From 11042898d71249ed9c698355fd7b7812b741a161 Mon Sep 17 00:00:00 2001 From: rihab kouki Date: Tue, 23 Nov 2021 15:29:35 +0100 Subject: Release v1.13.0 --- Drivers/BSP/Components/s25fl128s/LICENSE.md | 27 + .../BSP/Components/s25fl128s/Release_Notes.html | 41 +- .../BSP/Components/s25fl128s/_htmresc/favicon.png | Bin 0 -> 4126 bytes .../BSP/Components/s25fl128s/_htmresc/mini-st.css | 1700 ---- .../Components/s25fl128s/_htmresc/mini-st_2020.css | 1711 ++++ .../BSP/Components/s25fl128s/_htmresc/st_logo.png | Bin 18616 -> 0 bytes .../Components/s25fl128s/_htmresc/st_logo_2020.png | Bin 0 -> 7520 bytes Drivers/BSP/Components/s25fl128s/s25fl128s.c | 327 +- Drivers/BSP/Components/s25fl128s/s25fl128s.h | 39 +- .../Components/s25fl128s/s25fl128s_conf_template.h | 52 +- Drivers/BSP/Components/stm32wb_at/LICENSE.md | 27 + .../BSP/Components/stm32wb_at/Release_Notes.html | 51 + .../BSP/Components/stm32wb_at/_htmresc/favicon.png | Bin 0 -> 4126 bytes .../stm32wb_at/_htmresc/mini-st_2020.css | 1694 ++++ .../stm32wb_at/_htmresc/st_logo_2020.png | Bin 0 -> 7520 bytes Drivers/BSP/Components/stm32wb_at/stm32wb_at.c | 153 + Drivers/BSP/Components/stm32wb_at/stm32wb_at.h | 66 + Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c | 39 + Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.h | 300 + .../BSP/Components/stm32wb_at/stm32wb_at_client.c | 1356 ++++ .../BSP/Components/stm32wb_at/stm32wb_at_client.h | 50 + Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c | 73 + Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.h | 49 + Drivers/BSP/NUCLEO-WB15CC/README.md | 36 + Drivers/BSP/NUCLEO-WB15CC/Release_Notes.html | 17 +- Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c | 16 +- Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.h | 17 +- .../NUCLEO-WB15CC/nucleo_wb15cc_conf_template.h | 4 +- Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_errno.h | 2 - Drivers/BSP/P-NUCLEO-WB55.Nucleo/README.md | 36 + .../BSP/P-NUCLEO-WB55.Nucleo/Release_Notes.html | 21 +- .../BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c | 6 +- .../BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.h | 3 - Drivers/BSP/P-NUCLEO-WB55.USBDongle/README.md | 36 + .../BSP/P-NUCLEO-WB55.USBDongle/Release_Notes.html | 21 +- .../P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.c | 44 +- .../P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.h | 30 +- Drivers/BSP/STM32WB5MM-DK/README.md | 40 + Drivers/BSP/STM32WB5MM-DK/Release_Notes.html | 19 +- Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.c | 2 - Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.h | 34 +- Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.c | 37 +- Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.h | 6 +- Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.c | 4 +- Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.h | 2 - .../STM32WB5MM-DK/stm32wb5mm_dk_conf_template.h | 4 +- .../BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.c | 2 - .../BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.h | 2 - .../STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.c | 2 - .../STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.h | 2 - Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_errno.h | 2 - Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.c | 2 - Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.h | 2 - .../STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.c | 2 - .../STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.h | 2 - .../stm32wb5mm_dk_motion_sensors_ex.c | 2 - .../stm32wb5mm_dk_motion_sensors_ex.h | 2 - Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.c | 24 +- Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.h | 2 - .../Device/ST/STM32WBxx/Include/stm32wb10xx.h | 175 +- .../Device/ST/STM32WBxx/Include/stm32wb15xx.h | 118 +- .../Device/ST/STM32WBxx/Include/stm32wb30xx.h | 170 +- .../Device/ST/STM32WBxx/Include/stm32wb35xx.h | 170 +- .../Device/ST/STM32WBxx/Include/stm32wb50xx.h | 170 +- .../Device/ST/STM32WBxx/Include/stm32wb55xx.h | 170 +- .../Device/ST/STM32WBxx/Include/stm32wb5mxx.h | 170 +- .../CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h | 7 +- .../Device/ST/STM32WBxx/Include/system_stm32wbxx.h | 5 +- Drivers/CMSIS/Device/ST/STM32WBxx/LICENSE.md | 14 +- Drivers/CMSIS/Device/ST/STM32WBxx/README.md | 1 + .../CMSIS/Device/ST/STM32WBxx/Release_Notes.html | 47 +- .../Source/Templates/arm/startup_stm32wb10xx_cm4.s | 3 +- .../Source/Templates/arm/startup_stm32wb15xx_cm4.s | 3 +- .../Source/Templates/arm/startup_stm32wb30xx_cm4.s | 3 +- .../Source/Templates/arm/startup_stm32wb35xx_cm4.s | 3 +- .../Source/Templates/arm/startup_stm32wb50xx_cm4.s | 3 +- .../Source/Templates/arm/startup_stm32wb55xx_cm4.s | 3 +- .../Source/Templates/arm/startup_stm32wb5mxx_cm4.s | 3 +- .../Templates/gcc/linker/stm32wb10xx_flash_cm4.ld | 13 +- .../Templates/gcc/linker/stm32wb15xx_flash_cm4.ld | 13 +- .../Templates/gcc/linker/stm32wb30xx_flash_cm4.ld | 30 +- .../Templates/gcc/linker/stm32wb35xx_flash_cm4.ld | 30 +- .../Templates/gcc/linker/stm32wb50xx_flash_cm4.ld | 30 +- .../Templates/gcc/linker/stm32wb55xx_flash_cm4.ld | 30 +- .../Templates/gcc/linker/stm32wb5mxx_flash_cm4.ld | 30 +- .../Source/Templates/gcc/startup_stm32wb10xx_cm4.s | 3 +- .../Source/Templates/gcc/startup_stm32wb15xx_cm4.s | 3 +- .../Source/Templates/gcc/startup_stm32wb30xx_cm4.s | 3 +- .../Source/Templates/gcc/startup_stm32wb35xx_cm4.s | 3 +- .../Source/Templates/gcc/startup_stm32wb50xx_cm4.s | 3 +- .../Source/Templates/gcc/startup_stm32wb55xx_cm4.s | 3 +- .../Source/Templates/gcc/startup_stm32wb5mxx_cm4.s | 3 +- .../Source/Templates/iar/startup_stm32wb10xx_cm4.s | 3 +- .../Source/Templates/iar/startup_stm32wb15xx_cm4.s | 3 +- .../Source/Templates/iar/startup_stm32wb30xx_cm4.s | 3 +- .../Source/Templates/iar/startup_stm32wb35xx_cm4.s | 3 +- .../Source/Templates/iar/startup_stm32wb50xx_cm4.s | 3 +- .../Source/Templates/iar/startup_stm32wb55xx_cm4.s | 3 +- .../Source/Templates/iar/startup_stm32wb5mxx_cm4.s | 3 +- .../STM32WBxx/Source/Templates/system_stm32wbxx.c | 4 +- .../Inc/Legacy/stm32_hal_legacy.h | 59 +- .../Inc/stm32_assert_template.h | 14 +- Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc.h | 14 +- .../Inc/stm32wbxx_hal_adc_ex.h | 34 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_comp.h | 25 +- .../Inc/stm32wbxx_hal_conf_template.h | 13 +- .../Inc/stm32wbxx_hal_cortex.h | 15 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc.h | 68 +- .../Inc/stm32wbxx_hal_crc_ex.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp.h | 15 +- .../Inc/stm32wbxx_hal_cryp_ex.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_def.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma.h | 13 +- .../Inc/stm32wbxx_hal_dma_ex.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_exti.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash.h | 15 +- .../Inc/stm32wbxx_hal_flash_ex.h | 17 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio.h | 13 +- .../Inc/stm32wbxx_hal_gpio_ex.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_hsem.h | 17 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c.h | 13 +- .../Inc/stm32wbxx_hal_i2c_ex.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_ipcc.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda.h | 12 +- .../Inc/stm32wbxx_hal_irda_ex.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_iwdg.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lcd.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lptim.h | 47 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd.h | 57 +- .../Inc/stm32wbxx_hal_pcd_ex.h | 17 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pka.h | 39 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr.h | 12 +- .../Inc/stm32wbxx_hal_pwr_ex.h | 14 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_qspi.h | 15 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc.h | 66 +- .../Inc/stm32wbxx_hal_rcc_ex.h | 49 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rng.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc.h | 13 +- .../Inc/stm32wbxx_hal_rtc_ex.h | 15 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai.h | 13 +- .../Inc/stm32wbxx_hal_sai_ex.h | 13 +- .../Inc/stm32wbxx_hal_smartcard.h | 14 +- .../Inc/stm32wbxx_hal_smartcard_ex.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus.h | 17 +- .../Inc/stm32wbxx_hal_smbus_ex.h | 26 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi.h | 15 +- .../Inc/stm32wbxx_hal_spi_ex.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim.h | 151 +- .../Inc/stm32wbxx_hal_tim_ex.h | 28 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tsc.h | 170 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart.h | 12 +- .../Inc/stm32wbxx_hal_uart_ex.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart.h | 12 +- .../Inc/stm32wbxx_hal_usart_ex.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_wwdg.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_adc.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_bus.h | 25 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_comp.h | 17 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_cortex.h | 26 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crc.h | 15 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crs.h | 15 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dma.h | 15 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dmamux.h | 21 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_exti.h | 15 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_gpio.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_hsem.h | 16 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_i2c.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_ipcc.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_iwdg.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lptim.h | 74 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lpuart.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pka.h | 21 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pwr.h | 22 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rcc.h | 82 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rng.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rtc.h | 13 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_spi.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_system.h | 34 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_tim.h | 254 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usart.h | 12 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usb.h | 23 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_utils.h | 24 +- .../STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_wwdg.h | 13 +- Drivers/STM32WBxx_HAL_Driver/README.md | 13 +- Drivers/STM32WBxx_HAL_Driver/Release_Notes.html | 144 +- Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c | 25 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc.c | 27 +- .../Src/stm32wbxx_hal_adc_ex.c | 48 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_comp.c | 29 +- .../Src/stm32wbxx_hal_cortex.c | 23 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc.c | 44 +- .../Src/stm32wbxx_hal_crc_ex.c | 26 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp.c | 35 +- .../Src/stm32wbxx_hal_cryp_ex.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c | 30 +- .../Src/stm32wbxx_hal_dma_ex.c | 24 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c | 25 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c | 38 +- .../Src/stm32wbxx_hal_flash_ex.c | 23 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c | 53 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c | 24 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c | 149 +- .../Src/stm32wbxx_hal_i2c_ex.c | 30 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c | 28 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_irda.c | 65 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_iwdg.c | 27 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lcd.c | 25 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lptim.c | 91 +- .../Src/stm32wbxx_hal_msp_template.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd.c | 197 +- .../Src/stm32wbxx_hal_pcd_ex.c | 17 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.c | 101 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c | 13 +- .../Src/stm32wbxx_hal_pwr_ex.c | 14 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_qspi.c | 44 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c | 142 +- .../Src/stm32wbxx_hal_rcc_ex.c | 50 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c | 42 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c | 31 +- .../Src/stm32wbxx_hal_rtc_ex.c | 28 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai.c | 26 +- .../Src/stm32wbxx_hal_sai_ex.c | 13 +- .../Src/stm32wbxx_hal_smartcard.c | 30 +- .../Src/stm32wbxx_hal_smartcard_ex.c | 23 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus.c | 29 +- .../Src/stm32wbxx_hal_smbus_ex.c | 144 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi.c | 45 +- .../Src/stm32wbxx_hal_spi_ex.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c | 1064 +-- .../Src/stm32wbxx_hal_tim_ex.c | 342 +- .../stm32wbxx_hal_timebase_rtc_alarm_template.c | 36 +- .../stm32wbxx_hal_timebase_rtc_wakeup_template.c | 34 +- .../Src/stm32wbxx_hal_timebase_tim_template.c | 19 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tsc.c | 47 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c | 52 +- .../Src/stm32wbxx_hal_uart_ex.c | 23 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart.c | 105 +- .../Src/stm32wbxx_hal_usart_ex.c | 35 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_wwdg.c | 26 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_adc.c | 16 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_comp.c | 15 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crc.c | 16 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crs.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_dma.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_exti.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_gpio.c | 14 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_i2c.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lptim.c | 23 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lpuart.c | 14 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pka.c | 50 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pwr.c | 12 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rcc.c | 43 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rng.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rtc.c | 13 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_spi.c | 14 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_tim.c | 45 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usart.c | 12 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usb.c | 135 +- .../STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_utils.c | 13 +- .../ST/STM32_Audio/Addons/PDM/Inc/pdm2pcm_glo.h | 95 - .../Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc16.a | Bin 14854 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc32.a | Bin 14854 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc16.a | Bin 19528 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc32.a | Bin 19606 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM3_Keil_wc16.lib | Bin 26586 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16.a | Bin 13726 -> 0 bytes .../PDM/Lib/libPDMFilter_CM4_GCC_wc16_softfp.a | Bin 13742 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32.a | Bin 14960 -> 0 bytes .../PDM/Lib/libPDMFilter_CM4_GCC_wc32_softfp.a | Bin 13742 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc16.a | Bin 23554 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc32.a | Bin 24156 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM4_Keil_wc16.lib | Bin 34158 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16.a | Bin 13614 -> 0 bytes .../PDM/Lib/libPDMFilter_CM7_GCC_wc16_softfp.a | Bin 13638 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32.a | Bin 13614 -> 0 bytes .../PDM/Lib/libPDMFilter_CM7_GCC_wc32_softfp.a | Bin 13638 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc16.a | Bin 21568 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc32.a | Bin 22142 -> 0 bytes .../Addons/PDM/Lib/libPDMFilter_CM7_Keil_wc16.lib | Bin 33266 -> 0 bytes Middlewares/ST/STM32_Audio/Addons/PDM/readme.txt | 2 +- Middlewares/ST/STM32_WPAN/LICENSE.md | 80 + Middlewares/ST/STM32_WPAN/Release_Notes.html | 90 +- Middlewares/ST/STM32_WPAN/ble/ble.h | 23 +- Middlewares/ST/STM32_WPAN/ble/ble_common.h | 23 +- .../ST/STM32_WPAN/ble/core/auto/ble_events.c | 124 +- .../ST/STM32_WPAN/ble/core/auto/ble_events.h | 295 +- .../ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c | 293 +- .../ST/STM32_WPAN/ble/core/auto/ble_gap_aci.h | 704 +- .../ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c | 17 +- .../ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.h | 17 +- .../ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c | 17 +- .../ST/STM32_WPAN/ble/core/auto/ble_hal_aci.h | 23 +- .../ST/STM32_WPAN/ble/core/auto/ble_hci_le.c | 439 +- .../ST/STM32_WPAN/ble/core/auto/ble_hci_le.h | 648 +- .../ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c | 17 +- .../ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.h | 29 +- .../ST/STM32_WPAN/ble/core/auto/ble_types.h | 404 +- Middlewares/ST/STM32_WPAN/ble/core/ble_bufsize.h | 39 +- Middlewares/ST/STM32_WPAN/ble/core/ble_core.h | 15 +- Middlewares/ST/STM32_WPAN/ble/core/ble_defs.h | 88 +- Middlewares/ST/STM32_WPAN/ble/core/ble_legacy.h | 35 +- Middlewares/ST/STM32_WPAN/ble/core/ble_std.h | 126 +- .../core/doc/STM32WB_BLE_Wireless_Interface.html | 1376 +++- .../ST/STM32_WPAN/ble/core/template/ble_const.h | 15 +- .../ST/STM32_WPAN/ble/core/template/compiler.h | 15 +- Middlewares/ST/STM32_WPAN/ble/core/template/osal.c | 13 +- Middlewares/ST/STM32_WPAN/ble/core/template/osal.h | 13 +- Middlewares/ST/STM32_WPAN/ble/menu/DispTools.c | 21 +- Middlewares/ST/STM32_WPAN/ble/menu/DispTools.h | 25 +- Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.c | 13 +- Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.h | 13 +- .../ST/STM32_WPAN/ble/menu/hids_mouse_menu.c | 13 +- .../ST/STM32_WPAN/ble/mesh/Inc/appli_test.h | 13 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_clock.h | 35 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_mesh.h | 13 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/mesh_cfg.h | 20 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_if.h | 11 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_nvm.h | 15 +- .../ST/STM32_WPAN/ble/mesh/Inc/serial_ctrl.h | 13 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_if.h | 13 +- .../ST/STM32_WPAN/ble/mesh/Inc/serial_prvn.h | 13 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ut.h | 13 +- Middlewares/ST/STM32_WPAN/ble/mesh/Inc/types.h | 13 +- .../ble/mesh/Library/libBle_Mesh_CM4_GCC.a | Bin 306366 -> 324102 bytes .../ble/mesh/Library/libBle_Mesh_CM4_GCC_DEBUG.a | Bin 3059616 -> 3418896 bytes .../ble/mesh/Library/libBle_Mesh_CM4_IAR.a | Bin 673378 -> 538360 bytes .../ble/mesh/Library/libBle_Mesh_CM4_IAR_DEBUG.a | Bin 3478320 -> 3332104 bytes .../ble/mesh/Library/libBle_Mesh_CM4_Keil.lib | Bin 554690 -> 554318 bytes .../mesh/Library/libBle_Mesh_CM4_Keil_DEBUG.lib | Bin 3578072 -> 3587932 bytes .../ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC.a | Bin 0 -> 321342 bytes .../Library/libBle_Mesh_CM4_WB15xx_GCC_DEBUG.a | Bin 0 -> 3159914 bytes .../ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR.a | Bin 0 -> 535946 bytes .../Library/libBle_Mesh_CM4_WB15xx_IAR_DEBUG.a | Bin 0 -> 3335404 bytes .../mesh/Library/libBle_Mesh_CM4_WB15xx_Keil.lib | Bin 0 -> 553090 bytes .../Library/libBle_Mesh_CM4_WB15xx_Keil_DEBUG.lib | Bin 0 -> 3357362 bytes .../ST/STM32_WPAN/ble/mesh/MeshModel/Inc/common.h | 13 +- .../ble/mesh/MeshModel/Inc/config_client.h | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic.h | 13 +- .../ble/mesh/MeshModel/Inc/generic_client.h | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light.h | 13 +- .../ble/mesh/MeshModel/Inc/light_client.h | 13 +- .../STM32_WPAN/ble/mesh/MeshModel/Inc/light_lc.h | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors.h | 13 +- .../ble/mesh/MeshModel/Inc/sensors_client.h | 13 +- .../STM32_WPAN/ble/mesh/MeshModel/Inc/time_scene.h | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Inc/vendor.h | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c | 13 +- .../ble/mesh/MeshModel/Src/config_client.c | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c | 13 +- .../ble/mesh/MeshModel/Src/generic_client.c | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c | 19 +- .../ble/mesh/MeshModel/Src/light_client.c | 13 +- .../STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c | 13 +- .../ble/mesh/MeshModel/Src/sensors_client.c | 13 +- .../STM32_WPAN/ble/mesh/MeshModel/Src/time_scene.c | 13 +- .../ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c | 13 +- .../ST/STM32_WPAN/ble/mesh/PAL/STM32WB/pal_nvm.c | 37 +- .../ST/STM32_WPAN/ble/mesh/Src/appli_test.c | 11 +- Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c | 13 +- .../ST/STM32_WPAN/ble/mesh/Src/serial_ctrl.c | 13 +- Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_if.c | 15 +- .../ST/STM32_WPAN/ble/mesh/Src/serial_prvn.c | 15 +- Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ut.c | 11 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/bas.h | 13 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/bls.h | 23 +- .../ST/STM32_WPAN/ble/svc/Inc/bvopus_service_stm.h | 35 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/crs_stm.h | 27 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/dis.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/eds_stm.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/hids.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/hrs.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/hts.h | 13 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/ias.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/lls.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/mesh.h | 41 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/motenv_stm.h | 23 +- .../ST/STM32_WPAN/ble/svc/Inc/opus_interface_stm.h | 35 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/otas_stm.h | 13 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/p2p_stm.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/svc_ctl.h | 23 +- .../ST/STM32_WPAN/ble/svc/Inc/template_stm.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/tps.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/uuid.h | 13 +- Middlewares/ST/STM32_WPAN/ble/svc/Inc/zdd_stm.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/bas.c | 15 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/bls.c | 15 +- .../ST/STM32_WPAN/ble/svc/Src/bvopus_service_stm.c | 35 +- .../ST/STM32_WPAN/ble/svc/Src/common_blesvc.h | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/crs_stm.c | 27 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/eds_stm.c | 25 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/hids.c | 13 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c | 25 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/hts.c | 15 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/ias.c | 15 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/lls.c | 15 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c | 13 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/motenv_stm.c | 25 +- .../ST/STM32_WPAN/ble/svc/Src/opus_interface_stm.c | 35 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/otas_stm.c | 15 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c | 25 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c | 13 +- .../ST/STM32_WPAN/ble/svc/Src/template_stm.c | 25 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/tps.c | 23 +- Middlewares/ST/STM32_WPAN/ble/svc/Src/zdd_stm.c | 108 +- Middlewares/ST/STM32_WPAN/ble_lld/README.md | 171 + Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c | 59 +- Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.h | 33 +- Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c | 172 +- Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.h | 60 +- .../ST/STM32_WPAN/ble_lld/lld/ble_lld_transport.h | 33 +- .../ST/STM32_WPAN/ble_lld/lld/ipBLE_lld_public.h | 25 +- .../patterns/ble_thread/conf/tl_conf_template.h | 22 +- .../patterns/ble_thread/conf/vcp_conf_template.h | 22 +- .../STM32_WPAN/interface/patterns/ble_thread/hw.h | 12 +- .../interface/patterns/ble_thread/lhci/lhci.c | 356 +- .../interface/patterns/ble_thread/lhci/lhci.h | 22 +- .../interface/patterns/ble_thread/shci/shci.c | 22 +- .../interface/patterns/ble_thread/shci/shci.h | 63 +- .../interface/patterns/ble_thread/tl/hci_tl.c | 21 +- .../interface/patterns/ble_thread/tl/hci_tl.h | 21 +- .../interface/patterns/ble_thread/tl/hci_tl_if.c | 22 +- .../interface/patterns/ble_thread/tl/mbox_def.h | 22 +- .../interface/patterns/ble_thread/tl/shci_tl.c | 21 +- .../interface/patterns/ble_thread/tl/shci_tl.h | 24 +- .../interface/patterns/ble_thread/tl/shci_tl_if.c | 22 +- .../interface/patterns/ble_thread/tl/tl.h | 22 +- .../patterns/ble_thread/tl/tl_mac_802_15_4.h | 22 +- .../interface/patterns/ble_thread/tl/tl_mbox.c | 13 +- .../patterns/ble_thread/tl/tl_thread_hci.c | 22 +- .../patterns/ble_thread/tl/tl_thread_hci.h | 22 +- .../patterns/ble_thread/tl/tl_zigbee_hci.c | 12 +- .../patterns/ble_thread/tl/tl_zigbee_hci.h | 12 +- .../interface/patterns/ble_thread/vcp/usbd_conf.c | 23 +- .../interface/patterns/ble_thread/vcp/usbd_conf.h | 32 +- .../interface/patterns/ble_thread/vcp/usbd_desc.c | 32 +- .../interface/patterns/ble_thread/vcp/usbd_desc.h | 32 +- .../interface/patterns/ble_thread/vcp/vcp.c | 23 +- .../interface/patterns/ble_thread/vcp/vcp.h | 22 +- .../mac_802_15_4/core/inc/802_15_4_mac_config.h | 11 +- .../mac_802_15_4/core/inc/802_15_4_mac_core.h | 31 +- .../mac_802_15_4/core/inc/802_15_4_mac_errors.h | 11 +- .../mac_802_15_4/core/inc/802_15_4_mac_sap.h | 11 +- .../mac_802_15_4/core/inc/802_15_4_mac_types.h | 11 +- .../mac_802_15_4/core/src/mac_802_15_4_core_wb.c | 11 +- Middlewares/ST/STM32_WPAN/stm32_wpan_common.h | 13 +- .../openthread/core/openthread_api/border_agent.c | 11 +- .../openthread/core/openthread_api/border_router.c | 11 +- .../core/openthread_api/channel_manager.c | 11 +- .../core/openthread_api/channel_monitor.c | 11 +- .../core/openthread_api/child_supervision.c | 11 +- .../thread/openthread/core/openthread_api/coap.c | 11 +- .../openthread/core/openthread_api/coap_secure.c | 13 +- .../openthread/core/openthread_api/commissioner.c | 15 +- .../thread/openthread/core/openthread_api/crypto.c | 11 +- .../openthread/core/openthread_api/dataset.c | 11 +- .../openthread/core/openthread_api/dataset_ftd.c | 11 +- .../thread/openthread/core/openthread_api/diag.c | 11 +- .../thread/openthread/core/openthread_api/dns.c | 11 +- .../openthread/core/openthread_api/entropy.c | 11 +- .../thread/openthread/core/openthread_api/errors.c | 11 +- .../thread/openthread/core/openthread_api/icmp6.c | 11 +- .../openthread/core/openthread_api/instance.c | 15 +- .../thread/openthread/core/openthread_api/ip6.c | 11 +- .../openthread/core/openthread_api/jam_detection.c | 11 +- .../thread/openthread/core/openthread_api/joiner.c | 13 +- .../thread/openthread/core/openthread_api/link.c | 11 +- .../openthread/core/openthread_api/link_raw.c | 11 +- .../openthread/core/openthread_api/logging.c | 11 +- .../openthread/core/openthread_api/message.c | 11 +- .../openthread/core/openthread_api/netdata.c | 11 +- .../openthread/core/openthread_api/network_time.c | 11 +- .../openthread/core/openthread_api/openthread.c | 11 +- .../openthread_api_config_concurrent.h | 11 +- .../openthread_api/openthread_api_config_ftd.h | 11 +- .../openthread_api/openthread_api_config_mtd.h | 11 +- .../core/openthread_api/openthread_api_wb.c | 43 +- .../core/openthread_api/openthread_api_wb.h | 11 +- .../thread/openthread/core/openthread_api/radio.c | 11 +- .../openthread/core/openthread_api/random_crypto.c | 11 +- .../core/openthread_api/random_noncrypto.c | 13 +- .../thread/openthread/core/openthread_api/server.c | 11 +- .../thread/openthread/core/openthread_api/sntp.c | 11 +- .../openthread_api/stm32wbxx_core_interface_def.h | 26 +- .../openthread/core/openthread_api/tasklet.c | 11 +- .../thread/openthread/core/openthread_api/thread.c | 11 +- .../openthread/core/openthread_api/thread_ftd.c | 11 +- .../thread/openthread/core/openthread_api/udp.c | 11 +- Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c | 17 +- Middlewares/ST/STM32_WPAN/utilities/dbg_trace.h | 21 +- Middlewares/ST/STM32_WPAN/utilities/otp.c | 17 +- Middlewares/ST/STM32_WPAN/utilities/otp.h | 17 +- Middlewares/ST/STM32_WPAN/utilities/stm_list.c | 15 +- Middlewares/ST/STM32_WPAN/utilities/stm_list.h | 15 +- Middlewares/ST/STM32_WPAN/utilities/stm_queue.c | 15 +- Middlewares/ST/STM32_WPAN/utilities/stm_queue.h | 17 +- .../ST/STM32_WPAN/utilities/utilities_common.h | 21 +- Middlewares/ST/STM32_WPAN/zigbee/SLA0044.txt | 65 - .../zigbee/core/inc/stm32wbxx_core_interface_def.h | 32 +- .../ST/STM32_WPAN/zigbee/core/inc/zigbee_core.h | 27 +- .../ST/STM32_WPAN/zigbee/core/inc/zigbee_errors.h | 23 - .../STM32_WPAN/zigbee/core/inc/zigbee_interface.h | 15 +- .../ST/STM32_WPAN/zigbee/core/inc/zigbee_types.h | 17 +- .../ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c | 340 +- .../STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib.a | Bin 4298356 -> 4337372 bytes .../zigbee/lib/stm32wb_zigbee_wb_lib_keil.lib | Bin 13875362 -> 14198590 bytes Middlewares/ST/STM32_WPAN/zigbee/platform/ee.c | 13 +- Middlewares/ST/STM32_WPAN/zigbee/platform/ee.h | 13 +- Middlewares/ST/STM32_WPAN/zigbee/platform/ee_cfg.h | 17 +- .../ST/STM32_WPAN/zigbee/platform/hw_flash.c | 16 +- .../ST/STM32_WPAN/zigbee/platform/hw_flash.h | 15 +- Middlewares/ST/STM32_WPAN/zigbee/readme.txt | 9 +- .../zigbee/stack/include/mac/ieee802154_enums.h | 10 + .../zigbee/stack/include/zcl/general/zcl.alarm.h | 6 +- .../stack/include/zcl/general/zcl.ballast.config.h | 4 +- .../zigbee/stack/include/zcl/general/zcl.basic.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.color.h | 30 +- .../stack/include/zcl/general/zcl.commission.h | 10 +- .../stack/include/zcl/general/zcl.dehum.ctrl.h | 6 +- .../stack/include/zcl/general/zcl.device.temp.h | 6 +- .../stack/include/zcl/general/zcl.diagnostics.h | 10 +- .../stack/include/zcl/general/zcl.doorlock.h | 4 +- .../stack/include/zcl/general/zcl.elec.meas.h | 4 +- .../zigbee/stack/include/zcl/general/zcl.fan.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.groups.h | 2 +- .../stack/include/zcl/general/zcl.illum.level.h | 6 +- .../stack/include/zcl/general/zcl.illum.meas.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.level.h | 9 - .../stack/include/zcl/general/zcl.meter.id.h | 4 +- .../stack/include/zcl/general/zcl.nearest.gw.h | 6 +- .../stack/include/zcl/general/zcl.occupancy.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.onoff.h | 4 +- .../stack/include/zcl/general/zcl.onoff.swconfig.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.ota.h | 4 +- .../stack/include/zcl/general/zcl.poll.control.h | 6 +- .../stack/include/zcl/general/zcl.power.config.h | 4 +- .../stack/include/zcl/general/zcl.power.profile.h | 6 +- .../stack/include/zcl/general/zcl.press.meas.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.pump.h | 6 +- .../stack/include/zcl/general/zcl.rssi.loc.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.scenes.h | 6 +- .../stack/include/zcl/general/zcl.temp.meas.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.therm.h | 4 +- .../stack/include/zcl/general/zcl.therm.ui.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.time.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.voice.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.wcm.h | 6 +- .../zigbee/stack/include/zcl/general/zcl.window.h | 6 +- .../zigbee/stack/include/zcl/se/zcl.drlc.h | 4 +- .../zigbee/stack/include/zcl/se/zcl.keepalive.h | 10 +- .../zigbee/stack/include/zcl/se/zcl.message.h | 6 +- .../stack/include/zcl/se/zcl.meter.attr.gbcs.h | 447 +- .../zigbee/stack/include/zcl/se/zcl.meter.h | 432 +- .../stack/include/zcl/se/zcl.price.attr.gbcs.h | 35 +- .../zigbee/stack/include/zcl/se/zcl.price.h | 28 +- .../zigbee/stack/include/zcl/se/zcl.tunnel.h | 6 +- .../stack/include/zcl/security/zcl.ias_ace.h | 6 +- .../zigbee/stack/include/zcl/security/zcl.ias_wd.h | 6 +- .../stack/include/zcl/security/zcl.ias_zone.h | 4 +- .../stack/include/zcl/st_custom/zcl.custom_ls.h | 11 +- .../include/zcl/st_custom/zcl.custom_matrix.h | 14 +- .../STM32_WPAN/zigbee/stack/include/zcl/zcl.enum.h | 250 +- .../ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.h | 245 +- .../zigbee/stack/include/zcl/zcl.payload.h | 4 +- .../zigbee/stack/include/zcl/zcl.touchlink.h | 2 +- .../STM32_WPAN/zigbee/stack/include/zigbee.aps.h | 10 + .../ST/STM32_WPAN/zigbee/stack/include/zigbee.h | 36 +- .../STM32_WPAN/zigbee/stack/include/zigbee.nwk.h | 48 +- .../zigbee/stack/include/zigbee.security.h | 13 +- .../zigbee/stack/include/zigbee.startup.h | 15 +- .../stack/zcl/st_custom/zcl_custom_ls_client.c | 23 +- .../stack/zcl/st_custom/zcl_custom_ls_server.c | 17 +- .../stack/zcl/st_custom/zcl_custom_matrix_client.c | 66 + .../stack/zcl/st_custom/zcl_custom_matrix_server.c | 127 + .../ST/STM32_WPAN/zigbee/utilities/zigbee.string.c | 183 + .../BLE/BLE_DataThroughput/Core/Inc/app_common.h | 21 +- .../BLE/BLE_DataThroughput/Core/Inc/app_conf.h | 45 +- .../BLE/BLE_DataThroughput/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_DataThroughput/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_DataThroughput/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_DataThroughput/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_DataThroughput/Core/Inc/main.h | 13 +- .../Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_DataThroughput/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_DataThroughput/Core/Src/app_debug.c | 36 +- .../BLE/BLE_DataThroughput/Core/Src/app_entry.c | 194 +- .../BLE_DataThroughput/Core/Src/app_entry_origin.c | 29 +- .../BLE_DataThroughput/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_DataThroughput/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_DataThroughput/Core/Src/main.c | 14 +- .../Core/Src/standby_stm32wb15.c | 12 +- .../BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_DataThroughput/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../BLE/BLE_DataThroughput/STM32CubeIDE/.cproject | 107 + .../BLE/BLE_DataThroughput/STM32CubeIDE/.project | 319 + .../STM32CubeIDE/Application/Core/syscalls.c | 158 + .../STM32CubeIDE/Application/Core/sysmem.c | 79 + .../Application/Startup/startup_stm32wb15ccux.s | 392 + .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 175 + .../BLE_DataThroughput/STM32_WPAN/App/app_ble.c | 21 +- .../BLE_DataThroughput/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_DataThroughput/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../STM32_WPAN/App/dt_client_app.c | 29 +- .../STM32_WPAN/App/dt_client_app.h | 29 +- .../STM32_WPAN/App/dt_server_app.c | 28 +- .../STM32_WPAN/App/dt_server_app.h | 29 +- .../BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c | 29 +- .../BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h | 29 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_DataThroughput/readme.txt | 10 +- .../BLE/BLE_HeartRate/BLE_HeartRate.ioc | 8 +- .../Binary/BLE_HeartRate_reference.hex | 1732 +++-- .../BLE/BLE_HeartRate/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRate/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_HeartRate/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRate/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_HeartRate/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_HeartRate/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_HeartRate/Core/Inc/main.h | 13 +- .../BLE_HeartRate/Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_HeartRate/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_HeartRate/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRate/Core/Src/app_entry.c | 185 +- .../BLE/BLE_HeartRate/Core/Src/hw_timerserver.c | 23 +- .../Applications/BLE/BLE_HeartRate/Core/Src/main.c | 37 +- .../BLE/BLE_HeartRate/Core/Src/standby_stm32wb15.c | 18 +- .../BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c | 33 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c | 13 +- .../BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp | 2479 +++--- .../BLE_HeartRate/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../BLE_HeartRate/EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 17 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 15 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c | 65 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c | 12 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h | 20 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c | 12 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h | 12 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_HeartRate/readme.txt | 10 +- .../Binary/BLE_HeartRate_ota_reference.bin | Bin 22004 -> 22376 bytes .../BLE/BLE_HeartRate_ota/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h | 43 +- .../BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_HeartRate_ota/Core/Inc/main.h | 13 +- .../Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_HeartRate_ota/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_HeartRate_ota/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRate_ota/Core/Src/app_entry.c | 194 +- .../BLE_HeartRate_ota/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_HeartRate_ota/Core/Src/main.c | 14 +- .../BLE_HeartRate_ota/Core/Src/standby_stm32wb15.c | 12 +- .../BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4_ota.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 28 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 15 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c | 25 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c | 12 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h | 20 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c | 12 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h | 12 +- .../BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_HeartRate_ota/readme.txt | 10 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h | 116 + .../BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h | 639 ++ .../BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h | 67 + .../BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h | 72 + .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h | 173 + .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h | 87 + .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h | 247 + .../BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h | 60 + .../BLE/BLE_MeshLightingLPN/Core/Inc/main.h | 75 + .../Core/Inc/nucleo_wb15cc_conf.h | 74 + .../BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h | 79 + .../Core/Inc/stm32wbxx_hal_conf.h | 352 + .../BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h | 83 + .../BLE_MeshLightingLPN/Core/Inc/utilities_conf.h | 65 + .../BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h | 51 + .../BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c | 423 + .../BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c | 743 ++ .../BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c | 152 + .../BLE_MeshLightingLPN/Core/Src/hw_timerserver.c | 892 +++ .../BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c | 236 + .../BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c | 134 + .../BLE/BLE_MeshLightingLPN/Core/Src/main.c | 337 + .../Core/Src/standby_stm32wb15.c | 164 + .../BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c | 446 ++ .../Core/Src/stm32wbxx_hal_msp.c | 198 + .../BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c | 387 + .../Core/Src/system_stm32wbxx.c | 354 + .../EWARM/BLE_MeshLightingLPN.ewd | 2834 +++++++ .../EWARM/BLE_MeshLightingLPN.ewp | 1310 ++++ .../BLE/BLE_MeshLightingLPN/EWARM/Project.eww | 7 + .../EWARM/startup_stm32wb15xx_cm4.s | 469 ++ .../EWARM/stm32wb15xx_flash_cm4.icf | 42 + .../MDK-ARM/BLE_MeshLightingDemoLPN.uvoptx | 1144 +++ .../MDK-ARM/BLE_MeshLightingDemoLPN.uvprojx | 828 ++ .../MDK-ARM/startup_stm32wb15xx_cm4.s | 335 + .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 26 + .../BLE/BLE_MeshLightingLPN/STM32CubeIDE/.cproject | 218 + .../BLE/BLE_MeshLightingLPN/STM32CubeIDE/.project | 380 + .../STM32CubeIDE/Application/Core/syscalls.c | 158 + .../STM32CubeIDE/Application/Core/sysmem.c | 79 + .../Application/Startup/startup_stm32wb15ccux.s | 392 + .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 188 + .../STM32_WPAN/app/PWM_config.c | 110 + .../STM32_WPAN/app/PWM_config.h | 74 + .../STM32_WPAN/app/PWM_handlers.c | 279 + .../STM32_WPAN/app/PWM_handlers.h | 34 + .../BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c | 509 ++ .../BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h | 76 + .../STM32_WPAN/app/appli_config.c | 358 + .../STM32_WPAN/app/appli_config.h | 52 + .../STM32_WPAN/app/appli_config_client.c | 1917 +++++ .../STM32_WPAN/app/appli_config_client.h | 93 + .../STM32_WPAN/app/appli_generic.c | 484 ++ .../STM32_WPAN/app/appli_generic.h | 158 + .../STM32_WPAN/app/appli_generic_client.c | 345 + .../STM32_WPAN/app/appli_generic_client.h | 40 + .../STM32_WPAN/app/appli_light.c | 1351 ++++ .../STM32_WPAN/app/appli_light.h | 281 + .../STM32_WPAN/app/appli_light_client.c | 1206 +++ .../STM32_WPAN/app/appli_light_client.h | 111 + .../STM32_WPAN/app/appli_light_lc.c | 454 ++ .../STM32_WPAN/app/appli_light_lc.h | 81 + .../STM32_WPAN/app/appli_mesh.c | 1957 +++++ .../STM32_WPAN/app/appli_mesh.h | 144 + .../BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c | 751 ++ .../BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h | 107 + .../STM32_WPAN/app/appli_sensor.c | 765 ++ .../STM32_WPAN/app/appli_sensor.h | 111 + .../STM32_WPAN/app/appli_sensors_client.c | 332 + .../STM32_WPAN/app/appli_sensors_client.h | 72 + .../STM32_WPAN/app/appli_vendor.c | 565 ++ .../STM32_WPAN/app/appli_vendor.h | 46 + .../BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h | 72 + .../STM32_WPAN/app/ble_dbg_conf.h | 199 + .../BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h | 48 + .../BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s | 28 + .../STM32_WPAN/app/hal_common.h | 53 + .../STM32_WPAN/app/mesh_cfg_usr.h | 583 ++ .../BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c | 1163 +++ .../BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h | 51 + .../BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c | 443 ++ .../STM32_WPAN/app/sensor_cfg_usr.h | 741 ++ .../STM32_WPAN/app/svcctl_conf.c | 82 + .../BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h | 32 + .../STM32_WPAN/app/tl_dbg_conf.h | 133 + .../BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c | 47 + .../BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c | 343 + .../BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h | 40 + .../BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h | 51 + .../STM32_WPAN/target/hw_ipcc.c | 706 ++ .../BLE/BLE_MeshLightingLPN/readme.txt | 245 + .../BLE_MeshLightingPRFNode/Core/Inc/app_common.h | 116 + .../BLE_MeshLightingPRFNode/Core/Inc/app_conf.h | 637 ++ .../BLE_MeshLightingPRFNode/Core/Inc/app_debug.h | 67 + .../BLE_MeshLightingPRFNode/Core/Inc/app_entry.h | 72 + .../BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h | 173 + .../BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h | 87 + .../BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h | 247 + .../BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h | 60 + .../BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h | 75 + .../Core/Inc/nucleo_wb15cc_conf.h | 74 + .../Core/Inc/stm32_lpm_if.h | 79 + .../Core/Inc/stm32wbxx_hal_conf.h | 352 + .../Core/Inc/stm32wbxx_it.h | 81 + .../Core/Inc/utilities_conf.h | 65 + .../BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h | 51 + .../BLE_MeshLightingPRFNode/Core/Src/app_debug.c | 423 + .../BLE_MeshLightingPRFNode/Core/Src/app_entry.c | 735 ++ .../BLE_MeshLightingPRFNode/Core/Src/hw_flash.c | 152 + .../Core/Src/hw_timerserver.c | 892 +++ .../BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c | 236 + .../BLE_MeshLightingPRFNode/Core/Src/lp_timer.c | 134 + .../BLE/BLE_MeshLightingPRFNode/Core/Src/main.c | 337 + .../Core/Src/standby_stm32wb15.c | 164 + .../Core/Src/stm32_lpm_if.c | 446 ++ .../Core/Src/stm32wbxx_hal_msp.c | 198 + .../Core/Src/stm32wbxx_it.c | 374 + .../Core/Src/system_stm32wbxx.c | 354 + .../EWARM/BLE_MeshLightingPRFNode.ewd | 2834 +++++++ .../EWARM/BLE_MeshLightingPRFNode.ewp | 1313 ++++ .../BLE/BLE_MeshLightingPRFNode/EWARM/Project.eww | 7 + .../EWARM/startup_stm32wb15xx_cm4.s | 469 ++ .../EWARM/stm32wb15xx_flash_cm4.icf | 42 + .../MDK-ARM/BLE_MeshLightingDemoPRFNode.uvoptx | 1144 +++ .../MDK-ARM/BLE_MeshLightingDemoPRFNode.uvprojx | 828 ++ .../MDK-ARM/startup_stm32wb15xx_cm4.s | 335 + .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 26 + .../BLE_MeshLightingPRFNode/STM32CubeIDE/.cproject | 225 + .../BLE_MeshLightingPRFNode/STM32CubeIDE/.project | 380 + .../STM32CubeIDE/Application/Core/syscalls.c | 158 + .../STM32CubeIDE/Application/Core/sysmem.c | 79 + .../Application/Startup/startup_stm32wb15ccux.s | 392 + .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 188 + .../STM32_WPAN/app/PWM_config.c | 110 + .../STM32_WPAN/app/PWM_config.h | 74 + .../STM32_WPAN/app/PWM_handlers.c | 279 + .../STM32_WPAN/app/PWM_handlers.h | 34 + .../STM32_WPAN/app/app_ble.c | 509 ++ .../STM32_WPAN/app/app_ble.h | 76 + .../STM32_WPAN/app/appli_config.c | 358 + .../STM32_WPAN/app/appli_config.h | 52 + .../STM32_WPAN/app/appli_config_client.c | 1917 +++++ .../STM32_WPAN/app/appli_config_client.h | 93 + .../STM32_WPAN/app/appli_generic.c | 484 ++ .../STM32_WPAN/app/appli_generic.h | 158 + .../STM32_WPAN/app/appli_generic_client.c | 345 + .../STM32_WPAN/app/appli_generic_client.h | 40 + .../STM32_WPAN/app/appli_light.c | 1351 ++++ .../STM32_WPAN/app/appli_light.h | 281 + .../STM32_WPAN/app/appli_light_client.c | 1206 +++ .../STM32_WPAN/app/appli_light_client.h | 111 + .../STM32_WPAN/app/appli_light_lc.c | 454 ++ .../STM32_WPAN/app/appli_light_lc.h | 81 + .../STM32_WPAN/app/appli_mesh.c | 1908 +++++ .../STM32_WPAN/app/appli_mesh.h | 135 + .../STM32_WPAN/app/appli_nvm.c | 751 ++ .../STM32_WPAN/app/appli_nvm.h | 107 + .../STM32_WPAN/app/appli_sensor.c | 844 ++ .../STM32_WPAN/app/appli_sensor.h | 111 + .../STM32_WPAN/app/appli_sensors_client.c | 332 + .../STM32_WPAN/app/appli_sensors_client.h | 72 + .../STM32_WPAN/app/appli_vendor.c | 565 ++ .../STM32_WPAN/app/appli_vendor.h | 46 + .../STM32_WPAN/app/ble_conf.h | 72 + .../STM32_WPAN/app/ble_dbg_conf.h | 199 + .../STM32_WPAN/app/cube_hal.h | 48 + .../BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s | 28 + .../STM32_WPAN/app/hal_common.h | 53 + .../STM32_WPAN/app/mesh_cfg_usr.h | 628 ++ .../STM32_WPAN/app/models_if.c | 1163 +++ .../STM32_WPAN/app/models_if.h | 51 + .../STM32_WPAN/app/pal_nvm.c | 443 ++ .../STM32_WPAN/app/sensor_cfg_usr.h | 698 ++ .../STM32_WPAN/app/svcctl_conf.c | 82 + .../STM32_WPAN/app/tl_conf.h | 32 + .../STM32_WPAN/app/tl_dbg_conf.h | 133 + .../BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c | 47 + .../STM32_WPAN/app/user_if.c | 343 + .../STM32_WPAN/app/user_if.h | 40 + .../STM32_WPAN/app/vcp_conf.h | 51 + .../STM32_WPAN/target/hw_ipcc.c | 706 ++ .../BLE/BLE_MeshLightingPRFNode/readme.txt | 246 + .../BLE/BLE_Ota/Binary/BLE_Ota_reference.hex | 2094 ++--- .../Applications/BLE/BLE_Ota/Core/Inc/app_common.h | 21 +- .../Applications/BLE/BLE_Ota/Core/Inc/app_conf.h | 50 +- .../Applications/BLE/BLE_Ota/Core/Inc/app_debug.h | 22 +- .../Applications/BLE/BLE_Ota/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_Ota/Core/Inc/flash_driver.h | 13 +- .../Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h | 22 +- .../Applications/BLE/BLE_Ota/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_Ota/Core/Inc/main.h | 13 +- .../BLE/BLE_Ota/Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h | 23 +- .../BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_Ota/Core/Inc/utilities_conf.h | 25 +- .../Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h | 29 +- .../Applications/BLE/BLE_Ota/Core/Src/app_debug.c | 36 +- .../Applications/BLE/BLE_Ota/Core/Src/app_entry.c | 25 +- .../BLE/BLE_Ota/Core/Src/flash_driver.c | 44 +- .../BLE/BLE_Ota/Core/Src/hw_timerserver.c | 23 +- .../Applications/BLE/BLE_Ota/Core/Src/hw_uart.c | 29 +- .../Applications/BLE/BLE_Ota/Core/Src/main.c | 14 +- .../BLE/BLE_Ota/Core/Src/standby_stm32wb15.c | 12 +- .../BLE/BLE_Ota/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_Ota/Core/Src/stm32wbxx_it.c | 13 +- .../BLE/BLE_Ota/Core/Src/system_stm32wbxx.c | 23 +- .../BLE/BLE_Ota/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../BLE/BLE_Ota/EWARM/stm32wb15xx_flash_cm4.icf | 4 +- .../BLE/BLE_Ota/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../BLE/BLE_Ota/MDK-ARM/stm32wb15xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../BLE_Ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../BLE/BLE_Ota/STM32_WPAN/App/app_ble.c | 28 +- .../BLE/BLE_Ota/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h | 24 +- .../BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_Ota/STM32_WPAN/App/otas_app.c | 33 +- .../BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_Ota/readme.txt | 12 +- .../BLE_TransparentMode/BLE_TransparentMode.ioc | 8 +- .../Binary/BLE_TransparentMode_reference.hex | 2250 +++--- .../BLE/BLE_TransparentMode/Core/Inc/app_common.h | 21 +- .../BLE/BLE_TransparentMode/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_TransparentMode/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_TransparentMode/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_TransparentMode/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_TransparentMode/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_TransparentMode/Core/Inc/main.h | 13 +- .../Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE_TransparentMode/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_TransparentMode/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_TransparentMode/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_TransparentMode/Core/Src/app_debug.c | 36 +- .../BLE/BLE_TransparentMode/Core/Src/app_entry.c | 34 +- .../BLE_TransparentMode/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_TransparentMode/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_TransparentMode/Core/Src/main.c | 37 +- .../Core/Src/standby_stm32wb15.c | 12 +- .../BLE_TransparentMode/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 33 +- .../BLE_TransparentMode/Core/Src/stm32wbxx_it.c | 12 +- .../Core/Src/system_stm32wbxx.c | 13 +- .../EWARM/BLE_TransparentMode.ewp | 8 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 15 +- .../BLE_TransparentMode/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c | 27 +- .../BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h | 12 +- .../STM32_WPAN/Target/hw_ipcc.c | 26 +- .../BLE/BLE_TransparentMode/readme.txt | 10 +- .../BLE/BLE_p2pClient/BLE_p2pClient.ioc | 8 +- .../Binary/BLE_p2pClient_reference.hex | 3053 ++++---- .../BLE/BLE_p2pClient/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pClient/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_p2pClient/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pClient/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_p2pClient/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_p2pClient/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_p2pClient/Core/Inc/main.h | 13 +- .../BLE_p2pClient/Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_p2pClient/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_p2pClient/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pClient/Core/Src/app_entry.c | 185 +- .../BLE/BLE_p2pClient/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pClient/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_p2pClient/Core/Src/main.c | 37 +- .../BLE/BLE_p2pClient/Core/Src/standby_stm32wb15.c | 12 +- .../BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c | 33 +- .../BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c | 13 +- .../BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp | 78 +- .../BLE_p2pClient/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../BLE_p2pClient/EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 15 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c | 72 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c | 24 +- .../BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h | 20 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_p2pClient/readme.txt | 10 +- .../BLE/BLE_p2pServer/BLE_p2pServer.ioc | 8 +- .../Binary/BLE_p2pServer_reference.hex | 3190 ++++---- .../BLE/BLE_p2pServer/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pServer/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_p2pServer/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_p2pServer/Core/Inc/main.h | 13 +- .../BLE_p2pServer/Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_p2pServer/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_p2pServer/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pServer/Core/Src/app_entry.c | 185 +- .../BLE/BLE_p2pServer/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pServer/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_p2pServer/Core/Src/main.c | 39 +- .../BLE/BLE_p2pServer/Core/Src/standby_stm32wb15.c | 12 +- .../BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c | 43 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c | 13 +- .../BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp | 86 +- .../BLE_p2pServer/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../BLE_p2pServer/EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 15 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c | 65 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c | 22 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_p2pServer/readme.txt | 10 +- .../Binary/BLE_p2pServer_ota_reference.bin | Bin 32112 -> 33468 bytes .../BLE/BLE_p2pServer_ota/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h | 43 +- .../BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_p2pServer_ota/Core/Inc/main.h | 13 +- .../Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_p2pServer_ota/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_p2pServer_ota/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pServer_ota/Core/Src/app_entry.c | 194 +- .../BLE_p2pServer_ota/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_p2pServer_ota/Core/Src/main.c | 14 +- .../BLE_p2pServer_ota/Core/Src/standby_stm32wb15.c | 12 +- .../BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4_ota.icf | 6 +- .../MDK-ARM/BLE_p2pServer_ota.uvprojx | 2 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 17 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 28 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 15 +- .../BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c | 25 +- .../BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../STM32_WPAN/App/p2p_server_app.c | 22 +- .../STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_p2pServer_ota/readme.txt | 10 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h | 14 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h | 23 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h | 13 +- .../BLE_LLD_Chat/Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c | 28 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/main.c | 28 +- .../BLE_LLD_Chat/Core/Src/standby_stm32wb15.c | 12 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c | 13 +- .../BLE_LLD_Chat/Core/Src/system_stm32wbxx.c | 15 +- .../BLE_LLD_Chat/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../BLE_LLD_Chat/EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../BLE_LLD_Chat/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../BLE_LLD_Chat/MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 24 +- .../BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c | 14 +- .../BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h | 14 +- .../BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c | 14 +- .../BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h | 16 +- .../BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE_LLD/BLE_LLD_Chat/readme.txt | 10 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h | 14 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h | 23 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h | 15 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h | 13 +- .../BLE_LLD_Lowpower/Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD_Lowpower/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD_Lowpower/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c | 28 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD_Lowpower/Core/Src/hw_timerserver.c | 16 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c | 28 +- .../BLE_LLD_Lowpower/Core/Src/standby_stm32wb15.c | 12 +- .../BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD_Lowpower/Core/Src/stm_logging.c | 13 +- .../BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 24 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h | 16 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_LLD/BLE_LLD_Lowpower/readme.txt | 10 +- .../BLE_LLD_Pressbutton/Core/Inc/app_common.h | 14 +- .../BLE_LLD_Pressbutton/Core/Inc/app_conf.h | 23 +- .../BLE_LLD_Pressbutton/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h | 15 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h | 13 +- .../Core/Inc/nucleo_wb15cc_conf.h | 15 +- .../BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD_Pressbutton/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD_Pressbutton/Core/Src/app_entry.c | 28 +- .../BLE_LLD_Pressbutton/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c | 28 +- .../Core/Src/standby_stm32wb15.c | 12 +- .../BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD_Pressbutton/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../MDK-ARM/stm32wb15xx_flash_cm4.sct | 19 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 24 +- .../STM32_WPAN/App/app_ble_lld.c | 14 +- .../STM32_WPAN/App/app_ble_lld.h | 14 +- .../STM32_WPAN/App/pressbutton_app.c | 14 +- .../STM32_WPAN/App/pressbutton_app.h | 16 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_LLD/BLE_LLD_Pressbutton/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc | 9 +- .../FreeRTOS/FreeRTOS_Mutexes/Inc/main.h | 13 +- .../FreeRTOS_Mutexes/Inc/nucleo_wb15cc_conf.h | 15 +- .../FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c | 13 +- .../FreeRTOS/FreeRTOS_Mutexes/Src/main.c | 33 +- .../FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c | 12 +- .../FreeRTOS_Mutexes/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_Mutexes/readme.txt | 11 +- .../ADC_MultiChannelSingleConversion.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../ADC_MultiChannelSingleConversion/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../ADC_MultiChannelSingleConversion/Src/main.c | 34 +- .../Src/stm32wbxx_hal_msp.c | 23 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../ADC_MultiChannelSingleConversion/readme.txt | 10 +- .../ADC_SingleConversion_TriggerSW_IT.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../ADC_SingleConversion_TriggerSW_IT/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../ADC_SingleConversion_TriggerSW_IT/Src/main.c | 36 +- .../Src/stm32wbxx_hal_msp.c | 23 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../ADC_SingleConversion_TriggerSW_IT/readme.txt | 10 +- .../ADC_SingleConversion_TriggerTimer_DMA.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 38 +- .../Src/stm32wbxx_hal_msp.c | 23 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 10 +- .../Examples/BSP/BSP_Example/BSP_Example.ioc | 9 +- .../BSP_Example/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../BSP_Example/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/BSP/BSP_Example/Inc/main.h | 13 +- .../BSP/BSP_Example/Inc/nucleo_wb15cc_conf.h | 15 +- .../BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h | 13 +- .../BSP_Example/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/BSP/BSP_Example/Src/main.c | 31 +- .../BSP/BSP_Example/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/BSP/BSP_Example/Src/stm32wbxx_it.c | 12 +- .../BSP/BSP_Example/Src/system_stm32wbxx.c | 13 +- .../Examples/BSP/BSP_Example/readme.txt | 10 +- .../COMP_CompareGpioVsVrefInt_IT.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../EWARM/stm32wb15xx_sram_cm4.icf | 2 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c | 31 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt | 10 +- .../CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/CORTEX/CORTEXM_SysTick/Inc/main.h | 13 +- .../CORTEXM_SysTick/Inc/nucleo_wb15cc_conf.h | 15 +- .../CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h | 15 +- .../CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/CORTEX/CORTEXM_SysTick/Src/main.c | 31 +- .../CORTEX/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c | 13 +- .../CORTEX/CORTEXM_SysTick/Src/stm32wbxx_it.c | 12 +- .../CORTEX/CORTEXM_SysTick/Src/system_stm32wbxx.c | 13 +- .../Examples/CORTEX/CORTEXM_SysTick/readme.txt | 10 +- .../Examples/CRC/CRC_Example/CRC_Example.ioc | 9 +- .../CRC_Example/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../CRC_Example/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/CRC/CRC_Example/Inc/main.h | 13 +- .../CRC/CRC_Example/Inc/nucleo_wb15cc_conf.h | 15 +- .../CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h | 13 +- .../CRC_Example/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/CRC/CRC_Example/Src/main.c | 31 +- .../CRC/CRC_Example/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/CRC/CRC_Example/Src/stm32wbxx_it.c | 12 +- .../CRC/CRC_Example/Src/system_stm32wbxx.c | 13 +- .../Examples/CRC/CRC_Example/readme.txt | 10 +- .../Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc | 9 +- .../CRYP/CRYP_DMA/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../CRYP/CRYP_DMA/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/CRYP/CRYP_DMA/Inc/main.h | 13 +- .../CRYP/CRYP_DMA/Inc/nucleo_wb15cc_conf.h | 15 +- .../CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h | 13 +- .../CRYP_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../CRYP_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/CRYP/CRYP_DMA/Src/main.c | 33 +- .../Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c | 12 +- .../Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c | 13 +- .../Examples/CRYP/CRYP_DMA/readme.txt | 21 +- .../Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc | 9 +- .../DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/DMA/DMA_FLASHToRAM/Inc/main.h | 13 +- .../DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h | 15 +- .../DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/DMA/DMA_FLASHToRAM/Src/main.c | 31 +- .../DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c | 12 +- .../DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c | 13 +- .../Examples/DMA/DMA_FLASHToRAM/readme.txt | 10 +- .../Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc | 9 +- .../DMA_MUXSYNC/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../DMA_MUXSYNC/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/DMA/DMA_MUXSYNC/Inc/main.h | 13 +- .../DMA/DMA_MUXSYNC/Inc/nucleo_wb15cc_conf.h | 15 +- .../DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h | 13 +- .../DMA_MUXSYNC/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/DMA/DMA_MUXSYNC/Src/main.c | 36 +- .../DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c | 33 +- .../Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c | 12 +- .../DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c | 13 +- .../Examples/DMA/DMA_MUXSYNC/readme.txt | 10 +- .../DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/DMA/DMA_MUX_RequestGen/Inc/main.h | 13 +- .../DMA_MUX_RequestGen/Inc/nucleo_wb15cc_conf.h | 15 +- .../DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h | 15 +- .../DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/DMA/DMA_MUX_RequestGen/Src/main.c | 33 +- .../DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c | 13 +- .../DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c | 12 +- .../DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c | 13 +- .../Examples/DMA/DMA_MUX_RequestGen/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../FLASH_EraseProgram/FLASH_EraseProgram.ioc | 9 +- .../Examples/FLASH/FLASH_EraseProgram/Inc/main.h | 13 +- .../FLASH_EraseProgram/Inc/nucleo_wb15cc_conf.h | 15 +- .../FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h | 15 +- .../FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/FLASH/FLASH_EraseProgram/Src/main.c | 31 +- .../FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c | 13 +- .../FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c | 12 +- .../FLASH_EraseProgram/Src/system_stm32wbxx.c | 13 +- .../Examples/FLASH/FLASH_EraseProgram/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../FLASH_WriteProtection.ioc | 9 +- .../FLASH/FLASH_WriteProtection/Inc/main.h | 13 +- .../FLASH_WriteProtection/Inc/nucleo_wb15cc_conf.h | 15 +- .../FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h | 15 +- .../FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../FLASH/FLASH_WriteProtection/Src/main.c | 31 +- .../FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c | 13 +- .../FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c | 12 +- .../FLASH_WriteProtection/Src/system_stm32wbxx.c | 13 +- .../FLASH/FLASH_WriteProtection/readme.txt | 10 +- .../GPIO/GPIO_EXTI/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../GPIO/GPIO_EXTI/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc | 9 +- .../Examples/GPIO/GPIO_EXTI/Inc/main.h | 13 +- .../GPIO/GPIO_EXTI/Inc/nucleo_wb15cc_conf.h | 15 +- .../GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h | 13 +- .../GPIO_EXTI/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../GPIO_EXTI/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/GPIO/GPIO_EXTI/Src/main.c | 18 +- .../GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c | 12 +- .../Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c | 13 +- .../Examples/GPIO/GPIO_EXTI/readme.txt | 10 +- .../GPIO_IOToggle/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../GPIO_IOToggle/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc | 9 +- .../Examples/GPIO/GPIO_IOToggle/Inc/main.h | 13 +- .../GPIO/GPIO_IOToggle/Inc/nucleo_wb15cc_conf.h | 15 +- .../GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/GPIO/GPIO_IOToggle/Src/main.c | 31 +- .../GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c | 14 +- .../GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c | 13 +- .../Examples/GPIO/GPIO_IOToggle/readme.txt | 10 +- .../HAL_TimeBase/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../HAL_TimeBase/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc | 9 +- .../Examples/HAL/HAL_TimeBase/Inc/main.h | 13 +- .../HAL/HAL_TimeBase/Inc/nucleo_wb15cc_conf.h | 15 +- .../HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h | 13 +- .../HAL_TimeBase/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/HAL/HAL_TimeBase/Src/main.c | 35 +- .../HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c | 12 +- .../HAL/HAL_TimeBase/Src/system_stm32wbxx.c | 13 +- .../Examples/HAL/HAL_TimeBase/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../HAL_TimeBase_RTC_WKUP.ioc | 9 +- .../Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h | 13 +- .../HAL_TimeBase_RTC_WKUP/Inc/nucleo_wb15cc_conf.h | 15 +- .../HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h | 15 +- .../HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c | 18 +- .../HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_hal_timebase_rtc_wakeup.c | 26 +- .../HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c | 12 +- .../HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c | 13 +- .../Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc | 9 +- .../Examples/HAL/HAL_TimeBase_TIM/Inc/main.h | 13 +- .../HAL/HAL_TimeBase_TIM/Inc/nucleo_wb15cc_conf.h | 15 +- .../HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h | 15 +- .../HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/HAL/HAL_TimeBase_TIM/Src/main.c | 20 +- .../HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_hal_timebase_tim.c | 15 +- .../HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c | 12 +- .../HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c | 13 +- .../Examples/HAL/HAL_TimeBase_TIM/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc | 13 +- .../Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h | 13 +- .../I2C_TwoBoards_ComDMA/Inc/nucleo_wb15cc_conf.h | 15 +- .../I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c | 34 +- .../I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c | 22 +- .../I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c | 12 +- .../I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c | 13 +- .../Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc | 13 +- .../Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h | 13 +- .../I2C_TwoBoards_ComIT/Inc/nucleo_wb15cc_conf.h | 15 +- .../I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c | 34 +- .../I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c | 22 +- .../I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c | 12 +- .../I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c | 13 +- .../Examples/I2C/I2C_TwoBoards_ComIT/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc | 9 +- .../Examples/IWDG/IWDG_WindowMode/Inc/main.h | 13 +- .../IWDG/IWDG_WindowMode/Inc/nucleo_wb15cc_conf.h | 15 +- .../IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h | 15 +- .../IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/IWDG/IWDG_WindowMode/Src/main.c | 31 +- .../IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c | 12 +- .../IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c | 12 +- .../IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c | 13 +- .../Examples/IWDG/IWDG_WindowMode/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../LPTIM/LPTIM_PWMExternalClock/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h | 13 +- .../LPTIM_PWMExternalClock.ioc | 9 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../LPTIM/LPTIM_PWMExternalClock/Src/main.c | 34 +- .../LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c | 22 +- .../LPTIM_PWMExternalClock/Src/stm32wbxx_it.c | 14 +- .../LPTIM_PWMExternalClock/Src/system_stm32wbxx.c | 13 +- .../LPTIM/LPTIM_PWMExternalClock/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h | 13 +- .../LPTIM_PulseCounter/Inc/nucleo_wb15cc_conf.h | 15 +- .../LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h | 15 +- .../LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h | 13 +- .../LPTIM_PulseCounter/LPTIM_PulseCounter.ioc | 9 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/LPTIM/LPTIM_PulseCounter/Src/main.c | 33 +- .../LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c | 22 +- .../LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c | 15 +- .../LPTIM_PulseCounter/Src/system_stm32wbxx.c | 13 +- .../Examples/LPTIM/LPTIM_PulseCounter/readme.txt | 10 +- .../PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/main.h | 13 +- .../PKA/PKA_ECDSA_Sign/Inc/nucleo_wb15cc_conf.h | 15 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h | 13 +- .../PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/main.c | 31 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c | 15 +- .../PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/readme.txt | 14 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h | 13 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h | 13 +- .../PKA_ECDSA_Verify_IT/Inc/nucleo_wb15cc_conf.h | 15 +- .../PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h | 13 +- .../PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c | 13 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c | 31 +- .../PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c | 15 +- .../PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c | 13 +- .../PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c | 13 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt | 14 +- .../PWR/PWR_LPRUN/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../PWR/PWR_LPRUN/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_LPRUN/Inc/main.h | 13 +- .../PWR/PWR_LPRUN/Inc/nucleo_wb15cc_conf.h | 15 +- .../PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h | 13 +- .../PWR_LPRUN/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../PWR_LPRUN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/PWR/PWR_LPRUN/Src/main.c | 31 +- .../Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c | 12 +- .../Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c | 13 +- .../Examples/PWR/PWR_LPRUN/readme.txt | 10 +- .../PWR_LPSLEEP/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../PWR_LPSLEEP/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_LPSLEEP/Inc/main.h | 13 +- .../PWR/PWR_LPSLEEP/Inc/nucleo_wb15cc_conf.h | 15 +- .../PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h | 13 +- .../PWR_LPSLEEP/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/PWR/PWR_LPSLEEP/Src/main.c | 31 +- .../PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c | 15 +- .../Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c | 12 +- .../PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c | 13 +- .../Examples/PWR/PWR_LPSLEEP/readme.txt | 10 +- .../PWR/PWR_PVD/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../PWR/PWR_PVD/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/main.h | 13 +- .../Examples/PWR/PWR_PVD/Inc/nucleo_wb15cc_conf.h | 15 +- .../Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h | 13 +- .../PWR/PWR_PVD/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../NUCLEO-WB15CC/Examples/PWR/PWR_PVD/PWR_PVD.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../PWR_PVD/STM32CubeIDE/Application/User/sysmem.c | 27 +- .../PWR_PVD/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/main.c | 33 +- .../Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c | 12 +- .../Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c | 13 +- .../NUCLEO-WB15CC/Examples/PWR/PWR_PVD/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_STANDBY_RTC/Inc/main.h | 13 +- .../PWR/PWR_STANDBY_RTC/Inc/nucleo_wb15cc_conf.h | 15 +- .../PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h | 15 +- .../PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc | 12 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/PWR/PWR_STANDBY_RTC/Src/main.c | 34 +- .../PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c | 13 +- .../PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c | 12 +- .../PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c | 13 +- .../Examples/PWR/PWR_STANDBY_RTC/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/RCC/RCC_ClockConfig/Inc/main.h | 13 +- .../RCC/RCC_ClockConfig/Inc/nucleo_wb15cc_conf.h | 15 +- .../RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h | 15 +- .../RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../RCC/RCC_ClockConfig/RCC_ClockConfig.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/RCC/RCC_ClockConfig/Src/main.c | 33 +- .../RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c | 13 +- .../RCC/RCC_ClockConfig/Src/stm32wbxx_it.c | 12 +- .../RCC/RCC_ClockConfig/Src/system_stm32wbxx.c | 13 +- .../Examples/RCC/RCC_ClockConfig/readme.txt | 10 +- .../RNG_MultiRNG/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../RNG_MultiRNG/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/RNG/RNG_MultiRNG/Inc/main.h | 13 +- .../RNG/RNG_MultiRNG/Inc/nucleo_wb15cc_conf.h | 15 +- .../RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h | 13 +- .../RNG_MultiRNG/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc | 12 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/RNG/RNG_MultiRNG/Src/main.c | 33 +- .../RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c | 12 +- .../RNG/RNG_MultiRNG/Src/system_stm32wbxx.c | 13 +- .../Examples/RNG/RNG_MultiRNG/readme.txt | 10 +- .../RTC/RTC_Alarm/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../RTC/RTC_Alarm/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/RTC/RTC_Alarm/Inc/main.h | 13 +- .../RTC/RTC_Alarm/Inc/nucleo_wb15cc_conf.h | 15 +- .../RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h | 13 +- .../RTC_Alarm/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Examples/RTC/RTC_Alarm/RTC_Alarm.ioc | 12 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../RTC_Alarm/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/RTC/RTC_Alarm/Src/main.c | 33 +- .../Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c | 12 +- .../Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c | 13 +- .../Examples/RTC/RTC_Alarm/readme.txt | 10 +- .../RTC/RTC_Tamper/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../RTC/RTC_Tamper/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/RTC/RTC_Tamper/Inc/main.h | 13 +- .../RTC/RTC_Tamper/Inc/nucleo_wb15cc_conf.h | 15 +- .../RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h | 15 +- .../RTC_Tamper/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Examples/RTC/RTC_Tamper/RTC_Tamper.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../RTC_Tamper/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/RTC/RTC_Tamper/Src/main.c | 40 +- .../RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c | 23 +- .../Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c | 12 +- .../Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c | 13 +- .../Examples/RTC/RTC_Tamper/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../SPI_FullDuplex_ComDMA_Master.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c | 31 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../SPI/SPI_FullDuplex_ComDMA_Master/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../SPI_FullDuplex_ComDMA_Slave.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c | 31 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt | 10 +- .../TIM_OCActive/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../TIM_OCActive/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_OCActive/Inc/main.h | 13 +- .../TIM/TIM_OCActive/Inc/nucleo_wb15cc_conf.h | 15 +- .../TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h | 13 +- .../TIM_OCActive/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/TIM/TIM_OCActive/Src/main.c | 31 +- .../TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c | 14 +- .../TIM/TIM_OCActive/Src/system_stm32wbxx.c | 13 +- .../Examples/TIM/TIM_OCActive/TIM_OCActive.ioc | 9 +- .../Examples/TIM/TIM_OCActive/readme.txt | 10 +- .../TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_PWMInput/Inc/main.h | 13 +- .../TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h | 15 +- .../TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h | 13 +- .../TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/TIM/TIM_PWMInput/Src/main.c | 31 +- .../TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c | 14 +- .../TIM/TIM_PWMInput/Src/system_stm32wbxx.c | 13 +- .../Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc | 9 +- .../Examples/TIM/TIM_PWMInput/readme.txt | 10 +- .../TIM_PWMOutput/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../TIM_PWMOutput/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_PWMOutput/Inc/main.h | 13 +- .../TIM/TIM_PWMOutput/Inc/nucleo_wb15cc_conf.h | 15 +- .../TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/TIM/TIM_PWMOutput/Src/main.c | 31 +- .../TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c | 14 +- .../TIM/TIM_PWMOutput/Src/system_stm32wbxx.c | 13 +- .../Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc | 9 +- .../Examples/TIM/TIM_PWMOutput/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../UART/UART_HyperTerminal_DMA/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../UART/UART_HyperTerminal_DMA/Src/main.c | 34 +- .../UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c | 23 +- .../UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c | 12 +- .../UART_HyperTerminal_DMA/Src/system_stm32wbxx.c | 13 +- .../UART_HyperTerminal_DMA.ioc | 9 +- .../UART/UART_HyperTerminal_DMA/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/UART/UART_HyperTerminal_IT/Inc/main.h | 13 +- .../UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h | 15 +- .../UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/UART/UART_HyperTerminal_IT/Src/main.c | 34 +- .../UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c | 23 +- .../UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c | 12 +- .../UART_HyperTerminal_IT/Src/system_stm32wbxx.c | 13 +- .../UART_HyperTerminal_IT.ioc | 9 +- .../Examples/UART/UART_HyperTerminal_IT/readme.txt | 10 +- .../UART_Printf/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../UART_Printf/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/UART/UART_Printf/Inc/main.h | 13 +- .../UART/UART_Printf/Inc/nucleo_wb15cc_conf.h | 15 +- .../UART/UART_Printf/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/UART/UART_Printf/Inc/stm32wbxx_it.h | 13 +- .../UART_Printf/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/UART/UART_Printf/Src/main.c | 34 +- .../UART/UART_Printf/Src/stm32wbxx_hal_msp.c | 23 +- .../Examples/UART/UART_Printf/Src/stm32wbxx_it.c | 12 +- .../UART/UART_Printf/Src/system_stm32wbxx.c | 13 +- .../Examples/UART/UART_Printf/UART_Printf.ioc | 9 +- .../Examples/UART/UART_Printf/readme.txt | 10 +- .../WWDG_Example/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../WWDG_Example/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples/WWDG/WWDG_Example/Inc/main.h | 13 +- .../WWDG/WWDG_Example/Inc/nucleo_wb15cc_conf.h | 15 +- .../WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h | 13 +- .../WWDG_Example/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples/WWDG/WWDG_Example/Src/main.c | 31 +- .../WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c | 12 +- .../WWDG/WWDG_Example/Src/system_stm32wbxx.c | 13 +- .../Examples/WWDG/WWDG_Example/WWDG_Example.ioc | 9 +- .../Examples/WWDG/WWDG_Example/readme.txt | 10 +- .../ADC_MultiChannelSingleConversion_Init.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 28 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 10 +- .../ADC_SingleConversion_TriggerSW_IT_Init.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 30 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 10 +- .../ADC_SingleConversion_TriggerTimer_DMA_Init.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 32 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 10 +- .../CRC_CalculateAndCheck.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../CRC/CRC_CalculateAndCheck/Inc/main.h | 13 +- .../CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h | 15 +- .../CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../CRC/CRC_CalculateAndCheck/Src/main.c | 25 +- .../CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c | 12 +- .../CRC_CalculateAndCheck/Src/system_stm32wbxx.c | 13 +- .../CRC/CRC_CalculateAndCheck/readme.txt | 10 +- .../DMA_CopyFromFlashToMemory_Init.ioc | 9 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../DMA/DMA_CopyFromFlashToMemory_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../EXTI_ToggleLedOnIT_Init.ioc | 9 +- .../EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h | 13 +- .../EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h | 15 +- .../EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c | 25 +- .../EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c | 14 +- .../EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c | 13 +- .../EXTI/EXTI_ToggleLedOnIT_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../GPIO_InfiniteLedToggling_Init.ioc | 9 +- .../GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../GPIO/GPIO_InfiniteLedToggling_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc | 9 +- .../HSEM/HSEM_DualProcess_IT/Inc/main.h | 13 +- .../HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h | 15 +- .../HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../HSEM/HSEM_DualProcess_IT/Src/main.c | 25 +- .../HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c | 12 +- .../HSEM_DualProcess_IT/Src/system_stm32wbxx.c | 13 +- .../HSEM/HSEM_DualProcess_IT/readme.txt | 14 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc | 15 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 28 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc | 15 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 28 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../IWDG_RefreshUntilUserEvent_Init.ioc | 9 +- .../IWDG_RefreshUntilUserEvent_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../IWDG_RefreshUntilUserEvent_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../IWDG_RefreshUntilUserEvent_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../LPTIM/LPTIM_PulseCounter_Init/Inc/main.h | 13 +- .../LPTIM_PulseCounter_Init/Inc/stm32_assert.h | 15 +- .../LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h | 13 +- .../LPTIM_PulseCounter_Init.ioc | 9 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../LPTIM/LPTIM_PulseCounter_Init/Src/main.c | 28 +- .../LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c | 14 +- .../LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c | 13 +- .../LPTIM/LPTIM_PulseCounter_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h | 13 +- .../LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h | 15 +- .../LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h | 13 +- .../LPUART_WakeUpFromStop_Init.ioc | 9 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../LPUART/LPUART_WakeUpFromStop_Init/Src/main.c | 26 +- .../LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../LPUART/LPUART_WakeUpFromStop_Init/readme.txt | 10 +- .../PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h | 13 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h | 13 +- .../PKA/PKA_ECDSA_Sign/Inc/prime256v1.h | 13 +- .../PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h | 15 +- .../PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c | 13 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c | 27 +- .../PKA/PKA_ECDSA_Sign/Src/prime256v1.c | 15 +- .../PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c | 13 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt | 12 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../PWR/PWR_EnterStandbyMode/Inc/main.h | 13 +- .../PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h | 15 +- .../PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../PWR/PWR_EnterStandbyMode/Src/main.c | 25 +- .../PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c | 12 +- .../PWR_EnterStandbyMode/Src/system_stm32wbxx.c | 13 +- .../PWR/PWR_EnterStandbyMode/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h | 13 +- .../PWR/PWR_EnterStopMode/Inc/stm32_assert.h | 15 +- .../PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples_LL/PWR/PWR_EnterStopMode/Src/main.c | 25 +- .../PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c | 12 +- .../PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c | 13 +- .../Examples_LL/PWR/PWR_EnterStopMode/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../PWR/PWR_OptimizedRunMode/Inc/main.h | 13 +- .../PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h | 15 +- .../PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../PWR/PWR_OptimizedRunMode/Src/main.c | 25 +- .../PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c | 12 +- .../PWR_OptimizedRunMode/Src/system_stm32wbxx.c | 13 +- .../PWR/PWR_OptimizedRunMode/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h | 13 +- .../RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h | 15 +- .../RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../RCC_UseHSI_PLLasSystemClock.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c | 25 +- .../RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../RCC/RCC_UseHSI_PLLasSystemClock/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../RNG_GenerateRandomNumbers_IT.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../RNG/RNG_GenerateRandomNumbers_IT/Src/main.c | 28 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../RNG/RNG_GenerateRandomNumbers_IT/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h | 13 +- .../TIM/TIM_TimeBase_Init/Inc/stm32_assert.h | 15 +- .../TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c | 25 +- .../TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c | 14 +- .../TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c | 13 +- .../TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc | 9 +- .../Examples_LL/TIM/TIM_TimeBase_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../USART_Communication_Rx_IT_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../USART_Communication_Rx_IT_Init/Src/main.c | 28 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../USART_Communication_Rx_IT_Init.ioc | 9 +- .../USART_Communication_Rx_IT_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../USART/USART_Communication_Tx_Init/Inc/main.h | 13 +- .../USART_Communication_Tx_Init/Inc/stm32_assert.h | 15 +- .../USART_Communication_Tx_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../USART/USART_Communication_Tx_Init/Src/main.c | 28 +- .../USART_Communication_Tx_Init/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../USART_Communication_Tx_Init.ioc | 9 +- .../USART/USART_Communication_Tx_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../UTILS/UTILS_ReadDeviceInfo/Inc/main.h | 13 +- .../UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h | 15 +- .../UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../UTILS/UTILS_ReadDeviceInfo/Src/main.c | 25 +- .../UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c | 12 +- .../UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c | 13 +- .../UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc | 9 +- .../UTILS/UTILS_ReadDeviceInfo/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../WWDG_RefreshUntilUserEvent_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../WWDG_RefreshUntilUserEvent_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../WWDG_RefreshUntilUserEvent_Init.ioc | 9 +- .../WWDG_RefreshUntilUserEvent_Init/readme.txt | 10 +- .../DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc | 9 +- .../DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h | 13 +- .../DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h | 15 +- .../DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h | 15 +- .../DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c | 31 +- .../DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c | 13 +- .../DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c | 12 +- .../DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c | 13 +- .../Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt | 10 +- .../PWR/PWR_STOP1/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../PWR/PWR_STOP1/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples_MIX/PWR/PWR_STOP1/Inc/main.h | 13 +- .../PWR/PWR_STOP1/Inc/nucleo_wb15cc_conf.h | 15 +- .../PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h | 13 +- .../PWR_STOP1/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../PWR_STOP1/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples_MIX/PWR/PWR_STOP1/Src/main.c | 33 +- .../PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c | 12 +- .../PWR/PWR_STOP1/Src/system_stm32wbxx.c | 13 +- .../Examples_MIX/PWR/PWR_STOP1/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../SPI_HalfDuplex_ComPollingIT_Master.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../SPI_HalfDuplex_ComPollingIT_Master/Src/main.c | 31 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../SPI_HalfDuplex_ComPollingIT_Master/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h | 13 +- .../Inc/nucleo_wb15cc_conf.h | 15 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../SPI_HalfDuplex_ComPollingIT_Slave.ioc | 9 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c | 31 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 13 +- .../SPI_HalfDuplex_ComPollingIT_Slave/readme.txt | 10 +- .../TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../Examples_MIX/TIM/TIM_PWMInput/Inc/main.h | 13 +- .../TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h | 15 +- .../TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h | 15 +- .../TIM/TIM_PWMInput/Inc/stm32wbxx_it.h | 13 +- .../TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../Examples_MIX/TIM/TIM_PWMInput/Src/main.c | 31 +- .../TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c | 13 +- .../TIM/TIM_PWMInput/Src/stm32wbxx_it.c | 12 +- .../TIM/TIM_PWMInput/Src/system_stm32wbxx.c | 15 +- .../Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc | 9 +- .../Examples_MIX/TIM/TIM_PWMInput/readme.txt | 10 +- .../EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../EWARM/stm32wb15xx_flash_cm4.icf | 2 +- .../UART/UART_HyperTerminal_IT/Inc/main.h | 13 +- .../UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h | 15 +- .../UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- .../UART/UART_HyperTerminal_IT/Src/main.c | 34 +- .../UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c | 23 +- .../UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c | 12 +- .../UART_HyperTerminal_IT/Src/system_stm32wbxx.c | 13 +- .../UART_HyperTerminal_IT.ioc | 9 +- .../UART/UART_HyperTerminal_IT/readme.txt | 10 +- Projects/NUCLEO-WB15CC/Release_Notes.html | 29 +- .../Templates/EWARM/startup_stm32wb15xx_cm4.s | 14 +- .../Templates/EWARM/stm32wb15xx_flash_cm4.icf | 2 +- Projects/NUCLEO-WB15CC/Templates/Inc/main.h | 13 +- .../Templates/Inc/stm32wbxx_hal_conf.h | 15 +- .../NUCLEO-WB15CC/Templates/Inc/stm32wbxx_it.h | 15 +- .../Templates/MDK-ARM/startup_stm32wb15xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb15ccux.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../Templates/STM32CubeIDE/STM32WB15CCUX_FLASH.ld | 13 +- Projects/NUCLEO-WB15CC/Templates/Src/main.c | 31 +- .../Templates/Src/stm32wbxx_hal_msp.c | 12 +- .../NUCLEO-WB15CC/Templates/Src/stm32wbxx_it.c | 12 +- .../NUCLEO-WB15CC/Templates/Src/system_stm32wbxx.c | 13 +- Projects/NUCLEO-WB15CC/Templates/Templates.ioc | 9 +- Projects/NUCLEO-WB15CC/Templates/readme.txt | 64 + Projects/NUCLEO-WB15CC/Templates_LL/.extSettings | 7 + .../NUCLEO-WB15CC/Templates_LL/EWARM/Project.eww | 7 + .../Templates_LL/EWARM/Templates_LL.ewd | 1419 ++++ .../Templates_LL/EWARM/Templates_LL.ewp | 1083 +++ .../Templates_LL/EWARM/startup_stm32wb15xx_cm4.s | 430 ++ .../Templates_LL/EWARM/stm32wb15xx_flash_cm4.icf | 40 + Projects/NUCLEO-WB15CC/Templates_LL/Inc/main.h | 93 + .../NUCLEO-WB15CC/Templates_LL/Inc/stm32_assert.h | 52 + .../NUCLEO-WB15CC/Templates_LL/Inc/stm32wbxx_it.h | 66 + Projects/NUCLEO-WB15CC/Templates_LL/LICENSE.md | 27 + Projects/NUCLEO-WB15CC/Templates_LL/Src/main.c | 201 + .../NUCLEO-WB15CC/Templates_LL/Src/stm32wbxx_it.c | 204 + .../Templates_LL/Src/system_stm32wbxx.c | 362 + .../NUCLEO-WB15CC/Templates_LL/Templates_LL.ioc | 106 + Projects/NUCLEO-WB15CC/Templates_LL/readme.txt | 88 + .../Binary/BLE_AT_Server_reference.hex | 2637 +++++++ .../BLE/BLE_AT_Server/Core/Inc/app_common.h | 117 + .../BLE/BLE_AT_Server/Core/Inc/app_conf.h | 702 ++ .../BLE/BLE_AT_Server/Core/Inc/app_debug.h | 67 + .../BLE/BLE_AT_Server/Core/Inc/app_entry.h | 68 + .../BLE/BLE_AT_Server/Core/Inc/ble_at_server.h | 49 + .../BLE/BLE_AT_Server/Core/Inc/ble_at_server_cb.h | 43 + .../BLE/BLE_AT_Server/Core/Inc/hw_conf.h | 236 + .../BLE/BLE_AT_Server/Core/Inc/hw_if.h | 247 + .../Applications/BLE/BLE_AT_Server/Core/Inc/main.h | 93 + .../BLE/BLE_AT_Server/Core/Inc/stm32_lpm_if.h | 78 + .../BLE_AT_Server/Core/Inc/stm32wbxx_hal_conf.h | 352 + .../BLE/BLE_AT_Server/Core/Inc/stm32wbxx_it.h | 71 + .../BLE/BLE_AT_Server/Core/Inc/utilities_conf.h | 66 + .../BLE/BLE_AT_Server/Core/Src/app_debug.c | 397 + .../BLE/BLE_AT_Server/Core/Src/app_entry.c | 647 ++ .../BLE/BLE_AT_Server/Core/Src/ble_at_server.c | 1370 ++++ .../BLE/BLE_AT_Server/Core/Src/ble_at_server_cb.c | 572 ++ .../BLE/BLE_AT_Server/Core/Src/hw_timerserver.c | 893 +++ .../BLE/BLE_AT_Server/Core/Src/hw_uart.c | 318 + .../Applications/BLE/BLE_AT_Server/Core/Src/main.c | 629 ++ .../BLE/BLE_AT_Server/Core/Src/stm32_lpm_if.c | 347 + .../BLE/BLE_AT_Server/Core/Src/stm32wbxx_hal_msp.c | 323 + .../BLE/BLE_AT_Server/Core/Src/stm32wbxx_it.c | 301 + .../BLE/BLE_AT_Server/Core/Src/system_stm32wbxx.c | 366 + .../BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewd | 1419 ++++ .../BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewp | 1303 ++++ .../BLE/BLE_AT_Server/EWARM/Project.eww | 7 + .../BLE_AT_Server/EWARM/startup_stm32wb55xx_cm4.s | 515 ++ .../BLE_AT_Server/EWARM/stm32wb55xx_flash_cm4.icf | 42 + .../BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvoptx | 1069 +++ .../BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvprojx | 780 ++ .../MDK-ARM/startup_stm32wb55xx_cm4.s | 367 + .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 26 + .../BLE/BLE_AT_Server/STM32CubeIDE/.cproject | 201 + .../BLE/BLE_AT_Server/STM32CubeIDE/.project | 369 + .../STM32CubeIDE/Application/User/Core/syscalls.c | 155 + .../STM32CubeIDE/Application/User/Core/sysmem.c | 79 + .../User/Startup/startup_stm32wb55rgvx.s | 443 ++ .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 171 + .../BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.c | 1681 ++++ .../BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.h | 235 + .../BLE/BLE_AT_Server/STM32_WPAN/App/ble_conf.h | 104 + .../BLE_AT_Server/STM32_WPAN/App/ble_dbg_conf.h | 199 + .../BLE/BLE_AT_Server/STM32_WPAN/App/custom.c | 296 + .../BLE/BLE_AT_Server/STM32_WPAN/App/custom.h | 68 + .../BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.c | 150 + .../BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.h | 78 + .../BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.c | 218 + .../BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.h | 75 + .../BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.c | 213 + .../BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.h | 74 + .../BLE_AT_Server/STM32_WPAN/App/p2p_server_app.c | 420 + .../BLE_AT_Server/STM32_WPAN/App/p2p_server_app.h | 80 + .../BLE/BLE_AT_Server/STM32_WPAN/App/tl_dbg_conf.h | 134 + .../BLE/BLE_AT_Server/STM32_WPAN/Target/hw_ipcc.c | 673 ++ .../Applications/BLE/BLE_AT_Server/readme.txt | 147 + .../Applications/BLE/BLE_Beacon/BLE_Beacon.ioc | 8 +- .../BLE/BLE_Beacon/Core/Inc/app_common.h | 21 +- .../BLE/BLE_Beacon/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_Beacon/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_Beacon/Core/Inc/app_entry.h | 23 +- .../Applications/BLE/BLE_Beacon/Core/Inc/hw_conf.h | 21 +- .../Applications/BLE/BLE_Beacon/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_Beacon/Core/Inc/main.h | 13 +- .../BLE/BLE_Beacon/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE/BLE_Beacon/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_Beacon/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_Beacon/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_Beacon/Core/Src/app_debug.c | 36 +- .../BLE/BLE_Beacon/Core/Src/app_entry.c | 194 +- .../BLE/BLE_Beacon/Core/Src/hw_timerserver.c | 23 +- .../Applications/BLE/BLE_Beacon/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_Beacon/Core/Src/main.c | 53 +- .../BLE/BLE_Beacon/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_Beacon/Core/Src/stm32wbxx_hal_msp.c | 42 +- .../BLE/BLE_Beacon/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_Beacon/Core/Src/system_stm32wbxx.c | 15 +- .../BLE/BLE_Beacon/EWARM/ble_beacon.ewp | 18 +- .../BLE/BLE_Beacon/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE/BLE_Beacon/EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../BLE_Beacon/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../BLE_Beacon/MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../BLE_Beacon/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_Beacon/STM32_WPAN/App/app_ble.c | 55 +- .../BLE/BLE_Beacon/STM32_WPAN/App/app_ble.h | 13 +- .../BLE/BLE_Beacon/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE/BLE_Beacon/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_Beacon/STM32_WPAN/App/eddystone_beacon.h | 18 +- .../STM32_WPAN/App/eddystone_tlm_service.c | 26 +- .../STM32_WPAN/App/eddystone_tlm_service.h | 26 +- .../STM32_WPAN/App/eddystone_uid_service.c | 26 +- .../STM32_WPAN/App/eddystone_uid_service.h | 26 +- .../STM32_WPAN/App/eddystone_url_service.c | 26 +- .../STM32_WPAN/App/eddystone_url_service.h | 26 +- .../BLE/BLE_Beacon/STM32_WPAN/App/ibeacon.h | 18 +- .../BLE_Beacon/STM32_WPAN/App/ibeacon_service.c | 13 +- .../BLE_Beacon/STM32_WPAN/App/ibeacon_service.h | 13 +- .../BLE/BLE_Beacon/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_Beacon/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_Beacon/readme.txt | 12 +- .../BLE/BLE_BloodPressure/BLE_BloodPressure.ioc | 8 +- .../BLE/BLE_BloodPressure/Core/Inc/app_common.h | 21 +- .../BLE/BLE_BloodPressure/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_BloodPressure/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_BloodPressure/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_BloodPressure/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_BloodPressure/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_BloodPressure/Core/Inc/main.h | 13 +- .../BLE/BLE_BloodPressure/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE_BloodPressure/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_BloodPressure/Core/Src/app_debug.c | 36 +- .../BLE/BLE_BloodPressure/Core/Src/app_entry.c | 194 +- .../BLE_BloodPressure/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_BloodPressure/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_BloodPressure/Core/Src/main.c | 55 +- .../BLE/BLE_BloodPressure/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_BloodPressure/Core/Src/stm32wbxx_hal_msp.c | 52 +- .../BLE/BLE_BloodPressure/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_BloodPressure/Core/Src/system_stm32wbxx.c | 15 +- .../BLE_BloodPressure/EWARM/BLE_BloodPressure.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.c | 77 +- .../BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_BloodPressure/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.c | 23 +- .../BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.h | 23 +- .../BLE_BloodPressure/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE_BloodPressure/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_BloodPressure/readme.txt | 10 +- .../BLE/BLE_CableReplacement/Core/Inc/app_common.h | 29 +- .../BLE/BLE_CableReplacement/Core/Inc/app_conf.h | 95 +- .../BLE/BLE_CableReplacement/Core/Inc/app_debug.h | 26 +- .../BLE/BLE_CableReplacement/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_CableReplacement/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_CableReplacement/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_CableReplacement/Core/Inc/main.h | 23 +- .../BLE_CableReplacement/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../BLE_CableReplacement/Core/Inc/stm32wbxx_it.h | 23 +- .../BLE_CableReplacement/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_CableReplacement/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_CableReplacement/Core/Src/app_debug.c | 39 +- .../BLE/BLE_CableReplacement/Core/Src/app_entry.c | 229 +- .../BLE_CableReplacement/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_CableReplacement/Core/Src/hw_uart.c | 29 +- .../BLE/BLE_CableReplacement/Core/Src/main.c | 29 +- .../BLE_CableReplacement/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_CableReplacement/Core/Src/stm32wbxx_it.c | 23 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 29 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_CableReplacement/STM32_WPAN/App/app_ble.c | 32 +- .../BLE_CableReplacement/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_CableReplacement/STM32_WPAN/App/ble_conf.h | 29 +- .../STM32_WPAN/App/ble_dbg_conf.h | 29 +- .../BLE_CableReplacement/STM32_WPAN/App/crc_app.c | 31 +- .../BLE_CableReplacement/STM32_WPAN/App/crc_app.h | 31 +- .../BLE_CableReplacement/STM32_WPAN/App/crs_app.c | 23 +- .../BLE_CableReplacement/STM32_WPAN/App/crs_app.h | 23 +- .../STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE/BLE_CableReplacement/readme.txt | 10 +- .../Applications/BLE/BLE_Custom/BLE_Custom.ioc | 8 +- .../BLE/BLE_Custom/Core/Inc/app_common.h | 21 +- .../BLE/BLE_Custom/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_Custom/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_Custom/Core/Inc/app_entry.h | 13 +- .../Applications/BLE/BLE_Custom/Core/Inc/hw_conf.h | 21 +- .../Applications/BLE/BLE_Custom/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_Custom/Core/Inc/main.h | 13 +- .../BLE/BLE_Custom/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE/BLE_Custom/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_Custom/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_Custom/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_Custom/Core/Src/app_debug.c | 36 +- .../BLE/BLE_Custom/Core/Src/app_entry.c | 188 +- .../BLE/BLE_Custom/Core/Src/hw_timerserver.c | 23 +- .../Applications/BLE/BLE_Custom/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_Custom/Core/Src/main.c | 55 +- .../BLE/BLE_Custom/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_Custom/Core/Src/stm32wbxx_hal_msp.c | 52 +- .../BLE/BLE_Custom/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_Custom/Core/Src/system_stm32wbxx.c | 15 +- .../BLE/BLE_Custom/EWARM/BLE_Custom.ewp | 23 +- .../BLE/BLE_Custom/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE/BLE_Custom/EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../BLE_Custom/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../BLE_Custom/MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../BLE_Custom/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../BLE/BLE_Custom/STM32_WPAN/App/app_ble.c | 73 +- .../BLE/BLE_Custom/STM32_WPAN/App/app_ble.h | 13 +- .../BLE/BLE_Custom/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE/BLE_Custom/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_Custom/STM32_WPAN/App/custom_app.c | 28 +- .../BLE/BLE_Custom/STM32_WPAN/App/custom_app.h | 22 +- .../BLE/BLE_Custom/STM32_WPAN/App/custom_stm.c | 23 +- .../BLE/BLE_Custom/STM32_WPAN/App/custom_stm.h | 23 +- .../STM32_WPAN/App/template_server_app.h | 20 +- .../BLE/BLE_Custom/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_Custom/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_Custom/readme.txt | 12 +- .../BLE/BLE_DataThroughput/Core/Inc/app_common.h | 21 +- .../BLE/BLE_DataThroughput/Core/Inc/app_conf.h | 45 +- .../BLE/BLE_DataThroughput/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_DataThroughput/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_DataThroughput/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_DataThroughput/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_DataThroughput/Core/Inc/main.h | 13 +- .../BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_DataThroughput/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_DataThroughput/Core/Src/app_debug.c | 36 +- .../BLE/BLE_DataThroughput/Core/Src/app_entry.c | 192 +- .../BLE_DataThroughput/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_DataThroughput/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_DataThroughput/Core/Src/main.c | 28 +- .../BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_DataThroughput/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../BLE/BLE_DataThroughput/STM32CubeIDE/.cproject | 96 - .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 29 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_DataThroughput/STM32_WPAN/App/app_ble.c | 21 +- .../BLE_DataThroughput/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_DataThroughput/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../STM32_WPAN/App/dt_client_app.c | 29 +- .../STM32_WPAN/App/dt_client_app.h | 29 +- .../STM32_WPAN/App/dt_server_app.c | 28 +- .../STM32_WPAN/App/dt_server_app.h | 29 +- .../BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c | 29 +- .../BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h | 29 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_DataThroughput/readme.txt | 10 +- .../BLE_HealthThermometer.ioc | 8 +- .../BLE_HealthThermometer/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HealthThermometer/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_HealthThermometer/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HealthThermometer/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_HealthThermometer/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_HealthThermometer/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_HealthThermometer/Core/Inc/main.h | 13 +- .../BLE_HealthThermometer/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_HealthThermometer/Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_HealthThermometer/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HealthThermometer/Core/Src/app_entry.c | 194 +- .../Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_HealthThermometer/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_HealthThermometer/Core/Src/main.c | 55 +- .../BLE_HealthThermometer/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 52 +- .../BLE_HealthThermometer/Core/Src/stm32wbxx_it.c | 12 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/BLE_HealthThermometer.ewp | 2491 +++--- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_HealthThermometer/STM32_WPAN/App/app_ble.c | 77 +- .../BLE_HealthThermometer/STM32_WPAN/App/app_ble.h | 23 +- .../STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_HealthThermometer/STM32_WPAN/App/dis_app.c | 23 +- .../BLE_HealthThermometer/STM32_WPAN/App/dis_app.h | 23 +- .../BLE_HealthThermometer/STM32_WPAN/App/hts_app.c | 23 +- .../BLE_HealthThermometer/STM32_WPAN/App/hts_app.h | 23 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../STM32_WPAN/Target/hw_ipcc.c | 26 +- .../BLE/BLE_HealthThermometer/readme.txt | 10 +- .../BLE/BLE_HeartRate/BLE_HeartRate.ioc | 8 +- .../Binary/BLE_HeartRate_reference.hex | 2156 +++--- .../BLE/BLE_HeartRate/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRate/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_HeartRate/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRate/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_HeartRate/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_HeartRate/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_HeartRate/Core/Inc/main.h | 13 +- .../BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_HeartRate/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_HeartRate/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRate/Core/Src/app_entry.c | 194 +- .../BLE/BLE_HeartRate/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_HeartRate/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_HeartRate/Core/Src/main.c | 55 +- .../BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c | 52 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c | 15 +- .../BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp | 2491 +++--- .../BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c | 77 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c | 13 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h | 13 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_HeartRate/readme.txt | 10 +- .../BLE_HeartRateFreeRTOS.ioc | 8 +- .../BLE_HeartRateFreeRTOS/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_conf.h | 49 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Inc/main.h | 13 +- .../BLE_HeartRateFreeRTOS/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Inc/vcp_conf.h | 35 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Src/app_entry.c | 178 +- .../BLE_HeartRateFreeRTOS/Core/Src/app_freertos.c | 12 +- .../BLE_HeartRateFreeRTOS/Core/Src/freertos_port.c | 85 +- .../Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_HeartRateFreeRTOS/Core/Src/main.c | 57 +- .../BLE_HeartRateFreeRTOS/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 52 +- .../Core/Src/stm32wbxx_hal_timebase_tim.c | 27 +- .../BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_it.c | 12 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/BLE_HeartRateFreeRTOS.ewp | 2579 +++---- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.c | 77 +- .../BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.h | 23 +- .../STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.c | 23 +- .../BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.h | 23 +- .../BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.c | 23 +- .../BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.h | 13 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../STM32_WPAN/Target/hw_ipcc.c | 26 +- .../BLE/BLE_HeartRateFreeRTOS/readme.txt | 10 +- .../BLE_HeartRateFreeRTOS_ANCS_reference.hex | 8150 ++++++++++---------- .../Core/Inc/app_common.h | 21 +- .../BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_conf.h | 44 +- .../Core/Inc/app_debug.h | 22 +- .../Core/Inc/app_entry.h | 23 +- .../BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_conf.h | 21 +- .../BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../BLE_HeartRateFreeRTOS_ANCS/Core/Inc/vcp_conf.h | 29 +- .../Core/Src/app_debug.c | 36 +- .../Core/Src/app_entry.c | 188 +- .../Core/Src/app_freertos.c | 12 +- .../Core/Src/freertos_port.c | 84 +- .../Core/Src/hw_timerserver.c | 23 +- .../BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/main.c | 30 +- .../Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_hal_timebase_tim.c | 27 +- .../Core/Src/stm32wbxx_it.c | 12 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/ancs_client_app.c | 71 +- .../STM32_WPAN/App/ancs_client_app.h | 33 +- .../STM32_WPAN/App/app_ble.c | 41 +- .../STM32_WPAN/App/app_ble.h | 23 +- .../STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 24 +- .../STM32_WPAN/App/dis_app.c | 23 +- .../STM32_WPAN/App/dis_app.h | 23 +- .../STM32_WPAN/App/hrs_app.c | 23 +- .../STM32_WPAN/App/hrs_app.h | 13 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../STM32_WPAN/Target/hw_ipcc.c | 27 +- .../BLE/BLE_HeartRateFreeRTOS_ANCS/readme.txt | 12 +- .../Binary/BLE_HeartRate_ANCS_reference.hex | 7088 ++++++++--------- .../BLE/BLE_HeartRate_ANCS/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/app_conf.h | 43 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/main.h | 13 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE_HeartRate_ANCS/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_HeartRate_ANCS/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRate_ANCS/Core/Src/app_entry.c | 201 +- .../BLE_HeartRate_ANCS/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_HeartRate_ANCS/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_HeartRate_ANCS/Core/Src/main.c | 28 +- .../BLE/BLE_HeartRate_ANCS/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_HeartRate_ANCS/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/ancs_client_app.c | 71 +- .../STM32_WPAN/App/ancs_client_app.h | 33 +- .../BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.c | 41 +- .../BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_HeartRate_ANCS/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 24 +- .../BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.c | 23 +- .../BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.h | 23 +- .../BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.c | 13 +- .../BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.h | 13 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE_HeartRate_ANCS/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_HeartRate_ANCS/readme.txt | 12 +- .../Binary/BLE_HeartRate_ota_reference.bin | Bin 17780 -> 18276 bytes .../BLE/BLE_HeartRate_ota/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h | 45 +- .../BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_HeartRate_ota/Core/Inc/main.h | 13 +- .../BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE_HeartRate_ota/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_HeartRate_ota/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRate_ota/Core/Src/app_entry.c | 202 +- .../BLE_HeartRate_ota/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_HeartRate_ota/Core/Src/hw_uart.c | 12 +- .../BLE/BLE_HeartRate_ota/Core/Src/main.c | 28 +- .../BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4_ota.icf | 11 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c | 37 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h | 18 +- .../STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c | 23 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h | 23 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c | 13 +- .../BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h | 13 +- .../BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_HeartRate_ota/readme.txt | 10 +- .../Applications/BLE/BLE_Hid/Core/Inc/app_common.h | 23 +- .../Applications/BLE/BLE_Hid/Core/Inc/app_conf.h | 75 +- .../Applications/BLE/BLE_Hid/Core/Inc/app_debug.h | 26 +- .../Applications/BLE/BLE_Hid/Core/Inc/app_entry.h | 23 +- .../Applications/BLE/BLE_Hid/Core/Inc/hw_conf.h | 21 +- .../Applications/BLE/BLE_Hid/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_Hid/Core/Inc/main.h | 23 +- .../BLE/BLE_Hid/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE/BLE_Hid/Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../BLE/BLE_Hid/Core/Inc/stm32wbxx_it.h | 23 +- .../BLE/BLE_Hid/Core/Inc/utilities_conf.h | 23 +- .../Applications/BLE/BLE_Hid/Core/Src/app_debug.c | 39 +- .../Applications/BLE/BLE_Hid/Core/Src/app_entry.c | 195 +- .../BLE/BLE_Hid/Core/Src/hw_timerserver.c | 16 +- .../Applications/BLE/BLE_Hid/Core/Src/hw_uart.c | 29 +- .../Applications/BLE/BLE_Hid/Core/Src/main.c | 29 +- .../BLE/BLE_Hid/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_Hid/Core/Src/stm32wbxx_it.c | 23 +- .../BLE/BLE_Hid/Core/Src/system_stm32wbxx.c | 31 +- .../BLE/BLE_Hid/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE/BLE_Hid/EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../BLE/BLE_Hid/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../BLE/BLE_Hid/MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../BLE_Hid/STM32CubeIDE/Application/Core/sysmem.c | 29 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../BLE_Hid/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_Hid/STM32_WPAN/App/app_ble.c | 32 +- .../BLE/BLE_Hid/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_Hid/STM32_WPAN/App/bas_app.c | 31 +- .../BLE/BLE_Hid/STM32_WPAN/App/bas_app.h | 31 +- .../BLE/BLE_Hid/STM32_WPAN/App/ble_conf.h | 25 +- .../BLE/BLE_Hid/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_Hid/STM32_WPAN/App/dis_app.c | 12 +- .../BLE/BLE_Hid/STM32_WPAN/App/dis_app.h | 20 +- .../BLE/BLE_Hid/STM32_WPAN/App/hids_app.c | 31 +- .../BLE/BLE_Hid/STM32_WPAN/App/hids_app.h | 23 +- .../BLE/BLE_Hid/STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../BLE/BLE_Hid/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_Hid/readme.txt | 12 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h | 81 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h | 26 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h | 16 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/main.h | 13 +- .../BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE_MeshLightingLPN/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c | 39 +- .../BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c | 204 +- .../BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c | 31 +- .../BLE_MeshLightingLPN/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c | 16 +- .../BLE/BLE_MeshLightingLPN/Core/Src/main.c | 29 +- .../BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c | 13 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 29 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/app/PWM_config.c | 27 +- .../STM32_WPAN/app/PWM_handlers.c | 49 +- .../STM32_WPAN/app/PWM_handlers.h | 16 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c | 15 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h | 13 +- .../STM32_WPAN/app/appli_config.c | 30 +- .../STM32_WPAN/app/appli_config.h | 30 +- .../STM32_WPAN/app/appli_config_client.c | 37 +- .../STM32_WPAN/app/appli_config_client.h | 28 +- .../STM32_WPAN/app/appli_generic.c | 12 +- .../STM32_WPAN/app/appli_generic.h | 12 +- .../STM32_WPAN/app/appli_generic_client.c | 28 +- .../STM32_WPAN/app/appli_generic_client.h | 26 +- .../STM32_WPAN/app/appli_light.c | 14 +- .../STM32_WPAN/app/appli_light.h | 12 +- .../STM32_WPAN/app/appli_light_client.c | 28 +- .../STM32_WPAN/app/appli_light_client.h | 28 +- .../STM32_WPAN/app/appli_light_lc.c | 12 +- .../STM32_WPAN/app/appli_light_lc.h | 28 +- .../STM32_WPAN/app/appli_mesh.c | 12 +- .../STM32_WPAN/app/appli_mesh.h | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c | 14 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h | 14 +- .../STM32_WPAN/app/appli_sensor.c | 18 +- .../STM32_WPAN/app/appli_sensor.h | 12 +- .../STM32_WPAN/app/appli_sensors_client.c | 28 +- .../STM32_WPAN/app/appli_sensors_client.h | 26 +- .../STM32_WPAN/app/appli_vendor.c | 12 +- .../STM32_WPAN/app/appli_vendor.h | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h | 15 +- .../STM32_WPAN/app/ble_dbg_conf.h | 13 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h | 13 +- .../BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s | 32 +- .../STM32_WPAN/app/hal_common.h | 12 +- .../STM32_WPAN/app/mesh_cfg_usr.h | 17 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c | 16 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c | 16 +- .../STM32_WPAN/app/sensor_cfg_usr.h | 29 +- .../STM32_WPAN/app/svcctl_conf.c | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h | 13 +- .../STM32_WPAN/app/tl_dbg_conf.h | 27 +- .../BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c | 53 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h | 51 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h | 13 +- .../STM32_WPAN/target/hw_ipcc.c | 21 +- .../BLE/BLE_MeshLightingLPN/readme.txt | 45 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_common.h | 29 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_conf.h | 81 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_debug.h | 26 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_entry.h | 16 +- .../BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h | 21 +- .../BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h | 29 +- .../BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h | 15 +- .../BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h | 29 +- .../BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h | 29 +- .../BLE_MeshLightingPRFNode/Core/Src/app_debug.c | 39 +- .../BLE_MeshLightingPRFNode/Core/Src/app_entry.c | 204 +- .../BLE_MeshLightingPRFNode/Core/Src/hw_flash.c | 31 +- .../Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c | 29 +- .../BLE_MeshLightingPRFNode/Core/Src/lp_timer.c | 16 +- .../BLE/BLE_MeshLightingPRFNode/Core/Src/main.c | 29 +- .../Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_it.c | 13 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 29 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 39 +- .../STM32_WPAN/app/PWM_config.c | 27 +- .../STM32_WPAN/app/PWM_handlers.c | 49 +- .../STM32_WPAN/app/PWM_handlers.h | 16 +- .../STM32_WPAN/app/app_ble.c | 15 +- .../STM32_WPAN/app/app_ble.h | 13 +- .../STM32_WPAN/app/appli_config.c | 30 +- .../STM32_WPAN/app/appli_config.h | 30 +- .../STM32_WPAN/app/appli_config_client.c | 37 +- .../STM32_WPAN/app/appli_config_client.h | 28 +- .../STM32_WPAN/app/appli_generic.c | 12 +- .../STM32_WPAN/app/appli_generic.h | 12 +- .../STM32_WPAN/app/appli_generic_client.c | 28 +- .../STM32_WPAN/app/appli_generic_client.h | 26 +- .../STM32_WPAN/app/appli_light.c | 14 +- .../STM32_WPAN/app/appli_light.h | 12 +- .../STM32_WPAN/app/appli_light_client.c | 28 +- .../STM32_WPAN/app/appli_light_client.h | 28 +- .../STM32_WPAN/app/appli_light_lc.c | 12 +- .../STM32_WPAN/app/appli_light_lc.h | 28 +- .../STM32_WPAN/app/appli_mesh.c | 12 +- .../STM32_WPAN/app/appli_mesh.h | 12 +- .../STM32_WPAN/app/appli_nvm.c | 14 +- .../STM32_WPAN/app/appli_nvm.h | 14 +- .../STM32_WPAN/app/appli_sensor.c | 18 +- .../STM32_WPAN/app/appli_sensor.h | 12 +- .../STM32_WPAN/app/appli_sensors_client.c | 28 +- .../STM32_WPAN/app/appli_sensors_client.h | 26 +- .../STM32_WPAN/app/appli_vendor.c | 12 +- .../STM32_WPAN/app/appli_vendor.h | 12 +- .../STM32_WPAN/app/ble_conf.h | 15 +- .../STM32_WPAN/app/ble_dbg_conf.h | 13 +- .../STM32_WPAN/app/cube_hal.h | 13 +- .../BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s | 32 +- .../STM32_WPAN/app/hal_common.h | 12 +- .../STM32_WPAN/app/mesh_cfg_usr.h | 19 +- .../STM32_WPAN/app/models_if.c | 16 +- .../STM32_WPAN/app/models_if.h | 12 +- .../STM32_WPAN/app/pal_nvm.c | 16 +- .../STM32_WPAN/app/sensor_cfg_usr.h | 29 +- .../STM32_WPAN/app/svcctl_conf.c | 12 +- .../STM32_WPAN/app/tl_conf.h | 13 +- .../STM32_WPAN/app/tl_dbg_conf.h | 27 +- .../BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c | 12 +- .../STM32_WPAN/app/user_if.c | 53 +- .../STM32_WPAN/app/user_if.h | 51 +- .../STM32_WPAN/app/vcp_conf.h | 13 +- .../STM32_WPAN/target/hw_ipcc.c | 21 +- .../BLE/BLE_MeshLightingPRFNode/readme.txt | 49 +- .../Core/Inc/app_common.h | 29 +- .../Core/Inc/app_conf.h | 81 +- .../Core/Inc/app_debug.h | 26 +- .../Core/Inc/app_entry.h | 16 +- .../BLE_MeshLightingProvisioner/Core/Inc/hw_conf.h | 21 +- .../Core/Inc/hw_flash.h | 29 +- .../BLE_MeshLightingProvisioner/Core/Inc/hw_if.h | 15 +- .../Core/Inc/lp_timer.h | 29 +- .../BLE_MeshLightingProvisioner/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../Core/Inc/vcp_conf.h | 29 +- .../Core/Src/app_debug.c | 39 +- .../Core/Src/app_entry.c | 202 +- .../Core/Src/hw_flash.c | 31 +- .../Core/Src/hw_timerserver.c | 16 +- .../BLE_MeshLightingProvisioner/Core/Src/hw_uart.c | 29 +- .../Core/Src/lp_timer.c | 16 +- .../BLE_MeshLightingProvisioner/Core/Src/main.c | 29 +- .../Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_it.c | 13 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 29 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/app/PWM_config.c | 27 +- .../STM32_WPAN/app/PWM_handlers.c | 49 +- .../STM32_WPAN/app/PWM_handlers.h | 16 +- .../STM32_WPAN/app/app_ble.c | 15 +- .../STM32_WPAN/app/app_ble.h | 13 +- .../STM32_WPAN/app/appli_config.c | 30 +- .../STM32_WPAN/app/appli_config.h | 30 +- .../STM32_WPAN/app/appli_config_client.c | 37 +- .../STM32_WPAN/app/appli_config_client.h | 28 +- .../STM32_WPAN/app/appli_generic.c | 12 +- .../STM32_WPAN/app/appli_generic.h | 12 +- .../STM32_WPAN/app/appli_generic_client.c | 28 +- .../STM32_WPAN/app/appli_generic_client.h | 26 +- .../STM32_WPAN/app/appli_light.c | 14 +- .../STM32_WPAN/app/appli_light.h | 12 +- .../STM32_WPAN/app/appli_light_client.c | 28 +- .../STM32_WPAN/app/appli_light_client.h | 28 +- .../STM32_WPAN/app/appli_light_lc.c | 12 +- .../STM32_WPAN/app/appli_light_lc.h | 28 +- .../STM32_WPAN/app/appli_mesh.c | 12 +- .../STM32_WPAN/app/appli_mesh.h | 12 +- .../STM32_WPAN/app/appli_nvm.c | 16 +- .../STM32_WPAN/app/appli_nvm.h | 14 +- .../STM32_WPAN/app/appli_sensor.c | 18 +- .../STM32_WPAN/app/appli_sensor.h | 12 +- .../STM32_WPAN/app/appli_sensors_client.c | 28 +- .../STM32_WPAN/app/appli_sensors_client.h | 26 +- .../STM32_WPAN/app/appli_vendor.c | 12 +- .../STM32_WPAN/app/appli_vendor.h | 12 +- .../STM32_WPAN/app/ble_conf.h | 15 +- .../STM32_WPAN/app/ble_dbg_conf.h | 13 +- .../STM32_WPAN/app/cube_hal.h | 13 +- .../STM32_WPAN/app/data.s | 32 +- .../STM32_WPAN/app/hal_common.h | 12 +- .../STM32_WPAN/app/mesh_cfg_usr.h | 19 +- .../STM32_WPAN/app/models_if.c | 16 +- .../STM32_WPAN/app/models_if.h | 12 +- .../STM32_WPAN/app/pal_nvm.c | 16 +- .../STM32_WPAN/app/sensor_cfg_usr.h | 29 +- .../STM32_WPAN/app/svcctl_conf.c | 12 +- .../STM32_WPAN/app/tl_conf.h | 13 +- .../STM32_WPAN/app/tl_dbg_conf.h | 27 +- .../STM32_WPAN/app/tl_if.c | 12 +- .../STM32_WPAN/app/user_if.c | 53 +- .../STM32_WPAN/app/user_if.h | 51 +- .../STM32_WPAN/app/vcp_conf.h | 13 +- .../STM32_WPAN/target/hw_ipcc.c | 21 +- .../BLE/BLE_MeshLightingProvisioner/readme.txt | 42 +- .../BLE/BLE_MultiAppAt/Core/Inc/app_common.h | 23 +- .../BLE/BLE_MultiAppAt/Core/Inc/app_conf.h | 65 +- .../BLE/BLE_MultiAppAt/Core/Inc/app_debug.h | 26 +- .../BLE/BLE_MultiAppAt/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_MultiAppAt/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_MultiAppAt/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_MultiAppAt/Core/Inc/main.h | 13 +- .../BLE/BLE_MultiAppAt/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_MultiAppAt/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_MultiAppAt/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_MultiAppAt/Core/Src/app_debug.c | 39 +- .../BLE/BLE_MultiAppAt/Core/Src/app_entry.c | 34 +- .../BLE/BLE_MultiAppAt/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_MultiAppAt/Core/Src/hw_uart.c | 12 +- .../BLE/BLE_MultiAppAt/Core/Src/main.c | 28 +- .../BLE/BLE_MultiAppAt/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_MultiAppAt/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_MultiAppAt/Core/Src/system_stm32wbxx.c | 15 +- .../BLE_MultiAppAt/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_MultiAppAt/EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.c | 29 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.h | 23 +- .../BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.c | 29 +- .../BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.h | 23 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.c | 28 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.h | 23 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.c | 28 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.h | 23 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_conf.h | 16 +- .../BLE_MultiAppAt/STM32_WPAN/App/ble_dbg_conf.h | 14 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.c | 23 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.h | 23 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.c | 13 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.h | 13 +- .../BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.c | 35 +- .../BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.h | 29 +- .../BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.c | 31 +- .../BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE_MultiAppAt/STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.c | 29 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.h | 20 +- .../BLE/BLE_MultiAppAt/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_MultiAppAt/readme.txt | 10 +- .../BLE/BLE_Ota/Binary/BLE_Ota_reference.hex | 2115 ++--- .../Applications/BLE/BLE_Ota/Core/Inc/app_common.h | 29 +- .../Applications/BLE/BLE_Ota/Core/Inc/app_conf.h | 87 +- .../Applications/BLE/BLE_Ota/Core/Inc/app_debug.h | 26 +- .../Applications/BLE/BLE_Ota/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_Ota/Core/Inc/flash_driver.h | 13 +- .../Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h | 21 +- .../Applications/BLE/BLE_Ota/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_Ota/Core/Inc/main.h | 23 +- .../Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h | 23 +- .../BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h | 23 +- .../BLE/BLE_Ota/Core/Inc/utilities_conf.h | 23 +- .../Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h | 29 +- .../Applications/BLE/BLE_Ota/Core/Src/app_debug.c | 40 +- .../Applications/BLE/BLE_Ota/Core/Src/app_entry.c | 29 +- .../BLE/BLE_Ota/Core/Src/flash_driver.c | 44 +- .../BLE/BLE_Ota/Core/Src/hw_timerserver.c | 16 +- .../Applications/BLE/BLE_Ota/Core/Src/hw_uart.c | 29 +- .../Applications/BLE/BLE_Ota/Core/Src/main.c | 30 +- .../BLE/BLE_Ota/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_Ota/Core/Src/stm32wbxx_it.c | 23 +- .../BLE/BLE_Ota/Core/Src/system_stm32wbxx.c | 39 +- .../BLE/BLE_Ota/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE/BLE_Ota/EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../BLE/BLE_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../BLE/BLE_Ota/MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../BLE_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_Ota/STM32_WPAN/App/app_ble.c | 33 +- .../BLE/BLE_Ota/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h | 31 +- .../BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h | 29 +- .../BLE/BLE_Ota/STM32_WPAN/App/otas_app.c | 33 +- .../BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_Ota/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../BLE/BLE_Peripheral_Lite/Inc/app_common.h | 23 +- .../BLE/BLE_Peripheral_Lite/Inc/app_conf.h | 43 +- .../BLE/BLE_Peripheral_Lite/Inc/app_debug.h | 26 +- .../BLE/BLE_Peripheral_Lite/Inc/ble_conf.h | 14 +- .../BLE/BLE_Peripheral_Lite/Inc/ble_dbg_conf.h | 12 +- .../BLE/BLE_Peripheral_Lite/Inc/gatt_service.h | 23 +- .../BLE/BLE_Peripheral_Lite/Inc/hw_conf.h | 21 +- .../BLE/BLE_Peripheral_Lite/Inc/hw_if.h | 15 +- .../BLE/BLE_Peripheral_Lite/Inc/main.h | 13 +- .../BLE_Peripheral_Lite/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_Peripheral_Lite/Inc/tl_dbg_conf.h | 27 +- .../BLE/BLE_Peripheral_Lite/Inc/utilities_conf.h | 23 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_Peripheral_Lite/Src/app_debug.c | 39 +- .../BLE/BLE_Peripheral_Lite/Src/gatt_service.c | 29 +- .../BLE/BLE_Peripheral_Lite/Src/hw_ipcc.c | 21 +- .../BLE/BLE_Peripheral_Lite/Src/main.c | 35 +- .../BLE_Peripheral_Lite/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_Peripheral_Lite/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_Peripheral_Lite/Src/system_stm32wbxx.c | 15 +- .../BLE/BLE_Peripheral_Lite/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../Inc/app_common.h | 23 +- .../Inc/app_conf.h | 63 +- .../Inc/app_debug.h | 26 +- .../Inc/ble_conf.h | 14 +- .../Inc/ble_dbg_conf.h | 12 +- .../Inc/gatt_service.h | 23 +- .../Inc/hw_conf.h | 21 +- .../BLE_Peripheral_Lite_EventCallbacks/Inc/hw_if.h | 15 +- .../BLE_Peripheral_Lite_EventCallbacks/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../Inc/tl_dbg_conf.h | 27 +- .../Inc/utilities_conf.h | 23 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/app_debug.c | 39 +- .../Src/gatt_service.c | 29 +- .../Src/hw_ipcc.c | 21 +- .../BLE_Peripheral_Lite_EventCallbacks/Src/main.c | 35 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../BLE_Peripheral_Lite_EventCallbacks/readme.txt | 12 +- .../BLE/BLE_Proximity/Core/Inc/app_common.h | 23 +- .../BLE/BLE_Proximity/Core/Inc/app_conf.h | 75 +- .../BLE/BLE_Proximity/Core/Inc/app_debug.h | 26 +- .../BLE/BLE_Proximity/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_Proximity/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_Proximity/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_Proximity/Core/Inc/main.h | 23 +- .../BLE/BLE_Proximity/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_Proximity/Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../BLE/BLE_Proximity/Core/Inc/stm32wbxx_it.h | 23 +- .../BLE/BLE_Proximity/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_Proximity/Core/Src/app_debug.c | 39 +- .../BLE/BLE_Proximity/Core/Src/app_entry.c | 195 +- .../BLE/BLE_Proximity/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_Proximity/Core/Src/hw_uart.c | 29 +- .../Applications/BLE/BLE_Proximity/Core/Src/main.c | 29 +- .../BLE/BLE_Proximity/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_Proximity/Core/Src/stm32wbxx_it.c | 23 +- .../BLE/BLE_Proximity/Core/Src/system_stm32wbxx.c | 31 +- .../BLE_Proximity/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_Proximity/EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_Proximity/STM32_WPAN/App/app_ble.c | 32 +- .../BLE/BLE_Proximity/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_Proximity/STM32_WPAN/App/ble_conf.h | 31 +- .../BLE_Proximity/STM32_WPAN/App/ble_dbg_conf.h | 29 +- .../BLE/BLE_Proximity/STM32_WPAN/App/ias_app.c | 23 +- .../BLE/BLE_Proximity/STM32_WPAN/App/ias_app.h | 29 +- .../BLE/BLE_Proximity/STM32_WPAN/App/lls_app.c | 23 +- .../BLE/BLE_Proximity/STM32_WPAN/App/lls_app.h | 29 +- .../BLE/BLE_Proximity/STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../BLE/BLE_Proximity/STM32_WPAN/App/tps_app.c | 23 +- .../BLE/BLE_Proximity/STM32_WPAN/App/tps_app.h | 29 +- .../BLE/BLE_Proximity/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_Proximity/readme.txt | 12 +- .../Binary/BLE_RfWithFlash_reference.hex | 4037 +++++----- .../BLE/BLE_RfWithFlash/Core/Inc/app_common.h | 21 +- .../BLE/BLE_RfWithFlash/Core/Inc/app_conf.h | 81 +- .../BLE/BLE_RfWithFlash/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_RfWithFlash/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_RfWithFlash/Core/Inc/flash_driver.h | 13 +- .../BLE/BLE_RfWithFlash/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_RfWithFlash/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_RfWithFlash/Core/Inc/main.h | 13 +- .../BLE/BLE_RfWithFlash/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_RfWithFlash/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_RfWithFlash/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_RfWithFlash/Core/Src/app_debug.c | 36 +- .../BLE/BLE_RfWithFlash/Core/Src/app_entry.c | 415 +- .../BLE/BLE_RfWithFlash/Core/Src/flash_driver.c | 41 +- .../BLE/BLE_RfWithFlash/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_RfWithFlash/Core/Src/hw_uart.c | 12 +- .../BLE/BLE_RfWithFlash/Core/Src/main.c | 28 +- .../BLE/BLE_RfWithFlash/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_RfWithFlash/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_RfWithFlash/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.c | 43 +- .../BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_conf.h | 18 +- .../BLE_RfWithFlash/STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../STM32_WPAN/App/p2p_server_app.c | 31 +- .../STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE_RfWithFlash/STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../BLE_RfWithFlash/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_RfWithFlash/readme.txt | 14 +- .../BLE_TransparentMode/BLE_TransparentMode.ioc | 8 +- .../Binary/BLE_TransparentMode_reference.hex | 2341 +++--- .../BLE/BLE_TransparentMode/Core/Inc/app_common.h | 21 +- .../BLE/BLE_TransparentMode/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_TransparentMode/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_TransparentMode/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_TransparentMode/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_TransparentMode/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_TransparentMode/Core/Inc/main.h | 13 +- .../BLE_TransparentMode/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_TransparentMode/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE_TransparentMode/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_TransparentMode/Core/Src/app_debug.c | 36 +- .../BLE/BLE_TransparentMode/Core/Src/app_entry.c | 43 +- .../BLE_TransparentMode/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_TransparentMode/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_TransparentMode/Core/Src/main.c | 53 +- .../BLE_TransparentMode/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../BLE_TransparentMode/Core/Src/stm32wbxx_it.c | 12 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/BLE_TransparentMode.ewp | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_TransparentMode/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c | 35 +- .../BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h | 23 +- .../STM32_WPAN/Target/hw_ipcc.c | 26 +- .../BLE/BLE_TransparentMode/readme.txt | 10 +- .../BLE/BLE_p2pClient/BLE_p2pClient.ioc | 8 +- .../Binary/BLE_p2pClient_reference.hex | 3640 ++++----- .../BLE/BLE_p2pClient/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pClient/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_p2pClient/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pClient/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_p2pClient/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_p2pClient/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_p2pClient/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_p2pClient/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_p2pClient/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pClient/Core/Src/app_entry.c | 194 +- .../BLE/BLE_p2pClient/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pClient/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_p2pClient/Core/Src/main.c | 53 +- .../BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c | 42 +- .../BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c | 15 +- .../BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp | 18 +- .../BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c | 84 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c | 39 +- .../BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h | 35 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_p2pClient/readme.txt | 10 +- .../BLE/BLE_p2pRouteur/BLE_p2pRouteur.ioc | 8 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_p2pRouteur/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_p2pRouteur/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_p2pRouteur/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pRouteur/Core/Src/app_entry.c | 194 +- .../BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pRouteur/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_p2pRouteur/Core/Src/main.c | 55 +- .../BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c | 52 +- .../BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c | 15 +- .../BLE/BLE_p2pRouteur/EWARM/BLE_p2pRouteur.ewp | 2485 +++--- .../BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c | 77 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../STM32_WPAN/App/p2p_routeur_app.c | 42 +- .../STM32_WPAN/App/p2p_routeur_app.h | 35 +- .../BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_p2pRouteur/readme.txt | 10 +- .../BLE/BLE_p2pServer/BLE_p2pServer.ioc | 8 +- .../Binary/BLE_p2pServer_reference.hex | 3796 ++++----- .../BLE/BLE_p2pServer/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pServer/Core/Inc/app_conf.h | 58 +- .../BLE/BLE_p2pServer/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_p2pServer/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_p2pServer/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_p2pServer/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_p2pServer/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_p2pServer/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pServer/Core/Src/app_entry.c | 194 +- .../BLE/BLE_p2pServer/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pServer/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_p2pServer/Core/Src/main.c | 55 +- .../BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c | 52 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c | 15 +- .../BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp | 24 +- .../BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf | 8 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c | 77 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c | 37 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h | 22 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_p2pServer/readme.txt | 10 +- .../Binary/BLE_p2pServer_ota_reference.bin | Bin 32884 -> 34732 bytes .../BLE/BLE_p2pServer_ota/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h | 45 +- .../BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_p2pServer_ota/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE_p2pServer_ota/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_p2pServer_ota/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pServer_ota/Core/Src/app_entry.c | 189 +- .../BLE_p2pServer_ota/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c | 12 +- .../BLE/BLE_p2pServer_ota/Core/Src/main.c | 28 +- .../BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c | 12 +- .../BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4_ota.icf | 10 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 10 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c | 37 +- .../BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h | 18 +- .../STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../STM32_WPAN/App/p2p_server_app.c | 31 +- .../STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h | 27 +- .../BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_p2pServer_ota/readme.txt | 10 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h | 14 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h | 23 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c | 28 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/main.c | 28 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c | 13 +- .../BLE_LLD_Chat/Core/Src/system_stm32wbxx.c | 15 +- .../BLE_LLD_Chat/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_LLD_Chat/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../BLE_LLD_Chat/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c | 14 +- .../BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h | 14 +- .../BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c | 14 +- .../BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h | 16 +- .../BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE_LLD/BLE_LLD_Chat/readme.txt | 10 +- .../BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_common.h | 122 + .../BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_conf.h | 336 + .../BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_entry.h | 66 + .../BLE_LLD/BLE_LLD_Datarate/Core/Inc/gpio_lld.h | 179 + .../BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_conf.h | 184 + .../BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_if.h | 284 + .../BLE_LLD/BLE_LLD_Datarate/Core/Inc/main.h | 104 + .../BLE_LLD_Datarate/Core/Inc/stm32_lpm_if.h | 76 + .../BLE_LLD_Datarate/Core/Inc/stm32wbxx_hal_conf.h | 352 + .../BLE_LLD_Datarate/Core/Inc/stm32wbxx_it.h | 80 + .../BLE_LLD_Datarate/Core/Inc/stm_logging.h | 62 + .../BLE_LLD_Datarate/Core/Inc/utilities_conf.h | 66 + .../BLE_LLD/BLE_LLD_Datarate/Core/Src/app_entry.c | 419 + .../BLE_LLD/BLE_LLD_Datarate/Core/Src/gpio_lld.c | 112 + .../BLE_LLD_Datarate/Core/Src/hw_timerserver.c | 891 +++ .../BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_uart.c | 440 ++ .../BLE_LLD/BLE_LLD_Datarate/Core/Src/main.c | 605 ++ .../BLE_LLD_Datarate/Core/Src/stm32_lpm_if.c | 349 + .../BLE_LLD_Datarate/Core/Src/stm32wbxx_hal_msp.c | 329 + .../BLE_LLD_Datarate/Core/Src/stm32wbxx_it.c | 321 + .../BLE_LLD_Datarate/Core/Src/stm_logging.c | 212 + .../BLE_LLD_Datarate/Core/Src/system_stm32wbxx.c | 352 + .../BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewd | 1419 ++++ .../BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewp | 1229 +++ .../BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.eww | 7 + .../EWARM/startup_stm32wb55xx_cm4.s | 515 ++ .../EWARM/stm32wb55xx_flash_cm4.icf | 41 + .../MDK-ARM/BLE_LLD_Datarate.uvoptx | 829 ++ .../MDK-ARM/BLE_LLD_Datarate.uvprojx | 689 ++ .../MDK-ARM/startup_stm32wb55xx_cm4.s | 367 + .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 21 + .../BLE_LLD_Datarate/STM32CubeIDE/.cproject | 198 + .../BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.project | 264 + .../STM32CubeIDE/Application/User/Core/syscalls.c | 155 + .../STM32CubeIDE/Application/User/Core/sysmem.c | 79 + .../User/Startup/startup_stm32wb55rgvx.s | 443 ++ .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 171 + .../BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.c | 388 + .../BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.h | 69 + .../BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.c | 374 + .../BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.h | 53 + .../BLE_LLD_Datarate/STM32_WPAN/App/tl_dbg_conf.h | 124 + .../BLE_LLD_Datarate/STM32_WPAN/Target/hw_ipcc.c | 671 ++ .../BLE_LLD/BLE_LLD_Datarate/readme.txt | 137 + .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h | 14 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h | 23 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h | 15 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h | 13 +- .../BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD_Lowpower/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD_Lowpower/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c | 28 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD_Lowpower/Core/Src/hw_timerserver.c | 16 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c | 28 +- .../BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD_Lowpower/Core/Src/stm_logging.c | 13 +- .../BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h | 16 +- .../BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_LLD/BLE_LLD_Lowpower/readme.txt | 10 +- .../BLE_LLD_Pressbutton/Core/Inc/app_common.h | 14 +- .../BLE_LLD_Pressbutton/Core/Inc/app_conf.h | 23 +- .../BLE_LLD_Pressbutton/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h | 15 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h | 13 +- .../BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD_Pressbutton/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD_Pressbutton/Core/Src/app_entry.c | 28 +- .../BLE_LLD_Pressbutton/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c | 28 +- .../BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD_Pressbutton/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_ble_lld.c | 14 +- .../STM32_WPAN/App/app_ble_lld.h | 14 +- .../STM32_WPAN/App/pressbutton_app.c | 14 +- .../STM32_WPAN/App/pressbutton_app.h | 16 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_LLD/BLE_LLD_Pressbutton/readme.txt | 10 +- .../BLE_LLD_Proximity/Core/Inc/app_common.h | 14 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_conf.h | 23 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_if.h | 15 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Inc/main.h | 13 +- .../BLE_LLD_Proximity/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD_Proximity/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD_Proximity/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD_Proximity/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Src/app_entry.c | 28 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Proximity/Core/Src/main.c | 28 +- .../BLE_LLD_Proximity/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_LLD_Proximity/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD_Proximity/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD_Proximity/Core/Src/stm_logging.c | 13 +- .../BLE_LLD_Proximity/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.c | 14 +- .../BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.h | 14 +- .../STM32_WPAN/App/proximity_app.c | 14 +- .../STM32_WPAN/App/proximity_app.h | 16 +- .../BLE_LLD_Proximity/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_LLD_Proximity/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_LLD/BLE_LLD_Proximity/readme.txt | 12 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/app_common.h | 29 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/app_conf.h | 22 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/app_entry.h | 23 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/hw_conf.h | 29 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/hw_if.h | 15 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/main.h | 23 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_Mac_Static/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_it.h | 23 +- .../BLE_Mac/BLE_Mac_Static/Core/Inc/stm_logging.h | 11 +- .../BLE_Mac_Static/Core/Inc/utilities_conf.h | 12 +- .../BLE_Mac/BLE_Mac_Static/Core/Src/app_entry.c | 29 +- .../BLE_Mac_Static/Core/Src/hw_timerserver.c | 16 +- .../BLE_Mac/BLE_Mac_Static/Core/Src/hw_uart.c | 23 +- .../BLE_Mac/BLE_Mac_Static/Core/Src/main.c | 25 +- .../BLE_Mac/BLE_Mac_Static/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_Mac/BLE_Mac_Static/Core/Src/stm32wbxx_it.c | 23 +- .../BLE_Mac/BLE_Mac_Static/Core/Src/stm_logging.c | 27 +- .../BLE_Mac_Static/Core/Src/system_stm32wbxx.c | 31 +- .../BLE_Mac_Static/EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../BLE_Mac_Static/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_Mac_Static/STM32_WPAN/App/app_ble.c | 28 +- .../BLE_Mac_Static/STM32_WPAN/App/app_ble.h | 23 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4.c | 29 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4.h | 23 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4_process.c | 27 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4_process.h | 23 +- .../BLE_Mac_Static/STM32_WPAN/App/ble_conf.h | 18 +- .../BLE_Mac_Static/STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.c | 31 +- .../BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE_Mac_Static/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_Mac_Static/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE_Mac/BLE_Mac_Static/readme.txt | 14 +- .../Ble_Thread_Dyn/Core/Inc/app_common.h | 29 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_conf.h | 18 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_entry.h | 23 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_conf.h | 29 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_if.h | 15 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Inc/main.h | 23 +- .../Ble_Thread_Dyn/Core/Inc/stm32_lpm_if.h | 29 +- .../Ble_Thread_Dyn/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Ble_Thread_Dyn/Core/Inc/stm32wbxx_it.h | 23 +- .../Ble_Thread_Dyn/Core/Inc/stm_logging.h | 11 +- .../Ble_Thread_Dyn/Core/Inc/utilities_conf.h | 12 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Src/app_entry.c | 16 +- .../Ble_Thread_Dyn/Core/Src/hw_timerserver.c | 16 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_uart.c | 23 +- .../BLE_Thread/Ble_Thread_Dyn/Core/Src/main.c | 25 +- .../Ble_Thread_Dyn/Core/Src/stm32_lpm_if.c | 24 +- .../Ble_Thread_Dyn/Core/Src/stm32wbxx_it.c | 23 +- .../Ble_Thread_Dyn/Core/Src/stm_logging.c | 27 +- .../Ble_Thread_Dyn/Core/Src/system_stm32wbxx.c | 31 +- .../Ble_Thread_Dyn/EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../Ble_Thread_Dyn/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Ble_Thread_Dyn/STM32_WPAN/App/app_ble.c | 28 +- .../Ble_Thread_Dyn/STM32_WPAN/App/app_ble.h | 23 +- .../Ble_Thread_Dyn/STM32_WPAN/App/app_thread.c | 34 +- .../Ble_Thread_Dyn/STM32_WPAN/App/app_thread.h | 18 +- .../Ble_Thread_Dyn/STM32_WPAN/App/ble_conf.h | 18 +- .../Ble_Thread_Dyn/STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.c | 31 +- .../Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.h | 20 +- .../Ble_Thread_Dyn/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Ble_Thread_Dyn/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_Thread/Ble_Thread_Dyn/readme.txt | 10 +- .../Ble_Thread_Dyn_SED/Core/Inc/app_common.h | 29 +- .../Ble_Thread_Dyn_SED/Core/Inc/app_conf.h | 18 +- .../Ble_Thread_Dyn_SED/Core/Inc/app_entry.h | 23 +- .../Ble_Thread_Dyn_SED/Core/Inc/hw_conf.h | 29 +- .../BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_if.h | 15 +- .../BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/main.h | 23 +- .../Ble_Thread_Dyn_SED/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_it.h | 23 +- .../Ble_Thread_Dyn_SED/Core/Inc/stm_logging.h | 11 +- .../Ble_Thread_Dyn_SED/Core/Inc/utilities_conf.h | 12 +- .../Ble_Thread_Dyn_SED/Core/Src/app_entry.c | 16 +- .../Ble_Thread_Dyn_SED/Core/Src/hw_timerserver.c | 16 +- .../Ble_Thread_Dyn_SED/Core/Src/hw_uart.c | 23 +- .../BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/main.c | 25 +- .../Ble_Thread_Dyn_SED/Core/Src/stm32_lpm_if.c | 24 +- .../Ble_Thread_Dyn_SED/Core/Src/stm32wbxx_it.c | 23 +- .../Ble_Thread_Dyn_SED/Core/Src/stm_logging.c | 27 +- .../Ble_Thread_Dyn_SED/Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.c | 28 +- .../Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.h | 23 +- .../Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.c | 28 +- .../Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.h | 18 +- .../Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_conf.h | 18 +- .../STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../STM32_WPAN/App/p2p_server_app.c | 31 +- .../STM32_WPAN/App/p2p_server_app.h | 20 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Ble_Thread_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_Thread/Ble_Thread_Dyn_SED/readme.txt | 10 +- .../Ble_Thread_Static/Core/Inc/app_common.h | 29 +- .../Ble_Thread_Static/Core/Inc/app_conf.h | 18 +- .../Ble_Thread_Static/Core/Inc/app_entry.h | 23 +- .../Ble_Thread_Static/Core/Inc/hw_conf.h | 29 +- .../BLE_Thread/Ble_Thread_Static/Core/Inc/hw_if.h | 15 +- .../BLE_Thread/Ble_Thread_Static/Core/Inc/main.h | 23 +- .../Ble_Thread_Static/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Ble_Thread_Static/Core/Inc/stm32wbxx_it.h | 23 +- .../Ble_Thread_Static/Core/Inc/stm_logging.h | 11 +- .../Ble_Thread_Static/Core/Inc/utilities_conf.h | 12 +- .../Ble_Thread_Static/Core/Src/app_entry.c | 16 +- .../Ble_Thread_Static/Core/Src/hw_timerserver.c | 16 +- .../Ble_Thread_Static/Core/Src/hw_uart.c | 23 +- .../BLE_Thread/Ble_Thread_Static/Core/Src/main.c | 25 +- .../Ble_Thread_Static/Core/Src/stm32_lpm_if.c | 24 +- .../Ble_Thread_Static/Core/Src/stm32wbxx_it.c | 23 +- .../Ble_Thread_Static/Core/Src/stm_logging.c | 27 +- .../Ble_Thread_Static/Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Ble_Thread_Static/STM32_WPAN/App/app_ble.c | 28 +- .../Ble_Thread_Static/STM32_WPAN/App/app_ble.h | 23 +- .../Ble_Thread_Static/STM32_WPAN/App/app_thread.c | 28 +- .../Ble_Thread_Static/STM32_WPAN/App/app_thread.h | 18 +- .../Ble_Thread_Static/STM32_WPAN/App/ble_conf.h | 18 +- .../STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../STM32_WPAN/App/p2p_server_app.c | 31 +- .../STM32_WPAN/App/p2p_server_app.h | 20 +- .../Ble_Thread_Static/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Ble_Thread_Static/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_Thread/Ble_Thread_Static/readme.txt | 10 +- .../BLE_Zigbee_Dyn/Core/Inc/app_common.h | 29 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_conf.h | 18 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_entry.h | 23 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_conf.h | 29 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_if.h | 15 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/main.h | 23 +- .../BLE_Zigbee_Dyn/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_it.h | 23 +- .../BLE_Zigbee_Dyn/Core/Inc/stm_logging.h | 11 +- .../BLE_Zigbee_Dyn/Core/Inc/utilities_conf.h | 12 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/app_entry.c | 28 +- .../BLE_Zigbee_Dyn/Core/Src/hw_timerserver.c | 16 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_uart.c | 23 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/main.c | 25 +- .../BLE_Zigbee_Dyn/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_Zigbee_Dyn/Core/Src/stm32wbxx_it.c | 23 +- .../BLE_Zigbee_Dyn/Core/Src/stm_logging.c | 27 +- .../BLE_Zigbee_Dyn/Core/Src/system_stm32wbxx.c | 31 +- .../BLE_Zigbee_Dyn/EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../BLE_Zigbee_Dyn/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.c | 28 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.c | 36 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.h | 14 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/ble_conf.h | 18 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.c | 31 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE_Zigbee_Dyn/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_Zigbee_Dyn/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_Zigbee/BLE_Zigbee_Dyn/readme.txt | 10 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/app_common.h | 29 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/app_conf.h | 18 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/app_entry.h | 23 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/hw_conf.h | 29 +- .../BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_if.h | 15 +- .../BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/main.h | 23 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_it.h | 23 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/stm_logging.h | 11 +- .../BLE_Zigbee_Dyn_SED/Core/Inc/utilities_conf.h | 12 +- .../BLE_Zigbee_Dyn_SED/Core/Src/app_entry.c | 28 +- .../BLE_Zigbee_Dyn_SED/Core/Src/hw_timerserver.c | 16 +- .../BLE_Zigbee_Dyn_SED/Core/Src/hw_uart.c | 23 +- .../BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/main.c | 25 +- .../BLE_Zigbee_Dyn_SED/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_Zigbee_Dyn_SED/Core/Src/stm32wbxx_it.c | 23 +- .../BLE_Zigbee_Dyn_SED/Core/Src/stm_logging.c | 27 +- .../BLE_Zigbee_Dyn_SED/Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.c | 28 +- .../BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.h | 23 +- .../BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.c | 36 +- .../BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.h | 14 +- .../BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_conf.h | 18 +- .../STM32_WPAN/App/ble_dbg_conf.h | 16 +- .../STM32_WPAN/App/p2p_server_app.c | 31 +- .../STM32_WPAN/App/p2p_server_app.h | 20 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_Zigbee_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../BLE_Zigbee/BLE_Zigbee_Dyn_SED/readme.txt | 10 +- .../BLE_Zigbee_Static/Core/Inc/app_common.h | 124 - .../BLE_Zigbee_Static/Core/Inc/app_conf.h | 652 -- .../BLE_Zigbee_Static/Core/Inc/app_entry.h | 53 - .../BLE_Zigbee_Static/Core/Inc/hw_conf.h | 249 - .../BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_if.h | 250 - .../BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/main.h | 38 - .../BLE_Zigbee_Static/Core/Inc/stm32_lpm_if.h | 81 - .../Core/Inc/stm32wbxx_hal_conf.h | 353 - .../BLE_Zigbee_Static/Core/Inc/stm32wbxx_it.h | 62 - .../BLE_Zigbee_Static/Core/Inc/stm_logging.h | 68 - .../BLE_Zigbee_Static/Core/Inc/utilities_conf.h | 68 - .../BLE_Zigbee_Static/Core/Src/app_entry.c | 503 -- .../BLE_Zigbee_Static/Core/Src/hw_timerserver.c | 893 --- .../BLE_Zigbee_Static/Core/Src/hw_uart.c | 465 -- .../BLE_Zigbee/BLE_Zigbee_Static/Core/Src/main.c | 326 - .../BLE_Zigbee_Static/Core/Src/stm32_lpm_if.c | 359 - .../BLE_Zigbee_Static/Core/Src/stm32wbxx_it.c | 188 - .../BLE_Zigbee_Static/Core/Src/stm_logging.c | 213 - .../BLE_Zigbee_Static/Core/Src/system_stm32wbxx.c | 343 - .../BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewd | 1419 ---- .../BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewp | 1325 ---- .../BLE_Zigbee_Static/EWARM/ble_zigbee_static.eww | 7 - .../EWARM/startup_stm32wb55xx_cm4.s | 528 -- .../EWARM/stm32wb55xx_flash_cm4.icf | 42 - .../MDK-ARM/ble_zigbee_static.uvoptx | 985 --- .../MDK-ARM/ble_zigbee_static.uvprojx | 778 -- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 368 - .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 21 - .../BLE_Zigbee_Static/STM32CubeIDE/.cproject | 220 - .../BLE_Zigbee_Static/STM32CubeIDE/.project | 314 - .../User/Core/Startup/startup_stm32wb55rgvx.s | 445 -- .../Application/User/Core/src/syscalls.c | 159 - .../Application/User/Core/src/sysmem.c | 80 - .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 187 - .../BLE_Zigbee_Static/STM32_WPAN/App/app_ble.c | 1143 --- .../BLE_Zigbee_Static/STM32_WPAN/App/app_ble.h | 88 - .../BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.c | 845 -- .../BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.h | 64 - .../BLE_Zigbee_Static/STM32_WPAN/App/ble_conf.h | 70 - .../STM32_WPAN/App/ble_dbg_conf.h | 199 - .../STM32_WPAN/App/p2p_server_app.c | 398 - .../STM32_WPAN/App/p2p_server_app.h | 81 - .../BLE_Zigbee_Static/STM32_WPAN/App/tl_dbg_conf.h | 126 - .../BLE_Zigbee_Static/STM32_WPAN/Target/hw_ipcc.c | 675 -- .../BLE_Zigbee/BLE_Zigbee_Static/readme.txt | 132 - .../Applications/CKS/CKS_Crypt/Core/Inc/app_cks.h | 23 +- .../CKS/CKS_Crypt/Core/Inc/app_common.h | 14 +- .../Applications/CKS/CKS_Crypt/Core/Inc/app_conf.h | 21 +- .../CKS/CKS_Crypt/Core/Inc/app_entry.h | 23 +- .../Applications/CKS/CKS_Crypt/Core/Inc/hw_conf.h | 15 +- .../Applications/CKS/CKS_Crypt/Core/Inc/hw_if.h | 15 +- .../Applications/CKS/CKS_Crypt/Core/Inc/main.h | 13 +- .../CKS/CKS_Crypt/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../CKS/CKS_Crypt/Core/Inc/stm32wbxx_it.h | 13 +- .../CKS/CKS_Crypt/Core/Inc/tl_dbg_conf.h | 14 +- .../CKS/CKS_Crypt/Core/Inc/utilities_conf.h | 12 +- .../Applications/CKS/CKS_Crypt/Core/Src/app_cks.c | 37 +- .../Applications/CKS/CKS_Crypt/Core/Src/main.c | 29 +- .../CKS/CKS_Crypt/Core/Src/stm32wbxx_hal_msp.c | 47 +- .../CKS/CKS_Crypt/Core/Src/stm32wbxx_it.c | 12 +- .../CKS/CKS_Crypt/Core/Src/system_stm32wbxx.c | 15 +- .../CKS/CKS_Crypt/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../CKS_Crypt/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../CKS_Crypt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../CKS/CKS_Crypt/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/CKS/CKS_Crypt/readme.txt | 12 +- .../FreeRTOS_Mail/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../FreeRTOS_Mail/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS/FreeRTOS_Mail/FreeRTOS_Mail.ioc | 19 +- .../Applications/FreeRTOS/FreeRTOS_Mail/Inc/main.h | 39 +- .../FreeRTOS_Mail/Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS/FreeRTOS_Mail/Src/app_freertos.c | 38 +- .../Applications/FreeRTOS/FreeRTOS_Mail/Src/main.c | 50 +- .../FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_msp.c | 38 +- .../FreeRTOS_Mail/Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS/FreeRTOS_Mail/Src/system_stm32wbxx.c | 15 +- .../Applications/FreeRTOS/FreeRTOS_Mail/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc | 19 +- .../FreeRTOS/FreeRTOS_Mutexes/Inc/main.h | 39 +- .../FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_Mutexes/Src/main.c | 50 +- .../FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS_Mutexes/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_Mutexes/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc | 19 +- .../FreeRTOS/FreeRTOS_Queues/Inc/main.h | 39 +- .../FreeRTOS_Queues/Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS/FreeRTOS_Queues/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_Queues/Src/main.c | 50 +- .../FreeRTOS_Queues/Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS_Queues/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_Queues/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc | 19 +- .../FreeRTOS/FreeRTOS_Semaphore/Inc/main.h | 39 +- .../FreeRTOS_Semaphore/Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS/FreeRTOS_Semaphore/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_Semaphore/Src/main.c | 50 +- .../FreeRTOS_Semaphore/Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS_Semaphore/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_Semaphore/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS_SemaphoreFromISR.ioc | 19 +- .../FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/main.h | 39 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS_SemaphoreFromISR/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/main.c | 50 +- .../Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_SemaphoreFromISR/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS/FreeRTOS_Signal/FreeRTOS_Signal.ioc | 19 +- .../FreeRTOS/FreeRTOS_Signal/Inc/main.h | 39 +- .../FreeRTOS_Signal/Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS/FreeRTOS_Signal/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_Signal/Src/main.c | 50 +- .../FreeRTOS_Signal/Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS_Signal/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_Signal/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS_SignalFromISR.ioc | 19 +- .../FreeRTOS/FreeRTOS_SignalFromISR/Inc/main.h | 39 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS_SignalFromISR/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS_SignalFromISR/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_SignalFromISR/Src/main.c | 50 +- .../FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS_SignalFromISR/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS_SignalFromISR/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_SignalFromISR/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS_ThreadCreation.ioc | 19 +- .../FreeRTOS/FreeRTOS_ThreadCreation/Inc/main.h | 39 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS_ThreadCreation/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS_ThreadCreation/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_ThreadCreation/Src/main.c | 50 +- .../Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS_ThreadCreation/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS_ThreadCreation/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_ThreadCreation/readme.txt | 36 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc | 19 +- .../FreeRTOS/FreeRTOS_Timers/Inc/main.h | 39 +- .../FreeRTOS_Timers/Inc/stm32wbxx_hal_conf.h | 15 +- .../FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FreeRTOS/FreeRTOS_Timers/Src/app_freertos.c | 38 +- .../FreeRTOS/FreeRTOS_Timers/Src/main.c | 50 +- .../FreeRTOS_Timers/Src/stm32wbxx_hal_msp.c | 38 +- .../Src/stm32wbxx_hal_timebase_tim.c | 28 +- .../FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_it.c | 13 +- .../FreeRTOS_Timers/Src/system_stm32wbxx.c | 15 +- .../FreeRTOS/FreeRTOS_Timers/readme.txt | 36 +- .../Mac_802_15_4_FFD/Core/Inc/app_common.h | 23 +- .../Mac_802_15_4_FFD/Core/Inc/app_conf.h | 29 +- .../Mac_802_15_4_FFD/Core/Inc/app_entry.h | 23 +- .../Mac_802_15_4_FFD/Core/Inc/hw_conf.h | 29 +- .../Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_if.h | 15 +- .../Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/main.h | 25 +- .../Mac_802_15_4_FFD/Core/Inc/stm32_lpm_if.h | 29 +- .../Mac_802_15_4_FFD/Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../Mac_802_15_4_FFD/Core/Inc/stm32wbxx_it.h | 24 +- .../Mac_802_15_4_FFD/Core/Inc/stm_logging.h | 11 +- .../Mac_802_15_4_FFD/Core/Inc/utilities_conf.h | 12 +- .../Mac_802_15_4_FFD/Core/Src/app_entry.c | 29 +- .../Mac_802_15_4_FFD/Core/Src/hw_uart.c | 23 +- .../Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/main.c | 25 +- .../Mac_802_15_4_FFD/Core/Src/stm32_lpm_if.c | 24 +- .../Mac_802_15_4_FFD/Core/Src/stm32wbxx_it.c | 29 +- .../Mac_802_15_4_FFD/Core/Src/stm_logging.c | 23 +- .../Mac_802_15_4_FFD/Core/Src/system_stm32wbxx.c | 34 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4.c | 29 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4.h | 23 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4_process.c | 27 +- .../STM32_WPAN/App/app_ffd_mac_802_15_4_process.h | 23 +- .../Mac_802_15_4_FFD/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Mac_802_15_4_FFD/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Mac_802_15_4/Mac_802_15_4_FFD/readme.txt | 10 +- .../Core/inc/app_common.h | 23 +- .../Core/inc/app_conf.h | 31 +- .../Core/inc/app_entry.h | 23 +- .../Core/inc/hw_conf.h | 29 +- .../Core/inc/hw_if.h | 15 +- .../Core/inc/main.h | 25 +- .../Core/inc/stm32_lpm_if.h | 29 +- .../Core/inc/stm32wbxx_hal_conf.h | 25 +- .../Core/inc/stm32wbxx_it.h | 23 +- .../Core/inc/stm_logging.h | 11 +- .../Core/inc/utilities_conf.h | 12 +- .../Core/src/app_entry.c | 29 +- .../Core/src/main.c | 25 +- .../Core/src/stm32_lpm_if.c | 24 +- .../Core/src/stm32wbxx_hal_msp.c | 12 +- .../Core/src/stm32wbxx_it.c | 28 +- .../Core/src/system_stm32wbxx.c | 25 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.c | 33 +- .../STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.h | 23 +- .../app/app_lpm_transmit_mac_802_15_4_process.c | 27 +- .../app/app_lpm_transmit_mac_802_15_4_process.h | 23 +- .../STM32_WPAN/app/tl_dbg_conf.h | 14 +- .../STM32_WPAN/target/hw_ipcc.c | 21 +- .../Mac_802_15_4_LPM_Periodic_Transmit/readme.txt | 10 +- .../Mac_802_15_4_RFD/Core/Inc/app_common.h | 23 +- .../Mac_802_15_4_RFD/Core/Inc/app_conf.h | 29 +- .../Mac_802_15_4_RFD/Core/Inc/app_entry.h | 23 +- .../Mac_802_15_4_RFD/Core/Inc/hw_conf.h | 29 +- .../Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_if.h | 15 +- .../Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/main.h | 25 +- .../Mac_802_15_4_RFD/Core/Inc/stm32_lpm_if.h | 29 +- .../Mac_802_15_4_RFD/Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../Mac_802_15_4_RFD/Core/Inc/stm32wbxx_it.h | 23 +- .../Mac_802_15_4_RFD/Core/Inc/stm_logging.h | 11 +- .../Mac_802_15_4_RFD/Core/Inc/utilities_conf.h | 12 +- .../Mac_802_15_4_RFD/Core/Src/app_entry.c | 29 +- .../Mac_802_15_4_RFD/Core/Src/hw_uart.c | 23 +- .../Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/main.c | 25 +- .../Mac_802_15_4_RFD/Core/Src/stm32_lpm_if.c | 24 +- .../Mac_802_15_4_RFD/Core/Src/stm32wbxx_it.c | 28 +- .../Mac_802_15_4_RFD/Core/Src/stm_logging.c | 23 +- .../Mac_802_15_4_RFD/Core/Src/system_stm32wbxx.c | 34 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_rfd_mac_802_15_4.c | 31 +- .../STM32_WPAN/App/app_rfd_mac_802_15_4.h | 23 +- .../STM32_WPAN/App/app_rfd_mac_802_15_4_process.c | 27 +- .../STM32_WPAN/App/app_rfd_mac_802_15_4_process.h | 23 +- .../Mac_802_15_4_RFD/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Mac_802_15_4_RFD/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Mac_802_15_4/Mac_802_15_4_RFD/readme.txt | 12 +- .../Phy_802_15_4_Cli/Core/Inc/app_common.h | 14 +- .../Phy_802_15_4_Cli/Core/Inc/app_conf.h | 23 +- .../Phy_802_15_4_Cli/Core/Inc/app_entry.h | 12 +- .../Phy_802_15_4_Cli/Core/Inc/app_lld_tests.h | 16 +- .../Phy_802_15_4_Cli/Core/Inc/gpio_lld.h | 2 +- .../Phy_802_15_4_Cli/Core/Inc/hw_conf.h | 14 +- .../Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_if.h | 13 +- .../Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/main.h | 13 +- .../Phy_802_15_4_Cli/Core/Inc/stm32_lpm_if.h | 29 +- .../Phy_802_15_4_Cli/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Phy_802_15_4_Cli/Core/Inc/stm32wbxx_it.h | 15 +- .../Phy_802_15_4_Cli/Core/Inc/stm_logging.h | 11 +- .../Phy_802_15_4_Cli/Core/Inc/tl_dbg_conf.h | 14 +- .../Phy_802_15_4_Cli/Core/Inc/utilities_conf.h | 12 +- .../Phy_802_15_4_Cli/Core/Src/app_entry.c | 16 +- .../Phy_802_15_4_Cli/Core/Src/app_lld_tests.c | 36 +- .../Phy_802_15_4_Cli/Core/Src/gpio_lld.c | 34 +- .../Phy_802_15_4_Cli/Core/Src/hw_ipcc.c | 21 +- .../Phy_802_15_4_Cli/Core/Src/hw_uart.c | 12 +- .../Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/main.c | 25 +- .../Phy_802_15_4_Cli/Core/Src/stm32_lpm_if.c | 24 +- .../Phy_802_15_4_Cli/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Phy_802_15_4_Cli/Core/Src/stm32wbxx_it.c | 14 +- .../Phy_802_15_4_Cli/Core/Src/stm_logging.c | 13 +- .../Phy_802_15_4_Cli/Core/Src/system_stm32wbxx.c | 15 +- .../Phy_802_15_4_Cli/EWARM/app_lld_tests_iar_asm.s | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/app_lld_tests_arm_asm.s | 11 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/app_lld_tests_iar_asm.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Phy_802_15_4/Phy_802_15_4_Cli/readme.txt | 10 +- .../Thread/Thread_Cli_Cmd/Core/Inc/app_common.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h | 22 +- .../Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h | 13 +- .../Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/main.h | 13 +- .../Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h | 28 +- .../Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h | 11 +- .../Thread_Cli_Cmd/Core/Inc/utilities_conf.h | 13 +- .../Thread/Thread_Cli_Cmd/Core/Src/app_entry.c | 21 +- .../Thread_Cli_Cmd/Core/Src/hw_timerserver.c | 17 +- .../Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c | 13 +- .../Thread/Thread_Cli_Cmd/Core/Src/main.c | 50 +- .../Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c | 25 +- .../Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c | 15 +- .../Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c | 13 +- .../Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c | 15 +- .../Thread/Thread_Cli_Cmd/EWARM/Thread_Cli_Cmd.ewp | 18 +- .../Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c | 20 +- .../Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h | 19 +- .../Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_Cli_Cmd/Thread_Cli_Cmd.ioc | 8 +- .../Applications/Thread/Thread_Cli_Cmd/readme.txt | 12 +- .../Thread_Coap_DataTransfer/Core/Inc/app_common.h | 15 +- .../Thread_Coap_DataTransfer/Core/Inc/app_conf.h | 22 +- .../Thread_Coap_DataTransfer/Core/Inc/app_entry.h | 13 +- .../Thread_Coap_DataTransfer/Core/Inc/hw_conf.h | 15 +- .../Thread_Coap_DataTransfer/Core/Inc/hw_if.h | 15 +- .../Thread_Coap_DataTransfer/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h | 29 +- .../Thread_Coap_DataTransfer/Core/Src/app_entry.c | 21 +- .../Core/Src/hw_timerserver.c | 17 +- .../Thread_Coap_DataTransfer/Core/Src/hw_uart.c | 13 +- .../Thread_Coap_DataTransfer/Core/Src/main.c | 50 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Thread_Coap_DataTransfer.ewp | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 30 +- .../STM32_WPAN/App/app_thread.h | 19 +- .../STM32_WPAN/App/data_transfer.h | 29 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread_Coap_DataTransfer.ioc | 4 +- .../Thread/Thread_Coap_DataTransfer/readme.txt | 12 +- .../Thread_Coap_Generic/Core/Inc/app_common.h | 15 +- .../Thread/Thread_Coap_Generic/Core/Inc/app_conf.h | 22 +- .../Thread_Coap_Generic/Core/Inc/app_entry.h | 13 +- .../Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h | 15 +- .../Thread/Thread_Coap_Generic/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Coap_Generic/Core/Inc/main.h | 13 +- .../Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread_Coap_Generic/Core/Inc/stm_logging.h | 11 +- .../Thread_Coap_Generic/Core/Inc/utilities_conf.h | 13 +- .../Thread_Coap_Generic/Core/Src/app_entry.c | 21 +- .../Thread_Coap_Generic/Core/Src/hw_timerserver.c | 17 +- .../Thread/Thread_Coap_Generic/Core/Src/hw_uart.c | 13 +- .../Thread/Thread_Coap_Generic/Core/Src/main.c | 50 +- .../Thread_Coap_Generic/Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Thread_Coap_Generic/Core/Src/stm32wbxx_it.c | 15 +- .../Thread_Coap_Generic/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Thread_Coap_Generic.ewp | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 26 +- .../STM32_WPAN/App/app_thread.h | 19 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread_Coap_Generic/Thread_Coap_Generic.ioc | 8 +- .../Thread/Thread_Coap_Generic/readme.txt | 10 +- .../Thread_Coap_Generic_Ota/Core/Inc/app_common.h | 14 +- .../Thread_Coap_Generic_Ota/Core/Inc/app_conf.h | 16 +- .../Thread_Coap_Generic_Ota/Core/Inc/app_entry.h | 12 +- .../Thread_Coap_Generic_Ota/Core/Inc/hw_conf.h | 14 +- .../Thread_Coap_Generic_Ota/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Coap_Generic_Ota/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Thread_Coap_Generic_Ota/Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Thread_Coap_Generic_Ota/Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Thread_Coap_Generic_Ota/Core/Src/hw_uart.c | 12 +- .../Thread/Thread_Coap_Generic_Ota/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Thread_Coap_Generic_Ota/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4_ota.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 30 +- .../STM32_WPAN/App/app_thread.h | 18 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_Coap_Generic_Ota/readme.txt | 12 +- .../Thread_Coap_MultiBoard/Core/Inc/app_common.h | 15 +- .../Thread_Coap_MultiBoard/Core/Inc/app_conf.h | 22 +- .../Thread_Coap_MultiBoard/Core/Inc/app_entry.h | 13 +- .../Thread_Coap_MultiBoard/Core/Inc/hw_conf.h | 15 +- .../Thread/Thread_Coap_MultiBoard/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Coap_MultiBoard/Core/Inc/main.h | 13 +- .../Thread_Coap_MultiBoard/Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread_Coap_MultiBoard/Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Thread_Coap_MultiBoard/Core/Inc/vcp_conf.h | 29 +- .../Thread_Coap_MultiBoard/Core/Src/app_entry.c | 21 +- .../Core/Src/hw_timerserver.c | 17 +- .../Thread_Coap_MultiBoard/Core/Src/hw_uart.c | 13 +- .../Thread/Thread_Coap_MultiBoard/Core/Src/main.c | 50 +- .../Thread_Coap_MultiBoard/Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Thread_Coap_MultiBoard/Core/Src/stm32wbxx_it.c | 15 +- .../Thread_Coap_MultiBoard/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Thread_Coap_MultiBoard.ewp | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Core/User/src/syscalls.c | 27 +- .../Application/Core/User/src/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 26 +- .../STM32_WPAN/App/app_thread.h | 19 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread_Coap_Multiboard.ioc | 8 +- .../Thread/Thread_Coap_MultiBoard/readme.txt | 11 +- .../Thread_Coap_Secure/Core/Inc/app_common.h | 14 +- .../Thread/Thread_Coap_Secure/Core/Inc/app_conf.h | 19 +- .../Thread/Thread_Coap_Secure/Core/Inc/app_entry.h | 12 +- .../Thread/Thread_Coap_Secure/Core/Inc/hw_conf.h | 14 +- .../Thread/Thread_Coap_Secure/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Coap_Secure/Core/Inc/main.h | 13 +- .../Thread_Coap_Secure/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread_Coap_Secure/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread_Coap_Secure/Core/Inc/stm_logging.h | 11 +- .../Thread_Coap_Secure/Core/Inc/utilities_conf.h | 12 +- .../Thread/Thread_Coap_Secure/Core/Src/app_entry.c | 16 +- .../Thread_Coap_Secure/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_Coap_Secure/Core/Src/hw_uart.c | 12 +- .../Thread/Thread_Coap_Secure/Core/Src/main.c | 26 +- .../Thread_Coap_Secure/Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Thread_Coap_Secure/Core/Src/stm32wbxx_it.c | 14 +- .../Thread_Coap_Secure/Core/Src/stm_logging.c | 13 +- .../Thread_Coap_Secure/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Thread_Coap_Secure/STM32_WPAN/App/app_thread.c | 28 +- .../Thread_Coap_Secure/STM32_WPAN/App/app_thread.h | 18 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../Thread_Coap_Secure/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_Coap_Secure/readme.txt | 10 +- .../Thread_Commissioning/Core/Inc/app_common.h | 15 +- .../Thread_Commissioning/Core/Inc/app_conf.h | 22 +- .../Thread_Commissioning/Core/Inc/app_entry.h | 13 +- .../Thread/Thread_Commissioning/Core/Inc/hw_conf.h | 15 +- .../Thread/Thread_Commissioning/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Commissioning/Core/Inc/main.h | 13 +- .../Thread_Commissioning/Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread_Commissioning/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread_Commissioning/Core/Inc/stm_logging.h | 11 +- .../Thread_Commissioning/Core/Inc/utilities_conf.h | 13 +- .../Thread_Commissioning/Core/Inc/vcp_conf.h | 29 +- .../Thread_Commissioning/Core/Src/app_entry.c | 21 +- .../Thread_Commissioning/Core/Src/hw_timerserver.c | 17 +- .../Thread/Thread_Commissioning/Core/Src/hw_uart.c | 13 +- .../Thread/Thread_Commissioning/Core/Src/main.c | 50 +- .../Thread_Commissioning/Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Thread_Commissioning/Core/Src/stm32wbxx_it.c | 15 +- .../Thread_Commissioning/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Thread_Commissioning.ewp | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Core/User/src/syscalls.c | 27 +- .../Application/Core/User/src/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 20 +- .../STM32_WPAN/App/app_thread.h | 19 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread_Commissioning/Thread_Commissioning.ioc | 8 +- .../Thread/Thread_Commissioning/readme.txt | 10 +- .../Core/Inc/app_common.h | 15 +- .../Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h | 22 +- .../Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h | 13 +- .../Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h | 15 +- .../Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h | 15 +- .../Thread_FTD_Coap_Multicast/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h | 29 +- .../Thread_FTD_Coap_Multicast/Core/Src/app_entry.c | 21 +- .../Core/Src/hw_timerserver.c | 17 +- .../Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c | 13 +- .../Thread_FTD_Coap_Multicast/Core/Src/main.c | 50 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Thread_FTD_Coap_Multicast.ewp | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Core/User/src/syscalls.c | 27 +- .../Application/Core/User/src/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 26 +- .../STM32_WPAN/App/app_thread.h | 19 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread_FTD_Coap_Multicast.ioc | 8 +- .../Thread/Thread_FTD_Coap_Multicast/readme.txt | 10 +- .../Thread/Thread_Ota/Core/Inc/app_common.h | 14 +- .../Thread/Thread_Ota/Core/Inc/app_conf.h | 16 +- .../Thread/Thread_Ota/Core/Inc/app_entry.h | 12 +- .../Thread/Thread_Ota/Core/Inc/hw_conf.h | 14 +- .../Thread/Thread_Ota/Core/Inc/hw_if.h | 15 +- .../Applications/Thread/Thread_Ota/Core/Inc/main.h | 13 +- .../Thread/Thread_Ota/Core/Inc/stm32_lpm_if.h | 29 +- .../Thread_Ota/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread/Thread_Ota/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread/Thread_Ota/Core/Inc/stm_logging.h | 11 +- .../Thread/Thread_Ota/Core/Inc/utilities_conf.h | 12 +- .../Thread/Thread_Ota/Core/Src/app_entry.c | 16 +- .../Thread/Thread_Ota/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_Ota/Core/Src/hw_uart.c | 12 +- .../Applications/Thread/Thread_Ota/Core/Src/main.c | 26 +- .../Thread/Thread_Ota/Core/Src/stm32_lpm_if.c | 24 +- .../Thread/Thread_Ota/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Thread/Thread_Ota/Core/Src/stm32wbxx_it.c | 14 +- .../Thread/Thread_Ota/Core/Src/stm_logging.c | 13 +- .../Thread/Thread_Ota/Core/Src/system_stm32wbxx.c | 15 +- .../Thread_Ota/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Thread_Ota/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Thread_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../Thread_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Thread/Thread_Ota/STM32_WPAN/App/app_thread.c | 32 +- .../Thread/Thread_Ota/STM32_WPAN/App/app_thread.h | 18 +- .../Thread/Thread_Ota/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Thread/Thread_Ota/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/Thread/Thread_Ota/readme.txt | 12 +- .../Thread/Thread_Ota_Server/Core/Inc/app_common.h | 14 +- .../Thread/Thread_Ota_Server/Core/Inc/app_conf.h | 16 +- .../Thread/Thread_Ota_Server/Core/Inc/app_entry.h | 12 +- .../Thread/Thread_Ota_Server/Core/Inc/hw_conf.h | 14 +- .../Thread/Thread_Ota_Server/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Ota_Server/Core/Inc/main.h | 13 +- .../Thread_Ota_Server/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread_Ota_Server/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread_Ota_Server/Core/Inc/stm_logging.h | 11 +- .../Thread_Ota_Server/Core/Inc/utilities_conf.h | 12 +- .../Thread/Thread_Ota_Server/Core/Src/app_entry.c | 16 +- .../Thread_Ota_Server/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_Ota_Server/Core/Src/hw_uart.c | 12 +- .../Thread/Thread_Ota_Server/Core/Src/main.c | 26 +- .../Thread_Ota_Server/Core/Src/stm32_lpm_if.c | 24 +- .../Thread_Ota_Server/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Thread_Ota_Server/Core/Src/stm32wbxx_it.c | 14 +- .../Thread_Ota_Server/Core/Src/stm_logging.c | 13 +- .../Thread_Ota_Server/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Thread_Ota_Server/STM32_WPAN/App/app_thread.c | 32 +- .../Thread_Ota_Server/STM32_WPAN/App/app_thread.h | 18 +- .../Thread_Ota_Server/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Thread_Ota_Server/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_Ota_Server/readme.txt | 12 +- .../Thread/Thread_RCP/Core/Inc/app_common.h | 14 +- .../Thread/Thread_RCP/Core/Inc/app_conf.h | 15 +- .../Thread/Thread_RCP/Core/Inc/app_entry.h | 12 +- .../Thread/Thread_RCP/Core/Inc/hw_conf.h | 14 +- .../Thread/Thread_RCP/Core/Inc/hw_if.h | 15 +- .../Applications/Thread/Thread_RCP/Core/Inc/main.h | 13 +- .../Thread/Thread_RCP/Core/Inc/stm32_lpm_if.h | 29 +- .../Thread_RCP/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread/Thread_RCP/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread/Thread_RCP/Core/Inc/stm_logging.h | 15 +- .../Thread/Thread_RCP/Core/Inc/utilities_conf.h | 12 +- .../Thread/Thread_RCP/Core/Src/app_entry.c | 16 +- .../Thread/Thread_RCP/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_RCP/Core/Src/hw_uart.c | 12 +- .../Applications/Thread/Thread_RCP/Core/Src/main.c | 26 +- .../Thread/Thread_RCP/Core/Src/stm32_lpm_if.c | 24 +- .../Thread/Thread_RCP/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Thread/Thread_RCP/Core/Src/stm32wbxx_it.c | 14 +- .../Thread/Thread_RCP/Core/Src/stm_logging.c | 17 +- .../Thread/Thread_RCP/Core/Src/system_stm32wbxx.c | 15 +- .../Thread_RCP/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Thread_RCP/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Thread_RCP/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../Thread_RCP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Thread/Thread_RCP/STM32_WPAN/App/app_thread.c | 46 +- .../Thread/Thread_RCP/STM32_WPAN/App/app_thread.h | 18 +- .../Thread/Thread_RCP/STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../Thread/Thread_RCP/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/Thread/Thread_RCP/readme.txt | 18 +- .../Thread_RCP_Cli_Cmd/Core/Inc/app_common.h | 117 + .../Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_conf.h | 379 + .../Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_entry.h | 71 + .../Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_conf.h | 256 + .../Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_if.h | 247 + .../Thread/Thread_RCP_Cli_Cmd/Core/Inc/main.h | 73 + .../Thread_RCP_Cli_Cmd/Core/Inc/stm32_lpm_if.h | 78 + .../Core/Inc/stm32wbxx_hal_conf.h | 352 + .../Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_it.h | 80 + .../Thread_RCP_Cli_Cmd/Core/Inc/stm_logging.h | 62 + .../Thread_RCP_Cli_Cmd/Core/Inc/utilities_conf.h | 66 + .../Thread/Thread_RCP_Cli_Cmd/Core/Src/app_entry.c | 677 ++ .../Thread_RCP_Cli_Cmd/Core/Src/hw_timerserver.c | 893 +++ .../Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_uart.c | 318 + .../Thread/Thread_RCP_Cli_Cmd/Core/Src/main.c | 464 ++ .../Thread_RCP_Cli_Cmd/Core/Src/stm32_lpm_if.c | 349 + .../Core/Src/stm32wbxx_hal_msp.c | 371 + .../Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_it.c | 410 + .../Thread_RCP_Cli_Cmd/Core/Src/stm_logging.c | 212 + .../Thread_RCP_Cli_Cmd/Core/Src/system_stm32wbxx.c | 350 + .../Thread/Thread_RCP_Cli_Cmd/EWARM/Project.eww | 7 + .../EWARM/Thread_RCP_Cli_Cmd.ewd | 1419 ++++ .../EWARM/Thread_RCP_Cli_Cmd.ewp | 1527 ++++ .../EWARM/startup_stm32wb55xx_cm4.s | 515 ++ .../EWARM/stm32wb55xx_flash_cm4.icf | 40 + .../MDK-ARM/Thread_RCP_Cli_Cmd.uvoptx | 1229 +++ .../MDK-ARM/Thread_RCP_Cli_Cmd.uvprojx | 852 ++ .../MDK-ARM/startup_stm32wb55xx_cm4.s | 367 + .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 21 + .../Thread_RCP_Cli_Cmd/STM32CubeIDE/.cproject | 205 + .../Thread_RCP_Cli_Cmd/STM32CubeIDE/.project | 441 ++ .../Application/Startup/startup_stm32wb55rgvx.s | 443 ++ .../STM32CubeIDE/Application/User/syscalls.c | 158 + .../STM32CubeIDE/Application/User/sysmem.c | 57 + .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 171 + .../Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.c | 854 ++ .../Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.h | 104 + .../STM32_WPAN/App/tl_dbg_conf.h | 134 + .../Thread_RCP_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c | 670 ++ .../Thread/Thread_RCP_Cli_Cmd/readme.txt | 192 + .../Thread_SED_Coap_FreeRTOS/Core/Inc/app_common.h | 15 +- .../Thread_SED_Coap_FreeRTOS/Core/Inc/app_conf.h | 22 +- .../Thread_SED_Coap_FreeRTOS/Core/Inc/app_entry.h | 13 +- .../Thread_SED_Coap_FreeRTOS/Core/Inc/hw_conf.h | 15 +- .../Thread_SED_Coap_FreeRTOS/Core/Inc/hw_if.h | 15 +- .../Thread_SED_Coap_FreeRTOS/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Thread_SED_Coap_FreeRTOS/Core/Inc/vcp_conf.h | 29 +- .../Thread_SED_Coap_FreeRTOS/Core/Src/app_entry.c | 21 +- .../Core/Src/app_freertos.c | 12 +- .../Core/Src/freertos_port.c | 85 +- .../Core/Src/hw_timerserver.c | 17 +- .../Thread_SED_Coap_FreeRTOS/Core/Src/hw_uart.c | 13 +- .../Thread_SED_Coap_FreeRTOS/Core/Src/main.c | 50 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_hal_timebase_tim.c | 26 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Thread_SED_Coap_FreeRTOS.ewp | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 55 +- .../STM32_WPAN/App/app_thread.h | 19 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread_SED_Coap_FreeRTOS.ioc | 8 +- .../Thread/Thread_SED_Coap_FreeRTOS/readme.txt | 10 +- .../Core/Inc/app_common.h | 15 +- .../Thread_SED_Coap_Multicast/Core/Inc/app_conf.h | 22 +- .../Thread_SED_Coap_Multicast/Core/Inc/app_entry.h | 13 +- .../Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h | 15 +- .../Thread_SED_Coap_Multicast/Core/Inc/hw_if.h | 15 +- .../Thread_SED_Coap_Multicast/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h | 29 +- .../Thread_SED_Coap_Multicast/Core/Src/app_entry.c | 21 +- .../Core/Src/hw_timerserver.c | 17 +- .../Thread_SED_Coap_Multicast/Core/Src/hw_uart.c | 13 +- .../Thread_SED_Coap_Multicast/Core/Src/main.c | 50 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Thread_SED_Coap_Multicast.ewp | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 4 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Core/User/src/syscalls.c | 27 +- .../Application/Core/User/src/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 26 +- .../STM32_WPAN/App/app_thread.h | 19 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread_SED_Coap_Multicast.ioc | 8 +- .../Thread/Thread_SED_Coap_Multicast/readme.txt | 10 +- .../Thread/Thread_Udp/Core/Inc/app_common.h | 14 +- .../Thread/Thread_Udp/Core/Inc/app_conf.h | 19 +- .../Thread/Thread_Udp/Core/Inc/app_entry.h | 12 +- .../Thread/Thread_Udp/Core/Inc/hw_conf.h | 14 +- .../Thread/Thread_Udp/Core/Inc/hw_if.h | 15 +- .../Applications/Thread/Thread_Udp/Core/Inc/main.h | 13 +- .../Thread/Thread_Udp/Core/Inc/stm32_lpm_if.h | 29 +- .../Thread_Udp/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread/Thread_Udp/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread/Thread_Udp/Core/Inc/stm_logging.h | 11 +- .../Thread/Thread_Udp/Core/Inc/utilities_conf.h | 12 +- .../Thread/Thread_Udp/Core/Inc/vcp_conf.h | 29 +- .../Thread/Thread_Udp/Core/Src/app_entry.c | 16 +- .../Thread/Thread_Udp/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_Udp/Core/Src/hw_uart.c | 12 +- .../Applications/Thread/Thread_Udp/Core/Src/main.c | 26 +- .../Thread/Thread_Udp/Core/Src/stm32_lpm_if.c | 24 +- .../Thread/Thread_Udp/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Thread/Thread_Udp/Core/Src/stm32wbxx_it.c | 14 +- .../Thread/Thread_Udp/Core/Src/stm_logging.c | 13 +- .../Thread/Thread_Udp/Core/Src/system_stm32wbxx.c | 15 +- .../Thread_Udp/EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../Thread_Udp/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Thread_Udp/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Core/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../Thread_Udp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Thread/Thread_Udp/STM32_WPAN/App/app_thread.c | 30 +- .../Thread/Thread_Udp/STM32_WPAN/App/app_thread.h | 18 +- .../Thread/Thread_Udp/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Thread/Thread_Udp/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/Thread/Thread_Udp/readme.txt | 10 +- .../TouchSensing/TouchSensing_1touchKey/readme.txt | 14 +- .../USB_Device/CDC_Standalone/CDC_Standalone.ioc | 2 +- .../USB_Device/CDC_Standalone/Core/Inc/main.h | 13 +- .../CDC_Standalone/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../CDC_Standalone/Core/Inc/stm32wbxx_it.h | 15 +- .../USB_Device/CDC_Standalone/Core/Src/main.c | 22 +- .../CDC_Standalone/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../CDC_Standalone/Core/Src/stm32wbxx_it.c | 13 +- .../CDC_Standalone/Core/Src/system_stm32wbxx.c | 13 +- .../CDC_Standalone/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../CDC_Standalone/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../CDC_Standalone/USB_Device/App/usb_device.c | 12 +- .../CDC_Standalone/USB_Device/App/usb_device.h | 12 +- .../CDC_Standalone/USB_Device/App/usbd_cdc_if.c | 13 +- .../CDC_Standalone/USB_Device/App/usbd_cdc_if.h | 12 +- .../CDC_Standalone/USB_Device/App/usbd_desc.c | 12 +- .../CDC_Standalone/USB_Device/App/usbd_desc.h | 12 +- .../CDC_Standalone/USB_Device/Target/usbd_conf.c | 22 +- .../CDC_Standalone/USB_Device/Target/usbd_conf.h | 12 +- .../USB_Device/CDC_Standalone/readme.txt | 10 +- .../DFU_Standalone/Core/Binary/readme.txt | 10 +- .../USB_Device/DFU_Standalone/Core/Inc/main.h | 13 +- .../DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../DFU_Standalone/Core/Inc/stm32wbxx_it.h | 15 +- .../USB_Device/DFU_Standalone/Core/Src/main.c | 22 +- .../DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../DFU_Standalone/Core/Src/stm32wbxx_it.c | 13 +- .../DFU_Standalone/Core/Src/system_stm32wbxx.c | 13 +- .../USB_Device/DFU_Standalone/DFU_Standalone.ioc | 2 +- .../DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../DFU_Standalone/USB_Device/App/usb_device.c | 12 +- .../DFU_Standalone/USB_Device/App/usb_device.h | 12 +- .../DFU_Standalone/USB_Device/App/usbd_desc.c | 12 +- .../DFU_Standalone/USB_Device/App/usbd_desc.h | 12 +- .../DFU_Standalone/USB_Device/App/usbd_dfu_flash.c | 13 +- .../DFU_Standalone/USB_Device/App/usbd_dfu_flash.h | 12 +- .../DFU_Standalone/USB_Device/Target/usbd_conf.c | 20 +- .../DFU_Standalone/USB_Device/Target/usbd_conf.h | 12 +- .../USB_Device/DFU_Standalone/readme.txt | 10 +- .../USB_Device/HID_Standalone/Core/Inc/main.h | 13 +- .../HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../HID_Standalone/Core/Inc/stm32wbxx_it.h | 15 +- .../USB_Device/HID_Standalone/Core/Src/main.c | 22 +- .../HID_Standalone/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../HID_Standalone/Core/Src/stm32wbxx_it.c | 13 +- .../HID_Standalone/Core/Src/system_stm32wbxx.c | 13 +- .../HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USB_Device/HID_Standalone/HID_Standalone.ioc | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../HID_Standalone/USB_Device/App/usb_device.c | 12 +- .../HID_Standalone/USB_Device/App/usb_device.h | 12 +- .../HID_Standalone/USB_Device/App/usbd_desc.c | 12 +- .../HID_Standalone/USB_Device/App/usbd_desc.h | 12 +- .../HID_Standalone/USB_Device/Target/usbd_conf.c | 20 +- .../HID_Standalone/USB_Device/Target/usbd_conf.h | 12 +- .../USB_Device/HID_Standalone/readme.txt | 10 +- .../Zigbee/Zigbee_APS_Coord/Core/Inc/app_common.h | 12 +- .../Zigbee/Zigbee_APS_Coord/Core/Inc/app_conf.h | 16 +- .../Zigbee/Zigbee_APS_Coord/Core/Inc/app_entry.h | 12 +- .../Zigbee/Zigbee_APS_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee/Zigbee_APS_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee/Zigbee_APS_Coord/Core/Inc/main.h | 13 +- .../Zigbee_APS_Coord/Core/Inc/stm32_lpm_if.h | 29 +- .../Zigbee_APS_Coord/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Zigbee_APS_Coord/Core/Inc/stm32wbxx_it.h | 15 +- .../Zigbee/Zigbee_APS_Coord/Core/Inc/stm_logging.h | 11 +- .../Zigbee_APS_Coord/Core/Inc/utilities_conf.h | 12 +- .../Zigbee/Zigbee_APS_Coord/Core/Src/app_entry.c | 16 +- .../Zigbee_APS_Coord/Core/Src/hw_timerserver.c | 16 +- .../Zigbee/Zigbee_APS_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee/Zigbee_APS_Coord/Core/Src/main.c | 26 +- .../Zigbee_APS_Coord/Core/Src/stm32_lpm_if.c | 24 +- .../Zigbee_APS_Coord/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Zigbee_APS_Coord/Core/Src/stm32wbxx_it.c | 14 +- .../Zigbee/Zigbee_APS_Coord/Core/Src/stm_logging.c | 13 +- .../Zigbee_APS_Coord/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.c | 36 +- .../Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.h | 14 +- .../Zigbee_APS_Coord/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Zigbee_APS_Coord/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_APS_Coord/readme.txt | 19 +- .../Zigbee/Zigbee_APS_Router/Core/Inc/app_common.h | 12 +- .../Zigbee/Zigbee_APS_Router/Core/Inc/app_conf.h | 16 +- .../Zigbee/Zigbee_APS_Router/Core/Inc/app_entry.h | 12 +- .../Zigbee/Zigbee_APS_Router/Core/Inc/hw_conf.h | 14 +- .../Zigbee/Zigbee_APS_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee/Zigbee_APS_Router/Core/Inc/main.h | 13 +- .../Zigbee_APS_Router/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Zigbee_APS_Router/Core/Inc/stm32wbxx_it.h | 15 +- .../Zigbee_APS_Router/Core/Inc/stm_logging.h | 11 +- .../Zigbee_APS_Router/Core/Inc/utilities_conf.h | 12 +- .../Zigbee/Zigbee_APS_Router/Core/Src/app_entry.c | 16 +- .../Zigbee_APS_Router/Core/Src/hw_timerserver.c | 16 +- .../Zigbee/Zigbee_APS_Router/Core/Src/hw_uart.c | 12 +- .../Zigbee/Zigbee_APS_Router/Core/Src/main.c | 26 +- .../Zigbee_APS_Router/Core/Src/stm32_lpm_if.c | 24 +- .../Zigbee_APS_Router/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Zigbee_APS_Router/Core/Src/stm32wbxx_it.c | 14 +- .../Zigbee_APS_Router/Core/Src/stm_logging.c | 13 +- .../Zigbee_APS_Router/Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.c | 36 +- .../Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.h | 14 +- .../Zigbee_APS_Router/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../Zigbee_APS_Router/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_APS_Router/readme.txt | 17 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 58 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_Commissioning_Client_Coord/readme.txt | 16 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 44 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_Commissioning_Server_Router/readme.txt | 16 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_DevTemp_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_DevTemp_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_DevTemp_Client_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_DevTemp_Client_Router/readme.txt | 18 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_DevTemp_Server_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee_DevTemp_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_DevTemp_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_DevTemp_Server_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee_DevTemp_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_DevTemp_Server_Coord/readme.txt | 18 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 38 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_Diagnostic_Client_Router/readme.txt | 17 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Zigbee_Diagnostic_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_Diagnostic_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_Diagnostic_Server_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_DoorLock_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_DoorLock_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_DoorLock_Client_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_DoorLock_Client_Router/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_DoorLock_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_DoorLock_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_DoorLock_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 72 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_DoorLock_Server_Coord/readme.txt | 12 +- .../Zigbee_Find_Bind_Coord/Core/Inc/app_common.h | 14 +- .../Zigbee_Find_Bind_Coord/Core/Inc/app_conf.h | 19 +- .../Zigbee_Find_Bind_Coord/Core/Inc/app_entry.h | 12 +- .../Zigbee_Find_Bind_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/main.h | 13 +- .../Zigbee_Find_Bind_Coord/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_it.h | 15 +- .../Zigbee_Find_Bind_Coord/Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_Find_Bind_Coord/Core/Src/app_entry.c | 20 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_Find_Bind_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee/Zigbee_Find_Bind_Coord/Core/Src/main.c | 24 +- .../Zigbee_Find_Bind_Coord/Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_it.c | 14 +- .../Zigbee_Find_Bind_Coord/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 18 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_Find_Bind_Coord/readme.txt | 16 +- .../Core/Inc/app_common.h | 14 +- .../Core/Inc/app_conf.h | 19 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_if.h | 15 +- .../Zigbee_Find_Bind_IAS_Router2/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 20 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_Find_Bind_IAS_Router2/Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 18 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_Find_Bind_IAS_Router2/readme.txt | 14 +- .../Core/Inc/app_common.h | 14 +- .../Core/Inc/app_conf.h | 19 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Zigbee_Find_Bind_OnOff_Router1/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 20 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_Find_Bind_OnOff_Router1/Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 18 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_Find_Bind_OnOff_Router1/readme.txt | 14 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_IAS_WD_Client_Router/Core/Inc/hw_conf.h | 14 +- .../Zigbee_IAS_WD_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_IAS_WD_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_IAS_WD_Client_Router/Core/Src/hw_uart.c | 12 +- .../Zigbee_IAS_WD_Client_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_IAS_WD_Client_Router/readme.txt | 13 +- .../Core/Inc/app_common.h | 12 +- .../Zigbee_IAS_WD_Server_Coord/Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_IAS_WD_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_IAS_WD_Server_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee_IAS_WD_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_IAS_WD_Server_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 15 +- .../Core/Inc/app_conf.h | 22 +- .../Core/Inc/app_entry.h | 13 +- .../Core/Inc/hw_conf.h | 15 +- .../Zigbee_MeterId_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_MeterId_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Core/Src/app_entry.c | 25 +- .../Core/Src/hw_timerserver.c | 17 +- .../Core/Src/hw_uart.c | 13 +- .../Zigbee_MeterId_Client_Router/Core/Src/main.c | 48 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Zigbee_MeterId_Client_Router.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../STM32_WPAN/App/app_zigbee.c | 16 +- .../STM32_WPAN/App/app_zigbee.h | 15 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_MeterId_Client_Router.ioc | 8 +- .../Zigbee/Zigbee_MeterId_Client_Router/readme.txt | 12 +- .../Core/Inc/app_common.h | 15 +- .../Core/Inc/app_conf.h | 22 +- .../Core/Inc/app_entry.h | 13 +- .../Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h | 15 +- .../Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_MeterId_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Core/Src/app_entry.c | 25 +- .../Core/Src/hw_timerserver.c | 17 +- .../Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c | 13 +- .../Zigbee_MeterId_Server_Coord/Core/Src/main.c | 48 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Zigbee_MeterId_Server_Coord.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../STM32_WPAN/App/app_zigbee.c | 20 +- .../STM32_WPAN/App/app_zigbee.h | 15 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_MeterId_Server_Coord.ioc | 8 +- .../Zigbee/Zigbee_MeterId_Server_Coord/readme.txt | 12 +- .../Zigbee_OTA_Client_Router/Core/Inc/app_common.h | 12 +- .../Zigbee_OTA_Client_Router/Core/Inc/app_conf.h | 20 +- .../Zigbee_OTA_Client_Router/Core/Inc/app_entry.h | 12 +- .../Zigbee_OTA_Client_Router/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OTA_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_OTA_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_OTA_Client_Router/Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OTA_Client_Router/Core/Src/hw_uart.c | 12 +- .../Zigbee_OTA_Client_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 38 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OTA_Client_Router/readme.txt | 17 +- .../Zigbee_OTA_Server_Coord/Core/Inc/app_common.h | 12 +- .../Zigbee_OTA_Server_Coord/Core/Inc/app_conf.h | 16 +- .../Zigbee_OTA_Server_Coord/Core/Inc/app_entry.h | 12 +- .../Zigbee_OTA_Server_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OTA_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Zigbee_OTA_Server_Coord/Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_OTA_Server_Coord/Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OTA_Server_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee/Zigbee_OTA_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Zigbee_OTA_Server_Coord/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OTA_Server_Coord/readme.txt | 19 +- .../Core/Inc/app_common.h | 15 +- .../Core/Inc/app_conf.h | 22 +- .../Core/Inc/app_entry.h | 13 +- .../Zigbee_OnOff_Client_Distrib/Core/Inc/hw_conf.h | 17 +- .../Zigbee_OnOff_Client_Distrib/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Client_Distrib/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Core/Src/app_entry.c | 25 +- .../Core/Src/hw_timerserver.c | 17 +- .../Zigbee_OnOff_Client_Distrib/Core/Src/hw_uart.c | 13 +- .../Zigbee_OnOff_Client_Distrib/Core/Src/main.c | 48 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Zigbee_OnOff_Client_Distrib.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../STM32_WPAN/App/app_zigbee.c | 16 +- .../STM32_WPAN/App/app_zigbee.h | 15 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Client_Distrib.ioc | 8 +- .../Zigbee/Zigbee_OnOff_Client_Distrib/readme.txt | 12 +- .../Core/Inc/app_common.h | 15 +- .../Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h | 22 +- .../Core/Inc/app_entry.h | 13 +- .../Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h | 15 +- .../Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Core/Src/app_entry.c | 25 +- .../Core/Src/hw_timerserver.c | 17 +- .../Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c | 13 +- .../Zigbee_OnOff_Client_Router/Core/Src/main.c | 48 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Zigbee_OnOff_Client_Router.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../STM32_WPAN/App/app_zigbee.c | 16 +- .../STM32_WPAN/App/app_zigbee.h | 15 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Client_Router.ioc | 8 +- .../Zigbee/Zigbee_OnOff_Client_Router/readme.txt | 12 +- .../Core/Inc/FreeRTOSConfig.h | 2 +- .../Core/Inc/app_common.h | 14 +- .../Core/Inc/app_conf.h | 15 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 20 +- .../Core/Src/freertos_port.c | 79 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_hal_timebase_tim.c | 27 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 14 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Client_Router_FreeRTOS/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 20 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Client_Router_Ota/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_OnOff_Client_Router_Ota/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4_ota.icf | 11 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 38 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Client_Router_Ota/readme.txt | 12 +- .../Zigbee_OnOff_Client_SED/Core/Inc/app_common.h | 15 +- .../Zigbee_OnOff_Client_SED/Core/Inc/app_conf.h | 22 +- .../Zigbee_OnOff_Client_SED/Core/Inc/app_entry.h | 13 +- .../Zigbee_OnOff_Client_SED/Core/Inc/hw_conf.h | 15 +- .../Zigbee_OnOff_Client_SED/Core/Inc/hw_if.h | 15 +- .../Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Zigbee_OnOff_Client_SED/Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Zigbee_OnOff_Client_SED/Core/Src/app_entry.c | 25 +- .../Core/Src/hw_timerserver.c | 17 +- .../Zigbee_OnOff_Client_SED/Core/Src/hw_uart.c | 13 +- .../Zigbee/Zigbee_OnOff_Client_SED/Core/Src/main.c | 48 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Zigbee_OnOff_Client_SED/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Zigbee_OnOff_Client_SED.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../STM32_WPAN/App/app_zigbee.c | 16 +- .../STM32_WPAN/App/app_zigbee.h | 15 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Client_SED.ioc | 8 +- .../Zigbee/Zigbee_OnOff_Client_SED/readme.txt | 18 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/app_common.h | 12 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/app_conf.h | 20 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/app_entry.h | 12 +- .../Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee.h | 30 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/ee_cfg.h | 31 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/hw_flash.h | 31 +- .../Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_if.h | 15 +- .../Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/main.h | 13 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_it.h | 15 +- .../Zigbee_OnOff_Coord_NVM/Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_OnOff_Coord_NVM/Core/Src/app_entry.c | 16 +- .../Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/ee.c | 30 +- .../Zigbee_OnOff_Coord_NVM/Core/Src/hw_flash.c | 31 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OnOff_Coord_NVM/Core/Src/hw_uart.c | 12 +- .../Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/main.c | 26 +- .../Zigbee_OnOff_Coord_NVM/Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_it.c | 14 +- .../Zigbee_OnOff_Coord_NVM/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 38 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OnOff_Coord_NVM/readme.txt | 16 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/app_common.h | 12 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/app_conf.h | 20 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/app_entry.h | 12 +- .../Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee.h | 30 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/ee_cfg.h | 31 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/hw_flash.h | 31 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/hw_if.h | 15 +- .../Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Zigbee_OnOff_Router_NVM/Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_OnOff_Router_NVM/Core/Src/app_entry.c | 16 +- .../Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/ee.c | 30 +- .../Zigbee_OnOff_Router_NVM/Core/Src/hw_flash.c | 31 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OnOff_Router_NVM/Core/Src/hw_uart.c | 12 +- .../Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Zigbee_OnOff_Router_NVM/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 38 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OnOff_Router_NVM/readme.txt | 16 +- .../Core/Inc/app_common.h | 15 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h | 22 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h | 13 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h | 15 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c | 25 +- .../Core/Src/hw_timerserver.c | 17 +- .../Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c | 13 +- .../Zigbee_OnOff_Server_Coord/Core/Src/main.c | 48 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Zigbee_OnOff_Server_Coord.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../STM32_WPAN/App/app_zigbee.c | 16 +- .../STM32_WPAN/App/app_zigbee.h | 15 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Server_Coord.ioc | 8 +- .../Zigbee/Zigbee_OnOff_Server_Coord/readme.txt | 12 +- .../Core/Inc/FreeRTOSConfig.h | 2 +- .../Core/Inc/app_common.h | 14 +- .../Core/Inc/app_conf.h | 15 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 20 +- .../Core/Src/freertos_port.c | 79 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_hal_timebase_tim.c | 27 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 14 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Server_Coord_FreeRTOS/readme.txt | 12 +- .../Core/Inc/app_common.h | 15 +- .../Core/Inc/app_conf.h | 22 +- .../Core/Inc/app_entry.h | 13 +- .../Zigbee_OnOff_Server_Distrib/Core/Inc/hw_conf.h | 15 +- .../Zigbee_OnOff_Server_Distrib/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Server_Distrib/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 28 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 13 +- .../Core/Src/app_entry.c | 25 +- .../Core/Src/hw_timerserver.c | 17 +- .../Zigbee_OnOff_Server_Distrib/Core/Src/hw_uart.c | 13 +- .../Zigbee_OnOff_Server_Distrib/Core/Src/main.c | 48 +- .../Core/Src/stm32_lpm_if.c | 25 +- .../Core/Src/stm32wbxx_hal_msp.c | 42 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/Zigbee_OnOff_Server_Distrib.ewp | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../STM32_WPAN/App/app_zigbee.c | 16 +- .../STM32_WPAN/App/app_zigbee.h | 15 +- .../STM32_WPAN/App/tl_dbg_conf.h | 19 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_OnOff_Server_Distrib.ioc | 8 +- .../Zigbee/Zigbee_OnOff_Server_Distrib/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 38 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_PollControl_Client_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_PollControl_Server_SED/Core/Inc/hw_if.h | 15 +- .../Zigbee_PollControl_Server_SED/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_PollControl_Server_SED/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 40 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_PollControl_Server_SED/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_PowerProfile_Client_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 111 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_PowerProfile_Server_Router/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Zigbee_PressMeas_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_PressMeas_Client_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 75 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_PressMeas_Client_Router/readme.txt | 16 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_PressMeas_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_PressMeas_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_PressMeas_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_PressMeas_Server_Coord/readme.txt | 16 +- .../Core/Inc/app_common.h | 12 +- .../Zigbee_SE_Msg_Client_Coord/Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_SE_Msg_Client_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_SE_Msg_Client_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee_SE_Msg_Client_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_SE_Msg_Client_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_SE_Msg_Server_Router/Core/Inc/hw_conf.h | 14 +- .../Zigbee_SE_Msg_Server_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_SE_Msg_Server_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_SE_Msg_Server_Router/Core/Src/hw_uart.c | 12 +- .../Zigbee_SE_Msg_Server_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_SE_Msg_Server_Router/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Zigbee_custom_ls_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_custom_ls_Client_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 33 +- .../Zigbee_custom_ls_Client_Router/readme.txt | 13 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_custom_ls_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_custom_ls_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_custom_ls_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 33 +- .../Zigbee_custom_ls_Server_Coord/readme.txt | 13 +- .../ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/ADC/ADC_AnalogWatchdog/Inc/main.h | 13 +- .../ADC_AnalogWatchdog/Inc/stm32wbxx_hal_conf.h | 15 +- .../ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/ADC/ADC_AnalogWatchdog/Src/main.c | 22 +- .../ADC/ADC_AnalogWatchdog/Src/stm32wbxx_hal_msp.c | 12 +- .../ADC/ADC_AnalogWatchdog/Src/stm32wbxx_it.c | 13 +- .../ADC/ADC_AnalogWatchdog/Src/system_stm32wbxx.c | 15 +- .../Examples/ADC/ADC_AnalogWatchdog/readme.txt | 10 +- .../ADC_MultiChannelSingleConversion.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../ADC_MultiChannelSingleConversion/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC_MultiChannelSingleConversion/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../ADC_MultiChannelSingleConversion/readme.txt | 10 +- .../ADC/ADC_Oversampling/ADC_Oversampling.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/ADC/ADC_Oversampling/Inc/main.h | 13 +- .../ADC/ADC_Oversampling/Inc/stm32wbxx_hal_conf.h | 15 +- .../ADC/ADC_Oversampling/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/ADC/ADC_Oversampling/Src/main.c | 22 +- .../ADC/ADC_Oversampling/Src/stm32wbxx_hal_msp.c | 12 +- .../ADC/ADC_Oversampling/Src/stm32wbxx_it.c | 13 +- .../ADC/ADC_Oversampling/Src/system_stm32wbxx.c | 15 +- .../Examples/ADC/ADC_Oversampling/readme.txt | 10 +- .../ADC_SingleConversion_TriggerSW_IT.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../ADC_SingleConversion_TriggerSW_IT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC_SingleConversion_TriggerSW_IT/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../ADC_SingleConversion_TriggerSW_IT/readme.txt | 10 +- .../ADC_SingleConversion_TriggerTimer_DMA.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../Examples/BSP/BSP_Example/BSP_Example.ioc | 19 +- .../BSP_Example/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BSP_Example/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/BSP/BSP_Example/Inc/main.h | 13 +- .../BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h | 13 +- .../BSP_Example/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/BSP/BSP_Example/Src/main.c | 22 +- .../BSP/BSP_Example/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/BSP/BSP_Example/Src/stm32wbxx_it.c | 13 +- .../BSP/BSP_Example/Src/system_stm32wbxx.c | 15 +- .../Examples/BSP/BSP_Example/readme.txt | 10 +- .../COMP_CompareGpioVsVrefInt_IT.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt | 10 +- .../COMP_CompareGpioVsVrefInt_Window_IT.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../COMP_CompareGpioVsVrefInt_Window_IT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../COMP_CompareGpioVsVrefInt_Window_IT/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../COMP_CompareGpioVsVrefInt_Window_IT/readme.txt | 10 +- .../Examples/CRC/CRC_Example/CRC_Example.ioc | 19 +- .../CRC_Example/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../CRC_Example/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/CRC/CRC_Example/Inc/main.h | 13 +- .../CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h | 13 +- .../CRC_Example/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/CRC/CRC_Example/Src/main.c | 22 +- .../CRC/CRC_Example/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/CRC/CRC_Example/Src/stm32wbxx_it.c | 13 +- .../CRC/CRC_Example/Src/system_stm32wbxx.c | 15 +- .../Examples/CRC/CRC_Example/readme.txt | 10 +- .../CRC_UserDefinedPolynomial.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../CRC/CRC_UserDefinedPolynomial/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../CRC/CRC_UserDefinedPolynomial/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../CRC/CRC_UserDefinedPolynomial/readme.txt | 10 +- .../Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc | 19 +- .../CRYP_AESModes/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../CRYP_AESModes/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/CRYP/CRYP_AESModes/Inc/main.h | 13 +- .../CRYP/CRYP_AESModes/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/CRYP/CRYP_AESModes/Src/main.c | 28 +- .../CRYP/CRYP_AESModes/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_it.c | 13 +- .../CRYP/CRYP_AESModes/Src/system_stm32wbxx.c | 15 +- .../Examples/CRYP/CRYP_AESModes/readme.txt | 10 +- .../Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc | 19 +- .../CRYP/CRYP_DMA/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../CRYP/CRYP_DMA/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/CRYP/CRYP_DMA/Inc/main.h | 13 +- .../CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h | 13 +- .../CRYP_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../CRYP_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/CRYP/CRYP_DMA/Src/main.c | 24 +- .../Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c | 13 +- .../Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c | 15 +- .../Examples/CRYP/CRYP_DMA/readme.txt | 20 +- .../Examples/Cortex/CORTEXM_MPU/CORTEXM_MPU.ioc | 19 +- .../CORTEXM_MPU/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../CORTEXM_MPU/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/Cortex/CORTEXM_MPU/Inc/main.h | 13 +- .../Examples/Cortex/CORTEXM_MPU/Inc/stm32_mpu.h | 13 +- .../Cortex/CORTEXM_MPU/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_it.h | 13 +- .../CORTEXM_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/Cortex/CORTEXM_MPU/Src/main.c | 22 +- .../Examples/Cortex/CORTEXM_MPU/Src/stm32_mpu.c | 13 +- .../Cortex/CORTEXM_MPU/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_it.c | 13 +- .../Cortex/CORTEXM_MPU/Src/system_stm32wbxx.c | 15 +- .../Examples/Cortex/CORTEXM_MPU/readme.txt | 10 +- .../CORTEXM_ModePrivilege.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Cortex/CORTEXM_ModePrivilege/Inc/main.h | 13 +- .../CORTEXM_ModePrivilege/Inc/stm32wbxx_hal_conf.h | 15 +- .../CORTEXM_ModePrivilege/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Cortex/CORTEXM_ModePrivilege/Src/main.c | 22 +- .../CORTEXM_ModePrivilege/Src/stm32wbxx_hal_msp.c | 12 +- .../CORTEXM_ModePrivilege/Src/stm32wbxx_it.c | 13 +- .../CORTEXM_ModePrivilege/Src/system_stm32wbxx.c | 15 +- .../Cortex/CORTEXM_ModePrivilege/readme.txt | 10 +- .../Cortex/CORTEXM_SysTick/CORTEXM_SysTick.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/Cortex/CORTEXM_SysTick/Inc/main.h | 13 +- .../CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h | 15 +- .../Cortex/CORTEXM_SysTick/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/Cortex/CORTEXM_SysTick/Src/main.c | 22 +- .../Cortex/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c | 12 +- .../Cortex/CORTEXM_SysTick/Src/stm32wbxx_it.c | 13 +- .../Cortex/CORTEXM_SysTick/Src/system_stm32wbxx.c | 15 +- .../Examples/Cortex/CORTEXM_SysTick/readme.txt | 10 +- .../Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc | 19 +- .../DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/DMA/DMA_FLASHToRAM/Inc/main.h | 13 +- .../DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/DMA/DMA_FLASHToRAM/Src/main.c | 22 +- .../DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c | 13 +- .../DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c | 15 +- .../Examples/DMA/DMA_FLASHToRAM/readme.txt | 10 +- .../Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc | 19 +- .../DMA_MUXSYNC/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../DMA_MUXSYNC/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/DMA/DMA_MUXSYNC/Inc/main.h | 13 +- .../DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h | 13 +- .../DMA_MUXSYNC/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/DMA/DMA_MUXSYNC/Src/main.c | 22 +- .../DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c | 13 +- .../DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c | 15 +- .../Examples/DMA/DMA_MUXSYNC/readme.txt | 10 +- .../DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/DMA/DMA_MUX_RequestGen/Inc/main.h | 13 +- .../DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h | 15 +- .../DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/DMA/DMA_MUX_RequestGen/Src/main.c | 24 +- .../DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c | 12 +- .../DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c | 13 +- .../DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c | 15 +- .../Examples/DMA/DMA_MUX_RequestGen/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FLASH_EraseProgram/FLASH_EraseProgram.ioc | 19 +- .../Examples/FLASH/FLASH_EraseProgram/Inc/main.h | 13 +- .../FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h | 15 +- .../FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/FLASH/FLASH_EraseProgram/Src/main.c | 22 +- .../FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c | 12 +- .../FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c | 13 +- .../FLASH_EraseProgram/Src/system_stm32wbxx.c | 15 +- .../Examples/FLASH/FLASH_EraseProgram/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../FLASH_WriteProtection.ioc | 19 +- .../FLASH/FLASH_WriteProtection/Inc/main.h | 13 +- .../FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h | 15 +- .../FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../FLASH/FLASH_WriteProtection/Src/main.c | 22 +- .../FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c | 12 +- .../FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c | 13 +- .../FLASH_WriteProtection/Src/system_stm32wbxx.c | 15 +- .../FLASH/FLASH_WriteProtection/readme.txt | 10 +- .../GPIO/GPIO_EXTI/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../GPIO/GPIO_EXTI/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc | 19 +- .../Examples/GPIO/GPIO_EXTI/Inc/main.h | 13 +- .../GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h | 13 +- .../GPIO_EXTI/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../GPIO_EXTI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/GPIO/GPIO_EXTI/Src/main.c | 22 +- .../GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c | 13 +- .../Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c | 15 +- .../Examples/GPIO/GPIO_EXTI/readme.txt | 10 +- .../GPIO_IOToggle/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../GPIO_IOToggle/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc | 19 +- .../Examples/GPIO/GPIO_IOToggle/Inc/main.h | 13 +- .../GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/GPIO/GPIO_IOToggle/Src/main.c | 22 +- .../GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c | 15 +- .../GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c | 15 +- .../Examples/GPIO/GPIO_IOToggle/readme.txt | 10 +- .../HAL_TimeBase/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../HAL_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc | 19 +- .../Examples/HAL/HAL_TimeBase/Inc/main.h | 13 +- .../HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h | 13 +- .../HAL_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/HAL/HAL_TimeBase/Src/main.c | 39 +- .../HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c | 13 +- .../HAL/HAL_TimeBase/Src/system_stm32wbxx.c | 15 +- .../Examples/HAL/HAL_TimeBase/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../HAL_TimeBase_RTC_ALARM.ioc | 19 +- .../Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/main.c | 22 +- .../HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_hal_timebase_rtc_alarm.c | 26 +- .../HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_it.c | 13 +- .../HAL_TimeBase_RTC_ALARM/Src/system_stm32wbxx.c | 15 +- .../Examples/HAL/HAL_TimeBase_RTC_ALARM/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../HAL_TimeBase_RTC_WKUP.ioc | 19 +- .../Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h | 13 +- .../HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h | 15 +- .../HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c | 22 +- .../HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_hal_timebase_rtc_wakeup.c | 26 +- .../HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c | 13 +- .../HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c | 15 +- .../Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc | 19 +- .../Examples/HAL/HAL_TimeBase_TIM/Inc/main.h | 13 +- .../HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h | 15 +- .../HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/HAL/HAL_TimeBase_TIM/Src/main.c | 24 +- .../HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_hal_timebase_tim.c | 14 +- .../HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c | 13 +- .../HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c | 15 +- .../Examples/HAL/HAL_TimeBase_TIM/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc | 19 +- .../Examples/HSEM/HSEM_ProcessSync/Inc/main.h | 13 +- .../HSEM/HSEM_ProcessSync/Inc/stm32wbxx_hal_conf.h | 15 +- .../HSEM/HSEM_ProcessSync/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/HSEM/HSEM_ProcessSync/Src/main.c | 22 +- .../HSEM/HSEM_ProcessSync/Src/stm32wbxx_hal_msp.c | 12 +- .../HSEM/HSEM_ProcessSync/Src/stm32wbxx_it.c | 13 +- .../HSEM/HSEM_ProcessSync/Src/system_stm32wbxx.c | 15 +- .../Examples/HSEM/HSEM_ProcessSync/readme.txt | 10 +- .../HSEM_ReadLock/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../HSEM_ReadLock/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc | 19 +- .../Examples/HSEM/HSEM_ReadLock/Inc/main.h | 13 +- .../HSEM/HSEM_ReadLock/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/HSEM/HSEM_ReadLock/Src/main.c | 22 +- .../HSEM/HSEM_ReadLock/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_it.c | 13 +- .../HSEM/HSEM_ReadLock/Src/system_stm32wbxx.c | 15 +- .../Examples/HSEM/HSEM_ReadLock/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_AdvComIT.ioc | 23 +- .../Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/I2C/I2C_TwoBoards_AdvComIT/Src/main.c | 44 +- .../I2C_TwoBoards_AdvComIT/Src/stm32wbxx_hal_msp.c | 12 +- .../I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_it.c | 13 +- .../I2C_TwoBoards_AdvComIT/Src/system_stm32wbxx.c | 15 +- .../Examples/I2C/I2C_TwoBoards_AdvComIT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc | 23 +- .../Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h | 13 +- .../I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c | 30 +- .../I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c | 12 +- .../I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c | 13 +- .../I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c | 15 +- .../Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc | 23 +- .../Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h | 13 +- .../I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c | 22 +- .../I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c | 12 +- .../I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c | 13 +- .../I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c | 15 +- .../Examples/I2C/I2C_TwoBoards_ComIT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_ComPolling.ioc | 23 +- .../I2C/I2C_TwoBoards_ComPolling/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C_TwoBoards_ComPolling/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../I2C/I2C_TwoBoards_ComPolling/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../I2C_TwoBoards_ComPolling/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../I2C/I2C_TwoBoards_ComPolling/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_RestartAdvComIT.ioc | 23 +- .../I2C/I2C_TwoBoards_RestartAdvComIT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c | 28 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../I2C/I2C_TwoBoards_RestartAdvComIT/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_RestartComIT.ioc | 23 +- .../I2C/I2C_TwoBoards_RestartComIT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../I2C/I2C_TwoBoards_RestartComIT/Src/main.c | 30 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../I2C_TwoBoards_RestartComIT/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../I2C/I2C_TwoBoards_RestartComIT/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc | 23 +- .../Examples/I2C/I2C_WakeUpFromStop/Inc/main.h | 13 +- .../I2C_WakeUpFromStop/Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/I2C/I2C_WakeUpFromStop/Src/main.c | 34 +- .../I2C/I2C_WakeUpFromStop/Src/stm32wbxx_hal_msp.c | 22 +- .../I2C/I2C_WakeUpFromStop/Src/stm32wbxx_it.c | 12 +- .../I2C/I2C_WakeUpFromStop/Src/system_stm32wbxx.c | 15 +- .../Examples/I2C/I2C_WakeUpFromStop/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc | 23 +- .../Examples/I2C/I2C_WakeUpFromStop2/Inc/main.h | 13 +- .../I2C_WakeUpFromStop2/Inc/stm32wbxx_hal_conf.h | 15 +- .../I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/I2C/I2C_WakeUpFromStop2/Src/main.c | 34 +- .../I2C_WakeUpFromStop2/Src/stm32wbxx_hal_msp.c | 22 +- .../I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_it.c | 12 +- .../I2C/I2C_WakeUpFromStop2/Src/system_stm32wbxx.c | 15 +- .../Examples/I2C/I2C_WakeUpFromStop2/readme.txt | 12 +- .../IWDG_Reset/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../IWDG_Reset/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc | 19 +- .../Examples/IWDG/IWDG_Reset/Inc/main.h | 13 +- .../IWDG/IWDG_Reset/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_it.h | 13 +- .../IWDG_Reset/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../IWDG_Reset/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/IWDG/IWDG_Reset/Src/main.c | 22 +- .../IWDG/IWDG_Reset/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/IWDG/IWDG_Reset/Src/stm32wbxx_it.c | 13 +- .../IWDG/IWDG_Reset/Src/system_stm32wbxx.c | 15 +- .../Examples/IWDG/IWDG_Reset/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc | 19 +- .../Examples/IWDG/IWDG_WindowMode/Inc/main.h | 13 +- .../IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h | 15 +- .../IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/IWDG/IWDG_WindowMode/Src/main.c | 22 +- .../IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c | 12 +- .../IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c | 13 +- .../IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c | 15 +- .../Examples/IWDG/IWDG_WindowMode/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../EWARM/stm32wb55xx_sram_cm4.icf | 2 +- .../Examples/LCD/LCD_SegmentsDrive/Inc/main.h | 13 +- .../LCD/LCD_SegmentsDrive/Inc/stm32wbxx_hal_conf.h | 15 +- .../LCD/LCD_SegmentsDrive/Inc/stm32wbxx_it.h | 15 +- .../Inc/stm32wbxx_nucleo_glass_lcd.h | 21 +- .../LCD/LCD_SegmentsDrive/LCD_SegmentsDrive.ioc | 17 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/LCD/LCD_SegmentsDrive/Src/main.c | 34 +- .../LCD/LCD_SegmentsDrive/Src/stm32wbxx_hal_msp.c | 22 +- .../LCD/LCD_SegmentsDrive/Src/stm32wbxx_it.c | 12 +- .../Src/stm32wbxx_nucleo_glass_lcd.c | 15 +- .../LCD/LCD_SegmentsDrive/Src/system_stm32wbxx.c | 15 +- .../Examples/LCD/LCD_SegmentsDrive/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../LPTIM/LPTIM_PWMExternalClock/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h | 13 +- .../LPTIM_PWMExternalClock.ioc | 19 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../LPTIM/LPTIM_PWMExternalClock/Src/main.c | 22 +- .../LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c | 12 +- .../LPTIM_PWMExternalClock/Src/stm32wbxx_it.c | 15 +- .../LPTIM_PWMExternalClock/Src/system_stm32wbxx.c | 15 +- .../LPTIM/LPTIM_PWMExternalClock/readme.txt | 10 +- .../LPTIM_PWM_LSE/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../LPTIM_PWM_LSE/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/LPTIM/LPTIM_PWM_LSE/Inc/main.h | 13 +- .../LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_hal_conf.h | 15 +- .../LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_it.h | 13 +- .../Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc | 19 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c | 22 +- .../LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_hal_msp.c | 14 +- .../LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_it.c | 15 +- .../LPTIM/LPTIM_PWM_LSE/Src/system_stm32wbxx.c | 15 +- .../Examples/LPTIM/LPTIM_PWM_LSE/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h | 13 +- .../LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h | 15 +- .../LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h | 13 +- .../LPTIM_PulseCounter/LPTIM_PulseCounter.ioc | 19 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/LPTIM/LPTIM_PulseCounter/Src/main.c | 22 +- .../LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c | 12 +- .../LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c | 15 +- .../LPTIM_PulseCounter/Src/system_stm32wbxx.c | 15 +- .../Examples/LPTIM/LPTIM_PulseCounter/readme.txt | 10 +- .../LPTIM_Timeout/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../LPTIM_Timeout/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/LPTIM/LPTIM_Timeout/Inc/main.h | 13 +- .../LPTIM/LPTIM_Timeout/Inc/stm32wbxx_hal_conf.h | 15 +- .../LPTIM/LPTIM_Timeout/Inc/stm32wbxx_it.h | 13 +- .../Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc | 19 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/LPTIM/LPTIM_Timeout/Src/main.c | 22 +- .../LPTIM/LPTIM_Timeout/Src/stm32wbxx_hal_msp.c | 12 +- .../LPTIM/LPTIM_Timeout/Src/stm32wbxx_it.c | 15 +- .../LPTIM/LPTIM_Timeout/Src/system_stm32wbxx.c | 15 +- .../Examples/LPTIM/LPTIM_Timeout/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/ecdsa_priv_prime256v1.h | 13 +- .../PKA/PKA_ECCscalarMultiplication/Inc/main.h | 13 +- .../PKA_ECCscalarMultiplication/Inc/prime256v1.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../PKA_ECCscalarMultiplication/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ECCscalarMultiplication.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/ecdsa_priv_prime256v1.c | 15 +- .../PKA/PKA_ECCscalarMultiplication/Src/main.c | 31 +- .../PKA_ECCscalarMultiplication/Src/prime256v1.c | 15 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../PKA_ECCscalarMultiplication/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../PKA/PKA_ECCscalarMultiplication/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/ecdsa_priv_prime256v1.h | 13 +- .../PKA/PKA_ECCscalarMultiplication_IT/Inc/main.h | 13 +- .../Inc/prime256v1.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ECCscalarMultiplication_IT.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/ecdsa_priv_prime256v1.c | 15 +- .../PKA/PKA_ECCscalarMultiplication_IT/Src/main.c | 31 +- .../Src/prime256v1.c | 15 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../PKA/PKA_ECCscalarMultiplication_IT/readme.txt | 10 +- .../PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/main.h | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h | 13 +- .../PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/main.c | 31 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c | 15 +- .../PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c | 15 +- .../Examples/PKA/PKA_ECDSA_Sign/readme.txt | 14 +- .../PKA_ECDSA_Sign_IT/EWARM/PKA_ECDSA_Sign_IT.ewp | 6 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_ECDSA_Sign_IT/Inc/SigGen.h | 13 +- .../Examples/PKA/PKA_ECDSA_Sign_IT/Inc/main.h | 13 +- .../PKA/PKA_ECDSA_Sign_IT/Inc/prime256v1.h | 13 +- .../PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PKA/PKA_ECDSA_Sign_IT/Src/SigGen.c | 13 +- .../Examples/PKA/PKA_ECDSA_Sign_IT/Src/main.c | 31 +- .../PKA/PKA_ECDSA_Sign_IT/Src/prime256v1.c | 15 +- .../PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_hal_msp.c | 13 +- .../PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Sign_IT/Src/system_stm32wbxx.c | 15 +- .../Examples/PKA/PKA_ECDSA_Sign_IT/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_ECDSA_Verify/Inc/SigVer.h | 13 +- .../Examples/PKA/PKA_ECDSA_Verify/Inc/main.h | 13 +- .../Examples/PKA/PKA_ECDSA_Verify/Inc/prime256v1.h | 13 +- .../PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_hal_conf.h | 15 +- .../PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PKA/PKA_ECDSA_Verify/Src/SigVer.c | 13 +- .../Examples/PKA/PKA_ECDSA_Verify/Src/main.c | 31 +- .../Examples/PKA/PKA_ECDSA_Verify/Src/prime256v1.c | 15 +- .../PKA/PKA_ECDSA_Verify/Src/stm32wbxx_hal_msp.c | 13 +- .../PKA/PKA_ECDSA_Verify/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Verify/Src/system_stm32wbxx.c | 15 +- .../Examples/PKA/PKA_ECDSA_Verify/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h | 13 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h | 13 +- .../PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h | 13 +- .../PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c | 13 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c | 31 +- .../PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c | 15 +- .../PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c | 13 +- .../PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c | 15 +- .../Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../PKA/PKA_ModularExponentiation/Inc/ciphertext.h | 13 +- .../PKA/PKA_ModularExponentiation/Inc/main.h | 13 +- .../PKA/PKA_ModularExponentiation/Inc/plaintext.h | 13 +- .../PKA_ModularExponentiation/Inc/rsa_priv_2048.h | 13 +- .../PKA_ModularExponentiation/Inc/rsa_pub_2048.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../PKA_ModularExponentiation/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ModularExponentiation.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../PKA/PKA_ModularExponentiation/Src/ciphertext.c | 14 +- .../PKA/PKA_ModularExponentiation/Src/main.c | 31 +- .../PKA/PKA_ModularExponentiation/Src/plaintext.c | 14 +- .../PKA_ModularExponentiation/Src/rsa_priv_2048.c | 15 +- .../PKA_ModularExponentiation/Src/rsa_pub_2048.c | 15 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../PKA_ModularExponentiation/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../PKA/PKA_ModularExponentiation/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../PKA_ModularExponentiationCRT/Inc/ciphertext.h | 13 +- .../PKA/PKA_ModularExponentiationCRT/Inc/main.h | 13 +- .../PKA_ModularExponentiationCRT/Inc/plaintext.h | 13 +- .../Inc/rsa_priv_2048.h | 13 +- .../Inc/rsa_pub_2048.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ModularExponentiationCRT.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../PKA_ModularExponentiationCRT/Src/ciphertext.c | 14 +- .../PKA/PKA_ModularExponentiationCRT/Src/main.c | 31 +- .../PKA_ModularExponentiationCRT/Src/plaintext.c | 14 +- .../Src/rsa_priv_2048.c | 15 +- .../Src/rsa_pub_2048.c | 15 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../PKA/PKA_ModularExponentiationCRT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/ciphertext.h | 13 +- .../PKA/PKA_ModularExponentiationCRT_IT/Inc/main.h | 13 +- .../Inc/plaintext.h | 13 +- .../Inc/rsa_priv_2048.h | 13 +- .../Inc/rsa_pub_2048.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ModularExponentiationCRT_IT.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/ciphertext.c | 14 +- .../PKA/PKA_ModularExponentiationCRT_IT/Src/main.c | 31 +- .../Src/plaintext.c | 14 +- .../Src/rsa_priv_2048.c | 15 +- .../Src/rsa_pub_2048.c | 15 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../PKA/PKA_ModularExponentiationCRT_IT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../PKA_ModularExponentiation_IT/Inc/ciphertext.h | 13 +- .../PKA/PKA_ModularExponentiation_IT/Inc/main.h | 13 +- .../PKA_ModularExponentiation_IT/Inc/plaintext.h | 13 +- .../Inc/rsa_priv_2048.h | 13 +- .../Inc/rsa_pub_2048.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ModularExponentiation_IT.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../PKA_ModularExponentiation_IT/Src/ciphertext.c | 14 +- .../PKA/PKA_ModularExponentiation_IT/Src/main.c | 31 +- .../PKA_ModularExponentiation_IT/Src/plaintext.c | 14 +- .../Src/rsa_priv_2048.c | 15 +- .../Src/rsa_pub_2048.c | 15 +- .../Src/stm32wbxx_hal_msp.c | 13 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../PKA/PKA_ModularExponentiation_IT/readme.txt | 10 +- .../PKA_PointCheck/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PKA_PointCheck/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_PointCheck/Inc/PKV.h | 13 +- .../Examples/PKA/PKA_PointCheck/Inc/main.h | 13 +- .../Examples/PKA/PKA_PointCheck/Inc/prime256v1.h | 13 +- .../PKA/PKA_PointCheck/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PKA/PKA_PointCheck/Src/PKV.c | 12 +- .../Examples/PKA/PKA_PointCheck/Src/main.c | 31 +- .../Examples/PKA/PKA_PointCheck/Src/prime256v1.c | 15 +- .../PKA/PKA_PointCheck/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/PKA/PKA_PointCheck/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_PointCheck/Src/system_stm32wbxx.c | 15 +- .../Examples/PKA/PKA_PointCheck/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PKA/PKA_PointCheck_IT/Inc/PKV.h | 13 +- .../Examples/PKA/PKA_PointCheck_IT/Inc/main.h | 13 +- .../PKA/PKA_PointCheck_IT/Inc/prime256v1.h | 13 +- .../PKA/PKA_PointCheck_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../PKA/PKA_PointCheck_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PKA/PKA_PointCheck_IT/Src/PKV.c | 12 +- .../Examples/PKA/PKA_PointCheck_IT/Src/main.c | 31 +- .../PKA/PKA_PointCheck_IT/Src/prime256v1.c | 15 +- .../PKA/PKA_PointCheck_IT/Src/stm32wbxx_hal_msp.c | 13 +- .../PKA/PKA_PointCheck_IT/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_PointCheck_IT/Src/system_stm32wbxx.c | 15 +- .../Examples/PKA/PKA_PointCheck_IT/readme.txt | 14 +- .../PWR/PWR_LPRUN/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PWR/PWR_LPRUN/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_LPRUN/Inc/main.h | 13 +- .../PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h | 15 +- .../PWR_LPRUN/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../PWR_LPRUN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PWR/PWR_LPRUN/Src/main.c | 22 +- .../Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c | 14 +- .../Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c | 13 +- .../Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c | 15 +- .../Examples/PWR/PWR_LPRUN/readme.txt | 10 +- .../PWR_LPSLEEP/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PWR_LPSLEEP/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_LPSLEEP/Inc/main.h | 13 +- .../PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h | 13 +- .../PWR_LPSLEEP/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PWR/PWR_LPSLEEP/Src/main.c | 22 +- .../PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c | 14 +- .../Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c | 13 +- .../PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c | 15 +- .../Examples/PWR/PWR_LPSLEEP/readme.txt | 10 +- .../PWR/PWR_PVD/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PWR/PWR_PVD/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_PVD/Inc/main.h | 13 +- .../Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h | 13 +- .../PWR/PWR_PVD/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/PWR/PWR_PVD/PWR_PVD.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../PWR_PVD/STM32CubeIDE/Application/User/sysmem.c | 27 +- .../PWR_PVD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PWR/PWR_PVD/Src/main.c | 24 +- .../Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c | 13 +- .../Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c | 15 +- .../Examples/PWR/PWR_PVD/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_STANDBY_RTC/Inc/main.h | 13 +- .../PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h | 15 +- .../PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PWR/PWR_STANDBY_RTC/Src/main.c | 23 +- .../PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c | 12 +- .../PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c | 13 +- .../PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c | 15 +- .../Examples/PWR/PWR_STANDBY_RTC/readme.txt | 10 +- .../PWR_STOP2_RTC/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PWR_STOP2_RTC/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/PWR/PWR_STOP2_RTC/Inc/main.h | 13 +- .../PWR/PWR_STOP2_RTC/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/PWR/PWR_STOP2_RTC/Src/main.c | 22 +- .../PWR/PWR_STOP2_RTC/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_it.c | 13 +- .../PWR/PWR_STOP2_RTC/Src/system_stm32wbxx.c | 15 +- .../Examples/PWR/PWR_STOP2_RTC/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../EWARM/stm32wb55xx_sram_cm4.icf | 2 +- .../Examples/QSPI/QSPI_ExecuteInPlace/Inc/main.h | 13 +- .../QSPI_ExecuteInPlace/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../QSPI_ExecuteInPlace/QSPI_ExecuteInPlace.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/QSPI/QSPI_ExecuteInPlace/Src/main.c | 47 +- .../QSPI_ExecuteInPlace/Src/stm32wbxx_hal_msp.c | 37 +- .../QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_it.c | 12 +- .../QSPI_ExecuteInPlace/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_ExecuteInPlace/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../EWARM/stm32wb55xx_sram_cm4.icf | 2 +- .../Examples/QSPI/QSPI_MemoryMapped/Inc/main.h | 13 +- .../QSPI_MemoryMapped/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../QSPI/QSPI_MemoryMapped/QSPI_MemoryMapped.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/QSPI/QSPI_MemoryMapped/Src/main.c | 47 +- .../QSPI/QSPI_MemoryMapped/Src/stm32wbxx_hal_msp.c | 37 +- .../QSPI/QSPI_MemoryMapped/Src/stm32wbxx_it.c | 12 +- .../QSPI/QSPI_MemoryMapped/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_MemoryMapped/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../EWARM/stm32wb55xx_sram_cm4.icf | 2 +- .../Examples/QSPI/QSPI_ReadWrite_DMA/Inc/main.h | 13 +- .../QSPI_ReadWrite_DMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../QSPI/QSPI_ReadWrite_DMA/QSPI_ReadWrite_DMA.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/QSPI/QSPI_ReadWrite_DMA/Src/main.c | 47 +- .../QSPI_ReadWrite_DMA/Src/stm32wbxx_hal_msp.c | 37 +- .../QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_it.c | 12 +- .../QSPI/QSPI_ReadWrite_DMA/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_ReadWrite_DMA/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../EWARM/stm32wb55xx_sram_cm4.icf | 2 +- .../Examples/QSPI/QSPI_ReadWrite_IT/Inc/main.h | 13 +- .../QSPI_ReadWrite_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_it.h | 15 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../QSPI/QSPI_ReadWrite_IT/QSPI_ReadWrite_IT.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/QSPI/QSPI_ReadWrite_IT/Src/main.c | 47 +- .../QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_hal_msp.c | 36 +- .../QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_it.c | 12 +- .../QSPI/QSPI_ReadWrite_IT/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_ReadWrite_IT/readme.txt | 14 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RCC/RCC_CRS_Synchronization_IT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../RCC_CRS_Synchronization_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RCC_CRS_Synchronization_IT.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RCC/RCC_CRS_Synchronization_IT/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../RCC_CRS_Synchronization_IT/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../RCC/RCC_CRS_Synchronization_IT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RCC/RCC_CRS_Synchronization_Polling/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RCC_CRS_Synchronization_Polling.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RCC/RCC_CRS_Synchronization_Polling/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../RCC/RCC_CRS_Synchronization_Polling/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RCC/RCC_ClockConfig/Inc/main.h | 13 +- .../RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h | 15 +- .../RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RCC/RCC_ClockConfig/RCC_ClockConfig.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/RCC/RCC_ClockConfig/Src/main.c | 22 +- .../RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c | 12 +- .../RCC/RCC_ClockConfig/Src/stm32wbxx_it.c | 13 +- .../RCC/RCC_ClockConfig/Src/system_stm32wbxx.c | 15 +- .../Examples/RCC/RCC_ClockConfig/readme.txt | 10 +- .../RNG_MultiRNG/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../RNG_MultiRNG/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RNG/RNG_MultiRNG/Inc/main.h | 13 +- .../RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h | 13 +- .../RNG_MultiRNG/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/RNG/RNG_MultiRNG/Src/main.c | 22 +- .../RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c | 13 +- .../RNG/RNG_MultiRNG/Src/system_stm32wbxx.c | 15 +- .../Examples/RNG/RNG_MultiRNG/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RNG/RNG_MultiRNG_IT/Inc/main.h | 13 +- .../RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/RNG/RNG_MultiRNG_IT/Src/main.c | 22 +- .../RNG/RNG_MultiRNG_IT/Src/stm32wbxx_hal_msp.c | 12 +- .../RNG/RNG_MultiRNG_IT/Src/stm32wbxx_it.c | 13 +- .../RNG/RNG_MultiRNG_IT/Src/system_stm32wbxx.c | 15 +- .../Examples/RNG/RNG_MultiRNG_IT/readme.txt | 10 +- .../RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../RTC/RTC_Alarm/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RTC/RTC_Alarm/Inc/main.h | 13 +- .../RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h | 13 +- .../RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/RTC/RTC_Alarm/RTC_Alarm.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/RTC/RTC_Alarm/Src/main.c | 22 +- .../Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c | 13 +- .../Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c | 15 +- .../Examples/RTC/RTC_Alarm/readme.txt | 10 +- .../RTC_Calendar/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../RTC_Calendar/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RTC/RTC_Calendar/Inc/main.h | 13 +- .../RTC/RTC_Calendar/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RTC/RTC_Calendar/Inc/stm32wbxx_it.h | 13 +- .../RTC_Calendar/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/RTC/RTC_Calendar/RTC_Calendar.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/RTC/RTC_Calendar/Src/main.c | 22 +- .../RTC/RTC_Calendar/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/RTC/RTC_Calendar/Src/stm32wbxx_it.c | 13 +- .../RTC/RTC_Calendar/Src/system_stm32wbxx.c | 15 +- .../Examples/RTC/RTC_Calendar/readme.txt | 10 +- .../RTC/RTC_LSI/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../RTC/RTC_LSI/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RTC/RTC_LSI/Inc/main.h | 13 +- .../Examples/RTC/RTC_LSI/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RTC/RTC_LSI/Inc/stm32wbxx_it.h | 13 +- .../RTC/RTC_LSI/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/RTC/RTC_LSI/RTC_LSI.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../RTC_LSI/STM32CubeIDE/Application/User/sysmem.c | 29 +- .../RTC_LSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/RTC/RTC_LSI/Src/main.c | 22 +- .../Examples/RTC/RTC_LSI/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/RTC/RTC_LSI/Src/stm32wbxx_it.c | 13 +- .../Examples/RTC/RTC_LSI/Src/system_stm32wbxx.c | 15 +- .../Examples/RTC/RTC_LSI/readme.txt | 10 +- .../RTC/RTC_Tamper/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../RTC/RTC_Tamper/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RTC/RTC_Tamper/Inc/main.h | 13 +- .../RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h | 13 +- .../RTC_Tamper/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/RTC/RTC_Tamper/RTC_Tamper.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../RTC_Tamper/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/RTC/RTC_Tamper/Src/main.c | 22 +- .../RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c | 13 +- .../Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c | 15 +- .../Examples/RTC/RTC_Tamper/readme.txt | 10 +- .../RTC_TimeStamp/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../RTC_TimeStamp/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/RTC/RTC_TimeStamp/Inc/main.h | 13 +- .../RTC/RTC_TimeStamp/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/RTC/RTC_TimeStamp/Src/main.c | 22 +- .../RTC/RTC_TimeStamp/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_it.c | 13 +- .../RTC/RTC_TimeStamp/Src/system_stm32wbxx.c | 15 +- .../Examples/RTC/RTC_TimeStamp/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComDMA_Master.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_FullDuplex_ComDMA_Master/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComDMA_Slave.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComIT_Master/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComIT_Master.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI/SPI_FullDuplex_ComIT_Master/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_FullDuplex_ComIT_Master/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComIT_Slave/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComIT_Slave.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI/SPI_FullDuplex_ComIT_Slave/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_FullDuplex_ComIT_Slave/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI_FullDuplex_ComPolling_Master/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComPolling_Master.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI_FullDuplex_ComPolling_Master/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI_FullDuplex_ComPolling_Master/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComPolling_Slave.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt | 10 +- .../TIM/TIM_DMA/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM/TIM_DMA/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_DMA/Inc/main.h | 13 +- .../Examples/TIM/TIM_DMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_DMA/Inc/stm32wbxx_it.h | 13 +- .../TIM/TIM_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../TIM_DMA/STM32CubeIDE/Application/User/sysmem.c | 27 +- .../TIM_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_DMA/Src/main.c | 22 +- .../Examples/TIM/TIM_DMA/Src/stm32wbxx_hal_msp.c | 15 +- .../Examples/TIM/TIM_DMA/Src/stm32wbxx_it.c | 15 +- .../Examples/TIM/TIM_DMA/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_DMA/TIM_DMA.ioc | 19 +- .../Examples/TIM/TIM_DMA/readme.txt | 10 +- .../TIM_DMABurst/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_DMABurst/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_DMABurst/Inc/main.h | 13 +- .../TIM/TIM_DMABurst/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_it.h | 13 +- .../TIM_DMABurst/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_DMABurst/Src/main.c | 22 +- .../TIM/TIM_DMABurst/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_DMABurst/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_DMABurst/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc | 19 +- .../Examples/TIM/TIM_DMABurst/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_InputCapture/Inc/main.h | 13 +- .../TIM/TIM_InputCapture/Inc/stm32wbxx_hal_conf.h | 15 +- .../TIM/TIM_InputCapture/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/TIM/TIM_InputCapture/Src/main.c | 22 +- .../TIM/TIM_InputCapture/Src/stm32wbxx_hal_msp.c | 12 +- .../TIM/TIM_InputCapture/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_InputCapture/Src/system_stm32wbxx.c | 15 +- .../TIM/TIM_InputCapture/TIM_InputCapture.ioc | 19 +- .../Examples/TIM/TIM_InputCapture/readme.txt | 10 +- .../TIM_OCActive/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_OCActive/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_OCActive/Inc/main.h | 13 +- .../TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h | 13 +- .../TIM_OCActive/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_OCActive/Src/main.c | 22 +- .../TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_OCActive/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_OCActive/TIM_OCActive.ioc | 19 +- .../Examples/TIM/TIM_OCActive/readme.txt | 10 +- .../TIM_OCInactive/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_OCInactive/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_OCInactive/Inc/main.h | 13 +- .../TIM/TIM_OCInactive/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_OCInactive/Src/main.c | 22 +- .../TIM/TIM_OCInactive/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_OCInactive/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_OCInactive/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc | 19 +- .../Examples/TIM/TIM_OCInactive/readme.txt | 10 +- .../TIM_OCToggle/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_OCToggle/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_OCToggle/Inc/main.h | 13 +- .../TIM/TIM_OCToggle/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_it.h | 13 +- .../TIM_OCToggle/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_OCToggle/Src/main.c | 22 +- .../TIM/TIM_OCToggle/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_OCToggle/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_OCToggle/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc | 19 +- .../Examples/TIM/TIM_OCToggle/readme.txt | 10 +- .../TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../Examples/TIM/TIM_OnePulse/Inc/main.h | 13 +- .../TIM/TIM_OnePulse/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h | 13 +- .../TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_OnePulse/Src/main.c | 13 +- .../TIM/TIM_OnePulse/Src/stm32wbxx_hal_msp.c | 13 +- .../Examples/TIM/TIM_OnePulse/Src/stm32wbxx_it.c | 13 +- .../TIM/TIM_OnePulse/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_OnePulse/readme.txt | 27 +- .../TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_PWMInput/Inc/main.h | 13 +- .../TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h | 13 +- .../TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_PWMInput/Src/main.c | 22 +- .../TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_PWMInput/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc | 19 +- .../Examples/TIM/TIM_PWMInput/readme.txt | 10 +- .../TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_PWMOutput/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_PWMOutput/Inc/main.h | 13 +- .../TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_PWMOutput/Src/main.c | 22 +- .../TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_PWMOutput/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc | 19 +- .../Examples/TIM/TIM_PWMOutput/readme.txt | 10 +- .../TIM_TimeBase/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/TIM/TIM_TimeBase/Inc/main.h | 13 +- .../TIM/TIM_TimeBase/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_it.h | 13 +- .../TIM_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/TIM/TIM_TimeBase/Src/main.c | 22 +- .../TIM/TIM_TimeBase/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/TIM/TIM_TimeBase/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_TimeBase/Src/system_stm32wbxx.c | 15 +- .../Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc | 19 +- .../Examples/TIM/TIM_TimeBase/readme.txt | 10 +- .../TSC/TSC_BasicAcquisition_Interrupt/readme.txt | 10 +- .../UART_Console/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../UART_Console/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../UART_Console/EWARM/stm32wb55xx_sram_cm4.icf | 2 +- .../Examples/UART/UART_Console/Inc/main.h | 13 +- .../UART/UART_Console/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/UART/UART_Console/Inc/stm32wbxx_it.h | 13 +- .../UART_Console/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples/UART/UART_Console/Src/main.c | 22 +- .../UART/UART_Console/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/UART/UART_Console/Src/stm32wbxx_it.c | 13 +- .../UART/UART_Console/Src/system_stm32wbxx.c | 15 +- .../Examples/UART/UART_Console/UART_Console.ioc | 19 +- .../Examples/UART/UART_Console/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../UART/UART_HyperTerminal_DMA/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../UART/UART_HyperTerminal_DMA/Src/main.c | 22 +- .../UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c | 12 +- .../UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c | 13 +- .../UART_HyperTerminal_DMA/Src/system_stm32wbxx.c | 15 +- .../UART_HyperTerminal_DMA.ioc | 19 +- .../UART/UART_HyperTerminal_DMA/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/UART/UART_HyperTerminal_IT/Inc/main.h | 13 +- .../UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/UART/UART_HyperTerminal_IT/Src/main.c | 26 +- .../UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c | 12 +- .../UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c | 13 +- .../UART_HyperTerminal_IT/Src/system_stm32wbxx.c | 15 +- .../UART_HyperTerminal_IT.ioc | 19 +- .../Examples/UART/UART_HyperTerminal_IT/readme.txt | 10 +- .../UART_Printf/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../UART_Printf/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/UART/UART_Printf/Inc/main.h | 13 +- .../UART/UART_Printf/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/UART/UART_Printf/Inc/stm32wbxx_it.h | 13 +- .../UART_Printf/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/UART/UART_Printf/Src/main.c | 22 +- .../UART/UART_Printf/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/UART/UART_Printf/Src/stm32wbxx_it.c | 13 +- .../UART/UART_Printf/Src/system_stm32wbxx.c | 15 +- .../Examples/UART/UART_Printf/UART_Printf.ioc | 19 +- .../Examples/UART/UART_Printf/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../EWARM/stm32wb55xx_sram_cm4.icf | 2 +- .../UART_ReceptionToIdle_CircularDMA/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../UART_ReceptionToIdle_CircularDMA/Src/main.c | 34 +- .../Src/stm32wbxx_hal_msp.c | 22 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../UART_ReceptionToIdle_CircularDMA.ioc | 17 +- .../UART_ReceptionToIdle_CircularDMA/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/UART/UART_TwoBoards_ComDMA/Inc/main.h | 13 +- .../UART_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/UART/UART_TwoBoards_ComDMA/Src/main.c | 22 +- .../UART_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c | 12 +- .../UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_it.c | 13 +- .../UART_TwoBoards_ComDMA/Src/system_stm32wbxx.c | 15 +- .../UART_TwoBoards_ComDMA.ioc | 19 +- .../Examples/UART/UART_TwoBoards_ComDMA/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/UART/UART_TwoBoards_ComIT/Inc/main.h | 13 +- .../UART_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/UART/UART_TwoBoards_ComIT/Src/main.c | 23 +- .../UART_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c | 12 +- .../UART/UART_TwoBoards_ComIT/Src/stm32wbxx_it.c | 13 +- .../UART_TwoBoards_ComIT/Src/system_stm32wbxx.c | 15 +- .../UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc | 19 +- .../Examples/UART/UART_TwoBoards_ComIT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../UART/UART_TwoBoards_ComPolling/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../UART_TwoBoards_ComPolling/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../UART/UART_TwoBoards_ComPolling/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../UART_TwoBoards_ComPolling/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../UART_TwoBoards_ComPolling.ioc | 19 +- .../UART/UART_TwoBoards_ComPolling/readme.txt | 10 +- .../WWDG_Example/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../WWDG_Example/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples/WWDG/WWDG_Example/Inc/main.h | 13 +- .../WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h | 13 +- .../WWDG_Example/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples/WWDG/WWDG_Example/Src/main.c | 22 +- .../WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c | 13 +- .../WWDG/WWDG_Example/Src/system_stm32wbxx.c | 15 +- .../Examples/WWDG/WWDG_Example/WWDG_Example.ioc | 19 +- .../Examples/WWDG/WWDG_Example/readme.txt | 10 +- .../ADC_AnalogWatchdog_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../ADC/ADC_AnalogWatchdog_Init/Inc/main.h | 13 +- .../ADC/ADC_AnalogWatchdog_Init/Inc/stm32_assert.h | 15 +- .../ADC/ADC_AnalogWatchdog_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC/ADC_AnalogWatchdog_Init/Src/main.c | 29 +- .../ADC/ADC_AnalogWatchdog_Init/Src/stm32wbxx_it.c | 12 +- .../ADC_AnalogWatchdog_Init/Src/system_stm32wbxx.c | 15 +- .../ADC/ADC_AnalogWatchdog_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../ADC_ContinuousConversion_TriggerSW/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC_ContinuousConversion_TriggerSW/Src/main.c | 33 +- .../Src/stm32wbxx_it.c | 15 +- .../Src/system_stm32wbxx.c | 15 +- .../ADC_ContinuousConversion_TriggerSW/readme.txt | 10 +- .../ADC_ContinuousConversion_TriggerSW_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 29 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- ...ontinuousConversion_TriggerSW_LowPower_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 29 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../ADC_GroupsRegularInjected_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../ADC/ADC_GroupsRegularInjected_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC/ADC_GroupsRegularInjected_Init/Src/main.c | 31 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../ADC/ADC_GroupsRegularInjected_Init/readme.txt | 10 +- .../ADC_Oversampling_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../ADC/ADC_Oversampling_Init/Inc/main.h | 13 +- .../ADC/ADC_Oversampling_Init/Inc/stm32_assert.h | 15 +- .../ADC/ADC_Oversampling_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC/ADC_Oversampling_Init/Src/main.c | 29 +- .../ADC/ADC_Oversampling_Init/Src/stm32wbxx_it.c | 12 +- .../ADC_Oversampling_Init/Src/system_stm32wbxx.c | 15 +- .../ADC/ADC_Oversampling_Init/readme.txt | 10 +- .../ADC_SingleConversion_TriggerSW_DMA_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 29 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../ADC_SingleConversion_TriggerSW_IT_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 29 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../ADC_SingleConversion_TriggerSW_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../ADC_SingleConversion_TriggerSW_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC_SingleConversion_TriggerSW_Init/Src/main.c | 29 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../ADC_SingleConversion_TriggerSW_Init/readme.txt | 10 +- .../ADC_SingleConversion_TriggerTimer_DMA_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 29 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../ADC/ADC_TemperatureSensor/Inc/main.h | 13 +- .../ADC/ADC_TemperatureSensor/Inc/stm32_assert.h | 15 +- .../ADC/ADC_TemperatureSensor/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC/ADC_TemperatureSensor/Src/main.c | 33 +- .../ADC/ADC_TemperatureSensor/Src/stm32wbxx_it.c | 15 +- .../ADC_TemperatureSensor/Src/system_stm32wbxx.c | 15 +- .../ADC/ADC_TemperatureSensor/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c | 13 +- .../Src/stm32wbxx_it.c | 15 +- .../Src/system_stm32wbxx.c | 15 +- .../COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt | 10 +- .../COMP_CompareGpioVsVrefInt_IT_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../COMP_CompareGpioVsVrefInt_IT_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../COMP_CompareGpioVsVrefInt_IT_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 14 +- .../Src/system_stm32wbxx.c | 15 +- .../COMP_CompareGpioVsVrefInt_IT_Init/readme.txt | 10 +- .../COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc | 17 +- .../CORTEX_MPU/EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../CORTEX_MPU/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/CORTEX/CORTEX_MPU/Inc/main.h | 13 +- .../CORTEX/CORTEX_MPU/Inc/stm32_assert.h | 15 +- .../CORTEX/CORTEX_MPU/Inc/stm32wbxx_it.h | 13 +- .../CORTEX_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../CORTEX_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/CORTEX/CORTEX_MPU/Src/main.c | 25 +- .../CORTEX/CORTEX_MPU/Src/stm32wbxx_it.c | 12 +- .../CORTEX/CORTEX_MPU/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/CORTEX/CORTEX_MPU/readme.txt | 27 +- .../CRC_CalculateAndCheck.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../CRC/CRC_CalculateAndCheck/Inc/main.h | 13 +- .../CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h | 15 +- .../CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../CRC/CRC_CalculateAndCheck/Src/main.c | 25 +- .../CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c | 12 +- .../CRC_CalculateAndCheck/Src/system_stm32wbxx.c | 15 +- .../CRC/CRC_CalculateAndCheck/readme.txt | 10 +- .../CRC_UserDefinedPolynomial.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../CRC/CRC_UserDefinedPolynomial/Inc/main.h | 13 +- .../CRC_UserDefinedPolynomial/Inc/stm32_assert.h | 15 +- .../CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../CRC/CRC_UserDefinedPolynomial/Src/main.c | 25 +- .../CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../CRC/CRC_UserDefinedPolynomial/readme.txt | 10 +- .../CRS_Synchronization_IT.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../CRS/CRS_Synchronization_IT/Inc/main.h | 13 +- .../CRS/CRS_Synchronization_IT/Inc/stm32_assert.h | 15 +- .../CRS/CRS_Synchronization_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../CRS/CRS_Synchronization_IT/Src/main.c | 25 +- .../CRS/CRS_Synchronization_IT/Src/stm32wbxx_it.c | 12 +- .../CRS_Synchronization_IT/Src/system_stm32wbxx.c | 15 +- .../CRS/CRS_Synchronization_IT/readme.txt | 10 +- .../CRS_Synchronization_Polling.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../CRS/CRS_Synchronization_Polling/Inc/main.h | 13 +- .../CRS_Synchronization_Polling/Inc/stm32_assert.h | 15 +- .../CRS_Synchronization_Polling/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../CRS/CRS_Synchronization_Polling/Src/main.c | 25 +- .../CRS_Synchronization_Polling/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../CRS/CRS_Synchronization_Polling/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../DMA/DMA_CopyFromFlashToMemory/Inc/main.h | 13 +- .../DMA_CopyFromFlashToMemory/Inc/stm32_assert.h | 15 +- .../DMA_CopyFromFlashToMemory/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../DMA/DMA_CopyFromFlashToMemory/Src/main.c | 19 +- .../DMA_CopyFromFlashToMemory/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../DMA/DMA_CopyFromFlashToMemory/readme.txt | 10 +- .../DMA_CopyFromFlashToMemory_Init.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c | 31 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../DMA/DMA_CopyFromFlashToMemory_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/main.h | 13 +- .../EXTI/EXTI_ToggleLedOnIT/Inc/stm32_assert.h | 15 +- .../EXTI/EXTI_ToggleLedOnIT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/main.c | 13 +- .../EXTI/EXTI_ToggleLedOnIT/Src/stm32wbxx_it.c | 15 +- .../EXTI/EXTI_ToggleLedOnIT/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/EXTI/EXTI_ToggleLedOnIT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../EXTI_ToggleLedOnIT_Init.ioc | 17 +- .../EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h | 13 +- .../EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h | 15 +- .../EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c | 25 +- .../EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c | 14 +- .../EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c | 15 +- .../EXTI/EXTI_ToggleLedOnIT_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../GPIO/GPIO_InfiniteLedToggling/Inc/main.h | 13 +- .../GPIO_InfiniteLedToggling/Inc/stm32_assert.h | 15 +- .../GPIO_InfiniteLedToggling/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../GPIO/GPIO_InfiniteLedToggling/Src/main.c | 13 +- .../GPIO_InfiniteLedToggling/Src/stm32wbxx_it.c | 15 +- .../Src/system_stm32wbxx.c | 15 +- .../GPIO/GPIO_InfiniteLedToggling/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../GPIO_InfiniteLedToggling_Init.ioc | 17 +- .../GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../GPIO/GPIO_InfiniteLedToggling_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc | 17 +- .../Examples_LL/HSEM/HSEM_DualProcess/Inc/main.h | 13 +- .../HSEM/HSEM_DualProcess/Inc/stm32_assert.h | 15 +- .../HSEM/HSEM_DualProcess/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/HSEM/HSEM_DualProcess/Src/main.c | 25 +- .../HSEM/HSEM_DualProcess/Src/stm32wbxx_it.c | 12 +- .../HSEM/HSEM_DualProcess/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/HSEM/HSEM_DualProcess/readme.txt | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc | 17 +- .../HSEM/HSEM_DualProcess_IT/Inc/main.h | 13 +- .../HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h | 15 +- .../HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../HSEM/HSEM_DualProcess_IT/Src/main.c | 25 +- .../HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c | 12 +- .../HSEM_DualProcess_IT/Src/system_stm32wbxx.c | 15 +- .../HSEM/HSEM_DualProcess_IT/readme.txt | 18 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- ...I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc | 31 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_OneBoard_Communication_DMAAndIT_Init.ioc | 31 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 27 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../I2C/I2C_OneBoard_Communication_IT/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../I2C/I2C_OneBoard_Communication_IT/Src/main.c | 13 +- .../Src/stm32wbxx_it.c | 15 +- .../Src/system_stm32wbxx.c | 15 +- .../I2C/I2C_OneBoard_Communication_IT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_OneBoard_Communication_IT_Init.ioc | 31 +- .../I2C_OneBoard_Communication_IT_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../I2C_OneBoard_Communication_IT_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../I2C_OneBoard_Communication_IT_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- ...2C_OneBoard_Communication_PollingAndIT_Init.ioc | 30 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 27 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc | 23 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc | 23 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 27 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc | 21 +- .../I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/main.c | 27 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../I2C_TwoBoards_MasterTx_SlaveRx_Init/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc | 23 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc | 23 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../IWDG_RefreshUntilUserEvent_Init.ioc | 17 +- .../IWDG_RefreshUntilUserEvent_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../IWDG_RefreshUntilUserEvent_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../IWDG_RefreshUntilUserEvent_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../LPTIM/LPTIM_PulseCounter/Inc/main.h | 13 +- .../LPTIM/LPTIM_PulseCounter/Inc/stm32_assert.h | 15 +- .../LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../LPTIM/LPTIM_PulseCounter/Src/main.c | 13 +- .../LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c | 15 +- .../LPTIM_PulseCounter/Src/system_stm32wbxx.c | 15 +- .../LPTIM/LPTIM_PulseCounter/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../LPTIM/LPTIM_PulseCounter_Init/Inc/main.h | 13 +- .../LPTIM_PulseCounter_Init/Inc/stm32_assert.h | 15 +- .../LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h | 13 +- .../LPTIM_PulseCounter_Init.ioc | 17 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../LPTIM/LPTIM_PulseCounter_Init/Src/main.c | 25 +- .../LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c | 14 +- .../LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c | 15 +- .../LPTIM/LPTIM_PulseCounter_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../LPUART/LPUART_WakeUpFromStop2_Init/Inc/main.h | 13 +- .../LPUART_WakeUpFromStop2_Init/Inc/stm32_assert.h | 15 +- .../LPUART_WakeUpFromStop2_Init/Inc/stm32wbxx_it.h | 13 +- .../LPUART_WakeUpFromStop2_Init.ioc | 17 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../LPUART/LPUART_WakeUpFromStop2_Init/Src/main.c | 25 +- .../LPUART_WakeUpFromStop2_Init/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../LPUART/LPUART_WakeUpFromStop2_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h | 13 +- .../LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h | 15 +- .../LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h | 13 +- .../LPUART_WakeUpFromStop_Init.ioc | 17 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../LPUART/LPUART_WakeUpFromStop_Init/Src/main.c | 25 +- .../LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../LPUART/LPUART_WakeUpFromStop_Init/readme.txt | 10 +- .../PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h | 13 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h | 13 +- .../PKA/PKA_ECDSA_Sign/Inc/prime256v1.h | 13 +- .../PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h | 15 +- .../PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c | 13 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c | 27 +- .../PKA/PKA_ECDSA_Sign/Src/prime256v1.c | 15 +- .../PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c | 12 +- .../PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../PKA/PKA_ModularExponentiation/Inc/ciphertext.h | 13 +- .../PKA/PKA_ModularExponentiation/Inc/main.h | 13 +- .../PKA/PKA_ModularExponentiation/Inc/plaintext.h | 13 +- .../PKA_ModularExponentiation/Inc/rsa_priv_2048.h | 13 +- .../PKA_ModularExponentiation/Inc/rsa_pub_2048.h | 13 +- .../PKA_ModularExponentiation/Inc/stm32_assert.h | 15 +- .../PKA_ModularExponentiation/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PKA_ModularExponentiation.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../PKA/PKA_ModularExponentiation/Src/ciphertext.c | 14 +- .../PKA/PKA_ModularExponentiation/Src/main.c | 29 +- .../PKA/PKA_ModularExponentiation/Src/plaintext.c | 14 +- .../PKA_ModularExponentiation/Src/rsa_priv_2048.c | 15 +- .../PKA_ModularExponentiation/Src/rsa_pub_2048.c | 15 +- .../PKA_ModularExponentiation/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../PKA/PKA_ModularExponentiation/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../PWR/PWR_EnterStandbyMode/Inc/main.h | 13 +- .../PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h | 15 +- .../PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../PWR/PWR_EnterStandbyMode/Src/main.c | 25 +- .../PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c | 12 +- .../PWR_EnterStandbyMode/Src/system_stm32wbxx.c | 15 +- .../PWR/PWR_EnterStandbyMode/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h | 13 +- .../PWR/PWR_EnterStopMode/Inc/stm32_assert.h | 15 +- .../PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/PWR/PWR_EnterStopMode/Src/main.c | 25 +- .../PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c | 12 +- .../PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/PWR/PWR_EnterStopMode/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../PWR/PWR_OptimizedRunMode/Inc/main.h | 13 +- .../PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h | 15 +- .../PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../PWR/PWR_OptimizedRunMode/Src/main.c | 25 +- .../PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c | 12 +- .../PWR_OptimizedRunMode/Src/system_stm32wbxx.c | 15 +- .../PWR/PWR_OptimizedRunMode/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/main.h | 13 +- .../PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32_assert.h | 15 +- .../PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PWR/PWR_SMPS_16MHZ_HSI/PWR_SMPS_16MHZ_HSI.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/main.c | 25 +- .../PWR/PWR_SMPS_16MHZ_HSI/Src/stm32wbxx_it.c | 12 +- .../PWR/PWR_SMPS_16MHZ_HSI/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/main.h | 13 +- .../PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32_assert.h | 15 +- .../PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../PWR_SMPS_64MHZ_MSI_PLL.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/main.c | 25 +- .../PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/stm32wbxx_it.c | 12 +- .../PWR_SMPS_64MHZ_MSI_PLL/Src/system_stm32wbxx.c | 15 +- .../PWR/PWR_SMPS_64MHZ_MSI_PLL/readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RCC/RCC_HWAutoMSICalibration/Inc/main.h | 13 +- .../RCC_HWAutoMSICalibration/Inc/stm32_assert.h | 15 +- .../RCC_HWAutoMSICalibration/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RCC_HWAutoMSICalibration.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RCC/RCC_HWAutoMSICalibration/Src/main.c | 25 +- .../RCC_HWAutoMSICalibration/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../RCC/RCC_HWAutoMSICalibration/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RCC/RCC_OutputSystemClockOnMCO/Inc/main.h | 13 +- .../RCC_OutputSystemClockOnMCO/Inc/stm32_assert.h | 15 +- .../RCC_OutputSystemClockOnMCO/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RCC_OutputSystemClockOnMCO.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RCC/RCC_OutputSystemClockOnMCO/Src/main.c | 25 +- .../RCC_OutputSystemClockOnMCO/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../RCC/RCC_OutputSystemClockOnMCO/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RCC/RCC_UseHSEasSystemClock/Inc/main.h | 13 +- .../RCC/RCC_UseHSEasSystemClock/Inc/stm32_assert.h | 15 +- .../RCC/RCC_UseHSEasSystemClock/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RCC_UseHSEasSystemClock.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RCC/RCC_UseHSEasSystemClock/Src/main.c | 25 +- .../RCC/RCC_UseHSEasSystemClock/Src/stm32wbxx_it.c | 12 +- .../RCC_UseHSEasSystemClock/Src/system_stm32wbxx.c | 15 +- .../RCC/RCC_UseHSEasSystemClock/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h | 13 +- .../RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h | 15 +- .../RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RCC_UseHSI_PLLasSystemClock.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c | 25 +- .../RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../RCC/RCC_UseHSI_PLLasSystemClock/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RNG/RNG_GenerateRandomNumbers/Inc/main.h | 13 +- .../RNG_GenerateRandomNumbers/Inc/stm32_assert.h | 15 +- .../RNG_GenerateRandomNumbers/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RNG_GenerateRandomNumbers.ioc | 11 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RNG/RNG_GenerateRandomNumbers/Src/main.c | 25 +- .../RNG_GenerateRandomNumbers/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../RNG/RNG_GenerateRandomNumbers/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RNG_GenerateRandomNumbers_IT.ioc | 11 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../RNG/RNG_GenerateRandomNumbers_IT/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../RNG/RNG_GenerateRandomNumbers_IT/readme.txt | 10 +- .../RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Examples_LL/RTC/RTC_Alarm/Inc/main.h | 13 +- .../Examples_LL/RTC/RTC_Alarm/Inc/stm32_assert.h | 15 +- .../Examples_LL/RTC/RTC_Alarm/Inc/stm32wbxx_it.h | 13 +- .../RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../RTC_Alarm/STM32CubeIDE/Example/User/syscalls.c | 27 +- .../RTC_Alarm/STM32CubeIDE/Example/User/sysmem.c | 29 +- .../RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/RTC/RTC_Alarm/Src/main.c | 13 +- .../Examples_LL/RTC/RTC_Alarm/Src/stm32wbxx_it.c | 13 +- .../RTC/RTC_Alarm/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/RTC/RTC_Alarm/readme.txt | 10 +- .../RTC_Alarm_Init/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../RTC_Alarm_Init/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/RTC/RTC_Alarm_Init/Inc/main.h | 13 +- .../RTC/RTC_Alarm_Init/Inc/stm32_assert.h | 15 +- .../RTC/RTC_Alarm_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/RTC/RTC_Alarm_Init/Src/main.c | 25 +- .../RTC/RTC_Alarm_Init/Src/stm32wbxx_it.c | 12 +- .../RTC/RTC_Alarm_Init/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/RTC/RTC_Alarm_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/RTC/RTC_Calendar_Init/Inc/main.h | 13 +- .../RTC/RTC_Calendar_Init/Inc/stm32_assert.h | 15 +- .../RTC/RTC_Calendar_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RTC/RTC_Calendar_Init/RTC_Calendar_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples_LL/RTC/RTC_Calendar_Init/Src/main.c | 25 +- .../RTC/RTC_Calendar_Init/Src/stm32wbxx_it.c | 12 +- .../RTC/RTC_Calendar_Init/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/RTC/RTC_Calendar_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../RTC_ExitStandbyWithWakeUpTimer_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RTC_ExitStandbyWithWakeUpTimer_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../RTC_ExitStandbyWithWakeUpTimer_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../RTC_ExitStandbyWithWakeUpTimer_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/RTC/RTC_Tamper_Init/Inc/main.h | 13 +- .../RTC/RTC_Tamper_Init/Inc/stm32_assert.h | 15 +- .../RTC/RTC_Tamper_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/RTC/RTC_Tamper_Init/Src/main.c | 25 +- .../RTC/RTC_Tamper_Init/Src/stm32wbxx_it.c | 12 +- .../RTC/RTC_Tamper_Init/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/RTC/RTC_Tamper_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/RTC/RTC_TimeStamp_Init/Inc/main.h | 13 +- .../RTC/RTC_TimeStamp_Init/Inc/stm32_assert.h | 15 +- .../RTC/RTC_TimeStamp_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples_LL/RTC/RTC_TimeStamp_Init/Src/main.c | 25 +- .../RTC/RTC_TimeStamp_Init/Src/stm32wbxx_it.c | 12 +- .../RTC/RTC_TimeStamp_Init/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/RTC/RTC_TimeStamp_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/main.h | 13 +- .../SPI_OneBoard_HalfDuplex_DMA/Inc/stm32_assert.h | 15 +- .../SPI_OneBoard_HalfDuplex_DMA/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI/SPI_OneBoard_HalfDuplex_DMA/Src/main.c | 13 +- .../SPI_OneBoard_HalfDuplex_DMA/Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_OneBoard_HalfDuplex_DMA/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI_OneBoard_HalfDuplex_DMA_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_OneBoard_HalfDuplex_DMA_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI_OneBoard_HalfDuplex_DMA_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI_OneBoard_HalfDuplex_DMA_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_OneBoard_HalfDuplex_IT_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_OneBoard_HalfDuplex_IT_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../readme.txt | 12 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../TIM/TIM_BreakAndDeadtime/Inc/main.h | 13 +- .../TIM/TIM_BreakAndDeadtime/Inc/stm32_assert.h | 15 +- .../TIM/TIM_BreakAndDeadtime/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../TIM/TIM_BreakAndDeadtime/Src/main.c | 13 +- .../TIM/TIM_BreakAndDeadtime/Src/stm32wbxx_it.c | 15 +- .../TIM_BreakAndDeadtime/Src/system_stm32wbxx.c | 15 +- .../TIM/TIM_BreakAndDeadtime/readme.txt | 10 +- .../TIM_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/TIM/TIM_DMA_Init/Inc/main.h | 13 +- .../TIM/TIM_DMA_Init/Inc/stm32_assert.h | 15 +- .../TIM/TIM_DMA_Init/Inc/stm32wbxx_it.h | 13 +- .../TIM_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/TIM/TIM_DMA_Init/Src/main.c | 25 +- .../TIM/TIM_DMA_Init/Src/stm32wbxx_it.c | 14 +- .../TIM/TIM_DMA_Init/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc | 17 +- .../Examples_LL/TIM/TIM_DMA_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../TIM/TIM_InputCapture_Init/Inc/main.h | 13 +- .../TIM/TIM_InputCapture_Init/Inc/stm32_assert.h | 15 +- .../TIM/TIM_InputCapture_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../TIM/TIM_InputCapture_Init/Src/main.c | 25 +- .../TIM/TIM_InputCapture_Init/Src/stm32wbxx_it.c | 14 +- .../TIM_InputCapture_Init/Src/system_stm32wbxx.c | 15 +- .../TIM_InputCapture_Init.ioc | 17 +- .../TIM/TIM_InputCapture_Init/readme.txt | 10 +- .../TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Examples_LL/TIM/TIM_OnePulse/Inc/main.h | 13 +- .../TIM/TIM_OnePulse/Inc/stm32_assert.h | 15 +- .../TIM/TIM_OnePulse/Inc/stm32wbxx_it.h | 13 +- .../TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/TIM/TIM_OnePulse/Src/main.c | 13 +- .../TIM/TIM_OnePulse/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_OnePulse/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/TIM/TIM_OnePulse/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../TIM/TIM_OutputCompare_Init/Inc/main.h | 13 +- .../TIM/TIM_OutputCompare_Init/Inc/stm32_assert.h | 15 +- .../TIM/TIM_OutputCompare_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../TIM/TIM_OutputCompare_Init/Src/main.c | 25 +- .../TIM/TIM_OutputCompare_Init/Src/stm32wbxx_it.c | 14 +- .../TIM_OutputCompare_Init/Src/system_stm32wbxx.c | 15 +- .../TIM_OutputCompare_Init.ioc | 17 +- .../TIM/TIM_OutputCompare_Init/readme.txt | 10 +- .../TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Examples_LL/TIM/TIM_PWMOutput/Inc/main.h | 13 +- .../TIM/TIM_PWMOutput/Inc/stm32_assert.h | 15 +- .../TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/TIM/TIM_PWMOutput/Src/main.c | 13 +- .../TIM/TIM_PWMOutput/Src/stm32wbxx_it.c | 15 +- .../TIM/TIM_PWMOutput/Src/system_stm32wbxx.c | 15 +- .../Examples_LL/TIM/TIM_PWMOutput/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/TIM/TIM_PWMOutput_Init/Inc/main.h | 13 +- .../TIM/TIM_PWMOutput_Init/Inc/stm32_assert.h | 15 +- .../TIM/TIM_PWMOutput_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/TIM/TIM_PWMOutput_Init/Src/main.c | 25 +- .../TIM/TIM_PWMOutput_Init/Src/stm32wbxx_it.c | 14 +- .../TIM/TIM_PWMOutput_Init/Src/system_stm32wbxx.c | 15 +- .../TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc | 17 +- .../Examples_LL/TIM/TIM_PWMOutput_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h | 13 +- .../TIM/TIM_TimeBase_Init/Inc/stm32_assert.h | 15 +- .../TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c | 25 +- .../TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c | 14 +- .../TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c | 15 +- .../TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc | 17 +- .../Examples_LL/TIM/TIM_TimeBase_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../USART/USART_Communication_Rx_IT/Inc/main.h | 13 +- .../USART_Communication_Rx_IT/Inc/stm32_assert.h | 15 +- .../USART_Communication_Rx_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Example/User/syscalls.c | 27 +- .../STM32CubeIDE/Example/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART/USART_Communication_Rx_IT/Src/main.c | 13 +- .../USART_Communication_Rx_IT/Src/stm32wbxx_it.c | 15 +- .../Src/system_stm32wbxx.c | 15 +- .../USART/USART_Communication_Rx_IT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 35 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_Rx_IT_Continuous_Init.ioc | 17 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- ...ART_Communication_Rx_IT_Continuous_VCP_Init.ioc | 17 +- .../readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART_Communication_Rx_IT_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART_Communication_Rx_IT_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_Rx_IT_Init.ioc | 17 +- .../USART_Communication_Rx_IT_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART_Communication_Rx_IT_VCP_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART_Communication_Rx_IT_VCP_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_Rx_IT_VCP_Init.ioc | 17 +- .../USART_Communication_Rx_IT_VCP_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART_Communication_TxRx_DMA_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART_Communication_TxRx_DMA_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_TxRx_DMA_Init.ioc | 17 +- .../USART_Communication_TxRx_DMA_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART_Communication_Tx_IT_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART_Communication_Tx_IT_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_Tx_IT_Init.ioc | 17 +- .../USART_Communication_Tx_IT_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART_Communication_Tx_IT_VCP_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART_Communication_Tx_IT_VCP_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_Tx_IT_VCP_Init.ioc | 17 +- .../USART_Communication_Tx_IT_VCP_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART/USART_Communication_Tx_Init/Inc/main.h | 13 +- .../USART_Communication_Tx_Init/Inc/stm32_assert.h | 15 +- .../USART_Communication_Tx_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART/USART_Communication_Tx_Init/Src/main.c | 25 +- .../USART_Communication_Tx_Init/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_Tx_Init.ioc | 17 +- .../USART/USART_Communication_Tx_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART_Communication_Tx_VCP_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART_Communication_Tx_VCP_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_Communication_Tx_VCP_Init.ioc | 17 +- .../USART_Communication_Tx_VCP_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART/USART_WakeUpFromStop1_Init/Inc/main.h | 13 +- .../USART_WakeUpFromStop1_Init/Inc/stm32_assert.h | 15 +- .../USART_WakeUpFromStop1_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART/USART_WakeUpFromStop1_Init/Src/main.c | 25 +- .../USART_WakeUpFromStop1_Init/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_WakeUpFromStop1_Init.ioc | 17 +- .../USART/USART_WakeUpFromStop1_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USART/USART_WakeUpFromStop_Init/Inc/main.h | 13 +- .../USART_WakeUpFromStop_Init/Inc/stm32_assert.h | 15 +- .../USART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../USART/USART_WakeUpFromStop_Init/Src/main.c | 25 +- .../USART_WakeUpFromStop_Init/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../USART_WakeUpFromStop_Init.ioc | 17 +- .../USART/USART_WakeUpFromStop_Init/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../UTILS/UTILS_ConfigureSystemClock/Inc/main.h | 13 +- .../UTILS_ConfigureSystemClock/Inc/stm32_assert.h | 15 +- .../UTILS_ConfigureSystemClock/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../UTILS/UTILS_ConfigureSystemClock/Src/main.c | 25 +- .../UTILS_ConfigureSystemClock/Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../UTILS_ConfigureSystemClock.ioc | 17 +- .../UTILS/UTILS_ConfigureSystemClock/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../UTILS/UTILS_ReadDeviceInfo/Inc/main.h | 13 +- .../UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h | 15 +- .../UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../UTILS/UTILS_ReadDeviceInfo/Src/main.c | 25 +- .../UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c | 12 +- .../UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c | 15 +- .../UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc | 17 +- .../UTILS/UTILS_ReadDeviceInfo/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../WWDG_RefreshUntilUserEvent_Init/Inc/main.h | 13 +- .../Inc/stm32_assert.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../WWDG_RefreshUntilUserEvent_Init/Src/main.c | 25 +- .../Src/stm32wbxx_it.c | 12 +- .../Src/system_stm32wbxx.c | 15 +- .../WWDG_RefreshUntilUserEvent_Init.ioc | 17 +- .../WWDG_RefreshUntilUserEvent_Init/readme.txt | 10 +- .../ADC_SingleConversion_TriggerSW_IT.ioc | 17 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../ADC_SingleConversion_TriggerSW_IT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../ADC_SingleConversion_TriggerSW_IT/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../ADC_SingleConversion_TriggerSW_IT/readme.txt | 10 +- .../CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc | 19 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../CRC/CRC_PolynomialUpdate/Inc/main.h | 13 +- .../CRC_PolynomialUpdate/Inc/stm32wbxx_hal_conf.h | 15 +- .../CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../CRC/CRC_PolynomialUpdate/Src/main.c | 22 +- .../CRC_PolynomialUpdate/Src/stm32wbxx_hal_msp.c | 12 +- .../CRC/CRC_PolynomialUpdate/Src/stm32wbxx_it.c | 13 +- .../CRC_PolynomialUpdate/Src/system_stm32wbxx.c | 15 +- .../CRC/CRC_PolynomialUpdate/readme.txt | 10 +- .../DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc | 19 +- .../DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h | 13 +- .../DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h | 15 +- .../DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c | 22 +- .../DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c | 12 +- .../DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c | 13 +- .../DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c | 15 +- .../Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../I2C_OneBoard_ComSlave7_10bits_IT.ioc | 25 +- .../I2C_OneBoard_ComSlave7_10bits_IT/Inc/main.h | 30 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 30 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c | 37 +- .../Src/stm32wbxx_hal_msp.c | 33 +- .../Src/stm32wbxx_it.c | 30 +- .../Src/system_stm32wbxx.c | 15 +- .../I2C_OneBoard_ComSlave7_10bits_IT/readme.txt | 11 +- .../PWR/PWR_STOP1/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../PWR/PWR_STOP1/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_MIX/PWR/PWR_STOP1/Inc/main.h | 13 +- .../PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h | 13 +- .../PWR_STOP1/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc | 17 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../PWR_STOP1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../Examples_MIX/PWR/PWR_STOP1/Src/main.c | 22 +- .../PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c | 12 +- .../Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c | 13 +- .../PWR/PWR_STOP1/Src/system_stm32wbxx.c | 15 +- .../Examples_MIX/PWR/PWR_STOP1/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI_FullDuplex_ComPolling_Master/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComPolling_Master.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../SPI_FullDuplex_ComPolling_Master/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI_FullDuplex_ComPolling_Master/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_FullDuplex_ComPolling_Slave.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_HalfDuplex_ComPollingIT_Master.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../SPI_HalfDuplex_ComPollingIT_Master/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI_HalfDuplex_ComPollingIT_Master/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../SPI_HalfDuplex_ComPollingIT_Slave.ioc | 19 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../SPI_HalfDuplex_ComPollingIT_Slave/readme.txt | 10 +- .../TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../Examples_MIX/TIM/TIM_PWMInput/Inc/main.h | 13 +- .../TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h | 15 +- .../TIM/TIM_PWMInput/Inc/stm32wbxx_it.h | 13 +- .../TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Examples_MIX/TIM/TIM_PWMInput/Src/main.c | 22 +- .../TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c | 12 +- .../TIM/TIM_PWMInput/Src/stm32wbxx_it.c | 13 +- .../TIM/TIM_PWMInput/Src/system_stm32wbxx.c | 15 +- .../Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc | 19 +- .../Examples_MIX/TIM/TIM_PWMInput/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../UART/UART_HyperTerminal_IT/Inc/main.h | 13 +- .../UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../UART/UART_HyperTerminal_IT/Src/main.c | 22 +- .../UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c | 12 +- .../UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c | 13 +- .../UART_HyperTerminal_IT/Src/system_stm32wbxx.c | 15 +- .../UART_HyperTerminal_IT.ioc | 19 +- .../UART/UART_HyperTerminal_IT/readme.txt | 10 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../UART_HyperTerminal_TxPolling_RxIT/Inc/main.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../Inc/stm32wbxx_it.h | 13 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../UART_HyperTerminal_TxPolling_RxIT/Src/main.c | 22 +- .../Src/stm32wbxx_hal_msp.c | 12 +- .../Src/stm32wbxx_it.c | 13 +- .../Src/system_stm32wbxx.c | 15 +- .../UART_HyperTerminal_TxPolling_RxIT.ioc | 19 +- .../UART_HyperTerminal_TxPolling_RxIT/readme.txt | 10 +- Projects/P-NUCLEO-WB55.Nucleo/Release_Notes.html | 54 +- .../Templates/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Templates/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/main.h | 13 +- .../Templates/Inc/stm32wbxx_hal_conf.h | 15 +- .../Templates/Inc/stm32wbxx_it.h | 13 +- .../Templates/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../Templates/STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/main.c | 22 +- .../Templates/Src/stm32wbxx_hal_msp.c | 12 +- .../Templates/Src/stm32wbxx_it.c | 15 +- .../Templates/Src/system_stm32wbxx.c | 15 +- .../P-NUCLEO-WB55.Nucleo/Templates/Templates.ioc | 19 +- Projects/P-NUCLEO-WB55.Nucleo/Templates/readme.txt | 10 +- .../Templates_LL/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Templates_LL/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/main.h | 13 +- .../Templates_LL/Inc/stm32_assert.h | 15 +- .../Templates_LL/Inc/stm32wbxx_it.h | 13 +- .../Templates_LL/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 29 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 13 +- .../P-NUCLEO-WB55.Nucleo/Templates_LL/Src/main.c | 25 +- .../Templates_LL/Src/stm32wbxx_it.c | 14 +- .../Templates_LL/Src/system_stm32wbxx.c | 15 +- .../Templates_LL/Templates_LL.ioc | 17 +- .../P-NUCLEO-WB55.Nucleo/Templates_LL/readme.txt | 10 +- .../BLE/BLE_HeartRate/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRate/Core/Inc/app_conf.h | 43 +- .../BLE/BLE_HeartRate/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRate/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_HeartRate/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_HeartRate/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_HeartRate/Core/Inc/main.h | 13 +- .../BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_HeartRate/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_HeartRate/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_HeartRate/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRate/Core/Src/app_entry.c | 201 +- .../BLE/BLE_HeartRate/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_HeartRate/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_HeartRate/Core/Src/main.c | 28 +- .../BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c | 13 +- .../BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c | 37 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h | 24 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c | 13 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h | 13 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_HeartRate/readme.txt | 10 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h | 81 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h | 26 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h | 16 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/main.h | 13 +- .../BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE_MeshLightingLPN/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c | 39 +- .../BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c | 203 +- .../BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c | 31 +- .../BLE_MeshLightingLPN/Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c | 29 +- .../BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c | 16 +- .../BLE/BLE_MeshLightingLPN/Core/Src/main.c | 29 +- .../BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c | 13 +- .../Core/Src/system_stm32wbxx.c | 29 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../STM32_WPAN/app/PWM_config.c | 27 +- .../STM32_WPAN/app/PWM_handlers.c | 49 +- .../STM32_WPAN/app/PWM_handlers.h | 16 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c | 15 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h | 13 +- .../STM32_WPAN/app/appli_config.c | 30 +- .../STM32_WPAN/app/appli_config.h | 30 +- .../STM32_WPAN/app/appli_config_client.c | 37 +- .../STM32_WPAN/app/appli_config_client.h | 28 +- .../STM32_WPAN/app/appli_generic.c | 12 +- .../STM32_WPAN/app/appli_generic.h | 12 +- .../STM32_WPAN/app/appli_generic_client.c | 28 +- .../STM32_WPAN/app/appli_generic_client.h | 26 +- .../STM32_WPAN/app/appli_light.c | 14 +- .../STM32_WPAN/app/appli_light.h | 12 +- .../STM32_WPAN/app/appli_light_client.c | 28 +- .../STM32_WPAN/app/appli_light_client.h | 28 +- .../STM32_WPAN/app/appli_light_lc.c | 12 +- .../STM32_WPAN/app/appli_light_lc.h | 28 +- .../STM32_WPAN/app/appli_mesh.c | 12 +- .../STM32_WPAN/app/appli_mesh.h | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c | 14 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h | 14 +- .../STM32_WPAN/app/appli_sensor.c | 18 +- .../STM32_WPAN/app/appli_sensor.h | 12 +- .../STM32_WPAN/app/appli_sensors_client.c | 28 +- .../STM32_WPAN/app/appli_sensors_client.h | 26 +- .../STM32_WPAN/app/appli_vendor.c | 12 +- .../STM32_WPAN/app/appli_vendor.h | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h | 15 +- .../STM32_WPAN/app/ble_dbg_conf.h | 13 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h | 13 +- .../BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s | 32 +- .../STM32_WPAN/app/hal_common.h | 12 +- .../STM32_WPAN/app/mesh_cfg_usr.h | 17 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c | 16 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c | 16 +- .../STM32_WPAN/app/sensor_cfg_usr.h | 29 +- .../STM32_WPAN/app/svcctl_conf.c | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h | 13 +- .../STM32_WPAN/app/tl_dbg_conf.h | 27 +- .../BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c | 12 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c | 53 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h | 51 +- .../BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h | 13 +- .../STM32_WPAN/target/hw_ipcc.c | 21 +- .../BLE/BLE_MeshLightingLPN/readme.txt | 16 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_common.h | 29 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_conf.h | 81 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_debug.h | 26 +- .../BLE_MeshLightingPRFNode/Core/Inc/app_entry.h | 16 +- .../BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h | 21 +- .../BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h | 29 +- .../BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h | 15 +- .../BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h | 29 +- .../BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h | 29 +- .../BLE_MeshLightingPRFNode/Core/Src/app_debug.c | 39 +- .../BLE_MeshLightingPRFNode/Core/Src/app_entry.c | 204 +- .../BLE_MeshLightingPRFNode/Core/Src/hw_flash.c | 31 +- .../Core/Src/hw_timerserver.c | 16 +- .../BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c | 29 +- .../BLE_MeshLightingPRFNode/Core/Src/lp_timer.c | 16 +- .../BLE/BLE_MeshLightingPRFNode/Core/Src/main.c | 29 +- .../Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_it.c | 13 +- .../Core/Src/system_stm32wbxx.c | 29 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../STM32_WPAN/app/PWM_config.c | 27 +- .../STM32_WPAN/app/PWM_handlers.c | 49 +- .../STM32_WPAN/app/PWM_handlers.h | 16 +- .../STM32_WPAN/app/app_ble.c | 15 +- .../STM32_WPAN/app/app_ble.h | 13 +- .../STM32_WPAN/app/appli_config.c | 30 +- .../STM32_WPAN/app/appli_config.h | 30 +- .../STM32_WPAN/app/appli_config_client.c | 37 +- .../STM32_WPAN/app/appli_config_client.h | 28 +- .../STM32_WPAN/app/appli_generic.c | 12 +- .../STM32_WPAN/app/appli_generic.h | 12 +- .../STM32_WPAN/app/appli_generic_client.c | 28 +- .../STM32_WPAN/app/appli_generic_client.h | 26 +- .../STM32_WPAN/app/appli_light.c | 14 +- .../STM32_WPAN/app/appli_light.h | 12 +- .../STM32_WPAN/app/appli_light_client.c | 28 +- .../STM32_WPAN/app/appli_light_client.h | 28 +- .../STM32_WPAN/app/appli_light_lc.c | 12 +- .../STM32_WPAN/app/appli_light_lc.h | 28 +- .../STM32_WPAN/app/appli_mesh.c | 12 +- .../STM32_WPAN/app/appli_mesh.h | 12 +- .../STM32_WPAN/app/appli_nvm.c | 14 +- .../STM32_WPAN/app/appli_nvm.h | 14 +- .../STM32_WPAN/app/appli_sensor.c | 18 +- .../STM32_WPAN/app/appli_sensor.h | 12 +- .../STM32_WPAN/app/appli_sensors_client.c | 28 +- .../STM32_WPAN/app/appli_sensors_client.h | 26 +- .../STM32_WPAN/app/appli_vendor.c | 12 +- .../STM32_WPAN/app/appli_vendor.h | 12 +- .../STM32_WPAN/app/ble_conf.h | 15 +- .../STM32_WPAN/app/ble_dbg_conf.h | 13 +- .../STM32_WPAN/app/cube_hal.h | 13 +- .../BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s | 32 +- .../STM32_WPAN/app/hal_common.h | 12 +- .../STM32_WPAN/app/mesh_cfg_usr.h | 19 +- .../STM32_WPAN/app/models_if.c | 16 +- .../STM32_WPAN/app/models_if.h | 12 +- .../STM32_WPAN/app/pal_nvm.c | 16 +- .../STM32_WPAN/app/sensor_cfg_usr.h | 29 +- .../STM32_WPAN/app/svcctl_conf.c | 12 +- .../STM32_WPAN/app/tl_conf.h | 13 +- .../STM32_WPAN/app/tl_dbg_conf.h | 27 +- .../BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c | 12 +- .../STM32_WPAN/app/user_if.c | 53 +- .../STM32_WPAN/app/user_if.h | 51 +- .../STM32_WPAN/app/vcp_conf.h | 13 +- .../STM32_WPAN/target/hw_ipcc.c | 21 +- .../BLE/BLE_MeshLightingPRFNode/readme.txt | 16 +- .../Binary/BLE_TransparentModeVCP_reference.hex | 2834 ++++--- .../BLE_TransparentModeVCP/Core/Inc/app_common.h | 21 +- .../BLE/BLE_TransparentModeVCP/Core/Inc/app_conf.h | 43 +- .../BLE_TransparentModeVCP/Core/Inc/app_debug.h | 22 +- .../BLE_TransparentModeVCP/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_TransparentModeVCP/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_TransparentModeVCP/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_TransparentModeVCP/Core/Inc/main.h | 13 +- .../BLE_TransparentModeVCP/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_TransparentModeVCP/Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_TransparentModeVCP/Core/Inc/vcp_conf.h | 29 +- .../BLE_TransparentModeVCP/Core/Src/app_debug.c | 36 +- .../BLE_TransparentModeVCP/Core/Src/app_entry.c | 29 +- .../Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_TransparentModeVCP/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_TransparentModeVCP/Core/Src/main.c | 28 +- .../BLE_TransparentModeVCP/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE_TransparentModeVCP/Core/Src/stm32wbxx_it.c | 12 +- .../Core/Src/system_stm32wbxx.c | 13 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 24 +- .../STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.c | 29 +- .../BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.h | 23 +- .../STM32_WPAN/Target/hw_ipcc.c | 27 +- .../BLE/BLE_TransparentModeVCP/readme.txt | 14 +- .../Binary/BLE_p2pClient_reference.hex | 4719 +++++++----- .../BLE/BLE_p2pClient/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pClient/Core/Inc/app_conf.h | 43 +- .../BLE/BLE_p2pClient/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pClient/Core/Inc/app_entry.h | 22 +- .../BLE/BLE_p2pClient/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_p2pClient/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_p2pClient/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_p2pClient/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_p2pClient/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_p2pClient/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pClient/Core/Src/app_entry.c | 175 +- .../BLE/BLE_p2pClient/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pClient/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_p2pClient/Core/Src/main.c | 14 +- .../BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c | 13 +- .../BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c | 38 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h | 24 +- .../BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c | 33 +- .../BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h | 29 +- .../BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_p2pClient/readme.txt | 10 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_conf.h | 43 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pRouteur/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h | 21 +- .../BLE/BLE_p2pRouteur/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_p2pRouteur/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_p2pRouteur/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_p2pRouteur/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pRouteur/Core/Src/app_entry.c | 185 +- .../BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pRouteur/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_p2pRouteur/Core/Src/main.c | 28 +- .../BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c | 30 +- .../BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c | 13 +- .../BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c | 37 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h | 24 +- .../STM32_WPAN/App/p2p_routeur_app.c | 36 +- .../STM32_WPAN/App/p2p_routeur_app.h | 29 +- .../BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE/BLE_p2pRouteur/readme.txt | 10 +- .../Binary/BLE_p2pServer_reference.hex | 4748 +++++++----- .../BLE/BLE_p2pServer/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pServer/Core/Inc/app_conf.h | 43 +- .../BLE/BLE_p2pServer/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/app_entry.h | 23 +- .../BLE/BLE_p2pServer/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_p2pServer/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h | 13 +- .../BLE/BLE_p2pServer/Core/Inc/utilities_conf.h | 23 +- .../BLE/BLE_p2pServer/Core/Inc/vcp_conf.h | 29 +- .../BLE/BLE_p2pServer/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pServer/Core/Src/app_entry.c | 184 +- .../BLE/BLE_p2pServer/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pServer/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_p2pServer/Core/Src/main.c | 28 +- .../BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c | 13 +- .../BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf | 6 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../MDK-ARM/stm32wb55xx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c | 37 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h | 24 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c | 31 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h | 23 +- .../BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c | 27 +- .../Applications/BLE/BLE_p2pServer/readme.txt | 10 +- .../Thread/Thread_Cli_Cmd/Core/Inc/app_common.h | 14 +- .../Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h | 12 +- .../Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h | 14 +- .../Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/main.h | 13 +- .../Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h | 29 +- .../Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h | 11 +- .../Thread_Cli_Cmd/Core/Inc/utilities_conf.h | 12 +- .../Thread/Thread_Cli_Cmd/Core/Inc/vcp_conf.h | 29 +- .../Thread/Thread_Cli_Cmd/Core/Src/app_entry.c | 16 +- .../Thread_Cli_Cmd/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c | 12 +- .../Thread/Thread_Cli_Cmd/Core/Src/main.c | 26 +- .../Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c | 24 +- .../Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c | 14 +- .../Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c | 13 +- .../Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c | 15 +- .../Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c | 22 +- .../Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h | 18 +- .../Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/Thread/Thread_Cli_Cmd/readme.txt | 12 +- .../Thread_Coap_DataTransfer/Core/Inc/app_common.h | 23 +- .../Thread_Coap_DataTransfer/Core/Inc/app_conf.h | 33 +- .../Thread_Coap_DataTransfer/Core/Inc/app_entry.h | 23 +- .../Thread_Coap_DataTransfer/Core/Inc/hw_conf.h | 29 +- .../Thread_Coap_DataTransfer/Core/Inc/hw_if.h | 15 +- .../Thread_Coap_DataTransfer/Core/Inc/main.h | 25 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../Core/Inc/stm32wbxx_it.h | 23 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h | 29 +- .../Thread_Coap_DataTransfer/Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Thread_Coap_DataTransfer/Core/Src/hw_uart.c | 29 +- .../Thread_Coap_DataTransfer/Core/Src/main.c | 25 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_it.c | 29 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 32 +- .../STM32_WPAN/App/app_thread.h | 18 +- .../STM32_WPAN/App/data_transfer.h | 29 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_Coap_DataTransfer/readme.txt | 12 +- .../Thread_Coap_Generic/Core/Inc/app_common.h | 23 +- .../Thread/Thread_Coap_Generic/Core/Inc/app_conf.h | 33 +- .../Thread_Coap_Generic/Core/Inc/app_entry.h | 23 +- .../Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h | 29 +- .../Thread/Thread_Coap_Generic/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Coap_Generic/Core/Inc/main.h | 25 +- .../Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h | 23 +- .../Thread_Coap_Generic/Core/Inc/stm_logging.h | 11 +- .../Thread_Coap_Generic/Core/Inc/utilities_conf.h | 12 +- .../Thread/Thread_Coap_Generic/Core/Inc/vcp_conf.h | 29 +- .../Thread_Coap_Generic/Core/Src/app_entry.c | 16 +- .../Thread_Coap_Generic/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_Coap_Generic/Core/Src/hw_uart.c | 29 +- .../Thread/Thread_Coap_Generic/Core/Src/main.c | 25 +- .../Thread_Coap_Generic/Core/Src/stm32_lpm_if.c | 24 +- .../Thread_Coap_Generic/Core/Src/stm32wbxx_it.c | 28 +- .../Thread_Coap_Generic/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 28 +- .../STM32_WPAN/App/app_thread.h | 18 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_Coap_Generic/readme.txt | 10 +- .../Core/Inc/app_common.h | 23 +- .../Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h | 33 +- .../Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h | 23 +- .../Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h | 29 +- .../Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h | 15 +- .../Thread_FTD_Coap_Multicast/Core/Inc/main.h | 25 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../Core/Inc/stm32wbxx_it.h | 23 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h | 29 +- .../Thread_FTD_Coap_Multicast/Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c | 29 +- .../Thread_FTD_Coap_Multicast/Core/Src/main.c | 25 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_it.c | 29 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 28 +- .../STM32_WPAN/App/app_thread.h | 18 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_FTD_Coap_Multicast/readme.txt | 10 +- .../Core/Inc/app_common.h | 23 +- .../Thread_SED_Coap_Multicast/Core/Inc/app_conf.h | 33 +- .../Thread_SED_Coap_Multicast/Core/Inc/app_entry.h | 23 +- .../Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h | 29 +- .../Thread_SED_Coap_Multicast/Core/Inc/hw_if.h | 15 +- .../Thread_SED_Coap_Multicast/Core/Inc/main.h | 25 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 25 +- .../Core/Inc/stm32wbxx_it.h | 23 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h | 29 +- .../Thread_SED_Coap_Multicast/Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Thread_SED_Coap_Multicast/Core/Src/hw_uart.c | 29 +- .../Thread_SED_Coap_Multicast/Core/Src/main.c | 25 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_it.c | 29 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 31 +- .../EWARM/startup_stm32wb55xx_cm4.s | 29 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 22 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55rgvx.s | 14 +- .../Application/User/Core/src/syscalls.c | 27 +- .../Application/User/Core/src/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 28 +- .../STM32_WPAN/App/app_thread.h | 18 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_SED_Coap_Multicast/readme.txt | 10 +- .../DFU_Standalone/Core/Binary/readme.txt | 10 +- .../USB_Device/DFU_Standalone/Core/Inc/main.h | 13 +- .../DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../DFU_Standalone/Core/Inc/stm32wbxx_it.h | 13 +- .../USB_Device/DFU_Standalone/Core/Src/main.c | 22 +- .../DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../DFU_Standalone/Core/Src/stm32wbxx_it.c | 13 +- .../DFU_Standalone/Core/Src/system_stm32wbxx.c | 15 +- .../USB_Device/DFU_Standalone/DFU_Standalone.ioc | 19 +- .../DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../DFU_Standalone/USB_Device/App/usb_device.c | 12 +- .../DFU_Standalone/USB_Device/App/usb_device.h | 12 +- .../DFU_Standalone/USB_Device/App/usbd_desc.c | 12 +- .../DFU_Standalone/USB_Device/App/usbd_desc.h | 12 +- .../DFU_Standalone/USB_Device/App/usbd_dfu_flash.c | 13 +- .../DFU_Standalone/USB_Device/App/usbd_dfu_flash.h | 12 +- .../DFU_Standalone/USB_Device/Target/usbd_conf.c | 20 +- .../DFU_Standalone/USB_Device/Target/usbd_conf.h | 12 +- .../USB_Device/DFU_Standalone/readme.txt | 10 +- .../USB_Device/HID_Standalone/Core/Inc/main.h | 13 +- .../HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../HID_Standalone/Core/Inc/stm32wbxx_it.h | 13 +- .../USB_Device/HID_Standalone/Core/Src/main.c | 22 +- .../HID_Standalone/Core/Src/stm32wbxx_hal_msp.c | 12 +- .../HID_Standalone/Core/Src/stm32wbxx_it.c | 13 +- .../HID_Standalone/Core/Src/system_stm32wbxx.c | 15 +- .../HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../USB_Device/HID_Standalone/HID_Standalone.ioc | 19 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb55cgux.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../HID_Standalone/USB_Device/App/usb_device.c | 12 +- .../HID_Standalone/USB_Device/App/usb_device.h | 12 +- .../HID_Standalone/USB_Device/App/usbd_desc.c | 12 +- .../HID_Standalone/USB_Device/App/usbd_desc.h | 12 +- .../HID_Standalone/USB_Device/Target/usbd_conf.c | 20 +- .../HID_Standalone/USB_Device/Target/usbd_conf.h | 12 +- .../USB_Device/HID_Standalone/readme.txt | 10 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_MeterId_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Inc/vcp_conf.h | 29 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee_MeterId_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 40 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_MeterId_Server_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_OnOff_Client_Router/Core/Inc/vcp_conf.h | 29 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c | 12 +- .../Zigbee_OnOff_Client_Router/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OnOff_Client_Router/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h | 16 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h | 12 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/vcp_conf.h | 29 +- .../Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee_OnOff_Server_Coord/Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 36 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OnOff_Server_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 12 +- .../Core/Inc/app_conf.h | 16 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Core/Inc/hw_if.h | 15 +- .../Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Inc/vcp_conf.h | 29 +- .../Core/Src/app_entry.c | 16 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Core/Src/main.c | 26 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 2 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 29 +- .../User/Startup/startup_stm32wb55rgvx.s | 14 +- .../STM32CubeIDE/STM32WB55RGVX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 46 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_PowerProfile_Server_Router/readme.txt | 12 +- .../Examples/BSP/EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../Examples/BSP/Inc/main.h | 13 +- .../Examples/BSP/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/BSP/Inc/stm32wbxx_it.h | 13 +- .../Examples/BSP/MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Example/Startup/startup_stm32wb55cgux.s | 14 +- .../BSP/STM32CubeIDE/Example/User/syscalls.c | 27 +- .../BSP/STM32CubeIDE/Example/User/sysmem.c | 27 +- .../BSP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld | 30 +- .../Examples/BSP/Src/main.c | 13 +- .../Examples/BSP/Src/stm32wbxx_it.c | 15 +- .../Examples/BSP/Src/system_stm32wbxx.c | 15 +- .../Examples/BSP/readme.txt | 10 +- .../P-NUCLEO-WB55.USBDongle/Release_Notes.html | 52 +- Projects/STM32CubeProjectsList.html | 210 +- .../Applications/BLE/BLE_HeartRate/.extSettings | 3 +- .../BLE/BLE_HeartRate/BLE_HeartRate.ioc | 520 ++ .../BLE/BLE_HeartRate/Core/Inc/app_common.h | 21 +- .../BLE/BLE_HeartRate/Core/Inc/app_conf.h | 61 +- .../BLE/BLE_HeartRate/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_HeartRate/Core/Inc/app_entry.h | 25 +- .../BLE/BLE_HeartRate/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_HeartRate/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_HeartRate/Core/Inc/main.h | 13 +- .../BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_HeartRate/Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h | 17 +- .../BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_HeartRate/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_HeartRate/Core/Src/app_debug.c | 36 +- .../BLE/BLE_HeartRate/Core/Src/app_entry.c | 243 +- .../BLE/BLE_HeartRate/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_HeartRate/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_HeartRate/Core/Src/main.c | 78 +- .../BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c | 35 +- .../BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c | 13 +- .../BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp | 2546 +++--- .../BLE_HeartRate/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../BLE_HeartRate/EWARM/stm32wb5mxx_flash_cm4.icf | 8 +- .../BLE_HeartRate/EWARM/stm32wb5mxx_sram_cm4.icf | 39 - .../BLE_HeartRate/MDK-ARM/BLE_HeartRate.uvprojx | 2 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../MDK-ARM/stm32wb5mxx_flash_cm4.sct | 15 +- .../BLE/BLE_HeartRate/STM32CubeIDE/.cproject | 8 +- .../BLE/BLE_HeartRate/STM32CubeIDE/.project | 5 + .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c | 162 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c | 12 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h | 20 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c | 14 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h | 12 +- .../BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_HeartRate/readme.txt | 10 +- .../BLE_Mesh_Model_Sensor/Core/Inc/app_common.h | 119 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_conf.h | 613 ++ .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_debug.h | 42 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_entry.h | 42 + .../BLE_Mesh_Model_Sensor/Core/Inc/app_stts22h.h | 43 + .../BLE_Mesh_Model_Sensor/Core/Inc/app_vl53l0x.h | 43 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/hw_conf.h | 246 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/hw_flash.h | 84 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/hw_if.h | 250 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/lp_timer.h | 57 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/main.h | 37 + .../BLE_Mesh_Model_Sensor/Core/Inc/stm32_lpm_if.h | 79 + .../Core/Inc/stm32wb5mm_dk_conf.h | 93 + .../Core/Inc/stm32wbxx_hal_conf.h | 351 + .../BLE_Mesh_Model_Sensor/Core/Inc/stm32wbxx_it.h | 62 + .../Core/Inc/utilities_conf.h | 65 + .../BLE/BLE_Mesh_Model_Sensor/Core/Inc/vcp_conf.h | 50 + .../BLE/BLE_Mesh_Model_Sensor/Core/Src/app_debug.c | 367 + .../BLE/BLE_Mesh_Model_Sensor/Core/Src/app_entry.c | 521 ++ .../BLE_Mesh_Model_Sensor/Core/Src/app_stts22h.c | 131 + .../BLE_Mesh_Model_Sensor/Core/Src/app_vl53l0x.c | 139 + .../BLE/BLE_Mesh_Model_Sensor/Core/Src/hw_flash.c | 149 + .../Core/Src/hw_timerserver.c | 891 +++ .../BLE/BLE_Mesh_Model_Sensor/Core/Src/hw_uart.c | 468 ++ .../BLE/BLE_Mesh_Model_Sensor/Core/Src/lp_timer.c | 132 + .../BLE/BLE_Mesh_Model_Sensor/Core/Src/main.c | 460 ++ .../BLE_Mesh_Model_Sensor/Core/Src/stm32_lpm_if.c | 349 + .../BLE_Mesh_Model_Sensor/Core/Src/stm32wbxx_it.c | 224 + .../Core/Src/system_stm32wbxx.c | 340 + .../Core/Src/vl53l0x/vl53l0x_api.c | 2977 +++++++ .../Core/Src/vl53l0x/vl53l0x_api.h | 1943 +++++ .../Core/Src/vl53l0x/vl53l0x_api_calibration.c | 1259 +++ .../Core/Src/vl53l0x/vl53l0x_api_calibration.h | 110 + .../Core/Src/vl53l0x/vl53l0x_api_core.c | 2243 ++++++ .../Core/Src/vl53l0x/vl53l0x_api_core.h | 112 + .../Core/Src/vl53l0x/vl53l0x_api_ranging.c | 28 + .../Core/Src/vl53l0x/vl53l0x_api_ranging.h | 33 + .../Core/Src/vl53l0x/vl53l0x_api_strings.c | 448 ++ .../Core/Src/vl53l0x/vl53l0x_api_strings.h | 266 + .../Core/Src/vl53l0x/vl53l0x_def.h | 619 ++ .../Core/Src/vl53l0x/vl53l0x_device.h | 243 + .../vl53l0x/vl53l0x_interrupt_threshold_settings.h | 179 + .../Core/Src/vl53l0x/vl53l0x_platform.h | 43 + .../Core/Src/vl53l0x/vl53l0x_platform_log.c | 59 + .../Core/Src/vl53l0x/vl53l0x_platform_log.h | 110 + .../Core/Src/vl53l0x/vl53l0x_tof.c | 330 + .../Core/Src/vl53l0x/vl53l0x_tof.h | 230 + .../Core/Src/vl53l0x/vl53l0x_tuning.h | 131 + .../Core/Src/vl53l0x/vl53l0x_types.h | 96 + .../EWARM/BLE_Mesh_Model_Sensor.ewd | 1419 ++++ .../EWARM/BLE_Mesh_Model_Sensor.ewp | 1447 ++++ .../BLE/BLE_Mesh_Model_Sensor/EWARM/Project.eww | 7 + .../EWARM/startup_stm32wb55xx_cm4.s | 515 ++ .../EWARM/stm32wb5mxx_flash_cm4.icf | 42 + .../MDK-ARM/BLE_Mesh_Model_Sensor.uvoptx | 1529 ++++ .../MDK-ARM/BLE_Mesh_Model_Sensor.uvprojx | 1005 +++ .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 367 + .../MDK-ARM/stm32wb5mxx_flash_cm4.sct | 26 + .../BLE_Mesh_Model_Sensor/STM32CubeIDE/.cproject | 128 + .../BLE_Mesh_Model_Sensor/STM32CubeIDE/.project | 524 ++ .../STM32CubeIDE/Application/Core/syscalls.c | 155 + .../STM32CubeIDE/Application/Core/sysmem.c | 79 + .../Application/Startup/startup_stm32wb5mmghx.s | 443 ++ .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 171 + .../STM32_WPAN/app/PWM_config.c | 108 + .../STM32_WPAN/app/PWM_config.h | 69 + .../STM32_WPAN/app/PWM_handlers.c | 277 + .../STM32_WPAN/app/PWM_handlers.h | 33 + .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/app_ble.c | 672 ++ .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/app_ble.h | 76 + .../STM32_WPAN/app/appli_config.c | 355 + .../STM32_WPAN/app/appli_config.h | 50 + .../STM32_WPAN/app/appli_config_client.c | 1915 +++++ .../STM32_WPAN/app/appli_config_client.h | 91 + .../STM32_WPAN/app/appli_generic.c | 481 ++ .../STM32_WPAN/app/appli_generic.h | 156 + .../STM32_WPAN/app/appli_generic_client.c | 343 + .../STM32_WPAN/app/appli_generic_client.h | 38 + .../STM32_WPAN/app/appli_light.c | 1357 ++++ .../STM32_WPAN/app/appli_light.h | 275 + .../STM32_WPAN/app/appli_light_client.c | 1204 +++ .../STM32_WPAN/app/appli_light_client.h | 109 + .../STM32_WPAN/app/appli_light_lc.c | 452 ++ .../STM32_WPAN/app/appli_light_lc.h | 79 + .../STM32_WPAN/app/appli_mesh.c | 1810 +++++ .../STM32_WPAN/app/appli_mesh.h | 136 + .../STM32_WPAN/app/appli_nvm.c | 749 ++ .../STM32_WPAN/app/appli_nvm.h | 97 + .../STM32_WPAN/app/appli_sensor.c | 798 ++ .../STM32_WPAN/app/appli_sensor.h | 109 + .../STM32_WPAN/app/appli_sensors_client.c | 359 + .../STM32_WPAN/app/appli_sensors_client.h | 70 + .../STM32_WPAN/app/appli_vendor.c | 600 ++ .../STM32_WPAN/app/appli_vendor.h | 46 + .../STM32_WPAN/app/ble_conf.h | 71 + .../STM32_WPAN/app/ble_dbg_conf.h | 204 + .../STM32_WPAN/app/cube_hal.h | 46 + .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/data.s | 28 + .../STM32_WPAN/app/hal_common.h | 51 + .../STM32_WPAN/app/mesh_cfg_usr.h | 625 ++ .../STM32_WPAN/app/models_if.c | 1151 +++ .../STM32_WPAN/app/models_if.h | 49 + .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/pal_nvm.c | 441 ++ .../STM32_WPAN/app/sensor_cfg_usr.h | 695 ++ .../STM32_WPAN/app/svcctl_conf.c | 80 + .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/tl_conf.h | 30 + .../STM32_WPAN/app/tl_dbg_conf.h | 124 + .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/tl_if.c | 45 + .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/user_if.c | 341 + .../BLE_Mesh_Model_Sensor/STM32_WPAN/app/user_if.h | 39 + .../STM32_WPAN/app/vcp_conf.h | 49 + .../STM32_WPAN/target/hw_ipcc.c | 673 ++ .../BLE/BLE_Mesh_Model_Sensor/readme.txt | 269 + .../Core/Inc/app_common.h | 29 +- .../BLE_Mesh_ThermometerSensor/Core/Inc/app_conf.h | 89 +- .../Core/Inc/app_debug.h | 26 +- .../Core/Inc/app_entry.h | 16 +- .../Core/Inc/app_stts22h.h | 13 +- .../Core/Inc/app_vl53l0x.h | 13 +- .../BLE_Mesh_ThermometerSensor/Core/Inc/hw_conf.h | 21 +- .../BLE_Mesh_ThermometerSensor/Core/Inc/hw_flash.h | 29 +- .../BLE_Mesh_ThermometerSensor/Core/Inc/hw_if.h | 15 +- .../BLE_Mesh_ThermometerSensor/Core/Inc/lp_timer.h | 29 +- .../BLE/BLE_Mesh_ThermometerSensor/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 13 +- .../Core/Inc/utilities_conf.h | 23 +- .../BLE_Mesh_ThermometerSensor/Core/Inc/vcp_conf.h | 29 +- .../Core/Src/app_debug.c | 39 +- .../Core/Src/app_entry.c | 188 +- .../Core/Src/app_stts22h.c | 27 +- .../Core/Src/app_vl53l0x.c | 27 +- .../BLE_Mesh_ThermometerSensor/Core/Src/hw_flash.c | 31 +- .../Core/Src/hw_timerserver.c | 16 +- .../BLE_Mesh_ThermometerSensor/Core/Src/hw_uart.c | 29 +- .../BLE_Mesh_ThermometerSensor/Core/Src/lp_timer.c | 16 +- .../BLE/BLE_Mesh_ThermometerSensor/Core/Src/main.c | 29 +- .../Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_it.c | 13 +- .../Core/Src/system_stm32wbxx.c | 29 +- .../Core/Src/vl53l0x/vl53l0x_api.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_calibration.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_calibration.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_core.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_core.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_ranging.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_ranging.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_strings.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_strings.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_def.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_device.h | 11 +- .../vl53l0x/vl53l0x_interrupt_threshold_settings.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_platform.h | 13 +- .../Core/Src/vl53l0x/vl53l0x_platform_log.h | 13 +- .../Core/Src/vl53l0x/vl53l0x_tof.c | 13 +- .../Core/Src/vl53l0x/vl53l0x_tof.h | 13 +- .../Core/Src/vl53l0x/vl53l0x_tuning.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_types.h | 11 +- .../EWARM/BLE_Mesh_ThermometerSensor.ewp | 16 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../EWARM/stm32wb55xx_flash_cm4.icf | 40 - .../EWARM/stm32wb5mxx_flash_cm4.icf | 42 + .../MDK-ARM/BLE_Mesh_ThermometerSensor.uvoptx | 24 +- .../MDK-ARM/BLE_Mesh_ThermometerSensor.uvprojx | 19 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../MDK-ARM/stm32wb5mxx_flash_cm4.sct | 15 +- .../STM32CubeIDE/Application/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/Core/sysmem.c | 27 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../STM32_WPAN/app/PWM_config.c | 27 +- .../STM32_WPAN/app/PWM_handlers.c | 49 +- .../STM32_WPAN/app/PWM_handlers.h | 16 +- .../STM32_WPAN/app/app_ble.c | 22 +- .../STM32_WPAN/app/app_ble.h | 13 +- .../STM32_WPAN/app/appli_config.c | 30 +- .../STM32_WPAN/app/appli_config.h | 30 +- .../STM32_WPAN/app/appli_config_client.c | 37 +- .../STM32_WPAN/app/appli_config_client.h | 28 +- .../STM32_WPAN/app/appli_generic.c | 12 +- .../STM32_WPAN/app/appli_generic.h | 12 +- .../STM32_WPAN/app/appli_generic_client.c | 28 +- .../STM32_WPAN/app/appli_generic_client.h | 26 +- .../STM32_WPAN/app/appli_light.c | 14 +- .../STM32_WPAN/app/appli_light.h | 12 +- .../STM32_WPAN/app/appli_light_client.c | 28 +- .../STM32_WPAN/app/appli_light_client.h | 28 +- .../STM32_WPAN/app/appli_light_lc.c | 12 +- .../STM32_WPAN/app/appli_light_lc.h | 28 +- .../STM32_WPAN/app/appli_mesh.c | 12 +- .../STM32_WPAN/app/appli_mesh.h | 12 +- .../STM32_WPAN/app/appli_nvm.c | 14 +- .../STM32_WPAN/app/appli_nvm.h | 14 +- .../STM32_WPAN/app/appli_sensor.c | 18 +- .../STM32_WPAN/app/appli_sensor.h | 12 +- .../STM32_WPAN/app/appli_sensors_client.c | 28 +- .../STM32_WPAN/app/appli_sensors_client.h | 26 +- .../STM32_WPAN/app/appli_vendor.c | 12 +- .../STM32_WPAN/app/appli_vendor.h | 12 +- .../STM32_WPAN/app/ble_conf.h | 15 +- .../STM32_WPAN/app/ble_dbg_conf.h | 13 +- .../STM32_WPAN/app/cube_hal.h | 13 +- .../STM32_WPAN/app/data.s | 32 +- .../STM32_WPAN/app/hal_common.h | 12 +- .../STM32_WPAN/app/mesh_cfg_usr.h | 17 +- .../STM32_WPAN/app/models_if.c | 16 +- .../STM32_WPAN/app/models_if.h | 12 +- .../STM32_WPAN/app/pal_nvm.c | 16 +- .../STM32_WPAN/app/sensor_cfg_usr.h | 31 +- .../STM32_WPAN/app/svcctl_conf.c | 12 +- .../STM32_WPAN/app/tl_conf.h | 13 +- .../STM32_WPAN/app/tl_dbg_conf.h | 27 +- .../STM32_WPAN/app/tl_if.c | 12 +- .../STM32_WPAN/app/user_if.c | 53 +- .../STM32_WPAN/app/user_if.h | 51 +- .../STM32_WPAN/app/vcp_conf.h | 13 +- .../STM32_WPAN/target/hw_ipcc.c | 21 +- .../BLE/BLE_Mesh_ThermometerSensor/readme.txt | 96 +- .../Applications/BLE/BLE_Sensor/.extSettings | 9 +- .../Applications/BLE/BLE_Sensor/BLE_Sensor.ioc | 527 ++ .../BLE/BLE_Sensor/Core/Inc/app_common.h | 21 +- .../BLE/BLE_Sensor/Core/Inc/app_conf.h | 75 +- .../BLE/BLE_Sensor/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_Sensor/Core/Inc/app_entry.h | 25 +- .../BLE/BLE_Sensor/Core/Inc/app_vl53l0x.h | 13 +- .../Applications/BLE/BLE_Sensor/Core/Inc/hw_conf.h | 70 +- .../Applications/BLE/BLE_Sensor/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_Sensor/Core/Inc/main.h | 14 +- .../BLE/BLE_Sensor/Core/Inc/s25fl128s_conf.h | 23 +- .../BLE/BLE_Sensor/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE/BLE_Sensor/Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../BLE/BLE_Sensor/Core/Inc/stm32wbxx_hal_conf.h | 19 +- .../BLE/BLE_Sensor/Core/Inc/stm32wbxx_it.h | 17 +- .../BLE/BLE_Sensor/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_Sensor/Core/Src/app_debug.c | 40 +- .../BLE/BLE_Sensor/Core/Src/app_entry.c | 243 +- .../BLE/BLE_Sensor/Core/Src/app_vl53l0x.c | 54 +- .../BLE/BLE_Sensor/Core/Src/hw_timerserver.c | 23 +- .../Applications/BLE/BLE_Sensor/Core/Src/hw_uart.c | 317 + .../Applications/BLE/BLE_Sensor/Core/Src/main.c | 154 +- .../BLE/BLE_Sensor/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_Sensor/Core/Src/stm32wbxx_hal_msp.c | 127 +- .../BLE/BLE_Sensor/Core/Src/stm32wbxx_it.c | 43 +- .../BLE/BLE_Sensor/Core/Src/system_stm32wbxx.c | 13 +- .../BLE/BLE_Sensor/Core/Src/vl53l0x/vl53l0x_api.c | 11 +- .../BLE/BLE_Sensor/Core/Src/vl53l0x/vl53l0x_api.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_calibration.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_calibration.h | 11 +- .../BLE_Sensor/Core/Src/vl53l0x/vl53l0x_api_core.c | 11 +- .../BLE_Sensor/Core/Src/vl53l0x/vl53l0x_api_core.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_ranging.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_ranging.h | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_strings.c | 11 +- .../Core/Src/vl53l0x/vl53l0x_api_strings.h | 11 +- .../BLE/BLE_Sensor/Core/Src/vl53l0x/vl53l0x_def.h | 11 +- .../BLE_Sensor/Core/Src/vl53l0x/vl53l0x_device.h | 11 +- .../vl53l0x/vl53l0x_interrupt_threshold_settings.h | 11 +- .../BLE_Sensor/Core/Src/vl53l0x/vl53l0x_platform.h | 13 +- .../Core/Src/vl53l0x/vl53l0x_platform_log.h | 13 +- .../BLE/BLE_Sensor/Core/Src/vl53l0x/vl53l0x_tof.c | 13 +- .../BLE/BLE_Sensor/Core/Src/vl53l0x/vl53l0x_tof.h | 13 +- .../BLE_Sensor/Core/Src/vl53l0x/vl53l0x_tuning.h | 11 +- .../BLE_Sensor/Core/Src/vl53l0x/vl53l0x_types.h | 11 +- .../BLE/BLE_Sensor/EWARM/BLE_Sensor.ewp | 2691 ++++--- .../BLE/BLE_Sensor/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../BLE/BLE_Sensor/EWARM/stm32wb5mxx_flash_cm4.icf | 8 +- .../BLE/BLE_Sensor/EWARM/stm32wb5mxx_sram_cm4.icf | 39 - .../BLE/BLE_Sensor/MDK-ARM/BLE_Sensor.uvoptx | 48 +- .../BLE/BLE_Sensor/MDK-ARM/BLE_Sensor.uvprojx | 24 +- .../BLE_Sensor/MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../BLE_Sensor/MDK-ARM/stm32wb5mxx_flash_cm4.sct | 15 +- .../BLE/BLE_Sensor/STM32CubeIDE/.cproject | 4 +- .../BLE/BLE_Sensor/STM32CubeIDE/.project | 30 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../BLE_Sensor/STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../BLE/BLE_Sensor/STM32_WPAN/App/app_ble.c | 147 +- .../BLE/BLE_Sensor/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_Sensor/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE/BLE_Sensor/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE/BLE_Sensor/STM32_WPAN/App/env_server_app.c | 21 +- .../BLE/BLE_Sensor/STM32_WPAN/App/env_server_app.h | 20 +- .../BLE_Sensor/STM32_WPAN/App/motenv_server_app.c | 20 +- .../BLE_Sensor/STM32_WPAN/App/motenv_server_app.h | 20 +- .../BLE_Sensor/STM32_WPAN/App/motion_server_app.c | 20 +- .../BLE_Sensor/STM32_WPAN/App/motion_server_app.h | 20 +- .../BLE/BLE_Sensor/STM32_WPAN/App/p2p_server_app.c | 22 +- .../BLE/BLE_Sensor/STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE/BLE_Sensor/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE_Sensor/STM32_WPAN/App/wb5m_sensor_stm.c | 23 +- .../BLE_Sensor/STM32_WPAN/App/wb5m_sensor_stm.h | 23 +- .../BLE/BLE_Sensor/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_Sensor/readme.txt | 20 +- .../BLE/BLE_TransparentMode/.extSettings | 3 +- .../BLE_TransparentMode/BLE_TransparentMode.ioc | 515 ++ .../BLE/BLE_TransparentMode/Core/Inc/app_common.h | 21 +- .../BLE/BLE_TransparentMode/Core/Inc/app_conf.h | 63 +- .../BLE/BLE_TransparentMode/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_TransparentMode/Core/Inc/app_entry.h | 25 +- .../BLE/BLE_TransparentMode/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_TransparentMode/Core/Inc/hw_if.h | 15 +- .../BLE/BLE_TransparentMode/Core/Inc/main.h | 13 +- .../BLE_TransparentMode/Core/Inc/stm32_lpm_if.h | 34 +- .../Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Core/Inc/stm32wbxx_hal_conf.h | 17 +- .../BLE_TransparentMode/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_TransparentMode/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_TransparentMode/Core/Src/app_debug.c | 36 +- .../BLE/BLE_TransparentMode/Core/Src/app_entry.c | 92 +- .../BLE_TransparentMode/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_TransparentMode/Core/Src/hw_uart.c | 21 +- .../BLE/BLE_TransparentMode/Core/Src/main.c | 78 +- .../BLE_TransparentMode/Core/Src/stm32_lpm_if.c | 30 +- .../Core/Src/stm32wbxx_hal_msp.c | 35 +- .../BLE_TransparentMode/Core/Src/stm32wbxx_it.c | 12 +- .../Core/Src/system_stm32wbxx.c | 13 +- .../EWARM/BLE_TransparentMode.ewp | 2475 +++--- .../EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../EWARM/stm32wb5mxx_flash_cm4.icf | 8 +- .../EWARM/stm32wb5mxx_sram_cm4.icf | 39 - .../MDK-ARM/BLE_TransparentMode.uvprojx | 2 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../MDK-ARM/stm32wb5mxx_flash_cm4.sct | 15 +- .../BLE/BLE_TransparentMode/STM32CubeIDE/.cproject | 8 +- .../BLE/BLE_TransparentMode/STM32CubeIDE/.project | 5 + .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../BLE_TransparentMode/STM32_WPAN/App/ble_conf.h | 22 +- .../STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c | 29 +- .../BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h | 12 +- .../STM32_WPAN/Target/hw_ipcc.c | 26 +- .../BLE/BLE_TransparentMode/readme.txt | 10 +- .../Applications/BLE/BLE_p2pServer/.extSettings | 3 +- .../BLE/BLE_p2pServer/BLE_p2pServer.ioc | 517 ++ .../BLE/BLE_p2pServer/Core/Inc/app_common.h | 21 +- .../BLE/BLE_p2pServer/Core/Inc/app_conf.h | 61 +- .../BLE/BLE_p2pServer/Core/Inc/app_debug.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/app_entry.h | 25 +- .../BLE/BLE_p2pServer/Core/Inc/hw_conf.h | 22 +- .../BLE/BLE_p2pServer/Core/Inc/hw_if.h | 15 +- .../Applications/BLE/BLE_p2pServer/Core/Inc/main.h | 13 +- .../BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h | 34 +- .../BLE_p2pServer/Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h | 17 +- .../BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE/BLE_p2pServer/Core/Inc/utilities_conf.h | 25 +- .../BLE/BLE_p2pServer/Core/Src/app_debug.c | 36 +- .../BLE/BLE_p2pServer/Core/Src/app_entry.c | 243 +- .../BLE/BLE_p2pServer/Core/Src/hw_timerserver.c | 23 +- .../BLE/BLE_p2pServer/Core/Src/hw_uart.c | 21 +- .../Applications/BLE/BLE_p2pServer/Core/Src/main.c | 78 +- .../BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c | 30 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c | 35 +- .../BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c | 12 +- .../BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c | 13 +- .../BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp | 2534 +++--- .../BLE_p2pServer/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../BLE_p2pServer/EWARM/stm32wb5mxx_flash_cm4.icf | 8 +- .../BLE_p2pServer/EWARM/stm32wb5mxx_sram_cm4.icf | 39 - .../BLE/BLE_p2pServer/MDK-ARM/BLE_p2pServer.uvoptx | 1045 +++ .../BLE_p2pServer/MDK-ARM/BLE_p2pServer.uvprojx | 793 ++ .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 367 + .../MDK-ARM/stm32wb5mxx_flash_cm4.sct | 26 + .../BLE/BLE_p2pServer/STM32CubeIDE/.cproject | 4 +- .../BLE/BLE_p2pServer/STM32CubeIDE/.project | 5 + .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c | 147 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h | 23 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h | 22 +- .../BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h | 23 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c | 22 +- .../BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h | 20 +- .../BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h | 21 +- .../BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c | 26 +- .../Applications/BLE/BLE_p2pServer/readme.txt | 10 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h | 14 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h | 23 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h | 23 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h | 16 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h | 29 +- .../BLE_LLD_Chat/Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h | 15 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h | 11 +- .../BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h | 12 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c | 28 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c | 32 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c | 12 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/main.c | 28 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c | 24 +- .../BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c | 13 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c | 14 +- .../BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c | 13 +- .../BLE_LLD_Chat/Core/Src/system_stm32wbxx.c | 15 +- .../BLE_LLD_Chat/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../BLE_LLD_Chat/MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../BLE_LLD_Chat/MDK-ARM/stm32wb5mxx_flash_cm4.sct | 15 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c | 14 +- .../BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h | 14 +- .../BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c | 14 +- .../BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h | 16 +- .../BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h | 14 +- .../BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Applications/BLE_LLD/BLE_LLD_Chat/readme.txt | 10 +- .../Demontrations/Audio_BVLINKWB/readme.txt | 40 +- .../Thread_Coap_Generic/Core/Inc/app_common.h | 14 +- .../Thread/Thread_Coap_Generic/Core/Inc/app_conf.h | 15 +- .../Thread_Coap_Generic/Core/Inc/app_entry.h | 12 +- .../Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h | 14 +- .../Thread/Thread_Coap_Generic/Core/Inc/hw_if.h | 15 +- .../Thread/Thread_Coap_Generic/Core/Inc/main.h | 13 +- .../Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h | 15 +- .../Thread_Coap_Generic/Core/Inc/stm_logging.h | 11 +- .../Thread_Coap_Generic/Core/Inc/utilities_conf.h | 12 +- .../Thread_Coap_Generic/Core/Src/app_entry.c | 16 +- .../Thread_Coap_Generic/Core/Src/hw_timerserver.c | 16 +- .../Thread/Thread_Coap_Generic/Core/Src/hw_uart.c | 12 +- .../Thread/Thread_Coap_Generic/Core/Src/main.c | 26 +- .../Thread_Coap_Generic/Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Thread_Coap_Generic/Core/Src/stm32wbxx_it.c | 14 +- .../Thread_Coap_Generic/Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_thread.c | 24 +- .../STM32_WPAN/App/app_thread.h | 18 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Thread/Thread_Coap_Generic/readme.txt | 10 +- .../EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- .../TouchSensing/TouchSensing_1touchkey/Inc/main.h | 13 +- .../Inc/stm32wb5mm_dk_conf.h | 13 +- .../Inc/stm32wbxx_hal_conf.h | 15 +- .../TouchSensing_1touchkey/Inc/stm32wbxx_it.h | 15 +- .../Inc/stmCriticalSection.h | 30 +- .../TouchSensing_1touchkey/Inc/touchsensing.h | 12 +- .../TouchSensing_1touchkey/Inc/tsl_conf.h | 15 +- .../TouchSensing_1touchkey/Inc/tsl_user.h | 16 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 13 +- .../TouchSensing/TouchSensing_1touchkey/Src/main.c | 31 +- .../TouchSensing_1touchkey/Src/stm32wbxx_hal_msp.c | 13 +- .../TouchSensing_1touchkey/Src/stm32wbxx_it.c | 12 +- .../Src/stmCriticalSection.c | 30 +- .../TouchSensing_1touchkey/Src/system_stm32wbxx.c | 13 +- .../TouchSensing_1touchkey/Src/touchsensing.c | 14 +- .../TouchSensing_1touchkey/Src/tsl_user.c | 14 +- .../TouchSensing_1touchkey.ioc | 17 +- .../TouchSensing/TouchSensing_1touchkey/readme.txt | 10 +- .../Core/Inc/app_common.h | 14 +- .../Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h | 15 +- .../Core/Inc/app_entry.h | 12 +- .../Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 20 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c | 12 +- .../Zigbee_OnOff_Client_Router/Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 14 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OnOff_Client_Router/readme.txt | 12 +- .../Core/Inc/app_common.h | 14 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h | 15 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h | 12 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h | 14 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_OnOff_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c | 20 +- .../Core/Src/hw_timerserver.c | 16 +- .../Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c | 12 +- .../Zigbee_OnOff_Server_Coord/Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 15 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../MDK-ARM/startup_stm32wb55xx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 14 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_OnOff_Server_Coord/readme.txt | 12 +- .../Core/Inc/app_common.h | 14 +- .../Core/Inc/app_conf.h | 15 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_TempMeas_Client_Router/Core/Inc/hw_if.h | 15 +- .../Zigbee_TempMeas_Client_Router/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Src/app_entry.c | 20 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_TempMeas_Client_Router/Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 29 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee_TempMeas_Client_Router/readme.txt | 12 +- .../Core/Inc/app_common.h | 14 +- .../Core/Inc/app_conf.h | 15 +- .../Core/Inc/app_entry.h | 12 +- .../Core/Inc/app_stts22h.h | 13 +- .../Core/Inc/app_vl53l0x.h | 13 +- .../Core/Inc/hw_conf.h | 14 +- .../Zigbee_TempMeas_Server_Coord/Core/Inc/hw_if.h | 15 +- .../Zigbee_TempMeas_Server_Coord/Core/Inc/main.h | 13 +- .../Core/Inc/stm32_lpm_if.h | 29 +- .../Core/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Core/Inc/stm32wbxx_hal_conf.h | 15 +- .../Core/Inc/stm32wbxx_it.h | 15 +- .../Core/Inc/stm_logging.h | 11 +- .../Core/Inc/utilities_conf.h | 12 +- .../Core/Inc/vcp_conf.h | 29 +- .../Core/Src/app_entry.c | 20 +- .../Core/Src/app_stts22h.c | 27 +- .../Core/Src/hw_timerserver.c | 16 +- .../Core/Src/hw_uart.c | 12 +- .../Zigbee_TempMeas_Server_Coord/Core/Src/main.c | 24 +- .../Core/Src/stm32_lpm_if.c | 24 +- .../Core/Src/stm32wbxx_hal_msp.c | 12 +- .../Core/Src/stm32wbxx_it.c | 14 +- .../Core/Src/stm_logging.c | 13 +- .../Core/Src/system_stm32wbxx.c | 15 +- .../EWARM/startup_stm32wb55xx_cm4.s | 14 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/Core/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/Core/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../STM32_WPAN/App/app_zigbee.c | 14 +- .../STM32_WPAN/App/app_zigbee.h | 14 +- .../STM32_WPAN/App/tl_dbg_conf.h | 18 +- .../STM32_WPAN/Target/hw_ipcc.c | 21 +- .../Zigbee/Zigbee_TempMeas_Server_Coord/readme.txt | 12 +- .../STM32WB5MM-DK/Examples/BSP/EWARM/Project.ewp | 2 +- .../Examples/BSP/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- Projects/STM32WB5MM-DK/Examples/BSP/Inc/main.h | 13 +- .../Examples/BSP/Inc/s25fl128s_conf.h | 23 +- Projects/STM32WB5MM-DK/Examples/BSP/Inc/stlogo.h | 11 +- .../Examples/BSP/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Examples/BSP/Inc/stm32wbxx_hal_conf.h | 15 +- .../STM32WB5MM-DK/Examples/BSP/Inc/stm32wbxx_it.h | 13 +- .../Examples/BSP/Inc/usb/usbd_audio_if.h | 13 +- .../Examples/BSP/Inc/usb/usbd_audio_in.h | 13 +- .../STM32WB5MM-DK/Examples/BSP/Inc/usb/usbd_conf.h | 13 +- .../STM32WB5MM-DK/Examples/BSP/Inc/usb/usbd_desc.h | 12 +- .../Examples/BSP/MDK-ARM/Project.uvprojx | 2 +- .../Examples/BSP/MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- Projects/STM32WB5MM-DK/Examples/BSP/Src/lcd.c | 12 +- Projects/STM32WB5MM-DK/Examples/BSP/Src/led.c | 12 +- Projects/STM32WB5MM-DK/Examples/BSP/Src/main.c | 13 +- .../STM32WB5MM-DK/Examples/BSP/Src/proximity.c | 28 +- Projects/STM32WB5MM-DK/Examples/BSP/Src/qspi.c | 12 +- Projects/STM32WB5MM-DK/Examples/BSP/Src/record.c | 13 +- Projects/STM32WB5MM-DK/Examples/BSP/Src/sensors.c | 28 +- .../Examples/BSP/Src/stm32wbxx_hal_msp.c | 15 +- .../STM32WB5MM-DK/Examples/BSP/Src/stm32wbxx_it.c | 13 +- .../Examples/BSP/Src/system_stm32wbxx.c | 13 +- .../Examples/BSP/Src/usb/usbd_audio_if.c | 13 +- .../Examples/BSP/Src/usb/usbd_audio_in.c | 28 +- .../STM32WB5MM-DK/Examples/BSP/Src/usb/usbd_conf.c | 15 +- .../STM32WB5MM-DK/Examples/BSP/Src/usb/usbd_desc.c | 13 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api.c | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api.h | 11 +- .../BSP/Src/vl53l0x/vl53l0x_api_calibration.c | 11 +- .../BSP/Src/vl53l0x/vl53l0x_api_calibration.h | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api_core.c | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api_core.h | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api_ranging.c | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api_ranging.h | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api_strings.c | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_api_strings.h | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_def.h | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_device.h | 11 +- .../vl53l0x/vl53l0x_interrupt_threshold_settings.h | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_platform.h | 13 +- .../BSP/Src/vl53l0x/vl53l0x_platform_log.h | 13 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_tof.c | 13 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_tof.h | 13 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_tuning.h | 11 +- .../Examples/BSP/Src/vl53l0x/vl53l0x_types.h | 11 +- Projects/STM32WB5MM-DK/Examples/BSP/readme.txt | 23 +- .../EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- .../Examples/QSPI/QSPI_ExecuteInPlace/Inc/main.h | 13 +- .../QSPI_ExecuteInPlace/Inc/stm32wb5mm_dk_conf.h | 13 +- .../QSPI_ExecuteInPlace/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_it.h | 15 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../QSPI_ExecuteInPlace/QSPI_ExecuteInPlace.ioc | 17 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 13 +- .../Examples/QSPI/QSPI_ExecuteInPlace/Src/main.c | 31 +- .../QSPI_ExecuteInPlace/Src/stm32wbxx_hal_msp.c | 13 +- .../QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_it.c | 12 +- .../QSPI_ExecuteInPlace/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_ExecuteInPlace/readme.txt | 12 +- .../EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- .../Examples/QSPI/QSPI_MemoryMapped/Inc/main.h | 13 +- .../QSPI_MemoryMapped/Inc/stm32wb5mm_dk_conf.h | 13 +- .../QSPI_MemoryMapped/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_it.h | 15 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../QSPI/QSPI_MemoryMapped/QSPI_MemoryMapped.ioc | 17 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 13 +- .../Examples/QSPI/QSPI_MemoryMapped/Src/main.c | 31 +- .../QSPI/QSPI_MemoryMapped/Src/stm32wbxx_hal_msp.c | 13 +- .../QSPI/QSPI_MemoryMapped/Src/stm32wbxx_it.c | 12 +- .../QSPI/QSPI_MemoryMapped/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_MemoryMapped/readme.txt | 12 +- .../EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- .../Examples/QSPI/QSPI_ReadWrite_DMA/Inc/main.h | 13 +- .../QSPI_ReadWrite_DMA/Inc/stm32wb5mm_dk_conf.h | 13 +- .../QSPI_ReadWrite_DMA/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_it.h | 15 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../QSPI/QSPI_ReadWrite_DMA/QSPI_ReadWrite_DMA.ioc | 17 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../Examples/QSPI/QSPI_ReadWrite_DMA/Src/main.c | 31 +- .../QSPI_ReadWrite_DMA/Src/stm32wbxx_hal_msp.c | 13 +- .../QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_it.c | 12 +- .../QSPI/QSPI_ReadWrite_DMA/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_ReadWrite_DMA/readme.txt | 12 +- .../EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- .../Examples/QSPI/QSPI_ReadWrite_IT/Inc/main.h | 13 +- .../QSPI_ReadWrite_IT/Inc/stm32wb5mm_dk_conf.h | 13 +- .../QSPI_ReadWrite_IT/Inc/stm32wbxx_hal_conf.h | 15 +- .../QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_it.h | 15 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../QSPI/QSPI_ReadWrite_IT/QSPI_ReadWrite_IT.ioc | 17 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../Examples/QSPI/QSPI_ReadWrite_IT/Src/main.c | 31 +- .../QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_hal_msp.c | 13 +- .../QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_it.c | 12 +- .../QSPI/QSPI_ReadWrite_IT/Src/system_stm32wbxx.c | 15 +- .../Examples/QSPI/QSPI_ReadWrite_IT/readme.txt | 12 +- .../RCC/RCC_ClockConfig/EWARM/RCC_ClockConfig.ewp | 176 +- .../EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- .../RCC_ClockConfig/EWARM/stm32wb5mxx_sram_cm4.icf | 2 +- .../Examples/RCC/RCC_ClockConfig/Inc/main.h | 13 +- .../RCC/RCC_ClockConfig/Inc/stm32wb5mm_dk_conf.h | 13 +- .../RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h | 15 +- .../RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h | 15 +- .../MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../RCC/RCC_ClockConfig/RCC_ClockConfig.ioc | 15 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../Examples/RCC/RCC_ClockConfig/Src/main.c | 38 +- .../RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c | 43 +- .../RCC/RCC_ClockConfig/Src/stm32wbxx_it.c | 12 +- .../RCC/RCC_ClockConfig/Src/system_stm32wbxx.c | 13 +- .../Examples/RCC/RCC_ClockConfig/readme.txt | 10 +- .../Examples/SAI/SAI_AudioPlay/readme.txt | 15 +- .../UART_Console/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../UART_Console/EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- .../UART_Console/EWARM/stm32wb5mxx_sram_cm4.icf | 2 +- .../Examples/UART/UART_Console/Inc/main.h | 13 +- .../UART/UART_Console/Inc/stm32wb5mm_dk_conf.h | 13 +- .../UART/UART_Console/Inc/stm32wbxx_hal_conf.h | 15 +- .../Examples/UART/UART_Console/Inc/stm32wbxx_it.h | 13 +- .../UART_Console/MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 30 +- .../Examples/UART/UART_Console/Src/main.c | 34 +- .../UART/UART_Console/Src/stm32wbxx_hal_msp.c | 23 +- .../Examples/UART/UART_Console/Src/stm32wbxx_it.c | 12 +- .../UART/UART_Console/Src/system_stm32wbxx.c | 13 +- .../Examples/UART/UART_Console/UART_Console.ioc | 17 +- .../Examples/UART/UART_Console/readme.txt | 10 +- Projects/STM32WB5MM-DK/Release_Notes.html | 30 +- .../Templates/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../Templates/EWARM/stm32wb5mxx_flash_cm4.icf | 4 +- Projects/STM32WB5MM-DK/Templates/Inc/main.h | 13 +- .../Templates/Inc/stm32wb5mm_dk_conf.h | 13 +- .../Templates/Inc/stm32wbxx_hal_conf.h | 15 +- .../STM32WB5MM-DK/Templates/Inc/stm32wbxx_it.h | 15 +- .../Templates/MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../Templates/STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 13 +- Projects/STM32WB5MM-DK/Templates/Src/main.c | 31 +- .../Templates/Src/stm32wbxx_hal_msp.c | 13 +- .../STM32WB5MM-DK/Templates/Src/stm32wbxx_it.c | 12 +- .../STM32WB5MM-DK/Templates/Src/system_stm32wbxx.c | 15 +- Projects/STM32WB5MM-DK/Templates/Templates.ioc | 17 +- Projects/STM32WB5MM-DK/Templates/readme.txt | 10 +- .../Templates_LL/EWARM/startup_stm32wb5mxx_cm4.s | 14 +- .../Templates_LL/EWARM/stm32wb5mxx_flash_cm4.icf | 2 +- Projects/STM32WB5MM-DK/Templates_LL/Inc/main.h | 13 +- .../STM32WB5MM-DK/Templates_LL/Inc/stm32_assert.h | 15 +- .../STM32WB5MM-DK/Templates_LL/Inc/stm32wbxx_it.h | 15 +- .../Templates_LL/MDK-ARM/startup_stm32wb5mxx_cm4.s | 13 +- .../Application/Startup/startup_stm32wb5mmghx.s | 14 +- .../STM32CubeIDE/Application/User/syscalls.c | 27 +- .../STM32CubeIDE/Application/User/sysmem.c | 27 +- .../STM32CubeIDE/STM32WB5MMGHX_FLASH.ld | 13 +- Projects/STM32WB5MM-DK/Templates_LL/Src/main.c | 25 +- .../STM32WB5MM-DK/Templates_LL/Src/stm32wbxx_it.c | 12 +- .../Templates_LL/Src/system_stm32wbxx.c | 15 +- .../STM32WB5MM-DK/Templates_LL/Templates_LL.ioc | 17 +- Projects/STM32WB5MM-DK/Templates_LL/readme.txt | 10 +- .../STM32WB1x/Release_Notes.html | 136 +- .../STM32WB1x/stm32wb1x_BLE_HCILayer_fw.bin | Bin 77680 -> 93628 bytes .../STM32WB1x/stm32wb1x_BLE_HCI_AdvScan_fw.bin | Bin 38528 -> 31800 bytes .../STM32WB1x/stm32wb1x_BLE_Stack_basic_fw.bin | Bin 148856 -> 141956 bytes .../STM32WB1x/stm32wb1x_BLE_Stack_full_fw.bin | Bin 171848 -> 182624 bytes .../STM32WB1x/stm32wb1x_BLE_Stack_light_fw.bin | Bin 122284 -> 117744 bytes .../STM32WB1x/stm32wb1x_Safeboot_fw.bin | Bin 0 -> 6292 bytes .../STM32WB3x/Release_Notes.html | 263 +- .../STM32WB3x/stm32wb3x_BLE_HCILayer_fw.bin | Bin 77024 -> 95544 bytes .../STM32WB3x/stm32wb3x_BLE_HCI_AdvScan_fw.bin | Bin 37872 -> 35224 bytes .../STM32WB3x/stm32wb3x_BLE_Stack_basic_fw.bin | Bin 147796 -> 142884 bytes .../STM32WB3x/stm32wb3x_BLE_Stack_full_fw.bin | Bin 170804 -> 183536 bytes .../STM32WB3x/stm32wb3x_BLE_Stack_light_fw.bin | Bin 121236 -> 118688 bytes .../STM32WB3x/stm32wb3x_Mac_802_15_4_fw.bin | Bin 68392 -> 68740 bytes .../STM32WB3x/stm32wb3x_Phy_802_15_4_fw.bin | Bin 88432 -> 88944 bytes .../STM32WB3x/stm32wb3x_Safeboot_fw.bin | Bin 0 -> 7316 bytes .../STM32WB3x/stm32wb3x_Thread_FTD_fw.bin | Bin 376928 -> 377568 bytes .../STM32WB3x/stm32wb3x_Thread_MTD_fw.bin | Bin 298548 -> 299192 bytes .../STM32WB3x/stm32wb3x_Thread_RCP_fw.bin | Bin 102992 -> 102924 bytes .../STM32WB3x/stm32wb3x_Zigbee_FFD_fw.bin | Bin 324364 -> 326176 bytes .../STM32WB3x/stm32wb3x_Zigbee_RFD_fw.bin | Bin 264120 -> 265824 bytes .../STM32WB5x/Release_Notes.html | 382 +- .../STM32WB5x/stm32wb5x_BLE_HCILayer_fw.bin | Bin 77024 -> 95544 bytes .../STM32WB5x/stm32wb5x_BLE_HCI_AdvScan_fw.bin | Bin 37872 -> 35224 bytes .../STM32WB5x/stm32wb5x_BLE_Mac_802_15_4_fw.bin | Bin 259044 -> 272040 bytes .../STM32WB5x/stm32wb5x_BLE_Stack_basic_fw.bin | Bin 147796 -> 142884 bytes .../STM32WB5x/stm32wb5x_BLE_Stack_full_fw.bin | Bin 170804 -> 183536 bytes .../STM32WB5x/stm32wb5x_BLE_Stack_light_fw.bin | Bin 121236 -> 118688 bytes .../STM32WB5x/stm32wb5x_BLE_Thread_dynamic_fw.bin | Bin 539672 -> 552352 bytes .../STM32WB5x/stm32wb5x_BLE_Thread_static_fw.bin | Bin 530508 -> 543796 bytes .../stm32wb5x_BLE_Zigbee_FFD_dynamic_fw.bin | Bin 519096 -> 533356 bytes .../stm32wb5x_BLE_Zigbee_FFD_static_fw.bin | Bin 512260 -> 0 bytes .../stm32wb5x_BLE_Zigbee_RFD_dynamic_fw.bin | Bin 458744 -> 472840 bytes .../stm32wb5x_BLE_Zigbee_RFD_static_fw.bin | Bin 451784 -> 0 bytes .../STM32WB5x/stm32wb5x_Mac_802_15_4_fw.bin | Bin 68392 -> 68740 bytes .../STM32WB5x/stm32wb5x_Phy_802_15_4_fw.bin | Bin 88432 -> 88944 bytes .../STM32WB5x/stm32wb5x_Safeboot_fw.bin | Bin 0 -> 7316 bytes .../STM32WB5x/stm32wb5x_Thread_FTD_fw.bin | Bin 376928 -> 377568 bytes .../STM32WB5x/stm32wb5x_Thread_MTD_fw.bin | Bin 298548 -> 299192 bytes .../STM32WB5x/stm32wb5x_Thread_RCP_fw.bin | Bin 102992 -> 102924 bytes .../STM32WB5x/stm32wb5x_Zigbee_FFD_fw.bin | Bin 324364 -> 326176 bytes .../STM32WB5x/stm32wb5x_Zigbee_RFD_fw.bin | Bin 264120 -> 265824 bytes README.md | 4 + Release_Notes.html | 1585 ++-- package.xml | 4 +- 11175 files changed, 322955 insertions(+), 166477 deletions(-) create mode 100644 Drivers/BSP/Components/s25fl128s/LICENSE.md create mode 100644 Drivers/BSP/Components/s25fl128s/_htmresc/favicon.png delete mode 100644 Drivers/BSP/Components/s25fl128s/_htmresc/mini-st.css create mode 100644 Drivers/BSP/Components/s25fl128s/_htmresc/mini-st_2020.css delete mode 100644 Drivers/BSP/Components/s25fl128s/_htmresc/st_logo.png create mode 100644 Drivers/BSP/Components/s25fl128s/_htmresc/st_logo_2020.png create mode 100644 Drivers/BSP/Components/stm32wb_at/LICENSE.md create mode 100644 Drivers/BSP/Components/stm32wb_at/Release_Notes.html create mode 100644 Drivers/BSP/Components/stm32wb_at/_htmresc/favicon.png create mode 100644 Drivers/BSP/Components/stm32wb_at/_htmresc/mini-st_2020.css create mode 100644 Drivers/BSP/Components/stm32wb_at/_htmresc/st_logo_2020.png create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at.c create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at.h create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.h create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.c create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.h create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c create mode 100644 Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.h create mode 100644 Drivers/BSP/NUCLEO-WB15CC/README.md create mode 100644 Drivers/BSP/P-NUCLEO-WB55.Nucleo/README.md create mode 100644 Drivers/BSP/P-NUCLEO-WB55.USBDongle/README.md create mode 100644 Drivers/BSP/STM32WB5MM-DK/README.md delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Inc/pdm2pcm_glo.h delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc16.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc32.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc16.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc32.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_Keil_wc16.lib delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16_softfp.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32_softfp.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc16.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc32.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_Keil_wc16.lib delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16_softfp.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32_softfp.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc16.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc32.a delete mode 100644 Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_Keil_wc16.lib create mode 100644 Middlewares/ST/STM32_WPAN/LICENSE.md create mode 100644 Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC.a create mode 100644 Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC_DEBUG.a create mode 100644 Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR.a create mode 100644 Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR_DEBUG.a create mode 100644 Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil.lib create mode 100644 Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil_DEBUG.lib create mode 100644 Middlewares/ST/STM32_WPAN/ble_lld/README.md delete mode 100644 Middlewares/ST/STM32_WPAN/zigbee/SLA0044.txt delete mode 100644 Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_errors.h create mode 100644 Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_client.c create mode 100644 Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_server.c create mode 100644 Middlewares/ST/STM32_WPAN/zigbee/utilities/zigbee.string.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.project create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/nucleo_wb15cc_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/standby_stm32wb15.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_hal_msp.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewd create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewp create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/Project.eww create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb15xx_cm4.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb15xx_flash_cm4.icf create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvoptx create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvprojx create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb15xx_cm4.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb15xx_flash_cm4.sct create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.cproject create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.project create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/readme.txt create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/nucleo_wb15cc_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/standby_stm32wb15.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_hal_msp.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewd create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewp create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/Project.eww create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb15xx_cm4.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb15xx_flash_cm4.icf create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvoptx create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvprojx create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb15xx_cm4.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb15xx_flash_cm4.sct create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.cproject create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.project create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c create mode 100644 Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt create mode 100644 Projects/NUCLEO-WB15CC/Templates/readme.txt create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/.extSettings create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Project.eww create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewd create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewp create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/EWARM/startup_stm32wb15xx_cm4.s create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/EWARM/stm32wb15xx_flash_cm4.icf create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/Inc/main.h create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32_assert.h create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32wbxx_it.h create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/LICENSE.md create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/Src/main.c create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/Src/stm32wbxx_it.c create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/Src/system_stm32wbxx.c create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/Templates_LL.ioc create mode 100644 Projects/NUCLEO-WB15CC/Templates_LL/readme.txt create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Binary/BLE_AT_Server_reference.hex create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_common.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_debug.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_entry.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server_cb.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_if.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/main.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32_lpm_if.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_hal_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_it.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/utilities_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_debug.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_entry.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/ble_at_server.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/ble_at_server_cb.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_timerserver.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_uart.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/main.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32_lpm_if.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_hal_msp.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_it.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/system_stm32wbxx.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewd create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewp create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/Project.eww create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/startup_stm32wb55xx_cm4.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/stm32wb55xx_flash_cm4.icf create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvoptx create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvprojx create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/startup_stm32wb55xx_cm4.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/stm32wb55xx_flash_cm4.sct create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.cproject create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.project create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/syscalls.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/sysmem.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_dbg_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/p2p_server_app.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/p2p_server_app.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/tl_dbg_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/Target/hw_ipcc.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/readme.txt create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_common.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_entry.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/gpio_lld.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_if.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/main.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32_lpm_if.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_hal_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_it.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm_logging.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/utilities_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/app_entry.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/gpio_lld.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_timerserver.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_uart.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/main.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32_lpm_if.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_hal_msp.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_it.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm_logging.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/system_stm32wbxx.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewd create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewp create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.eww create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/startup_stm32wb55xx_cm4.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/stm32wb55xx_flash_cm4.icf create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvoptx create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvprojx create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/startup_stm32wb55xx_cm4.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/stm32wb55xx_flash_cm4.sct create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.cproject create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.project create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/syscalls.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/sysmem.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/tl_dbg_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/Target/hw_ipcc.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/readme.txt delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_common.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_conf.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_entry.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_conf.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_if.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/main.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32_lpm_if.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_hal_conf.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_it.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm_logging.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/utilities_conf.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/app_entry.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_timerserver.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_uart.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/main.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32_lpm_if.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32wbxx_it.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm_logging.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/system_stm32wbxx.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewd delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewp delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.eww delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/startup_stm32wb55xx_cm4.s delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/stm32wb55xx_flash_cm4.icf delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvoptx delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvprojx delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/startup_stm32wb55xx_cm4.s delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/stm32wb55xx_flash_cm4.sct delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.cproject delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.project delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_conf.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_dbg_conf.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/p2p_server_app.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/p2p_server_app.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/tl_dbg_conf.h delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/Target/hw_ipcc.c delete mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/readme.txt create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_common.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_entry.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_if.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/main.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32_lpm_if.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_it.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm_logging.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/utilities_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/app_entry.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_timerserver.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_uart.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/main.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32_lpm_if.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_it.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm_logging.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/system_stm32wbxx.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Project.eww create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewd create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewp create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvoptx create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvprojx create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/stm32wb55xx_flash_cm4.sct create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.cproject create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.project create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c create mode 100644 Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/readme.txt create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc delete mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_sram_cm4.icf create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_common.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_debug.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_entry.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_stts22h.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/app_vl53l0x.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/hw_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/hw_flash.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/hw_if.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/lp_timer.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/main.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/stm32_lpm_if.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/stm32wb5mm_dk_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/stm32wbxx_hal_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/stm32wbxx_it.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/utilities_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Inc/vcp_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/app_debug.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/app_entry.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/app_stts22h.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/app_vl53l0x.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/hw_flash.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/hw_timerserver.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/hw_uart.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/lp_timer.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/main.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/stm32_lpm_if.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/stm32wbxx_it.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/system_stm32wbxx.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_calibration.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_calibration.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_core.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_core.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_ranging.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_ranging.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_strings.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_api_strings.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_def.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_device.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_interrupt_threshold_settings.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_platform.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_platform_log.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_platform_log.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_tof.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_tof.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_tuning.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/Core/Src/vl53l0x/vl53l0x_types.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/EWARM/BLE_Mesh_Model_Sensor.ewd create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/EWARM/BLE_Mesh_Model_Sensor.ewp create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/EWARM/Project.eww create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/EWARM/startup_stm32wb55xx_cm4.s create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/EWARM/stm32wb5mxx_flash_cm4.icf create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/MDK-ARM/BLE_Mesh_Model_Sensor.uvoptx create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/MDK-ARM/BLE_Mesh_Model_Sensor.uvprojx create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/MDK-ARM/startup_stm32wb5mxx_cm4.s create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/MDK-ARM/stm32wb5mxx_flash_cm4.sct create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32CubeIDE/.cproject create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32CubeIDE/.project create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32CubeIDE/Application/Core/syscalls.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32CubeIDE/Application/Core/sysmem.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32CubeIDE/Application/Startup/startup_stm32wb5mmghx.s create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32CubeIDE/STM32WB5MMGHX_FLASH.ld create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/PWM_config.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/PWM_config.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/PWM_handlers.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/PWM_handlers.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/app_ble.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/app_ble.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_config.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_config.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_config_client.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_config_client.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_generic.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_generic.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_generic_client.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_generic_client.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_light.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_light.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_light_client.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_light_client.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_light_lc.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_light_lc.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_mesh.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_mesh.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_nvm.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_nvm.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_sensor.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_sensor.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_sensors_client.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_sensors_client.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_vendor.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/appli_vendor.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/ble_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/ble_dbg_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/cube_hal.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/data.s create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/hal_common.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/mesh_cfg_usr.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/models_if.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/models_if.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/pal_nvm.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/sensor_cfg_usr.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/svcctl_conf.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/tl_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/tl_dbg_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/tl_if.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/user_if.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/user_if.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/app/vcp_conf.h create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/STM32_WPAN/target/hw_ipcc.c create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_Model_Sensor/readme.txt delete mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_ThermometerSensor/EWARM/stm32wb55xx_flash_cm4.icf create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Mesh_ThermometerSensor/EWARM/stm32wb5mxx_flash_cm4.icf create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Sensor/BLE_Sensor.ioc create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Sensor/Core/Src/hw_uart.c delete mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_Sensor/EWARM/stm32wb5mxx_sram_cm4.icf create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc delete mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb5mxx_sram_cm4.icf create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc delete mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_p2pServer/EWARM/stm32wb5mxx_sram_cm4.icf create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_p2pServer/MDK-ARM/BLE_p2pServer.uvoptx create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_p2pServer/MDK-ARM/BLE_p2pServer.uvprojx create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb5mxx_cm4.s create mode 100644 Projects/STM32WB5MM-DK/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb5mxx_flash_cm4.sct create mode 100644 Projects/STM32WB_Copro_Wireless_Binaries/STM32WB1x/stm32wb1x_Safeboot_fw.bin create mode 100644 Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Safeboot_fw.bin delete mode 100644 Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/stm32wb5x_BLE_Zigbee_FFD_static_fw.bin delete mode 100644 Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/stm32wb5x_BLE_Zigbee_RFD_static_fw.bin create mode 100644 Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/stm32wb5x_Safeboot_fw.bin diff --git a/Drivers/BSP/Components/s25fl128s/LICENSE.md b/Drivers/BSP/Components/s25fl128s/LICENSE.md new file mode 100644 index 000000000..9226612ae --- /dev/null +++ b/Drivers/BSP/Components/s25fl128s/LICENSE.md @@ -0,0 +1,27 @@ +Copyright 2021 STMicroelectronics. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Drivers/BSP/Components/s25fl128s/Release_Notes.html b/Drivers/BSP/Components/s25fl128s/Release_Notes.html index 7400c4f62..55a4a2a54 100644 --- a/Drivers/BSP/Components/s25fl128s/Release_Notes.html +++ b/Drivers/BSP/Components/s25fl128s/Release_Notes.html @@ -11,28 +11,21 @@ span.underline{text-decoration: underline;} div.column{display: inline-block; vertical-align: top; width: 50%;} - + +
-
-
-

Release Notes for S25FL128S QuadSPI Component Driver

+

Release Notes for

+

S25FL128S QuadSPI Component Driver

Copyright © 2021 STMicroelectronics

- -
-
-
-

License

-This software component is licensed by ST under BSD 3-Clause license, the “License”; You may not use this component except in compliance with the License. You may obtain a copy of the License at: -
-https://opensource.org/licenses/BSD-3-Clause +

Purpose

This driver provides a set of functions for S25FL128S QuadSPI component

@@ -40,10 +33,29 @@ This software component is licensed by ST under BSD 3-Clause license, the “Lic

Update History

- +

Main Changes

    +
  • Update licensing in Release Notes
    • +
+
+
+
+ +
+

Main Changes

+
    +
  • Fix S25FL128S_ReadStatusRegister() to ensure data read
    • +
  • Cleanup since S25FL128S supports only 1-bit instructions
    • +
+
+
+
+ +
+

Main Changes

+
  • First official release of S25FL128S QuadSPI component driver
@@ -51,8 +63,7 @@ This software component is licensed by ST under BSD 3-Clause license, the “Lic
-

For complete documentation on STM32,visit: [www.st.com/stm32]

-This release note uses up to date web standards and, for this reason, should not be opened with Internet Explorer but preferably with popular browsers such as Google Chrome, Mozilla Firefox, Opera or Microsoft Edge. +For complete documentation on STM32 Microcontrollers , visit: http://www.st.com/STM32
diff --git a/Drivers/BSP/Components/s25fl128s/_htmresc/favicon.png b/Drivers/BSP/Components/s25fl128s/_htmresc/favicon.png new file mode 100644 index 000000000..06713eec4 Binary files /dev/null and b/Drivers/BSP/Components/s25fl128s/_htmresc/favicon.png differ diff --git a/Drivers/BSP/Components/s25fl128s/_htmresc/mini-st.css b/Drivers/BSP/Components/s25fl128s/_htmresc/mini-st.css deleted file mode 100644 index 71fbc14fc..000000000 --- a/Drivers/BSP/Components/s25fl128s/_htmresc/mini-st.css +++ /dev/null @@ -1,1700 +0,0 @@ -@charset "UTF-8"; -/* - Flavor name: Default (mini-default) - Author: Angelos Chalaris (chalarangelo@gmail.com) - Maintainers: Angelos Chalaris - mini.css version: v3.0.0-alpha.3 -*/ -/* - Browsers resets and base typography. -*/ -/* Core module CSS variable definitions */ -:root { - --fore-color: #111; - --secondary-fore-color: #444; - --back-color: #f8f8f8; - --secondary-back-color: #f0f0f0; - --blockquote-color: #f57c00; - --pre-color: #1565c0; - --border-color: #aaa; - --secondary-border-color: #ddd; - --heading-ratio: 1.19; - --universal-margin: 0.5rem; - --universal-padding: 0.125rem; - --universal-border-radius: 0.125rem; - --a-link-color: #0277bd; - --a-visited-color: #01579b; } - -html { - font-size: 14px; } - -a, b, del, em, i, ins, q, span, strong, u { - font-size: 1em; } - -html, * { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif; - line-height: 1.4; - -webkit-text-size-adjust: 100%; } - -* { - font-size: 1rem; } - -body { - margin: 0; - color: var(--fore-color); - background: var(--back-color); } - -details { - display: block; } - -summary { - display: list-item; } - -abbr[title] { - border-bottom: none; - text-decoration: underline dotted; } - -input { - overflow: visible; } - -img { - max-width: 100%; - height: auto; } - -h1, h2, h3, h4, h5, h6 { - line-height: 1.2; - margin: calc(1.5 * var(--universal-margin)) var(--universal-margin); - font-weight: 500; } - h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { - color: var(--secondary-fore-color); - display: block; - margin-top: -0.25rem; } - -h1 { - font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); } - -h2 { - font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); ); - background: var(--mark-back-color); - font-weight: 600; - padding: 0.1em 0.5em 0.2em 0.5em; - color: var(--mark-fore-color); } - -h3 { - font-size: calc(1rem * var(--heading-ratio)); - padding-left: calc(2 * var(--universal-margin)); - /* background: var(--border-color); */ - } - -h4 { - font-size: 1rem;); - padding-left: calc(4 * var(--universal-margin)); } - -h5 { - font-size: 1rem; } - -h6 { - font-size: calc(1rem / var(--heading-ratio)); } - -p { - margin: var(--universal-margin); } - -ol, ul { - margin: var(--universal-margin); - padding-left: calc(6 * var(--universal-margin)); } - -b, strong { - font-weight: 700; } - -hr { - box-sizing: content-box; - border: 0; - line-height: 1.25em; - margin: var(--universal-margin); - height: 0.0625rem; - background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); } - -blockquote { - display: block; - position: relative; - font-style: italic; - color: var(--secondary-fore-color); - margin: var(--universal-margin); - padding: calc(3 * var(--universal-padding)); - border: 0.0625rem solid var(--secondary-border-color); - border-left: 0.375rem solid var(--blockquote-color); - border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; } - blockquote:before { - position: absolute; - top: calc(0rem - var(--universal-padding)); - left: 0; - font-family: sans-serif; - font-size: 3rem; - font-weight: 700; - content: "\201c"; - color: var(--blockquote-color); } - blockquote[cite]:after { - font-style: normal; - font-size: 0.75em; - font-weight: 700; - content: "\a— " attr(cite); - white-space: pre; } - -code, kbd, pre, samp { - font-family: Menlo, Consolas, monospace; - font-size: 0.85em; } - -code { - background: var(--secondary-back-color); - border-radius: var(--universal-border-radius); - padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); } - -kbd { - background: var(--fore-color); - color: var(--back-color); - border-radius: var(--universal-border-radius); - padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); } - -pre { - overflow: auto; - background: var(--secondary-back-color); - padding: calc(1.5 * var(--universal-padding)); - margin: var(--universal-margin); - border: 0.0625rem solid var(--secondary-border-color); - border-left: 0.25rem solid var(--pre-color); - border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; } - -sup, sub, code, kbd { - line-height: 0; - position: relative; - vertical-align: baseline; } - -small, sup, sub, figcaption { - font-size: 0.75em; } - -sup { - top: -0.5em; } - -sub { - bottom: -0.25em; } - -figure { - margin: var(--universal-margin); } - -figcaption { - color: var(--secondary-fore-color); } - -a { - text-decoration: none; } - a:link { - color: var(--a-link-color); } - a:visited { - color: var(--a-visited-color); } - a:hover, a:focus { - text-decoration: underline; } - -/* - Definitions for the grid system, cards and containers. -*/ -.container { - margin: 0 auto; - padding: 0 calc(1.5 * var(--universal-padding)); } - -.row { - box-sizing: border-box; - display: flex; - flex: 0 1 auto; - flex-flow: row wrap; } - -.col-sm, -[class^='col-sm-'], -[class^='col-sm-offset-'], -.row[class*='cols-sm-'] > * { - box-sizing: border-box; - flex: 0 0 auto; - padding: 0 calc(var(--universal-padding) / 2); } - -.col-sm, -.row.cols-sm > * { - max-width: 100%; - flex-grow: 1; - flex-basis: 0; } - -.col-sm-1, -.row.cols-sm-1 > * { - max-width: 8.3333333333%; - flex-basis: 8.3333333333%; } - -.col-sm-offset-0 { - margin-left: 0; } - -.col-sm-2, -.row.cols-sm-2 > * { - max-width: 16.6666666667%; - flex-basis: 16.6666666667%; } - -.col-sm-offset-1 { - margin-left: 8.3333333333%; } - -.col-sm-3, -.row.cols-sm-3 > * { - max-width: 25%; - flex-basis: 25%; } - -.col-sm-offset-2 { - margin-left: 16.6666666667%; } - -.col-sm-4, -.row.cols-sm-4 > * { - max-width: 33.3333333333%; - flex-basis: 33.3333333333%; } - -.col-sm-offset-3 { - margin-left: 25%; } - -.col-sm-5, -.row.cols-sm-5 > * { - max-width: 41.6666666667%; - flex-basis: 41.6666666667%; } - -.col-sm-offset-4 { - margin-left: 33.3333333333%; } - -.col-sm-6, -.row.cols-sm-6 > * { - max-width: 50%; - flex-basis: 50%; } - -.col-sm-offset-5 { - margin-left: 41.6666666667%; } - -.col-sm-7, -.row.cols-sm-7 > * { - max-width: 58.3333333333%; - flex-basis: 58.3333333333%; } - -.col-sm-offset-6 { - margin-left: 50%; } - -.col-sm-8, -.row.cols-sm-8 > * { - max-width: 66.6666666667%; - flex-basis: 66.6666666667%; } - -.col-sm-offset-7 { - margin-left: 58.3333333333%; } - -.col-sm-9, -.row.cols-sm-9 > * { - max-width: 75%; - flex-basis: 75%; } - -.col-sm-offset-8 { - margin-left: 66.6666666667%; } - -.col-sm-10, -.row.cols-sm-10 > * { - max-width: 83.3333333333%; - flex-basis: 83.3333333333%; } - -.col-sm-offset-9 { - margin-left: 75%; } - -.col-sm-11, -.row.cols-sm-11 > * { - max-width: 91.6666666667%; - flex-basis: 91.6666666667%; } - -.col-sm-offset-10 { - margin-left: 83.3333333333%; } - -.col-sm-12, -.row.cols-sm-12 > * { - max-width: 100%; - flex-basis: 100%; } - -.col-sm-offset-11 { - margin-left: 91.6666666667%; } - -.col-sm-normal { - order: initial; } - -.col-sm-first { - order: -999; } - -.col-sm-last { - order: 999; } - -@media screen and (min-width: 500px) { - .col-md, - [class^='col-md-'], - [class^='col-md-offset-'], - .row[class*='cols-md-'] > * { - box-sizing: border-box; - flex: 0 0 auto; - padding: 0 calc(var(--universal-padding) / 2); } - - .col-md, - .row.cols-md > * { - max-width: 100%; - flex-grow: 1; - flex-basis: 0; } - - .col-md-1, - .row.cols-md-1 > * { - max-width: 8.3333333333%; - flex-basis: 8.3333333333%; } - - .col-md-offset-0 { - margin-left: 0; } - - .col-md-2, - .row.cols-md-2 > * { - max-width: 16.6666666667%; - flex-basis: 16.6666666667%; } - - .col-md-offset-1 { - margin-left: 8.3333333333%; } - - .col-md-3, - .row.cols-md-3 > * { - max-width: 25%; - flex-basis: 25%; } - - .col-md-offset-2 { - margin-left: 16.6666666667%; } - - .col-md-4, - .row.cols-md-4 > * { - max-width: 33.3333333333%; - flex-basis: 33.3333333333%; } - - .col-md-offset-3 { - margin-left: 25%; } - - .col-md-5, - .row.cols-md-5 > * { - max-width: 41.6666666667%; - flex-basis: 41.6666666667%; } - - .col-md-offset-4 { - margin-left: 33.3333333333%; } - - .col-md-6, - .row.cols-md-6 > * { - max-width: 50%; - flex-basis: 50%; } - - .col-md-offset-5 { - margin-left: 41.6666666667%; } - - .col-md-7, - .row.cols-md-7 > * { - max-width: 58.3333333333%; - flex-basis: 58.3333333333%; } - - .col-md-offset-6 { - margin-left: 50%; } - - .col-md-8, - .row.cols-md-8 > * { - max-width: 66.6666666667%; - flex-basis: 66.6666666667%; } - - .col-md-offset-7 { - margin-left: 58.3333333333%; } - - .col-md-9, - .row.cols-md-9 > * { - max-width: 75%; - flex-basis: 75%; } - - .col-md-offset-8 { - margin-left: 66.6666666667%; } - - .col-md-10, - .row.cols-md-10 > * { - max-width: 83.3333333333%; - flex-basis: 83.3333333333%; } - - .col-md-offset-9 { - margin-left: 75%; } - - .col-md-11, - .row.cols-md-11 > * { - max-width: 91.6666666667%; - flex-basis: 91.6666666667%; } - - .col-md-offset-10 { - margin-left: 83.3333333333%; } - - .col-md-12, - .row.cols-md-12 > * { - max-width: 100%; - flex-basis: 100%; } - - .col-md-offset-11 { - margin-left: 91.6666666667%; } - - .col-md-normal { - order: initial; } - - .col-md-first { - order: -999; } - - .col-md-last { - order: 999; } } -@media screen and (min-width: 1280px) { - .col-lg, - [class^='col-lg-'], - [class^='col-lg-offset-'], - .row[class*='cols-lg-'] > * { - box-sizing: border-box; - flex: 0 0 auto; - padding: 0 calc(var(--universal-padding) / 2); } - - .col-lg, - .row.cols-lg > * { - max-width: 100%; - flex-grow: 1; - flex-basis: 0; } - - .col-lg-1, - .row.cols-lg-1 > * { - max-width: 8.3333333333%; - flex-basis: 8.3333333333%; } - - .col-lg-offset-0 { - margin-left: 0; } - - .col-lg-2, - .row.cols-lg-2 > * { - max-width: 16.6666666667%; - flex-basis: 16.6666666667%; } - - .col-lg-offset-1 { - margin-left: 8.3333333333%; } - - .col-lg-3, - .row.cols-lg-3 > * { - max-width: 25%; - flex-basis: 25%; } - - .col-lg-offset-2 { - margin-left: 16.6666666667%; } - - .col-lg-4, - .row.cols-lg-4 > * { - max-width: 33.3333333333%; - flex-basis: 33.3333333333%; } - - .col-lg-offset-3 { - margin-left: 25%; } - - .col-lg-5, - .row.cols-lg-5 > * { - max-width: 41.6666666667%; - flex-basis: 41.6666666667%; } - - .col-lg-offset-4 { - margin-left: 33.3333333333%; } - - .col-lg-6, - .row.cols-lg-6 > * { - max-width: 50%; - flex-basis: 50%; } - - .col-lg-offset-5 { - margin-left: 41.6666666667%; } - - .col-lg-7, - .row.cols-lg-7 > * { - max-width: 58.3333333333%; - flex-basis: 58.3333333333%; } - - .col-lg-offset-6 { - margin-left: 50%; } - - .col-lg-8, - .row.cols-lg-8 > * { - max-width: 66.6666666667%; - flex-basis: 66.6666666667%; } - - .col-lg-offset-7 { - margin-left: 58.3333333333%; } - - .col-lg-9, - .row.cols-lg-9 > * { - max-width: 75%; - flex-basis: 75%; } - - .col-lg-offset-8 { - margin-left: 66.6666666667%; } - - .col-lg-10, - .row.cols-lg-10 > * { - max-width: 83.3333333333%; - flex-basis: 83.3333333333%; } - - .col-lg-offset-9 { - margin-left: 75%; } - - .col-lg-11, - .row.cols-lg-11 > * { - max-width: 91.6666666667%; - flex-basis: 91.6666666667%; } - - .col-lg-offset-10 { - margin-left: 83.3333333333%; } - - .col-lg-12, - .row.cols-lg-12 > * { - max-width: 100%; - flex-basis: 100%; } - - .col-lg-offset-11 { - margin-left: 91.6666666667%; } - - .col-lg-normal { - order: initial; } - - .col-lg-first { - order: -999; } - - .col-lg-last { - order: 999; } } -/* Card component CSS variable definitions */ -:root { - --card-back-color: #f8f8f8; - --card-fore-color: #111; - --card-border-color: #ddd; } - -.card { - display: flex; - flex-direction: column; - justify-content: space-between; - align-self: center; - position: relative; - width: 100%; - background: var(--card-back-color); - color: var(--card-fore-color); - border: 0.0625rem solid var(--card-border-color); - border-radius: var(--universal-border-radius); - margin: var(--universal-margin); - overflow: hidden; } - @media screen and (min-width: 320px) { - .card { - max-width: 320px; } } - .card > .sectione { - background: var(--card-back-color); - color: var(--card-fore-color); - box-sizing: border-box; - margin: 0; - border: 0; - border-radius: 0; - border-bottom: 0.0625rem solid var(--card-border-color); - padding: var(--universal-padding); - width: 100%; } - .card > .sectione.media { - height: 200px; - padding: 0; - -o-object-fit: cover; - object-fit: cover; } - .card > .sectione:last-child { - border-bottom: 0; } - -/* - Custom elements for card elements. -*/ -@media screen and (min-width: 240px) { - .card.small { - max-width: 240px; } } -@media screen and (min-width: 480px) { - .card.large { - max-width: 480px; } } -.card.fluid { - max-width: 100%; - width: auto; } - -.card.warning { -/* --card-back-color: #ffca28; */ - --card-back-color: #e5b8b7; - --card-border-color: #e8b825; } - -.card.error { - --card-back-color: #b71c1c; - --card-fore-color: #f8f8f8; - --card-border-color: #a71a1a; } - -.card > .sectione.dark { - --card-back-color: #e0e0e0; } - -.card > .sectione.double-padded { - padding: calc(1.5 * var(--universal-padding)); } - -/* - Definitions for forms and input elements. -*/ -/* Input_control module CSS variable definitions */ -:root { - --form-back-color: #f0f0f0; - --form-fore-color: #111; - --form-border-color: #ddd; - --input-back-color: #f8f8f8; - --input-fore-color: #111; - --input-border-color: #ddd; - --input-focus-color: #0288d1; - --input-invalid-color: #d32f2f; - --button-back-color: #e2e2e2; - --button-hover-back-color: #dcdcdc; - --button-fore-color: #212121; - --button-border-color: transparent; - --button-hover-border-color: transparent; - --button-group-border-color: rgba(124, 124, 124, 0.54); } - -form { - background: var(--form-back-color); - color: var(--form-fore-color); - border: 0.0625rem solid var(--form-border-color); - border-radius: var(--universal-border-radius); - margin: var(--universal-margin); - padding: calc(2 * var(--universal-padding)) var(--universal-padding); } - -fieldset { - border: 0.0625rem solid var(--form-border-color); - border-radius: var(--universal-border-radius); - margin: calc(var(--universal-margin) / 4); - padding: var(--universal-padding); } - -legend { - box-sizing: border-box; - display: table; - max-width: 100%; - white-space: normal; - font-weight: 700; - padding: calc(var(--universal-padding) / 2); } - -label { - padding: calc(var(--universal-padding) / 2) var(--universal-padding); } - -.input-group { - display: inline-block; } - .input-group.fluid { - display: flex; - align-items: center; - justify-content: center; } - .input-group.fluid > input { - max-width: 100%; - flex-grow: 1; - flex-basis: 0px; } - @media screen and (max-width: 499px) { - .input-group.fluid { - align-items: stretch; - flex-direction: column; } } - .input-group.vertical { - display: flex; - align-items: stretch; - flex-direction: column; } - .input-group.vertical > input { - max-width: 100%; - flex-grow: 1; - flex-basis: 0px; } - -[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button { - height: auto; } - -[type="search"] { - -webkit-appearance: textfield; - outline-offset: -2px; } - -[type="search"]::-webkit-search-cancel-button, -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; } - -input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"], -[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select { - box-sizing: border-box; - background: var(--input-back-color); - color: var(--input-fore-color); - border: 0.0625rem solid var(--input-border-color); - border-radius: var(--universal-border-radius); - margin: calc(var(--universal-margin) / 2); - padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); } - -input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus { - border-color: var(--input-focus-color); - box-shadow: none; } -input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid { - border-color: var(--input-invalid-color); - box-shadow: none; } -input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] { - background: var(--secondary-back-color); } - -select { - max-width: 100%; } - -option { - overflow: hidden; - text-overflow: ellipsis; } - -[type="checkbox"], [type="radio"] { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - position: relative; - height: calc(1rem + var(--universal-padding) / 2); - width: calc(1rem + var(--universal-padding) / 2); - vertical-align: text-bottom; - padding: 0; - flex-basis: calc(1rem + var(--universal-padding) / 2) !important; - flex-grow: 0 !important; } - [type="checkbox"]:checked:before, [type="radio"]:checked:before { - position: absolute; } - -[type="checkbox"]:checked:before { - content: '\2713'; - font-family: sans-serif; - font-size: calc(1rem + var(--universal-padding) / 2); - top: calc(0rem - var(--universal-padding)); - left: calc(var(--universal-padding) / 4); } - -[type="radio"] { - border-radius: 100%; } - [type="radio"]:checked:before { - border-radius: 100%; - content: ''; - top: calc(0.0625rem + var(--universal-padding) / 2); - left: calc(0.0625rem + var(--universal-padding) / 2); - background: var(--input-fore-color); - width: 0.5rem; - height: 0.5rem; } - -:placeholder-shown { - color: var(--input-fore-color); } - -::-ms-placeholder { - color: var(--input-fore-color); - opacity: 0.54; } - -button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; } - -button, html [type="button"], [type="reset"], [type="submit"] { - -webkit-appearance: button; } - -button { - overflow: visible; - text-transform: none; } - -button, [type="button"], [type="submit"], [type="reset"], -a.button, label.button, .button, -a[role="button"], label[role="button"], [role="button"] { - display: inline-block; - background: var(--button-back-color); - color: var(--button-fore-color); - border: 0.0625rem solid var(--button-border-color); - border-radius: var(--universal-border-radius); - padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); - margin: var(--universal-margin); - text-decoration: none; - cursor: pointer; - transition: background 0.3s; } - button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus, - a.button:hover, - a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus, - a[role="button"]:hover, - a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus { - background: var(--button-hover-back-color); - border-color: var(--button-hover-border-color); } - -input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] { - cursor: not-allowed; - opacity: 0.75; } - -.button-group { - display: flex; - border: 0.0625rem solid var(--button-group-border-color); - border-radius: var(--universal-border-radius); - margin: var(--universal-margin); } - .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] { - margin: 0; - max-width: 100%; - flex: 1 1 auto; - text-align: center; - border: 0; - border-radius: 0; - box-shadow: none; } - .button-group > :not(:first-child) { - border-left: 0.0625rem solid var(--button-group-border-color); } - @media screen and (max-width: 499px) { - .button-group { - flex-direction: column; } - .button-group > :not(:first-child) { - border: 0; - border-top: 0.0625rem solid var(--button-group-border-color); } } - -/* - Custom elements for forms and input elements. -*/ -button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary { - --button-back-color: #1976d2; - --button-fore-color: #f8f8f8; } - button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus { - --button-hover-back-color: #1565c0; } - -button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary { - --button-back-color: #d32f2f; - --button-fore-color: #f8f8f8; } - button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus { - --button-hover-back-color: #c62828; } - -button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary { - --button-back-color: #308732; - --button-fore-color: #f8f8f8; } - button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus { - --button-hover-back-color: #277529; } - -button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse { - --button-back-color: #212121; - --button-fore-color: #f8f8f8; } - button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus { - --button-hover-back-color: #111; } - -button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small { - padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding)); - margin: var(--universal-margin); } - -button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large { - padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding)); - margin: var(--universal-margin); } - -/* - Definitions for navigation elements. -*/ -/* Navigation module CSS variable definitions */ -:root { - --header-back-color: #f8f8f8; - --header-hover-back-color: #f0f0f0; - --header-fore-color: #444; - --header-border-color: #ddd; - --nav-back-color: #f8f8f8; - --nav-hover-back-color: #f0f0f0; - --nav-fore-color: #444; - --nav-border-color: #ddd; - --nav-link-color: #0277bd; - --footer-fore-color: #444; - --footer-back-color: #f8f8f8; - --footer-border-color: #ddd; - --footer-link-color: #0277bd; - --drawer-back-color: #f8f8f8; - --drawer-hover-back-color: #f0f0f0; - --drawer-border-color: #ddd; - --drawer-close-color: #444; } - -header { - height: 3.1875rem; - background: var(--header-back-color); - color: var(--header-fore-color); - border-bottom: 0.0625rem solid var(--header-border-color); - padding: calc(var(--universal-padding) / 4) 0; - white-space: nowrap; - overflow-x: auto; - overflow-y: hidden; } - header.row { - box-sizing: content-box; } - header .logo { - color: var(--header-fore-color); - font-size: 1.75rem; - padding: var(--universal-padding) calc(2 * var(--universal-padding)); - text-decoration: none; } - header button, header [type="button"], header .button, header [role="button"] { - box-sizing: border-box; - position: relative; - top: calc(0rem - var(--universal-padding) / 4); - height: calc(3.1875rem + var(--universal-padding) / 2); - background: var(--header-back-color); - line-height: calc(3.1875rem - var(--universal-padding) * 1.5); - text-align: center; - color: var(--header-fore-color); - border: 0; - border-radius: 0; - margin: 0; - text-transform: uppercase; } - header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus { - background: var(--header-hover-back-color); } - -nav { - background: var(--nav-back-color); - color: var(--nav-fore-color); - border: 0.0625rem solid var(--nav-border-color); - border-radius: var(--universal-border-radius); - margin: var(--universal-margin); } - nav * { - padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); } - nav a, nav a:visited { - display: block; - color: var(--nav-link-color); - border-radius: var(--universal-border-radius); - transition: background 0.3s; } - nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus { - text-decoration: none; - background: var(--nav-hover-back-color); } - nav .sublink-1 { - position: relative; - margin-left: calc(2 * var(--universal-padding)); } - nav .sublink-1:before { - position: absolute; - left: calc(var(--universal-padding) - 1 * var(--universal-padding)); - top: -0.0625rem; - content: ''; - height: 100%; - border: 0.0625rem solid var(--nav-border-color); - border-left: 0; } - nav .sublink-2 { - position: relative; - margin-left: calc(4 * var(--universal-padding)); } - nav .sublink-2:before { - position: absolute; - left: calc(var(--universal-padding) - 3 * var(--universal-padding)); - top: -0.0625rem; - content: ''; - height: 100%; - border: 0.0625rem solid var(--nav-border-color); - border-left: 0; } - -footer { - background: var(--footer-back-color); - color: var(--footer-fore-color); - border-top: 0.0625rem solid var(--footer-border-color); - padding: calc(2 * var(--universal-padding)) var(--universal-padding); - font-size: 0.875rem; } - footer a, footer a:visited { - color: var(--footer-link-color); } - -header.sticky { - position: -webkit-sticky; - position: sticky; - z-index: 1101; - top: 0; } - -footer.sticky { - position: -webkit-sticky; - position: sticky; - z-index: 1101; - bottom: 0; } - -.drawer-toggle:before { - display: inline-block; - position: relative; - vertical-align: bottom; - content: '\00a0\2261\00a0'; - font-family: sans-serif; - font-size: 1.5em; } -@media screen and (min-width: 500px) { - .drawer-toggle:not(.persistent) { - display: none; } } - -[type="checkbox"].drawer { - height: 1px; - width: 1px; - margin: -1px; - overflow: hidden; - position: absolute; - clip: rect(0 0 0 0); - -webkit-clip-path: inset(100%); - clip-path: inset(100%); } - [type="checkbox"].drawer + * { - display: block; - box-sizing: border-box; - position: fixed; - top: 0; - width: 320px; - height: 100vh; - overflow-y: auto; - background: var(--drawer-back-color); - border: 0.0625rem solid var(--drawer-border-color); - border-radius: 0; - margin: 0; - z-index: 1110; - right: -320px; - transition: right 0.3s; } - [type="checkbox"].drawer + * .drawer-close { - position: absolute; - top: var(--universal-margin); - right: var(--universal-margin); - z-index: 1111; - width: 2rem; - height: 2rem; - border-radius: var(--universal-border-radius); - padding: var(--universal-padding); - margin: 0; - cursor: pointer; - transition: background 0.3s; } - [type="checkbox"].drawer + * .drawer-close:before { - display: block; - content: '\00D7'; - color: var(--drawer-close-color); - position: relative; - font-family: sans-serif; - font-size: 2rem; - line-height: 1; - text-align: center; } - [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus { - background: var(--drawer-hover-back-color); } - @media screen and (max-width: 320px) { - [type="checkbox"].drawer + * { - width: 100%; } } - [type="checkbox"].drawer:checked + * { - right: 0; } - @media screen and (min-width: 500px) { - [type="checkbox"].drawer:not(.persistent) + * { - position: static; - height: 100%; - z-index: 1100; } - [type="checkbox"].drawer:not(.persistent) + * .drawer-close { - display: none; } } - -/* - Definitions for the responsive table component. -*/ -/* Table module CSS variable definitions. */ -:root { - --table-border-color: #aaa; - --table-border-separator-color: #666; - --table-head-back-color: #e6e6e6; - --table-head-fore-color: #111; - --table-body-back-color: #f8f8f8; - --table-body-fore-color: #111; - --table-body-alt-back-color: #eee; } - -table { - border-collapse: separate; - border-spacing: 0; - : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin); - display: flex; - flex: 0 1 auto; - flex-flow: row wrap; - padding: var(--universal-padding); - padding-top: 0; - margin: calc(1.5 * var(--universal-margin)) var(--universal-margin); } - table caption { - font-size: 1.25 * rem; - margin: calc(2 * var(--universal-margin)) 0; - max-width: 100%; - flex: 0 0 100%; - text-align: left;} - table thead, table tbody { - display: flex; - flex-flow: row wrap; - border: 0.0625rem solid var(--table-border-color); } - table thead { - z-index: 999; - border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; - border-bottom: 0.0625rem solid var(--table-border-separator-color); } - table tbody { - border-top: 0; - margin-top: calc(0 - var(--universal-margin)); - border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } - table tr { - display: flex; - padding: 0; } - table th, table td { - padding: calc(0.5 * var(--universal-padding)); - font-size: 0.9rem; } - table th { - text-align: left; - background: var(--table-head-back-color); - color: var(--table-head-fore-color); } - table td { - background: var(--table-body-back-color); - color: var(--table-body-fore-color); - border-top: 0.0625rem solid var(--table-border-color); } - -table:not(.horizontal) { - overflow: auto; - max-height: 850px; } - table:not(.horizontal) thead, table:not(.horizontal) tbody { - max-width: 100%; - flex: 0 0 100%; } - table:not(.horizontal) tr { - flex-flow: row wrap; - flex: 0 0 100%; } - table:not(.horizontal) th, table:not(.horizontal) td { - flex: 1 0 0%; - overflow: hidden; - text-overflow: ellipsis; } - table:not(.horizontal) thead { - position: sticky; - top: 0; } - table:not(.horizontal) tbody tr:first-child td { - border-top: 0; } - -table.horizontal { - border: 0; } - table.horizontal thead, table.horizontal tbody { - border: 0; - flex-flow: row nowrap; } - table.horizontal tbody { - overflow: auto; - justify-content: space-between; - flex: 1 0 0; - margin-left: calc( 4 * var(--universal-margin)); - padding-bottom: calc(var(--universal-padding) / 4); } - table.horizontal tr { - flex-direction: column; - flex: 1 0 auto; } - table.horizontal th, table.horizontal td { - width: 100%; - border: 0; - border-bottom: 0.0625rem solid var(--table-border-color); } - table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) { - border-top: 0; } - table.horizontal th { - text-align: right; - border-left: 0.0625rem solid var(--table-border-color); - border-right: 0.0625rem solid var(--table-border-separator-color); } - table.horizontal thead tr:first-child { - padding-left: 0; } - table.horizontal th:first-child, table.horizontal td:first-child { - border-top: 0.0625rem solid var(--table-border-color); } - table.horizontal tbody tr:last-child td { - border-right: 0.0625rem solid var(--table-border-color); } - table.horizontal tbody tr:last-child td:first-child { - border-top-right-radius: 0.25rem; } - table.horizontal tbody tr:last-child td:last-child { - border-bottom-right-radius: 0.25rem; } - table.horizontal thead tr:first-child th:first-child { - border-top-left-radius: 0.25rem; } - table.horizontal thead tr:first-child th:last-child { - border-bottom-left-radius: 0.25rem; } - -@media screen and (max-width: 499px) { - table, table.horizontal { - border-collapse: collapse; - border: 0; - width: 100%; - display: table; } - table thead, table th, table.horizontal thead, table.horizontal th { - border: 0; - height: 1px; - width: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - clip: rect(0 0 0 0); - -webkit-clip-path: inset(100%); - clip-path: inset(100%); } - table tbody, table.horizontal tbody { - border: 0; - display: table-row-group; } - table tr, table.horizontal tr { - display: block; - border: 0.0625rem solid var(--table-border-color); - border-radius: var(--universal-border-radius); - background: #fafafa; - padding: var(--universal-padding); - margin: var(--universal-margin); - margin-bottom: calc(2 * var(--universal-margin)); } - table th, table td, table.horizontal th, table.horizontal td { - width: auto; } - table td, table.horizontal td { - display: block; - border: 0; - text-align: right; } - table td:before, table.horizontal td:before { - content: attr(data-label); - float: left; - font-weight: 600; } - table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child { - border-top: 0; } - table tbody tr:last-child td, table.horizontal tbody tr:last-child td { - border-right: 0; } } -:root { - --table-body-alt-back-color: #eee; } - -table tr:nth-of-type(2n) > td { - background: var(--table-body-alt-back-color); } - -@media screen and (max-width: 500px) { - table tr:nth-of-type(2n) { - background: var(--table-body-alt-back-color); } } -:root { - --table-body-hover-back-color: #90caf9; } - -table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td { - background: var(--table-body-hover-back-color); } - -@media screen and (max-width: 500px) { - table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td { - background: var(--table-body-hover-back-color); } } -/* - Definitions for contextual background elements, toasts and tooltips. -*/ -/* Contextual module CSS variable definitions */ -:root { - --mark-back-color: #0277bd; - --mark-fore-color: #fafafa; } - -mark { - background: var(--mark-back-color); - color: var(--mark-fore-color); - font-size: 0.95em; - line-height: 1em; - border-radius: var(--universal-border-radius); - padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); } - mark.inline-block { - display: inline-block; - font-size: 1em; - line-height: 1.5; - padding: calc(var(--universal-padding) / 2) var(--universal-padding); } - -:root { - --toast-back-color: #424242; - --toast-fore-color: #fafafa; } - -.toast { - position: fixed; - bottom: calc(var(--universal-margin) * 3); - left: 50%; - transform: translate(-50%, -50%); - z-index: 1111; - color: var(--toast-fore-color); - background: var(--toast-back-color); - border-radius: calc(var(--universal-border-radius) * 16); - padding: var(--universal-padding) calc(var(--universal-padding) * 3); } - -:root { - --tooltip-back-color: #212121; - --tooltip-fore-color: #fafafa; } - -.tooltip { - position: relative; - display: inline-block; } - .tooltip:before, .tooltip:after { - position: absolute; - opacity: 0; - clip: rect(0 0 0 0); - -webkit-clip-path: inset(100%); - clip-path: inset(100%); - transition: all 0.3s; - z-index: 1010; - left: 50%; } - .tooltip:not(.bottom):before, .tooltip:not(.bottom):after { - bottom: 75%; } - .tooltip.bottom:before, .tooltip.bottom:after { - top: 75%; } - .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after { - opacity: 1; - clip: auto; - -webkit-clip-path: inset(0%); - clip-path: inset(0%); } - .tooltip:before { - content: ''; - background: transparent; - border: var(--universal-margin) solid transparent; - left: calc(50% - var(--universal-margin)); } - .tooltip:not(.bottom):before { - border-top-color: #212121; } - .tooltip.bottom:before { - border-bottom-color: #212121; } - .tooltip:after { - content: attr(aria-label); - color: var(--tooltip-fore-color); - background: var(--tooltip-back-color); - border-radius: var(--universal-border-radius); - padding: var(--universal-padding); - white-space: nowrap; - transform: translateX(-50%); } - .tooltip:not(.bottom):after { - margin-bottom: calc(2 * var(--universal-margin)); } - .tooltip.bottom:after { - margin-top: calc(2 * var(--universal-margin)); } - -:root { - --modal-overlay-color: rgba(0, 0, 0, 0.45); - --modal-close-color: #444; - --modal-close-hover-color: #f0f0f0; } - -[type="checkbox"].modal { - height: 1px; - width: 1px; - margin: -1px; - overflow: hidden; - position: absolute; - clip: rect(0 0 0 0); - -webkit-clip-path: inset(100%); - clip-path: inset(100%); } - [type="checkbox"].modal + div { - position: fixed; - top: 0; - left: 0; - display: none; - width: 100vw; - height: 100vh; - background: var(--modal-overlay-color); } - [type="checkbox"].modal + div .card { - margin: 0 auto; - max-height: 50vh; - overflow: auto; } - [type="checkbox"].modal + div .card .modal-close { - position: absolute; - top: 0; - right: 0; - width: 1.75rem; - height: 1.75rem; - border-radius: var(--universal-border-radius); - padding: var(--universal-padding); - margin: 0; - cursor: pointer; - transition: background 0.3s; } - [type="checkbox"].modal + div .card .modal-close:before { - display: block; - content: '\00D7'; - color: var(--modal-close-color); - position: relative; - font-family: sans-serif; - font-size: 1.75rem; - line-height: 1; - text-align: center; } - [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus { - background: var(--modal-close-hover-color); } - [type="checkbox"].modal:checked + div { - display: flex; - flex: 0 1 auto; - z-index: 1200; } - [type="checkbox"].modal:checked + div .card .modal-close { - z-index: 1211; } - -:root { - --collapse-label-back-color: #e8e8e8; - --collapse-label-fore-color: #212121; - --collapse-label-hover-back-color: #f0f0f0; - --collapse-selected-label-back-color: #ececec; - --collapse-border-color: #ddd; - --collapse-content-back-color: #fafafa; - --collapse-selected-label-border-color: #0277bd; } - -.collapse { - width: calc(100% - 2 * var(--universal-margin)); - opacity: 1; - display: flex; - flex-direction: column; - margin: var(--universal-margin); - border-radius: var(--universal-border-radius); } - .collapse > [type="radio"], .collapse > [type="checkbox"] { - height: 1px; - width: 1px; - margin: -1px; - overflow: hidden; - position: absolute; - clip: rect(0 0 0 0); - -webkit-clip-path: inset(100%); - clip-path: inset(100%); } - .collapse > label { - flex-grow: 1; - display: inline-block; - height: 1.5rem; - cursor: pointer; - transition: background 0.3s; - color: var(--collapse-label-fore-color); - background: var(--collapse-label-back-color); - border: 0.0625rem solid var(--collapse-border-color); - padding: calc(1.5 * var(--universal-padding)); } - .collapse > label:hover, .collapse > label:focus { - background: var(--collapse-label-hover-back-color); } - .collapse > label + div { - flex-basis: auto; - height: 1px; - width: 1px; - margin: -1px; - overflow: hidden; - position: absolute; - clip: rect(0 0 0 0); - -webkit-clip-path: inset(100%); - clip-path: inset(100%); - transition: max-height 0.3s; - max-height: 1px; } - .collapse > :checked + label { - background: var(--collapse-selected-label-back-color); - border-bottom-color: var(--collapse-selected-label-border-color); } - .collapse > :checked + label + div { - box-sizing: border-box; - position: relative; - width: 100%; - height: auto; - overflow: auto; - margin: 0; - background: var(--collapse-content-back-color); - border: 0.0625rem solid var(--collapse-border-color); - border-top: 0; - padding: var(--universal-padding); - clip: auto; - -webkit-clip-path: inset(0%); - clip-path: inset(0%); - max-height: 850px; } - .collapse > label:not(:first-of-type) { - border-top: 0; } - .collapse > label:first-of-type { - border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; } - .collapse > label:last-of-type:not(:first-of-type) { - border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } - .collapse > label:last-of-type:first-of-type { - border-radius: var(--universal-border-radius); } - .collapse > :checked:last-of-type:not(:first-of-type) + label { - border-radius: 0; } - .collapse > :checked:last-of-type + label + div { - border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } - -/* - Custom elements for contextual background elements, toasts and tooltips. -*/ -mark.secondary { - --mark-back-color: #d32f2f; } - -mark.tertiary { - --mark-back-color: #308732; } - -mark.tag { - padding: calc(var(--universal-padding)/2) var(--universal-padding); - border-radius: 1em; } - -/* - Definitions for progress elements and spinners. -*/ -/* Progess module CSS variable definitions */ -:root { - --progress-back-color: #ddd; - --progress-fore-color: #555; } - -progress { - display: block; - vertical-align: baseline; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - height: 0.75rem; - width: calc(100% - 2 * var(--universal-margin)); - margin: var(--universal-margin); - border: 0; - border-radius: calc(2 * var(--universal-border-radius)); - background: var(--progress-back-color); - color: var(--progress-fore-color); } - progress::-webkit-progress-value { - background: var(--progress-fore-color); - border-top-left-radius: calc(2 * var(--universal-border-radius)); - border-bottom-left-radius: calc(2 * var(--universal-border-radius)); } - progress::-webkit-progress-bar { - background: var(--progress-back-color); } - progress::-moz-progress-bar { - background: var(--progress-fore-color); - border-top-left-radius: calc(2 * var(--universal-border-radius)); - border-bottom-left-radius: calc(2 * var(--universal-border-radius)); } - progress[value="1000"]::-webkit-progress-value { - border-radius: calc(2 * var(--universal-border-radius)); } - progress[value="1000"]::-moz-progress-bar { - border-radius: calc(2 * var(--universal-border-radius)); } - progress.inline { - display: inline-block; - vertical-align: middle; - width: 60%; } - -:root { - --spinner-back-color: #ddd; - --spinner-fore-color: #555; } - -@keyframes spinner-donut-anim { - 0% { - transform: rotate(0deg); } - 100% { - transform: rotate(360deg); } } -.spinner { - display: inline-block; - margin: var(--universal-margin); - border: 0.25rem solid var(--spinner-back-color); - border-left: 0.25rem solid var(--spinner-fore-color); - border-radius: 50%; - width: 1.25rem; - height: 1.25rem; - animation: spinner-donut-anim 1.2s linear infinite; } - -/* - Custom elements for progress bars and spinners. -*/ -progress.primary { - --progress-fore-color: #1976d2; } - -progress.secondary { - --progress-fore-color: #d32f2f; } - -progress.tertiary { - --progress-fore-color: #308732; } - -.spinner.primary { - --spinner-fore-color: #1976d2; } - -.spinner.secondary { - --spinner-fore-color: #d32f2f; } - -.spinner.tertiary { - --spinner-fore-color: #308732; } - -/* - Definitions for icons - powered by Feather (https://feathericons.com/). -*/ -span[class^='icon-'] { - display: inline-block; - height: 1em; - width: 1em; - vertical-align: -0.125em; - background-size: contain; - margin: 0 calc(var(--universal-margin) / 4); } - span[class^='icon-'].secondary { - -webkit-filter: invert(25%); - filter: invert(25%); } - span[class^='icon-'].inverse { - -webkit-filter: invert(100%); - filter: invert(100%); } - -span.icon-alert { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-bookmark { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); } -span.icon-calendar { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-credit { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-edit { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); } -span.icon-link { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-help { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-home { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); } -span.icon-info { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-lock { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); } -span.icon-mail { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); } -span.icon-location { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); } -span.icon-phone { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); } -span.icon-rss { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); } -span.icon-search { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-settings { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); } -span.icon-share { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-cart { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); } -span.icon-upload { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); } -span.icon-user { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); } - -/* - Definitions for utilities and helper classes. -*/ -/* Utility module CSS variable definitions */ -:root { - --generic-border-color: rgba(0, 0, 0, 0.3); - --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); } - -.hidden { - display: none !important; } - -.visually-hidden { - position: absolute !important; - width: 1px !important; - height: 1px !important; - margin: -1px !important; - border: 0 !important; - padding: 0 !important; - clip: rect(0 0 0 0) !important; - -webkit-clip-path: inset(100%) !important; - clip-path: inset(100%) !important; - overflow: hidden !important; } - -.bordered { - border: 0.0625rem solid var(--generic-border-color) !important; } - -.rounded { - border-radius: var(--universal-border-radius) !important; } - -.circular { - border-radius: 50% !important; } - -.shadowed { - box-shadow: var(--generic-box-shadow) !important; } - -.responsive-margin { - margin: calc(var(--universal-margin) / 4) !important; } - @media screen and (min-width: 500px) { - .responsive-margin { - margin: calc(var(--universal-margin) / 2) !important; } } - @media screen and (min-width: 1280px) { - .responsive-margin { - margin: var(--universal-margin) !important; } } - -.responsive-padding { - padding: calc(var(--universal-padding) / 4) !important; } - @media screen and (min-width: 500px) { - .responsive-padding { - padding: calc(var(--universal-padding) / 2) !important; } } - @media screen and (min-width: 1280px) { - .responsive-padding { - padding: var(--universal-padding) !important; } } - -@media screen and (max-width: 499px) { - .hidden-sm { - display: none !important; } } -@media screen and (min-width: 500px) and (max-width: 1279px) { - .hidden-md { - display: none !important; } } -@media screen and (min-width: 1280px) { - .hidden-lg { - display: none !important; } } -@media screen and (max-width: 499px) { - .visually-hidden-sm { - position: absolute !important; - width: 1px !important; - height: 1px !important; - margin: -1px !important; - border: 0 !important; - padding: 0 !important; - clip: rect(0 0 0 0) !important; - -webkit-clip-path: inset(100%) !important; - clip-path: inset(100%) !important; - overflow: hidden !important; } } -@media screen and (min-width: 500px) and (max-width: 1279px) { - .visually-hidden-md { - position: absolute !important; - width: 1px !important; - height: 1px !important; - margin: -1px !important; - border: 0 !important; - padding: 0 !important; - clip: rect(0 0 0 0) !important; - -webkit-clip-path: inset(100%) !important; - clip-path: inset(100%) !important; - overflow: hidden !important; } } -@media screen and (min-width: 1280px) { - .visually-hidden-lg { - position: absolute !important; - width: 1px !important; - height: 1px !important; - margin: -1px !important; - border: 0 !important; - padding: 0 !important; - clip: rect(0 0 0 0) !important; - -webkit-clip-path: inset(100%) !important; - clip-path: inset(100%) !important; - overflow: hidden !important; } } - -/*# sourceMappingURL=mini-default.css.map */ diff --git a/Drivers/BSP/Components/s25fl128s/_htmresc/mini-st_2020.css b/Drivers/BSP/Components/s25fl128s/_htmresc/mini-st_2020.css new file mode 100644 index 000000000..986f4d420 --- /dev/null +++ b/Drivers/BSP/Components/s25fl128s/_htmresc/mini-st_2020.css @@ -0,0 +1,1711 @@ +@charset "UTF-8"; +/* + Flavor name: Custom (mini-custom) + Generated online - https://minicss.org/flavors + mini.css version: v3.0.1 +*/ +/* + Browsers resets and base typography. +*/ +/* Core module CSS variable definitions */ +:root { + --fore-color: #03234b; + --secondary-fore-color: #03234b; + --back-color: #ffffff; + --secondary-back-color: #ffffff; + --blockquote-color: #e6007e; + --pre-color: #e6007e; + --border-color: #3cb4e6; + --secondary-border-color: #3cb4e6; + --heading-ratio: 1.2; + --universal-margin: 0.5rem; + --universal-padding: 0.25rem; + --universal-border-radius: 0.075rem; + --background-margin: 1.5%; + --a-link-color: #3cb4e6; + --a-visited-color: #8c0078; } + +html { + font-size: 13.5px; } + +a, b, del, em, i, ins, q, span, strong, u { + font-size: 1em; } + +html, * { + font-family: -apple-system, BlinkMacSystemFont, Helvetica, arial, sans-serif; + line-height: 1.25; + -webkit-text-size-adjust: 100%; } + +* { + font-size: 1rem; } + +body { + margin: 0; + color: var(--fore-color); + @background: var(--back-color); + background: var(--back-color) linear-gradient(#ffd200, #ffd200) repeat-y left top; + background-size: var(--background-margin); + } + +details { + display: block; } + +summary { + display: list-item; } + +abbr[title] { + border-bottom: none; + text-decoration: underline dotted; } + +input { + overflow: visible; } + +img { + max-width: 100%; + height: auto; } + +h1, h2, h3, h4, h5, h6 { + line-height: 1.25; + margin: calc(1.5 * var(--universal-margin)) var(--universal-margin); + font-weight: 400; } + h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { + color: var(--secondary-fore-color); + display: block; + margin-top: -0.25rem; } + +h1 { + font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); } + +h2 { + font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) ); + border-style: none none solid none ; + border-width: thin; + border-color: var(--border-color); } +h3 { + font-size: calc(1rem * var(--heading-ratio) ); } + +h4 { + font-size: calc(1rem * var(--heading-ratio)); } + +h5 { + font-size: 1rem; } + +h6 { + font-size: calc(1rem / var(--heading-ratio)); } + +p { + margin: var(--universal-margin); } + +ol, ul { + margin: var(--universal-margin); + padding-left: calc(3 * var(--universal-margin)); } + +b, strong { + font-weight: 700; } + +hr { + box-sizing: content-box; + border: 0; + line-height: 1.25em; + margin: var(--universal-margin); + height: 0.0714285714rem; + background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); } + +blockquote { + display: block; + position: relative; + font-style: italic; + color: var(--secondary-fore-color); + margin: var(--universal-margin); + padding: calc(3 * var(--universal-padding)); + border: 0.0714285714rem solid var(--secondary-border-color); + border-left: 0.3rem solid var(--blockquote-color); + border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; } + blockquote:before { + position: absolute; + top: calc(0rem - var(--universal-padding)); + left: 0; + font-family: sans-serif; + font-size: 2rem; + font-weight: 800; + content: "\201c"; + color: var(--blockquote-color); } + blockquote[cite]:after { + font-style: normal; + font-size: 0.75em; + font-weight: 700; + content: "\a— " attr(cite); + white-space: pre; } + +code, kbd, pre, samp { + font-family: Menlo, Consolas, monospace; + font-size: 0.85em; } + +code { + background: var(--secondary-back-color); + border-radius: var(--universal-border-radius); + padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); } + +kbd { + background: var(--fore-color); + color: var(--back-color); + border-radius: var(--universal-border-radius); + padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); } + +pre { + overflow: auto; + background: var(--secondary-back-color); + padding: calc(1.5 * var(--universal-padding)); + margin: var(--universal-margin); + border: 0.0714285714rem solid var(--secondary-border-color); + border-left: 0.2857142857rem solid var(--pre-color); + border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; } + +sup, sub, code, kbd { + line-height: 0; + position: relative; + vertical-align: baseline; } + +small, sup, sub, figcaption { + font-size: 0.75em; } + +sup { + top: -0.5em; } + +sub { + bottom: -0.25em; } + +figure { + margin: var(--universal-margin); } + +figcaption { + color: var(--secondary-fore-color); } + +a { + text-decoration: none; } + a:link { + color: var(--a-link-color); } + a:visited { + color: var(--a-visited-color); } + a:hover, a:focus { + text-decoration: underline; } + +/* + Definitions for the grid system, cards and containers. +*/ +.container { + margin: 0 auto; + padding: 0 calc(1.5 * var(--universal-padding)); } + +.row { + box-sizing: border-box; + display: flex; + flex: 0 1 auto; + flex-flow: row wrap; + margin: 0 0 0 var(--background-margin); } + +.col-sm, +[class^='col-sm-'], +[class^='col-sm-offset-'], +.row[class*='cols-sm-'] > * { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); } + +.col-sm, +.row.cols-sm > * { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; } + +.col-sm-1, +.row.cols-sm-1 > * { + max-width: 8.3333333333%; + flex-basis: 8.3333333333%; } + +.col-sm-offset-0 { + margin-left: 0; } + +.col-sm-2, +.row.cols-sm-2 > * { + max-width: 16.6666666667%; + flex-basis: 16.6666666667%; } + +.col-sm-offset-1 { + margin-left: 8.3333333333%; } + +.col-sm-3, +.row.cols-sm-3 > * { + max-width: 25%; + flex-basis: 25%; } + +.col-sm-offset-2 { + margin-left: 16.6666666667%; } + +.col-sm-4, +.row.cols-sm-4 > * { + max-width: 33.3333333333%; + flex-basis: 33.3333333333%; } + +.col-sm-offset-3 { + margin-left: 25%; } + +.col-sm-5, +.row.cols-sm-5 > * { + max-width: 41.6666666667%; + flex-basis: 41.6666666667%; } + +.col-sm-offset-4 { + margin-left: 33.3333333333%; } + +.col-sm-6, +.row.cols-sm-6 > * { + max-width: 50%; + flex-basis: 50%; } + +.col-sm-offset-5 { + margin-left: 41.6666666667%; } + +.col-sm-7, +.row.cols-sm-7 > * { + max-width: 58.3333333333%; + flex-basis: 58.3333333333%; } + +.col-sm-offset-6 { + margin-left: 50%; } + +.col-sm-8, +.row.cols-sm-8 > * { + max-width: 66.6666666667%; + flex-basis: 66.6666666667%; } + +.col-sm-offset-7 { + margin-left: 58.3333333333%; } + +.col-sm-9, +.row.cols-sm-9 > * { + max-width: 75%; + flex-basis: 75%; } + +.col-sm-offset-8 { + margin-left: 66.6666666667%; } + +.col-sm-10, +.row.cols-sm-10 > * { + max-width: 83.3333333333%; + flex-basis: 83.3333333333%; } + +.col-sm-offset-9 { + margin-left: 75%; } + +.col-sm-11, +.row.cols-sm-11 > * { + max-width: 91.6666666667%; + flex-basis: 91.6666666667%; } + +.col-sm-offset-10 { + margin-left: 83.3333333333%; } + +.col-sm-12, +.row.cols-sm-12 > * { + max-width: 100%; + flex-basis: 100%; } + +.col-sm-offset-11 { + margin-left: 91.6666666667%; } + +.col-sm-normal { + order: initial; } + +.col-sm-first { + order: -999; } + +.col-sm-last { + order: 999; } + +@media screen and (min-width: 500px) { + .col-md, + [class^='col-md-'], + [class^='col-md-offset-'], + .row[class*='cols-md-'] > * { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); } + + .col-md, + .row.cols-md > * { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; } + + .col-md-1, + .row.cols-md-1 > * { + max-width: 8.3333333333%; + flex-basis: 8.3333333333%; } + + .col-md-offset-0 { + margin-left: 0; } + + .col-md-2, + .row.cols-md-2 > * { + max-width: 16.6666666667%; + flex-basis: 16.6666666667%; } + + .col-md-offset-1 { + margin-left: 8.3333333333%; } + + .col-md-3, + .row.cols-md-3 > * { + max-width: 25%; + flex-basis: 25%; } + + .col-md-offset-2 { + margin-left: 16.6666666667%; } + + .col-md-4, + .row.cols-md-4 > * { + max-width: 33.3333333333%; + flex-basis: 33.3333333333%; } + + .col-md-offset-3 { + margin-left: 25%; } + + .col-md-5, + .row.cols-md-5 > * { + max-width: 41.6666666667%; + flex-basis: 41.6666666667%; } + + .col-md-offset-4 { + margin-left: 33.3333333333%; } + + .col-md-6, + .row.cols-md-6 > * { + max-width: 50%; + flex-basis: 50%; } + + .col-md-offset-5 { + margin-left: 41.6666666667%; } + + .col-md-7, + .row.cols-md-7 > * { + max-width: 58.3333333333%; + flex-basis: 58.3333333333%; } + + .col-md-offset-6 { + margin-left: 50%; } + + .col-md-8, + .row.cols-md-8 > * { + max-width: 66.6666666667%; + flex-basis: 66.6666666667%; } + + .col-md-offset-7 { + margin-left: 58.3333333333%; } + + .col-md-9, + .row.cols-md-9 > * { + max-width: 75%; + flex-basis: 75%; } + + .col-md-offset-8 { + margin-left: 66.6666666667%; } + + .col-md-10, + .row.cols-md-10 > * { + max-width: 83.3333333333%; + flex-basis: 83.3333333333%; } + + .col-md-offset-9 { + margin-left: 75%; } + + .col-md-11, + .row.cols-md-11 > * { + max-width: 91.6666666667%; + flex-basis: 91.6666666667%; } + + .col-md-offset-10 { + margin-left: 83.3333333333%; } + + .col-md-12, + .row.cols-md-12 > * { + max-width: 100%; + flex-basis: 100%; } + + .col-md-offset-11 { + margin-left: 91.6666666667%; } + + .col-md-normal { + order: initial; } + + .col-md-first { + order: -999; } + + .col-md-last { + order: 999; } } +@media screen and (min-width: 1280px) { + .col-lg, + [class^='col-lg-'], + [class^='col-lg-offset-'], + .row[class*='cols-lg-'] > * { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); } + + .col-lg, + .row.cols-lg > * { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; } + + .col-lg-1, + .row.cols-lg-1 > * { + max-width: 8.3333333333%; + flex-basis: 8.3333333333%; } + + .col-lg-offset-0 { + margin-left: 0; } + + .col-lg-2, + .row.cols-lg-2 > * { + max-width: 16.6666666667%; + flex-basis: 16.6666666667%; } + + .col-lg-offset-1 { + margin-left: 8.3333333333%; } + + .col-lg-3, + .row.cols-lg-3 > * { + max-width: 25%; + flex-basis: 25%; } + + .col-lg-offset-2 { + margin-left: 16.6666666667%; } + + .col-lg-4, + .row.cols-lg-4 > * { + max-width: 33.3333333333%; + flex-basis: 33.3333333333%; } + + .col-lg-offset-3 { + margin-left: 25%; } + + .col-lg-5, + .row.cols-lg-5 > * { + max-width: 41.6666666667%; + flex-basis: 41.6666666667%; } + + .col-lg-offset-4 { + margin-left: 33.3333333333%; } + + .col-lg-6, + .row.cols-lg-6 > * { + max-width: 50%; + flex-basis: 50%; } + + .col-lg-offset-5 { + margin-left: 41.6666666667%; } + + .col-lg-7, + .row.cols-lg-7 > * { + max-width: 58.3333333333%; + flex-basis: 58.3333333333%; } + + .col-lg-offset-6 { + margin-left: 50%; } + + .col-lg-8, + .row.cols-lg-8 > * { + max-width: 66.6666666667%; + flex-basis: 66.6666666667%; } + + .col-lg-offset-7 { + margin-left: 58.3333333333%; } + + .col-lg-9, + .row.cols-lg-9 > * { + max-width: 75%; + flex-basis: 75%; } + + .col-lg-offset-8 { + margin-left: 66.6666666667%; } + + .col-lg-10, + .row.cols-lg-10 > * { + max-width: 83.3333333333%; + flex-basis: 83.3333333333%; } + + .col-lg-offset-9 { + margin-left: 75%; } + + .col-lg-11, + .row.cols-lg-11 > * { + max-width: 91.6666666667%; + flex-basis: 91.6666666667%; } + + .col-lg-offset-10 { + margin-left: 83.3333333333%; } + + .col-lg-12, + .row.cols-lg-12 > * { + max-width: 100%; + flex-basis: 100%; } + + .col-lg-offset-11 { + margin-left: 91.6666666667%; } + + .col-lg-normal { + order: initial; } + + .col-lg-first { + order: -999; } + + .col-lg-last { + order: 999; } } +/* Card component CSS variable definitions */ +:root { + --card-back-color: #3cb4e6; + --card-fore-color: #03234b; + --card-border-color: #03234b; } + +.card { + display: flex; + flex-direction: column; + justify-content: space-between; + align-self: center; + position: relative; + width: 100%; + background: var(--card-back-color); + color: var(--card-fore-color); + border: 0.0714285714rem solid var(--card-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); + overflow: hidden; } + @media screen and (min-width: 320px) { + .card { + max-width: 320px; } } + .card > .sectione { + background: var(--card-back-color); + color: var(--card-fore-color); + box-sizing: border-box; + margin: 0; + border: 0; + border-radius: 0; + border-bottom: 0.0714285714rem solid var(--card-border-color); + padding: var(--universal-padding); + width: 100%; } + .card > .sectione.media { + height: 200px; + padding: 0; + -o-object-fit: cover; + object-fit: cover; } + .card > .sectione:last-child { + border-bottom: 0; } + +/* + Custom elements for card elements. +*/ +@media screen and (min-width: 240px) { + .card.small { + max-width: 240px; } } +@media screen and (min-width: 480px) { + .card.large { + max-width: 480px; } } +.card.fluid { + max-width: 100%; + width: auto; } + +.card.warning { + --card-back-color: #e5b8b7; + --card-fore-color: #3b234b; + --card-border-color: #8c0078; } + +.card.error { + --card-back-color: #464650; + --card-fore-color: #ffffff; + --card-border-color: #8c0078; } + +.card > .sectione.dark { + --card-back-color: #3b234b; + --card-fore-color: #ffffff; } + +.card > .sectione.double-padded { + padding: calc(1.5 * var(--universal-padding)); } + +/* + Definitions for forms and input elements. +*/ +/* Input_control module CSS variable definitions */ +:root { + --form-back-color: #ffe97f; + --form-fore-color: #03234b; + --form-border-color: #3cb4e6; + --input-back-color: #ffffff; + --input-fore-color: #03234b; + --input-border-color: #3cb4e6; + --input-focus-color: #0288d1; + --input-invalid-color: #d32f2f; + --button-back-color: #e2e2e2; + --button-hover-back-color: #dcdcdc; + --button-fore-color: #212121; + --button-border-color: transparent; + --button-hover-border-color: transparent; + --button-group-border-color: rgba(124, 124, 124, 0.54); } + +form { + background: var(--form-back-color); + color: var(--form-fore-color); + border: 0.0714285714rem solid var(--form-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); + padding: calc(2 * var(--universal-padding)) var(--universal-padding); } + +fieldset { + border: 0.0714285714rem solid var(--form-border-color); + border-radius: var(--universal-border-radius); + margin: calc(var(--universal-margin) / 4); + padding: var(--universal-padding); } + +legend { + box-sizing: border-box; + display: table; + max-width: 100%; + white-space: normal; + font-weight: 500; + padding: calc(var(--universal-padding) / 2); } + +label { + padding: calc(var(--universal-padding) / 2) var(--universal-padding); } + +.input-group { + display: inline-block; } + .input-group.fluid { + display: flex; + align-items: center; + justify-content: center; } + .input-group.fluid > input { + max-width: 100%; + flex-grow: 1; + flex-basis: 0px; } + @media screen and (max-width: 499px) { + .input-group.fluid { + align-items: stretch; + flex-direction: column; } } + .input-group.vertical { + display: flex; + align-items: stretch; + flex-direction: column; } + .input-group.vertical > input { + max-width: 100%; + flex-grow: 1; + flex-basis: 0px; } + +[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button { + height: auto; } + +[type="search"] { + -webkit-appearance: textfield; + outline-offset: -2px; } + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } + +input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"], +[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select { + box-sizing: border-box; + background: var(--input-back-color); + color: var(--input-fore-color); + border: 0.0714285714rem solid var(--input-border-color); + border-radius: var(--universal-border-radius); + margin: calc(var(--universal-margin) / 2); + padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); } + +input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus { + border-color: var(--input-focus-color); + box-shadow: none; } +input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid { + border-color: var(--input-invalid-color); + box-shadow: none; } +input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] { + background: var(--secondary-back-color); } + +select { + max-width: 100%; } + +option { + overflow: hidden; + text-overflow: ellipsis; } + +[type="checkbox"], [type="radio"] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + position: relative; + height: calc(1rem + var(--universal-padding) / 2); + width: calc(1rem + var(--universal-padding) / 2); + vertical-align: text-bottom; + padding: 0; + flex-basis: calc(1rem + var(--universal-padding) / 2) !important; + flex-grow: 0 !important; } + [type="checkbox"]:checked:before, [type="radio"]:checked:before { + position: absolute; } + +[type="checkbox"]:checked:before { + content: '\2713'; + font-family: sans-serif; + font-size: calc(1rem + var(--universal-padding) / 2); + top: calc(0rem - var(--universal-padding)); + left: calc(var(--universal-padding) / 4); } + +[type="radio"] { + border-radius: 100%; } + [type="radio"]:checked:before { + border-radius: 100%; + content: ''; + top: calc(0.0714285714rem + var(--universal-padding) / 2); + left: calc(0.0714285714rem + var(--universal-padding) / 2); + background: var(--input-fore-color); + width: 0.5rem; + height: 0.5rem; } + +:placeholder-shown { + color: var(--input-fore-color); } + +::-ms-placeholder { + color: var(--input-fore-color); + opacity: 0.54; } + +button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; } + +button, html [type="button"], [type="reset"], [type="submit"] { + -webkit-appearance: button; } + +button { + overflow: visible; + text-transform: none; } + +button, [type="button"], [type="submit"], [type="reset"], +a.button, label.button, .button, +a[role="button"], label[role="button"], [role="button"] { + display: inline-block; + background: var(--button-back-color); + color: var(--button-fore-color); + border: 0.0714285714rem solid var(--button-border-color); + border-radius: var(--universal-border-radius); + padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); + margin: var(--universal-margin); + text-decoration: none; + cursor: pointer; + transition: background 0.3s; } + button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus, + a.button:hover, + a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus, + a[role="button"]:hover, + a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus { + background: var(--button-hover-back-color); + border-color: var(--button-hover-border-color); } + +input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] { + cursor: not-allowed; + opacity: 0.75; } + +.button-group { + display: flex; + border: 0.0714285714rem solid var(--button-group-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); } + .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] { + margin: 0; + max-width: 100%; + flex: 1 1 auto; + text-align: center; + border: 0; + border-radius: 0; + box-shadow: none; } + .button-group > :not(:first-child) { + border-left: 0.0714285714rem solid var(--button-group-border-color); } + @media screen and (max-width: 499px) { + .button-group { + flex-direction: column; } + .button-group > :not(:first-child) { + border: 0; + border-top: 0.0714285714rem solid var(--button-group-border-color); } } + +/* + Custom elements for forms and input elements. +*/ +button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary { + --button-back-color: #1976d2; + --button-fore-color: #f8f8f8; } + button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus { + --button-hover-back-color: #1565c0; } + +button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary { + --button-back-color: #d32f2f; + --button-fore-color: #f8f8f8; } + button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus { + --button-hover-back-color: #c62828; } + +button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary { + --button-back-color: #308732; + --button-fore-color: #f8f8f8; } + button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus { + --button-hover-back-color: #277529; } + +button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse { + --button-back-color: #212121; + --button-fore-color: #f8f8f8; } + button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus { + --button-hover-back-color: #111; } + +button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small { + padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding)); + margin: var(--universal-margin); } + +button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large { + padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding)); + margin: var(--universal-margin); } + +/* + Definitions for navigation elements. +*/ +/* Navigation module CSS variable definitions */ +:root { + --header-back-color: #03234b; + --header-hover-back-color: #ffd200; + --header-fore-color: #ffffff; + --header-border-color: #3cb4e6; + --nav-back-color: #ffffff; + --nav-hover-back-color: #ffe97f; + --nav-fore-color: #e6007e; + --nav-border-color: #3cb4e6; + --nav-link-color: #3cb4e6; + --footer-fore-color: #ffffff; + --footer-back-color: #03234b; + --footer-border-color: #3cb4e6; + --footer-link-color: #3cb4e6; + --drawer-back-color: #ffffff; + --drawer-hover-back-color: #ffe97f; + --drawer-border-color: #3cb4e6; + --drawer-close-color: #e6007e; } + +header { + height: 2.75rem; + background: var(--header-back-color); + color: var(--header-fore-color); + border-bottom: 0.0714285714rem solid var(--header-border-color); + padding: calc(var(--universal-padding) / 4) 0; + white-space: nowrap; + overflow-x: auto; + overflow-y: hidden; } + header.row { + box-sizing: content-box; } + header .logo { + color: var(--header-fore-color); + font-size: 1.75rem; + padding: var(--universal-padding) calc(2 * var(--universal-padding)); + text-decoration: none; } + header button, header [type="button"], header .button, header [role="button"] { + box-sizing: border-box; + position: relative; + top: calc(0rem - var(--universal-padding) / 4); + height: calc(3.1875rem + var(--universal-padding) / 2); + background: var(--header-back-color); + line-height: calc(3.1875rem - var(--universal-padding) * 1.5); + text-align: center; + color: var(--header-fore-color); + border: 0; + border-radius: 0; + margin: 0; + text-transform: uppercase; } + header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus { + background: var(--header-hover-back-color); } + +nav { + background: var(--nav-back-color); + color: var(--nav-fore-color); + border: 0.0714285714rem solid var(--nav-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); } + nav * { + padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); } + nav a, nav a:visited { + display: block; + color: var(--nav-link-color); + border-radius: var(--universal-border-radius); + transition: background 0.3s; } + nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus { + text-decoration: none; + background: var(--nav-hover-back-color); } + nav .sublink-1 { + position: relative; + margin-left: calc(2 * var(--universal-padding)); } + nav .sublink-1:before { + position: absolute; + left: calc(var(--universal-padding) - 1 * var(--universal-padding)); + top: -0.0714285714rem; + content: ''; + height: 100%; + border: 0.0714285714rem solid var(--nav-border-color); + border-left: 0; } + nav .sublink-2 { + position: relative; + margin-left: calc(4 * var(--universal-padding)); } + nav .sublink-2:before { + position: absolute; + left: calc(var(--universal-padding) - 3 * var(--universal-padding)); + top: -0.0714285714rem; + content: ''; + height: 100%; + border: 0.0714285714rem solid var(--nav-border-color); + border-left: 0; } + +footer { + background: var(--footer-back-color); + color: var(--footer-fore-color); + border-top: 0.0714285714rem solid var(--footer-border-color); + padding: calc(2 * var(--universal-padding)) var(--universal-padding); + font-size: 0.875rem; } + footer a, footer a:visited { + color: var(--footer-link-color); } + +header.sticky { + position: -webkit-sticky; + position: sticky; + z-index: 1101; + top: 0; } + +footer.sticky { + position: -webkit-sticky; + position: sticky; + z-index: 1101; + bottom: 0; } + +.drawer-toggle:before { + display: inline-block; + position: relative; + vertical-align: bottom; + content: '\00a0\2261\00a0'; + font-family: sans-serif; + font-size: 1.5em; } +@media screen and (min-width: 500px) { + .drawer-toggle:not(.persistent) { + display: none; } } + +[type="checkbox"].drawer { + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + [type="checkbox"].drawer + * { + display: block; + box-sizing: border-box; + position: fixed; + top: 0; + width: 320px; + height: 100vh; + overflow-y: auto; + background: var(--drawer-back-color); + border: 0.0714285714rem solid var(--drawer-border-color); + border-radius: 0; + margin: 0; + z-index: 1110; + right: -320px; + transition: right 0.3s; } + [type="checkbox"].drawer + * .drawer-close { + position: absolute; + top: var(--universal-margin); + right: var(--universal-margin); + z-index: 1111; + width: 2rem; + height: 2rem; + border-radius: var(--universal-border-radius); + padding: var(--universal-padding); + margin: 0; + cursor: pointer; + transition: background 0.3s; } + [type="checkbox"].drawer + * .drawer-close:before { + display: block; + content: '\00D7'; + color: var(--drawer-close-color); + position: relative; + font-family: sans-serif; + font-size: 2rem; + line-height: 1; + text-align: center; } + [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus { + background: var(--drawer-hover-back-color); } + @media screen and (max-width: 320px) { + [type="checkbox"].drawer + * { + width: 100%; } } + [type="checkbox"].drawer:checked + * { + right: 0; } + @media screen and (min-width: 500px) { + [type="checkbox"].drawer:not(.persistent) + * { + position: static; + height: 100%; + z-index: 1100; } + [type="checkbox"].drawer:not(.persistent) + * .drawer-close { + display: none; } } + +/* + Definitions for the responsive table component. +*/ +/* Table module CSS variable definitions. */ +:root { + --table-border-color: #03234b; + --table-border-separator-color: #03234b; + --table-head-back-color: #03234b; + --table-head-fore-color: #ffffff; + --table-body-back-color: #ffffff; + --table-body-fore-color: #03234b; + --table-body-alt-back-color: #f4f4f4; } + +table { + border-collapse: separate; + border-spacing: 0; + margin: 0; + display: flex; + flex: 0 1 auto; + flex-flow: row wrap; + padding: var(--universal-padding); + padding-top: 0; } + table caption { + font-size: 1rem; + margin: calc(2 * var(--universal-margin)) 0; + max-width: 100%; + flex: 0 0 100%; } + table thead, table tbody { + display: flex; + flex-flow: row wrap; + border: 0.0714285714rem solid var(--table-border-color); } + table thead { + z-index: 999; + border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; + border-bottom: 0.0714285714rem solid var(--table-border-separator-color); } + table tbody { + border-top: 0; + margin-top: calc(0 - var(--universal-margin)); + border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } + table tr { + display: flex; + padding: 0; } + table th, table td { + padding: calc(0.5 * var(--universal-padding)); + font-size: 0.9rem; } + table th { + text-align: left; + background: var(--table-head-back-color); + color: var(--table-head-fore-color); } + table td { + background: var(--table-body-back-color); + color: var(--table-body-fore-color); + border-top: 0.0714285714rem solid var(--table-border-color); } + +table:not(.horizontal) { + overflow: auto; + max-height: 100%; } + table:not(.horizontal) thead, table:not(.horizontal) tbody { + max-width: 100%; + flex: 0 0 100%; } + table:not(.horizontal) tr { + flex-flow: row wrap; + flex: 0 0 100%; } + table:not(.horizontal) th, table:not(.horizontal) td { + flex: 1 0 0%; + overflow: hidden; + text-overflow: ellipsis; } + table:not(.horizontal) thead { + position: sticky; + top: 0; } + table:not(.horizontal) tbody tr:first-child td { + border-top: 0; } + +table.horizontal { + border: 0; } + table.horizontal thead, table.horizontal tbody { + border: 0; + flex: .2 0 0; + flex-flow: row nowrap; } + table.horizontal tbody { + overflow: auto; + justify-content: space-between; + flex: .8 0 0; + margin-left: 0; + padding-bottom: calc(var(--universal-padding) / 4); } + table.horizontal tr { + flex-direction: column; + flex: 1 0 auto; } + table.horizontal th, table.horizontal td { + width: auto; + border: 0; + border-bottom: 0.0714285714rem solid var(--table-border-color); } + table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) { + border-top: 0; } + table.horizontal th { + text-align: right; + border-left: 0.0714285714rem solid var(--table-border-color); + border-right: 0.0714285714rem solid var(--table-border-separator-color); } + table.horizontal thead tr:first-child { + padding-left: 0; } + table.horizontal th:first-child, table.horizontal td:first-child { + border-top: 0.0714285714rem solid var(--table-border-color); } + table.horizontal tbody tr:last-child td { + border-right: 0.0714285714rem solid var(--table-border-color); } + table.horizontal tbody tr:last-child td:first-child { + border-top-right-radius: 0.25rem; } + table.horizontal tbody tr:last-child td:last-child { + border-bottom-right-radius: 0.25rem; } + table.horizontal thead tr:first-child th:first-child { + border-top-left-radius: 0.25rem; } + table.horizontal thead tr:first-child th:last-child { + border-bottom-left-radius: 0.25rem; } + +@media screen and (max-width: 499px) { + table, table.horizontal { + border-collapse: collapse; + border: 0; + width: 100%; + display: table; } + table thead, table th, table.horizontal thead, table.horizontal th { + border: 0; + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + table tbody, table.horizontal tbody { + border: 0; + display: table-row-group; } + table tr, table.horizontal tr { + display: block; + border: 0.0714285714rem solid var(--table-border-color); + border-radius: var(--universal-border-radius); + background: #ffffff; + padding: var(--universal-padding); + margin: var(--universal-margin); + margin-bottom: calc(1 * var(--universal-margin)); } + table th, table td, table.horizontal th, table.horizontal td { + width: auto; } + table td, table.horizontal td { + display: block; + border: 0; + text-align: right; } + table td:before, table.horizontal td:before { + content: attr(data-label); + float: left; + font-weight: 600; } + table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child { + border-top: 0; } + table tbody tr:last-child td, table.horizontal tbody tr:last-child td { + border-right: 0; } } +table tr:nth-of-type(2n) > td { + background: var(--table-body-alt-back-color); } + +@media screen and (max-width: 500px) { + table tr:nth-of-type(2n) { + background: var(--table-body-alt-back-color); } } +:root { + --table-body-hover-back-color: #90caf9; } + +table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td { + background: var(--table-body-hover-back-color); } + +@media screen and (max-width: 500px) { + table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td { + background: var(--table-body-hover-back-color); } } +/* + Definitions for contextual background elements, toasts and tooltips. +*/ +/* Contextual module CSS variable definitions */ +:root { + --mark-back-color: #3cb4e6; + --mark-fore-color: #ffffff; } + +mark { + background: var(--mark-back-color); + color: var(--mark-fore-color); + font-size: 0.95em; + line-height: 1em; + border-radius: var(--universal-border-radius); + padding: calc(var(--universal-padding) / 4) var(--universal-padding); } + mark.inline-block { + display: inline-block; + font-size: 1em; + line-height: 1.4; + padding: calc(var(--universal-padding) / 2) var(--universal-padding); } + +:root { + --toast-back-color: #424242; + --toast-fore-color: #fafafa; } + +.toast { + position: fixed; + bottom: calc(var(--universal-margin) * 3); + left: 50%; + transform: translate(-50%, -50%); + z-index: 1111; + color: var(--toast-fore-color); + background: var(--toast-back-color); + border-radius: calc(var(--universal-border-radius) * 16); + padding: var(--universal-padding) calc(var(--universal-padding) * 3); } + +:root { + --tooltip-back-color: #212121; + --tooltip-fore-color: #fafafa; } + +.tooltip { + position: relative; + display: inline-block; } + .tooltip:before, .tooltip:after { + position: absolute; + opacity: 0; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); + transition: all 0.3s; + z-index: 1010; + left: 50%; } + .tooltip:not(.bottom):before, .tooltip:not(.bottom):after { + bottom: 75%; } + .tooltip.bottom:before, .tooltip.bottom:after { + top: 75%; } + .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after { + opacity: 1; + clip: auto; + -webkit-clip-path: inset(0%); + clip-path: inset(0%); } + .tooltip:before { + content: ''; + background: transparent; + border: var(--universal-margin) solid transparent; + left: calc(50% - var(--universal-margin)); } + .tooltip:not(.bottom):before { + border-top-color: #212121; } + .tooltip.bottom:before { + border-bottom-color: #212121; } + .tooltip:after { + content: attr(aria-label); + color: var(--tooltip-fore-color); + background: var(--tooltip-back-color); + border-radius: var(--universal-border-radius); + padding: var(--universal-padding); + white-space: nowrap; + transform: translateX(-50%); } + .tooltip:not(.bottom):after { + margin-bottom: calc(2 * var(--universal-margin)); } + .tooltip.bottom:after { + margin-top: calc(2 * var(--universal-margin)); } + +:root { + --modal-overlay-color: rgba(0, 0, 0, 0.45); + --modal-close-color: #e6007e; + --modal-close-hover-color: #ffe97f; } + +[type="checkbox"].modal { + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + [type="checkbox"].modal + div { + position: fixed; + top: 0; + left: 0; + display: none; + width: 100vw; + height: 100vh; + background: var(--modal-overlay-color); } + [type="checkbox"].modal + div .card { + margin: 0 auto; + max-height: 50vh; + overflow: auto; } + [type="checkbox"].modal + div .card .modal-close { + position: absolute; + top: 0; + right: 0; + width: 1.75rem; + height: 1.75rem; + border-radius: var(--universal-border-radius); + padding: var(--universal-padding); + margin: 0; + cursor: pointer; + transition: background 0.3s; } + [type="checkbox"].modal + div .card .modal-close:before { + display: block; + content: '\00D7'; + color: var(--modal-close-color); + position: relative; + font-family: sans-serif; + font-size: 1.75rem; + line-height: 1; + text-align: center; } + [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus { + background: var(--modal-close-hover-color); } + [type="checkbox"].modal:checked + div { + display: flex; + flex: 0 1 auto; + z-index: 1200; } + [type="checkbox"].modal:checked + div .card .modal-close { + z-index: 1211; } + +:root { + --collapse-label-back-color: #03234b; + --collapse-label-fore-color: #ffffff; + --collapse-label-hover-back-color: #3cb4e6; + --collapse-selected-label-back-color: #3cb4e6; + --collapse-border-color: var(--collapse-label-back-color); + --collapse-selected-border-color: #ceecf8; + --collapse-content-back-color: #ffffff; + --collapse-selected-label-border-color: #3cb4e6; } + +.collapse { + width: calc(100% - 2 * var(--universal-margin)); + opacity: 1; + display: flex; + flex-direction: column; + margin: var(--universal-margin); + border-radius: var(--universal-border-radius); } + .collapse > [type="radio"], .collapse > [type="checkbox"] { + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + .collapse > label { + flex-grow: 1; + display: inline-block; + height: 1.25rem; + cursor: pointer; + transition: background 0.2s; + color: var(--collapse-label-fore-color); + background: var(--collapse-label-back-color); + border: 0.0714285714rem solid var(--collapse-selected-border-color); + padding: calc(1.25 * var(--universal-padding)); } + .collapse > label:hover, .collapse > label:focus { + background: var(--collapse-label-hover-back-color); } + .collapse > label + div { + flex-basis: auto; + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); + transition: max-height 0.3s; + max-height: 1px; } + .collapse > :checked + label { + background: var(--collapse-selected-label-back-color); + border-color: var(--collapse-selected-label-border-color); } + .collapse > :checked + label + div { + box-sizing: border-box; + position: relative; + width: 100%; + height: auto; + overflow: auto; + margin: 0; + background: var(--collapse-content-back-color); + border: 0.0714285714rem solid var(--collapse-selected-border-color); + border-top: 0; + padding: var(--universal-padding); + clip: auto; + -webkit-clip-path: inset(0%); + clip-path: inset(0%); + max-height: 100%; } + .collapse > label:not(:first-of-type) { + border-top: 0; } + .collapse > label:first-of-type { + border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; } + .collapse > label:last-of-type:not(:first-of-type) { + border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } + .collapse > label:last-of-type:first-of-type { + border-radius: var(--universal-border-radius); } + .collapse > :checked:last-of-type:not(:first-of-type) + label { + border-radius: 0; } + .collapse > :checked:last-of-type + label + div { + border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } + +/* + Custom elements for contextual background elements, toasts and tooltips. +*/ +mark.tertiary { + --mark-back-color: #3cb4e6; } + +mark.tag { + padding: calc(var(--universal-padding)/2) var(--universal-padding); + border-radius: 1em; } + +/* + Definitions for progress elements and spinners. +*/ +/* Progress module CSS variable definitions */ +:root { + --progress-back-color: #3cb4e6; + --progress-fore-color: #555; } + +progress { + display: block; + vertical-align: baseline; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + height: 0.75rem; + width: calc(100% - 2 * var(--universal-margin)); + margin: var(--universal-margin); + border: 0; + border-radius: calc(2 * var(--universal-border-radius)); + background: var(--progress-back-color); + color: var(--progress-fore-color); } + progress::-webkit-progress-value { + background: var(--progress-fore-color); + border-top-left-radius: calc(2 * var(--universal-border-radius)); + border-bottom-left-radius: calc(2 * var(--universal-border-radius)); } + progress::-webkit-progress-bar { + background: var(--progress-back-color); } + progress::-moz-progress-bar { + background: var(--progress-fore-color); + border-top-left-radius: calc(2 * var(--universal-border-radius)); + border-bottom-left-radius: calc(2 * var(--universal-border-radius)); } + progress[value="1000"]::-webkit-progress-value { + border-radius: calc(2 * var(--universal-border-radius)); } + progress[value="1000"]::-moz-progress-bar { + border-radius: calc(2 * var(--universal-border-radius)); } + progress.inline { + display: inline-block; + vertical-align: middle; + width: 60%; } + +:root { + --spinner-back-color: #ddd; + --spinner-fore-color: #555; } + +@keyframes spinner-donut-anim { + 0% { + transform: rotate(0deg); } + 100% { + transform: rotate(360deg); } } +.spinner { + display: inline-block; + margin: var(--universal-margin); + border: 0.25rem solid var(--spinner-back-color); + border-left: 0.25rem solid var(--spinner-fore-color); + border-radius: 50%; + width: 1.25rem; + height: 1.25rem; + animation: spinner-donut-anim 1.2s linear infinite; } + +/* + Custom elements for progress bars and spinners. +*/ +progress.primary { + --progress-fore-color: #1976d2; } + +progress.secondary { + --progress-fore-color: #d32f2f; } + +progress.tertiary { + --progress-fore-color: #308732; } + +.spinner.primary { + --spinner-fore-color: #1976d2; } + +.spinner.secondary { + --spinner-fore-color: #d32f2f; } + +.spinner.tertiary { + --spinner-fore-color: #308732; } + +/* + Definitions for icons - powered by Feather (https://feathericons.com/). +*/ +span[class^='icon-'] { + display: inline-block; + height: 1em; + width: 1em; + vertical-align: -0.125em; + background-size: contain; + margin: 0 calc(var(--universal-margin) / 4); } + span[class^='icon-'].secondary { + -webkit-filter: invert(25%); + filter: invert(25%); } + span[class^='icon-'].inverse { + -webkit-filter: invert(100%); + filter: invert(100%); } + +span.icon-alert { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-bookmark { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-calendar { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-credit { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-edit { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); } +span.icon-link { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-help { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-home { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); } +span.icon-info { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-lock { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-mail { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); } +span.icon-location { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); } +span.icon-phone { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-rss { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); } +span.icon-search { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-settings { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-share { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-cart { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-upload { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-user { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); } + +/* + Definitions for STMicroelectronics icons (https://brandportal.st.com/document/26). +*/ +span.icon-st-update { + background-image: url("Update.svg"); } +span.icon-st-add { + background-image: url("Add button.svg"); } + +/* + Definitions for utilities and helper classes. +*/ +/* Utility module CSS variable definitions */ +:root { + --generic-border-color: rgba(0, 0, 0, 0.3); + --generic-box-shadow: 0 0.2857142857rem 0.2857142857rem 0 rgba(0, 0, 0, 0.125), 0 0.1428571429rem 0.1428571429rem -0.1428571429rem rgba(0, 0, 0, 0.125); } + +.hidden { + display: none !important; } + +.visually-hidden { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } + +.bordered { + border: 0.0714285714rem solid var(--generic-border-color) !important; } + +.rounded { + border-radius: var(--universal-border-radius) !important; } + +.circular { + border-radius: 50% !important; } + +.shadowed { + box-shadow: var(--generic-box-shadow) !important; } + +.responsive-margin { + margin: calc(var(--universal-margin) / 4) !important; } + @media screen and (min-width: 500px) { + .responsive-margin { + margin: calc(var(--universal-margin) / 2) !important; } } + @media screen and (min-width: 1280px) { + .responsive-margin { + margin: var(--universal-margin) !important; } } + +.responsive-padding { + padding: calc(var(--universal-padding) / 4) !important; } + @media screen and (min-width: 500px) { + .responsive-padding { + padding: calc(var(--universal-padding) / 2) !important; } } + @media screen and (min-width: 1280px) { + .responsive-padding { + padding: var(--universal-padding) !important; } } + +@media screen and (max-width: 499px) { + .hidden-sm { + display: none !important; } } +@media screen and (min-width: 500px) and (max-width: 1279px) { + .hidden-md { + display: none !important; } } +@media screen and (min-width: 1280px) { + .hidden-lg { + display: none !important; } } +@media screen and (max-width: 499px) { + .visually-hidden-sm { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } } +@media screen and (min-width: 500px) and (max-width: 1279px) { + .visually-hidden-md { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } } +@media screen and (min-width: 1280px) { + .visually-hidden-lg { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } } + +/*# sourceMappingURL=mini-custom.css.map */ + +img[alt="ST logo"] { display: block; margin: auto; width: 75%; max-width: 250px; min-width: 71px; } +img[alt="Cube logo"] { float: right; width: 30%; max-width: 10rem; min-width: 8rem; padding-right: 1rem;} + +.figure { + display: block; + margin-left: auto; + margin-right: auto; + text-align: center; +} \ No newline at end of file diff --git a/Drivers/BSP/Components/s25fl128s/_htmresc/st_logo.png b/Drivers/BSP/Components/s25fl128s/_htmresc/st_logo.png deleted file mode 100644 index 8b80057fd..000000000 Binary files a/Drivers/BSP/Components/s25fl128s/_htmresc/st_logo.png and /dev/null differ diff --git a/Drivers/BSP/Components/s25fl128s/_htmresc/st_logo_2020.png b/Drivers/BSP/Components/s25fl128s/_htmresc/st_logo_2020.png new file mode 100644 index 000000000..d6cebb5ac Binary files /dev/null and b/Drivers/BSP/Components/s25fl128s/_htmresc/st_logo_2020.png differ diff --git a/Drivers/BSP/Components/s25fl128s/s25fl128s.c b/Drivers/BSP/Components/s25fl128s/s25fl128s.c index 0106f7b85..cc7d79410 100644 --- a/Drivers/BSP/Components/s25fl128s/s25fl128s.c +++ b/Drivers/BSP/Components/s25fl128s/s25fl128s.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

© Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

+ * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "s25fl128s.h" @@ -32,6 +31,21 @@ * @{ */ +/** @defgroup S25FL128S_Private_Define S25FL128S Private Define + * @{ + */ +/* To avoid compiling issues for projects using previous version */ +#ifndef S25FL128S_DUMMY_CYCLES_READ_DUAL_INOUT +#define S25FL128S_DUMMY_CYCLES_READ_DUAL_INOUT 4U +#endif + +#ifndef S25FL128S_DUMMY_CYCLES_READ_QUAD_INOUT +#define S25FL128S_DUMMY_CYCLES_READ_QUAD_INOUT 6U +#endif +/** + * @} + */ + /** @defgroup S25FL128S_Exported_Functions S25FL128S Exported Functions * @{ */ @@ -64,8 +78,10 @@ int32_t S25FL128S_WriteEnable(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mod QSPI_CommandTypeDef s_command; QSPI_AutoPollingTypeDef s_config; + UNUSED(Mode); /* The command Write Enable is always 1-0-0 */ + /* Enable write operations */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_WRITE_ENABLE_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -107,8 +123,10 @@ int32_t S25FL128S_WriteDisable(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mo { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Write Disable is always 1-0-0 */ + /* Initialize the read ID command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_WRITE_DISABLE_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -128,7 +146,7 @@ int32_t S25FL128S_WriteDisable(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mo /** * @brief Writes an amount of data to the QSPI memory. - * SPI/DPI/QPI; 1-1-1/1-2-2/1-1-4/1-4-4/2-2-2/4-4-4 + * SPI/QPI; 1-1-1/1-1-4 * @param Ctx QSPI handle * @param Mode Flash mode * @param pData Pointer to data to be written @@ -143,31 +161,16 @@ int32_t S25FL128S_PageProgram(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mod /* Setup program command */ switch(Mode) { - case S25FL128S_SPI_1I4O_MODE : /* 1-1-4 program commands */ - s_command.Instruction = S25FL128S_QUAD_IN_FAST_PROG_CMD; + s_command.Instruction = S25FL128S_QUAD_IN_FAST_PROG_4_BYTE_ADDR_CMD; s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_4_LINES; break; - case S25FL128S_SPI_4IO_MODE : /* 1-4-4 program commands */ - s_command.Instruction = S25FL128S_QUAD_IN_FAST_PROG_ALTERNATE_CMD; - s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.AddressMode = QSPI_ADDRESS_4_LINES; - s_command.DataMode = QSPI_DATA_4_LINES; - break; - - case S25FL128S_QPI_MODE : /* 4-4-4 commands */ - s_command.Instruction = S25FL128S_QUAD_IN_FAST_PROG_CMD; - s_command.InstructionMode = QSPI_INSTRUCTION_4_LINES; - s_command.AddressMode = QSPI_ADDRESS_4_LINES; - s_command.DataMode = QSPI_DATA_4_LINES; - break; - case S25FL128S_SPI_MODE : /* 1-1-1 commands, Power on H/W default setting */ default : - s_command.Instruction = S25FL128S_PAGE_PROG_CMD; + s_command.Instruction = S25FL128S_PAGE_PROG_4_BYTE_ADDR_CMD; s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_1_LINE; @@ -208,8 +211,10 @@ int32_t S25FL128S_AutoPollingMemReady(QSPI_HandleTypeDef *Ctx, S25FL128S_Interfa QSPI_CommandTypeDef s_command; QSPI_AutoPollingTypeDef s_config; + UNUSED(Mode); /* The command Read Status Register-1 is always 1-0-1 */ + /* Configure automatic polling mode to wait for memory ready */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_READ_STATUS_REG1_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -244,57 +249,57 @@ int32_t S25FL128S_Enter4BytesAddressMode(QSPI_HandleTypeDef *Ctx, S25FL128S_Inte QSPI_CommandTypeDef s_command; uint8_t reg1; - /* Initialize the read bank register command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_READ_BANK_REG_CMD; - s_command.AddressMode = QSPI_ADDRESS_NONE; - s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; - s_command.DataMode = QSPI_DATA_1_LINE; - s_command.DummyCycles = 0; - s_command.NbData = 1; - s_command.DdrMode = QSPI_DDR_MODE_DISABLE; - s_command.SIOOMode = QSPI_SIOO_INST_EVERY_CMD; - - /* Configure the command */ - if (HAL_QSPI_Command(Ctx, &s_command, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) - { - return S25FL128S_ERROR; - } - - /* Reception of the data */ - if (HAL_QSPI_Receive(Ctx, ®1, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) - { - return S25FL128S_ERROR; - } - - /* Enable write operations */ + /* Initialize the read bank register command */ + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; + s_command.Instruction = S25FL128S_READ_BANK_REG_CMD; + s_command.AddressMode = QSPI_ADDRESS_NONE; + s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; + s_command.DataMode = QSPI_DATA_1_LINE; + s_command.DummyCycles = 0; + s_command.NbData = 1; + s_command.DdrMode = QSPI_DDR_MODE_DISABLE; + s_command.SIOOMode = QSPI_SIOO_INST_EVERY_CMD; + + /* Configure the command */ + if (HAL_QSPI_Command(Ctx, &s_command, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) + { + return S25FL128S_ERROR; + } + + /* Reception of the data */ + if (HAL_QSPI_Receive(Ctx, ®1, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) + { + return S25FL128S_ERROR; + } + + /* Enable write operations */ if( S25FL128S_WriteEnable(Ctx,Mode)!=S25FL128S_OK) { return S25FL128S_ERROR; } - /* Update Bank address register (with 4byte addressing bit) */ - s_command.Instruction = S25FL128S_WRITE_BANK_REG_CMD; - MODIFY_REG(reg1, S25FL128S_BA_EXTADD, S25FL128S_BA_EXTADD); + /* Update Bank address register (with 4byte addressing bit) */ + s_command.Instruction = S25FL128S_WRITE_BANK_REG_CMD; + MODIFY_REG(reg1, S25FL128S_BA_EXTADD, S25FL128S_BA_EXTADD); - /* Configure the write volatile configuration register command */ - if (HAL_QSPI_Command(Ctx, &s_command, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) - { - return S25FL128S_ERROR; - } + /* Configure the write volatile configuration register command */ + if (HAL_QSPI_Command(Ctx, &s_command, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) + { + return S25FL128S_ERROR; + } - /* Transmission of the data Status Register 1 */ - if (HAL_QSPI_Transmit(Ctx, ®1, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) - { - return S25FL128S_ERROR; - } + /* Transmission of the data Status Register 1 */ + if (HAL_QSPI_Transmit(Ctx, ®1, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) + { + return S25FL128S_ERROR; + } return S25FL128S_OK; } /** * @brief Reads an amount of data from the QSPI memory in STR mode. - * SPI/DPI/QPI; 1-1-1/1-2-2/1-1-4/1-4-4/2-2-2/4-4-4 + * SPI/DPI/QPI; 1-1-1/1-1-2/1-2-2/1-1-4/1-4-4 * @param Ctx QSPI handle * @param Mode Flash mode * @param pData Pointer to data to be read @@ -310,57 +315,47 @@ int32_t S25FL128S_ReadSTR(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, u { case S25FL128S_SPI_1I2O_MODE : /* 1-1-2 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_DUAL_OUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_DUAL_OUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_2_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; break; case S25FL128S_SPI_2IO_MODE : /* 1-2-2 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_DUAL_INOUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_DUAL_INOUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_2_LINES; s_command.DataMode = QSPI_DATA_2_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ_DUAL_INOUT; break; case S25FL128S_SPI_1I4O_MODE : /* 1-1-4 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_QUAD_OUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_QUAD_OUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_4_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; break; case S25FL128S_SPI_4IO_MODE : /* 1-4-4 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_QUAD_INOUT_FAST_READ_CMD; - s_command.AddressMode = QSPI_ADDRESS_4_LINES; - s_command.DataMode = QSPI_DATA_4_LINES; - break; - - case S25FL128S_DPI_MODE : /* 2-2-2 commands */ - s_command.InstructionMode = QSPI_INSTRUCTION_2_LINES; - s_command.Instruction = S25FL128S_DUAL_OUT_FAST_READ_CMD; - s_command.AddressMode = QSPI_ADDRESS_2_LINES; - s_command.DataMode = QSPI_DATA_2_LINES; - break; - - case S25FL128S_QPI_MODE : /* 4-4-4 commands */ - s_command.InstructionMode = QSPI_INSTRUCTION_4_LINES; - s_command.Instruction = S25FL128S_QUAD_INOUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_QUAD_INOUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_4_LINES; s_command.DataMode = QSPI_DATA_4_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ_QUAD_INOUT; break; case S25FL128S_SPI_MODE : /* 1-1-1 commands, Power on H/W default setting */ default: s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_FAST_READ_CMD; + s_command.Instruction = S25FL128S_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_1_LINE; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; break; } /* Initialize the read command */ - s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; s_command.AddressSize = QSPI_ADDRESS_32_BITS; s_command.Address = ReadAddr; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -386,7 +381,7 @@ int32_t S25FL128S_ReadSTR(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, u /** * @brief Erases the specified block of the QSPI memory. * S25FL128S support 4K, 64K size block erase commands. - * SPI/DPI/QPI; 1-1-1/1-2-2/1-1-4/1-4-4/2-2-2/4-4-4 + * SPI; 1-0-0/1-1-0 * @param Ctx QSPI handle * @param Mode Flash mode * @param BlockAddress Block address to erase @@ -397,28 +392,34 @@ int32_t S25FL128S_BlockErase(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The Erase commands are always 1-1-0 or 1-0-0 */ + /* Setup erase command */ switch(BlockSize) { case S25FL128S_ERASE_64K : - s_command.Instruction = S25FL128S_SECTOR_ERASE_CMD; + s_command.Instruction = S25FL128S_SECTOR_ERASE_4_BYTE_ADDR_CMD; + s_command.AddressMode = QSPI_ADDRESS_1_LINE; + s_command.AddressSize = QSPI_ADDRESS_32_BITS; + s_command.Address = BlockAddress; break; case S25FL128S_ERASE_CHIP : s_command.Instruction = S25FL128S_BULK_ERASE_ALTERNATE_CMD; - break; + s_command.AddressMode = QSPI_ADDRESS_NONE; + break; case S25FL128S_ERASE_4K : default : - s_command.Instruction = S25FL128S_SUBSECTOR_ERASE_CMD_4K; + s_command.Instruction = S25FL128S_SUBSECTOR_ERASE_4_BYTE_ADDR_CMD_4K; + s_command.AddressMode = QSPI_ADDRESS_1_LINE; + s_command.AddressSize = QSPI_ADDRESS_32_BITS; + s_command.Address = BlockAddress; break; } /* Initialize the erase command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; - s_command.AddressMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_ADDRESS_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_ADDRESS_2_LINES : QSPI_ADDRESS_1_LINE; - s_command.AddressSize = QSPI_ADDRESS_32_BITS; - s_command.Address = BlockAddress; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; s_command.DummyCycles = 0; s_command.DataMode = QSPI_DATA_NONE; @@ -436,7 +437,7 @@ int32_t S25FL128S_BlockErase(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode /** * @brief Whole chip erase. - * SPI/DPI/QPI; 1-1-0/2-2-0/4-4-0 + * SPI; 1-0-0 * @param Ctx QSPI handle * @param Mode Flash mode * @retval QSPI memory status @@ -445,9 +446,11 @@ int32_t S25FL128S_ChipErase(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode) { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Chip Erase is always 1-0-0 */ + /* Initialize the erase command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; - s_command.AddressMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_ADDRESS_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_ADDRESS_2_LINES : QSPI_ADDRESS_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; + s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.Instruction = S25FL128S_BULK_ERASE_ALTERNATE_CMD; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; s_command.DummyCycles = 0; @@ -466,7 +469,7 @@ int32_t S25FL128S_ChipErase(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode) /** * @brief Reads an amount of data from the QSPI memory on STR mode. - * SPI/DPI/QPI; 1-1-1/1-2-2/1-1-4/1-4-4/2-2-2/4-4-4 + * SPI/DPI/QPI; 1-1-1/1-1-2/1-2-2/1-1-4/1-4-4 * @param Ctx QSPI handle * @param Mode Flash mode * @retval QSPI memory status @@ -480,52 +483,43 @@ int32_t S25FL128S_EnableMemoryMappedModeSTR(QSPI_HandleTypeDef *Ctx, S25FL128S_I { case S25FL128S_SPI_1I2O_MODE : /* 1-1-2 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_DUAL_OUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_DUAL_OUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_2_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; break; case S25FL128S_SPI_2IO_MODE : /* 1-2-2 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_DUAL_INOUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_DUAL_INOUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_2_LINES; s_command.DataMode = QSPI_DATA_2_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ_DUAL_INOUT; break; case S25FL128S_SPI_1I4O_MODE : /* 1-1-4 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_QUAD_OUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_QUAD_OUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_4_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; break; case S25FL128S_SPI_4IO_MODE : /* 1-4-4 read commands */ s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_QUAD_INOUT_FAST_READ_CMD; - s_command.AddressMode = QSPI_ADDRESS_4_LINES; - s_command.DataMode = QSPI_DATA_4_LINES; - break; - - case S25FL128S_DPI_MODE : /* 2-2-2 commands */ - s_command.InstructionMode = QSPI_INSTRUCTION_2_LINES; - s_command.Instruction = S25FL128S_DUAL_OUT_FAST_READ_CMD; - s_command.AddressMode = QSPI_ADDRESS_2_LINES; - s_command.DataMode = QSPI_DATA_2_LINES; - break; - - case S25FL128S_QPI_MODE : /* 4-4-4 commands */ - s_command.InstructionMode = QSPI_INSTRUCTION_4_LINES; - s_command.Instruction = S25FL128S_QUAD_INOUT_FAST_READ_CMD; + s_command.Instruction = S25FL128S_QUAD_INOUT_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_4_LINES; s_command.DataMode = QSPI_DATA_4_LINES; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ_QUAD_INOUT; break; case S25FL128S_SPI_MODE : /* 1-1-1 commands, Power on H/W default setting */ default: s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_FAST_READ_CMD; + s_command.Instruction = S25FL128S_FAST_READ_4_BYTE_ADDR_CMD; s_command.AddressMode = QSPI_ADDRESS_1_LINE; s_command.DataMode = QSPI_DATA_1_LINE; + s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; break; } @@ -549,7 +543,7 @@ int32_t S25FL128S_EnableMemoryMappedModeSTR(QSPI_HandleTypeDef *Ctx, S25FL128S_I /** * @brief Read Flash Status register value - * SPI/DPI/QPI; 1-0-0/2-0-0/4-0-0 + * SPI; 1-0-1 * @param Ctx QSPI handle * @param Mode Flash mode * @param Value to read from status register @@ -558,12 +552,15 @@ int32_t S25FL128S_ReadStatusRegister(QSPI_HandleTypeDef *Ctx, S25FL128S_Interfac { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Read Status Register-1 is always 1-0-1 */ + /* Initialize the reading of status register */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_READ_STATUS_REG1_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; s_command.DummyCycles = 0; + s_command.DataMode = QSPI_DATA_1_LINE; s_command.NbData = 1; s_command.DdrMode = QSPI_DDR_MODE_DISABLE; s_command.SIOOMode = QSPI_SIOO_INST_EVERY_CMD; @@ -585,6 +582,7 @@ int32_t S25FL128S_ReadStatusRegister(QSPI_HandleTypeDef *Ctx, S25FL128S_Interfac /** * @brief Flash reset enable command + * SPI; 1-0-0 * @param Ctx QSPI handle * @param Mode Flash mode * @retval QSPI memory status @@ -593,8 +591,10 @@ int32_t S25FL128S_ResetEnable(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mod { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Software Reset is always 1-0-0 */ + /* Initialize the reset enable command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_SOFTWARE_RESET_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -614,6 +614,7 @@ int32_t S25FL128S_ResetEnable(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mod /** * @brief Flash reset memory command + * SPI; 1-0-0 * @param Ctx QSPI handle * @param Mode Flash mode * @retval QSPI memory status @@ -622,8 +623,10 @@ int32_t S25FL128S_ResetMemory(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mod { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Software Reset is always 1-0-0 */ + /* Initialize the reset enable command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_SOFTWARE_RESET_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -644,7 +647,7 @@ int32_t S25FL128S_ResetMemory(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mod /** * @brief Read Flash 3 Byte IDs. * Manufacturer ID, Memory type, Memory density - * SPI/DPI/QPI; 1-1-1/2-2-2/4-4-4 + * SPI; 1-0-1 * @param Ctx QSPI handle * @param Mode Flash mode * @param ID Flash ID @@ -654,13 +657,15 @@ int32_t S25FL128S_ReadID(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, ui { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Read Identification is always 1-0-1 */ + /* Initialize the read ID command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_READ_ID_CMD2; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; s_command.DataMode = QSPI_DATA_1_LINE; - s_command.NbData = 6; + s_command.NbData = 3; s_command.DummyCycles = 0; s_command.DdrMode = QSPI_DDR_MODE_DISABLE; s_command.SIOOMode = QSPI_SIOO_INST_EVERY_CMD; @@ -684,7 +689,7 @@ int32_t S25FL128S_ReadID(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, ui * @brief Program/Erases suspend. Interruption Program/Erase operations. * After the device has entered Erase-Suspended mode, * system can read any address except the block/sector being Program/Erased. - * SPI/DPI/QPI; 1-0-0/2-0-0/4-0-0 + * SPI; 1-0-0 * @param Ctx QSPI handle * @param Mode Flash moder * @retval QSPI memory status @@ -693,8 +698,10 @@ int32_t S25FL128S_ProgEraseSuspend(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_ { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Program Erase Suspend is always 1-0-0 */ + /* Initialize the S25FL128S_PROG_ERASE_SUSPEND_CMD command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_PROG_ERASE_SUSPEND_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -714,7 +721,7 @@ int32_t S25FL128S_ProgEraseSuspend(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_ /** * @brief Program/Erases resume. - * SPI/DPI/QPI; 1-0-0/2-0-0/4-0-0 + * SPI; 1-0-0 * @param Ctx QSPI handle * @param Mode Flash mode * @retval QSPI memory status @@ -723,8 +730,10 @@ int32_t S25FL128S_ProgEraseResume(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t { QSPI_CommandTypeDef s_command; + UNUSED(Mode); /* The command Program Erase Resume is always 1-0-0 */ + /* Initialize the S25FL128S_PROG_ERASE_RESUME_CMD command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; + s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; s_command.Instruction = S25FL128S_PROG_ERASE_RESUME_CMD; s_command.AddressMode = QSPI_ADDRESS_NONE; s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; @@ -744,38 +753,22 @@ int32_t S25FL128S_ProgEraseResume(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t /** * @brief Enter deep sleep - * SPI/DPI/QPI; 1-0-0/2-0-0/4-0-0 * @param Ctx QSPI handle * @param Mode Flash mode * @retval QSPI memory status */ int32_t S25FL128S_EnterDeepPowerDown(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode) { - QSPI_CommandTypeDef s_command; - - /* Initialize Write Protect Selection command */ - s_command.InstructionMode = (Mode == S25FL128S_QPI_MODE) ? QSPI_INSTRUCTION_4_LINES : (Mode == S25FL128S_DPI_MODE) ? QSPI_INSTRUCTION_2_LINES : QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_ENTER_DEEP_POWER_DOWN; - s_command.AddressMode = QSPI_ADDRESS_NONE; - s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; - s_command.DummyCycles = 0; - s_command.DataMode = QSPI_DATA_NONE; - s_command.DdrMode = QSPI_DDR_MODE_DISABLE; - s_command.SIOOMode = QSPI_SIOO_INST_EVERY_CMD; + UNUSED(Ctx); + UNUSED(Mode); - /* Configure the command */ - if (HAL_QSPI_Command(Ctx, &s_command, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) - { - return S25FL128S_ERROR; - } - - return S25FL128S_OK; + /* No Deep Power Down command for this memory */ + return S25FL128S_ERROR; } /** * @brief Reads an amount of SFDP data from the QSPI memory. * SFDP : Serial Flash Discoverable Parameter - * SPI; 1-1-1 * @param Ctx QSPI handle * @param Mode Flash mode * @param pData Pointer to data to be read @@ -785,35 +778,15 @@ int32_t S25FL128S_EnterDeepPowerDown(QSPI_HandleTypeDef *Ctx, S25FL128S_Interfac */ int32_t S25FL128S_ReadSFDP(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, uint8_t *pData, uint32_t ReadAddr, uint32_t Size) { - QSPI_CommandTypeDef s_command; - - /* Initialize the read SFDP command */ - s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE; - s_command.Instruction = S25FL128S_READ_SERIAL_FLASH_DISCO_PARAM_CMD; - s_command.AddressMode = QSPI_ADDRESS_1_LINE; - s_command.AddressSize = QSPI_ADDRESS_32_BITS; - s_command.Address = ReadAddr; - s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE; - s_command.DummyCycles = S25FL128S_DUMMY_CYCLES_READ; - s_command.DataMode = QSPI_DATA_1_LINE; - s_command.NbData = Size; - s_command.DdrMode = QSPI_DDR_MODE_DISABLE; - s_command.SIOOMode = QSPI_SIOO_INST_EVERY_CMD; - - /* Configure the command */ - if (HAL_QSPI_Command(Ctx, &s_command, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) - { - return S25FL128S_ERROR; - } - - /* Reception of the data */ - if (HAL_QSPI_Receive(Ctx, pData, HAL_QSPI_TIMEOUT_DEFAULT_VALUE) != HAL_OK) - { - return S25FL128S_ERROR; - } + UNUSED(Ctx); + UNUSED(Mode); + UNUSED(pData); + UNUSED(ReadAddr); + UNUSED(Size); - return S25FL128S_OK; -} + /* No Serial Flash Discoverable Parameter command for this memory */ + return S25FL128S_ERROR; + } /** * @} @@ -831,5 +804,3 @@ int32_t S25FL128S_ReadSFDP(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/BSP/Components/s25fl128s/s25fl128s.h b/Drivers/BSP/Components/s25fl128s/s25fl128s.h index b0748f30c..159c54384 100644 --- a/Drivers/BSP/Components/s25fl128s/s25fl128s.h +++ b/Drivers/BSP/Components/s25fl128s/s25fl128s.h @@ -6,20 +6,19 @@ ****************************************************************************** * @attention * - *

© Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

+ * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __S25FL128S_H -#define __S25FL128S_H +#ifndef S25FL128S_H +#define S25FL128S_H #ifdef __cplusplus extern "C" { @@ -42,14 +41,6 @@ extern "C" { * @{ */ -/** @defgroup S25FL128S_Exported_Types - * @{ - */ - -/** - * @} - */ - /** @defgroup S25FL128S_Exported_Constants * @{ */ @@ -254,6 +245,9 @@ typedef enum S25FL128S_ERASE_CHIP /*!< Whole chip erase */ } S25FL128S_Erase_t; +/** + * @} + */ /** @defgroup S25FL128S_Exported_Functions * @{ @@ -278,16 +272,11 @@ int32_t S25FL128S_EnterDeepPowerDown(QSPI_HandleTypeDef *Ctx, S25FL128S_Interfac int32_t S25FL128S_ProgEraseResume(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode); int32_t S25FL128S_ProgEraseSuspend(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode); int32_t S25FL128S_ReadSFDP(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, uint8_t *pData, uint32_t ReadAddr, uint32_t Size); + /** * @} */ -#ifdef __cplusplus -} -#endif - -#endif /* __S25FL128S_H */ - /** * @} */ @@ -300,4 +289,8 @@ int32_t S25FL128S_ReadSFDP(QSPI_HandleTypeDef *Ctx, S25FL128S_Interface_t Mode, * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ +#ifdef __cplusplus +} +#endif + +#endif /* S25FL128S_H */ diff --git a/Drivers/BSP/Components/s25fl128s/s25fl128s_conf_template.h b/Drivers/BSP/Components/s25fl128s/s25fl128s_conf_template.h index 784c1630f..2d03fcf7e 100644 --- a/Drivers/BSP/Components/s25fl128s/s25fl128s_conf_template.h +++ b/Drivers/BSP/Components/s25fl128s/s25fl128s_conf_template.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

© Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

+ * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -22,7 +21,7 @@ #define S25FL128S_CONF_H #ifdef __cplusplus - extern "C" { +extern "C" { #endif /* Includes ------------------------------------------------------------------*/ @@ -32,18 +31,32 @@ * @{ */ -#define CONF_S25FL128S_READ_ENHANCE 0 /* MMP performance enhance read enable/disable */ -#define CONF_QSPI_DUMMY_CLOCK 8U +/** @addtogroup Components + * @{ + */ -/* Dummy cycles for STR read mode */ -#define S25FL128S_DUMMY_CYCLES_READ_QUAD 8U -#define S25FL128S_DUMMY_CYCLES_READ 8U +/** @addtogroup S25FL128S + * @brief This file provides a set of definitions for the Spansion + * S25FL128S memory configuration. + * @{ + */ -#ifdef __cplusplus -} -#endif +/** @addtogroup S25FL128S_Exported_Constants + * @{ + */ -#endif /* S25FL128S_CONF_H */ +#define CONF_S25FL128S_READ_ENHANCE 0 /* MMP performance enhance read enable/disable */ +#define CONF_QSPI_DUMMY_CLOCK 8U + +/* Dummy cycles for STR read mode */ +#define S25FL128S_DUMMY_CYCLES_READ_QUAD 8U +#define S25FL128S_DUMMY_CYCLES_READ 8U +#define S25FL128S_DUMMY_CYCLES_READ_DUAL_INOUT 4U +#define S25FL128S_DUMMY_CYCLES_READ_QUAD_INOUT 6U + +/** + * @} + */ /** * @} @@ -57,4 +70,9 @@ * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ +#ifdef __cplusplus +} +#endif + +#endif /* S25FL128S_CONF_H */ + diff --git a/Drivers/BSP/Components/stm32wb_at/LICENSE.md b/Drivers/BSP/Components/stm32wb_at/LICENSE.md new file mode 100644 index 000000000..9226612ae --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/LICENSE.md @@ -0,0 +1,27 @@ +Copyright 2021 STMicroelectronics. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Drivers/BSP/Components/stm32wb_at/Release_Notes.html b/Drivers/BSP/Components/stm32wb_at/Release_Notes.html new file mode 100644 index 000000000..816c328a8 --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/Release_Notes.html @@ -0,0 +1,51 @@ + + + + + + + Release Notes for STM32WB AT client + + + + + + +
+
+
+

Release Notes for

+

STM32WB AT client component driver

+

Copyright © 2021 STMicroelectronics
+

+ +
+

Purpose

+

This directory contains the AT client driver to control an STM32WB device running the AT server application.

+
+
+

Update History

+
+ +

Main changes

+
    +
  • First official release of STM32WB AT client component.
    • +
+
+
+
+ + + diff --git a/Drivers/BSP/Components/stm32wb_at/_htmresc/favicon.png b/Drivers/BSP/Components/stm32wb_at/_htmresc/favicon.png new file mode 100644 index 000000000..440506106 Binary files /dev/null and b/Drivers/BSP/Components/stm32wb_at/_htmresc/favicon.png differ diff --git a/Drivers/BSP/Components/stm32wb_at/_htmresc/mini-st_2020.css b/Drivers/BSP/Components/stm32wb_at/_htmresc/mini-st_2020.css new file mode 100644 index 000000000..96ed21a5c --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/_htmresc/mini-st_2020.css @@ -0,0 +1,1694 @@ +@charset "UTF-8"; +/* + Flavor name: Custom (mini-custom) + Generated online - https://minicss.org/flavors + mini.css version: v3.0.1 +*/ +/* + Browsers resets and base typography. +*/ +/* Core module CSS variable definitions */ +:root { + --fore-color: #03234b; + --secondary-fore-color: #e6007e; + --back-color: #ffffff; + --secondary-back-color: #ffffff; + --blockquote-color: #e6007e; + --pre-color: #e6007e; + --border-color: #3cb4e6; + --secondary-border-color: #3cb4e6; + --heading-ratio: 1.2; + --universal-margin: 0.5rem; + --universal-padding: 0.25rem; + --universal-border-radius: 0.075rem; + --background-margin: 4.44%; + --a-link-color: #3cb4e6; + --a-visited-color: #8c0078; } + +html { + font-size: 13.5px; } + +a, b, del, em, i, ins, q, span, strong, u { + font-size: 1em; } + +html, * { + font-family: -apple-system, BlinkMacSystemFont, Helvetica, arial, sans-serif; + line-height: 1.25; + -webkit-text-size-adjust: 100%; } + +* { + font-size: 1rem; } + +body { + margin: 0; + color: var(--fore-color); + @background: var(--back-color); + background: var(--back-color) linear-gradient(#ffd200, #ffd200) repeat-y left top; + background-size: var(--background-margin); + } + +details { + display: block; } + +summary { + display: list-item; } + +abbr[title] { + border-bottom: none; + text-decoration: underline dotted; } + +input { + overflow: visible; } + +img { + max-width: 100%; + height: auto; } + +h1, h2, h3, h4, h5, h6 { + line-height: 1.25; + margin: calc(1.5 * var(--universal-margin)) var(--universal-margin); + font-weight: 400; } + h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { + color: var(--secondary-fore-color); + display: block; + margin-top: -0.25rem; } + +h1 { + font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); } + +h2 { + font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) ); } + +h3 { + font-size: calc(1rem * var(--heading-ratio) ); } + +h4 { + font-size: calc(1rem * var(--heading-ratio)); } + +h5 { + font-size: 1rem; } + +h6 { + font-size: calc(1rem / var(--heading-ratio)); } + +p { + margin: var(--universal-margin); } + +ol, ul { + margin: var(--universal-margin); + padding-left: calc(3 * var(--universal-margin)); } + +b, strong { + font-weight: 700; } + +hr { + box-sizing: content-box; + border: 0; + line-height: 1.25em; + margin: var(--universal-margin); + height: 0.0714285714rem; + background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); } + +blockquote { + display: block; + position: relative; + font-style: italic; + color: var(--secondary-fore-color); + margin: var(--universal-margin); + padding: calc(3 * var(--universal-padding)); + border: 0.0714285714rem solid var(--secondary-border-color); + border-left: 0.3rem solid var(--blockquote-color); + border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; } + blockquote:before { + position: absolute; + top: calc(0rem - var(--universal-padding)); + left: 0; + font-family: sans-serif; + font-size: 2rem; + font-weight: 800; + content: "\201c"; + color: var(--blockquote-color); } + blockquote[cite]:after { + font-style: normal; + font-size: 0.75em; + font-weight: 700; + content: "\a— " attr(cite); + white-space: pre; } + +code, kbd, pre, samp { + font-family: Menlo, Consolas, monospace; + font-size: 0.85em; } + +code { + background: var(--secondary-back-color); + border-radius: var(--universal-border-radius); + padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); } + +kbd { + background: var(--fore-color); + color: var(--back-color); + border-radius: var(--universal-border-radius); + padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); } + +pre { + overflow: auto; + background: var(--secondary-back-color); + padding: calc(1.5 * var(--universal-padding)); + margin: var(--universal-margin); + border: 0.0714285714rem solid var(--secondary-border-color); + border-left: 0.2857142857rem solid var(--pre-color); + border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; } + +sup, sub, code, kbd { + line-height: 0; + position: relative; + vertical-align: baseline; } + +small, sup, sub, figcaption { + font-size: 0.75em; } + +sup { + top: -0.5em; } + +sub { + bottom: -0.25em; } + +figure { + margin: var(--universal-margin); } + +figcaption { + color: var(--secondary-fore-color); } + +a { + text-decoration: none; } + a:link { + color: var(--a-link-color); } + a:visited { + color: var(--a-visited-color); } + a:hover, a:focus { + text-decoration: underline; } + +/* + Definitions for the grid system, cards and containers. +*/ +.container { + margin: 0 auto; + padding: 0 calc(1.5 * var(--universal-padding)); } + +.row { + box-sizing: border-box; + display: flex; + flex: 0 1 auto; + flex-flow: row wrap; + margin: 0 0 0 var(--background-margin); } + +.col-sm, +[class^='col-sm-'], +[class^='col-sm-offset-'], +.row[class*='cols-sm-'] > * { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); } + +.col-sm, +.row.cols-sm > * { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; } + +.col-sm-1, +.row.cols-sm-1 > * { + max-width: 8.3333333333%; + flex-basis: 8.3333333333%; } + +.col-sm-offset-0 { + margin-left: 0; } + +.col-sm-2, +.row.cols-sm-2 > * { + max-width: 16.6666666667%; + flex-basis: 16.6666666667%; } + +.col-sm-offset-1 { + margin-left: 8.3333333333%; } + +.col-sm-3, +.row.cols-sm-3 > * { + max-width: 25%; + flex-basis: 25%; } + +.col-sm-offset-2 { + margin-left: 16.6666666667%; } + +.col-sm-4, +.row.cols-sm-4 > * { + max-width: 33.3333333333%; + flex-basis: 33.3333333333%; } + +.col-sm-offset-3 { + margin-left: 25%; } + +.col-sm-5, +.row.cols-sm-5 > * { + max-width: 41.6666666667%; + flex-basis: 41.6666666667%; } + +.col-sm-offset-4 { + margin-left: 33.3333333333%; } + +.col-sm-6, +.row.cols-sm-6 > * { + max-width: 50%; + flex-basis: 50%; } + +.col-sm-offset-5 { + margin-left: 41.6666666667%; } + +.col-sm-7, +.row.cols-sm-7 > * { + max-width: 58.3333333333%; + flex-basis: 58.3333333333%; } + +.col-sm-offset-6 { + margin-left: 50%; } + +.col-sm-8, +.row.cols-sm-8 > * { + max-width: 66.6666666667%; + flex-basis: 66.6666666667%; } + +.col-sm-offset-7 { + margin-left: 58.3333333333%; } + +.col-sm-9, +.row.cols-sm-9 > * { + max-width: 75%; + flex-basis: 75%; } + +.col-sm-offset-8 { + margin-left: 66.6666666667%; } + +.col-sm-10, +.row.cols-sm-10 > * { + max-width: 83.3333333333%; + flex-basis: 83.3333333333%; } + +.col-sm-offset-9 { + margin-left: 75%; } + +.col-sm-11, +.row.cols-sm-11 > * { + max-width: 91.6666666667%; + flex-basis: 91.6666666667%; } + +.col-sm-offset-10 { + margin-left: 83.3333333333%; } + +.col-sm-12, +.row.cols-sm-12 > * { + max-width: 100%; + flex-basis: 100%; } + +.col-sm-offset-11 { + margin-left: 91.6666666667%; } + +.col-sm-normal { + order: initial; } + +.col-sm-first { + order: -999; } + +.col-sm-last { + order: 999; } + +@media screen and (min-width: 500px) { + .col-md, + [class^='col-md-'], + [class^='col-md-offset-'], + .row[class*='cols-md-'] > * { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); } + + .col-md, + .row.cols-md > * { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; } + + .col-md-1, + .row.cols-md-1 > * { + max-width: 8.3333333333%; + flex-basis: 8.3333333333%; } + + .col-md-offset-0 { + margin-left: 0; } + + .col-md-2, + .row.cols-md-2 > * { + max-width: 16.6666666667%; + flex-basis: 16.6666666667%; } + + .col-md-offset-1 { + margin-left: 8.3333333333%; } + + .col-md-3, + .row.cols-md-3 > * { + max-width: 25%; + flex-basis: 25%; } + + .col-md-offset-2 { + margin-left: 16.6666666667%; } + + .col-md-4, + .row.cols-md-4 > * { + max-width: 33.3333333333%; + flex-basis: 33.3333333333%; } + + .col-md-offset-3 { + margin-left: 25%; } + + .col-md-5, + .row.cols-md-5 > * { + max-width: 41.6666666667%; + flex-basis: 41.6666666667%; } + + .col-md-offset-4 { + margin-left: 33.3333333333%; } + + .col-md-6, + .row.cols-md-6 > * { + max-width: 50%; + flex-basis: 50%; } + + .col-md-offset-5 { + margin-left: 41.6666666667%; } + + .col-md-7, + .row.cols-md-7 > * { + max-width: 58.3333333333%; + flex-basis: 58.3333333333%; } + + .col-md-offset-6 { + margin-left: 50%; } + + .col-md-8, + .row.cols-md-8 > * { + max-width: 66.6666666667%; + flex-basis: 66.6666666667%; } + + .col-md-offset-7 { + margin-left: 58.3333333333%; } + + .col-md-9, + .row.cols-md-9 > * { + max-width: 75%; + flex-basis: 75%; } + + .col-md-offset-8 { + margin-left: 66.6666666667%; } + + .col-md-10, + .row.cols-md-10 > * { + max-width: 83.3333333333%; + flex-basis: 83.3333333333%; } + + .col-md-offset-9 { + margin-left: 75%; } + + .col-md-11, + .row.cols-md-11 > * { + max-width: 91.6666666667%; + flex-basis: 91.6666666667%; } + + .col-md-offset-10 { + margin-left: 83.3333333333%; } + + .col-md-12, + .row.cols-md-12 > * { + max-width: 100%; + flex-basis: 100%; } + + .col-md-offset-11 { + margin-left: 91.6666666667%; } + + .col-md-normal { + order: initial; } + + .col-md-first { + order: -999; } + + .col-md-last { + order: 999; } } +@media screen and (min-width: 1280px) { + .col-lg, + [class^='col-lg-'], + [class^='col-lg-offset-'], + .row[class*='cols-lg-'] > * { + box-sizing: border-box; + flex: 0 0 auto; + padding: 0 calc(var(--universal-padding) / 2); } + + .col-lg, + .row.cols-lg > * { + max-width: 100%; + flex-grow: 1; + flex-basis: 0; } + + .col-lg-1, + .row.cols-lg-1 > * { + max-width: 8.3333333333%; + flex-basis: 8.3333333333%; } + + .col-lg-offset-0 { + margin-left: 0; } + + .col-lg-2, + .row.cols-lg-2 > * { + max-width: 16.6666666667%; + flex-basis: 16.6666666667%; } + + .col-lg-offset-1 { + margin-left: 8.3333333333%; } + + .col-lg-3, + .row.cols-lg-3 > * { + max-width: 25%; + flex-basis: 25%; } + + .col-lg-offset-2 { + margin-left: 16.6666666667%; } + + .col-lg-4, + .row.cols-lg-4 > * { + max-width: 33.3333333333%; + flex-basis: 33.3333333333%; } + + .col-lg-offset-3 { + margin-left: 25%; } + + .col-lg-5, + .row.cols-lg-5 > * { + max-width: 41.6666666667%; + flex-basis: 41.6666666667%; } + + .col-lg-offset-4 { + margin-left: 33.3333333333%; } + + .col-lg-6, + .row.cols-lg-6 > * { + max-width: 50%; + flex-basis: 50%; } + + .col-lg-offset-5 { + margin-left: 41.6666666667%; } + + .col-lg-7, + .row.cols-lg-7 > * { + max-width: 58.3333333333%; + flex-basis: 58.3333333333%; } + + .col-lg-offset-6 { + margin-left: 50%; } + + .col-lg-8, + .row.cols-lg-8 > * { + max-width: 66.6666666667%; + flex-basis: 66.6666666667%; } + + .col-lg-offset-7 { + margin-left: 58.3333333333%; } + + .col-lg-9, + .row.cols-lg-9 > * { + max-width: 75%; + flex-basis: 75%; } + + .col-lg-offset-8 { + margin-left: 66.6666666667%; } + + .col-lg-10, + .row.cols-lg-10 > * { + max-width: 83.3333333333%; + flex-basis: 83.3333333333%; } + + .col-lg-offset-9 { + margin-left: 75%; } + + .col-lg-11, + .row.cols-lg-11 > * { + max-width: 91.6666666667%; + flex-basis: 91.6666666667%; } + + .col-lg-offset-10 { + margin-left: 83.3333333333%; } + + .col-lg-12, + .row.cols-lg-12 > * { + max-width: 100%; + flex-basis: 100%; } + + .col-lg-offset-11 { + margin-left: 91.6666666667%; } + + .col-lg-normal { + order: initial; } + + .col-lg-first { + order: -999; } + + .col-lg-last { + order: 999; } } +/* Card component CSS variable definitions */ +:root { + --card-back-color: #3cb4e6; + --card-fore-color: #03234b; + --card-border-color: #03234b; } + +.card { + display: flex; + flex-direction: column; + justify-content: space-between; + align-self: center; + position: relative; + width: 100%; + background: var(--card-back-color); + color: var(--card-fore-color); + border: 0.0714285714rem solid var(--card-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); + overflow: hidden; } + @media screen and (min-width: 320px) { + .card { + max-width: 320px; } } + .card > .sectione { + background: var(--card-back-color); + color: var(--card-fore-color); + box-sizing: border-box; + margin: 0; + border: 0; + border-radius: 0; + border-bottom: 0.0714285714rem solid var(--card-border-color); + padding: var(--universal-padding); + width: 100%; } + .card > .sectione.media { + height: 200px; + padding: 0; + -o-object-fit: cover; + object-fit: cover; } + .card > .sectione:last-child { + border-bottom: 0; } + +/* + Custom elements for card elements. +*/ +@media screen and (min-width: 240px) { + .card.small { + max-width: 240px; } } +@media screen and (min-width: 480px) { + .card.large { + max-width: 480px; } } +.card.fluid { + max-width: 100%; + width: auto; } + +.card.warning { + --card-back-color: #ffffff; + --card-fore-color: #3b234b; + --card-border-color: #3cb4e6; } + +.card.error { + --card-back-color: #464650; + --card-fore-color: #ffffff; + --card-border-color: #8c0078; } + +.card > .sectione.dark { + --card-back-color: #3b234b; + --card-fore-color: #ffffff; } + +.card > .sectione.double-padded { + padding: calc(1.5 * var(--universal-padding)); } + +/* + Definitions for forms and input elements. +*/ +/* Input_control module CSS variable definitions */ +:root { + --form-back-color: #ffe97f; + --form-fore-color: #03234b; + --form-border-color: #3cb4e6; + --input-back-color: #ffffff; + --input-fore-color: #03234b; + --input-border-color: #3cb4e6; + --input-focus-color: #0288d1; + --input-invalid-color: #d32f2f; + --button-back-color: #e2e2e2; + --button-hover-back-color: #dcdcdc; + --button-fore-color: #212121; + --button-border-color: transparent; + --button-hover-border-color: transparent; + --button-group-border-color: rgba(124, 124, 124, 0.54); } + +form { + background: var(--form-back-color); + color: var(--form-fore-color); + border: 0.0714285714rem solid var(--form-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); + padding: calc(2 * var(--universal-padding)) var(--universal-padding); } + +fieldset { + border: 0.0714285714rem solid var(--form-border-color); + border-radius: var(--universal-border-radius); + margin: calc(var(--universal-margin) / 4); + padding: var(--universal-padding); } + +legend { + box-sizing: border-box; + display: table; + max-width: 100%; + white-space: normal; + font-weight: 500; + padding: calc(var(--universal-padding) / 2); } + +label { + padding: calc(var(--universal-padding) / 2) var(--universal-padding); } + +.input-group { + display: inline-block; } + .input-group.fluid { + display: flex; + align-items: center; + justify-content: center; } + .input-group.fluid > input { + max-width: 100%; + flex-grow: 1; + flex-basis: 0px; } + @media screen and (max-width: 499px) { + .input-group.fluid { + align-items: stretch; + flex-direction: column; } } + .input-group.vertical { + display: flex; + align-items: stretch; + flex-direction: column; } + .input-group.vertical > input { + max-width: 100%; + flex-grow: 1; + flex-basis: 0px; } + +[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button { + height: auto; } + +[type="search"] { + -webkit-appearance: textfield; + outline-offset: -2px; } + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } + +input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"], +[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select { + box-sizing: border-box; + background: var(--input-back-color); + color: var(--input-fore-color); + border: 0.0714285714rem solid var(--input-border-color); + border-radius: var(--universal-border-radius); + margin: calc(var(--universal-margin) / 2); + padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); } + +input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus { + border-color: var(--input-focus-color); + box-shadow: none; } +input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid { + border-color: var(--input-invalid-color); + box-shadow: none; } +input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] { + background: var(--secondary-back-color); } + +select { + max-width: 100%; } + +option { + overflow: hidden; + text-overflow: ellipsis; } + +[type="checkbox"], [type="radio"] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + position: relative; + height: calc(1rem + var(--universal-padding) / 2); + width: calc(1rem + var(--universal-padding) / 2); + vertical-align: text-bottom; + padding: 0; + flex-basis: calc(1rem + var(--universal-padding) / 2) !important; + flex-grow: 0 !important; } + [type="checkbox"]:checked:before, [type="radio"]:checked:before { + position: absolute; } + +[type="checkbox"]:checked:before { + content: '\2713'; + font-family: sans-serif; + font-size: calc(1rem + var(--universal-padding) / 2); + top: calc(0rem - var(--universal-padding)); + left: calc(var(--universal-padding) / 4); } + +[type="radio"] { + border-radius: 100%; } + [type="radio"]:checked:before { + border-radius: 100%; + content: ''; + top: calc(0.0714285714rem + var(--universal-padding) / 2); + left: calc(0.0714285714rem + var(--universal-padding) / 2); + background: var(--input-fore-color); + width: 0.5rem; + height: 0.5rem; } + +:placeholder-shown { + color: var(--input-fore-color); } + +::-ms-placeholder { + color: var(--input-fore-color); + opacity: 0.54; } + +button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; } + +button, html [type="button"], [type="reset"], [type="submit"] { + -webkit-appearance: button; } + +button { + overflow: visible; + text-transform: none; } + +button, [type="button"], [type="submit"], [type="reset"], +a.button, label.button, .button, +a[role="button"], label[role="button"], [role="button"] { + display: inline-block; + background: var(--button-back-color); + color: var(--button-fore-color); + border: 0.0714285714rem solid var(--button-border-color); + border-radius: var(--universal-border-radius); + padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); + margin: var(--universal-margin); + text-decoration: none; + cursor: pointer; + transition: background 0.3s; } + button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus, + a.button:hover, + a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus, + a[role="button"]:hover, + a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus { + background: var(--button-hover-back-color); + border-color: var(--button-hover-border-color); } + +input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] { + cursor: not-allowed; + opacity: 0.75; } + +.button-group { + display: flex; + border: 0.0714285714rem solid var(--button-group-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); } + .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] { + margin: 0; + max-width: 100%; + flex: 1 1 auto; + text-align: center; + border: 0; + border-radius: 0; + box-shadow: none; } + .button-group > :not(:first-child) { + border-left: 0.0714285714rem solid var(--button-group-border-color); } + @media screen and (max-width: 499px) { + .button-group { + flex-direction: column; } + .button-group > :not(:first-child) { + border: 0; + border-top: 0.0714285714rem solid var(--button-group-border-color); } } + +/* + Custom elements for forms and input elements. +*/ +button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary { + --button-back-color: #1976d2; + --button-fore-color: #f8f8f8; } + button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus { + --button-hover-back-color: #1565c0; } + +button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary { + --button-back-color: #d32f2f; + --button-fore-color: #f8f8f8; } + button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus { + --button-hover-back-color: #c62828; } + +button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary { + --button-back-color: #308732; + --button-fore-color: #f8f8f8; } + button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus { + --button-hover-back-color: #277529; } + +button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse { + --button-back-color: #212121; + --button-fore-color: #f8f8f8; } + button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus { + --button-hover-back-color: #111; } + +button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small { + padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding)); + margin: var(--universal-margin); } + +button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large { + padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding)); + margin: var(--universal-margin); } + +/* + Definitions for navigation elements. +*/ +/* Navigation module CSS variable definitions */ +:root { + --header-back-color: #03234b; + --header-hover-back-color: #ffd200; + --header-fore-color: #ffffff; + --header-border-color: #3cb4e6; + --nav-back-color: #ffffff; + --nav-hover-back-color: #ffe97f; + --nav-fore-color: #e6007e; + --nav-border-color: #3cb4e6; + --nav-link-color: #3cb4e6; + --footer-fore-color: #ffffff; + --footer-back-color: #03234b; + --footer-border-color: #3cb4e6; + --footer-link-color: #3cb4e6; + --drawer-back-color: #ffffff; + --drawer-hover-back-color: #ffe97f; + --drawer-border-color: #3cb4e6; + --drawer-close-color: #e6007e; } + +header { + height: 2.75rem; + background: var(--header-back-color); + color: var(--header-fore-color); + border-bottom: 0.0714285714rem solid var(--header-border-color); + padding: calc(var(--universal-padding) / 4) 0; + white-space: nowrap; + overflow-x: auto; + overflow-y: hidden; } + header.row { + box-sizing: content-box; } + header .logo { + color: var(--header-fore-color); + font-size: 1.75rem; + padding: var(--universal-padding) calc(2 * var(--universal-padding)); + text-decoration: none; } + header button, header [type="button"], header .button, header [role="button"] { + box-sizing: border-box; + position: relative; + top: calc(0rem - var(--universal-padding) / 4); + height: calc(3.1875rem + var(--universal-padding) / 2); + background: var(--header-back-color); + line-height: calc(3.1875rem - var(--universal-padding) * 1.5); + text-align: center; + color: var(--header-fore-color); + border: 0; + border-radius: 0; + margin: 0; + text-transform: uppercase; } + header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus { + background: var(--header-hover-back-color); } + +nav { + background: var(--nav-back-color); + color: var(--nav-fore-color); + border: 0.0714285714rem solid var(--nav-border-color); + border-radius: var(--universal-border-radius); + margin: var(--universal-margin); } + nav * { + padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); } + nav a, nav a:visited { + display: block; + color: var(--nav-link-color); + border-radius: var(--universal-border-radius); + transition: background 0.3s; } + nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus { + text-decoration: none; + background: var(--nav-hover-back-color); } + nav .sublink-1 { + position: relative; + margin-left: calc(2 * var(--universal-padding)); } + nav .sublink-1:before { + position: absolute; + left: calc(var(--universal-padding) - 1 * var(--universal-padding)); + top: -0.0714285714rem; + content: ''; + height: 100%; + border: 0.0714285714rem solid var(--nav-border-color); + border-left: 0; } + nav .sublink-2 { + position: relative; + margin-left: calc(4 * var(--universal-padding)); } + nav .sublink-2:before { + position: absolute; + left: calc(var(--universal-padding) - 3 * var(--universal-padding)); + top: -0.0714285714rem; + content: ''; + height: 100%; + border: 0.0714285714rem solid var(--nav-border-color); + border-left: 0; } + +footer { + background: var(--footer-back-color); + color: var(--footer-fore-color); + border-top: 0.0714285714rem solid var(--footer-border-color); + padding: calc(2 * var(--universal-padding)) var(--universal-padding); + font-size: 0.875rem; } + footer a, footer a:visited { + color: var(--footer-link-color); } + +header.sticky { + position: -webkit-sticky; + position: sticky; + z-index: 1101; + top: 0; } + +footer.sticky { + position: -webkit-sticky; + position: sticky; + z-index: 1101; + bottom: 0; } + +.drawer-toggle:before { + display: inline-block; + position: relative; + vertical-align: bottom; + content: '\00a0\2261\00a0'; + font-family: sans-serif; + font-size: 1.5em; } +@media screen and (min-width: 500px) { + .drawer-toggle:not(.persistent) { + display: none; } } + +[type="checkbox"].drawer { + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + [type="checkbox"].drawer + * { + display: block; + box-sizing: border-box; + position: fixed; + top: 0; + width: 320px; + height: 100vh; + overflow-y: auto; + background: var(--drawer-back-color); + border: 0.0714285714rem solid var(--drawer-border-color); + border-radius: 0; + margin: 0; + z-index: 1110; + right: -320px; + transition: right 0.3s; } + [type="checkbox"].drawer + * .drawer-close { + position: absolute; + top: var(--universal-margin); + right: var(--universal-margin); + z-index: 1111; + width: 2rem; + height: 2rem; + border-radius: var(--universal-border-radius); + padding: var(--universal-padding); + margin: 0; + cursor: pointer; + transition: background 0.3s; } + [type="checkbox"].drawer + * .drawer-close:before { + display: block; + content: '\00D7'; + color: var(--drawer-close-color); + position: relative; + font-family: sans-serif; + font-size: 2rem; + line-height: 1; + text-align: center; } + [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus { + background: var(--drawer-hover-back-color); } + @media screen and (max-width: 320px) { + [type="checkbox"].drawer + * { + width: 100%; } } + [type="checkbox"].drawer:checked + * { + right: 0; } + @media screen and (min-width: 500px) { + [type="checkbox"].drawer:not(.persistent) + * { + position: static; + height: 100%; + z-index: 1100; } + [type="checkbox"].drawer:not(.persistent) + * .drawer-close { + display: none; } } + +/* + Definitions for the responsive table component. +*/ +/* Table module CSS variable definitions. */ +:root { + --table-border-color: #03234b; + --table-border-separator-color: #03234b; + --table-head-back-color: #ffd200; + --table-head-fore-color: #03234b; + --table-body-back-color: #ffffff; + --table-body-fore-color: #03234b; + --table-body-alt-back-color: #f4f4f4; } + +table { + border-collapse: separate; + border-spacing: 0; + margin: 0; + display: flex; + flex: 0 1 auto; + flex-flow: row wrap; + padding: var(--universal-padding); + padding-top: 0; } + table caption { + font-size: 1rem; + margin: calc(2 * var(--universal-margin)) 0; + max-width: 100%; + flex: 0 0 100%; } + table thead, table tbody { + display: flex; + flex-flow: row wrap; + border: 0.0714285714rem solid var(--table-border-color); } + table thead { + z-index: 999; + border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; + border-bottom: 0.0714285714rem solid var(--table-border-separator-color); } + table tbody { + border-top: 0; + margin-top: calc(0 - var(--universal-margin)); + border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } + table tr { + display: flex; + padding: 0; } + table th, table td { + padding: calc(0.5 * var(--universal-padding)); + font-size: 0.9rem; } + table th { + text-align: left; + background: var(--table-head-back-color); + color: var(--table-head-fore-color); } + table td { + background: var(--table-body-back-color); + color: var(--table-body-fore-color); + border-top: 0.0714285714rem solid var(--table-border-color); } + +table:not(.horizontal) { + overflow: auto; + max-height: 100%; } + table:not(.horizontal) thead, table:not(.horizontal) tbody { + max-width: 100%; + flex: 0 0 100%; } + table:not(.horizontal) tr { + flex-flow: row wrap; + flex: 0 0 100%; } + table:not(.horizontal) th, table:not(.horizontal) td { + flex: 1 0 0%; + overflow: hidden; + text-overflow: ellipsis; } + table:not(.horizontal) thead { + position: sticky; + top: 0; } + table:not(.horizontal) tbody tr:first-child td { + border-top: 0; } + +table.horizontal { + border: 0; } + table.horizontal thead, table.horizontal tbody { + border: 0; + flex: .2 0 0; + flex-flow: row nowrap; } + table.horizontal tbody { + overflow: auto; + justify-content: space-between; + flex: .8 0 0; + margin-left: 0; + padding-bottom: calc(var(--universal-padding) / 4); } + table.horizontal tr { + flex-direction: column; + flex: 1 0 auto; } + table.horizontal th, table.horizontal td { + width: auto; + border: 0; + border-bottom: 0.0714285714rem solid var(--table-border-color); } + table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) { + border-top: 0; } + table.horizontal th { + text-align: right; + border-left: 0.0714285714rem solid var(--table-border-color); + border-right: 0.0714285714rem solid var(--table-border-separator-color); } + table.horizontal thead tr:first-child { + padding-left: 0; } + table.horizontal th:first-child, table.horizontal td:first-child { + border-top: 0.0714285714rem solid var(--table-border-color); } + table.horizontal tbody tr:last-child td { + border-right: 0.0714285714rem solid var(--table-border-color); } + table.horizontal tbody tr:last-child td:first-child { + border-top-right-radius: 0.25rem; } + table.horizontal tbody tr:last-child td:last-child { + border-bottom-right-radius: 0.25rem; } + table.horizontal thead tr:first-child th:first-child { + border-top-left-radius: 0.25rem; } + table.horizontal thead tr:first-child th:last-child { + border-bottom-left-radius: 0.25rem; } + +@media screen and (max-width: 499px) { + table, table.horizontal { + border-collapse: collapse; + border: 0; + width: 100%; + display: table; } + table thead, table th, table.horizontal thead, table.horizontal th { + border: 0; + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + table tbody, table.horizontal tbody { + border: 0; + display: table-row-group; } + table tr, table.horizontal tr { + display: block; + border: 0.0714285714rem solid var(--table-border-color); + border-radius: var(--universal-border-radius); + background: #ffffff; + padding: var(--universal-padding); + margin: var(--universal-margin); + margin-bottom: calc(1 * var(--universal-margin)); } + table th, table td, table.horizontal th, table.horizontal td { + width: auto; } + table td, table.horizontal td { + display: block; + border: 0; + text-align: right; } + table td:before, table.horizontal td:before { + content: attr(data-label); + float: left; + font-weight: 600; } + table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child { + border-top: 0; } + table tbody tr:last-child td, table.horizontal tbody tr:last-child td { + border-right: 0; } } +table tr:nth-of-type(2n) > td { + background: var(--table-body-alt-back-color); } + +@media screen and (max-width: 500px) { + table tr:nth-of-type(2n) { + background: var(--table-body-alt-back-color); } } +:root { + --table-body-hover-back-color: #90caf9; } + +table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td { + background: var(--table-body-hover-back-color); } + +@media screen and (max-width: 500px) { + table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td { + background: var(--table-body-hover-back-color); } } +/* + Definitions for contextual background elements, toasts and tooltips. +*/ +/* Contextual module CSS variable definitions */ +:root { + --mark-back-color: #3cb4e6; + --mark-fore-color: #ffffff; } + +mark { + background: var(--mark-back-color); + color: var(--mark-fore-color); + font-size: 0.95em; + line-height: 1em; + border-radius: var(--universal-border-radius); + padding: calc(var(--universal-padding) / 4) var(--universal-padding); } + mark.inline-block { + display: inline-block; + font-size: 1em; + line-height: 1.4; + padding: calc(var(--universal-padding) / 2) var(--universal-padding); } + +:root { + --toast-back-color: #424242; + --toast-fore-color: #fafafa; } + +.toast { + position: fixed; + bottom: calc(var(--universal-margin) * 3); + left: 50%; + transform: translate(-50%, -50%); + z-index: 1111; + color: var(--toast-fore-color); + background: var(--toast-back-color); + border-radius: calc(var(--universal-border-radius) * 16); + padding: var(--universal-padding) calc(var(--universal-padding) * 3); } + +:root { + --tooltip-back-color: #212121; + --tooltip-fore-color: #fafafa; } + +.tooltip { + position: relative; + display: inline-block; } + .tooltip:before, .tooltip:after { + position: absolute; + opacity: 0; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); + transition: all 0.3s; + z-index: 1010; + left: 50%; } + .tooltip:not(.bottom):before, .tooltip:not(.bottom):after { + bottom: 75%; } + .tooltip.bottom:before, .tooltip.bottom:after { + top: 75%; } + .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after { + opacity: 1; + clip: auto; + -webkit-clip-path: inset(0%); + clip-path: inset(0%); } + .tooltip:before { + content: ''; + background: transparent; + border: var(--universal-margin) solid transparent; + left: calc(50% - var(--universal-margin)); } + .tooltip:not(.bottom):before { + border-top-color: #212121; } + .tooltip.bottom:before { + border-bottom-color: #212121; } + .tooltip:after { + content: attr(aria-label); + color: var(--tooltip-fore-color); + background: var(--tooltip-back-color); + border-radius: var(--universal-border-radius); + padding: var(--universal-padding); + white-space: nowrap; + transform: translateX(-50%); } + .tooltip:not(.bottom):after { + margin-bottom: calc(2 * var(--universal-margin)); } + .tooltip.bottom:after { + margin-top: calc(2 * var(--universal-margin)); } + +:root { + --modal-overlay-color: rgba(0, 0, 0, 0.45); + --modal-close-color: #e6007e; + --modal-close-hover-color: #ffe97f; } + +[type="checkbox"].modal { + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + [type="checkbox"].modal + div { + position: fixed; + top: 0; + left: 0; + display: none; + width: 100vw; + height: 100vh; + background: var(--modal-overlay-color); } + [type="checkbox"].modal + div .card { + margin: 0 auto; + max-height: 50vh; + overflow: auto; } + [type="checkbox"].modal + div .card .modal-close { + position: absolute; + top: 0; + right: 0; + width: 1.75rem; + height: 1.75rem; + border-radius: var(--universal-border-radius); + padding: var(--universal-padding); + margin: 0; + cursor: pointer; + transition: background 0.3s; } + [type="checkbox"].modal + div .card .modal-close:before { + display: block; + content: '\00D7'; + color: var(--modal-close-color); + position: relative; + font-family: sans-serif; + font-size: 1.75rem; + line-height: 1; + text-align: center; } + [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus { + background: var(--modal-close-hover-color); } + [type="checkbox"].modal:checked + div { + display: flex; + flex: 0 1 auto; + z-index: 1200; } + [type="checkbox"].modal:checked + div .card .modal-close { + z-index: 1211; } + +:root { + --collapse-label-back-color: #03234b; + --collapse-label-fore-color: #ffffff; + --collapse-label-hover-back-color: #3cb4e6; + --collapse-selected-label-back-color: #3cb4e6; + --collapse-border-color: var(--collapse-label-back-color); + --collapse-selected-border-color: #ceecf8; + --collapse-content-back-color: #ffffff; + --collapse-selected-label-border-color: #3cb4e6; } + +.collapse { + width: calc(100% - 2 * var(--universal-margin)); + opacity: 1; + display: flex; + flex-direction: column; + margin: var(--universal-margin); + border-radius: var(--universal-border-radius); } + .collapse > [type="radio"], .collapse > [type="checkbox"] { + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); } + .collapse > label { + flex-grow: 1; + display: inline-block; + height: 1.25rem; + cursor: pointer; + transition: background 0.2s; + color: var(--collapse-label-fore-color); + background: var(--collapse-label-back-color); + border: 0.0714285714rem solid var(--collapse-selected-border-color); + padding: calc(1.25 * var(--universal-padding)); } + .collapse > label:hover, .collapse > label:focus { + background: var(--collapse-label-hover-back-color); } + .collapse > label + div { + flex-basis: auto; + height: 1px; + width: 1px; + margin: -1px; + overflow: hidden; + position: absolute; + clip: rect(0 0 0 0); + -webkit-clip-path: inset(100%); + clip-path: inset(100%); + transition: max-height 0.3s; + max-height: 1px; } + .collapse > :checked + label { + background: var(--collapse-selected-label-back-color); + border-color: var(--collapse-selected-label-border-color); } + .collapse > :checked + label + div { + box-sizing: border-box; + position: relative; + width: 100%; + height: auto; + overflow: auto; + margin: 0; + background: var(--collapse-content-back-color); + border: 0.0714285714rem solid var(--collapse-selected-border-color); + border-top: 0; + padding: var(--universal-padding); + clip: auto; + -webkit-clip-path: inset(0%); + clip-path: inset(0%); + max-height: 100%; } + .collapse > label:not(:first-of-type) { + border-top: 0; } + .collapse > label:first-of-type { + border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; } + .collapse > label:last-of-type:not(:first-of-type) { + border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } + .collapse > label:last-of-type:first-of-type { + border-radius: var(--universal-border-radius); } + .collapse > :checked:last-of-type:not(:first-of-type) + label { + border-radius: 0; } + .collapse > :checked:last-of-type + label + div { + border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); } + +/* + Custom elements for contextual background elements, toasts and tooltips. +*/ +mark.tertiary { + --mark-back-color: #3cb4e6; } + +mark.tag { + padding: calc(var(--universal-padding)/2) var(--universal-padding); + border-radius: 1em; } + +/* + Definitions for progress elements and spinners. +*/ +/* Progress module CSS variable definitions */ +:root { + --progress-back-color: #3cb4e6; + --progress-fore-color: #555; } + +progress { + display: block; + vertical-align: baseline; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + height: 0.75rem; + width: calc(100% - 2 * var(--universal-margin)); + margin: var(--universal-margin); + border: 0; + border-radius: calc(2 * var(--universal-border-radius)); + background: var(--progress-back-color); + color: var(--progress-fore-color); } + progress::-webkit-progress-value { + background: var(--progress-fore-color); + border-top-left-radius: calc(2 * var(--universal-border-radius)); + border-bottom-left-radius: calc(2 * var(--universal-border-radius)); } + progress::-webkit-progress-bar { + background: var(--progress-back-color); } + progress::-moz-progress-bar { + background: var(--progress-fore-color); + border-top-left-radius: calc(2 * var(--universal-border-radius)); + border-bottom-left-radius: calc(2 * var(--universal-border-radius)); } + progress[value="1000"]::-webkit-progress-value { + border-radius: calc(2 * var(--universal-border-radius)); } + progress[value="1000"]::-moz-progress-bar { + border-radius: calc(2 * var(--universal-border-radius)); } + progress.inline { + display: inline-block; + vertical-align: middle; + width: 60%; } + +:root { + --spinner-back-color: #ddd; + --spinner-fore-color: #555; } + +@keyframes spinner-donut-anim { + 0% { + transform: rotate(0deg); } + 100% { + transform: rotate(360deg); } } +.spinner { + display: inline-block; + margin: var(--universal-margin); + border: 0.25rem solid var(--spinner-back-color); + border-left: 0.25rem solid var(--spinner-fore-color); + border-radius: 50%; + width: 1.25rem; + height: 1.25rem; + animation: spinner-donut-anim 1.2s linear infinite; } + +/* + Custom elements for progress bars and spinners. +*/ +progress.primary { + --progress-fore-color: #1976d2; } + +progress.secondary { + --progress-fore-color: #d32f2f; } + +progress.tertiary { + --progress-fore-color: #308732; } + +.spinner.primary { + --spinner-fore-color: #1976d2; } + +.spinner.secondary { + --spinner-fore-color: #d32f2f; } + +.spinner.tertiary { + --spinner-fore-color: #308732; } + +/* + Definitions for icons - powered by Feather (https://feathericons.com/). +*/ +span[class^='icon-'] { + display: inline-block; + height: 1em; + width: 1em; + vertical-align: -0.125em; + background-size: contain; + margin: 0 calc(var(--universal-margin) / 4); } + span[class^='icon-'].secondary { + -webkit-filter: invert(25%); + filter: invert(25%); } + span[class^='icon-'].inverse { + -webkit-filter: invert(100%); + filter: invert(100%); } + +span.icon-alert { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-bookmark { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-calendar { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-credit { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-edit { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); } +span.icon-link { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-help { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-home { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); } +span.icon-info { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-lock { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-mail { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); } +span.icon-location { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); } +span.icon-phone { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-rss { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); } +span.icon-search { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-settings { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-share { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-cart { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); } +span.icon-upload { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); } +span.icon-user { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); } + +/* + Definitions for utilities and helper classes. +*/ +/* Utility module CSS variable definitions */ +:root { + --generic-border-color: rgba(0, 0, 0, 0.3); + --generic-box-shadow: 0 0.2857142857rem 0.2857142857rem 0 rgba(0, 0, 0, 0.125), 0 0.1428571429rem 0.1428571429rem -0.1428571429rem rgba(0, 0, 0, 0.125); } + +.hidden { + display: none !important; } + +.visually-hidden { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } + +.bordered { + border: 0.0714285714rem solid var(--generic-border-color) !important; } + +.rounded { + border-radius: var(--universal-border-radius) !important; } + +.circular { + border-radius: 50% !important; } + +.shadowed { + box-shadow: var(--generic-box-shadow) !important; } + +.responsive-margin { + margin: calc(var(--universal-margin) / 4) !important; } + @media screen and (min-width: 500px) { + .responsive-margin { + margin: calc(var(--universal-margin) / 2) !important; } } + @media screen and (min-width: 1280px) { + .responsive-margin { + margin: var(--universal-margin) !important; } } + +.responsive-padding { + padding: calc(var(--universal-padding) / 4) !important; } + @media screen and (min-width: 500px) { + .responsive-padding { + padding: calc(var(--universal-padding) / 2) !important; } } + @media screen and (min-width: 1280px) { + .responsive-padding { + padding: var(--universal-padding) !important; } } + +@media screen and (max-width: 499px) { + .hidden-sm { + display: none !important; } } +@media screen and (min-width: 500px) and (max-width: 1279px) { + .hidden-md { + display: none !important; } } +@media screen and (min-width: 1280px) { + .hidden-lg { + display: none !important; } } +@media screen and (max-width: 499px) { + .visually-hidden-sm { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } } +@media screen and (min-width: 500px) and (max-width: 1279px) { + .visually-hidden-md { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } } +@media screen and (min-width: 1280px) { + .visually-hidden-lg { + position: absolute !important; + width: 1px !important; + height: 1px !important; + margin: -1px !important; + border: 0 !important; + padding: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(100%) !important; + clip-path: inset(100%) !important; + overflow: hidden !important; } } + +/*# sourceMappingURL=mini-custom.css.map */ + +img[alt="ST logo"] { display: block; margin: auto; width: 75%; max-width: 250px; min-width: 71px; } +img[alt="Cube logo"] { float: right; width: 30%; max-width: 10rem; min-width: 8rem; padding-right: 1rem;} diff --git a/Drivers/BSP/Components/stm32wb_at/_htmresc/st_logo_2020.png b/Drivers/BSP/Components/stm32wb_at/_htmresc/st_logo_2020.png new file mode 100644 index 000000000..d6cebb5ac Binary files /dev/null and b/Drivers/BSP/Components/stm32wb_at/_htmresc/st_logo_2020.png differ diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at.c b/Drivers/BSP/Components/stm32wb_at/stm32wb_at.c new file mode 100644 index 000000000..6f41b1243 --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at.c @@ -0,0 +1,153 @@ +/** + ****************************************************************************** + * @file stm32wb_at.c + * @author MCD Application Team + * @brief Transport layer. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wb_at.h" +#include "stm32wb_at_ll.h" +#include "stm32wb_at_client.h" + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +uint8_t *buffer_rx; +uint8_t buffer_rx_size; +uint8_t buffer_rx_cursor; +char str_received[64]; +/* Private function prototypes -----------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ + +/** + * @brief Init the at module + * @param None + * @retval 0 in case of success, an error code otherwise + */ +uint8_t stm32wb_at_Init(uint8_t *buff_rx, uint8_t buff_rx_size) +{ + uint8_t status; + + if(buff_rx_size >= sizeof(str_received)) + { + buffer_rx_size = buff_rx_size; + buffer_rx = buff_rx; + (void)memset(&buffer_rx[0], 0, buffer_rx_size); + buffer_rx_cursor = 0; + (void)memset(&str_received[0], 0, sizeof(str_received)); + + stm32wb_at_ll_Async_receive(0); + status = 0; + } + else + { + status = 1; + } + return status; +} + +/** + * @brief Accumulate bytes received and detects a new frame received + * @param byte the last byte received + * @retval 0 in case of success, an error code otherwise + */ +uint8_t stm32wb_at_Received(uint8_t byte) +{ + uint8_t status, i; + + if(buffer_rx_cursor < buffer_rx_size) + { + buffer_rx[buffer_rx_cursor] = byte; + buffer_rx_cursor++; + + /* check if we have received the command delimiter LF */ + if(byte == (uint8_t)'\n') + { + /* remove CR if any */ + if(buffer_rx_cursor > 2U) + { + if( buffer_rx[buffer_rx_cursor - 2U] == (uint8_t)'\r') + { + buffer_rx[buffer_rx_cursor - 1U] = 0U; + buffer_rx[buffer_rx_cursor - 2U] = (uint8_t)'\n'; + buffer_rx_cursor--; + } + } + /* remove the last \n */ + buffer_rx[buffer_rx_cursor - 1U] = 0U; + buffer_rx_cursor--; + + /* remove null leading caractere if any*/ + if( buffer_rx[0] == 0U) + { + i = 1U; + while(buffer_rx[i] != 0U) + { + buffer_rx[i - 1U] = buffer_rx[i]; + i++; + } + buffer_rx[i - 1U] = 0U; + } + + + /* check if command is long enough */ + if(buffer_rx_cursor > 1U) + { + (void)strcpy(&str_received[0], (char*)&buffer_rx[0]); + + stm32wb_at_ll_Async_receive((uint8_t)sizeof(str_received)); + + (void)memset(&buffer_rx[0], 0, buffer_rx_size); + buffer_rx_cursor = 0U; + + status = stm32wb_at_Process_rx_frame(str_received); + (void)memset(&str_received[0], 0, sizeof(str_received)); + } + else + { + (void)memset(&buffer_rx[0], 0, buffer_rx_size); + buffer_rx_cursor = 0U; + + stm32wb_at_ll_Async_receive(0); + } + } + else + { + stm32wb_at_ll_Async_receive(0); + } + status = 0U; + } + else + { + status = 1U; + } + + return status; +} + +/** + * @brief Process a frame received + * @param str pointer string to process + * @retval 0 in case of success, an error code otherwise + */ +__weak uint8_t stm32wb_at_Process_rx_frame(char * str) +{ + (void)stm32wb_at_client_Process_rx_frame(str); + + return 0; +} diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at.h b/Drivers/BSP/Components/stm32wb_at/stm32wb_at.h new file mode 100644 index 000000000..3966e121b --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at.h @@ -0,0 +1,66 @@ +/** + ****************************************************************************** + * @file stm32wb_at.h + * @author MCD Application Team + * @brief Header file of AT transport layer. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef STM32WB_AT_H +#define STM32WB_AT_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include +#include +#include + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ + +/* Exported constants --------------------------------------------------------*/ +#define AT_PRE_CMD "AT+" +#define AT_CMD_TEST "AT" + +#define AT_GET "?" +#define AT_SET "=" +#define AT_READ ":" +#define AT_REPLY "+" +#define AT_EVENT "<" +#define AT_SEPARATOR "," +#define AT_EOL "\r\n" + +#define AT_CMD_STATUS_OK "OK" +#define AT_CMD_STATUS_ERROR "ERROR" + +/* Exported macros -----------------------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ +uint8_t stm32wb_at_Init(uint8_t *buff_rx, uint8_t buff_rx_size); +uint8_t stm32wb_at_Received(uint8_t byte); +uint8_t stm32wb_at_Process_rx_frame(char * str); + +#ifdef __cplusplus +} +#endif + +#endif /* STM32WB_AT_H */ diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c new file mode 100644 index 000000000..7ae505d5c --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c @@ -0,0 +1,39 @@ +/** + ****************************************************************************** + * @file stm32wb_at_ble.c + * @author MCD Application Team + * @brief AT BLE commands + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wb_at_ble.h" + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +/* Exported variable ---------------------------------------------------------*/ +const char *AT_BLE_CMD_STRING[] = { + FOREACH_AT_BLE_CMD(GENERATE_STRING) +}; + +const char *AT_BLE_EVT_STRING[] = { + FOREACH_AT_BLE_EVT(GENERATE_STRING) +}; + +/* Exported functions --------------------------------------------------------*/ +FOREACH_AT_BLE_CMD(GENERATE_AT_BLE_CB_FUNC) +FOREACH_AT_BLE_EVT(GENERATE_AT_BLE_EVT_CB_FUNC) diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.h b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.h new file mode 100644 index 000000000..55b863afd --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.h @@ -0,0 +1,300 @@ +/** + ****************************************************************************** + * @file stm32wb_at_ble.h + * @author MCD Application Team + * @brief Header file of AT BLE commands. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef STM32WB_AT_BLE_H +#define STM32WB_AT_BLE_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wb_at.h" + +/* Private includes ----------------------------------------------------------*/ +#define FOREACH_AT_BLE_CMD(AT_BLE_CMD)\ + AT_BLE_CMD(BLE_TEST)\ + AT_BLE_CMD(BLE_SVC)\ + AT_BLE_CMD(BLE_INIT)\ + AT_BLE_CMD(BLE_ADV_PARAM)\ + AT_BLE_CMD(BLE_ADV)\ + AT_BLE_CMD(BLE_CHAR_ADD)\ + AT_BLE_CMD(BLE_PERIPH_SEC_REQ)\ + AT_BLE_CMD(BLE_PAIRING_CONFIRM)\ + AT_BLE_CMD(BLE_PASSKEY_RESP)\ + AT_BLE_CMD(BLE_IO_CAPA)\ + AT_BLE_CMD(BLE_SET_AUTHEN_REQ)\ + AT_BLE_CMD(BLE_CLEAR_DB)\ + AT_BLE_CMD(BLE_RST)\ + AT_BLE_CMD(BLE_CFG_RAND_ADDR)\ + AT_BLE_CMD(BLE_PUB_ADDR)\ + AT_BLE_CMD(BLE_RAND_ADDR)\ + AT_BLE_CMD(BLE_NAME)\ + AT_BLE_CMD(BLE_RF_POWER)\ + AT_BLE_CMD(BLE_NOTIF_VAL)\ + AT_BLE_CMD(BLE_INDIC_VAL)\ + AT_BLE_CMD(BLE_CONN_INT)\ + AT_BLE_CMD(BLE_NONE)\ + +#define GENERATE_ENUM(ENUM) ENUM, +#define GENERATE_STRING(STRING) #STRING, +#define GENERATE_AT_BLE_CB_PROTO(CMD) uint8_t stm32wb_at_##CMD##_cb(stm32wb_at_##CMD##_t *param); +#define GENERATE_AT_BLE_CB_FUNC(CMD) __weak uint8_t stm32wb_at_##CMD##_cb(stm32wb_at_##CMD##_t *param){UNUSED(param);return 1;} +#define GENERATE_AT_BLE_SERVER_CB_PROTO(CMD) uint8_t stm32wb_at_##CMD##_server_cb(char *buff); +#define GENERATE_AT_BLE_SERVER_CB_FUNC(CMD) __weak uint8_t stm32wb_at_##CMD##_server_cb(char *buff){return 1;} + +#define FOREACH_AT_BLE_EVT(AT_BLE_EVT)\ + AT_BLE_EVT(BLE_EVT_WRITE)\ + AT_BLE_EVT(BLE_EVT_CONN)\ + AT_BLE_EVT(BLE_EVT_UPD_CONN)\ + AT_BLE_EVT(BLE_EVT_VALUE_CONFIRM)\ + AT_BLE_EVT(BLE_EVT_PASSKEY_REQ)\ + AT_BLE_EVT(BLE_EVT_PAIRING)\ + AT_BLE_EVT(BLE_EVT_NONE)\ + +#define GENERATE_AT_BLE_EVT_CB_PROTO(CMD) uint8_t stm32wb_at_##CMD##_cb(stm32wb_at_##CMD##_t *param); +#define GENERATE_AT_BLE_EVT_CB_FUNC(CMD) __weak uint8_t stm32wb_at_##CMD##_cb(stm32wb_at_##CMD##_t *param){UNUSED(param);return 1;} + +/* Exported types ------------------------------------------------------------*/ +/* BLE_TEST */ +typedef struct +{ + uint8_t dummy; +} stm32wb_at_BLE_TEST_t; + +/* BLE_INIT */ +typedef struct +{ + uint8_t init_set; +} stm32wb_at_BLE_INIT_t; + +/* BLE_ADV_PARAM */ +typedef struct +{ + uint8_t entry_number; + uint8_t adv_type; + float adv_int_min; + float adv_int_max; +} stm32wb_at_BLE_ADV_PARAM_t; + +/* BLE_ADV */ +typedef struct +{ + uint8_t enable; +} stm32wb_at_BLE_ADV_t; + +/* BLE_SVC */ +typedef struct +{ + uint8_t index; + uint8_t svc_uuid_type; + uint16_t svc_uuid; + uint8_t max_attr_record; +} stm32wb_at_BLE_SVC_t; + +/* BLE_CHAR_ADD */ +typedef struct +{ + uint8_t svc_id; + uint8_t char_id; + uint8_t char_uuid_type; + uint16_t char_uuid; + uint16_t char_value_len; + uint8_t char_properties; + uint8_t sec_permission; + uint8_t gatt_evt_mask; +} stm32wb_at_BLE_CHAR_ADD_t; + +/* BLE_SLAVE_SEC_REQ */ +typedef struct +{ + uint8_t enable; +} stm32wb_at_BLE_PERIPH_SEC_REQ_t; + +/* BLE_PAIRING_CONFIRM */ +typedef struct +{ + uint8_t confirm_yes_no; +} stm32wb_at_BLE_PAIRING_CONFIRM_t; + +/* BLE_PASSKEY_RESP */ +typedef struct +{ + uint32_t pass_key_resp; +} stm32wb_at_BLE_PASSKEY_RESP_t; + +/* BLE_IO_CAPA */ +typedef struct +{ + uint8_t io_capability; +} stm32wb_at_BLE_IO_CAPA_t; + +/* BLE_SET_AUTHEN_REQ */ +typedef struct +{ + uint8_t bonding_mode; + uint8_t mitm; + uint8_t sc_support; + uint8_t use_fixed_pin; + uint32_t fixed_pin; + uint8_t identity_address_type; +} stm32wb_at_BLE_SET_AUTHEN_REQ_t; + +/* BLE_CLEAR_DB */ +typedef struct +{ + uint8_t dummy; +} stm32wb_at_BLE_CLEAR_DB_t; + +/* BLE_RST */ +typedef struct +{ + uint8_t reset; +} stm32wb_at_BLE_RST_t; + +/* BLE_PUB_ADDR */ +typedef struct +{ + uint8_t BD_address[6]; +} stm32wb_at_BLE_PUB_ADDR_t; + +/* BLE_RAND_ADDR */ +typedef struct +{ + uint8_t BD_address[6]; +} stm32wb_at_BLE_RAND_ADDR_t; + +/* BLE_CFG_RAND_ADDR */ +typedef struct +{ + uint8_t cfg_rand_addr; +} stm32wb_at_BLE_CFG_RAND_ADDR_t; + +/* BLE_NAME */ +typedef struct +{ + char name[20]; +} stm32wb_at_BLE_NAME_t; + +/* BLE_RF_POWER */ +typedef struct +{ + float tx_power; + uint8_t tx_power_code; +} stm32wb_at_BLE_RF_POWER_t; + +/* BLE_NOTIF_VAL */ +typedef struct +{ + uint8_t svc_index; + uint8_t char_index; + uint8_t val_tab[64]; + uint8_t val_tab_len; +} stm32wb_at_BLE_NOTIF_VAL_t; + +/* BLE_INDIC_VAL */ +typedef struct +{ + uint8_t svc_index; + uint8_t char_index; + uint8_t val_tab[64]; + uint8_t val_tab_len; +} stm32wb_at_BLE_INDIC_VAL_t; + +/* BLE_CONN_INT */ +typedef struct +{ + float min; + float max; +} stm32wb_at_BLE_CONN_INT_t; + +/* BLE_NONE */ +typedef struct +{ + uint8_t dummy; +} stm32wb_at_BLE_NONE_t; + +/* BLE_EVT_WRITE */ +typedef struct +{ + uint8_t svc_index; + uint8_t char_index; + uint8_t val_tab[245]; + uint8_t val_tab_len; +} stm32wb_at_BLE_EVT_WRITE_t; + +/* BLE_EVT_CONN */ +typedef struct +{ + uint8_t status; +} stm32wb_at_BLE_EVT_CONN_t; + +/* BLE_EVT_UPD_CONN */ +typedef struct +{ + uint8_t status; +} stm32wb_at_BLE_EVT_UPD_CONN_t; + +/* BLE_EVT_VALUE_CONFIRM */ +typedef struct +{ + uint32_t numeric_value; +} stm32wb_at_BLE_EVT_VALUE_CONFIRM_t; + +/* BLE_EVT_PASSKEY_REQ */ +typedef struct +{ + uint8_t dummy; +} stm32wb_at_BLE_EVT_PASSKEY_REQ_t; + +typedef struct +{ + uint8_t status; + uint8_t reason; +} stm32wb_at_BLE_EVT_PAIRING_t; + +/* BLE_EVT_NONE */ +typedef struct +{ + uint8_t dummy; +} stm32wb_at_BLE_EVT_NONE_t; + +/* Exported constants --------------------------------------------------------*/ +typedef enum AT_BLE_CMD_ENUM { + FOREACH_AT_BLE_CMD(GENERATE_ENUM) +}stm32wb_at_BLE_CMD_t; + +typedef enum AT_BLE_EVT_ENUM { + FOREACH_AT_BLE_EVT(GENERATE_ENUM) +}stm32wb_at_BLE_EVT_t; + +extern const char* AT_BLE_CMD_STRING[]; +extern const char* AT_BLE_EVT_STRING[]; + +/* Exported macros -----------------------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ +FOREACH_AT_BLE_CMD(GENERATE_AT_BLE_CB_PROTO) +FOREACH_AT_BLE_EVT(GENERATE_AT_BLE_EVT_CB_PROTO) + +#ifdef __cplusplus +} +#endif + +#endif /* STM32WB_AT_BLE_H */ diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.c b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.c new file mode 100644 index 000000000..e32e76357 --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.c @@ -0,0 +1,1356 @@ +/** + ****************************************************************************** + * @file stm32wb_at_client.c + * @author MCD Application Team + * @brief AT client. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wb_at_client.h" + +uint8_t str_to_byte_tab(char *str_in, uint8_t *tab, uint8_t *tab_len); +extern float tab_conv_tx_power[32]; + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +#define SRV_CUSTOM_APP_SVC_OFFSET 3 +#define SRV_CUSTOM_APP_SVC_COUNT 5 + +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static char client_buff_tx[64]; +static stm32wb_at_BLE_CMD_t client_current_cmd; + +/* Private function prototypes -----------------------------------------------*/ +static uint8_t stm32wb_at_client_Wait_ready(void); + +/* Exported functions --------------------------------------------------------*/ + +/** + * @brief Init the at client + * @param None + * @retval 0 in case of success, an error code otherwise + */ +uint8_t stm32wb_at_client_Init(void) +{ + (void)memset(&client_buff_tx[0], 0, sizeof(client_buff_tx)); + client_current_cmd = BLE_NONE; + + return 0; +} + +/** + * @brief Query the server on a specified command + * @param cmd code to query + * @retval 0 in case of success, an error code otherwise + */ +uint8_t stm32wb_at_client_Query(stm32wb_at_BLE_CMD_t cmd) +{ + uint8_t status; + + (void)stm32wb_at_client_Wait_ready(); + + if(cmd == BLE_TEST) + { + (void)strcpy(client_buff_tx, AT_CMD_TEST); + (void)strcat(client_buff_tx, AT_EOL); + + client_current_cmd = cmd; + status = stm32wb_at_ll_Transmit((uint8_t *)&client_buff_tx[0], (uint16_t)strlen(client_buff_tx)); + (void)memset(&client_buff_tx[0], 0, sizeof(client_buff_tx)); + } + else if(cmd < BLE_NONE) + { + (void)strcpy(client_buff_tx, AT_PRE_CMD); + (void)strcat(client_buff_tx, AT_BLE_CMD_STRING[cmd]); + (void)strcat(client_buff_tx, AT_GET); + (void)strcat(client_buff_tx, AT_EOL); + + client_current_cmd = cmd; + status = stm32wb_at_ll_Transmit((uint8_t *)&client_buff_tx[0], (uint16_t)strlen(client_buff_tx)); + (void)memset(&client_buff_tx[0], 0, sizeof(client_buff_tx)); + } + else + { + status = 1; + } + + return status; +} + +/** + * @brief Process an At string and perform required actions + * @param str pointer to the string to process + * @retval 0 in case of success, an error code otherwise + */ +uint8_t stm32wb_at_client_Process_rx_frame(char * str) +{ + uint8_t status; + stm32wb_at_BLE_EVT_t current_evt; + + status = 1; + + if( strcmp(str, AT_CMD_STATUS_OK) == 0) + { + client_current_cmd = BLE_NONE; + status = 0; + } + else if( strcmp(str, AT_CMD_STATUS_ERROR) == 0) + { + client_current_cmd = BLE_NONE; + status = 0; + } + else if( strncmp(str, AT_REPLY, strlen(AT_REPLY)) == 0) + { + str++; + /* check if it's a response of current command */ + if( strncmp(str, AT_BLE_CMD_STRING[client_current_cmd], strlen(AT_BLE_CMD_STRING[client_current_cmd])) == 0 ) + { + str += strlen(AT_BLE_CMD_STRING[client_current_cmd]); + + if( strncmp(str, AT_READ, strlen(AT_READ)) == 0) + { + str++; + /* extract params regarding current command */ + switch (client_current_cmd) { + case BLE_SVC: + { + stm32wb_at_BLE_SVC_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.index = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + if((param.index >= SRV_CUSTOM_APP_SVC_OFFSET) && + (param.index < (SRV_CUSTOM_APP_SVC_OFFSET + SRV_CUSTOM_APP_SVC_COUNT)) ) + { + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.svc_uuid_type = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.svc_uuid = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.max_attr_record = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + } + + if( param.index >= (SRV_CUSTOM_APP_SVC_OFFSET + SRV_CUSTOM_APP_SVC_COUNT) ) + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_SVC_cb(¶m); + } + break; + } + case BLE_INIT: + { + stm32wb_at_BLE_INIT_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.init_set = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_INIT_cb(¶m); + } + break; + } + case BLE_ADV: + { + stm32wb_at_BLE_ADV_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.enable = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_ADV_cb(¶m); + } + break; + } + case BLE_ADV_PARAM: + { + stm32wb_at_BLE_ADV_PARAM_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.adv_type = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.adv_int_min = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.adv_int_max = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + +// token = strtok(NULL, AT_SEPARATOR); +// if(token != 0) +// { +// param.own_addr_type = (uint8_t)strtol(token, NULL, 0); +// } +// else +// { +// status |= 1; +// } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_ADV_PARAM_cb(¶m); + } + break; + } + case BLE_CONN_INT: + { + stm32wb_at_BLE_CONN_INT_t param; + char * token; + float value; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + if ((value >= 7.5f) && (value <= 4000.0f)) + { + param.min = value; + } + else + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + if ((value >= 7.5f) && (value <= 4000.0f) && (value >= param.min)) + { + param.max = value; + } + else + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_CONN_INT_cb(¶m); + } + break; + } + case BLE_CHAR_ADD: + { + stm32wb_at_BLE_CHAR_ADD_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.svc_id = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.char_id = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.char_uuid_type = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.char_uuid = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.char_value_len = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.char_properties = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.sec_permission = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.gatt_evt_mask = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_CHAR_ADD_cb(¶m); + } + break; + } + case BLE_PERIPH_SEC_REQ: + { + stm32wb_at_BLE_PERIPH_SEC_REQ_t param; + char * token; + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.enable = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + if(status == 0) + { + status = stm32wb_at_BLE_PERIPH_SEC_REQ_cb(¶m); + } + break; + } + case BLE_PAIRING_CONFIRM: + { + stm32wb_at_BLE_PAIRING_CONFIRM_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.confirm_yes_no = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_PAIRING_CONFIRM_cb(¶m); + } + break; + } + case BLE_PASSKEY_RESP: + { + stm32wb_at_BLE_PASSKEY_RESP_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.pass_key_resp = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_PASSKEY_RESP_cb(¶m); + } + break; + } + case BLE_IO_CAPA: + { + stm32wb_at_BLE_IO_CAPA_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.io_capability = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_IO_CAPA_cb(¶m); + } + break; + } + case BLE_SET_AUTHEN_REQ: + { + stm32wb_at_BLE_SET_AUTHEN_REQ_t param; + char * token; + + /* all the fields are mandatory using this method */ + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.bonding_mode = (uint8_t)strtol(str, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.mitm = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.sc_support = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.use_fixed_pin = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.fixed_pin = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.identity_address_type = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_SET_AUTHEN_REQ_cb(¶m); + } + } + break; + case BLE_CLEAR_DB: + { + stm32wb_at_BLE_CLEAR_DB_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.dummy = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + if(status == 0) + { + status = stm32wb_at_BLE_CLEAR_DB_cb(¶m); + } + break; + } + case BLE_RST: + { + stm32wb_at_BLE_RST_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.reset = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_RST_cb(¶m); + } + break; + } + case BLE_PUB_ADDR: + { + stm32wb_at_BLE_PUB_ADDR_t param; + char * token; + uint8_t tab_len; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + tab_len = sizeof(param.BD_address); + status |= str_to_byte_tab(token, ¶m.BD_address[0], &tab_len); + if(tab_len != 6) + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_PUB_ADDR_cb(¶m); + } + break; + } + case BLE_RAND_ADDR: + { + stm32wb_at_BLE_RAND_ADDR_t param; + char * token; + uint8_t tab_len; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + tab_len = sizeof(param.BD_address); + status |= str_to_byte_tab(token, ¶m.BD_address[0], &tab_len); + if(tab_len != 6) + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_RAND_ADDR_cb(¶m); + } + break; + } + case BLE_RF_POWER: + { + stm32wb_at_BLE_RF_POWER_t param; + char * token; + float value; + uint8_t value_flag = 0; + status = 0; + uint8_t i; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + for (i = 0 ; i < sizeof(tab_conv_tx_power) ; i++) + { + if (value == tab_conv_tx_power[i]) + { + value_flag = 1; + param.tx_power = value; + param.tx_power_code = i; + break; + } + } + if (value_flag != 1) + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_RF_POWER_cb(¶m); + } + break; + } + case BLE_NAME: + { + stm32wb_at_BLE_NAME_t param; + status = 0; + + strcpy(¶m.name[0], str); + + /* do not check separator as it can be in the name itself */ + if(status == 0) + { + status = stm32wb_at_BLE_NAME_cb(¶m); + } + break; + } + case BLE_NOTIF_VAL: + { + stm32wb_at_BLE_NOTIF_VAL_t param; + + break; + } + case BLE_INDIC_VAL: + { + stm32wb_at_BLE_INDIC_VAL_t param; + + break; + } + default: + break; + } + } + } + } + else if( strncmp(str, AT_EVENT, strlen(AT_EVENT)) == 0) + { + str++; + + for( current_evt = (stm32wb_at_BLE_EVT_t)0 ; current_evt < BLE_EVT_NONE ; current_evt++ ) + { + if( strncmp(str, AT_BLE_EVT_STRING[current_evt], strlen(AT_BLE_EVT_STRING[current_evt])) == 0 ) + { + str += strlen(AT_BLE_EVT_STRING[current_evt]); + break; + } + } + if( current_evt == BLE_EVT_NONE) + { + status = 1; + } + else + { + if (strncmp(str, AT_SET, strlen(AT_SET)) == 0) + { + str++; + /* extract params regarding current command */ + switch (current_evt) { + case BLE_EVT_WRITE: + { + stm32wb_at_BLE_EVT_WRITE_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.svc_index = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.char_index = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.val_tab_len = sizeof(param.val_tab); + status |= str_to_byte_tab(token, ¶m.val_tab[0], ¶m.val_tab_len); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_EVT_WRITE_cb(¶m); + } + break; + } + case BLE_EVT_CONN: + { + stm32wb_at_BLE_EVT_CONN_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.status = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_EVT_CONN_cb(¶m); + } + break; + } + case BLE_EVT_UPD_CONN: + { + stm32wb_at_BLE_EVT_UPD_CONN_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.status = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_EVT_UPD_CONN_cb(¶m); + } + break; + } + case BLE_EVT_VALUE_CONFIRM: + { + stm32wb_at_BLE_EVT_VALUE_CONFIRM_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.numeric_value = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_EVT_VALUE_CONFIRM_cb(¶m); + } + break; + } + default: + break; + } + } + else + { + status = 1; + } + } + } + + return status; +} + +/** + * @brief Send an AT set with specified command and parameters + * @param cmd command code + * @param param pointer to parameters of command + * @retval 0 in case of success, an error code otherwise + */ +uint8_t stm32wb_at_client_Set(stm32wb_at_BLE_CMD_t cmd, void *param) +{ + uint8_t status; + + (void)stm32wb_at_client_Wait_ready(); + + if(cmd < BLE_NONE) + { + client_current_cmd = cmd; + + (void)strcpy(client_buff_tx, AT_PRE_CMD); + (void)strcat(client_buff_tx, AT_BLE_CMD_STRING[cmd]); + (void)strcat(client_buff_tx, AT_SET); + + switch (cmd) { + case BLE_SVC: + { + stm32wb_at_BLE_SVC_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->index); + (void)strcat(client_buff_tx, str_tmp); + if(p->index >= SRV_CUSTOM_APP_SVC_OFFSET) + { + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->svc_uuid_type); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "0x%04x", p->svc_uuid); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->max_attr_record); + (void)strcat(client_buff_tx, str_tmp); + } + break; + } + case BLE_INIT: + { + stm32wb_at_BLE_INIT_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->init_set); + (void)strcat(client_buff_tx, str_tmp); + + break; + } + case BLE_RF_POWER: + { + stm32wb_at_BLE_RF_POWER_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%.2f", p->tx_power); + (void)strcat(client_buff_tx, str_tmp); + + break; + } + case BLE_IO_CAPA: + { + stm32wb_at_BLE_IO_CAPA_t param; + + break; + } + case BLE_SET_AUTHEN_REQ: + { + stm32wb_at_BLE_SET_AUTHEN_REQ_t param; + + break; + } + case BLE_PERIPH_SEC_REQ: + { + stm32wb_at_BLE_PERIPH_SEC_REQ_t param; + + break; + } + case BLE_PAIRING_CONFIRM: + { + stm32wb_at_BLE_PAIRING_CONFIRM_t param; + + break; + } + case BLE_PASSKEY_RESP: + { + stm32wb_at_BLE_PASSKEY_RESP_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->pass_key_resp); + (void)strcat(client_buff_tx, str_tmp); + + break; + } + case BLE_CLEAR_DB: + { + stm32wb_at_BLE_CLEAR_DB_t param; + + break; + } + case BLE_NOTIF_VAL: + { + stm32wb_at_BLE_NOTIF_VAL_t *p = param; + uint8_t i; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->svc_index); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->char_index); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + + if(p->val_tab_len <= 1) + { + sprintf(str_tmp, "%d", (uint16_t)p->val_tab[0]); + strcat(client_buff_tx, str_tmp); + } + else + { + (void)strcat(client_buff_tx, "0x"); + for(i = 0 ; i < p->val_tab_len ; i++) + { + (void)sprintf( str_tmp, "%02x", p->val_tab[i] ); + (void)strcat(client_buff_tx, str_tmp); + } + } + + break; + } + case BLE_INDIC_VAL: + { + stm32wb_at_BLE_INDIC_VAL_t *p = param; + uint8_t i; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->svc_index); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->char_index); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + if(p->val_tab_len <= 1) + { + sprintf(str_tmp, "%d", (uint16_t)p->val_tab[0]); + strcat(client_buff_tx, str_tmp); + } + else + { + (void)strcat(client_buff_tx, "0x"); + for(i = 0 ; i < p->val_tab_len ; i++) + { + (void)sprintf( str_tmp, "%02x", p->val_tab[i] ); + (void)strcat(client_buff_tx, str_tmp); + } + } + + break; + } + case BLE_ADV: + { + stm32wb_at_BLE_ADV_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->enable); + (void)strcat(client_buff_tx, str_tmp); + + break; + } + case BLE_ADV_PARAM: + { + stm32wb_at_BLE_ADV_PARAM_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->entry_number); + (void)strcat(client_buff_tx, str_tmp); + if(p->entry_number == 0) + { + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->adv_type); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%.2f", p->adv_int_min); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%.2f", p->adv_int_max); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + +// (void)sprintf(str_tmp, "%d", p->own_addr_type); +// (void)strcat(client_buff_tx, str_tmp); +// (void)strcat(client_buff_tx, AT_SEPARATOR); + } + break; + } + case BLE_CONN_INT: + { + stm32wb_at_BLE_CONN_INT_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%.1f", p->min); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%.1f", p->max); + (void)strcat(client_buff_tx, str_tmp); + + break; + } + case BLE_CHAR_ADD: + { + stm32wb_at_BLE_CHAR_ADD_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->svc_id); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->char_id); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->char_uuid_type); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "0x%04x", p->char_uuid); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%d", p->char_value_len); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "0x%02x", p->char_properties); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "0x%02x", p->sec_permission); + (void)strcat(client_buff_tx, str_tmp); + (void)strcat(client_buff_tx, AT_SEPARATOR); + + (void)sprintf(str_tmp, "0x%02x", p->gatt_evt_mask); + (void)strcat(client_buff_tx, str_tmp); + + break; + } + case BLE_RST: + { + stm32wb_at_BLE_RST_t *p = param; + char str_tmp[8]; + + (void)sprintf(str_tmp, "%d", p->reset); + (void)strcat(client_buff_tx, str_tmp); + + break; + } + case BLE_PUB_ADDR: + { + stm32wb_at_BLE_PUB_ADDR_t *p = param; + char str_tmp[20]; + uint8_t i; + + (void)strcat(client_buff_tx, "0x"); + for(i = 0 ; i < sizeof(p->BD_address) ; i++) + { + (void)sprintf(str_tmp, "%02x", p->BD_address[i]); + (void)strcat(client_buff_tx, str_tmp); + } + + break; + } + case BLE_RAND_ADDR: + { + stm32wb_at_BLE_RAND_ADDR_t *p = param; + char str_tmp[20]; + uint8_t i; + + (void)strcat(client_buff_tx, "0x"); + for(i = 0 ; i < sizeof(p->BD_address) ; i++) + { + (void)sprintf(str_tmp, "%02x", p->BD_address[i]); + (void)strcat(client_buff_tx, str_tmp); + } + + break; + } + case BLE_NAME: + { + stm32wb_at_BLE_NAME_t *p = param; + + (void)strcat(client_buff_tx, p->name); + + break; + } + default: + break; + } + + (void)strcat(client_buff_tx, AT_EOL); + + client_current_cmd = cmd; + status = stm32wb_at_ll_Transmit((uint8_t *)&client_buff_tx[0], (uint16_t)strlen(client_buff_tx)); + (void)memset(&client_buff_tx[0], 0, sizeof(client_buff_tx)); + } + else + { + status = 1; + } + + return status; +} + +/** + * @brief Wait for the last AT command completed + * @param None + * @retval 0 in case of success, an error code otherwise + */ +static uint8_t stm32wb_at_client_Wait_ready(void) +{ + while (client_current_cmd != BLE_NONE) + { + } + + return 0; +} diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.h b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.h new file mode 100644 index 000000000..06af95db5 --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_client.h @@ -0,0 +1,50 @@ +/** + ****************************************************************************** + * @file stm32wb_at_client.h + * @author MCD Application Team + * @brief Header file of AT client. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef STM32WB_AT_CLIENT_H +#define STM32WB_AT_CLIENT_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wb_at.h" +#include "stm32wb_at_ll.h" +#include "stm32wb_at_ble.h" + +/* Private includes ----------------------------------------------------------*/ + +/* Exported types ------------------------------------------------------------*/ + +/* Exported constants --------------------------------------------------------*/ + +/* Exported macros -----------------------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ +uint8_t stm32wb_at_client_Init(void); +uint8_t stm32wb_at_client_Query(stm32wb_at_BLE_CMD_t cmd); +uint8_t stm32wb_at_client_Process_rx_frame(char * str); +uint8_t stm32wb_at_client_Set(stm32wb_at_BLE_CMD_t cmd, void *param); + +#ifdef __cplusplus +} +#endif + +#endif /* STM32WB_AT_CLIENT_H */ diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c new file mode 100644 index 000000000..5f74dd4a9 --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c @@ -0,0 +1,73 @@ +/** + ****************************************************************************** + * @file stm32wb_at_ll.c + * @author MCD Application Team + * @brief Transport layer interface file, user have to implement these + * functions in his application. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wb_at.h" +#include "stm32wb_at_ll.h" + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +/** + * @brief Init the transport module + * @param None + * @retval 0 in case of success, an error code otherwise + */ +__weak uint8_t stm32wb_at_ll_Init(void) +{ + return 1; +} + +/** + * @brief De init the transport module + * @param None + * @retval 0 in case of success, an error code otherwise + */ +__weak uint8_t stm32wb_at_ll_DeInit(void) +{ + return 1; +} + +/** + * @brief Triggers the reception of a byte + * @param pBuff pointer to the first byte to transmit + * @param Size byte count to transfer + * @retval 0 in case of success, an error code otherwise + */ +__weak uint8_t stm32wb_at_ll_Transmit(uint8_t *pBuff, uint16_t Size) +{ + UNUSED(pBuff); + UNUSED(Size); + + return 1; +} + +/** + * @brief Triggers the reception of a byte + * @param new_frame containts the length of a new frame received in rx buffer, else 0 + * @retval None + */ +__weak void stm32wb_at_ll_Async_receive(uint8_t new_frame) +{ + UNUSED(new_frame); + return; +} diff --git a/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.h b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.h new file mode 100644 index 000000000..522657310 --- /dev/null +++ b/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.h @@ -0,0 +1,49 @@ +/** + ****************************************************************************** + * @file stm32wb_at_ll.h + * @author MCD Application Team + * @brief Header file of AT client. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef STM32WB_AT_LL_H +#define STM32WB_AT_LL_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wb_at.h" +#include "stm32wb_at_ll.h" + +/* Private includes ----------------------------------------------------------*/ + +/* Exported types ------------------------------------------------------------*/ + +/* Exported constants --------------------------------------------------------*/ + +/* Exported macros -----------------------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ +uint8_t stm32wb_at_ll_Init(void); +uint8_t stm32wb_at_ll_DeInit(void); +uint8_t stm32wb_at_ll_Transmit(uint8_t *pBuff, uint16_t Size); +void stm32wb_at_ll_Async_receive(uint8_t new_frame); + +#ifdef __cplusplus +} +#endif + +#endif /* STM32WB_AT_LL_H */ diff --git a/Drivers/BSP/NUCLEO-WB15CC/README.md b/Drivers/BSP/NUCLEO-WB15CC/README.md new file mode 100644 index 000000000..3e255b7fe --- /dev/null +++ b/Drivers/BSP/NUCLEO-WB15CC/README.md @@ -0,0 +1,36 @@ +# BSP NUCLEO-WB15CC Component + +![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/nucleo-wb15cc.svg?color=brightgreen) + +## Overview + +**STM32Cube** is an STMicroelectronics original initiative to ease developers' life by reducing efforts, time and cost. + +**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series. + * The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product. + * The STM32 HAL-LL drivers, an abstraction layer offering a set of APIs ensuring maximized portability across the STM32 portfolio. + * The BSP drivers of each evaluation, demonstration or nucleo board provided for this STM32 series. + * A consistent set of middleware libraries such as RTOS, USB, FatFS, graphics, touch sensing library... + * A full set of software projects (basic examples, applications, and demonstrations) for each board provided for this STM32 series. + +Two models of publication are proposed for the STM32Cube embedded software: + * The monolithic **MCU Package**: all STM32Cube software modules of one STM32 series are present (Drivers, Middleware, Projects, Utilities) in the repository (usual name **STM32Cubexx**, xx corresponding to the STM32 series). + * The **MCU component**: each STM32Cube software module being part of the STM32Cube MCU Package, is delivered as an individual repository, allowing the user to select and get only the required software functions. + +## Description + +This **nucleo-wb15cc** MCU component repository is one element of the **STM32CubeWB** MCU embedded software package, providing the **NUCLEO-WB15CC** BSP BOARD component part. + +## Release note + +Details about the content of this release are available in the release note [here](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/nucleo-wb15cc/blob/main/Release_Notes.html). + +## Compatibility information + +Below is the list of the BSP *component* drivers to be used with this BSP *board* driver. It is **crucial** that you use a consistent set of CMSIS - HAL - BSP versions, as mentioned in [this](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/STM32CubeWB/blob/master/Release_Notes.html) release note. + +* [stm32-bsp-common](https://github.com/STMicroelectronics/stm32-bsp-common) + +## Troubleshooting + +Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) guide. diff --git a/Drivers/BSP/NUCLEO-WB15CC/Release_Notes.html b/Drivers/BSP/NUCLEO-WB15CC/Release_Notes.html index 86c921da1..32f9c35d4 100644 --- a/Drivers/BSP/NUCLEO-WB15CC/Release_Notes.html +++ b/Drivers/BSP/NUCLEO-WB15CC/Release_Notes.html @@ -36,10 +36,23 @@

Update History

- +

Main Changes

    +
  • Update Licensing information and format +
      +
    • All source files: update disclaimer to add reference to the new license agreement
      • +
    • Add README.md file for GitHub publication
      • +
    • +
+
+
+
+ +
+

Main Changes

+
  • Update Release Notes template
  • Update Licensing information and format
      @@ -53,7 +66,7 @@
      -

      Main Changes

      +

      Main Changes

      First release

      diff --git a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c index 377e53e48..66193e995 100644 --- a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c +++ b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c @@ -107,7 +107,7 @@ static void COM1_MspDeInit(UART_HandleTypeDef *huart); /** @addtogroup NUCLEO_WB15CC_LOW_LEVEL_Exported_Functions * @{ - */ + */ /** * @brief This method returns the NUCLEO-WB15CC BSP Driver revision @@ -120,7 +120,7 @@ uint32_t BSP_GetVersion(void) /** @addtogroup NUCLEO_WB15CC_LOW_LEVEL_LED_Functions * @{ - */ + */ /** * @brief Configures LED GPIO. @@ -235,11 +235,11 @@ int32_t BSP_LED_GetState(Led_TypeDef Led) /** * @} - */ + */ /** @addtogroup NUCLEO_WB15CC_LOW_LEVEL_BUTTON_Functions * @{ - */ + */ /** * @brief Configures Button GPIO and EXTI Line. @@ -259,7 +259,7 @@ int32_t BSP_PB_Init(Button_TypeDef Button, ButtonMode_TypeDef ButtonMode) { GPIO_InitTypeDef gpio_init_structure = {0}; static BSP_EXTI_LineCallback button_callback[BUTTONn] = {BUTTON_SW1_EXTI_Callback, BUTTON_SW2_EXTI_Callback, BUTTON_SW3_EXTI_Callback}; - static uint32_t button_interrupt_priority[BUTTONn] = {BSP_BUTTON_SWx_IT_PRIORITY, BSP_BUTTON_SWx_IT_PRIORITY, BSP_BUTTON_SWx_IT_PRIORITY}; + static uint32_t button_interrupt_priority[BUTTONn] = {BSP_BUTTON_USER_IT_PRIORITY, BSP_BUTTON_USER_IT_PRIORITY, BSP_BUTTON_USER_IT_PRIORITY}; static const uint32_t button_exti_line[BUTTONn] = {BUTTON_SW1_EXTI_LINE, BUTTON_SW2_EXTI_LINE, BUTTON_SW3_EXTI_LINE}; /* Enable the BUTTON Clock */ @@ -355,7 +355,7 @@ __weak void BSP_PB_Callback(Button_TypeDef Button) /** * @} - */ + */ #if (USE_BSP_COM_FEATURE > 0) /** @addtogroup NUCLEO_WB15CC_LOW_LEVEL_COM_Functions @@ -673,6 +673,4 @@ static void COM1_MspDeInit(UART_HandleTypeDef *huart) /** * @} - */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + */ diff --git a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.h b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.h index 6387540fa..46d1dd15c 100644 --- a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.h +++ b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.h @@ -135,18 +135,18 @@ typedef enum }Presence_TypeDef; /** * @} - */ + */ /** @defgroup NUCLEO_WB15CC_LOW_LEVEL_Exported_Constants LOW LEVEL Exported Constants * @{ - */ + */ /** * @brief NUCLEO-WB15CC BSP Driver version number */ #define __NUCLEO_WB15CC_BSP_VERSION_MAIN (0x01U) /*!< [31:24] main version */ #define __NUCLEO_WB15CC_BSP_VERSION_SUB1 (0x00U) /*!< [23:16] sub1 version */ -#define __NUCLEO_WB15CC_BSP_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */ +#define __NUCLEO_WB15CC_BSP_VERSION_SUB2 (0x02U) /*!< [15:8] sub2 version */ #define __NUCLEO_WB15CC_BSP_VERSION_RC (0x00U) /*!< [7:0] release candidate */ #define __NUCLEO_WB15CC_BSP_VERSION ((__NUCLEO_WB15CC_BSP_VERSION_MAIN << 24)\ |(__NUCLEO_WB15CC_BSP_VERSION_SUB1 << 16)\ @@ -155,7 +155,7 @@ typedef enum /** * @brief Define for NUCLEO-WB15CC board - */ + */ #if !defined (USE_NUCLEO_WB15CC) #define USE_NUCLEO_WB15CC #endif @@ -184,11 +184,11 @@ typedef enum #define LEDx_GPIO_CLK_DISABLE(__INDEX__) __HAL_RCC_GPIOB_CLK_DISABLE() /* All Led on same port */ /** * @} - */ + */ /** @defgroup NUCLEO_WB15CC_LOW_LEVEL_BUTTON LOW LEVEL BUTTON Constants * @{ - */ + */ #define BUTTONn 3 /** @@ -242,7 +242,7 @@ typedef enum #if (USE_BSP_COM_FEATURE > 0) /** @defgroup NUCLEO_WB15CC_LOW_LEVEL_COM LOW LEVEL COM Port Constants * @{ - */ + */ #define COM1_UART USART1 #define COM1_CLK_ENABLE() __HAL_RCC_LPUART1_CLK_ENABLE() #define COM1_CLK_DISABLE() __HAL_RCC_LPUART1_CLK_DISABLE() @@ -351,6 +351,3 @@ HAL_StatusTypeDef MX_LPUART1_Init(UART_HandleTypeDef *huart, MX_UART_InitTypeDef #endif #endif /* NUCLEO_WB15CC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_conf_template.h b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_conf_template.h index a77d5c468..66927f899 100644 --- a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_conf_template.h +++ b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_conf_template.h @@ -49,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -72,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_errno.h b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_errno.h index b8841c2cf..a0dfa7575 100644 --- a/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_errno.h +++ b/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc_errno.h @@ -43,5 +43,3 @@ #endif #endif /* NUCLEO_WB15CC_ERRNO_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/P-NUCLEO-WB55.Nucleo/README.md b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/README.md new file mode 100644 index 000000000..c47ee62e4 --- /dev/null +++ b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/README.md @@ -0,0 +1,36 @@ +# BSP P-NUCLEO-WB55-NUCLEO Component + +![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/p-nucleo-wb55-nucleo.svg?color=brightgreen) + +## Overview + +**STM32Cube** is an STMicroelectronics original initiative to ease developers' life by reducing efforts, time and cost. + +**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series. + * The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product. + * The STM32 HAL-LL drivers, an abstraction layer offering a set of APIs ensuring maximized portability across the STM32 portfolio. + * The BSP drivers of each evaluation, demonstration or nucleo board provided for this STM32 series. + * A consistent set of middleware libraries such as RTOS, USB, FatFS, graphics, touch sensing library... + * A full set of software projects (basic examples, applications, and demonstrations) for each board provided for this STM32 series. + +Two models of publication are proposed for the STM32Cube embedded software: + * The monolithic **MCU Package**: all STM32Cube software modules of one STM32 series are present (Drivers, Middleware, Projects, Utilities) in the repository (usual name **STM32Cubexx**, xx corresponding to the STM32 series). + * The **MCU component**: each STM32Cube software module being part of the STM32Cube MCU Package, is delivered as an individual repository, allowing the user to select and get only the required software functions. + +## Description + +This **p-nucleo-wb55-nucleo** MCU component repository is one element of the **STM32CubeWB** MCU embedded software package, providing the **P-NUCLEO-WB55-NUCLEO** BSP BOARD component part. + +## Release note + +Details about the content of this release are available in the release note [here](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/p-nucleo-wb55-nucleo/blob/main/Release_Notes.html). + +## Compatibility information + +Below is the list of the BSP *component* drivers to be used with this BSP *board* driver. It is **crucial** that you use a consistent set of CMSIS - HAL - BSP versions, as mentioned in [this](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/STM32CubeWB/blob/master/Release_Notes.html) release note. + +* [stm32-bsp-common](https://github.com/STMicroelectronics/stm32-bsp-common) + +## Troubleshooting + +Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) guide. diff --git a/Drivers/BSP/P-NUCLEO-WB55.Nucleo/Release_Notes.html b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/Release_Notes.html index 7f9b59a5e..f34bf75f9 100644 --- a/Drivers/BSP/P-NUCLEO-WB55.Nucleo/Release_Notes.html +++ b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/Release_Notes.html @@ -37,10 +37,23 @@

      Update History

      - +

      Main Changes

        +
      • Update Licensing information and format +
          +
        • All source files: update disclaimer to add reference to the new license agreement
          • +
        • Add README.md file for GitHub publication
          • +
        • +
      +
      +
      +
      + +
      +

      Main Changes

      +
      • Update Release Notes template
      • Update Licensing information and format
          @@ -54,7 +67,7 @@
          -

          Main Changes

          +

          Main Changes

          • Correct LED1_GPIO_CLK_DISABLE macro
          @@ -63,7 +76,7 @@
          -

          Main Changes

          +

          Main Changes

          • Clean CORE_CM0PLUS
          @@ -72,7 +85,7 @@
          -

          Main Changes

          +

          Main Changes

          First release

          diff --git a/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c index 644cbc5c6..b269e2ce7 100644 --- a/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c +++ b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c @@ -44,7 +44,7 @@ */ #define __STM32WBxx_NUCLEO_BSP_VERSION_MAIN (0x01U) /*!< [31:24] main version */ #define __STM32WBxx_NUCLEO_BSP_VERSION_SUB1 (0x00U) /*!< [23:16] sub1 version */ -#define __STM32WBxx_NUCLEO_BSP_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */ +#define __STM32WBxx_NUCLEO_BSP_VERSION_SUB2 (0x04U) /*!< [15:8] sub2 version */ #define __STM32WBxx_NUCLEO_BSP_VERSION_RC (0x00U) /*!< [7:0] release candidate */ #define __STM32WBxx_NUCLEO_BSP_VERSION ((__STM32WBxx_NUCLEO_BSP_VERSION_MAIN << 24)\ |(__STM32WBxx_NUCLEO_BSP_VERSION_SUB1 << 16)\ @@ -855,6 +855,4 @@ static HAL_StatusTypeDef ADCx_Init(void) /** * @} - */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + */ diff --git a/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.h b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.h index 848f18dac..df63365dc 100644 --- a/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.h +++ b/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.h @@ -302,6 +302,3 @@ JOYState_TypeDef BSP_JOY_GetState(void); #endif #endif /* __STM32WBXX_NUCLEO_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/BSP/P-NUCLEO-WB55.USBDongle/README.md b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/README.md new file mode 100644 index 000000000..433861fd2 --- /dev/null +++ b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/README.md @@ -0,0 +1,36 @@ +# BSP P-NUCLEO-WB55-USB-DONGLE Component + +![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/p-nucleo-wb55-usb-dongle.svg?color=brightgreen) + +## Overview + +**STM32Cube** is an STMicroelectronics original initiative to ease developers' life by reducing efforts, time and cost. + +**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series. + * The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product. + * The STM32 HAL-LL drivers, an abstraction layer offering a set of APIs ensuring maximized portability across the STM32 portfolio. + * The BSP drivers of each evaluation, demonstration or nucleo board provided for this STM32 series. + * A consistent set of middleware libraries such as RTOS, USB, FatFS, graphics, touch sensing library... + * A full set of software projects (basic examples, applications, and demonstrations) for each board provided for this STM32 series. + +Two models of publication are proposed for the STM32Cube embedded software: + * The monolithic **MCU Package**: all STM32Cube software modules of one STM32 series are present (Drivers, Middleware, Projects, Utilities) in the repository (usual name **STM32Cubexx**, xx corresponding to the STM32 series). + * The **MCU component**: each STM32Cube software module being part of the STM32Cube MCU Package, is delivered as an individual repository, allowing the user to select and get only the required software functions. + +## Description + +This **p-nucleo-wb55-usb-dongle** MCU component repository is one element of the **STM32CubeWB** MCU embedded software package, providing the **P-NUCLEO-WB55-USB-DONGLE** BSP BOARD component part. + +## Release note + +Details about the content of this release are available in the release note [here](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/p-nucleo-wb55-usb-dongle/blob/main/Release_Notes.html). + +## Compatibility information + +Below is the list of the BSP *component* drivers to be used with this BSP *board* driver. It is **crucial** that you use a consistent set of CMSIS - HAL - BSP versions, as mentioned in [this](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/STM32CubeWB/blob/master/Release_Notes.html) release note. + +* [stm32-bsp-common](https://github.com/STMicroelectronics/stm32-bsp-common) + +## Troubleshooting + +Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) guide. diff --git a/Drivers/BSP/P-NUCLEO-WB55.USBDongle/Release_Notes.html b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/Release_Notes.html index 9ca57154e..98e922bb3 100644 --- a/Drivers/BSP/P-NUCLEO-WB55.USBDongle/Release_Notes.html +++ b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/Release_Notes.html @@ -36,10 +36,23 @@

          Update History

          - +

          Main Changes

            +
          • Update Licensing information and format +
              +
            • All source files: update disclaimer to add reference to the new license agreement
              • +
            • Add README.md file for GitHub publication
              • +
            • +
          +
          +
          +
          + +
          +

          Main Changes

          +
          • Update Release Notes template
          • Update Licensing information and format
              @@ -53,7 +66,7 @@
              -

              Main Changes

              +

              Main Changes

              • Add License.md
              @@ -62,7 +75,7 @@
              -

              Main Changes

              +

              Main Changes

              • Clean CORE_CM0PLUS
              @@ -71,7 +84,7 @@
              -

              Main Changes

              +

              Main Changes

              First release

              diff --git a/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.c b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.c index 47780b21f..7738c6693 100644 --- a/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.c +++ b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.c @@ -16,20 +16,20 @@ * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ - + */ + /* Includes ------------------------------------------------------------------*/ #include "stm32wbxx_usb_dongle.h" /** @addtogroup BSP * @{ - */ + */ /** @defgroup STM32WBXX_USB_DONGLE STM32WBxx Usb Dongle * @brief This file provides set of firmware functions to manage Leds and push-button * available on STM32WBxx Usb Dongle Kit from STMicroelectronics. * @{ - */ + */ /** @defgroup STM32WBXX_USB_DONGLE_Private_Defines Private Defines * @{ @@ -40,7 +40,7 @@ */ #define __STM32WBxx_USB_DONGLE_BSP_VERSION_MAIN (0x01U) /*!< [31:24] main version */ #define __STM32WBxx_USB_DONGLE_BSP_VERSION_SUB1 (0x00U) /*!< [23:16] sub1 version */ -#define __STM32WBxx_USB_DONGLE_BSP_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */ +#define __STM32WBxx_USB_DONGLE_BSP_VERSION_SUB2 (0x04U) /*!< [15:8] sub2 version */ #define __STM32WBxx_USB_DONGLE_BSP_VERSION_RC (0x00U) /*!< [7:0] release candidate */ #define __STM32WBxx_USB_DONGLE_BSP_VERSION ((__STM32WBxx_USB_DONGLE_BSP_VERSION_MAIN << 24)\ |(__STM32WBxx_USB_DONGLE_BSP_VERSION_SUB1 << 16)\ @@ -55,11 +55,11 @@ /** * @} - */ + */ /** @defgroup STM32WBXX_USB_DONGLE_LOW_LEVEL_Private_Variables Private Variables * @{ - */ + */ GPIO_TypeDef* GPIO_PORT[LEDn] = {LED1_GPIO_PORT, LED2_GPIO_PORT, LED3_GPIO_PORT}; const uint16_t GPIO_PIN[LEDn] = {LED1_PIN, LED2_PIN, LED3_PIN}; @@ -69,11 +69,11 @@ const uint8_t BUTTON_IRQn[BUTTONn] = {BUTTON_SW1_EXTI_IRQn}; /** * @} - */ + */ /** @defgroup STM32WBXX_USB_DONGLE_Exported_Functions Exported Functions * @{ - */ + */ /** * @brief This method returns the STM32WBxx usb dongle BSP Driver revision @@ -86,7 +86,7 @@ uint32_t BSP_GetVersion(void) /** @defgroup STM32WBXX_USB_DONGLE_LED_Functions LED Functions * @{ - */ + */ /** * @brief Configures LED GPIO. @@ -98,18 +98,18 @@ uint32_t BSP_GetVersion(void) void BSP_LED_Init(Led_TypeDef Led) { GPIO_InitTypeDef gpioinitstruct = {0}; - + /* Enable the GPIO_LED Clock */ LEDx_GPIO_CLK_ENABLE(Led); - + /* Configure the GPIO_LED pin */ gpioinitstruct.Pin = GPIO_PIN[Led]; gpioinitstruct.Mode = GPIO_MODE_OUTPUT_PP; gpioinitstruct.Pull = GPIO_NOPULL; gpioinitstruct.Speed = GPIO_SPEED_FREQ_HIGH; - + HAL_GPIO_Init(GPIO_PORT[Led], &gpioinitstruct); - + HAL_GPIO_WritePin(GPIO_PORT[Led], GPIO_PIN[Led], GPIO_PIN_RESET); } @@ -170,7 +170,7 @@ void BSP_LED_Toggle(Led_TypeDef Led) /** * @} - */ + */ /** @defgroup STM32WBXX_USB_DONGLE_BUTTON_Functions BUTTON Functions * @{ @@ -190,10 +190,10 @@ void BSP_LED_Toggle(Led_TypeDef Led) void BSP_PB_Init(Button_TypeDef Button, ButtonMode_TypeDef ButtonMode) { GPIO_InitTypeDef gpioinitstruct = {0}; - + /* Enable the BUTTON Clock */ BUTTONx_GPIO_CLK_ENABLE(Button); - + if(ButtonMode == BUTTON_MODE_GPIO) { /* Configure Button pin as input */ @@ -203,7 +203,7 @@ void BSP_PB_Init(Button_TypeDef Button, ButtonMode_TypeDef ButtonMode) gpioinitstruct.Speed = GPIO_SPEED_FREQ_HIGH; HAL_GPIO_Init(BUTTON_PORT[Button], &gpioinitstruct); } - + if(ButtonMode == BUTTON_MODE_EXTI) { /* Configure Button pin as input with External interrupt */ @@ -247,7 +247,7 @@ uint32_t BSP_PB_GetState(Button_TypeDef Button) /** * @} - */ + */ /** * @} @@ -255,10 +255,8 @@ uint32_t BSP_PB_GetState(Button_TypeDef Button) /** * @} - */ + */ /** * @} - */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + */ diff --git a/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.h b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.h index 2f168fd8e..4f99e1f81 100644 --- a/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.h +++ b/Drivers/BSP/P-NUCLEO-WB55.USBDongle/stm32wbxx_usb_dongle.h @@ -16,8 +16,8 @@ * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ - + */ + /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBXX_USB_DONGLE_H #define __STM32WBXX_USB_DONGLE_H @@ -53,27 +53,27 @@ typedef enum }Led_TypeDef; typedef enum -{ +{ BUTTON_SW1 = 0 }Button_TypeDef; typedef enum -{ +{ BUTTON_MODE_GPIO = 0, BUTTON_MODE_EXTI = 1 }ButtonMode_TypeDef; /** * @} - */ + */ /** @defgroup STM32WBXX_USB_DONGLE_Exported_Constants Exported Constants * @{ */ -/** +/** * @brief Define for STM32WBXX_USB_DONGLE board - */ + */ #if !defined (USE_STM32WBXX_USB_DONGLE) #define USE_STM32WBXX_USB_DONGLE #endif @@ -107,11 +107,11 @@ typedef enum if ((__INDEX__) == LED3) LED3_GPIO_CLK_DISABLE();} while(0) /** * @} - */ - + */ + /** @defgroup STM32WBXX_USB_DONGLE_BUTTON BUTTON Constants * @{ - */ + */ #define BUTTONn 1 /** @@ -142,7 +142,7 @@ typedef enum /** * @} - */ + */ /** * @} @@ -151,7 +151,7 @@ typedef enum /** @addtogroup STM32WBXX_USB_DONGLE_Exported_Functions * @{ - */ + */ uint32_t BSP_GetVersion(void); /** @addtogroup STM32WBXX_USB_DONGLE_LED_Functions @@ -174,11 +174,11 @@ void BSP_PB_DeInit(Button_TypeDef Button); uint32_t BSP_PB_GetState(Button_TypeDef Button); /** * @} - */ + */ /** * @} - */ + */ /** * @} @@ -193,5 +193,3 @@ uint32_t BSP_PB_GetState(Button_TypeDef Button); #endif #endif /* __STM32WBXX_USB_DONGLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/README.md b/Drivers/BSP/STM32WB5MM-DK/README.md new file mode 100644 index 000000000..ee235949a --- /dev/null +++ b/Drivers/BSP/STM32WB5MM-DK/README.md @@ -0,0 +1,40 @@ +# BSP STM32WB5MM-DK Component + +![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/stm32wb5mm-dk.svg?color=brightgreen) + +## Overview + +**STM32Cube** is an STMicroelectronics original initiative to ease developers' life by reducing efforts, time and cost. + +**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series. + * The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product. + * The STM32 HAL-LL drivers, an abstraction layer offering a set of APIs ensuring maximized portability across the STM32 portfolio. + * The BSP drivers of each evaluation, demonstration or nucleo board provided for this STM32 series. + * A consistent set of middleware libraries such as RTOS, USB, FatFS, graphics, touch sensing library... + * A full set of software projects (basic examples, applications, and demonstrations) for each board provided for this STM32 series. + +Two models of publication are proposed for the STM32Cube embedded software: + * The monolithic **MCU Package**: all STM32Cube software modules of one STM32 series are present (Drivers, Middleware, Projects, Utilities) in the repository (usual name **STM32Cubexx**, xx corresponding to the STM32 series). + * The **MCU component**: each STM32Cube software module being part of the STM32Cube MCU Package, is delivered as an individual repository, allowing the user to select and get only the required software functions. + +## Description + +This **stm32wb5mm-dk** MCU component repository is one element of the **STM32CubeWB** MCU embedded software package, providing the **STM32WB5MM-DK** BSP BOARD component part. + +## Release note + +Details about the content of this release are available in the release note [here](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/stm32wb5mm-dk/blob/main/Release_Notes.html). + +## Compatibility information + +Below is the list of the BSP *component* drivers to be used with this BSP *board* driver. It is **crucial** that you use a consistent set of CMSIS - HAL - BSP versions, as mentioned in [this](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/STM32CubeWB/blob/master/Release_Notes.html) release note. + +* [stm32-bsp-common](https://github.com/STMicroelectronics/stm32-bsp-common) +* [stm32-ism330dhcx](https://github.com/STMicroelectronics/stm32-ism330dhcx) +* [stm32-s25fl128s](https://github.com/STMicroelectronics/stm32-s25fl128s) +* [stm32-ssd1315](https://github.com/STMicroelectronics/stm32-ssd1315) +* [stm32-stts22h](https://github.com/STMicroelectronics/stm32-stts22h) + +## Troubleshooting + +Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) guide. diff --git a/Drivers/BSP/STM32WB5MM-DK/Release_Notes.html b/Drivers/BSP/STM32WB5MM-DK/Release_Notes.html index f512285e6..381c298b9 100644 --- a/Drivers/BSP/STM32WB5MM-DK/Release_Notes.html +++ b/Drivers/BSP/STM32WB5MM-DK/Release_Notes.html @@ -41,10 +41,25 @@

              Update History

              - +

              Main Changes

                +
              • Update COM1 config to use VCP
                • +
              • Correct English spelling typos and remove non UTF-8 characters in comments
                • +
              • Update Licensing information and format +
                  +
                • All source files: update disclaimer to add reference to the new license agreement
                  • +
                • Add README.md file for GitHub publication
                  • +
                • +
              +
              +
              +
              + +
              +

              Main Changes

              +
              • Update Release Notes template
              • Update Licensing information and format
                  @@ -58,7 +73,7 @@
                  -

                  Main Changes

                  +

                  Main Changes

                  First release

                  diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.c index 059cbc699..4ab906197 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.c @@ -928,5 +928,3 @@ void TIM17_MspDeInit(TIM_HandleTypeDef *htim) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.h index 90268c009..c3dd4b057 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.h @@ -144,7 +144,7 @@ typedef struct */ #define STM32WB5MM_DK_BSP_VERSION_MAIN (0x01U) /*!< [31:24] main version */ #define STM32WB5MM_DK_BSP_VERSION_SUB1 (0x00U) /*!< [23:16] sub1 version */ -#define STM32WB5MM_DK_BSP_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */ +#define STM32WB5MM_DK_BSP_VERSION_SUB2 (0x02U) /*!< [15:8] sub2 version */ #define STM32WB5MM_DK_BSP_VERSION_RC (0x00U) /*!< [7:0] release candidate */ #define STM32WB5MM_DK_BSP_VERSION ((STM32WB5MM_DK_BSP_VERSION_MAIN << 24U)\ |(STM32WB5MM_DK_BSP_VERSION_SUB1 << 16U)\ @@ -248,21 +248,21 @@ typedef struct */ #define COMn 1U -#define COM1_UART LPUART1 -#define COM1_CLK_ENABLE() __HAL_RCC_LPUART1_CLK_ENABLE() -#define COM1_CLK_DISABLE() __HAL_RCC_LPUART1_CLK_DISABLE() - -#define COM1_TX_PIN GPIO_PIN_2 -#define COM1_TX_GPIO_PORT GPIOA -#define COM1_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() -#define COM1_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOA_CLK_DISABLE() -#define COM1_TX_AF GPIO_AF8_LPUART1 - -#define COM1_RX_PIN GPIO_PIN_3 -#define COM1_RX_GPIO_PORT GPIOA -#define COM1_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() -#define COM1_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOA_CLK_DISABLE() -#define COM1_RX_AF GPIO_AF8_LPUART1 +#define COM1_UART USART1 +#define COM1_CLK_ENABLE() __HAL_RCC_USART1_CLK_ENABLE() +#define COM1_CLK_DISABLE() __HAL_RCC_USART1_CLK_DISABLE() + +#define COM1_TX_PIN GPIO_PIN_6 +#define COM1_TX_GPIO_PORT GPIOB +#define COM1_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define COM1_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() +#define COM1_TX_AF GPIO_AF7_USART1 + +#define COM1_RX_PIN GPIO_PIN_7 +#define COM1_RX_GPIO_PORT GPIOB +#define COM1_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define COM1_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() +#define COM1_RX_AF GPIO_AF7_USART1 #define COM_POLL_TIMEOUT 1000 #define MX_UART_InitTypeDef COM_InitTypeDef @@ -366,5 +366,3 @@ HAL_StatusTypeDef MX_LPUART1_Init(UART_HandleTypeDef *huart, MX_UART_InitTypeDef #endif #endif /* STM32WB5MM_DK_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.c index e1f5830c2..cc8158af0 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.c @@ -4,6 +4,17 @@ * @author MCD Application Team * @brief This file provides the Audio driver for the STM32WB5MM-DK * discovery board. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim How To use this driver: ----------------------- @@ -52,16 +63,6 @@ @endverbatim ****************************************************************************** - * @attention - * - * Copyright (c) 2021 STMicroelectronics. - * All rights reserved. - * - * This software is licensed under terms that can be found in the LICENSE file - * in the root directory of this software component. - * If no LICENSE file comes with this software, it is provided AS-IS. - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -88,7 +89,7 @@ /** * @} - */ + */ /** @defgroup STM32WB5MM_DK_AUDIO_Exported_Variables STM32WB5MM_DK AUDIO Exported Variables * @{ @@ -618,7 +619,7 @@ int32_t BSP_AUDIO_IN_GetChannelsNbr(uint32_t Instance, uint32_t *ChannelNbr) /** * @brief Set the current audio in volume level. * @param Instance AUDIO IN Instance. - * @param Volume Volume level to be returnd + * @param Volume Volume level to be returned * @retval BSP status */ int32_t BSP_AUDIO_IN_SetVolume(uint32_t Instance, uint32_t Volume) @@ -660,7 +661,7 @@ int32_t BSP_AUDIO_IN_SetVolume(uint32_t Instance, uint32_t Volume) /** * @brief Get the current audio in volume level. * @param Instance AUDIO IN Instance. - * @param Volume Volume level to be returnd + * @param Volume Volume level to be returned * @retval BSP status */ int32_t BSP_AUDIO_IN_GetVolume(uint32_t Instance, uint32_t *Volume) @@ -785,11 +786,11 @@ __weak void BSP_AUDIO_IN_Error_CallBack(uint32_t Instance) /** * @} - */ + */ /** @defgroup BSP_AUDIO_IN_Private_Functions STM32WB5MM_DK AUDIO IN Private Functions * @{ - */ + */ /******************************************************************************* Static Functions @@ -938,7 +939,7 @@ __weak HAL_StatusTypeDef MX_SAI1_Block_A_Init(SAI_HandleTypeDef* hsai,uint32_t P /** * @} - */ + */ /** * @} @@ -950,6 +951,4 @@ __weak HAL_StatusTypeDef MX_SAI1_Block_A_Init(SAI_HandleTypeDef* hsai,uint32_t P /** * @} - */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + */ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.h index c542f8ea6..bcbe8a416 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_audio.h @@ -68,7 +68,7 @@ typedef struct uint32_t Size; /* Audio IN record buffer size */ uint32_t Volume; /* Audio IN volume */ uint32_t State; /* Audio IN State */ - uint32_t IsMspCallbacksValid; /* Is Msp Callbacks registred */ + uint32_t IsMspCallbacksValid; /* Is Msp Callbacks registered */ uint32_t DecimationFactor; }AUDIO_IN_Ctx_t; @@ -82,7 +82,7 @@ typedef struct /** * @} - */ + */ /** @defgroup STM32WB5MM_DK_AUDIO_Exported_Constants STM32WB5MM_DK AUDIO Exported Constants * @{ @@ -261,5 +261,3 @@ HAL_StatusTypeDef MX_SAI1_Block_A_Init(SAI_HandleTypeDef* hsai,uint32_t PDM_FREQ #endif #endif /* STM32WB5MM_DK_AUDIO_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.c index 1a8552a5c..5ecfd1495 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.c @@ -1047,7 +1047,7 @@ static uint32_t I2C_Compute_SCLL_SCLH (uint32_t clock_src_freq, uint32_t I2C_spe * @brief Convert the SPI baudfreq into tpresc. * @param clock_src_freq : SPI source clock in HZ. * @param baudfreq_mbps : SPI baud freq in mbps. - * @retval Prescaler dividor + * @retval Prescaler divisor */ static uint32_t SPI_GetPrescaler( uint32_t clock_src_freq, uint32_t baudfreq_mbps ) { @@ -1094,5 +1094,3 @@ static uint32_t SPI_GetPrescaler( uint32_t clock_src_freq, uint32_t baudfreq_mbp /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.h index 0ed8c18f9..df8215456 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.h @@ -173,5 +173,3 @@ int32_t BSP_GetTick(void); #endif #endif /* STM32WB5MM_DK_BUS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_conf_template.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_conf_template.h index 256d84e7b..53846fa55 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_conf_template.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_conf_template.h @@ -45,7 +45,7 @@ extern "C" { #define BSP_BUTTON_USERx_IT_PRIORITY 0x0FUL #define PWM_LED_CLOCK_IT_PRIORITY 0x03UL -/* I2C3 Frequeny in Hz */ +/* I2C3 Frequency in Hz */ #define BUS_I2C3_FREQUENCY 100000UL /* Frequency of I2C3 = 100 KHz*/ /* Indicates whether or not TCXO is supported by the board @@ -93,5 +93,3 @@ extern "C" { #endif #endif /* STM32WB5MM_DK_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.c index 9e510f45d..5e037d366 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.c @@ -514,5 +514,3 @@ static int32_t STTS22H_0_Probe(uint32_t Functions) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.h index 169bc2b1c..faea17d51 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors.h @@ -139,5 +139,3 @@ int32_t BSP_ENV_SENSOR_GetValue(uint32_t Instance, uint32_t Function, float *Val #endif #endif /* STM32WB5MM_DK_ENV_SENSORS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.c index f466d007d..b90ca215c 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.c @@ -501,5 +501,3 @@ int32_t BSP_ENV_SENSOR_Get_One_Shot_Status(uint32_t Instance, uint8_t *Status) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.h index 54e72b346..ef641be0b 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_env_sensors_ex.h @@ -81,5 +81,3 @@ int32_t BSP_ENV_SENSOR_Get_One_Shot_Status(uint32_t Instance, uint8_t *Status); #endif #endif /* BSP_ENV_SENSOR_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_errno.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_errno.h index 47655f184..595d2b5d5 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_errno.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_errno.h @@ -45,5 +45,3 @@ #define BSP_ERROR_BUS_PROTOCOL_FAILURE -103 #endif /* STM32WB5MM_DK_ERRNO_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.c index 025ac1506..2c1b4e3e4 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.c @@ -1196,5 +1196,3 @@ static int32_t LCD_IO_DeInit(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.h index 3c1b9e7fd..25bd6dc1e 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.h @@ -194,5 +194,3 @@ int32_t BSP_LCD_SendData(uint8_t *pData, uint16_t Length); #endif #endif /* STM32WB5MM_DK_LCD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.c index 1a892b0a6..4557efb51 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.c @@ -677,5 +677,3 @@ static int32_t ISM330DHCX_0_Probe(uint32_t Functions) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.h index 965d1702a..08d7f3ba2 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors.h @@ -160,5 +160,3 @@ int32_t BSP_MOTION_SENSOR_SetFullScale(uint32_t Instance, uint32_t Function, int #endif #endif /* STM32WB5MM_DK_MOTION_SENSORS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.c index 33b4f7248..19acdf0fe 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.c @@ -183,5 +183,3 @@ int32_t BSP_MOTION_SENSOR_Write_Register(uint32_t Instance, uint8_t Reg, uint8_t /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.h index aef463aa5..5be594458 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_motion_sensors_ex.h @@ -69,5 +69,3 @@ int32_t BSP_MOTION_SENSOR_Write_Register(uint32_t Instance, uint8_t Reg, uint8_t #endif #endif /* BSP_MOTION_SENSOR_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.c b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.c index b16d0d706..7aba86274 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.c +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.c @@ -4,6 +4,17 @@ * @author MCD Application Team * @brief This file includes a standard driver for the S25FL128S QSPI * memory mounted on STM32WB5MM-DK board. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -37,16 +48,6 @@ Memory type, Memory density. @endverbatim ****************************************************************************** - * @attention - * - * Copyright (c) 2021 STMicroelectronics. - * All rights reserved. - * - * This software is licensed under terms that can be found in the LICENSE file - * in the root directory of this software component. - * If no LICENSE file comes with this software, it is provided AS-IS. - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -919,6 +920,3 @@ static int32_t QSPI_DummyCyclesCfg(uint32_t Instance) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.h b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.h index 22fb36a5c..a1208decd 100644 --- a/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.h +++ b/Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_qspi.h @@ -212,5 +212,3 @@ HAL_StatusTypeDef MX_QSPI_Init(QSPI_HandleTypeDef *hQspi, MX_QSPI_Init_t *Config #endif #endif /* STM32WB5MM_DK_QSPI_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb10xx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb10xx.h index 063adf308..488328f8b 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb10xx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb10xx.h @@ -380,7 +380,7 @@ uint32_t RESERVED0[2]; /*!< Reserved, __IO uint32_t CIER; /*!< RCC Clock Interrupt Enable Register, Address offset: 0x18 */ __IO uint32_t CIFR; /*!< RCC Clock Interrupt Flag Register, Address offset: 0x1C */ __IO uint32_t CICR; /*!< RCC Clock Interrupt Clear Register, Address offset: 0x20 */ - __IO uint32_t SMPSCR; /*!< RCC SMPS step-down converter control register, Address offset: 0x24 */ +uint32_t RESERVED11; /*!< Reserved, Address offset: 0x24 */ __IO uint32_t AHB1RSTR; /*!< RCC AHB1 peripheral reset register, Address offset: 0x28 */ __IO uint32_t AHB2RSTR; /*!< RCC AHB2 peripheral reset register, Address offset: 0x2C */ __IO uint32_t AHB3RSTR; /*!< RCC AHB3 & AHB4 peripheral reset register, Address offset: 0x30 */ @@ -413,7 +413,7 @@ uint32_t RESERVED6; /*!< Reserved, __IO uint32_t HSECR; /*!< RCC HSE Clock Register, Address offset: 0x9C */ uint32_t RESERVED7[26]; /*!< Reserved, Address offset: 0xA0-0x104 */ __IO uint32_t EXTCFGR; /*!< RCC Extended Clock Recovery Register, Address offset: 0x108 */ -uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ +uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ __IO uint32_t C2AHB1ENR; /*!< RRCC AHB1 peripheral CPU2 clocks enable register, Address offset: 0x148 */ __IO uint32_t C2AHB2ENR; /*!< RCC AHB2 peripheral CPU2 clocks enable register, Address offset: 0x14C */ __IO uint32_t C2AHB3ENR; /*!< RCC AHB3 & AHB4 peripheral CPU2 clocks enable register,, Address offset: 0x150 */ @@ -755,10 +755,10 @@ typedef struct /*!< Memory, OTP and Option bytes */ /* Base addresses */ -#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_BASE (0x1FFF7800UL) /*!< Option Bytes : 128B (0x1FFF7800 0x1FFF787F) */ -#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_BASE (0x1FFF7800UL) /*!< Option Bytes : 128B (0x1FFF7800 - 0x1FFF787F) */ +#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ #define SRAM1_BASE SRAM_BASE /*!< SRAM1(up to 12 KB) base address */ #define SRAM2A_BASE (SRAM_BASE + 0x00030000UL)/*!< SRAM2A(32 KB) base address */ @@ -771,14 +771,14 @@ typedef struct #define SRAM2B_SIZE 0x00001000UL /*!< SRAM2b default size : 4 KB */ /* End addresses */ -#define SRAM1_END_ADDR (0x20002FFFUL) /*!< SRAM1 : 12KB (0x20000000 0x20002FFF) */ -#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 0x20037FFF) */ -#define SRAM2B_END_ADDR (0x20038FFFUL) /*!< SRAM2b (backup) : 4KB (0x20038000 0x20038FFF) */ +#define SRAM1_END_ADDR (0x20002FFFUL) /*!< SRAM1 : 12KB (0x20000000 - 0x20002FFF) */ +#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 - 0x20037FFF) */ +#define SRAM2B_END_ADDR (0x20038FFFUL) /*!< SRAM2b (backup) : 4KB (0x20038000 - 0x20038FFF) */ -#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ /*!< Peripheral memory map */ #define APB1PERIPH_BASE PERIPH_BASE @@ -1086,7 +1086,7 @@ typedef struct #define ADC_CFGR1_ALIGN_Pos (5U) #define ADC_CFGR1_ALIGN_Msk (0x1UL << ADC_CFGR1_ALIGN_Pos) /*!< 0x00000020 */ -#define ADC_CFGR1_ALIGN ADC_CFGR1_ALIGN_Msk /*!< ADC data alignement */ +#define ADC_CFGR1_ALIGN ADC_CFGR1_ALIGN_Msk /*!< ADC data alignment */ #define ADC_CFGR1_EXTSEL_Pos (6U) #define ADC_CFGR1_EXTSEL_Msk (0x7UL << ADC_CFGR1_EXTSEL_Pos) /*!< 0x000001C0 */ @@ -1136,7 +1136,7 @@ typedef struct #define ADC_CFGR1_AWD1CH_3 (0x08UL << ADC_CFGR1_AWD1CH_Pos) /*!< 0x20000000 */ #define ADC_CFGR1_AWD1CH_4 (0x10UL << ADC_CFGR1_AWD1CH_Pos) /*!< 0x40000000 */ -/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec accross STM32WB serie */ +/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec across STM32WB series */ #define ADC_CFGR_DMAEN_Pos ADC_CFGR1_DMAEN_Pos #define ADC_CFGR_DMAEN_Msk ADC_CFGR1_DMAEN_Msk #define ADC_CFGR_DMAEN ADC_CFGR1_DMAEN @@ -1477,7 +1477,7 @@ typedef struct #define ADC_DR_DATA_14 (0x4000UL << ADC_DR_DATA_Pos) /*!< 0x00004000 */ #define ADC_DR_DATA_15 (0x8000UL << ADC_DR_DATA_Pos) /*!< 0x00008000 */ -/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec accross STM32WB serie */ +/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec across STM32WB series */ #define ADC_DR_RDATA_Pos ADC_DR_DATA_Pos #define ADC_DR_RDATA_Msk ADC_DR_DATA_Msk #define ADC_DR_RDATA ADC_DR_DATA @@ -3040,12 +3040,12 @@ typedef struct /* Arithmetic addition output data */ #define PKA_ARITHMETIC_ADD_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Arithmetic substraction input data */ +/* Arithmetic subtraction input data */ #define PKA_ARITHMETIC_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_ARITHMETIC_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_ARITHMETIC_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ -/* Arithmetic substraction output data */ +/* Arithmetic subtraction output data */ #define PKA_ARITHMETIC_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Arithmetic multiplication input data */ @@ -3081,13 +3081,13 @@ typedef struct /* Modular inversion output data */ #define PKA_MODULAR_INV_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Modular substraction input data */ +/* Modular subtraction input data */ #define PKA_MODULAR_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_MODULAR_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_MODULAR_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ #define PKA_MODULAR_SUB_IN_OP3_MOD ((0xD5CU - PKA_RAM_OFFSET)>>2) /*!< Input operand op3 */ -/* Modular substraction output data */ +/* Modular subtraction output data */ #define PKA_MODULAR_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Montgomery multiplication input data */ @@ -5498,13 +5498,6 @@ typedef struct #define PWR_SR1_WUFI PWR_SR1_WUFI_Msk /*!< Internal wakeup interrupt flag */ /******************** Bit definition for PWR_SR2 register ********************/ -#define PWR_SR2_SMPSBF_Pos (0U) -#define PWR_SR2_SMPSBF_Msk (0x1UL << PWR_SR2_SMPSBF_Pos) /*!< 0x00000001 */ -#define PWR_SR2_SMPSBF PWR_SR2_SMPSBF_Msk /*!< SMPS step down converter in operating mode bypass flag */ -#define PWR_SR2_SMPSF_Pos (1U) -#define PWR_SR2_SMPSF_Msk (0x1UL << PWR_SR2_SMPSF_Pos) /*!< 0x00000002 */ -#define PWR_SR2_SMPSF PWR_SR2_SMPSF_Msk /*!< SMPS step down converter in operating mode step down flag */ - #define PWR_SR2_REGLPS_Pos (8U) #define PWR_SR2_REGLPS_Msk (0x1UL << PWR_SR2_REGLPS_Pos) /*!< 0x00000100 */ #define PWR_SR2_REGLPS PWR_SR2_REGLPS_Msk /*!< Low-power regulator started */ @@ -5531,10 +5524,6 @@ typedef struct #define PWR_SCR_CWUF4_Msk (0x1UL << PWR_SCR_CWUF4_Pos) /*!< 0x00000008 */ #define PWR_SCR_CWUF4 PWR_SCR_CWUF4_Msk /*!< Clear Wake-up Pin 4 [Flag 3] */ -#define PWR_SCR_CSMPSFBF_Pos (7U) -#define PWR_SCR_CSMPSFBF_Msk (0x1UL << PWR_SCR_CSMPSFBF_Pos) /*!< 0x00000080 */ -#define PWR_SCR_CSMPSFBF PWR_SCR_CSMPSFBF_Msk /*!< Clear SMPS Step Down converter forced in bypass mode interrupt flag */ - #define PWR_SCR_CBORHF_Pos (8U) #define PWR_SCR_CBORHF_Msk (0x1UL << PWR_SCR_CBORHF_Pos) /*!< 0x00000100 */ #define PWR_SCR_CBORHF PWR_SCR_CBORHF_Msk /*!< Clear BORH interrupt flag */ @@ -5554,30 +5543,6 @@ typedef struct #define PWR_SCR_CC2HF_Msk (0x1UL << PWR_SCR_CC2HF_Pos) /*!< 0x00004000 */ #define PWR_SCR_CC2HF PWR_SCR_CC2HF_Msk /*!< Clear CPU2 Hold interrupt flag */ -/******************** Bit definition for PWR_CR5 register ********************/ -#define PWR_CR5_SMPSVOS_Pos (0U) -#define PWR_CR5_SMPSVOS_Msk (0xFUL << PWR_CR5_SMPSVOS_Pos) /*!< 0x0000000F */ -#define PWR_CR5_SMPSVOS PWR_CR5_SMPSVOS_Msk /*!< SMPS step down converter voltage output scaling voltage level */ -#define PWR_CR5_SMPSVOS_0 (0x01U << PWR_CR5_SMPSVOS_Pos) /*!< 0x00000001 */ -#define PWR_CR5_SMPSVOS_1 (0x02U << PWR_CR5_SMPSVOS_Pos) /*!< 0x00000002 */ -#define PWR_CR5_SMPSVOS_2 (0x04U << PWR_CR5_SMPSVOS_Pos) /*!< 0x00000004 */ -#define PWR_CR5_SMPSVOS_3 (0x08U << PWR_CR5_SMPSVOS_Pos) /*!< 0x00000008 */ - -#define PWR_CR5_SMPSSC_Pos (4U) -#define PWR_CR5_SMPSSC_Msk (0x7UL << PWR_CR5_SMPSSC_Pos) /*!< 0x00000070 */ -#define PWR_CR5_SMPSSC PWR_CR5_SMPSSC_Msk /*!< SMPS step down converter supply startup current selection */ -#define PWR_CR5_SMPSSC_0 (0x01U << PWR_CR5_SMPSSC_Pos) /*!< 0x00000010 */ -#define PWR_CR5_SMPSSC_1 (0x02U << PWR_CR5_SMPSSC_Pos) /*!< 0x00000020 */ -#define PWR_CR5_SMPSSC_2 (0x04U << PWR_CR5_SMPSSC_Pos) /*!< 0x00000040 */ - -#define PWR_CR5_BORHC_Pos (8U) -#define PWR_CR5_BORHC_Msk (0x1UL << PWR_CR5_BORHC_Pos) /*!< 0x00000100 */ -#define PWR_CR5_BORHC PWR_CR5_BORHC_Msk /*!< BORH configuration selection */ - -#define PWR_CR5_SMPSEN_Pos (15U) -#define PWR_CR5_SMPSEN_Msk (0x1UL << PWR_CR5_SMPSEN_Pos) /*!< 0x00008000 */ -#define PWR_CR5_SMPSEN PWR_CR5_SMPSEN_Msk /*!< Enable SMPS Step Down converter SMPS mode enable */ - /******************** Bit definition for PWR_PUCRA register *****************/ #define PWR_PUCRA_PA0_Pos (0U) #define PWR_PUCRA_PA0_Msk (0x1UL << PWR_PUCRA_PA0_Pos) /*!< 0x00000001 */ @@ -5852,7 +5817,6 @@ typedef struct /* * @brief Specific device feature definitions */ -#define RCC_SMPS_SUPPORT /******************** Bit definition for RCC_CR register *****************/ #define RCC_CR_MSION_Pos (0U) @@ -6189,25 +6153,6 @@ typedef struct #define RCC_CICR_LSI2RDYC_Msk (0x1UL << RCC_CICR_LSI2RDYC_Pos) /*!< 0x00000800 */ #define RCC_CICR_LSI2RDYC RCC_CICR_LSI2RDYC_Msk -/******************** Bit definition for RCC_SMPSCR register ******************/ -#define RCC_SMPSCR_SMPSSEL_Pos (0U) -#define RCC_SMPSCR_SMPSSEL_Msk (0x3UL << RCC_SMPSCR_SMPSSEL_Pos) /*!< 0x00000003 */ -#define RCC_SMPSCR_SMPSSEL RCC_SMPSCR_SMPSSEL_Msk -#define RCC_SMPSCR_SMPSSEL_0 (0x1U << RCC_SMPSCR_SMPSSEL_Pos) /*!< 0x00000001 */ -#define RCC_SMPSCR_SMPSSEL_1 (0x2U << RCC_SMPSCR_SMPSSEL_Pos) /*!< 0x00000002 */ - -#define RCC_SMPSCR_SMPSDIV_Pos (4U) -#define RCC_SMPSCR_SMPSDIV_Msk (0x3UL << RCC_SMPSCR_SMPSDIV_Pos) /*!< 0x00000030 */ -#define RCC_SMPSCR_SMPSDIV RCC_SMPSCR_SMPSDIV_Msk -#define RCC_SMPSCR_SMPSDIV_0 (0x1U << RCC_SMPSCR_SMPSDIV_Pos) /*!< 0x00000010 */ -#define RCC_SMPSCR_SMPSDIV_1 (0x2U << RCC_SMPSCR_SMPSDIV_Pos) /*!< 0x00000020 */ - -#define RCC_SMPSCR_SMPSSWS_Pos (8U) -#define RCC_SMPSCR_SMPSSWS_Msk (0x3UL << RCC_SMPSCR_SMPSSWS_Pos) /*!< 0x00000300 */ -#define RCC_SMPSCR_SMPSSWS RCC_SMPSCR_SMPSSWS_Msk -#define RCC_SMPSCR_SMPSSWS_0 (0x1U << RCC_SMPSCR_SMPSSWS_Pos) /*!< 0x00000100 */ -#define RCC_SMPSCR_SMPSSWS_1 (0x2U << RCC_SMPSCR_SMPSSWS_Pos) /*!< 0x00000200 */ - /******************** Bit definition for RCC_AHB1RSTR register **************/ #define RCC_AHB1RSTR_DMA1RST_Pos (0U) #define RCC_AHB1RSTR_DMA1RST_Msk (0x1UL << RCC_AHB1RSTR_DMA1RST_Pos) /*!< 0x00000001 */ @@ -7009,10 +6954,10 @@ typedef struct #define RTC_CR_OSEL_1 (0x2U << RTC_CR_OSEL_Pos) /*!< 0x00400000 */ #define RTC_CR_POL_Pos (20U) #define RTC_CR_POL_Msk (0x1UL << RTC_CR_POL_Pos) /*!< 0x00100000 */ -#define RTC_CR_POL RTC_CR_POL_Msk /*!< Ouput polarity */ +#define RTC_CR_POL RTC_CR_POL_Msk /*!< Output polarity */ #define RTC_CR_COSEL_Pos (19U) #define RTC_CR_COSEL_Msk (0x1UL << RTC_CR_COSEL_Pos) /*!< 0x00080000 */ -#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration ouput selection */ +#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration output selection */ #define RTC_CR_BKP_Pos (18U) #define RTC_CR_BKP_Msk (0x1UL << RTC_CR_BKP_Pos) /*!< 0x00040000 */ #define RTC_CR_BKP RTC_CR_BKP_Msk /*!< Backup */ @@ -7281,7 +7226,7 @@ typedef struct /******************** Bits definition for RTC_SHIFTR register ***************/ #define RTC_SHIFTR_SUBFS_Pos (0U) #define RTC_SHIFTR_SUBFS_Msk (0x7FFFUL << RTC_SHIFTR_SUBFS_Pos) /*!< 0x00007FFF */ -#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Substract a fraction of a second */ +#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Subtract a fraction of a second */ #define RTC_SHIFTR_ADD1S_Pos (31U) #define RTC_SHIFTR_ADD1S_Msk (0x1UL << RTC_SHIFTR_ADD1S_Pos) /*!< 0x80000000 */ #define RTC_SHIFTR_ADD1S RTC_SHIFTR_ADD1S_Msk /*!< Add on second */ @@ -8427,100 +8372,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR1 register (SYSCFG SRAM2A write protection register) *********************************************************/ #define SYSCFG_SWPR1_PAGE0_Pos (0U) #define SYSCFG_SWPR1_PAGE0_Msk (0x1UL << SYSCFG_SWPR1_PAGE0_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 0x200303FF) */ +#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 - 0x200303FF) */ #define SYSCFG_SWPR1_PAGE1_Pos (1U) #define SYSCFG_SWPR1_PAGE1_Msk (0x1UL << SYSCFG_SWPR1_PAGE1_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 0x200307FF) */ +#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 - 0x200307FF) */ #define SYSCFG_SWPR1_PAGE2_Pos (2U) #define SYSCFG_SWPR1_PAGE2_Msk (0x1UL << SYSCFG_SWPR1_PAGE2_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 0x20030BFF) */ +#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 - 0x20030BFF) */ #define SYSCFG_SWPR1_PAGE3_Pos (3U) #define SYSCFG_SWPR1_PAGE3_Msk (0x1UL << SYSCFG_SWPR1_PAGE3_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 0x20030FFF) */ +#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 - 0x20030FFF) */ #define SYSCFG_SWPR1_PAGE4_Pos (4U) #define SYSCFG_SWPR1_PAGE4_Msk (0x1UL << SYSCFG_SWPR1_PAGE4_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 0x200313FF) */ +#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 - 0x200313FF) */ #define SYSCFG_SWPR1_PAGE5_Pos (5U) #define SYSCFG_SWPR1_PAGE5_Msk (0x1UL << SYSCFG_SWPR1_PAGE5_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 0x200317FF) */ +#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 - 0x200317FF) */ #define SYSCFG_SWPR1_PAGE6_Pos (6U) #define SYSCFG_SWPR1_PAGE6_Msk (0x1UL << SYSCFG_SWPR1_PAGE6_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 0x20031BFF) */ +#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 - 0x20031BFF) */ #define SYSCFG_SWPR1_PAGE7_Pos (7U) #define SYSCFG_SWPR1_PAGE7_Msk (0x1UL << SYSCFG_SWPR1_PAGE7_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 0x20031FFF) */ +#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 - 0x20031FFF) */ #define SYSCFG_SWPR1_PAGE8_Pos (8U) #define SYSCFG_SWPR1_PAGE8_Msk (0x1UL << SYSCFG_SWPR1_PAGE8_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 0x200323FF) */ +#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 - 0x200323FF) */ #define SYSCFG_SWPR1_PAGE9_Pos (9U) #define SYSCFG_SWPR1_PAGE9_Msk (0x1UL << SYSCFG_SWPR1_PAGE9_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 0x200327FF) */ +#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 - 0x200327FF) */ #define SYSCFG_SWPR1_PAGE10_Pos (10U) #define SYSCFG_SWPR1_PAGE10_Msk (0x1UL << SYSCFG_SWPR1_PAGE10_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 0x20032BFF) */ +#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 - 0x20032BFF) */ #define SYSCFG_SWPR1_PAGE11_Pos (11U) #define SYSCFG_SWPR1_PAGE11_Msk (0x1UL << SYSCFG_SWPR1_PAGE11_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 0x20032FFF) */ +#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 - 0x20032FFF) */ #define SYSCFG_SWPR1_PAGE12_Pos (12U) #define SYSCFG_SWPR1_PAGE12_Msk (0x1UL << SYSCFG_SWPR1_PAGE12_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 0x200333FF) */ +#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 - 0x200333FF) */ #define SYSCFG_SWPR1_PAGE13_Pos (13U) #define SYSCFG_SWPR1_PAGE13_Msk (0x1UL << SYSCFG_SWPR1_PAGE13_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 0x200337FF) */ +#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 - 0x200337FF) */ #define SYSCFG_SWPR1_PAGE14_Pos (14U) #define SYSCFG_SWPR1_PAGE14_Msk (0x1UL << SYSCFG_SWPR1_PAGE14_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 0x20033BFF) */ +#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 - 0x20033BFF) */ #define SYSCFG_SWPR1_PAGE15_Pos (15U) #define SYSCFG_SWPR1_PAGE15_Msk (0x1UL << SYSCFG_SWPR1_PAGE15_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 0x20033FFF) */ +#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 - 0x20033FFF) */ #define SYSCFG_SWPR1_PAGE16_Pos (16U) #define SYSCFG_SWPR1_PAGE16_Msk (0x1UL << SYSCFG_SWPR1_PAGE16_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 0x200343FF) */ +#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 - 0x200343FF) */ #define SYSCFG_SWPR1_PAGE17_Pos (17U) #define SYSCFG_SWPR1_PAGE17_Msk (0x1UL << SYSCFG_SWPR1_PAGE17_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 0x200347FF) */ +#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 - 0x200347FF) */ #define SYSCFG_SWPR1_PAGE18_Pos (18U) #define SYSCFG_SWPR1_PAGE18_Msk (0x1UL << SYSCFG_SWPR1_PAGE18_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 0x20034BFF) */ +#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 - 0x20034BFF) */ #define SYSCFG_SWPR1_PAGE19_Pos (19U) #define SYSCFG_SWPR1_PAGE19_Msk (0x1UL << SYSCFG_SWPR1_PAGE19_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 0x20034FFF) */ +#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 - 0x20034FFF) */ #define SYSCFG_SWPR1_PAGE20_Pos (20U) #define SYSCFG_SWPR1_PAGE20_Msk (0x1UL << SYSCFG_SWPR1_PAGE20_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 0x200353FF) */ +#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 - 0x200353FF) */ #define SYSCFG_SWPR1_PAGE21_Pos (21U) #define SYSCFG_SWPR1_PAGE21_Msk (0x1UL << SYSCFG_SWPR1_PAGE21_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 0x200357FF) */ +#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 - 0x200357FF) */ #define SYSCFG_SWPR1_PAGE22_Pos (22U) #define SYSCFG_SWPR1_PAGE22_Msk (0x1UL << SYSCFG_SWPR1_PAGE22_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 0x20035BFF) */ +#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 - 0x20035BFF) */ #define SYSCFG_SWPR1_PAGE23_Pos (23U) #define SYSCFG_SWPR1_PAGE23_Msk (0x1UL << SYSCFG_SWPR1_PAGE23_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 0x20035FFF) */ +#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 - 0x20035FFF) */ #define SYSCFG_SWPR1_PAGE24_Pos (24U) #define SYSCFG_SWPR1_PAGE24_Msk (0x1UL << SYSCFG_SWPR1_PAGE24_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 0x200363FF) */ +#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 - 0x200363FF) */ #define SYSCFG_SWPR1_PAGE25_Pos (25U) #define SYSCFG_SWPR1_PAGE25_Msk (0x1UL << SYSCFG_SWPR1_PAGE25_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 0x200367FF) */ +#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 - 0x200367FF) */ #define SYSCFG_SWPR1_PAGE26_Pos (26U) #define SYSCFG_SWPR1_PAGE26_Msk (0x1UL << SYSCFG_SWPR1_PAGE26_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 0x20036BFF) */ +#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 - 0x20036BFF) */ #define SYSCFG_SWPR1_PAGE27_Pos (27U) #define SYSCFG_SWPR1_PAGE27_Msk (0x1UL << SYSCFG_SWPR1_PAGE27_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 0x20036FFF) */ +#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 - 0x20036FFF) */ #define SYSCFG_SWPR1_PAGE28_Pos (28U) #define SYSCFG_SWPR1_PAGE28_Msk (0x1UL << SYSCFG_SWPR1_PAGE28_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 0x200373FF) */ +#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 - 0x200373FF) */ #define SYSCFG_SWPR1_PAGE29_Pos (29U) #define SYSCFG_SWPR1_PAGE29_Msk (0x1UL << SYSCFG_SWPR1_PAGE29_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 0x200377FF) */ +#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 - 0x200377FF) */ #define SYSCFG_SWPR1_PAGE30_Pos (30U) #define SYSCFG_SWPR1_PAGE30_Msk (0x1UL << SYSCFG_SWPR1_PAGE30_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 0x20037BFF) */ +#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 - 0x20037BFF) */ #define SYSCFG_SWPR1_PAGE31_Pos (31U) #define SYSCFG_SWPR1_PAGE31_Msk (0x1UL << SYSCFG_SWPR1_PAGE31_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 0x20037FFF) */ +#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 - 0x20037FFF) */ /***************** Bit definition for SYSCFG_SKR register (SYSCFG SRAM2 key register) *************************************************************************/ #define SYSCFG_SKR_KEY_Pos (0U) @@ -8530,16 +8475,16 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR2 register (SYSCFG SRAM2 write protection register) **********************************************************/ #define SYSCFG_SWPR2_PAGE32_Pos (0U) #define SYSCFG_SWPR2_PAGE32_Msk (0x1UL << SYSCFG_SWPR2_PAGE32_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 0x200383FF) */ +#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 - 0x200383FF) */ #define SYSCFG_SWPR2_PAGE33_Pos (1U) #define SYSCFG_SWPR2_PAGE33_Msk (0x1UL << SYSCFG_SWPR2_PAGE33_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 0x200387FF) */ +#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 - 0x200387FF) */ #define SYSCFG_SWPR2_PAGE34_Pos (2U) #define SYSCFG_SWPR2_PAGE34_Msk (0x1UL << SYSCFG_SWPR2_PAGE34_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 0x20038bFF) */ +#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 - 0x20038bFF) */ #define SYSCFG_SWPR2_PAGE35_Pos (3U) #define SYSCFG_SWPR2_PAGE35_Msk (0x1UL << SYSCFG_SWPR2_PAGE35_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 0x20038FFF) */ +#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 - 0x20038FFF) */ /***************** Bit definition for SYSCFG_IMR1 register (Interrupt masks control and status register on CPU1 - part 1) *******************************************/ #define SYSCFG_IMR1_TIM1IM_Pos (13U) @@ -10864,5 +10809,3 @@ typedef struct /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb15xx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb15xx.h index 13d350bea..07601f756 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb15xx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb15xx.h @@ -423,7 +423,7 @@ uint32_t RESERVED6; /*!< Reserved, __IO uint32_t HSECR; /*!< RCC HSE Clock Register, Address offset: 0x9C */ uint32_t RESERVED7[26]; /*!< Reserved, Address offset: 0xA0-0x104 */ __IO uint32_t EXTCFGR; /*!< RCC Extended Clock Recovery Register, Address offset: 0x108 */ -uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ +uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ __IO uint32_t C2AHB1ENR; /*!< RRCC AHB1 peripheral CPU2 clocks enable register, Address offset: 0x148 */ __IO uint32_t C2AHB2ENR; /*!< RCC AHB2 peripheral CPU2 clocks enable register, Address offset: 0x14C */ __IO uint32_t C2AHB3ENR; /*!< RCC AHB3 & AHB4 peripheral CPU2 clocks enable register,, Address offset: 0x150 */ @@ -765,10 +765,10 @@ typedef struct /*!< Memory, OTP and Option bytes */ /* Base addresses */ -#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_BASE (0x1FFF7800UL) /*!< Option Bytes : 128B (0x1FFF7800 0x1FFF787F) */ -#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_BASE (0x1FFF7800UL) /*!< Option Bytes : 128B (0x1FFF7800 - 0x1FFF787F) */ +#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ #define SRAM1_BASE SRAM_BASE /*!< SRAM1(up to 12 KB) base address */ #define SRAM2A_BASE (SRAM_BASE + 0x00030000UL)/*!< SRAM2A(32 KB) base address */ @@ -781,14 +781,14 @@ typedef struct #define SRAM2B_SIZE 0x00001000UL /*!< SRAM2b default size : 4 KB */ /* End addresses */ -#define SRAM1_END_ADDR (0x20002FFFUL) /*!< SRAM1 : 12KB (0x20000000 0x20002FFF) */ -#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 0x20037FFF) */ -#define SRAM2B_END_ADDR (0x20038FFFUL) /*!< SRAM2b (backup) : 4KB (0x20038000 0x20038FFF) */ +#define SRAM1_END_ADDR (0x20002FFFUL) /*!< SRAM1 : 12KB (0x20000000 - 0x20002FFF) */ +#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 - 0x20037FFF) */ +#define SRAM2B_END_ADDR (0x20038FFFUL) /*!< SRAM2b (backup) : 4KB (0x20038000 - 0x20038FFF) */ -#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ /*!< Peripheral memory map */ #define APB1PERIPH_BASE PERIPH_BASE @@ -1101,7 +1101,7 @@ typedef struct #define ADC_CFGR1_ALIGN_Pos (5U) #define ADC_CFGR1_ALIGN_Msk (0x1UL << ADC_CFGR1_ALIGN_Pos) /*!< 0x00000020 */ -#define ADC_CFGR1_ALIGN ADC_CFGR1_ALIGN_Msk /*!< ADC data alignement */ +#define ADC_CFGR1_ALIGN ADC_CFGR1_ALIGN_Msk /*!< ADC data alignment */ #define ADC_CFGR1_EXTSEL_Pos (6U) #define ADC_CFGR1_EXTSEL_Msk (0x7UL << ADC_CFGR1_EXTSEL_Pos) /*!< 0x000001C0 */ @@ -1151,7 +1151,7 @@ typedef struct #define ADC_CFGR1_AWD1CH_3 (0x08UL << ADC_CFGR1_AWD1CH_Pos) /*!< 0x20000000 */ #define ADC_CFGR1_AWD1CH_4 (0x10UL << ADC_CFGR1_AWD1CH_Pos) /*!< 0x40000000 */ -/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec accross STM32WB serie */ +/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec across STM32WB series */ #define ADC_CFGR_DMAEN_Pos ADC_CFGR1_DMAEN_Pos #define ADC_CFGR_DMAEN_Msk ADC_CFGR1_DMAEN_Msk #define ADC_CFGR_DMAEN ADC_CFGR1_DMAEN @@ -1492,7 +1492,7 @@ typedef struct #define ADC_DR_DATA_14 (0x4000UL << ADC_DR_DATA_Pos) /*!< 0x00004000 */ #define ADC_DR_DATA_15 (0x8000UL << ADC_DR_DATA_Pos) /*!< 0x00008000 */ -/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec accross STM32WB serie */ +/* Definitions for cohabitation of ADC peripherals 2.5Ms/sec and 5Ms/sec across STM32WB series */ #define ADC_DR_RDATA_Pos ADC_DR_DATA_Pos #define ADC_DR_RDATA_Msk ADC_DR_DATA_Msk #define ADC_DR_RDATA ADC_DR_DATA @@ -3136,12 +3136,12 @@ typedef struct /* Arithmetic addition output data */ #define PKA_ARITHMETIC_ADD_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Arithmetic substraction input data */ +/* Arithmetic subtraction input data */ #define PKA_ARITHMETIC_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_ARITHMETIC_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_ARITHMETIC_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ -/* Arithmetic substraction output data */ +/* Arithmetic subtraction output data */ #define PKA_ARITHMETIC_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Arithmetic multiplication input data */ @@ -3177,13 +3177,13 @@ typedef struct /* Modular inversion output data */ #define PKA_MODULAR_INV_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Modular substraction input data */ +/* Modular subtraction input data */ #define PKA_MODULAR_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_MODULAR_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_MODULAR_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ #define PKA_MODULAR_SUB_IN_OP3_MOD ((0xD5CU - PKA_RAM_OFFSET)>>2) /*!< Input operand op3 */ -/* Modular substraction output data */ +/* Modular subtraction output data */ #define PKA_MODULAR_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Montgomery multiplication input data */ @@ -7126,10 +7126,10 @@ typedef struct #define RTC_CR_OSEL_1 (0x2U << RTC_CR_OSEL_Pos) /*!< 0x00400000 */ #define RTC_CR_POL_Pos (20U) #define RTC_CR_POL_Msk (0x1UL << RTC_CR_POL_Pos) /*!< 0x00100000 */ -#define RTC_CR_POL RTC_CR_POL_Msk /*!< Ouput polarity */ +#define RTC_CR_POL RTC_CR_POL_Msk /*!< Output polarity */ #define RTC_CR_COSEL_Pos (19U) #define RTC_CR_COSEL_Msk (0x1UL << RTC_CR_COSEL_Pos) /*!< 0x00080000 */ -#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration ouput selection */ +#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration output selection */ #define RTC_CR_BKP_Pos (18U) #define RTC_CR_BKP_Msk (0x1UL << RTC_CR_BKP_Pos) /*!< 0x00040000 */ #define RTC_CR_BKP RTC_CR_BKP_Msk /*!< Backup */ @@ -7398,7 +7398,7 @@ typedef struct /******************** Bits definition for RTC_SHIFTR register ***************/ #define RTC_SHIFTR_SUBFS_Pos (0U) #define RTC_SHIFTR_SUBFS_Msk (0x7FFFUL << RTC_SHIFTR_SUBFS_Pos) /*!< 0x00007FFF */ -#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Substract a fraction of a second */ +#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Subtract a fraction of a second */ #define RTC_SHIFTR_ADD1S_Pos (31U) #define RTC_SHIFTR_ADD1S_Msk (0x1UL << RTC_SHIFTR_ADD1S_Pos) /*!< 0x80000000 */ #define RTC_SHIFTR_ADD1S RTC_SHIFTR_ADD1S_Msk /*!< Add on second */ @@ -8544,100 +8544,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR1 register (SYSCFG SRAM2A write protection register) *********************************************************/ #define SYSCFG_SWPR1_PAGE0_Pos (0U) #define SYSCFG_SWPR1_PAGE0_Msk (0x1UL << SYSCFG_SWPR1_PAGE0_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 0x200303FF) */ +#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 - 0x200303FF) */ #define SYSCFG_SWPR1_PAGE1_Pos (1U) #define SYSCFG_SWPR1_PAGE1_Msk (0x1UL << SYSCFG_SWPR1_PAGE1_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 0x200307FF) */ +#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 - 0x200307FF) */ #define SYSCFG_SWPR1_PAGE2_Pos (2U) #define SYSCFG_SWPR1_PAGE2_Msk (0x1UL << SYSCFG_SWPR1_PAGE2_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 0x20030BFF) */ +#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 - 0x20030BFF) */ #define SYSCFG_SWPR1_PAGE3_Pos (3U) #define SYSCFG_SWPR1_PAGE3_Msk (0x1UL << SYSCFG_SWPR1_PAGE3_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 0x20030FFF) */ +#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 - 0x20030FFF) */ #define SYSCFG_SWPR1_PAGE4_Pos (4U) #define SYSCFG_SWPR1_PAGE4_Msk (0x1UL << SYSCFG_SWPR1_PAGE4_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 0x200313FF) */ +#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 - 0x200313FF) */ #define SYSCFG_SWPR1_PAGE5_Pos (5U) #define SYSCFG_SWPR1_PAGE5_Msk (0x1UL << SYSCFG_SWPR1_PAGE5_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 0x200317FF) */ +#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 - 0x200317FF) */ #define SYSCFG_SWPR1_PAGE6_Pos (6U) #define SYSCFG_SWPR1_PAGE6_Msk (0x1UL << SYSCFG_SWPR1_PAGE6_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 0x20031BFF) */ +#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 - 0x20031BFF) */ #define SYSCFG_SWPR1_PAGE7_Pos (7U) #define SYSCFG_SWPR1_PAGE7_Msk (0x1UL << SYSCFG_SWPR1_PAGE7_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 0x20031FFF) */ +#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 - 0x20031FFF) */ #define SYSCFG_SWPR1_PAGE8_Pos (8U) #define SYSCFG_SWPR1_PAGE8_Msk (0x1UL << SYSCFG_SWPR1_PAGE8_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 0x200323FF) */ +#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 - 0x200323FF) */ #define SYSCFG_SWPR1_PAGE9_Pos (9U) #define SYSCFG_SWPR1_PAGE9_Msk (0x1UL << SYSCFG_SWPR1_PAGE9_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 0x200327FF) */ +#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 - 0x200327FF) */ #define SYSCFG_SWPR1_PAGE10_Pos (10U) #define SYSCFG_SWPR1_PAGE10_Msk (0x1UL << SYSCFG_SWPR1_PAGE10_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 0x20032BFF) */ +#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 - 0x20032BFF) */ #define SYSCFG_SWPR1_PAGE11_Pos (11U) #define SYSCFG_SWPR1_PAGE11_Msk (0x1UL << SYSCFG_SWPR1_PAGE11_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 0x20032FFF) */ +#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 - 0x20032FFF) */ #define SYSCFG_SWPR1_PAGE12_Pos (12U) #define SYSCFG_SWPR1_PAGE12_Msk (0x1UL << SYSCFG_SWPR1_PAGE12_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 0x200333FF) */ +#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 - 0x200333FF) */ #define SYSCFG_SWPR1_PAGE13_Pos (13U) #define SYSCFG_SWPR1_PAGE13_Msk (0x1UL << SYSCFG_SWPR1_PAGE13_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 0x200337FF) */ +#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 - 0x200337FF) */ #define SYSCFG_SWPR1_PAGE14_Pos (14U) #define SYSCFG_SWPR1_PAGE14_Msk (0x1UL << SYSCFG_SWPR1_PAGE14_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 0x20033BFF) */ +#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 - 0x20033BFF) */ #define SYSCFG_SWPR1_PAGE15_Pos (15U) #define SYSCFG_SWPR1_PAGE15_Msk (0x1UL << SYSCFG_SWPR1_PAGE15_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 0x20033FFF) */ +#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 - 0x20033FFF) */ #define SYSCFG_SWPR1_PAGE16_Pos (16U) #define SYSCFG_SWPR1_PAGE16_Msk (0x1UL << SYSCFG_SWPR1_PAGE16_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 0x200343FF) */ +#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 - 0x200343FF) */ #define SYSCFG_SWPR1_PAGE17_Pos (17U) #define SYSCFG_SWPR1_PAGE17_Msk (0x1UL << SYSCFG_SWPR1_PAGE17_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 0x200347FF) */ +#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 - 0x200347FF) */ #define SYSCFG_SWPR1_PAGE18_Pos (18U) #define SYSCFG_SWPR1_PAGE18_Msk (0x1UL << SYSCFG_SWPR1_PAGE18_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 0x20034BFF) */ +#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 - 0x20034BFF) */ #define SYSCFG_SWPR1_PAGE19_Pos (19U) #define SYSCFG_SWPR1_PAGE19_Msk (0x1UL << SYSCFG_SWPR1_PAGE19_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 0x20034FFF) */ +#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 - 0x20034FFF) */ #define SYSCFG_SWPR1_PAGE20_Pos (20U) #define SYSCFG_SWPR1_PAGE20_Msk (0x1UL << SYSCFG_SWPR1_PAGE20_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 0x200353FF) */ +#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 - 0x200353FF) */ #define SYSCFG_SWPR1_PAGE21_Pos (21U) #define SYSCFG_SWPR1_PAGE21_Msk (0x1UL << SYSCFG_SWPR1_PAGE21_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 0x200357FF) */ +#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 - 0x200357FF) */ #define SYSCFG_SWPR1_PAGE22_Pos (22U) #define SYSCFG_SWPR1_PAGE22_Msk (0x1UL << SYSCFG_SWPR1_PAGE22_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 0x20035BFF) */ +#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 - 0x20035BFF) */ #define SYSCFG_SWPR1_PAGE23_Pos (23U) #define SYSCFG_SWPR1_PAGE23_Msk (0x1UL << SYSCFG_SWPR1_PAGE23_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 0x20035FFF) */ +#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 - 0x20035FFF) */ #define SYSCFG_SWPR1_PAGE24_Pos (24U) #define SYSCFG_SWPR1_PAGE24_Msk (0x1UL << SYSCFG_SWPR1_PAGE24_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 0x200363FF) */ +#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 - 0x200363FF) */ #define SYSCFG_SWPR1_PAGE25_Pos (25U) #define SYSCFG_SWPR1_PAGE25_Msk (0x1UL << SYSCFG_SWPR1_PAGE25_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 0x200367FF) */ +#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 - 0x200367FF) */ #define SYSCFG_SWPR1_PAGE26_Pos (26U) #define SYSCFG_SWPR1_PAGE26_Msk (0x1UL << SYSCFG_SWPR1_PAGE26_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 0x20036BFF) */ +#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 - 0x20036BFF) */ #define SYSCFG_SWPR1_PAGE27_Pos (27U) #define SYSCFG_SWPR1_PAGE27_Msk (0x1UL << SYSCFG_SWPR1_PAGE27_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 0x20036FFF) */ +#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 - 0x20036FFF) */ #define SYSCFG_SWPR1_PAGE28_Pos (28U) #define SYSCFG_SWPR1_PAGE28_Msk (0x1UL << SYSCFG_SWPR1_PAGE28_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 0x200373FF) */ +#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 - 0x200373FF) */ #define SYSCFG_SWPR1_PAGE29_Pos (29U) #define SYSCFG_SWPR1_PAGE29_Msk (0x1UL << SYSCFG_SWPR1_PAGE29_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 0x200377FF) */ +#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 - 0x200377FF) */ #define SYSCFG_SWPR1_PAGE30_Pos (30U) #define SYSCFG_SWPR1_PAGE30_Msk (0x1UL << SYSCFG_SWPR1_PAGE30_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 0x20037BFF) */ +#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 - 0x20037BFF) */ #define SYSCFG_SWPR1_PAGE31_Pos (31U) #define SYSCFG_SWPR1_PAGE31_Msk (0x1UL << SYSCFG_SWPR1_PAGE31_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 0x20037FFF) */ +#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 - 0x20037FFF) */ /***************** Bit definition for SYSCFG_SKR register (SYSCFG SRAM2 key register) *************************************************************************/ #define SYSCFG_SKR_KEY_Pos (0U) @@ -8647,16 +8647,16 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR2 register (SYSCFG SRAM2 write protection register) **********************************************************/ #define SYSCFG_SWPR2_PAGE32_Pos (0U) #define SYSCFG_SWPR2_PAGE32_Msk (0x1UL << SYSCFG_SWPR2_PAGE32_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 0x200383FF) */ +#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 - 0x200383FF) */ #define SYSCFG_SWPR2_PAGE33_Pos (1U) #define SYSCFG_SWPR2_PAGE33_Msk (0x1UL << SYSCFG_SWPR2_PAGE33_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 0x200387FF) */ +#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 - 0x200387FF) */ #define SYSCFG_SWPR2_PAGE34_Pos (2U) #define SYSCFG_SWPR2_PAGE34_Msk (0x1UL << SYSCFG_SWPR2_PAGE34_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 0x20038bFF) */ +#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 - 0x20038bFF) */ #define SYSCFG_SWPR2_PAGE35_Pos (3U) #define SYSCFG_SWPR2_PAGE35_Msk (0x1UL << SYSCFG_SWPR2_PAGE35_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 0x20038FFF) */ +#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 - 0x20038FFF) */ /***************** Bit definition for SYSCFG_IMR1 register (Interrupt masks control and status register on CPU1 - part 1) *******************************************/ #define SYSCFG_IMR1_TIM1IM_Pos (13U) @@ -10994,5 +10994,3 @@ typedef struct /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb30xx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb30xx.h index d0abd1cf8..385136795 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb30xx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb30xx.h @@ -431,7 +431,7 @@ uint32_t RESERVED6; /*!< Reserved, __IO uint32_t HSECR; /*!< RCC HSE Clock Register, Address offset: 0x9C */ uint32_t RESERVED7[26]; /*!< Reserved, Address offset: 0xA0-0x104 */ __IO uint32_t EXTCFGR; /*!< RCC Extended Clock Recovery Register, Address offset: 0x108 */ -uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ +uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ __IO uint32_t C2AHB1ENR; /*!< RRCC AHB1 peripheral CPU2 clocks enable register, Address offset: 0x148 */ __IO uint32_t C2AHB2ENR; /*!< RCC AHB2 peripheral CPU2 clocks enable register, Address offset: 0x14C */ __IO uint32_t C2AHB3ENR; /*!< RCC AHB3 & AHB4 peripheral CPU2 clocks enable register,, Address offset: 0x150 */ @@ -752,10 +752,10 @@ typedef struct /*!< Memory, OTP and Option bytes */ /* Base addresses */ -#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ #define SRAM1_BASE SRAM_BASE /*!< SRAM1(up to 32 KB) base address */ #define SRAM2A_BASE (SRAM_BASE + 0x00030000UL)/*!< SRAM2A(32 KB) base address */ @@ -768,14 +768,14 @@ typedef struct #define SRAM2B_SIZE 0x00008000UL /*!< SRAM2b default size : 32 kB */ /* End addresses */ -#define SRAM1_END_ADDR (0x20007FFFUL) /*!< SRAM1 : 32KB (0x20000000 0x20007FFF) */ -#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 0x20037FFF) */ -#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 0x2003FFFF) */ +#define SRAM1_END_ADDR (0x20007FFFUL) /*!< SRAM1 : 32KB (0x20000000 - 0x20007FFF) */ +#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 - 0x20037FFF) */ +#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 - 0x2003FFFF) */ -#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ /*!< Peripheral memory map */ #define APB1PERIPH_BASE PERIPH_BASE @@ -1100,7 +1100,7 @@ typedef struct #define ADC_CFGR_ALIGN_Pos (5U) #define ADC_CFGR_ALIGN_Msk (0x1UL << ADC_CFGR_ALIGN_Pos) /*!< 0x00000020 */ -#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignement */ +#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignment */ #define ADC_CFGR_EXTSEL_Pos (6U) #define ADC_CFGR_EXTSEL_Msk (0xFUL << ADC_CFGR_EXTSEL_Pos) /*!< 0x000003C0 */ @@ -3521,12 +3521,12 @@ typedef struct /* Arithmetic addition output data */ #define PKA_ARITHMETIC_ADD_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Arithmetic substraction input data */ +/* Arithmetic subtraction input data */ #define PKA_ARITHMETIC_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_ARITHMETIC_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_ARITHMETIC_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ -/* Arithmetic substraction output data */ +/* Arithmetic subtraction output data */ #define PKA_ARITHMETIC_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Arithmetic multiplication input data */ @@ -3562,13 +3562,13 @@ typedef struct /* Modular inversion output data */ #define PKA_MODULAR_INV_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Modular substraction input data */ +/* Modular subtraction input data */ #define PKA_MODULAR_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_MODULAR_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_MODULAR_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ #define PKA_MODULAR_SUB_IN_OP3_MOD ((0xD5CU - PKA_RAM_OFFSET)>>2) /*!< Input operand op3 */ -/* Modular substraction output data */ +/* Modular subtraction output data */ #define PKA_MODULAR_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Montgomery multiplication input data */ @@ -7494,10 +7494,10 @@ typedef struct #define RTC_CR_OSEL_1 (0x2U << RTC_CR_OSEL_Pos) /*!< 0x00400000 */ #define RTC_CR_POL_Pos (20U) #define RTC_CR_POL_Msk (0x1UL << RTC_CR_POL_Pos) /*!< 0x00100000 */ -#define RTC_CR_POL RTC_CR_POL_Msk /*!< Ouput polarity */ +#define RTC_CR_POL RTC_CR_POL_Msk /*!< Output polarity */ #define RTC_CR_COSEL_Pos (19U) #define RTC_CR_COSEL_Msk (0x1UL << RTC_CR_COSEL_Pos) /*!< 0x00080000 */ -#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration ouput selection */ +#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration output selection */ #define RTC_CR_BKP_Pos (18U) #define RTC_CR_BKP_Msk (0x1UL << RTC_CR_BKP_Pos) /*!< 0x00040000 */ #define RTC_CR_BKP RTC_CR_BKP_Msk /*!< Backup */ @@ -7766,7 +7766,7 @@ typedef struct /******************** Bits definition for RTC_SHIFTR register ***************/ #define RTC_SHIFTR_SUBFS_Pos (0U) #define RTC_SHIFTR_SUBFS_Msk (0x7FFFUL << RTC_SHIFTR_SUBFS_Pos) /*!< 0x00007FFF */ -#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Substract a fraction of a second */ +#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Subtract a fraction of a second */ #define RTC_SHIFTR_ADD1S_Pos (31U) #define RTC_SHIFTR_ADD1S_Msk (0x1UL << RTC_SHIFTR_ADD1S_Pos) /*!< 0x80000000 */ #define RTC_SHIFTR_ADD1S RTC_SHIFTR_ADD1S_Msk /*!< Add on second */ @@ -8466,100 +8466,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR1 register (SYSCFG SRAM2A write protection register) *********************************************************/ #define SYSCFG_SWPR1_PAGE0_Pos (0U) #define SYSCFG_SWPR1_PAGE0_Msk (0x1UL << SYSCFG_SWPR1_PAGE0_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 0x200303FF) */ +#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 - 0x200303FF) */ #define SYSCFG_SWPR1_PAGE1_Pos (1U) #define SYSCFG_SWPR1_PAGE1_Msk (0x1UL << SYSCFG_SWPR1_PAGE1_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 0x200307FF) */ +#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 - 0x200307FF) */ #define SYSCFG_SWPR1_PAGE2_Pos (2U) #define SYSCFG_SWPR1_PAGE2_Msk (0x1UL << SYSCFG_SWPR1_PAGE2_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 0x20030BFF) */ +#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 - 0x20030BFF) */ #define SYSCFG_SWPR1_PAGE3_Pos (3U) #define SYSCFG_SWPR1_PAGE3_Msk (0x1UL << SYSCFG_SWPR1_PAGE3_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 0x20030FFF) */ +#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 - 0x20030FFF) */ #define SYSCFG_SWPR1_PAGE4_Pos (4U) #define SYSCFG_SWPR1_PAGE4_Msk (0x1UL << SYSCFG_SWPR1_PAGE4_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 0x200313FF) */ +#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 - 0x200313FF) */ #define SYSCFG_SWPR1_PAGE5_Pos (5U) #define SYSCFG_SWPR1_PAGE5_Msk (0x1UL << SYSCFG_SWPR1_PAGE5_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 0x200317FF) */ +#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 - 0x200317FF) */ #define SYSCFG_SWPR1_PAGE6_Pos (6U) #define SYSCFG_SWPR1_PAGE6_Msk (0x1UL << SYSCFG_SWPR1_PAGE6_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 0x20031BFF) */ +#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 - 0x20031BFF) */ #define SYSCFG_SWPR1_PAGE7_Pos (7U) #define SYSCFG_SWPR1_PAGE7_Msk (0x1UL << SYSCFG_SWPR1_PAGE7_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 0x20031FFF) */ +#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 - 0x20031FFF) */ #define SYSCFG_SWPR1_PAGE8_Pos (8U) #define SYSCFG_SWPR1_PAGE8_Msk (0x1UL << SYSCFG_SWPR1_PAGE8_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 0x200323FF) */ +#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 - 0x200323FF) */ #define SYSCFG_SWPR1_PAGE9_Pos (9U) #define SYSCFG_SWPR1_PAGE9_Msk (0x1UL << SYSCFG_SWPR1_PAGE9_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 0x200327FF) */ +#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 - 0x200327FF) */ #define SYSCFG_SWPR1_PAGE10_Pos (10U) #define SYSCFG_SWPR1_PAGE10_Msk (0x1UL << SYSCFG_SWPR1_PAGE10_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 0x20032BFF) */ +#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 - 0x20032BFF) */ #define SYSCFG_SWPR1_PAGE11_Pos (11U) #define SYSCFG_SWPR1_PAGE11_Msk (0x1UL << SYSCFG_SWPR1_PAGE11_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 0x20032FFF) */ +#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 - 0x20032FFF) */ #define SYSCFG_SWPR1_PAGE12_Pos (12U) #define SYSCFG_SWPR1_PAGE12_Msk (0x1UL << SYSCFG_SWPR1_PAGE12_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 0x200333FF) */ +#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 - 0x200333FF) */ #define SYSCFG_SWPR1_PAGE13_Pos (13U) #define SYSCFG_SWPR1_PAGE13_Msk (0x1UL << SYSCFG_SWPR1_PAGE13_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 0x200337FF) */ +#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 - 0x200337FF) */ #define SYSCFG_SWPR1_PAGE14_Pos (14U) #define SYSCFG_SWPR1_PAGE14_Msk (0x1UL << SYSCFG_SWPR1_PAGE14_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 0x20033BFF) */ +#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 - 0x20033BFF) */ #define SYSCFG_SWPR1_PAGE15_Pos (15U) #define SYSCFG_SWPR1_PAGE15_Msk (0x1UL << SYSCFG_SWPR1_PAGE15_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 0x20033FFF) */ +#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 - 0x20033FFF) */ #define SYSCFG_SWPR1_PAGE16_Pos (16U) #define SYSCFG_SWPR1_PAGE16_Msk (0x1UL << SYSCFG_SWPR1_PAGE16_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 0x200343FF) */ +#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 - 0x200343FF) */ #define SYSCFG_SWPR1_PAGE17_Pos (17U) #define SYSCFG_SWPR1_PAGE17_Msk (0x1UL << SYSCFG_SWPR1_PAGE17_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 0x200347FF) */ +#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 - 0x200347FF) */ #define SYSCFG_SWPR1_PAGE18_Pos (18U) #define SYSCFG_SWPR1_PAGE18_Msk (0x1UL << SYSCFG_SWPR1_PAGE18_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 0x20034BFF) */ +#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 - 0x20034BFF) */ #define SYSCFG_SWPR1_PAGE19_Pos (19U) #define SYSCFG_SWPR1_PAGE19_Msk (0x1UL << SYSCFG_SWPR1_PAGE19_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 0x20034FFF) */ +#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 - 0x20034FFF) */ #define SYSCFG_SWPR1_PAGE20_Pos (20U) #define SYSCFG_SWPR1_PAGE20_Msk (0x1UL << SYSCFG_SWPR1_PAGE20_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 0x200353FF) */ +#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 - 0x200353FF) */ #define SYSCFG_SWPR1_PAGE21_Pos (21U) #define SYSCFG_SWPR1_PAGE21_Msk (0x1UL << SYSCFG_SWPR1_PAGE21_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 0x200357FF) */ +#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 - 0x200357FF) */ #define SYSCFG_SWPR1_PAGE22_Pos (22U) #define SYSCFG_SWPR1_PAGE22_Msk (0x1UL << SYSCFG_SWPR1_PAGE22_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 0x20035BFF) */ +#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 - 0x20035BFF) */ #define SYSCFG_SWPR1_PAGE23_Pos (23U) #define SYSCFG_SWPR1_PAGE23_Msk (0x1UL << SYSCFG_SWPR1_PAGE23_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 0x20035FFF) */ +#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 - 0x20035FFF) */ #define SYSCFG_SWPR1_PAGE24_Pos (24U) #define SYSCFG_SWPR1_PAGE24_Msk (0x1UL << SYSCFG_SWPR1_PAGE24_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 0x200363FF) */ +#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 - 0x200363FF) */ #define SYSCFG_SWPR1_PAGE25_Pos (25U) #define SYSCFG_SWPR1_PAGE25_Msk (0x1UL << SYSCFG_SWPR1_PAGE25_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 0x200367FF) */ +#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 - 0x200367FF) */ #define SYSCFG_SWPR1_PAGE26_Pos (26U) #define SYSCFG_SWPR1_PAGE26_Msk (0x1UL << SYSCFG_SWPR1_PAGE26_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 0x20036BFF) */ +#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 - 0x20036BFF) */ #define SYSCFG_SWPR1_PAGE27_Pos (27U) #define SYSCFG_SWPR1_PAGE27_Msk (0x1UL << SYSCFG_SWPR1_PAGE27_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 0x20036FFF) */ +#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 - 0x20036FFF) */ #define SYSCFG_SWPR1_PAGE28_Pos (28U) #define SYSCFG_SWPR1_PAGE28_Msk (0x1UL << SYSCFG_SWPR1_PAGE28_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 0x200373FF) */ +#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 - 0x200373FF) */ #define SYSCFG_SWPR1_PAGE29_Pos (29U) #define SYSCFG_SWPR1_PAGE29_Msk (0x1UL << SYSCFG_SWPR1_PAGE29_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 0x200377FF) */ +#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 - 0x200377FF) */ #define SYSCFG_SWPR1_PAGE30_Pos (30U) #define SYSCFG_SWPR1_PAGE30_Msk (0x1UL << SYSCFG_SWPR1_PAGE30_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 0x20037BFF) */ +#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 - 0x20037BFF) */ #define SYSCFG_SWPR1_PAGE31_Pos (31U) #define SYSCFG_SWPR1_PAGE31_Msk (0x1UL << SYSCFG_SWPR1_PAGE31_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 0x20037FFF) */ +#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 - 0x20037FFF) */ /***************** Bit definition for SYSCFG_SKR register (SYSCFG SRAM2 key register) *************************************************************************/ #define SYSCFG_SKR_KEY_Pos (0U) @@ -8569,100 +8569,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR2 register (SYSCFG SRAM2 write protection register) **********************************************************/ #define SYSCFG_SWPR2_PAGE32_Pos (0U) #define SYSCFG_SWPR2_PAGE32_Msk (0x1UL << SYSCFG_SWPR2_PAGE32_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 0x200383FF) */ +#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 - 0x200383FF) */ #define SYSCFG_SWPR2_PAGE33_Pos (1U) #define SYSCFG_SWPR2_PAGE33_Msk (0x1UL << SYSCFG_SWPR2_PAGE33_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 0x200387FF) */ +#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 - 0x200387FF) */ #define SYSCFG_SWPR2_PAGE34_Pos (2U) #define SYSCFG_SWPR2_PAGE34_Msk (0x1UL << SYSCFG_SWPR2_PAGE34_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 0x20038bFF) */ +#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 - 0x20038bFF) */ #define SYSCFG_SWPR2_PAGE35_Pos (3U) #define SYSCFG_SWPR2_PAGE35_Msk (0x1UL << SYSCFG_SWPR2_PAGE35_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 0x20038FFF) */ +#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 - 0x20038FFF) */ #define SYSCFG_SWPR2_PAGE36_Pos (4U) #define SYSCFG_SWPR2_PAGE36_Msk (0x1UL << SYSCFG_SWPR2_PAGE36_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 0x200393FF) */ +#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 - 0x200393FF) */ #define SYSCFG_SWPR2_PAGE37_Pos (5U) #define SYSCFG_SWPR2_PAGE37_Msk (0x1UL << SYSCFG_SWPR2_PAGE37_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 0x200397FF) */ +#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 - 0x200397FF) */ #define SYSCFG_SWPR2_PAGE38_Pos (6U) #define SYSCFG_SWPR2_PAGE38_Msk (0x1UL << SYSCFG_SWPR2_PAGE38_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 0x20039BFF) */ +#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 - 0x20039BFF) */ #define SYSCFG_SWPR2_PAGE39_Pos (7U) #define SYSCFG_SWPR2_PAGE39_Msk (0x1UL << SYSCFG_SWPR2_PAGE39_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 0x20039FFF) */ +#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 - 0x20039FFF) */ #define SYSCFG_SWPR2_PAGE40_Pos (8U) #define SYSCFG_SWPR2_PAGE40_Msk (0x1UL << SYSCFG_SWPR2_PAGE40_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 0x2003A3FF) */ +#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 - 0x2003A3FF) */ #define SYSCFG_SWPR2_PAGE41_Pos (9U) #define SYSCFG_SWPR2_PAGE41_Msk (0x1UL << SYSCFG_SWPR2_PAGE41_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 0x2003A7FF) */ +#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 - 0x2003A7FF) */ #define SYSCFG_SWPR2_PAGE42_Pos (10U) #define SYSCFG_SWPR2_PAGE42_Msk (0x1UL << SYSCFG_SWPR2_PAGE42_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 0x2003ABFF) */ +#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 - 0x2003ABFF) */ #define SYSCFG_SWPR2_PAGE43_Pos (11U) #define SYSCFG_SWPR2_PAGE43_Msk (0x1UL << SYSCFG_SWPR2_PAGE43_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 0x2003AFFF) */ +#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 - 0x2003AFFF) */ #define SYSCFG_SWPR2_PAGE44_Pos (12U) #define SYSCFG_SWPR2_PAGE44_Msk (0x1UL << SYSCFG_SWPR2_PAGE44_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 0x2003B3FF) */ +#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 - 0x2003B3FF) */ #define SYSCFG_SWPR2_PAGE45_Pos (13U) #define SYSCFG_SWPR2_PAGE45_Msk (0x1UL << SYSCFG_SWPR2_PAGE45_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 0x2003B7FF) */ +#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 - 0x2003B7FF) */ #define SYSCFG_SWPR2_PAGE46_Pos (14U) #define SYSCFG_SWPR2_PAGE46_Msk (0x1UL << SYSCFG_SWPR2_PAGE46_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 0x2003BBFF) */ +#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 - 0x2003BBFF) */ #define SYSCFG_SWPR2_PAGE47_Pos (15U) #define SYSCFG_SWPR2_PAGE47_Msk (0x1UL << SYSCFG_SWPR2_PAGE47_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 0x2003BFFF) */ +#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 - 0x2003BFFF) */ #define SYSCFG_SWPR2_PAGE48_Pos (16U) #define SYSCFG_SWPR2_PAGE48_Msk (0x1UL << SYSCFG_SWPR2_PAGE48_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 0x2003C3FF) */ +#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 - 0x2003C3FF) */ #define SYSCFG_SWPR2_PAGE49_Pos (17U) #define SYSCFG_SWPR2_PAGE49_Msk (0x1UL << SYSCFG_SWPR2_PAGE49_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 0x2003C7FF) */ +#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 - 0x2003C7FF) */ #define SYSCFG_SWPR2_PAGE50_Pos (18U) #define SYSCFG_SWPR2_PAGE50_Msk (0x1UL << SYSCFG_SWPR2_PAGE50_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 0x2003CBFF) */ +#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 - 0x2003CBFF) */ #define SYSCFG_SWPR2_PAGE51_Pos (19U) #define SYSCFG_SWPR2_PAGE51_Msk (0x1UL << SYSCFG_SWPR2_PAGE51_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 0x2003CFFF) */ +#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 - 0x2003CFFF) */ #define SYSCFG_SWPR2_PAGE52_Pos (20U) #define SYSCFG_SWPR2_PAGE52_Msk (0x1UL << SYSCFG_SWPR2_PAGE52_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 0x2003D3FF) */ +#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 - 0x2003D3FF) */ #define SYSCFG_SWPR2_PAGE53_Pos (21U) #define SYSCFG_SWPR2_PAGE53_Msk (0x1UL << SYSCFG_SWPR2_PAGE53_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 0x2003D7FF) */ +#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 - 0x2003D7FF) */ #define SYSCFG_SWPR2_PAGE54_Pos (22U) #define SYSCFG_SWPR2_PAGE54_Msk (0x1UL << SYSCFG_SWPR2_PAGE54_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 0x2003DBFF) */ +#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 - 0x2003DBFF) */ #define SYSCFG_SWPR2_PAGE55_Pos (23U) #define SYSCFG_SWPR2_PAGE55_Msk (0x1UL << SYSCFG_SWPR2_PAGE55_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 0x2003DFFF) */ +#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 - 0x2003DFFF) */ #define SYSCFG_SWPR2_PAGE56_Pos (24U) #define SYSCFG_SWPR2_PAGE56_Msk (0x1UL << SYSCFG_SWPR2_PAGE56_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 0x2003E3FF) */ +#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 - 0x2003E3FF) */ #define SYSCFG_SWPR2_PAGE57_Pos (25U) #define SYSCFG_SWPR2_PAGE57_Msk (0x1UL << SYSCFG_SWPR2_PAGE57_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 0x2003E7FF) */ +#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 - 0x2003E7FF) */ #define SYSCFG_SWPR2_PAGE58_Pos (26U) #define SYSCFG_SWPR2_PAGE58_Msk (0x1UL << SYSCFG_SWPR2_PAGE58_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 0x2003EBFF) */ +#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 - 0x2003EBFF) */ #define SYSCFG_SWPR2_PAGE59_Pos (27U) #define SYSCFG_SWPR2_PAGE59_Msk (0x1UL << SYSCFG_SWPR2_PAGE59_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 0x2003EFFF) */ +#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 - 0x2003EFFF) */ #define SYSCFG_SWPR2_PAGE60_Pos (28U) #define SYSCFG_SWPR2_PAGE60_Msk (0x1UL << SYSCFG_SWPR2_PAGE60_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 0x2003F3FF) */ +#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 - 0x2003F3FF) */ #define SYSCFG_SWPR2_PAGE61_Pos (29U) #define SYSCFG_SWPR2_PAGE61_Msk (0x1UL << SYSCFG_SWPR2_PAGE61_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 0x2003F7FF) */ +#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 - 0x2003F7FF) */ #define SYSCFG_SWPR2_PAGE62_Pos (30U) #define SYSCFG_SWPR2_PAGE62_Msk (0x1UL << SYSCFG_SWPR2_PAGE62_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 0x2003FBFF) */ +#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 - 0x2003FBFF) */ #define SYSCFG_SWPR2_PAGE63_Pos (31U) #define SYSCFG_SWPR2_PAGE63_Msk (0x1UL << SYSCFG_SWPR2_PAGE63_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 0x2003FFFF) */ +#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 - 0x2003FFFF) */ /***************** Bit definition for SYSCFG_IMR1 register (Interrupt masks control and status register on CPU1 - part 1) *******************************************/ #define SYSCFG_IMR1_TIM1IM_Pos (13U) @@ -11033,5 +11033,3 @@ typedef struct /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb35xx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb35xx.h index bcbbfc68a..4b01c5c84 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb35xx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb35xx.h @@ -483,7 +483,7 @@ uint32_t RESERVED6; /*!< Reserved, __IO uint32_t HSECR; /*!< RCC HSE Clock Register, Address offset: 0x9C */ uint32_t RESERVED7[26]; /*!< Reserved, Address offset: 0xA0-0x104 */ __IO uint32_t EXTCFGR; /*!< RCC Extended Clock Recovery Register, Address offset: 0x108 */ -uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ +uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ __IO uint32_t C2AHB1ENR; /*!< RRCC AHB1 peripheral CPU2 clocks enable register, Address offset: 0x148 */ __IO uint32_t C2AHB2ENR; /*!< RCC AHB2 peripheral CPU2 clocks enable register, Address offset: 0x14C */ __IO uint32_t C2AHB3ENR; /*!< RCC AHB3 & AHB4 peripheral CPU2 clocks enable register,, Address offset: 0x150 */ @@ -884,10 +884,10 @@ typedef struct /*!< Memory, OTP and Option bytes */ /* Base addresses */ -#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ #define SRAM1_BASE SRAM_BASE /*!< SRAM1(up to 32 KB) base address */ #define SRAM2A_BASE (SRAM_BASE + 0x00030000UL)/*!< SRAM2A(32 KB) base address */ @@ -900,14 +900,14 @@ typedef struct #define SRAM2B_SIZE 0x00008000UL /*!< SRAM2b default size : 32 kB */ /* End addresses */ -#define SRAM1_END_ADDR (0x20007FFFUL) /*!< SRAM1 : 32KB (0x20000000 0x20007FFF) */ -#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 0x20037FFF) */ -#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 0x2003FFFF) */ +#define SRAM1_END_ADDR (0x20007FFFUL) /*!< SRAM1 : 32KB (0x20000000 - 0x20007FFF) */ +#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 - 0x20037FFF) */ +#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 - 0x2003FFFF) */ -#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ /*!< Peripheral memory map */ #define APB1PERIPH_BASE PERIPH_BASE @@ -1292,7 +1292,7 @@ typedef struct #define ADC_CFGR_ALIGN_Pos (5U) #define ADC_CFGR_ALIGN_Msk (0x1UL << ADC_CFGR_ALIGN_Pos) /*!< 0x00000020 */ -#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignement */ +#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignment */ #define ADC_CFGR_EXTSEL_Pos (6U) #define ADC_CFGR_EXTSEL_Msk (0xFUL << ADC_CFGR_EXTSEL_Pos) /*!< 0x000003C0 */ @@ -3899,12 +3899,12 @@ typedef struct /* Arithmetic addition output data */ #define PKA_ARITHMETIC_ADD_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Arithmetic substraction input data */ +/* Arithmetic subtraction input data */ #define PKA_ARITHMETIC_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_ARITHMETIC_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_ARITHMETIC_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ -/* Arithmetic substraction output data */ +/* Arithmetic subtraction output data */ #define PKA_ARITHMETIC_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Arithmetic multiplication input data */ @@ -3940,13 +3940,13 @@ typedef struct /* Modular inversion output data */ #define PKA_MODULAR_INV_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Modular substraction input data */ +/* Modular subtraction input data */ #define PKA_MODULAR_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_MODULAR_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_MODULAR_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ #define PKA_MODULAR_SUB_IN_OP3_MOD ((0xD5CU - PKA_RAM_OFFSET)>>2) /*!< Input operand op3 */ -/* Modular substraction output data */ +/* Modular subtraction output data */ #define PKA_MODULAR_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Montgomery multiplication input data */ @@ -8495,10 +8495,10 @@ typedef struct #define RTC_CR_OSEL_1 (0x2U << RTC_CR_OSEL_Pos) /*!< 0x00400000 */ #define RTC_CR_POL_Pos (20U) #define RTC_CR_POL_Msk (0x1UL << RTC_CR_POL_Pos) /*!< 0x00100000 */ -#define RTC_CR_POL RTC_CR_POL_Msk /*!< Ouput polarity */ +#define RTC_CR_POL RTC_CR_POL_Msk /*!< Output polarity */ #define RTC_CR_COSEL_Pos (19U) #define RTC_CR_COSEL_Msk (0x1UL << RTC_CR_COSEL_Pos) /*!< 0x00080000 */ -#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration ouput selection */ +#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration output selection */ #define RTC_CR_BKP_Pos (18U) #define RTC_CR_BKP_Msk (0x1UL << RTC_CR_BKP_Pos) /*!< 0x00040000 */ #define RTC_CR_BKP RTC_CR_BKP_Msk /*!< Backup */ @@ -8773,7 +8773,7 @@ typedef struct /******************** Bits definition for RTC_SHIFTR register ***************/ #define RTC_SHIFTR_SUBFS_Pos (0U) #define RTC_SHIFTR_SUBFS_Msk (0x7FFFUL << RTC_SHIFTR_SUBFS_Pos) /*!< 0x00007FFF */ -#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Substract a fraction of a second */ +#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Subtract a fraction of a second */ #define RTC_SHIFTR_ADD1S_Pos (31U) #define RTC_SHIFTR_ADD1S_Msk (0x1UL << RTC_SHIFTR_ADD1S_Pos) /*!< 0x80000000 */ #define RTC_SHIFTR_ADD1S RTC_SHIFTR_ADD1S_Msk /*!< Add on second */ @@ -9815,100 +9815,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR1 register (SYSCFG SRAM2A write protection register) *********************************************************/ #define SYSCFG_SWPR1_PAGE0_Pos (0U) #define SYSCFG_SWPR1_PAGE0_Msk (0x1UL << SYSCFG_SWPR1_PAGE0_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 0x200303FF) */ +#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 - 0x200303FF) */ #define SYSCFG_SWPR1_PAGE1_Pos (1U) #define SYSCFG_SWPR1_PAGE1_Msk (0x1UL << SYSCFG_SWPR1_PAGE1_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 0x200307FF) */ +#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 - 0x200307FF) */ #define SYSCFG_SWPR1_PAGE2_Pos (2U) #define SYSCFG_SWPR1_PAGE2_Msk (0x1UL << SYSCFG_SWPR1_PAGE2_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 0x20030BFF) */ +#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 - 0x20030BFF) */ #define SYSCFG_SWPR1_PAGE3_Pos (3U) #define SYSCFG_SWPR1_PAGE3_Msk (0x1UL << SYSCFG_SWPR1_PAGE3_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 0x20030FFF) */ +#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 - 0x20030FFF) */ #define SYSCFG_SWPR1_PAGE4_Pos (4U) #define SYSCFG_SWPR1_PAGE4_Msk (0x1UL << SYSCFG_SWPR1_PAGE4_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 0x200313FF) */ +#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 - 0x200313FF) */ #define SYSCFG_SWPR1_PAGE5_Pos (5U) #define SYSCFG_SWPR1_PAGE5_Msk (0x1UL << SYSCFG_SWPR1_PAGE5_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 0x200317FF) */ +#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 - 0x200317FF) */ #define SYSCFG_SWPR1_PAGE6_Pos (6U) #define SYSCFG_SWPR1_PAGE6_Msk (0x1UL << SYSCFG_SWPR1_PAGE6_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 0x20031BFF) */ +#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 - 0x20031BFF) */ #define SYSCFG_SWPR1_PAGE7_Pos (7U) #define SYSCFG_SWPR1_PAGE7_Msk (0x1UL << SYSCFG_SWPR1_PAGE7_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 0x20031FFF) */ +#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 - 0x20031FFF) */ #define SYSCFG_SWPR1_PAGE8_Pos (8U) #define SYSCFG_SWPR1_PAGE8_Msk (0x1UL << SYSCFG_SWPR1_PAGE8_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 0x200323FF) */ +#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 - 0x200323FF) */ #define SYSCFG_SWPR1_PAGE9_Pos (9U) #define SYSCFG_SWPR1_PAGE9_Msk (0x1UL << SYSCFG_SWPR1_PAGE9_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 0x200327FF) */ +#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 - 0x200327FF) */ #define SYSCFG_SWPR1_PAGE10_Pos (10U) #define SYSCFG_SWPR1_PAGE10_Msk (0x1UL << SYSCFG_SWPR1_PAGE10_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 0x20032BFF) */ +#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 - 0x20032BFF) */ #define SYSCFG_SWPR1_PAGE11_Pos (11U) #define SYSCFG_SWPR1_PAGE11_Msk (0x1UL << SYSCFG_SWPR1_PAGE11_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 0x20032FFF) */ +#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 - 0x20032FFF) */ #define SYSCFG_SWPR1_PAGE12_Pos (12U) #define SYSCFG_SWPR1_PAGE12_Msk (0x1UL << SYSCFG_SWPR1_PAGE12_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 0x200333FF) */ +#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 - 0x200333FF) */ #define SYSCFG_SWPR1_PAGE13_Pos (13U) #define SYSCFG_SWPR1_PAGE13_Msk (0x1UL << SYSCFG_SWPR1_PAGE13_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 0x200337FF) */ +#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 - 0x200337FF) */ #define SYSCFG_SWPR1_PAGE14_Pos (14U) #define SYSCFG_SWPR1_PAGE14_Msk (0x1UL << SYSCFG_SWPR1_PAGE14_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 0x20033BFF) */ +#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 - 0x20033BFF) */ #define SYSCFG_SWPR1_PAGE15_Pos (15U) #define SYSCFG_SWPR1_PAGE15_Msk (0x1UL << SYSCFG_SWPR1_PAGE15_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 0x20033FFF) */ +#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 - 0x20033FFF) */ #define SYSCFG_SWPR1_PAGE16_Pos (16U) #define SYSCFG_SWPR1_PAGE16_Msk (0x1UL << SYSCFG_SWPR1_PAGE16_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 0x200343FF) */ +#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 - 0x200343FF) */ #define SYSCFG_SWPR1_PAGE17_Pos (17U) #define SYSCFG_SWPR1_PAGE17_Msk (0x1UL << SYSCFG_SWPR1_PAGE17_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 0x200347FF) */ +#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 - 0x200347FF) */ #define SYSCFG_SWPR1_PAGE18_Pos (18U) #define SYSCFG_SWPR1_PAGE18_Msk (0x1UL << SYSCFG_SWPR1_PAGE18_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 0x20034BFF) */ +#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 - 0x20034BFF) */ #define SYSCFG_SWPR1_PAGE19_Pos (19U) #define SYSCFG_SWPR1_PAGE19_Msk (0x1UL << SYSCFG_SWPR1_PAGE19_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 0x20034FFF) */ +#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 - 0x20034FFF) */ #define SYSCFG_SWPR1_PAGE20_Pos (20U) #define SYSCFG_SWPR1_PAGE20_Msk (0x1UL << SYSCFG_SWPR1_PAGE20_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 0x200353FF) */ +#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 - 0x200353FF) */ #define SYSCFG_SWPR1_PAGE21_Pos (21U) #define SYSCFG_SWPR1_PAGE21_Msk (0x1UL << SYSCFG_SWPR1_PAGE21_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 0x200357FF) */ +#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 - 0x200357FF) */ #define SYSCFG_SWPR1_PAGE22_Pos (22U) #define SYSCFG_SWPR1_PAGE22_Msk (0x1UL << SYSCFG_SWPR1_PAGE22_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 0x20035BFF) */ +#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 - 0x20035BFF) */ #define SYSCFG_SWPR1_PAGE23_Pos (23U) #define SYSCFG_SWPR1_PAGE23_Msk (0x1UL << SYSCFG_SWPR1_PAGE23_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 0x20035FFF) */ +#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 - 0x20035FFF) */ #define SYSCFG_SWPR1_PAGE24_Pos (24U) #define SYSCFG_SWPR1_PAGE24_Msk (0x1UL << SYSCFG_SWPR1_PAGE24_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 0x200363FF) */ +#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 - 0x200363FF) */ #define SYSCFG_SWPR1_PAGE25_Pos (25U) #define SYSCFG_SWPR1_PAGE25_Msk (0x1UL << SYSCFG_SWPR1_PAGE25_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 0x200367FF) */ +#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 - 0x200367FF) */ #define SYSCFG_SWPR1_PAGE26_Pos (26U) #define SYSCFG_SWPR1_PAGE26_Msk (0x1UL << SYSCFG_SWPR1_PAGE26_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 0x20036BFF) */ +#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 - 0x20036BFF) */ #define SYSCFG_SWPR1_PAGE27_Pos (27U) #define SYSCFG_SWPR1_PAGE27_Msk (0x1UL << SYSCFG_SWPR1_PAGE27_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 0x20036FFF) */ +#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 - 0x20036FFF) */ #define SYSCFG_SWPR1_PAGE28_Pos (28U) #define SYSCFG_SWPR1_PAGE28_Msk (0x1UL << SYSCFG_SWPR1_PAGE28_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 0x200373FF) */ +#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 - 0x200373FF) */ #define SYSCFG_SWPR1_PAGE29_Pos (29U) #define SYSCFG_SWPR1_PAGE29_Msk (0x1UL << SYSCFG_SWPR1_PAGE29_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 0x200377FF) */ +#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 - 0x200377FF) */ #define SYSCFG_SWPR1_PAGE30_Pos (30U) #define SYSCFG_SWPR1_PAGE30_Msk (0x1UL << SYSCFG_SWPR1_PAGE30_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 0x20037BFF) */ +#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 - 0x20037BFF) */ #define SYSCFG_SWPR1_PAGE31_Pos (31U) #define SYSCFG_SWPR1_PAGE31_Msk (0x1UL << SYSCFG_SWPR1_PAGE31_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 0x20037FFF) */ +#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 - 0x20037FFF) */ /***************** Bit definition for SYSCFG_SKR register (SYSCFG SRAM2 key register) *************************************************************************/ #define SYSCFG_SKR_KEY_Pos (0U) @@ -9918,100 +9918,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR2 register (SYSCFG SRAM2 write protection register) **********************************************************/ #define SYSCFG_SWPR2_PAGE32_Pos (0U) #define SYSCFG_SWPR2_PAGE32_Msk (0x1UL << SYSCFG_SWPR2_PAGE32_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 0x200383FF) */ +#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 - 0x200383FF) */ #define SYSCFG_SWPR2_PAGE33_Pos (1U) #define SYSCFG_SWPR2_PAGE33_Msk (0x1UL << SYSCFG_SWPR2_PAGE33_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 0x200387FF) */ +#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 - 0x200387FF) */ #define SYSCFG_SWPR2_PAGE34_Pos (2U) #define SYSCFG_SWPR2_PAGE34_Msk (0x1UL << SYSCFG_SWPR2_PAGE34_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 0x20038bFF) */ +#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 - 0x20038bFF) */ #define SYSCFG_SWPR2_PAGE35_Pos (3U) #define SYSCFG_SWPR2_PAGE35_Msk (0x1UL << SYSCFG_SWPR2_PAGE35_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 0x20038FFF) */ +#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 - 0x20038FFF) */ #define SYSCFG_SWPR2_PAGE36_Pos (4U) #define SYSCFG_SWPR2_PAGE36_Msk (0x1UL << SYSCFG_SWPR2_PAGE36_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 0x200393FF) */ +#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 - 0x200393FF) */ #define SYSCFG_SWPR2_PAGE37_Pos (5U) #define SYSCFG_SWPR2_PAGE37_Msk (0x1UL << SYSCFG_SWPR2_PAGE37_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 0x200397FF) */ +#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 - 0x200397FF) */ #define SYSCFG_SWPR2_PAGE38_Pos (6U) #define SYSCFG_SWPR2_PAGE38_Msk (0x1UL << SYSCFG_SWPR2_PAGE38_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 0x20039BFF) */ +#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 - 0x20039BFF) */ #define SYSCFG_SWPR2_PAGE39_Pos (7U) #define SYSCFG_SWPR2_PAGE39_Msk (0x1UL << SYSCFG_SWPR2_PAGE39_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 0x20039FFF) */ +#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 - 0x20039FFF) */ #define SYSCFG_SWPR2_PAGE40_Pos (8U) #define SYSCFG_SWPR2_PAGE40_Msk (0x1UL << SYSCFG_SWPR2_PAGE40_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 0x2003A3FF) */ +#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 - 0x2003A3FF) */ #define SYSCFG_SWPR2_PAGE41_Pos (9U) #define SYSCFG_SWPR2_PAGE41_Msk (0x1UL << SYSCFG_SWPR2_PAGE41_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 0x2003A7FF) */ +#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 - 0x2003A7FF) */ #define SYSCFG_SWPR2_PAGE42_Pos (10U) #define SYSCFG_SWPR2_PAGE42_Msk (0x1UL << SYSCFG_SWPR2_PAGE42_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 0x2003ABFF) */ +#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 - 0x2003ABFF) */ #define SYSCFG_SWPR2_PAGE43_Pos (11U) #define SYSCFG_SWPR2_PAGE43_Msk (0x1UL << SYSCFG_SWPR2_PAGE43_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 0x2003AFFF) */ +#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 - 0x2003AFFF) */ #define SYSCFG_SWPR2_PAGE44_Pos (12U) #define SYSCFG_SWPR2_PAGE44_Msk (0x1UL << SYSCFG_SWPR2_PAGE44_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 0x2003B3FF) */ +#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 - 0x2003B3FF) */ #define SYSCFG_SWPR2_PAGE45_Pos (13U) #define SYSCFG_SWPR2_PAGE45_Msk (0x1UL << SYSCFG_SWPR2_PAGE45_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 0x2003B7FF) */ +#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 - 0x2003B7FF) */ #define SYSCFG_SWPR2_PAGE46_Pos (14U) #define SYSCFG_SWPR2_PAGE46_Msk (0x1UL << SYSCFG_SWPR2_PAGE46_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 0x2003BBFF) */ +#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 - 0x2003BBFF) */ #define SYSCFG_SWPR2_PAGE47_Pos (15U) #define SYSCFG_SWPR2_PAGE47_Msk (0x1UL << SYSCFG_SWPR2_PAGE47_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 0x2003BFFF) */ +#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 - 0x2003BFFF) */ #define SYSCFG_SWPR2_PAGE48_Pos (16U) #define SYSCFG_SWPR2_PAGE48_Msk (0x1UL << SYSCFG_SWPR2_PAGE48_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 0x2003C3FF) */ +#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 - 0x2003C3FF) */ #define SYSCFG_SWPR2_PAGE49_Pos (17U) #define SYSCFG_SWPR2_PAGE49_Msk (0x1UL << SYSCFG_SWPR2_PAGE49_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 0x2003C7FF) */ +#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 - 0x2003C7FF) */ #define SYSCFG_SWPR2_PAGE50_Pos (18U) #define SYSCFG_SWPR2_PAGE50_Msk (0x1UL << SYSCFG_SWPR2_PAGE50_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 0x2003CBFF) */ +#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 - 0x2003CBFF) */ #define SYSCFG_SWPR2_PAGE51_Pos (19U) #define SYSCFG_SWPR2_PAGE51_Msk (0x1UL << SYSCFG_SWPR2_PAGE51_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 0x2003CFFF) */ +#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 - 0x2003CFFF) */ #define SYSCFG_SWPR2_PAGE52_Pos (20U) #define SYSCFG_SWPR2_PAGE52_Msk (0x1UL << SYSCFG_SWPR2_PAGE52_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 0x2003D3FF) */ +#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 - 0x2003D3FF) */ #define SYSCFG_SWPR2_PAGE53_Pos (21U) #define SYSCFG_SWPR2_PAGE53_Msk (0x1UL << SYSCFG_SWPR2_PAGE53_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 0x2003D7FF) */ +#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 - 0x2003D7FF) */ #define SYSCFG_SWPR2_PAGE54_Pos (22U) #define SYSCFG_SWPR2_PAGE54_Msk (0x1UL << SYSCFG_SWPR2_PAGE54_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 0x2003DBFF) */ +#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 - 0x2003DBFF) */ #define SYSCFG_SWPR2_PAGE55_Pos (23U) #define SYSCFG_SWPR2_PAGE55_Msk (0x1UL << SYSCFG_SWPR2_PAGE55_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 0x2003DFFF) */ +#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 - 0x2003DFFF) */ #define SYSCFG_SWPR2_PAGE56_Pos (24U) #define SYSCFG_SWPR2_PAGE56_Msk (0x1UL << SYSCFG_SWPR2_PAGE56_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 0x2003E3FF) */ +#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 - 0x2003E3FF) */ #define SYSCFG_SWPR2_PAGE57_Pos (25U) #define SYSCFG_SWPR2_PAGE57_Msk (0x1UL << SYSCFG_SWPR2_PAGE57_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 0x2003E7FF) */ +#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 - 0x2003E7FF) */ #define SYSCFG_SWPR2_PAGE58_Pos (26U) #define SYSCFG_SWPR2_PAGE58_Msk (0x1UL << SYSCFG_SWPR2_PAGE58_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 0x2003EBFF) */ +#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 - 0x2003EBFF) */ #define SYSCFG_SWPR2_PAGE59_Pos (27U) #define SYSCFG_SWPR2_PAGE59_Msk (0x1UL << SYSCFG_SWPR2_PAGE59_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 0x2003EFFF) */ +#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 - 0x2003EFFF) */ #define SYSCFG_SWPR2_PAGE60_Pos (28U) #define SYSCFG_SWPR2_PAGE60_Msk (0x1UL << SYSCFG_SWPR2_PAGE60_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 0x2003F3FF) */ +#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 - 0x2003F3FF) */ #define SYSCFG_SWPR2_PAGE61_Pos (29U) #define SYSCFG_SWPR2_PAGE61_Msk (0x1UL << SYSCFG_SWPR2_PAGE61_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 0x2003F7FF) */ +#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 - 0x2003F7FF) */ #define SYSCFG_SWPR2_PAGE62_Pos (30U) #define SYSCFG_SWPR2_PAGE62_Msk (0x1UL << SYSCFG_SWPR2_PAGE62_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 0x2003FBFF) */ +#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 - 0x2003FBFF) */ #define SYSCFG_SWPR2_PAGE63_Pos (31U) #define SYSCFG_SWPR2_PAGE63_Msk (0x1UL << SYSCFG_SWPR2_PAGE63_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 0x2003FFFF) */ +#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 - 0x2003FFFF) */ /***************** Bit definition for SYSCFG_IMR1 register (Interrupt masks control and status register on CPU1 - part 1) *******************************************/ #define SYSCFG_IMR1_TIM1IM_Pos (13U) @@ -12777,5 +12777,3 @@ typedef struct /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb50xx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb50xx.h index 0e4077bfe..2527fdcb1 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb50xx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb50xx.h @@ -432,7 +432,7 @@ uint32_t RESERVED6; /*!< Reserved, __IO uint32_t HSECR; /*!< RCC HSE Clock Register, Address offset: 0x9C */ uint32_t RESERVED7[26]; /*!< Reserved, Address offset: 0xA0-0x104 */ __IO uint32_t EXTCFGR; /*!< RCC Extended Clock Recovery Register, Address offset: 0x108 */ -uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ +uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ __IO uint32_t C2AHB1ENR; /*!< RRCC AHB1 peripheral CPU2 clocks enable register, Address offset: 0x148 */ __IO uint32_t C2AHB2ENR; /*!< RCC AHB2 peripheral CPU2 clocks enable register, Address offset: 0x14C */ __IO uint32_t C2AHB3ENR; /*!< RCC AHB3 & AHB4 peripheral CPU2 clocks enable register,, Address offset: 0x150 */ @@ -753,10 +753,10 @@ typedef struct /*!< Memory, OTP and Option bytes */ /* Base addresses */ -#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ #define SRAM1_BASE SRAM_BASE /*!< SRAM1(up to 64 KB) base address */ #define SRAM2A_BASE (SRAM_BASE + 0x00030000UL)/*!< SRAM2A(32 KB) base address */ @@ -769,14 +769,14 @@ typedef struct #define SRAM2B_SIZE 0x00008000UL /*!< SRAM2b default size : 32 kB */ /* End addresses */ -#define SRAM1_END_ADDR (0x2000FFFFUL) /*!< SRAM1 : 64KB (0x20000000 0x2000FFFF) */ -#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 0x20037FFF) */ -#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 0x2003FFFF) */ +#define SRAM1_END_ADDR (0x2000FFFFUL) /*!< SRAM1 : 64KB (0x20000000 - 0x2000FFFF) */ +#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 - 0x20037FFF) */ +#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 - 0x2003FFFF) */ -#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ /*!< Peripheral memory map */ #define APB1PERIPH_BASE PERIPH_BASE @@ -1101,7 +1101,7 @@ typedef struct #define ADC_CFGR_ALIGN_Pos (5U) #define ADC_CFGR_ALIGN_Msk (0x1UL << ADC_CFGR_ALIGN_Pos) /*!< 0x00000020 */ -#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignement */ +#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignment */ #define ADC_CFGR_EXTSEL_Pos (6U) #define ADC_CFGR_EXTSEL_Msk (0xFUL << ADC_CFGR_EXTSEL_Pos) /*!< 0x000003C0 */ @@ -3522,12 +3522,12 @@ typedef struct /* Arithmetic addition output data */ #define PKA_ARITHMETIC_ADD_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Arithmetic substraction input data */ +/* Arithmetic subtraction input data */ #define PKA_ARITHMETIC_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_ARITHMETIC_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_ARITHMETIC_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ -/* Arithmetic substraction output data */ +/* Arithmetic subtraction output data */ #define PKA_ARITHMETIC_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Arithmetic multiplication input data */ @@ -3563,13 +3563,13 @@ typedef struct /* Modular inversion output data */ #define PKA_MODULAR_INV_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Modular substraction input data */ +/* Modular subtraction input data */ #define PKA_MODULAR_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_MODULAR_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_MODULAR_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ #define PKA_MODULAR_SUB_IN_OP3_MOD ((0xD5CU - PKA_RAM_OFFSET)>>2) /*!< Input operand op3 */ -/* Modular substraction output data */ +/* Modular subtraction output data */ #define PKA_MODULAR_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Montgomery multiplication input data */ @@ -7495,10 +7495,10 @@ typedef struct #define RTC_CR_OSEL_1 (0x2U << RTC_CR_OSEL_Pos) /*!< 0x00400000 */ #define RTC_CR_POL_Pos (20U) #define RTC_CR_POL_Msk (0x1UL << RTC_CR_POL_Pos) /*!< 0x00100000 */ -#define RTC_CR_POL RTC_CR_POL_Msk /*!< Ouput polarity */ +#define RTC_CR_POL RTC_CR_POL_Msk /*!< Output polarity */ #define RTC_CR_COSEL_Pos (19U) #define RTC_CR_COSEL_Msk (0x1UL << RTC_CR_COSEL_Pos) /*!< 0x00080000 */ -#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration ouput selection */ +#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration output selection */ #define RTC_CR_BKP_Pos (18U) #define RTC_CR_BKP_Msk (0x1UL << RTC_CR_BKP_Pos) /*!< 0x00040000 */ #define RTC_CR_BKP RTC_CR_BKP_Msk /*!< Backup */ @@ -7767,7 +7767,7 @@ typedef struct /******************** Bits definition for RTC_SHIFTR register ***************/ #define RTC_SHIFTR_SUBFS_Pos (0U) #define RTC_SHIFTR_SUBFS_Msk (0x7FFFUL << RTC_SHIFTR_SUBFS_Pos) /*!< 0x00007FFF */ -#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Substract a fraction of a second */ +#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Subtract a fraction of a second */ #define RTC_SHIFTR_ADD1S_Pos (31U) #define RTC_SHIFTR_ADD1S_Msk (0x1UL << RTC_SHIFTR_ADD1S_Pos) /*!< 0x80000000 */ #define RTC_SHIFTR_ADD1S RTC_SHIFTR_ADD1S_Msk /*!< Add on second */ @@ -8467,100 +8467,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR1 register (SYSCFG SRAM2A write protection register) *********************************************************/ #define SYSCFG_SWPR1_PAGE0_Pos (0U) #define SYSCFG_SWPR1_PAGE0_Msk (0x1UL << SYSCFG_SWPR1_PAGE0_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 0x200303FF) */ +#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 - 0x200303FF) */ #define SYSCFG_SWPR1_PAGE1_Pos (1U) #define SYSCFG_SWPR1_PAGE1_Msk (0x1UL << SYSCFG_SWPR1_PAGE1_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 0x200307FF) */ +#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 - 0x200307FF) */ #define SYSCFG_SWPR1_PAGE2_Pos (2U) #define SYSCFG_SWPR1_PAGE2_Msk (0x1UL << SYSCFG_SWPR1_PAGE2_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 0x20030BFF) */ +#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 - 0x20030BFF) */ #define SYSCFG_SWPR1_PAGE3_Pos (3U) #define SYSCFG_SWPR1_PAGE3_Msk (0x1UL << SYSCFG_SWPR1_PAGE3_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 0x20030FFF) */ +#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 - 0x20030FFF) */ #define SYSCFG_SWPR1_PAGE4_Pos (4U) #define SYSCFG_SWPR1_PAGE4_Msk (0x1UL << SYSCFG_SWPR1_PAGE4_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 0x200313FF) */ +#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 - 0x200313FF) */ #define SYSCFG_SWPR1_PAGE5_Pos (5U) #define SYSCFG_SWPR1_PAGE5_Msk (0x1UL << SYSCFG_SWPR1_PAGE5_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 0x200317FF) */ +#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 - 0x200317FF) */ #define SYSCFG_SWPR1_PAGE6_Pos (6U) #define SYSCFG_SWPR1_PAGE6_Msk (0x1UL << SYSCFG_SWPR1_PAGE6_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 0x20031BFF) */ +#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 - 0x20031BFF) */ #define SYSCFG_SWPR1_PAGE7_Pos (7U) #define SYSCFG_SWPR1_PAGE7_Msk (0x1UL << SYSCFG_SWPR1_PAGE7_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 0x20031FFF) */ +#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 - 0x20031FFF) */ #define SYSCFG_SWPR1_PAGE8_Pos (8U) #define SYSCFG_SWPR1_PAGE8_Msk (0x1UL << SYSCFG_SWPR1_PAGE8_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 0x200323FF) */ +#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 - 0x200323FF) */ #define SYSCFG_SWPR1_PAGE9_Pos (9U) #define SYSCFG_SWPR1_PAGE9_Msk (0x1UL << SYSCFG_SWPR1_PAGE9_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 0x200327FF) */ +#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 - 0x200327FF) */ #define SYSCFG_SWPR1_PAGE10_Pos (10U) #define SYSCFG_SWPR1_PAGE10_Msk (0x1UL << SYSCFG_SWPR1_PAGE10_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 0x20032BFF) */ +#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 - 0x20032BFF) */ #define SYSCFG_SWPR1_PAGE11_Pos (11U) #define SYSCFG_SWPR1_PAGE11_Msk (0x1UL << SYSCFG_SWPR1_PAGE11_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 0x20032FFF) */ +#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 - 0x20032FFF) */ #define SYSCFG_SWPR1_PAGE12_Pos (12U) #define SYSCFG_SWPR1_PAGE12_Msk (0x1UL << SYSCFG_SWPR1_PAGE12_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 0x200333FF) */ +#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 - 0x200333FF) */ #define SYSCFG_SWPR1_PAGE13_Pos (13U) #define SYSCFG_SWPR1_PAGE13_Msk (0x1UL << SYSCFG_SWPR1_PAGE13_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 0x200337FF) */ +#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 - 0x200337FF) */ #define SYSCFG_SWPR1_PAGE14_Pos (14U) #define SYSCFG_SWPR1_PAGE14_Msk (0x1UL << SYSCFG_SWPR1_PAGE14_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 0x20033BFF) */ +#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 - 0x20033BFF) */ #define SYSCFG_SWPR1_PAGE15_Pos (15U) #define SYSCFG_SWPR1_PAGE15_Msk (0x1UL << SYSCFG_SWPR1_PAGE15_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 0x20033FFF) */ +#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 - 0x20033FFF) */ #define SYSCFG_SWPR1_PAGE16_Pos (16U) #define SYSCFG_SWPR1_PAGE16_Msk (0x1UL << SYSCFG_SWPR1_PAGE16_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 0x200343FF) */ +#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 - 0x200343FF) */ #define SYSCFG_SWPR1_PAGE17_Pos (17U) #define SYSCFG_SWPR1_PAGE17_Msk (0x1UL << SYSCFG_SWPR1_PAGE17_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 0x200347FF) */ +#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 - 0x200347FF) */ #define SYSCFG_SWPR1_PAGE18_Pos (18U) #define SYSCFG_SWPR1_PAGE18_Msk (0x1UL << SYSCFG_SWPR1_PAGE18_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 0x20034BFF) */ +#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 - 0x20034BFF) */ #define SYSCFG_SWPR1_PAGE19_Pos (19U) #define SYSCFG_SWPR1_PAGE19_Msk (0x1UL << SYSCFG_SWPR1_PAGE19_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 0x20034FFF) */ +#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 - 0x20034FFF) */ #define SYSCFG_SWPR1_PAGE20_Pos (20U) #define SYSCFG_SWPR1_PAGE20_Msk (0x1UL << SYSCFG_SWPR1_PAGE20_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 0x200353FF) */ +#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 - 0x200353FF) */ #define SYSCFG_SWPR1_PAGE21_Pos (21U) #define SYSCFG_SWPR1_PAGE21_Msk (0x1UL << SYSCFG_SWPR1_PAGE21_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 0x200357FF) */ +#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 - 0x200357FF) */ #define SYSCFG_SWPR1_PAGE22_Pos (22U) #define SYSCFG_SWPR1_PAGE22_Msk (0x1UL << SYSCFG_SWPR1_PAGE22_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 0x20035BFF) */ +#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 - 0x20035BFF) */ #define SYSCFG_SWPR1_PAGE23_Pos (23U) #define SYSCFG_SWPR1_PAGE23_Msk (0x1UL << SYSCFG_SWPR1_PAGE23_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 0x20035FFF) */ +#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 - 0x20035FFF) */ #define SYSCFG_SWPR1_PAGE24_Pos (24U) #define SYSCFG_SWPR1_PAGE24_Msk (0x1UL << SYSCFG_SWPR1_PAGE24_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 0x200363FF) */ +#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 - 0x200363FF) */ #define SYSCFG_SWPR1_PAGE25_Pos (25U) #define SYSCFG_SWPR1_PAGE25_Msk (0x1UL << SYSCFG_SWPR1_PAGE25_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 0x200367FF) */ +#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 - 0x200367FF) */ #define SYSCFG_SWPR1_PAGE26_Pos (26U) #define SYSCFG_SWPR1_PAGE26_Msk (0x1UL << SYSCFG_SWPR1_PAGE26_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 0x20036BFF) */ +#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 - 0x20036BFF) */ #define SYSCFG_SWPR1_PAGE27_Pos (27U) #define SYSCFG_SWPR1_PAGE27_Msk (0x1UL << SYSCFG_SWPR1_PAGE27_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 0x20036FFF) */ +#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 - 0x20036FFF) */ #define SYSCFG_SWPR1_PAGE28_Pos (28U) #define SYSCFG_SWPR1_PAGE28_Msk (0x1UL << SYSCFG_SWPR1_PAGE28_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 0x200373FF) */ +#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 - 0x200373FF) */ #define SYSCFG_SWPR1_PAGE29_Pos (29U) #define SYSCFG_SWPR1_PAGE29_Msk (0x1UL << SYSCFG_SWPR1_PAGE29_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 0x200377FF) */ +#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 - 0x200377FF) */ #define SYSCFG_SWPR1_PAGE30_Pos (30U) #define SYSCFG_SWPR1_PAGE30_Msk (0x1UL << SYSCFG_SWPR1_PAGE30_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 0x20037BFF) */ +#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 - 0x20037BFF) */ #define SYSCFG_SWPR1_PAGE31_Pos (31U) #define SYSCFG_SWPR1_PAGE31_Msk (0x1UL << SYSCFG_SWPR1_PAGE31_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 0x20037FFF) */ +#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 - 0x20037FFF) */ /***************** Bit definition for SYSCFG_SKR register (SYSCFG SRAM2 key register) *************************************************************************/ #define SYSCFG_SKR_KEY_Pos (0U) @@ -8570,100 +8570,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR2 register (SYSCFG SRAM2 write protection register) **********************************************************/ #define SYSCFG_SWPR2_PAGE32_Pos (0U) #define SYSCFG_SWPR2_PAGE32_Msk (0x1UL << SYSCFG_SWPR2_PAGE32_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 0x200383FF) */ +#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 - 0x200383FF) */ #define SYSCFG_SWPR2_PAGE33_Pos (1U) #define SYSCFG_SWPR2_PAGE33_Msk (0x1UL << SYSCFG_SWPR2_PAGE33_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 0x200387FF) */ +#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 - 0x200387FF) */ #define SYSCFG_SWPR2_PAGE34_Pos (2U) #define SYSCFG_SWPR2_PAGE34_Msk (0x1UL << SYSCFG_SWPR2_PAGE34_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 0x20038bFF) */ +#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 - 0x20038bFF) */ #define SYSCFG_SWPR2_PAGE35_Pos (3U) #define SYSCFG_SWPR2_PAGE35_Msk (0x1UL << SYSCFG_SWPR2_PAGE35_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 0x20038FFF) */ +#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 - 0x20038FFF) */ #define SYSCFG_SWPR2_PAGE36_Pos (4U) #define SYSCFG_SWPR2_PAGE36_Msk (0x1UL << SYSCFG_SWPR2_PAGE36_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 0x200393FF) */ +#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 - 0x200393FF) */ #define SYSCFG_SWPR2_PAGE37_Pos (5U) #define SYSCFG_SWPR2_PAGE37_Msk (0x1UL << SYSCFG_SWPR2_PAGE37_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 0x200397FF) */ +#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 - 0x200397FF) */ #define SYSCFG_SWPR2_PAGE38_Pos (6U) #define SYSCFG_SWPR2_PAGE38_Msk (0x1UL << SYSCFG_SWPR2_PAGE38_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 0x20039BFF) */ +#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 - 0x20039BFF) */ #define SYSCFG_SWPR2_PAGE39_Pos (7U) #define SYSCFG_SWPR2_PAGE39_Msk (0x1UL << SYSCFG_SWPR2_PAGE39_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 0x20039FFF) */ +#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 - 0x20039FFF) */ #define SYSCFG_SWPR2_PAGE40_Pos (8U) #define SYSCFG_SWPR2_PAGE40_Msk (0x1UL << SYSCFG_SWPR2_PAGE40_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 0x2003A3FF) */ +#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 - 0x2003A3FF) */ #define SYSCFG_SWPR2_PAGE41_Pos (9U) #define SYSCFG_SWPR2_PAGE41_Msk (0x1UL << SYSCFG_SWPR2_PAGE41_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 0x2003A7FF) */ +#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 - 0x2003A7FF) */ #define SYSCFG_SWPR2_PAGE42_Pos (10U) #define SYSCFG_SWPR2_PAGE42_Msk (0x1UL << SYSCFG_SWPR2_PAGE42_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 0x2003ABFF) */ +#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 - 0x2003ABFF) */ #define SYSCFG_SWPR2_PAGE43_Pos (11U) #define SYSCFG_SWPR2_PAGE43_Msk (0x1UL << SYSCFG_SWPR2_PAGE43_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 0x2003AFFF) */ +#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 - 0x2003AFFF) */ #define SYSCFG_SWPR2_PAGE44_Pos (12U) #define SYSCFG_SWPR2_PAGE44_Msk (0x1UL << SYSCFG_SWPR2_PAGE44_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 0x2003B3FF) */ +#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 - 0x2003B3FF) */ #define SYSCFG_SWPR2_PAGE45_Pos (13U) #define SYSCFG_SWPR2_PAGE45_Msk (0x1UL << SYSCFG_SWPR2_PAGE45_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 0x2003B7FF) */ +#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 - 0x2003B7FF) */ #define SYSCFG_SWPR2_PAGE46_Pos (14U) #define SYSCFG_SWPR2_PAGE46_Msk (0x1UL << SYSCFG_SWPR2_PAGE46_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 0x2003BBFF) */ +#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 - 0x2003BBFF) */ #define SYSCFG_SWPR2_PAGE47_Pos (15U) #define SYSCFG_SWPR2_PAGE47_Msk (0x1UL << SYSCFG_SWPR2_PAGE47_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 0x2003BFFF) */ +#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 - 0x2003BFFF) */ #define SYSCFG_SWPR2_PAGE48_Pos (16U) #define SYSCFG_SWPR2_PAGE48_Msk (0x1UL << SYSCFG_SWPR2_PAGE48_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 0x2003C3FF) */ +#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 - 0x2003C3FF) */ #define SYSCFG_SWPR2_PAGE49_Pos (17U) #define SYSCFG_SWPR2_PAGE49_Msk (0x1UL << SYSCFG_SWPR2_PAGE49_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 0x2003C7FF) */ +#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 - 0x2003C7FF) */ #define SYSCFG_SWPR2_PAGE50_Pos (18U) #define SYSCFG_SWPR2_PAGE50_Msk (0x1UL << SYSCFG_SWPR2_PAGE50_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 0x2003CBFF) */ +#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 - 0x2003CBFF) */ #define SYSCFG_SWPR2_PAGE51_Pos (19U) #define SYSCFG_SWPR2_PAGE51_Msk (0x1UL << SYSCFG_SWPR2_PAGE51_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 0x2003CFFF) */ +#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 - 0x2003CFFF) */ #define SYSCFG_SWPR2_PAGE52_Pos (20U) #define SYSCFG_SWPR2_PAGE52_Msk (0x1UL << SYSCFG_SWPR2_PAGE52_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 0x2003D3FF) */ +#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 - 0x2003D3FF) */ #define SYSCFG_SWPR2_PAGE53_Pos (21U) #define SYSCFG_SWPR2_PAGE53_Msk (0x1UL << SYSCFG_SWPR2_PAGE53_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 0x2003D7FF) */ +#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 - 0x2003D7FF) */ #define SYSCFG_SWPR2_PAGE54_Pos (22U) #define SYSCFG_SWPR2_PAGE54_Msk (0x1UL << SYSCFG_SWPR2_PAGE54_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 0x2003DBFF) */ +#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 - 0x2003DBFF) */ #define SYSCFG_SWPR2_PAGE55_Pos (23U) #define SYSCFG_SWPR2_PAGE55_Msk (0x1UL << SYSCFG_SWPR2_PAGE55_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 0x2003DFFF) */ +#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 - 0x2003DFFF) */ #define SYSCFG_SWPR2_PAGE56_Pos (24U) #define SYSCFG_SWPR2_PAGE56_Msk (0x1UL << SYSCFG_SWPR2_PAGE56_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 0x2003E3FF) */ +#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 - 0x2003E3FF) */ #define SYSCFG_SWPR2_PAGE57_Pos (25U) #define SYSCFG_SWPR2_PAGE57_Msk (0x1UL << SYSCFG_SWPR2_PAGE57_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 0x2003E7FF) */ +#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 - 0x2003E7FF) */ #define SYSCFG_SWPR2_PAGE58_Pos (26U) #define SYSCFG_SWPR2_PAGE58_Msk (0x1UL << SYSCFG_SWPR2_PAGE58_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 0x2003EBFF) */ +#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 - 0x2003EBFF) */ #define SYSCFG_SWPR2_PAGE59_Pos (27U) #define SYSCFG_SWPR2_PAGE59_Msk (0x1UL << SYSCFG_SWPR2_PAGE59_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 0x2003EFFF) */ +#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 - 0x2003EFFF) */ #define SYSCFG_SWPR2_PAGE60_Pos (28U) #define SYSCFG_SWPR2_PAGE60_Msk (0x1UL << SYSCFG_SWPR2_PAGE60_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 0x2003F3FF) */ +#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 - 0x2003F3FF) */ #define SYSCFG_SWPR2_PAGE61_Pos (29U) #define SYSCFG_SWPR2_PAGE61_Msk (0x1UL << SYSCFG_SWPR2_PAGE61_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 0x2003F7FF) */ +#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 - 0x2003F7FF) */ #define SYSCFG_SWPR2_PAGE62_Pos (30U) #define SYSCFG_SWPR2_PAGE62_Msk (0x1UL << SYSCFG_SWPR2_PAGE62_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 0x2003FBFF) */ +#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 - 0x2003FBFF) */ #define SYSCFG_SWPR2_PAGE63_Pos (31U) #define SYSCFG_SWPR2_PAGE63_Msk (0x1UL << SYSCFG_SWPR2_PAGE63_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 0x2003FFFF) */ +#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 - 0x2003FFFF) */ /***************** Bit definition for SYSCFG_IMR1 register (Interrupt masks control and status register on CPU1 - part 1) *******************************************/ #define SYSCFG_IMR1_TIM1IM_Pos (13U) @@ -11037,5 +11037,3 @@ typedef struct /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb55xx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb55xx.h index 196faabcb..b3e0bb83a 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb55xx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb55xx.h @@ -487,7 +487,7 @@ uint32_t RESERVED6; /*!< Reserved, __IO uint32_t HSECR; /*!< RCC HSE Clock Register, Address offset: 0x9C */ uint32_t RESERVED7[26]; /*!< Reserved, Address offset: 0xA0-0x104 */ __IO uint32_t EXTCFGR; /*!< RCC Extended Clock Recovery Register, Address offset: 0x108 */ -uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ +uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ __IO uint32_t C2AHB1ENR; /*!< RRCC AHB1 peripheral CPU2 clocks enable register, Address offset: 0x148 */ __IO uint32_t C2AHB2ENR; /*!< RCC AHB2 peripheral CPU2 clocks enable register, Address offset: 0x14C */ __IO uint32_t C2AHB3ENR; /*!< RCC AHB3 & AHB4 peripheral CPU2 clocks enable register,, Address offset: 0x150 */ @@ -922,10 +922,10 @@ typedef struct /*!< Memory, OTP and Option bytes */ /* Base addresses */ -#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ #define SRAM1_BASE SRAM_BASE /*!< SRAM1(up to 192 KB) base address */ #define SRAM2A_BASE (SRAM_BASE + 0x00030000UL)/*!< SRAM2A(32 KB) base address */ @@ -938,14 +938,14 @@ typedef struct #define SRAM2B_SIZE 0x00008000UL /*!< SRAM2b default size : 32 kB */ /* End addresses */ -#define SRAM1_END_ADDR (0x2002FFFFUL) /*!< SRAM1 : 192KB (0x20000000 0x2002FFFF) */ -#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 0x20037FFF) */ -#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 0x2003FFFF) */ +#define SRAM1_END_ADDR (0x2002FFFFUL) /*!< SRAM1 : 192KB (0x20000000 - 0x2002FFFF) */ +#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 - 0x20037FFF) */ +#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 - 0x2003FFFF) */ -#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ /*!< Peripheral memory map */ #define APB1PERIPH_BASE PERIPH_BASE @@ -1338,7 +1338,7 @@ typedef struct #define ADC_CFGR_ALIGN_Pos (5U) #define ADC_CFGR_ALIGN_Msk (0x1UL << ADC_CFGR_ALIGN_Pos) /*!< 0x00000020 */ -#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignement */ +#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignment */ #define ADC_CFGR_EXTSEL_Pos (6U) #define ADC_CFGR_EXTSEL_Msk (0xFUL << ADC_CFGR_EXTSEL_Pos) /*!< 0x000003C0 */ @@ -3951,12 +3951,12 @@ typedef struct /* Arithmetic addition output data */ #define PKA_ARITHMETIC_ADD_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Arithmetic substraction input data */ +/* Arithmetic subtraction input data */ #define PKA_ARITHMETIC_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_ARITHMETIC_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_ARITHMETIC_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ -/* Arithmetic substraction output data */ +/* Arithmetic subtraction output data */ #define PKA_ARITHMETIC_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Arithmetic multiplication input data */ @@ -3992,13 +3992,13 @@ typedef struct /* Modular inversion output data */ #define PKA_MODULAR_INV_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Modular substraction input data */ +/* Modular subtraction input data */ #define PKA_MODULAR_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_MODULAR_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_MODULAR_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ #define PKA_MODULAR_SUB_IN_OP3_MOD ((0xD5CU - PKA_RAM_OFFSET)>>2) /*!< Input operand op3 */ -/* Modular substraction output data */ +/* Modular subtraction output data */ #define PKA_MODULAR_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Montgomery multiplication input data */ @@ -8746,10 +8746,10 @@ typedef struct #define RTC_CR_OSEL_1 (0x2U << RTC_CR_OSEL_Pos) /*!< 0x00400000 */ #define RTC_CR_POL_Pos (20U) #define RTC_CR_POL_Msk (0x1UL << RTC_CR_POL_Pos) /*!< 0x00100000 */ -#define RTC_CR_POL RTC_CR_POL_Msk /*!< Ouput polarity */ +#define RTC_CR_POL RTC_CR_POL_Msk /*!< Output polarity */ #define RTC_CR_COSEL_Pos (19U) #define RTC_CR_COSEL_Msk (0x1UL << RTC_CR_COSEL_Pos) /*!< 0x00080000 */ -#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration ouput selection */ +#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration output selection */ #define RTC_CR_BKP_Pos (18U) #define RTC_CR_BKP_Msk (0x1UL << RTC_CR_BKP_Pos) /*!< 0x00040000 */ #define RTC_CR_BKP RTC_CR_BKP_Msk /*!< Backup */ @@ -9024,7 +9024,7 @@ typedef struct /******************** Bits definition for RTC_SHIFTR register ***************/ #define RTC_SHIFTR_SUBFS_Pos (0U) #define RTC_SHIFTR_SUBFS_Msk (0x7FFFUL << RTC_SHIFTR_SUBFS_Pos) /*!< 0x00007FFF */ -#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Substract a fraction of a second */ +#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Subtract a fraction of a second */ #define RTC_SHIFTR_ADD1S_Pos (31U) #define RTC_SHIFTR_ADD1S_Msk (0x1UL << RTC_SHIFTR_ADD1S_Pos) /*!< 0x80000000 */ #define RTC_SHIFTR_ADD1S RTC_SHIFTR_ADD1S_Msk /*!< Add on second */ @@ -10714,100 +10714,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR1 register (SYSCFG SRAM2A write protection register) *********************************************************/ #define SYSCFG_SWPR1_PAGE0_Pos (0U) #define SYSCFG_SWPR1_PAGE0_Msk (0x1UL << SYSCFG_SWPR1_PAGE0_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 0x200303FF) */ +#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 - 0x200303FF) */ #define SYSCFG_SWPR1_PAGE1_Pos (1U) #define SYSCFG_SWPR1_PAGE1_Msk (0x1UL << SYSCFG_SWPR1_PAGE1_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 0x200307FF) */ +#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 - 0x200307FF) */ #define SYSCFG_SWPR1_PAGE2_Pos (2U) #define SYSCFG_SWPR1_PAGE2_Msk (0x1UL << SYSCFG_SWPR1_PAGE2_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 0x20030BFF) */ +#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 - 0x20030BFF) */ #define SYSCFG_SWPR1_PAGE3_Pos (3U) #define SYSCFG_SWPR1_PAGE3_Msk (0x1UL << SYSCFG_SWPR1_PAGE3_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 0x20030FFF) */ +#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 - 0x20030FFF) */ #define SYSCFG_SWPR1_PAGE4_Pos (4U) #define SYSCFG_SWPR1_PAGE4_Msk (0x1UL << SYSCFG_SWPR1_PAGE4_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 0x200313FF) */ +#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 - 0x200313FF) */ #define SYSCFG_SWPR1_PAGE5_Pos (5U) #define SYSCFG_SWPR1_PAGE5_Msk (0x1UL << SYSCFG_SWPR1_PAGE5_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 0x200317FF) */ +#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 - 0x200317FF) */ #define SYSCFG_SWPR1_PAGE6_Pos (6U) #define SYSCFG_SWPR1_PAGE6_Msk (0x1UL << SYSCFG_SWPR1_PAGE6_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 0x20031BFF) */ +#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 - 0x20031BFF) */ #define SYSCFG_SWPR1_PAGE7_Pos (7U) #define SYSCFG_SWPR1_PAGE7_Msk (0x1UL << SYSCFG_SWPR1_PAGE7_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 0x20031FFF) */ +#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 - 0x20031FFF) */ #define SYSCFG_SWPR1_PAGE8_Pos (8U) #define SYSCFG_SWPR1_PAGE8_Msk (0x1UL << SYSCFG_SWPR1_PAGE8_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 0x200323FF) */ +#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 - 0x200323FF) */ #define SYSCFG_SWPR1_PAGE9_Pos (9U) #define SYSCFG_SWPR1_PAGE9_Msk (0x1UL << SYSCFG_SWPR1_PAGE9_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 0x200327FF) */ +#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 - 0x200327FF) */ #define SYSCFG_SWPR1_PAGE10_Pos (10U) #define SYSCFG_SWPR1_PAGE10_Msk (0x1UL << SYSCFG_SWPR1_PAGE10_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 0x20032BFF) */ +#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 - 0x20032BFF) */ #define SYSCFG_SWPR1_PAGE11_Pos (11U) #define SYSCFG_SWPR1_PAGE11_Msk (0x1UL << SYSCFG_SWPR1_PAGE11_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 0x20032FFF) */ +#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 - 0x20032FFF) */ #define SYSCFG_SWPR1_PAGE12_Pos (12U) #define SYSCFG_SWPR1_PAGE12_Msk (0x1UL << SYSCFG_SWPR1_PAGE12_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 0x200333FF) */ +#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 - 0x200333FF) */ #define SYSCFG_SWPR1_PAGE13_Pos (13U) #define SYSCFG_SWPR1_PAGE13_Msk (0x1UL << SYSCFG_SWPR1_PAGE13_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 0x200337FF) */ +#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 - 0x200337FF) */ #define SYSCFG_SWPR1_PAGE14_Pos (14U) #define SYSCFG_SWPR1_PAGE14_Msk (0x1UL << SYSCFG_SWPR1_PAGE14_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 0x20033BFF) */ +#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 - 0x20033BFF) */ #define SYSCFG_SWPR1_PAGE15_Pos (15U) #define SYSCFG_SWPR1_PAGE15_Msk (0x1UL << SYSCFG_SWPR1_PAGE15_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 0x20033FFF) */ +#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 - 0x20033FFF) */ #define SYSCFG_SWPR1_PAGE16_Pos (16U) #define SYSCFG_SWPR1_PAGE16_Msk (0x1UL << SYSCFG_SWPR1_PAGE16_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 0x200343FF) */ +#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 - 0x200343FF) */ #define SYSCFG_SWPR1_PAGE17_Pos (17U) #define SYSCFG_SWPR1_PAGE17_Msk (0x1UL << SYSCFG_SWPR1_PAGE17_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 0x200347FF) */ +#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 - 0x200347FF) */ #define SYSCFG_SWPR1_PAGE18_Pos (18U) #define SYSCFG_SWPR1_PAGE18_Msk (0x1UL << SYSCFG_SWPR1_PAGE18_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 0x20034BFF) */ +#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 - 0x20034BFF) */ #define SYSCFG_SWPR1_PAGE19_Pos (19U) #define SYSCFG_SWPR1_PAGE19_Msk (0x1UL << SYSCFG_SWPR1_PAGE19_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 0x20034FFF) */ +#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 - 0x20034FFF) */ #define SYSCFG_SWPR1_PAGE20_Pos (20U) #define SYSCFG_SWPR1_PAGE20_Msk (0x1UL << SYSCFG_SWPR1_PAGE20_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 0x200353FF) */ +#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 - 0x200353FF) */ #define SYSCFG_SWPR1_PAGE21_Pos (21U) #define SYSCFG_SWPR1_PAGE21_Msk (0x1UL << SYSCFG_SWPR1_PAGE21_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 0x200357FF) */ +#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 - 0x200357FF) */ #define SYSCFG_SWPR1_PAGE22_Pos (22U) #define SYSCFG_SWPR1_PAGE22_Msk (0x1UL << SYSCFG_SWPR1_PAGE22_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 0x20035BFF) */ +#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 - 0x20035BFF) */ #define SYSCFG_SWPR1_PAGE23_Pos (23U) #define SYSCFG_SWPR1_PAGE23_Msk (0x1UL << SYSCFG_SWPR1_PAGE23_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 0x20035FFF) */ +#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 - 0x20035FFF) */ #define SYSCFG_SWPR1_PAGE24_Pos (24U) #define SYSCFG_SWPR1_PAGE24_Msk (0x1UL << SYSCFG_SWPR1_PAGE24_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 0x200363FF) */ +#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 - 0x200363FF) */ #define SYSCFG_SWPR1_PAGE25_Pos (25U) #define SYSCFG_SWPR1_PAGE25_Msk (0x1UL << SYSCFG_SWPR1_PAGE25_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 0x200367FF) */ +#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 - 0x200367FF) */ #define SYSCFG_SWPR1_PAGE26_Pos (26U) #define SYSCFG_SWPR1_PAGE26_Msk (0x1UL << SYSCFG_SWPR1_PAGE26_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 0x20036BFF) */ +#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 - 0x20036BFF) */ #define SYSCFG_SWPR1_PAGE27_Pos (27U) #define SYSCFG_SWPR1_PAGE27_Msk (0x1UL << SYSCFG_SWPR1_PAGE27_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 0x20036FFF) */ +#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 - 0x20036FFF) */ #define SYSCFG_SWPR1_PAGE28_Pos (28U) #define SYSCFG_SWPR1_PAGE28_Msk (0x1UL << SYSCFG_SWPR1_PAGE28_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 0x200373FF) */ +#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 - 0x200373FF) */ #define SYSCFG_SWPR1_PAGE29_Pos (29U) #define SYSCFG_SWPR1_PAGE29_Msk (0x1UL << SYSCFG_SWPR1_PAGE29_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 0x200377FF) */ +#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 - 0x200377FF) */ #define SYSCFG_SWPR1_PAGE30_Pos (30U) #define SYSCFG_SWPR1_PAGE30_Msk (0x1UL << SYSCFG_SWPR1_PAGE30_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 0x20037BFF) */ +#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 - 0x20037BFF) */ #define SYSCFG_SWPR1_PAGE31_Pos (31U) #define SYSCFG_SWPR1_PAGE31_Msk (0x1UL << SYSCFG_SWPR1_PAGE31_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 0x20037FFF) */ +#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 - 0x20037FFF) */ /***************** Bit definition for SYSCFG_SKR register (SYSCFG SRAM2 key register) *************************************************************************/ #define SYSCFG_SKR_KEY_Pos (0U) @@ -10817,100 +10817,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR2 register (SYSCFG SRAM2 write protection register) **********************************************************/ #define SYSCFG_SWPR2_PAGE32_Pos (0U) #define SYSCFG_SWPR2_PAGE32_Msk (0x1UL << SYSCFG_SWPR2_PAGE32_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 0x200383FF) */ +#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 - 0x200383FF) */ #define SYSCFG_SWPR2_PAGE33_Pos (1U) #define SYSCFG_SWPR2_PAGE33_Msk (0x1UL << SYSCFG_SWPR2_PAGE33_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 0x200387FF) */ +#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 - 0x200387FF) */ #define SYSCFG_SWPR2_PAGE34_Pos (2U) #define SYSCFG_SWPR2_PAGE34_Msk (0x1UL << SYSCFG_SWPR2_PAGE34_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 0x20038bFF) */ +#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 - 0x20038bFF) */ #define SYSCFG_SWPR2_PAGE35_Pos (3U) #define SYSCFG_SWPR2_PAGE35_Msk (0x1UL << SYSCFG_SWPR2_PAGE35_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 0x20038FFF) */ +#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 - 0x20038FFF) */ #define SYSCFG_SWPR2_PAGE36_Pos (4U) #define SYSCFG_SWPR2_PAGE36_Msk (0x1UL << SYSCFG_SWPR2_PAGE36_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 0x200393FF) */ +#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 - 0x200393FF) */ #define SYSCFG_SWPR2_PAGE37_Pos (5U) #define SYSCFG_SWPR2_PAGE37_Msk (0x1UL << SYSCFG_SWPR2_PAGE37_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 0x200397FF) */ +#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 - 0x200397FF) */ #define SYSCFG_SWPR2_PAGE38_Pos (6U) #define SYSCFG_SWPR2_PAGE38_Msk (0x1UL << SYSCFG_SWPR2_PAGE38_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 0x20039BFF) */ +#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 - 0x20039BFF) */ #define SYSCFG_SWPR2_PAGE39_Pos (7U) #define SYSCFG_SWPR2_PAGE39_Msk (0x1UL << SYSCFG_SWPR2_PAGE39_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 0x20039FFF) */ +#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 - 0x20039FFF) */ #define SYSCFG_SWPR2_PAGE40_Pos (8U) #define SYSCFG_SWPR2_PAGE40_Msk (0x1UL << SYSCFG_SWPR2_PAGE40_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 0x2003A3FF) */ +#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 - 0x2003A3FF) */ #define SYSCFG_SWPR2_PAGE41_Pos (9U) #define SYSCFG_SWPR2_PAGE41_Msk (0x1UL << SYSCFG_SWPR2_PAGE41_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 0x2003A7FF) */ +#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 - 0x2003A7FF) */ #define SYSCFG_SWPR2_PAGE42_Pos (10U) #define SYSCFG_SWPR2_PAGE42_Msk (0x1UL << SYSCFG_SWPR2_PAGE42_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 0x2003ABFF) */ +#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 - 0x2003ABFF) */ #define SYSCFG_SWPR2_PAGE43_Pos (11U) #define SYSCFG_SWPR2_PAGE43_Msk (0x1UL << SYSCFG_SWPR2_PAGE43_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 0x2003AFFF) */ +#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 - 0x2003AFFF) */ #define SYSCFG_SWPR2_PAGE44_Pos (12U) #define SYSCFG_SWPR2_PAGE44_Msk (0x1UL << SYSCFG_SWPR2_PAGE44_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 0x2003B3FF) */ +#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 - 0x2003B3FF) */ #define SYSCFG_SWPR2_PAGE45_Pos (13U) #define SYSCFG_SWPR2_PAGE45_Msk (0x1UL << SYSCFG_SWPR2_PAGE45_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 0x2003B7FF) */ +#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 - 0x2003B7FF) */ #define SYSCFG_SWPR2_PAGE46_Pos (14U) #define SYSCFG_SWPR2_PAGE46_Msk (0x1UL << SYSCFG_SWPR2_PAGE46_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 0x2003BBFF) */ +#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 - 0x2003BBFF) */ #define SYSCFG_SWPR2_PAGE47_Pos (15U) #define SYSCFG_SWPR2_PAGE47_Msk (0x1UL << SYSCFG_SWPR2_PAGE47_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 0x2003BFFF) */ +#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 - 0x2003BFFF) */ #define SYSCFG_SWPR2_PAGE48_Pos (16U) #define SYSCFG_SWPR2_PAGE48_Msk (0x1UL << SYSCFG_SWPR2_PAGE48_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 0x2003C3FF) */ +#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 - 0x2003C3FF) */ #define SYSCFG_SWPR2_PAGE49_Pos (17U) #define SYSCFG_SWPR2_PAGE49_Msk (0x1UL << SYSCFG_SWPR2_PAGE49_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 0x2003C7FF) */ +#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 - 0x2003C7FF) */ #define SYSCFG_SWPR2_PAGE50_Pos (18U) #define SYSCFG_SWPR2_PAGE50_Msk (0x1UL << SYSCFG_SWPR2_PAGE50_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 0x2003CBFF) */ +#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 - 0x2003CBFF) */ #define SYSCFG_SWPR2_PAGE51_Pos (19U) #define SYSCFG_SWPR2_PAGE51_Msk (0x1UL << SYSCFG_SWPR2_PAGE51_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 0x2003CFFF) */ +#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 - 0x2003CFFF) */ #define SYSCFG_SWPR2_PAGE52_Pos (20U) #define SYSCFG_SWPR2_PAGE52_Msk (0x1UL << SYSCFG_SWPR2_PAGE52_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 0x2003D3FF) */ +#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 - 0x2003D3FF) */ #define SYSCFG_SWPR2_PAGE53_Pos (21U) #define SYSCFG_SWPR2_PAGE53_Msk (0x1UL << SYSCFG_SWPR2_PAGE53_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 0x2003D7FF) */ +#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 - 0x2003D7FF) */ #define SYSCFG_SWPR2_PAGE54_Pos (22U) #define SYSCFG_SWPR2_PAGE54_Msk (0x1UL << SYSCFG_SWPR2_PAGE54_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 0x2003DBFF) */ +#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 - 0x2003DBFF) */ #define SYSCFG_SWPR2_PAGE55_Pos (23U) #define SYSCFG_SWPR2_PAGE55_Msk (0x1UL << SYSCFG_SWPR2_PAGE55_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 0x2003DFFF) */ +#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 - 0x2003DFFF) */ #define SYSCFG_SWPR2_PAGE56_Pos (24U) #define SYSCFG_SWPR2_PAGE56_Msk (0x1UL << SYSCFG_SWPR2_PAGE56_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 0x2003E3FF) */ +#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 - 0x2003E3FF) */ #define SYSCFG_SWPR2_PAGE57_Pos (25U) #define SYSCFG_SWPR2_PAGE57_Msk (0x1UL << SYSCFG_SWPR2_PAGE57_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 0x2003E7FF) */ +#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 - 0x2003E7FF) */ #define SYSCFG_SWPR2_PAGE58_Pos (26U) #define SYSCFG_SWPR2_PAGE58_Msk (0x1UL << SYSCFG_SWPR2_PAGE58_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 0x2003EBFF) */ +#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 - 0x2003EBFF) */ #define SYSCFG_SWPR2_PAGE59_Pos (27U) #define SYSCFG_SWPR2_PAGE59_Msk (0x1UL << SYSCFG_SWPR2_PAGE59_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 0x2003EFFF) */ +#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 - 0x2003EFFF) */ #define SYSCFG_SWPR2_PAGE60_Pos (28U) #define SYSCFG_SWPR2_PAGE60_Msk (0x1UL << SYSCFG_SWPR2_PAGE60_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 0x2003F3FF) */ +#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 - 0x2003F3FF) */ #define SYSCFG_SWPR2_PAGE61_Pos (29U) #define SYSCFG_SWPR2_PAGE61_Msk (0x1UL << SYSCFG_SWPR2_PAGE61_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 0x2003F7FF) */ +#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 - 0x2003F7FF) */ #define SYSCFG_SWPR2_PAGE62_Pos (30U) #define SYSCFG_SWPR2_PAGE62_Msk (0x1UL << SYSCFG_SWPR2_PAGE62_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 0x2003FBFF) */ +#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 - 0x2003FBFF) */ #define SYSCFG_SWPR2_PAGE63_Pos (31U) #define SYSCFG_SWPR2_PAGE63_Msk (0x1UL << SYSCFG_SWPR2_PAGE63_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 0x2003FFFF) */ +#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 - 0x2003FFFF) */ /***************** Bit definition for SYSCFG_IMR1 register (Interrupt masks control and status register on CPU1 - part 1) *******************************************/ #define SYSCFG_IMR1_TIM1IM_Pos (13U) @@ -13690,5 +13690,3 @@ typedef struct /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb5mxx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb5mxx.h index f02d68c74..334d3b8e5 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb5mxx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb5mxx.h @@ -487,7 +487,7 @@ uint32_t RESERVED6; /*!< Reserved, __IO uint32_t HSECR; /*!< RCC HSE Clock Register, Address offset: 0x9C */ uint32_t RESERVED7[26]; /*!< Reserved, Address offset: 0xA0-0x104 */ __IO uint32_t EXTCFGR; /*!< RCC Extended Clock Recovery Register, Address offset: 0x108 */ -uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ +uint32_t RESERVED8[15]; /*!< Reserved, Address offset: 0x10C-0x144 */ __IO uint32_t C2AHB1ENR; /*!< RRCC AHB1 peripheral CPU2 clocks enable register, Address offset: 0x148 */ __IO uint32_t C2AHB2ENR; /*!< RCC AHB2 peripheral CPU2 clocks enable register, Address offset: 0x14C */ __IO uint32_t C2AHB3ENR; /*!< RCC AHB3 & AHB4 peripheral CPU2 clocks enable register,, Address offset: 0x150 */ @@ -922,10 +922,10 @@ typedef struct /*!< Memory, OTP and Option bytes */ /* Base addresses */ -#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_BASE (0x1FFF0000UL) /*!< System Memory : 28Kb (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_BASE (0x1FFF7000UL) /*!< OTP area : 1kB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_BASE (0x1FFF8000UL) /*!< Option Bytes : 4kB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_BASE (0x1FFF7400UL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ #define SRAM1_BASE SRAM_BASE /*!< SRAM1(up to 192 KB) base address */ #define SRAM2A_BASE (SRAM_BASE + 0x00030000UL)/*!< SRAM2A(32 KB) base address */ @@ -938,14 +938,14 @@ typedef struct #define SRAM2B_SIZE 0x00008000UL /*!< SRAM2b default size : 32 kB */ /* End addresses */ -#define SRAM1_END_ADDR (0x2002FFFFUL) /*!< SRAM1 : 192KB (0x20000000 0x2002FFFF) */ -#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 0x20037FFF) */ -#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 0x2003FFFF) */ +#define SRAM1_END_ADDR (0x2002FFFFUL) /*!< SRAM1 : 192KB (0x20000000 - 0x2002FFFF) */ +#define SRAM2A_END_ADDR (0x20037FFFUL) /*!< SRAM2a (backup) : 32KB (0x20030000 - 0x20037FFF) */ +#define SRAM2B_END_ADDR (0x2003FFFFUL) /*!< SRAM2b (non-backup) : 32KB (0x20038000 - 0x2003FFFF) */ -#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 0x1FFF6FFF) */ -#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 0x1FFF73FF) */ -#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 0x1FFF8FFF) */ -#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 0x1FFF7FFF) */ +#define SYSTEM_MEMORY_END_ADDR (0x1FFF6FFFUL) /*!< System Memory : 28KB (0x1FFF0000 - 0x1FFF6FFF) */ +#define OTP_AREA_END_ADDR (0x1FFF73FFUL) /*!< OTP area : 1KB (0x1FFF7000 - 0x1FFF73FF) */ +#define OPTION_BYTE_END_ADDR (0x1FFF8FFFUL) /*!< Option Bytes : 4KB (0x1FFF8000 - 0x1FFF8FFF) */ +#define ENGI_BYTE_END_ADDR (0x1FFF7FFFUL) /*!< Engi Bytes : 3kB (0x1FFF7400 - 0x1FFF7FFF) */ /*!< Peripheral memory map */ #define APB1PERIPH_BASE PERIPH_BASE @@ -1338,7 +1338,7 @@ typedef struct #define ADC_CFGR_ALIGN_Pos (5U) #define ADC_CFGR_ALIGN_Msk (0x1UL << ADC_CFGR_ALIGN_Pos) /*!< 0x00000020 */ -#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignement */ +#define ADC_CFGR_ALIGN ADC_CFGR_ALIGN_Msk /*!< ADC data alignment */ #define ADC_CFGR_EXTSEL_Pos (6U) #define ADC_CFGR_EXTSEL_Msk (0xFUL << ADC_CFGR_EXTSEL_Pos) /*!< 0x000003C0 */ @@ -3951,12 +3951,12 @@ typedef struct /* Arithmetic addition output data */ #define PKA_ARITHMETIC_ADD_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Arithmetic substraction input data */ +/* Arithmetic subtraction input data */ #define PKA_ARITHMETIC_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_ARITHMETIC_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_ARITHMETIC_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ -/* Arithmetic substraction output data */ +/* Arithmetic subtraction output data */ #define PKA_ARITHMETIC_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Arithmetic multiplication input data */ @@ -3992,13 +3992,13 @@ typedef struct /* Modular inversion output data */ #define PKA_MODULAR_INV_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ -/* Modular substraction input data */ +/* Modular subtraction input data */ #define PKA_MODULAR_SUB_NB_BITS ((0x404U - PKA_RAM_OFFSET)>>2) /*!< Input operand number of bits */ #define PKA_MODULAR_SUB_IN_OP1 ((0x8B4U - PKA_RAM_OFFSET)>>2) /*!< Input operand op1 */ #define PKA_MODULAR_SUB_IN_OP2 ((0xA44U - PKA_RAM_OFFSET)>>2) /*!< Input operand op2 */ #define PKA_MODULAR_SUB_IN_OP3_MOD ((0xD5CU - PKA_RAM_OFFSET)>>2) /*!< Input operand op3 */ -/* Modular substraction output data */ +/* Modular subtraction output data */ #define PKA_MODULAR_SUB_OUT_RESULT ((0xBD0U - PKA_RAM_OFFSET)>>2) /*!< Output result */ /* Montgomery multiplication input data */ @@ -8746,10 +8746,10 @@ typedef struct #define RTC_CR_OSEL_1 (0x2U << RTC_CR_OSEL_Pos) /*!< 0x00400000 */ #define RTC_CR_POL_Pos (20U) #define RTC_CR_POL_Msk (0x1UL << RTC_CR_POL_Pos) /*!< 0x00100000 */ -#define RTC_CR_POL RTC_CR_POL_Msk /*!< Ouput polarity */ +#define RTC_CR_POL RTC_CR_POL_Msk /*!< Output polarity */ #define RTC_CR_COSEL_Pos (19U) #define RTC_CR_COSEL_Msk (0x1UL << RTC_CR_COSEL_Pos) /*!< 0x00080000 */ -#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration ouput selection */ +#define RTC_CR_COSEL RTC_CR_COSEL_Msk /*!< Calibration output selection */ #define RTC_CR_BKP_Pos (18U) #define RTC_CR_BKP_Msk (0x1UL << RTC_CR_BKP_Pos) /*!< 0x00040000 */ #define RTC_CR_BKP RTC_CR_BKP_Msk /*!< Backup */ @@ -9024,7 +9024,7 @@ typedef struct /******************** Bits definition for RTC_SHIFTR register ***************/ #define RTC_SHIFTR_SUBFS_Pos (0U) #define RTC_SHIFTR_SUBFS_Msk (0x7FFFUL << RTC_SHIFTR_SUBFS_Pos) /*!< 0x00007FFF */ -#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Substract a fraction of a second */ +#define RTC_SHIFTR_SUBFS RTC_SHIFTR_SUBFS_Msk /*!< Subtract a fraction of a second */ #define RTC_SHIFTR_ADD1S_Pos (31U) #define RTC_SHIFTR_ADD1S_Msk (0x1UL << RTC_SHIFTR_ADD1S_Pos) /*!< 0x80000000 */ #define RTC_SHIFTR_ADD1S RTC_SHIFTR_ADD1S_Msk /*!< Add on second */ @@ -10714,100 +10714,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR1 register (SYSCFG SRAM2A write protection register) *********************************************************/ #define SYSCFG_SWPR1_PAGE0_Pos (0U) #define SYSCFG_SWPR1_PAGE0_Msk (0x1UL << SYSCFG_SWPR1_PAGE0_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 0x200303FF) */ +#define SYSCFG_SWPR1_PAGE0 SYSCFG_SWPR1_PAGE0_Msk /*!< SRAM2A Write protection page 0 (0x20030000 - 0x200303FF) */ #define SYSCFG_SWPR1_PAGE1_Pos (1U) #define SYSCFG_SWPR1_PAGE1_Msk (0x1UL << SYSCFG_SWPR1_PAGE1_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 0x200307FF) */ +#define SYSCFG_SWPR1_PAGE1 SYSCFG_SWPR1_PAGE1_Msk /*!< SRAM2A Write protection page 1 (0x20030400 - 0x200307FF) */ #define SYSCFG_SWPR1_PAGE2_Pos (2U) #define SYSCFG_SWPR1_PAGE2_Msk (0x1UL << SYSCFG_SWPR1_PAGE2_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 0x20030BFF) */ +#define SYSCFG_SWPR1_PAGE2 SYSCFG_SWPR1_PAGE2_Msk /*!< SRAM2A Write protection page 2 (0x20030800 - 0x20030BFF) */ #define SYSCFG_SWPR1_PAGE3_Pos (3U) #define SYSCFG_SWPR1_PAGE3_Msk (0x1UL << SYSCFG_SWPR1_PAGE3_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 0x20030FFF) */ +#define SYSCFG_SWPR1_PAGE3 SYSCFG_SWPR1_PAGE3_Msk /*!< SRAM2A Write protection page 3 (0x20030C00 - 0x20030FFF) */ #define SYSCFG_SWPR1_PAGE4_Pos (4U) #define SYSCFG_SWPR1_PAGE4_Msk (0x1UL << SYSCFG_SWPR1_PAGE4_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 0x200313FF) */ +#define SYSCFG_SWPR1_PAGE4 SYSCFG_SWPR1_PAGE4_Msk /*!< SRAM2A Write protection page 4 (0x20031000 - 0x200313FF) */ #define SYSCFG_SWPR1_PAGE5_Pos (5U) #define SYSCFG_SWPR1_PAGE5_Msk (0x1UL << SYSCFG_SWPR1_PAGE5_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 0x200317FF) */ +#define SYSCFG_SWPR1_PAGE5 SYSCFG_SWPR1_PAGE5_Msk /*!< SRAM2A Write protection page 5 (0x20031400 - 0x200317FF) */ #define SYSCFG_SWPR1_PAGE6_Pos (6U) #define SYSCFG_SWPR1_PAGE6_Msk (0x1UL << SYSCFG_SWPR1_PAGE6_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 0x20031BFF) */ +#define SYSCFG_SWPR1_PAGE6 SYSCFG_SWPR1_PAGE6_Msk /*!< SRAM2A Write protection page 6 (0x20031800 - 0x20031BFF) */ #define SYSCFG_SWPR1_PAGE7_Pos (7U) #define SYSCFG_SWPR1_PAGE7_Msk (0x1UL << SYSCFG_SWPR1_PAGE7_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 0x20031FFF) */ +#define SYSCFG_SWPR1_PAGE7 SYSCFG_SWPR1_PAGE7_Msk /*!< SRAM2A Write protection page 7 (0x20031C00 - 0x20031FFF) */ #define SYSCFG_SWPR1_PAGE8_Pos (8U) #define SYSCFG_SWPR1_PAGE8_Msk (0x1UL << SYSCFG_SWPR1_PAGE8_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 0x200323FF) */ +#define SYSCFG_SWPR1_PAGE8 SYSCFG_SWPR1_PAGE8_Msk /*!< SRAM2A Write protection page 8 (0x20032000 - 0x200323FF) */ #define SYSCFG_SWPR1_PAGE9_Pos (9U) #define SYSCFG_SWPR1_PAGE9_Msk (0x1UL << SYSCFG_SWPR1_PAGE9_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 0x200327FF) */ +#define SYSCFG_SWPR1_PAGE9 SYSCFG_SWPR1_PAGE9_Msk /*!< SRAM2A Write protection page 9 (0x20032400 - 0x200327FF) */ #define SYSCFG_SWPR1_PAGE10_Pos (10U) #define SYSCFG_SWPR1_PAGE10_Msk (0x1UL << SYSCFG_SWPR1_PAGE10_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 0x20032BFF) */ +#define SYSCFG_SWPR1_PAGE10 SYSCFG_SWPR1_PAGE10_Msk /*!< SRAM2A Write protection page 10 (0x20032800 - 0x20032BFF) */ #define SYSCFG_SWPR1_PAGE11_Pos (11U) #define SYSCFG_SWPR1_PAGE11_Msk (0x1UL << SYSCFG_SWPR1_PAGE11_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 0x20032FFF) */ +#define SYSCFG_SWPR1_PAGE11 SYSCFG_SWPR1_PAGE11_Msk /*!< SRAM2A Write protection page 11 (0x20032C00 - 0x20032FFF) */ #define SYSCFG_SWPR1_PAGE12_Pos (12U) #define SYSCFG_SWPR1_PAGE12_Msk (0x1UL << SYSCFG_SWPR1_PAGE12_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 0x200333FF) */ +#define SYSCFG_SWPR1_PAGE12 SYSCFG_SWPR1_PAGE12_Msk /*!< SRAM2A Write protection page 12 (0x20033000 - 0x200333FF) */ #define SYSCFG_SWPR1_PAGE13_Pos (13U) #define SYSCFG_SWPR1_PAGE13_Msk (0x1UL << SYSCFG_SWPR1_PAGE13_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 0x200337FF) */ +#define SYSCFG_SWPR1_PAGE13 SYSCFG_SWPR1_PAGE13_Msk /*!< SRAM2A Write protection page 13 (0x20033400 - 0x200337FF) */ #define SYSCFG_SWPR1_PAGE14_Pos (14U) #define SYSCFG_SWPR1_PAGE14_Msk (0x1UL << SYSCFG_SWPR1_PAGE14_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 0x20033BFF) */ +#define SYSCFG_SWPR1_PAGE14 SYSCFG_SWPR1_PAGE14_Msk /*!< SRAM2A Write protection page 14 (0x20033800 - 0x20033BFF) */ #define SYSCFG_SWPR1_PAGE15_Pos (15U) #define SYSCFG_SWPR1_PAGE15_Msk (0x1UL << SYSCFG_SWPR1_PAGE15_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 0x20033FFF) */ +#define SYSCFG_SWPR1_PAGE15 SYSCFG_SWPR1_PAGE15_Msk /*!< SRAM2A Write protection page 15 (0x20033C00 - 0x20033FFF) */ #define SYSCFG_SWPR1_PAGE16_Pos (16U) #define SYSCFG_SWPR1_PAGE16_Msk (0x1UL << SYSCFG_SWPR1_PAGE16_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 0x200343FF) */ +#define SYSCFG_SWPR1_PAGE16 SYSCFG_SWPR1_PAGE16_Msk /*!< SRAM2A Write protection page 16 (0x20034000 - 0x200343FF) */ #define SYSCFG_SWPR1_PAGE17_Pos (17U) #define SYSCFG_SWPR1_PAGE17_Msk (0x1UL << SYSCFG_SWPR1_PAGE17_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 0x200347FF) */ +#define SYSCFG_SWPR1_PAGE17 SYSCFG_SWPR1_PAGE17_Msk /*!< SRAM2A Write protection page 17 (0x20034400 - 0x200347FF) */ #define SYSCFG_SWPR1_PAGE18_Pos (18U) #define SYSCFG_SWPR1_PAGE18_Msk (0x1UL << SYSCFG_SWPR1_PAGE18_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 0x20034BFF) */ +#define SYSCFG_SWPR1_PAGE18 SYSCFG_SWPR1_PAGE18_Msk /*!< SRAM2A Write protection page 18 (0x20034800 - 0x20034BFF) */ #define SYSCFG_SWPR1_PAGE19_Pos (19U) #define SYSCFG_SWPR1_PAGE19_Msk (0x1UL << SYSCFG_SWPR1_PAGE19_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 0x20034FFF) */ +#define SYSCFG_SWPR1_PAGE19 SYSCFG_SWPR1_PAGE19_Msk /*!< SRAM2A Write protection page 19 (0x20034C00 - 0x20034FFF) */ #define SYSCFG_SWPR1_PAGE20_Pos (20U) #define SYSCFG_SWPR1_PAGE20_Msk (0x1UL << SYSCFG_SWPR1_PAGE20_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 0x200353FF) */ +#define SYSCFG_SWPR1_PAGE20 SYSCFG_SWPR1_PAGE20_Msk /*!< SRAM2A Write protection page 20 (0x20035000 - 0x200353FF) */ #define SYSCFG_SWPR1_PAGE21_Pos (21U) #define SYSCFG_SWPR1_PAGE21_Msk (0x1UL << SYSCFG_SWPR1_PAGE21_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 0x200357FF) */ +#define SYSCFG_SWPR1_PAGE21 SYSCFG_SWPR1_PAGE21_Msk /*!< SRAM2A Write protection page 21 (0x20035400 - 0x200357FF) */ #define SYSCFG_SWPR1_PAGE22_Pos (22U) #define SYSCFG_SWPR1_PAGE22_Msk (0x1UL << SYSCFG_SWPR1_PAGE22_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 0x20035BFF) */ +#define SYSCFG_SWPR1_PAGE22 SYSCFG_SWPR1_PAGE22_Msk /*!< SRAM2A Write protection page 22 (0x20035800 - 0x20035BFF) */ #define SYSCFG_SWPR1_PAGE23_Pos (23U) #define SYSCFG_SWPR1_PAGE23_Msk (0x1UL << SYSCFG_SWPR1_PAGE23_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 0x20035FFF) */ +#define SYSCFG_SWPR1_PAGE23 SYSCFG_SWPR1_PAGE23_Msk /*!< SRAM2A Write protection page 23 (0x20035C00 - 0x20035FFF) */ #define SYSCFG_SWPR1_PAGE24_Pos (24U) #define SYSCFG_SWPR1_PAGE24_Msk (0x1UL << SYSCFG_SWPR1_PAGE24_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 0x200363FF) */ +#define SYSCFG_SWPR1_PAGE24 SYSCFG_SWPR1_PAGE24_Msk /*!< SRAM2A Write protection page 24 (0x20036000 - 0x200363FF) */ #define SYSCFG_SWPR1_PAGE25_Pos (25U) #define SYSCFG_SWPR1_PAGE25_Msk (0x1UL << SYSCFG_SWPR1_PAGE25_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 0x200367FF) */ +#define SYSCFG_SWPR1_PAGE25 SYSCFG_SWPR1_PAGE25_Msk /*!< SRAM2A Write protection page 25 (0x20036400 - 0x200367FF) */ #define SYSCFG_SWPR1_PAGE26_Pos (26U) #define SYSCFG_SWPR1_PAGE26_Msk (0x1UL << SYSCFG_SWPR1_PAGE26_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 0x20036BFF) */ +#define SYSCFG_SWPR1_PAGE26 SYSCFG_SWPR1_PAGE26_Msk /*!< SRAM2A Write protection page 26 (0x20036800 - 0x20036BFF) */ #define SYSCFG_SWPR1_PAGE27_Pos (27U) #define SYSCFG_SWPR1_PAGE27_Msk (0x1UL << SYSCFG_SWPR1_PAGE27_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 0x20036FFF) */ +#define SYSCFG_SWPR1_PAGE27 SYSCFG_SWPR1_PAGE27_Msk /*!< SRAM2A Write protection page 27 (0x20036C00 - 0x20036FFF) */ #define SYSCFG_SWPR1_PAGE28_Pos (28U) #define SYSCFG_SWPR1_PAGE28_Msk (0x1UL << SYSCFG_SWPR1_PAGE28_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 0x200373FF) */ +#define SYSCFG_SWPR1_PAGE28 SYSCFG_SWPR1_PAGE28_Msk /*!< SRAM2A Write protection page 28 (0x20037000 - 0x200373FF) */ #define SYSCFG_SWPR1_PAGE29_Pos (29U) #define SYSCFG_SWPR1_PAGE29_Msk (0x1UL << SYSCFG_SWPR1_PAGE29_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 0x200377FF) */ +#define SYSCFG_SWPR1_PAGE29 SYSCFG_SWPR1_PAGE29_Msk /*!< SRAM2A Write protection page 29 (0x20037400 - 0x200377FF) */ #define SYSCFG_SWPR1_PAGE30_Pos (30U) #define SYSCFG_SWPR1_PAGE30_Msk (0x1UL << SYSCFG_SWPR1_PAGE30_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 0x20037BFF) */ +#define SYSCFG_SWPR1_PAGE30 SYSCFG_SWPR1_PAGE30_Msk /*!< SRAM2A Write protection page 30 (0x20037800 - 0x20037BFF) */ #define SYSCFG_SWPR1_PAGE31_Pos (31U) #define SYSCFG_SWPR1_PAGE31_Msk (0x1UL << SYSCFG_SWPR1_PAGE31_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 0x20037FFF) */ +#define SYSCFG_SWPR1_PAGE31 SYSCFG_SWPR1_PAGE31_Msk /*!< SRAM2A Write protection page 31 (0x20037C00 - 0x20037FFF) */ /***************** Bit definition for SYSCFG_SKR register (SYSCFG SRAM2 key register) *************************************************************************/ #define SYSCFG_SKR_KEY_Pos (0U) @@ -10817,100 +10817,100 @@ typedef struct /***************** Bit definition for SYSCFG_SWPR2 register (SYSCFG SRAM2 write protection register) **********************************************************/ #define SYSCFG_SWPR2_PAGE32_Pos (0U) #define SYSCFG_SWPR2_PAGE32_Msk (0x1UL << SYSCFG_SWPR2_PAGE32_Pos) /*!< 0x00000001 */ -#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 0x200383FF) */ +#define SYSCFG_SWPR2_PAGE32 SYSCFG_SWPR2_PAGE32_Msk /*!< SRAM2B Write protection page 0 (0x20038000 - 0x200383FF) */ #define SYSCFG_SWPR2_PAGE33_Pos (1U) #define SYSCFG_SWPR2_PAGE33_Msk (0x1UL << SYSCFG_SWPR2_PAGE33_Pos) /*!< 0x00000002 */ -#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 0x200387FF) */ +#define SYSCFG_SWPR2_PAGE33 SYSCFG_SWPR2_PAGE33_Msk /*!< SRAM2B Write protection page 1 (0x20038400 - 0x200387FF) */ #define SYSCFG_SWPR2_PAGE34_Pos (2U) #define SYSCFG_SWPR2_PAGE34_Msk (0x1UL << SYSCFG_SWPR2_PAGE34_Pos) /*!< 0x00000004 */ -#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 0x20038bFF) */ +#define SYSCFG_SWPR2_PAGE34 SYSCFG_SWPR2_PAGE34_Msk /*!< SRAM2B Write protection page 2 (0x20038800 - 0x20038bFF) */ #define SYSCFG_SWPR2_PAGE35_Pos (3U) #define SYSCFG_SWPR2_PAGE35_Msk (0x1UL << SYSCFG_SWPR2_PAGE35_Pos) /*!< 0x00000008 */ -#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 0x20038FFF) */ +#define SYSCFG_SWPR2_PAGE35 SYSCFG_SWPR2_PAGE35_Msk /*!< SRAM2B Write protection page 3 (0x20038C00 - 0x20038FFF) */ #define SYSCFG_SWPR2_PAGE36_Pos (4U) #define SYSCFG_SWPR2_PAGE36_Msk (0x1UL << SYSCFG_SWPR2_PAGE36_Pos) /*!< 0x00000010 */ -#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 0x200393FF) */ +#define SYSCFG_SWPR2_PAGE36 SYSCFG_SWPR2_PAGE36_Msk /*!< SRAM2B Write protection page 4 (0x20039000 - 0x200393FF) */ #define SYSCFG_SWPR2_PAGE37_Pos (5U) #define SYSCFG_SWPR2_PAGE37_Msk (0x1UL << SYSCFG_SWPR2_PAGE37_Pos) /*!< 0x00000020 */ -#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 0x200397FF) */ +#define SYSCFG_SWPR2_PAGE37 SYSCFG_SWPR2_PAGE37_Msk /*!< SRAM2B Write protection page 5 (0x20039400 - 0x200397FF) */ #define SYSCFG_SWPR2_PAGE38_Pos (6U) #define SYSCFG_SWPR2_PAGE38_Msk (0x1UL << SYSCFG_SWPR2_PAGE38_Pos) /*!< 0x00000040 */ -#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 0x20039BFF) */ +#define SYSCFG_SWPR2_PAGE38 SYSCFG_SWPR2_PAGE38_Msk /*!< SRAM2B Write protection page 6 (0x20039800 - 0x20039BFF) */ #define SYSCFG_SWPR2_PAGE39_Pos (7U) #define SYSCFG_SWPR2_PAGE39_Msk (0x1UL << SYSCFG_SWPR2_PAGE39_Pos) /*!< 0x00000080 */ -#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 0x20039FFF) */ +#define SYSCFG_SWPR2_PAGE39 SYSCFG_SWPR2_PAGE39_Msk /*!< SRAM2B Write protection page 7 (0x20039C00 - 0x20039FFF) */ #define SYSCFG_SWPR2_PAGE40_Pos (8U) #define SYSCFG_SWPR2_PAGE40_Msk (0x1UL << SYSCFG_SWPR2_PAGE40_Pos) /*!< 0x00000100 */ -#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 0x2003A3FF) */ +#define SYSCFG_SWPR2_PAGE40 SYSCFG_SWPR2_PAGE40_Msk /*!< SRAM2B Write protection page 8 (0x2003A000 - 0x2003A3FF) */ #define SYSCFG_SWPR2_PAGE41_Pos (9U) #define SYSCFG_SWPR2_PAGE41_Msk (0x1UL << SYSCFG_SWPR2_PAGE41_Pos) /*!< 0x00000200 */ -#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 0x2003A7FF) */ +#define SYSCFG_SWPR2_PAGE41 SYSCFG_SWPR2_PAGE41_Msk /*!< SRAM2B Write protection page 9 (0x2003A400 - 0x2003A7FF) */ #define SYSCFG_SWPR2_PAGE42_Pos (10U) #define SYSCFG_SWPR2_PAGE42_Msk (0x1UL << SYSCFG_SWPR2_PAGE42_Pos) /*!< 0x00000400 */ -#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 0x2003ABFF) */ +#define SYSCFG_SWPR2_PAGE42 SYSCFG_SWPR2_PAGE42_Msk /*!< SRAM2B Write protection page 10 (0x2003A800 - 0x2003ABFF) */ #define SYSCFG_SWPR2_PAGE43_Pos (11U) #define SYSCFG_SWPR2_PAGE43_Msk (0x1UL << SYSCFG_SWPR2_PAGE43_Pos) /*!< 0x00000800 */ -#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 0x2003AFFF) */ +#define SYSCFG_SWPR2_PAGE43 SYSCFG_SWPR2_PAGE43_Msk /*!< SRAM2B Write protection page 11 (0x2003AC00 - 0x2003AFFF) */ #define SYSCFG_SWPR2_PAGE44_Pos (12U) #define SYSCFG_SWPR2_PAGE44_Msk (0x1UL << SYSCFG_SWPR2_PAGE44_Pos) /*!< 0x00001000 */ -#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 0x2003B3FF) */ +#define SYSCFG_SWPR2_PAGE44 SYSCFG_SWPR2_PAGE44_Msk /*!< SRAM2B Write protection page 12 (0x2003B000 - 0x2003B3FF) */ #define SYSCFG_SWPR2_PAGE45_Pos (13U) #define SYSCFG_SWPR2_PAGE45_Msk (0x1UL << SYSCFG_SWPR2_PAGE45_Pos) /*!< 0x00002000 */ -#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 0x2003B7FF) */ +#define SYSCFG_SWPR2_PAGE45 SYSCFG_SWPR2_PAGE45_Msk /*!< SRAM2B Write protection page 13 (0x2003B400 - 0x2003B7FF) */ #define SYSCFG_SWPR2_PAGE46_Pos (14U) #define SYSCFG_SWPR2_PAGE46_Msk (0x1UL << SYSCFG_SWPR2_PAGE46_Pos) /*!< 0x00004000 */ -#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 0x2003BBFF) */ +#define SYSCFG_SWPR2_PAGE46 SYSCFG_SWPR2_PAGE46_Msk /*!< SRAM2B Write protection page 14 (0x2003B800 - 0x2003BBFF) */ #define SYSCFG_SWPR2_PAGE47_Pos (15U) #define SYSCFG_SWPR2_PAGE47_Msk (0x1UL << SYSCFG_SWPR2_PAGE47_Pos) /*!< 0x00008000 */ -#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 0x2003BFFF) */ +#define SYSCFG_SWPR2_PAGE47 SYSCFG_SWPR2_PAGE47_Msk /*!< SRAM2B Write protection page 15 (0x2003BC00 - 0x2003BFFF) */ #define SYSCFG_SWPR2_PAGE48_Pos (16U) #define SYSCFG_SWPR2_PAGE48_Msk (0x1UL << SYSCFG_SWPR2_PAGE48_Pos) /*!< 0x00010000 */ -#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 0x2003C3FF) */ +#define SYSCFG_SWPR2_PAGE48 SYSCFG_SWPR2_PAGE48_Msk /*!< SRAM2B Write protection page 16 (0x2003C000 - 0x2003C3FF) */ #define SYSCFG_SWPR2_PAGE49_Pos (17U) #define SYSCFG_SWPR2_PAGE49_Msk (0x1UL << SYSCFG_SWPR2_PAGE49_Pos) /*!< 0x00020000 */ -#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 0x2003C7FF) */ +#define SYSCFG_SWPR2_PAGE49 SYSCFG_SWPR2_PAGE49_Msk /*!< SRAM2B Write protection page 17 (0x2003C400 - 0x2003C7FF) */ #define SYSCFG_SWPR2_PAGE50_Pos (18U) #define SYSCFG_SWPR2_PAGE50_Msk (0x1UL << SYSCFG_SWPR2_PAGE50_Pos) /*!< 0x00040000 */ -#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 0x2003CBFF) */ +#define SYSCFG_SWPR2_PAGE50 SYSCFG_SWPR2_PAGE50_Msk /*!< SRAM2B Write protection page 18 (0x2003C800 - 0x2003CBFF) */ #define SYSCFG_SWPR2_PAGE51_Pos (19U) #define SYSCFG_SWPR2_PAGE51_Msk (0x1UL << SYSCFG_SWPR2_PAGE51_Pos) /*!< 0x00080000 */ -#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 0x2003CFFF) */ +#define SYSCFG_SWPR2_PAGE51 SYSCFG_SWPR2_PAGE51_Msk /*!< SRAM2B Write protection page 19 (0x2003CC00 - 0x2003CFFF) */ #define SYSCFG_SWPR2_PAGE52_Pos (20U) #define SYSCFG_SWPR2_PAGE52_Msk (0x1UL << SYSCFG_SWPR2_PAGE52_Pos) /*!< 0x00100000 */ -#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 0x2003D3FF) */ +#define SYSCFG_SWPR2_PAGE52 SYSCFG_SWPR2_PAGE52_Msk /*!< SRAM2B Write protection page 20 (0x2003D000 - 0x2003D3FF) */ #define SYSCFG_SWPR2_PAGE53_Pos (21U) #define SYSCFG_SWPR2_PAGE53_Msk (0x1UL << SYSCFG_SWPR2_PAGE53_Pos) /*!< 0x00200000 */ -#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 0x2003D7FF) */ +#define SYSCFG_SWPR2_PAGE53 SYSCFG_SWPR2_PAGE53_Msk /*!< SRAM2B Write protection page 21 (0x2003D400 - 0x2003D7FF) */ #define SYSCFG_SWPR2_PAGE54_Pos (22U) #define SYSCFG_SWPR2_PAGE54_Msk (0x1UL << SYSCFG_SWPR2_PAGE54_Pos) /*!< 0x00400000 */ -#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 0x2003DBFF) */ +#define SYSCFG_SWPR2_PAGE54 SYSCFG_SWPR2_PAGE54_Msk /*!< SRAM2B Write protection page 22 (0x2003D800 - 0x2003DBFF) */ #define SYSCFG_SWPR2_PAGE55_Pos (23U) #define SYSCFG_SWPR2_PAGE55_Msk (0x1UL << SYSCFG_SWPR2_PAGE55_Pos) /*!< 0x00800000 */ -#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 0x2003DFFF) */ +#define SYSCFG_SWPR2_PAGE55 SYSCFG_SWPR2_PAGE55_Msk /*!< SRAM2B Write protection page 23 (0x2003DC00 - 0x2003DFFF) */ #define SYSCFG_SWPR2_PAGE56_Pos (24U) #define SYSCFG_SWPR2_PAGE56_Msk (0x1UL << SYSCFG_SWPR2_PAGE56_Pos) /*!< 0x01000000 */ -#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 0x2003E3FF) */ +#define SYSCFG_SWPR2_PAGE56 SYSCFG_SWPR2_PAGE56_Msk /*!< SRAM2B Write protection page 24 (0x2003E000 - 0x2003E3FF) */ #define SYSCFG_SWPR2_PAGE57_Pos (25U) #define SYSCFG_SWPR2_PAGE57_Msk (0x1UL << SYSCFG_SWPR2_PAGE57_Pos) /*!< 0x02000000 */ -#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 0x2003E7FF) */ +#define SYSCFG_SWPR2_PAGE57 SYSCFG_SWPR2_PAGE57_Msk /*!< SRAM2B Write protection page 25 (0x2003E400 - 0x2003E7FF) */ #define SYSCFG_SWPR2_PAGE58_Pos (26U) #define SYSCFG_SWPR2_PAGE58_Msk (0x1UL << SYSCFG_SWPR2_PAGE58_Pos) /*!< 0x04000000 */ -#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 0x2003EBFF) */ +#define SYSCFG_SWPR2_PAGE58 SYSCFG_SWPR2_PAGE58_Msk /*!< SRAM2B Write protection page 26 (0x2003E800 - 0x2003EBFF) */ #define SYSCFG_SWPR2_PAGE59_Pos (27U) #define SYSCFG_SWPR2_PAGE59_Msk (0x1UL << SYSCFG_SWPR2_PAGE59_Pos) /*!< 0x08000000 */ -#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 0x2003EFFF) */ +#define SYSCFG_SWPR2_PAGE59 SYSCFG_SWPR2_PAGE59_Msk /*!< SRAM2B Write protection page 27 (0x2003EC00 - 0x2003EFFF) */ #define SYSCFG_SWPR2_PAGE60_Pos (28U) #define SYSCFG_SWPR2_PAGE60_Msk (0x1UL << SYSCFG_SWPR2_PAGE60_Pos) /*!< 0x10000000 */ -#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 0x2003F3FF) */ +#define SYSCFG_SWPR2_PAGE60 SYSCFG_SWPR2_PAGE60_Msk /*!< SRAM2B Write protection page 28 (0x2003F000 - 0x2003F3FF) */ #define SYSCFG_SWPR2_PAGE61_Pos (29U) #define SYSCFG_SWPR2_PAGE61_Msk (0x1UL << SYSCFG_SWPR2_PAGE61_Pos) /*!< 0x20000000 */ -#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 0x2003F7FF) */ +#define SYSCFG_SWPR2_PAGE61 SYSCFG_SWPR2_PAGE61_Msk /*!< SRAM2B Write protection page 29 (0x2003F400 - 0x2003F7FF) */ #define SYSCFG_SWPR2_PAGE62_Pos (30U) #define SYSCFG_SWPR2_PAGE62_Msk (0x1UL << SYSCFG_SWPR2_PAGE62_Pos) /*!< 0x40000000 */ -#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 0x2003FBFF) */ +#define SYSCFG_SWPR2_PAGE62 SYSCFG_SWPR2_PAGE62_Msk /*!< SRAM2B Write protection page 30 (0x2003F800 - 0x2003FBFF) */ #define SYSCFG_SWPR2_PAGE63_Pos (31U) #define SYSCFG_SWPR2_PAGE63_Msk (0x1UL << SYSCFG_SWPR2_PAGE63_Pos) /*!< 0x80000000 */ -#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 0x2003FFFF) */ +#define SYSCFG_SWPR2_PAGE63 SYSCFG_SWPR2_PAGE63_Msk /*!< SRAM2B Write protection page 31 (0x2003FC00 - 0x2003FFFF) */ /***************** Bit definition for SYSCFG_IMR1 register (Interrupt masks control and status register on CPU1 - part 1) *******************************************/ #define SYSCFG_IMR1_TIM1IM_Pos (13U) @@ -13690,5 +13690,3 @@ typedef struct /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h index 197059705..c9b60bf27 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h @@ -68,7 +68,7 @@ * @brief CMSIS Device version number */ #define __STM32WBxx_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */ -#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x09U) /*!< [23:16] sub1 version */ +#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x0AU) /*!< [23:16] sub1 version */ #define __STM32WBxx_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */ #define __STM32WBxx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */ #define __STM32WBxx_CMSIS_DEVICE_VERSION ((__STM32WBxx_CMSIS_VERSION_MAIN << 24)\ @@ -226,8 +226,3 @@ typedef enum /** * @} */ - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/system_stm32wbxx.h b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/system_stm32wbxx.h index 24dcb93b3..5915e83a5 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Include/system_stm32wbxx.h +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Include/system_stm32wbxx.h @@ -63,7 +63,7 @@ extern const uint32_t AHBPrescTable[16]; /*!< AHB prescalers table values */ extern const uint32_t APBPrescTable[8]; /*!< APB prescalers table values */ extern const uint32_t MSIRangeTable[16]; /*!< MSI ranges table values */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) extern const uint32_t SmpsPrescalerTable[4][6]; /*!< SMPS factor ranges table values */ #endif /** @@ -108,5 +108,4 @@ extern void SystemCoreClockUpdate(void); /** * @} - */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + */ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/LICENSE.md b/Drivers/CMSIS/Device/ST/STM32WBxx/LICENSE.md index 1a68e0709..261eeb9e9 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/LICENSE.md +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/LICENSE.md @@ -175,8 +175,18 @@ END OF TERMS AND CONDITIONS - - Copyright 2019 STMicroelectronics + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/README.md b/Drivers/CMSIS/Device/ST/STM32WBxx/README.md index b47e2254b..3eabb779b 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/README.md +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/README.md @@ -38,6 +38,7 @@ Tag v1.5.0 | Tag v5.4.0_cm4 | Tag v1.8.0 Tag v1.7.0 | Tag v5.6.0_cm4 | Tag v1.10.0 Tag v1.8.0 | Tag v5.6.0_cm4 | Tag v1.11.0 Tag v1.9.0 | Tag v5.6.0_cm4 | Tag v1.12.0 +Tag v1.10.0 | Tag v5.6.0_cm4 | Tag v1.13.0 The full **STM32CubeWB** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeWB). diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Release_Notes.html b/Drivers/CMSIS/Device/ST/STM32WBxx/Release_Notes.html index 4964b92a9..74db9dd91 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Release_Notes.html +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Release_Notes.html @@ -89,10 +89,25 @@

                  Update History

                  - +

                  Main Changes

                    +
                  • Update CMSIS devices drivers for all value lines not supporting SMPS
                    • +
                  • All source files and templates: update disclaimer to add reference to the new license agreement
                    • +
                  • Correct English spelling typos and remove non UTF-8 characters in comments
                    • +
                  +

                  Supported Devices and boards

                  +
                    +
                  • STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx and STM32WB10xx devices.
                    • +
                  +
                  +
                  +
                  + +
                  +

                  Main Changes

                  +
                  • Add atomic register access services:
                    • 32-bit register access: ATOMIC_SET_BIT(), ATOMIC_CLEAR_BIT(), ATOMIC_MODIFY_REG()
                      • @@ -105,7 +120,7 @@
                    • Add define LSI_STARTUP_TIME used in default IWDG timeout calculation (HAL_IWDG_DEFAULT_TIMEOUT)
                    • Add define FLASH_ECCR_CPUID bits for new macro __HAL_FLASH_ECC_CPUID() macro
                    -

                    Supported Devices and boards

                    +

                    Supported Devices and boards

                    • STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx and STM32WB10xx devices.
                    @@ -114,7 +129,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Add support for STM32WB15xx and STM32WB10xx

                    • Change how to adapt VTOR for user
                      • @@ -125,7 +140,7 @@
                    • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25
                    • System Workbench STM32 (SW4STM32) toolchain V2.7
                    -

                    Supported Devices and boards

                    +

                    Supported Devices and boards

                    • STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx and STM32WB10xx devices.
                    @@ -134,7 +149,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Maintenance release

                    Maintenance release for STM32WBxx devices (stm32wb55xx, stm32wb50xx, stm32wb35xx and stm32wb30xx devices)

                    @@ -164,7 +179,7 @@
                  • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25
                  • System Workbench STM32 (SW4STM32) toolchain V2.7
                    • -

                    Supported Devices and boards

                    +

                    Supported Devices and boards

                    • STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.
                    @@ -173,7 +188,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Maintenance release

                    Maintenance release for STM32WBxx devices (stm32wb55xx, stm32wb50xx, stm32wb35xx and stm32wb30xx devices)

                    @@ -212,7 +227,7 @@
                  • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25
                  • System Workbench STM32 (SW4STM32) toolchain V2.7
                    • -

                    Supported Devices and boards

                    +

                    Supported Devices and boards

                    • STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.
                    @@ -221,7 +236,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Introduction of STM32WB35xx, STM32WB30xx and STM32WB5Mxx product

                    This release introduce the support of STM32WB5Mxx, STM32WB35xx product and its value line STM32WB30xx.

                    Added features:

                    @@ -239,7 +254,7 @@
                  • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25
                  • System Workbench STM32 (SW4STM32) toolchain V2.7
                    • -

                    Supported Devices and boards

                    +

                    Supported Devices and boards

                    • STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.
                    @@ -248,7 +263,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Maintenance release for STM32WBxx devices (stm32wb55xx and stm32wb50xx devices)

                    @@ -277,7 +292,7 @@
                  • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25
                  • System Workbench STM32 (SW4STM32) toolchain V2.7
                    • -

                    Supported Devices and boards

                    +

                    Supported Devices and boards

                    • STM32WB55xx, STM32WB50xx devices
                    @@ -286,7 +301,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Introduction of STM32WB50xx device

                    First release for STM32WBxx CMSIS introducing stm32wb50xx devices.

                    Contents

                    @@ -297,7 +312,7 @@
                  • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25
                  • System Workbench STM32 (SW4STM32) toolchain V2.7
                    • -

                    Supported Devices and boards

                    +

                    Supported Devices and boards

                    • STM32WB55xx and STM32WB50xx devices
                    @@ -306,7 +321,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Maintenance release

                    Maintenance release for STM32WBxx devices (stm32wb55xx devices)

                    @@ -330,7 +345,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    First release

                    Add support of STM32WB55xx.

                    diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb10xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb10xx_cm4.s index 3f29cc6d0..589d3fbb7 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb10xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb10xx_cm4.s @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -329,4 +329,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb15xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb15xx_cm4.s index bdd4a9ea5..fa891d1a6 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb15xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb15xx_cm4.s @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb30xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb30xx_cm4.s index b33359add..931345746 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb30xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb30xx_cm4.s @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -325,4 +325,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb35xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb35xx_cm4.s index d045d5d46..2c2c12934 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb35xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb35xx_cm4.s @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -357,4 +357,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb50xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb50xx_cm4.s index b48c38eeb..39bb66f20 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb50xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb50xx_cm4.s @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -325,4 +325,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s index 08143dfdb..b42b6d12e 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb5mxx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb5mxx_cm4.s index 041c26a36..70adf0418 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb5mxx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb5mxx_cm4.s @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb10xx_flash_cm4.ld b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb10xx_flash_cm4.ld index 7f4d1e38a..e6aa0789a 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb10xx_flash_cm4.ld +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb10xx_flash_cm4.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                    © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                    +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -137,7 +136,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb15xx_flash_cm4.ld b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb15xx_flash_cm4.ld index 7f4d1e38a..e6aa0789a 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb15xx_flash_cm4.ld +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb15xx_flash_cm4.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                    © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                    +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -137,7 +136,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb30xx_flash_cm4.ld b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb30xx_flash_cm4.ld index 79be4587f..7743fd9dd 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb30xx_flash_cm4.ld +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb30xx_flash_cm4.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                    © COPYRIGHT(c) 2019 Ac6

                    +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of Ac6 nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb35xx_flash_cm4.ld b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb35xx_flash_cm4.ld index 18b39589c..dead7a9d6 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb35xx_flash_cm4.ld +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb35xx_flash_cm4.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                    © COPYRIGHT(c) 2019 Ac6

                    +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of Ac6 nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb50xx_flash_cm4.ld b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb50xx_flash_cm4.ld index cad41e035..4a8bd3f40 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb50xx_flash_cm4.ld +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb50xx_flash_cm4.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                    © COPYRIGHT(c) 2019 Ac6

                    +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of Ac6 nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb55xx_flash_cm4.ld b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb55xx_flash_cm4.ld index 840a6420b..660f30161 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb55xx_flash_cm4.ld +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb55xx_flash_cm4.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                    © COPYRIGHT(c) 2019 Ac6

                    +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of Ac6 nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb5mxx_flash_cm4.ld b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb5mxx_flash_cm4.ld index eab2c6e06..d1d82de8f 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb5mxx_flash_cm4.ld +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb5mxx_flash_cm4.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                    © COPYRIGHT(c) 2019 Ac6

                    +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of Ac6 nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb10xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb10xx_cm4.s index ee25adcdd..9be0cca4d 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb10xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb10xx_cm4.s @@ -92,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -384,4 +384,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb15xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb15xx_cm4.s index 75ae40a36..5e1a465d6 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb15xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb15xx_cm4.s @@ -92,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -390,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb30xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb30xx_cm4.s index 979c0ab80..2c1110e0b 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb30xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb30xx_cm4.s @@ -92,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -381,4 +381,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb35xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb35xx_cm4.s index 1c85892f1..52cbc6925 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb35xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb35xx_cm4.s @@ -92,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -429,4 +429,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb50xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb50xx_cm4.s index 7c49da886..9430dfdff 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb50xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb50xx_cm4.s @@ -92,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -384,4 +384,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s index c5c2b3fc3..77c2e0551 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s @@ -92,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -441,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb5mxx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb5mxx_cm4.s index 6ac953f28..94be63da3 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb5mxx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb5mxx_cm4.s @@ -92,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -441,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb10xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb10xx_cm4.s index aa19e5090..b92dc297f 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb10xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb10xx_cm4.s @@ -82,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -418,4 +418,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb15xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb15xx_cm4.s index 457d3359a..f8b301368 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb15xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb15xx_cm4.s @@ -82,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -428,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb30xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb30xx_cm4.s index d6a42dc9f..d0528d424 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb30xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb30xx_cm4.s @@ -82,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -413,4 +413,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb35xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb35xx_cm4.s index 0b8d9e6ae..aa5cfa626 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb35xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb35xx_cm4.s @@ -82,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -493,4 +493,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb50xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb50xx_cm4.s index 1d9c91135..e9dcd9c2e 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb50xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb50xx_cm4.s @@ -82,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -413,4 +413,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s index 124fea45a..c33c16a0b 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s @@ -82,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -513,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb5mxx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb5mxx_cm4.s index e5981a7b6..63d084a37 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb5mxx_cm4.s +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb5mxx_cm4.s @@ -82,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -513,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/system_stm32wbxx.c b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/system_stm32wbxx.c index d0ff7d2d3..4bfa00f1f 100644 --- a/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/system_stm32wbxx.c +++ b/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/system_stm32wbxx.c @@ -175,7 +175,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -364,5 +364,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/Drivers/STM32WBxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h index 77551bdc6..006638330 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h @@ -7,7 +7,7 @@ ****************************************************************************** * @attention * - * Copyright (c) 2019-2021 STMicroelectronics. + * Copyright (c) 2021 STMicroelectronics. * All rights reserved. * * This software is licensed under terms that can be found in the LICENSE file @@ -213,6 +213,11 @@ extern "C" { * @{ */ #define __HAL_CORTEX_SYSTICKCLK_CONFIG HAL_SYSTICK_CLKSourceConfig +#if defined(STM32U5) +#define MPU_DEVICE_nGnRnE MPU_DEVICE_NGNRNE +#define MPU_DEVICE_nGnRE MPU_DEVICE_NGNRE +#define MPU_DEVICE_nGRE MPU_DEVICE_NGRE +#endif /* STM32U5 */ /** * @} */ @@ -220,11 +225,8 @@ extern "C" { /** @defgroup CRC_Aliases CRC API aliases * @{ */ -#if defined(STM32WL) || defined(STM32WB) || defined(STM32L5) || defined(STM32L4) -#else #define HAL_CRC_Input_Data_Reverse HAL_CRCEx_Input_Data_Reverse /*!< Aliased to HAL_CRCEx_Input_Data_Reverse for inter STM32 series compatibility */ #define HAL_CRC_Output_Data_Reverse HAL_CRCEx_Output_Data_Reverse /*!< Aliased to HAL_CRCEx_Output_Data_Reverse for inter STM32 series compatibility */ -#endif /** * @} */ @@ -259,6 +261,13 @@ extern "C" { #define DAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL #endif +#if defined(STM32U5) +#define DAC_TRIGGER_STOP_LPTIM1_OUT DAC_TRIGGER_STOP_LPTIM1_CH1 +#define DAC_TRIGGER_STOP_LPTIM3_OUT DAC_TRIGGER_STOP_LPTIM3_CH1 +#define DAC_TRIGGER_LPTIM1_OUT DAC_TRIGGER_LPTIM1_CH1 +#define DAC_TRIGGER_LPTIM3_OUT DAC_TRIGGER_LPTIM3_CH1 +#endif + #if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4) || defined(STM32G4) #define HAL_DAC_MSP_INIT_CB_ID HAL_DAC_MSPINIT_CB_ID #define HAL_DAC_MSP_DEINIT_CB_ID HAL_DAC_MSPDEINIT_CB_ID @@ -644,6 +653,20 @@ extern "C" { #endif /* STM32F0 || STM32F3 || STM32F1 */ #define GPIO_AF6_DFSDM GPIO_AF6_DFSDM1 + +#if defined(STM32U5) +#define GPIO_AF0_RTC_50Hz GPIO_AF0_RTC_50HZ +#endif /* STM32U5 */ +/** + * @} + */ + +/** @defgroup HAL_GTZC_Aliased_Defines HAL GTZC Aliased Defines maintained for legacy purpose + * @{ + */ +#if defined(STM32U5) +#define GTZC_PERIPH_DCMI GTZC_PERIPH_DCMI_PSSI +#endif /* STM32U5 */ /** * @} */ @@ -884,6 +907,7 @@ extern "C" { #if defined(STM32U5) #define LPTIM_ISR_CC1 LPTIM_ISR_CC1IF #define LPTIM_ISR_CC2 LPTIM_ISR_CC2IF +#define LPTIM_CHANNEL_ALL 0x00000000U #endif /* STM32U5 */ /** * @} @@ -1448,7 +1472,8 @@ extern "C" { */ #if defined(STM32U5) -#define HAL_DCACHE_CleanInvalidateByAddr_IT HAL_DCACHE_AsyncCleanInvalidateByAddr +#define HAL_DCACHE_CleanInvalidateByAddr HAL_DCACHE_CleanInvalidByAddr +#define HAL_DCACHE_CleanInvalidateByAddr_IT HAL_DCACHE_CleanInvalidByAddr_IT #endif /* STM32U5 */ /** @@ -3410,7 +3435,19 @@ extern "C" { #define __HAL_RCC_APB2_CLK_Disable_Clear __HAL_RCC_APB2_CLK_ENABLE #define __HAL_RCC_APB3_CLK_Disable_Clear __HAL_RCC_APB3_CLK_ENABLE #define IS_RCC_MSIPLLModeSelection IS_RCC_MSIPLLMODE_SELECT +#define RCC_PERIPHCLK_CLK48 RCC_PERIPHCLK_ICLK +#define RCC_CLK48CLKSOURCE_HSI48 RCC_ICLK_CLKSOURCE_HSI48 +#define RCC_CLK48CLKSOURCE_PLL2 RCC_ICLK_CLKSOURCE_PLL2 +#define RCC_CLK48CLKSOURCE_PLL1 RCC_ICLK_CLKSOURCE_PLL1 +#define RCC_CLK48CLKSOURCE_MSIK RCC_ICLK_CLKSOURCE_MSIK +#define __HAL_RCC_ADC1_CLK_ENABLE __HAL_RCC_ADC12_CLK_ENABLE +#define __HAL_RCC_ADC1_CLK_DISABLE __HAL_RCC_ADC12_CLK_DISABLE +#define __HAL_RCC_ADC1_IS_CLK_ENABLED __HAL_RCC_ADC12_IS_CLK_ENABLED +#define __HAL_RCC_ADC1_IS_CLK_DISABLED __HAL_RCC_ADC12_IS_CLK_DISABLED +#define __HAL_RCC_ADC1_FORCE_RESET __HAL_RCC_ADC12_FORCE_RESET +#define __HAL_RCC_ADC1_RELEASE_RESET __HAL_RCC_ADC12_RELEASE_RESET #endif + /** * @} */ @@ -3491,12 +3528,14 @@ extern "C" { #define SD_OCR_CID_CSD_OVERWRIETE SD_OCR_CID_CSD_OVERWRITE #define SD_CMD_SD_APP_STAUS SD_CMD_SD_APP_STATUS +#if !defined(STM32F1) && !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32L1) #define eMMC_HIGH_VOLTAGE_RANGE EMMC_HIGH_VOLTAGE_RANGE #define eMMC_DUAL_VOLTAGE_RANGE EMMC_DUAL_VOLTAGE_RANGE #define eMMC_LOW_VOLTAGE_RANGE EMMC_LOW_VOLTAGE_RANGE #define SDMMC_NSpeed_CLK_DIV SDMMC_NSPEED_CLK_DIV #define SDMMC_HSpeed_CLK_DIV SDMMC_HSPEED_CLK_DIV +#endif #if defined(STM32F4) || defined(STM32F2) #define SD_SDMMC_DISABLED SD_SDIO_DISABLED @@ -3826,6 +3865,16 @@ extern "C" { * @} */ +/** @defgroup HAL_Generic_Aliased_Macros HAL Generic Aliased Macros maintained for legacy purpose + * @{ + */ +#if defined (STM32F7) +#define ART_ACCLERATOR_ENABLE ART_ACCELERATOR_ENABLE +#endif /* STM32F7 */ +/** + * @} + */ + /** @defgroup HAL_PPP_Aliased_Macros HAL PPP Aliased Macros maintained for legacy purpose * @{ */ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32_assert_template.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32_assert_template.h index 4ebffa163..d9e5916fe 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32_assert_template.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32_assert_template.h @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,3 @@ #endif #endif /* STM32_ASSERT_H */ - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal.h index 44f851ea6..d556479e0 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -695,5 +694,3 @@ uint32_t HAL_SYSCFG_IsEnabledSecurityAccess(uint32_t SecurityAccess); #endif #endif /* STM32WBxx_HAL_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc.h index f53b7f9aa..97e6ced48 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1890,7 +1889,4 @@ void ADC_DMAError(DMA_HandleTypeDef *hdma); } #endif - #endif /* STM32WBxx_HAL_ADC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc_ex.h index 59864e5df..53e3b7143 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -188,7 +187,7 @@ typedef struct #if defined (ADC_SUPPORT_2_5_MSPS) /* Feature "ADC group injected" not available on ADC peripheral of this STM32WB device */ #else -/** @defgroup ADC_injected_external_trigger_source ADC group injected trigger source +/** @defgroup ADCEx_injected_external_trigger_source ADC group injected trigger source * @{ */ /* ADC group regular trigger sources for all ADC instances */ @@ -203,7 +202,7 @@ typedef struct * @} */ -/** @defgroup ADC_injected_external_trigger_edge ADC group injected trigger edge (when external trigger is selected) +/** @defgroup ADCEx_injected_external_trigger_edge ADC group injected trigger edge (when external trigger is selected) * @{ */ #define ADC_EXTERNALTRIGINJECCONV_EDGE_NONE (0x00000000UL) /*!< Injected conversions hardware trigger detection disabled */ @@ -215,7 +214,7 @@ typedef struct */ #endif /* ADC_SUPPORT_2_5_MSPS */ -/** @defgroup ADC_HAL_EC_CHANNEL_SINGLE_DIFF_ENDING Channel - Single or differential ending +/** @defgroup ADCEx_HAL_EC_CHANNEL_SINGLE_DIFF_ENDING Channel - Single or differential ending * @{ */ #define ADC_SINGLE_ENDED (LL_ADC_SINGLE_ENDED) /*!< ADC channel ending set to single ended (literal also used to set calibration mode) */ @@ -226,7 +225,7 @@ typedef struct * @} */ -/** @defgroup ADC_HAL_EC_OFFSET_NB ADC instance - Offset number +/** @defgroup ADCEx_HAL_EC_OFFSET_NB ADC instance - Offset number * @{ */ #define ADC_OFFSET_NONE (ADC_OFFSET_4 + 1U) /*!< ADC offset disabled: no offset correction for the selected ADC channel */ @@ -241,7 +240,7 @@ typedef struct #if defined (ADC_SUPPORT_2_5_MSPS) /* Feature "ADC group injected" not available on ADC peripheral of this STM32WB device */ #else -/** @defgroup ADC_INJ_SEQ_RANKS ADC group injected - Sequencer ranks +/** @defgroup ADCEx_INJ_SEQ_RANKS ADC group injected - Sequencer ranks * @{ */ #define ADC_INJECTED_RANK_1 (LL_ADC_INJ_RANK_1) /*!< ADC group injected sequencer rank 1 */ @@ -253,7 +252,7 @@ typedef struct */ #endif /* ADC_SUPPORT_2_5_MSPS */ -/** @defgroup ADC_HAL_EC_GROUPS ADC instance - Groups +/** @defgroup ADCEx_HAL_EC_GROUPS ADC instance - Groups * @{ */ #define ADC_REGULAR_GROUP (LL_ADC_GROUP_REGULAR) /*!< ADC group regular (available on all STM32 devices) */ @@ -267,7 +266,7 @@ typedef struct * @} */ -/** @defgroup ADC_CFGR_fields ADCx CFGR fields +/** @defgroup ADCEx_CFGR_fields ADCx CFGR fields * @{ */ #define ADC_CFGR_FIELDS (ADC_CFGR_AWD1CH | ADC_CFGR_JAUTO | ADC_CFGR_JAWD1EN |\ @@ -280,7 +279,7 @@ typedef struct * @} */ -/** @defgroup ADC_SMPR1_fields ADCx SMPR1 fields +/** @defgroup ADCEx_SMPR1_fields ADCx SMPR1 fields * @{ */ #define ADC_SMPR1_FIELDS (ADC_SMPR1_SMP9 | ADC_SMPR1_SMP8 | ADC_SMPR1_SMP7 |\ @@ -291,7 +290,7 @@ typedef struct * @} */ -/** @defgroup ADC_CFGR_fields_2 ADCx CFGR sub fields +/** @defgroup ADCEx_CFGR_fields_2 ADCx CFGR sub fields * @{ */ /* ADC_CFGR fields of parameters that can be updated when no conversion @@ -391,7 +390,7 @@ typedef struct /** * @brief Enable ADC overrun mode. * @param _OVERRUN_MODE_ Overrun mode. - * @retval Overun bit setting to be programmed into CFGR register + * @retval Overrun bit setting to be programmed into CFGR register */ /* Note: Bit ADC_CFGR1_OVRMOD not used directly in constant */ /* "ADC_OVR_DATA_OVERWRITTEN" to have this case defined to 0x00, to set it */ @@ -914,6 +913,3 @@ HAL_StatusTypeDef HAL_ADCEx_EnterADCDeepPowerDownMode(ADC_HandleTypeDef *h #endif #endif /* STM32WBxx_HAL_ADC_EX_H */ - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_comp.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_comp.h index a9bf449ec..576692447 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_comp.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_comp.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,7 +101,7 @@ typedef enum typedef struct __COMP_HandleTypeDef #else typedef struct -#endif +#endif /* USE_HAL_COMP_REGISTER_CALLBACKS */ { COMP_TypeDef *Instance; /*!< Register base address */ COMP_InitTypeDef Init; /*!< COMP required parameters */ @@ -163,7 +162,7 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer /** * @} */ -#endif +#endif /* COMP2 */ /** @defgroup COMP_PowerMode COMP power mode * @{ @@ -204,7 +203,7 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer /* COMP_INPUT_MINUS_IO2 not available on this device */ #else #define COMP_INPUT_MINUS_IO2 (COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO2 (pin PC4 for COMP1 (except device STM32WB35xx), pin PB7 for COMP2). Note: On STM32WB serie, parameter not available on devices: STM32WB10xx, STM32WB15xx. */ -#endif +#endif /* STM32WB51xx || STM32WB10xx */ #define COMP_INPUT_MINUS_IO3 ( COMP_CSR_INMESEL_0 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO3 (pin PA0 for COMP1, pin PA2 for COMP2) */ #define COMP_INPUT_MINUS_IO4 (COMP_CSR_INMESEL_1 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO4 (pin PA4 for COMP1, pin PA4 for COMP2) */ #define COMP_INPUT_MINUS_IO5 (COMP_CSR_INMESEL_1 | COMP_CSR_INMESEL_0 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO5 (pin PA5 for COMP1, pin PA5 for COMP2) */ @@ -299,7 +298,7 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer } while(0) #else #define __HAL_COMP_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_COMP_STATE_RESET) -#endif +#endif /* USE_HAL_COMP_REGISTER_CALLBACKS */ /** * @brief Clear COMP error code (set it to no error code "HAL_COMP_ERROR_NONE"). @@ -588,7 +587,7 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer #if defined(COMP2) #define IS_COMP_WINDOWMODE(__WINDOWMODE__) (((__WINDOWMODE__) == COMP_WINDOWMODE_DISABLE) || \ ((__WINDOWMODE__) == COMP_WINDOWMODE_COMP1_INPUT_PLUS_COMMON) ) -#endif +#endif /* COMP2 */ #define IS_COMP_POWERMODE(__POWERMODE__) (((__POWERMODE__) == COMP_POWERMODE_HIGHSPEED) || \ ((__POWERMODE__) == COMP_POWERMODE_MEDIUMSPEED) || \ @@ -601,7 +600,7 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer #else #define IS_COMP_INPUT_PLUS(__COMP_INSTANCE__, __INPUT_PLUS__) (((__INPUT_PLUS__) == COMP_INPUT_PLUS_IO2) || \ ((__INPUT_PLUS__) == COMP_INPUT_PLUS_IO3)) -#endif +#endif /* COMP_INPUT_PLUS_IO1 */ /* Note: On this STM32 series, comparator input minus parameters are */ /* the same on all COMP instances. */ @@ -743,5 +742,3 @@ uint32_t HAL_COMP_GetError(COMP_HandleTypeDef *hcomp); #endif #endif /* STM32WBxx_HAL_COMP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_conf_template.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_conf_template.h index b78c5cb83..25779f228 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_conf_template.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_conf_template.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -351,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cortex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cortex.h index dde126737..57c0ac9bc 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cortex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cortex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -413,7 +412,3 @@ void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_Init); #endif #endif /* STM32WBxx_HAL_CORTEX_H */ - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc.h index c6c4d6f75..347969fa4 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,19 +59,22 @@ typedef struct { uint8_t DefaultPolynomialUse; /*!< This parameter is a value of @ref CRC_Default_Polynomial and indicates if default polynomial is used. If set to DEFAULT_POLYNOMIAL_ENABLE, resort to default - X^32 + X^26 + X^23 + X^22 + X^16 + X^12 + X^11 + X^10 +X^8 + X^7 + X^5 + X^4 + X^2+ X +1. + X^32 + X^26 + X^23 + X^22 + X^16 + X^12 + X^11 + X^10 +X^8 + X^7 + X^5 + + X^4 + X^2+ X +1. In that case, there is no need to set GeneratingPolynomial field. - If otherwise set to DEFAULT_POLYNOMIAL_DISABLE, GeneratingPolynomial and CRCLength fields must be set. */ + If otherwise set to DEFAULT_POLYNOMIAL_DISABLE, GeneratingPolynomial and + CRCLength fields must be set. */ uint8_t DefaultInitValueUse; /*!< This parameter is a value of @ref CRC_Default_InitValue_Use and indicates if default init value is used. If set to DEFAULT_INIT_VALUE_ENABLE, resort to default - 0xFFFFFFFF value. In that case, there is no need to set InitValue field. - If otherwise set to DEFAULT_INIT_VALUE_DISABLE, InitValue field must be set. */ + 0xFFFFFFFF value. In that case, there is no need to set InitValue field. If + otherwise set to DEFAULT_INIT_VALUE_DISABLE, InitValue field must be set. */ uint32_t GeneratingPolynomial; /*!< Set CRC generating polynomial as a 7, 8, 16 or 32-bit long value for a polynomial degree - respectively equal to 7, 8, 16 or 32. This field is written in normal representation, - e.g., for a polynomial of degree 7, X^7 + X^6 + X^5 + X^2 + 1 is written 0x65. - No need to specify it if DefaultPolynomialUse is set to DEFAULT_POLYNOMIAL_ENABLE. */ + respectively equal to 7, 8, 16 or 32. This field is written in normal, + representation e.g., for a polynomial of degree 7, X^7 + X^6 + X^5 + X^2 + 1 + is written 0x65. No need to specify it if DefaultPolynomialUse is set to + DEFAULT_POLYNOMIAL_ENABLE. */ uint32_t CRCLength; /*!< This parameter is a value of @ref CRC_Polynomial_Sizes and indicates CRC length. Value can be either one of @@ -87,14 +89,18 @@ typedef struct uint32_t InputDataInversionMode; /*!< This parameter is a value of @ref CRCEx_Input_Data_Inversion and specifies input data inversion mode. Can be either one of the following values @arg @ref CRC_INPUTDATA_INVERSION_NONE no input data inversion - @arg @ref CRC_INPUTDATA_INVERSION_BYTE byte-wise inversion, 0x1A2B3C4D becomes 0x58D43CB2 - @arg @ref CRC_INPUTDATA_INVERSION_HALFWORD halfword-wise inversion, 0x1A2B3C4D becomes 0xD458B23C - @arg @ref CRC_INPUTDATA_INVERSION_WORD word-wise inversion, 0x1A2B3C4D becomes 0xB23CD458 */ + @arg @ref CRC_INPUTDATA_INVERSION_BYTE byte-wise inversion, 0x1A2B3C4D + becomes 0x58D43CB2 + @arg @ref CRC_INPUTDATA_INVERSION_HALFWORD halfword-wise inversion, + 0x1A2B3C4D becomes 0xD458B23C + @arg @ref CRC_INPUTDATA_INVERSION_WORD word-wise inversion, 0x1A2B3C4D + becomes 0xB23CD458 */ uint32_t OutputDataInversionMode; /*!< This parameter is a value of @ref CRCEx_Output_Data_Inversion and specifies output data (i.e. CRC) inversion mode. Can be either @arg @ref CRC_OUTPUTDATA_INVERSION_DISABLE no CRC inversion, - @arg @ref CRC_OUTPUTDATA_INVERSION_ENABLE CRC 0x11223344 is converted into 0x22CC4488 */ + @arg @ref CRC_OUTPUTDATA_INVERSION_ENABLE CRC 0x11223344 is converted + into 0x22CC4488 */ } CRC_InitTypeDef; /** @@ -112,12 +118,16 @@ typedef struct uint32_t InputDataFormat; /*!< This parameter is a value of @ref CRC_Input_Buffer_Format and specifies input data format. Can be either - @arg @ref CRC_INPUTDATA_FORMAT_BYTES input data is a stream of bytes (8-bit data) - @arg @ref CRC_INPUTDATA_FORMAT_HALFWORDS input data is a stream of half-words (16-bit data) - @arg @ref CRC_INPUTDATA_FORMAT_WORDS input data is a stream of words (32-bit data) - - Note that constant CRC_INPUT_FORMAT_UNDEFINED is defined but an initialization error - must occur if InputBufferFormat is not one of the three values listed above */ + @arg @ref CRC_INPUTDATA_FORMAT_BYTES input data is a stream of bytes + (8-bit data) + @arg @ref CRC_INPUTDATA_FORMAT_HALFWORDS input data is a stream of + half-words (16-bit data) + @arg @ref CRC_INPUTDATA_FORMAT_WORDS input data is a stream of words + (32-bit data) + + Note that constant CRC_INPUT_FORMAT_UNDEFINED is defined but an initialization + error must occur if InputBufferFormat is not one of the three values listed + above */ } CRC_HandleTypeDef; /** * @} @@ -199,15 +209,6 @@ typedef struct * @} */ -/** @defgroup CRC_Aliases CRC API aliases - * @{ - */ -#define HAL_CRC_Input_Data_Reverse HAL_CRCEx_Input_Data_Reverse /*!< Aliased to HAL_CRCEx_Input_Data_Reverse for inter STM32 series compatibility */ -#define HAL_CRC_Output_Data_Reverse HAL_CRCEx_Output_Data_Reverse /*!< Aliased to HAL_CRCEx_Output_Data_Reverse for inter STM32 series compatibility */ -/** - * @} - */ - /** * @} */ @@ -267,7 +268,6 @@ typedef struct #define IS_DEFAULT_POLYNOMIAL(DEFAULT) (((DEFAULT) == DEFAULT_POLYNOMIAL_ENABLE) || \ ((DEFAULT) == DEFAULT_POLYNOMIAL_DISABLE)) - #define IS_DEFAULT_INIT_VALUE(VALUE) (((VALUE) == DEFAULT_INIT_VALUE_ENABLE) || \ ((VALUE) == DEFAULT_INIT_VALUE_DISABLE)) @@ -340,5 +340,3 @@ HAL_CRC_StateTypeDef HAL_CRC_GetState(CRC_HandleTypeDef *hcrc); #endif #endif /* STM32WBxx_HAL_CRC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc_ex.h index 9c3174c18..3266d5e78 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_crc_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -149,5 +148,3 @@ HAL_StatusTypeDef HAL_CRCEx_Output_Data_Reverse(CRC_HandleTypeDef *hcrc, uint32_ #endif #endif /* STM32WBxx_HAL_CRC_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp.h index 4dabd501b..7dd6865f0 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,7 +106,7 @@ typedef enum typedef struct __CRYP_HandleTypeDef #else typedef struct -#endif +#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */ { AES_TypeDef *Instance; /*!< AES Register base address */ @@ -644,5 +643,3 @@ uint32_t HAL_CRYP_GetError(CRYP_HandleTypeDef *hcryp); #endif #endif /* STM32WBxx_HAL_CRYP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp_ex.h index a8e430f1f..fd8b0b2ab 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,3 @@ void HAL_CRYPEx_DisableAutoKeyDerivation(CRYP_HandleTypeDef *hcryp); #endif #endif /* STM32WBxx_HAL_CRYP_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_def.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_def.h index f6a0e6bf7..5c48d6c3f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_def.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_def.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -209,5 +208,3 @@ typedef enum #endif #endif /* ___STM32WBxx_HAL_DEF */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma.h index 365be4fed..cb5716bd0 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -711,5 +710,3 @@ uint32_t HAL_DMA_GetError(DMA_HandleTypeDef *hdma); #endif #endif /* STM32WBxx_HAL_DMA_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma_ex.h index 5c9321e16..e140e635b 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -261,5 +260,3 @@ void HAL_DMAEx_MUX_IRQHandler(DMA_HandleTypeDef *hdma); #endif #endif /* STM32WBxx_HAL_DMA_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_exti.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_exti.h index 40a9b67c8..c99ff0376 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_exti.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_exti.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -362,5 +361,3 @@ void HAL_EXTI_GenerateSWI(EXTI_HandleTypeDef *hexti); #endif #endif /* STM32WBxx_HAL_EXTI_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash.h index 0fd626248..9c5e4239c 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -100,7 +99,7 @@ typedef struct This parameter can be a value of @ref FLASH_SRAM2A_ADDRESS_RANGE */ uint32_t SecureRAM2bStartAddr; /*!< Secure non-Backup RAM2b start address (used for OPTIONBYTE_SECURE_MODE) This parameter can be a value of @ref FLASH_SRAM2B_ADDRESS_RANGE */ - uint32_t SecureMode; /*!< Secure mode activated or desactivated. + uint32_t SecureMode; /*!< Secure mode activated or deactivated. This parameter can be a value of @ref FLASH_OB_SECURITY_MODE */ uint32_t C2BootRegion; /*!< CPU2 Secure Boot memory region(used for OPTIONBYTE_C2_BOOT_VECT). This parameter can be a value of @ref FLASH_C2_OB_BOOT_REGION */ @@ -986,5 +985,3 @@ HAL_StatusTypeDef FLASH_WaitForLastOperation(uint32_t Timeout); #endif #endif /* STM32WBxx_HAL_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash_ex.h index 2e6c61a17..7f72d13db 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_flash_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,8 +64,8 @@ extern "C" { */ /* Exported macro ------------------------------------------------------------*/ -/** @defgroup FLASH_ECC FLASH ECC Macros - * @brief macros to get Error Code Correction informations +/** @defgroup FLASHEx_ECC FLASH ECC Macros + * @brief macros to get Error Code Correction information * @{ */ @@ -137,5 +136,3 @@ void FLASH_PageErase(uint32_t Page); #endif #endif /* STM32WBxx_HAL_FLASH_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio.h index 9c1738d6f..36159185d 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -323,5 +322,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin); #endif #endif /* STM32WBxx_HAL_GPIO_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio_ex.h index aa14647ee..1404fbadc 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -678,5 +677,3 @@ extern "C" { #endif #endif /* STM32WBxx_HAL_GPIO_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_hsem.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_hsem.h index 8c481641a..0c903b48b 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_hsem.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_hsem.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,12 +129,12 @@ extern "C" { HAL_StatusTypeDef HAL_HSEM_Take(uint32_t SemID, uint32_t ProcessID); /* HSEM semaphore fast take (lock) using 1-Step method ***********************/ HAL_StatusTypeDef HAL_HSEM_FastTake(uint32_t SemID); -/* HSEM Check semaphore state Taken or not **********************************/ -uint32_t HAL_HSEM_IsSemTaken(uint32_t SemID); /* HSEM Release **************************************************************/ void HAL_HSEM_Release(uint32_t SemID, uint32_t ProcessID); /* HSEM Release All************************************************************/ void HAL_HSEM_ReleaseAll(uint32_t Key, uint32_t CoreID); +/* HSEM Check semaphore state Taken or not **********************************/ +uint32_t HAL_HSEM_IsSemTaken(uint32_t SemID); /** * @} @@ -206,5 +205,3 @@ void HAL_HSEM_IRQHandler(void); #endif #endif /* STM32WBxx_HAL_HSEM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c.h index e6963ce39..4e36f9762 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -834,5 +833,3 @@ uint32_t HAL_I2C_GetError(I2C_HandleTypeDef *hi2c); #endif /* STM32WBxx_HAL_I2C_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c_ex.h index 66ea6fcc1..4121483a5 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_i2c_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -169,5 +168,3 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus); #endif #endif /* STM32WBxx_HAL_I2C_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_ipcc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_ipcc.h index 6088c9e33..4761ae62f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_ipcc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_ipcc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,4 +261,3 @@ void HAL_IPCC_RxCallback(IPCC_HandleTypeDef *hipcc, uint32_t ChannelIndex, IPCC_ #endif /* STM32WBxx_HAL_IPCC_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda.h index e4056e72b..ea6e9179a 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -952,4 +951,3 @@ uint32_t HAL_IRDA_GetError(IRDA_HandleTypeDef *hirda); #endif /* STM32WBxx_HAL_IRDA_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda_ex.h index 7ca4efa48..870664c45 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_irda_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,4 +100,3 @@ extern "C" { #endif /* STM32WBxx_HAL_IRDA_EX_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_iwdg.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_iwdg.h index 3fbcc155e..42b146bec 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_iwdg.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_iwdg.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -236,5 +235,3 @@ HAL_StatusTypeDef HAL_IWDG_Refresh(IWDG_HandleTypeDef *hiwdg); #endif #endif /* STM32WBxx_HAL_IWDG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lcd.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lcd.h index 1556bad15..1a1c4d916 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lcd.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lcd.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -768,5 +767,3 @@ HAL_StatusTypeDef LCD_WaitForSynchro(LCD_HandleTypeDef *hlcd); #endif #endif /* STM32WBxx_HAL_LCD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lptim.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lptim.h index 1db4805f0..a83c25f93 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lptim.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lptim.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,30 +97,30 @@ typedef struct */ typedef struct { - LPTIM_ClockConfigTypeDef Clock; /*!< Specifies the clock parameters */ + LPTIM_ClockConfigTypeDef Clock; /*!< Specifies the clock parameters */ - LPTIM_ULPClockConfigTypeDef UltraLowPowerClock; /*!< Specifies the Ultra Low Power clock parameters */ + LPTIM_ULPClockConfigTypeDef UltraLowPowerClock;/*!< Specifies the Ultra Low Power clock parameters */ - LPTIM_TriggerConfigTypeDef Trigger; /*!< Specifies the Trigger parameters */ + LPTIM_TriggerConfigTypeDef Trigger; /*!< Specifies the Trigger parameters */ - uint32_t OutputPolarity; /*!< Specifies the Output polarity. - This parameter can be a value of @ref LPTIM_Output_Polarity */ + uint32_t OutputPolarity; /*!< Specifies the Output polarity. + This parameter can be a value of @ref LPTIM_Output_Polarity */ - uint32_t UpdateMode; /*!< Specifies whether the update of the autoreload and the compare - values is done immediately or after the end of current period. - This parameter can be a value of @ref LPTIM_Updating_Mode */ + uint32_t UpdateMode; /*!< Specifies whether the update of the autoreload and the compare + values is done immediately or after the end of current period. + This parameter can be a value of @ref LPTIM_Updating_Mode */ - uint32_t CounterSource; /*!< Specifies whether the counter is incremented each internal event - or each external event. - This parameter can be a value of @ref LPTIM_Counter_Source */ + uint32_t CounterSource; /*!< Specifies whether the counter is incremented each internal event + or each external event. + This parameter can be a value of @ref LPTIM_Counter_Source */ - uint32_t Input1Source; /*!< Specifies source selected for input1 (GPIO or comparator output). - This parameter can be a value of @ref LPTIM_Input1_Source */ + uint32_t Input1Source; /*!< Specifies source selected for input1 (GPIO or comparator output). + This parameter can be a value of @ref LPTIM_Input1_Source */ - uint32_t Input2Source; /*!< Specifies source selected for input2 (GPIO or comparator output). - Note: This parameter is used only for encoder feature so is used only - for LPTIM1 instance. - This parameter can be a value of @ref LPTIM_Input2_Source */ + uint32_t Input2Source; /*!< Specifies source selected for input2 (GPIO or comparator output). + Note: This parameter is used only for encoder feature so is used only + for LPTIM1 instance. + This parameter can be a value of @ref LPTIM_Input2_Source */ } LPTIM_InitTypeDef; /** @@ -843,5 +842,3 @@ void LPTIM_Disable(LPTIM_HandleTypeDef *hlptim); #endif #endif /* STM32WBxx_HAL_LPTIM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd.h index 5b21631c8..e5fc6dbe9 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -193,16 +192,16 @@ typedef struct */ -#define __HAL_PCD_ENABLE(__HANDLE__) (void)USB_EnableGlobalInt ((__HANDLE__)->Instance) -#define __HAL_PCD_DISABLE(__HANDLE__) (void)USB_DisableGlobalInt ((__HANDLE__)->Instance) -#define __HAL_PCD_GET_FLAG(__HANDLE__, __INTERRUPT__) ((USB_ReadInterrupts((__HANDLE__)->Instance)\ - & (__INTERRUPT__)) == (__INTERRUPT__)) +#define __HAL_PCD_ENABLE(__HANDLE__) (void)USB_EnableGlobalInt ((__HANDLE__)->Instance) +#define __HAL_PCD_DISABLE(__HANDLE__) (void)USB_DisableGlobalInt ((__HANDLE__)->Instance) +#define __HAL_PCD_GET_FLAG(__HANDLE__, __INTERRUPT__) ((USB_ReadInterrupts((__HANDLE__)->Instance)\ + & (__INTERRUPT__)) == (__INTERRUPT__)) -#define __HAL_PCD_CLEAR_FLAG(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->ISTR)\ - &= (uint16_t)(~(__INTERRUPT__))) +#define __HAL_PCD_CLEAR_FLAG(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->ISTR)\ + &= (uint16_t)(~(__INTERRUPT__))) -#define __HAL_USB_WAKEUP_EXTI_ENABLE_IT() EXTI->IMR1 |= USB_WAKEUP_EXTI_LINE -#define __HAL_USB_WAKEUP_EXTI_DISABLE_IT() EXTI->IMR1 &= ~(USB_WAKEUP_EXTI_LINE) +#define __HAL_USB_WAKEUP_EXTI_ENABLE_IT() EXTI->IMR1 |= USB_WAKEUP_EXTI_LINE +#define __HAL_USB_WAKEUP_EXTI_DISABLE_IT() EXTI->IMR1 &= ~(USB_WAKEUP_EXTI_LINE) /** @@ -346,13 +345,11 @@ HAL_StatusTypeDef HAL_PCD_EP_Receive(PCD_HandleTypeDef *hpcd, uint8_t ep_addr, HAL_StatusTypeDef HAL_PCD_EP_Transmit(PCD_HandleTypeDef *hpcd, uint8_t ep_addr, uint8_t *pBuf, uint32_t len); - HAL_StatusTypeDef HAL_PCD_EP_SetStall(PCD_HandleTypeDef *hpcd, uint8_t ep_addr); HAL_StatusTypeDef HAL_PCD_EP_ClrStall(PCD_HandleTypeDef *hpcd, uint8_t ep_addr); HAL_StatusTypeDef HAL_PCD_EP_Flush(PCD_HandleTypeDef *hpcd, uint8_t ep_addr); HAL_StatusTypeDef HAL_PCD_ActivateRemoteWakeup(PCD_HandleTypeDef *hpcd); HAL_StatusTypeDef HAL_PCD_DeActivateRemoteWakeup(PCD_HandleTypeDef *hpcd); - uint32_t HAL_PCD_EP_GetRxCount(PCD_HandleTypeDef *hpcd, uint8_t ep_addr); /** * @} @@ -471,7 +468,7 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef *hpcd); * @param bEpNum, bDir * @retval None */ -#define PCD_FreeUserBuffer(USBx, bEpNum, bDir) \ +#define PCD_FREE_USER_BUFFER(USBx, bEpNum, bDir) \ do { \ if ((bDir) == 0U) \ { \ @@ -639,8 +636,8 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef *hpcd); * @param bEpNum Endpoint Number. * @retval None */ -#define PCD_SET_EP_DBUF(USBx, bEpNum) PCD_SET_EP_KIND((USBx), (bEpNum)) -#define PCD_CLEAR_EP_DBUF(USBx, bEpNum) PCD_CLEAR_EP_KIND((USBx), (bEpNum)) +#define PCD_SET_BULK_EP_DBUF(USBx, bEpNum) PCD_SET_EP_KIND((USBx), (bEpNum)) +#define PCD_CLEAR_BULK_EP_DBUF(USBx, bEpNum) PCD_CLEAR_EP_KIND((USBx), (bEpNum)) /** * @brief Clears bit CTR_RX / CTR_TX in the endpoint register. @@ -816,18 +813,22 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef *hpcd); #define PCD_SET_EP_CNT_RX_REG(pdwReg, wCount) \ do { \ uint32_t wNBlocks; \ - if ((wCount) == 0U) \ - { \ - *(pdwReg) &= (uint16_t)~USB_CNTRX_NBLK_MSK; \ - *(pdwReg) |= USB_CNTRX_BLSIZE; \ - } \ - else if((wCount) <= 62U) \ + \ + if ((wCount) > 62U) \ { \ - PCD_CALC_BLK2((pdwReg), (wCount), wNBlocks); \ + PCD_CALC_BLK32((pdwReg), (wCount), wNBlocks); \ } \ else \ { \ - PCD_CALC_BLK32((pdwReg), (wCount), wNBlocks); \ + if ((wCount) == 0U) \ + { \ + *(pdwReg) &= (uint16_t)~USB_CNTRX_NBLK_MSK; \ + *(pdwReg) |= USB_CNTRX_BLSIZE; \ + } \ + else \ + { \ + PCD_CALC_BLK2((pdwReg), (wCount), wNBlocks); \ + } \ } \ } while(0) /* PCD_SET_EP_CNT_RX_REG */ @@ -1000,5 +1001,3 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef *hpcd); #endif #endif /* STM32WBxx_HAL_PCD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd_ex.h index 2f75a7e9f..0d4d78799 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -23,7 +22,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* __cplusplus */ /* Includes ------------------------------------------------------------------*/ #include "stm32wbxx_hal_def.h" @@ -83,9 +82,7 @@ void HAL_PCDEx_BCD_Callback(PCD_HandleTypeDef *hpcd, PCD_BCD_MsgTypeDef msg); #ifdef __cplusplus } -#endif +#endif /* __cplusplus */ #endif /* STM32WBxx_HAL_PCD_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pka.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pka.h index c6dc2d719..505d3d797 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pka.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pka.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -29,19 +28,19 @@ extern "C" { #include "stm32wbxx_hal_def.h" /** @addtogroup STM32WBxx_HAL_Driver - * @{ - */ + * @{ + */ #if defined(PKA) && defined(HAL_PKA_MODULE_ENABLED) /** @addtogroup PKA - * @{ - */ + * @{ + */ /* Exported types ------------------------------------------------------------*/ /** @defgroup PKA_Exported_Types PKA Exported Types - * @{ - */ + * @{ + */ /** @defgroup HAL_state_structure_definition HAL state structure definition * @brief HAL State structures definition @@ -364,7 +363,7 @@ typedef struct } while(0) #else #define __HAL_PKA_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_PKA_STATE_RESET) -#endif +#endif /* USE_HAL_PKA_REGISTER_CALLBACKS */ /** @brief Enable the specified PKA interrupt. * @param __HANDLE__ specifies the PKA Handle @@ -397,7 +396,8 @@ typedef struct * @arg @ref PKA_IT_RAMERR RAM error interrupt enable * @retval The new state of __INTERRUPT__ (SET or RESET) */ -#define __HAL_PKA_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->CR & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET) +#define __HAL_PKA_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->CR\ + & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET) /** @brief Check whether the specified PKA flag is set or not. * @param __HANDLE__ specifies the PKA Handle @@ -408,7 +408,8 @@ typedef struct * @arg @ref PKA_FLAG_RAMERR RAM error * @retval The new state of __FLAG__ (SET or RESET) */ -#define __HAL_PKA_GET_FLAG(__HANDLE__, __FLAG__) (((((__HANDLE__)->Instance->SR) & (__FLAG__)) == (__FLAG__)) ? SET : RESET) +#define __HAL_PKA_GET_FLAG(__HANDLE__, __FLAG__) (((((__HANDLE__)->Instance->SR)\ + & (__FLAG__)) == (__FLAG__)) ? SET : RESET) /** @brief Clear the PKA pending flags which are cleared by writing 1 in a specific bit. * @param __HANDLE__ specifies the PKA Handle @@ -459,7 +460,8 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka); #if (USE_HAL_PKA_REGISTER_CALLBACKS == 1) /* Callbacks Register/UnRegister functions ***********************************/ -HAL_StatusTypeDef HAL_PKA_RegisterCallback(PKA_HandleTypeDef *hpka, HAL_PKA_CallbackIDTypeDef CallbackID, pPKA_CallbackTypeDef pCallback); +HAL_StatusTypeDef HAL_PKA_RegisterCallback(PKA_HandleTypeDef *hpka, HAL_PKA_CallbackIDTypeDef CallbackID, + pPKA_CallbackTypeDef pCallback); HAL_StatusTypeDef HAL_PKA_UnRegisterCallback(PKA_HandleTypeDef *hpka, HAL_PKA_CallbackIDTypeDef CallbackID); #endif /* USE_HAL_PKA_REGISTER_CALLBACKS */ @@ -480,7 +482,8 @@ void HAL_PKA_ModExp_GetResult(PKA_HandleTypeDef *hpka, uint8_t *pRes); HAL_StatusTypeDef HAL_PKA_ECDSASign(PKA_HandleTypeDef *hpka, PKA_ECDSASignInTypeDef *in, uint32_t Timeout); HAL_StatusTypeDef HAL_PKA_ECDSASign_IT(PKA_HandleTypeDef *hpka, PKA_ECDSASignInTypeDef *in); -void HAL_PKA_ECDSASign_GetResult(PKA_HandleTypeDef *hpka, PKA_ECDSASignOutTypeDef *out, PKA_ECDSASignOutExtParamTypeDef *outExt); +void HAL_PKA_ECDSASign_GetResult(PKA_HandleTypeDef *hpka, PKA_ECDSASignOutTypeDef *out, + PKA_ECDSASignOutExtParamTypeDef *outExt); HAL_StatusTypeDef HAL_PKA_ECDSAVerif(PKA_HandleTypeDef *hpka, PKA_ECDSAVerifInTypeDef *in, uint32_t Timeout); HAL_StatusTypeDef HAL_PKA_ECDSAVerif_IT(PKA_HandleTypeDef *hpka, PKA_ECDSAVerifInTypeDef *in); @@ -563,5 +566,3 @@ uint32_t HAL_PKA_GetError(PKA_HandleTypeDef *hpka); #endif #endif /* STM32WBxx_HAL_PKA_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr.h index 9ed9c4fe0..11a2876ff 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -512,4 +511,3 @@ void HAL_PWR_DisableSEVOnPend(void); #endif /* STM32WBxx_HAL_PWR_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr_ex.h index 0adc7c018..b056eb85b 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pwr_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -267,7 +266,7 @@ typedef struct */ /* Note: Literals values are defined from register SR2 bits SMPSF and SMPSBF */ /* but they are also used as register CR5 bits SMPSEN and SMPSBEN, */ -/* as used by all SMPS operating mode functions targetting different */ +/* as used by all SMPS operating mode functions targeting different */ /* registers: */ /* "LL_PWR_SMPS_SetMode()", "LL_PWR_SMPS_GetMode()" */ /* and "LL_PWR_SMPS_GetEffectiveMode()". */ @@ -975,4 +974,3 @@ void HAL_PWREx_PVM3Callback(void); #endif /* STM32WBxx_HAL_PWR_EX_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_qspi.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_qspi.h index 47ead5cf0..ce9d99650 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_qspi.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_qspi.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -698,12 +697,10 @@ uint32_t HAL_QSPI_GetFifoThreshold(QSPI_HandleTypeDef *hqspi); * @} */ -#endif /* defined(QUADSPI) || defined(QUADSPI1) || defined(QUADSPI2) */ +#endif /* defined(QUADSPI) */ #ifdef __cplusplus } #endif #endif /* STM32WBxx_HAL_QSPI_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc.h index e97b0c4fb..079b8a39e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -184,13 +183,13 @@ extern "C" { ((__SOURCE__) == RCC_RTCCLKSOURCE_HSE_DIV32)) #if defined(RCC_MCO3_SUPPORT) -#define IS_RCC_MCO(__MCOX__) (((__MCOX__) == RCC_MCO1) || \ - ((__MCOX__) == RCC_MCO2) || \ - ((__MCOX__) == RCC_MCO3)) +#define IS_RCC_MCO(__MCOX__) (((__MCOX__) == RCC_MCO1_PA8) || \ + ((__MCOX__) == RCC_MCO2_PB6) || \ + ((__MCOX__) == RCC_MCO3_PA15)) #else -#define IS_RCC_MCO(__MCOX__) (((__MCOX__) == RCC_MCO1) || \ - ((__MCOX__) == RCC_MCO2)) -#endif +#define IS_RCC_MCO(__MCOX__) (((__MCOX__) == RCC_MCO1_PA8) || \ + ((__MCOX__) == RCC_MCO2_PB6)) +#endif /* RCC_MCO3_SUPPORT */ #if defined(RCC_HSI48_SUPPORT) #define IS_RCC_MCO1SOURCE(__SOURCE__) (((__SOURCE__) == RCC_MCO1SOURCE_NOCLOCK) || \ @@ -437,7 +436,7 @@ typedef struct /** * @} */ -#endif +#endif /* RCC_HSI48_SUPPORT */ /** @defgroup RCC_PLL_Config PLL Config * @{ @@ -668,13 +667,41 @@ typedef struct /** @defgroup RCC_MCO_Index MCO Index * @{ */ -#define RCC_MCO1 0x00000000U /*!< MCO1 index */ -#define RCC_MCO2 0x00000001U /*!< MCO2 index */ + +/* @cond */ +/* 32 28 20 16 0 + -------------------------------- + | MCO | GPIO | GPIO | GPIO | + | Index | AF | Port | Pin | + -------------------------------*/ + +#define RCC_MCO_GPIOPORT_POS 16U +#define RCC_MCO_GPIOPORT_MASK (0xFUL << RCC_MCO_GPIOPORT_POS) +#define RCC_MCO_GPIOAF_POS 20U +#define RCC_MCO_GPIOAF_MASK (0xFFUL << RCC_MCO_GPIOAF_POS) +#define RCC_MCO_INDEX_POS 28U +#define RCC_MCO_INDEX_MASK (0x1UL << RCC_MCO_INDEX_POS) + +#define RCC_MCO1_INDEX (0x0UL << RCC_MCO_INDEX_POS) /*!< MCO1 index */ +#define RCC_MCO2_INDEX (0x1UL << RCC_MCO_INDEX_POS) /*!< MCO2 index */ +/* @endcond */ + +#define RCC_MCO1_PA8 (RCC_MCO1_INDEX | (GPIO_AF0_MCO << RCC_MCO_GPIOAF_POS) | (GPIO_GET_INDEX(GPIOA) << RCC_MCO_GPIOPORT_POS) | GPIO_PIN_8) +#define RCC_MCO1 RCC_MCO1_PA8 /*!< Alias for compatibility */ + +#define RCC_MCO2_PB6 (RCC_MCO2_INDEX | (GPIO_AF0_MCO << RCC_MCO_GPIOAF_POS) | (GPIO_GET_INDEX(GPIOB) << RCC_MCO_GPIOPORT_POS) | GPIO_PIN_6) +#define RCC_MCO2 RCC_MCO2_PB6 /*!< Alias for compatibility */ + #if defined(RCC_MCO3_SUPPORT) -#define RCC_MCO3 0x00000002U /*!< MCO3 index */ -#endif +/* @cond */ +#define RCC_MCO3_INDEX (0x2UL << RCC_MCO_INDEX_POS) /*!< MCO3 index */ +/* @endcond */ -#define RCC_MCO RCC_MCO1 /*!< MCO1 to be compliant with other families with 1 MCO*/ +#define RCC_MCO3_PA15 (RCC_MCO3_INDEX | (GPIO_AF6_MCO << RCC_MCO_GPIOAF_POS) | (GPIO_GET_INDEX(GPIOA) << RCC_MCO_GPIOPORT_POS) | GPIO_PIN_15) +#define RCC_MCO3 RCC_MCO3_PA15 /*!< Alias for compatibility */ +#endif /* RCC_MCO3_SUPPORT */ + +#define RCC_MCO RCC_MCO1 /*!< MCO1 to be compliant with other families with 1 MCO*/ /** * @} */ @@ -3392,6 +3419,3 @@ uint32_t HAL_RCC_GetResetSource(void); #endif #endif /* STM32WBxx_HAL_RCC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc_ex.h index 673da3133..cf32b6a63 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rcc_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -138,21 +137,32 @@ extern "C" { ((__SOURCE__) == RCC_LPTIM2CLKSOURCE_LSE)) #if defined(RCC_HSI48_SUPPORT) +#if defined(SAI1) #define IS_RCC_RNGCLKSOURCE(__SOURCE__) \ (((__SOURCE__) == RCC_RNGCLKSOURCE_HSI48) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_PLL) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_MSI) || \ + ((__SOURCE__) == RCC_RNGCLKSOURCE_PLLSAI1) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_CLK48) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_LSI) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_LSE)) -#else +#else /* SAI1 */ +#define IS_RCC_RNGCLKSOURCE(__SOURCE__) \ + (((__SOURCE__) == RCC_RNGCLKSOURCE_HSI48) || \ + ((__SOURCE__) == RCC_RNGCLKSOURCE_PLL) || \ + ((__SOURCE__) == RCC_RNGCLKSOURCE_MSI) || \ + ((__SOURCE__) == RCC_RNGCLKSOURCE_CLK48) || \ + ((__SOURCE__) == RCC_RNGCLKSOURCE_LSI) || \ + ((__SOURCE__) == RCC_RNGCLKSOURCE_LSE)) +#endif /* SAI1 */ +#else /* RCC_HSI48_SUPPORT */ #define IS_RCC_RNGCLKSOURCE(__SOURCE__) \ (((__SOURCE__) == RCC_RNGCLKSOURCE_PLL) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_MSI) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_CLK48) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_LSI) || \ ((__SOURCE__) == RCC_RNGCLKSOURCE_LSE)) -#endif +#endif /* RCC_HSI48_SUPPORT */ #if defined(USB) #if defined(SAI1) @@ -544,6 +554,9 @@ typedef struct #define RCC_RNGCLKSOURCE_HSI48 (CLK48_MASK | LL_RCC_CLK48_CLKSOURCE_HSI48) /*!< HSI48 clock divided by 3 selected as RNG clock */ #define RCC_RNGCLKSOURCE_PLL (CLK48_MASK | LL_RCC_CLK48_CLKSOURCE_PLL) /*!< PLL "Q" clock divided by 3 selected as RNG clock */ #define RCC_RNGCLKSOURCE_MSI (CLK48_MASK | LL_RCC_CLK48_CLKSOURCE_MSI) /*!< MSI clock divided by 3 selected as RNG clock */ +#if defined(SAI1) +#define RCC_RNGCLKSOURCE_PLLSAI1 (CLK48_MASK | LL_RCC_CLK48_CLKSOURCE_PLLSAI1) /*!< PLLSAI1 "Q" clock selected as RNG clock */ +#endif /* SAI1 */ #define RCC_RNGCLKSOURCE_CLK48 LL_RCC_RNG_CLKSOURCE_CLK48 /*!< CLK48 divided by 3 selected as RNG Clock */ #define RCC_RNGCLKSOURCE_LSI LL_RCC_RNG_CLKSOURCE_LSI /*!< LSI clock selected as RNG clock */ #define RCC_RNGCLKSOURCE_LSE LL_RCC_RNG_CLKSOURCE_LSE /*!< LSE clock selected as RNG clock */ @@ -1093,24 +1106,28 @@ typedef struct * @arg @ref RCC_RNGCLKSOURCE_HSI48 HSI48 clock divided by 3 selected as RNG clock * @arg @ref RCC_RNGCLKSOURCE_PLL PLL "Q" clock divided by 3 selected as RNG clock * @arg @ref RCC_RNGCLKSOURCE_MSI MSI clock divided by 3 selected as RNG clock + * @arg @ref RCC_RNGCLKSOURCE_PLLSAI1 PLLSAI1 "Q" clock selected as RNG (*) * @arg @ref RCC_RNGCLKSOURCE_CLK48 CLK48 divided by 3 selected as RNG Clock (default HSI48) * @arg @ref RCC_RNGCLKSOURCE_LSI LSI clock selected as RNG clock * @arg @ref RCC_RNGCLKSOURCE_LSE LSE clock selected as RNG clock + * + * (*) Value not defined in all devices. + * * @retval None */ #define __HAL_RCC_RNG_CONFIG(__RNG_CLKSOURCE__) \ do { \ if (((__RNG_CLKSOURCE__) == RCC_RNGCLKSOURCE_LSI) \ - || ((__RNG_CLKSOURCE__) == RCC_RNGCLKSOURCE_LSE) \ - || ((__RNG_CLKSOURCE__) == RCC_RNGCLKSOURCE_CLK48)) \ + || ((__RNG_CLKSOURCE__) == RCC_RNGCLKSOURCE_LSE) \ + || ((__RNG_CLKSOURCE__) == RCC_RNGCLKSOURCE_CLK48)) \ { \ - LL_RCC_SetRNGClockSource((__RNG_CLKSOURCE__)); \ + LL_RCC_SetRNGClockSource((__RNG_CLKSOURCE__)); \ } \ else \ { \ - uint32_t tmp = (__RNG_CLKSOURCE__) &(~CLK48_MASK); \ + uint32_t tmp = (__RNG_CLKSOURCE__) &(~CLK48_MASK); \ LL_RCC_SetRNGClockSource(RCC_RNGCLKSOURCE_CLK48); \ - LL_RCC_SetCLK48ClockSource(tmp); \ + LL_RCC_SetCLK48ClockSource(tmp); \ } \ } while(0U) @@ -1510,14 +1527,14 @@ typedef struct #define __HAL_RCC_CRS_FREQ_ERROR_COUNTER_DISABLE() LL_CRS_DisableFreqErrorCounter() /** - * @brief Enable the automatic hardware adjustement of TRIM bits. + * @brief Enable the automatic hardware adjustment of TRIM bits. * @note When the AUTOTRIMEN bit is set the CRS_CFGR register becomes write-protected. * @retval None */ #define __HAL_RCC_CRS_AUTOMATIC_CALIB_ENABLE() LL_CRS_EnableAutoTrimming() /** - * @brief Enable or disable the automatic hardware adjustement of TRIM bits. + * @brief Enable or disable the automatic hardware adjustment of TRIM bits. * @retval None */ #define __HAL_RCC_CRS_AUTOMATIC_CALIB_DISABLE() LL_CRS_DisableAutoTrimming() @@ -1630,5 +1647,3 @@ void HAL_RCCEx_CRS_ErrorCallback(uint32_t Error); #endif #endif /* STM32WBxx_HAL_RCC_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rng.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rng.h index 333d2f4a8..fb07ec2c6 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rng.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rng.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -376,5 +375,3 @@ uint32_t HAL_RNG_GetError(RNG_HandleTypeDef *hrng); #endif /* STM32WBxx_HAL_RNG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc.h index f70206c2d..9d16d6ca6 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1031,5 +1030,3 @@ uint8_t RTC_Bcd2ToByte(uint8_t Value); #endif #endif /* STM32WBxx_HAL_RTC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc_ex.h index b0c4e6075..db5524431 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rtc_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1324,7 +1323,7 @@ HAL_StatusTypeDef HAL_RTCEx_PollForAlarmBEvent(RTC_HandleTypeDef *hrtc, uint32_t -/** @defgroup RTCEx_Substract_Fraction_Of_Second_Value RTCEx Substract Fraction Of Second Value +/** @defgroup RTCEx_Subtract_Fraction_Of_Second_Value RTCEx Subtract Fraction Of Second Value * @{ */ #define IS_RTC_SHIFT_SUBFS(FS) ((FS) <= RTC_SHIFTR_SUBFS) @@ -1357,5 +1356,3 @@ HAL_StatusTypeDef HAL_RTCEx_PollForAlarmBEvent(RTC_HandleTypeDef *hrtc, uint32_t #endif #endif /* STM32WBxx_HAL_RTC_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai.h index bdcf6047b..69166eb97 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -964,5 +963,3 @@ uint32_t HAL_SAI_GetError(SAI_HandleTypeDef *hsai); #endif #endif /* STM32WBxx_HAL_SAI_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai_ex.h index 7a9d9319c..a2db0b188 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_sai_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,5 +103,3 @@ HAL_StatusTypeDef HAL_SAIEx_ConfigPdmMicDelay(SAI_HandleTypeDef *hsai, SAIEx_Pdm #endif #endif /* STM32WBxx_HAL_SAI_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard.h index be98e2c4d..854f3cb42 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,7 +110,7 @@ typedef struct } SMARTCARD_InitTypeDef; /** - * @brief SMARTCARD advanced features initalization structure definition + * @brief SMARTCARD advanced features initialization structure definition */ typedef struct { @@ -1130,4 +1129,3 @@ uint32_t HAL_SMARTCARD_GetError(SMARTCARD_HandleTypeDef *hsmar #endif /* STM32WBxx_HAL_SMARTCARD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard_ex.h index 64ec116d0..11c6f913f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -335,4 +334,3 @@ HAL_StatusTypeDef HAL_SMARTCARDEx_SetRxFifoThreshold(SMARTCARD_HandleTypeDef *hs #endif /* STM32WBxx_HAL_SMARTCARD_EX_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus.h index 1f008a3a4..0f4770018 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -27,7 +26,6 @@ extern "C" { /* Includes ------------------------------------------------------------------*/ #include "stm32wbxx_hal_def.h" -#include "stm32wbxx_hal_smbus_ex.h" /** @addtogroup STM32WBxx_HAL_Driver * @{ @@ -654,6 +652,9 @@ typedef void (*pSMBUS_AddrCallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus, uint8_t * @} */ +/* Include SMBUS HAL Extended module */ +#include "stm32wbxx_hal_smbus_ex.h" + /* Exported functions --------------------------------------------------------*/ /** @addtogroup SMBUS_Exported_Functions SMBUS Exported Functions * @{ @@ -785,5 +786,3 @@ uint32_t HAL_SMBUS_GetError(SMBUS_HandleTypeDef *hsmbus); #endif /* STM32WBxx_HAL_SMBUS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus_ex.h index 58ddc14da..ca5261587 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smbus_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -37,7 +36,6 @@ extern "C" { */ /* Exported types ------------------------------------------------------------*/ - /* Exported constants --------------------------------------------------------*/ /** @defgroup SMBUSEx_Exported_Constants SMBUS Extended Exported Constants * @{ @@ -79,7 +77,17 @@ extern "C" { * @{ */ -/** @addtogroup SMBUSEx_Exported_Functions_Group3 SMBUS Extended FastModePlus Functions +/** @addtogroup SMBUSEx_Exported_Functions_Group2 WakeUp Mode Functions + * @{ + */ +/* Peripheral Control functions ************************************************/ +HAL_StatusTypeDef HAL_SMBUSEx_EnableWakeUp(SMBUS_HandleTypeDef *hsmbus); +HAL_StatusTypeDef HAL_SMBUSEx_DisableWakeUp(SMBUS_HandleTypeDef *hsmbus); +/** + * @} + */ + +/** @addtogroup SMBUSEx_Exported_Functions_Group3 Fast Mode Plus Functions * @{ */ void HAL_SMBUSEx_EnableFastModePlus(uint32_t ConfigFastModePlus); @@ -137,5 +145,3 @@ void HAL_SMBUSEx_DisableFastModePlus(uint32_t ConfigFastModePlus); #endif #endif /* STM32WBxx_HAL_SMBUS_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi.h index e247a1a66..4a30885d2 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -778,7 +777,8 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef *hspi); /* Callbacks Register/UnRegister functions ***********************************/ #if (USE_HAL_SPI_REGISTER_CALLBACKS == 1U) -HAL_StatusTypeDef HAL_SPI_RegisterCallback(SPI_HandleTypeDef *hspi, HAL_SPI_CallbackIDTypeDef CallbackID, pSPI_CallbackTypeDef pCallback); +HAL_StatusTypeDef HAL_SPI_RegisterCallback(SPI_HandleTypeDef *hspi, HAL_SPI_CallbackIDTypeDef CallbackID, + pSPI_CallbackTypeDef pCallback); HAL_StatusTypeDef HAL_SPI_UnRegisterCallback(SPI_HandleTypeDef *hspi, HAL_SPI_CallbackIDTypeDef CallbackID); #endif /* USE_HAL_SPI_REGISTER_CALLBACKS */ /** @@ -849,4 +849,3 @@ uint32_t HAL_SPI_GetError(SPI_HandleTypeDef *hspi); #endif /* STM32WBxx_HAL_SPI_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi_ex.h index 332704135..54cc0c538 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_spi_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,4 +71,3 @@ HAL_StatusTypeDef HAL_SPIEx_FlushRxFifo(SPI_HandleTypeDef *hspi); #endif /* STM32WBxx_HAL_SPI_EX_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim.h index 2cacf87e0..35b7bc97b 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,8 +64,10 @@ typedef struct This means in PWM mode that (N+1) corresponds to: - the number of PWM periods in edge-aligned mode - the number of half PWM period in center-aligned mode - GP timers: this parameter must be a number between Min_Data = 0x00 and Max_Data = 0xFF. - Advanced timers: this parameter must be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF. */ + GP timers: this parameter must be a number between Min_Data = 0x00 and + Max_Data = 0xFF. + Advanced timers: this parameter must be a number between Min_Data = 0x0000 and + Max_Data = 0xFFFF. */ uint32_t AutoReloadPreload; /*!< Specifies the auto-reload preload. This parameter can be a value of @ref TIM_AutoReloadPreload */ @@ -218,7 +219,8 @@ typedef struct uint32_t ClearInputPolarity; /*!< TIM Clear Input polarity This parameter can be a value of @ref TIM_ClearInput_Polarity */ uint32_t ClearInputPrescaler; /*!< TIM Clear Input prescaler - This parameter must be 0: When OCRef clear feature is used with ETR source, ETR prescaler must be off */ + This parameter must be 0: When OCRef clear feature is used with ETR source, + ETR prescaler must be off */ uint32_t ClearInputFilter; /*!< TIM Clear Input filter This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */ } TIM_ClearInputConfigTypeDef; @@ -268,32 +270,32 @@ typedef struct */ typedef struct { - uint32_t OffStateRunMode; /*!< TIM off state in run mode - This parameter can be a value of @ref TIM_OSSR_Off_State_Selection_for_Run_mode_state */ - uint32_t OffStateIDLEMode; /*!< TIM off state in IDLE mode - This parameter can be a value of @ref TIM_OSSI_Off_State_Selection_for_Idle_mode_state */ - uint32_t LockLevel; /*!< TIM Lock level - This parameter can be a value of @ref TIM_Lock_level */ - uint32_t DeadTime; /*!< TIM dead Time - This parameter can be a number between Min_Data = 0x00 and Max_Data = 0xFF */ - uint32_t BreakState; /*!< TIM Break State - This parameter can be a value of @ref TIM_Break_Input_enable_disable */ - uint32_t BreakPolarity; /*!< TIM Break input polarity - This parameter can be a value of @ref TIM_Break_Polarity */ - uint32_t BreakFilter; /*!< Specifies the break input filter. - This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */ - uint32_t BreakAFMode; /*!< Specifies the alternate function mode of the break input. - This parameter can be a value of @ref TIM_Break_Input_AF_Mode */ - uint32_t Break2State; /*!< TIM Break2 State - This parameter can be a value of @ref TIM_Break2_Input_enable_disable */ - uint32_t Break2Polarity; /*!< TIM Break2 input polarity - This parameter can be a value of @ref TIM_Break2_Polarity */ - uint32_t Break2Filter; /*!< TIM break2 input filter. - This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */ - uint32_t Break2AFMode; /*!< Specifies the alternate function mode of the break2 input. - This parameter can be a value of @ref TIM_Break2_Input_AF_Mode */ - uint32_t AutomaticOutput; /*!< TIM Automatic Output Enable state - This parameter can be a value of @ref TIM_AOE_Bit_Set_Reset */ + uint32_t OffStateRunMode; /*!< TIM off state in run mode, This parameter can be a value of @ref TIM_OSSR_Off_State_Selection_for_Run_mode_state */ + + uint32_t OffStateIDLEMode; /*!< TIM off state in IDLE mode, This parameter can be a value of @ref TIM_OSSI_Off_State_Selection_for_Idle_mode_state */ + + uint32_t LockLevel; /*!< TIM Lock level, This parameter can be a value of @ref TIM_Lock_level */ + + uint32_t DeadTime; /*!< TIM dead Time, This parameter can be a number between Min_Data = 0x00 and Max_Data = 0xFF */ + + uint32_t BreakState; /*!< TIM Break State, This parameter can be a value of @ref TIM_Break_Input_enable_disable */ + + uint32_t BreakPolarity; /*!< TIM Break input polarity, This parameter can be a value of @ref TIM_Break_Polarity */ + + uint32_t BreakFilter; /*!< Specifies the break input filter.This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */ + + uint32_t BreakAFMode; /*!< Specifies the alternate function mode of the break input.This parameter can be a value of @ref TIM_Break_Input_AF_Mode */ + + uint32_t Break2State; /*!< TIM Break2 State, This parameter can be a value of @ref TIM_Break2_Input_enable_disable */ + + uint32_t Break2Polarity; /*!< TIM Break2 input polarity, This parameter can be a value of @ref TIM_Break2_Polarity */ + + uint32_t Break2Filter; /*!< TIM break2 input filter.This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */ + + uint32_t Break2AFMode; /*!< Specifies the alternate function mode of the break2 input.This parameter can be a value of @ref TIM_Break2_Input_AF_Mode */ + + uint32_t AutomaticOutput; /*!< TIM Automatic Output Enable state, This parameter can be a value of @ref TIM_AOE_Bit_Set_Reset */ + } TIM_BreakDeadTimeConfigTypeDef; /** @@ -664,10 +666,8 @@ typedef void (*pTIM_CallbackTypeDef)(TIM_HandleTypeDef *htim); /*!< pointer to /** @defgroup TIM_Input_Capture_Selection TIM Input Capture Selection * @{ */ -#define TIM_ICSELECTION_DIRECTTI TIM_CCMR1_CC1S_0 /*!< TIM Input 1, 2, 3 or 4 is selected to be - connected to IC1, IC2, IC3 or IC4, respectively */ -#define TIM_ICSELECTION_INDIRECTTI TIM_CCMR1_CC1S_1 /*!< TIM Input 1, 2, 3 or 4 is selected to be - connected to IC2, IC1, IC4 or IC3, respectively */ +#define TIM_ICSELECTION_DIRECTTI TIM_CCMR1_CC1S_0 /*!< TIM Input 1, 2, 3 or 4 is selected to be connected to IC1, IC2, IC3 or IC4, respectively */ +#define TIM_ICSELECTION_INDIRECTTI TIM_CCMR1_CC1S_1 /*!< TIM Input 1, 2, 3 or 4 is selected to be connected to IC2, IC1, IC4 or IC3, respectively */ #define TIM_ICSELECTION_TRC TIM_CCMR1_CC1S /*!< TIM Input 1, 2, 3 or 4 is selected to be connected to TRC */ /** * @} @@ -924,19 +924,18 @@ typedef void (*pTIM_CallbackTypeDef)(TIM_HandleTypeDef *htim); /*!< pointer to * @{ */ #define TIM_AUTOMATICOUTPUT_DISABLE 0x00000000U /*!< MOE can be set only by software */ -#define TIM_AUTOMATICOUTPUT_ENABLE TIM_BDTR_AOE /*!< MOE can be set by software or automatically at the next update event - (if none of the break inputs BRK and BRK2 is active) */ +#define TIM_AUTOMATICOUTPUT_ENABLE TIM_BDTR_AOE /*!< MOE can be set by software or automatically at the next update event (if none of the break inputs BRK and BRK2 is active) */ /** * @} */ -/** @defgroup TIM_Group_Channel5 Group Channel 5 and Channel 1, 2 or 3 +/** @defgroup TIM_Group_Channel5 TIM Group Channel 5 and Channel 1, 2 or 3 * @{ */ -#define TIM_GROUPCH5_NONE 0x00000000U /* !< No effect of OC5REF on OC1REFC, OC2REFC and OC3REFC */ -#define TIM_GROUPCH5_OC1REFC TIM_CCR5_GC5C1 /* !< OC1REFC is the logical AND of OC1REFC and OC5REF */ -#define TIM_GROUPCH5_OC2REFC TIM_CCR5_GC5C2 /* !< OC2REFC is the logical AND of OC2REFC and OC5REF */ -#define TIM_GROUPCH5_OC3REFC TIM_CCR5_GC5C3 /* !< OC3REFC is the logical AND of OC3REFC and OC5REF */ +#define TIM_GROUPCH5_NONE 0x00000000U /*!< No effect of OC5REF on OC1REFC, OC2REFC and OC3REFC */ +#define TIM_GROUPCH5_OC1REFC TIM_CCR5_GC5C1 /*!< OC1REFC is the logical AND of OC1REFC and OC5REF */ +#define TIM_GROUPCH5_OC2REFC TIM_CCR5_GC5C2 /*!< OC2REFC is the logical AND of OC2REFC and OC5REF */ +#define TIM_GROUPCH5_OC3REFC TIM_CCR5_GC5C3 /*!< OC3REFC is the logical AND of OC3REFC and OC5REF */ /** * @} */ @@ -1225,7 +1224,8 @@ typedef void (*pTIM_CallbackTypeDef)(TIM_HandleTypeDef *htim); /*!< pointer to * @brief Disable the TIM main Output. * @param __HANDLE__ TIM handle * @retval None - * @note The Main Output Enable of a timer instance is disabled only if all the CCx and CCxN channels have been disabled + * @note The Main Output Enable of a timer instance is disabled only if all the CCx and CCxN channels have been + * disabled */ #define __HAL_TIM_MOE_DISABLE(__HANDLE__) \ do { \ @@ -1392,7 +1392,8 @@ typedef void (*pTIM_CallbackTypeDef)(TIM_HandleTypeDef *htim); /*!< pointer to /** * @brief Force a continuous copy of the update interrupt flag (UIF) into the timer counter register (bit 31). - * @note This allows both the counter value and a potential roll-over condition signalled by the UIFCPY flag to be read in an atomic way. + * @note This allows both the counter value and a potential roll-over condition signalled by the UIFCPY flag to be read + * in an atomic way. * @param __HANDLE__ TIM handle. * @retval None mode. @@ -1419,8 +1420,8 @@ mode. * @brief Indicates whether or not the TIM Counter is used as downcounter. * @param __HANDLE__ TIM handle. * @retval False (Counter used as upcounter) or True (Counter used as downcounter) - * @note This macro is particularly useful to get the counting mode when the timer operates in Center-aligned mode or Encoder -mode. + * @note This macro is particularly useful to get the counting mode when the timer operates in Center-aligned mode + * or Encoder mode. */ #define __HAL_TIM_IS_TIM_COUNTING_DOWN(__HANDLE__) (((__HANDLE__)->Instance->CR1 &(TIM_CR1_DIR)) == (TIM_CR1_DIR)) @@ -1434,7 +1435,8 @@ mode. /** * @brief Set the TIM Counter Register value on runtime. - * Note Please check if the bit 31 of CNT register is used as UIF copy or not, this may affect the counter range in case of 32 bits counter TIM instance. + * Note Please check if the bit 31 of CNT register is used as UIF copy or not, this may affect the counter range in + * case of 32 bits counter TIM instance. * Bit 31 of CNT can be enabled/disabled using __HAL_TIM_UIFREMAP_ENABLE()/__HAL_TIM_UIFREMAP_DISABLE() macros. * @param __HANDLE__ TIM handle. * @param __COUNTER__ specifies the Counter register new value. @@ -1496,7 +1498,8 @@ mode. #define __HAL_TIM_GET_CLOCKDIVISION(__HANDLE__) ((__HANDLE__)->Instance->CR1 & TIM_CR1_CKD) /** - * @brief Set the TIM Input Capture prescaler on runtime without calling another time HAL_TIM_IC_ConfigChannel() function. + * @brief Set the TIM Input Capture prescaler on runtime without calling another time HAL_TIM_IC_ConfigChannel() + * function. * @param __HANDLE__ TIM handle. * @param __CHANNEL__ TIM Channels to be configured. * This parameter can be one of the following values: @@ -2074,13 +2077,19 @@ mode. ((__HANDLE__)->ChannelState[5] = (__CHANNEL_STATE__))) #define TIM_CHANNEL_STATE_SET_ALL(__HANDLE__, __CHANNEL_STATE__) do { \ - (__HANDLE__)->ChannelState[0] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelState[1] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelState[2] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelState[3] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelState[4] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelState[5] = (__CHANNEL_STATE__); \ - } while(0) + (__HANDLE__)->ChannelState[0] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelState[1] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelState[2] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelState[3] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelState[4] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelState[5] = \ + (__CHANNEL_STATE__); \ + } while(0) #define TIM_CHANNEL_N_STATE_GET(__HANDLE__, __CHANNEL__)\ (((__CHANNEL__) == TIM_CHANNEL_1) ? (__HANDLE__)->ChannelNState[0] :\ @@ -2095,11 +2104,15 @@ mode. ((__HANDLE__)->ChannelNState[3] = (__CHANNEL_STATE__))) #define TIM_CHANNEL_N_STATE_SET_ALL(__HANDLE__, __CHANNEL_STATE__) do { \ - (__HANDLE__)->ChannelNState[0] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelNState[1] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelNState[2] = (__CHANNEL_STATE__); \ - (__HANDLE__)->ChannelNState[3] = (__CHANNEL_STATE__); \ - } while(0) + (__HANDLE__)->ChannelNState[0] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelNState[1] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelNState[2] = \ + (__CHANNEL_STATE__); \ + (__HANDLE__)->ChannelNState[3] = \ + (__CHANNEL_STATE__); \ + } while(0) /** * @} @@ -2273,14 +2286,14 @@ HAL_StatusTypeDef HAL_TIM_SlaveConfigSynchro_IT(TIM_HandleTypeDef *htim, TIM_Sla HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStart(TIM_HandleTypeDef *htim, uint32_t BurstBaseAddress, uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength); HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint32_t BurstBaseAddress, - uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength, - uint32_t DataLength); + uint32_t BurstRequestSrc, uint32_t *BurstBuffer, + uint32_t BurstLength, uint32_t DataLength); HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStop(TIM_HandleTypeDef *htim, uint32_t BurstRequestSrc); HAL_StatusTypeDef HAL_TIM_DMABurst_ReadStart(TIM_HandleTypeDef *htim, uint32_t BurstBaseAddress, uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength); HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint32_t BurstBaseAddress, - uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength, - uint32_t DataLength); + uint32_t BurstRequestSrc, uint32_t *BurstBuffer, + uint32_t BurstLength, uint32_t DataLength); HAL_StatusTypeDef HAL_TIM_DMABurst_ReadStop(TIM_HandleTypeDef *htim, uint32_t BurstRequestSrc); HAL_StatusTypeDef HAL_TIM_GenerateEvent(TIM_HandleTypeDef *htim, uint32_t EventSource); uint32_t HAL_TIM_ReadCapturedValue(TIM_HandleTypeDef *htim, uint32_t Channel); @@ -2378,5 +2391,3 @@ void TIM_ResetCallback(TIM_HandleTypeDef *htim); #endif #endif /* STM32WBxx_HAL_TIM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim_ex.h index a0a9e6f8d..2110abe21 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,8 +70,7 @@ typedef struct This parameter can be a value of @ref TIMEx_Break_Input_Source_Enable */ uint32_t Polarity; /*!< Specifies the break input source polarity. This parameter can be a value of @ref TIMEx_Break_Input_Source_Polarity */ -} -TIMEx_BreakInputConfigTypeDef; +} TIMEx_BreakInputConfigTypeDef; /** * @} @@ -148,8 +146,8 @@ TIMEx_BreakInputConfigTypeDef; /** @defgroup TIMEx_Break_Input TIM Extended Break input * @{ */ -#define TIM_BREAKINPUT_BRK 0x00000001U /* !< Timer break input */ -#define TIM_BREAKINPUT_BRK2 0x00000002U /* !< Timer break2 input */ +#define TIM_BREAKINPUT_BRK 0x00000001U /*!< Timer break input */ +#define TIM_BREAKINPUT_BRK2 0x00000002U /*!< Timer break2 input */ /** * @} */ @@ -171,8 +169,8 @@ TIMEx_BreakInputConfigTypeDef; /** @defgroup TIMEx_Break_Input_Source_Enable TIM Extended Break input source enabling * @{ */ -#define TIM_BREAKINPUTSOURCE_DISABLE 0x00000000U /* !< Break input source is disabled */ -#define TIM_BREAKINPUTSOURCE_ENABLE 0x00000001U /* !< Break input source is enabled */ +#define TIM_BREAKINPUTSOURCE_DISABLE 0x00000000U /*!< Break input source is disabled */ +#define TIM_BREAKINPUTSOURCE_ENABLE 0x00000001U /*!< Break input source is enabled */ /** * @} */ @@ -180,8 +178,8 @@ TIMEx_BreakInputConfigTypeDef; /** @defgroup TIMEx_Break_Input_Source_Polarity TIM Extended Break input polarity * @{ */ -#define TIM_BREAKINPUTSOURCE_POLARITY_LOW 0x00000001U /* !< Break input source is active low */ -#define TIM_BREAKINPUTSOURCE_POLARITY_HIGH 0x00000000U /* !< Break input source is active_high */ +#define TIM_BREAKINPUTSOURCE_POLARITY_LOW 0x00000001U /*!< Break input source is active low */ +#define TIM_BREAKINPUTSOURCE_POLARITY_HIGH 0x00000000U /*!< Break input source is active_high */ /** * @} */ @@ -423,5 +421,3 @@ void TIMEx_DMACommutationHalfCplt(DMA_HandleTypeDef *hdma); #endif /* STM32WBxx_HAL_TIM_EX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tsc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tsc.h index ccf414dcd..63310dd27 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tsc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tsc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -187,22 +186,38 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to /** @defgroup TSC_CTPulseHL_Config CTPulse High Length * @{ */ -#define TSC_CTPH_1CYCLE 0x00000000UL /*!< Charge transfer pulse high during 1 cycle (PGCLK) */ -#define TSC_CTPH_2CYCLES TSC_CR_CTPH_0 /*!< Charge transfer pulse high during 2 cycles (PGCLK) */ -#define TSC_CTPH_3CYCLES TSC_CR_CTPH_1 /*!< Charge transfer pulse high during 3 cycles (PGCLK) */ -#define TSC_CTPH_4CYCLES (TSC_CR_CTPH_1 | TSC_CR_CTPH_0) /*!< Charge transfer pulse high during 4 cycles (PGCLK) */ -#define TSC_CTPH_5CYCLES TSC_CR_CTPH_2 /*!< Charge transfer pulse high during 5 cycles (PGCLK) */ -#define TSC_CTPH_6CYCLES (TSC_CR_CTPH_2 | TSC_CR_CTPH_0) /*!< Charge transfer pulse high during 6 cycles (PGCLK) */ -#define TSC_CTPH_7CYCLES (TSC_CR_CTPH_2 | TSC_CR_CTPH_1) /*!< Charge transfer pulse high during 7 cycles (PGCLK) */ -#define TSC_CTPH_8CYCLES (TSC_CR_CTPH_2 | TSC_CR_CTPH_1 | TSC_CR_CTPH_0) /*!< Charge transfer pulse high during 8 cycles (PGCLK) */ -#define TSC_CTPH_9CYCLES TSC_CR_CTPH_3 /*!< Charge transfer pulse high during 9 cycles (PGCLK) */ -#define TSC_CTPH_10CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_0) /*!< Charge transfer pulse high during 10 cycles (PGCLK) */ -#define TSC_CTPH_11CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_1) /*!< Charge transfer pulse high during 11 cycles (PGCLK) */ -#define TSC_CTPH_12CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_1 | TSC_CR_CTPH_0) /*!< Charge transfer pulse high during 12 cycles (PGCLK) */ -#define TSC_CTPH_13CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2) /*!< Charge transfer pulse high during 13 cycles (PGCLK) */ -#define TSC_CTPH_14CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2 | TSC_CR_CTPH_0) /*!< Charge transfer pulse high during 14 cycles (PGCLK) */ -#define TSC_CTPH_15CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2 | TSC_CR_CTPH_1) /*!< Charge transfer pulse high during 15 cycles (PGCLK) */ -#define TSC_CTPH_16CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2 | TSC_CR_CTPH_1 | TSC_CR_CTPH_0) /*!< Charge transfer pulse high during 16 cycles (PGCLK) */ +#define TSC_CTPH_1CYCLE 0x00000000UL +/*!< Charge transfer pulse high during 1 cycle (PGCLK) */ +#define TSC_CTPH_2CYCLES TSC_CR_CTPH_0 +/*!< Charge transfer pulse high during 2 cycles (PGCLK) */ +#define TSC_CTPH_3CYCLES TSC_CR_CTPH_1 +/*!< Charge transfer pulse high during 3 cycles (PGCLK) */ +#define TSC_CTPH_4CYCLES (TSC_CR_CTPH_1 | TSC_CR_CTPH_0) +/*!< Charge transfer pulse high during 4 cycles (PGCLK) */ +#define TSC_CTPH_5CYCLES TSC_CR_CTPH_2 +/*!< Charge transfer pulse high during 5 cycles (PGCLK) */ +#define TSC_CTPH_6CYCLES (TSC_CR_CTPH_2 | TSC_CR_CTPH_0) +/*!< Charge transfer pulse high during 6 cycles (PGCLK) */ +#define TSC_CTPH_7CYCLES (TSC_CR_CTPH_2 | TSC_CR_CTPH_1) +/*!< Charge transfer pulse high during 7 cycles (PGCLK) */ +#define TSC_CTPH_8CYCLES (TSC_CR_CTPH_2 | TSC_CR_CTPH_1 | TSC_CR_CTPH_0) +/*!< Charge transfer pulse high during 8 cycles (PGCLK) */ +#define TSC_CTPH_9CYCLES TSC_CR_CTPH_3 +/*!< Charge transfer pulse high during 9 cycles (PGCLK) */ +#define TSC_CTPH_10CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_0) +/*!< Charge transfer pulse high during 10 cycles (PGCLK) */ +#define TSC_CTPH_11CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_1) +/*!< Charge transfer pulse high during 11 cycles (PGCLK) */ +#define TSC_CTPH_12CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_1 | TSC_CR_CTPH_0) +/*!< Charge transfer pulse high during 12 cycles (PGCLK) */ +#define TSC_CTPH_13CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2) +/*!< Charge transfer pulse high during 13 cycles (PGCLK) */ +#define TSC_CTPH_14CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2 | TSC_CR_CTPH_0) +/*!< Charge transfer pulse high during 14 cycles (PGCLK) */ +#define TSC_CTPH_15CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2 | TSC_CR_CTPH_1) +/*!< Charge transfer pulse high during 15 cycles (PGCLK) */ +#define TSC_CTPH_16CYCLES (TSC_CR_CTPH_3 | TSC_CR_CTPH_2 | TSC_CR_CTPH_1 | TSC_CR_CTPH_0) +/*!< Charge transfer pulse high during 16 cycles (PGCLK) */ /** * @} */ @@ -210,22 +225,38 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to /** @defgroup TSC_CTPulseLL_Config CTPulse Low Length * @{ */ -#define TSC_CTPL_1CYCLE 0x00000000UL /*!< Charge transfer pulse low during 1 cycle (PGCLK) */ -#define TSC_CTPL_2CYCLES TSC_CR_CTPL_0 /*!< Charge transfer pulse low during 2 cycles (PGCLK) */ -#define TSC_CTPL_3CYCLES TSC_CR_CTPL_1 /*!< Charge transfer pulse low during 3 cycles (PGCLK) */ -#define TSC_CTPL_4CYCLES (TSC_CR_CTPL_1 | TSC_CR_CTPL_0) /*!< Charge transfer pulse low during 4 cycles (PGCLK) */ -#define TSC_CTPL_5CYCLES TSC_CR_CTPL_2 /*!< Charge transfer pulse low during 5 cycles (PGCLK) */ -#define TSC_CTPL_6CYCLES (TSC_CR_CTPL_2 | TSC_CR_CTPL_0) /*!< Charge transfer pulse low during 6 cycles (PGCLK) */ -#define TSC_CTPL_7CYCLES (TSC_CR_CTPL_2 | TSC_CR_CTPL_1) /*!< Charge transfer pulse low during 7 cycles (PGCLK) */ -#define TSC_CTPL_8CYCLES (TSC_CR_CTPL_2 | TSC_CR_CTPL_1 | TSC_CR_CTPL_0) /*!< Charge transfer pulse low during 8 cycles (PGCLK) */ -#define TSC_CTPL_9CYCLES TSC_CR_CTPL_3 /*!< Charge transfer pulse low during 9 cycles (PGCLK) */ -#define TSC_CTPL_10CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_0) /*!< Charge transfer pulse low during 10 cycles (PGCLK) */ -#define TSC_CTPL_11CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_1) /*!< Charge transfer pulse low during 11 cycles (PGCLK) */ -#define TSC_CTPL_12CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_1 | TSC_CR_CTPL_0) /*!< Charge transfer pulse low during 12 cycles (PGCLK) */ -#define TSC_CTPL_13CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2) /*!< Charge transfer pulse low during 13 cycles (PGCLK) */ -#define TSC_CTPL_14CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2 | TSC_CR_CTPL_0) /*!< Charge transfer pulse low during 14 cycles (PGCLK) */ -#define TSC_CTPL_15CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2 | TSC_CR_CTPL_1) /*!< Charge transfer pulse low during 15 cycles (PGCLK) */ -#define TSC_CTPL_16CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2 | TSC_CR_CTPL_1 | TSC_CR_CTPL_0) /*!< Charge transfer pulse low during 16 cycles (PGCLK) */ +#define TSC_CTPL_1CYCLE 0x00000000UL +/*!< Charge transfer pulse low during 1 cycle (PGCLK) */ +#define TSC_CTPL_2CYCLES TSC_CR_CTPL_0 +/*!< Charge transfer pulse low during 2 cycles (PGCLK) */ +#define TSC_CTPL_3CYCLES TSC_CR_CTPL_1 +/*!< Charge transfer pulse low during 3 cycles (PGCLK) */ +#define TSC_CTPL_4CYCLES (TSC_CR_CTPL_1 | TSC_CR_CTPL_0) +/*!< Charge transfer pulse low during 4 cycles (PGCLK) */ +#define TSC_CTPL_5CYCLES TSC_CR_CTPL_2 +/*!< Charge transfer pulse low during 5 cycles (PGCLK) */ +#define TSC_CTPL_6CYCLES (TSC_CR_CTPL_2 | TSC_CR_CTPL_0) +/*!< Charge transfer pulse low during 6 cycles (PGCLK) */ +#define TSC_CTPL_7CYCLES (TSC_CR_CTPL_2 | TSC_CR_CTPL_1) +/*!< Charge transfer pulse low during 7 cycles (PGCLK) */ +#define TSC_CTPL_8CYCLES (TSC_CR_CTPL_2 | TSC_CR_CTPL_1 | TSC_CR_CTPL_0) +/*!< Charge transfer pulse low during 8 cycles (PGCLK) */ +#define TSC_CTPL_9CYCLES TSC_CR_CTPL_3 +/*!< Charge transfer pulse low during 9 cycles (PGCLK) */ +#define TSC_CTPL_10CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_0) +/*!< Charge transfer pulse low during 10 cycles (PGCLK) */ +#define TSC_CTPL_11CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_1) +/*!< Charge transfer pulse low during 11 cycles (PGCLK) */ +#define TSC_CTPL_12CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_1 | TSC_CR_CTPL_0) +/*!< Charge transfer pulse low during 12 cycles (PGCLK) */ +#define TSC_CTPL_13CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2) +/*!< Charge transfer pulse low during 13 cycles (PGCLK) */ +#define TSC_CTPL_14CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2 | TSC_CR_CTPL_0) +/*!< Charge transfer pulse low during 14 cycles (PGCLK) */ +#define TSC_CTPL_15CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2 | TSC_CR_CTPL_1) +/*!< Charge transfer pulse low during 15 cycles (PGCLK) */ +#define TSC_CTPL_16CYCLES (TSC_CR_CTPL_3 | TSC_CR_CTPL_2 | TSC_CR_CTPL_1 | TSC_CR_CTPL_0) +/*!< Charge transfer pulse low during 16 cycles (PGCLK) */ /** * @} */ @@ -289,8 +320,11 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to /** @defgroup TSC_Acquisition_Mode Acquisition Mode * @{ */ -#define TSC_ACQ_MODE_NORMAL 0x00000000UL /*!< Normal acquisition mode (acquisition starts as soon as START bit is set) */ -#define TSC_ACQ_MODE_SYNCHRO TSC_CR_AM /*!< Synchronized acquisition mode (acquisition starts if START bit is set and when the selected signal is detected on the SYNC input pin) */ +#define TSC_ACQ_MODE_NORMAL 0x00000000UL +/*!< Normal acquisition mode (acquisition starts as soon as START bit is set) */ +#define TSC_ACQ_MODE_SYNCHRO TSC_CR_AM +/*!< Synchronized acquisition mode (acquisition starts if START bit is set and +when the selected signal is detected on the SYNC input pin) */ /** * @} */ @@ -377,14 +411,14 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to * @retval None */ #if (USE_HAL_TSC_REGISTER_CALLBACKS == 1) -#define __HAL_TSC_RESET_HANDLE_STATE(__HANDLE__) do{ \ - (__HANDLE__)->State = HAL_TSC_STATE_RESET; \ - (__HANDLE__)->MspInitCallback = NULL; \ - (__HANDLE__)->MspDeInitCallback = NULL; \ +#define __HAL_TSC_RESET_HANDLE_STATE(__HANDLE__) do{ \ + (__HANDLE__)->State = HAL_TSC_STATE_RESET; \ + (__HANDLE__)->MspInitCallback = NULL; \ + (__HANDLE__)->MspDeInitCallback = NULL; \ } while(0) #else #define __HAL_TSC_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_TSC_STATE_RESET) -#endif +#endif /* (USE_HAL_TSC_REGISTER_CALLBACKS == 1) */ /** * @brief Enable the TSC peripheral. @@ -463,7 +497,9 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to * @param __INTERRUPT__ TSC interrupt * @retval SET or RESET */ -#define __HAL_TSC_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->IER & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET) +#define __HAL_TSC_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->IER\ + & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET :\ + RESET) /** * @brief Check whether the specified TSC flag is set or not. @@ -471,7 +507,8 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to * @param __FLAG__ TSC flag * @retval SET or RESET */ -#define __HAL_TSC_GET_FLAG(__HANDLE__, __FLAG__) ((((__HANDLE__)->Instance->ISR & (__FLAG__)) == (__FLAG__)) ? SET : RESET) +#define __HAL_TSC_GET_FLAG(__HANDLE__, __FLAG__) ((((__HANDLE__)->Instance->ISR\ + & (__FLAG__)) == (__FLAG__)) ? SET : RESET) /** * @brief Clear the TSC's pending flag. @@ -495,7 +532,8 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to * @param __GX_IOY_MASK__ IOs mask * @retval None */ -#define __HAL_TSC_DISABLE_HYSTERESIS(__HANDLE__, __GX_IOY_MASK__) ((__HANDLE__)->Instance->IOHCR &= (~(__GX_IOY_MASK__))) +#define __HAL_TSC_DISABLE_HYSTERESIS(__HANDLE__, __GX_IOY_MASK__) ((__HANDLE__)->Instance->IOHCR\ + &= (~(__GX_IOY_MASK__))) /** * @brief Open analog switch on a group of IOs. @@ -503,7 +541,8 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to * @param __GX_IOY_MASK__ IOs mask * @retval None */ -#define __HAL_TSC_OPEN_ANALOG_SWITCH(__HANDLE__, __GX_IOY_MASK__) ((__HANDLE__)->Instance->IOASCR &= (~(__GX_IOY_MASK__))) +#define __HAL_TSC_OPEN_ANALOG_SWITCH(__HANDLE__, __GX_IOY_MASK__) ((__HANDLE__)->Instance->IOASCR\ + &= (~(__GX_IOY_MASK__))) /** * @brief Close analog switch on a group of IOs. @@ -527,7 +566,8 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to * @param __GX_IOY_MASK__ IOs mask * @retval None */ -#define __HAL_TSC_DISABLE_CHANNEL(__HANDLE__, __GX_IOY_MASK__) ((__HANDLE__)->Instance->IOCCR &= (~(__GX_IOY_MASK__))) +#define __HAL_TSC_DISABLE_CHANNEL(__HANDLE__, __GX_IOY_MASK__) ((__HANDLE__)->Instance->IOCCR\ + &= (~(__GX_IOY_MASK__))) /** * @brief Enable a group of IOs in sampling mode. @@ -567,7 +607,8 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to * @retval SET or RESET */ #define __HAL_TSC_GET_GROUP_STATUS(__HANDLE__, __GX_INDEX__) \ -((((__HANDLE__)->Instance->IOGCSR & (uint32_t)(1UL << (((__GX_INDEX__) & 0xFUL) + 16UL))) == (uint32_t)(1UL << (((__GX_INDEX__) & 0xFUL) + 16UL))) ? TSC_GROUP_COMPLETED : TSC_GROUP_ONGOING) + ((((__HANDLE__)->Instance->IOGCSR & (uint32_t)(1UL << (((__GX_INDEX__) & 0xFUL) + 16UL))) == \ + (uint32_t)(1UL << (((__GX_INDEX__) & 0xFUL) + 16UL))) ? TSC_GROUP_COMPLETED : TSC_GROUP_ONGOING) /** * @} @@ -613,7 +654,8 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to ((__VALUE__) == TSC_CTPL_15CYCLES) || \ ((__VALUE__) == TSC_CTPL_16CYCLES)) -#define IS_TSC_SS(__VALUE__) (((FunctionalState)(__VALUE__) == DISABLE) || ((FunctionalState)(__VALUE__) == ENABLE)) +#define IS_TSC_SS(__VALUE__) (((FunctionalState)(__VALUE__) == DISABLE)\ + || ((FunctionalState)(__VALUE__) == ENABLE)) #define IS_TSC_SSD(__VALUE__) (((__VALUE__) == 0UL) || (((__VALUE__) > 0UL) && ((__VALUE__) < 128UL))) @@ -628,9 +670,13 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to ((__VALUE__) == TSC_PG_PRESC_DIV64) || \ ((__VALUE__) == TSC_PG_PRESC_DIV128)) -#define IS_TSC_PG_PRESC_VS_CTPL(__PGPSC__, __CTPL__) ((((__PGPSC__) == TSC_PG_PRESC_DIV1) && ((__CTPL__) > TSC_CTPL_2CYCLES)) || \ - (((__PGPSC__) == TSC_PG_PRESC_DIV2) && ((__CTPL__) > TSC_CTPL_1CYCLE)) || \ - (((__PGPSC__) > TSC_PG_PRESC_DIV2) && (((__CTPL__) == TSC_CTPL_1CYCLE) || ((__CTPL__) > TSC_CTPL_1CYCLE)))) +#define IS_TSC_PG_PRESC_VS_CTPL(__PGPSC__, __CTPL__) ((((__PGPSC__) == TSC_PG_PRESC_DIV1) && \ + ((__CTPL__) > TSC_CTPL_2CYCLES)) || \ + (((__PGPSC__) == TSC_PG_PRESC_DIV2) && \ + ((__CTPL__) > TSC_CTPL_1CYCLE)) || \ + (((__PGPSC__) > TSC_PG_PRESC_DIV2) && \ + (((__CTPL__) == TSC_CTPL_1CYCLE) || \ + ((__CTPL__) > TSC_CTPL_1CYCLE)))) #define IS_TSC_MCV(__VALUE__) (((__VALUE__) == TSC_MCV_255) || \ ((__VALUE__) == TSC_MCV_511) || \ @@ -642,13 +688,16 @@ typedef void (*pTSC_CallbackTypeDef)(TSC_HandleTypeDef *htsc); /*!< pointer to #define IS_TSC_IODEF(__VALUE__) (((__VALUE__) == TSC_IODEF_OUT_PP_LOW) || ((__VALUE__) == TSC_IODEF_IN_FLOAT)) -#define IS_TSC_SYNC_POL(__VALUE__) (((__VALUE__) == TSC_SYNC_POLARITY_FALLING) || ((__VALUE__) == TSC_SYNC_POLARITY_RISING)) +#define IS_TSC_SYNC_POL(__VALUE__) (((__VALUE__) == TSC_SYNC_POLARITY_FALLING)\ + || ((__VALUE__) == TSC_SYNC_POLARITY_RISING)) #define IS_TSC_ACQ_MODE(__VALUE__) (((__VALUE__) == TSC_ACQ_MODE_NORMAL) || ((__VALUE__) == TSC_ACQ_MODE_SYNCHRO)) -#define IS_TSC_MCE_IT(__VALUE__) (((FunctionalState)(__VALUE__) == DISABLE) || ((FunctionalState)(__VALUE__) == ENABLE)) +#define IS_TSC_MCE_IT(__VALUE__) (((FunctionalState)(__VALUE__) == DISABLE)\ + || ((FunctionalState)(__VALUE__) == ENABLE)) -#define IS_TSC_GROUP_INDEX(__VALUE__) (((__VALUE__) == 0UL) || (((__VALUE__) > 0UL) && ((__VALUE__) < (uint32_t)TSC_NB_OF_GROUPS))) +#define IS_TSC_GROUP_INDEX(__VALUE__) (((__VALUE__) == 0UL)\ + || (((__VALUE__) > 0UL) && ((__VALUE__) < (uint32_t)TSC_NB_OF_GROUPS))) #define IS_TSC_GROUP(__VALUE__) (((__VALUE__) == 0UL) ||\ (((__VALUE__) & TSC_GROUP1_IO1) == TSC_GROUP1_IO1) ||\ @@ -699,7 +748,8 @@ void HAL_TSC_MspDeInit(TSC_HandleTypeDef *htsc); /* Callbacks Register/UnRegister functions ***********************************/ #if (USE_HAL_TSC_REGISTER_CALLBACKS == 1) -HAL_StatusTypeDef HAL_TSC_RegisterCallback(TSC_HandleTypeDef *htsc, HAL_TSC_CallbackIDTypeDef CallbackID, pTSC_CallbackTypeDef pCallback); +HAL_StatusTypeDef HAL_TSC_RegisterCallback(TSC_HandleTypeDef *htsc, HAL_TSC_CallbackIDTypeDef CallbackID, + pTSC_CallbackTypeDef pCallback); HAL_StatusTypeDef HAL_TSC_UnRegisterCallback(TSC_HandleTypeDef *htsc, HAL_TSC_CallbackIDTypeDef CallbackID); #endif /* USE_HAL_TSC_REGISTER_CALLBACKS */ /** @@ -769,5 +819,3 @@ void HAL_TSC_ErrorCallback(TSC_HandleTypeDef *htsc); #endif #endif /* STM32WBxx_HAL_TSC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart.h index f68b25592..15c971f85 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1724,4 +1723,3 @@ HAL_StatusTypeDef UART_Start_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pDa #endif /* STM32WBxx_HAL_UART_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart_ex.h index c0a40b3f4..986c71295 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_uart_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -389,4 +388,3 @@ HAL_StatusTypeDef HAL_UARTEx_ReceiveToIdle_DMA(UART_HandleTypeDef *huart, uint8_ #endif /* STM32WBxx_HAL_UART_EX_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart.h index 1cc6d453e..2c0c7ad53 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -929,4 +928,3 @@ uint32_t HAL_USART_GetError(USART_HandleTypeDef *husart); #endif /* STM32WBxx_HAL_USART_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart_ex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart_ex.h index 616e214ab..83ea1fee4 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart_ex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_usart_ex.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -282,4 +281,3 @@ HAL_StatusTypeDef HAL_USARTEx_SetRxFifoThreshold(USART_HandleTypeDef *husart, ui #endif /* STM32WBxx_HAL_USART_EX_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_wwdg.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_wwdg.h index 982848c91..7e9336654 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_wwdg.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_wwdg.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -305,5 +304,3 @@ void HAL_WWDG_EarlyWakeupCallback(WWDG_HandleTypeDef *hwwdg); #endif #endif /* STM32WBxx_HAL_WWDG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_adc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_adc.h index bf280b498..d66703c35 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_adc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_adc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -8010,5 +8009,3 @@ void LL_ADC_INJ_StructInit(LL_ADC_INJ_InitTypeDef *ADC_INJ_InitStruct); #endif #endif /* STM32WBxx_LL_ADC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_bus.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_bus.h index 98e2b5d9f..699e40f9a 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_bus.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_bus.h @@ -3,7 +3,17 @@ * @file stm32wbxx_ll_bus.h * @author MCD Application Team * @brief Header file of BUS LL module. - + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ##### RCC Limitations ##### ============================================================================== @@ -21,17 +31,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -2376,5 +2375,3 @@ __STATIC_INLINE void LL_C2_APB3_GRP1_DisableClockSleep(uint32_t Periphs) #endif #endif /* STM32WBxx_LL_BUS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_comp.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_comp.h index 52556fac7..aa5d45d0f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_comp.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_comp.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,7 +141,7 @@ typedef struct /* LL_COMP_INPUT_PLUS_IO1 not available on this device */ #else #define LL_COMP_INPUT_PLUS_IO1 (0x00000000UL) /*!< Comparator input plus connected to IO1 (pin PC5 for COMP1 (except device STM32WB35xx), pin PB4 for COMP2). Note: On STM32WB serie, parameter not available on devices: STM32WB10xx, STM32WB15xx. */ -#endif +#endif /* STM32WB15xx || STM32WB10xx */ #define LL_COMP_INPUT_PLUS_IO2 (COMP_CSR_INPSEL_0) /*!< Comparator input plus connected to IO2 (pin PB2 for COMP1, pin PB6 for COMP2) */ #define LL_COMP_INPUT_PLUS_IO3 (COMP_CSR_INPSEL_1) /*!< Comparator input plus connected to IO3 (pin PA1 for COMP1, pin PA3 for COMP2) */ /** @@ -161,7 +160,7 @@ typedef struct /* LL_COMP_INPUT_MINUS_IO2 not available on this device */ #else #define LL_COMP_INPUT_MINUS_IO2 (COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO2 (pin PC4 for COMP1 (except device STM32WB35xx), pin PB7 for COMP2). Note: On STM32WB serie, parameter not available on devices: STM32WB10xx, STM32WB15xx. */ -#endif +#endif /* STM32WB15xx || STM32WB10xx */ #define LL_COMP_INPUT_MINUS_IO3 ( COMP_CSR_INMESEL_0 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO3 (pin PA0 for COMP1, pin PA2 for COMP2) */ #define LL_COMP_INPUT_MINUS_IO4 (COMP_CSR_INMESEL_1 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO4 (pin PA4 for COMP1, pin PA4 for COMP2) */ #define LL_COMP_INPUT_MINUS_IO5 (COMP_CSR_INMESEL_1 | COMP_CSR_INMESEL_0 | COMP_CSR_INMSEL_2 | COMP_CSR_INMSEL_1 | COMP_CSR_INMSEL_0) /*!< Comparator input minus connected to IO5 (pin PA5 for COMP1, pin PA5 for COMP2) */ @@ -778,5 +777,3 @@ void LL_COMP_StructInit(LL_COMP_InitTypeDef *COMP_InitStruct); #endif #endif /* STM32WBxx_LL_COMP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_cortex.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_cortex.h index c5b868a69..67ad56e1e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_cortex.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_cortex.h @@ -3,6 +3,17 @@ * @file stm32wbxx_ll_cortex.h * @author MCD Application Team * @brief Header file of CORTEX LL module. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -10,7 +21,7 @@ [..] The LL CORTEX driver contains a set of generic APIs that can be used by user: - (+) SYSTICK configuration used by @ref LL_mDelay and @ref LL_Init1msTick + (+) SYSTICK configuration used by LL_mDelay and LL_Init1msTick functions (+) Low power mode configuration (SCB register of Cortex-MCU) (+) MPU API to configure and enable regions @@ -19,17 +30,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -641,5 +641,3 @@ __STATIC_INLINE void LL_MPU_DisableRegion(uint32_t Region) #endif #endif /* STM32WBxx_LL_CORTEX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crc.h index 84158a13a..281174670 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -236,7 +235,7 @@ __STATIC_INLINE void LL_CRC_SetOutputDataReverseMode(CRC_TypeDef *CRCx, uint32_t } /** - * @brief Configure the reversal of the bit order of the Output data + * @brief Return type of reversal of the bit order of the Output data * @rmtoll CR REV_OUT LL_CRC_GetOutputDataReverseMode * @param CRCx CRC Instance * @retval Returned value can be one of the following values: @@ -460,5 +459,3 @@ ErrorStatus LL_CRC_DeInit(CRC_TypeDef *CRCx); #endif #endif /* STM32WBxx_LL_CRC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crs.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crs.h index 473ffa2b8..619ab90be 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crs.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_crs.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -109,7 +108,7 @@ extern "C" { /** @defgroup CRS_LL_EC_SYNC_SOURCE Synchronization Signal Source * @{ */ -#define LL_CRS_SYNC_SOURCE_GPIO 0x00000000U /*!< Synchro Signal soucre GPIO */ +#define LL_CRS_SYNC_SOURCE_GPIO 0x00000000U /*!< Synchro Signal source GPIO */ #define LL_CRS_SYNC_SOURCE_LSE CRS_CFGR_SYNCSRC_0 /*!< Synchro Signal source LSE */ #define LL_CRS_SYNC_SOURCE_USB CRS_CFGR_SYNCSRC_1 /*!< Synchro Signal source USB SOF (default)*/ /** @@ -794,5 +793,3 @@ ErrorStatus LL_CRS_DeInit(void); #endif #endif /* STM32WBxx_LL_CRS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dma.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dma.h index 8c1169618..b783cfb9f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dma.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dma.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -959,7 +958,7 @@ __STATIC_INLINE uint32_t LL_DMA_GetDataLength(DMA_TypeDef *DMAx, uint32_t Channe /** * @brief Configure the Source and Destination addresses. * @note This API must not be called when the DMA channel is enabled. - * @note Each peripheral using DMA provides an API to get directly the register adress (LL_PPP_DMA_GetRegAddr). + * @note Each peripheral using DMA provides an API to get directly the register address (LL_PPP_DMA_GetRegAddr). * @rmtoll CPAR PA LL_DMA_ConfigAddresses\n * CMAR MA LL_DMA_ConfigAddresses * @param DMAx DMAx Instance @@ -2158,5 +2157,3 @@ void LL_DMA_StructInit(LL_DMA_InitTypeDef *DMA_InitStruct); #endif #endif /* STM32WBxx_LL_DMA_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dmamux.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dmamux.h index 6e6852241..710d72975 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dmamux.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_dmamux.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -240,8 +239,8 @@ extern "C" { #define LL_DMAMUX_SYNC_EXTI_LINE15 (DMAMUX_CxCR_SYNC_ID_3 | DMAMUX_CxCR_SYNC_ID_2 | DMAMUX_CxCR_SYNC_ID_1 | DMAMUX_CxCR_SYNC_ID_0) /*!< Synchronization signal from EXTI Line15 */ #define LL_DMAMUX_SYNC_DMAMUX_CH0 DMAMUX_CxCR_SYNC_ID_4 /*!< Synchronization signal from DMAMUX channel0 Event */ #define LL_DMAMUX_SYNC_DMAMUX_CH1 (DMAMUX_CxCR_SYNC_ID_4 | DMAMUX_CxCR_SYNC_ID_0) /*!< Synchronization signal from DMAMUX channel1 Event */ -#define LL_DMAMUX_SYNC_LPTIM1_OUT (DMAMUX_CxCR_SYNC_ID_4 | DMAMUX_CxCR_SYNC_ID_1) /*!< Synchronization signal from LPTIM1 Ouput */ -#define LL_DMAMUX_SYNC_LPTIM2_OUT (DMAMUX_CxCR_SYNC_ID_4 | DMAMUX_CxCR_SYNC_ID_1 | DMAMUX_CxCR_SYNC_ID_0) /*!< Synchronization signal from LPTIM2 Ouput */ +#define LL_DMAMUX_SYNC_LPTIM1_OUT (DMAMUX_CxCR_SYNC_ID_4 | DMAMUX_CxCR_SYNC_ID_1) /*!< Synchronization signal from LPTIM1 Output */ +#define LL_DMAMUX_SYNC_LPTIM2_OUT (DMAMUX_CxCR_SYNC_ID_4 | DMAMUX_CxCR_SYNC_ID_1 | DMAMUX_CxCR_SYNC_ID_0) /*!< Synchronization signal from LPTIM2 Output */ /** * @} */ @@ -289,8 +288,8 @@ extern "C" { #define LL_DMAMUX_REQ_GEN_EXTI_LINE15 (DMAMUX_RGxCR_SIG_ID_3 | DMAMUX_RGxCR_SIG_ID_2 | DMAMUX_RGxCR_SIG_ID_1 | DMAMUX_RGxCR_SIG_ID_0) /*!< Request signal generation from EXTI Line15 */ #define LL_DMAMUX_REQ_GEN_DMAMUX_CH0 DMAMUX_RGxCR_SIG_ID_4 /*!< Request signal generation from DMAMUX channel0 Event */ #define LL_DMAMUX_REQ_GEN_DMAMUX_CH1 (DMAMUX_RGxCR_SIG_ID_4 | DMAMUX_RGxCR_SIG_ID_0) /*!< Request signal generation from DMAMUX channel1 Event */ -#define LL_DMAMUX_REQ_GEN_LPTIM1_OUT (DMAMUX_RGxCR_SIG_ID_4 | DMAMUX_RGxCR_SIG_ID_1) /*!< Request signal generation from LPTIM1 Ouput */ -#define LL_DMAMUX_REQ_GEN_LPTIM2_OUT (DMAMUX_RGxCR_SIG_ID_4 | DMAMUX_RGxCR_SIG_ID_1 | DMAMUX_RGxCR_SIG_ID_0) /*!< Request signal generation from LPTIM2 Ouput */ +#define LL_DMAMUX_REQ_GEN_LPTIM1_OUT (DMAMUX_RGxCR_SIG_ID_4 | DMAMUX_RGxCR_SIG_ID_1) /*!< Request signal generation from LPTIM1 Output */ +#define LL_DMAMUX_REQ_GEN_LPTIM2_OUT (DMAMUX_RGxCR_SIG_ID_4 | DMAMUX_RGxCR_SIG_ID_1 | DMAMUX_RGxCR_SIG_ID_0) /*!< Request signal generation from LPTIM2 Output */ /** * @} */ @@ -1755,5 +1754,3 @@ __STATIC_INLINE uint32_t LL_DMAMUX_IsEnabledIT_RGO(DMAMUX_Channel_TypeDef *DMAMU #endif #endif /* STM32WBxx_LL_DMAMUX_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_exti.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_exti.h index a7a1ddd05..93fa1a2ed 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_exti.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_exti.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1406,7 +1405,7 @@ __STATIC_INLINE void LL_EXTI_GenerateSWI_0_31(uint32_t ExtiLine) /** * @brief Generate a software Interrupt Event for Lines in range 32 to 63 - * @note If the interrupt is enabled on this line inthe EXTI_IMR2, writing a 1 to + * @note If the interrupt is enabled on this line in the EXTI_IMR2, writing a 1 to * this bit when it is at '0' sets the corresponding pending bit in EXTI_PR2 * resulting in an interrupt request generation. * This bit is cleared by clearing the corresponding bit in the EXTI_PR2 @@ -1632,5 +1631,3 @@ void LL_EXTI_StructInit(LL_EXTI_InitTypeDef *EXTI_InitStruct); #endif #endif /* STM32WBxx_LL_EXTI_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_gpio.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_gpio.h index f578faa2a..16ea3856e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_gpio.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_gpio.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -988,5 +987,3 @@ void LL_GPIO_StructInit(LL_GPIO_InitTypeDef *GPIO_InitStruct); #endif #endif /* STM32WBxx_LL_GPIO_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_hsem.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_hsem.h index 711925d53..12da97a44 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_hsem.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_hsem.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,6 +60,7 @@ extern "C" { * @} */ + /** @defgroup HSEM_LL_EC_GET_FLAG Get Flags Defines * @brief Flags defines which can be used with LL_HSEM_ReadReg function * @{ @@ -286,6 +286,8 @@ __STATIC_INLINE uint32_t LL_HSEM_GetKey(HSEM_TypeDef *HSEMx) /** * @brief Release all semaphore with the same core id. * @rmtoll CR KEY LL_HSEM_ResetAllLock + * @rmtoll CR SEC LL_HSEM_ResetAllLock + * @rmtoll CR PRIV LL_HSEM_ResetAllLock * @param HSEMx HSEM Instance. * @param key Key value. * @param core This parameter can be one of the following values: @@ -876,5 +878,3 @@ __STATIC_INLINE uint32_t LL_HSEM_IsActiveFlag_C2MISR(HSEM_TypeDef *HSEMx, uint32 #endif #endif /* __STM32WBxx_LL_HSEM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_i2c.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_i2c.h index 94f9b4b7e..c747ff355 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_i2c.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_i2c.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -2271,5 +2270,3 @@ void LL_I2C_StructInit(LL_I2C_InitTypeDef *I2C_InitStruct); #endif #endif /* STM32WBxx_LL_I2C_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_ipcc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_ipcc.h index 95d831193..1d84c0fd7 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_ipcc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_ipcc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -732,4 +731,3 @@ __STATIC_INLINE uint32_t LL_IPCC_GetChannelNumber(IPCC_TypeDef *IPCCx) #endif /* STM32WBxx_LL_IPCC_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_iwdg.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_iwdg.h index 83a7e60ce..e960d1d4c 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_iwdg.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_iwdg.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -337,5 +336,3 @@ __STATIC_INLINE uint32_t LL_IWDG_IsReady(IWDG_TypeDef *IWDGx) #endif #endif /* STM32WBxx_LL_IWDG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lptim.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lptim.h index f2b15a872..9e84e5a70 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lptim.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lptim.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,22 +66,26 @@ typedef struct uint32_t ClockSource; /*!< Specifies the source of the clock used by the LPTIM instance. This parameter can be a value of @ref LPTIM_LL_EC_CLK_SOURCE. - This feature can be modified afterwards using unitary function @ref LL_LPTIM_SetClockSource().*/ + This feature can be modified afterwards using unitary + function @ref LL_LPTIM_SetClockSource().*/ uint32_t Prescaler; /*!< Specifies the prescaler division ratio. This parameter can be a value of @ref LPTIM_LL_EC_PRESCALER. - This feature can be modified afterwards using using unitary function @ref LL_LPTIM_SetPrescaler().*/ + This feature can be modified afterwards using using unitary + function @ref LL_LPTIM_SetPrescaler().*/ uint32_t Waveform; /*!< Specifies the waveform shape. This parameter can be a value of @ref LPTIM_LL_EC_OUTPUT_WAVEFORM. - This feature can be modified afterwards using unitary function @ref LL_LPTIM_ConfigOutput().*/ + This feature can be modified afterwards using unitary + function @ref LL_LPTIM_ConfigOutput().*/ uint32_t Polarity; /*!< Specifies waveform polarity. This parameter can be a value of @ref LPTIM_LL_EC_OUTPUT_POLARITY. - This feature can be modified afterwards using unitary function @ref LL_LPTIM_ConfigOutput().*/ + This feature can be modified afterwards using unitary + function @ref LL_LPTIM_ConfigOutput().*/ } LL_LPTIM_InitTypeDef; /** @@ -100,9 +103,9 @@ typedef struct * @{ */ #define LL_LPTIM_ISR_CMPM LPTIM_ISR_CMPM /*!< Compare match */ +#define LL_LPTIM_ISR_CMPOK LPTIM_ISR_CMPOK /*!< Compare register update OK */ #define LL_LPTIM_ISR_ARRM LPTIM_ISR_ARRM /*!< Autoreload match */ #define LL_LPTIM_ISR_EXTTRIG LPTIM_ISR_EXTTRIG /*!< External trigger edge event */ -#define LL_LPTIM_ISR_CMPOK LPTIM_ISR_CMPOK /*!< Compare register update OK */ #define LL_LPTIM_ISR_ARROK LPTIM_ISR_ARROK /*!< Autoreload register update OK */ #define LL_LPTIM_ISR_UP LPTIM_ISR_UP /*!< Counter direction change down to up */ #define LL_LPTIM_ISR_DOWN LPTIM_ISR_DOWN /*!< Counter direction change up to down */ @@ -114,13 +117,13 @@ typedef struct * @brief IT defines which can be used with LL_LPTIM_ReadReg and LL_LPTIM_WriteReg functions * @{ */ -#define LL_LPTIM_IER_CMPMIE LPTIM_IER_CMPMIE /*!< Compare match Interrupt Enable */ -#define LL_LPTIM_IER_ARRMIE LPTIM_IER_ARRMIE /*!< Autoreload match Interrupt Enable */ -#define LL_LPTIM_IER_EXTTRIGIE LPTIM_IER_EXTTRIGIE /*!< External trigger valid edge Interrupt Enable */ -#define LL_LPTIM_IER_CMPOKIE LPTIM_IER_CMPOKIE /*!< Compare register update OK Interrupt Enable */ -#define LL_LPTIM_IER_ARROKIE LPTIM_IER_ARROKIE /*!< Autoreload register update OK Interrupt Enable */ -#define LL_LPTIM_IER_UPIE LPTIM_IER_UPIE /*!< Direction change to UP Interrupt Enable */ -#define LL_LPTIM_IER_DOWNIE LPTIM_IER_DOWNIE /*!< Direction change to down Interrupt Enable */ +#define LL_LPTIM_IER_CMPMIE LPTIM_IER_CMPMIE /*!< Compare match */ +#define LL_LPTIM_IER_CMPOKIE LPTIM_IER_CMPOKIE /*!< Compare register update OK */ +#define LL_LPTIM_IER_ARRMIE LPTIM_IER_ARRMIE /*!< Autoreload match */ +#define LL_LPTIM_IER_EXTTRIGIE LPTIM_IER_EXTTRIGIE /*!< External trigger edge event */ +#define LL_LPTIM_IER_ARROKIE LPTIM_IER_ARROKIE /*!< Autoreload register update OK */ +#define LL_LPTIM_IER_UPIE LPTIM_IER_UPIE /*!< Counter direction change down to up */ +#define LL_LPTIM_IER_DOWNIE LPTIM_IER_DOWNIE /*!< Counter direction change up to down */ /** * @} */ @@ -920,7 +923,8 @@ __STATIC_INLINE uint32_t LL_LPTIM_GetClockSource(LPTIM_TypeDef *LPTIMx) } /** - * @brief Configure the active edge or edges used by the counter when the LPTIM is clocked by an external clock source. + * @brief Configure the active edge or edges used by the counter when + the LPTIM is clocked by an external clock source. * @note This function must be called when the LPTIM instance is disabled. * @note When both external clock signal edges are considered active ones, * the LPTIM must also be clocked by an internal clock source with a @@ -1138,7 +1142,8 @@ __STATIC_INLINE void LL_LPTIM_ClearFlag_CMPOK(LPTIM_TypeDef *LPTIMx) } /** - * @brief Informs application whether the APB bus write operation to the LPTIMx_CMP register has been successfully completed. If so, a new one can be initiated. + * @brief Informs application whether the APB bus write operation to the LPTIMx_CMP register has been successfully + completed. If so, a new one can be initiated. * @rmtoll ISR CMPOK LL_LPTIM_IsActiveFlag_CMPOK * @param LPTIMx Low-Power Timer instance * @retval State of bit (1 or 0). @@ -1160,7 +1165,8 @@ __STATIC_INLINE void LL_LPTIM_ClearFlag_ARROK(LPTIM_TypeDef *LPTIMx) } /** - * @brief Informs application whether the APB bus write operation to the LPTIMx_ARR register has been successfully completed. If so, a new one can be initiated. + * @brief Informs application whether the APB bus write operation to the LPTIMx_ARR register has been successfully + completed. If so, a new one can be initiated. * @rmtoll ISR ARROK LL_LPTIM_IsActiveFlag_ARROK * @param LPTIMx Low-Power Timer instance * @retval State of bit (1 or 0). @@ -1182,7 +1188,8 @@ __STATIC_INLINE void LL_LPTIM_ClearFlag_UP(LPTIM_TypeDef *LPTIMx) } /** - * @brief Informs the application whether the counter direction has changed from down to up (when the LPTIM instance operates in encoder mode). + * @brief Informs the application whether the counter direction has changed from down to up (when the LPTIM instance + operates in encoder mode). * @rmtoll ISR UP LL_LPTIM_IsActiveFlag_UP * @param LPTIMx Low-Power Timer instance * @retval State of bit (1 or 0). @@ -1204,7 +1211,8 @@ __STATIC_INLINE void LL_LPTIM_ClearFlag_DOWN(LPTIM_TypeDef *LPTIMx) } /** - * @brief Informs the application whether the counter direction has changed from up to down (when the LPTIM instance operates in encoder mode). + * @brief Informs the application whether the counter direction has changed from up to down (when the LPTIM instance + operates in encoder mode). * @rmtoll ISR DOWN LL_LPTIM_IsActiveFlag_DOWN * @param LPTIMx Low-Power Timer instance * @retval State of bit (1 or 0). @@ -1356,7 +1364,7 @@ __STATIC_INLINE uint32_t LL_LPTIM_IsEnabledIT_CMPOK(LPTIM_TypeDef *LPTIMx) /** * @brief Enable autoreload register write completed interrupt (ARROKIE). - * @rmtoll IER ARROKIE LL_LPTIM_EnableIT_ARROK + * @rmtoll IER ARROKIE LL_LPTIM_EnableIT_ARROK * @param LPTIMx Low-Power Timer instance * @retval None */ @@ -1367,7 +1375,7 @@ __STATIC_INLINE void LL_LPTIM_EnableIT_ARROK(LPTIM_TypeDef *LPTIMx) /** * @brief Disable autoreload register write completed interrupt (ARROKIE). - * @rmtoll IER ARROKIE LL_LPTIM_DisableIT_ARROK + * @rmtoll IER ARROKIE LL_LPTIM_DisableIT_ARROK * @param LPTIMx Low-Power Timer instance * @retval None */ @@ -1378,7 +1386,7 @@ __STATIC_INLINE void LL_LPTIM_DisableIT_ARROK(LPTIM_TypeDef *LPTIMx) /** * @brief Indicates whether the autoreload register write completed interrupt (ARROKIE) is enabled. - * @rmtoll IER ARROKIE LL_LPTIM_IsEnabledIT_ARROK + * @rmtoll IER ARROKIE LL_LPTIM_IsEnabledIT_ARROK * @param LPTIMx Low-Power Timer instance * @retval State of bit(1 or 0). */ @@ -1389,7 +1397,7 @@ __STATIC_INLINE uint32_t LL_LPTIM_IsEnabledIT_ARROK(LPTIM_TypeDef *LPTIMx) /** * @brief Enable direction change to up interrupt (UPIE). - * @rmtoll IER UPIE LL_LPTIM_EnableIT_UP + * @rmtoll IER UPIE LL_LPTIM_EnableIT_UP * @param LPTIMx Low-Power Timer instance * @retval None */ @@ -1400,7 +1408,7 @@ __STATIC_INLINE void LL_LPTIM_EnableIT_UP(LPTIM_TypeDef *LPTIMx) /** * @brief Disable direction change to up interrupt (UPIE). - * @rmtoll IER UPIE LL_LPTIM_DisableIT_UP + * @rmtoll IER UPIE LL_LPTIM_DisableIT_UP * @param LPTIMx Low-Power Timer instance * @retval None */ @@ -1411,7 +1419,7 @@ __STATIC_INLINE void LL_LPTIM_DisableIT_UP(LPTIM_TypeDef *LPTIMx) /** * @brief Indicates whether the direction change to up interrupt (UPIE) is enabled. - * @rmtoll IER UPIE LL_LPTIM_IsEnabledIT_UP + * @rmtoll IER UPIE LL_LPTIM_IsEnabledIT_UP * @param LPTIMx Low-Power Timer instance * @retval State of bit(1 or 0). */ @@ -1422,7 +1430,7 @@ __STATIC_INLINE uint32_t LL_LPTIM_IsEnabledIT_UP(LPTIM_TypeDef *LPTIMx) /** * @brief Enable direction change to down interrupt (DOWNIE). - * @rmtoll IER DOWNIE LL_LPTIM_EnableIT_DOWN + * @rmtoll IER DOWNIE LL_LPTIM_EnableIT_DOWN * @param LPTIMx Low-Power Timer instance * @retval None */ @@ -1433,7 +1441,7 @@ __STATIC_INLINE void LL_LPTIM_EnableIT_DOWN(LPTIM_TypeDef *LPTIMx) /** * @brief Disable direction change to down interrupt (DOWNIE). - * @rmtoll IER DOWNIE LL_LPTIM_DisableIT_DOWN + * @rmtoll IER DOWNIE LL_LPTIM_DisableIT_DOWN * @param LPTIMx Low-Power Timer instance * @retval None */ @@ -1444,7 +1452,7 @@ __STATIC_INLINE void LL_LPTIM_DisableIT_DOWN(LPTIM_TypeDef *LPTIMx) /** * @brief Indicates whether the direction change to down interrupt (DOWNIE) is enabled. - * @rmtoll IER DOWNIE LL_LPTIM_IsEnabledIT_DOWN + * @rmtoll IER DOWNIE LL_LPTIM_IsEnabledIT_DOWN * @param LPTIMx Low-Power Timer instance * @retval State of bit(1 or 0). */ @@ -1476,5 +1484,3 @@ __STATIC_INLINE uint32_t LL_LPTIM_IsEnabledIT_DOWN(LPTIM_TypeDef *LPTIMx) #endif #endif /* STM32WBxx_LL_LPTIM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lpuart.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lpuart.h index a3df7ecf1..98e3e5d17 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lpuart.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_lpuart.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -2643,4 +2642,3 @@ void LL_LPUART_StructInit(LL_LPUART_InitTypeDef *LPUART_InitStruct); #endif /* STM32WBxx_LL_LPUART_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pka.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pka.h index 21d0c50ca..b38e918a5 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pka.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pka.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,7 +93,7 @@ typedef struct */ /** @defgroup PKA_LL_EC_MODE Operation Mode - * @brief List of opearation mode. + * @brief List of operation mode. * @{ */ #define LL_PKA_MODE_MONTGOMERY_PARAM_MOD_EXP ((uint32_t)0x00000000U) /*!< Compute Montgomery parameter and modular exponentiation */ @@ -173,9 +172,9 @@ typedef struct * @param PKAx PKA Instance. * @param Mode This parameter can be one of the following values: * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_MOD_EXP + * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_ECC * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM * @arg @ref LL_PKA_MODE_MODULAR_EXP - * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_ECC * @arg @ref LL_PKA_MODE_ECC_KP_PRIMITIVE * @arg @ref LL_PKA_MODE_ECDSA_SIGNATURE * @arg @ref LL_PKA_MODE_ECDSA_VERIFICATION @@ -235,9 +234,9 @@ __STATIC_INLINE uint32_t LL_PKA_IsEnabled(PKA_TypeDef *PKAx) * @param PKAx PKA Instance. * @param Mode This parameter can be one of the following values: * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_MOD_EXP + * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_ECC * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM * @arg @ref LL_PKA_MODE_MODULAR_EXP - * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_ECC * @arg @ref LL_PKA_MODE_ECC_KP_PRIMITIVE * @arg @ref LL_PKA_MODE_ECDSA_SIGNATURE * @arg @ref LL_PKA_MODE_ECDSA_VERIFICATION @@ -265,9 +264,9 @@ __STATIC_INLINE void LL_PKA_SetMode(PKA_TypeDef *PKAx, uint32_t Mode) * @param PKAx PKA Instance. * @retval Returned value can be one of the following values: * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_MOD_EXP + * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_ECC * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM * @arg @ref LL_PKA_MODE_MODULAR_EXP - * @arg @ref LL_PKA_MODE_MONTGOMERY_PARAM_ECC * @arg @ref LL_PKA_MODE_ECC_KP_PRIMITIVE * @arg @ref LL_PKA_MODE_ECDSA_SIGNATURE * @arg @ref LL_PKA_MODE_ECDSA_VERIFICATION @@ -533,5 +532,3 @@ void LL_PKA_StructInit(LL_PKA_InitTypeDef *PKA_InitStruct); #endif #endif /* STM32WBxx_LL_PKA_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pwr.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pwr.h index 4c8a15af1..e63688508 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pwr.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_pwr.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -336,7 +335,7 @@ extern "C" { */ /* Note: Literals values are defined from register SR2 bits SMPSF and SMPSBF */ /* but they are also used as register CR5 bits SMPSEN and SMPSBEN, */ -/* as used by all SMPS operating mode functions targetting different */ +/* as used by all SMPS operating mode functions targeting different */ /* registers: */ /* "LL_PWR_SMPS_SetMode()", "LL_PWR_SMPS_GetMode()" */ /* and "LL_PWR_SMPS_GetEffectiveMode()". */ @@ -1327,7 +1326,7 @@ __STATIC_INLINE uint32_t LL_PWR_GetBORConfig(void) * switching on the fly is performed automaticcaly * and interruption is generated. * Refer to function @ref LL_PWR_SetBORConfig(). - * @note Occurence of SMPS step down converter forced in bypass mode + * @note Occurrence of SMPS step down converter forced in bypass mode * can be monitored by flag and interruption. * Refer to functions * @ref LL_PWR_IsActiveFlag_SMPSFB(), @ref LL_PWR_ClearFlag_SMPSFB(), @@ -1504,7 +1503,7 @@ __STATIC_INLINE uint32_t LL_PWR_SMPS_GetStartupCurrent(void) __STATIC_INLINE void LL_PWR_SMPS_SetOutputVoltageLevel(uint32_t OutputVoltageLevel) { __IO const uint32_t OutputVoltageLevel_calibration = (((*SMPS_VOLTAGE_CAL_ADDR) & SMPS_VOLTAGE_CAL) >> SMPS_VOLTAGE_CAL_POS); /* SMPS output voltage level calibrated in production */ - int32_t TrimmingSteps; /* Trimming steps between theorical output voltage and calibrated output voltage */ + int32_t TrimmingSteps; /* Trimming steps between theoretical output voltage and calibrated output voltage */ int32_t OutputVoltageLevelTrimmed; /* SMPS output voltage level after calibration: trimming value added to required level */ if(OutputVoltageLevel_calibration == 0UL) @@ -1565,7 +1564,7 @@ __STATIC_INLINE void LL_PWR_SMPS_SetOutputVoltageLevel(uint32_t OutputVoltageLev __STATIC_INLINE uint32_t LL_PWR_SMPS_GetOutputVoltageLevel(void) { __IO const uint32_t OutputVoltageLevel_calibration = (((*SMPS_VOLTAGE_CAL_ADDR) & SMPS_VOLTAGE_CAL) >> SMPS_VOLTAGE_CAL_POS); /* SMPS output voltage level calibrated in production */ - int32_t TrimmingSteps; /* Trimming steps between theorical output voltage and calibrated output voltage */ + int32_t TrimmingSteps; /* Trimming steps between theoretical output voltage and calibrated output voltage */ int32_t OutputVoltageLevelTrimmed; /* SMPS output voltage level after calibration: trimming value added to required level */ if(OutputVoltageLevel_calibration == 0UL) @@ -1578,7 +1577,7 @@ __STATIC_INLINE uint32_t LL_PWR_SMPS_GetOutputVoltageLevel(void) { /* Device with SMPS output voltage calibrated in production: Return output voltage value after correction by calibration value */ - TrimmingSteps = ((int32_t)OutputVoltageLevel_calibration - (int32_t)(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V50 >> PWR_CR5_SMPSVOS_Pos)); /* Trimming steps between theorical output voltage and calibrated output voltage */ + TrimmingSteps = ((int32_t)OutputVoltageLevel_calibration - (int32_t)(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V50 >> PWR_CR5_SMPSVOS_Pos)); /* Trimming steps between theoretical output voltage and calibrated output voltage */ OutputVoltageLevelTrimmed = ((int32_t)((uint32_t)READ_BIT(PWR->CR5, PWR_CR5_SMPSVOS)) - TrimmingSteps); @@ -2724,4 +2723,3 @@ ErrorStatus LL_PWR_DeInit(void); #endif /* STM32WBxx_LL_PWR_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rcc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rcc.h index 73c3832a7..e42e4b136 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rcc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rcc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -3285,6 +3284,16 @@ __STATIC_INLINE void LL_RCC_PLL_DisableDomain_SAI(void) } #endif +/** + * @brief Check if PLL output mapped on SAI domain clock is enabled + * @rmtoll PLLCFGR PLLPEN LL_RCC_PLL_IsEnabledDomain_SAI + * @retval State of bit (1 or 0). + */ +__STATIC_INLINE uint32_t LL_RCC_PLL_IsEnabledDomain_SAI(void) +{ + return ((READ_BIT(RCC->PLLCFGR, RCC_PLLCFGR_PLLPEN) == (RCC_PLLCFGR_PLLPEN)) ? 1UL : 0UL); +} + /** * @brief Enable PLL output mapped on ADC domain clock * @rmtoll PLLCFGR PLLPEN LL_RCC_PLL_EnableDomain_ADC @@ -3307,6 +3316,15 @@ __STATIC_INLINE void LL_RCC_PLL_DisableDomain_ADC(void) CLEAR_BIT(RCC->PLLCFGR, RCC_PLLCFGR_PLLPEN); } +/** + * @brief Check if PLL output mapped on ADC domain clock is enabled + * @rmtoll PLLCFGR PLLPEN LL_RCC_PLL_IsEnabledDomain_ADC + * @retval State of bit (1 or 0). + */ +__STATIC_INLINE uint32_t LL_RCC_PLL_IsEnabledDomain_ADC(void) +{ + return ((READ_BIT(RCC->PLLCFGR, RCC_PLLCFGR_PLLPEN) == (RCC_PLLCFGR_PLLPEN)) ? 1UL : 0UL); +} /** * @brief Enable PLL output mapped on 48MHz domain clock @@ -3330,6 +3348,16 @@ __STATIC_INLINE void LL_RCC_PLL_DisableDomain_48M(void) CLEAR_BIT(RCC->PLLCFGR, RCC_PLLCFGR_PLLQEN); } +/** + * @brief Check if PLL output mapped on 48MHz domain clock is enabled + * @rmtoll PLLCFGR PLLQEN LL_RCC_PLL_IsEnabledDomain_48M + * @retval State of bit (1 or 0). + */ +__STATIC_INLINE uint32_t LL_RCC_PLL_IsEnabledDomain_48M(void) +{ + return ((READ_BIT(RCC->PLLCFGR, RCC_PLLCFGR_PLLQEN) == (RCC_PLLCFGR_PLLQEN)) ? 1UL : 0UL); +} + /** * @brief Enable PLL output mapped on SYSCLK domain * @rmtoll PLLCFGR PLLREN LL_RCC_PLL_EnableDomain_SYS @@ -3353,6 +3381,16 @@ __STATIC_INLINE void LL_RCC_PLL_DisableDomain_SYS(void) CLEAR_BIT(RCC->PLLCFGR, RCC_PLLCFGR_PLLREN); } +/** + * @brief Check if PLL output mapped on SYSCLK domain clock is enabled + * @rmtoll PLLCFGR RCC_PLLCFGR_PLLREN LL_RCC_PLL_LL_RCC_PLL_IsEnabledDomain_SYSIsEnabledDomain_SYS + * @retval State of bit (1 or 0). + */ +__STATIC_INLINE uint32_t LL_RCC_PLL_IsEnabledDomain_SYS(void) +{ + return ((READ_BIT(RCC->PLLCFGR, RCC_PLLCFGR_PLLREN) == (RCC_PLLCFGR_PLLREN)) ? 1UL : 0UL); +} + /** * @} */ @@ -3651,6 +3689,16 @@ __STATIC_INLINE void LL_RCC_PLLSAI1_DisableDomain_SAI(void) CLEAR_BIT(RCC->PLLSAI1CFGR, RCC_PLLSAI1CFGR_PLLPEN); } +/** + * @brief Check if PLLSAI1 output mapped on SAI domain clock is enabled + * @rmtoll PLLSAI1CFGR PLLPEN LL_RCC_PLLSAI1_IsEnabledDomain_SAI + * @retval State of bit (1 or 0). + */ +__STATIC_INLINE uint32_t LL_RCC_PLLSAI1_IsEnabledDomain_SAI(void) +{ + return ((READ_BIT(RCC->PLLSAI1CFGR, RCC_PLLSAI1CFGR_PLLPEN) == (RCC_PLLSAI1CFGR_PLLPEN)) ? 1UL : 0UL); +} + /** * @brief Enable PLLSAI1 output mapped on 48MHz domain clock * @rmtoll PLLSAI1CFGR PLLQEN LL_RCC_PLLSAI1_EnableDomain_48M @@ -3673,6 +3721,16 @@ __STATIC_INLINE void LL_RCC_PLLSAI1_DisableDomain_48M(void) CLEAR_BIT(RCC->PLLSAI1CFGR, RCC_PLLSAI1CFGR_PLLQEN); } +/** + * @brief Check if PLLSAI1 output mapped on 48MHz domain clock is enabled + * @rmtoll PLLSAI1CFGR PLLQEN LL_RCC_PLLSAI1_IsEnabledDomain_48M + * @retval State of bit (1 or 0). + */ +__STATIC_INLINE uint32_t LL_RCC_PLLSAI1_IsEnabledDomain_48M(void) +{ + return ((READ_BIT(RCC->PLLSAI1CFGR, RCC_PLLSAI1CFGR_PLLQEN) == (RCC_PLLSAI1CFGR_PLLQEN)) ? 1UL : 0UL); +} + /** * @brief Enable PLLSAI1 output mapped on ADC domain clock * @rmtoll PLLSAI1CFGR PLLREN LL_RCC_PLLSAI1_EnableDomain_ADC @@ -3694,6 +3752,16 @@ __STATIC_INLINE void LL_RCC_PLLSAI1_DisableDomain_ADC(void) { CLEAR_BIT(RCC->PLLSAI1CFGR, RCC_PLLSAI1CFGR_PLLREN); } + +/** + * @brief Check if PLLSAI1 output mapped on ADC domain clock is enabled + * @rmtoll PLLSAI1CFGR PLLREN LL_RCC_PLLSAI1_IsEnabledDomain_ADC + * @retval State of bit (1 or 0). + */ +__STATIC_INLINE uint32_t LL_RCC_PLLSAI1_IsEnabledDomain_ADC(void) +{ + return ((READ_BIT(RCC->PLLSAI1CFGR, RCC_PLLSAI1CFGR_PLLREN) == (RCC_PLLSAI1CFGR_PLLREN)) ? 1UL : 0UL); +} #endif /** @@ -4471,5 +4539,3 @@ uint32_t LL_RCC_GetRFWKPClockFreq(void); #endif #endif /* STM32WBxx_LL_RCC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rng.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rng.h index 251e70eb1..2b8e20ae6 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rng.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rng.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -397,5 +396,3 @@ ErrorStatus LL_RNG_DeInit(RNG_TypeDef *RNGx); #endif #endif /* __STM32WBxx_LL_RNG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rtc.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rtc.h index 9773676f1..e542b9b19 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rtc.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_rtc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -3934,5 +3933,3 @@ ErrorStatus LL_RTC_WaitForSynchro(RTC_TypeDef *RTCx); #endif #endif /* STM32WBxx_LL_RTC_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_spi.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_spi.h index b6f6d9d6c..8c7e7a83e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_spi.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_spi.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1417,4 +1416,3 @@ void LL_SPI_StructInit(LL_SPI_InitTypeDef *SPI_InitStruct); #endif /* STM32WBxx_LL_SPI_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_system.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_system.h index 995602c88..168e4f250 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_system.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_system.h @@ -3,6 +3,17 @@ * @file stm32wbxx_ll_system.h * @author MCD Application Team * @brief Header file of SYSTEM LL module. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -17,17 +28,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -1614,7 +1614,7 @@ __STATIC_INLINE uint32_t LL_DBGMCU_IsEnabledTraceClock(void) } /** - * @brief Enable the external trigger ouput + * @brief Enable the external trigger output * @note When enable the external trigger is output (state of bit 1), * TRGIO pin is connected to TRGOUT. * @rmtoll DBGMCU_CR TRGOEN LL_DBGMCU_EnableTriggerOutput\n @@ -1625,7 +1625,7 @@ __STATIC_INLINE void LL_DBGMCU_EnableTriggerOutput(void) } /** - * @brief Disable the external trigger ouput + * @brief Disable the external trigger output * @note When disable external trigger is input (state of bit 0), * TRGIO pin is connected to TRGIN. * @rmtoll DBGMCU_CR TRGOEN LL_DBGMCU_DisableTriggerOutput\n @@ -2228,7 +2228,7 @@ __STATIC_INLINE uint32_t LL_FLASH_GetUDN(void) * @note The 64-bit UID64 may be used by Firmware to derive BLE 48-bit Device Address EUI-48 or * 802.15.4 64-bit Device Address EUI-64. * For STM32WBxxxx devices, the device ID is 0x26 - * @retval Values between Min_Data=0x00 and Max_Data=0xFF (ex: Device ID is 0x26 fo STM32WB55x) + * @retval Values between Min_Data=0x00 and Max_Data=0xFF (ex: Device ID is 0x26 for STM32WB55x) */ __STATIC_INLINE uint32_t LL_FLASH_GetDeviceID(void) { @@ -2239,8 +2239,8 @@ __STATIC_INLINE uint32_t LL_FLASH_GetDeviceID(void) * @brief Return the ST Company ID * @note The 64-bit UID64 may be used by Firmware to derive BLE 48-bit Device Address EUI-48 or * 802.15.4 64-bit Device Address EUI-64. - * For STM32WBxxxx devices, the ST Compagny ID is 0x0080E1 - * @retval Values between Min_Data=0x00 and Max_Data=0xFFFFFF (ex: ST Compagny ID is 0x0080E1) + * For STM32WBxxxx devices, the ST Company ID is 0x0080E1 + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFFFF (ex: ST Company ID is 0x0080E1) */ __STATIC_INLINE uint32_t LL_FLASH_GetSTCompanyID(void) { @@ -2273,5 +2273,3 @@ __STATIC_INLINE uint32_t LL_FLASH_GetSTCompanyID(void) #endif #endif /* STM32WBxx_LL_SYSTEM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_tim.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_tim.h index 1aa584d9d..d0e87f238 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_tim.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_tim.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -220,24 +219,29 @@ typedef struct uint16_t Prescaler; /*!< Specifies the prescaler value used to divide the TIM clock. This parameter can be a number between Min_Data=0x0000 and Max_Data=0xFFFF. - This feature can be modified afterwards using unitary function @ref LL_TIM_SetPrescaler().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetPrescaler().*/ uint32_t CounterMode; /*!< Specifies the counter mode. This parameter can be a value of @ref TIM_LL_EC_COUNTERMODE. - This feature can be modified afterwards using unitary function @ref LL_TIM_SetCounterMode().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetCounterMode().*/ uint32_t Autoreload; /*!< Specifies the auto reload value to be loaded into the active Auto-Reload Register at the next update event. This parameter must be a number between Min_Data=0x0000 and Max_Data=0xFFFF. - Some timer instances may support 32 bits counters. In that case this parameter must be a number between 0x0000 and 0xFFFFFFFF. + Some timer instances may support 32 bits counters. In that case this parameter must + be a number between 0x0000 and 0xFFFFFFFF. - This feature can be modified afterwards using unitary function @ref LL_TIM_SetAutoReload().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetAutoReload().*/ uint32_t ClockDivision; /*!< Specifies the clock division. This parameter can be a value of @ref TIM_LL_EC_CLOCKDIVISION. - This feature can be modified afterwards using unitary function @ref LL_TIM_SetClockDivision().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetClockDivision().*/ uint32_t RepetitionCounter; /*!< Specifies the repetition counter value. Each time the RCR downcounter reaches zero, an update event is generated and counting restarts @@ -245,10 +249,13 @@ typedef struct This means in PWM mode that (N+1) corresponds to: - the number of PWM periods in edge-aligned mode - the number of half PWM period in center-aligned mode - GP timers: this parameter must be a number between Min_Data = 0x00 and Max_Data = 0xFF. - Advanced timers: this parameter must be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF. + GP timers: this parameter must be a number between Min_Data = 0x00 and + Max_Data = 0xFF. + Advanced timers: this parameter must be a number between Min_Data = 0x0000 and + Max_Data = 0xFFFF. - This feature can be modified afterwards using unitary function @ref LL_TIM_SetRepetitionCounter().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetRepetitionCounter().*/ } LL_TIM_InitTypeDef; /** @@ -259,43 +266,51 @@ typedef struct uint32_t OCMode; /*!< Specifies the output mode. This parameter can be a value of @ref TIM_LL_EC_OCMODE. - This feature can be modified afterwards using unitary function @ref LL_TIM_OC_SetMode().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_OC_SetMode().*/ uint32_t OCState; /*!< Specifies the TIM Output Compare state. This parameter can be a value of @ref TIM_LL_EC_OCSTATE. - This feature can be modified afterwards using unitary functions @ref LL_TIM_CC_EnableChannel() or @ref LL_TIM_CC_DisableChannel().*/ + This feature can be modified afterwards using unitary functions + @ref LL_TIM_CC_EnableChannel() or @ref LL_TIM_CC_DisableChannel().*/ uint32_t OCNState; /*!< Specifies the TIM complementary Output Compare state. This parameter can be a value of @ref TIM_LL_EC_OCSTATE. - This feature can be modified afterwards using unitary functions @ref LL_TIM_CC_EnableChannel() or @ref LL_TIM_CC_DisableChannel().*/ + This feature can be modified afterwards using unitary functions + @ref LL_TIM_CC_EnableChannel() or @ref LL_TIM_CC_DisableChannel().*/ uint32_t CompareValue; /*!< Specifies the Compare value to be loaded into the Capture Compare Register. This parameter can be a number between Min_Data=0x0000 and Max_Data=0xFFFF. - This feature can be modified afterwards using unitary function LL_TIM_OC_SetCompareCHx (x=1..6).*/ + This feature can be modified afterwards using unitary function + LL_TIM_OC_SetCompareCHx (x=1..6).*/ uint32_t OCPolarity; /*!< Specifies the output polarity. This parameter can be a value of @ref TIM_LL_EC_OCPOLARITY. - This feature can be modified afterwards using unitary function @ref LL_TIM_OC_SetPolarity().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_OC_SetPolarity().*/ uint32_t OCNPolarity; /*!< Specifies the complementary output polarity. This parameter can be a value of @ref TIM_LL_EC_OCPOLARITY. - This feature can be modified afterwards using unitary function @ref LL_TIM_OC_SetPolarity().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_OC_SetPolarity().*/ uint32_t OCIdleState; /*!< Specifies the TIM Output Compare pin state during Idle state. This parameter can be a value of @ref TIM_LL_EC_OCIDLESTATE. - This feature can be modified afterwards using unitary function @ref LL_TIM_OC_SetIdleState().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_OC_SetIdleState().*/ uint32_t OCNIdleState; /*!< Specifies the TIM Output Compare pin state during Idle state. This parameter can be a value of @ref TIM_LL_EC_OCIDLESTATE. - This feature can be modified afterwards using unitary function @ref LL_TIM_OC_SetIdleState().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_OC_SetIdleState().*/ } LL_TIM_OC_InitTypeDef; /** @@ -308,22 +323,26 @@ typedef struct uint32_t ICPolarity; /*!< Specifies the active edge of the input signal. This parameter can be a value of @ref TIM_LL_EC_IC_POLARITY. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPolarity().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPolarity().*/ uint32_t ICActiveInput; /*!< Specifies the input. This parameter can be a value of @ref TIM_LL_EC_ACTIVEINPUT. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetActiveInput().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetActiveInput().*/ uint32_t ICPrescaler; /*!< Specifies the Input Capture Prescaler. This parameter can be a value of @ref TIM_LL_EC_ICPSC. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPrescaler().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPrescaler().*/ uint32_t ICFilter; /*!< Specifies the input capture filter. This parameter can be a value of @ref TIM_LL_EC_IC_FILTER. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetFilter().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetFilter().*/ } LL_TIM_IC_InitTypeDef; @@ -335,47 +354,56 @@ typedef struct uint32_t EncoderMode; /*!< Specifies the encoder resolution (x2 or x4). This parameter can be a value of @ref TIM_LL_EC_ENCODERMODE. - This feature can be modified afterwards using unitary function @ref LL_TIM_SetEncoderMode().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetEncoderMode().*/ uint32_t IC1Polarity; /*!< Specifies the active edge of TI1 input. This parameter can be a value of @ref TIM_LL_EC_IC_POLARITY. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPolarity().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPolarity().*/ uint32_t IC1ActiveInput; /*!< Specifies the TI1 input source This parameter can be a value of @ref TIM_LL_EC_ACTIVEINPUT. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetActiveInput().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetActiveInput().*/ uint32_t IC1Prescaler; /*!< Specifies the TI1 input prescaler value. This parameter can be a value of @ref TIM_LL_EC_ICPSC. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPrescaler().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPrescaler().*/ uint32_t IC1Filter; /*!< Specifies the TI1 input filter. This parameter can be a value of @ref TIM_LL_EC_IC_FILTER. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetFilter().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetFilter().*/ uint32_t IC2Polarity; /*!< Specifies the active edge of TI2 input. This parameter can be a value of @ref TIM_LL_EC_IC_POLARITY. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPolarity().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPolarity().*/ uint32_t IC2ActiveInput; /*!< Specifies the TI2 input source This parameter can be a value of @ref TIM_LL_EC_ACTIVEINPUT. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetActiveInput().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetActiveInput().*/ uint32_t IC2Prescaler; /*!< Specifies the TI2 input prescaler value. This parameter can be a value of @ref TIM_LL_EC_ICPSC. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPrescaler().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPrescaler().*/ uint32_t IC2Filter; /*!< Specifies the TI2 input filter. This parameter can be a value of @ref TIM_LL_EC_IC_FILTER. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetFilter().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetFilter().*/ } LL_TIM_ENCODER_InitTypeDef; @@ -388,26 +416,31 @@ typedef struct uint32_t IC1Polarity; /*!< Specifies the active edge of TI1 input. This parameter can be a value of @ref TIM_LL_EC_IC_POLARITY. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPolarity().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPolarity().*/ uint32_t IC1Prescaler; /*!< Specifies the TI1 input prescaler value. Prescaler must be set to get a maximum counter period longer than the time interval between 2 consecutive changes on the Hall inputs. This parameter can be a value of @ref TIM_LL_EC_ICPSC. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetPrescaler().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetPrescaler().*/ uint32_t IC1Filter; /*!< Specifies the TI1 input filter. - This parameter can be a value of @ref TIM_LL_EC_IC_FILTER. + This parameter can be a value of + @ref TIM_LL_EC_IC_FILTER. - This feature can be modified afterwards using unitary function @ref LL_TIM_IC_SetFilter().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_IC_SetFilter().*/ uint32_t CommutationDelay; /*!< Specifies the compare value to be loaded into the Capture Compare Register. A positive pulse (TRGO event) is generated with a programmable delay every time a change occurs on the Hall inputs. This parameter can be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF. - This feature can be modified afterwards using unitary function @ref LL_TIM_OC_SetCompareCH2().*/ + This feature can be modified afterwards using unitary function + @ref LL_TIM_OC_SetCompareCH2().*/ } LL_TIM_HALLSENSOR_InitTypeDef; /** @@ -418,97 +451,121 @@ typedef struct uint32_t OSSRState; /*!< Specifies the Off-State selection used in Run mode. This parameter can be a value of @ref TIM_LL_EC_OSSR - This feature can be modified afterwards using unitary function @ref LL_TIM_SetOffStates() + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetOffStates() - @note This bit-field cannot be modified as long as LOCK level 2 has been programmed. */ + @note This bit-field cannot be modified as long as LOCK level 2 has been + programmed. */ uint32_t OSSIState; /*!< Specifies the Off-State used in Idle state. This parameter can be a value of @ref TIM_LL_EC_OSSI - This feature can be modified afterwards using unitary function @ref LL_TIM_SetOffStates() + This feature can be modified afterwards using unitary function + @ref LL_TIM_SetOffStates() - @note This bit-field cannot be modified as long as LOCK level 2 has been programmed. */ + @note This bit-field cannot be modified as long as LOCK level 2 has been + programmed. */ uint32_t LockLevel; /*!< Specifies the LOCK level parameters. This parameter can be a value of @ref TIM_LL_EC_LOCKLEVEL - @note The LOCK bits can be written only once after the reset. Once the TIMx_BDTR register - has been written, their content is frozen until the next reset.*/ + @note The LOCK bits can be written only once after the reset. Once the TIMx_BDTR + register has been written, their content is frozen until the next reset.*/ uint8_t DeadTime; /*!< Specifies the delay time between the switching-off and the switching-on of the outputs. This parameter can be a number between Min_Data = 0x00 and Max_Data = 0xFF. - This feature can be modified afterwards using unitary function @ref LL_TIM_OC_SetDeadTime() + This feature can be modified afterwards using unitary function + @ref LL_TIM_OC_SetDeadTime() - @note This bit-field can not be modified as long as LOCK level 1, 2 or 3 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1, 2 or 3 has been + programmed. */ uint16_t BreakState; /*!< Specifies whether the TIM Break input is enabled or not. This parameter can be a value of @ref TIM_LL_EC_BREAK_ENABLE - This feature can be modified afterwards using unitary functions @ref LL_TIM_EnableBRK() or @ref LL_TIM_DisableBRK() + This feature can be modified afterwards using unitary functions + @ref LL_TIM_EnableBRK() or @ref LL_TIM_DisableBRK() - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t BreakPolarity; /*!< Specifies the TIM Break Input pin polarity. This parameter can be a value of @ref TIM_LL_EC_BREAK_POLARITY - This feature can be modified afterwards using unitary function @ref LL_TIM_ConfigBRK() + This feature can be modified afterwards using unitary function + @ref LL_TIM_ConfigBRK() - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t BreakFilter; /*!< Specifies the TIM Break Filter. This parameter can be a value of @ref TIM_LL_EC_BREAK_FILTER - This feature can be modified afterwards using unitary function @ref LL_TIM_ConfigBRK() + This feature can be modified afterwards using unitary function + @ref LL_TIM_ConfigBRK() - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t BreakAFMode; /*!< Specifies the alternate function mode of the break input. This parameter can be a value of @ref TIM_LL_EC_BREAK_AFMODE - This feature can be modified afterwards using unitary functions @ref LL_TIM_ConfigBRK() + This feature can be modified afterwards using unitary functions + @ref LL_TIM_ConfigBRK() @note Bidirectional break input is only supported by advanced timers instances. - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t Break2State; /*!< Specifies whether the TIM Break2 input is enabled or not. This parameter can be a value of @ref TIM_LL_EC_BREAK2_ENABLE - This feature can be modified afterwards using unitary functions @ref LL_TIM_EnableBRK2() or @ref LL_TIM_DisableBRK2() + This feature can be modified afterwards using unitary functions + @ref LL_TIM_EnableBRK2() or @ref LL_TIM_DisableBRK2() - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t Break2Polarity; /*!< Specifies the TIM Break2 Input pin polarity. This parameter can be a value of @ref TIM_LL_EC_BREAK2_POLARITY - This feature can be modified afterwards using unitary function @ref LL_TIM_ConfigBRK2() + This feature can be modified afterwards using unitary function + @ref LL_TIM_ConfigBRK2() - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t Break2Filter; /*!< Specifies the TIM Break2 Filter. This parameter can be a value of @ref TIM_LL_EC_BREAK2_FILTER - This feature can be modified afterwards using unitary function @ref LL_TIM_ConfigBRK2() + This feature can be modified afterwards using unitary function + @ref LL_TIM_ConfigBRK2() - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t Break2AFMode; /*!< Specifies the alternate function mode of the break2 input. This parameter can be a value of @ref TIM_LL_EC_BREAK2_AFMODE - This feature can be modified afterwards using unitary functions @ref LL_TIM_ConfigBRK2() + This feature can be modified afterwards using unitary functions + @ref LL_TIM_ConfigBRK2() @note Bidirectional break input is only supported by advanced timers instances. - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ uint32_t AutomaticOutput; /*!< Specifies whether the TIM Automatic Output feature is enabled or not. This parameter can be a value of @ref TIM_LL_EC_AUTOMATICOUTPUT_ENABLE - This feature can be modified afterwards using unitary functions @ref LL_TIM_EnableAutomaticOutput() or @ref LL_TIM_DisableAutomaticOutput() + This feature can be modified afterwards using unitary functions + @ref LL_TIM_EnableAutomaticOutput() or @ref LL_TIM_DisableAutomaticOutput() - @note This bit-field can not be modified as long as LOCK level 1 has been programmed. */ + @note This bit-field can not be modified as long as LOCK level 1 has been + programmed. */ } LL_TIM_BDTR_InitTypeDef; /** @@ -1297,10 +1354,17 @@ typedef struct * @retval DTG[0:7] */ #define __LL_TIM_CALC_DEADTIME(__TIMCLK__, __CKD__, __DT__) \ - ( (((uint64_t)((__DT__)*1000U)) < ((DT_DELAY_1+1U) * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? (uint8_t)(((uint64_t)((__DT__)*1000U) / TIM_CALC_DTS((__TIMCLK__), (__CKD__))) & DT_DELAY_1) : \ - (((uint64_t)((__DT__)*1000U)) < ((64U + (DT_DELAY_2+1U)) * 2U * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? (uint8_t)(DT_RANGE_2 | ((uint8_t)((uint8_t)((((uint64_t)((__DT__)*1000U))/ TIM_CALC_DTS((__TIMCLK__), (__CKD__))) >> 1U) - (uint8_t) 64) & DT_DELAY_2)) :\ - (((uint64_t)((__DT__)*1000U)) < ((32U + (DT_DELAY_3+1U)) * 8U * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? (uint8_t)(DT_RANGE_3 | ((uint8_t)((uint8_t)(((((uint64_t)(__DT__)*1000U))/ TIM_CALC_DTS((__TIMCLK__), (__CKD__))) >> 3U) - (uint8_t) 32) & DT_DELAY_3)) :\ - (((uint64_t)((__DT__)*1000U)) < ((32U + (DT_DELAY_4+1U)) * 16U * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? (uint8_t)(DT_RANGE_4 | ((uint8_t)((uint8_t)(((((uint64_t)(__DT__)*1000U))/ TIM_CALC_DTS((__TIMCLK__), (__CKD__))) >> 4U) - (uint8_t) 32) & DT_DELAY_4)) :\ + ( (((uint64_t)((__DT__)*1000U)) < ((DT_DELAY_1+1U) * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? \ + (uint8_t)(((uint64_t)((__DT__)*1000U) / TIM_CALC_DTS((__TIMCLK__), (__CKD__))) & DT_DELAY_1) : \ + (((uint64_t)((__DT__)*1000U)) < ((64U + (DT_DELAY_2+1U)) * 2U * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? \ + (uint8_t)(DT_RANGE_2 | ((uint8_t)((uint8_t)((((uint64_t)((__DT__)*1000U))/ TIM_CALC_DTS((__TIMCLK__), \ + (__CKD__))) >> 1U) - (uint8_t) 64) & DT_DELAY_2)) :\ + (((uint64_t)((__DT__)*1000U)) < ((32U + (DT_DELAY_3+1U)) * 8U * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? \ + (uint8_t)(DT_RANGE_3 | ((uint8_t)((uint8_t)(((((uint64_t)(__DT__)*1000U))/ TIM_CALC_DTS((__TIMCLK__), \ + (__CKD__))) >> 3U) - (uint8_t) 32) & DT_DELAY_3)) :\ + (((uint64_t)((__DT__)*1000U)) < ((32U + (DT_DELAY_4+1U)) * 16U * TIM_CALC_DTS((__TIMCLK__), (__CKD__)))) ? \ + (uint8_t)(DT_RANGE_4 | ((uint8_t)((uint8_t)(((((uint64_t)(__DT__)*1000U))/ TIM_CALC_DTS((__TIMCLK__), \ + (__CKD__))) >> 4U) - (uint8_t) 32) & DT_DELAY_4)) :\ 0U) /** @@ -1325,7 +1389,8 @@ typedef struct ((((__TIMCLK__)/((__PSC__) + 1U)) >= (__FREQ__)) ? (((__TIMCLK__)/((__FREQ__) * ((__PSC__) + 1U))) - 1U) : 0U) /** - * @brief HELPER macro calculating the compare value required to achieve the required timer output compare active/inactive delay. + * @brief HELPER macro calculating the compare value required to achieve the required timer output compare + * active/inactive delay. * @note ex: @ref __LL_TIM_CALC_DELAY (1000000, @ref LL_TIM_GetPrescaler (), 10); * @param __TIMCLK__ timer input clock frequency (in Hz) * @param __PSC__ prescaler @@ -1337,7 +1402,8 @@ typedef struct / ((uint64_t)1000000U * (uint64_t)((__PSC__) + 1U)))) /** - * @brief HELPER macro calculating the auto-reload value to achieve the required pulse duration (when the timer operates in one pulse mode). + * @brief HELPER macro calculating the auto-reload value to achieve the required pulse duration + * (when the timer operates in one pulse mode). * @note ex: @ref __LL_TIM_CALC_PULSE (1000000, @ref LL_TIM_GetPrescaler (), 10, 20); * @param __TIMCLK__ timer input clock frequency (in Hz) * @param __PSC__ prescaler @@ -1594,7 +1660,8 @@ __STATIC_INLINE uint32_t LL_TIM_IsEnabledARRPreload(TIM_TypeDef *TIMx) } /** - * @brief Set the division ratio between the timer clock and the sampling clock used by the dead-time generators (when supported) and the digital filters. + * @brief Set the division ratio between the timer clock and the sampling clock used by the dead-time generators + * (when supported) and the digital filters. * @note Macro IS_TIM_CLOCK_DIVISION_INSTANCE(TIMx) can be used to check * whether or not the clock division feature is supported by the timer * instance. @@ -1612,7 +1679,8 @@ __STATIC_INLINE void LL_TIM_SetClockDivision(TIM_TypeDef *TIMx, uint32_t ClockDi } /** - * @brief Get the actual division ratio between the timer clock and the sampling clock used by the dead-time generators (when supported) and the digital filters. + * @brief Get the actual division ratio between the timer clock and the sampling clock used by the dead-time + * generators (when supported) and the digital filters. * @note Macro IS_TIM_CLOCK_DIVISION_INSTANCE(TIMx) can be used to check * whether or not the clock division feature is supported by the timer * instance. @@ -1754,7 +1822,8 @@ __STATIC_INLINE uint32_t LL_TIM_GetRepetitionCounter(TIM_TypeDef *TIMx) /** * @brief Force a continuous copy of the update interrupt flag (UIF) into the timer counter register (bit 31). - * @note This allows both the counter value and a potential roll-over condition signalled by the UIFCPY flag to be read in an atomic way. + * @note This allows both the counter value and a potential roll-over condition signalled by the UIFCPY flag to be read + * in an atomic way. * @rmtoll CR1 UIFREMAP LL_TIM_EnableUIFRemap * @param TIMx Timer instance * @retval None @@ -2059,7 +2128,7 @@ __STATIC_INLINE void LL_TIM_OC_SetMode(TIM_TypeDef *TIMx, uint32_t Channel, uint { uint8_t iChannel = TIM_GET_CHANNEL_INDEX(Channel); __IO uint32_t *pReg = (__IO uint32_t *)((uint32_t)((uint32_t)(&TIMx->CCMR1) + OFFSET_TAB_CCMRx[iChannel])); - MODIFY_REG(*pReg, ((TIM_CCMR1_OC1M | TIM_CCMR1_CC1S) << SHIFT_TAB_OCxx[iChannel]), Mode << SHIFT_TAB_OCxx[iChannel]); + MODIFY_REG(*pReg, ((TIM_CCMR1_OC1M | TIM_CCMR1_CC1S) << SHIFT_TAB_OCxx[iChannel]), Mode << SHIFT_TAB_OCxx[iChannel]); } /** @@ -2098,7 +2167,7 @@ __STATIC_INLINE uint32_t LL_TIM_OC_GetMode(TIM_TypeDef *TIMx, uint32_t Channel) { uint8_t iChannel = TIM_GET_CHANNEL_INDEX(Channel); const __IO uint32_t *pReg = (__IO uint32_t *)((uint32_t)((uint32_t)(&TIMx->CCMR1) + OFFSET_TAB_CCMRx[iChannel])); - return (READ_BIT(*pReg, ((TIM_CCMR1_OC1M | TIM_CCMR1_CC1S) << SHIFT_TAB_OCxx[iChannel])) >> SHIFT_TAB_OCxx[iChannel]); + return (READ_BIT(*pReg, ((TIM_CCMR1_OC1M | TIM_CCMR1_CC1S) << SHIFT_TAB_OCxx[iChannel])) >> SHIFT_TAB_OCxx[iChannel]); } /** @@ -2476,7 +2545,8 @@ __STATIC_INLINE uint32_t LL_TIM_OC_IsEnabledClear(TIM_TypeDef *TIMx, uint32_t Ch } /** - * @brief Set the dead-time delay (delay inserted between the rising edge of the OCxREF signal and the rising edge of the Ocx and OCxN signals). + * @brief Set the dead-time delay (delay inserted between the rising edge of the OCxREF signal and the rising edge of + * the Ocx and OCxN signals). * @note Macro IS_TIM_BREAK_INSTANCE(TIMx) can be used to check whether or not * dead-time insertion feature is supported by a timer instance. * @note Helper macro @ref __LL_TIM_CALC_DEADTIME can be used to calculate the DeadTime parameter @@ -2743,7 +2813,8 @@ __STATIC_INLINE void LL_TIM_IC_Config(TIM_TypeDef *TIMx, uint32_t Channel, uint3 uint8_t iChannel = TIM_GET_CHANNEL_INDEX(Channel); __IO uint32_t *pReg = (__IO uint32_t *)((uint32_t)((uint32_t)(&TIMx->CCMR1) + OFFSET_TAB_CCMRx[iChannel])); MODIFY_REG(*pReg, ((TIM_CCMR1_IC1F | TIM_CCMR1_IC1PSC | TIM_CCMR1_CC1S) << SHIFT_TAB_ICxx[iChannel]), - ((Configuration >> 16U) & (TIM_CCMR1_IC1F | TIM_CCMR1_IC1PSC | TIM_CCMR1_CC1S)) << SHIFT_TAB_ICxx[iChannel]); + ((Configuration >> 16U) & (TIM_CCMR1_IC1F | TIM_CCMR1_IC1PSC | TIM_CCMR1_CC1S)) \ + << SHIFT_TAB_ICxx[iChannel]); MODIFY_REG(TIMx->CCER, ((TIM_CCER_CC1NP | TIM_CCER_CC1P) << SHIFT_TAB_CCxP[iChannel]), (Configuration & (TIM_CCER_CC1NP | TIM_CCER_CC1P)) << SHIFT_TAB_CCxP[iChannel]); } @@ -3809,11 +3880,11 @@ __STATIC_INLINE void LL_TIM_SetBreakInputSourcePolarity(TIM_TypeDef *TIMx, uint3 * @arg @ref LL_TIM_DMABURST_BASEADDR_CCR4 * @arg @ref LL_TIM_DMABURST_BASEADDR_BDTR * @arg @ref LL_TIM_DMABURST_BASEADDR_OR - * @arg @ref LL_TIM_DMABURST_BASEADDR_CCMR3 - * @arg @ref LL_TIM_DMABURST_BASEADDR_CCR5 - * @arg @ref LL_TIM_DMABURST_BASEADDR_CCR6 - * @arg @ref LL_TIM_DMABURST_BASEADDR_AF1 - * @arg @ref LL_TIM_DMABURST_BASEADDR_AF2 + * @arg @ref LL_TIM_DMABURST_BASEADDR_CCMR3 + * @arg @ref LL_TIM_DMABURST_BASEADDR_CCR5 + * @arg @ref LL_TIM_DMABURST_BASEADDR_CCR6 + * @arg @ref LL_TIM_DMABURST_BASEADDR_AF1 + * @arg @ref LL_TIM_DMABURST_BASEADDR_AF2 * @param DMABurstLength This parameter can be one of the following values: * @arg @ref LL_TIM_DMABURST_LENGTH_1TRANSFER * @arg @ref LL_TIM_DMABURST_LENGTH_2TRANSFERS @@ -4200,7 +4271,8 @@ __STATIC_INLINE void LL_TIM_ClearFlag_CC1OVR(TIM_TypeDef *TIMx) } /** - * @brief Indicate whether Capture/Compare 1 over-capture interrupt flag (CC1OF) is set (Capture/Compare 1 interrupt is pending). + * @brief Indicate whether Capture/Compare 1 over-capture interrupt flag (CC1OF) is set + * (Capture/Compare 1 interrupt is pending). * @rmtoll SR CC1OF LL_TIM_IsActiveFlag_CC1OVR * @param TIMx Timer instance * @retval State of bit (1 or 0). @@ -4222,7 +4294,8 @@ __STATIC_INLINE void LL_TIM_ClearFlag_CC2OVR(TIM_TypeDef *TIMx) } /** - * @brief Indicate whether Capture/Compare 2 over-capture interrupt flag (CC2OF) is set (Capture/Compare 2 over-capture interrupt is pending). + * @brief Indicate whether Capture/Compare 2 over-capture interrupt flag (CC2OF) is set + * (Capture/Compare 2 over-capture interrupt is pending). * @rmtoll SR CC2OF LL_TIM_IsActiveFlag_CC2OVR * @param TIMx Timer instance * @retval State of bit (1 or 0). @@ -4244,7 +4317,8 @@ __STATIC_INLINE void LL_TIM_ClearFlag_CC3OVR(TIM_TypeDef *TIMx) } /** - * @brief Indicate whether Capture/Compare 3 over-capture interrupt flag (CC3OF) is set (Capture/Compare 3 over-capture interrupt is pending). + * @brief Indicate whether Capture/Compare 3 over-capture interrupt flag (CC3OF) is set + * (Capture/Compare 3 over-capture interrupt is pending). * @rmtoll SR CC3OF LL_TIM_IsActiveFlag_CC3OVR * @param TIMx Timer instance * @retval State of bit (1 or 0). @@ -4266,7 +4340,8 @@ __STATIC_INLINE void LL_TIM_ClearFlag_CC4OVR(TIM_TypeDef *TIMx) } /** - * @brief Indicate whether Capture/Compare 4 over-capture interrupt flag (CC4OF) is set (Capture/Compare 4 over-capture interrupt is pending). + * @brief Indicate whether Capture/Compare 4 over-capture interrupt flag (CC4OF) is set + * (Capture/Compare 4 over-capture interrupt is pending). * @rmtoll SR CC4OF LL_TIM_IsActiveFlag_CC4OVR * @param TIMx Timer instance * @retval State of bit (1 or 0). @@ -4573,7 +4648,7 @@ __STATIC_INLINE uint32_t LL_TIM_IsEnabledIT_BRK(TIM_TypeDef *TIMx) * @} */ -/** @defgroup TIM_LL_EF_DMA_Management DMA-Management +/** @defgroup TIM_LL_EF_DMA_Management DMA Management * @{ */ /** @@ -4959,4 +5034,3 @@ ErrorStatus LL_TIM_BDTR_Init(TIM_TypeDef *TIMx, LL_TIM_BDTR_InitTypeDef *TIM_BDT #endif #endif /* __STM32WBxx_LL_TIM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usart.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usart.h index 3dd3bfab6..9a6b9e8d2 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usart.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usart.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -4386,4 +4385,3 @@ void LL_USART_ClockStructInit(LL_USART_ClockInitTypeDef *USART_ClockInitS #endif /* STM32WBxx_LL_USART_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usb.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usb.h index c328c7d18..37d3fb4bf 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usb.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_usb.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -23,7 +22,7 @@ #ifdef __cplusplus extern "C" { -#endif +#endif /* __cplusplus */ /* Includes ------------------------------------------------------------------*/ #include "stm32wbxx_hal_def.h" @@ -168,6 +167,10 @@ typedef struct #define PMA_ACCESS 1U #define EP_ADDR_MSK 0x7U + +#ifndef USE_USB_DOUBLE_BUFFER +#define USE_USB_DOUBLE_BUFFER 1U +#endif /* USE_USB_DOUBLE_BUFFER */ /** * @} */ @@ -195,7 +198,7 @@ HAL_StatusTypeDef USB_DeactivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep); HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep); HAL_StatusTypeDef USB_EPSetStall(USB_TypeDef *USBx, USB_EPTypeDef *ep); HAL_StatusTypeDef USB_EPClearStall(USB_TypeDef *USBx, USB_EPTypeDef *ep); -#endif +#endif /* defined (HAL_PCD_MODULE_ENABLED) */ HAL_StatusTypeDef USB_SetDevAddress(USB_TypeDef *USBx, uint8_t address); HAL_StatusTypeDef USB_DevConnect(USB_TypeDef *USBx); @@ -230,9 +233,7 @@ void USB_ReadPMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, #ifdef __cplusplus } -#endif +#endif /* __cplusplus */ #endif /* STM32WBxx_LL_USB_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_utils.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_utils.h index 927ff6550..4fc5054a6 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_utils.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_utils.h @@ -3,6 +3,17 @@ * @file stm32wbxx_ll_utils.h * @author MCD Application Team * @brief Header file of UTILS LL module. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -16,17 +27,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -310,5 +310,3 @@ ErrorStatus LL_PLL_ConfigSystemClock_HSE(uint32_t HSEBypass, #endif #endif /* STM32WBxx_LL_UTILS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_wwdg.h b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_wwdg.h index 5bc7d87cf..401821a60 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_wwdg.h +++ b/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_wwdg.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -327,5 +326,3 @@ __STATIC_INLINE uint32_t LL_WWDG_IsEnabledIT_EWKUP(WWDG_TypeDef *WWDGx) #endif #endif /* STM32WBxx_LL_WWDG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/README.md b/Drivers/STM32WBxx_HAL_Driver/README.md index e00492b44..144abc536 100644 --- a/Drivers/STM32WBxx_HAL_Driver/README.md +++ b/Drivers/STM32WBxx_HAL_Driver/README.md @@ -21,12 +21,6 @@ Two models of publication are proposed for the STM32Cube embedded software: This **stm32wbxx_hal_driver** MCU component repo is one element of the STM32CubeWB MCU embedded software package, providing the **HAL-LL Drivers** part. -## License - -Copyright (c) 2019 STMicroelectronics. - -This software component is licensed by STMicroelectronics under BSD-3-Clause license. You may not use this software except in compliance with the License. -You may obtain a copy of the License [here](https://opensource.org/licenses/BSD-3-Clause). ## Release note @@ -47,9 +41,10 @@ Tag v1.3.0 | Tag v1.3.0 | Tag v5.4.0_cm4 | Tag v1.3.0 (and following, if Tag v1.4.0 | Tag v1.3.0 | Tag v5.4.0_cm4 | Tag v1.4.0 (and following, if any, till next tag) Tag v1.5.0 | Tag v1.4.0 | Tag v5.4.0_cm4 | Tag v1.5.0 (and following, if any, till next tag) Tag v1.6.0 | Tag v1.5.0 | Tag v5.4.0_cm4 | Tag v1.8.0 (and following, if any, till next tag) -Tag v1.7.0 | Tag v1.7.0 | Tag v5.4.0_cm4 | Tag v1.10.0 (and following, if any, till next tag) -Tag v1.8.0 | Tag v1.8.0 | Tag v5.4.0_cm4 | Tag v1.11.0 (and following, if any, till next tag) -Tag v1.9.0 | Tag v1.9.0 | Tag v5.4.0_cm4 | Tag v1.12.0 (and following, if any, till next tag) +Tag v1.7.0 | Tag v1.7.0 | Tag v5.6.0_cm4 | Tag v1.10.0 (and following, if any, till next tag) +Tag v1.8.0 | Tag v1.8.0 | Tag v5.6.0_cm4 | Tag v1.11.0 (and following, if any, till next tag) +Tag v1.9.0 | Tag v1.9.0 | Tag v5.6.0_cm4 | Tag v1.12.0 (and following, if any, till next tag) +Tag v1.10.0 | Tag v1.10.0 | Tag v5.6.0_cm4 | Tag v1.13.0 (and following, if any, till next tag) The full **STM32CubeWB** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeWB). diff --git a/Drivers/STM32WBxx_HAL_Driver/Release_Notes.html b/Drivers/STM32WBxx_HAL_Driver/Release_Notes.html index 8080f5386..bc55c883a 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Release_Notes.html +++ b/Drivers/STM32WBxx_HAL_Driver/Release_Notes.html @@ -40,11 +40,111 @@

                    Update History

                    - +

                    Main Changes

                    • Maintenance release of HAL and Low Layer drivers to include latest corrections
                      • +
                    • All source files: update disclaimer to add reference to the new license agreement
                      • +
                    • Correct English spelling errors and typos
                      • +
                    +

                    Contents

                    +

                    HAL Drivers updates

                    +
                      +
                    • HAL ADC driver +
                        +
                      • Enhance ADC calibration to reduce noise effect
                        • +
                      • +
                    • HAL GPIO driver +
                        +
                      • Reorder EXTI configuration sequence in order to avoid unexpected level detection
                        • +
                      • +
                    • HAL I2C driver +
                        +
                      • Update I2C_TransferConfig() function to avoid write to reserved bit 28 in I2C_CR2 register
                        • +
                      • Update header description of I2C_WaitOnFlagUntilTimeout() function
                        • +
                      • Update driver to handle errors in polling mode
                        • +
                      • Update I2C_IsAcknowledgeFailed() API to avoid I2C in busy state if NACK received after transmitting register address
                        • +
                      • Rename I2C_IsAcknowledgeFailed() to I2C_IsErrorOccurred() and correctly manage when error occurs
                        • +
                      • +
                    • HAL IRDA driver +
                        +
                      • Improve description of IRDA_WaitOnFlagUntilTimeout() function header
                        • +
                      • +
                    • HAL IWDG driver +
                        +
                      • Fix HAL_GetTick() timeout vulnerability
                        • +
                      • Update HAL_IWDG_DEFAULT_TIMEOUT value to take into account LSI startup time
                        • +
                      • +
                    • HAL LPTIM driver +
                        +
                      • Add check on PRIMASK register to prevent from enabling unwanted global interrupts within LPTIM_Disable() and LL_LPTIM_Disable() funstions
                        • +
                      • +
                    • HAL PKA driver +
                        +
                      • Fix Incorrect length for R and S in HAL_PKA_ECDSASign_GetResult() function
                        • +
                      • +
                    • HAL RCC driver +
                        +
                      • Enhance RCC_MCOx in order to support both MCO number and AF mapping
                        • +
                      • Add missing RCC_RNGCLKSOURCE_PLLSAI1 in RNG clock sources
                        • +
                      • +
                    • HAL SMARTCARD driver +
                        +
                      • Improve description of SMARTCARD_WaitOnFlagUntilTimeout() function header
                        • +
                      • +
                    • HAL SMBUS driver +
                        +
                      • Add new APIs: +
                          +
                        • HAL_SMBUSEx_EnableWakeUp()
                          • +
                        • HAL_SMBUSEx_DisableWakeUp()
                          • +
                        • +
                      • +
                    • HAL TIM driver +
                        +
                      • Reorder function calls in HAL_TIM_IC_Start_DMA() and HAL_TIM_Encoder_Start_DMA() functions to enable the timer when configuration is done
                        • +
                      • +
                    • HAL UART driver +
                        +
                      • Improve description of UART_WaitOnFlagUntilTimeout() function header
                        • +
                      • +
                    • HAL USART driver +
                        +
                      • Improve description of USART_WaitOnFlagUntilTimeout() function header
                        • +
                      • +
                    • HAL WWDG driver +
                        +
                      • Remove non UTF-8 characters in comments
                        • +
                      • +
                    +


                    +

                    +

                    LL Drivers updates

                    +
                      +
                    • LL ADC driver +
                        +
                      • Update LL_ADC driver to prevent unused argument compilation warning
                        • +
                      • +
                    • LL RCC driver +
                        +
                      • Add missing APIs LL_RCC_PLL_IsEnabledDomain_XXX for PLL domain outputs
                        • +
                      • Add check of PLL enable bit when a peripheral is using PPL P or PLL Q
                        • +
                      • Update driver to fix CodeSonar warnings
                        • +
                      • +
                    +


                    +

                    +

                    Backward Compatibility

                    +

                    This release is compatible with the previous versions.

                    +
                    +
                    +
                    + +
                    +

                    Main Changes

                    +
                      +
                    • Maintenance release of HAL and Low Layer drivers to include latest corrections
                    • Update of HAL SMBUS driver to introduce fast mode and fast mode plus
                      • Add extension files stm32wbxx_hal_smbus_ex.h/.c for new APIs: @@ -56,8 +156,8 @@


                      -

                      Contents

                      -

                      HAL Drivers updates

                      +

                      Contents

                      +

                      HAL Drivers updates

                      • HAL CORTEX driver
                          @@ -133,7 +233,7 @@


                        -

                        LL Drivers updates

                        +

                        LL Drivers updates

                        • LL DMA driver
                            @@ -160,14 +260,14 @@


                          -

                          Backward Compatibility

                          +

                          Backward Compatibility

                          This release is compatible with the previous versions.

                    -

                    Main Changes

                    +

                    Main Changes

                    Add support for STM32WB15xx and STM32WB10xx

                    @@ -303,14 +403,14 @@
                    -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    -

                    Main Changes

                    +

                    Main Changes

                    Maitenance release

                    All peripheral

                    @@ -383,14 +483,14 @@
                    -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    -

                    Main Changes

                    +

                    Main Changes

                    Maitenance release

                    All peripheral

                    @@ -495,14 +595,14 @@
                    -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    -

                    Main Changes

                    +

                    Main Changes

                    Introduction of STM32WB5M, STM32WB35xx and STM32WB30xx product

                    This release introduce the support of STM32WB5Mxx, STM32WB35xx product and its value line STM32WB30xx.

                    Added features:

                    @@ -547,14 +647,14 @@ -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    -

                    Main Changes

                    +

                    Main Changes

                    Maitenance release

                    @@ -598,7 +698,7 @@
                    -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    Dependencies

                    This software release is compatible with:

                    @@ -608,7 +708,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Maitenance release

                    @@ -680,7 +780,7 @@
                    -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    Dependencies

                    This software release is compatible with:

                    @@ -690,7 +790,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    STM32WB50xx introduction and maintenance release

                    First release for STM32WBxx HAL drivers introducing stm32wb50xx devices.

                    @@ -759,7 +859,7 @@
                    -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    Dependencies

                    This software release is compatible with:

                    @@ -769,7 +869,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    Maintenance release

                    Maintenance release of HAL and Low layers drivers supporting STM32WB55xx devices.

                    @@ -823,7 +923,7 @@
                    -

                    Backward Compatibility

                    +

                    Backward Compatibility

                    This release is compatible with the previous versions.

                    Dependencies

                    This software release is compatible with:

                    @@ -833,7 +933,7 @@
                    -

                    Main Changes

                    +

                    Main Changes

                    First release

                    First official release of HAL (Hardware Abstraction Layer) and LL (Low layers) drivers to support STM32WB55xx.

                    diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c index 64fb5069f..1d1d67171 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c @@ -4,7 +4,17 @@ * @author MCD Application Team * @brief HAL module driver. * This is the common part of the HAL initialization + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -19,17 +29,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -56,7 +55,7 @@ * @brief STM32WBxx HAL Driver version number */ #define __STM32WBxx_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */ -#define __STM32WBxx_HAL_VERSION_SUB1 (0x09U) /*!< [23:16] sub1 version */ +#define __STM32WBxx_HAL_VERSION_SUB1 (0x0AU) /*!< [23:16] sub1 version */ #define __STM32WBxx_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */ #define __STM32WBxx_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */ #define __STM32WBxx_HAL_VERSION ((__STM32WBxx_HAL_VERSION_MAIN << 24U)\ @@ -850,5 +849,3 @@ uint32_t HAL_SYSCFG_IsEnabledSecurityAccess(uint32_t SecurityAccess) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc.c index bd10651b6..7288fcd0e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc.c @@ -18,7 +18,17 @@ * ++ Interrupts and flags management * Other functions (extended functions) are available in file * "stm32wbxx_hal_adc_ex.c". + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### ADC peripheral features ##### @@ -284,17 +294,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -729,7 +728,7 @@ HAL_StatusTypeDef HAL_ADC_Init(ADC_HandleTypeDef *hadc) /* - Set ADC group regular sequencer to value memorized */ /* in HAL ADC handle */ /* Note: This value maybe be initialized at a unknown value, */ - /* therefore afer the first call of "HAL_ADC_Init()", */ + /* therefore after the first call of "HAL_ADC_Init()", */ /* each rank corresponding to parameter "NbrOfConversion" */ /* must be set using "HAL_ADC_ConfigChannel()". */ /* - Set sequencer scan length by clearing ranks above maximum rank */ @@ -2245,7 +2244,7 @@ HAL_StatusTypeDef HAL_ADC_Stop_DMA(ADC_HandleTypeDef *hadc) /* Disable ADC peripheral if conversions are effectively stopped */ if (tmp_hal_status == HAL_OK) { - /* Disable ADC DMA (ADC DMA configuration of continous requests is kept) */ + /* Disable ADC DMA (ADC DMA configuration of continuous requests is kept) */ #if defined (ADC_SUPPORT_2_5_MSPS) CLEAR_BIT(hadc->Instance->CFGR1, ADC_CFGR1_DMAEN); #else @@ -3993,5 +3992,3 @@ void ADC_DMAError(DMA_HandleTypeDef *hdma) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc_ex.c index 7d6a45a30..3a746cfa1 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc_ex.c @@ -17,7 +17,17 @@ * ++ ADC group injected contexts queue management (not available on devices: STM32WB10xx, STM32WB15xx) * Other functions (generic functions) are available in file * "stm32wbxx_hal_adc.c". + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim [..] (@) Sections "ADC peripheral features" and "How to use this driver" are @@ -25,17 +35,6 @@ [..] @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -127,8 +126,11 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_Start(ADC_HandleTypeDef *hadc, uint32_t { #if defined (ADC_SUPPORT_2_5_MSPS) UNUSED(SingleDiff); -#endif - + + uint32_t calibration_index; + uint32_t calibration_factor_accumulated = 0; +#endif /* ADC_SUPPORT_2_5_MSPS */ + HAL_StatusTypeDef tmp_hal_status; __IO uint32_t wait_loop_index = 0UL; @@ -160,7 +162,13 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_Start(ADC_HandleTypeDef *hadc, uint32_t /* Start ADC calibration in mode single-ended or differential */ #if defined (ADC_SUPPORT_2_5_MSPS) - LL_ADC_StartCalibration(hadc->Instance); + /* ADC calibration procedure */ + /* Note: Perform an averaging of 8 calibrations for optimized accuracy */ + for (calibration_index = 0UL; calibration_index < 8UL; calibration_index++) + { + /* Start ADC calibration */ + LL_ADC_StartCalibration(hadc->Instance); + #else LL_ADC_StartCalibration(hadc->Instance, SingleDiff); #endif /* ADC_SUPPORT_2_5_MSPS */ @@ -182,6 +190,16 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_Start(ADC_HandleTypeDef *hadc, uint32_t return HAL_ERROR; } } +#if defined (ADC_SUPPORT_2_5_MSPS) + calibration_factor_accumulated += LL_ADC_GetCalibrationFactor(hadc->Instance); + } + /* Compute average */ + calibration_factor_accumulated /= calibration_index; + /* Apply calibration factor */ + LL_ADC_Enable(hadc->Instance); + LL_ADC_SetCalibrationFactor(hadc->Instance, calibration_factor_accumulated); + LL_ADC_Disable(hadc->Instance); +#endif /* ADC_SUPPORT_2_5_MSPS */ /* Set ADC state */ ADC_STATE_CLR_SET(hadc->State, @@ -1744,5 +1762,3 @@ HAL_StatusTypeDef HAL_ADCEx_EnterADCDeepPowerDownMode(ADC_HandleTypeDef *hadc) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_comp.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_comp.c index 5a61b5d2a..2a2e82341 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_comp.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_comp.c @@ -6,11 +6,20 @@ * This file provides firmware functions to manage the following * functionalities of the COMP peripheral: * + Initialization and de-initialization functions - * + Start/Stop operation functions in polling mode - * + Start/Stop operation functions in interrupt mode (through EXTI interrupt) * + Peripheral control functions * + Peripheral state functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ================================================================================ ##### COMP Peripheral features ##### @@ -148,18 +157,6 @@ @endverbatim ****************************************************************************** - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -325,7 +322,7 @@ HAL_StatusTypeDef HAL_COMP_Init(COMP_HandleTypeDef *hcomp) COMP_CSR_BLANKING | COMP_CSR_BRGEN | COMP_CSR_SCALEN | COMP_CSR_INMESEL, tmp_csr ); -#endif +#endif /* COMP_CSR_WINMODE */ #if defined(COMP2) /* Set window mode */ @@ -1006,5 +1003,3 @@ uint32_t HAL_COMP_GetError(COMP_HandleTypeDef *hcomp) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c index c4c2c3ea8..3701c334a 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c @@ -7,7 +7,17 @@ * functionalities of the CORTEX: * + Initialization and Configuration functions * + Peripheral Control functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -63,17 +73,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -478,5 +477,3 @@ void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_Init) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc.c index 0b9d56fa8..9d229d020 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc.c @@ -9,6 +9,17 @@ * + Peripheral Control functions * + Peripheral State functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim =============================================================================== ##### How to use this driver ##### @@ -29,17 +40,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -62,8 +62,8 @@ /* Private variables ---------------------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/ /** @defgroup CRC_Private_Functions CRC Private Functions - * @{ - */ + * @{ + */ static uint32_t CRC_Handle_8(CRC_HandleTypeDef *hcrc, uint8_t pBuffer[], uint32_t BufferLength); static uint32_t CRC_Handle_16(CRC_HandleTypeDef *hcrc, uint16_t pBuffer[], uint32_t BufferLength); /** @@ -77,8 +77,8 @@ static uint32_t CRC_Handle_16(CRC_HandleTypeDef *hcrc, uint16_t pBuffer[], uint3 */ /** @defgroup CRC_Exported_Functions_Group1 Initialization and de-initialization functions - * @brief Initialization and Configuration functions. - * + * @brief Initialization and Configuration functions. + * @verbatim =============================================================================== ##### Initialization and de-initialization functions ##### @@ -250,8 +250,8 @@ __weak void HAL_CRC_MspDeInit(CRC_HandleTypeDef *hcrc) */ /** @defgroup CRC_Exported_Functions_Group2 Peripheral Control functions - * @brief management functions. - * + * @brief management functions. + * @verbatim =============================================================================== ##### Peripheral Control functions ##### @@ -385,8 +385,8 @@ uint32_t HAL_CRC_Calculate(CRC_HandleTypeDef *hcrc, uint32_t pBuffer[], uint32_t */ /** @defgroup CRC_Exported_Functions_Group3 Peripheral State functions - * @brief Peripheral State functions. - * + * @brief Peripheral State functions. + * @verbatim =============================================================================== ##### Peripheral State functions ##### @@ -418,8 +418,8 @@ HAL_CRC_StateTypeDef HAL_CRC_GetState(CRC_HandleTypeDef *hcrc) */ /** @addtogroup CRC_Private_Functions - * @{ - */ + * @{ + */ /** * @brief Enter 8-bit input data to the CRC calculator. @@ -514,5 +514,3 @@ static uint32_t CRC_Handle_16(CRC_HandleTypeDef *hcrc, uint16_t pBuffer[], uint3 /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc_ex.c index 9e00c6ea7..98352037e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_crc_ex.c @@ -6,27 +6,27 @@ * This file provides firmware functions to manage the extended * functionalities of the CRC peripheral. * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ================================================================================ ##### How to use this driver ##### ================================================================================ [..] - (+) Set user-defined generating polynomial thru HAL_CRCEx_Polynomial_Set() + (+) Set user-defined generating polynomial through HAL_CRCEx_Polynomial_Set() (+) Configure Input or Output data inversion @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -221,5 +221,3 @@ HAL_StatusTypeDef HAL_CRCEx_Output_Data_Reverse(CRC_HandleTypeDef *hcrc, uint32_ /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp.c index a8f1eb871..d3467f624 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp.c @@ -11,6 +11,17 @@ * + CRYP IRQ handler management * + Peripheral State functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -283,17 +294,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -1209,7 +1209,7 @@ HAL_StatusTypeDef HAL_CRYP_Encrypt(CRYP_HandleTypeDef *hcryp, uint32_t *Input, u /* Check input buffer size */ assert_param(IS_CRYP_BUFFERSIZE(algo_assert, hcryp->Init.DataWidthUnit, Size)); -#endif +#endif /* USE_FULL_ASSERT */ if (hcryp->State == HAL_CRYP_STATE_READY) { @@ -1309,7 +1309,7 @@ HAL_StatusTypeDef HAL_CRYP_Decrypt(CRYP_HandleTypeDef *hcryp, uint32_t *Input, u /* Check input buffer size */ assert_param(IS_CRYP_BUFFERSIZE(algo_assert, hcryp->Init.DataWidthUnit, Size)); -#endif +#endif /* USE_FULL_ASSERT */ if (hcryp->State == HAL_CRYP_STATE_READY) { @@ -1408,7 +1408,7 @@ HAL_StatusTypeDef HAL_CRYP_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint32_t *Input /* Check input buffer size */ assert_param(IS_CRYP_BUFFERSIZE(algo_assert, hcryp->Init.DataWidthUnit, Size)); -#endif +#endif /* USE_FULL_ASSERT */ if (hcryp->State == HAL_CRYP_STATE_READY) { @@ -1518,7 +1518,7 @@ HAL_StatusTypeDef HAL_CRYP_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint32_t *Input /* Check input buffer size */ assert_param(IS_CRYP_BUFFERSIZE(algo_assert, hcryp->Init.DataWidthUnit, Size)); -#endif +#endif /* USE_FULL_ASSERT */ if (hcryp->State == HAL_CRYP_STATE_READY) { @@ -1628,7 +1628,7 @@ HAL_StatusTypeDef HAL_CRYP_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint32_t *Inpu /* Check input buffer size */ assert_param(IS_CRYP_BUFFERSIZE(algo_assert, hcryp->Init.DataWidthUnit, Size)); -#endif +#endif /* USE_FULL_ASSERT */ if (hcryp->State == HAL_CRYP_STATE_READY) { @@ -1754,7 +1754,7 @@ HAL_StatusTypeDef HAL_CRYP_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint32_t *Inpu /* Check input buffer size */ assert_param(IS_CRYP_BUFFERSIZE(algo_assert, hcryp->Init.DataWidthUnit, Size)); -#endif +#endif /* USE_FULL_ASSERT */ if (hcryp->State == HAL_CRYP_STATE_READY) { @@ -5590,4 +5590,3 @@ static void CRYP_PhaseProcessingResume(CRYP_HandleTypeDef *hcryp) /** * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp_ex.c index 963a39c48..b41b47837 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cryp_ex.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -385,5 +384,3 @@ void HAL_CRYPEx_DisableAutoKeyDerivation(CRYP_HandleTypeDef *hcryp) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c index 9148f21f9..37d0c3fbc 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c @@ -8,6 +8,17 @@ * + Initialization and de-initialization functions * + IO operation functions * + Peripheral State and errors functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -73,17 +84,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -837,9 +837,9 @@ void HAL_DMA_IRQHandler(DMA_HandleTypeDef *hdma) * @brief Register callbacks * @param hdma Pointer to a DMA_HandleTypeDef structure that contains * the configuration information for the specified DMA Channel. - * @param CallbackID User Callback identifer + * @param CallbackID User Callback identifier * a HAL_DMA_CallbackIDTypeDef ENUM as parameter. - * @param pCallback Pointer to private callbacsk function which has pointer to + * @param pCallback Pointer to private callback function which has pointer to * a DMA_HandleTypeDef structure as parameter. * @retval HAL status */ @@ -890,7 +890,7 @@ HAL_StatusTypeDef HAL_DMA_RegisterCallback(DMA_HandleTypeDef *hdma, HAL_DMA_Call * @brief UnRegister callbacks * @param hdma Pointer to a DMA_HandleTypeDef structure that contains * the configuration information for the specified DMA Channel. - * @param CallbackID User Callback identifer + * @param CallbackID User Callback identifier * a HAL_DMA_CallbackIDTypeDef ENUM as parameter. * @retval HAL status */ @@ -1116,5 +1116,3 @@ static void DMA_CalcDMAMUXRequestGenBaseAndMask(DMA_HandleTypeDef *hdma) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c index fe223c60f..87faff304 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c @@ -7,6 +7,17 @@ * functionalities of the DMA Extension peripheral: * + Extended features functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -27,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -292,5 +292,3 @@ void HAL_DMAEx_MUX_IRQHandler(DMA_HandleTypeDef *hdma) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c index 9cc3b2fab..5ce0d69c7 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c @@ -7,7 +7,17 @@ * functionalities of the General Purpose Input/Output (EXTI) peripheral: * + Initialization and de-initialization functions * + IO operation functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### EXTI Peripheral features ##### @@ -30,7 +40,7 @@ (++) Trigger request occurred (+) Exti lines 0 to 15 are linked to gpio pin number 0 to 15. Gpio port can - be selected throught multiplexer. + be selected through multiplexer. ##### How to use this driver ##### ============================================================================== @@ -68,17 +78,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -628,5 +627,3 @@ void HAL_EXTI_GenerateSWI(EXTI_HandleTypeDef *hexti) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c index 57db37d04..97d54a133 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c @@ -8,7 +8,17 @@ * + Program operations functions * + Memory Control functions * + Peripheral Errors functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * + ****************************************************************************** @verbatim ============================================================================== ##### FLASH peripheral features ##### @@ -75,17 +85,6 @@ (+) Monitor the Flash flags status @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * ****************************************************************************** */ @@ -312,7 +311,7 @@ void HAL_FLASH_IRQHandler(void) /* check operation was a program or erase */ if ((pFlash.ProcedureOnGoing & (FLASH_TYPEPROGRAM_DOUBLEWORD | FLASH_TYPEPROGRAM_FAST)) != 0U) { - /* return adress being programmed */ + /* return address being programmed */ param = pFlash.Address; } else if ((pFlash.ProcedureOnGoing & (FLASH_TYPEERASE_PAGES)) != 0U) @@ -628,6 +627,19 @@ HAL_StatusTypeDef FLASH_WaitForLastOperation(uint32_t Timeout) __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP); } + /* Workaround for BZ 70309 : + - OPTVERR is always set at power-up due to failure of engi bytes checking + - FLASH_WaitForLastOperation() is called at the beginning of erase or program + operations, so the bit will be clear when performing first operation */ + if ((error & FLASH_FLAG_OPTVERR) != 0U) + { + /* Clear FLASH OPTVERR bit */ + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR); + + /* Clear OPTVERR bit in "error" variable to not treat it as error */ + error &= ~FLASH_FLAG_OPTVERR; + } + /* Now update error variable to only error value */ error &= FLASH_FLAG_SR_ERRORS; @@ -730,5 +742,3 @@ static __RAM_FUNC void FLASH_Program_Fast(uint32_t Address, uint32_t DataAddress /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c index e7c9a5ca9..9171797de 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c @@ -6,7 +6,17 @@ * This file provides firmware functions to manage the following * functionalities of the FLASH extended peripheral: * + Extended programming operations functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### Flash Extended features ##### @@ -62,17 +72,6 @@ HAL_FLASHEx_ForceFlashEmpty(). @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * ****************************************************************************** */ @@ -1051,5 +1050,3 @@ static HAL_StatusTypeDef FLASH_OB_ProceedWriteOperation(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c index ac16901f5..7d492ee1e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c @@ -7,7 +7,17 @@ * functionalities of the General Purpose Input/Output (GPIO) peripheral: * + Initialization and de-initialization functions * + IO operation functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### GPIO Peripheral features ##### @@ -89,17 +99,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -236,39 +235,39 @@ void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init) temp |= (GPIO_GET_INDEX(GPIOx) << (4u * (position & 0x03u))); SYSCFG->EXTICR[position >> 2u] = temp; - /* Clear EXTI line configuration */ - temp = EXTI->IMR1; + /* Clear Rising Falling edge configuration */ + temp = EXTI->RTSR1; temp &= ~(iocurrent); - if ((GPIO_Init->Mode & EXTI_IT) != 0x00u) + if ((GPIO_Init->Mode & TRIGGER_RISING) != 0x00u) { temp |= iocurrent; } - EXTI->IMR1 = temp; + EXTI->RTSR1 = temp; - temp = EXTI->EMR1; + temp = EXTI->FTSR1; temp &= ~(iocurrent); - if ((GPIO_Init->Mode & EXTI_EVT) != 0x00u) + if ((GPIO_Init->Mode & TRIGGER_FALLING) != 0x00u) { temp |= iocurrent; } - EXTI->EMR1 = temp; + EXTI->FTSR1 = temp; - /* Clear Rising Falling edge configuration */ - temp = EXTI->RTSR1; + /* Clear EXTI line configuration */ + temp = EXTI->IMR1; temp &= ~(iocurrent); - if ((GPIO_Init->Mode & TRIGGER_RISING) != 0x00u) + if ((GPIO_Init->Mode & EXTI_IT) != 0x00u) { temp |= iocurrent; } - EXTI->RTSR1 = temp; + EXTI->IMR1 = temp; - temp = EXTI->FTSR1; + temp = EXTI->EMR1; temp &= ~(iocurrent); - if ((GPIO_Init->Mode & TRIGGER_FALLING) != 0x00u) + if ((GPIO_Init->Mode & EXTI_EVT) != 0x00u) { temp |= iocurrent; } - EXTI->FTSR1 = temp; + EXTI->EMR1 = temp; } } @@ -427,7 +426,7 @@ void HAL_GPIO_TogglePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin) /* Check the parameters */ assert_param(IS_GPIO_PIN(GPIO_Pin)); - /* get current Ouput Data Register value */ + /* get current Output Data Register value */ odr = GPIOx->ODR; /* Set selected pins that were at low level, and reset ones that were high */ @@ -522,5 +521,3 @@ __weak void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c index 9410a864b..0c61d66c3 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c @@ -14,6 +14,17 @@ * + IRQ handler management * * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -71,17 +82,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -367,5 +367,3 @@ __weak void HAL_HSEM_FreeCallback(uint32_t SemMask) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c index 0adaec72e..ba2e718b5 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c @@ -9,6 +9,17 @@ * + IO operation functions * + Peripheral State and Errors functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -147,7 +158,7 @@ add their own code by customization of function pointer HAL_I2C_MasterRxCpltCallback() (++) Abort a master IT or DMA I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT() (+++) End of abort process, HAL_I2C_AbortCpltCallback() is executed and users can - add their own code by customization of function pointerHAL_I2C_AbortCpltCallback() + add their own code by customization of function pointer HAL_I2C_AbortCpltCallback() (++) Enable/disable the Address listen mode in slave I2C mode using HAL_I2C_EnableListen_IT() HAL_I2C_DisableListen_IT() (+++) When address slave I2C match, HAL_I2C_AddrCallback() is executed and users can @@ -156,13 +167,11 @@ (+++) At Listen mode end HAL_I2C_ListenCpltCallback() is executed and users can add their own code by customization of function pointer HAL_I2C_ListenCpltCallback() (++) Sequential transmit in slave I2C mode an amount of data in non-blocking mode using - HAL_I2C_Slave_Seq_Transmit_IT() - or using HAL_I2C_Slave_Seq_Transmit_DMA() + HAL_I2C_Slave_Seq_Transmit_IT() or using HAL_I2C_Slave_Seq_Transmit_DMA() (+++) At transmission end of current frame transfer, HAL_I2C_SlaveTxCpltCallback() is executed and users can add their own code by customization of function pointer HAL_I2C_SlaveTxCpltCallback() (++) Sequential receive in slave I2C mode an amount of data in non-blocking mode using - HAL_I2C_Slave_Seq_Receive_IT() - or usingHAL_I2C_Slave_Seq_Receive_DMA() + HAL_I2C_Slave_Seq_Receive_IT() or using HAL_I2C_Slave_Seq_Receive_DMA() (+++) At reception end of current frame transfer, HAL_I2C_SlaveRxCpltCallback() is executed and users can add their own code by customization of function pointer HAL_I2C_SlaveRxCpltCallback() (++) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and users can @@ -308,18 +317,6 @@ (@) You can refer to the I2C HAL driver header file for more useful macros @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -454,8 +451,8 @@ static HAL_StatusTypeDef I2C_WaitOnRXNEFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Tickstart); static HAL_StatusTypeDef I2C_WaitOnSTOPFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart); -static HAL_StatusTypeDef I2C_IsAcknowledgeFailed(I2C_HandleTypeDef *hi2c, uint32_t Timeout, - uint32_t Tickstart); +static HAL_StatusTypeDef I2C_IsErrorOccurred(I2C_HandleTypeDef *hi2c, uint32_t Timeout, + uint32_t Tickstart); /* Private functions to centralize the enable/disable of Interrupts */ static void I2C_Enable_IRQ(I2C_HandleTypeDef *hi2c, uint16_t InterruptRequest); @@ -6347,11 +6344,12 @@ static void I2C_DMAAbort(DMA_HandleTypeDef *hdma) } /** - * @brief This function handles I2C Communication Timeout. + * @brief This function handles I2C Communication Timeout. It waits + * until a flag is no longer in the specified status. * @param hi2c Pointer to a I2C_HandleTypeDef structure that contains * the configuration information for the specified I2C. * @param Flag Specifies the I2C flag to check. - * @param Status The new Flag status (SET or RESET). + * @param Status The actual Flag status (SET or RESET). * @param Timeout Timeout duration * @param Tickstart Tick start value * @retval HAL status @@ -6392,8 +6390,8 @@ static HAL_StatusTypeDef I2C_WaitOnTXISFlagUntilTimeout(I2C_HandleTypeDef *hi2c, { while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_TXIS) == RESET) { - /* Check if a NACK is detected */ - if (I2C_IsAcknowledgeFailed(hi2c, Timeout, Tickstart) != HAL_OK) + /* Check if an error is detected */ + if (I2C_IsErrorOccurred(hi2c, Timeout, Tickstart) != HAL_OK) { return HAL_ERROR; } @@ -6430,8 +6428,8 @@ static HAL_StatusTypeDef I2C_WaitOnSTOPFlagUntilTimeout(I2C_HandleTypeDef *hi2c, { while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_STOPF) == RESET) { - /* Check if a NACK is detected */ - if (I2C_IsAcknowledgeFailed(hi2c, Timeout, Tickstart) != HAL_OK) + /* Check if an error is detected */ + if (I2C_IsErrorOccurred(hi2c, Timeout, Tickstart) != HAL_OK) { return HAL_ERROR; } @@ -6465,8 +6463,8 @@ static HAL_StatusTypeDef I2C_WaitOnRXNEFlagUntilTimeout(I2C_HandleTypeDef *hi2c, { while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_RXNE) == RESET) { - /* Check if a NACK is detected */ - if (I2C_IsAcknowledgeFailed(hi2c, Timeout, Tickstart) != HAL_OK) + /* Check if an error is detected */ + if (I2C_IsErrorOccurred(hi2c, Timeout, Tickstart) != HAL_OK) { return HAL_ERROR; } @@ -6517,16 +6515,20 @@ static HAL_StatusTypeDef I2C_WaitOnRXNEFlagUntilTimeout(I2C_HandleTypeDef *hi2c, } /** - * @brief This function handles Acknowledge failed detection during an I2C Communication. + * @brief This function handles errors detection during an I2C Communication. * @param hi2c Pointer to a I2C_HandleTypeDef structure that contains * the configuration information for the specified I2C. * @param Timeout Timeout duration * @param Tickstart Tick start value * @retval HAL status */ -static HAL_StatusTypeDef I2C_IsAcknowledgeFailed(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart) +static HAL_StatusTypeDef I2C_IsErrorOccurred(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart) { - if (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_AF) == SET) + HAL_StatusTypeDef status = HAL_OK; + uint32_t itflag = hi2c->Instance->ISR; + uint32_t error_code = 0; + + if (HAL_IS_BIT_SET(itflag, I2C_FLAG_AF)) { /* In case of Soft End condition, generate the STOP condition */ if (I2C_GET_STOP_MODE(hi2c) != I2C_AUTOEND_MODE) @@ -6534,49 +6536,92 @@ static HAL_StatusTypeDef I2C_IsAcknowledgeFailed(I2C_HandleTypeDef *hi2c, uint32 /* Generate Stop */ hi2c->Instance->CR2 |= I2C_CR2_STOP; } - /* Wait until STOP Flag is reset */ + + /* Wait until STOP Flag is set or timeout occurred */ /* AutoEnd should be initiate after AF */ - while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_STOPF) == RESET) + while ((__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_STOPF) == RESET) && (status == HAL_OK)) { /* Check for the Timeout */ if (Timeout != HAL_MAX_DELAY) { if (((HAL_GetTick() - Tickstart) > Timeout) || (Timeout == 0U)) { - hi2c->ErrorCode |= HAL_I2C_ERROR_TIMEOUT; - hi2c->State = HAL_I2C_STATE_READY; - hi2c->Mode = HAL_I2C_MODE_NONE; - - /* Process Unlocked */ - __HAL_UNLOCK(hi2c); + error_code |= HAL_I2C_ERROR_TIMEOUT; - return HAL_ERROR; + status = HAL_ERROR; } } } + /* In case STOP Flag is detected, clear it */ + if (status == HAL_OK) + { + /* Clear STOP Flag */ + __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_STOPF); + } + /* Clear NACKF Flag */ __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_AF); - /* Clear STOP Flag */ - __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_STOPF); + error_code |= HAL_I2C_ERROR_AF; + + status = HAL_ERROR; + } + + /* Refresh Content of Status register */ + itflag = hi2c->Instance->ISR; + + /* Then verify if an additional errors occurs */ + /* Check if a Bus error occurred */ + if (HAL_IS_BIT_SET(itflag, I2C_FLAG_BERR)) + { + error_code |= HAL_I2C_ERROR_BERR; + /* Clear BERR flag */ + __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_BERR); + + status = HAL_ERROR; + } + + /* Check if an Over-Run/Under-Run error occurred */ + if (HAL_IS_BIT_SET(itflag, I2C_FLAG_OVR)) + { + error_code |= HAL_I2C_ERROR_OVR; + + /* Clear OVR flag */ + __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_OVR); + + status = HAL_ERROR; + } + + /* Check if an Arbitration Loss error occurred */ + if (HAL_IS_BIT_SET(itflag, I2C_FLAG_ARLO)) + { + error_code |= HAL_I2C_ERROR_ARLO; + + /* Clear ARLO flag */ + __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_ARLO); + + status = HAL_ERROR; + } + + if (status != HAL_OK) + { /* Flush TX register */ I2C_Flush_TXDR(hi2c); /* Clear Configuration Register 2 */ I2C_RESET_CR2(hi2c); - hi2c->ErrorCode |= HAL_I2C_ERROR_AF; + hi2c->ErrorCode |= error_code; hi2c->State = HAL_I2C_STATE_READY; hi2c->Mode = HAL_I2C_MODE_NONE; /* Process Unlocked */ __HAL_UNLOCK(hi2c); - - return HAL_ERROR; } - return HAL_OK; + + return status; } /** @@ -6606,14 +6651,16 @@ static void I2C_TransferConfig(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uin assert_param(IS_TRANSFER_MODE(Mode)); assert_param(IS_TRANSFER_REQUEST(Request)); + /* Declaration of tmp to prevent undefined behavior of volatile usage */ + uint32_t tmp = ((uint32_t)(((uint32_t)DevAddress & I2C_CR2_SADD) | \ + (((uint32_t)Size << I2C_CR2_NBYTES_Pos) & I2C_CR2_NBYTES) | \ + (uint32_t)Mode | (uint32_t)Request) & (~0x80000000U)); + /* update CR2 register */ - MODIFY_REG(hi2c->Instance->CR2, + MODIFY_REG(hi2c->Instance->CR2, \ ((I2C_CR2_SADD | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_AUTOEND | \ (I2C_CR2_RD_WRN & (uint32_t)(Request >> (31U - I2C_CR2_RD_WRN_Pos))) | \ - I2C_CR2_START | I2C_CR2_STOP)), \ - (uint32_t)(((uint32_t)DevAddress & I2C_CR2_SADD) | \ - (((uint32_t)Size << I2C_CR2_NBYTES_Pos) & I2C_CR2_NBYTES) | \ - (uint32_t)Mode | (uint32_t)Request)); + I2C_CR2_START | I2C_CR2_STOP)), tmp); } /** @@ -6792,5 +6839,3 @@ static void I2C_ConvertOtherXferOptions(I2C_HandleTypeDef *hi2c) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c_ex.c index e09f132fc..eb31914f4 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c_ex.c @@ -5,8 +5,21 @@ * @brief I2C Extended HAL module driver. * This file provides firmware functions to manage the following * functionalities of I2C Extended peripheral: - * + Extended features functions + * + Filter Mode Functions + * + WakeUp Mode Functions + * + FastModePlus Functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### I2C peripheral Extended features ##### @@ -32,18 +45,6 @@ (++) HAL_I2CEx_EnableFastModePlus() (++) HAL_I2CEx_DisableFastModePlus() @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -339,7 +340,6 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus) /** * @} */ - /** * @} */ @@ -352,5 +352,3 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c index 7c6a4c507..f128db72c 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c @@ -9,6 +9,17 @@ * + Initialization and de-initialization functions * + Configuration, notification and interrupts handling * + Peripheral State and Error functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -37,18 +48,7 @@ or when a message has been retrieved from a chosen channel by calling the HAL_IPCC_NotifyCPU() API. -@endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * + @endverbatim ****************************************************************************** */ @@ -457,7 +457,7 @@ HAL_StatusTypeDef HAL_IPCC_NotifyCPU(IPCC_HandleTypeDef const *const hipcc, uint /* Check the parameters */ assert_param(IS_IPCC_ALL_INSTANCE(hipcc->Instance)); - /* Check if IPCC is initiliased */ + /* Check if IPCC is initialized */ if (hipcc->State == HAL_IPCC_STATE_READY) { /* For IPCC_CHANNEL_DIR_TX, set the status. For IPCC_CHANNEL_DIR_RX, clear the status */ @@ -744,4 +744,4 @@ void IPCC_Reset_Register(IPCC_CommonTypeDef *Instance) * @} */ #endif /* IPCC */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_irda.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_irda.c index f30dbec19..532cde148 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_irda.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_irda.c @@ -11,6 +11,17 @@ * + Peripheral State and Errors functions * + Peripheral Control functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -40,7 +51,8 @@ (+++) Configure the declared DMA handle structure with the required Tx/Rx parameters. (+++) Configure the DMA Tx/Rx channel. (+++) Associate the initialized DMA handle to the IRDA DMA Tx/Rx handle. - (+++) Configure the priority and enable the NVIC for the transfer complete interrupt on the DMA Tx/Rx channel. + (+++) Configure the priority and enable the NVIC for the transfer + complete interrupt on the DMA Tx/Rx channel. (#) Program the Baud Rate, Word Length and Parity and Mode(Receiver/Transmitter), the normal or low power mode and the clock prescaler in the hirda handle Init structure. @@ -169,20 +181,8 @@ not defined, the callback registration feature is not available and weak (surcharged) callbacks are used. - @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -207,7 +207,7 @@ #define IRDA_TEACK_REACK_TIMEOUT 1000U /*!< IRDA TX or RX enable acknowledge time-out value */ #define IRDA_CR1_FIELDS ((uint32_t)(USART_CR1_M | USART_CR1_PCE \ - | USART_CR1_PS | USART_CR1_TE | USART_CR1_RE)) /*!< UART or USART CR1 fields of parameters set by IRDA_SetConfig API */ + | USART_CR1_PS | USART_CR1_TE | USART_CR1_RE)) /*!< UART or USART CR1 fields of parameters set by IRDA_SetConfig API */ #define USART_BRR_MIN 0x10U /*!< USART BRR minimum authorized value */ @@ -241,7 +241,8 @@ void IRDA_InitCallbacksToDefault(IRDA_HandleTypeDef *hirda); #endif /* USE_HAL_IRDA_REGISTER_CALLBACKS */ static HAL_StatusTypeDef IRDA_SetConfig(IRDA_HandleTypeDef *hirda); static HAL_StatusTypeDef IRDA_CheckIdleState(IRDA_HandleTypeDef *hirda); -static HAL_StatusTypeDef IRDA_WaitOnFlagUntilTimeout(IRDA_HandleTypeDef *hirda, uint32_t Flag, FlagStatus Status, uint32_t Tickstart, uint32_t Timeout); +static HAL_StatusTypeDef IRDA_WaitOnFlagUntilTimeout(IRDA_HandleTypeDef *hirda, uint32_t Flag, FlagStatus Status, + uint32_t Tickstart, uint32_t Timeout); static void IRDA_EndTxTransfer(IRDA_HandleTypeDef *hirda); static void IRDA_EndRxTransfer(IRDA_HandleTypeDef *hirda); static void IRDA_DMATransmitCplt(DMA_HandleTypeDef *hdma); @@ -716,6 +717,7 @@ HAL_StatusTypeDef HAL_IRDA_UnRegisterCallback(IRDA_HandleTypeDef *hirda, HAL_IRD While receiving data, transmission should be avoided as the data to be transmitted could be corrupted. + [..] (#) There are two modes of transfer: (++) Blocking mode: the communication is performed in polling mode. The HAL status of all data processing is returned by the same function @@ -812,7 +814,7 @@ HAL_StatusTypeDef HAL_IRDA_Transmit(IRDA_HandleTypeDef *hirda, uint8_t *pData, u hirda->ErrorCode = HAL_IRDA_ERROR_NONE; hirda->gState = HAL_IRDA_STATE_BUSY_TX; - /* Init tickstart for timeout managment*/ + /* Init tickstart for timeout management */ tickstart = HAL_GetTick(); hirda->TxXferSize = Size; @@ -902,7 +904,7 @@ HAL_StatusTypeDef HAL_IRDA_Receive(IRDA_HandleTypeDef *hirda, uint8_t *pData, ui hirda->ErrorCode = HAL_IRDA_ERROR_NONE; hirda->RxState = HAL_IRDA_STATE_BUSY_RX; - /* Init tickstart for timeout managment*/ + /* Init tickstart for timeout management */ tickstart = HAL_GetTick(); hirda->RxXferSize = Size; @@ -1373,7 +1375,7 @@ HAL_StatusTypeDef HAL_IRDA_DMAStop(IRDA_HandleTypeDef *hirda) * - Set handle State to READY * @note This procedure is executed in blocking mode : when exiting function, Abort is considered as completed. * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_IRDA_Abort(IRDA_HandleTypeDef *hirda) { /* Disable TXEIE, TCIE, RXNE, PE and ERR (Frame error, noise error, overrun error) interrupts */ @@ -1459,7 +1461,7 @@ HAL_StatusTypeDef HAL_IRDA_Abort(IRDA_HandleTypeDef *hirda) * - Set handle State to READY * @note This procedure is executed in blocking mode : when exiting function, Abort is considered as completed. * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_IRDA_AbortTransmit(IRDA_HandleTypeDef *hirda) { /* Disable TXEIE and TCIE interrupts */ @@ -1511,7 +1513,7 @@ HAL_StatusTypeDef HAL_IRDA_AbortTransmit(IRDA_HandleTypeDef *hirda) * - Set handle State to READY * @note This procedure is executed in blocking mode : when exiting function, Abort is considered as completed. * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_IRDA_AbortReceive(IRDA_HandleTypeDef *hirda) { /* Disable RXNE, PE and ERR (Frame error, noise error, overrun error) interrupts */ @@ -1569,7 +1571,7 @@ HAL_StatusTypeDef HAL_IRDA_AbortReceive(IRDA_HandleTypeDef *hirda) * @note This procedure is executed in Interrupt mode, meaning that abort procedure could be * considered as completed only when user abort complete callback is executed (not when exiting function). * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_IRDA_Abort_IT(IRDA_HandleTypeDef *hirda) { uint32_t abortcplt = 1U; @@ -1701,7 +1703,7 @@ HAL_StatusTypeDef HAL_IRDA_Abort_IT(IRDA_HandleTypeDef *hirda) * @note This procedure is executed in Interrupt mode, meaning that abort procedure could be * considered as completed only when user abort complete callback is executed (not when exiting function). * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_IRDA_AbortTransmit_IT(IRDA_HandleTypeDef *hirda) { /* Disable TXEIE and TCIE interrupts */ @@ -1779,7 +1781,7 @@ HAL_StatusTypeDef HAL_IRDA_AbortTransmit_IT(IRDA_HandleTypeDef *hirda) * @note This procedure is executed in Interrupt mode, meaning that abort procedure could be * considered as completed only when user abort complete callback is executed (not when exiting function). * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_IRDA_AbortReceive_IT(IRDA_HandleTypeDef *hirda) { /* Disable RXNE, PE and ERR (Frame error, noise error, overrun error) interrupts */ @@ -2168,7 +2170,8 @@ __weak void HAL_IRDA_AbortReceiveCpltCallback(IRDA_HandleTypeDef *hirda) HAL_IRDA_StateTypeDef HAL_IRDA_GetState(IRDA_HandleTypeDef *hirda) { /* Return IRDA handle state */ - uint32_t temp1, temp2; + uint32_t temp1; + uint32_t temp2; temp1 = (uint32_t)hirda->gState; temp2 = (uint32_t)hirda->RxState; @@ -2312,7 +2315,7 @@ static HAL_StatusTypeDef IRDA_CheckIdleState(IRDA_HandleTypeDef *hirda) /* Initialize the IRDA ErrorCode */ hirda->ErrorCode = HAL_IRDA_ERROR_NONE; - /* Init tickstart for timeout managment*/ + /* Init tickstart for timeout management */ tickstart = HAL_GetTick(); /* Check if the Transmitter is enabled */ @@ -2347,16 +2350,18 @@ static HAL_StatusTypeDef IRDA_CheckIdleState(IRDA_HandleTypeDef *hirda) } /** - * @brief Handle IRDA Communication Timeout. + * @brief Handle IRDA Communication Timeout. It waits + * until a flag is no longer in the specified status. * @param hirda Pointer to a IRDA_HandleTypeDef structure that contains * the configuration information for the specified IRDA module. * @param Flag Specifies the IRDA flag to check. - * @param Status Flag status (SET or RESET) + * @param Status The actual Flag status (SET or RESET) * @param Tickstart Tick start value * @param Timeout Timeout duration * @retval HAL status */ -static HAL_StatusTypeDef IRDA_WaitOnFlagUntilTimeout(IRDA_HandleTypeDef *hirda, uint32_t Flag, FlagStatus Status, uint32_t Tickstart, uint32_t Timeout) +static HAL_StatusTypeDef IRDA_WaitOnFlagUntilTimeout(IRDA_HandleTypeDef *hirda, uint32_t Flag, FlagStatus Status, + uint32_t Tickstart, uint32_t Timeout) { /* Wait until flag is set */ while ((__HAL_IRDA_GET_FLAG(hirda, Flag) ? SET : RESET) == Status) @@ -2366,7 +2371,8 @@ static HAL_StatusTypeDef IRDA_WaitOnFlagUntilTimeout(IRDA_HandleTypeDef *hirda, { if (((HAL_GetTick() - Tickstart) > Timeout) || (Timeout == 0U)) { - /* Disable TXE, RXNE, PE and ERR (Frame error, noise error, overrun error) interrupts for the interrupt process */ + /* Disable TXE, RXNE, PE and ERR (Frame error, noise error, overrun error) + interrupts for the interrupt process */ CLEAR_BIT(hirda->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE)); CLEAR_BIT(hirda->Instance->CR3, USART_CR3_EIE); @@ -2875,4 +2881,3 @@ static void IRDA_Receive_IT(IRDA_HandleTypeDef *hirda) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_iwdg.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_iwdg.c index 6461386ef..4ad95acdd 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_iwdg.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_iwdg.c @@ -8,6 +8,17 @@ * + Initialization and Start functions * + IO operation functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IWDG Generic features ##### @@ -86,18 +97,6 @@ the reload register @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -125,7 +124,7 @@ the LSI_VALUE constant. The value of this constant can be changed by the user to take into account possible LSI clock period variations. The timeout value is multiplied by 1000 to be converted in milliseconds. - LSI startup time is also considered here by adding LSI_STARTUP_TIMEOUT + LSI startup time is also considered here by adding LSI_STARTUP_TIME converted in milliseconds. */ #define HAL_IWDG_DEFAULT_TIMEOUT (((6UL * 256UL * 1000UL) / LSI_VALUE) + ((LSI_STARTUP_TIME / 1000UL) + 1UL)) #define IWDG_KERNEL_UPDATE_FLAGS (IWDG_SR_WVU | IWDG_SR_RVU | IWDG_SR_PVU) @@ -281,5 +280,3 @@ HAL_StatusTypeDef HAL_IWDG_Refresh(IWDG_HandleTypeDef *hiwdg) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lcd.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lcd.c index 8bdcf34bc..ed2b096e2 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lcd.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lcd.c @@ -9,6 +9,17 @@ * + I/O operation methods * + Peripheral State methods * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -66,17 +77,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -611,6 +611,3 @@ HAL_StatusTypeDef LCD_WaitForSynchro(LCD_HandleTypeDef *hlcd) /** * @} */ - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lptim.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lptim.c index 359e36fca..458ee1e65 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lptim.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_lptim.c @@ -11,6 +11,17 @@ * + Reading operation functions. * + Peripheral State functions. * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -143,17 +154,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -570,7 +570,7 @@ HAL_StatusTypeDef HAL_LPTIM_PWM_Stop(LPTIM_HandleTypeDef *hlptim) return HAL_TIMEOUT; } - /* Change the TIM state*/ + /* Change the LPTIM state*/ hlptim->State = HAL_LPTIM_STATE_READY; /* Return function status */ @@ -706,7 +706,7 @@ HAL_StatusTypeDef HAL_LPTIM_PWM_Stop_IT(LPTIM_HandleTypeDef *hlptim) __HAL_LPTIM_DISABLE_IT(hlptim, LPTIM_IT_EXTTRIG); } - /* Change the TIM state*/ + /* Change the LPTIM state*/ hlptim->State = HAL_LPTIM_STATE_READY; /* Return function status */ @@ -793,7 +793,7 @@ HAL_StatusTypeDef HAL_LPTIM_OnePulse_Stop(LPTIM_HandleTypeDef *hlptim) return HAL_TIMEOUT; } - /* Change the TIM state*/ + /* Change the LPTIM state*/ hlptim->State = HAL_LPTIM_STATE_READY; /* Return function status */ @@ -929,7 +929,7 @@ HAL_StatusTypeDef HAL_LPTIM_OnePulse_Stop_IT(LPTIM_HandleTypeDef *hlptim) __HAL_LPTIM_DISABLE_IT(hlptim, LPTIM_IT_EXTTRIG); } - /* Change the TIM state*/ + /* Change the LPTIM state*/ hlptim->State = HAL_LPTIM_STATE_READY; /* Return function status */ @@ -1016,7 +1016,7 @@ HAL_StatusTypeDef HAL_LPTIM_SetOnce_Stop(LPTIM_HandleTypeDef *hlptim) return HAL_TIMEOUT; } - /* Change the TIM state*/ + /* Change the LPTIM state*/ hlptim->State = HAL_LPTIM_STATE_READY; /* Return function status */ @@ -1152,7 +1152,7 @@ HAL_StatusTypeDef HAL_LPTIM_SetOnce_Stop_IT(LPTIM_HandleTypeDef *hlptim) __HAL_LPTIM_DISABLE_IT(hlptim, LPTIM_IT_EXTTRIG); } - /* Change the TIM state*/ + /* Change the LPTIM state*/ hlptim->State = HAL_LPTIM_STATE_READY; /* Return function status */ @@ -2214,39 +2214,48 @@ HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *hlpti switch (CallbackID) { case HAL_LPTIM_MSPINIT_CB_ID : - hlptim->MspInitCallback = HAL_LPTIM_MspInit; /* Legacy weak MspInit Callback */ + /* Legacy weak MspInit Callback */ + hlptim->MspInitCallback = HAL_LPTIM_MspInit; break; case HAL_LPTIM_MSPDEINIT_CB_ID : - hlptim->MspDeInitCallback = HAL_LPTIM_MspDeInit; /* Legacy weak Msp DeInit Callback */ + /* Legacy weak Msp DeInit Callback */ + hlptim->MspDeInitCallback = HAL_LPTIM_MspDeInit; break; case HAL_LPTIM_COMPARE_MATCH_CB_ID : - hlptim->CompareMatchCallback = HAL_LPTIM_CompareMatchCallback; /* Legacy weak Compare match Callback */ + /* Legacy weak Compare match Callback */ + hlptim->CompareMatchCallback = HAL_LPTIM_CompareMatchCallback; break; case HAL_LPTIM_AUTORELOAD_MATCH_CB_ID : - hlptim->AutoReloadMatchCallback = HAL_LPTIM_AutoReloadMatchCallback; /* Legacy weak Auto-reload match Callback */ + /* Legacy weak Auto-reload match Callback */ + hlptim->AutoReloadMatchCallback = HAL_LPTIM_AutoReloadMatchCallback; break; case HAL_LPTIM_TRIGGER_CB_ID : - hlptim->TriggerCallback = HAL_LPTIM_TriggerCallback; /* Legacy weak External trigger event detection Callback */ + /* Legacy weak External trigger event detection Callback */ + hlptim->TriggerCallback = HAL_LPTIM_TriggerCallback; break; case HAL_LPTIM_COMPARE_WRITE_CB_ID : - hlptim->CompareWriteCallback = HAL_LPTIM_CompareWriteCallback; /* Legacy weak Compare register write complete Callback */ + /* Legacy weak Compare register write complete Callback */ + hlptim->CompareWriteCallback = HAL_LPTIM_CompareWriteCallback; break; case HAL_LPTIM_AUTORELOAD_WRITE_CB_ID : - hlptim->AutoReloadWriteCallback = HAL_LPTIM_AutoReloadWriteCallback; /* Legacy weak Auto-reload register write complete Callback */ + /* Legacy weak Auto-reload register write complete Callback */ + hlptim->AutoReloadWriteCallback = HAL_LPTIM_AutoReloadWriteCallback; break; case HAL_LPTIM_DIRECTION_UP_CB_ID : - hlptim->DirectionUpCallback = HAL_LPTIM_DirectionUpCallback; /* Legacy weak Up-counting direction change Callback */ + /* Legacy weak Up-counting direction change Callback */ + hlptim->DirectionUpCallback = HAL_LPTIM_DirectionUpCallback; break; case HAL_LPTIM_DIRECTION_DOWN_CB_ID : - hlptim->DirectionDownCallback = HAL_LPTIM_DirectionDownCallback; /* Legacy weak Down-counting direction change Callback */ + /* Legacy weak Down-counting direction change Callback */ + hlptim->DirectionDownCallback = HAL_LPTIM_DirectionDownCallback; break; default : @@ -2260,11 +2269,13 @@ HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *hlpti switch (CallbackID) { case HAL_LPTIM_MSPINIT_CB_ID : - hlptim->MspInitCallback = HAL_LPTIM_MspInit; /* Legacy weak MspInit Callback */ + /* Legacy weak MspInit Callback */ + hlptim->MspInitCallback = HAL_LPTIM_MspInit; break; case HAL_LPTIM_MSPDEINIT_CB_ID : - hlptim->MspDeInitCallback = HAL_LPTIM_MspDeInit; /* Legacy weak Msp DeInit Callback */ + /* Legacy weak Msp DeInit Callback */ + hlptim->MspDeInitCallback = HAL_LPTIM_MspDeInit; break; default : @@ -2339,13 +2350,13 @@ HAL_LPTIM_StateTypeDef HAL_LPTIM_GetState(LPTIM_HandleTypeDef *hlptim) static void LPTIM_ResetCallback(LPTIM_HandleTypeDef *lptim) { /* Reset the LPTIM callback to the legacy weak callbacks */ - lptim->CompareMatchCallback = HAL_LPTIM_CompareMatchCallback; /* Compare match Callback */ - lptim->AutoReloadMatchCallback = HAL_LPTIM_AutoReloadMatchCallback; /* Auto-reload match Callback */ - lptim->TriggerCallback = HAL_LPTIM_TriggerCallback; /* External trigger event detection Callback */ - lptim->CompareWriteCallback = HAL_LPTIM_CompareWriteCallback; /* Compare register write complete Callback */ - lptim->AutoReloadWriteCallback = HAL_LPTIM_AutoReloadWriteCallback; /* Auto-reload register write complete Callback */ - lptim->DirectionUpCallback = HAL_LPTIM_DirectionUpCallback; /* Up-counting direction change Callback */ - lptim->DirectionDownCallback = HAL_LPTIM_DirectionDownCallback; /* Down-counting direction change Callback */ + lptim->CompareMatchCallback = HAL_LPTIM_CompareMatchCallback; + lptim->AutoReloadMatchCallback = HAL_LPTIM_AutoReloadMatchCallback; + lptim->TriggerCallback = HAL_LPTIM_TriggerCallback; + lptim->CompareWriteCallback = HAL_LPTIM_CompareWriteCallback; + lptim->AutoReloadWriteCallback = HAL_LPTIM_AutoReloadWriteCallback; + lptim->DirectionUpCallback = HAL_LPTIM_DirectionUpCallback; + lptim->DirectionDownCallback = HAL_LPTIM_DirectionDownCallback; } #endif /* USE_HAL_LPTIM_REGISTER_CALLBACKS */ @@ -2388,11 +2399,14 @@ void LPTIM_Disable(LPTIM_HandleTypeDef *hlptim) uint32_t tmpCFGR; uint32_t tmpCMP; uint32_t tmpARR; + uint32_t primask_bit; #if defined(LPTIM_OR_OR) uint32_t tmpOR; #endif /* LPTIM_OR_OR */ - __disable_irq(); + /* Enter critical section */ + primask_bit = __get_PRIMASK(); + __set_PRIMASK(1) ; /*********** Save LPTIM Config ***********/ /* Save LPTIM source clock */ @@ -2507,7 +2521,8 @@ void LPTIM_Disable(LPTIM_HandleTypeDef *hlptim) hlptim->Instance->OR = tmpOR; #endif /* LPTIM_OR_OR */ - __enable_irq(); + /* Exit critical section: restore previous priority mask */ + __set_PRIMASK(primask_bit); } /** * @} @@ -2522,5 +2537,3 @@ void LPTIM_Disable(LPTIM_HandleTypeDef *hlptim) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_msp_template.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_msp_template.c index 19863c2c8..063489732 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_msp_template.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_msp_template.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -97,5 +96,3 @@ void HAL_PPP_MspDeInit(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd.c index 79c57a614..6e77e8e19 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd.c @@ -10,6 +10,17 @@ * + Peripheral Control functions * + Peripheral State functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -40,17 +51,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -88,8 +88,10 @@ */ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd); +#if (USE_USB_DOUBLE_BUFFER == 1U) static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, PCD_EPTypeDef *ep, uint16_t wEPVal); static uint16_t HAL_PCD_EP_DB_Receive(PCD_HandleTypeDef *hpcd, PCD_EPTypeDef *ep, uint16_t wEPVal); +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ /** * @} @@ -1005,14 +1007,18 @@ HAL_StatusTypeDef HAL_PCD_Stop(PCD_HandleTypeDef *hpcd) */ void HAL_PCD_IRQHandler(PCD_HandleTypeDef *hpcd) { - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_CTR)) + uint32_t wIstr = USB_ReadInterrupts(hpcd->Instance); + + if ((wIstr & USB_ISTR_CTR) == USB_ISTR_CTR) { /* servicing of the endpoint correct transfer interrupt */ /* clear of the CTR flag into the sub */ (void)PCD_EP_ISR_Handler(hpcd); + + return; } - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_RESET)) + if ((wIstr & USB_ISTR_RESET) == USB_ISTR_RESET) { __HAL_PCD_CLEAR_FLAG(hpcd, USB_ISTR_RESET); @@ -1023,19 +1029,25 @@ void HAL_PCD_IRQHandler(PCD_HandleTypeDef *hpcd) #endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ (void)HAL_PCD_SetAddress(hpcd, 0U); + + return; } - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_PMAOVR)) + if ((wIstr & USB_ISTR_PMAOVR) == USB_ISTR_PMAOVR) { __HAL_PCD_CLEAR_FLAG(hpcd, USB_ISTR_PMAOVR); + + return; } - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_ERR)) + if ((wIstr & USB_ISTR_ERR) == USB_ISTR_ERR) { __HAL_PCD_CLEAR_FLAG(hpcd, USB_ISTR_ERR); + + return; } - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_WKUP)) + if ((wIstr & USB_ISTR_WKUP) == USB_ISTR_WKUP) { hpcd->Instance->CNTR &= (uint16_t) ~(USB_CNTR_LPMODE); hpcd->Instance->CNTR &= (uint16_t) ~(USB_CNTR_FSUSP); @@ -1057,9 +1069,11 @@ void HAL_PCD_IRQHandler(PCD_HandleTypeDef *hpcd) #endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ __HAL_PCD_CLEAR_FLAG(hpcd, USB_ISTR_WKUP); + + return; } - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_SUSP)) + if ((wIstr & USB_ISTR_SUSP) == USB_ISTR_SUSP) { /* Force low-power mode in the macrocell */ hpcd->Instance->CNTR |= (uint16_t)USB_CNTR_FSUSP; @@ -1074,10 +1088,12 @@ void HAL_PCD_IRQHandler(PCD_HandleTypeDef *hpcd) #else HAL_PCD_SuspendCallback(hpcd); #endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ + + return; } /* Handle LPM Interrupt */ - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_L1REQ)) + if ((wIstr & USB_ISTR_L1REQ) == USB_ISTR_L1REQ) { __HAL_PCD_CLEAR_FLAG(hpcd, USB_ISTR_L1REQ); if (hpcd->LPM_State == LPM_L0) @@ -1102,9 +1118,11 @@ void HAL_PCD_IRQHandler(PCD_HandleTypeDef *hpcd) HAL_PCD_SuspendCallback(hpcd); #endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ } + + return; } - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_SOF)) + if ((wIstr & USB_ISTR_SOF) == USB_ISTR_SOF) { __HAL_PCD_CLEAR_FLAG(hpcd, USB_ISTR_SOF); @@ -1113,12 +1131,16 @@ void HAL_PCD_IRQHandler(PCD_HandleTypeDef *hpcd) #else HAL_PCD_SOFCallback(hpcd); #endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ + + return; } - if (__HAL_PCD_GET_FLAG(hpcd, USB_ISTR_ESOF)) + if ((wIstr & USB_ISTR_ESOF) == USB_ISTR_ESOF) { /* clear ESOF flag in ISTR */ __HAL_PCD_CLEAR_FLAG(hpcd, USB_ISTR_ESOF); + + return; } } @@ -1671,7 +1693,10 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef *hpcd) static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd) { PCD_EPTypeDef *ep; - uint16_t count, wIstr, wEPVal, TxByteNbre; + uint16_t count; + uint16_t wIstr; + uint16_t wEPVal; + uint16_t TxPctSize; uint8_t epindex; /* stay in loop while pending interrupts */ @@ -1791,6 +1816,7 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd) USB_ReadPMA(hpcd->Instance, ep->xfer_buff, ep->pmaadress, count); } } +#if (USE_USB_DOUBLE_BUFFER == 1U) else { /* manage double buffer bulk out */ @@ -1801,7 +1827,7 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd) else /* manage double buffer iso out */ { /* free EP OUT Buffer */ - PCD_FreeUserBuffer(hpcd->Instance, ep->num, 0U); + PCD_FREE_USER_BUFFER(hpcd->Instance, ep->num, 0U); if ((PCD_GET_ENDPOINT(hpcd->Instance, ep->num) & USB_EP_DTOG_RX) != 0U) { @@ -1825,6 +1851,8 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd) } } } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ + /* multi-packet on the NON control OUT endpoint */ ep->xfer_count += count; ep->xfer_buff += count; @@ -1842,7 +1870,6 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd) { (void) USB_EPStartXfer(hpcd->Instance, ep); } - } if ((wEPVal & USB_EP_CTR_TX) != 0U) @@ -1852,44 +1879,73 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd) /* clear int flag */ PCD_CLEAR_TX_EP_CTR(hpcd->Instance, epindex); - /* Manage all non bulk/isoc transaction Bulk Single Buffer Transaction */ - if ((ep->type == EP_TYPE_INTR) || (ep->type == EP_TYPE_CTRL) || - ((ep->type == EP_TYPE_BULK) && ((wEPVal & USB_EP_KIND) == 0U))) + if (ep->type != EP_TYPE_BULK) { - /* multi-packet on the NON control IN endpoint */ - TxByteNbre = (uint16_t)PCD_GET_EP_TX_CNT(hpcd->Instance, ep->num); + ep->xfer_len = 0U; - if (ep->xfer_len > TxByteNbre) +#if (USE_USB_DOUBLE_BUFFER == 1U) + if (ep->doublebuffer != 0U) { - ep->xfer_len -= TxByteNbre; - } - else - { - ep->xfer_len = 0U; + if ((wEPVal & USB_EP_DTOG_TX) != 0U) + { + PCD_SET_EP_DBUF0_CNT(hpcd->Instance, ep->num, ep->is_in, 0U); + } + else + { + PCD_SET_EP_DBUF1_CNT(hpcd->Instance, ep->num, ep->is_in, 0U); + } } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ - /* Zero Length Packet? */ - if (ep->xfer_len == 0U) + /* TX COMPLETE */ +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) + hpcd->DataInStageCallback(hpcd, ep->num); +#else + HAL_PCD_DataInStageCallback(hpcd, ep->num); +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ + } + else + { + /* Manage Bulk Single Buffer Transaction */ + if ((wEPVal & USB_EP_KIND) == 0U) { - /* TX COMPLETE */ + /* multi-packet on the NON control IN endpoint */ + TxPctSize = (uint16_t)PCD_GET_EP_TX_CNT(hpcd->Instance, ep->num); + + if (ep->xfer_len > TxPctSize) + { + ep->xfer_len -= TxPctSize; + } + else + { + ep->xfer_len = 0U; + } + + /* Zero Length Packet? */ + if (ep->xfer_len == 0U) + { + /* TX COMPLETE */ #if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) - hpcd->DataInStageCallback(hpcd, ep->num); + hpcd->DataInStageCallback(hpcd, ep->num); #else - HAL_PCD_DataInStageCallback(hpcd, ep->num); + HAL_PCD_DataInStageCallback(hpcd, ep->num); #endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ + } + else + { + /* Transfer is not yet Done */ + ep->xfer_buff += TxPctSize; + ep->xfer_count += TxPctSize; + (void)USB_EPStartXfer(hpcd->Instance, ep); + } } +#if (USE_USB_DOUBLE_BUFFER == 1U) + /* Double Buffer bulk IN (bulk transfer Len > Ep_Mps) */ else { - /* Transfer is not yet Done */ - ep->xfer_buff += TxByteNbre; - ep->xfer_count += TxByteNbre; - (void)USB_EPStartXfer(hpcd->Instance, ep); + (void)HAL_PCD_EP_DB_Transmit(hpcd, ep, wEPVal); } - } - /* Double Buffer Iso/bulk IN (bulk transfer Len > Ep_Mps) */ - else - { - (void)HAL_PCD_EP_DB_Transmit(hpcd, ep, wEPVal); +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ } } } @@ -1899,6 +1955,7 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd) } +#if (USE_USB_DOUBLE_BUFFER == 1U) /** * @brief Manage double buffer bulk out transaction from ISR * @param hpcd PCD handle @@ -1932,10 +1989,10 @@ static uint16_t HAL_PCD_EP_DB_Receive(PCD_HandleTypeDef *hpcd, PCD_SET_EP_RX_STATUS(hpcd->Instance, ep->num, USB_EP_RX_NAK); } - /* Check if Buffer1 is in blocked sate which requires to toggle */ + /* Check if Buffer1 is in blocked state which requires to toggle */ if ((wEPVal & USB_EP_DTOG_TX) != 0U) { - PCD_FreeUserBuffer(hpcd->Instance, ep->num, 0U); + PCD_FREE_USER_BUFFER(hpcd->Instance, ep->num, 0U); } if (count != 0U) @@ -1967,7 +2024,7 @@ static uint16_t HAL_PCD_EP_DB_Receive(PCD_HandleTypeDef *hpcd, /*Need to FreeUser Buffer*/ if ((wEPVal & USB_EP_DTOG_TX) == 0U) { - PCD_FreeUserBuffer(hpcd->Instance, ep->num, 0U); + PCD_FREE_USER_BUFFER(hpcd->Instance, ep->num, 0U); } if (count != 0U) @@ -1991,22 +2048,23 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, PCD_EPTypeDef *ep, uint16_t wEPVal) { uint32_t len; - uint16_t TxByteNbre; + uint16_t TxPctSize; /* Data Buffer0 ACK received */ if ((wEPVal & USB_EP_DTOG_TX) != 0U) { /* multi-packet on the NON control IN endpoint */ - TxByteNbre = (uint16_t)PCD_GET_EP_DBUF0_CNT(hpcd->Instance, ep->num); + TxPctSize = (uint16_t)PCD_GET_EP_DBUF0_CNT(hpcd->Instance, ep->num); - if (ep->xfer_len > TxByteNbre) + if (ep->xfer_len > TxPctSize) { - ep->xfer_len -= TxByteNbre; + ep->xfer_len -= TxPctSize; } else { ep->xfer_len = 0U; } + /* Transfer is completed */ if (ep->xfer_len == 0U) { @@ -2022,7 +2080,7 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, if ((wEPVal & USB_EP_DTOG_RX) != 0U) { - PCD_FreeUserBuffer(hpcd->Instance, ep->num, 1U); + PCD_FREE_USER_BUFFER(hpcd->Instance, ep->num, 1U); } } else /* Transfer is not yet Done */ @@ -2030,14 +2088,14 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, /* need to Free USB Buff */ if ((wEPVal & USB_EP_DTOG_RX) != 0U) { - PCD_FreeUserBuffer(hpcd->Instance, ep->num, 1U); + PCD_FREE_USER_BUFFER(hpcd->Instance, ep->num, 1U); } /* Still there is data to Fill in the next Buffer */ if (ep->xfer_fill_db == 1U) { - ep->xfer_buff += TxByteNbre; - ep->xfer_count += TxByteNbre; + ep->xfer_buff += TxPctSize; + ep->xfer_count += TxPctSize; /* Calculate the len of the new buffer to fill */ if (ep->xfer_len_db >= ep->maxpacket) @@ -2047,7 +2105,7 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, } else if (ep->xfer_len_db == 0U) { - len = TxByteNbre; + len = TxPctSize; ep->xfer_fill_db = 0U; } else @@ -2069,11 +2127,11 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, else /* Data Buffer1 ACK received */ { /* multi-packet on the NON control IN endpoint */ - TxByteNbre = (uint16_t)PCD_GET_EP_DBUF1_CNT(hpcd->Instance, ep->num); + TxPctSize = (uint16_t)PCD_GET_EP_DBUF1_CNT(hpcd->Instance, ep->num); - if (ep->xfer_len >= TxByteNbre) + if (ep->xfer_len >= TxPctSize) { - ep->xfer_len -= TxByteNbre; + ep->xfer_len -= TxPctSize; } else { @@ -2096,7 +2154,7 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, /* need to Free USB Buff */ if ((wEPVal & USB_EP_DTOG_RX) == 0U) { - PCD_FreeUserBuffer(hpcd->Instance, ep->num, 1U); + PCD_FREE_USER_BUFFER(hpcd->Instance, ep->num, 1U); } } else /* Transfer is not yet Done */ @@ -2104,14 +2162,14 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, /* need to Free USB Buff */ if ((wEPVal & USB_EP_DTOG_RX) == 0U) { - PCD_FreeUserBuffer(hpcd->Instance, ep->num, 1U); + PCD_FREE_USER_BUFFER(hpcd->Instance, ep->num, 1U); } /* Still there is data to Fill in the next Buffer */ if (ep->xfer_fill_db == 1U) { - ep->xfer_buff += TxByteNbre; - ep->xfer_count += TxByteNbre; + ep->xfer_buff += TxPctSize; + ep->xfer_count += TxPctSize; /* Calculate the len of the new buffer to fill */ if (ep->xfer_len_db >= ep->maxpacket) @@ -2121,7 +2179,7 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, } else if (ep->xfer_len_db == 0U) { - len = TxByteNbre; + len = TxPctSize; ep->xfer_fill_db = 0U; } else @@ -2145,6 +2203,7 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, return HAL_OK; } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ @@ -2161,5 +2220,3 @@ static HAL_StatusTypeDef HAL_PCD_EP_DB_Transmit(PCD_HandleTypeDef *hpcd, /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd_ex.c index e6f93a2d8..dbe20229b 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pcd_ex.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,6 +100,7 @@ HAL_StatusTypeDef HAL_PCDEx_PMAConfig(PCD_HandleTypeDef *hpcd, uint16_t ep_addr /* Configure the PMA */ ep->pmaadress = (uint16_t)pmaadress; } +#if (USE_USB_DOUBLE_BUFFER == 1U) else /* USB_DBL_BUF */ { /* Double Buffer Endpoint */ @@ -109,6 +109,7 @@ HAL_StatusTypeDef HAL_PCDEx_PMAConfig(PCD_HandleTypeDef *hpcd, uint16_t ep_addr ep->pmaaddr0 = (uint16_t)(pmaadress & 0xFFFFU); ep->pmaaddr1 = (uint16_t)((pmaadress & 0xFFFF0000U) >> 16); } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ return HAL_OK; } @@ -160,7 +161,7 @@ void HAL_PCDEx_BCD_VBUSDetect(PCD_HandleTypeDef *hpcd) USB_TypeDef *USBx = hpcd->Instance; uint32_t tickstart = HAL_GetTick(); - /* Wait Detect flag or a timeout is happen*/ + /* Wait Detect flag or a timeout is happen */ while ((USBx->BCDR & USB_BCDR_DCDET) == 0U) { /* Check for the Timeout */ @@ -332,5 +333,3 @@ __weak void HAL_PCDEx_BCD_Callback(PCD_HandleTypeDef *hpcd, PCD_BCD_MsgTypeDef m /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.c index 3c11743f2..83d7cee44 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.c @@ -9,6 +9,17 @@ * + Start an operation * + Retrieve the operation result * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -229,17 +240,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -252,7 +252,7 @@ #if defined(PKA) && defined(HAL_PKA_MODULE_ENABLED) /** @defgroup PKA PKA - * @brief PKA HAL module driver. + * @brief PKA HAL module driver. * @{ */ @@ -299,7 +299,8 @@ void PKA_ECCMulFastMode_Set(PKA_HandleTypeDef *hpka, PKA_ECCMulFastModeInTypeDef void PKA_ModRed_Set(PKA_HandleTypeDef *hpka, PKA_ModRedInTypeDef *in); void PKA_ModInv_Set(PKA_HandleTypeDef *hpka, PKA_ModInvInTypeDef *in); void PKA_MontgomeryParam_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint8_t *pOp1); -void PKA_ARI_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint32_t *pOp1, const uint32_t *pOp2, const uint8_t *pOp3); +void PKA_ARI_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint32_t *pOp1, const uint32_t *pOp2, + const uint8_t *pOp3); /** * @} */ @@ -311,8 +312,8 @@ void PKA_ARI_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint32_t *p */ /** @defgroup PKA_Exported_Functions_Group1 Initialization and de-initialization functions - * @brief Initialization and de-initialization functions - * + * @brief Initialization and de-initialization functions + * @verbatim =============================================================================== ##### Initialization and de-initialization functions ##### @@ -411,7 +412,7 @@ HAL_StatusTypeDef HAL_PKA_DeInit(PKA_HandleTypeDef *hpka) hpka->State = HAL_PKA_STATE_BUSY; /* Reset the control register */ - /* This abort any operation in progress (PKA RAM content is not guaranted in this case) */ + /* This abort any operation in progress (PKA RAM content is not guaranteed in this case) */ hpka->Instance->CR = 0; /* Reset any pending flag */ @@ -489,7 +490,8 @@ __weak void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka) * @param pCallback pointer to the Callback function * @retval HAL status */ -HAL_StatusTypeDef HAL_PKA_RegisterCallback(PKA_HandleTypeDef *hpka, HAL_PKA_CallbackIDTypeDef CallbackID, pPKA_CallbackTypeDef pCallback) +HAL_StatusTypeDef HAL_PKA_RegisterCallback(PKA_HandleTypeDef *hpka, HAL_PKA_CallbackIDTypeDef CallbackID, + pPKA_CallbackTypeDef pCallback) { HAL_StatusTypeDef status = HAL_OK; @@ -649,8 +651,8 @@ HAL_StatusTypeDef HAL_PKA_UnRegisterCallback(PKA_HandleTypeDef *hpka, HAL_PKA_Ca */ /** @defgroup PKA_Exported_Functions_Group2 IO operation functions - * @brief IO operation functions - * + * @brief IO operation functions + * @verbatim =============================================================================== ##### IO operation functions ##### @@ -864,7 +866,8 @@ HAL_StatusTypeDef HAL_PKA_ECDSASign_IT(PKA_HandleTypeDef *hpka, PKA_ECDSASignInT * @param out Output information * @param outExt Additional Output information (facultative) */ -void HAL_PKA_ECDSASign_GetResult(PKA_HandleTypeDef *hpka, PKA_ECDSASignOutTypeDef *out, PKA_ECDSASignOutExtParamTypeDef *outExt) +void HAL_PKA_ECDSASign_GetResult(PKA_HandleTypeDef *hpka, PKA_ECDSASignOutTypeDef *out, + PKA_ECDSASignOutExtParamTypeDef *outExt) { uint32_t size; @@ -902,7 +905,8 @@ HAL_StatusTypeDef HAL_PKA_ECDSAVerif(PKA_HandleTypeDef *hpka, PKA_ECDSAVerifInTy } /** - * @brief Verify the validity of a signature using elliptic curves over prime fields in non-blocking mode with Interrupt. + * @brief Verify the validity of a signature using elliptic curves + * over prime fields in non-blocking mode with Interrupt. * @param hpka PKA handle * @param in Input information * @retval HAL status @@ -1012,7 +1016,7 @@ HAL_StatusTypeDef HAL_PKA_PointCheck_IT(PKA_HandleTypeDef *hpka, PKA_PointCheckI */ uint32_t HAL_PKA_PointCheck_IsOnCurve(PKA_HandleTypeDef const *const hpka) { - #define PKA_POINT_IS_ON_CURVE 0UL +#define PKA_POINT_IS_ON_CURVE 0UL /* Invert the value of the PKA RAM containing the result of the operation */ return (hpka->Instance->RAM[PKA_POINT_CHECK_OUT_ERROR] == PKA_POINT_IS_ON_CURVE) ? 1UL : 0UL; } @@ -1633,8 +1637,8 @@ __weak void HAL_PKA_ErrorCallback(PKA_HandleTypeDef *hpka) */ /** @defgroup PKA_Exported_Functions_Group3 Peripheral State and Error functions - * @brief Peripheral State and Error functions - * + * @brief Peripheral State and Error functions + * @verbatim =============================================================================== ##### Peripheral State and Error functions ##### @@ -1661,7 +1665,7 @@ HAL_PKA_StateTypeDef HAL_PKA_GetState(PKA_HandleTypeDef *hpka) * @brief Return the PKA error code. * @param hpka PKA handle * @retval PKA error code -*/ + */ uint32_t HAL_PKA_GetError(PKA_HandleTypeDef *hpka) { /* Return PKA handle error code */ @@ -1944,7 +1948,8 @@ HAL_StatusTypeDef PKA_Process(PKA_HandleTypeDef *hpka, uint32_t mode, uint32_t T tickstart = HAL_GetTick(); /* Set the mode and deactivate the interrupts */ - MODIFY_REG(hpka->Instance->CR, PKA_CR_MODE | PKA_CR_PROCENDIE | PKA_CR_RAMERRIE | PKA_CR_ADDRERRIE, mode << PKA_CR_MODE_Pos); + MODIFY_REG(hpka->Instance->CR, PKA_CR_MODE | PKA_CR_PROCENDIE | PKA_CR_RAMERRIE | PKA_CR_ADDRERRIE, + mode << PKA_CR_MODE_Pos); /* Start the computation */ hpka->Instance->CR |= PKA_CR_START; @@ -2002,7 +2007,8 @@ HAL_StatusTypeDef PKA_Process_IT(PKA_HandleTypeDef *hpka, uint32_t mode) hpka->ErrorCode = HAL_PKA_ERROR_NONE; /* Set the mode and activate interrupts */ - MODIFY_REG(hpka->Instance->CR, PKA_CR_MODE | PKA_CR_PROCENDIE | PKA_CR_RAMERRIE | PKA_CR_ADDRERRIE, (mode << PKA_CR_MODE_Pos) | PKA_CR_PROCENDIE | PKA_CR_RAMERRIE | PKA_CR_ADDRERRIE); + MODIFY_REG(hpka->Instance->CR, PKA_CR_MODE | PKA_CR_PROCENDIE | PKA_CR_RAMERRIE | PKA_CR_ADDRERRIE, + (mode << PKA_CR_MODE_Pos) | PKA_CR_PROCENDIE | PKA_CR_RAMERRIE | PKA_CR_ADDRERRIE); /* Start the computation */ hpka->Instance->CR |= PKA_CR_START; @@ -2066,8 +2072,9 @@ void PKA_ModExpFastMode_Set(PKA_HandleTypeDef *hpka, PKA_ModExpFastModeInTypeDef __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_MODULAR_EXP_IN_MODULUS + (in->OpSize / 4UL)); /* Move the Montgomery parameter to PKA RAM */ - PKA_Memcpy_u32_to_u32(&hpka->Instance->RAM[PKA_MODULAR_EXP_IN_MONTGOMERY_PARAM], in->pMontgomeryParam, in->expSize / 4UL); - __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_MODULAR_EXP_IN_MONTGOMERY_PARAM + (in->expSize / 4UL)); + PKA_Memcpy_u32_to_u32(&hpka->Instance->RAM[PKA_MODULAR_EXP_IN_MONTGOMERY_PARAM], in->pMontgomeryParam, + in->OpSize / 4UL); + __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_MODULAR_EXP_IN_MONTGOMERY_PARAM + (in->OpSize / 4UL)); } @@ -2153,11 +2160,13 @@ void PKA_ECDSAVerif_Set(PKA_HandleTypeDef *hpka, PKA_ECDSAVerifInTypeDef *in) __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_ECDSA_VERIF_IN_INITIAL_POINT_Y + ((in->modulusSize + 3UL) / 4UL)); /* Move the input parameters public-key curve point Q coordinate xQ to PKA RAM */ - PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_ECDSA_VERIF_IN_PUBLIC_KEY_POINT_X], in->pPubKeyCurvePtX, in->modulusSize); + PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_ECDSA_VERIF_IN_PUBLIC_KEY_POINT_X], in->pPubKeyCurvePtX, + in->modulusSize); __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_ECDSA_VERIF_IN_PUBLIC_KEY_POINT_X + ((in->modulusSize + 3UL) / 4UL)); /* Move the input parameters public-key curve point Q coordinate xQ to PKA RAM */ - PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_ECDSA_VERIF_IN_PUBLIC_KEY_POINT_Y], in->pPubKeyCurvePtY, in->modulusSize); + PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_ECDSA_VERIF_IN_PUBLIC_KEY_POINT_Y], in->pPubKeyCurvePtY, + in->modulusSize); __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_ECDSA_VERIF_IN_PUBLIC_KEY_POINT_Y + ((in->modulusSize + 3UL) / 4UL)); /* Move the input parameters signature part r to PKA RAM */ @@ -2276,12 +2285,12 @@ void PKA_ECCMul_Set(PKA_HandleTypeDef *hpka, PKA_ECCMulInTypeDef *in) __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_ECC_SCALAR_MUL_IN_K + ((in->scalarMulSize + 3UL) / 4UL)); /* Move the input parameters Point P coordinate x to PKA RAM */ - PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_POINT_CHECK_IN_INITIAL_POINT_X], in->pointX, in->modulusSize); - __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_POINT_CHECK_IN_INITIAL_POINT_X + ((in->modulusSize + 3UL) / 4UL)); + PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_ECC_SCALAR_MUL_IN_INITIAL_POINT_X], in->pointX, in->modulusSize); + __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_ECC_SCALAR_MUL_IN_INITIAL_POINT_X + ((in->modulusSize + 3UL) / 4UL)); /* Move the input parameters Point P coordinate y to PKA RAM */ - PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_POINT_CHECK_IN_INITIAL_POINT_Y], in->pointY, in->modulusSize); - __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_POINT_CHECK_IN_INITIAL_POINT_Y + ((in->modulusSize + 3UL) / 4UL)); + PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_ECC_SCALAR_MUL_IN_INITIAL_POINT_Y], in->pointY, in->modulusSize); + __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_ECC_SCALAR_MUL_IN_INITIAL_POINT_Y + ((in->modulusSize + 3UL) / 4UL)); } @@ -2323,7 +2332,8 @@ void PKA_ECCMulFastMode_Set(PKA_HandleTypeDef *hpka, PKA_ECCMulFastModeInTypeDef __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_POINT_CHECK_IN_INITIAL_POINT_Y + ((in->modulusSize + 3UL) / 4UL)); /* Move the Montgomery parameter to PKA RAM */ - PKA_Memcpy_u32_to_u32(&hpka->Instance->RAM[PKA_ECC_SCALAR_MUL_IN_MONTGOMERY_PARAM], in->pMontgomeryParam, (in->modulusSize + 3UL) / 4UL); + PKA_Memcpy_u32_to_u32(&hpka->Instance->RAM[PKA_ECC_SCALAR_MUL_IN_MONTGOMERY_PARAM], in->pMontgomeryParam, + (in->modulusSize + 3UL) / 4UL); __PKA_RAM_PARAM_END(hpka->Instance->RAM, PKA_ECC_SCALAR_MUL_IN_MONTGOMERY_PARAM + ((in->modulusSize + 3UL) / 4UL)); } /** @@ -2375,10 +2385,22 @@ void PKA_ModRed_Set(PKA_HandleTypeDef *hpka, PKA_ModRedInTypeDef *in) */ void PKA_MontgomeryParam_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint8_t *pOp1) { + uint32_t bytetoskip = 0UL; + uint32_t newSize; + if (pOp1 != NULL) { + /* Count the number of zero bytes */ + while ((bytetoskip < size) && (pOp1[bytetoskip] == 0UL)) + { + bytetoskip++; + } + + /* Get new size after skipping zero bytes */ + newSize = size - bytetoskip; + /* Get the number of bit per operand */ - hpka->Instance->RAM[PKA_MONTGOMERY_PARAM_IN_MOD_NB_BITS] = PKA_GetOptBitSize_u8(size, *pOp1); + hpka->Instance->RAM[PKA_MONTGOMERY_PARAM_IN_MOD_NB_BITS] = PKA_GetOptBitSize_u8(newSize, pOp1[bytetoskip]); /* Move the input parameters pOp1 to PKA RAM */ PKA_Memcpy_u8_to_u32(&hpka->Instance->RAM[PKA_MONTGOMERY_PARAM_IN_MODULUS], pOp1, size); @@ -2394,7 +2416,8 @@ void PKA_MontgomeryParam_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const * @param pOp2 Generic pointer to input data * @param pOp3 Generic pointer to input data */ -void PKA_ARI_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint32_t *pOp1, const uint32_t *pOp2, const uint8_t *pOp3) +void PKA_ARI_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint32_t *pOp1, const uint32_t *pOp2, + const uint8_t *pOp3) { /* Get the number of bit per operand */ hpka->Instance->RAM[PKA_ARITHMETIC_ALL_OPS_NB_BITS] = PKA_GetBitSize_u32(size); @@ -2434,5 +2457,3 @@ void PKA_ARI_Set(PKA_HandleTypeDef *hpka, const uint32_t size, const uint32_t *p /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c index d91020508..82f210eb8 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -718,4 +717,4 @@ __weak void HAL_PWR_PVDCallback(void) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c index 37ede3ebe..04dbfca55 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -868,7 +867,7 @@ HAL_StatusTypeDef HAL_PWREx_ConfigSMPS(PWR_SMPSTypeDef *sConfigSMPS) assert_param(IS_PWR_SMPS_OUTPUT_VOLTAGE(sConfigSMPS->OutputVoltage)); __IO const uint32_t OutputVoltageLevel_calibration = (((*SMPS_VOLTAGE_CAL_ADDR) & SMPS_VOLTAGE_CAL) >> SMPS_VOLTAGE_CAL_POS); /* SMPS output voltage level calibrated in production */ - int32_t TrimmingSteps; /* Trimming steps between theorical output voltage and calibrated output voltage */ + int32_t TrimmingSteps; /* Trimming steps between theoretical output voltage and calibrated output voltage */ int32_t OutputVoltageLevelTrimmed; /* SMPS output voltage level after calibration: trimming value added to required level */ if(OutputVoltageLevel_calibration == 0UL) @@ -1366,4 +1365,3 @@ __weak void HAL_PWREx_PVM3Callback(void) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_qspi.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_qspi.c index 26391fd5f..fdddf2d12 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_qspi.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_qspi.c @@ -14,6 +14,17 @@ * + Errors management and abort functionality * * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim =============================================================================== ##### How to use this driver ##### @@ -193,17 +204,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -307,9 +307,6 @@ HAL_StatusTypeDef HAL_QSPI_Init(QSPI_HandleTypeDef *hqspi) assert_param(IS_QSPI_CS_HIGH_TIME(hqspi->Init.ChipSelectHighTime)); assert_param(IS_QSPI_CLOCK_MODE(hqspi->Init.ClockMode)); - /* Process locked */ - __HAL_LOCK(hqspi); - if(hqspi->State == HAL_QSPI_STATE_RESET) { /* Allocate lock resource and initialize it */ @@ -393,9 +390,6 @@ HAL_StatusTypeDef HAL_QSPI_DeInit(QSPI_HandleTypeDef *hqspi) return HAL_ERROR; } - /* Process locked */ - __HAL_LOCK(hqspi); - /* Disable the QSPI Peripheral Clock */ __HAL_QSPI_DISABLE(hqspi); @@ -721,7 +715,7 @@ void HAL_QSPI_IRQHandler(QSPI_HandleTypeDef *hqspi) /* Change state of QSPI */ hqspi->State = HAL_QSPI_STATE_READY; - + /* Error callback */ #if (USE_HAL_QSPI_REGISTER_CALLBACKS == 1) hqspi->ErrorCallback(hqspi); @@ -1350,10 +1344,10 @@ HAL_StatusTypeDef HAL_QSPI_Transmit_DMA(QSPI_HandleTypeDef *hqspi, uint8_t *pDat { /* Process unlocked */ __HAL_UNLOCK(hqspi); - + /* Enable the QSPI transfer error Interrupt */ __HAL_QSPI_ENABLE_IT(hqspi, QSPI_IT_TE); - + /* Enable the DMA transfer by setting the DMAEN bit in the QSPI CR register */ SET_BIT(hqspi->Instance->CR, QUADSPI_CR_DMAEN); } @@ -1498,10 +1492,10 @@ HAL_StatusTypeDef HAL_QSPI_Receive_DMA(QSPI_HandleTypeDef *hqspi, uint8_t *pData /* Process unlocked */ __HAL_UNLOCK(hqspi); - + /* Enable the QSPI transfer error Interrupt */ __HAL_QSPI_ENABLE_IT(hqspi, QSPI_IT_TE); - + /* Enable the DMA transfer by setting the DMAEN bit in the QSPI CR register */ SET_BIT(hqspi->Instance->CR, QUADSPI_CR_DMAEN); } @@ -2329,7 +2323,7 @@ HAL_StatusTypeDef HAL_QSPI_Abort_IT(QSPI_HandleTypeDef *hqspi) { /* Change state of QSPI */ hqspi->State = HAL_QSPI_STATE_READY; - + /* Abort Complete callback */ #if (USE_HAL_QSPI_REGISTER_CALLBACKS == 1) hqspi->AbortCpltCallback(hqspi); @@ -2734,6 +2728,4 @@ static void QSPI_Config(QSPI_HandleTypeDef *hqspi, QSPI_CommandTypeDef *cmd, uin * @} */ -#endif /* defined(QUADSPI) || defined(QUADSPI1) || defined(QUADSPI2) */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ +#endif /* defined(QUADSPI) */ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c index 96ee2780c..8e421114e 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c @@ -7,7 +7,17 @@ * functionalities of the Reset and Clock Control (RCC) peripheral: * + Initialization and de-initialization functions * + Peripheral Control functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### RCC specific features ##### @@ -36,17 +46,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -92,17 +91,14 @@ /** @defgroup RCC_Private_Macros RCC Private Macros * @{ */ -#define __MCO1_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() -#define MCO1_GPIO_PORT GPIOA -#define MCO1_PIN GPIO_PIN_8 -#define __MCO2_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() -#define MCO2_GPIO_PORT GPIOB -#define MCO2_PIN GPIO_PIN_6 +#define RCC_GET_MCO_GPIO_PIN(__RCC_MCOx__) ((__RCC_MCOx__) & GPIO_PIN_MASK) + +#define RCC_GET_MCO_GPIO_AF(__RCC_MCOx__) (((__RCC_MCOx__) & RCC_MCO_GPIOAF_MASK) >> RCC_MCO_GPIOAF_POS) + +#define RCC_GET_MCO_GPIO_INDEX(__RCC_MCOx__) (((__RCC_MCOx__) & RCC_MCO_GPIOPORT_MASK) >> RCC_MCO_GPIOPORT_POS) -#define __MCO3_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() -#define MCO3_GPIO_PORT GPIOA -#define MCO3_PIN GPIO_PIN_15 +#define RCC_GET_MCO_GPIO_PORT(__RCC_MCOx__) (IOPORT_BASE + ((0x00000400UL) * RCC_GET_MCO_GPIO_INDEX((__RCC_MCOx__)))) #define RCC_PLL_OSCSOURCE_CONFIG(__HAL_RCC_PLLSOURCE__) \ (MODIFY_REG(RCC->PLLCFGR, RCC_PLLCFGR_PLLSRC, (uint32_t)(__HAL_RCC_PLLSOURCE__))) @@ -154,7 +150,7 @@ static HAL_StatusTypeDef RCC_SetFlashLatency(uint32_t Flash_ClkSrcFreq, uint32_t (+) HSI (high-speed internal): 16 MHz factory-trimmed RC used directly or through the PLL as System clock source. - (+) MSI (Mutiple Speed Internal): Its frequency is software trimmable from 100KHZ to 48MHZ. + (+) MSI (Multiple Speed Internal): Its frequency is software trimmable from 100KHZ to 48MHZ. It can be used to generate the clock for the USB FS (48 MHz). The number of flash wait states is automatically adjusted when MSI range is updated with HAL_RCC_OscConfig() and the MSI is used as System clock source. @@ -1281,7 +1277,7 @@ HAL_StatusTypeDef HAL_RCC_ClockConfig(RCC_ClkInitTypeDef *RCC_ClkInitStruct, ui [..] This subsection provides a set of functions allowing to: - (+) Ouput clock to MCO pin. + (+) Output clock to MCO pin. (+) Retrieve current clock frequencies. (+) Enable the Clock Security System. @@ -1290,23 +1286,23 @@ HAL_StatusTypeDef HAL_RCC_ClockConfig(RCC_ClkInitTypeDef *RCC_ClkInitStruct, ui */ /** - * @brief Select the clock source to output on MCO1 pin(PA8) or MC02 pin (PB6) or MCO3 pin (PA15). + * @brief Select the clock source to output on MCO1 pin(PA8) or MCO2 pin (PB6) or MCO3 pin (PA15). * @note PA8, PB6 or PA15 should be configured in alternate function mode. * @param RCC_MCOx specifies the output direction for the clock source. - * @arg @ref RCC_MCO1 Clock source to output on MCO1 pin(PA8) - * @arg @ref RCC_MCO2 Clock source to output on MCO2 pin(PB6) - * @arg @ref RCC_MCO3 Clock source to output on MCO3 pin(PA15) + * @arg @ref RCC_MCO1_PA8 Clock source to output on MCO1 pin(PA8) + * @arg @ref RCC_MCO2_PB6 Clock source to output on MCO2 pin(PB6) + * @arg @ref RCC_MCO3_PA15 Clock source to output on MCO3 pin(PA15) * @param RCC_MCOSource specifies the clock source to output. * This parameter can be one of the following values: * @arg @ref RCC_MCO1SOURCE_NOCLOCK MCO output disabled, no clock on MCO - * @arg @ref RCC_MCO1SOURCE_SYSCLK system clock selected as MCO source - * @arg @ref RCC_MCO1SOURCE_MSI MSI clock selected as MCO source - * @arg @ref RCC_MCO1SOURCE_HSI HSI clock selected as MCO source - * @arg @ref RCC_MCO1SOURCE_HSE HSE clock selected as MCO sourcee + * @arg @ref RCC_MCO1SOURCE_SYSCLK system clock selected as MCO source + * @arg @ref RCC_MCO1SOURCE_MSI MSI clock selected as MCO source + * @arg @ref RCC_MCO1SOURCE_HSI HSI clock selected as MCO source + * @arg @ref RCC_MCO1SOURCE_HSE HSE clock selected as MCO sourcee * @arg @ref RCC_MCO1SOURCE_PLLCLK main PLL clock selected as MCO source - * @arg @ref RCC_MCO1SOURCE_LSI1 LSI1 clock selected as MCO source - * @arg @ref RCC_MCO1SOURCE_LSI2 LSI2 clock selected as MCO source - * @arg @ref RCC_MCO1SOURCE_LSE LSE clock selected as MCO source + * @arg @ref RCC_MCO1SOURCE_LSI1 LSI1 clock selected as MCO source + * @arg @ref RCC_MCO1SOURCE_LSI2 LSI2 clock selected as MCO source + * @arg @ref RCC_MCO1SOURCE_LSE LSE clock selected as MCO source * @arg @ref RCC_MCO1SOURCE_HSI48 HSI48 clock selected as MCO source for devices with HSI48 * @arg @ref RCC_MCO1SOURCE_HSE_BEFORE_STAB HSE clock before stabilization selected as MCO source * @param RCC_MCODiv specifies the MCO prescaler. @@ -1320,63 +1316,65 @@ HAL_StatusTypeDef HAL_RCC_ClockConfig(RCC_ClkInitTypeDef *RCC_ClkInitStruct, ui */ void HAL_RCC_MCOConfig(uint32_t RCC_MCOx, uint32_t RCC_MCOSource, uint32_t RCC_MCODiv) { - GPIO_InitTypeDef GPIO_InitStruct; + GPIO_InitTypeDef gpio_initstruct; + uint32_t mcoindex; + uint32_t mco_gpio_index; + GPIO_TypeDef * mco_gpio_port; /* Check the parameters */ assert_param(IS_RCC_MCO(RCC_MCOx)); - assert_param(IS_RCC_MCODIV(RCC_MCODiv)); - assert_param(IS_RCC_MCO1SOURCE(RCC_MCOSource)); /* Common GPIO init parameters */ - GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; - GPIO_InitStruct.Pull = GPIO_NOPULL; + gpio_initstruct.Mode = GPIO_MODE_AF_PP; + gpio_initstruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + gpio_initstruct.Pull = GPIO_NOPULL; - /* RCC_MCO1 */ - if (RCC_MCOx == RCC_MCO1) - { - /* MCO1 Clock Enable */ - __MCO1_CLK_ENABLE(); - /* Configue the MCO1 pin in alternate function mode */ - GPIO_InitStruct.Pin = MCO1_PIN; - GPIO_InitStruct.Alternate = GPIO_AF0_MCO; - HAL_GPIO_Init(MCO1_GPIO_PORT, &GPIO_InitStruct); + /* Get MCOx selection */ + mcoindex = RCC_MCOx & RCC_MCO_INDEX_MASK; + + /* Get MCOx GPIO Port */ + mco_gpio_port = (GPIO_TypeDef *) RCC_GET_MCO_GPIO_PORT(RCC_MCOx); + + /* MCOx Clock Enable */ + mco_gpio_index = RCC_GET_MCO_GPIO_INDEX(RCC_MCOx); + SET_BIT(RCC->AHB2ENR, (1UL << mco_gpio_index )); + /* Configure the MCOx pin in alternate function mode */ + gpio_initstruct.Pin = RCC_GET_MCO_GPIO_PIN(RCC_MCOx); + gpio_initstruct.Alternate = RCC_GET_MCO_GPIO_AF(RCC_MCOx); + HAL_GPIO_Init(mco_gpio_port, &gpio_initstruct); + + if (mcoindex == RCC_MCO1_INDEX) + { + assert_param(IS_RCC_MCODIV(RCC_MCODiv)); + assert_param(IS_RCC_MCO1SOURCE(RCC_MCOSource)); + /* Mask MCOSEL[] and MCOPRE[] bits then set MCO clock source and prescaler */ + LL_RCC_ConfigMCO(RCC_MCOSource, RCC_MCODiv); } - else if (RCC_MCOx == RCC_MCO2) + else if (RCC_MCOx == RCC_MCO2_INDEX) { - /* MCO2 Clock Enable */ - __MCO2_CLK_ENABLE(); - /* Configue the MCO2 pin in alternate function mode */ - GPIO_InitStruct.Pin = MCO2_PIN; - GPIO_InitStruct.Alternate = GPIO_AF0_MCO; - HAL_GPIO_Init(MCO2_GPIO_PORT, &GPIO_InitStruct); - + assert_param(IS_RCC_MCODIV(RCC_MCODiv)); + assert_param(IS_RCC_MCO2SOURCE(RCC_MCOSource)); + /* Mask MCOSEL[] and MCOPRE[] bits then set MCO clock source and prescaler */ + LL_RCC_ConfigMCO(RCC_MCOSource, RCC_MCODiv); } #if defined(RCC_MCO3_SUPPORT) - else if (RCC_MCOx == RCC_MCO3) + else if (RCC_MCOx == RCC_MCO3_INDEX) { - /* MCO3 Clock Enable */ - __MCO3_CLK_ENABLE(); - /* Configue the MCO3 pin in alternate function mode */ - GPIO_InitStruct.Pin = MCO3_PIN; - GPIO_InitStruct.Alternate = GPIO_AF6_MCO; - HAL_GPIO_Init(MCO3_GPIO_PORT, &GPIO_InitStruct); + assert_param(IS_RCC_MCODIV(RCC_MCODiv)); + assert_param(IS_RCC_MCO3SOURCE(RCC_MCOSource)); + /* Mask MCOSEL[] and MCOPRE[] bits then set MCO clock source and prescaler */ + LL_RCC_ConfigMCO(RCC_MCOSource, RCC_MCODiv); } -#endif +#endif /* RCC_MCO3_SUPPORT */ else - { - ; - } - - /* Mask MCOSEL[] and MCOPRE[] bits then set MCO clock source and prescaler */ - LL_RCC_ConfigMCO(RCC_MCOSource, RCC_MCODiv); + {} } /** * @brief Return the SYSCLK frequency. * - * @note The system computed by this function is not the real + * @note The system computed by this function is not the real * frequency in the chip. It is calculated based on the predefined * constant and the selected clock source: * @note If SYSCLK source is MSI, function returns values based on MSI range @@ -1859,5 +1857,3 @@ static HAL_StatusTypeDef RCC_SetFlashLatency(uint32_t Flash_ClkSrcFreq, uint32_t /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c index 5e9b35733..21fdeb6d9 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c @@ -8,17 +8,15 @@ * + Extended Peripheral Control functions * + Extended Clock management functions * + Extended Clock Recovery System Control functions - * ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -696,6 +694,19 @@ uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk) /* Nothing to do as frequency already initialized to 0U */ } } +#if defined(SAI1) + else if (rngClockSource == RCC_RNGCLKSOURCE_PLLSAI1) /* PLLSAI1 clock used as SAI1 clock source */ + { + if (LL_RCC_PLLSAI1_IsReady() == 1U) + { + frequency = RCC_PLLSAI1_GetFreqDomain_Q(); + } + else + { + /* Nothing to do as frequency already initialized to 0U */ + } + } +#endif /* SAI1 */ else /* HSI48 clock divided by 3 used as RNG clock source */ { #if defined(RCC_HSI48_SUPPORT) @@ -1111,10 +1122,14 @@ uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk) * @brief Return the RNG clock source * @retval The RNG clock source can be one of the following values: * @arg @ref RCC_RNGCLKSOURCE_HSI48 HSI48 clock divided by 3 selected as RNG clock - * @arg @ref RCC_RNGCLKSOURCE_PLL PLL "Q" clock divided by 3 selected as RNG clock - * @arg @ref RCC_RNGCLKSOURCE_MSI MSI clock divided by 3 selected as RNG clock - * @arg @ref RCC_RNGCLKSOURCE_LSI LSI clock selected as RNG clock - * @arg @ref RCC_RNGCLKSOURCE_LSE LSE clock selected as RNG clock + * @arg @ref RCC_RNGCLKSOURCE_PLL PLL "Q" clock divided by 3 selected as RNG clock + * @arg @ref RCC_RNGCLKSOURCE_MSI MSI clock divided by 3 selected as RNG clock + * @arg @ref RCC_RNGCLKSOURCE_PLLSAI1 PLLSAI1 "Q" clock selected as RNG clock (*) + * @arg @ref RCC_RNGCLKSOURCE_LSI LSI clock selected as RNG clock + * @arg @ref RCC_RNGCLKSOURCE_LSE LSE clock selected as RNG clock + * + * (*) Value not defined in all devices. + * */ uint32_t HAL_RCCEx_GetRngCLKSource(void) { @@ -1370,7 +1385,7 @@ void HAL_RCCEx_LSCOConfig(uint32_t RCC_LSCOx, uint32_t RCC_LSCOSource) { /* LSCO1 Clock Enable */ __LSCO1_CLK_ENABLE(); - /* Configue the LSCO1 pin in alternate function mode */ + /* Configure the LSCO1 pin in alternate function mode */ GPIO_InitStruct.Pin = LSCO1_PIN; GPIO_InitStruct.Alternate = GPIO_AF0_LSCO; HAL_GPIO_Init(LSCO1_GPIO_PORT, &GPIO_InitStruct); @@ -1380,7 +1395,7 @@ void HAL_RCCEx_LSCOConfig(uint32_t RCC_LSCOx, uint32_t RCC_LSCOSource) { /* LSCO2 Clock Enable */ __LSCO2_CLK_ENABLE(); - /* Configue the LSCO2 pin in alternate function mode */ + /* Configure the LSCO2 pin in alternate function mode */ GPIO_InitStruct.Pin = LSCO2_PIN; GPIO_InitStruct.Alternate = GPIO_AF0_LSCO; HAL_GPIO_Init(LSCO2_GPIO_PORT, &GPIO_InitStruct); @@ -1391,7 +1406,7 @@ void HAL_RCCEx_LSCOConfig(uint32_t RCC_LSCOx, uint32_t RCC_LSCOSource) { /* LSCO3 Clock Enable */ __LSCO3_CLK_ENABLE(); - /* Configue the LSCO3 pin in alternate function mode */ + /* Configure the LSCO3 pin in alternate function mode */ GPIO_InitStruct.Pin = LSCO3_PIN; GPIO_InitStruct.Alternate = GPIO_AF6_LSCO; HAL_GPIO_Init(LSCO3_GPIO_PORT, &GPIO_InitStruct); @@ -1572,7 +1587,7 @@ HAL_StatusTypeDef HAL_RCCEx_TrimOsc(uint32_t OscillatorType) ##### Extended Clock Recovery System Control functions ##### =============================================================================== [..] - For devices with Clock Recovery System feature (CRS), RCC Extention HAL driver can be used as follows: + For devices with Clock Recovery System feature (CRS), RCC Extended HAL driver can be used as follows: (#) In System clock config, HSI48 needs to be enabled @@ -1583,7 +1598,7 @@ HAL_StatusTypeDef HAL_RCCEx_TrimOsc(uint32_t OscillatorType) (+++) Default values can be set for frequency Error Measurement (reload and error limit) and also HSI48 oscillator smooth trimming. (+++) Macro __HAL_RCC_CRS_RELOADVALUE_CALCULATE can be also used to calculate - directly reload value with target and sychronization frequencies values + directly reload value with target and synchronization frequencies values (##) Call function HAL_RCCEx_CRSConfig which (+++) Resets CRS registers to their default values. (+++) Configures CRS registers with synchronization configuration @@ -2357,6 +2372,3 @@ static uint32_t RCC_PLLSAI1_GetFreqDomain_Q(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c index c27d09b50..582a2f774 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c @@ -9,6 +9,17 @@ * + Peripheral Control functions * + Peripheral State functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -56,7 +67,7 @@ [..] By default, after the HAL_RNG_Init() and when the state is HAL_RNG_STATE_RESET all callbacks are set to the corresponding weak (surcharged) functions: - exampleHAL_RNG_ErrorCallback(). + example HAL_RNG_ErrorCallback(). Exception done for MspInit and MspDeInit functions that are respectively reset to the legacy weak (surcharged) functions in the HAL_RNG_Init() and HAL_RNG_DeInit() only when these callbacks are null (not registered beforehand). @@ -79,17 +90,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -129,8 +129,8 @@ */ /** @addtogroup RNG_Exported_Functions_Group1 - * @brief Initialization and configuration functions - * + * @brief Initialization and configuration functions + * @verbatim =============================================================================== ##### Initialization and configuration functions ##### @@ -373,7 +373,7 @@ HAL_StatusTypeDef HAL_RNG_RegisterCallback(RNG_HandleTypeDef *hrng, HAL_RNG_Call /** * @brief Unregister an RNG Callback - * RNG callabck is redirected to the weak predefined callback + * RNG callback is redirected to the weak predefined callback * @param hrng RNG handle * @param CallbackID ID of the callback to be unregistered * This parameter can be one of the following values: @@ -520,8 +520,8 @@ HAL_StatusTypeDef HAL_RNG_UnRegisterReadyDataCallback(RNG_HandleTypeDef *hrng) */ /** @addtogroup RNG_Exported_Functions_Group2 - * @brief Peripheral Control functions - * + * @brief Peripheral Control functions + * @verbatim =============================================================================== ##### Peripheral Control functions ##### @@ -779,8 +779,8 @@ __weak void HAL_RNG_ErrorCallback(RNG_HandleTypeDef *hrng) /** @addtogroup RNG_Exported_Functions_Group3 - * @brief Peripheral State functions - * + * @brief Peripheral State functions + * @verbatim =============================================================================== ##### Peripheral State functions ##### @@ -808,7 +808,7 @@ HAL_RNG_StateTypeDef HAL_RNG_GetState(RNG_HandleTypeDef *hrng) * @brief Return the RNG handle error code. * @param hrng: pointer to a RNG_HandleTypeDef structure. * @retval RNG Error Code -*/ + */ uint32_t HAL_RNG_GetError(RNG_HandleTypeDef *hrng) { /* Return RNG Error Code */ @@ -833,5 +833,3 @@ uint32_t HAL_RNG_GetError(RNG_HandleTypeDef *hrng) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c index ec315fb12..69fcea225 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c @@ -15,6 +15,17 @@ * + RTC Tamper and TimeStamp Pins Selection * + Interrupts and flags management * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim =============================================================================== ##### RTC Operating Condition ##### @@ -147,19 +158,7 @@ not defined, the callback registration feature is not available and all callbacks are set to the corresponding weak functions. - @endverbatim - - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * + @endverbatim ****************************************************************************** */ @@ -584,7 +583,7 @@ HAL_StatusTypeDef HAL_RTC_RegisterCallback(RTC_HandleTypeDef *hrtc, HAL_RTC_Call /** * @brief Unregister an RTC Callback - * RTC callabck is redirected to the weak predefined callback + * RTC callback is redirected to the weak predefined callback * @param hrtc RTC handle * @param CallbackID ID of the callback to be unregistered * This parameter can be one of the following values: @@ -1075,7 +1074,7 @@ void HAL_RTC_DST_Add1Hour(RTC_HandleTypeDef *hrtc) } /** - * @brief Daylight Saving Time, Substract one hour from the calendar in one + * @brief Daylight Saving Time, Subtract one hour from the calendar in one * single operation without going through the initialization procedure. * @param hrtc RTC handle * @retval None @@ -1930,5 +1929,3 @@ uint8_t RTC_Bcd2ToByte(uint8_t Value) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c index 4e4f28c94..3b9b9cdde 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c @@ -11,6 +11,17 @@ * + Extended Control functions * + Extended RTC features functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -85,18 +96,7 @@ (+) To read the RTC Backup Data registers, use the HAL_RTCEx_BKUPRead() function. - @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * + @endverbatim ****************************************************************************** */ @@ -1908,10 +1908,6 @@ HAL_StatusTypeDef HAL_RTCEx_PollForAlarmBEvent(RTC_HandleTypeDef *hrtc, uint32_t * @} */ - /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai.c index 57b2abbc5..951ff172a 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai.c @@ -10,6 +10,17 @@ * + Peripheral Control functions * + Peripheral State functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -198,17 +209,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -1489,7 +1489,7 @@ HAL_StatusTypeDef HAL_SAI_Transmit_DMA(SAI_HandleTypeDef *hsai, uint8_t *pData, /* Enable SAI Tx DMA Request */ hsai->Instance->CR1 |= SAI_xCR1_DMAEN; - /* Wait untill FIFO is not empty */ + /* Wait until FIFO is not empty */ while ((hsai->Instance->SR & SAI_xSR_FLVL) == SAI_FIFOSTATUS_EMPTY) { /* Check for the Timeout */ @@ -2742,5 +2742,3 @@ static void SAI_DMAAbort(DMA_HandleTypeDef *hdma) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai_ex.c index 7200571a2..f912e29d7 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_sai_ex.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,5 +130,3 @@ HAL_StatusTypeDef HAL_SAIEx_ConfigPdmMicDelay(SAI_HandleTypeDef *hsai, SAIEx_Pdm /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard.c index b04eeef48..3e2dd2d6d 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard.c @@ -10,6 +10,17 @@ * + Peripheral Control functions * + Peripheral State and Error functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -166,17 +177,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -778,7 +778,7 @@ HAL_StatusTypeDef HAL_SMARTCARD_UnRegisterCallback(SMARTCARD_HandleTypeDef *hsma and HAL_SMARTCARD_ErrorCallback() user callback is executed. Transfer is kept ongoing on SMARTCARD side. If user wants to abort it, Abort services should be called by user. (##) Error is considered as Blocking : Transfer could not be completed properly and is aborted. - This concerns Frame Error in Interrupt mode tranmission, Overrun Error in Interrupt mode reception and all errors in DMA mode. + This concerns Frame Error in Interrupt mode transmission, Overrun Error in Interrupt mode reception and all errors in DMA mode. Error code is set to allow user to identify error type, and HAL_SMARTCARD_ErrorCallback() user callback is executed. @endverbatim @@ -2550,11 +2550,12 @@ static HAL_StatusTypeDef SMARTCARD_CheckIdleState(SMARTCARD_HandleTypeDef *hsmar } /** - * @brief Handle SMARTCARD Communication Timeout. + * @brief Handle SMARTCARD Communication Timeout. It waits + * until a flag is no longer in the specified status. * @param hsmartcard Pointer to a SMARTCARD_HandleTypeDef structure that contains * the configuration information for the specified SMARTCARD module. * @param Flag Specifies the SMARTCARD flag to check. - * @param Status The new Flag status (SET or RESET). + * @param Status The actual Flag status (SET or RESET). * @param Tickstart Tick start value * @param Timeout Timeout duration. * @retval HAL status @@ -3153,4 +3154,3 @@ static void SMARTCARD_RxISR_FIFOEN(SMARTCARD_HandleTypeDef *hsmartcard) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard_ex.c index 2f2c09891..1351cb4ac 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smartcard_ex.c @@ -8,6 +8,17 @@ * + Initialization and de-initialization functions * + Peripheral Control functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================= ##### SMARTCARD peripheral extended features ##### @@ -27,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -491,4 +491,3 @@ static void SMARTCARDEx_SetNbDataToProcess(SMARTCARD_HandleTypeDef *hsmartcard) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus.c index e00b46023..89581c292 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus.c @@ -10,6 +10,17 @@ * + IO operation functions * + Peripheral State and Errors functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -131,7 +142,7 @@ [..] For callback AddrCallback use dedicated register callbacks : HAL_SMBUS_UnRegisterAddrCallback. [..] - By default, after theHAL_SMBUS_Init() and when the state is HAL_I2C_STATE_RESET + By default, after the HAL_SMBUS_Init() and when the state is HAL_I2C_STATE_RESET all callbacks are set to the corresponding weak functions: examples HAL_SMBUS_MasterTxCpltCallback(), HAL_SMBUS_MasterRxCpltCallback(). Exception done for MspInit and MspDeInit functions that are @@ -145,7 +156,7 @@ in HAL_I2C_STATE_READY or HAL_I2C_STATE_RESET state, thus registered (user) MspInit/DeInit callbacks can be used during the Init/DeInit. Then, the user first registers the MspInit/MspDeInit user callbacks - using HAL_SMBUS_RegisterCallback() before calling HAL_SMBUS_DeInit() + using HAL_SMBUS_RegisterCallback() before calling HAL_SMBUS_DeInit() or HAL_SMBUS_Init() function. [..] When the compilation flag USE_HAL_SMBUS_REGISTER_CALLBACKS is set to 0 or @@ -156,18 +167,6 @@ (@) You can refer to the SMBUS HAL driver header file for more useful macros @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -2746,5 +2745,3 @@ static void SMBUS_ConvertOtherXferOptions(SMBUS_HandleTypeDef *hsmbus) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus_ex.c index 99c31b479..12492be75 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_smbus_ex.c @@ -7,6 +7,17 @@ * functionalities of SMBUS Extended peripheral: * + Extended features functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### SMBUS peripheral Extended features ##### @@ -15,26 +26,18 @@ [..] Comparing to other previous devices, the SMBUS interface for STM32WBxx devices contains the following additional features + (+) Disable or enable wakeup from Stop mode(s) (+) Disable or enable Fast Mode Plus ##### How to use this driver ##### ============================================================================== + (#) Configure the enable or disable of SMBUS Wake Up Mode using the functions : + (++) HAL_SMBUSEx_EnableWakeUp() + (++) HAL_SMBUSEx_DisableWakeUp() (#) Configure the enable or disable of fast mode plus driving capability using the functions : (++) HAL_SMBUSEx_EnableFastModePlus() (++) HAL_SMBUSEx_DisableFastModePlus() @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -62,15 +65,109 @@ * @{ */ -/** @defgroup SMBUSEx_Exported_Functions_Group1 Extended features functions - * @brief Extended features functions +/** @defgroup SMBUSEx_Exported_Functions_Group2 WakeUp Mode Functions + * @brief WakeUp Mode Functions * @verbatim =============================================================================== - ##### Extended features functions ##### + ##### WakeUp Mode Functions ##### =============================================================================== [..] This section provides functions allowing to: + (+) Configure Wake Up Feature + +@endverbatim + * @{ + */ + +/** + * @brief Enable SMBUS wakeup from Stop mode(s). + * @param hsmbus Pointer to a SMBUS_HandleTypeDef structure that contains + * the configuration information for the specified SMBUSx peripheral. + * @retval HAL status + */ +HAL_StatusTypeDef HAL_SMBUSEx_EnableWakeUp(SMBUS_HandleTypeDef *hsmbus) +{ + /* Check the parameters */ + assert_param(IS_I2C_WAKEUP_FROMSTOP_INSTANCE(hsmbus->Instance)); + + if (hsmbus->State == HAL_SMBUS_STATE_READY) + { + /* Process Locked */ + __HAL_LOCK(hsmbus); + + hsmbus->State = HAL_SMBUS_STATE_BUSY; + + /* Disable the selected SMBUS peripheral */ + __HAL_SMBUS_DISABLE(hsmbus); + + /* Enable wakeup from stop mode */ + hsmbus->Instance->CR1 |= I2C_CR1_WUPEN; + + __HAL_SMBUS_ENABLE(hsmbus); + + hsmbus->State = HAL_SMBUS_STATE_READY; + + /* Process Unlocked */ + __HAL_UNLOCK(hsmbus); + return HAL_OK; + } + else + { + return HAL_BUSY; + } +} + +/** + * @brief Disable SMBUS wakeup from Stop mode(s). + * @param hsmbus Pointer to a SMBUS_HandleTypeDef structure that contains + * the configuration information for the specified SMBUSx peripheral. + * @retval HAL status + */ +HAL_StatusTypeDef HAL_SMBUSEx_DisableWakeUp(SMBUS_HandleTypeDef *hsmbus) +{ + /* Check the parameters */ + assert_param(IS_I2C_WAKEUP_FROMSTOP_INSTANCE(hsmbus->Instance)); + + if (hsmbus->State == HAL_SMBUS_STATE_READY) + { + /* Process Locked */ + __HAL_LOCK(hsmbus); + + hsmbus->State = HAL_SMBUS_STATE_BUSY; + + /* Disable the selected SMBUS peripheral */ + __HAL_SMBUS_DISABLE(hsmbus); + + /* Disable wakeup from stop mode */ + hsmbus->Instance->CR1 &= ~(I2C_CR1_WUPEN); + + __HAL_SMBUS_ENABLE(hsmbus); + + hsmbus->State = HAL_SMBUS_STATE_READY; + + /* Process Unlocked */ + __HAL_UNLOCK(hsmbus); + + return HAL_OK; + } + else + { + return HAL_BUSY; + } +} +/** + * @} + */ + +/** @defgroup SMBUSEx_Exported_Functions_Group3 Fast Mode Plus Functions + * @brief Fast Mode Plus Functions + * +@verbatim + =============================================================================== + ##### Fast Mode Plus Functions ##### + =============================================================================== + [..] This section provides functions allowing to: (+) Configure Fast Mode Plus @endverbatim @@ -82,12 +179,12 @@ * @param ConfigFastModePlus Selects the pin. * This parameter can be one of the @ref SMBUSEx_FastModePlus values * @note For I2C1, fast mode plus driving capability can be enabled on all selected - * I2C1 pins using I2C_FASTMODEPLUS_I2C1 parameter or independently + * I2C1 pins using SMBUS_FASTMODEPLUS_I2C1 parameter or independently * on each one of the following pins PB6, PB7, PB8 and PB9. * @note For remaining I2C1 pins (PA14, PA15...) fast mode plus driving capability - * can be enabled only by using I2C_FASTMODEPLUS_I2C1 parameter. + * can be enabled only by using SMBUS_FASTMODEPLUS_I2C1 parameter. * @note For all I2C3 pins fast mode plus driving capability can be enabled - * only by using I2C_FASTMODEPLUS_I2C3 parameter. + * only by using SMBUS_FASTMODEPLUS_I2C3 parameter. * @retval None */ void HAL_SMBUSEx_EnableFastModePlus(uint32_t ConfigFastModePlus) @@ -104,12 +201,12 @@ void HAL_SMBUSEx_EnableFastModePlus(uint32_t ConfigFastModePlus) * @param ConfigFastModePlus Selects the pin. * This parameter can be one of the @ref SMBUSEx_FastModePlus values * @note For I2C1, fast mode plus driving capability can be disabled on all selected - * I2C1 pins using I2C_FASTMODEPLUS_I2C1 parameter or independently + * I2C1 pins using SMBUS_FASTMODEPLUS_I2C1 parameter or independently * on each one of the following pins PB6, PB7, PB8 and PB9. * @note For remaining I2C1 pins (PA14, PA15...) fast mode plus driving capability - * can be disabled only by using I2C_FASTMODEPLUS_I2C1 parameter. + * can be disabled only by using SMBUS_FASTMODEPLUS_I2C1 parameter. * @note For all I2C3 pins fast mode plus driving capability can be disabled - * only by using I2C_FASTMODEPLUS_I2C3 parameter. + * only by using SMBUS_FASTMODEPLUS_I2C3 parameter. * @retval None */ void HAL_SMBUSEx_DisableFastModePlus(uint32_t ConfigFastModePlus) @@ -121,6 +218,9 @@ void HAL_SMBUSEx_DisableFastModePlus(uint32_t ConfigFastModePlus) CLEAR_BIT(SYSCFG->CFGR1, (uint32_t)ConfigFastModePlus); } +/** + * @} + */ /** * @} @@ -138,5 +238,3 @@ void HAL_SMBUSEx_DisableFastModePlus(uint32_t ConfigFastModePlus) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi.c index 3a04eb764..51c9a905f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi.c @@ -9,7 +9,17 @@ * + IO operation functions * + Peripheral Control functions * + Peripheral State functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -184,18 +194,6 @@ (#) RX processes are HAL_SPI_Receive(), HAL_SPI_Receive_IT() and HAL_SPI_Receive_DMA() (#) TX processes are HAL_SPI_Transmit(), HAL_SPI_Transmit_IT() and HAL_SPI_Transmit_DMA() - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -1009,7 +1007,7 @@ HAL_StatusTypeDef HAL_SPI_Receive(SPI_HandleTypeDef *hspi, uint8_t *pData, uint1 { #if (USE_SPI_CRC != 0U) __IO uint32_t tmpreg = 0U; - __IO uint8_t * ptmpreg8; + __IO uint8_t *ptmpreg8; __IO uint8_t tmpreg8 = 0; #endif /* USE_SPI_CRC */ uint32_t tickstart; @@ -1257,7 +1255,7 @@ HAL_StatusTypeDef HAL_SPI_TransmitReceive(SPI_HandleTypeDef *hspi, uint8_t *pTxD __IO uint32_t tmpreg = 0U; uint32_t spi_cr1; uint32_t spi_cr2; - __IO uint8_t * ptmpreg8; + __IO uint8_t *ptmpreg8; __IO uint8_t tmpreg8 = 0; #endif /* USE_SPI_CRC */ @@ -3074,7 +3072,7 @@ static void SPI_DMAReceiveCplt(DMA_HandleTypeDef *hdma) uint32_t tickstart; #if (USE_SPI_CRC != 0U) __IO uint32_t tmpreg = 0U; - __IO uint8_t * ptmpreg8; + __IO uint8_t *ptmpreg8; __IO uint8_t tmpreg8 = 0; #endif /* USE_SPI_CRC */ @@ -3191,7 +3189,7 @@ static void SPI_DMATransmitReceiveCplt(DMA_HandleTypeDef *hdma) uint32_t tickstart; #if (USE_SPI_CRC != 0U) __IO uint32_t tmpreg = 0U; - __IO uint8_t * ptmpreg8; + __IO uint8_t *ptmpreg8; __IO uint8_t tmpreg8 = 0; #endif /* USE_SPI_CRC */ @@ -3568,7 +3566,7 @@ static void SPI_2linesRxISR_8BIT(struct __SPI_HandleTypeDef *hspi) */ static void SPI_2linesRxISR_8BITCRC(struct __SPI_HandleTypeDef *hspi) { - __IO uint8_t * ptmpreg8; + __IO uint8_t *ptmpreg8; __IO uint8_t tmpreg8 = 0; /* Initialize the 8bit temporary pointer */ @@ -3688,7 +3686,7 @@ static void SPI_2linesRxISR_16BITCRC(struct __SPI_HandleTypeDef *hspi) /* Read 16bit CRC to flush Data Register */ tmpreg = READ_REG(hspi->Instance->DR); /* To avoid GCC warning */ - UNUSED(tmpreg); + UNUSED(tmpreg); /* Disable RXNE interrupt */ __HAL_SPI_DISABLE_IT(hspi, SPI_IT_RXNE); @@ -3743,7 +3741,7 @@ static void SPI_2linesTxISR_16BIT(struct __SPI_HandleTypeDef *hspi) */ static void SPI_RxISR_8BITCRC(struct __SPI_HandleTypeDef *hspi) { - __IO uint8_t * ptmpreg8; + __IO uint8_t *ptmpreg8; __IO uint8_t tmpreg8 = 0; /* Initialize the 8bit temporary pointer */ @@ -3960,7 +3958,7 @@ static HAL_StatusTypeDef SPI_WaitFlagStateUntilTimeout(SPI_HandleTypeDef *hspi, return HAL_TIMEOUT; } /* If Systick is disabled or not incremented, deactivate timeout to go in disable loop procedure */ - if(count == 0U) + if (count == 0U) { tmp_timeout = 0U; } @@ -3987,7 +3985,7 @@ static HAL_StatusTypeDef SPI_WaitFifoStateUntilTimeout(SPI_HandleTypeDef *hspi, __IO uint32_t count; uint32_t tmp_timeout; uint32_t tmp_tickstart; - __IO uint8_t * ptmpreg8; + __IO uint8_t *ptmpreg8; __IO uint8_t tmpreg8 = 0; /* Adjust Timeout value in case of end of transfer */ @@ -4042,10 +4040,10 @@ static HAL_StatusTypeDef SPI_WaitFifoStateUntilTimeout(SPI_HandleTypeDef *hspi, return HAL_TIMEOUT; } /* If Systick is disabled or not incremented, deactivate timeout to go in disable loop procedure */ - if(count == 0U) + if (count == 0U) { tmp_timeout = 0U; - } + } count--; } } @@ -4436,4 +4434,3 @@ static void SPI_AbortTx_ISR(SPI_HandleTypeDef *hspi) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi_ex.c index 07a2ffc45..f51957d8d 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi_ex.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ HAL_StatusTypeDef HAL_SPIEx_FlushRxFifo(SPI_HandleTypeDef *hspi) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c index efc149305..703f8418b 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c @@ -29,6 +29,17 @@ * + Commutation Event configuration with Interruption and DMA * + TIM OCRef clear configuration * + TIM External Clock configuration + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### TIMER Generic features ##### @@ -170,17 +181,6 @@ all interrupt callbacks are set to the corresponding weak functions: @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -569,7 +569,8 @@ HAL_StatusTypeDef HAL_TIM_Base_Start_DMA(TIM_HandleTypeDef *htim, uint32_t *pDat htim->hdma[TIM_DMA_ID_UPDATE]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_UPDATE], (uint32_t)pData, (uint32_t)&htim->Instance->ARR, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_UPDATE], (uint32_t)pData, (uint32_t)&htim->Instance->ARR, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -889,6 +890,7 @@ HAL_StatusTypeDef HAL_TIM_OC_Stop(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_OC_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Check the parameters */ @@ -934,34 +936,38 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) } default: + status = HAL_ERROR; break; } - /* Enable the Output compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Enable the main output */ - __HAL_TIM_MOE_ENABLE(htim); - } + /* Enable the Output compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Enable the main output */ + __HAL_TIM_MOE_ENABLE(htim); + } + + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -977,6 +983,8 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_OC_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCX_INSTANCE(htim->Instance, Channel)); @@ -1011,26 +1019,30 @@ HAL_StatusTypeDef HAL_TIM_OC_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) } default: + status = HAL_ERROR; break; } - /* Disable the Output compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); - } + /* Disable the Output compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); + } - /* Set the TIM channel state */ - TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); + + /* Set the TIM channel state */ + TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1048,6 +1060,7 @@ HAL_StatusTypeDef HAL_TIM_OC_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_OC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel, uint32_t *pData, uint16_t Length) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Check the parameters */ @@ -1086,7 +1099,8 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC1]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1107,7 +1121,8 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC2]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1128,7 +1143,8 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC3]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1148,7 +1164,8 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC4]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)pData, (uint32_t)&htim->Instance->CCR4, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)pData, (uint32_t)&htim->Instance->CCR4, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1159,34 +1176,38 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel } default: + status = HAL_ERROR; break; } - /* Enable the Output compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Enable the main output */ - __HAL_TIM_MOE_ENABLE(htim); - } + /* Enable the Output compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Enable the main output */ + __HAL_TIM_MOE_ENABLE(htim); + } + + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1202,6 +1223,8 @@ HAL_StatusTypeDef HAL_TIM_OC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel */ HAL_StatusTypeDef HAL_TIM_OC_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCX_INSTANCE(htim->Instance, Channel)); @@ -1240,26 +1263,30 @@ HAL_StatusTypeDef HAL_TIM_OC_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel) } default: + status = HAL_ERROR; break; } - /* Disable the Output compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); - } + /* Disable the Output compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); + } - /* Set the TIM channel state */ - TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); + + /* Set the TIM channel state */ + TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1530,7 +1557,9 @@ HAL_StatusTypeDef HAL_TIM_PWM_Stop(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_PWM_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; + /* Check the parameters */ assert_param(IS_TIM_CCX_INSTANCE(htim->Instance, Channel)); @@ -1574,34 +1603,38 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel } default: + status = HAL_ERROR; break; } - /* Enable the Capture compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Enable the main output */ - __HAL_TIM_MOE_ENABLE(htim); - } + /* Enable the Capture compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Enable the main output */ + __HAL_TIM_MOE_ENABLE(htim); + } + + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1617,6 +1650,8 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel */ HAL_StatusTypeDef HAL_TIM_PWM_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCX_INSTANCE(htim->Instance, Channel)); @@ -1651,26 +1686,30 @@ HAL_StatusTypeDef HAL_TIM_PWM_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) } default: + status = HAL_ERROR; break; } - /* Disable the Capture compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); - } + /* Disable the Capture compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); + } - /* Set the TIM channel state */ - TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); + + /* Set the TIM channel state */ + TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1688,6 +1727,7 @@ HAL_StatusTypeDef HAL_TIM_PWM_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_PWM_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel, uint32_t *pData, uint16_t Length) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Check the parameters */ @@ -1726,7 +1766,8 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channe htim->hdma[TIM_DMA_ID_CC1]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1747,7 +1788,8 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channe htim->hdma[TIM_DMA_ID_CC2]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1767,7 +1809,8 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channe htim->hdma[TIM_DMA_ID_CC3]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1787,7 +1830,8 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channe htim->hdma[TIM_DMA_ID_CC4]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)pData, (uint32_t)&htim->Instance->CCR4, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)pData, (uint32_t)&htim->Instance->CCR4, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1798,34 +1842,38 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channe } default: + status = HAL_ERROR; break; } - /* Enable the Capture compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Enable the main output */ - __HAL_TIM_MOE_ENABLE(htim); - } + /* Enable the Capture compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Enable the main output */ + __HAL_TIM_MOE_ENABLE(htim); + } + + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1841,6 +1889,8 @@ HAL_StatusTypeDef HAL_TIM_PWM_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channe */ HAL_StatusTypeDef HAL_TIM_PWM_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCX_INSTANCE(htim->Instance, Channel)); @@ -1879,26 +1929,30 @@ HAL_StatusTypeDef HAL_TIM_PWM_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel } default: + status = HAL_ERROR; break; } - /* Disable the Capture compare channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - - if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + if (status == HAL_OK) { - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); - } + /* Disable the Capture compare channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + if (IS_TIM_BREAK_INSTANCE(htim->Instance) != RESET) + { + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); + } - /* Set the TIM channel state */ - TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); + + /* Set the TIM channel state */ + TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -2158,7 +2212,9 @@ HAL_StatusTypeDef HAL_TIM_IC_Stop(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_IC_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; + HAL_TIM_ChannelStateTypeDef channel_state = TIM_CHANNEL_STATE_GET(htim, Channel); HAL_TIM_ChannelStateTypeDef complementary_channel_state = TIM_CHANNEL_N_STATE_GET(htim, Channel); @@ -2207,27 +2263,32 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) } default: + status = HAL_ERROR; break; } - /* Enable the Input Capture channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + if (status == HAL_OK) { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + /* Enable the Input Capture channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); + + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -2243,6 +2304,8 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_IC_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCX_INSTANCE(htim->Instance, Channel)); @@ -2277,21 +2340,25 @@ HAL_StatusTypeDef HAL_TIM_IC_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) } default: + status = HAL_ERROR; break; } - /* Disable the Input Capture channel */ - TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); + if (status == HAL_OK) + { + /* Disable the Input Capture channel */ + TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_DISABLE); - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); - /* Set the TIM channel state */ - TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); - TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Set the TIM channel state */ + TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -2309,7 +2376,9 @@ HAL_StatusTypeDef HAL_TIM_IC_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel, uint32_t *pData, uint16_t Length) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; + HAL_TIM_ChannelStateTypeDef channel_state = TIM_CHANNEL_STATE_GET(htim, Channel); HAL_TIM_ChannelStateTypeDef complementary_channel_state = TIM_CHANNEL_N_STATE_GET(htim, Channel); @@ -2344,20 +2413,6 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel /* Enable the Input Capture channel */ TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) - { - __HAL_TIM_ENABLE(htim); - } - } - else - { - __HAL_TIM_ENABLE(htim); - } - switch (Channel) { case TIM_CHANNEL_1: @@ -2370,7 +2425,8 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC1]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)&htim->Instance->CCR1, (uint32_t)pData, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)&htim->Instance->CCR1, (uint32_t)pData, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -2390,7 +2446,8 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC2]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)&htim->Instance->CCR2, (uint32_t)pData, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)&htim->Instance->CCR2, (uint32_t)pData, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -2410,7 +2467,8 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC3]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)&htim->Instance->CCR3, (uint32_t)pData, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)&htim->Instance->CCR3, (uint32_t)pData, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -2430,7 +2488,8 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel htim->hdma[TIM_DMA_ID_CC4]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)&htim->Instance->CCR4, (uint32_t)pData, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)&htim->Instance->CCR4, (uint32_t)pData, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -2441,11 +2500,26 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel } default: + status = HAL_ERROR; break; } + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else + { + __HAL_TIM_ENABLE(htim); + } + /* Return function status */ - return HAL_OK; + return status; } /** @@ -2461,6 +2535,8 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel */ HAL_StatusTypeDef HAL_TIM_IC_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCX_INSTANCE(htim->Instance, Channel)); assert_param(IS_TIM_DMA_CC_INSTANCE(htim->Instance)); @@ -2503,18 +2579,22 @@ HAL_StatusTypeDef HAL_TIM_IC_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel) } default: + status = HAL_ERROR; break; } - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + if (status == HAL_OK) + { + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); - /* Set the TIM channel state */ - TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); - TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Set the TIM channel state */ + TIM_CHANNEL_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** * @} @@ -3567,7 +3647,8 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Ch htim->hdma[TIM_DMA_ID_CC1]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)&htim->Instance->CCR1, (uint32_t)pData1, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)&htim->Instance->CCR1, (uint32_t)pData1, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -3575,11 +3656,12 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Ch /* Enable the TIM Input Capture DMA request */ __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC1); + /* Enable the Capture compare channel */ + TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_ENABLE); + /* Enable the Peripheral */ __HAL_TIM_ENABLE(htim); - /* Enable the Capture compare channel */ - TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_ENABLE); break; } @@ -3592,7 +3674,8 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Ch /* Set the DMA error callback */ htim->hdma[TIM_DMA_ID_CC2]->XferErrorCallback = TIM_DMAError; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)&htim->Instance->CCR2, (uint32_t)pData2, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)&htim->Instance->CCR2, (uint32_t)pData2, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -3600,15 +3683,16 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Ch /* Enable the TIM Input Capture DMA request */ __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC2); + /* Enable the Capture compare channel */ + TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_2, TIM_CCx_ENABLE); + /* Enable the Peripheral */ __HAL_TIM_ENABLE(htim); - /* Enable the Capture compare channel */ - TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_2, TIM_CCx_ENABLE); break; } - case TIM_CHANNEL_ALL: + default: { /* Set the DMA capture callbacks */ htim->hdma[TIM_DMA_ID_CC1]->XferCpltCallback = TIM_DMACaptureCplt; @@ -3618,7 +3702,8 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Ch htim->hdma[TIM_DMA_ID_CC1]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)&htim->Instance->CCR1, (uint32_t)pData1, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)&htim->Instance->CCR1, (uint32_t)pData1, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -3632,27 +3717,27 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Ch htim->hdma[TIM_DMA_ID_CC2]->XferErrorCallback = TIM_DMAError ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)&htim->Instance->CCR2, (uint32_t)pData2, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)&htim->Instance->CCR2, (uint32_t)pData2, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; } - /* Enable the Peripheral */ - __HAL_TIM_ENABLE(htim); - - /* Enable the Capture compare channel */ - TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_ENABLE); - TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_2, TIM_CCx_ENABLE); /* Enable the TIM Input Capture DMA request */ __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC1); /* Enable the TIM Input Capture DMA request */ __HAL_TIM_ENABLE_DMA(htim, TIM_DMA_CC2); - break; - } - default: + /* Enable the Capture compare channel */ + TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_ENABLE); + TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_2, TIM_CCx_ENABLE); + + /* Enable the Peripheral */ + __HAL_TIM_ENABLE(htim); + break; + } } /* Return function status */ @@ -3980,6 +4065,8 @@ HAL_StatusTypeDef HAL_TIM_OC_ConfigChannel(TIM_HandleTypeDef *htim, TIM_OC_InitTypeDef *sConfig, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CHANNELS(Channel)); assert_param(IS_TIM_OC_MODE(sConfig->OCMode)); @@ -4051,12 +4138,13 @@ HAL_StatusTypeDef HAL_TIM_OC_ConfigChannel(TIM_HandleTypeDef *htim, } default: + status = HAL_ERROR; break; } __HAL_UNLOCK(htim); - return HAL_OK; + return status; } /** @@ -4074,6 +4162,8 @@ HAL_StatusTypeDef HAL_TIM_OC_ConfigChannel(TIM_HandleTypeDef *htim, */ HAL_StatusTypeDef HAL_TIM_IC_ConfigChannel(TIM_HandleTypeDef *htim, TIM_IC_InitTypeDef *sConfig, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CC1_INSTANCE(htim->Instance)); assert_param(IS_TIM_IC_POLARITY(sConfig->ICPolarity)); @@ -4130,7 +4220,7 @@ HAL_StatusTypeDef HAL_TIM_IC_ConfigChannel(TIM_HandleTypeDef *htim, TIM_IC_InitT /* Set the IC3PSC value */ htim->Instance->CCMR2 |= sConfig->ICPrescaler; } - else + else if (Channel == TIM_CHANNEL_4) { /* TI4 Configuration */ assert_param(IS_TIM_CC4_INSTANCE(htim->Instance)); @@ -4146,10 +4236,14 @@ HAL_StatusTypeDef HAL_TIM_IC_ConfigChannel(TIM_HandleTypeDef *htim, TIM_IC_InitT /* Set the IC4PSC value */ htim->Instance->CCMR2 |= (sConfig->ICPrescaler << 8U); } + else + { + status = HAL_ERROR; + } __HAL_UNLOCK(htim); - return HAL_OK; + return status; } /** @@ -4171,6 +4265,8 @@ HAL_StatusTypeDef HAL_TIM_PWM_ConfigChannel(TIM_HandleTypeDef *htim, TIM_OC_InitTypeDef *sConfig, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CHANNELS(Channel)); assert_param(IS_TIM_PWM_MODE(sConfig->OCMode)); @@ -4285,12 +4381,13 @@ HAL_StatusTypeDef HAL_TIM_PWM_ConfigChannel(TIM_HandleTypeDef *htim, } default: + status = HAL_ERROR; break; } __HAL_UNLOCK(htim); - return HAL_OK; + return status; } /** @@ -4315,6 +4412,7 @@ HAL_StatusTypeDef HAL_TIM_PWM_ConfigChannel(TIM_HandleTypeDef *htim, HAL_StatusTypeDef HAL_TIM_OnePulse_ConfigChannel(TIM_HandleTypeDef *htim, TIM_OnePulse_InitTypeDef *sConfig, uint32_t OutputChannel, uint32_t InputChannel) { + HAL_StatusTypeDef status = HAL_OK; TIM_OC_InitTypeDef temp1; /* Check the parameters */ @@ -4345,6 +4443,7 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_ConfigChannel(TIM_HandleTypeDef *htim, TIM_O TIM_OC1_SetConfig(htim->Instance, &temp1); break; } + case TIM_CHANNEL_2: { assert_param(IS_TIM_CC2_INSTANCE(htim->Instance)); @@ -4352,60 +4451,67 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_ConfigChannel(TIM_HandleTypeDef *htim, TIM_O TIM_OC2_SetConfig(htim->Instance, &temp1); break; } + default: + status = HAL_ERROR; break; } - switch (InputChannel) + if (status == HAL_OK) { - case TIM_CHANNEL_1: + switch (InputChannel) { - assert_param(IS_TIM_CC1_INSTANCE(htim->Instance)); + case TIM_CHANNEL_1: + { + assert_param(IS_TIM_CC1_INSTANCE(htim->Instance)); - TIM_TI1_SetConfig(htim->Instance, sConfig->ICPolarity, - sConfig->ICSelection, sConfig->ICFilter); + TIM_TI1_SetConfig(htim->Instance, sConfig->ICPolarity, + sConfig->ICSelection, sConfig->ICFilter); - /* Reset the IC1PSC Bits */ - htim->Instance->CCMR1 &= ~TIM_CCMR1_IC1PSC; + /* Reset the IC1PSC Bits */ + htim->Instance->CCMR1 &= ~TIM_CCMR1_IC1PSC; - /* Select the Trigger source */ - htim->Instance->SMCR &= ~TIM_SMCR_TS; - htim->Instance->SMCR |= TIM_TS_TI1FP1; + /* Select the Trigger source */ + htim->Instance->SMCR &= ~TIM_SMCR_TS; + htim->Instance->SMCR |= TIM_TS_TI1FP1; - /* Select the Slave Mode */ - htim->Instance->SMCR &= ~TIM_SMCR_SMS; - htim->Instance->SMCR |= TIM_SLAVEMODE_TRIGGER; - break; - } - case TIM_CHANNEL_2: - { - assert_param(IS_TIM_CC2_INSTANCE(htim->Instance)); + /* Select the Slave Mode */ + htim->Instance->SMCR &= ~TIM_SMCR_SMS; + htim->Instance->SMCR |= TIM_SLAVEMODE_TRIGGER; + break; + } - TIM_TI2_SetConfig(htim->Instance, sConfig->ICPolarity, - sConfig->ICSelection, sConfig->ICFilter); + case TIM_CHANNEL_2: + { + assert_param(IS_TIM_CC2_INSTANCE(htim->Instance)); - /* Reset the IC2PSC Bits */ - htim->Instance->CCMR1 &= ~TIM_CCMR1_IC2PSC; + TIM_TI2_SetConfig(htim->Instance, sConfig->ICPolarity, + sConfig->ICSelection, sConfig->ICFilter); - /* Select the Trigger source */ - htim->Instance->SMCR &= ~TIM_SMCR_TS; - htim->Instance->SMCR |= TIM_TS_TI2FP2; + /* Reset the IC2PSC Bits */ + htim->Instance->CCMR1 &= ~TIM_CCMR1_IC2PSC; - /* Select the Slave Mode */ - htim->Instance->SMCR &= ~TIM_SMCR_SMS; - htim->Instance->SMCR |= TIM_SLAVEMODE_TRIGGER; - break; - } + /* Select the Trigger source */ + htim->Instance->SMCR &= ~TIM_SMCR_TS; + htim->Instance->SMCR |= TIM_TS_TI2FP2; - default: - break; + /* Select the Slave Mode */ + htim->Instance->SMCR &= ~TIM_SMCR_SMS; + htim->Instance->SMCR |= TIM_SLAVEMODE_TRIGGER; + break; + } + + default: + status = HAL_ERROR; + break; + } } htim->State = HAL_TIM_STATE_READY; __HAL_UNLOCK(htim); - return HAL_OK; + return status; } else { @@ -4437,9 +4543,9 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_ConfigChannel(TIM_HandleTypeDef *htim, TIM_O * @arg TIM_DMABASE_CCR4 * @arg TIM_DMABASE_BDTR * @arg TIM_DMABASE_OR - * @arg TIM_DMABASE_CCMR3 - * @arg TIM_DMABASE_CCR5 - * @arg TIM_DMABASE_CCR6 + * @arg TIM_DMABASE_CCMR3 + * @arg TIM_DMABASE_CCR5 + * @arg TIM_DMABASE_CCR6 * @arg TIM_DMABASE_AF1 * @arg TIM_DMABASE_AF2 * @param BurstRequestSrc TIM DMA Request sources @@ -4460,8 +4566,14 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_ConfigChannel(TIM_HandleTypeDef *htim, TIM_O HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStart(TIM_HandleTypeDef *htim, uint32_t BurstBaseAddress, uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength) { - return HAL_TIM_DMABurst_MultiWriteStart(htim, BurstBaseAddress, BurstRequestSrc, BurstBuffer, BurstLength, - ((BurstLength) >> 8U) + 1U); + HAL_StatusTypeDef status; + + status = HAL_TIM_DMABurst_MultiWriteStart(htim, BurstBaseAddress, BurstRequestSrc, BurstBuffer, BurstLength, + ((BurstLength) >> 8U) + 1U); + + + + return status; } /** @@ -4488,9 +4600,9 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStart(TIM_HandleTypeDef *htim, uint32_t * @arg TIM_DMABASE_CCR4 * @arg TIM_DMABASE_BDTR * @arg TIM_DMABASE_OR - * @arg TIM_DMABASE_CCMR3 - * @arg TIM_DMABASE_CCR5 - * @arg TIM_DMABASE_CCR6 + * @arg TIM_DMABASE_CCMR3 + * @arg TIM_DMABASE_CCR5 + * @arg TIM_DMABASE_CCR6 * @arg TIM_DMABASE_AF1 * @arg TIM_DMABASE_AF2 * @param BurstRequestSrc TIM DMA Request sources @@ -4513,6 +4625,8 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength, uint32_t DataLength) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_DMABURST_INSTANCE(htim->Instance)); assert_param(IS_TIM_DMA_BASE(BurstBaseAddress)); @@ -4539,6 +4653,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint { /* nothing to do */ } + switch (BurstRequestSrc) { case TIM_DMA_UPDATE: @@ -4552,7 +4667,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_UPDATE], (uint32_t)BurstBuffer, - (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) + (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4570,7 +4685,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)BurstBuffer, - (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) + (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4588,7 +4703,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)BurstBuffer, - (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) + (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4606,7 +4721,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)BurstBuffer, - (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) + (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4624,7 +4739,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)BurstBuffer, - (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) + (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4642,7 +4757,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_COMMUTATION], (uint32_t)BurstBuffer, - (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) + (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4660,7 +4775,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_TRIGGER], (uint32_t)BurstBuffer, - (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) + (uint32_t)&htim->Instance->DMAR, DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4668,16 +4783,20 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint break; } default: + status = HAL_ERROR; break; } - /* Configure the DMA Burst Mode */ - htim->Instance->DCR = (BurstBaseAddress | BurstLength); - /* Enable the TIM DMA Request */ - __HAL_TIM_ENABLE_DMA(htim, BurstRequestSrc); + if (status == HAL_OK) + { + /* Configure the DMA Burst Mode */ + htim->Instance->DCR = (BurstBaseAddress | BurstLength); + /* Enable the TIM DMA Request */ + __HAL_TIM_ENABLE_DMA(htim, BurstRequestSrc); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -4688,6 +4807,8 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiWriteStart(TIM_HandleTypeDef *htim, uint */ HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStop(TIM_HandleTypeDef *htim, uint32_t BurstRequestSrc) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_DMA_SOURCE(BurstRequestSrc)); @@ -4730,17 +4851,21 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStop(TIM_HandleTypeDef *htim, uint32_t B break; } default: + status = HAL_ERROR; break; } - /* Disable the TIM Update DMA request */ - __HAL_TIM_DISABLE_DMA(htim, BurstRequestSrc); + if (status == HAL_OK) + { + /* Disable the TIM Update DMA request */ + __HAL_TIM_DISABLE_DMA(htim, BurstRequestSrc); - /* Change the DMA burst operation state */ - htim->DMABurstState = HAL_DMA_BURST_STATE_READY; + /* Change the DMA burst operation state */ + htim->DMABurstState = HAL_DMA_BURST_STATE_READY; + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -4767,9 +4892,9 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStop(TIM_HandleTypeDef *htim, uint32_t B * @arg TIM_DMABASE_CCR4 * @arg TIM_DMABASE_BDTR * @arg TIM_DMABASE_OR - * @arg TIM_DMABASE_CCMR3 - * @arg TIM_DMABASE_CCR5 - * @arg TIM_DMABASE_CCR6 + * @arg TIM_DMABASE_CCMR3 + * @arg TIM_DMABASE_CCR5 + * @arg TIM_DMABASE_CCR6 * @arg TIM_DMABASE_AF1 * @arg TIM_DMABASE_AF2 * @param BurstRequestSrc TIM DMA Request sources @@ -4790,8 +4915,13 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_WriteStop(TIM_HandleTypeDef *htim, uint32_t B HAL_StatusTypeDef HAL_TIM_DMABurst_ReadStart(TIM_HandleTypeDef *htim, uint32_t BurstBaseAddress, uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength) { - return HAL_TIM_DMABurst_MultiReadStart(htim, BurstBaseAddress, BurstRequestSrc, BurstBuffer, BurstLength, - ((BurstLength) >> 8U) + 1U); + HAL_StatusTypeDef status; + + status = HAL_TIM_DMABurst_MultiReadStart(htim, BurstBaseAddress, BurstRequestSrc, BurstBuffer, BurstLength, + ((BurstLength) >> 8U) + 1U); + + + return status; } /** @@ -4818,9 +4948,9 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_ReadStart(TIM_HandleTypeDef *htim, uint32_t B * @arg TIM_DMABASE_CCR4 * @arg TIM_DMABASE_BDTR * @arg TIM_DMABASE_OR - * @arg TIM_DMABASE_CCMR3 - * @arg TIM_DMABASE_CCR5 - * @arg TIM_DMABASE_CCR6 + * @arg TIM_DMABASE_CCMR3 + * @arg TIM_DMABASE_CCR5 + * @arg TIM_DMABASE_CCR6 * @arg TIM_DMABASE_AF1 * @arg TIM_DMABASE_AF2 * @param BurstRequestSrc TIM DMA Request sources @@ -4843,6 +4973,8 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 uint32_t BurstRequestSrc, uint32_t *BurstBuffer, uint32_t BurstLength, uint32_t DataLength) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_DMABURST_INSTANCE(htim->Instance)); assert_param(IS_TIM_DMA_BASE(BurstBaseAddress)); @@ -4882,7 +5014,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_UPDATE], (uint32_t)&htim->Instance->DMAR, (uint32_t)BurstBuffer, - DataLength) != HAL_OK) + DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4900,7 +5032,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)&htim->Instance->DMAR, (uint32_t)BurstBuffer, - DataLength) != HAL_OK) + DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4918,7 +5050,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)&htim->Instance->DMAR, (uint32_t)BurstBuffer, - DataLength) != HAL_OK) + DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4936,7 +5068,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)&htim->Instance->DMAR, (uint32_t)BurstBuffer, - DataLength) != HAL_OK) + DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4954,7 +5086,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC4], (uint32_t)&htim->Instance->DMAR, (uint32_t)BurstBuffer, - DataLength) != HAL_OK) + DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4972,7 +5104,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_COMMUTATION], (uint32_t)&htim->Instance->DMAR, (uint32_t)BurstBuffer, - DataLength) != HAL_OK) + DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4990,7 +5122,7 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 /* Enable the DMA channel */ if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_TRIGGER], (uint32_t)&htim->Instance->DMAR, (uint32_t)BurstBuffer, - DataLength) != HAL_OK) + DataLength) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -4998,17 +5130,21 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 break; } default: + status = HAL_ERROR; break; } - /* Configure the DMA Burst Mode */ - htim->Instance->DCR = (BurstBaseAddress | BurstLength); + if (status == HAL_OK) + { + /* Configure the DMA Burst Mode */ + htim->Instance->DCR = (BurstBaseAddress | BurstLength); - /* Enable the TIM DMA Request */ - __HAL_TIM_ENABLE_DMA(htim, BurstRequestSrc); + /* Enable the TIM DMA Request */ + __HAL_TIM_ENABLE_DMA(htim, BurstRequestSrc); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -5019,6 +5155,8 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_MultiReadStart(TIM_HandleTypeDef *htim, uint3 */ HAL_StatusTypeDef HAL_TIM_DMABurst_ReadStop(TIM_HandleTypeDef *htim, uint32_t BurstRequestSrc) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_DMA_SOURCE(BurstRequestSrc)); @@ -5061,17 +5199,21 @@ HAL_StatusTypeDef HAL_TIM_DMABurst_ReadStop(TIM_HandleTypeDef *htim, uint32_t Bu break; } default: + status = HAL_ERROR; break; } - /* Disable the TIM Update DMA request */ - __HAL_TIM_DISABLE_DMA(htim, BurstRequestSrc); + if (status == HAL_OK) + { + /* Disable the TIM Update DMA request */ + __HAL_TIM_DISABLE_DMA(htim, BurstRequestSrc); - /* Change the DMA burst operation state */ - htim->DMABurstState = HAL_DMA_BURST_STATE_READY; + /* Change the DMA burst operation state */ + htim->DMABurstState = HAL_DMA_BURST_STATE_READY; + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -5138,6 +5280,8 @@ HAL_StatusTypeDef HAL_TIM_ConfigOCrefClear(TIM_HandleTypeDef *htim, TIM_ClearInputConfigTypeDef *sClearInputConfig, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_OCXREF_CLEAR_INSTANCE(htim->Instance)); assert_param(IS_TIM_CLEARINPUT_SOURCE(sClearInputConfig->ClearInputSource)); @@ -5198,104 +5342,108 @@ HAL_StatusTypeDef HAL_TIM_ConfigOCrefClear(TIM_HandleTypeDef *htim, } default: + status = HAL_ERROR; break; } - switch (Channel) + if (status == HAL_OK) { - case TIM_CHANNEL_1: - { - if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) - { - /* Enable the OCREF clear feature for Channel 1 */ - SET_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC1CE); - } - else - { - /* Disable the OCREF clear feature for Channel 1 */ - CLEAR_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC1CE); - } - break; - } - case TIM_CHANNEL_2: - { - if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) - { - /* Enable the OCREF clear feature for Channel 2 */ - SET_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC2CE); - } - else - { - /* Disable the OCREF clear feature for Channel 2 */ - CLEAR_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC2CE); - } - break; - } - case TIM_CHANNEL_3: + switch (Channel) { - if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) - { - /* Enable the OCREF clear feature for Channel 3 */ - SET_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC3CE); - } - else + case TIM_CHANNEL_1: { - /* Disable the OCREF clear feature for Channel 3 */ - CLEAR_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC3CE); + if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + { + /* Enable the OCREF clear feature for Channel 1 */ + SET_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC1CE); + } + else + { + /* Disable the OCREF clear feature for Channel 1 */ + CLEAR_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC1CE); + } + break; } - break; - } - case TIM_CHANNEL_4: - { - if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + case TIM_CHANNEL_2: { - /* Enable the OCREF clear feature for Channel 4 */ - SET_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC4CE); + if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + { + /* Enable the OCREF clear feature for Channel 2 */ + SET_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC2CE); + } + else + { + /* Disable the OCREF clear feature for Channel 2 */ + CLEAR_BIT(htim->Instance->CCMR1, TIM_CCMR1_OC2CE); + } + break; } - else + case TIM_CHANNEL_3: { - /* Disable the OCREF clear feature for Channel 4 */ - CLEAR_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC4CE); - } - break; - } - case TIM_CHANNEL_5: - { - if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) - { - /* Enable the OCREF clear feature for Channel 5 */ - SET_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC5CE); + if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + { + /* Enable the OCREF clear feature for Channel 3 */ + SET_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC3CE); + } + else + { + /* Disable the OCREF clear feature for Channel 3 */ + CLEAR_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC3CE); + } + break; } - else + case TIM_CHANNEL_4: { - /* Disable the OCREF clear feature for Channel 5 */ - CLEAR_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC5CE); + if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + { + /* Enable the OCREF clear feature for Channel 4 */ + SET_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC4CE); + } + else + { + /* Disable the OCREF clear feature for Channel 4 */ + CLEAR_BIT(htim->Instance->CCMR2, TIM_CCMR2_OC4CE); + } + break; } - break; - } - case TIM_CHANNEL_6: - { - if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + case TIM_CHANNEL_5: { - /* Enable the OCREF clear feature for Channel 6 */ - SET_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC6CE); + if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + { + /* Enable the OCREF clear feature for Channel 5 */ + SET_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC5CE); + } + else + { + /* Disable the OCREF clear feature for Channel 5 */ + CLEAR_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC5CE); + } + break; } - else + case TIM_CHANNEL_6: { - /* Disable the OCREF clear feature for Channel 6 */ - CLEAR_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC6CE); + if (sClearInputConfig->ClearInputState != (uint32_t)DISABLE) + { + /* Enable the OCREF clear feature for Channel 6 */ + SET_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC6CE); + } + else + { + /* Disable the OCREF clear feature for Channel 6 */ + CLEAR_BIT(htim->Instance->CCMR3, TIM_CCMR3_OC6CE); + } + break; } - break; + default: + break; } - default: - break; } htim->State = HAL_TIM_STATE_READY; __HAL_UNLOCK(htim); - return HAL_OK; + return status; } /** @@ -5307,6 +5455,7 @@ HAL_StatusTypeDef HAL_TIM_ConfigOCrefClear(TIM_HandleTypeDef *htim, */ HAL_StatusTypeDef HAL_TIM_ConfigClockSource(TIM_HandleTypeDef *htim, TIM_ClockConfigTypeDef *sClockSourceConfig) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Process Locked */ @@ -5427,22 +5576,23 @@ HAL_StatusTypeDef HAL_TIM_ConfigClockSource(TIM_HandleTypeDef *htim, TIM_ClockCo case TIM_CLOCKSOURCE_ITR1: case TIM_CLOCKSOURCE_ITR2: case TIM_CLOCKSOURCE_ITR3: - { - /* Check whether or not the timer instance supports internal trigger input */ - assert_param(IS_TIM_CLOCKSOURCE_ITRX_INSTANCE(htim->Instance)); + { + /* Check whether or not the timer instance supports internal trigger input */ + assert_param(IS_TIM_CLOCKSOURCE_ITRX_INSTANCE(htim->Instance)); - TIM_ITRx_SetConfig(htim->Instance, sClockSourceConfig->ClockSource); - break; - } + TIM_ITRx_SetConfig(htim->Instance, sClockSourceConfig->ClockSource); + break; + } default: + status = HAL_ERROR; break; } htim->State = HAL_TIM_STATE_READY; __HAL_UNLOCK(htim); - return HAL_OK; + return status; } /** @@ -5968,7 +6118,7 @@ HAL_StatusTypeDef HAL_TIM_RegisterCallback(TIM_HandleTypeDef *htim, HAL_TIM_Call default : /* Return error status */ - status = HAL_ERROR; + status = HAL_ERROR; break; } } @@ -6034,14 +6184,14 @@ HAL_StatusTypeDef HAL_TIM_RegisterCallback(TIM_HandleTypeDef *htim, HAL_TIM_Call default : /* Return error status */ - status = HAL_ERROR; + status = HAL_ERROR; break; } } else { /* Return error status */ - status = HAL_ERROR; + status = HAL_ERROR; } /* Release Lock */ @@ -6098,120 +6248,148 @@ HAL_StatusTypeDef HAL_TIM_UnRegisterCallback(TIM_HandleTypeDef *htim, HAL_TIM_Ca switch (CallbackID) { case HAL_TIM_BASE_MSPINIT_CB_ID : - htim->Base_MspInitCallback = HAL_TIM_Base_MspInit; /* Legacy weak Base MspInit Callback */ + /* Legacy weak Base MspInit Callback */ + htim->Base_MspInitCallback = HAL_TIM_Base_MspInit; break; case HAL_TIM_BASE_MSPDEINIT_CB_ID : - htim->Base_MspDeInitCallback = HAL_TIM_Base_MspDeInit; /* Legacy weak Base Msp DeInit Callback */ + /* Legacy weak Base Msp DeInit Callback */ + htim->Base_MspDeInitCallback = HAL_TIM_Base_MspDeInit; break; case HAL_TIM_IC_MSPINIT_CB_ID : - htim->IC_MspInitCallback = HAL_TIM_IC_MspInit; /* Legacy weak IC Msp Init Callback */ + /* Legacy weak IC Msp Init Callback */ + htim->IC_MspInitCallback = HAL_TIM_IC_MspInit; break; case HAL_TIM_IC_MSPDEINIT_CB_ID : - htim->IC_MspDeInitCallback = HAL_TIM_IC_MspDeInit; /* Legacy weak IC Msp DeInit Callback */ + /* Legacy weak IC Msp DeInit Callback */ + htim->IC_MspDeInitCallback = HAL_TIM_IC_MspDeInit; break; case HAL_TIM_OC_MSPINIT_CB_ID : - htim->OC_MspInitCallback = HAL_TIM_OC_MspInit; /* Legacy weak OC Msp Init Callback */ + /* Legacy weak OC Msp Init Callback */ + htim->OC_MspInitCallback = HAL_TIM_OC_MspInit; break; case HAL_TIM_OC_MSPDEINIT_CB_ID : - htim->OC_MspDeInitCallback = HAL_TIM_OC_MspDeInit; /* Legacy weak OC Msp DeInit Callback */ + /* Legacy weak OC Msp DeInit Callback */ + htim->OC_MspDeInitCallback = HAL_TIM_OC_MspDeInit; break; case HAL_TIM_PWM_MSPINIT_CB_ID : - htim->PWM_MspInitCallback = HAL_TIM_PWM_MspInit; /* Legacy weak PWM Msp Init Callback */ + /* Legacy weak PWM Msp Init Callback */ + htim->PWM_MspInitCallback = HAL_TIM_PWM_MspInit; break; case HAL_TIM_PWM_MSPDEINIT_CB_ID : - htim->PWM_MspDeInitCallback = HAL_TIM_PWM_MspDeInit; /* Legacy weak PWM Msp DeInit Callback */ + /* Legacy weak PWM Msp DeInit Callback */ + htim->PWM_MspDeInitCallback = HAL_TIM_PWM_MspDeInit; break; case HAL_TIM_ONE_PULSE_MSPINIT_CB_ID : - htim->OnePulse_MspInitCallback = HAL_TIM_OnePulse_MspInit; /* Legacy weak One Pulse Msp Init Callback */ + /* Legacy weak One Pulse Msp Init Callback */ + htim->OnePulse_MspInitCallback = HAL_TIM_OnePulse_MspInit; break; case HAL_TIM_ONE_PULSE_MSPDEINIT_CB_ID : - htim->OnePulse_MspDeInitCallback = HAL_TIM_OnePulse_MspDeInit; /* Legacy weak One Pulse Msp DeInit Callback */ + /* Legacy weak One Pulse Msp DeInit Callback */ + htim->OnePulse_MspDeInitCallback = HAL_TIM_OnePulse_MspDeInit; break; case HAL_TIM_ENCODER_MSPINIT_CB_ID : - htim->Encoder_MspInitCallback = HAL_TIM_Encoder_MspInit; /* Legacy weak Encoder Msp Init Callback */ + /* Legacy weak Encoder Msp Init Callback */ + htim->Encoder_MspInitCallback = HAL_TIM_Encoder_MspInit; break; case HAL_TIM_ENCODER_MSPDEINIT_CB_ID : - htim->Encoder_MspDeInitCallback = HAL_TIM_Encoder_MspDeInit; /* Legacy weak Encoder Msp DeInit Callback */ + /* Legacy weak Encoder Msp DeInit Callback */ + htim->Encoder_MspDeInitCallback = HAL_TIM_Encoder_MspDeInit; break; case HAL_TIM_HALL_SENSOR_MSPINIT_CB_ID : - htim->HallSensor_MspInitCallback = HAL_TIMEx_HallSensor_MspInit; /* Legacy weak Hall Sensor Msp Init Callback */ + /* Legacy weak Hall Sensor Msp Init Callback */ + htim->HallSensor_MspInitCallback = HAL_TIMEx_HallSensor_MspInit; break; case HAL_TIM_HALL_SENSOR_MSPDEINIT_CB_ID : - htim->HallSensor_MspDeInitCallback = HAL_TIMEx_HallSensor_MspDeInit; /* Legacy weak Hall Sensor Msp DeInit Callback */ + /* Legacy weak Hall Sensor Msp DeInit Callback */ + htim->HallSensor_MspDeInitCallback = HAL_TIMEx_HallSensor_MspDeInit; break; case HAL_TIM_PERIOD_ELAPSED_CB_ID : - htim->PeriodElapsedCallback = HAL_TIM_PeriodElapsedCallback; /* Legacy weak Period Elapsed Callback */ + /* Legacy weak Period Elapsed Callback */ + htim->PeriodElapsedCallback = HAL_TIM_PeriodElapsedCallback; break; case HAL_TIM_PERIOD_ELAPSED_HALF_CB_ID : - htim->PeriodElapsedHalfCpltCallback = HAL_TIM_PeriodElapsedHalfCpltCallback; /* Legacy weak Period Elapsed half complete Callback */ + /* Legacy weak Period Elapsed half complete Callback */ + htim->PeriodElapsedHalfCpltCallback = HAL_TIM_PeriodElapsedHalfCpltCallback; break; case HAL_TIM_TRIGGER_CB_ID : - htim->TriggerCallback = HAL_TIM_TriggerCallback; /* Legacy weak Trigger Callback */ + /* Legacy weak Trigger Callback */ + htim->TriggerCallback = HAL_TIM_TriggerCallback; break; case HAL_TIM_TRIGGER_HALF_CB_ID : - htim->TriggerHalfCpltCallback = HAL_TIM_TriggerHalfCpltCallback; /* Legacy weak Trigger half complete Callback */ + /* Legacy weak Trigger half complete Callback */ + htim->TriggerHalfCpltCallback = HAL_TIM_TriggerHalfCpltCallback; break; case HAL_TIM_IC_CAPTURE_CB_ID : - htim->IC_CaptureCallback = HAL_TIM_IC_CaptureCallback; /* Legacy weak IC Capture Callback */ + /* Legacy weak IC Capture Callback */ + htim->IC_CaptureCallback = HAL_TIM_IC_CaptureCallback; break; case HAL_TIM_IC_CAPTURE_HALF_CB_ID : - htim->IC_CaptureHalfCpltCallback = HAL_TIM_IC_CaptureHalfCpltCallback; /* Legacy weak IC Capture half complete Callback */ + /* Legacy weak IC Capture half complete Callback */ + htim->IC_CaptureHalfCpltCallback = HAL_TIM_IC_CaptureHalfCpltCallback; break; case HAL_TIM_OC_DELAY_ELAPSED_CB_ID : - htim->OC_DelayElapsedCallback = HAL_TIM_OC_DelayElapsedCallback; /* Legacy weak OC Delay Elapsed Callback */ + /* Legacy weak OC Delay Elapsed Callback */ + htim->OC_DelayElapsedCallback = HAL_TIM_OC_DelayElapsedCallback; break; case HAL_TIM_PWM_PULSE_FINISHED_CB_ID : - htim->PWM_PulseFinishedCallback = HAL_TIM_PWM_PulseFinishedCallback; /* Legacy weak PWM Pulse Finished Callback */ + /* Legacy weak PWM Pulse Finished Callback */ + htim->PWM_PulseFinishedCallback = HAL_TIM_PWM_PulseFinishedCallback; break; case HAL_TIM_PWM_PULSE_FINISHED_HALF_CB_ID : - htim->PWM_PulseFinishedHalfCpltCallback = HAL_TIM_PWM_PulseFinishedHalfCpltCallback; /* Legacy weak PWM Pulse Finished half complete Callback */ + /* Legacy weak PWM Pulse Finished half complete Callback */ + htim->PWM_PulseFinishedHalfCpltCallback = HAL_TIM_PWM_PulseFinishedHalfCpltCallback; break; case HAL_TIM_ERROR_CB_ID : - htim->ErrorCallback = HAL_TIM_ErrorCallback; /* Legacy weak Error Callback */ + /* Legacy weak Error Callback */ + htim->ErrorCallback = HAL_TIM_ErrorCallback; break; case HAL_TIM_COMMUTATION_CB_ID : - htim->CommutationCallback = HAL_TIMEx_CommutCallback; /* Legacy weak Commutation Callback */ + /* Legacy weak Commutation Callback */ + htim->CommutationCallback = HAL_TIMEx_CommutCallback; break; case HAL_TIM_COMMUTATION_HALF_CB_ID : - htim->CommutationHalfCpltCallback = HAL_TIMEx_CommutHalfCpltCallback; /* Legacy weak Commutation half complete Callback */ + /* Legacy weak Commutation half complete Callback */ + htim->CommutationHalfCpltCallback = HAL_TIMEx_CommutHalfCpltCallback; break; case HAL_TIM_BREAK_CB_ID : - htim->BreakCallback = HAL_TIMEx_BreakCallback; /* Legacy weak Break Callback */ + /* Legacy weak Break Callback */ + htim->BreakCallback = HAL_TIMEx_BreakCallback; break; case HAL_TIM_BREAK2_CB_ID : - htim->Break2Callback = HAL_TIMEx_Break2Callback; /* Legacy weak Break2 Callback */ + /* Legacy weak Break2 Callback */ + htim->Break2Callback = HAL_TIMEx_Break2Callback; break; default : /* Return error status */ - status = HAL_ERROR; + status = HAL_ERROR; break; } } @@ -6220,71 +6398,85 @@ HAL_StatusTypeDef HAL_TIM_UnRegisterCallback(TIM_HandleTypeDef *htim, HAL_TIM_Ca switch (CallbackID) { case HAL_TIM_BASE_MSPINIT_CB_ID : - htim->Base_MspInitCallback = HAL_TIM_Base_MspInit; /* Legacy weak Base MspInit Callback */ + /* Legacy weak Base MspInit Callback */ + htim->Base_MspInitCallback = HAL_TIM_Base_MspInit; break; case HAL_TIM_BASE_MSPDEINIT_CB_ID : - htim->Base_MspDeInitCallback = HAL_TIM_Base_MspDeInit; /* Legacy weak Base Msp DeInit Callback */ + /* Legacy weak Base Msp DeInit Callback */ + htim->Base_MspDeInitCallback = HAL_TIM_Base_MspDeInit; break; case HAL_TIM_IC_MSPINIT_CB_ID : - htim->IC_MspInitCallback = HAL_TIM_IC_MspInit; /* Legacy weak IC Msp Init Callback */ + /* Legacy weak IC Msp Init Callback */ + htim->IC_MspInitCallback = HAL_TIM_IC_MspInit; break; case HAL_TIM_IC_MSPDEINIT_CB_ID : - htim->IC_MspDeInitCallback = HAL_TIM_IC_MspDeInit; /* Legacy weak IC Msp DeInit Callback */ + /* Legacy weak IC Msp DeInit Callback */ + htim->IC_MspDeInitCallback = HAL_TIM_IC_MspDeInit; break; case HAL_TIM_OC_MSPINIT_CB_ID : - htim->OC_MspInitCallback = HAL_TIM_OC_MspInit; /* Legacy weak OC Msp Init Callback */ + /* Legacy weak OC Msp Init Callback */ + htim->OC_MspInitCallback = HAL_TIM_OC_MspInit; break; case HAL_TIM_OC_MSPDEINIT_CB_ID : - htim->OC_MspDeInitCallback = HAL_TIM_OC_MspDeInit; /* Legacy weak OC Msp DeInit Callback */ + /* Legacy weak OC Msp DeInit Callback */ + htim->OC_MspDeInitCallback = HAL_TIM_OC_MspDeInit; break; case HAL_TIM_PWM_MSPINIT_CB_ID : - htim->PWM_MspInitCallback = HAL_TIM_PWM_MspInit; /* Legacy weak PWM Msp Init Callback */ + /* Legacy weak PWM Msp Init Callback */ + htim->PWM_MspInitCallback = HAL_TIM_PWM_MspInit; break; case HAL_TIM_PWM_MSPDEINIT_CB_ID : - htim->PWM_MspDeInitCallback = HAL_TIM_PWM_MspDeInit; /* Legacy weak PWM Msp DeInit Callback */ + /* Legacy weak PWM Msp DeInit Callback */ + htim->PWM_MspDeInitCallback = HAL_TIM_PWM_MspDeInit; break; case HAL_TIM_ONE_PULSE_MSPINIT_CB_ID : - htim->OnePulse_MspInitCallback = HAL_TIM_OnePulse_MspInit; /* Legacy weak One Pulse Msp Init Callback */ + /* Legacy weak One Pulse Msp Init Callback */ + htim->OnePulse_MspInitCallback = HAL_TIM_OnePulse_MspInit; break; case HAL_TIM_ONE_PULSE_MSPDEINIT_CB_ID : - htim->OnePulse_MspDeInitCallback = HAL_TIM_OnePulse_MspDeInit; /* Legacy weak One Pulse Msp DeInit Callback */ + /* Legacy weak One Pulse Msp DeInit Callback */ + htim->OnePulse_MspDeInitCallback = HAL_TIM_OnePulse_MspDeInit; break; case HAL_TIM_ENCODER_MSPINIT_CB_ID : - htim->Encoder_MspInitCallback = HAL_TIM_Encoder_MspInit; /* Legacy weak Encoder Msp Init Callback */ + /* Legacy weak Encoder Msp Init Callback */ + htim->Encoder_MspInitCallback = HAL_TIM_Encoder_MspInit; break; case HAL_TIM_ENCODER_MSPDEINIT_CB_ID : - htim->Encoder_MspDeInitCallback = HAL_TIM_Encoder_MspDeInit; /* Legacy weak Encoder Msp DeInit Callback */ + /* Legacy weak Encoder Msp DeInit Callback */ + htim->Encoder_MspDeInitCallback = HAL_TIM_Encoder_MspDeInit; break; case HAL_TIM_HALL_SENSOR_MSPINIT_CB_ID : - htim->HallSensor_MspInitCallback = HAL_TIMEx_HallSensor_MspInit; /* Legacy weak Hall Sensor Msp Init Callback */ + /* Legacy weak Hall Sensor Msp Init Callback */ + htim->HallSensor_MspInitCallback = HAL_TIMEx_HallSensor_MspInit; break; case HAL_TIM_HALL_SENSOR_MSPDEINIT_CB_ID : - htim->HallSensor_MspDeInitCallback = HAL_TIMEx_HallSensor_MspDeInit; /* Legacy weak Hall Sensor Msp DeInit Callback */ + /* Legacy weak Hall Sensor Msp DeInit Callback */ + htim->HallSensor_MspDeInitCallback = HAL_TIMEx_HallSensor_MspDeInit; break; default : /* Return error status */ - status = HAL_ERROR; + status = HAL_ERROR; break; } } else { /* Return error status */ - status = HAL_ERROR; + status = HAL_ERROR; } /* Release Lock */ @@ -7199,6 +7391,7 @@ static void TIM_OC6_SetConfig(TIM_TypeDef *TIMx, static HAL_StatusTypeDef TIM_SlaveTimer_SetConfig(TIM_HandleTypeDef *htim, TIM_SlaveConfigTypeDef *sSlaveConfig) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; uint32_t tmpccmr1; uint32_t tmpccer; @@ -7295,16 +7488,18 @@ static HAL_StatusTypeDef TIM_SlaveTimer_SetConfig(TIM_HandleTypeDef *htim, case TIM_TS_ITR1: case TIM_TS_ITR2: case TIM_TS_ITR3: - { - /* Check the parameter */ - assert_param(IS_TIM_CC2_INSTANCE(htim->Instance)); - break; - } + { + /* Check the parameter */ + assert_param(IS_TIM_CC2_INSTANCE(htim->Instance)); + break; + } default: + status = HAL_ERROR; break; } - return HAL_OK; + + return status; } /** @@ -7680,20 +7875,20 @@ void TIM_CCxChannelCmd(TIM_TypeDef *TIMx, uint32_t Channel, uint32_t ChannelStat void TIM_ResetCallback(TIM_HandleTypeDef *htim) { /* Reset the TIM callback to the legacy weak callbacks */ - htim->PeriodElapsedCallback = HAL_TIM_PeriodElapsedCallback; /* Legacy weak PeriodElapsedCallback */ - htim->PeriodElapsedHalfCpltCallback = HAL_TIM_PeriodElapsedHalfCpltCallback; /* Legacy weak PeriodElapsedHalfCpltCallback */ - htim->TriggerCallback = HAL_TIM_TriggerCallback; /* Legacy weak TriggerCallback */ - htim->TriggerHalfCpltCallback = HAL_TIM_TriggerHalfCpltCallback; /* Legacy weak TriggerHalfCpltCallback */ - htim->IC_CaptureCallback = HAL_TIM_IC_CaptureCallback; /* Legacy weak IC_CaptureCallback */ - htim->IC_CaptureHalfCpltCallback = HAL_TIM_IC_CaptureHalfCpltCallback; /* Legacy weak IC_CaptureHalfCpltCallback */ - htim->OC_DelayElapsedCallback = HAL_TIM_OC_DelayElapsedCallback; /* Legacy weak OC_DelayElapsedCallback */ - htim->PWM_PulseFinishedCallback = HAL_TIM_PWM_PulseFinishedCallback; /* Legacy weak PWM_PulseFinishedCallback */ - htim->PWM_PulseFinishedHalfCpltCallback = HAL_TIM_PWM_PulseFinishedHalfCpltCallback; /* Legacy weak PWM_PulseFinishedHalfCpltCallback */ - htim->ErrorCallback = HAL_TIM_ErrorCallback; /* Legacy weak ErrorCallback */ - htim->CommutationCallback = HAL_TIMEx_CommutCallback; /* Legacy weak CommutationCallback */ - htim->CommutationHalfCpltCallback = HAL_TIMEx_CommutHalfCpltCallback; /* Legacy weak CommutationHalfCpltCallback */ - htim->BreakCallback = HAL_TIMEx_BreakCallback; /* Legacy weak BreakCallback */ - htim->Break2Callback = HAL_TIMEx_Break2Callback; /* Legacy weak Break2Callback */ + htim->PeriodElapsedCallback = HAL_TIM_PeriodElapsedCallback; + htim->PeriodElapsedHalfCpltCallback = HAL_TIM_PeriodElapsedHalfCpltCallback; + htim->TriggerCallback = HAL_TIM_TriggerCallback; + htim->TriggerHalfCpltCallback = HAL_TIM_TriggerHalfCpltCallback; + htim->IC_CaptureCallback = HAL_TIM_IC_CaptureCallback; + htim->IC_CaptureHalfCpltCallback = HAL_TIM_IC_CaptureHalfCpltCallback; + htim->OC_DelayElapsedCallback = HAL_TIM_OC_DelayElapsedCallback; + htim->PWM_PulseFinishedCallback = HAL_TIM_PWM_PulseFinishedCallback; + htim->PWM_PulseFinishedHalfCpltCallback = HAL_TIM_PWM_PulseFinishedHalfCpltCallback; + htim->ErrorCallback = HAL_TIM_ErrorCallback; + htim->CommutationCallback = HAL_TIMEx_CommutCallback; + htim->CommutationHalfCpltCallback = HAL_TIMEx_CommutHalfCpltCallback; + htim->BreakCallback = HAL_TIMEx_BreakCallback; + htim->Break2Callback = HAL_TIMEx_Break2Callback; } #endif /* USE_HAL_TIM_REGISTER_CALLBACKS */ @@ -7709,4 +7904,3 @@ void TIM_ResetCallback(TIM_HandleTypeDef *htim) /** * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c index c91b35a24..1f14172bd 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c @@ -12,6 +12,17 @@ * + Time Output Compare/PWM Channel Configuration (for channels 5 and 6) * + Time OCRef clear configuration * + Timer remapping capabilities configuration + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### TIMER Extended features ##### @@ -56,24 +67,16 @@ the commutation event). (#) Activate the TIM peripheral using one of the start functions: - (++) Complementary Output Compare : HAL_TIMEx_OCN_Start(), HAL_TIMEx_OCN_Start_DMA(), HAL_TIMEx_OCN_Start_IT() - (++) Complementary PWM generation : HAL_TIMEx_PWMN_Start(), HAL_TIMEx_PWMN_Start_DMA(), HAL_TIMEx_PWMN_Start_IT() + (++) Complementary Output Compare : HAL_TIMEx_OCN_Start(), HAL_TIMEx_OCN_Start_DMA(), + HAL_TIMEx_OCN_Start_IT() + (++) Complementary PWM generation : HAL_TIMEx_PWMN_Start(), HAL_TIMEx_PWMN_Start_DMA(), + HAL_TIMEx_PWMN_Start_IT() (++) Complementary One-pulse mode output : HAL_TIMEx_OnePulseN_Start(), HAL_TIMEx_OnePulseN_Start_IT() - (++) Hall Sensor output : HAL_TIMEx_HallSensor_Start(), HAL_TIMEx_HallSensor_Start_DMA(), HAL_TIMEx_HallSensor_Start_IT(). + (++) Hall Sensor output : HAL_TIMEx_HallSensor_Start(), HAL_TIMEx_HallSensor_Start_DMA(), + HAL_TIMEx_HallSensor_Start_IT(). @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -373,7 +376,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Start(TIM_HandleTypeDef *htim) TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_BUSY); /* Enable the Input Capture channel 1 - (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, TIM_CHANNEL_2 and TIM_CHANNEL_3) */ + (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, + TIM_CHANNEL_2 and TIM_CHANNEL_3) */ TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_ENABLE); /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ @@ -405,7 +409,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Stop(TIM_HandleTypeDef *htim) assert_param(IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(htim->Instance)); /* Disable the Input Capture channels 1, 2 and 3 - (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, TIM_CHANNEL_2 and TIM_CHANNEL_3) */ + (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, + TIM_CHANNEL_2 and TIM_CHANNEL_3) */ TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_DISABLE); /* Disable the Peripheral */ @@ -456,7 +461,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Start_IT(TIM_HandleTypeDef *htim) __HAL_TIM_ENABLE_IT(htim, TIM_IT_CC1); /* Enable the Input Capture channel 1 - (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, TIM_CHANNEL_2 and TIM_CHANNEL_3) */ + (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, + TIM_CHANNEL_2 and TIM_CHANNEL_3) */ TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_ENABLE); /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ @@ -488,7 +494,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Stop_IT(TIM_HandleTypeDef *htim) assert_param(IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(htim->Instance)); /* Disable the Input Capture channel 1 - (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, TIM_CHANNEL_2 and TIM_CHANNEL_3) */ + (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, + TIM_CHANNEL_2 and TIM_CHANNEL_3) */ TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_DISABLE); /* Disable the capture compare Interrupts event */ @@ -548,7 +555,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Start_DMA(TIM_HandleTypeDef *htim, uint32 } /* Enable the Input Capture channel 1 - (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, TIM_CHANNEL_2 and TIM_CHANNEL_3) */ + (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, + TIM_CHANNEL_2 and TIM_CHANNEL_3) */ TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_ENABLE); /* Set the DMA Input Capture 1 Callbacks */ @@ -595,7 +603,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Stop_DMA(TIM_HandleTypeDef *htim) assert_param(IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(htim->Instance)); /* Disable the Input Capture channel 1 - (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, TIM_CHANNEL_2 and TIM_CHANNEL_3) */ + (in the Hall Sensor Interface the three possible channels that can be used are TIM_CHANNEL_1, + TIM_CHANNEL_2 and TIM_CHANNEL_3) */ TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_DISABLE); @@ -735,6 +744,7 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Stop(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Check the parameters */ @@ -774,34 +784,38 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_IT(TIM_HandleTypeDef *htim, uint32_t Chann default: + status = HAL_ERROR; break; } - /* Enable the TIM Break interrupt */ - __HAL_TIM_ENABLE_IT(htim, TIM_IT_BREAK); + if (status == HAL_OK) + { + /* Enable the TIM Break interrupt */ + __HAL_TIM_ENABLE_IT(htim, TIM_IT_BREAK); - /* Enable the Capture compare channel N */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); + /* Enable the Capture compare channel N */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); - /* Enable the Main Output */ - __HAL_TIM_MOE_ENABLE(htim); + /* Enable the Main Output */ + __HAL_TIM_MOE_ENABLE(htim); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -817,7 +831,9 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_IT(TIM_HandleTypeDef *htim, uint32_t Chann */ HAL_StatusTypeDef HAL_TIMEx_OCN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpccer; + /* Check the parameters */ assert_param(IS_TIM_CCXN_INSTANCE(htim->Instance, Channel)); @@ -845,30 +861,34 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channe } default: + status = HAL_ERROR; break; } - /* Disable the Capture compare channel N */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); - - /* Disable the TIM Break interrupt (only if no more channel is active) */ - tmpccer = htim->Instance->CCER; - if ((tmpccer & (TIM_CCER_CC1NE | TIM_CCER_CC2NE | TIM_CCER_CC3NE)) == (uint32_t)RESET) + if (status == HAL_OK) { - __HAL_TIM_DISABLE_IT(htim, TIM_IT_BREAK); - } + /* Disable the Capture compare channel N */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); + /* Disable the TIM Break interrupt (only if no more channel is active) */ + tmpccer = htim->Instance->CCER; + if ((tmpccer & (TIM_CCER_CC1NE | TIM_CCER_CC2NE | TIM_CCER_CC3NE)) == (uint32_t)RESET) + { + __HAL_TIM_DISABLE_IT(htim, TIM_IT_BREAK); + } - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); - /* Set the TIM complementary channel state */ - TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); + + /* Set the TIM complementary channel state */ + TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -886,6 +906,7 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channe */ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel, uint32_t *pData, uint16_t Length) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Check the parameters */ @@ -924,7 +945,8 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Chan htim->hdma[TIM_DMA_ID_CC1]->XferErrorCallback = TIM_DMAErrorCCxN ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -944,7 +966,8 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Chan htim->hdma[TIM_DMA_ID_CC2]->XferErrorCallback = TIM_DMAErrorCCxN ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -964,7 +987,8 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Chan htim->hdma[TIM_DMA_ID_CC3]->XferErrorCallback = TIM_DMAErrorCCxN ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -975,31 +999,35 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Chan } default: + status = HAL_ERROR; break; } - /* Enable the Capture compare channel N */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); + if (status == HAL_OK) + { + /* Enable the Capture compare channel N */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); - /* Enable the Main Output */ - __HAL_TIM_MOE_ENABLE(htim); + /* Enable the Main Output */ + __HAL_TIM_MOE_ENABLE(htim); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1015,6 +1043,8 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Chan */ HAL_StatusTypeDef HAL_TIMEx_OCN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCXN_INSTANCE(htim->Instance, Channel)); @@ -1045,23 +1075,27 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Chann } default: + status = HAL_ERROR; break; } - /* Disable the Capture compare channel N */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); + if (status == HAL_OK) + { + /* Disable the Capture compare channel N */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); - /* Set the TIM complementary channel state */ - TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Set the TIM complementary channel state */ + TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1192,6 +1226,7 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop(TIM_HandleTypeDef *htim, uint32_t Channel) */ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Check the parameters */ @@ -1230,34 +1265,38 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_IT(TIM_HandleTypeDef *htim, uint32_t Chan } default: + status = HAL_ERROR; break; } - /* Enable the TIM Break interrupt */ - __HAL_TIM_ENABLE_IT(htim, TIM_IT_BREAK); + if (status == HAL_OK) + { + /* Enable the TIM Break interrupt */ + __HAL_TIM_ENABLE_IT(htim, TIM_IT_BREAK); - /* Enable the complementary PWM output */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); + /* Enable the complementary PWM output */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); - /* Enable the Main Output */ - __HAL_TIM_MOE_ENABLE(htim); + /* Enable the Main Output */ + __HAL_TIM_MOE_ENABLE(htim); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1273,6 +1312,7 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_IT(TIM_HandleTypeDef *htim, uint32_t Chan */ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpccer; /* Check the parameters */ @@ -1302,30 +1342,34 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Chann } default: + status = HAL_ERROR; break; } - /* Disable the complementary PWM output */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); - - /* Disable the TIM Break interrupt (only if no more channel is active) */ - tmpccer = htim->Instance->CCER; - if ((tmpccer & (TIM_CCER_CC1NE | TIM_CCER_CC2NE | TIM_CCER_CC3NE)) == (uint32_t)RESET) + if (status == HAL_OK) { - __HAL_TIM_DISABLE_IT(htim, TIM_IT_BREAK); - } + /* Disable the complementary PWM output */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); + /* Disable the TIM Break interrupt (only if no more channel is active) */ + tmpccer = htim->Instance->CCER; + if ((tmpccer & (TIM_CCER_CC1NE | TIM_CCER_CC2NE | TIM_CCER_CC3NE)) == (uint32_t)RESET) + { + __HAL_TIM_DISABLE_IT(htim, TIM_IT_BREAK); + } - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); - /* Set the TIM complementary channel state */ - TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); + + /* Set the TIM complementary channel state */ + TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1343,6 +1387,7 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Chann */ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel, uint32_t *pData, uint16_t Length) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpsmcr; /* Check the parameters */ @@ -1381,7 +1426,8 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Cha htim->hdma[TIM_DMA_ID_CC1]->XferErrorCallback = TIM_DMAErrorCCxN ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC1], (uint32_t)pData, (uint32_t)&htim->Instance->CCR1, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1401,7 +1447,8 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Cha htim->hdma[TIM_DMA_ID_CC2]->XferErrorCallback = TIM_DMAErrorCCxN ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC2], (uint32_t)pData, (uint32_t)&htim->Instance->CCR2, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1421,7 +1468,8 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Cha htim->hdma[TIM_DMA_ID_CC3]->XferErrorCallback = TIM_DMAErrorCCxN ; /* Enable the DMA channel */ - if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, Length) != HAL_OK) + if (HAL_DMA_Start_IT(htim->hdma[TIM_DMA_ID_CC3], (uint32_t)pData, (uint32_t)&htim->Instance->CCR3, + Length) != HAL_OK) { /* Return error status */ return HAL_ERROR; @@ -1432,31 +1480,35 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Cha } default: + status = HAL_ERROR; break; } - /* Enable the complementary PWM output */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); + if (status == HAL_OK) + { + /* Enable the complementary PWM output */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_ENABLE); - /* Enable the Main Output */ - __HAL_TIM_MOE_ENABLE(htim); + /* Enable the Main Output */ + __HAL_TIM_MOE_ENABLE(htim); - /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ - if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) - { - tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; - if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */ + if (IS_TIM_SLAVE_INSTANCE(htim->Instance)) + { + tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS; + if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr)) + { + __HAL_TIM_ENABLE(htim); + } + } + else { __HAL_TIM_ENABLE(htim); } } - else - { - __HAL_TIM_ENABLE(htim); - } /* Return function status */ - return HAL_OK; + return status; } /** @@ -1472,6 +1524,8 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Cha */ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Channel) { + HAL_StatusTypeDef status = HAL_OK; + /* Check the parameters */ assert_param(IS_TIM_CCXN_INSTANCE(htim->Instance, Channel)); @@ -1502,23 +1556,27 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Chan } default: + status = HAL_ERROR; break; } - /* Disable the complementary PWM output */ - TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); + if (status == HAL_OK) + { + /* Disable the complementary PWM output */ + TIM_CCxNChannelCmd(htim->Instance, Channel, TIM_CCxN_DISABLE); - /* Disable the Main Output */ - __HAL_TIM_MOE_DISABLE(htim); + /* Disable the Main Output */ + __HAL_TIM_MOE_DISABLE(htim); - /* Disable the Peripheral */ - __HAL_TIM_DISABLE(htim); + /* Disable the Peripheral */ + __HAL_TIM_DISABLE(htim); - /* Set the TIM complementary channel state */ - TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + /* Set the TIM complementary channel state */ + TIM_CHANNEL_N_STATE_SET(htim, Channel, HAL_TIM_CHANNEL_STATE_READY); + } /* Return function status */ - return HAL_OK; + return status; } /** @@ -2100,6 +2158,7 @@ HAL_StatusTypeDef HAL_TIMEx_ConfigBreakInput(TIM_HandleTypeDef *htim, TIMEx_BreakInputConfigTypeDef *sBreakInputConfig) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmporx; uint32_t bkin_enable_mask; uint32_t bkin_polarity_mask; @@ -2192,12 +2251,13 @@ HAL_StatusTypeDef HAL_TIMEx_ConfigBreakInput(TIM_HandleTypeDef *htim, break; } default: + status = HAL_ERROR; break; } __HAL_UNLOCK(htim); - return HAL_OK; + return status; } /** @@ -2347,6 +2407,7 @@ HAL_StatusTypeDef HAL_TIMEx_GroupChannel5(TIM_HandleTypeDef *htim, uint32_t Chan */ HAL_StatusTypeDef HAL_TIMEx_DisarmBreakInput(TIM_HandleTypeDef *htim, uint32_t BreakInput) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tmpbdtr; /* Check the parameters */ @@ -2381,10 +2442,11 @@ HAL_StatusTypeDef HAL_TIMEx_DisarmBreakInput(TIM_HandleTypeDef *htim, uint32_t B break; } default: + status = HAL_ERROR; break; } - return HAL_OK; + return status; } /** @@ -2400,6 +2462,7 @@ HAL_StatusTypeDef HAL_TIMEx_DisarmBreakInput(TIM_HandleTypeDef *htim, uint32_t B */ HAL_StatusTypeDef HAL_TIMEx_ReArmBreakInput(TIM_HandleTypeDef *htim, uint32_t BreakInput) { + HAL_StatusTypeDef status = HAL_OK; uint32_t tickstart; /* Check the parameters */ @@ -2454,10 +2517,11 @@ HAL_StatusTypeDef HAL_TIMEx_ReArmBreakInput(TIM_HandleTypeDef *htim, uint32_t Br break; } default: + status = HAL_ERROR; break; } - return HAL_OK; + return status; } /** @@ -2597,7 +2661,7 @@ HAL_TIM_ChannelStateTypeDef HAL_TIMEx_GetChannelNState(TIM_HandleTypeDef *htim, */ /* Private functions ---------------------------------------------------------*/ -/** @defgroup TIMEx_Private_Functions TIMEx Private Functions +/** @defgroup TIMEx_Private_Functions TIM Extended Private Functions * @{ */ @@ -2773,5 +2837,3 @@ static void TIM_CCxNChannelCmd(TIM_TypeDef *TIMx, uint32_t Channel, uint32_t Cha /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_alarm_template.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_alarm_template.c index c9a16386f..dd740b4db 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_alarm_template.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_alarm_template.c @@ -6,10 +6,21 @@ * * This file override the native HAL time base functions (defined as weak) * to use the RTC ALARM for time base generation: - * + Intializes the RTC peripheral to increment the seconds registers each 1ms + * + Initializes the RTC peripheral to increment the seconds registers each 1ms * + The alarm is configured to assert an interrupt when the RTC reaches 1ms * + HAL_IncTick is called at each Alarm event and the time is reset to 00:00:00 - * + HSE (default), LSE or LSI can be selected as RTC clock source + * + HSE (default), LSE or LSI can be selected as RTC clock source + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -21,7 +32,7 @@ HAL_RTC_MODULE_ENABLED define in stm32wbxx_hal_conf.h [..] - (@) HAL RTC alarm and HAL RTC wakeup drivers cant be used with low power modes: + (@) HAL RTC alarm and HAL RTC wakeup drivers can't be used with low power modes: The wake up capability of the RTC may be intrusive in case of prior low power mode configuration requiring different wake up sources. Application/Example behavior is no more guaranteed @@ -30,17 +41,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -102,19 +102,19 @@ HAL_StatusTypeDef HAL_InitTick (uint32_t TickPriority) RCC_PeriphCLKInitTypeDef PeriphClkInitStruct; #ifdef RTC_CLOCK_SOURCE_LSE - /* Configue LSE as RTC clock soucre */ + /* Configure LSE as RTC clock source */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; RCC_OscInitStruct.LSEState = RCC_LSE_ON; PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; #elif defined (RTC_CLOCK_SOURCE_LSI) - /* Configue LSI as RTC clock soucre */ + /* Configure LSI as RTC clock source */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI1; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; RCC_OscInitStruct.LSIState = RCC_LSI_ON; PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; #elif defined (RTC_CLOCK_SOURCE_HSE) - /* Configue HSE as RTC clock soucre */ + /* Configure HSE as RTC clock source */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; RCC_OscInitStruct.HSEState = RCC_HSE_ON; @@ -297,5 +297,3 @@ void RTC_Alarm_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_wakeup_template.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_wakeup_template.c index d3aa560f0..698ee4138 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_wakeup_template.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_rtc_wakeup_template.c @@ -6,11 +6,22 @@ * * This file overrides the native HAL time base functions (defined as weak) * to use the RTC WAKEUP for the time base generation: - * + Intializes the RTC peripheral and configures the wakeup timer to be + * + Initializes the RTC peripheral and configures the wakeup timer to be * incremented each 1ms * + The wakeup feature is configured to assert an interrupt each 1ms * + HAL_IncTick is called inside the HAL_RTCEx_WakeUpTimerEventCallback * + HSE (default), LSE or LSI can be selected as RTC clock source + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -22,7 +33,7 @@ HAL_RTC_MODULE_ENABLED define in stm32wbxx_hal_conf.h [..] - (@) HAL RTC alarm and HAL RTC wakeup drivers cant be used with low power modes: + (@) HAL RTC alarm and HAL RTC wakeup drivers can't be used with low power modes: The wake up capability of the RTC may be intrusive in case of prior low power mode configuration requiring different wake up sources. Application/Example behavior is no more guaranteed @@ -31,17 +42,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -108,19 +108,19 @@ HAL_StatusTypeDef HAL_InitTick (uint32_t TickPriority) RCC_PeriphCLKInitTypeDef PeriphClkInitStruct; #ifdef RTC_CLOCK_SOURCE_LSE - /* Configue LSE as RTC clock soucre */ + /* Configure LSE as RTC clock source */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; RCC_OscInitStruct.LSEState = RCC_LSE_ON; PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; #elif defined (RTC_CLOCK_SOURCE_LSI) - /* Configue LSI as RTC clock soucre */ + /* Configure LSI as RTC clock source */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI1; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; RCC_OscInitStruct.LSIState = RCC_LSI_ON; PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; #elif defined (RTC_CLOCK_SOURCE_HSE) - /* Configue HSE as RTC clock soucre */ + /* Configure HSE as RTC clock source */ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; RCC_OscInitStruct.HSEState = RCC_HSE_ON; @@ -275,5 +275,3 @@ void RTC_WKUP_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_tim_template.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_tim_template.c index 10c37e5f3..99c8904da 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_tim_template.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_timebase_tim_template.c @@ -6,19 +6,18 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -157,10 +156,8 @@ void TIM2_IRQHandler(void) /** * @} - */ + */ /** * @} - */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + */ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tsc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tsc.c index 0de2b9bdd..4e010161b 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tsc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tsc.c @@ -10,6 +10,17 @@ * + Read acquisition result * + Interrupts and flags management * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ================================================================================ ##### TSC specific features ##### @@ -176,18 +187,7 @@ | PD2 (AF) | | +--------------------------------+ - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -219,8 +219,8 @@ static uint32_t TSC_extract_groups(uint32_t iomask); */ /** @defgroup TSC_Exported_Functions_Group1 Initialization and de-initialization functions - * @brief Initialization and Configuration functions - * + * @brief Initialization and Configuration functions + * @verbatim =============================================================================== ##### Initialization and de-initialization functions ##### @@ -599,8 +599,8 @@ HAL_StatusTypeDef HAL_TSC_UnRegisterCallback(TSC_HandleTypeDef *htsc, HAL_TSC_Ca */ /** @defgroup TSC_Exported_Functions_Group2 Input and Output operation functions - * @brief Input and Output operation functions - * + * @brief Input and Output operation functions + * @verbatim =============================================================================== ##### IO Operation functions ##### @@ -850,8 +850,8 @@ uint32_t HAL_TSC_GroupGetValue(TSC_HandleTypeDef *htsc, uint32_t gx_index) */ /** @defgroup TSC_Exported_Functions_Group3 Peripheral Control functions - * @brief Peripheral Control functions - * + * @brief Peripheral Control functions + * @verbatim =============================================================================== ##### Peripheral Control functions ##### @@ -939,8 +939,8 @@ HAL_StatusTypeDef HAL_TSC_IODischarge(TSC_HandleTypeDef *htsc, FunctionalState c */ /** @defgroup TSC_Exported_Functions_Group4 Peripheral State and Errors functions - * @brief Peripheral State and Errors functions - * + * @brief Peripheral State and Errors functions + * @verbatim =============================================================================== ##### State and Errors functions ##### @@ -992,8 +992,8 @@ HAL_TSC_StateTypeDef HAL_TSC_GetState(TSC_HandleTypeDef *htsc) */ /** @defgroup TSC_IRQ_Handler_and_Callbacks IRQ Handler and Callbacks - * @{ - */ + * @{ + */ /** * @brief Handle TSC interrupt request. @@ -1097,7 +1097,7 @@ static uint32_t TSC_extract_groups(uint32_t iomask) for (idx = 0UL; idx < (uint32_t)TSC_NB_OF_GROUPS; idx++) { - if ((iomask & (0x0FUL << (idx * 4UL))) != 0UL ) + if ((iomask & (0x0FUL << (idx * 4UL))) != 0UL) { groups |= (1UL << idx); } @@ -1121,4 +1121,3 @@ static uint32_t TSC_extract_groups(uint32_t iomask) */ #endif /* TSC */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c index 5c91bed0d..3cfbaae05 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c @@ -10,6 +10,17 @@ * + Peripheral Control functions * * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim =============================================================================== ##### How to use this driver ##### @@ -76,8 +87,8 @@ allows the user to configure dynamically the driver callbacks. [..] - Use Function @ref HAL_UART_RegisterCallback() to register a user callback. - Function @ref HAL_UART_RegisterCallback() allows to register following callbacks: + Use Function HAL_UART_RegisterCallback() to register a user callback. + Function HAL_UART_RegisterCallback() allows to register following callbacks: (+) TxHalfCpltCallback : Tx Half Complete Callback. (+) TxCpltCallback : Tx Complete Callback. (+) RxHalfCpltCallback : Rx Half Complete Callback. @@ -95,9 +106,9 @@ and a pointer to the user callback function. [..] - Use function @ref HAL_UART_UnRegisterCallback() to reset a callback to the default + Use function HAL_UART_UnRegisterCallback() to reset a callback to the default weak (surcharged) function. - @ref HAL_UART_UnRegisterCallback() takes as parameters the HAL peripheral handle, + HAL_UART_UnRegisterCallback() takes as parameters the HAL peripheral handle, and the Callback ID. This function allows to reset following callbacks: (+) TxHalfCpltCallback : Tx Half Complete Callback. @@ -116,16 +127,16 @@ [..] For specific callback RxEventCallback, use dedicated registration/reset functions: - respectively @ref HAL_UART_RegisterRxEventCallback() , @ref HAL_UART_UnRegisterRxEventCallback(). + respectively HAL_UART_RegisterRxEventCallback() , HAL_UART_UnRegisterRxEventCallback(). [..] - By default, after the @ref HAL_UART_Init() and when the state is HAL_UART_STATE_RESET + By default, after the HAL_UART_Init() and when the state is HAL_UART_STATE_RESET all callbacks are set to the corresponding weak (surcharged) functions: - examples @ref HAL_UART_TxCpltCallback(), @ref HAL_UART_RxHalfCpltCallback(). + examples HAL_UART_TxCpltCallback(), HAL_UART_RxHalfCpltCallback(). Exception done for MspInit and MspDeInit functions that are respectively - reset to the legacy weak (surcharged) functions in the @ref HAL_UART_Init() - and @ref HAL_UART_DeInit() only when these callbacks are null (not registered beforehand). - If not, MspInit or MspDeInit are not null, the @ref HAL_UART_Init() and @ref HAL_UART_DeInit() + reset to the legacy weak (surcharged) functions in the HAL_UART_Init() + and HAL_UART_DeInit() only when these callbacks are null (not registered beforehand). + If not, MspInit or MspDeInit are not null, the HAL_UART_Init() and HAL_UART_DeInit() keep and use the user MspInit/MspDeInit callbacks (registered beforehand). [..] @@ -134,8 +145,8 @@ in HAL_UART_STATE_READY or HAL_UART_STATE_RESET state, thus registered (user) MspInit/DeInit callbacks can be used during the Init/DeInit. In that case first register the MspInit/MspDeInit user callbacks - using @ref HAL_UART_RegisterCallback() before calling @ref HAL_UART_DeInit() - or @ref HAL_UART_Init() function. + using HAL_UART_RegisterCallback() before calling HAL_UART_DeInit() + or HAL_UART_Init() function. [..] When The compilation define USE_HAL_UART_REGISTER_CALLBACKS is set to 0 or @@ -145,17 +156,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -3427,10 +3427,11 @@ HAL_StatusTypeDef UART_CheckIdleState(UART_HandleTypeDef *huart) } /** - * @brief Handle UART Communication Timeout. + * @brief This function handles UART Communication Timeout. It waits + * until a flag is no longer in the specified status. * @param huart UART handle. * @param Flag Specifies the UART flag to check - * @param Status Flag status (SET or RESET) + * @param Status The actual Flag status (SET or RESET) * @param Tickstart Tick start value * @param Timeout Timeout duration * @retval HAL status @@ -4670,4 +4671,3 @@ static void UART_RxISR_16BIT_FIFOEN(UART_HandleTypeDef *huart) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c index d99dad065..dad1f8855 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c @@ -9,6 +9,17 @@ * + Peripheral Control functions * * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### UART peripheral extended features ##### @@ -27,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -1026,4 +1026,3 @@ static void UARTEx_SetNbDataToProcess(UART_HandleTypeDef *huart) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart.c index 2239c66c2..d7ab46702 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart.c @@ -11,6 +11,17 @@ * + Peripheral Control functions * + Peripheral State and Error functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim =============================================================================== ##### How to use this driver ##### @@ -39,7 +50,8 @@ (+++) Configure the declared DMA handle structure with the required Tx/Rx parameters. (+++) Configure the DMA Tx/Rx channel. (+++) Associate the initialized DMA handle to the USART DMA Tx/Rx handle. - (+++) Configure the priority and enable the NVIC for the transfer complete interrupt on the DMA Tx/Rx channel. + (+++) Configure the priority and enable the NVIC for the transfer + complete interrupt on the DMA Tx/Rx channel. (#) Program the Baud Rate, Word Length, Stop Bit, Parity, and Mode (Receiver/Transmitter) in the husart handle Init structure. @@ -122,17 +134,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -421,7 +422,8 @@ __weak void HAL_USART_MspDeInit(USART_HandleTypeDef *husart) * @param pCallback pointer to the Callback function * @retval HAL status + */ -HAL_StatusTypeDef HAL_USART_RegisterCallback(USART_HandleTypeDef *husart, HAL_USART_CallbackIDTypeDef CallbackID, pUSART_CallbackTypeDef pCallback) +HAL_StatusTypeDef HAL_USART_RegisterCallback(USART_HandleTypeDef *husart, HAL_USART_CallbackIDTypeDef CallbackID, + pUSART_CallbackTypeDef pCallback) { HAL_StatusTypeDef status = HAL_OK; @@ -718,13 +720,16 @@ HAL_StatusTypeDef HAL_USART_UnRegisterCallback(USART_HandleTypeDef *husart, HAL_ (#) In Non-Blocking mode transfers, possible errors are split into 2 categories. Errors are handled as follows : (++) Error is considered as Recoverable and non blocking : Transfer could go till end, but error severity is - to be evaluated by user : this concerns Frame Error, Parity Error or Noise Error in Interrupt mode reception . - Received character is then retrieved and stored in Rx buffer, Error code is set to allow user to identify error type, - and HAL_USART_ErrorCallback() user callback is executed. Transfer is kept ongoing on USART side. + to be evaluated by user : this concerns Frame Error, + Parity Error or Noise Error in Interrupt mode reception . + Received character is then retrieved and stored in Rx buffer, Error code is set to allow user to identify + error type, and HAL_USART_ErrorCallback() user callback is executed. + Transfer is kept ongoing on USART side. If user wants to abort it, Abort services should be called by user. (++) Error is considered as Blocking : Transfer could not be completed properly and is aborted. This concerns Overrun Error In Interrupt mode reception and all errors in DMA mode. - Error code is set to allow user to identify error type, and HAL_USART_ErrorCallback() user callback is executed. + Error code is set to allow user to identify error type, + and HAL_USART_ErrorCallback() user callback is executed. @endverbatim * @{ @@ -761,7 +766,7 @@ HAL_StatusTypeDef HAL_USART_Transmit(USART_HandleTypeDef *husart, uint8_t *pTxDa husart->ErrorCode = HAL_USART_ERROR_NONE; husart->State = HAL_USART_STATE_BUSY_TX; - /* Init tickstart for timeout managment*/ + /* Init tickstart for timeout management */ tickstart = HAL_GetTick(); husart->TxXferSize = Size; @@ -860,7 +865,7 @@ HAL_StatusTypeDef HAL_USART_Receive(USART_HandleTypeDef *husart, uint8_t *pRxDat husart->ErrorCode = HAL_USART_ERROR_NONE; husart->State = HAL_USART_STATE_BUSY_RX; - /* Init tickstart for timeout managment*/ + /* Init tickstart for timeout management */ tickstart = HAL_GetTick(); husart->RxXferSize = Size; @@ -952,7 +957,8 @@ HAL_StatusTypeDef HAL_USART_Receive(USART_HandleTypeDef *husart, uint8_t *pRxDat * @param Timeout Timeout duration. * @retval HAL status */ -HAL_StatusTypeDef HAL_USART_TransmitReceive(USART_HandleTypeDef *husart, uint8_t *pTxData, uint8_t *pRxData, uint16_t Size, uint32_t Timeout) +HAL_StatusTypeDef HAL_USART_TransmitReceive(USART_HandleTypeDef *husart, uint8_t *pTxData, uint8_t *pRxData, + uint16_t Size, uint32_t Timeout) { uint8_t *prxdata8bits; uint16_t *prxdata16bits; @@ -976,7 +982,7 @@ HAL_StatusTypeDef HAL_USART_TransmitReceive(USART_HandleTypeDef *husart, uint8_t husart->ErrorCode = HAL_USART_ERROR_NONE; husart->State = HAL_USART_STATE_BUSY_RX; - /* Init tickstart for timeout managment*/ + /* Init tickstart for timeout management */ tickstart = HAL_GetTick(); husart->RxXferSize = Size; @@ -1288,7 +1294,8 @@ HAL_StatusTypeDef HAL_USART_Receive_IT(USART_HandleTypeDef *husart, uint8_t *pRx * @param Size amount of data elements (u8 or u16) to be sent (same amount to be received). * @retval HAL status */ -HAL_StatusTypeDef HAL_USART_TransmitReceive_IT(USART_HandleTypeDef *husart, uint8_t *pTxData, uint8_t *pRxData, uint16_t Size) +HAL_StatusTypeDef HAL_USART_TransmitReceive_IT(USART_HandleTypeDef *husart, uint8_t *pTxData, uint8_t *pRxData, + uint16_t Size) { if (husart->State == HAL_USART_STATE_READY) @@ -1424,7 +1431,7 @@ HAL_StatusTypeDef HAL_USART_Transmit_DMA(USART_HandleTypeDef *husart, uint8_t *p status = HAL_DMA_Start_IT(husart->hdmatx, *(uint32_t *)tmp, (uint32_t)&husart->Instance->TDR, Size); } - if(status == HAL_OK) + if (status == HAL_OK) { /* Clear the TC flag in the ICR register */ __HAL_USART_CLEAR_FLAG(husart, USART_CLEAR_TCF); @@ -1448,7 +1455,7 @@ HAL_StatusTypeDef HAL_USART_Transmit_DMA(USART_HandleTypeDef *husart, uint8_t *p /* Restore husart->State to ready */ husart->State = HAL_USART_STATE_READY; - + return HAL_ERROR; } } @@ -1528,7 +1535,7 @@ HAL_StatusTypeDef HAL_USART_Receive_DMA(USART_HandleTypeDef *husart, uint8_t *pR } } - if(status == HAL_OK) + if (status == HAL_OK) { /* Process Unlocked */ __HAL_UNLOCK(husart); @@ -1551,7 +1558,7 @@ HAL_StatusTypeDef HAL_USART_Receive_DMA(USART_HandleTypeDef *husart, uint8_t *pR } else { - if(husart->hdmarx != NULL) + if (husart->hdmarx != NULL) { status = HAL_DMA_Abort(husart->hdmarx); } @@ -1589,7 +1596,8 @@ HAL_StatusTypeDef HAL_USART_Receive_DMA(USART_HandleTypeDef *husart, uint8_t *pR * @param Size amount of data elements (u8 or u16) to be received/sent. * @retval HAL status */ -HAL_StatusTypeDef HAL_USART_TransmitReceive_DMA(USART_HandleTypeDef *husart, uint8_t *pTxData, uint8_t *pRxData, uint16_t Size) +HAL_StatusTypeDef HAL_USART_TransmitReceive_DMA(USART_HandleTypeDef *husart, uint8_t *pTxData, uint8_t *pRxData, + uint16_t Size) { HAL_StatusTypeDef status; uint32_t *tmp; @@ -1638,7 +1646,7 @@ HAL_StatusTypeDef HAL_USART_TransmitReceive_DMA(USART_HandleTypeDef *husart, uin status = HAL_DMA_Start_IT(husart->hdmarx, (uint32_t)&husart->Instance->RDR, *(uint32_t *)tmp, Size); /* Enable the USART transmit DMA channel */ - if(status == HAL_OK) + if (status == HAL_OK) { tmp = (uint32_t *)&pTxData; status = HAL_DMA_Start_IT(husart->hdmatx, *(uint32_t *)tmp, (uint32_t)&husart->Instance->TDR, Size); @@ -1649,7 +1657,7 @@ HAL_StatusTypeDef HAL_USART_TransmitReceive_DMA(USART_HandleTypeDef *husart, uin status = HAL_ERROR; } - if(status == HAL_OK) + if (status == HAL_OK) { /* Process Unlocked */ __HAL_UNLOCK(husart); @@ -1675,7 +1683,7 @@ HAL_StatusTypeDef HAL_USART_TransmitReceive_DMA(USART_HandleTypeDef *husart, uin } else { - if(husart->hdmarx != NULL) + if (husart->hdmarx != NULL) { status = HAL_DMA_Abort(husart->hdmarx); } @@ -1771,7 +1779,7 @@ HAL_StatusTypeDef HAL_USART_DMAResume(USART_HandleTypeDef *husart) /* Clear the Overrun flag before resuming the Rx transfer*/ __HAL_USART_CLEAR_FLAG(husart, USART_CLEAR_OREF); - /* Reenable PE and ERR (Frame error, noise error, overrun error) interrupts */ + /* Re-enable PE and ERR (Frame error, noise error, overrun error) interrupts */ SET_BIT(husart->Instance->CR1, USART_CR1_PEIE); SET_BIT(husart->Instance->CR3, USART_CR3_EIE); @@ -1862,11 +1870,12 @@ HAL_StatusTypeDef HAL_USART_DMAStop(USART_HandleTypeDef *husart) * - Set handle State to READY * @note This procedure is executed in blocking mode : when exiting function, Abort is considered as completed. * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_USART_Abort(USART_HandleTypeDef *husart) { /* Disable TXEIE, TCIE, RXNE, RXFT, TXFT, PE and ERR (Frame error, noise error, overrun error) interrupts */ - CLEAR_BIT(husart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE | USART_CR1_TCIE)); + CLEAR_BIT(husart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE | + USART_CR1_TCIE)); CLEAR_BIT(husart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE | USART_CR3_TXFTIE)); /* Disable the USART DMA Tx request if enabled */ @@ -1963,13 +1972,14 @@ HAL_StatusTypeDef HAL_USART_Abort(USART_HandleTypeDef *husart) * @note This procedure is executed in Interrupt mode, meaning that abort procedure could be * considered as completed only when user abort complete callback is executed (not when exiting function). * @retval HAL status -*/ + */ HAL_StatusTypeDef HAL_USART_Abort_IT(USART_HandleTypeDef *husart) { uint32_t abortcplt = 1U; /* Disable TXEIE, TCIE, RXNE, RXFT, TXFT, PE and ERR (Frame error, noise error, overrun error) interrupts */ - CLEAR_BIT(husart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE | USART_CR1_TCIE)); + CLEAR_BIT(husart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE | + USART_CR1_TCIE)); CLEAR_BIT(husart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE | USART_CR3_TXFTIE)); /* If DMA Tx and/or DMA Rx Handles are associated to USART Handle, DMA Abort complete callbacks should be initialised @@ -2429,8 +2439,8 @@ __weak void HAL_USART_AbortCpltCallback(USART_HandleTypeDef *husart) */ /** @defgroup USART_Exported_Functions_Group4 Peripheral State and Error functions - * @brief USART Peripheral State and Error functions - * + * @brief USART Peripheral State and Error functions + * @verbatim ============================================================================== ##### Peripheral State and Error functions ##### @@ -2476,8 +2486,8 @@ uint32_t HAL_USART_GetError(USART_HandleTypeDef *husart) */ /** @defgroup USART_Private_Functions USART Private Functions - * @{ - */ + * @{ + */ /** * @brief Initialize the callbacks to their default values. @@ -2808,15 +2818,17 @@ static void USART_DMARxAbortCallback(DMA_HandleTypeDef *hdma) /** - * @brief Handle USART Communication Timeout. + * @brief Handle USART Communication Timeout. It waits + * until a flag is no longer in the specified status. * @param husart USART handle. * @param Flag Specifies the USART flag to check. - * @param Status the Flag status (SET or RESET). + * @param Status the actual Flag status (SET or RESET). * @param Tickstart Tick start value * @param Timeout timeout duration. * @retval HAL status */ -static HAL_StatusTypeDef USART_WaitOnFlagUntilTimeout(USART_HandleTypeDef *husart, uint32_t Flag, FlagStatus Status, uint32_t Tickstart, uint32_t Timeout) +static HAL_StatusTypeDef USART_WaitOnFlagUntilTimeout(USART_HandleTypeDef *husart, uint32_t Flag, FlagStatus Status, + uint32_t Tickstart, uint32_t Timeout) { /* Wait until flag is set */ while ((__HAL_USART_GET_FLAG(husart, Flag) ? SET : RESET) == Status) @@ -2950,7 +2962,7 @@ static HAL_StatusTypeDef USART_CheckIdleState(USART_HandleTypeDef *husart) /* Initialize the USART ErrorCode */ husart->ErrorCode = HAL_USART_ERROR_NONE; - /* Init tickstart for timeout managment*/ + /* Init tickstart for timeout management */ tickstart = HAL_GetTick(); /* Check if the Transmitter is enabled */ @@ -3412,7 +3424,8 @@ static void USART_RxISR_8BIT_FIFOEN(USART_HandleTypeDef *husart) /* Disable the USART Parity Error Interrupt */ CLEAR_BIT(husart->Instance->CR1, USART_CR1_PEIE); - /* Disable the USART Error Interrupt: (Frame error, noise error, overrun error) and RX FIFO Threshold interrupt */ + /* Disable the USART Error Interrupt: (Frame error, noise error, overrun error) + and RX FIFO Threshold interrupt */ CLEAR_BIT(husart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE)); /* Clear RxISR function pointer */ @@ -3543,7 +3556,8 @@ static void USART_RxISR_16BIT_FIFOEN(USART_HandleTypeDef *husart) /* Disable the USART Parity Error Interrupt */ CLEAR_BIT(husart->Instance->CR1, USART_CR1_PEIE); - /* Disable the USART Error Interrupt: (Frame error, noise error, overrun error) and RX FIFO Threshold interrupt */ + /* Disable the USART Error Interrupt: (Frame error, noise error, overrun error) + and RX FIFO Threshold interrupt */ CLEAR_BIT(husart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE)); /* Clear RxISR function pointer */ @@ -3651,4 +3665,3 @@ static void USART_RxISR_16BIT_FIFOEN(USART_HandleTypeDef *husart) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart_ex.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart_ex.c index 56e52b08a..24ed9996c 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart_ex.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_usart_ex.c @@ -8,6 +8,17 @@ * + Peripheral Control functions * * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### USART peripheral extended features ##### @@ -26,17 +37,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -515,10 +515,14 @@ static void USARTEx_SetNbDataToProcess(USART_HandleTypeDef *husart) { rx_fifo_depth = RX_FIFO_DEPTH; tx_fifo_depth = TX_FIFO_DEPTH; - rx_fifo_threshold = (uint8_t)((READ_BIT(husart->Instance->CR3, USART_CR3_RXFTCFG) >> USART_CR3_RXFTCFG_Pos) & 0xFFU); - tx_fifo_threshold = (uint8_t)((READ_BIT(husart->Instance->CR3, USART_CR3_TXFTCFG) >> USART_CR3_TXFTCFG_Pos) & 0xFFU); - husart->NbTxDataToProcess = ((uint16_t)tx_fifo_depth * numerator[tx_fifo_threshold]) / (uint16_t)denominator[tx_fifo_threshold]; - husart->NbRxDataToProcess = ((uint16_t)rx_fifo_depth * numerator[rx_fifo_threshold]) / (uint16_t)denominator[rx_fifo_threshold]; + rx_fifo_threshold = (uint8_t)((READ_BIT(husart->Instance->CR3, + USART_CR3_RXFTCFG) >> USART_CR3_RXFTCFG_Pos) & 0xFFU); + tx_fifo_threshold = (uint8_t)((READ_BIT(husart->Instance->CR3, + USART_CR3_TXFTCFG) >> USART_CR3_TXFTCFG_Pos) & 0xFFU); + husart->NbTxDataToProcess = ((uint16_t)tx_fifo_depth * numerator[tx_fifo_threshold]) / + (uint16_t)denominator[tx_fifo_threshold]; + husart->NbRxDataToProcess = ((uint16_t)rx_fifo_depth * numerator[rx_fifo_threshold]) / + (uint16_t)denominator[rx_fifo_threshold]; } } /** @@ -535,4 +539,3 @@ static void USARTEx_SetNbDataToProcess(USART_HandleTypeDef *husart) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_wwdg.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_wwdg.c index 0c0a47013..78a85b27f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_wwdg.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_wwdg.c @@ -7,6 +7,17 @@ * functionalities of the Window Watchdog (WWDG) peripheral: * + Initialization and Configuration functions * + IO operation functions + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### WWDG Specific features ##### @@ -55,7 +66,7 @@ (+) Enable WWDG APB1 clock using __HAL_RCC_WWDG_CLK_ENABLE(). (+) Configure the WWDG prescaler, refresh window value, counter value and early interrupt status using HAL_WWDG_Init() function. This will automatically - enable WWDG and start its downcounter. Time reference can be taken from + enable WWDG and start its downcounter. Time reference can be taken from function exit. Care must be taken to provide a counter value greater than 0x40 to prevent generation of immediate reset. (+) If the Early Wakeup Interrupt (EWI) feature is enabled, an interrupt is @@ -112,17 +123,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -418,5 +418,3 @@ __weak void HAL_WWDG_EarlyWakeupCallback(WWDG_HandleTypeDef *hwwdg) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_adc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_adc.c index a543fcd60..6495557d8 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_adc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_adc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -322,6 +321,9 @@ ErrorStatus LL_ADC_CommonDeInit(ADC_Common_TypeDef *ADCxy_COMMON) /* Check the parameters */ assert_param(IS_ADC_COMMON_INSTANCE(ADCxy_COMMON)); + /* Prevent unused argument compilation warning */ + (void)(ADCxy_COMMON); + #if defined (ADC_SUPPORT_2_5_MSPS) /* Force reset of ADC clock (core clock) */ LL_APB2_GRP1_ForceReset(LL_APB2_GRP1_PERIPH_ADC); @@ -1258,5 +1260,3 @@ void LL_ADC_INJ_StructInit(LL_ADC_INJ_InitTypeDef *ADC_INJ_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_comp.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_comp.c index 7495e2182..b41f12e7f 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_comp.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_comp.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -25,7 +24,7 @@ #include "stm32_assert.h" #else #define assert_param(expr) ((void)0U) -#endif +#endif /* USE_FULL_ASSERT */ /** @addtogroup STM32WBxx_LL_Driver * @{ @@ -276,5 +275,3 @@ void LL_COMP_StructInit(LL_COMP_InitTypeDef *COMP_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crc.c index c2606e77f..51ac55c4c 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -26,7 +25,7 @@ #include "stm32_assert.h" #else #define assert_param(expr) ((void)0U) -#endif +#endif /* USE_FULL_ASSERT */ /** @addtogroup STM32WBxx_LL_Driver * @{ @@ -102,6 +101,3 @@ ErrorStatus LL_CRC_DeInit(CRC_TypeDef *CRCx) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crs.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crs.c index 6ca67375f..924788730 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crs.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_crs.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,5 +81,3 @@ ErrorStatus LL_CRS_DeInit(void) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_dma.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_dma.c index 5d9957555..25c582315 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_dma.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_dma.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -367,5 +366,3 @@ void LL_DMA_StructInit(LL_DMA_InitTypeDef *DMA_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_exti.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_exti.c index 10e79c201..f5ef90c8c 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_exti.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_exti.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -295,5 +294,3 @@ void LL_EXTI_StructInit(LL_EXTI_InitTypeDef *EXTI_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_gpio.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_gpio.c index a816c1c7d..d750f5df7 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_gpio.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_gpio.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -270,6 +269,3 @@ void LL_GPIO_StructInit(LL_GPIO_InitTypeDef *GPIO_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_i2c.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_i2c.c index a531c1efc..70fe40c86 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_i2c.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_i2c.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -224,5 +223,3 @@ void LL_I2C_StructInit(LL_I2C_InitTypeDef *I2C_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lptim.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lptim.c index 9560ad99c..0516954c6 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lptim.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lptim.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -28,7 +27,7 @@ #include "stm32_assert.h" #else #define assert_param(expr) ((void)0U) -#endif +#endif /* USE_FULL_ASSERT */ /** @addtogroup STM32WBxx_LL_Driver * @{ @@ -196,6 +195,7 @@ void LL_LPTIM_Disable(LPTIM_TypeDef *LPTIMx) uint32_t tmpCFGR; uint32_t tmpCMP; uint32_t tmpARR; + uint32_t primask_bit; #if defined(LPTIM_OR_OR) uint32_t tmpOR; #endif @@ -203,7 +203,9 @@ void LL_LPTIM_Disable(LPTIM_TypeDef *LPTIMx) /* Check the parameters */ assert_param(IS_LPTIM_INSTANCE(LPTIMx)); - __disable_irq(); + /* Enter critical section */ + primask_bit = __get_PRIMASK(); + __set_PRIMASK(1) ; /********** Save LPTIM Config *********/ /* Save LPTIM source clock */ @@ -297,7 +299,8 @@ void LL_LPTIM_Disable(LPTIM_TypeDef *LPTIMx) LPTIMx->OR = tmpOR; #endif - __enable_irq(); + /* Exit critical section: restore previous priority mask */ + __set_PRIMASK(primask_bit); } /** @@ -319,5 +322,3 @@ void LL_LPTIM_Disable(LPTIM_TypeDef *LPTIMx) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lpuart.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lpuart.c index 8e507ab75..f60023b9d 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lpuart.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_lpuart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -281,6 +280,3 @@ void LL_LPUART_StructInit(LL_LPUART_InitTypeDef *LPUART_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pka.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pka.c index 6f3b6617f..3e7bcadc3 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pka.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pka.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -26,7 +25,7 @@ #include "stm32_assert.h" #else #define assert_param(expr) ((void)0U) -#endif +#endif /* USE_FULL_ASSERT */ /** @addtogroup STM32WBxx_LL_Driver * @{ @@ -46,23 +45,23 @@ * @{ */ #define IS_LL_PKA_MODE(__VALUE__) (((__VALUE__) == LL_PKA_MODE_MONTGOMERY_PARAM_MOD_EXP) ||\ - ((__VALUE__) == LL_PKA_MODE_MONTGOMERY_PARAM) ||\ - ((__VALUE__) == LL_PKA_MODE_MODULAR_EXP) ||\ - ((__VALUE__) == LL_PKA_MODE_MONTGOMERY_PARAM_ECC) ||\ - ((__VALUE__) == LL_PKA_MODE_ECC_KP_PRIMITIVE) ||\ - ((__VALUE__) == LL_PKA_MODE_ECDSA_SIGNATURE) ||\ - ((__VALUE__) == LL_PKA_MODE_ECDSA_VERIFICATION) ||\ - ((__VALUE__) == LL_PKA_MODE_POINT_CHECK) ||\ - ((__VALUE__) == LL_PKA_MODE_RSA_CRT_EXP) ||\ - ((__VALUE__) == LL_PKA_MODE_MODULAR_INV) ||\ - ((__VALUE__) == LL_PKA_MODE_ARITHMETIC_ADD) ||\ - ((__VALUE__) == LL_PKA_MODE_ARITHMETIC_SUB) ||\ - ((__VALUE__) == LL_PKA_MODE_ARITHMETIC_MUL) ||\ - ((__VALUE__) == LL_PKA_MODE_COMPARISON) ||\ - ((__VALUE__) == LL_PKA_MODE_MODULAR_REDUC) ||\ - ((__VALUE__) == LL_PKA_MODE_MODULAR_ADD) ||\ - ((__VALUE__) == LL_PKA_MODE_MODULAR_SUB) ||\ - ((__VALUE__) == LL_PKA_MODE_MONTGOMERY_MUL)) + ((__VALUE__) == LL_PKA_MODE_MONTGOMERY_PARAM) ||\ + ((__VALUE__) == LL_PKA_MODE_MODULAR_EXP) ||\ + ((__VALUE__) == LL_PKA_MODE_MONTGOMERY_PARAM_ECC) ||\ + ((__VALUE__) == LL_PKA_MODE_ECC_KP_PRIMITIVE) ||\ + ((__VALUE__) == LL_PKA_MODE_ECDSA_SIGNATURE) ||\ + ((__VALUE__) == LL_PKA_MODE_ECDSA_VERIFICATION) ||\ + ((__VALUE__) == LL_PKA_MODE_POINT_CHECK) ||\ + ((__VALUE__) == LL_PKA_MODE_RSA_CRT_EXP) ||\ + ((__VALUE__) == LL_PKA_MODE_MODULAR_INV) ||\ + ((__VALUE__) == LL_PKA_MODE_ARITHMETIC_ADD) ||\ + ((__VALUE__) == LL_PKA_MODE_ARITHMETIC_SUB) ||\ + ((__VALUE__) == LL_PKA_MODE_ARITHMETIC_MUL) ||\ + ((__VALUE__) == LL_PKA_MODE_COMPARISON) ||\ + ((__VALUE__) == LL_PKA_MODE_MODULAR_REDUC) ||\ + ((__VALUE__) == LL_PKA_MODE_MODULAR_ADD) ||\ + ((__VALUE__) == LL_PKA_MODE_MODULAR_SUB) ||\ + ((__VALUE__) == LL_PKA_MODE_MONTGOMERY_MUL)) /** * @} */ @@ -159,6 +158,3 @@ void LL_PKA_StructInit(LL_PKA_InitTypeDef *PKA_InitStruct) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pwr.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pwr.c index b275ced7d..7eebe1b96 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pwr.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pwr.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -150,4 +149,3 @@ ErrorStatus LL_PWR_DeInit(void) #endif /* USE_FULL_LL_DRIVER */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rcc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rcc.c index afcaa9430..eeed534db 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rcc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rcc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -629,7 +628,10 @@ uint32_t LL_RCC_GetSAIClockFreq(uint32_t SAIxSource) case LL_RCC_SAI1_CLKSOURCE_PLLSAI1: /* PLLSAI1 clock used as SAI1 clock source */ if (LL_RCC_PLLSAI1_IsReady() == 1U) { - sai_frequency = RCC_PLLSAI1_GetFreqDomain_SAI(); + if (LL_RCC_PLLSAI1_IsEnabledDomain_SAI() == 1U) + { + sai_frequency = RCC_PLLSAI1_GetFreqDomain_SAI(); + } } break; #endif @@ -637,7 +639,10 @@ uint32_t LL_RCC_GetSAIClockFreq(uint32_t SAIxSource) case LL_RCC_SAI1_CLKSOURCE_PLL: /* PLL clock used as SAI1 clock source */ if (LL_RCC_PLL_IsReady() == 1U) { - sai_frequency = RCC_PLL_GetFreqDomain_SAI(); + if (LL_RCC_PLL_IsEnabledDomain_SAI() == 1U) + { + sai_frequency = RCC_PLL_GetFreqDomain_SAI(); + } } break; @@ -671,7 +676,10 @@ uint32_t LL_RCC_GetCLK48ClockFreq(uint32_t CLK48xSource) case LL_RCC_CLK48_CLKSOURCE_PLLSAI1: /* PLLSAI1 clock used as CLK48 clock source */ if (LL_RCC_PLLSAI1_IsReady() == 1U) { - clk48_frequency = RCC_PLLSAI1_GetFreqDomain_48M(); + if (LL_RCC_PLLSAI1_IsEnabledDomain_48M() == 1U) + { + clk48_frequency = RCC_PLLSAI1_GetFreqDomain_48M(); + } } break; #endif @@ -679,7 +687,10 @@ uint32_t LL_RCC_GetCLK48ClockFreq(uint32_t CLK48xSource) case LL_RCC_CLK48_CLKSOURCE_PLL: /* PLL clock used as CLK48 clock source */ if (LL_RCC_PLL_IsReady() == 1U) { - clk48_frequency = RCC_PLL_GetFreqDomain_48M(); + if (LL_RCC_PLL_IsEnabledDomain_48M() == 1U) + { + clk48_frequency = RCC_PLL_GetFreqDomain_48M(); + } } break; @@ -784,7 +795,10 @@ uint32_t LL_RCC_GetADCClockFreq(uint32_t ADCxSource) case LL_RCC_ADC_CLKSOURCE_PLLSAI1: /* PLLSAI1 clock used as ADC clock source */ if (LL_RCC_PLLSAI1_IsReady() == 1U) { - adc_frequency = RCC_PLLSAI1_GetFreqDomain_ADC(); + if (LL_RCC_PLLSAI1_IsEnabledDomain_ADC() == 1U) + { + adc_frequency = RCC_PLLSAI1_GetFreqDomain_ADC(); + } } break; #endif @@ -796,7 +810,10 @@ uint32_t LL_RCC_GetADCClockFreq(uint32_t ADCxSource) case LL_RCC_ADC_CLKSOURCE_PLL: /* PLL clock used as ADC clock source */ if (LL_RCC_PLL_IsReady() == 1U) { - adc_frequency = RCC_PLL_GetFreqDomain_ADC(); + if (LL_RCC_PLL_IsEnabledDomain_ADC() == 1U) + { + adc_frequency = RCC_PLL_GetFreqDomain_ADC(); + } } break; @@ -1338,5 +1355,3 @@ static uint32_t RCC_PLLSAI1_GetFreqDomain_ADC(void) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rng.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rng.c index 07a660fd8..463d4e863 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rng.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rng.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,5 +133,3 @@ void LL_RNG_StructInit(LL_RNG_InitTypeDef *RNG_InitStruct) #endif /* USE_FULL_LL_DRIVER */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rtc.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rtc.c index f92a7033d..7ed96ba4d 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rtc.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_rtc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -858,5 +857,3 @@ ErrorStatus LL_RTC_WaitForSynchro(RTC_TypeDef *RTCx) */ #endif /* USE_FULL_LL_DRIVER */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_spi.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_spi.c index 37c69db12..a275d6c73 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_spi.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_spi.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -26,7 +25,7 @@ #include "stm32_assert.h" #else #define assert_param(expr) ((void)0U) -#endif +#endif /* USE_FULL_ASSERT */ /** @addtogroup STM32WBxx_LL_Driver * @{ @@ -282,4 +281,3 @@ void LL_SPI_StructInit(LL_SPI_InitTypeDef *SPI_InitStruct) #endif /* USE_FULL_LL_DRIVER */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_tim.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_tim.c index f07d16a38..f782a2180 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_tim.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_tim.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -278,7 +277,8 @@ void LL_TIM_StructInit(LL_TIM_InitTypeDef *TIM_InitStruct) /** * @brief Configure the TIMx time base unit. * @param TIMx Timer Instance - * @param TIM_InitStruct pointer to a @ref LL_TIM_InitTypeDef structure (TIMx time base unit configuration data structure) + * @param TIM_InitStruct pointer to a @ref LL_TIM_InitTypeDef structure + * (TIMx time base unit configuration data structure) * @retval An ErrorStatus enumeration value: * - SUCCESS: TIMx registers are de-initialized * - ERROR: not applicable @@ -331,7 +331,8 @@ ErrorStatus LL_TIM_Init(TIM_TypeDef *TIMx, LL_TIM_InitTypeDef *TIM_InitStruct) /** * @brief Set the fields of the TIMx output channel configuration data * structure to their default values. - * @param TIM_OC_InitStruct pointer to a @ref LL_TIM_OC_InitTypeDef structure (the output channel configuration data structure) + * @param TIM_OC_InitStruct pointer to a @ref LL_TIM_OC_InitTypeDef structure + * (the output channel configuration data structure) * @retval None */ void LL_TIM_OC_StructInit(LL_TIM_OC_InitTypeDef *TIM_OC_InitStruct) @@ -357,7 +358,8 @@ void LL_TIM_OC_StructInit(LL_TIM_OC_InitTypeDef *TIM_OC_InitStruct) * @arg @ref LL_TIM_CHANNEL_CH4 * @arg @ref LL_TIM_CHANNEL_CH5 * @arg @ref LL_TIM_CHANNEL_CH6 - * @param TIM_OC_InitStruct pointer to a @ref LL_TIM_OC_InitTypeDef structure (TIMx output channel configuration data structure) + * @param TIM_OC_InitStruct pointer to a @ref LL_TIM_OC_InitTypeDef structure (TIMx output channel configuration + * data structure) * @retval An ErrorStatus enumeration value: * - SUCCESS: TIMx output channel is initialized * - ERROR: TIMx output channel is not initialized @@ -396,7 +398,8 @@ ErrorStatus LL_TIM_OC_Init(TIM_TypeDef *TIMx, uint32_t Channel, LL_TIM_OC_InitTy /** * @brief Set the fields of the TIMx input channel configuration data * structure to their default values. - * @param TIM_ICInitStruct pointer to a @ref LL_TIM_IC_InitTypeDef structure (the input channel configuration data structure) + * @param TIM_ICInitStruct pointer to a @ref LL_TIM_IC_InitTypeDef structure (the input channel configuration + * data structure) * @retval None */ void LL_TIM_IC_StructInit(LL_TIM_IC_InitTypeDef *TIM_ICInitStruct) @@ -416,7 +419,8 @@ void LL_TIM_IC_StructInit(LL_TIM_IC_InitTypeDef *TIM_ICInitStruct) * @arg @ref LL_TIM_CHANNEL_CH2 * @arg @ref LL_TIM_CHANNEL_CH3 * @arg @ref LL_TIM_CHANNEL_CH4 - * @param TIM_IC_InitStruct pointer to a @ref LL_TIM_IC_InitTypeDef structure (TIMx input channel configuration data structure) + * @param TIM_IC_InitStruct pointer to a @ref LL_TIM_IC_InitTypeDef structure (TIMx input channel configuration data + * structure) * @retval An ErrorStatus enumeration value: * - SUCCESS: TIMx output channel is initialized * - ERROR: TIMx output channel is not initialized @@ -448,7 +452,8 @@ ErrorStatus LL_TIM_IC_Init(TIM_TypeDef *TIMx, uint32_t Channel, LL_TIM_IC_InitTy /** * @brief Fills each TIM_EncoderInitStruct field with its default value - * @param TIM_EncoderInitStruct pointer to a @ref LL_TIM_ENCODER_InitTypeDef structure (encoder interface configuration data structure) + * @param TIM_EncoderInitStruct pointer to a @ref LL_TIM_ENCODER_InitTypeDef structure (encoder interface + * configuration data structure) * @retval None */ void LL_TIM_ENCODER_StructInit(LL_TIM_ENCODER_InitTypeDef *TIM_EncoderInitStruct) @@ -468,7 +473,8 @@ void LL_TIM_ENCODER_StructInit(LL_TIM_ENCODER_InitTypeDef *TIM_EncoderInitStruct /** * @brief Configure the encoder interface of the timer instance. * @param TIMx Timer Instance - * @param TIM_EncoderInitStruct pointer to a @ref LL_TIM_ENCODER_InitTypeDef structure (TIMx encoder interface configuration data structure) + * @param TIM_EncoderInitStruct pointer to a @ref LL_TIM_ENCODER_InitTypeDef structure (TIMx encoder interface + * configuration data structure) * @retval An ErrorStatus enumeration value: * - SUCCESS: TIMx registers are de-initialized * - ERROR: not applicable @@ -532,7 +538,8 @@ ErrorStatus LL_TIM_ENCODER_Init(TIM_TypeDef *TIMx, LL_TIM_ENCODER_InitTypeDef *T /** * @brief Set the fields of the TIMx Hall sensor interface configuration data * structure to their default values. - * @param TIM_HallSensorInitStruct pointer to a @ref LL_TIM_HALLSENSOR_InitTypeDef structure (HALL sensor interface configuration data structure) + * @param TIM_HallSensorInitStruct pointer to a @ref LL_TIM_HALLSENSOR_InitTypeDef structure (HALL sensor interface + * configuration data structure) * @retval None */ void LL_TIM_HALLSENSOR_StructInit(LL_TIM_HALLSENSOR_InitTypeDef *TIM_HallSensorInitStruct) @@ -559,7 +566,8 @@ void LL_TIM_HALLSENSOR_StructInit(LL_TIM_HALLSENSOR_InitTypeDef *TIM_HallSensorI * @note LL_TIM_IC_POLARITY_BOTHEDGE must not be used for TI1 when it is used * when TIMx operates in Hall sensor interface mode. * @param TIMx Timer Instance - * @param TIM_HallSensorInitStruct pointer to a @ref LL_TIM_HALLSENSOR_InitTypeDef structure (TIMx HALL sensor interface configuration data structure) + * @param TIM_HallSensorInitStruct pointer to a @ref LL_TIM_HALLSENSOR_InitTypeDef structure (TIMx HALL sensor + * interface configuration data structure) * @retval An ErrorStatus enumeration value: * - SUCCESS: TIMx registers are de-initialized * - ERROR: not applicable @@ -639,7 +647,8 @@ ErrorStatus LL_TIM_HALLSENSOR_Init(TIM_TypeDef *TIMx, LL_TIM_HALLSENSOR_InitType /** * @brief Set the fields of the Break and Dead Time configuration data structure * to their default values. - * @param TIM_BDTRInitStruct pointer to a @ref LL_TIM_BDTR_InitTypeDef structure (Break and Dead Time configuration data structure) + * @param TIM_BDTRInitStruct pointer to a @ref LL_TIM_BDTR_InitTypeDef structure (Break and Dead Time configuration + * data structure) * @retval None */ void LL_TIM_BDTR_StructInit(LL_TIM_BDTR_InitTypeDef *TIM_BDTRInitStruct) @@ -671,7 +680,8 @@ void LL_TIM_BDTR_StructInit(LL_TIM_BDTR_InitTypeDef *TIM_BDTRInitStruct) * @note Macro IS_TIM_BKIN2_INSTANCE(TIMx) can be used to check whether or not * a timer instance provides a second break input. * @param TIMx Timer Instance - * @param TIM_BDTRInitStruct pointer to a @ref LL_TIM_BDTR_InitTypeDef structure (Break and Dead Time configuration data structure) + * @param TIM_BDTRInitStruct pointer to a @ref LL_TIM_BDTR_InitTypeDef structure (Break and Dead Time configuration + * data structure) * @retval An ErrorStatus enumeration value: * - SUCCESS: Break and Dead Time is initialized * - ERROR: not applicable @@ -1317,4 +1327,3 @@ static ErrorStatus IC4Config(TIM_TypeDef *TIMx, LL_TIM_IC_InitTypeDef *TIM_ICIni #endif /* USE_FULL_LL_DRIVER */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usart.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usart.c index adf405273..1b3d0f3ad 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usart.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -367,5 +366,4 @@ void LL_USART_ClockStructInit(LL_USART_ClockInitTypeDef *USART_ClockInitStruct) #endif /* USE_FULL_LL_DRIVER */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usb.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usb.c index 538a56526..6a52e3da6 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usb.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_usb.c @@ -11,6 +11,17 @@ * + Peripheral Control functions * + Peripheral State functions * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -23,17 +34,7 @@ (#) The upper HAL HCD/PCD driver will call the right routines for its internal processes. @endverbatim - ****************************************************************************** - * @attention - * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * + ****************************************************************************** */ @@ -53,7 +54,6 @@ /* Private function prototypes -----------------------------------------------*/ /* Private functions ---------------------------------------------------------*/ - /** * @brief Initializes the USB Core * @param USBx USB Instance @@ -235,22 +235,31 @@ HAL_StatusTypeDef USB_ActivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep) } else { - /*Set the endpoint Receive buffer address */ + /* Set the endpoint Receive buffer address */ PCD_SET_EP_RX_ADDRESS(USBx, ep->num, ep->pmaadress); - /*Set the endpoint Receive buffer counter*/ + /* Set the endpoint Receive buffer counter */ PCD_SET_EP_RX_CNT(USBx, ep->num, ep->maxpacket); PCD_CLEAR_RX_DTOG(USBx, ep->num); - /* Configure VALID status for the Endpoint*/ + /* Configure VALID status for the Endpoint */ PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_VALID); } } - /*Double Buffer*/ +#if (USE_USB_DOUBLE_BUFFER == 1U) + /* Double Buffer */ else { - /* Set the endpoint as double buffered */ - PCD_SET_EP_DBUF(USBx, ep->num); + if (ep->type == EP_TYPE_BULK) + { + /* Set bulk endpoint as double buffered */ + PCD_SET_BULK_EP_DBUF(USBx, ep->num); + } + else + { + /* Set the ISOC endpoint in double buffer mode */ + PCD_CLEAR_EP_KIND(USBx, ep->num); + } /* Set buffer address for double buffered mode */ PCD_SET_EP_DBUF_ADDR(USBx, ep->num, ep->pmaaddr0, ep->pmaaddr1); @@ -284,6 +293,7 @@ HAL_StatusTypeDef USB_ActivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep) PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_DIS); } } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ return ret; } @@ -302,18 +312,20 @@ HAL_StatusTypeDef USB_DeactivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep) { PCD_CLEAR_TX_DTOG(USBx, ep->num); - /* Configure DISABLE status for the Endpoint*/ + /* Configure DISABLE status for the Endpoint */ PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS); } + else { PCD_CLEAR_RX_DTOG(USBx, ep->num); - /* Configure DISABLE status for the Endpoint*/ + /* Configure DISABLE status for the Endpoint */ PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_DIS); } } - /*Double Buffer*/ +#if (USE_USB_DOUBLE_BUFFER == 1U) + /* Double Buffer */ else { if (ep->is_in == 0U) @@ -340,6 +352,7 @@ HAL_StatusTypeDef USB_DeactivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep) PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_DIS); } } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ return HAL_OK; } @@ -353,8 +366,10 @@ HAL_StatusTypeDef USB_DeactivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep) HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) { uint32_t len; +#if (USE_USB_DOUBLE_BUFFER == 1U) uint16_t pmabuffer; uint16_t wEPVal; +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ /* IN endpoint */ if (ep->is_in == 1U) @@ -375,6 +390,7 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) USB_WritePMA(USBx, ep->xfer_buff, ep->pmaadress, (uint16_t)len); PCD_SET_EP_TX_CNT(USBx, ep->num, len); } +#if (USE_USB_DOUBLE_BUFFER == 1U) else { /* double buffer bulk management */ @@ -383,7 +399,7 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) if (ep->xfer_len_db > ep->maxpacket) { /* enable double buffer */ - PCD_SET_EP_DBUF(USBx, ep->num); + PCD_SET_BULK_EP_DBUF(USBx, ep->num); /* each Time to write in PMA xfer_len_db will */ ep->xfer_len_db -= len; @@ -449,8 +465,8 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) { len = ep->xfer_len_db; - /* disable double buffer mode */ - PCD_CLEAR_EP_DBUF(USBx, ep->num); + /* disable double buffer mode for Bulk endpoint */ + PCD_CLEAR_BULK_EP_DBUF(USBx, ep->num); /* Set Tx count with nbre of byte to be transmitted */ PCD_SET_EP_TX_CNT(USBx, ep->num, len); @@ -459,14 +475,9 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) /* Write the user buffer to USB PMA */ USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len); } - }/* end if bulk double buffer */ - - /* manage isochronous double buffer IN mode */ - else + } + else /* manage isochronous double buffer IN mode */ { - /* enable double buffer */ - PCD_SET_EP_DBUF(USBx, ep->num); - /* each Time to write in PMA xfer_len_db will */ ep->xfer_len_db -= len; @@ -479,27 +490,6 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) /* Write the user buffer to USB PMA */ USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len); - ep->xfer_buff += len; - - if (ep->xfer_len_db > ep->maxpacket) - { - ep->xfer_len_db -= len; - } - else - { - len = ep->xfer_len_db; - ep->xfer_len_db = 0U; - } - - if (len > 0U) - { - /* Set the Double buffer counter for pmabuffer0 */ - PCD_SET_EP_DBUF0_CNT(USBx, ep->num, ep->is_in, len); - pmabuffer = ep->pmaaddr0; - - /* Write the user buffer to USB PMA */ - USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len); - } } else { @@ -509,30 +499,10 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) /* Write the user buffer to USB PMA */ USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len); - ep->xfer_buff += len; - - if (ep->xfer_len_db > ep->maxpacket) - { - ep->xfer_len_db -= len; - } - else - { - len = ep->xfer_len_db; - ep->xfer_len_db = 0U; - } - - if (len > 0U) - { - /* Set the Double buffer counter for pmabuffer1 */ - PCD_SET_EP_DBUF1_CNT(USBx, ep->num, ep->is_in, len); - pmabuffer = ep->pmaaddr1; - - /* Write the user buffer to USB PMA */ - USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len); - } } } } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_VALID); } @@ -554,6 +524,7 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) /* configure and validate Rx endpoint */ PCD_SET_EP_RX_CNT(USBx, ep->num, len); } +#if (USE_USB_DOUBLE_BUFFER == 1U) else { /* First Transfer Coming From HAL_PCD_EP_Receive & From ISR */ @@ -572,7 +543,7 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) if ((((wEPVal & USB_EP_DTOG_RX) != 0U) && ((wEPVal & USB_EP_DTOG_TX) != 0U)) || (((wEPVal & USB_EP_DTOG_RX) == 0U) && ((wEPVal & USB_EP_DTOG_TX) == 0U))) { - PCD_FreeUserBuffer(USBx, ep->num, 0U); + PCD_FREE_USER_BUFFER(USBx, ep->num, 0U); } } } @@ -597,6 +568,7 @@ HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep) return HAL_ERROR; } } +#endif /* (USE_USB_DOUBLE_BUFFER == 1U) */ PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_VALID); } @@ -656,7 +628,7 @@ HAL_StatusTypeDef USB_EPClearStall(USB_TypeDef *USBx, USB_EPTypeDef *ep) return HAL_OK; } -#endif +#endif /* defined (HAL_PCD_MODULE_ENABLED) */ /** * @brief USB_StopDevice Stop the usb device mode @@ -770,7 +742,9 @@ void USB_WritePMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, uint16_t wPMABufAddr, ui { uint32_t n = ((uint32_t)wNBytes + 1U) >> 1; uint32_t BaseAddr = (uint32_t)USBx; - uint32_t i, temp1, temp2; + uint32_t i; + uint32_t temp1; + uint32_t temp2; __IO uint16_t *pdwVal; uint8_t *pBuf = pbUsrBuf; @@ -786,7 +760,7 @@ void USB_WritePMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, uint16_t wPMABufAddr, ui #if PMA_ACCESS > 1U pdwVal++; -#endif +#endif /* PMA_ACCESS */ pBuf++; } @@ -804,7 +778,8 @@ void USB_ReadPMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uin { uint32_t n = (uint32_t)wNBytes >> 1; uint32_t BaseAddr = (uint32_t)USBx; - uint32_t i, temp; + uint32_t i; + uint32_t temp; __IO uint16_t *pdwVal; uint8_t *pBuf = pbUsrBuf; @@ -821,7 +796,7 @@ void USB_ReadPMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uin #if PMA_ACCESS > 1U pdwVal++; -#endif +#endif /* PMA_ACCESS */ } if ((wNBytes % 2U) != 0U) @@ -845,5 +820,3 @@ void USB_ReadPMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uin /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_utils.c b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_utils.c index d77d920e5..d09b530f3 100644 --- a/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_utils.c +++ b/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_utils.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -757,5 +756,3 @@ static ErrorStatus UTILS_EnablePLLAndSwitchSystem(uint32_t SYSCLK_Frequency, LL_ /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Inc/pdm2pcm_glo.h b/Middlewares/ST/STM32_Audio/Addons/PDM/Inc/pdm2pcm_glo.h deleted file mode 100644 index bf12727d3..000000000 --- a/Middlewares/ST/STM32_Audio/Addons/PDM/Inc/pdm2pcm_glo.h +++ /dev/null @@ -1,95 +0,0 @@ -/** - ****************************************************************************** - * @file pdm2pcm_glo.h - * @author MCD Application Team - * @brief Global header for PDM2PCM conversion code - ****************************************************************************** - * @attention - * - *

                    © COPYRIGHT 2011 STMicroelectronics

                    - * - * Licensed under MCD-ST Image SW License Agreement V2, (the "License"); - * You may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.st.com/software_license_agreement_image_v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - ****************************************************************************** - */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __PDM2PCM_FILTER_H -#define __PDM2PCM_FILTER_H - -#ifdef __cplusplus - extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ -#include - -/* Exported constants --------------------------------------------------------*/ -#define PDM_FILTER_ENDIANNESS_LE ((uint16_t)0x0000) -#define PDM_FILTER_ENDIANNESS_BE ((uint16_t)0x0001) - -#define PDM_FILTER_BIT_ORDER_LSB ((uint16_t)0x0000) -#define PDM_FILTER_BIT_ORDER_MSB ((uint16_t)0x0001) - -#define PDM_FILTER_DEC_FACTOR_48 ((uint16_t)0x0001) -#define PDM_FILTER_DEC_FACTOR_64 ((uint16_t)0x0002) -#define PDM_FILTER_DEC_FACTOR_80 ((uint16_t)0x0003) -#define PDM_FILTER_DEC_FACTOR_128 ((uint16_t)0x0004) -#define PDM_FILTER_DEC_FACTOR_16 ((uint16_t)0x0005) -#define PDM_FILTER_DEC_FACTOR_24 ((uint16_t)0x0006) -#define PDM_FILTER_DEC_FACTOR_32 ((uint16_t)0x0007) - -#define PDM_FILTER_INIT_ERROR ((uint16_t)0x0010) -#define PDM_FILTER_CONFIG_ERROR ((uint16_t)0x0020) -#define PDM_FILTER_ENDIANNESS_ERROR ((uint16_t)0x0001) -#define PDM_FILTER_BIT_ORDER_ERROR ((uint16_t)0x0002) -#define PDM_FILTER_CRC_LOCK_ERROR ((uint16_t)0x0004) -#define PDM_FILTER_DECIMATION_ERROR ((uint16_t)0x0008) -#define PDM_FILTER_GAIN_ERROR ((uint16_t)0x0040) -#define PDM_FILTER_SAMPLES_NUMBER_ERROR ((uint16_t)0x0080) -#define PDM2PCM_INTERNAL_MEMORY_SIZE 16 - -/* Exported types ------------------------------------------------------------*/ -typedef struct{ - uint16_t bit_order; - uint16_t endianness; - uint32_t high_pass_tap; - uint16_t in_ptr_channels; - uint16_t out_ptr_channels; - uint32_t pInternalMemory[PDM2PCM_INTERNAL_MEMORY_SIZE]; -}PDM_Filter_Handler_t; - -typedef struct{ - uint16_t decimation_factor; - uint16_t output_samples_number; - int16_t mic_gain; -}PDM_Filter_Config_t; - -/* Exported macros -----------------------------------------------------------*/ - -/* Exported functions ------------------------------------------------------- */ -uint32_t PDM_Filter_Init(PDM_Filter_Handler_t *pHandler); -uint32_t PDM_Filter_setConfig(PDM_Filter_Handler_t *pHandler, PDM_Filter_Config_t *pConfig); -uint32_t PDM_Filter_getConfig(PDM_Filter_Handler_t *pHandler, PDM_Filter_Config_t *pConfig); -uint32_t PDM_Filter_deInterleave(void *pDataIn, void *pDataOut, PDM_Filter_Handler_t * pHandler); -uint32_t PDM_Filter(void *pDataIn, void *pDataOut, PDM_Filter_Handler_t *pHandler); - -#ifdef __cplusplus -} -#endif - -#endif /* __PDM2PCM_FILTER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc16.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc16.a deleted file mode 100644 index f3c637096..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc16.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc32.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc32.a deleted file mode 100644 index 720817605..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_GCC_wc32.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc16.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc16.a deleted file mode 100644 index 9529ba9db..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc16.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc32.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc32.a deleted file mode 100644 index d9f67a4e1..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_IAR_wc32.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_Keil_wc16.lib b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_Keil_wc16.lib deleted file mode 100644 index 7606acc10..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM3_Keil_wc16.lib and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16.a deleted file mode 100644 index a3ec51b06..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16_softfp.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16_softfp.a deleted file mode 100644 index 35731eae9..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc16_softfp.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32.a deleted file mode 100644 index c3719e1f4..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32_softfp.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32_softfp.a deleted file mode 100644 index bb93644c1..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_GCC_wc32_softfp.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc16.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc16.a deleted file mode 100644 index 70b3d4540..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc16.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc32.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc32.a deleted file mode 100644 index 0307e851d..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_IAR_wc32.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_Keil_wc16.lib b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_Keil_wc16.lib deleted file mode 100644 index a252c3c1a..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM4_Keil_wc16.lib and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16.a deleted file mode 100644 index 76201222e..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16_softfp.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16_softfp.a deleted file mode 100644 index 864226050..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc16_softfp.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32.a deleted file mode 100644 index fc41d196a..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32_softfp.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32_softfp.a deleted file mode 100644 index d24624f2b..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_GCC_wc32_softfp.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc16.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc16.a deleted file mode 100644 index 6fb6c9a04..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc16.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc32.a b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc32.a deleted file mode 100644 index 1e03a0ed7..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_IAR_wc32.a and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_Keil_wc16.lib b/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_Keil_wc16.lib deleted file mode 100644 index b7ff6fcd5..000000000 Binary files a/Middlewares/ST/STM32_Audio/Addons/PDM/Lib/libPDMFilter_CM7_Keil_wc16.lib and /dev/null differ diff --git a/Middlewares/ST/STM32_Audio/Addons/PDM/readme.txt b/Middlewares/ST/STM32_Audio/Addons/PDM/readme.txt index 008bff221..ccb432e4f 100644 --- a/Middlewares/ST/STM32_Audio/Addons/PDM/readme.txt +++ b/Middlewares/ST/STM32_Audio/Addons/PDM/readme.txt @@ -13,7 +13,7 @@ CAUTION: Some steps described below (e.g. license display, download start) may Please follow the steps below in order to obtain it: 1. Click on the link below to be redirected to the MW web page on ST servers. - https://www.st.com/en/licensed-software/audiopdm-mw.html?softwareProduct=AudioPDM-MW&softwareVersion=N/A + https://www.st.com/en/licensed-software/audiopdm-mw.html?softwareProduct=AudioPDM-MW&softwareVersion=3.3.0 2. The terms of the license shall be displayed on your screen (this may take a few seconds). Once you have read them carefully and accepted them click on the "ACCEPT" button. 3. You will be then prompted to login/register or to provide your name and e-mail. diff --git a/Middlewares/ST/STM32_WPAN/LICENSE.md b/Middlewares/ST/STM32_WPAN/LICENSE.md new file mode 100644 index 000000000..1af523307 --- /dev/null +++ b/Middlewares/ST/STM32_WPAN/LICENSE.md @@ -0,0 +1,80 @@ +SLA0044 Rev5/February 2018 + +## Software license agreement + +### __ULTIMATE LIBERTY SOFTWARE LICENSE AGREEMENT__ + +BY INSTALLING, COPYING, DOWNLOADING, ACCESSING OR OTHERWISE USING THIS SOFTWARE +OR ANY PART THEREOF (AND THE RELATED DOCUMENTATION) FROM STMICROELECTRONICS +INTERNATIONAL N.V, SWISS BRANCH AND/OR ITS AFFILIATED COMPANIES +(STMICROELECTRONICS), THE RECIPIENT, ON BEHALF OF HIMSELF OR HERSELF, OR ON +BEHALF OF ANY ENTITY BY WHICH SUCH RECIPIENT IS EMPLOYED AND/OR ENGAGED AGREES +TO BE BOUND BY THIS SOFTWARE LICENSE AGREEMENT. + +Under STMicroelectronics’ intellectual property rights, the redistribution, +reproduction and use in source and binary forms of the software or any part +thereof, with or without modification, are permitted provided that the following +conditions are met: + +1. Redistribution of source code (modified or not) must retain any copyright +notice, this list of conditions and the disclaimer set forth below as items 10 +and 11. + +2. Redistributions in binary form, except as embedded into microcontroller or +microprocessor device manufactured by or for STMicroelectronics or a software +update for such device, must reproduce any copyright notice provided with the +binary code, this list of conditions, and the disclaimer set forth below as +items 10 and 11, in documentation and/or other materials provided with the +distribution. + +3. Neither the name of STMicroelectronics nor the names of other contributors to +this software may be used to endorse or promote products derived from this +software or part thereof without specific written permission. + +4. This software or any part thereof, including modifications and/or derivative +works of this software, must be used and execute solely and exclusively on or in +combination with a microcontroller or microprocessor device manufactured by or +for STMicroelectronics. + +5. No use, reproduction or redistribution of this software partially or totally +may be done in any manner that would subject this software to any Open Source +Terms. “Open Source Terms” shall mean any open source license which requires as +part of distribution of software that the source code of such software is +distributed therewith or otherwise made available, or open source license that +substantially complies with the Open Source definition specified at +www.opensource.org and any other comparable open source license such as for +example GNU General Public License (GPL), Eclipse Public License (EPL), Apache +Software License, BSD license or MIT license. + +6. STMicroelectronics has no obligation to provide any maintenance, support or +updates for the software. + +7. The software is and will remain the exclusive property of STMicroelectronics +and its licensors. The recipient will not take any action that jeopardizes +STMicroelectronics and its licensors' proprietary rights or acquire any rights +in the software, except the limited rights specified hereunder. + +8. The recipient shall comply with all applicable laws and regulations affecting +the use of the software or any part thereof including any applicable export +control law or regulation. + +9. Redistribution and use of this software or any part thereof other than as +permitted under this license is void and will automatically terminate your +rights under this license. + +10. THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, WHICH ARE +DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT SHALL +STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +11. EXCEPT AS EXPRESSLY PERMITTED HEREUNDER, NO LICENSE OR OTHER RIGHTS, WHETHER +EXPRESS OR IMPLIED, ARE GRANTED UNDER ANY PATENT OR OTHER INTELLECTUAL PROPERTY +RIGHTS OF STMICROELECTRONICS OR ANY THIRD PARTY. diff --git a/Middlewares/ST/STM32_WPAN/Release_Notes.html b/Middlewares/ST/STM32_WPAN/Release_Notes.html index 3d4d0dc43..1499ee132 100644 --- a/Middlewares/ST/STM32_WPAN/Release_Notes.html +++ b/Middlewares/ST/STM32_WPAN/Release_Notes.html @@ -11,7 +11,7 @@ span.underline{text-decoration: underline;} div.column{display: inline-block; vertical-align: top; width: 50%;} - + @@ -43,10 +43,10 @@
                    • Zigbee clusters are provided as a library.
                        -
                      • Available on IAR/SW4STM32(stm32wb_zigbee_wb_lib.a) and Keil(stm32wb_zigbee_wb_lib_keil.lib) under Middlewares/ST/STM32_WPAN/zigbee/lib.
                        • +
                      • Available on IAR/SW4STM32 (stm32wb_zigbee_wb_lib.a) and Keil (stm32wb_zigbee_wb_lib_keil.lib) under Middlewares/ST/STM32_WPAN/zigbee/lib.
                      • To get access to Zigbee clusters source code, please contact ST local office.
                      • -

                    • All available binaries are located under/Projects/STM32_Copro_Wireless_Binaries directory.

                      • +

                    • All available binaries are located under /Projects/STM32_Copro_Wireless_Binaries directory.

                    • Refer to UM2237 to learn how to use/install STM32CubeProgrammer.

                    • Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the Coprocessor binary.
                    @@ -54,10 +54,66 @@

                    Update History

                    - +

                    Main Changes

                      +
                    • BLE: +
                        +
                      • BLE Multi link support
                        • +
                      • ID 108789 : ACI_GAP_START_NAME_DISCOVERY_PROC command is deprecated
                        +
                        • +
                      • ID 109815 : IP over BLE enablement by default
                        +
                        • +
                      • ID 109676 : New HCI error status overlap with ACI error status
                        • +
                      • New HCI errors are added (from BLE spec. v5.2): +
                          +
                        • HCI_UNKNOWN_ADVERTISING_IDENTIFIER_ERR_CODE: 0x42
                          • +
                        • HCI_PACKET_TOO_LONG_ERR_CODE: 0x45
                          • +
                        • +
                      • Following ACI errors(already supported by BLE Host) are remapped to HCI errors: +
                          +
                        • BLE_STATUS_UNKNOWN_CONNECTION_ID: 0x40 -> 0x02 (HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERR_CODE)
                          • +
                        • BLE_STATUS_NOT_ALLOWED: 0x46 -> 0x0C (HCI_COMMAND_DISALLOWED_ERR_CODE)
                          • +
                        • +
                      • Following ACI errors (already supported by BLE Host) are renumbered: +
                          +
                        • BLE_STATUS_FAILED: 0x41 -> 0x91
                          • +
                        • BLE_STATUS_INVALID_PARAMS: 0x42 -> 0x92
                          • +
                        • BLE_STATUS_BUSY: 0x43 -> 0x93
                          • +
                        • BLE_STATUS_PENDING: 0x45 -> 0x95
                          • +
                        • BLE_STATUS_ERROR: 0x47 -> 0x97
                          • +
                        • BLE_STATUS_OUT_OF_MEMORY: 0x48 -> 0x98
                          • +
                        • +
                      • ID 111208 : Support Dory Cut2.1 in parallel to Cut2.2 with new SHCI_C2_CONFIG parameter.
                        +
                        • +
                      • ID 112402 : Implement SMP bypass controlled via config data command
                        • +
                      • ID 113007 : add new parameter “rx_model_config” used for RSSI/AGC-LUT selection in SHCI_C2_Ble_Init() interface
                        • +
                      • ID 114031 : Some BLE HCI command names are not aligned with Bluetooth standard 5.2
                        • +
                      • +
                    • BLE Mesh lib: +
                        +
                      • Added BLE MESH libraries for lighting projects (LP Node and PRF Node) on STM32 WB15.
                        • +
                      • +
                    • Zigbee: +
                        +
                      • Alignment of Zigbee Clusters PICS regarding mainly the attribute reporting status.
                        • +
                      • API changes inside the Metering cluster. The ZbZclMeterClientCallbacksT and ZbZclMeterServerCallbacksT structures have been modified.For instance the previous request_mirror(..) and remove_mirror(..) functions inside the ZbZclMeterServerCallbacksT have been replaced by one single function. Refer to zcl.meter.h file for more details.
                        • +
                      • The ZbZclAttrReportConfigT structure has been updated in order to manage in parallel several attribute reports. An array of fixed size (ZCL_ATTR_REPORT_CONFIG_NUM_MAX) is now used to handle multiple reporting. Refer to zcl.h file to see the new structure ZbZclAttrReportConfigT. You can also refer yourself to the Zigbee_PressMeas_Client_router Application to see how to use this new structure.
                        • +
                      • The ZbNwkFastPollRequest(..) API has been updated and contains additional parameters to tune the delay and the timeout . The Delay in used to postpone the sending of the first NLME-SYNC. The Timeout is used for setting the fast pool interval value. Refer to Zigbee.nwk.h file for more details.
                        • +
                      • The types of several fields inside the ZbZclPriseServerPublishPriceT structure have been updated. Refer to zcl.price.h file for more details.
                        • +
                      • The ZbZclKeepAliveClient(..) API prototype has been updated. This function is now using the stack instance instead of the cluster instance as input parameter. Refer to zcl.keepalive.h file for more details.
                        • +
                      • The ZbZclClutsterT structure has been reworked after code cleanup and factorization. In particular, the field handling the reporting has been re-architectured. Refer to zcl.h file for more details.
                        • +
                      • A new API named ZbApsBindSrcExists(…) has been added in order to check if a binding exist.
                        • +
                      • +
                    +
                    +
                    +
                    + +
                    +

                    Main Changes

                    +
                    • Zigbee:
                      • ZCL Reporting improvement in order to eliminate an unused 1 second timer handler processing
                        • @@ -79,7 +135,7 @@
                        -

                        Main Changes

                        +

                        Main Changes

                        • BLE-Mesh library version 1.13.002
                            @@ -132,7 +188,7 @@
                            -

                            Main Changes

                            +

                            Main Changes

                            • General:
                                @@ -168,7 +224,7 @@
                                -

                                Main Changes

                                +

                                Main Changes

                                • BLE-Mesh library version 1.13.000
                                    @@ -230,7 +286,7 @@
                                    -

                                    Main Changes

                                    +

                                    Main Changes

                                    • BLE-Mesh library version 1.12.008
                                        @@ -266,7 +322,7 @@
                                        -

                                        Main Changes

                                        +

                                        Main Changes

                                        BLE-Mesh:

                                        • BLE Mesh Models Fixe/Update
                                          • @@ -276,7 +332,7 @@
                                          -

                                          Main Changes

                                          +

                                          Main Changes

                                          BLE-Mesh:

                                          • BLE-Mesh library version 1.12.007 @@ -548,7 +604,7 @@
                                            -

                                            Main Changes

                                            +

                                            Main Changes

                                            Interface:

                                            • Added new commmand SHCI_C2_SetFlashActivityControl() to configure BLE timing protection
                                              • @@ -591,7 +647,7 @@
                                              -

                                              Main Changes

                                              +

                                              Main Changes

                                              Interface:

                                              • Added new commmand SHCI_C2_ExtpaConfig() to support external PA
                                                • @@ -607,7 +663,7 @@
                                                -

                                                Main Changes

                                                +

                                                Main Changes

                                                General:

                                                • Introducing support of Zigbee
                                                  • @@ -645,7 +701,7 @@
                                                  -

                                                  Main Changes

                                                  +

                                                  Main Changes

                                                  General:

                                                  • Following utilities : Scheduler and Low Power Manager reworked and moved to “Utilities” directory
                                                    • @@ -671,7 +727,7 @@
                                                    -

                                                    Main Changes

                                                    +

                                                    Main Changes

                                                    BLE:

                                                    • Fix race condition in transport layer when an operating system is used.
                                                      • @@ -717,7 +773,7 @@
                                                      -

                                                      Main Changes

                                                      +

                                                      Main Changes

                                                      General:

                                                      • Licenses in utilities and patterns moved from sla0044 to 3-clauses BSD
                                                        • @@ -743,7 +799,7 @@
                                                        -

                                                        Main Changes

                                                        +

                                                        Main Changes

                                                        First release

                                                        diff --git a/Middlewares/ST/STM32_WPAN/ble/ble.h b/Middlewares/ST/STM32_WPAN/ble/ble.h index 6e771fd28..d322e665b 100644 --- a/Middlewares/ST/STM32_WPAN/ble/ble.h +++ b/Middlewares/ST/STM32_WPAN/ble/ble.h @@ -5,17 +5,16 @@ * @brief BLE interface ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -74,4 +73,4 @@ extern "C" { #endif /*__BLE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/ble_common.h b/Middlewares/ST/STM32_WPAN/ble/ble_common.h index db5bb1fa1..be22aac84 100644 --- a/Middlewares/ST/STM32_WPAN/ble/ble_common.h +++ b/Middlewares/ST/STM32_WPAN/ble/ble_common.h @@ -5,17 +5,16 @@ * @brief Common file to BLE Middleware ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -114,4 +113,4 @@ extern "C" { #endif /*__BLE_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.c b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.c index ba998bc4d..b0467e0dd 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.c +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.c @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_events.c * @author MCD * @brief STM32WB BLE API (event callbacks) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #include "ble_events.h" @@ -37,6 +36,11 @@ static void hci_le_generate_dhkey_complete_event_process( const uint8_t* in ); static void hci_le_enhanced_connection_complete_event_process( const uint8_t* in ); static void hci_le_direct_advertising_report_event_process( const uint8_t* in ); static void hci_le_phy_update_complete_event_process( const uint8_t* in ); +static void hci_le_extended_advertising_report_event_process( const uint8_t* in ); +static void hci_le_scan_timeout_event_process( const uint8_t* in ); +static void hci_le_advertising_set_terminated_event_process( const uint8_t* in ); +static void hci_le_scan_request_received_event_process( const uint8_t* in ); +static void hci_le_channel_selection_algorithm_event_process( const uint8_t* in ); static void aci_hal_end_of_radio_activity_event_process( const uint8_t* in ); static void aci_hal_scan_req_report_event_process( const uint8_t* in ); static void aci_hal_fw_error_event_process( const uint8_t* in ); @@ -114,6 +118,11 @@ const hci_event_table_t hci_le_event_table[HCI_LE_EVENT_TABLE_SIZE] = { 0x000AU, hci_le_enhanced_connection_complete_event_process }, { 0x000BU, hci_le_direct_advertising_report_event_process }, { 0x000CU, hci_le_phy_update_complete_event_process }, + { 0x000DU, hci_le_extended_advertising_report_event_process }, + { 0x0011U, hci_le_scan_timeout_event_process }, + { 0x0012U, hci_le_advertising_set_terminated_event_process }, + { 0x0013U, hci_le_scan_request_received_event_process }, + { 0x0014U, hci_le_channel_selection_algorithm_event_process }, }; /* HCI VS event process functions table */ @@ -479,6 +488,103 @@ static void hci_le_phy_update_complete_event_process( const uint8_t* in ) rp0->RX_PHY ); } +/* HCI_LE_EXTENDED_ADVERTISING_REPORT_EVENT callback function */ +__WEAK void hci_le_extended_advertising_report_event( uint8_t Num_Reports, + uint16_t Event_Type, + uint8_t Address_Type, + const uint8_t* Address, + uint8_t Primary_PHY, + uint8_t Secondary_PHY, + uint8_t Advertising_SID, + uint8_t TX_Power, + uint8_t RSSI, + uint16_t Periodic_Adv_Interval, + uint8_t Direct_Address_Type, + const uint8_t* Direct_Address, + uint8_t Data_Length, + const uint8_t* Data ) +{ +} + +/* HCI_LE_EXTENDED_ADVERTISING_REPORT_EVENT process function */ +static void hci_le_extended_advertising_report_event_process( const uint8_t* in ) +{ + hci_le_extended_advertising_report_event_rp0 *rp0 = (void*)in; + hci_le_extended_advertising_report_event( rp0->Num_Reports, + rp0->Event_Type, + rp0->Address_Type, + rp0->Address, + rp0->Primary_PHY, + rp0->Secondary_PHY, + rp0->Advertising_SID, + rp0->TX_Power, + rp0->RSSI, + rp0->Periodic_Adv_Interval, + rp0->Direct_Address_Type, + rp0->Direct_Address, + rp0->Data_Length, + rp0->Data ); +} + +/* HCI_LE_SCAN_TIMEOUT_EVENT callback function */ +__WEAK void hci_le_scan_timeout_event( void ) +{ +} + +/* HCI_LE_SCAN_TIMEOUT_EVENT process function */ +static void hci_le_scan_timeout_event_process( const uint8_t* in ) +{ + hci_le_scan_timeout_event( ); +} + +/* HCI_LE_ADVERTISING_SET_TERMINATED_EVENT callback function */ +__WEAK void hci_le_advertising_set_terminated_event( uint8_t Status, + uint8_t Advertising_Handle, + uint16_t Connection_Handle, + uint8_t Num_Completed_Ext_Adv_Events ) +{ +} + +/* HCI_LE_ADVERTISING_SET_TERMINATED_EVENT process function */ +static void hci_le_advertising_set_terminated_event_process( const uint8_t* in ) +{ + hci_le_advertising_set_terminated_event_rp0 *rp0 = (void*)in; + hci_le_advertising_set_terminated_event( rp0->Status, + rp0->Advertising_Handle, + rp0->Connection_Handle, + rp0->Num_Completed_Ext_Adv_Events ); +} + +/* HCI_LE_SCAN_REQUEST_RECEIVED_EVENT callback function */ +__WEAK void hci_le_scan_request_received_event( uint8_t Advertising_Handle, + uint8_t Scanner_Address_Type, + const uint8_t* Scanner_Address ) +{ +} + +/* HCI_LE_SCAN_REQUEST_RECEIVED_EVENT process function */ +static void hci_le_scan_request_received_event_process( const uint8_t* in ) +{ + hci_le_scan_request_received_event_rp0 *rp0 = (void*)in; + hci_le_scan_request_received_event( rp0->Advertising_Handle, + rp0->Scanner_Address_Type, + rp0->Scanner_Address ); +} + +/* HCI_LE_CHANNEL_SELECTION_ALGORITHM_EVENT callback function */ +__WEAK void hci_le_channel_selection_algorithm_event( uint16_t Connection_Handle, + uint8_t Channel_Selection_Algorithm ) +{ +} + +/* HCI_LE_CHANNEL_SELECTION_ALGORITHM_EVENT process function */ +static void hci_le_channel_selection_algorithm_event_process( const uint8_t* in ) +{ + hci_le_channel_selection_algorithm_event_rp0 *rp0 = (void*)in; + hci_le_channel_selection_algorithm_event( rp0->Connection_Handle, + rp0->Channel_Selection_Algorithm ); +} + /* ACI_HAL_END_OF_RADIO_ACTIVITY_EVENT callback function */ __WEAK void aci_hal_end_of_radio_activity_event( uint8_t Last_State, uint8_t Next_State, diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.h b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.h index 2a2884cc2..f28853f2d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_events.h @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_events.h * @author MCD * @brief STM32WB BLE API (event callbacks) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_EVENTS_H__ @@ -24,13 +23,13 @@ #include "ble_types.h" #define HCI_EVENT_TABLE_SIZE 6 -#define HCI_LE_EVENT_TABLE_SIZE 11 +#define HCI_LE_EVENT_TABLE_SIZE 16 #define HCI_VS_EVENT_TABLE_SIZE 51 typedef struct { uint16_t evt_code; - void (*process)(const uint8_t* in); + void (*process)( const uint8_t* in ); } hci_event_table_t; extern const hci_event_table_t hci_event_table[HCI_EVENT_TABLE_SIZE]; @@ -51,7 +50,7 @@ extern const hci_event_table_t hci_vs_event_table[HCI_VS_EVENT_TABLE_SIZE]; * Connection_Handle that didn't correspond to a connection was given. * * @param Status Status error code. - * @param Connection_Handle Connection_Handle which was disconnected. + * @param Connection_Handle Connection handle for which the event applies. * Values: * - 0x0000 ... 0x0EFF * @param Reason Reason for disconnection (see Bluetooth spec. [Vol 1, Part F] @@ -82,7 +81,7 @@ void hci_disconnection_complete_event( uint8_t Status, * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.8]. * * @param Status Status error code. - * @param Connection_Handle Connection handle for which the command applies. + * @param Connection_Handle Connection handle for which the event applies. * Values: * - 0x0000 ... 0x0EFF * @param Encryption_Enabled Link Level Encryption. @@ -117,7 +116,7 @@ void hci_encryption_change_event( uint8_t Status, * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.12]. * * @param Status Status error code. - * @param Connection_Handle Connection handle for which the command applies. + * @param Connection_Handle Connection handle for which the event applies. * Values: * - 0x0000 ... 0x0EFF * @param Version Version of the Current LMP in the remote Controller @@ -190,7 +189,7 @@ void hci_number_of_completed_packets_event( uint8_t Number_of_Handles, * the Role Change event. * * @param Status Status error code. - * @param Connection_Handle Connection handle for which the command applies. + * @param Connection_Handle Connection handle for which the event applies. * Values: * - 0x0000 ... 0x0EFF * @return None @@ -230,7 +229,7 @@ void hci_encryption_key_refresh_complete_event( uint8_t Status, * @param Peer_Address Public Device Address or Random Device Address of the * peer device * @param Conn_Interval Connection interval used on this connection. - * Time = N * 1.25 msec + * Time = N * 1.25 ms * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -240,7 +239,7 @@ void hci_encryption_key_refresh_complete_event( uint8_t Status, * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @param Master_Clock_Accuracy Master clock accuracy. Only valid for a slave. @@ -299,7 +298,7 @@ void hci_le_advertising_report_event( uint8_t Num_Reports, * Values: * - 0x0000 ... 0x0EFF * @param Conn_Interval Connection interval used on this connection. - * Time = N * 1.25 msec + * Time = N * 1.25 ms * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -309,7 +308,7 @@ void hci_le_advertising_report_event( uint8_t Num_Reports, * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @return None @@ -367,30 +366,29 @@ void hci_le_long_term_key_request_event( uint16_t Connection_Handle, * the connection following the change, except that on the LE Coded PHY a * packet taking up to 2704 us to transmit may be sent even though the * corresponding parameter has a lower value. - * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.7]. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.7] and [Vol 6, Part B, + * 4.5.10]. * * @param Connection_Handle Connection handle for which the event applies. * Values: * - 0x0000 ... 0x0EFF * @param MaxTxOctets The maximum number of payload octets in a Link Layer * packet that the local Controller will send on this connection - * (connEffectiveMaxTxOctets defined in [Vol 6] Part B, Section 4.5.10). + * (connEffectiveMaxTxOctets). * Values: * - 0x001B ... 0x00FB * @param MaxTxTime The maximum time that the local Controller will take to - * send a Link Layer packet on this connection (connEffectiveMaxTxTime - * defined in [Vol 6] Part B, Section 4.5.10). + * send a Link Layer packet on this connection (connEffectiveMaxTxTime). * Values: * - 0x0148 ... 0x4290 * @param MaxRxOctets The maximum number of payload octets in a Link Layer * packet that the local Controller expects to receive on this - * connection (connEffectiveMaxRxOctets defined in [Vol 6] Part B, - * Section 4.5.10). + * connection (connEffectiveMaxRxOctets). * Values: * - 0x001B ... 0x00FB * @param MaxRxTime The maximum time that the local Controller expects to take * to receive a Link Layer packet on this connection - * (connEffectiveMaxRxTime defined in [Vol 6] Part B, Section 4.5.10). + * (connEffectiveMaxRxTime). * Values: * - 0x0148 ... 0x4290 * @return None @@ -477,7 +475,7 @@ void hci_le_generate_dhkey_complete_event( uint8_t Status, * This is only valid for Peer_Address_Type 0x02 and 0x03. For other * Peer_Address_Type values, the Controller shall return all zeros. * @param Conn_Interval Connection interval used on this connection. - * Time = N * 1.25 msec + * Time = N * 1.25 ms * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -487,7 +485,7 @@ void hci_le_generate_dhkey_complete_event( uint8_t Status, * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @param Master_Clock_Accuracy Master clock accuracy. Only valid for a slave. @@ -546,22 +544,21 @@ void hci_le_direct_advertising_report_event( uint8_t Num_Reports, * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.12]. * * @param Status Status error code. - * @param Connection_Handle Connection handle to be used to identify the - * connection with the peer device. + * @param Connection_Handle Connection handle for which the event applies. * Values: * - 0x0000 ... 0x0EFF * @param TX_PHY Transmitter PHY in use * Values: * - 0x01: The transmitter PHY for the connection is LE 1M * - 0x02: The transmitter PHY for the connection is LE 2M - * - 0x03: The transmitter PHY for the connection is LE Coded - * (Not supported by STM32WB) + * - 0x03: The transmitter PHY for the connection is LE Coded (not + * supported) * @param RX_PHY Receiver PHY in use * Values: * - 0x01: The receiver PHY for the connection is LE 1M * - 0x02: The receiver PHY for the connection is LE 2M - * - 0x03: The receiver PHY for the connection is LE Coded - * (Not supported by STM32WB) + * - 0x03: The receiver PHY for the connection is LE Coded (not + * supported) * @return None */ void hci_le_phy_update_complete_event( uint8_t Status, @@ -569,6 +566,178 @@ void hci_le_phy_update_complete_event( uint8_t Status, uint8_t TX_PHY, uint8_t RX_PHY ); +/** + * @brief HCI_LE_EXTENDED_ADVERTISING_REPORT_EVENT + * The HCI_LE_Extended_Advertising_Report event indicates that a Bluetooth + * device has responded to an active scan or has broadcast advertisements that + * were received during a passive scan. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.13]. + * + * @param Num_Reports Number of responses in this event. + * Values: + * - 0x01 + * @param Event_Type Event type. + * Flags: + * - 0x0001: Connectable advertising + * - 0x0002: Scannable advertising + * - 0x0004: Directed advertising + * - 0x0008: Scan response + * - 0x0010: Legacy advertising PDUs used + * - 0x0020: Incomplete, more data to come + * - 0x0040: Incomplete, data truncated, no more to come + * @param Address_Type Address type of the advertising device. + * Values: + * - 0x00: Public Device Address + * - 0x01: Random Device Address + * - 0x02: Public Identity Address (corresponds to Resolved Private + * Address) + * - 0x03: Random (static) Identity Address (corresponds to Resolved + * Private Address) + * - 0xFF: No address provided (anonymous advertisement) + * @param Address Public Device Address, Random Device Address, Public Identity + * Address, or Random (static) Identity Address of the advertising + * device. + * @param Primary_PHY Primary advetising PHY. + * Values: + * - 0x01: Advertiser PHY is LE 1M + * @param Secondary_PHY Secondary advetising PHY. + * Values: + * - 0x00: No packets on the secondary advertising physical channel + * - 0x01: Advertiser PHY is LE 1M + * - 0x02: Advertiser PHY is LE 2M + * - 0x03: Advertiser PHY is LE Coded + * @param Advertising_SID Value of the Advertising SID subfield in the ADI + * field of the PDU or, for scan responses, in the ADI field of the + * original scannable. + * Values: + * - 0xFF: No ADI field provided + * - 0x00 ... 0x0F: Advertising SID subfield + * @param TX_Power Tx Power (signed integer). + * Units: dBm. + * Values: + * - 127: Tx power information not available + * - -127 ... 20: Tx power + * @param RSSI RSSI (signed integer). + * Units: dBm. + * Values: + * - 127: RSSI not available + * - -127 ... 20 + * @param Periodic_Adv_Interval Interval of the periodic advertising. + * Values: + * - 0x0000: No periodic advertising + * @param Direct_Address_Type Target device address type. + * Values: + * - 0x00: Public Device Address + * - 0x01: Random Device Address + * - 0x02: Public Identity Address (Corresponds to Resolved Private + * Address) + * - 0x03: Random (static) Identity Address (Corresponds to Resolved + * Private Address) + * - 0xFE: Random Device Address (Controller unable to resolve) + * @param Direct_Address Public Device Address, Random Device Address, Public + * Identity Address, or Random (static) Identity Address of the target + * device. + * @param Data_Length Length of Data + * @param Data Octets of advertising or scan response data formatted as defined + * in Bluetooth spec. v.5.2 [Vol 3, Part C, 11]. + * @return None + */ +void hci_le_extended_advertising_report_event( uint8_t Num_Reports, + uint16_t Event_Type, + uint8_t Address_Type, + const uint8_t* Address, + uint8_t Primary_PHY, + uint8_t Secondary_PHY, + uint8_t Advertising_SID, + uint8_t TX_Power, + uint8_t RSSI, + uint16_t Periodic_Adv_Interval, + uint8_t Direct_Address_Type, + const uint8_t* Direct_Address, + uint8_t Data_Length, + const uint8_t* Data ); + +/** + * @brief HCI_LE_SCAN_TIMEOUT_EVENT + * The HCI_LE_Scan_Timeout event indicates that scanning has ended because the + * duration has expired. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.17]. + * + * @return None + */ +void hci_le_scan_timeout_event( void ); + +/** + * @brief HCI_LE_ADVERTISING_SET_TERMINATED_EVENT + * The HCI_LE_Advertising_Set_Terminated event indicates that the Controller + * has terminated advertising in the advertising sets specified by the + * Advertising_Handle parameter. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.18]. + * + * @param Status Status error code. + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Connection_Handle Connection handle for which the event applies. + * Values: + * - 0x0000 ... 0x0EFF + * @param Num_Completed_Ext_Adv_Events Number of completed extended advertising + * events transmitted by the Controller. + * Values: + * - 0x00 ... 0xFF + * @return None + */ +void hci_le_advertising_set_terminated_event( uint8_t Status, + uint8_t Advertising_Handle, + uint16_t Connection_Handle, + uint8_t Num_Completed_Ext_Adv_Events ); + +/** + * @brief HCI_LE_SCAN_REQUEST_RECEIVED_EVENT + * The HCI_LE_Scan_Request_Received event indicates that a SCAN_REQ PDU or an + * AUX_SCAN_REQ PDU has been received by the advertiser. The request contains a + * device address from a scanner that is allowed by the advertising filter + * policy. The advertising set is identified by Advertising_Handle. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.19]. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Scanner_Address_Type Scanner address type. + * Values: + * - 0x00: Public Device Address + * - 0x01: Random Device Address + * - 0x02: Public Identity Address (corresponds to Resolved Private + * Address) + * - 0x03: Random (static) Identity Address (corresponds to Resolved + * Private Address) + * @param Scanner_Address Public Device Address, Random Device Address, Public + * Identity Address, or Random (static) Identity Address of the scanner + * device. + * @return None + */ +void hci_le_scan_request_received_event( uint8_t Advertising_Handle, + uint8_t Scanner_Address_Type, + const uint8_t* Scanner_Address ); + +/** + * @brief HCI_LE_CHANNEL_SELECTION_ALGORITHM_EVENT + * The HCI_LE_Channel_Selection_Algorithm event indicates which channel + * selection algorithm is used on a data physical channel connection. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.20]. + * + * @param Connection_Handle Connection handle for which the event applies. + * Values: + * - 0x0000 ... 0x0EFF + * @param Channel_Selection_Algorithm LE Channel Selection Algorithm. + * Values: + * - 0x00: Algorithm #1 is used + * - 0x01: Algorithm #2 is used + * @return None + */ +void hci_le_channel_selection_algorithm_event( uint16_t Connection_Handle, + uint8_t Channel_Selection_Algorithm ); + /* ACI GAP events */ /** @@ -588,8 +757,9 @@ void aci_gap_limited_discoverable_event( void ); * that it can take further actions or to notify that a timeout has occurred so * that the upper layer can decide to disconnect the link. * - * @param Connection_Handle Connection handle on which the pairing procedure - * completed + * @param Connection_Handle Handle of the connection where this event occurred. + * Values: + * - 0x0000 ... 0x0EFF * @param Status Pairing status * Values: * - 0x00: Success @@ -622,8 +792,9 @@ void aci_gap_pairing_complete_event( uint16_t Connection_Handle, * passkey is required for pairing. When this event is received, the * application has to respond with the ACI_GAP_PASS_KEY_RESP command. * - * @param Connection_Handle Connection handle for which the passkey has been - * requested. + * @param Connection_Handle Handle of the connection where this event occurred. + * Values: + * - 0x0000 ... 0x0EFF * @return None */ void aci_gap_pass_key_req_event( uint16_t Connection_Handle ); @@ -636,8 +807,9 @@ void aci_gap_pass_key_req_event( uint16_t Connection_Handle ); * When this event is received, ACI_GAP_AUTHORIZATION_RESP command should be * used to respond by the application. * - * @param Connection_Handle Connection handle for which authorization has been - * requested. + * @param Connection_Handle Handle of the connection where this event occurred. + * Values: + * - 0x0000 ... 0x0EFF * @return None */ void aci_gap_authorization_req_event( uint16_t Connection_Handle ); @@ -673,7 +845,6 @@ void aci_gap_bond_lost_event( void ); * Values: * - 0x01: GAP_LIMITED_DISCOVERY_PROC * - 0x02: GAP_GENERAL_DISCOVERY_PROC - * - 0x04: GAP_NAME_DISCOVERY_PROC * - 0x08: GAP_AUTO_CONNECTION_ESTABLISHMENT_PROC * - 0x10: GAP_GENERAL_CONNECTION_ESTABLISHMENT_PROC * - 0x20: GAP_SELECTIVE_CONNECTION_ESTABLISHMENT_PROC @@ -697,8 +868,9 @@ void aci_gap_proc_complete_event( uint8_t Procedure_Code, * to the upper layers when the peripheral is unsuccessful in resolving the * resolvable address of the peer device after connecting to it. * - * @param Connection_Handle Connection handle for which the private address - * could not be resolved with any of the stored IRK's. + * @param Connection_Handle Handle of the connection where this event occurred. + * Values: + * - 0x0000 ... 0x0EFF * @return None */ void aci_gap_addr_not_resolved_event( uint16_t Connection_Handle ); @@ -710,7 +882,10 @@ void aci_gap_addr_not_resolved_event( uint16_t Connection_Handle ); * and to ask for Confirmation to the User. When this event is received, the * application has to respond with the ACI_GAP_NUMERIC_COMPARISON_RESP command. * - * @param Connection_Handle Connection handle related to the underlying Pairing + * @param Connection_Handle Handle of the connection where this event occurred. + * Values: + * - 0x0000 ... 0x0EFF + * @param Numeric_Value Generated numeric value. * @return None */ void aci_gap_numeric_comparison_value_event( uint16_t Connection_Handle, @@ -723,9 +898,11 @@ void aci_gap_numeric_comparison_value_event( uint16_t Connection_Handle, * having Keyboard only I/O capabilities. When this event is received, no * action is required to the User. * - * @param Connection_Handle Connection handle related to the underlying Pairing + * @param Connection_Handle Handle of the connection where this event occurred. + * Values: + * - 0x0000 ... 0x0EFF * @param Notification_Type Type of Keypress input notified/signaled by peer - * device (having Keyboard only I/O capabilities + * device (having Keyboard only I/O capabilities. * @return None */ void aci_gap_keypress_notification_event( uint16_t Connection_Handle, @@ -744,7 +921,9 @@ void aci_gap_keypress_notification_event( uint16_t Connection_Handle, * - write long characteristic value * - reliable write. * - * @param Connection_Handle The connection handle which modified the attribute. + * @param Connection_Handle Connection handle for which the event applies. + * Values: + * - 0x0000 ... 0x0EFF * @param Attr_Handle Handle of the attribute that was modified. * @param Offset Bits 14-0: offset from which the write has been performed by * the peer device. Bit 15 is used as flag: when set to 1 it indicates @@ -773,8 +952,9 @@ void aci_gatt_attribute_modified_event( uint16_t Connection_Handle, * sending the ACI_GAP_TERMINATE, since immediately after this event, system * could save important information in non volatile memory. * - * @param Connection_Handle Connection handle on which the GATT procedure has - * timed out + * @param Connection_Handle Connection handle for which the event applies. + * Values: + * - 0x0000 ... 0x0EFF * @return None */ void aci_gatt_proc_timeout_event( uint16_t Connection_Handle ); @@ -1127,8 +1307,9 @@ void aci_gatt_read_permit_req_event( uint16_t Connection_Handle, * command to indicate to the stack that it can send the response to the * client. * - * @param Connection_Handle Handle of the connection which requested to read - * the attribute + * @param Connection_Handle Connection handle for which the event applies. + * Values: + * - 0x0000 ... 0x0EFF * @param Handle_Item See @ref Handle_Item_t * @return None */ @@ -1279,6 +1460,10 @@ void aci_gatt_notification_ext_event( uint16_t Connection_Handle, * @param Connection_Handle Handle of the connection where this event occurred. * Values: * - 0x0000 ... 0x0EFF + * @param Result Result field from the response packet. + * Values: + * - 0x0000: Connection Parameters accepted + * - 0x0001: Connection Parameters rejected * @return None */ void aci_l2cap_connection_update_resp_event( uint16_t Connection_Handle, @@ -1314,12 +1499,12 @@ void aci_l2cap_proc_timeout_event( uint16_t Connection_Handle, * @param L2CAP_Length Length of the L2CAP connection update request. * @param Interval_Min Minimum value for the connection event interval. This * shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Interval_Max Maximum value for the connection event interval. This * shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Slave_Latency Slave latency for the connection in number of @@ -1597,8 +1782,8 @@ void aci_hal_end_of_radio_activity_event( uint8_t Last_State, * This event is reported to the application after a scan request is received * and a scan response is scheduled to be transmitted. * - * @param RSSI N Size: 1 Octet (signed integer) - * Units: dBm + * @param RSSI RSSI (signed integer). + * Units: dBm. * Values: * - 127: RSSI not available * - -127 ... 20 diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c index e1ae981e0..df74c6ca6 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_gap_aci.c * @author MCD * @brief STM32WB BLE API (gap_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #include "ble_gap_aci.h" @@ -674,58 +673,6 @@ tBleStatus aci_gap_start_general_discovery_proc( uint16_t LE_Scan_Interval, return status; } -tBleStatus aci_gap_start_name_discovery_proc( uint16_t LE_Scan_Interval, - uint16_t LE_Scan_Window, - uint8_t Peer_Address_Type, - const uint8_t* Peer_Address, - uint8_t Own_Address_Type, - uint16_t Conn_Interval_Min, - uint16_t Conn_Interval_Max, - uint16_t Conn_Latency, - uint16_t Supervision_Timeout, - uint16_t Minimum_CE_Length, - uint16_t Maximum_CE_Length ) -{ - struct hci_request rq; - uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; - aci_gap_start_name_discovery_proc_cp0 *cp0 = (aci_gap_start_name_discovery_proc_cp0*)(cmd_buffer); - tBleStatus status = 0; - int index_input = 0; - cp0->LE_Scan_Interval = LE_Scan_Interval; - index_input += 2; - cp0->LE_Scan_Window = LE_Scan_Window; - index_input += 2; - cp0->Peer_Address_Type = Peer_Address_Type; - index_input += 1; - Osal_MemCpy( (void*)&cp0->Peer_Address, (const void*)Peer_Address, 6 ); - index_input += 6; - cp0->Own_Address_Type = Own_Address_Type; - index_input += 1; - cp0->Conn_Interval_Min = Conn_Interval_Min; - index_input += 2; - cp0->Conn_Interval_Max = Conn_Interval_Max; - index_input += 2; - cp0->Conn_Latency = Conn_Latency; - index_input += 2; - cp0->Supervision_Timeout = Supervision_Timeout; - index_input += 2; - cp0->Minimum_CE_Length = Minimum_CE_Length; - index_input += 2; - cp0->Maximum_CE_Length = Maximum_CE_Length; - index_input += 2; - Osal_MemSet( &rq, 0, sizeof(rq) ); - rq.ogf = 0x3f; - rq.ocf = 0x098; - rq.event = 0x0F; - rq.cparam = cmd_buffer; - rq.clen = index_input; - rq.rparam = &status; - rq.rlen = 1; - if ( hci_send_req(&rq, FALSE) < 0 ) - return BLE_STATUS_TIMEOUT; - return status; -} - tBleStatus aci_gap_start_auto_connection_establish_proc( uint16_t LE_Scan_Interval, uint16_t LE_Scan_Window, uint8_t Own_Address_Type, @@ -1324,6 +1271,39 @@ tBleStatus aci_gap_remove_bonded_device( uint8_t Peer_Identity_Address_Type, return status; } +tBleStatus aci_gap_add_devices_to_list( uint8_t Num_of_List_Entries, + const List_Entry_t* List_Entry, + uint8_t Mode ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + aci_gap_add_devices_to_list_cp0 *cp0 = (aci_gap_add_devices_to_list_cp0*)(cmd_buffer); + aci_gap_add_devices_to_list_cp1 *cp1 = (aci_gap_add_devices_to_list_cp1*)(cmd_buffer + 1 + Num_of_List_Entries * (sizeof(List_Entry_t))); + tBleStatus status = 0; + int index_input = 0; + cp0->Num_of_List_Entries = Num_of_List_Entries; + index_input += 1; + /* var_len_data input */ + { + Osal_MemCpy( (void*)&cp0->List_Entry, (const void*)List_Entry, Num_of_List_Entries ); + index_input += Num_of_List_Entries; + { + cp1->Mode = Mode; + } + index_input += 1; + } + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x3f; + rq.ocf = 0x0ab; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + tBleStatus aci_gap_additional_beacon_start( uint16_t Adv_Interval_Min, uint16_t Adv_Interval_Max, uint8_t Adv_Channel_Map, @@ -1398,3 +1378,194 @@ tBleStatus aci_gap_additional_beacon_set_data( uint8_t Adv_Data_Length, return status; } +tBleStatus aci_gap_adv_set_configuration( uint8_t Adv_Mode, + uint8_t Advertising_Handle, + uint16_t Adv_Event_Properties, + uint32_t Primary_Adv_Interval_Min, + uint32_t Primary_Adv_Interval_Max, + uint8_t Primary_Adv_Channel_Map, + uint8_t Own_Address_Type, + uint8_t Peer_Address_Type, + const uint8_t* Peer_Address, + uint8_t Adv_Filter_Policy, + uint8_t Adv_TX_Power, + uint8_t Secondary_Adv_Max_Skip, + uint8_t Secondary_Adv_PHY, + uint8_t Adv_SID, + uint8_t Scan_Req_Notification_Enable ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + aci_gap_adv_set_configuration_cp0 *cp0 = (aci_gap_adv_set_configuration_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Adv_Mode = Adv_Mode; + index_input += 1; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + cp0->Adv_Event_Properties = Adv_Event_Properties; + index_input += 2; + cp0->Primary_Adv_Interval_Min = Primary_Adv_Interval_Min; + index_input += 4; + cp0->Primary_Adv_Interval_Max = Primary_Adv_Interval_Max; + index_input += 4; + cp0->Primary_Adv_Channel_Map = Primary_Adv_Channel_Map; + index_input += 1; + cp0->Own_Address_Type = Own_Address_Type; + index_input += 1; + cp0->Peer_Address_Type = Peer_Address_Type; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Peer_Address, (const void*)Peer_Address, 6 ); + index_input += 6; + cp0->Adv_Filter_Policy = Adv_Filter_Policy; + index_input += 1; + cp0->Adv_TX_Power = Adv_TX_Power; + index_input += 1; + cp0->Secondary_Adv_Max_Skip = Secondary_Adv_Max_Skip; + index_input += 1; + cp0->Secondary_Adv_PHY = Secondary_Adv_PHY; + index_input += 1; + cp0->Adv_SID = Adv_SID; + index_input += 1; + cp0->Scan_Req_Notification_Enable = Scan_Req_Notification_Enable; + index_input += 1; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x3f; + rq.ocf = 0x0c0; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus aci_gap_adv_set_enable( uint8_t Enable, + uint8_t Num_Sets, + const Adv_Set_t* Adv_Set ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + aci_gap_adv_set_enable_cp0 *cp0 = (aci_gap_adv_set_enable_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Enable = Enable; + index_input += 1; + cp0->Num_Sets = Num_Sets; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Adv_Set, (const void*)Adv_Set, Num_Sets * (sizeof(Adv_Set_t)) ); + index_input += Num_Sets * (sizeof(Adv_Set_t)); + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x3f; + rq.ocf = 0x0c1; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus aci_gap_adv_set_adv_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Advertising_Data_Length, + const uint8_t* Advertising_Data ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + aci_gap_adv_set_adv_data_cp0 *cp0 = (aci_gap_adv_set_adv_data_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + cp0->Operation = Operation; + index_input += 1; + cp0->Fragment_Preference = Fragment_Preference; + index_input += 1; + cp0->Advertising_Data_Length = Advertising_Data_Length; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Advertising_Data, (const void*)Advertising_Data, Advertising_Data_Length ); + index_input += Advertising_Data_Length; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x3f; + rq.ocf = 0x0c2; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus aci_gap_adv_set_scan_resp_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Scan_Response_Data_Length, + const uint8_t* Scan_Response_Data ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + aci_gap_adv_set_scan_resp_data_cp0 *cp0 = (aci_gap_adv_set_scan_resp_data_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + cp0->Operation = Operation; + index_input += 1; + cp0->Fragment_Preference = Fragment_Preference; + index_input += 1; + cp0->Scan_Response_Data_Length = Scan_Response_Data_Length; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Scan_Response_Data, (const void*)Scan_Response_Data, Scan_Response_Data_Length ); + index_input += Scan_Response_Data_Length; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x3f; + rq.ocf = 0x0c3; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus aci_gap_adv_remove_set( uint8_t Advertising_Handle ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + aci_gap_adv_remove_set_cp0 *cp0 = (aci_gap_adv_remove_set_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x3f; + rq.ocf = 0x0c4; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus aci_gap_adv_clear_sets( void ) +{ + struct hci_request rq; + tBleStatus status = 0; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x3f; + rq.ocf = 0x0c5; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.h b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.h index 1d96f7569..a6cde6e42 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.h @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_gap_aci.h * @author MCD * @brief STM32WB BLE API (gap_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_GAP_ACI_H__ @@ -61,23 +60,21 @@ tBleStatus aci_gap_set_non_discoverable( void ); * - 0x02: ADV_SCAN_IND (Scannable undirected advertising) * - 0x03: ADV_NONCONN_IND (Non connectable undirected advertising) * @param Advertising_Interval_Min Minimum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Advertising_Interval_Max Maximum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @param Advertising_Filter_Policy Advertising filter policy: not applicable * (the value of Advertising_Filter_Policy parameter is not used inside * the Stack) @@ -158,23 +155,21 @@ tBleStatus aci_gap_set_limited_discoverable( uint8_t Advertising_Type, * - 0x02: ADV_SCAN_IND (Scannable undirected advertising) * - 0x03: ADV_NONCONN_IND (Non connectable undirected advertising) * @param Advertising_Interval_Min Minimum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Advertising_Interval_Max Maximum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @param Advertising_Filter_Policy Advertising filter policy: not applicable * (the value of Advertising_Filter_Policy parameter is not used inside * the Stack) @@ -241,16 +236,14 @@ tBleStatus aci_gap_set_discoverable( uint8_t Advertising_Type, * status set to HCI_ADVERTISING_TIMEOUT_ERR_CODE if the connection was not * established and BLE_STATUS_SUCCESS (0x00) if the connection was successfully * established. - * If Host privacy is enabled this command returns BLE_STATUS_INVALID_PARAMS. * - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address * @param Directed_Advertising_Type Advertising type * Values: * - 0x01: High Duty Cycle Directed Advertising @@ -259,15 +252,15 @@ tBleStatus aci_gap_set_discoverable( uint8_t Advertising_Type, * Values: * - 0x00: Public Device Address * - 0x01: Random Device Address - * @param Direct_Address Initiator Bluetooth address + * @param Direct_Address Initiator address * @param Advertising_Interval_Min Minimum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0006 (3.750 ms) : for High Duty Cycle Directed Advertising * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) : for Low Duty Cycle * Directed Advertising * @param Advertising_Interval_Max Maximum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0006 (3.750 ms) : for High Duty Cycle Directed Advertising * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) : for Low Duty Cycle @@ -431,11 +424,11 @@ tBleStatus aci_gap_authorization_resp( uint16_t Connection_Handle, * - 0x02: Broadcaster * - 0x04: Central * - 0x08: Observer - * @param privacy_enabled Specify if privacy is enabled or not and which one . + * @param privacy_enabled This paremeter specifies if Privacy is enabled or + * not. N.B.: only Controller Privacy is supported. * Values: * - 0x00: Privacy disabled - * - 0x01: Privacy host enabled - * - 0x02: Privacy controller enabled + * - 0x02: Privacy enabled * @param device_name_char_len Length of the device name characteristic * @param[out] Service_Handle Handle of the GAP service * @param[out] Dev_Name_Char_Handle Device Name Characteristic handle @@ -460,16 +453,14 @@ tBleStatus aci_gap_init( uint8_t Role, * Values: * - 0x02: ADV_SCAN_IND (Scannable undirected advertising) * - 0x03: ADV_NONCONN_IND (Non connectable undirected advertising) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @return Value indicating success or error code. */ tBleStatus aci_gap_set_non_connectable( uint8_t Advertising_Event_Type, @@ -483,23 +474,20 @@ tBleStatus aci_gap_set_non_connectable( uint8_t Advertising_Event_Type, * type specified in own_addr_type is used for advertising. * * @param Advertising_Interval_Min Minimum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Advertising_Interval_Max Maximum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if Host privacy (i.e. privacy 1.1) is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address * @param Adv_Filter_Policy Advertising filter policy. * Values: * - 0x00: Allow Scan Request from Any, Allow Connect Request from Any @@ -671,24 +659,22 @@ tBleStatus aci_gap_allow_rebond( uint16_t Connection_Handle ); * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @param Filter_Duplicates Enable/disable duplicate filtering. * Values: * - 0x00: Duplicate filtering disabled @@ -714,24 +700,22 @@ tBleStatus aci_gap_start_limited_discovery_proc( uint16_t LE_Scan_Interval, * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @param Filter_Duplicates Enable/disable duplicate filtering. * Values: * - 0x00: Duplicate filtering disabled @@ -743,88 +727,6 @@ tBleStatus aci_gap_start_general_discovery_proc( uint16_t LE_Scan_Interval, uint8_t Own_Address_Type, uint8_t Filter_Duplicates ); -/** - * @brief ACI_GAP_START_NAME_DISCOVERY_PROC - * Start the name discovery procedure. A LE_Create_Connection call will be made - * to the controller by GAP with the initiator filter policy set to "ignore - * whitelist and process connectable advertising packets only for the specified - * device". Once a connection is established, GATT procedure is started to read - * the device name characteristic. When the read is completed (successfully or - * unsuccessfully), a ACI_GAP_PROC_COMPLETE_EVENT event is given to the upper - * layer. The event also contains the name of the device if the device name was - * read successfully. - * - * @param LE_Scan_Interval This is defined as the time interval from when the - * Controller started its last LE scan until it begins the subsequent LE - * scan. - * Time = N * 0.625 msec. - * Values: - * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param LE_Scan_Window Amount of time for the duration of the LE scan. - * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. - * Values: - * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param Peer_Address_Type Address type. - * Values: - * - 0x00: Public Device Address - * - 0x01: Random Device Address - * @param Peer_Address Public Device Address or Random Device Address of the - * device to be connected. - * @param Own_Address_Type Own address type - * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) - * @param Conn_Interval_Min Minimum value for the connection event interval. - * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. - * Values: - * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) - * @param Conn_Interval_Max Maximum value for the connection event interval. - * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. - * Values: - * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) - * @param Conn_Latency Slave latency for the connection in number of connection - * events. - * Values: - * - 0x0000 ... 0x01F3 - * @param Supervision_Timeout Supervision timeout for the LE Link. - * It shall be a multiple of 10 ms and larger than (1 + - * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. - * Values: - * - 0x000A (100 ms) ... 0x0C80 (32000 ms) - * @param Minimum_CE_Length Information parameter about the minimum length of - * connection needed for this LE connection. - * Time = N * 0.625 msec. - * Values: - * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) - * @param Maximum_CE_Length Information parameter about the maximum length of - * connection needed for this LE connection. - * Time = N * 0.625 msec. - * Values: - * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) - * @return Value indicating success or error code. - */ -tBleStatus aci_gap_start_name_discovery_proc( uint16_t LE_Scan_Interval, - uint16_t LE_Scan_Window, - uint8_t Peer_Address_Type, - const uint8_t* Peer_Address, - uint8_t Own_Address_Type, - uint16_t Conn_Interval_Min, - uint16_t Conn_Interval_Max, - uint16_t Conn_Latency, - uint16_t Supervision_Timeout, - uint16_t Minimum_CE_Length, - uint16_t Maximum_CE_Length ); - /** * @brief ACI_GAP_START_AUTO_CONNECTION_ESTABLISH_PROC * Start the auto connection establishment procedure. The devices specified are @@ -839,39 +741,36 @@ tBleStatus aci_gap_start_name_discovery_proc( uint16_t LE_Scan_Interval, * ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x08. A * ACI_GAP_PROC_COMPLETE_EVENT event is returned with the procedure code set to * 0x08. - * If controller privacy is enabled and the peer device (advertiser) is in the - * resolving list then the link layer will generate a RPA, if it is not then - * the RPA/NRPA generated by the Host will be used. + * If privacy is enabled and the peer device (advertiser) is in the resolving + * list then the link layer generates a RPA, if it is not then the RPA + * generated by the Host is used. * * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address * @param Conn_Interval_Min Minimum value for the connection event interval. * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Interval_Max Maximum value for the connection event interval. * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -881,17 +780,17 @@ tBleStatus aci_gap_start_name_discovery_proc( uint16_t LE_Scan_Interval, * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @param Minimum_CE_Length Information parameter about the minimum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Maximum_CE_Length Information parameter about the maximum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Num_of_Whitelist_Entries Number of devices that have to be added to @@ -928,36 +827,34 @@ tBleStatus aci_gap_start_auto_connection_establish_proc( uint16_t LE_Scan_Interv * ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x10. On * completion of the procedure a ACI_GAP_PROC_COMPLETE_EVENT event is generated * with the procedure code set to 0x10. - * If controller privacy is enabled and the peer device (advertiser) is in the - * resolving list then the link layer will generate a RPA, if it is not then - * the RPA/NRPA generated by the Host will be used. + * If privacy is enabled and the peer device (advertiser) is in the resolving + * list then the link layer will generate a RPA, if it is not then the RPA/NRPA + * generated by the Host will be used. * - * @param LE_Scan_Type Passive or active scanning. With active scanning - * SCAN_REQ packets are sent. + * @param LE_Scan_Type Passive or active scanning. With passive scanning, no + * scan request PDUs are sent. * Values: - * - 0x00: Passive Scanning + * - 0x00: Passive scanning * - 0x01: Active scanning * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @param Scanning_Filter_Policy Scanning filter policy: * - 0x00 Accept all advertisement packets.Directed advertising packets * which are not addressed for this device shall be ignored. @@ -965,16 +862,15 @@ tBleStatus aci_gap_start_auto_connection_establish_proc( uint16_t LE_Scan_Interv * List Only.Directed advertising packets which are not addressed for * this device shall be ignored. * - 0x02 Accept all undirected advertisement packets (it is allowed - * only if controller privacy or host privacy is enabled).Directed - * advertisement packets where initiator address is a RPA and Directed - * advertisement packets addressed to this device shall be accepted. + * only if privacy is enabled). Directed advertisement packets where + * initiator address is a RPA and Directed advertisement packets + * addressed to this device shall be accepted. * - 0x03 Accept all undirected advertisement packets from devices that * are in the White List.Directed advertisement packets where initiator * address is RPA and Directed advertisement packets addressed to this * device shall be accepted. - * - NOTE: if controller privacy is enabled Scanning_Filter_Policy can - * only assume values 0x00 or 0x02; if Host privacy is enabled - * Scanning_Filter_Policy can only assume value 0x00. + * - NOTE: if privacy is enabled Scanning_Filter_Policy can only assume + * values 0x00 or 0x02. * Values: * - 0x00: Accept all * - 0x01: Ignore devices not in the White List @@ -1007,36 +903,34 @@ tBleStatus aci_gap_start_general_connection_establish_proc( uint8_t LE_Scan_Type * when a connection is established or the upper layer terminates the procedure * by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure code * set to 0x20. - * If controller privacy is enabled and the peer device (advertiser) is in the - * resolving list then the link layer will generate a RPA, if it is not then - * the RPA/NRPA generated by the Host will be used. + * If privacy is enabled and the peer device (advertiser) is in the resolving + * list then the link layer will generate a RPA, if it is not then the RPA/NRPA + * generated by the Host will be used. * - * @param LE_Scan_Type Passive or active scanning. With active scanning - * SCAN_REQ packets are sent. + * @param LE_Scan_Type Passive or active scanning. With passive scanning, no + * scan request PDUs are sent. * Values: - * - 0x00: Passive Scanning + * - 0x00: Passive scanning * - 0x01: Active scanning * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @param Scanning_Filter_Policy Scanning filter policy: * - 0x00 Accept all advertisement packets.Directed advertising packets * which are not addressed for this device shall be ignored. @@ -1044,16 +938,15 @@ tBleStatus aci_gap_start_general_connection_establish_proc( uint8_t LE_Scan_Type * List Only.Directed advertising packets which are not addressed for * this device shall be ignored. * - 0x02 Accept all undirected advertisement packets (it is allowed - * only if controller privacy or host privacy is enabled).Directed - * advertisement packets where initiator address is a RPA and Directed - * advertisement packets addressed to this device shall be accepted. + * only if privacy is enabled). Directed advertisement packets where + * initiator address is a RPA and Directed advertisement packets + * addressed to this device shall be accepted. * - 0x03 Accept all undirected advertisement packets from devices that * are in the White List.Directed advertisement packets where initiator * address is RPA and Directed advertisement packets addressed to this * device shall be accepted. - * - NOTE: if controller privacy is enabled Scanning_Filter_Policy can - * only assume values 0x01 or 0x03; if Host privacy is enabled - * Scanning_Filter_Policy can only assume value 0x01. + * - NOTE: if privacy is enabled Scanning_Filter_Policy can only assume + * values 0x01 or 0x03. * Values: * - 0x00: Accept all * - 0x01: Ignore devices not in the White List @@ -1090,19 +983,19 @@ tBleStatus aci_gap_start_selective_connection_establish_proc( uint8_t LE_Scan_Ty * returned. The procedure can be explicitly terminated by the upper layer by * issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure_code set * to 0x40. - * If controller privacy is enabled and the peer device (advertiser) is in the - * resolving list then the link layer will generate a RPA, if it is not then - * the RPA/NRPA generated by the Host will be used. + * If privacy is enabled and the peer device (advertiser) is in the resolving + * list then the link layer will generate a RPA, if it is not then the RPA + * generated by the Host will be used. * * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param Peer_Address_Type The address type of the peer device. @@ -1111,24 +1004,21 @@ tBleStatus aci_gap_start_selective_connection_establish_proc( uint8_t LE_Scan_Ty * - 0x01: Random Device Address * @param Peer_Address Public Device Address or Random Device Address of the * device to be connected. - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address * @param Conn_Interval_Min Minimum value for the connection event interval. * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Interval_Max Maximum value for the connection event interval. * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -1138,17 +1028,17 @@ tBleStatus aci_gap_start_selective_connection_establish_proc( uint8_t LE_Scan_Ty * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @param Minimum_CE_Length Information parameter about the minimum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Maximum_CE_Length Information parameter about the maximum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @return Value indicating success or error code. @@ -1175,7 +1065,6 @@ tBleStatus aci_gap_create_connection( uint16_t LE_Scan_Interval, * - 0x00: No events * - 0x01: GAP_LIMITED_DISCOVERY_PROC * - 0x02: GAP_GENERAL_DISCOVERY_PROC - * - 0x04: GAP_NAME_DISCOVERY_PROC * - 0x08: GAP_AUTO_CONNECTION_ESTABLISHMENT_PROC * - 0x10: GAP_GENERAL_CONNECTION_ESTABLISHMENT_PROC * - 0x20: GAP_SELECTIVE_CONNECTION_ESTABLISHMENT_PROC @@ -1197,12 +1086,12 @@ tBleStatus aci_gap_terminate_gap_proc( uint8_t Procedure_Code ); * - 0x0000 ... 0x0EFF * @param Conn_Interval_Min Minimum value for the connection event interval. * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Interval_Max Maximum value for the connection event interval. * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -1212,17 +1101,17 @@ tBleStatus aci_gap_terminate_gap_proc( uint8_t Procedure_Code ); * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @param Minimum_CE_Length Information parameter about the minimum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Maximum_CE_Length Information parameter about the maximum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @return Value indicating success or error code. @@ -1280,21 +1169,20 @@ tBleStatus aci_gap_resolve_private_addr( const uint8_t* Address, * as specified in the Own_Addr_Type parameter of the command. * * @param Advertising_Interval_Min Minimum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Advertising_Interval_Max Maximum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Advertising_Type Advertising type * Values: * - 0x02: ADV_SCAN_IND (Scannable undirected advertising) * - 0x03: ADV_NONCONN_IND (Non connectable undirected advertising) - * @param Own_Address_Type If Privacy is disabled, then the address can be - * public or static random. - * If Privacy is enabled, then the address can be a resolvable private - * address or a non-resolvable private address. + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: * - 0x00: Public address * - 0x01: Static random address @@ -1322,57 +1210,53 @@ tBleStatus aci_gap_set_broadcast_mode( uint16_t Advertising_Interval_Min, * Starts an Observation procedure, when the device is in Observer Role. The * host enables scanning in the controller. The advertising reports are sent to * the upper layer using standard LE Advertising Report Event. - * If controller privacy is enabled and the peer device (advertiser) is in the - * resolving list then the link layer will generate a RPA, if it is not then - * the RPA/NRPA generated by the Host will be used. + * If privacy is enabled and the peer device (advertiser) is in the resolving + * list then the link layer will generate a RPA, if it is not then the RPA/NRPA + * generated by the Host will be used. * * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param LE_Scan_Type Passive or active scanning. With active scanning - * SCAN_REQ packets are sent. + * @param LE_Scan_Type Passive or active scanning. With passive scanning, no + * scan request PDUs are sent. * Values: - * - 0x00: Passive Scanning + * - 0x00: Passive scanning * - 0x01: Active scanning - * @param Own_Address_Type Own address type + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. * Values: - * - 0x00: Public Device Address - * (only if privacy is disabled) - * - 0x01: Random Device Address - * (only if privacy is disabled) - * - 0x02: Resolvable Private Address - * (only if privacy is enabled) - * - 0x03: Non Resolvable Private Address - * (only if privacy is enabled) + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address * @param Filter_Duplicates Enable/disable duplicate filtering. * Values: * - 0x00: Duplicate filtering disabled * - 0x01: Duplicate filtering enabled * @param Scanning_Filter_Policy Scanning filter policy: * - 0x00 Accept all advertisement packets (it is allowed only if - * controller privacy is enabled).Directed advertising packets which are - * not addressed for this device shall be ignored. + * privacy is enabled). Directed advertising packets which are not + * addressed for this device shall be ignored. * - 0x01 Ignore advertisement packets from devices not in the White - * List Only.Directed advertising packets which are not addressed for + * List Only. Directed advertising packets which are not addressed for * this device shall be ignored. * - 0x02 Accept all undirected advertisement packets (it is allowed - * only if controller privacy or host privacy is enabled).Directed - * advertisement packets where initiator address is a RPA and Directed - * advertisement packets addressed to this device shall be accepted. + * only if privacy is enabled). Directed advertisement packets where + * initiator address is a RPA and Directed advertisement packets + * addressed to this device shall be accepted. * - 0x03 Accept all undirected advertisement packets from devices that - * are in the White List.Directed advertisement packets where initiator + * are in the White List. Directed advertisement packets where initiator * address is RPA and Directed advertisement packets addressed to this * device shall be accepted. - * - NOTE: If Host privacy is enabled Scanning_Filter_Policy can only - * take values 0x00 or 0x01; * Values: * - 0x00: Accept all * - 0x01: Ignore devices not in the White List @@ -1430,7 +1314,7 @@ tBleStatus aci_gap_is_device_bonded( uint8_t Peer_Address_Type, * equal! * Values: * - 0x00: No - * - 0x01: YES + * - 0x01: Yes * @return Value indicating success or error code. */ tBleStatus aci_gap_numeric_comparison_value_confirm_yesno( uint16_t Connection_Handle, @@ -1514,13 +1398,16 @@ tBleStatus aci_gap_set_oob_data( uint8_t Device_Type, /** * @brief ACI_GAP_ADD_DEVICES_TO_RESOLVING_LIST - * This command is used to add one device to the list of address translations + * This command is used to add devices to the list of address translations * used to resolve Resolvable Private Addresses in the Controller. * * @param Num_of_Resolving_list_Entries Number of devices that have to be added - * to the resolving list. + * to the list. * @param Whitelist_Identity_Entry See @ref Whitelist_Identity_Entry_t * @param Clear_Resolving_List Clear the resolving list + * Values: + * - 0x00: Do not clear + * - 0x01: Clear before adding * @return Value indicating success or error code. */ tBleStatus aci_gap_add_devices_to_resolving_list( uint8_t Num_of_Resolving_list_Entries, @@ -1542,6 +1429,28 @@ tBleStatus aci_gap_add_devices_to_resolving_list( uint8_t Num_of_Resolving_list_ tBleStatus aci_gap_remove_bonded_device( uint8_t Peer_Identity_Address_Type, const uint8_t* Peer_Identity_Address ); +/** + * @brief ACI_GAP_ADD_DEVICES_TO_LIST + * This command is used to add specific device addresses to the white and/or + * resolving list. + * + * @param Num_of_List_Entries Number of devices that have to be added to the + * list. + * @param List_Entry See @ref List_Entry_t + * @param Mode Mode used for adding devices in the lists. + * Values: + * - 0x00: Append to the resolving list only + * - 0x01: Clear and set the resolving list only + * - 0x02: Append to the white list only + * - 0x03: Clear and set the white list only + * - 0x04: Append to both resolving and white lists + * - 0x05: Clear and set both resolving and white lists + * @return Value indicating success or error code. + */ +tBleStatus aci_gap_add_devices_to_list( uint8_t Num_of_List_Entries, + const List_Entry_t* List_Entry, + uint8_t Mode ); + /** * @brief ACI_GAP_ADDITIONAL_BEACON_START * This command starts an advertising beacon. It allows additional advertising @@ -1550,19 +1459,18 @@ tBleStatus aci_gap_remove_bonded_device( uint8_t Peer_Identity_Address_Type, * ACI_GAP_SET_LIMITED_DISCOVERABLE. * * @param Adv_Interval_Min Minimum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Adv_Interval_Max Maximum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Adv_Channel_Map Advertising channel map. - * Default: 00000111b (all channels enabled). * Flags: - * - 0x01: ch 37 - * - 0x02: ch 38 - * - 0x04: ch 39 + * - 0x01: Channel 37 shall be used + * - 0x02: Channel 38 shall be used + * - 0x04: Channel 39 shall be used * @param Own_Address_Type Own address type: public or static random. * Values: * - 0x00: Public Device Address @@ -1635,5 +1543,201 @@ tBleStatus aci_gap_additional_beacon_stop( void ); tBleStatus aci_gap_additional_beacon_set_data( uint8_t Adv_Data_Length, const uint8_t* Adv_Data ); +/** + * @brief ACI_GAP_ADV_SET_CONFIGURATION + * This command is used to set the extended advertising configration. + * + * @param Adv_Mode Not used. Shall be set to 0. + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Adv_Event_Properties Type of advertising event. + * Flags: + * - 0x0001: Connectable advertising + * - 0x0002: Scannable advertising + * - 0x0004: Directed advertising + * - 0x0008: High Duty Cycle Directed Connectable advertising + * - 0x0010: Use legacy advertising PDUs + * - 0x0020: Anonymous advertising + * - 0x0040: Include TxPower in at least one advertising PDU + * @param Primary_Adv_Interval_Min Minimum advertising interval. + * Time = N * 0.625 ms. + * Values: + * - 0x00000020 (20.000 ms) ... 0x00FFFFFF (10485759.375 ms) + * @param Primary_Adv_Interval_Max Maximum advertising interval. + * Time = N * 0.625 ms. + * Values: + * - 0x00000020 (20.000 ms) ... 0x00FFFFFF (10485759.375 ms) + * @param Primary_Adv_Channel_Map Advertising channel map. + * Flags: + * - 0x01: Channel 37 shall be used + * - 0x02: Channel 38 shall be used + * - 0x04: Channel 39 shall be used + * @param Own_Address_Type Own address type: if Privacy is disabled, the + * address can be public or static random; otherwise, it can be a + * resolvable private address or a non-resolvable private address. + * Values: + * - 0x00: Public address + * - 0x01: Static random address + * - 0x02: Resolvable private address + * - 0x03: Non-resolvable private address + * @param Peer_Address_Type Address type of the peer device. + * Values: + * - 0x00: Public Device Address or Public Identity Address + * - 0x01: Random Device Address or Random (static) Identity Address + * @param Peer_Address Public Device Address, Random Device Address, Public + * Identity Address, or Random (static) Identity Address of the device + * to be connected. + * @param Adv_Filter_Policy Advertising filter policy + * Values: + * - 0x00: Process scan and connection requests from all devices (i.e., + * the White List is not in use) + * - 0x01: Process connection requests from all devices and scan + * requests only from devices that are in the White List. + * - 0x02: Process scan requests from all devices and connection + * requests only from devices that are in the White List. + * - 0x03: Process scan and connection requests only from devices in the + * White List. + * @param Adv_TX_Power Advertising TX power. Units: dBm. + * Values: + * - -127 ... 20 + * @param Secondary_Adv_Max_Skip Secondary advertising maximum skip. + * Values: + * - 0x00: AUX_ADV_IND shall be sent prior to the next advertising event + * - 0x01 ... 0xFF: Maximum advertising events the Controller can skip + * before sending the AUX_ADV_IND packets on the secondary advertising + * physical channel + * @param Secondary_Adv_PHY Secondary advertising PHY. + * Values: + * - 0x01: Secondary advertisement PHY is LE 1M + * - 0x02: Secondary advertisement PHY is LE 2M + * - 0x03: Secondary advertisement PHY is LE Coded (not supported) + * @param Adv_SID Value of the Advertising SID subfield in the ADI field of the + * PDU. + * Values: + * - 0x00 ... 0x0F + * @param Scan_Req_Notification_Enable Scan request notifications. + * Values: + * - 0x00: Scan request notifications disabled + * - 0x01: Scan request notifications enabled + * @return Value indicating success or error code. + */ +tBleStatus aci_gap_adv_set_configuration( uint8_t Adv_Mode, + uint8_t Advertising_Handle, + uint16_t Adv_Event_Properties, + uint32_t Primary_Adv_Interval_Min, + uint32_t Primary_Adv_Interval_Max, + uint8_t Primary_Adv_Channel_Map, + uint8_t Own_Address_Type, + uint8_t Peer_Address_Type, + const uint8_t* Peer_Address, + uint8_t Adv_Filter_Policy, + uint8_t Adv_TX_Power, + uint8_t Secondary_Adv_Max_Skip, + uint8_t Secondary_Adv_PHY, + uint8_t Adv_SID, + uint8_t Scan_Req_Notification_Enable ); + +/** + * @brief ACI_GAP_ADV_SET_ENABLE + * This command is used to request the Controller to enable or disable one or + * more extended advertising sets. + * + * @param Enable Enable/disable advertising. + * Values: + * - 0x00: Advertising is disabled + * - 0x01: Advertising is enabled + * @param Num_Sets Number of advertising sets. + * Values: + * - 0x00: Disable all advertising sets + * - 0x01 ... 0x3F: Number of advertising sets to enable or disable + * @param Adv_Set See @ref Adv_Set_t + * @return Value indicating success or error code. + */ +tBleStatus aci_gap_adv_set_enable( uint8_t Enable, + uint8_t Num_Sets, + const Adv_Set_t* Adv_Set ); + +/** + * @brief ACI_GAP_ADV_SET_ADV_DATA + * This command is used to set the data used in extended advertising PDUs that + * have a data field. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Operation Advertising operation. + * Values: + * - 0x00: Intermediate fragment of fragmented extended advertising data + * - 0x01: First fragment of fragmented extended advertising data + * - 0x02: Last fragment of fragmented extended advertising data + * - 0x03: Complete extended advertising data + * - 0x04: Unchanged data (just update the Advertising DID) + * @param Fragment_Preference Fragment preference. + * Values: + * - 0x00: The Controller may fragment all data + * - 0x01: The Controller should not fragment or should minimize + * fragmentation of data + * @param Advertising_Data_Length Length of Advertising_Data in octets + * @param Advertising_Data Data formatted as defined in Bluetooth spec. v.5.2 + * [Vol 3, Part C, 11]. + * @return Value indicating success or error code. + */ +tBleStatus aci_gap_adv_set_adv_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Advertising_Data_Length, + const uint8_t* Advertising_Data ); + +/** + * @brief ACI_GAP_ADV_SET_SCAN_RESP_DATA + * This command is used to provide scan response data used during extended + * advertising. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Operation Scan response operation. + * Values: + * - 0x00: Intermediate fragment of fragmented scan response data + * - 0x01: First fragment of fragmented scan response data + * - 0x02: Last fragment of fragmented scan response data + * - 0x03: Complete scan response data + * @param Fragment_Preference Fragment preference. + * Values: + * - 0x00: The Controller may fragment all data + * - 0x01: The Controller should not fragment or should minimize + * fragmentation of data + * @param Scan_Response_Data_Length Length of Scan_Response_Data in octets + * @param Scan_Response_Data Data formatted as defined in Bluetooth spec. v.5.2 + * [Vol 3, Part C, 11]. + * @return Value indicating success or error code. + */ +tBleStatus aci_gap_adv_set_scan_resp_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Scan_Response_Data_Length, + const uint8_t* Scan_Response_Data ); + +/** + * @brief ACI_GAP_ADV_REMOVE_SET + * This command is used to remove an advertising set from the Controller. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @return Value indicating success or error code. + */ +tBleStatus aci_gap_adv_remove_set( uint8_t Advertising_Handle ); + +/** + * @brief ACI_GAP_ADV_CLEAR_SETS + * This command is used to remove all existing advertising sets from the + * Controller. + * + * @return Value indicating success or error code. + */ +tBleStatus aci_gap_adv_clear_sets( void ); + #endif /* BLE_GAP_ACI_H__ */ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c index b552cf22b..d2f37d809 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_gatt_aci.c * @author MCD * @brief STM32WB BLE API (gatt_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #include "ble_gatt_aci.h" diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.h b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.h index a01b3e576..240823037 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.h @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_gatt_aci.h * @author MCD * @brief STM32WB BLE API (gatt_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_GATT_ACI_H__ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c index 2dd97aa1e..0658d71dc 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_hal_aci.c * @author MCD * @brief STM32WB BLE API (hal_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #include "ble_hal_aci.h" diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.h b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.h index b81d3cb32..cc919c428 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.h @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_hal_aci.h * @author MCD * @brief STM32WB BLE API (hal_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_HAL_ACI_H__ @@ -49,8 +48,10 @@ tBleStatus aci_hal_get_fw_build_number( uint16_t* Build_Number ); * Encryption root key used to derive LTK and CSRK; 16 bytes * - 0x18: CONFIG_DATA_IR_OFFSET; * Identity root key used to derive LTK and CSRK; 16 bytes - * - 0x2E: CONFIG_DATA_RANDOM_ADDRESS_WR; + * - 0x2E: CONFIG_DATA_RANDOM_ADDRESS_OFFSET; * Static Random Address; 6 bytes + * - 0xB0: CONFIG_DATA_SMP_MODE_OFFSET; + * SMP mode (0: normal, 1:bypass); 1 byte * @param Length Length of data to be written * @param Value Data to be written * @return Value indicating success or error code. @@ -73,7 +74,7 @@ tBleStatus aci_hal_write_config_data( uint8_t Offset, * Encryption root key used to derive LTK and CSRK; 16 bytes * - 0x18: CONFIG_DATA_IR_OFFSET * Identity root key used to derive LTK and CSRK; 16 bytes - * - 0x2E: CONFIG_DATA_RANDOM_ADDRESS_WR; + * - 0x2E: CONFIG_DATA_RANDOM_ADDRESS_OFFSET; * Static Random Address; 6 bytes * @param[out] Data_Length Length of Data in octets * @param[out] Data Data field associated with Offset parameter diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c index 285cc41f3..e2a6bbbfd 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_hci_le.c * @author MCD * @brief STM32WB BLE API (hci_le) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #include "ble_hci_le.h" @@ -433,10 +432,10 @@ tBleStatus hci_le_set_advertising_parameters( uint16_t Advertising_Interval_Min, return status; } -tBleStatus hci_le_read_advertising_channel_tx_power( uint8_t* Transmit_Power_Level ) +tBleStatus hci_le_read_advertising_physical_channel_tx_power( uint8_t* Transmit_Power_Level ) { struct hci_request rq; - hci_le_read_advertising_channel_tx_power_rp0 resp; + hci_le_read_advertising_physical_channel_tx_power_rp0 resp; Osal_MemSet( &resp, 0, sizeof(resp) ); Osal_MemSet( &rq, 0, sizeof(rq) ); rq.ogf = 0x08; @@ -499,11 +498,11 @@ tBleStatus hci_le_set_scan_response_data( uint8_t Scan_Response_Data_Length, return status; } -tBleStatus hci_le_set_advertise_enable( uint8_t Advertising_Enable ) +tBleStatus hci_le_set_advertising_enable( uint8_t Advertising_Enable ) { struct hci_request rq; uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; - hci_le_set_advertise_enable_cp0 *cp0 = (hci_le_set_advertise_enable_cp0*)(cmd_buffer); + hci_le_set_advertising_enable_cp0 *cp0 = (hci_le_set_advertising_enable_cp0*)(cmd_buffer); tBleStatus status = 0; int index_input = 0; cp0->Advertising_Enable = Advertising_Enable; @@ -882,14 +881,14 @@ tBleStatus hci_le_rand( uint8_t* Random_Number ) return BLE_STATUS_SUCCESS; } -tBleStatus hci_le_start_encryption( uint16_t Connection_Handle, - const uint8_t* Random_Number, - uint16_t Encrypted_Diversifier, - const uint8_t* Long_Term_Key ) +tBleStatus hci_le_enable_encryption( uint16_t Connection_Handle, + const uint8_t* Random_Number, + uint16_t Encrypted_Diversifier, + const uint8_t* Long_Term_Key ) { struct hci_request rq; uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; - hci_le_start_encryption_cp0 *cp0 = (hci_le_start_encryption_cp0*)(cmd_buffer); + hci_le_enable_encryption_cp0 *cp0 = (hci_le_enable_encryption_cp0*)(cmd_buffer); tBleStatus status = 0; int index_input = 0; cp0->Connection_Handle = Connection_Handle; @@ -940,12 +939,12 @@ tBleStatus hci_le_long_term_key_request_reply( uint16_t Connection_Handle, return BLE_STATUS_SUCCESS; } -tBleStatus hci_le_long_term_key_requested_negative_reply( uint16_t Connection_Handle ) +tBleStatus hci_le_long_term_key_request_negative_reply( uint16_t Connection_Handle ) { struct hci_request rq; uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; - hci_le_long_term_key_requested_negative_reply_cp0 *cp0 = (hci_le_long_term_key_requested_negative_reply_cp0*)(cmd_buffer); - hci_le_long_term_key_requested_negative_reply_rp0 resp; + hci_le_long_term_key_request_negative_reply_cp0 *cp0 = (hci_le_long_term_key_request_negative_reply_cp0*)(cmd_buffer); + hci_le_long_term_key_request_negative_reply_rp0 resp; Osal_MemSet( &resp, 0, sizeof(resp) ); int index_input = 0; cp0->Connection_Handle = Connection_Handle; @@ -1458,13 +1457,13 @@ tBleStatus hci_le_set_phy( uint16_t Connection_Handle, return status; } -tBleStatus hci_le_enhanced_receiver_test( uint8_t RX_Frequency, - uint8_t PHY, - uint8_t Modulation_Index ) +tBleStatus hci_le_receiver_test_v2( uint8_t RX_Frequency, + uint8_t PHY, + uint8_t Modulation_Index ) { struct hci_request rq; uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; - hci_le_enhanced_receiver_test_cp0 *cp0 = (hci_le_enhanced_receiver_test_cp0*)(cmd_buffer); + hci_le_receiver_test_v2_cp0 *cp0 = (hci_le_receiver_test_v2_cp0*)(cmd_buffer); tBleStatus status = 0; int index_input = 0; cp0->RX_Frequency = RX_Frequency; @@ -1485,14 +1484,14 @@ tBleStatus hci_le_enhanced_receiver_test( uint8_t RX_Frequency, return status; } -tBleStatus hci_le_enhanced_transmitter_test( uint8_t TX_Frequency, - uint8_t Length_Of_Test_Data, - uint8_t Packet_Payload, - uint8_t PHY ) +tBleStatus hci_le_transmitter_test_v2( uint8_t TX_Frequency, + uint8_t Length_Of_Test_Data, + uint8_t Packet_Payload, + uint8_t PHY ) { struct hci_request rq; uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; - hci_le_enhanced_transmitter_test_cp0 *cp0 = (hci_le_enhanced_transmitter_test_cp0*)(cmd_buffer); + hci_le_transmitter_test_v2_cp0 *cp0 = (hci_le_transmitter_test_v2_cp0*)(cmd_buffer); tBleStatus status = 0; int index_input = 0; cp0->TX_Frequency = TX_Frequency; @@ -1515,6 +1514,386 @@ tBleStatus hci_le_enhanced_transmitter_test( uint8_t TX_Frequency, return status; } +tBleStatus hci_le_set_advertising_set_random_address( uint8_t Advertising_Handle, + const uint8_t* Random_Address ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_set_advertising_set_random_address_cp0 *cp0 = (hci_le_set_advertising_set_random_address_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Random_Address, (const void*)Random_Address, 6 ); + index_input += 6; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x035; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_set_extended_advertising_parameters( uint8_t Advertising_Handle, + uint16_t Adv_Event_Properties, + const uint8_t* Primary_Adv_Interval_Min, + const uint8_t* Primary_Adv_Interval_Max, + uint8_t Primary_Adv_Channel_Map, + uint8_t Own_Address_Type, + uint8_t Peer_Address_Type, + const uint8_t* Peer_Address, + uint8_t Adv_Filter_Policy, + uint8_t Adv_TX_Power, + uint8_t Primary_Adv_PHY, + uint8_t Secondary_Adv_Max_Skip, + uint8_t Secondary_Adv_PHY, + uint8_t Adv_SID, + uint8_t Scan_Req_Notification_Enable, + uint8_t* Selected_TX_Power ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_set_extended_advertising_parameters_cp0 *cp0 = (hci_le_set_extended_advertising_parameters_cp0*)(cmd_buffer); + hci_le_set_extended_advertising_parameters_rp0 resp; + Osal_MemSet( &resp, 0, sizeof(resp) ); + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + cp0->Adv_Event_Properties = Adv_Event_Properties; + index_input += 2; + Osal_MemCpy( (void*)&cp0->Primary_Adv_Interval_Min, (const void*)Primary_Adv_Interval_Min, 3 ); + index_input += 3; + Osal_MemCpy( (void*)&cp0->Primary_Adv_Interval_Max, (const void*)Primary_Adv_Interval_Max, 3 ); + index_input += 3; + cp0->Primary_Adv_Channel_Map = Primary_Adv_Channel_Map; + index_input += 1; + cp0->Own_Address_Type = Own_Address_Type; + index_input += 1; + cp0->Peer_Address_Type = Peer_Address_Type; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Peer_Address, (const void*)Peer_Address, 6 ); + index_input += 6; + cp0->Adv_Filter_Policy = Adv_Filter_Policy; + index_input += 1; + cp0->Adv_TX_Power = Adv_TX_Power; + index_input += 1; + cp0->Primary_Adv_PHY = Primary_Adv_PHY; + index_input += 1; + cp0->Secondary_Adv_Max_Skip = Secondary_Adv_Max_Skip; + index_input += 1; + cp0->Secondary_Adv_PHY = Secondary_Adv_PHY; + index_input += 1; + cp0->Adv_SID = Adv_SID; + index_input += 1; + cp0->Scan_Req_Notification_Enable = Scan_Req_Notification_Enable; + index_input += 1; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x036; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &resp; + rq.rlen = sizeof(resp); + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + if ( resp.Status ) + return resp.Status; + *Selected_TX_Power = resp.Selected_TX_Power; + return BLE_STATUS_SUCCESS; +} + +tBleStatus hci_le_set_extended_advertising_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Advertising_Data_Length, + const uint8_t* Advertising_Data ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_set_extended_advertising_data_cp0 *cp0 = (hci_le_set_extended_advertising_data_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + cp0->Operation = Operation; + index_input += 1; + cp0->Fragment_Preference = Fragment_Preference; + index_input += 1; + cp0->Advertising_Data_Length = Advertising_Data_Length; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Advertising_Data, (const void*)Advertising_Data, Advertising_Data_Length ); + index_input += Advertising_Data_Length; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x037; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_set_extended_scan_response_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Scan_Response_Data_Length, + const uint8_t* Scan_Response_Data ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_set_extended_scan_response_data_cp0 *cp0 = (hci_le_set_extended_scan_response_data_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + cp0->Operation = Operation; + index_input += 1; + cp0->Fragment_Preference = Fragment_Preference; + index_input += 1; + cp0->Scan_Response_Data_Length = Scan_Response_Data_Length; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Scan_Response_Data, (const void*)Scan_Response_Data, Scan_Response_Data_Length ); + index_input += Scan_Response_Data_Length; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x038; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_set_extended_advertising_enable( uint8_t Enable, + uint8_t Num_Sets, + const Adv_Set_t* Adv_Set ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_set_extended_advertising_enable_cp0 *cp0 = (hci_le_set_extended_advertising_enable_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Enable = Enable; + index_input += 1; + cp0->Num_Sets = Num_Sets; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Adv_Set, (const void*)Adv_Set, Num_Sets * (sizeof(Adv_Set_t)) ); + index_input += Num_Sets * (sizeof(Adv_Set_t)); + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x039; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_read_maximum_advertising_data_length( uint16_t* Max_Advertising_Data_Length ) +{ + struct hci_request rq; + hci_le_read_maximum_advertising_data_length_rp0 resp; + Osal_MemSet( &resp, 0, sizeof(resp) ); + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x03a; + rq.rparam = &resp; + rq.rlen = sizeof(resp); + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + if ( resp.Status ) + return resp.Status; + *Max_Advertising_Data_Length = resp.Max_Advertising_Data_Length; + return BLE_STATUS_SUCCESS; +} + +tBleStatus hci_le_read_number_of_supported_advertising_sets( uint8_t* Num_Supported_Advertising_Sets ) +{ + struct hci_request rq; + hci_le_read_number_of_supported_advertising_sets_rp0 resp; + Osal_MemSet( &resp, 0, sizeof(resp) ); + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x03b; + rq.rparam = &resp; + rq.rlen = sizeof(resp); + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + if ( resp.Status ) + return resp.Status; + *Num_Supported_Advertising_Sets = resp.Num_Supported_Advertising_Sets; + return BLE_STATUS_SUCCESS; +} + +tBleStatus hci_le_remove_advertising_set( uint8_t Advertising_Handle ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_remove_advertising_set_cp0 *cp0 = (hci_le_remove_advertising_set_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Advertising_Handle = Advertising_Handle; + index_input += 1; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x03c; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_clear_advertising_sets( void ) +{ + struct hci_request rq; + tBleStatus status = 0; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x03d; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_set_extended_scan_parameters( uint8_t Own_Address_Type, + uint8_t Scanning_Filter_Policy, + uint8_t Scanning_PHYs, + uint8_t Scan_Type, + uint16_t Scan_Interval, + uint16_t Scan_Window ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_set_extended_scan_parameters_cp0 *cp0 = (hci_le_set_extended_scan_parameters_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Own_Address_Type = Own_Address_Type; + index_input += 1; + cp0->Scanning_Filter_Policy = Scanning_Filter_Policy; + index_input += 1; + cp0->Scanning_PHYs = Scanning_PHYs; + index_input += 1; + cp0->Scan_Type = Scan_Type; + index_input += 1; + cp0->Scan_Interval = Scan_Interval; + index_input += 2; + cp0->Scan_Window = Scan_Window; + index_input += 2; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x041; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_set_extended_scan_enable( uint8_t Enable, + uint8_t Filter_Duplicates, + uint16_t Duration, + uint16_t Period ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_set_extended_scan_enable_cp0 *cp0 = (hci_le_set_extended_scan_enable_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Enable = Enable; + index_input += 1; + cp0->Filter_Duplicates = Filter_Duplicates; + index_input += 1; + cp0->Duration = Duration; + index_input += 2; + cp0->Period = Period; + index_input += 2; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x042; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + +tBleStatus hci_le_extended_create_connection( uint8_t Initiator_Filter_Policy, + uint8_t Own_Address_Type, + uint8_t Peer_Address_Type, + const uint8_t* Peer_Address, + uint8_t Initiating_PHYs, + uint16_t Scan_Interval, + uint16_t Scan_Window, + uint16_t Conn_Interval_Min, + uint16_t Conn_Interval_Max, + uint16_t Conn_Latency, + uint16_t Supervision_Timeout, + uint16_t Min_CE_Length, + uint16_t Max_CE_Length ) +{ + struct hci_request rq; + uint8_t cmd_buffer[BLE_CMD_MAX_PARAM_LEN]; + hci_le_extended_create_connection_cp0 *cp0 = (hci_le_extended_create_connection_cp0*)(cmd_buffer); + tBleStatus status = 0; + int index_input = 0; + cp0->Initiator_Filter_Policy = Initiator_Filter_Policy; + index_input += 1; + cp0->Own_Address_Type = Own_Address_Type; + index_input += 1; + cp0->Peer_Address_Type = Peer_Address_Type; + index_input += 1; + Osal_MemCpy( (void*)&cp0->Peer_Address, (const void*)Peer_Address, 6 ); + index_input += 6; + cp0->Initiating_PHYs = Initiating_PHYs; + index_input += 1; + cp0->Scan_Interval = Scan_Interval; + index_input += 2; + cp0->Scan_Window = Scan_Window; + index_input += 2; + cp0->Conn_Interval_Min = Conn_Interval_Min; + index_input += 2; + cp0->Conn_Interval_Max = Conn_Interval_Max; + index_input += 2; + cp0->Conn_Latency = Conn_Latency; + index_input += 2; + cp0->Supervision_Timeout = Supervision_Timeout; + index_input += 2; + cp0->Min_CE_Length = Min_CE_Length; + index_input += 2; + cp0->Max_CE_Length = Max_CE_Length; + index_input += 2; + Osal_MemSet( &rq, 0, sizeof(rq) ); + rq.ogf = 0x08; + rq.ocf = 0x043; + rq.event = 0x0F; + rq.cparam = cmd_buffer; + rq.clen = index_input; + rq.rparam = &status; + rq.rlen = 1; + if ( hci_send_req(&rq, FALSE) < 0 ) + return BLE_STATUS_TIMEOUT; + return status; +} + tBleStatus hci_le_read_transmit_power( uint8_t* Min_TX_Power, uint8_t* Max_TX_Power ) { diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.h b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.h index c8072f4c0..c7b3a632e 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.h @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_hci_le.h * @author MCD * @brief STM32WB BLE API (hci_le) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_HCI_LE_H__ @@ -349,8 +348,8 @@ tBleStatus hci_read_bd_addr( uint8_t* BD_ADDR ); * @param Connection_Handle Connection handle for which the command applies. * Values: * - 0x0000 ... 0x0EFF - * @param[out] RSSI N Size: 1 Octet (signed integer) - * Units: dBm + * @param[out] RSSI RSSI (signed integer). + * Units: dBm. * Values: * - 127: RSSI not available * - -127 ... 20 @@ -495,14 +494,14 @@ tBleStatus hci_le_set_random_address( const uint8_t* Random_Address ); * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.5]. * * @param Advertising_Interval_Min Minimum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) * @param Advertising_Interval_Max Maximum advertising interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) - * @param Advertising_Type Advertising type + * @param Advertising_Type Advertising type. * Values: * - 0x00: ADV_IND (Connectable undirected advertising) * - 0x01: ADV_DIRECT_IND, high duty cycle (Connectable high duty cycle @@ -512,32 +511,25 @@ tBleStatus hci_le_set_random_address( const uint8_t* Random_Address ); * - 0x04: ADV_DIRECT_IND_LDC, low duty cycle (Connectable low duty * cycle directed advertising) * @param Own_Address_Type Own address type. - * - 0x00: Public Device Address - * - 0x01 Random Device Address - * - 0x02: Controller generates Resolvable Private Address based on the - * local IRK from resolving list. If resolving list contains no matching - * entry, use public address. - * - 0x03: Controller generates Resolvable Private Address based on the - * local IRK from resolving list. If resolving list contains no matching - * entry, use random address from LE_Set_Random_Address. - * Values: - * - 0x00: Public Device Address - * - 0x01: Random Device Address - * - 0x02: Resolvable Private Address or Public Address - * - 0x03: Resolvable Private Address or Random Address - * @param Peer_Address_Type The address type of the peer device. * Values: * - 0x00: Public Device Address * - 0x01: Random Device Address + * - 0x02: Resolvable Private Address if available, otherwise Public + * Address + * - 0x03: Resolvable Private Address if available, otherwise Random + * Address + * @param Peer_Address_Type Address type of the peer device. + * Values: + * - 0x00: Public Device Address or Public Identity Address + * - 0x01: Random Device Address or Random (static) Identity Address * @param Peer_Address Public Device Address, Random Device Address, Public - * Identity Address or Random (static) Identity Address of the device to - * be connected. + * Identity Address, or Random (static) Identity Address of the device + * to be connected. * @param Advertising_Channel_Map Advertising channel map. - * Default: 00000111b (all channels enabled). * Flags: - * - 0x01: ch 37 - * - 0x02: ch 38 - * - 0x04: ch 39 + * - 0x01: Channel 37 shall be used + * - 0x02: Channel 38 shall be used + * - 0x04: Channel 39 shall be used * @param Advertising_Filter_Policy Advertising filter policy. * Values: * - 0x00: Allow Scan Request from Any, Allow Connect Request from Any @@ -559,9 +551,10 @@ tBleStatus hci_le_set_advertising_parameters( uint16_t Advertising_Interval_Min, uint8_t Advertising_Filter_Policy ); /** - * @brief HCI_LE_READ_ADVERTISING_CHANNEL_TX_POWER - * The LE_Read_Advertising_Channel_Tx_Power command is used by the Host to read - * the transmit power level used for LE advertising channel packets. + * @brief HCI_LE_READ_ADVERTISING_PHYSICAL_CHANNEL_TX_POWER + * The LE_Read_Advertising_Physical_Channel_Tx_Power command is used by the + * Host to read the transmit power level used for LE advertising physical + * channel packets. * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.6]. * * @param[out] Transmit_Power_Level Size: 1 Octet (signed integer) @@ -571,7 +564,7 @@ tBleStatus hci_le_set_advertising_parameters( uint16_t Advertising_Interval_Min, * - -20 ... 10 * @return Value indicating success or error code. */ -tBleStatus hci_le_read_advertising_channel_tx_power( uint8_t* Transmit_Power_Level ); +tBleStatus hci_le_read_advertising_physical_channel_tx_power( uint8_t* Transmit_Power_Level ); /** * @brief HCI_LE_SET_ADVERTISING_DATA @@ -608,25 +601,25 @@ tBleStatus hci_le_set_scan_response_data( uint8_t Scan_Response_Data_Length, const uint8_t* Scan_Response_Data ); /** - * @brief HCI_LE_SET_ADVERTISE_ENABLE - * The LE_Set_Advertise_Enable command is used to request the Controller to + * @brief HCI_LE_SET_ADVERTISING_ENABLE + * The LE_Set_Advertising_Enable command is used to request the Controller to * start or stop advertising. The Controller manages the timing of * advertisements as per the advertising parameters given in the * LE_Set_Advertising_Parameters command. * The Controller shall continue advertising until the Host issues an - * LE_Set_Advertise_Enable command with Advertising_Enable set to 0x00 + * LE_Set_Advertising_Enable command with Advertising_Enable set to 0x00 * (Advertising is disabled) or until a connection is created or until the * Advertising is timed out due to high duty cycle Directed Advertising. In * these cases, advertising is then disabled. * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.9]. * - * @param Advertising_Enable Enable/disable advertise. Default is 0 (disabled). + * @param Advertising_Enable Enable/disable advertising. * Values: * - 0x00: Advertising is disabled * - 0x01: Advertising is enabled * @return Value indicating success or error code. */ -tBleStatus hci_le_set_advertise_enable( uint8_t Advertising_Enable ); +tBleStatus hci_le_set_advertising_enable( uint8_t Advertising_Enable ); /** * @brief HCI_LE_SET_SCAN_PARAMETERS @@ -644,36 +637,30 @@ tBleStatus hci_le_set_advertise_enable( uint8_t Advertising_Enable ); * Controller; if it is the Command Disallowed error code shall be used. * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.10]. * - * @param LE_Scan_Type Passive or active scanning. With active scanning - * SCAN_REQ packets are sent. + * @param LE_Scan_Type Passive or active scanning. With passive scanning, no + * scan request PDUs are sent. * Values: - * - 0x00: Passive Scanning + * - 0x00: Passive scanning * - 0x01: Active scanning * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param Own_Address_Type Own address type. - * - 0x00: Public Device Address - * - 0x01 Random Device Address - * - 0x02: Controller generates Resolvable Private Address based on the - * local IRK from resolving list. If resolving list contains no matching - * entry, use public address. - * - 0x03: Controller generates Resolvable Private Address based on the - * local IRK from resolving list. If resolving list contains no matching - * entry, use random address from LE_Set_Random_Address. * Values: * - 0x00: Public Device Address * - 0x01: Random Device Address - * - 0x02: Resolvable Private Address or Public Address - * - 0x03: Resolvable Private Address or Random Address + * - 0x02: Resolvable Private Address if available, otherwise Public + * Address + * - 0x03: Resolvable Private Address if available, otherwise Random + * Address * @param Scanning_Filter_Policy 0x00 Accept all advertisement packets. * Directed advertising packets which are not addressed for this device * shall be ignored. @@ -709,7 +696,7 @@ tBleStatus hci_le_set_scan_parameters( uint8_t LE_Scan_Type, * generate advertising reports for each packet received. * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.11]. * - * @param LE_Scan_Enable Enable/disable scan. Default is 0 (disabled). + * @param LE_Scan_Enable Enable/disable scan. * Values: * - 0x00: Scanning disabled * - 0x01: Scanning enabled @@ -759,22 +746,18 @@ tBleStatus hci_le_set_scan_enable( uint8_t LE_Scan_Enable, * @param LE_Scan_Interval This is defined as the time interval from when the * Controller started its last LE scan until it begins the subsequent LE * scan. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) * @param LE_Scan_Window Amount of time for the duration of the LE scan. * LE_Scan_Window shall be less than or equal to LE_Scan_Interval. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms) - * @param Initiator_Filter_Policy 0x00 White list is not used to determine - * which advertiser to connect to. - * Peer_Address_Type and Peer_Address shall be used. - * 0x01 White list is used to determine which advertiser to connect to. - * Peer_Address_Type and Peer_Address shall be ignored. - * Values: - * - 0x00: White list not used - * - 0x01: White list used + * @param Initiator_Filter_Policy Initiator filter policy. + * Values: + * - 0x00: White list is not used + * - 0x01: White list is used * @param Peer_Address_Type Address type * 0x00 Public Device Address * 0x01 Random Device Address @@ -790,27 +773,21 @@ tBleStatus hci_le_set_scan_enable( uint8_t LE_Scan_Enable, * @param Peer_Address Public Device Address or Random Device Address of the * device to be connected. * @param Own_Address_Type Own address type. - * - 0x00: Public Device Address - * - 0x01 Random Device Address - * - 0x02: Controller generates Resolvable Private Address based on the - * local IRK from resolving list. If resolving list contains no matching - * entry, use public address. - * - 0x03: Controller generates Resolvable Private Address based on the - * local IRK from resolving list. If resolving list contains no matching - * entry, use random address from LE_Set_Random_Address. * Values: * - 0x00: Public Device Address * - 0x01: Random Device Address - * - 0x02: Resolvable Private Address or Public Address - * - 0x03: Resolvable Private Address or Random Address + * - 0x02: Resolvable Private Address if available, otherwise Public + * Address + * - 0x03: Resolvable Private Address if available, otherwise Random + * Address * @param Conn_Interval_Min Minimum value for the connection event interval. * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Interval_Max Maximum value for the connection event interval. * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -820,17 +797,17 @@ tBleStatus hci_le_set_scan_enable( uint8_t LE_Scan_Enable, * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @param Minimum_CE_Length Information parameter about the minimum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Maximum_CE_Length Information parameter about the maximum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @return Value indicating success or error code. @@ -959,12 +936,12 @@ tBleStatus hci_le_remove_device_from_white_list( uint8_t Address_Type, * - 0x0000 ... 0x0EFF * @param Conn_Interval_Min Minimum value for the connection event interval. * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Interval_Max Maximum value for the connection event interval. * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Latency Slave latency for the connection in number of connection @@ -974,17 +951,17 @@ tBleStatus hci_le_remove_device_from_white_list( uint8_t Address_Type, * @param Supervision_Timeout Supervision timeout for the LE Link. * It shall be a multiple of 10 ms and larger than (1 + * connSlaveLatency) * connInterval * 2. - * Time = N * 10 msec. + * Time = N * 10 ms. * Values: * - 0x000A (100 ms) ... 0x0C80 (32000 ms) * @param Minimum_CE_Length Information parameter about the minimum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Maximum_CE_Length Information parameter about the maximum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @return Value indicating success or error code. @@ -1093,11 +1070,11 @@ tBleStatus hci_le_encrypt( const uint8_t* Key, tBleStatus hci_le_rand( uint8_t* Random_Number ); /** - * @brief HCI_LE_START_ENCRYPTION - * The LE_Start_Encryption command is used to authenticate the given encryption - * key associated with the remote device specified by the connection handle, - * and once authenticated will encrypt the connection. The parameters are as - * defined in [Vol 3] Part H, Section 2.4.4. + * @brief HCI_LE_ENABLE_ENCRYPTION + * The LE_Enable_Encryption command is used to authenticate the given + * encryption key associated with the remote device specified by the connection + * handle, and once authenticated will encrypt the connection. The parameters + * are as defined in [Vol 3] Part H, Section 2.4.4. * If the connection is already encrypted then the Controller shall pause * connection encryption before attempting to authenticate the given encryption * key, and then re-encrypt the connection. While encryption is paused no user @@ -1116,10 +1093,10 @@ tBleStatus hci_le_rand( uint8_t* Random_Number ); * @param Long_Term_Key 128 bit long term key. * @return Value indicating success or error code. */ -tBleStatus hci_le_start_encryption( uint16_t Connection_Handle, - const uint8_t* Random_Number, - uint16_t Encrypted_Diversifier, - const uint8_t* Long_Term_Key ); +tBleStatus hci_le_enable_encryption( uint16_t Connection_Handle, + const uint8_t* Random_Number, + uint16_t Encrypted_Diversifier, + const uint8_t* Long_Term_Key ); /** * @brief HCI_LE_LONG_TERM_KEY_REQUEST_REPLY @@ -1139,7 +1116,7 @@ tBleStatus hci_le_long_term_key_request_reply( uint16_t Connection_Handle, const uint8_t* Long_Term_Key ); /** - * @brief HCI_LE_LONG_TERM_KEY_REQUESTED_NEGATIVE_REPLY + * @brief HCI_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY * The LE_Long_Term_Key_Request_Negative_Reply command is used to reply to an * LE Long Term Key Request event from the Controller if the Host cannot * provide a Long Term Key for this Connection_Handle. @@ -1150,7 +1127,7 @@ tBleStatus hci_le_long_term_key_request_reply( uint16_t Connection_Handle, * - 0x0000 ... 0x0EFF * @return Value indicating success or error code. */ -tBleStatus hci_le_long_term_key_requested_negative_reply( uint16_t Connection_Handle ); +tBleStatus hci_le_long_term_key_request_negative_reply( uint16_t Connection_Handle ); /** * @brief HCI_LE_READ_SUPPORTED_STATES @@ -1563,14 +1540,14 @@ tBleStatus hci_le_read_maximum_data_length( uint16_t* supportedMaxTxOctets, * Values: * - 0x01: The transmitter PHY for the connection is LE 1M * - 0x02: The transmitter PHY for the connection is LE 2M - * - 0x03: The transmitter PHY for the connection is LE Coded - * (Not supported by STM32WB) + * - 0x03: The transmitter PHY for the connection is LE Coded (not + * supported) * @param[out] RX_PHY Receiver PHY in use * Values: * - 0x01: The receiver PHY for the connection is LE 1M * - 0x02: The receiver PHY for the connection is LE 2M - * - 0x03: The receiver PHY for the connection is LE Coded - * (Not supported by STM32WB) + * - 0x03: The receiver PHY for the connection is LE Coded (not + * supported) * @return Value indicating success or error code. */ tBleStatus hci_le_read_phy( uint16_t Connection_Handle, @@ -1667,7 +1644,7 @@ tBleStatus hci_le_set_phy( uint16_t Connection_Handle, uint16_t PHY_options ); /** - * @brief HCI_LE_ENHANCED_RECEIVER_TEST + * @brief HCI_LE_RECEIVER_TEST_V2 * This command is used to start a test where the DUT receives test reference * packets at a fixed interval. The tester generates the test reference * packets. @@ -1690,19 +1667,18 @@ tBleStatus hci_le_set_phy( uint16_t Connection_Handle, * - 0x01: Assume transmitter will have a stable modulation index * @return Value indicating success or error code. */ -tBleStatus hci_le_enhanced_receiver_test( uint8_t RX_Frequency, - uint8_t PHY, - uint8_t Modulation_Index ); +tBleStatus hci_le_receiver_test_v2( uint8_t RX_Frequency, + uint8_t PHY, + uint8_t Modulation_Index ); /** - * @brief HCI_LE_ENHANCED_TRANSMITTER_TEST + * @brief HCI_LE_TRANSMITTER_TEST_V2 * This command is used to start a test where the DUT generates test reference * packets at a fixed interval. The Controller shall transmit at maximum power. - * An LE Controller supporting the LE_Enhanced Transmitter_Test command shall - * support Packet_Payload values 0x00, 0x01 and 0x02. An LE Controller - * supporting the LE Coded PHY shall also support Packet_Payload value 0x04 - * (not supported by STM32WB). An LE Controller may support other values of - * Packet_Payload. + * An LE Controller supporting this command shall support Packet_Payload values + * 0x00, 0x01 and 0x02. An LE Controller supporting the LE Coded PHY shall also + * support Packet_Payload value 0x04 (not supported by STM32WB). An LE + * Controller may support other values of Packet_Payload. * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.51]. * * @param TX_Frequency N = (F - 2402) / 2 @@ -1731,10 +1707,446 @@ tBleStatus hci_le_enhanced_receiver_test( uint8_t RX_Frequency, * - 0x04: Transmitter set to use the LE Coded PHY with S=2 data coding * @return Value indicating success or error code. */ -tBleStatus hci_le_enhanced_transmitter_test( uint8_t TX_Frequency, - uint8_t Length_Of_Test_Data, - uint8_t Packet_Payload, - uint8_t PHY ); +tBleStatus hci_le_transmitter_test_v2( uint8_t TX_Frequency, + uint8_t Length_Of_Test_Data, + uint8_t Packet_Payload, + uint8_t PHY ); + +/** + * @brief HCI_LE_SET_ADVERTISING_SET_RANDOM_ADDRESS + * This command is used by the Host to set the random device address specified + * by the Random_Address parameter. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.52]. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Random_Address Random Device Address. + * @return Value indicating success or error code. + */ +tBleStatus hci_le_set_advertising_set_random_address( uint8_t Advertising_Handle, + const uint8_t* Random_Address ); + +/** + * @brief HCI_LE_SET_EXTENDED_ADVERTISING_PARAMETERS + * This command is used by the Host to set the extended advertising parameters. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.53]. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Adv_Event_Properties Type of advertising event. + * Flags: + * - 0x0001: Connectable advertising + * - 0x0002: Scannable advertising + * - 0x0004: Directed advertising + * - 0x0008: High Duty Cycle Directed Connectable advertising + * - 0x0010: Use legacy advertising PDUs + * - 0x0020: Anonymous advertising + * - 0x0040: Include TxPower in at least one advertising PDU + * @param Primary_Adv_Interval_Min Minimum advertising interval. + * Time = N * 0.625 ms. + * Values: + * - 0x000020 (20.000 ms) ... 0xFFFFFF (10485759.375 ms) + * @param Primary_Adv_Interval_Max Maximum advertising interval. + * Time = N * 0.625 ms. + * Values: + * - 0x000020 (20.000 ms) ... 0xFFFFFF (10485759.375 ms) + * @param Primary_Adv_Channel_Map Advertising channel map. + * Flags: + * - 0x01: Channel 37 shall be used + * - 0x02: Channel 38 shall be used + * - 0x04: Channel 39 shall be used + * @param Own_Address_Type Own address type. + * Values: + * - 0x00: Public Device Address + * - 0x01: Random Device Address + * - 0x02: Resolvable Private Address if available, otherwise Public + * Address + * - 0x03: Resolvable Private Address if available, otherwise Random + * Address + * @param Peer_Address_Type Address type of the peer device. + * Values: + * - 0x00: Public Device Address or Public Identity Address + * - 0x01: Random Device Address or Random (static) Identity Address + * @param Peer_Address Public Device Address, Random Device Address, Public + * Identity Address, or Random (static) Identity Address of the device + * to be connected. + * @param Adv_Filter_Policy Advertising filter policy + * Values: + * - 0x00: Process scan and connection requests from all devices (i.e., + * the White List is not in use) + * - 0x01: Process connection requests from all devices and scan + * requests only from devices that are in the White List. + * - 0x02: Process scan requests from all devices and connection + * requests only from devices that are in the White List. + * - 0x03: Process scan and connection requests only from devices in the + * White List. + * @param Adv_TX_Power Advertising TX power. Units: dBm. + * Values: + * - -127 ... 20 + * @param Primary_Adv_PHY Primary advertising PHY. + * Values: + * - 0x01: Primary advertisement PHY is LE 1M + * - 0x03: Primary advertisement PHY is LE Coded (not supported) + * @param Secondary_Adv_Max_Skip Secondary advertising maximum skip. + * Values: + * - 0x00: AUX_ADV_IND shall be sent prior to the next advertising event + * - 0x01 ... 0xFF: Maximum advertising events the Controller can skip + * before sending the AUX_ADV_IND packets on the secondary advertising + * physical channel + * @param Secondary_Adv_PHY Secondary advertising PHY. + * Values: + * - 0x01: Secondary advertisement PHY is LE 1M + * - 0x02: Secondary advertisement PHY is LE 2M + * - 0x03: Secondary advertisement PHY is LE Coded (not supported) + * @param Adv_SID Value of the Advertising SID subfield in the ADI field of the + * PDU. + * Values: + * - 0x00 ... 0x0F + * @param Scan_Req_Notification_Enable Scan request notifications. + * Values: + * - 0x00: Scan request notifications disabled + * - 0x01: Scan request notifications enabled + * @param[out] Selected_TX_Power Power level selected by the Controller. Units: + * dBm. + * Values: + * - -127 ... 20 + * @return Value indicating success or error code. + */ +tBleStatus hci_le_set_extended_advertising_parameters( uint8_t Advertising_Handle, + uint16_t Adv_Event_Properties, + const uint8_t* Primary_Adv_Interval_Min, + const uint8_t* Primary_Adv_Interval_Max, + uint8_t Primary_Adv_Channel_Map, + uint8_t Own_Address_Type, + uint8_t Peer_Address_Type, + const uint8_t* Peer_Address, + uint8_t Adv_Filter_Policy, + uint8_t Adv_TX_Power, + uint8_t Primary_Adv_PHY, + uint8_t Secondary_Adv_Max_Skip, + uint8_t Secondary_Adv_PHY, + uint8_t Adv_SID, + uint8_t Scan_Req_Notification_Enable, + uint8_t* Selected_TX_Power ); + +/** + * @brief HCI_LE_SET_EXTENDED_ADVERTISING_DATA + * This command is used to set the data used in extended advertising PDUs that + * have a data field. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.54]. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Operation Advertising operation. + * Values: + * - 0x00: Intermediate fragment of fragmented extended advertising data + * - 0x01: First fragment of fragmented extended advertising data + * - 0x02: Last fragment of fragmented extended advertising data + * - 0x03: Complete extended advertising data + * - 0x04: Unchanged data (just update the Advertising DID) + * @param Fragment_Preference Fragment preference. + * Values: + * - 0x00: The Controller may fragment all data + * - 0x01: The Controller should not fragment or should minimize + * fragmentation of data + * @param Advertising_Data_Length Length of Advertising_Data in octets + * @param Advertising_Data Data formatted as defined in Bluetooth spec. v.5.2 + * [Vol 3, Part C, 11]. + * @return Value indicating success or error code. + */ +tBleStatus hci_le_set_extended_advertising_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Advertising_Data_Length, + const uint8_t* Advertising_Data ); + +/** + * @brief HCI_LE_SET_EXTENDED_SCAN_RESPONSE_DATA + * This command is used to provide scan response data used in scanning response + * PDUs during extended advertising. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.55]. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @param Operation Scan response operation. + * Values: + * - 0x00: Intermediate fragment of fragmented scan response data + * - 0x01: First fragment of fragmented scan response data + * - 0x02: Last fragment of fragmented scan response data + * - 0x03: Complete scan response data + * @param Fragment_Preference Fragment preference. + * Values: + * - 0x00: The Controller may fragment all data + * - 0x01: The Controller should not fragment or should minimize + * fragmentation of data + * @param Scan_Response_Data_Length Length of Scan_Response_Data in octets + * @param Scan_Response_Data Data formatted as defined in Bluetooth spec. v.5.2 + * [Vol 3, Part C, 11]. + * @return Value indicating success or error code. + */ +tBleStatus hci_le_set_extended_scan_response_data( uint8_t Advertising_Handle, + uint8_t Operation, + uint8_t Fragment_Preference, + uint8_t Scan_Response_Data_Length, + const uint8_t* Scan_Response_Data ); + +/** + * @brief HCI_LE_SET_EXTENDED_ADVERTISING_ENABLE + * This command is used to request the Controller to enable or disable one or + * more advertising sets using the advertising sets identified by the + * Advertising_Handle[i] parameter. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.56]. + * + * @param Enable Enable/disable advertising. + * Values: + * - 0x00: Advertising is disabled + * - 0x01: Advertising is enabled + * @param Num_Sets Number of advertising sets. + * Values: + * - 0x00: Disable all advertising sets + * - 0x01 ... 0x3F: Number of advertising sets to enable or disable + * @param Adv_Set See @ref Adv_Set_t + * @return Value indicating success or error code. + */ +tBleStatus hci_le_set_extended_advertising_enable( uint8_t Enable, + uint8_t Num_Sets, + const Adv_Set_t* Adv_Set ); + +/** + * @brief HCI_LE_READ_MAXIMUM_ADVERTISING_DATA_LENGTH + * This command is used to read the maximum length of data supported by the + * Controller for use as advertisement data or scan response data in an + * extended advertising event. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.57]. + * + * @param[out] Max_Advertising_Data_Length Maximum supported advertising data + * length. + * Values: + * - 0x001F ... 0x0672 + * @return Value indicating success or error code. + */ +tBleStatus hci_le_read_maximum_advertising_data_length( uint16_t* Max_Advertising_Data_Length ); + +/** + * @brief HCI_LE_READ_NUMBER_OF_SUPPORTED_ADVERTISING_SETS + * This command is used to read the maximum number of advertising sets + * supported by the Controller at the same time during extended advertising. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.58]. + * + * @param[out] Num_Supported_Advertising_Sets Number of advertising sets + * supported at the same time. + * Values: + * - 0x01 ... 0xF0 + * @return Value indicating success or error code. + */ +tBleStatus hci_le_read_number_of_supported_advertising_sets( uint8_t* Num_Supported_Advertising_Sets ); + +/** + * @brief HCI_LE_REMOVE_ADVERTISING_SET + * This command is used to remove an advertising set from the Controller. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.59]. + * + * @param Advertising_Handle Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + * @return Value indicating success or error code. + */ +tBleStatus hci_le_remove_advertising_set( uint8_t Advertising_Handle ); + +/** + * @brief HCI_LE_CLEAR_ADVERTISING_SETS + * This command is used to remove all existing advertising sets from the + * Controller. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.60]. + * + * @return Value indicating success or error code. + */ +tBleStatus hci_le_clear_advertising_sets( void ); + +/** + * @brief HCI_LE_SET_EXTENDED_SCAN_PARAMETERS + * This command is used to set the extended scan parameters to be used on the + * advertising physical channels. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.64]. + * + * @param Own_Address_Type Own address type. + * Values: + * - 0x00: Public Device Address + * - 0x01: Random Device Address + * - 0x02: Resolvable Private Address if available, otherwise Public + * Address + * - 0x03: Resolvable Private Address if available, otherwise Random + * Address + * @param Scanning_Filter_Policy Scan filter policy. + * Values: + * - 0x00: Accept all advertising and scan response PDUs except directed + * advertising PDUs not addressed to this device + * - 0x01: Accept only advertising and scan response PDUs from devices + * where the advertiser's address is in the White List. Directed + * advertising PDUs which are not addressed to this device shall be + * ignored. + * - 0x02: Accept all advertising and scan response PDUs except directed + * advertising PDUs where the identity address corresponding to + * TargetA does not address this device. + * - 0x03: Accept all advertising and scan response PDUs except + * advertising and scan response PDUs where the advertiser's identity + * address is not in the White List; and directed advertising PDUs + * where the identity address corresponding to TargetA does not + * address this device. + * @param Scanning_PHYs Scan PHYs. + * Flags: + * - 0x01: Scan advertisements on the LE 1M PHY + * - 0x04: Scan advertisements on the LE Coded PHY (not supported) + * @param Scan_Type Passive or active scanning. With passive scanning, no scan + * request PDUs are sent. + * Values: + * - 0x00: Passive scanning + * - 0x01: Active scanning + * @param Scan_Interval Time interval from when the Controller started its last + * scan until it begins the subsequent scan on the primary advertising + * physical channel. + * Time = N * 0.625 ms. + * Values: + * - 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms) + * @param Scan_Window Duration of the scan on the primary advertising physical + * channel. + * Time = N * 0.625 ms. + * Values: + * - 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms) + * @return Value indicating success or error code. + */ +tBleStatus hci_le_set_extended_scan_parameters( uint8_t Own_Address_Type, + uint8_t Scanning_Filter_Policy, + uint8_t Scanning_PHYs, + uint8_t Scan_Type, + uint16_t Scan_Interval, + uint16_t Scan_Window ); + +/** + * @brief HCI_LE_SET_EXTENDED_SCAN_ENABLE + * This command is used to enable or disable extended scanning. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.65]. + * + * @param Enable Enable/disable scan. + * Values: + * - 0x00: Scanning disabled + * - 0x01: Scanning enabled + * @param Filter_Duplicates Duplicate filtering. + * Values: + * - 0x00: Duplicate filtering disabled + * - 0x01: Duplicate filtering enabled + * - 0x02: Duplicate filtering enabled, reset for each scan period + * @param Duration Scan duration. + * Time = N * 10 ms. + * Values: + * - 0x0000 (0 ms) : Scan continuously until explicitly disable + * - 0x0001 (10 ms) ... 0xFFFF (655350 ms) : Scan duration + * @param Period Scan period. + * Time = N * 1.28 s. + * Values: + * - 0x0000 (0 ms) : Scan continuously + * - 0x0001 (1280 ms) ... 0xFFFF (83884800 ms) : Time interval from + * when the Controller started its last Scan_Duration until it begins + * the subsequent Scan_Duration + * @return Value indicating success or error code. + */ +tBleStatus hci_le_set_extended_scan_enable( uint8_t Enable, + uint8_t Filter_Duplicates, + uint16_t Duration, + uint16_t Period ); + +/** + * @brief HCI_LE_EXTENDED_CREATE_CONNECTION + * This command is used to create an ACL connection to a connectable advertiser + * by means of extended scanning. + * See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.66]. + * + * @param Initiator_Filter_Policy Initiator filter policy. + * Values: + * - 0x00: White list is not used + * - 0x01: White list is used + * @param Own_Address_Type Own address type. + * Values: + * - 0x00: Public Device Address + * - 0x01: Random Device Address + * - 0x02: Resolvable Private Address if available, otherwise Public + * Address + * - 0x03: Resolvable Private Address if available, otherwise Random + * Address + * @param Peer_Address_Type Address type of the peer device. + * Values: + * - 0x00: Public Device Address or Public Identity Address + * - 0x01: Random Device Address or Random (static) Identity Address + * @param Peer_Address Public Device Address, Random Device Address, Public + * Identity Address, or Random (static) Identity Address of the device + * to be connected. + * @param Initiating_PHYs Initiating PHYs. + * Values: + * - 0: Scan connectable advertisements on the LE 1M PHY- Connection + * parameters for the LE 1M PHY + * - 1: Connection parameters for the LE 2M PHY + * - 2: Scan connectable advertisements on the LE Coded PHY (not + * supported) + * @param Scan_Interval Time interval from when the Controller started its last + * scan until it begins the subsequent scan on the primary advertising + * physical channel. + * Time = N * 0.625 ms. + * Values: + * - 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms) + * @param Scan_Window Duration of the scan on the primary advertising physical + * channel. + * Time = N * 0.625 ms. + * Values: + * - 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms) + * @param Conn_Interval_Min Minimum value for the connection event interval. + * This shall be less than or equal to Conn_Interval_Max. + * Time = N * 1.25 ms. + * Values: + * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) + * @param Conn_Interval_Max Maximum value for the connection event interval. + * This shall be greater than or equal to Conn_Interval_Min. + * Time = N * 1.25 ms. + * Values: + * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) + * @param Conn_Latency Slave latency for the connection in number of connection + * events. + * Values: + * - 0x0000 ... 0x01F3 + * @param Supervision_Timeout Supervision timeout for the LE Link. + * It shall be a multiple of 10 ms and larger than (1 + + * connSlaveLatency) * connInterval * 2. + * Time = N * 10 ms. + * Values: + * - 0x000A (100 ms) ... 0x0C80 (32000 ms) + * @param Min_CE_Length Information parameter about the minimum length of + * connection needed for this LE connection. + * Time = N * 0.625 ms. + * Values: + * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) + * @param Max_CE_Length Information parameter about the maximum length of + * connection needed for this LE connection. + * Time = N * 0.625 ms. + * Values: + * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) + * @return Value indicating success or error code. + */ +tBleStatus hci_le_extended_create_connection( uint8_t Initiator_Filter_Policy, + uint8_t Own_Address_Type, + uint8_t Peer_Address_Type, + const uint8_t* Peer_Address, + uint8_t Initiating_PHYs, + uint16_t Scan_Interval, + uint16_t Scan_Window, + uint16_t Conn_Interval_Min, + uint16_t Conn_Interval_Max, + uint16_t Conn_Latency, + uint16_t Supervision_Timeout, + uint16_t Min_CE_Length, + uint16_t Max_CE_Length ); /** * @brief HCI_LE_READ_TRANSMIT_POWER diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c index c7bf367d5..b41b1fbb8 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_l2cap_aci.c * @author MCD * @brief STM32WB BLE API (l2cap_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #include "ble_l2cap_aci.h" diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.h b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.h index d37148bad..bb84e6b95 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.h @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_l2cap_aci.h * @author MCD * @brief STM32WB BLE API (l2cap_aci) * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_L2CAP_ACI_H__ @@ -35,12 +34,12 @@ * - 0x0000 ... 0x0EFF * @param Conn_Interval_Min Minimum value for the connection event interval. * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Interval_Max Maximum value for the connection event interval. * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Slave_latency Slave latency for the connection in number of @@ -69,12 +68,12 @@ tBleStatus aci_l2cap_connection_parameter_update_req( uint16_t Connection_Handle * - 0x0000 ... 0x0EFF * @param Conn_Interval_Min Minimum value for the connection event interval. * This shall be less than or equal to Conn_Interval_Max. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Conn_Interval_Max Maximum value for the connection event interval. * This shall be greater than or equal to Conn_Interval_Min. - * Time = N * 1.25 msec. + * Time = N * 1.25 ms. * Values: * - 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms) * @param Slave_latency Slave latency for the connection in number of @@ -85,12 +84,12 @@ tBleStatus aci_l2cap_connection_parameter_update_req( uint16_t Connection_Handle * following manner: Timeout Multiplier * 10ms. * @param Minimum_CE_Length Information parameter about the minimum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Maximum_CE_Length Information parameter about the maximum length of * connection needed for this LE connection. - * Time = N * 0.625 msec. + * Time = N * 0.625 ms. * Values: * - 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms) * @param Identifier Identifier received in ACI_L2CAP_Connection_Update_Req diff --git a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_types.h b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_types.h index 3e22df303..152706656 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_types.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_types.h @@ -1,20 +1,19 @@ -/****************************************************************************** +/***************************************************************************** * @file ble_types.h * @author MCD * @brief STM32WB BLE command/event types * Auto-generated file: do not edit! - ****************************************************************************** + ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_TYPES_H__ @@ -47,6 +46,34 @@ typedef PACKED(struct) uint16_t Host_Num_Of_Completed_Packets; } Host_Nb_Of_Completed_Pkt_Pair_t; +/* Definition of Adv_Set_t */ +typedef PACKED(struct) +{ + /** + * Used to identify an advertising set. + * Values: + * - 0x00 ... 0xEF + */ + uint8_t Advertising_Handle; + /** + * Duration of advertising set. + * Time = N * 10 ms. + * Values: + * - 0x0000 (0 ms) : No advertising duration. + * - 0x0001 (10 ms) ... 0xFFFF (655350 ms) : Advertising duration + */ + uint16_t Duration; + /** + * Maximum number of advertising events. + * Values: + * - 0x00: No maximum number of advertising events + * - 0x01 ... 0xFF: Maximum number of extended advertising events the + * Controller shall attempt to send prior to terminating the extended + * advertising + */ + uint8_t Max_Extended_Advertising_Events; +} Adv_Set_t; + /* Definition of Whitelist_Entry_t */ typedef PACKED(struct) { @@ -95,6 +122,22 @@ typedef PACKED(struct) uint8_t Peer_Identity_Address[6]; } Whitelist_Identity_Entry_t; +/* Definition of List_Entry_t */ +typedef PACKED(struct) +{ + /** + * Address type. + * Values: + * - 0x00: Public Device Address + * - 0x01: Random Device Address + */ + uint8_t Address_Type; + /** + * Public Device Address or Random Device Address. + */ + uint8_t Address[6]; +} List_Entry_t; + /* Definition of Service_UUID_t */ typedef PACKED(union) { @@ -222,19 +265,19 @@ typedef PACKED(struct) */ uint8_t Address[6]; /** - * Length of the Data[i] field for each device which responded. + * Length of the Data field for each device which responded. * Values: * - 0 ... 31 */ uint8_t Length_Data; /** - * Length_Data[i] octets of advertising or scan response data formatted - * as defined in [Vol 3] Part C, Section 8. + * Octets of advertising or scan response data formatted as defined in + * Bluetooth spec. v.5.2 [Vol 3, Part C, 11]. */ const uint8_t* Data; /** - * N Size: 1 Octet (signed integer) - * Units: dBm + * RSSI (signed integer). + * Units: dBm. * Values: * - 127: RSSI not available * - -127 ... 20 @@ -281,8 +324,8 @@ typedef PACKED(struct) */ uint8_t Direct_Address[6]; /** - * N Size: 1 Octet (signed integer) - * Units: dBm + * RSSI (signed integer). + * Units: dBm. * Values: * - 127: RSSI not available * - -127 ... 20 @@ -488,7 +531,7 @@ typedef PACKED(struct) { uint8_t Status; uint8_t Transmit_Power_Level; -} hci_le_read_advertising_channel_tx_power_rp0; +} hci_le_read_advertising_physical_channel_tx_power_rp0; typedef PACKED(struct) { @@ -515,12 +558,12 @@ typedef PACKED(struct) typedef PACKED(struct) { uint8_t Advertising_Enable; -} hci_le_set_advertise_enable_cp0; +} hci_le_set_advertising_enable_cp0; typedef PACKED(struct) { uint8_t Status; -} hci_le_set_advertise_enable_rp0; +} hci_le_set_advertising_enable_rp0; typedef PACKED(struct) { @@ -678,12 +721,12 @@ typedef PACKED(struct) uint8_t Random_Number[8]; uint16_t Encrypted_Diversifier; uint8_t Long_Term_Key[16]; -} hci_le_start_encryption_cp0; +} hci_le_enable_encryption_cp0; typedef PACKED(struct) { uint8_t Status; -} hci_le_start_encryption_rp0; +} hci_le_enable_encryption_rp0; typedef PACKED(struct) { @@ -700,13 +743,13 @@ typedef PACKED(struct) typedef PACKED(struct) { uint16_t Connection_Handle; -} hci_le_long_term_key_requested_negative_reply_cp0; +} hci_le_long_term_key_request_negative_reply_cp0; typedef PACKED(struct) { uint8_t Status; uint16_t Connection_Handle; -} hci_le_long_term_key_requested_negative_reply_rp0; +} hci_le_long_term_key_request_negative_reply_rp0; typedef PACKED(struct) { @@ -920,12 +963,12 @@ typedef PACKED(struct) uint8_t RX_Frequency; uint8_t PHY; uint8_t Modulation_Index; -} hci_le_enhanced_receiver_test_cp0; +} hci_le_receiver_test_v2_cp0; typedef PACKED(struct) { uint8_t Status; -} hci_le_enhanced_receiver_test_rp0; +} hci_le_receiver_test_v2_rp0; typedef PACKED(struct) { @@ -933,12 +976,165 @@ typedef PACKED(struct) uint8_t Length_Of_Test_Data; uint8_t Packet_Payload; uint8_t PHY; -} hci_le_enhanced_transmitter_test_cp0; +} hci_le_transmitter_test_v2_cp0; typedef PACKED(struct) { uint8_t Status; -} hci_le_enhanced_transmitter_test_rp0; +} hci_le_transmitter_test_v2_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; + uint8_t Random_Address[6]; +} hci_le_set_advertising_set_random_address_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_set_advertising_set_random_address_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; + uint16_t Adv_Event_Properties; + uint8_t Primary_Adv_Interval_Min[3]; + uint8_t Primary_Adv_Interval_Max[3]; + uint8_t Primary_Adv_Channel_Map; + uint8_t Own_Address_Type; + uint8_t Peer_Address_Type; + uint8_t Peer_Address[6]; + uint8_t Adv_Filter_Policy; + uint8_t Adv_TX_Power; + uint8_t Primary_Adv_PHY; + uint8_t Secondary_Adv_Max_Skip; + uint8_t Secondary_Adv_PHY; + uint8_t Adv_SID; + uint8_t Scan_Req_Notification_Enable; +} hci_le_set_extended_advertising_parameters_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; + uint8_t Selected_TX_Power; +} hci_le_set_extended_advertising_parameters_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; + uint8_t Operation; + uint8_t Fragment_Preference; + uint8_t Advertising_Data_Length; + uint8_t Advertising_Data[BLE_CMD_MAX_PARAM_LEN - 4]; +} hci_le_set_extended_advertising_data_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_set_extended_advertising_data_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; + uint8_t Operation; + uint8_t Fragment_Preference; + uint8_t Scan_Response_Data_Length; + uint8_t Scan_Response_Data[BLE_CMD_MAX_PARAM_LEN - 4]; +} hci_le_set_extended_scan_response_data_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_set_extended_scan_response_data_rp0; + +typedef PACKED(struct) +{ + uint8_t Enable; + uint8_t Num_Sets; + Adv_Set_t Adv_Set[(BLE_CMD_MAX_PARAM_LEN - 2)/sizeof(Adv_Set_t)]; +} hci_le_set_extended_advertising_enable_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_set_extended_advertising_enable_rp0; + +typedef PACKED(struct) +{ + uint8_t Status; + uint16_t Max_Advertising_Data_Length; +} hci_le_read_maximum_advertising_data_length_rp0; + +typedef PACKED(struct) +{ + uint8_t Status; + uint8_t Num_Supported_Advertising_Sets; +} hci_le_read_number_of_supported_advertising_sets_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; +} hci_le_remove_advertising_set_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_remove_advertising_set_rp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_clear_advertising_sets_rp0; + +typedef PACKED(struct) +{ + uint8_t Own_Address_Type; + uint8_t Scanning_Filter_Policy; + uint8_t Scanning_PHYs; + uint8_t Scan_Type; + uint16_t Scan_Interval; + uint16_t Scan_Window; +} hci_le_set_extended_scan_parameters_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_set_extended_scan_parameters_rp0; + +typedef PACKED(struct) +{ + uint8_t Enable; + uint8_t Filter_Duplicates; + uint16_t Duration; + uint16_t Period; +} hci_le_set_extended_scan_enable_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_set_extended_scan_enable_rp0; + +typedef PACKED(struct) +{ + uint8_t Initiator_Filter_Policy; + uint8_t Own_Address_Type; + uint8_t Peer_Address_Type; + uint8_t Peer_Address[6]; + uint8_t Initiating_PHYs; + uint16_t Scan_Interval; + uint16_t Scan_Window; + uint16_t Conn_Interval_Min; + uint16_t Conn_Interval_Max; + uint16_t Conn_Latency; + uint16_t Supervision_Timeout; + uint16_t Min_CE_Length; + uint16_t Max_CE_Length; +} hci_le_extended_create_connection_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} hci_le_extended_create_connection_rp0; typedef PACKED(struct) { @@ -1408,26 +1604,6 @@ typedef PACKED(struct) uint8_t Status; } aci_gap_start_general_discovery_proc_rp0; -typedef PACKED(struct) -{ - uint16_t LE_Scan_Interval; - uint16_t LE_Scan_Window; - uint8_t Peer_Address_Type; - uint8_t Peer_Address[6]; - uint8_t Own_Address_Type; - uint16_t Conn_Interval_Min; - uint16_t Conn_Interval_Max; - uint16_t Conn_Latency; - uint16_t Supervision_Timeout; - uint16_t Minimum_CE_Length; - uint16_t Maximum_CE_Length; -} aci_gap_start_name_discovery_proc_cp0; - -typedef PACKED(struct) -{ - uint8_t Status; -} aci_gap_start_name_discovery_proc_rp0; - typedef PACKED(struct) { uint16_t LE_Scan_Interval; @@ -1681,6 +1857,22 @@ typedef PACKED(struct) uint8_t Status; } aci_gap_remove_bonded_device_rp0; +typedef PACKED(struct) +{ + uint8_t Num_of_List_Entries; + List_Entry_t List_Entry[(BLE_CMD_MAX_PARAM_LEN - 2)/sizeof(List_Entry_t)]; +} aci_gap_add_devices_to_list_cp0; + +typedef PACKED(struct) +{ + uint8_t Mode; +} aci_gap_add_devices_to_list_cp1; + +typedef PACKED(struct) +{ + uint8_t Status; +} aci_gap_add_devices_to_list_rp0; + typedef PACKED(struct) { uint16_t Adv_Interval_Min; @@ -1712,6 +1904,85 @@ typedef PACKED(struct) uint8_t Status; } aci_gap_additional_beacon_set_data_rp0; +typedef PACKED(struct) +{ + uint8_t Adv_Mode; + uint8_t Advertising_Handle; + uint16_t Adv_Event_Properties; + uint32_t Primary_Adv_Interval_Min; + uint32_t Primary_Adv_Interval_Max; + uint8_t Primary_Adv_Channel_Map; + uint8_t Own_Address_Type; + uint8_t Peer_Address_Type; + uint8_t Peer_Address[6]; + uint8_t Adv_Filter_Policy; + uint8_t Adv_TX_Power; + uint8_t Secondary_Adv_Max_Skip; + uint8_t Secondary_Adv_PHY; + uint8_t Adv_SID; + uint8_t Scan_Req_Notification_Enable; +} aci_gap_adv_set_configuration_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} aci_gap_adv_set_configuration_rp0; + +typedef PACKED(struct) +{ + uint8_t Enable; + uint8_t Num_Sets; + Adv_Set_t Adv_Set[(BLE_CMD_MAX_PARAM_LEN - 2)/sizeof(Adv_Set_t)]; +} aci_gap_adv_set_enable_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} aci_gap_adv_set_enable_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; + uint8_t Operation; + uint8_t Fragment_Preference; + uint8_t Advertising_Data_Length; + uint8_t Advertising_Data[BLE_CMD_MAX_PARAM_LEN - 4]; +} aci_gap_adv_set_adv_data_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} aci_gap_adv_set_adv_data_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; + uint8_t Operation; + uint8_t Fragment_Preference; + uint8_t Scan_Response_Data_Length; + uint8_t Scan_Response_Data[BLE_CMD_MAX_PARAM_LEN - 4]; +} aci_gap_adv_set_scan_resp_data_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} aci_gap_adv_set_scan_resp_data_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; +} aci_gap_adv_remove_set_cp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} aci_gap_adv_remove_set_rp0; + +typedef PACKED(struct) +{ + uint8_t Status; +} aci_gap_adv_clear_sets_rp0; + typedef PACKED(struct) { uint8_t Status; @@ -2557,6 +2828,45 @@ typedef PACKED(struct) uint8_t RX_PHY; } hci_le_phy_update_complete_event_rp0; +typedef PACKED(struct) +{ + uint8_t Num_Reports; + uint16_t Event_Type; + uint8_t Address_Type; + uint8_t Address[6]; + uint8_t Primary_PHY; + uint8_t Secondary_PHY; + uint8_t Advertising_SID; + uint8_t TX_Power; + uint8_t RSSI; + uint16_t Periodic_Adv_Interval; + uint8_t Direct_Address_Type; + uint8_t Direct_Address[6]; + uint8_t Data_Length; + uint8_t Data[(BLE_EVT_MAX_PARAM_LEN - 1) - 25]; +} hci_le_extended_advertising_report_event_rp0; + +typedef PACKED(struct) +{ + uint8_t Status; + uint8_t Advertising_Handle; + uint16_t Connection_Handle; + uint8_t Num_Completed_Ext_Adv_Events; +} hci_le_advertising_set_terminated_event_rp0; + +typedef PACKED(struct) +{ + uint8_t Advertising_Handle; + uint8_t Scanner_Address_Type; + uint8_t Scanner_Address[6]; +} hci_le_scan_request_received_event_rp0; + +typedef PACKED(struct) +{ + uint16_t Connection_Handle; + uint8_t Channel_Selection_Algorithm; +} hci_le_channel_selection_algorithm_event_rp0; + typedef PACKED(struct) { uint8_t Last_State; diff --git a/Middlewares/ST/STM32_WPAN/ble/core/ble_bufsize.h b/Middlewares/ST/STM32_WPAN/ble/core/ble_bufsize.h index d57faa92a..94f0440bd 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/ble_bufsize.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/ble_bufsize.h @@ -5,13 +5,12 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ***************************************************************************** */ @@ -91,30 +90,30 @@ * mentioned parameters. */ #if (BEACON_ONLY != 0) -#define BLE_FIXED_BUFFER_SIZE_BYTES 4204 /* Beacon only */ +#define BLE_FIXED_BUFFER_SIZE_BYTES 4184 /* Beacon only */ #elif (LL_ONLY != 0) -#define BLE_FIXED_BUFFER_SIZE_BYTES 5824 /* LL only */ +#define BLE_FIXED_BUFFER_SIZE_BYTES 6068 /* LL only */ #elif (SLAVE_ONLY != 0) -#define BLE_FIXED_BUFFER_SIZE_BYTES 6400 /* Peripheral only */ +#define BLE_FIXED_BUFFER_SIZE_BYTES 6096 /* Peripheral only */ #elif (BASIC_FEATURES != 0) -#define BLE_FIXED_BUFFER_SIZE_BYTES 6688 /* Basic Features */ +#define BLE_FIXED_BUFFER_SIZE_BYTES 6400 /* Basic Features */ #else -#define BLE_FIXED_BUFFER_SIZE_BYTES 7168 /* Full stack */ +#define BLE_FIXED_BUFFER_SIZE_BYTES 7312 /* Full stack */ #endif /* * BLE_PER_LINK_SIZE_BYTES: additional memory size used per link */ #if (BEACON_ONLY != 0) -#define BLE_PER_LINK_SIZE_BYTES 148 /* Beacon only */ +#define BLE_PER_LINK_SIZE_BYTES 192 /* Beacon only */ #elif (LL_ONLY != 0) -#define BLE_PER_LINK_SIZE_BYTES 196 /* LL only */ +#define BLE_PER_LINK_SIZE_BYTES 260 /* LL only */ #elif (SLAVE_ONLY != 0) -#define BLE_PER_LINK_SIZE_BYTES 328 /* Peripheral only */ +#define BLE_PER_LINK_SIZE_BYTES 388 /* Peripheral only */ #elif (BASIC_FEATURES != 0) -#define BLE_PER_LINK_SIZE_BYTES 328 /* Basic Features */ +#define BLE_PER_LINK_SIZE_BYTES 388 /* Basic Features */ #else -#define BLE_PER_LINK_SIZE_BYTES 380 /* Full stack */ +#define BLE_PER_LINK_SIZE_BYTES 444 /* Full stack */ #endif /* @@ -132,6 +131,14 @@ (BLE_PER_LINK_SIZE_BYTES * (n_link)) + \ ((BLE_MEM_BLOCK_SIZE + 12) * (mblocks_count))) +/* + * BLE_EXT_ADV_BUFFER_SIZE + * additional memory size used for Extended advertising; + * It has to be added to BLE_TOTAL_BUFFER_SIZE(). + * The formula used is based on:(1792 + ((set_nbr) * (60 + (2 * (data_len))))) + */ +#define BLE_EXT_ADV_BUFFER_SIZE(set_nbr, data_len) (7596) + /* * BLE_TOTAL_BUFFER_SIZE_GATT: this macro returns the amount of memory, * in bytes, needed for the storage of GATT database elements. diff --git a/Middlewares/ST/STM32_WPAN/ble/core/ble_core.h b/Middlewares/ST/STM32_WPAN/ble/core/ble_core.h index 2bb7aa2dd..182f8cd0d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/ble_core.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/ble_core.h @@ -5,15 +5,14 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_CORE_H__ @@ -40,5 +39,3 @@ #endif /* BLE_CORE_H__ */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/ble_defs.h b/Middlewares/ST/STM32_WPAN/ble/core/ble_defs.h index 524c623f8..9852b0653 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/ble_defs.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/ble_defs.h @@ -5,15 +5,14 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_DEFS_H__ @@ -195,49 +194,6 @@ */ #define BLE_STATUS_SUCCESS 0x00U -/* The Connection Identifier does not exist at SMP level. - */ -#define BLE_STATUS_UNKNOWN_CONNECTION_ID 0x40U - -/* The Host failed while performing the requested operation. - */ -#define BLE_STATUS_FAILED 0x41U - -/* Invalid parameters in Host commands - */ -#define BLE_STATUS_INVALID_PARAMS 0x42U - -/* The Host is already processing another request received in advance. - */ -#define BLE_STATUS_BUSY 0x43U - -/* The operation requested cannot be completed immediately by the Host - * (usually because of lack of resources). - * The operation is generally put on hold by the caller and it's usually - * retried on later time. - */ -#define BLE_STATUS_PENDING 0x45U - -/* The requested operation cannot be performed by the Host in the current - * status. - */ -#define BLE_STATUS_NOT_ALLOWED 0x46U - -/* The requested operation violates the logic of the called layer/function or - * the format of the data to be processed during the operation. - */ -#define BLE_STATUS_ERROR 0x47U - -/* The requested operation failed because of lack of memory. - * Out of memory shall be returned for situations where memory will never - * become available again (e.g. ATT database) - */ -#define BLE_STATUS_OUT_OF_MEMORY 0x48U - -/* An invalid L2CAP CID/channel has been selected to send data over. - */ -#define BLE_STATUS_INVALID_CID 0x50U - /* The remote device in in the Blacklist and the pairing operation it requested * cannot be performed. */ @@ -334,6 +290,36 @@ */ #define BLE_STATUS_LENGTH_FAILED 0x86U +/* The Host failed while performing the requested operation. + */ +#define BLE_STATUS_FAILED 0x91U + +/* Invalid parameters in Host commands + */ +#define BLE_STATUS_INVALID_PARAMS 0x92U + +/* The Host is already processing another request received in advance. + */ +#define BLE_STATUS_BUSY 0x93U + +/* The operation requested cannot be completed immediately by the Host + * (usually because of lack of resources). + * The operation is generally put on hold by the caller and it's usually + * retried on later time. + */ +#define BLE_STATUS_PENDING 0x95U + +/* The requested operation violates the logic of the called layer/function or + * the format of the data to be processed during the operation. + */ +#define BLE_STATUS_ERROR 0x97U + +/* The requested operation failed because of lack of memory. + * Out of memory shall be returned for situations where memory will never + * become available again (e.g. ATT database) + */ +#define BLE_STATUS_OUT_OF_MEMORY 0x98U + /* Returned when a timeout occurs at BLE application interface */ #define BLE_STATUS_TIMEOUT 0xFFU @@ -694,6 +680,7 @@ #define CONFIG_DATA_ER_OFFSET 0x08U #define CONFIG_DATA_IR_OFFSET 0x18U #define CONFIG_DATA_RANDOM_ADDRESS_OFFSET 0x2EU +#define CONFIG_DATA_SMP_MODE_OFFSET 0xB0U /* Length for configuration values (see ACI_HAL_WRITE_CONFIG_DATA) */ @@ -701,6 +688,7 @@ #define CONFIG_DATA_ER_LEN 16 #define CONFIG_DATA_IR_LEN 16 #define CONFIG_DATA_RANDOM_ADDRESS_LEN 6 +#define CONFIG_DATA_SMP_MODE_LEN 1 /* ------------------------------------------------------------------------- */ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/ble_legacy.h b/Middlewares/ST/STM32_WPAN/ble/core/ble_legacy.h index 97178febe..bbf852f32 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/ble_legacy.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/ble_legacy.h @@ -5,15 +5,14 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_LEGACY_H__ @@ -195,11 +194,14 @@ typedef uint8_t tBDAddr[6]; #define LIM_DISC_MODE_TIMEOUT 180000 /* 180 seconds */ #define PRIVATE_ADDR_INT_TIMEOUT 900000 /* 15 minutes */ +#define BLE_STATUS_UNKNOWN_CONNECTION_ID 0x02 +#define BLE_STATUS_NOT_ALLOWED 0x0C #define BLE_STATUS_SEC_UNKNOWN_CONNECTION_ID 0x40 #define BLE_STATUS_INVALID_LEN_PDU 0x44 #define FLASH_READ_FAILED 0x49 #define FLASH_WRITE_FAILED 0x4A #define FLASH_ERASE_FAILED 0x4B +#define BLE_STATUS_INVALID_CID 0x50 #define TIMER_NOT_VALID_LAYER 0x54 #define TIMER_INSUFFICIENT_RESOURCES 0x55 #define BLE_STATUS_DEV_NOT_FOUND_IN_DB 0x5C @@ -263,11 +265,24 @@ typedef uint8_t tBDAddr[6]; /* ------------------------------------------------------------------------- */ -/* Deprecative name for LE Read Remote Features command +/* Deprecated names for HCI commands and events */ -#define hci_le_read_remote_used_features hci_le_read_remote_features +#define hci_le_read_remote_used_features \ + hci_le_read_remote_features #define hci_le_read_remote_used_features_complete_event_rp0 \ - hci_le_read_remote_features_complete_event_rp0 + hci_le_read_remote_features_complete_event_rp0 +#define hci_le_read_advertising_channel_tx_power \ + hci_le_read_advertising_physical_channel_tx_power +#define hci_le_start_encryption \ + hci_le_enable_encryption +#define hci_le_long_term_key_requested_negative_reply \ + hci_le_long_term_key_request_negative_reply +#define hci_le_set_advertise_enable \ + hci_le_set_advertising_enable +#define hci_le_enhanced_receiver_test \ + hci_le_receiver_test_v2 +#define hci_le_enhanced_transmitter_test \ + hci_le_transmitter_test_v2 /* ------------------------------------------------------------------------- */ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/ble_std.h b/Middlewares/ST/STM32_WPAN/ble/core/ble_std.h index eb40ed0fe..b41448cdf 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/ble_std.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/ble_std.h @@ -5,15 +5,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_STD_H__ @@ -81,6 +80,7 @@ #define HCI_PIN_OR_KEY_MISSING_ERR_CODE 0x06U #define HCI_MEMORY_CAPACITY_EXCEEDED_ERR_CODE 0x07U #define HCI_CONNECTION_TIMEOUT_ERR_CODE 0x08U +#define HCI_CONNECTION_ALREADY_EXISTS_ERR_CODE 0x0BU #define HCI_COMMAND_DISALLOWED_ERR_CODE 0x0CU #define HCI_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE_ERR_CODE 0x11U #define HCI_INVALID_HCI_COMMAND_PARAMETERS_ERR_CODE 0x12U @@ -89,6 +89,7 @@ #define HCI_LMP_FEATURE_ERR_CODE 0x1AU #define HCI_INVALID_LL_PARAMETERS_ERR_CODE 0x1EU #define HCI_UNSPECIFIED_ERROR_ERR_CODE 0x1FU +#define HCI_UNSUPPORTED_LL_PARAMETER_VALUE_ERR_CODE 0x20U #define HCI_LL_RESPONSE_TIMEOUT_ERR_CODE 0x22U #define HCI_LL_PROCEDURE_COLLISION_ERR_CODE 0x23U #define HCI_LMP_PDU_NOT_ALLOWED_ERR_CODE 0x24U @@ -100,46 +101,77 @@ #define HCI_ADVERTISING_TIMEOUT_ERR_CODE 0x3CU #define HCI_CONNECTION_TERMINATED_DUE_TO_MIC_FAILURE_ERR_CODE 0x3DU #define HCI_CONNECTION_FAILED_TO_BE_ESTABLISHED_ERR_CODE 0x3EU - -/* HCI_LE_Read_PHY */ -#define HCI_TX_PHY_LE_1M 0x01U -#define HCI_TX_PHY_LE_2M 0x02U -#define HCI_TX_PHY_LE_CODED 0x03U -#define HCI_RX_PHY_LE_1M 0x01U -#define HCI_RX_PHY_LE_2M 0x02U -#define HCI_RX_PHY_LE_CODED 0x03U - -/* HCI_LE_Set_PHY */ -#define HCI_ALL_PHYS_TX_NO_PREF 0x01U -#define HCI_ALL_PHYS_RX_NO_PREF 0x02U -#define HCI_TX_PHYS_LE_1M_PREF 0x01U -#define HCI_TX_PHYS_LE_2M_PREF 0x02U -#define HCI_TX_PHYS_LE_CODED_PREF 0x04U -#define HCI_RX_PHYS_LE_1M_PREF 0x01U -#define HCI_RX_PHYS_LE_2M_PREF 0x02U -#define HCI_RX_PHYS_LE_CODED_PREF 0x04U - -/* HCI_LE_Advertising_Report */ -#define HCI_ADV_EVT_TYPE_ADV_IND 0x00U -#define HCI_ADV_EVT_TYPE_ADV_DIRECT_IND 0x01U -#define HCI_ADV_EVT_TYPE_ADV_SCAN_IND 0x02U -#define HCI_ADV_EVT_TYPE_ADV_NONCONN_IND 0x03U -#define HCI_ADV_EVT_TYPE_SCAN_RSP 0x04U - -/* HCI_LE_Set_Advertising_Parameters */ -#define HCI_ADV_TYPE_ADV_IND 0x00U -#define HCI_ADV_TYPE_ADV_DIRECT_IND_HDC 0x01U -#define HCI_ADV_TYPE_ADV_SCAN_IND 0x02U -#define HCI_ADV_TYPE_ADV_NONCONN_IND 0x03U -#define HCI_ADV_TYPE_ADV_DIRECT_IND_LDC 0x04U - -/* HCI_LE_Set_Scan_Parameters */ -#define HCI_SCAN_FILTER_NO 0x00U -#define HCI_SCAN_FILTER_WHITELIST 0x01U -#define HCI_SCAN_FILTER_NO_EVEN_RPA 0x02U -#define HCI_SCAN_FILTER_WHITELIST_BUT_RPA 0x03U +#define HCI_UNKNOWN_ADVERTISING_IDENTIFIER_ERR_CODE 0x42U +#define HCI_ADVERTISING_LIMIT_REACHED_ERR_CODE 0x43U +#define HCI_PACKET_TOO_LONG_ERR_CODE 0x45U + +/* HCI_LE_Set_Advertising_Parameters: Advertising_Type */ +#define HCI_ADV_TYPE_ADV_IND 0x00U +#define HCI_ADV_TYPE_ADV_DIRECT_IND_HDC 0x01U +#define HCI_ADV_TYPE_ADV_SCAN_IND 0x02U +#define HCI_ADV_TYPE_ADV_NONCONN_IND 0x03U +#define HCI_ADV_TYPE_ADV_DIRECT_IND_LDC 0x04U + +/* HCI_LE_Set_Scan_Parameters: Scanning_Filter_Policy */ +#define HCI_SCAN_FILTER_NO 0x00U +#define HCI_SCAN_FILTER_WHITELIST 0x01U +#define HCI_SCAN_FILTER_NO_EVEN_RPA 0x02U +#define HCI_SCAN_FILTER_WHITELIST_BUT_RPA 0x03U + +/* HCI_LE_Read_PHY: TX_PHY */ +#define HCI_TX_PHY_LE_1M 0x01U +#define HCI_TX_PHY_LE_2M 0x02U +#define HCI_TX_PHY_LE_CODED 0x03U + +/* HCI_LE_Read_PHY: RX_PHY */ +#define HCI_RX_PHY_LE_1M 0x01U +#define HCI_RX_PHY_LE_2M 0x02U +#define HCI_RX_PHY_LE_CODED 0x03U + +/* HCI_LE_Set_PHY: ALL_PHYS */ +#define HCI_ALL_PHYS_TX_NO_PREF 0x01U +#define HCI_ALL_PHYS_RX_NO_PREF 0x02U + +/* HCI_LE_Set_PHY: TX_PHYS */ +#define HCI_TX_PHYS_LE_1M_PREF 0x01U +#define HCI_TX_PHYS_LE_2M_PREF 0x02U +#define HCI_TX_PHYS_LE_CODED_PREF 0x04U + +/* HCI_LE_Set_PHY: RX_PHYS */ +#define HCI_RX_PHYS_LE_1M_PREF 0x01U +#define HCI_RX_PHYS_LE_2M_PREF 0x02U +#define HCI_RX_PHYS_LE_CODED_PREF 0x04U + +/* HCI_LE_Set_Extended_Advertising_Parameters: Advertising_Event_Properties */ +#define HCI_ADV_EVENT_PROP_CONNECTABLE 0x0001U +#define HCI_ADV_EVENT_PROP_SCANNABLE 0x0002U +#define HCI_ADV_EVENT_PROP_DIRECTED 0x0004U +#define HCI_ADV_EVENT_PROP_HDC_DIRECTED 0x0008U +#define HCI_ADV_EVENT_PROP_LEGACY 0x0010U +#define HCI_ADV_EVENT_PROP_ANONYMOUS 0x0020U +#define HCI_ADV_EVENT_PROP_TXPOWER_INC 0x0040U + +/* HCI_LE_Set_Extended_Advertising_Parameters: Primary_Advertising_PHY */ +#define HCI_PRIMARY_ADV_PHY_LE_1M 0x01U +#define HCI_PRIMARY_ADV_PHY_LE_CODED 0x03U + +/* HCI_LE_Set_Extended_Advertising_Data: Operation */ +#define HCI_SET_ADV_DATA_OPERATION_INTERMEDIATE 0x00U +#define HCI_SET_ADV_DATA_OPERATION_FIRST 0x01U +#define HCI_SET_ADV_DATA_OPERATION_LAST 0x02U +#define HCI_SET_ADV_DATA_OPERATION_COMPLETE 0x03U +#define HCI_SET_ADV_DATA_OPERATION_UNCHANGED 0x04U + +/* HCI_LE_Advertising_Report: Event_Type */ +#define HCI_ADV_EVT_TYPE_ADV_IND 0x00U +#define HCI_ADV_EVT_TYPE_ADV_DIRECT_IND 0x01U +#define HCI_ADV_EVT_TYPE_ADV_SCAN_IND 0x02U +#define HCI_ADV_EVT_TYPE_ADV_NONCONN_IND 0x03U +#define HCI_ADV_EVT_TYPE_SCAN_RSP 0x04U + +/* HCI_LE_Set_Extended_Scan_Parameters: Scanning_PHYs */ +#define HCI_SCANNING_PHYS_LE_1M 0x01U +#define HCI_SCANNING_PHYS_LE_CODED 0x04U #endif /* BLE_STD_H__ */ - -/*********************** (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/doc/STM32WB_BLE_Wireless_Interface.html b/Middlewares/ST/STM32_WPAN/ble/core/doc/STM32WB_BLE_Wireless_Interface.html index 5fb6ae462..4d7843d88 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/doc/STM32WB_BLE_Wireless_Interface.html +++ b/Middlewares/ST/STM32_WPAN/ble/core/doc/STM32WB_BLE_Wireless_Interface.html @@ -636,10 +636,12 @@ padding-right: 0px; } td.gsib_a {padding:0px;padding-top:4px;padding-left:3px;} -

                                                        STM32WB BLE Wireless Interface

                                                        This document describes the STM32WB BLE Application Commands Interface (ACI) and Host Commands Interface (HCI).

                                                        STM32WB Series website

                                                        Revision history

                                                        December 2018 - Rev 1.0 - First release for interface 1.0

                                                        February 2019 - Rev 1.1 - Modified HCI_HARDWARE_ERROR_EVENT comment

                                                        March 2019 - Rev 1.2 - Removed unused event documentation

                                                        March 2019 - Rev 1.3 - Modification ACI_HAL_FW_ERROR_EVENT error code

                                                        March 2019 - Rev 1.4 - Changed default mask of HCI_SET_EVENT_MASK

                                                        May 2019 - Rev 1.5 - ACI_GATT_NOTIFICATION_EXT_EVENT added

                                                        June 2019 - Rev 1.6 - Changed comment on usage of Char Handles in multiple ACI_GATT commands; Added ACI_GATT_INDICATION_EXT_EVENT

                                                        June 2019 - Rev 1.7 - Changed descriptions of ACI_ATT_READ_BY_TYPE_REQ and ACI_GATT_READ_USING_CHAR_UUID

                                                        July 2019 - Rev 1.8 - Reworked error codes section; Added GAP_ prefix to the GAP procedure bitmap definitions

                                                        September 2019 - Rev 1.9 - Added ACI_GATT_READ_EXT_EVENT; Modified ACI_GAP_CONFIGURE_WHITELIST comment

                                                        October 2019 - Rev 1.10 - Changed descriptions of ACI_GATT_WRITE_WITHOUT_RESP and ACI_GATT_SIGNED_WRITE_WITHOUT_RESP; Removed obsolete configuration data elements

                                                        November 2019 - Rev 1.11 - Completed description of ACI_GAP_INIT; Added specific pairing status definitions

                                                        November 2019 - Rev 1.12 - Fixed status error codes

                                                        January 2020 - Rev 1.13 - Removed DIV unused configuration data; Fixed naming of HCI_LE_READ_REMOTE_FEATURES command and complete event

                                                        March 2020 - Rev 1.14 - Removed unused HCI_Data_Buffer_Overflow event; Fixed naming of FW_Error_Type possible values; Fixed pairing status possible values

                                                        March 2020 - Rev 1.15 - Added GAP scan timeout value

                                                        April 2020 - Rev 1.16 - Fixed various format issues; Added LO and PO columns for command and event tables.

                                                        May 2020 - Rev 1.17 - Updated PO stack features; Added comment in HCI_LE_ADVERTISING_REPORT_EVENT description.

                                                        June 2020 - Rev 1.18 - Added BO column for command and event tables; Fixed advertising commands description; Fixed various format issues.

                                                        June 2020 - Rev 1.19 - Completed interval possible values for ACI_GAP_SET_DIRECT_CONNECTABLE.

                                                        July 2020 - Rev 1.20 - Added HCI_LE_SET_PRIVACY_MODE.

                                                        July 2020 - Rev 1.21 - Updated BO stack features.

                                                        September 2020 - Rev 1.22 - Fixed various minor issues.

                                                        November 2020 - Rev 1.23 - Added connection-oriented channels feature; Added HCI_LE_READ_TRANSMIT_POWER; Updated PO variant.

                                                        December 2020 - Rev 1.24 - Added BF column for command and event tables.

                                                        January 2021 - Rev 1.25 - Added Link_Status possible values.

                                                        January 2021 - Rev 1.26 - Fixed some specification references.

                                                        February 2021 - Rev 1.27 - Added ACI_HAL_SET_SLAVE_LATENCY; Updated comments of ACI_HAL_WRITE_CONFIG_DATA and ACI_HAL_READ_CONFIG_DATA.

                                                        March 2021 - Rev 1.28 - Added additional beacon feature.

                                                        April 2021 - Rev 1.29 - Removed unused ACI_HAL_SET_SMP_ENG_CONFIG.

                                                        May 2021 - Rev 1.30 - Fixed event generated by HCI_SET_CONTROLLER_TO_HOST_FLOW_CONTROL and HCI_HOST_BUFFER_SIZE.

                                                        May 2021 - Rev 1.31 - Added HCI_LE_SET_ADVERTISING_DATA in BF and PO variants.

                                                        Contents

                                                        HCI/ACI commands

                                                        HCI/ACI events

                                                        Status error codes

                                                        HCI/ACI commands

                                                        HCI commands

                                                        HCI TESTING commands

                                                        ACI HAL commands

                                                        ACI GAP commands

                                                        ACI GATT/ATT commands

                                                        ACI L2CAP commands

                                                        Note: in the command tables, a "Y" in the "BF", "PO", "LO" or "BO" column, means that the corresponding command applies to the "Basic Features", "Peripheral Only", "Link Layer Only" or "Beacon Only" variant of the BLE stack, respectively.

                                                        HCI commands

                                                        +

                                                        STM32WB BLE Wireless Interface

                                                        This document describes the STM32WB BLE Application Commands Interface (ACI) and Host Commands Interface (HCI).

                                                        STM32WB Series website

                                                        Revision history

                                                        December 2018 - Rev 1.0 - First release for interface 1.0

                                                        February 2019 - Rev 1.1 - Modified HCI_HARDWARE_ERROR_EVENT comment

                                                        March 2019 - Rev 1.2 - Removed unused event documentation

                                                        March 2019 - Rev 1.3 - Modification ACI_HAL_FW_ERROR_EVENT error code

                                                        March 2019 - Rev 1.4 - Changed default mask of HCI_SET_EVENT_MASK

                                                        May 2019 - Rev 1.5 - ACI_GATT_NOTIFICATION_EXT_EVENT added

                                                        June 2019 - Rev 1.6 - Changed comment on usage of Char Handles in multiple ACI_GATT commands; Added ACI_GATT_INDICATION_EXT_EVENT

                                                        June 2019 - Rev 1.7 - Changed descriptions of ACI_ATT_READ_BY_TYPE_REQ and ACI_GATT_READ_USING_CHAR_UUID

                                                        July 2019 - Rev 1.8 - Reworked error codes section; Added GAP_ prefix to the GAP procedure bitmap definitions

                                                        September 2019 - Rev 1.9 - Added ACI_GATT_READ_EXT_EVENT; Modified ACI_GAP_CONFIGURE_WHITELIST comment

                                                        October 2019 - Rev 1.10 - Changed descriptions of ACI_GATT_WRITE_WITHOUT_RESP and ACI_GATT_SIGNED_WRITE_WITHOUT_RESP; Removed obsolete configuration data elements

                                                        November 2019 - Rev 1.11 - Completed description of ACI_GAP_INIT; Added specific pairing status definitions

                                                        November 2019 - Rev 1.12 - Fixed status error codes

                                                        January 2020 - Rev 1.13 - Removed DIV unused configuration data; Fixed naming of HCI_LE_READ_REMOTE_FEATURES command and complete event

                                                        March 2020 - Rev 1.14 - Removed unused HCI_Data_Buffer_Overflow event; Fixed naming of FW_Error_Type possible values; Fixed pairing status possible values

                                                        March 2020 - Rev 1.15 - Added GAP scan timeout value

                                                        April 2020 - Rev 1.16 - Fixed various format issues; Added LO and PO columns for command and event tables.

                                                        May 2020 - Rev 1.17 - Updated PO stack features; Added comment in HCI_LE_ADVERTISING_REPORT_EVENT description.

                                                        June 2020 - Rev 1.18 - Added BO column for command and event tables; Fixed advertising commands description; Fixed various format issues.

                                                        June 2020 - Rev 1.19 - Completed interval possible values for ACI_GAP_SET_DIRECT_CONNECTABLE.

                                                        July 2020 - Rev 1.20 - Added HCI_LE_SET_PRIVACY_MODE.

                                                        July 2020 - Rev 1.21 - Updated BO stack features.

                                                        September 2020 - Rev 1.22 - Fixed various minor issues.

                                                        November 2020 - Rev 1.23 - Added connection-oriented channels feature; Added HCI_LE_READ_TRANSMIT_POWER; Updated PO variant.

                                                        December 2020 - Rev 1.24 - Added BF column for command and event tables.

                                                        January 2021 - Rev 1.25 - Added Link_Status possible values.

                                                        January 2021 - Rev 1.26 - Fixed some specification references.

                                                        February 2021 - Rev 1.27 - Added ACI_HAL_SET_SLAVE_LATENCY; Updated comments of ACI_HAL_WRITE_CONFIG_DATA and ACI_HAL_READ_CONFIG_DATA.

                                                        March 2021 - Rev 1.28 - Added additional beacon feature.

                                                        April 2021 - Rev 1.29 - Removed unused ACI_HAL_SET_SMP_ENG_CONFIG.

                                                        May 2021 - Rev 1.30 - Fixed event generated by HCI_SET_CONTROLLER_TO_HOST_FLOW_CONTROL and HCI_HOST_BUFFER_SIZE.

                                                        May 2021 - Rev 1.31 - Added HCI_LE_SET_ADVERTISING_DATA in BF and PO variants.

                                                        June 2021 - Rev 1.32 - Added extended advertising feature; Added HCI_DISCONNECT in BF and PO variants; Removed host privacy; Added ACI_GAP_ADD_DEVICES_TO_LIST; Added HCI_LE_CHANNEL_SELECTION_ALGORITHM_EVENT.

                                                        July 2021 - Rev 1.33 - Removed ACI_GAP_START_NAME_DISCOVERY_PROC.

                                                        July 2021 - Rev 1.34 - Updated error status codes; Added HCI_LE_CONNECTION_UPDATE in BF variant.

                                                        October 2021 - Rev 1.35 - Fixed Scanning_PHYs values; Removed HCI_LE_DIRECT_ADVERTISING_REPORT_EVENT in BO variant; Fixed names of some HCI commands; Added SMP mode in ACI_HAL_WRITE_CONFIG_DATA.

                                                        October 2021 - Rev 1.36 - Fixed NRPA use; Fixed names of some HCI commands.

                                                        Contents

                                                        HCI/ACI commands

                                                        HCI/ACI events

                                                        Status error codes

                                                        HCI/ACI commands

                                                        HCI commands

                                                        HCI TESTING commands

                                                        ACI HAL commands

                                                        ACI GAP commands

                                                        ACI GATT/ATT commands

                                                        ACI L2CAP commands

                                                        Note: in the command tables, a "Y" in the "BF", "PO", "LO" or "BO" column, means that the corresponding command applies to the "Basic Features", "Peripheral Only", "Link Layer Only" or "Beacon Only" variant of the BLE stack, respectively.

                                                        HCI commands

                                                        - @@ -736,7 +738,7 @@ td.gsib_a {padding:0px;padding-top:4px;padding-left:3px;} - @@ -771,7 +773,8 @@ td.gsib_a {padding:0px;padding-top:4px;padding-left:3px;} - - + + + + + + + + + + + +
                                                        CommandOpcodeBFPOLOBO
                                                        HCI_DISCONNECT

                                                        0x0406

                                                        -

                                                        Y

                                                        +

                                                        Y

                                                        +

                                                        Y

                                                        +

                                                        Y

                                                        HCI_READ_REMOTE_VERSION_INFORMATION

                                                        0x041D

                                                        Y

                                                        @@ -720,7 +722,7 @@ td.gsib_a {padding:0px;padding-top:4px;padding-left:3px;}

                                                        Y

                                                        Y

                                                        HCI_LE_READ_ADVERTISING_CHANNEL_TX_POWER

                                                        0x2007

                                                        +
                                                        HCI_LE_READ_ADVERTISING_PHYSICAL_CHANNEL_TX_POWER

                                                        0x2007

                                                        Y

                                                        Y

                                                        Y

                                                        Y

                                                        HCI_LE_SET_ADVERTISE_ENABLE

                                                        0x200A

                                                        +
                                                        HCI_LE_SET_ADVERTISING_ENABLE

                                                        0x200A

                                                        Y

                                                        Y

                                                        Y

                                                        HCI_LE_CONNECTION_UPDATE

                                                        0x2013

                                                        -

                                                        Y

                                                        +

                                                        Y

                                                        +

                                                        Y

                                                        HCI_LE_SET_HOST_CHANNEL_CLASSIFICATION

                                                        0x2014

                                                        Y

                                                        @@ -795,13 +798,13 @@ td.gsib_a {padding:0px;padding-top:4px;padding-left:3px;}

                                                        Y

                                                        Y

                                                        HCI_LE_START_ENCRYPTION

                                                        0x2019

                                                        +
                                                        HCI_LE_ENABLE_ENCRYPTION

                                                        0x2019

                                                        Y

                                                        HCI_LE_LONG_TERM_KEY_REQUEST_REPLY

                                                        0x201A

                                                        Y

                                                        HCI_LE_LONG_TERM_KEY_REQUESTED_NEGATIVE_REPLY

                                                        0x201B

                                                        +
                                                        HCI_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY

                                                        0x201B

                                                        Y

                                                        HCI_LE_READ_SUPPORTED_STATES

                                                        0x201C

                                                        @@ -869,6 +872,42 @@ td.gsib_a {padding:0px;padding-top:4px;padding-left:3px;}
                                                        HCI_LE_SET_PHY

                                                        0x2032

                                                        Y

                                                        HCI_LE_SET_ADVERTISING_SET_RANDOM_ADDRESS

                                                        0x2035

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SET_EXTENDED_ADVERTISING_PARAMETERS

                                                        0x2036

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SET_EXTENDED_ADVERTISING_DATA

                                                        0x2037

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SET_EXTENDED_SCAN_RESPONSE_DATA

                                                        0x2038

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SET_EXTENDED_ADVERTISING_ENABLE

                                                        0x2039

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_READ_MAXIMUM_ADVERTISING_DATA_LENGTH

                                                        0x203A

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_READ_NUMBER_OF_SUPPORTED_ADVERTISING_SETS

                                                        0x203B

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_REMOVE_ADVERTISING_SET

                                                        0x203C

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_CLEAR_ADVERTISING_SETS

                                                        0x203D

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SET_EXTENDED_SCAN_PARAMETERS

                                                        0x2041

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SET_EXTENDED_SCAN_ENABLE

                                                        0x2042

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_EXTENDED_CREATE_CONNECTION

                                                        0x2043

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_READ_TRANSMIT_POWER

                                                        0x204B

                                                        Y

                                                        Y

                                                        @@ -1078,8 +1117,8 @@ Unsupported or undefined commands shall be set to 0.

                                                      • 0x0000 ... 0x0EFF

                                                        • RSSI

                                                        1

                                                        -

                                                        N Size: 1 Octet (signed integer) -Units: dBm

                                                        +

                                                        RSSI (signed integer). +Units: dBm.

                                                      • 127: RSSI not available
                                                      • -127 ... 20

                                                        • Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_EVENT_MASK

                                                        Description

                                                        The LE_Set_Event_Mask command is used to control which LE events are generated by the HCI for the Host. If the bit in the LE_Event_Mask is set to a one, then the event associated with that bit will be enabled. The Host has to deal with each event that is generated by an LE Controller. The event mask allows the Host to control which events will interrupt it.
                                                        For LE events to be generated, the LE Meta-Event bit in the Event_Mask shall also be set. If that bit is not set, then LE events shall not be generated, regardless of how the LE_Event_Mask is set.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.1].

                                                        Input parameters

                                                        @@ -1136,43 +1175,33 @@ Units: dBm

                                                         + + + -
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Interval_Min

                                                        2

                                                        Minimum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Advertising_Interval_Max

                                                        2

                                                        Maximum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Advertising_Type

                                                        1

                                                        -

                                                        Advertising type

                                                        +

                                                        Advertising type.

                                                      • 0x00: ADV_IND (Connectable undirected advertising)
                                                      • 0x01: ADV_DIRECT_IND, high duty cycle (Connectable high duty cycle directed advertising)
                                                      • 0x02: ADV_SCAN_IND (Scannable undirected advertising)
                                                      • 0x03: ADV_NONCONN_IND (Non connectable undirected advertising)
                                                      • 0x04: ADV_DIRECT_IND_LDC, low duty cycle (Connectable low duty cycle directed advertising)

                                                        • Own_Address_Type

                                                        1

                                                        -
                                                        -
                                                        Own address type.
                                                        -
                                                          -
                                                        • 0x00: Public Device Address
                                                          • -
                                                        • 0x01 Random Device Address
                                                          • -
                                                        • 0x02: Controller generates Resolvable Private Address based on the local IRK from resolving list. If resolving list contains no matching entry, use public address.
                                                          • -
                                                        • 0x03: Controller generates Resolvable Private Address based on the local IRK from resolving list. If resolving list contains no matching entry, use random address from LE_Set_Random_Address.
                                                          • -
                                                        -
                                                        -
                                                        -
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address or Public Address
                                                      • 0x03: Resolvable Private Address or Random Address

                                                        • Own address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address if available, otherwise Public Address
                                                      • 0x03: Resolvable Private Address if available, otherwise Random Address

                                                        • Peer_Address_Type

                                                        1

                                                        -

                                                        The address type of the peer device.

                                                        -
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address

                                                        • Address type of the peer device.

                                                        +
                                                      • 0x00: Public Device Address or Public Identity Address
                                                      • 0x01: Random Device Address or Random (static) Identity Address

                                                        • Peer_Address

                                                        6

                                                        -

                                                        Public Device Address, Random Device Address, Public Identity Address or Random (static) Identity Address of the device to be connected.

                                                        +

                                                        Public Device Address, Random Device Address, Public Identity Address, or Random (static) Identity Address of the device to be connected.

                                                        Advertising_Channel_Map

                                                        1

                                                        -

                                                        Advertising channel map. -Default: 00000111b (all channels enabled).

                                                        -

                                                        Bitmask of:

                                                      • 0x01: ch 37
                                                      • 0x02: ch 38
                                                      • 0x04: ch 39

                                                        • Advertising channel map.

                                                        +

                                                        Bitmask of:

                                                      • 0x01: Channel 37 shall be used
                                                      • 0x02: Channel 38 shall be used
                                                      • 0x04: Channel 39 shall be used

                                                        • Advertising_Filter_Policy

                                                        1

                                                        Advertising filter policy.

                                                        @@ -1183,7 +1212,7 @@ Default: 00000111b (all channels enabled).

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_READ_ADVERTISING_CHANNEL_TX_POWER

                                                        Description

                                                        The LE_Read_Advertising_Channel_Tx_Power command is used by the Host to read the transmit power level used for LE advertising channel packets.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.6].

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_READ_ADVERTISING_PHYSICAL_CHANNEL_TX_POWER

                                                        Description

                                                        The LE_Read_Advertising_Physical_Channel_Tx_Power command is used by the Host to read the transmit power level used for LE advertising physical channel packets.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.6].

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        -
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        1

                                                        @@ -1227,11 +1256,11 @@ Accuracy: +/- 4 dBm

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_ADVERTISE_ENABLE

                                                        Description

                                                        The LE_Set_Advertise_Enable command is used to request the Controller to start or stop advertising. The Controller manages the timing of advertisements as per the advertising parameters given in the LE_Set_Advertising_Parameters command.
                                                        The Controller shall continue advertising until the Host issues an LE_Set_Advertise_Enable command with Advertising_Enable set to 0x00 (Advertising is disabled) or until a connection is created or until the Advertising is timed out due to high duty cycle Directed Advertising. In these cases, advertising is then disabled.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.9].

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_ADVERTISING_ENABLE

                                                        Description

                                                        The LE_Set_Advertising_Enable command is used to request the Controller to start or stop advertising. The Controller manages the timing of advertisements as per the advertising parameters given in the LE_Set_Advertising_Parameters command.
                                                        The Controller shall continue advertising until the Host issues an LE_Set_Advertising_Enable command with Advertising_Enable set to 0x00 (Advertising is disabled) or until a connection is created or until the Advertising is timed out due to high duty cycle Directed Advertising. In these cases, advertising is then disabled.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.9].

                                                        Input parameters

                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Enable

                                                        1

                                                        -

                                                        Enable/disable advertise. Default is 0 (disabled).

                                                        +

                                                        Enable/disable advertising.

                                                      • 0x00: Advertising is disabled
                                                      • 0x01: Advertising is enabled

                                                        • Output parameters

                                                        @@ -1243,31 +1272,22 @@ Accuracy: +/- 4 dBm

                                                         + + + +
                                                        ParameterSizeDescriptionPossible values
                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Type

                                                        1

                                                        -

                                                        Passive or active scanning. With active scanning SCAN_REQ packets are sent.

                                                        -
                                                      • 0x00: Passive Scanning
                                                      • 0x01: Active scanning

                                                        • Passive or active scanning. With passive scanning, no scan request PDUs are sent.

                                                        +
                                                      • 0x00: Passive scanning
                                                      • 0x01: Active scanning

                                                        • LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -
                                                        -
                                                        Own address type.
                                                        -
                                                          -
                                                        • 0x00: Public Device Address
                                                          • -
                                                        • 0x01 Random Device Address
                                                          • -
                                                        • 0x02: Controller generates Resolvable Private Address based on the local IRK from resolving list. If resolving list contains no matching entry, use public address.
                                                          • -
                                                        • 0x03: Controller generates Resolvable Private Address based on the local IRK from resolving list. If resolving list contains no matching entry, use random address from LE_Set_Random_Address.
                                                          • -
                                                        -
                                                        -
                                                        -
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address or Public Address
                                                      • 0x03: Resolvable Private Address or Random Address

                                                        • Own address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address if available, otherwise Public Address
                                                      • 0x03: Resolvable Private Address if available, otherwise Random Address

                                                        • Scanning_Filter_Policy

                                                        1

                                                        0x00 Accept all advertisement packets. Directed advertising packets which are not addressed for this device shall be ignored. @@ -1285,7 +1305,7 @@ Time = N * 0.625 msec.

                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Enable

                                                        1

                                                        -

                                                        Enable/disable scan. Default is 0 (disabled).

                                                        +

                                                        Enable/disable scan.

                                                      • 0x00: Scanning disabled
                                                      • 0x01: Scanning enabled

                                                        • Filter_Duplicates

                                                        1

                                                        @@ -1302,20 +1322,17 @@ Time = N * 0.625 msec.

                                                        LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Initiator_Filter_Policy

                                                        1

                                                        -

                                                        0x00 White list is not used to determine which advertiser to connect to. -Peer_Address_Type and Peer_Address shall be used. -0x01 White list is used to determine which advertiser to connect to. -Peer_Address_Type and Peer_Address shall be ignored.

                                                        -
                                                      • 0x00: White list not used
                                                      • 0x01: White list used

                                                        • Initiator filter policy.

                                                        +
                                                      • 0x00: White list is not used
                                                      • 0x01: White list is used

                                                        • Peer_Address_Type

                                                        1

                                                        Address type @@ -1330,26 +1347,17 @@ Peer_Address_Type and Peer_Address shall be ignored.

                                                        Own_Address_Type

                                                        1

                                                        -
                                                        -
                                                        Own address type.
                                                        -
                                                          -
                                                        • 0x00: Public Device Address
                                                          • -
                                                        • 0x01 Random Device Address
                                                          • -
                                                        • 0x02: Controller generates Resolvable Private Address based on the local IRK from resolving list. If resolving list contains no matching entry, use public address.
                                                          • -
                                                        • 0x03: Controller generates Resolvable Private Address based on the local IRK from resolving list. If resolving list contains no matching entry, use random address from LE_Set_Random_Address.
                                                          • -
                                                        -
                                                        -
                                                        -
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address or Public Address
                                                      • 0x03: Resolvable Private Address or Random Address

                                                        • Own address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address if available, otherwise Public Address
                                                      • 0x03: Resolvable Private Address if available, otherwise Random Address

                                                        • Conn_Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -1359,17 +1367,17 @@ Time = N * 1.25 msec.

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Minimum_CE_Length

                                                        2

                                                        Information parameter about the minimum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Maximum_CE_Length

                                                        2

                                                        Information parameter about the maximum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Output parameters

                                                        @@ -1440,12 +1448,12 @@ Time = N * 0.625 msec.

                                                        ParameterSizeDescriptionPossible values

                                                        Conn_Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -1455,17 +1463,17 @@ Time = N * 1.25 msec.

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Minimum_CE_Length

                                                        2

                                                        Information parameter about the minimum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Maximum_CE_Length

                                                        2

                                                        Information parameter about the maximum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Output parameters

                                                        @@ -1557,7 +1565,7 @@ The most significant bits are reserved and shall be set to 0.

                                                         -
                                                        ParameterSizeDescriptionPossible values

                                                        8

                                                        Random Number

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_START_ENCRYPTION

                                                        Description

                                                        The LE_Start_Encryption command is used to authenticate the given encryption key associated with the remote device specified by the connection handle, and once authenticated will encrypt the connection. The parameters are as defined in [Vol 3] Part H, Section 2.4.4.
                                                        If the connection is already encrypted then the Controller shall pause connection encryption before attempting to authenticate the given encryption key, and then re-encrypt the connection. While encryption is paused no user data shall be transmitted.
                                                        On an authentication failure, the connection shall be automatically disconnected by the Link Layer. If this command succeeds, then the connection shall be encrypted.
                                                        This command shall only be used when the local device's role is Master.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.24].

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_ENABLE_ENCRYPTION

                                                        Description

                                                        The LE_Enable_Encryption command is used to authenticate the given encryption key associated with the remote device specified by the connection handle, and once authenticated will encrypt the connection. The parameters are as defined in [Vol 3] Part H, Section 2.4.4.
                                                        If the connection is already encrypted then the Controller shall pause connection encryption before attempting to authenticate the given encryption key, and then re-encrypt the connection. While encryption is paused no user data shall be transmitted.
                                                        On an authentication failure, the connection shall be automatically disconnected by the Link Layer. If this command succeeds, then the connection shall be encrypted.
                                                        This command shall only be used when the local device's role is Master.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.24].

                                                        Input parameters

                                                        -
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        @@ -1601,7 +1609,7 @@ The most significant bits are reserved and shall be set to 0.

                                                        2

                                                        Connection handle for which the event applies.

                                                      • 0x0000 ... 0x0EFF

                                                        • Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_LONG_TERM_KEY_REQUESTED_NEGATIVE_REPLY

                                                        Description

                                                        The LE_Long_Term_Key_Request_Negative_Reply command is used to reply to an LE Long Term Key Request event from the Controller if the Host cannot provide a Long Term Key for this Connection_Handle.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.26].

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY

                                                        Description

                                                        The LE_Long_Term_Key_Request_Negative_Reply command is used to reply to an LE Long Term Key Request event from the Controller if the Host cannot provide a Long Term Key for this Connection_Handle.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.26].

                                                        Input parameters

                                                        + +
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        @@ -1867,13 +1875,11 @@ Default: N= 0x0384 (900 secs or 15 minutes)

                                                        TX_PHY

                                                        1

                                                        Transmitter PHY in use

                                                        -
                                                      • 0x01: The transmitter PHY for the connection is LE 1M
                                                      • 0x02: The transmitter PHY for the connection is LE 2M
                                                      • 0x03: The transmitter PHY for the connection is LE Coded -(Not supported by STM32WB)
                                                      • 0x01: The transmitter PHY for the connection is LE 1M
                                                      • 0x02: The transmitter PHY for the connection is LE 2M
                                                      • 0x03: The transmitter PHY for the connection is LE Coded (not supported)

                                                        • RX_PHY

                                                        1

                                                        Receiver PHY in use

                                                        -
                                                      • 0x01: The receiver PHY for the connection is LE 1M
                                                      • 0x02: The receiver PHY for the connection is LE 2M
                                                      • 0x03: The receiver PHY for the connection is LE Coded -(Not supported by STM32WB)
                                                      • 0x01: The receiver PHY for the connection is LE 1M
                                                      • 0x02: The receiver PHY for the connection is LE 2M
                                                      • 0x03: The receiver PHY for the connection is LE Coded (not supported)

                                                        • Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_DEFAULT_PHY

                                                        Description

                                                        The LE_Set_Default_PHY command allows the Host to specify its preferred values for the transmitter PHY and receiver PHY to be used for all subsequent connections over the LE transport.
                                                        The ALL_PHYS parameter is a bit field that allows the Host to specify, for each
                                                        direction, whether it has no preference among the PHYs that the Controller supports in a given direction or whether it has specified particular PHYs that it prefers in the TX_PHYS or RX_PHYS parameter.
                                                        The TX_PHYS parameter is a bit field that indicates the transmitter PHYs that the Host prefers the Controller to use. If the ALL_PHYS parameter specifies that the Host has no preference, the TX_PHYS parameter is ignored; otherwise at least one bit shall be set to 1.
                                                        The RX_PHYS parameter is a bit field that indicates the receiver PHYs that the Host prefers the Controller to use. If the ALL_PHYS parameter specifies that the Host has no preference, the RX_PHYS parameter is ignored; otherwise at least one bit shall be set to 1.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.48].

                                                        Input parameters

                                                        -
                                                        ParameterSizeDescriptionPossible values

                                                        ALL_PHYS

                                                        @@ -1922,7 +1928,348 @@ Default: N= 0x0384 (900 secs or 15 minutes)

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • HCI_LE_PHY_UPDATE_COMPLETE_EVENT

                                                        • HCI_LE_READ_TRANSMIT_POWER

                                                        Description

                                                        This command is used to read the minimum and maximum transmit powers supported by the Controller.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.74].

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • HCI_LE_PHY_UPDATE_COMPLETE_EVENT

                                                        • HCI_LE_SET_ADVERTISING_SET_RANDOM_ADDRESS

                                                        Description

                                                        This command is used by the Host to set the random device address specified by the Random_Address parameter.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.52].

                                                        Input parameters

                                                        + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Random_Address

                                                        +

                                                        6

                                                        +

                                                        Random Device Address.

                                                        +

                                                        Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_EXTENDED_ADVERTISING_PARAMETERS

                                                        Description

                                                        This command is used by the Host to set the extended advertising parameters.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.53].

                                                        Input parameters

                                                        + + + + + + + + + + + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Adv_Event_Properties

                                                        +

                                                        2

                                                        +

                                                        Type of advertising event.

                                                        +

                                                        Bitmask of:

                                                      • 0x0001: Connectable advertising
                                                      • 0x0002: Scannable advertising
                                                      • 0x0004: Directed advertising
                                                      • 0x0008: High Duty Cycle Directed Connectable advertising
                                                      • 0x0010: Use legacy advertising PDUs
                                                      • 0x0020: Anonymous advertising
                                                      • 0x0040: Include TxPower in at least one advertising PDU

                                                        • Primary_Adv_Interval_Min

                                                        +

                                                        3

                                                        +

                                                        Minimum advertising interval. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x000020 (20.000 ms) ... 0xFFFFFF (10485759.375 ms)

                                                        • Primary_Adv_Interval_Max

                                                        +

                                                        3

                                                        +

                                                        Maximum advertising interval. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x000020 (20.000 ms) ... 0xFFFFFF (10485759.375 ms)

                                                        • Primary_Adv_Channel_Map

                                                        +

                                                        1

                                                        +

                                                        Advertising channel map.

                                                        +

                                                        Bitmask of:

                                                      • 0x01: Channel 37 shall be used
                                                      • 0x02: Channel 38 shall be used
                                                      • 0x04: Channel 39 shall be used

                                                        • Own_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Own address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address if available, otherwise Public Address
                                                      • 0x03: Resolvable Private Address if available, otherwise Random Address

                                                        • Peer_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Address type of the peer device.

                                                        +
                                                      • 0x00: Public Device Address or Public Identity Address
                                                      • 0x01: Random Device Address or Random (static) Identity Address

                                                        • Peer_Address

                                                        +

                                                        6

                                                        +

                                                        Public Device Address, Random Device Address, Public Identity Address, or Random (static) Identity Address of the device to be connected.

                                                        +

                                                        Adv_Filter_Policy

                                                        +

                                                        1

                                                        +

                                                        Advertising filter policy

                                                        +
                                                      • 0x00: Process scan and connection requests from all devices (i.e., the White List is not in use)
                                                      • 0x01: Process connection requests from all devices and scan requests only from devices that are in the White List.
                                                      • 0x02: Process scan requests from all devices and connection requests only from devices that are in the White List.
                                                      • 0x03: Process scan and connection requests only from devices in the White List.

                                                        • Adv_TX_Power

                                                        +

                                                        1

                                                        +

                                                        Advertising TX power. Units: dBm.

                                                        +
                                                      • -127 ... 20

                                                        • Primary_Adv_PHY

                                                        +

                                                        1

                                                        +

                                                        Primary advertising PHY.

                                                        +
                                                      • 0x01: Primary advertisement PHY is LE 1M
                                                      • 0x03: Primary advertisement PHY is LE Coded (not supported)

                                                        • Secondary_Adv_Max_Skip

                                                        +

                                                        1

                                                        +

                                                        Secondary advertising maximum skip.

                                                        +
                                                      • 0x00: AUX_ADV_IND shall be sent prior to the next advertising event
                                                      • 0x01 ... 0xFF: Maximum advertising events the Controller can skip before sending the AUX_ADV_IND packets on the secondary advertising physical channel

                                                        • Secondary_Adv_PHY

                                                        +

                                                        1

                                                        +

                                                        Secondary advertising PHY.

                                                        +
                                                      • 0x01: Secondary advertisement PHY is LE 1M
                                                      • 0x02: Secondary advertisement PHY is LE 2M
                                                      • 0x03: Secondary advertisement PHY is LE Coded (not supported)

                                                        • Adv_SID

                                                        +

                                                        1

                                                        +

                                                        Value of the Advertising SID subfield in the ADI field of the PDU.

                                                        +
                                                      • 0x00 ... 0x0F

                                                        • Scan_Req_Notification_Enable

                                                        +

                                                        1

                                                        +

                                                        Scan request notifications.

                                                        +
                                                      • 0x00: Scan request notifications disabled
                                                      • 0x01: Scan request notifications enabled

                                                        • Output parameters

                                                        + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Selected_TX_Power

                                                        +

                                                        1

                                                        +

                                                        Power level selected by the Controller. Units: dBm.

                                                        +
                                                      • -127 ... 20

                                                        • Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_EXTENDED_ADVERTISING_DATA

                                                        Description

                                                        This command is used to set the data used in extended advertising PDUs that have a data field.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.54].

                                                        Input parameters

                                                        + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Operation

                                                        +

                                                        1

                                                        +

                                                        Advertising operation.

                                                        +
                                                      • 0x00: Intermediate fragment of fragmented extended advertising data
                                                      • 0x01: First fragment of fragmented extended advertising data
                                                      • 0x02: Last fragment of fragmented extended advertising data
                                                      • 0x03: Complete extended advertising data
                                                      • 0x04: Unchanged data (just update the Advertising DID)

                                                        • Fragment_Preference

                                                        +

                                                        1

                                                        +

                                                        Fragment preference.

                                                        +
                                                      • 0x00: The Controller may fragment all data
                                                      • 0x01: The Controller should not fragment or should minimize fragmentation of data

                                                        • Advertising_Data_Length

                                                        +

                                                        1

                                                        +

                                                        Length of Advertising_Data in octets

                                                        +

                                                        Advertising_Data

                                                        +

                                                        Advertising_Data_Length

                                                        +

                                                        Data formatted as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 11].

                                                        +

                                                        Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_EXTENDED_SCAN_RESPONSE_DATA

                                                        Description

                                                        This command is used to provide scan response data used in scanning response PDUs during extended advertising.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.55].

                                                        Input parameters

                                                        + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Operation

                                                        +

                                                        1

                                                        +

                                                        Scan response operation.

                                                        +
                                                      • 0x00: Intermediate fragment of fragmented scan response data
                                                      • 0x01: First fragment of fragmented scan response data
                                                      • 0x02: Last fragment of fragmented scan response data
                                                      • 0x03: Complete scan response data

                                                        • Fragment_Preference

                                                        +

                                                        1

                                                        +

                                                        Fragment preference.

                                                        +
                                                      • 0x00: The Controller may fragment all data
                                                      • 0x01: The Controller should not fragment or should minimize fragmentation of data

                                                        • Scan_Response_Data_Length

                                                        +

                                                        1

                                                        +

                                                        Length of Scan_Response_Data in octets

                                                        +

                                                        Scan_Response_Data

                                                        +

                                                        Scan_Response_Data_Length

                                                        +

                                                        Data formatted as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 11].

                                                        +

                                                        Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_EXTENDED_ADVERTISING_ENABLE

                                                        Description

                                                        This command is used to request the Controller to enable or disable one or more advertising sets using the advertising sets identified by the Advertising_Handle[i] parameter.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.56].

                                                        Input parameters

                                                        + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Enable

                                                        +

                                                        1

                                                        +

                                                        Enable/disable advertising.

                                                        +
                                                      • 0x00: Advertising is disabled
                                                      • 0x01: Advertising is enabled

                                                        • Num_Sets

                                                        +

                                                        1

                                                        +

                                                        Number of advertising sets.

                                                        +
                                                      • 0x00: Disable all advertising sets
                                                      • 0x01 ... 0x3F: Number of advertising sets to enable or disable

                                                        • Advertising_Handle[i]

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Duration[i]

                                                        +

                                                        2

                                                        +

                                                        Duration of advertising set. +Time = N * 10 ms.

                                                        +
                                                      • 0x0000 (0 ms) : No advertising duration.
                                                      • 0x0001 (10 ms) ... 0xFFFF (655350 ms) : Advertising duration

                                                        • Max_Extended_Advertising_Events[i]

                                                        +

                                                        1

                                                        +

                                                        Maximum number of advertising events.

                                                        +
                                                      • 0x00: No maximum number of advertising events
                                                      • 0x01 ... 0xFF: Maximum number of extended advertising events the Controller shall attempt to send prior to terminating the extended advertising

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT
                                                      • HCI_LE_ADVERTISING_SET_TERMINATED_EVENT
                                                      • HCI_LE_CONNECTION_COMPLETE_EVENT

                                                        • HCI_LE_READ_MAXIMUM_ADVERTISING_DATA_LENGTH

                                                        Description

                                                        This command is used to read the maximum length of data supported by the Controller for use as advertisement data or scan response data in an extended advertising event.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.57].

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Max_Advertising_Data_Length

                                                        +

                                                        2

                                                        +

                                                        Maximum supported advertising data length.

                                                        +
                                                      • 0x001F ... 0x0672

                                                        • Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_READ_NUMBER_OF_SUPPORTED_ADVERTISING_SETS

                                                        Description

                                                        This command is used to read the maximum number of advertising sets supported by the Controller at the same time during extended advertising.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.58].

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Num_Supported_Advertising_Sets

                                                        +

                                                        1

                                                        +

                                                        Number of advertising sets supported at the same time.

                                                        +
                                                      • 0x01 ... 0xF0

                                                        • Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_REMOVE_ADVERTISING_SET

                                                        Description

                                                        This command is used to remove an advertising set from the Controller.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.59].

                                                        Input parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_CLEAR_ADVERTISING_SETS

                                                        Description

                                                        This command is used to remove all existing advertising sets from the Controller.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.60].

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_EXTENDED_SCAN_PARAMETERS

                                                        Description

                                                        This command is used to set the extended scan parameters to be used on the advertising physical channels.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.64].

                                                        Input parameters

                                                        + + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Own_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Own address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address if available, otherwise Public Address
                                                      • 0x03: Resolvable Private Address if available, otherwise Random Address

                                                        • Scanning_Filter_Policy

                                                        +

                                                        1

                                                        +

                                                        Scan filter policy.

                                                        +
                                                      • 0x00: Accept all advertising and scan response PDUs except directed advertising PDUs not addressed to this device
                                                      • 0x01: Accept only advertising and scan response PDUs from devices where the advertiser's address is in the White List. Directed advertising PDUs which are not addressed to this device shall be ignored.
                                                      • 0x02: Accept all advertising and scan response PDUs except directed advertising PDUs where the identity address corresponding to TargetA does not address this device.
                                                      • 0x03: Accept all advertising and scan response PDUs except advertising and scan response PDUs where the advertiser's identity address is not in the White List; and directed advertising PDUs where the identity address corresponding to TargetA does not address this device.

                                                        • Scanning_PHYs

                                                        +

                                                        1

                                                        +

                                                        Scan PHYs.

                                                        +

                                                        Bitmask of:

                                                      • 0x01: Scan advertisements on the LE 1M PHY
                                                      • 0x04: Scan advertisements on the LE Coded PHY (not supported)

                                                        • Scan_Type

                                                        +

                                                        1

                                                        +

                                                        Passive or active scanning. With passive scanning, no scan request PDUs are sent.

                                                        +
                                                      • 0x00: Passive scanning
                                                      • 0x01: Active scanning

                                                        • Scan_Interval

                                                        +

                                                        2

                                                        +

                                                        Time interval from when the Controller started its last scan until it begins the subsequent scan on the primary advertising physical channel. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms)

                                                        • Scan_Window

                                                        +

                                                        2

                                                        +

                                                        Duration of the scan on the primary advertising physical channel. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms)

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_SET_EXTENDED_SCAN_ENABLE

                                                        Description

                                                        This command is used to enable or disable extended scanning.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.65].

                                                        Input parameters

                                                        + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Enable

                                                        +

                                                        1

                                                        +

                                                        Enable/disable scan.

                                                        +
                                                      • 0x00: Scanning disabled
                                                      • 0x01: Scanning enabled

                                                        • Filter_Duplicates

                                                        +

                                                        1

                                                        +

                                                        Duplicate filtering.

                                                        +
                                                      • 0x00: Duplicate filtering disabled
                                                      • 0x01: Duplicate filtering enabled
                                                      • 0x02: Duplicate filtering enabled, reset for each scan period

                                                        • Duration

                                                        +

                                                        2

                                                        +

                                                        Scan duration. +Time = N * 10 ms.

                                                        +
                                                      • 0x0000 (0 ms) : Scan continuously until explicitly disable
                                                      • 0x0001 (10 ms) ... 0xFFFF (655350 ms) : Scan duration

                                                        • Period

                                                        +

                                                        2

                                                        +

                                                        Scan period. +Time = N * 1.28 s.

                                                        +
                                                      • 0x0000 (0 ms) : Scan continuously
                                                      • 0x0001 (1280 ms) ... 0xFFFF (83884800 ms) : Time interval from when the Controller started its last Scan_Duration until it begins the subsequent Scan_Duration

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT
                                                      • HCI_LE_EXTENDED_ADVERTISING_REPORT_EVENT

                                                        • HCI_LE_EXTENDED_CREATE_CONNECTION

                                                        Description

                                                        This command is used to create an ACL connection to a connectable advertiser by means of extended scanning.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.66].

                                                        Input parameters

                                                        + + + + + + + + + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Initiator_Filter_Policy

                                                        +

                                                        1

                                                        +

                                                        Initiator filter policy.

                                                        +
                                                      • 0x00: White list is not used
                                                      • 0x01: White list is used

                                                        • Own_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Own address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Resolvable Private Address if available, otherwise Public Address
                                                      • 0x03: Resolvable Private Address if available, otherwise Random Address

                                                        • Peer_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Address type of the peer device.

                                                        +
                                                      • 0x00: Public Device Address or Public Identity Address
                                                      • 0x01: Random Device Address or Random (static) Identity Address

                                                        • Peer_Address

                                                        +

                                                        6

                                                        +

                                                        Public Device Address, Random Device Address, Public Identity Address, or Random (static) Identity Address of the device to be connected.

                                                        +

                                                        Initiating_PHYs

                                                        +

                                                        1

                                                        +

                                                        Initiating PHYs.

                                                        +
                                                      • 0: Scan connectable advertisements on the LE 1M PHY- Connection parameters for the LE 1M PHY
                                                      • 1: Connection parameters for the LE 2M PHY
                                                      • 2: Scan connectable advertisements on the LE Coded PHY (not supported)

                                                        • Scan_Interval

                                                        +

                                                        2

                                                        +

                                                        Time interval from when the Controller started its last scan until it begins the subsequent scan on the primary advertising physical channel. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms)

                                                        • Scan_Window

                                                        +

                                                        2

                                                        +

                                                        Duration of the scan on the primary advertising physical channel. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x0004 (2.500 ms) ... 0xFFFF (40959.375 ms)

                                                        • Conn_Interval_Min

                                                        +

                                                        2

                                                        +

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. +Time = N * 1.25 ms.

                                                        +
                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        +

                                                        2

                                                        +

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. +Time = N * 1.25 ms.

                                                        +
                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        +

                                                        2

                                                        +

                                                        Slave latency for the connection in number of connection events.

                                                        +
                                                      • 0x0000 ... 0x01F3

                                                        • Supervision_Timeout

                                                        +

                                                        2

                                                        +

                                                        Supervision timeout for the LE Link. +It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. +Time = N * 10 ms.

                                                        +
                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Min_CE_Length

                                                        +

                                                        2

                                                        +

                                                        Information parameter about the minimum length of connection needed for this LE connection. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Max_CE_Length

                                                        +

                                                        2

                                                        +

                                                        Information parameter about the maximum length of connection needed for this LE connection. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • HCI_LE_ENHANCED_CONNECTION_COMPLETE_EVENT

                                                        • HCI_LE_READ_TRANSMIT_POWER

                                                        Description

                                                        This command is used to read the minimum and maximum transmit powers supported by the Controller.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.74].

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        - -
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        1

                                                        @@ -1973,10 +2320,10 @@ Default: N= 0x0384 (900 secs or 15 minutes)

                                                        Y

                                                        Y

                                                        HCI_LE_ENHANCED_RECEIVER_TEST

                                                        0x2033

                                                        +
                                                        HCI_LE_RECEIVER_TEST_V2

                                                        0x2033

                                                        Y

                                                        HCI_LE_ENHANCED_TRANSMITTER_TEST

                                                        0x2034

                                                        +
                                                        HCI_LE_TRANSMITTER_TEST_V2

                                                        0x2034

                                                        Y

                                                        HCI_LE_RECEIVER_TEST

                                                        Description

                                                        This command is used to start a test where the DUT receives test reference packets at a fixed interval. The tester generates the test reference packets.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.28].

                                                        Input parameters

                                                        @@ -2023,7 +2370,7 @@ Frequency Range : 2402 MHz to 2480 MHz

                                                         -

                                                        2

                                                        Number of packets received

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_ENHANCED_RECEIVER_TEST

                                                        Description

                                                        This command is used to start a test where the DUT receives test reference packets at a fixed interval. The tester generates the test reference packets.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.50].

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_RECEIVER_TEST_V2

                                                        Description

                                                        This command is used to start a test where the DUT receives test reference packets at a fixed interval. The tester generates the test reference packets.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.50].

                                                        Input parameters

                                                        -
                                                        ParameterSizeDescriptionPossible values

                                                        RX_Frequency

                                                        1

                                                        @@ -2044,7 +2391,7 @@ Frequency Range : 2402 MHz to 2480 MHz

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_ENHANCED_TRANSMITTER_TEST

                                                        Description

                                                        This command is used to start a test where the DUT generates test reference packets at a fixed interval. The Controller shall transmit at maximum power.
                                                        An LE Controller supporting the LE_Enhanced Transmitter_Test command shall support Packet_Payload values 0x00, 0x01 and 0x02. An LE Controller supporting the LE Coded PHY shall also support Packet_Payload value 0x04 (not supported by STM32WB). An LE Controller may support other values of Packet_Payload.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.51].

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • HCI_LE_TRANSMITTER_TEST_V2

                                                        Description

                                                        This command is used to start a test where the DUT generates test reference packets at a fixed interval. The Controller shall transmit at maximum power.
                                                        An LE Controller supporting this command shall support Packet_Payload values 0x00, 0x01 and 0x02. An LE Controller supporting the LE Coded PHY shall also support Packet_Payload value 0x04 (not supported by STM32WB). An LE Controller may support other values of Packet_Payload.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.8.51].

                                                        Input parameters

                                                        +Identity root key used to derive LTK and CSRK; 16 bytes
                                                      • 0x2E: CONFIG_DATA_RANDOM_ADDRESS_OFFSET; +Static Random Address; 6 bytes
                                                      • 0xB0: CONFIG_DATA_SMP_MODE_OFFSET; +SMP mode (0: normal, 1:bypass); 1 byte
                                                        • ParameterSizeDescriptionPossible values

                                                        TX_Frequency

                                                        1

                                                        @@ -2166,13 +2513,13 @@ Frequency Range : 2402 MHz to 2480 MHz

                                                        ParameterSizeDescriptionPossible values

                                                        Offset

                                                        1

                                                        -

                                                        Offset of the element in the configuration data structure -which has to be written.

                                                        +

                                                        Offset of the element in the configuration data structure which has to be written.

                                                      • 0x00: CONFIG_DATA_PUBADDR_OFFSET; Bluetooth public address; 6 bytes
                                                      • 0x08: CONFIG_DATA_ER_OFFSET; Encryption root key used to derive LTK and CSRK; 16 bytes
                                                      • 0x18: CONFIG_DATA_IR_OFFSET; -Identity root key used to derive LTK and CSRK; 16 bytes
                                                      • 0x2E: CONFIG_DATA_RANDOM_ADDRESS_WR; -Static Random Address; 6 bytes

                                                        • Length

                                                        1

                                                        Length of data to be written

                                                        @@ -2196,7 +2543,7 @@ which has to be read.

                                                      • 0x00: CONFIG_DATA_PUBADDR_OFFSET; Bluetooth public address; 6 bytes
                                                      • 0x08: CONFIG_DATA_ER_OFFSET; Encryption root key used to derive LTK and CSRK; 16 bytes
                                                      • 0x18: CONFIG_DATA_IR_OFFSET -Identity root key used to derive LTK and CSRK; 16 bytes
                                                      • 0x2E: CONFIG_DATA_RANDOM_ADDRESS_WR; +Identity root key used to derive LTK and CSRK; 16 bytes
                                                      • 0x2E: CONFIG_DATA_RANDOM_ADDRESS_OFFSET; Static Random Address; 6 bytes

                                                        • Output parameters

                                                        @@ -2508,9 +2855,6 @@ frequency deviation (250kHz).

                                                         - @@ -2573,12 +2917,28 @@ frequency deviation (250kHz).

                                                         + + + + + + +
                                                        ParameterSizeDescriptionPossible values
                                                        ACI_GAP_START_GENERAL_DISCOVERY_PROC

                                                        0xFC97

                                                        Y

                                                        ACI_GAP_START_NAME_DISCOVERY_PROC

                                                        0xFC98

                                                        -

                                                        Y

                                                        -
                                                        ACI_GAP_START_AUTO_CONNECTION_ESTABLISH_PROC

                                                        0xFC99

                                                        Y

                                                        Y

                                                        Y

                                                        ACI_GAP_ADD_DEVICES_TO_LIST

                                                        0xFCAB

                                                        +

                                                        Y

                                                        +

                                                        Y

                                                        +
                                                        ACI_GAP_ADDITIONAL_BEACON_START

                                                        0xFCB0

                                                        ACI_GAP_ADDITIONAL_BEACON_STOP

                                                        0xFCB1

                                                        ACI_GAP_ADDITIONAL_BEACON_SET_DATA

                                                        0xFCB2

                                                        ACI_GAP_ADV_SET_CONFIGURATION

                                                        0xFCC0

                                                        +
                                                        ACI_GAP_ADV_SET_ENABLE

                                                        0xFCC1

                                                        +
                                                        ACI_GAP_ADV_SET_ADV_DATA

                                                        0xFCC2

                                                        +
                                                        ACI_GAP_ADV_SET_SCAN_RESP_DATA

                                                        0xFCC3

                                                        +
                                                        ACI_GAP_ADV_REMOVE_SET

                                                        0xFCC4

                                                        +
                                                        ACI_GAP_ADV_CLEAR_SETS

                                                        0xFCC5

                                                        +

                                                        ACI_GAP_SET_NON_DISCOVERABLE

                                                        Description

                                                        Put the device in non-discoverable mode. This command disables the LL advertising.

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        + + -
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        @@ -2594,21 +2954,17 @@ frequency deviation (250kHz).

                                                        Advertising_Interval_Min

                                                        2

                                                        Minimum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Advertising_Interval_Max

                                                        2

                                                        Maximum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Advertising_Filter_Policy

                                                        1

                                                        Advertising filter policy: not applicable (the value of Advertising_Filter_Policy parameter is not used inside the Stack)

                                                        @@ -2660,21 +3016,17 @@ connIntervalmax = Slave_Conn_Interval_Max x 1.25ms

                                                        Advertising_Interval_Min

                                                        2

                                                        Minimum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Advertising_Interval_Max

                                                        2

                                                        Maximum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Advertising_Filter_Policy

                                                        1

                                                        Advertising filter policy: not applicable (the value of Advertising_Filter_Policy parameter is not used inside the Stack)

                                                        @@ -2717,15 +3069,12 @@ connIntervalmax = Slave_Conn_Interval_Max x 1.25ms

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_SET_DIRECT_CONNECTABLE

                                                        Description

                                                        Set the device in direct connectable mode (as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 9.3.3]). Device uses direct connectable mode to advertise using High Duty cycle advertisement events or Low Duty cycle advertisement events and the address as either what is specified in the Own Address Type parameter. The command specifies the type of the advertising used.
                                                        If the privacy is enabled, the Type parameter in reconnection address is used for advertising, otherwise the address of the type specified in OwnAddrType is used.
                                                        The device stays in directed connectable mode only for 1.28 seconds. If no connection is established within this duration, the device enters non discoverable mode and advertising has to be again enabled explicitly.
                                                        The controller generates a HCI_LE_CONNECTION_COMPLETE_EVENT event with the status set to HCI_ADVERTISING_TIMEOUT_ERR_CODE if the connection was not established and BLE_STATUS_SUCCESS (0x00) if the connection was successfully established.
                                                        If Host privacy is enabled this command returns BLE_STATUS_INVALID_PARAMS.

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_SET_DIRECT_CONNECTABLE

                                                        Description

                                                        Set the device in direct connectable mode (as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 9.3.3]). Device uses direct connectable mode to advertise using High Duty cycle advertisement events or Low Duty cycle advertisement events and the address as either what is specified in the Own Address Type parameter. The command specifies the type of the advertising used.
                                                        If the privacy is enabled, the Type parameter in reconnection address is used for advertising, otherwise the address of the type specified in OwnAddrType is used.
                                                        The device stays in directed connectable mode only for 1.28 seconds. If no connection is established within this duration, the device enters non discoverable mode and advertising has to be again enabled explicitly.
                                                        The controller generates a HCI_LE_CONNECTION_COMPLETE_EVENT event with the status set to HCI_ADVERTISING_TIMEOUT_ERR_CODE if the connection was not established and BLE_STATUS_SUCCESS (0x00) if the connection was successfully established.

                                                        Input parameters

                                                        +
                                                        ParameterSizeDescriptionPossible values

                                                        Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address

                                                        • Directed_Advertising_Type

                                                        1

                                                        Advertising type

                                                        @@ -2736,17 +3085,17 @@ connIntervalmax = Slave_Conn_Interval_Max x 1.25ms

                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address

                                                        • Direct_Address

                                                        6

                                                        -

                                                        Initiator Bluetooth address

                                                        +

                                                        Initiator address

                                                        Advertising_Interval_Min

                                                        2

                                                        Minimum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0006 (3.750 ms) : for High Duty Cycle Directed Advertising
                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) : for Low Duty Cycle Directed Advertising

                                                        • Advertising_Interval_Max

                                                        2

                                                        Maximum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0006 (3.750 ms) : for High Duty Cycle Directed Advertising
                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms) : for Low Duty Cycle Directed Advertising

                                                        • Output parameters

                                                        @@ -2870,8 +3219,8 @@ Must be a six-digit decimal number.

                                                         + +
                                                        ParameterSizeDescriptionPossible values

                                                        Bitmask of:

                                                      • 0x01: Peripheral
                                                      • 0x02: Broadcaster
                                                      • 0x04: Central
                                                      • 0x08: Observer

                                                        • privacy_enabled

                                                        1

                                                        -

                                                        Specify if privacy is enabled or not and which one .

                                                        -
                                                      • 0x00: Privacy disabled
                                                      • 0x01: Privacy host enabled
                                                      • 0x02: Privacy controller enabled

                                                        • This paremeter specifies if Privacy is enabled or not. N.B.: only Controller Privacy is supported.

                                                        +
                                                      • 0x00: Privacy disabled
                                                      • 0x02: Privacy enabled

                                                        • device_name_char_len

                                                        1

                                                        Length of the device name characteristic

                                                        @@ -2902,12 +3251,8 @@ Must be a six-digit decimal number.

                                                      • 0x02: ADV_SCAN_IND (Scannable undirected advertising)
                                                      • 0x03: ADV_NONCONN_IND (Non connectable undirected advertising)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Output parameters

                                                        + + + -
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        @@ -2919,21 +3264,17 @@ Must be a six-digit decimal number.

                                                        Advertising_Interval_Min

                                                        2

                                                        Minimum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Advertising_Interval_Max

                                                        2

                                                        Maximum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if Host privacy (i.e. privacy 1.1) is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address

                                                        • Adv_Filter_Policy

                                                        1

                                                        Advertising filter policy.

                                                        @@ -3061,21 +3402,17 @@ Time = N * 0.625 msec.

                                                        LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Filter_Duplicates

                                                        1

                                                        Enable/disable duplicate filtering.

                                                        @@ -3091,21 +3428,17 @@ Time = N * 0.625 msec.

                                                        LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Filter_Duplicates

                                                        1

                                                        Enable/disable duplicate filtering.

                                                        @@ -3116,99 +3449,31 @@ Time = N * 0.625 msec.

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • HCI_LE_ADVERTISING_REPORT_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_START_NAME_DISCOVERY_PROC

                                                        Description

                                                        Start the name discovery procedure. A LE_Create_Connection call will be made to the controller by GAP with the initiator filter policy set to "ignore whitelist and process connectable advertising packets only for the specified device". Once a connection is established, GATT procedure is started to read the device name characteristic. When the read is completed (successfully or unsuccessfully), a ACI_GAP_PROC_COMPLETE_EVENT event is given to the upper layer. The event also contains the name of the device if the device name was read successfully.

                                                        Input parameters

                                                        - - - - - - - - - - - - -
                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Interval

                                                        -

                                                        2

                                                        -

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        -
                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        -

                                                        2

                                                        -

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        -
                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Peer_Address_Type

                                                        -

                                                        1

                                                        -

                                                        Address type.

                                                        -
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address

                                                        • Peer_Address

                                                        -

                                                        6

                                                        -

                                                        Public Device Address or Random Device Address of the device to be connected.

                                                        -

                                                        Own_Address_Type

                                                        -

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Conn_Interval_Min

                                                        -

                                                        2

                                                        -

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        -
                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        -

                                                        2

                                                        -

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        -
                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        -

                                                        2

                                                        -

                                                        Slave latency for the connection in number of connection events.

                                                        -
                                                      • 0x0000 ... 0x01F3

                                                        • Supervision_Timeout

                                                        -

                                                        2

                                                        -

                                                        Supervision timeout for the LE Link. -It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        -
                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Minimum_CE_Length

                                                        -

                                                        2

                                                        -

                                                        Information parameter about the minimum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        -
                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Maximum_CE_Length

                                                        -

                                                        2

                                                        -

                                                        Information parameter about the maximum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        -
                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Output parameters

                                                        - - -
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        -

                                                        1

                                                        -

                                                        Status error code.

                                                        -

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_START_AUTO_CONNECTION_ESTABLISH_PROC

                                                        Description

                                                        Start the auto connection establishment procedure. The devices specified are added to the whitelist of the controller and a LE_Create_Connection call will be made to the controller by GAP with the initiator filter policy set to "use whitelist to determine which advertiser to connect to". When a command is issued to terminate the procedure by upper layer, a LE_Create_Connection_Cancel call will be made to the controller by GAP.
                                                        The procedure is terminated when either a connection is successfully established with one of the specified devices in the whitelist or the procedure is explicitly terminated by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x08. A ACI_GAP_PROC_COMPLETE_EVENT event is returned with the procedure code set to 0x08.
                                                        If controller privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • HCI_LE_ADVERTISING_REPORT_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_START_AUTO_CONNECTION_ESTABLISH_PROC

                                                        Description

                                                        Start the auto connection establishment procedure. The devices specified are added to the whitelist of the controller and a LE_Create_Connection call will be made to the controller by GAP with the initiator filter policy set to "use whitelist to determine which advertiser to connect to". When a command is issued to terminate the procedure by upper layer, a LE_Create_Connection_Cancel call will be made to the controller by GAP.
                                                        The procedure is terminated when either a connection is successfully established with one of the specified devices in the whitelist or the procedure is explicitly terminated by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x08. A ACI_GAP_PROC_COMPLETE_EVENT event is returned with the procedure code set to 0x08.
                                                        If privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer generates a RPA, if it is not then the RPA generated by the Host is used.

                                                        Input parameters

                                                        + -
                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address

                                                        • Conn_Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -3218,17 +3483,17 @@ Time = N * 1.25 msec.

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Minimum_CE_Length

                                                        2

                                                        Information parameter about the minimum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Maximum_CE_Length

                                                        2

                                                        Information parameter about the maximum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Num_of_Whitelist_Entries

                                                        1

                                                        @@ -3248,30 +3513,26 @@ Time = N * 0.625 msec.

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_START_GENERAL_CONNECTION_ESTABLISH_PROC

                                                        Description

                                                        Start a general connection establishment procedure. The host enables scanning in the controller with the scanner filter policy set to "accept all advertising packets" and from the scanning results, all the devices are sent to the upper layer using the event LE_Advertising_Report. The upper layer then has to select one of the devices to which it wants to connect by issuing the command ACI_GAP_CREATE_CONNECTION. If privacy is enabled, then either a private resolvable address or a non resolvable address, based on the address type specified in the command is set as the scanner address but the gap create connection always uses a private resolvable address if the general connection establishment procedure is active.
                                                        The procedure is terminated when a connection is established or the upper layer terminates the procedure by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x10. On completion of the procedure a ACI_GAP_PROC_COMPLETE_EVENT event is generated with the procedure code set to 0x10.
                                                        If controller privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_START_GENERAL_CONNECTION_ESTABLISH_PROC

                                                        Description

                                                        Start a general connection establishment procedure. The host enables scanning in the controller with the scanner filter policy set to "accept all advertising packets" and from the scanning results, all the devices are sent to the upper layer using the event LE_Advertising_Report. The upper layer then has to select one of the devices to which it wants to connect by issuing the command ACI_GAP_CREATE_CONNECTION. If privacy is enabled, then either a private resolvable address or a non resolvable address, based on the address type specified in the command is set as the scanner address but the gap create connection always uses a private resolvable address if the general connection establishment procedure is active.
                                                        The procedure is terminated when a connection is established or the upper layer terminates the procedure by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x10. On completion of the procedure a ACI_GAP_PROC_COMPLETE_EVENT event is generated with the procedure code set to 0x10.
                                                        If privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        + + -
                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Type

                                                        1

                                                        -

                                                        Passive or active scanning. With active scanning SCAN_REQ packets are sent.

                                                        -
                                                      • 0x00: Passive Scanning
                                                      • 0x01: Active scanning

                                                        • Passive or active scanning. With passive scanning, no scan request PDUs are sent.

                                                        +
                                                      • 0x00: Passive scanning
                                                      • 0x01: Active scanning

                                                        • LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Scanning_Filter_Policy

                                                        1

                                                        @@ -3279,9 +3540,9 @@ Time = N * 0.625 msec.

                                                        • 0x00 Accept all advertisement packets.Directed advertising packets which are not addressed for this device shall be ignored.
                                                        • 0x01 Ignore advertisement packets from devices not in the White List Only.Directed advertising packets which are not addressed for this device shall be ignored.
                                                          • -
                                                        • 0x02 Accept all undirected advertisement packets (it is allowed only if controller privacy or host privacy is enabled).Directed advertisement packets where initiator address is a RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                          • +
                                                        • 0x02 Accept all undirected advertisement packets (it is allowed only if privacy is enabled). Directed advertisement packets where initiator address is a RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                        • 0x03 Accept all undirected advertisement packets from devices that are in the White List.Directed advertisement packets where initiator address is RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                          • -
                                                        • NOTE: if controller privacy is enabled Scanning_Filter_Policy can only assume values 0x00 or 0x02; if Host privacy is enabled Scanning_Filter_Policy can only assume value 0x00.
                                                          • +
                                                        • NOTE: if privacy is enabled Scanning_Filter_Policy can only assume values 0x00 or 0x02.
                                                        @@ -3296,30 +3557,26 @@ Time = N * 0.625 msec.

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_START_SELECTIVE_CONNECTION_ESTABLISH_PROC

                                                        Description

                                                        Start a selective connection establishment procedure. The GAP adds the specified device addresses into whitelist and enables scanning in the controller with the scanner filter policy set to "accept packets only from devices in whitelist". All the devices found are sent to the upper layer by the event HCI_LE_ADVERTISING_REPORT_EVENT. The upper layer then has to select one of the devices to which it wants to connect by issuing the command ACI_GAP_CREATE_CONNECTION.
                                                        On completion of the procedure a ACI_GAP_PROC_COMPLETE_EVENT event is generated with the procedure code set to 0x20. The procedure is terminated when a connection is established or the upper layer terminates the procedure by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x20.
                                                        If controller privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_START_SELECTIVE_CONNECTION_ESTABLISH_PROC

                                                        Description

                                                        Start a selective connection establishment procedure. The GAP adds the specified device addresses into whitelist and enables scanning in the controller with the scanner filter policy set to "accept packets only from devices in whitelist". All the devices found are sent to the upper layer by the event HCI_LE_ADVERTISING_REPORT_EVENT. The upper layer then has to select one of the devices to which it wants to connect by issuing the command ACI_GAP_CREATE_CONNECTION.
                                                        On completion of the procedure a ACI_GAP_PROC_COMPLETE_EVENT event is generated with the procedure code set to 0x20. The procedure is terminated when a connection is established or the upper layer terminates the procedure by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure code set to 0x20.
                                                        If privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        + + -
                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Type

                                                        1

                                                        -

                                                        Passive or active scanning. With active scanning SCAN_REQ packets are sent.

                                                        -
                                                      • 0x00: Passive Scanning
                                                      • 0x01: Active scanning

                                                        • Passive or active scanning. With passive scanning, no scan request PDUs are sent.

                                                        +
                                                      • 0x00: Passive scanning
                                                      • 0x01: Active scanning

                                                        • LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Scanning_Filter_Policy

                                                        1

                                                        @@ -3327,9 +3584,9 @@ Time = N * 0.625 msec.

                                                        • 0x00 Accept all advertisement packets.Directed advertising packets which are not addressed for this device shall be ignored.
                                                        • 0x01 Ignore advertisement packets from devices not in the White List Only.Directed advertising packets which are not addressed for this device shall be ignored.
                                                          • -
                                                        • 0x02 Accept all undirected advertisement packets (it is allowed only if controller privacy or host privacy is enabled).Directed advertisement packets where initiator address is a RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                          • +
                                                        • 0x02 Accept all undirected advertisement packets (it is allowed only if privacy is enabled). Directed advertisement packets where initiator address is a RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                        • 0x03 Accept all undirected advertisement packets from devices that are in the White List.Directed advertisement packets where initiator address is RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                          • -
                                                        • NOTE: if controller privacy is enabled Scanning_Filter_Policy can only assume values 0x01 or 0x03; if Host privacy is enabled Scanning_Filter_Policy can only assume value 0x01.
                                                          • +
                                                        • NOTE: if privacy is enabled Scanning_Filter_Policy can only assume values 0x01 or 0x03.
                                                        @@ -3356,17 +3613,17 @@ Time = N * 0.625 msec.

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_CREATE_CONNECTION

                                                        Description

                                                        Start the direct connection establishment procedure. A LE_Create_Connection call will be made to the controller by GAP with the initiator filter policy set to "ignore whitelist and process connectable advertising packets only for the specified device". The procedure can be terminated explicitly by the upper layer by issuing the command ACI_GAP_TERMINATE_GAP_PROC. When a command is issued to terminate the procedure by upper layer, a HCI_LE_CREATE_CONNECTION_CANCEL call will be made to the controller by GAP.
                                                        On termination of the procedure, a HCI_LE_CONNECTION_COMPLETE_EVENT event is returned. The procedure can be explicitly terminated by the upper layer by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure_code set to 0x40.
                                                        If controller privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_STATUS_EVENT
                                                      • ACI_GAP_PROC_COMPLETE_EVENT

                                                        • ACI_GAP_CREATE_CONNECTION

                                                        Description

                                                        Start the direct connection establishment procedure. A LE_Create_Connection call will be made to the controller by GAP with the initiator filter policy set to "ignore whitelist and process connectable advertising packets only for the specified device". The procedure can be terminated explicitly by the upper layer by issuing the command ACI_GAP_TERMINATE_GAP_PROC. When a command is issued to terminate the procedure by upper layer, a HCI_LE_CREATE_CONNECTION_CANCEL call will be made to the controller by GAP.
                                                        On termination of the procedure, a HCI_LE_CONNECTION_COMPLETE_EVENT event is returned. The procedure can be explicitly terminated by the upper layer by issuing the command ACI_GAP_TERMINATE_GAP_PROC with the procedure_code set to 0x40.
                                                        If privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA generated by the Host will be used.

                                                        Input parameters

                                                        +
                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • Peer_Address_Type

                                                        1

                                                        @@ -3378,21 +3635,17 @@ Time = N * 0.625 msec.

                                                        Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address

                                                        • Conn_Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -3402,17 +3655,17 @@ Time = N * 1.25 msec.

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Minimum_CE_Length

                                                        2

                                                        Information parameter about the minimum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Maximum_CE_Length

                                                        2

                                                        Information parameter about the maximum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Output parameters

                                                        @@ -3425,7 +3678,7 @@ Time = N * 0.625 msec.

                                                         +
                                                        ParameterSizeDescriptionPossible values

                                                        Procedure_Code

                                                        1

                                                        GAP procedure bitmap.

                                                        -
                                                      • 0x00: No events
                                                      • 0x01: GAP_LIMITED_DISCOVERY_PROC
                                                      • 0x02: GAP_GENERAL_DISCOVERY_PROC
                                                      • 0x04: GAP_NAME_DISCOVERY_PROC
                                                      • 0x08: GAP_AUTO_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x10: GAP_GENERAL_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x20: GAP_SELECTIVE_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x40: GAP_DIRECT_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x80: GAP_OBSERVATION_PROC
                                                      • 0x00: No events
                                                      • 0x01: GAP_LIMITED_DISCOVERY_PROC
                                                      • 0x02: GAP_GENERAL_DISCOVERY_PROC
                                                      • 0x08: GAP_AUTO_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x10: GAP_GENERAL_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x20: GAP_SELECTIVE_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x40: GAP_DIRECT_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x80: GAP_OBSERVATION_PROC

                                                        • Output parameters

                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        @@ -3441,12 +3694,12 @@ Time = N * 0.625 msec.

                                                        Conn_Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -3456,17 +3709,17 @@ Time = N * 1.25 msec.

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Minimum_CE_Length

                                                        2

                                                        Information parameter about the minimum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Maximum_CE_Length

                                                        2

                                                        Information parameter about the maximum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Output parameters

                                                        @@ -3514,12 +3767,12 @@ Time = N * 0.625 msec.

                                                         -
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Interval_Min

                                                        2

                                                        Minimum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Advertising_Interval_Max

                                                        2

                                                        Maximum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Advertising_Type

                                                        1

                                                        @@ -3527,8 +3780,7 @@ Time = N * 0.625 msec.

                                                      • 0x02: ADV_SCAN_IND (Scannable undirected advertising)
                                                      • 0x03: ADV_NONCONN_IND (Non connectable undirected advertising)

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        If Privacy is disabled, then the address can be public or static random. -If Privacy is enabled, then the address can be a resolvable private address or a non-resolvable private address.

                                                        +

                                                        Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Adv_Data_Length

                                                        1

                                                        @@ -3556,30 +3808,26 @@ If Privacy is enabled, then the address can be a resolvable private address or a

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_START_OBSERVATION_PROC

                                                        Description

                                                        Starts an Observation procedure, when the device is in Observer Role. The host enables scanning in the controller. The advertising reports are sent to the upper layer using standard LE Advertising Report Event.
                                                        If controller privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_START_OBSERVATION_PROC

                                                        Description

                                                        Starts an Observation procedure, when the device is in Observer Role. The host enables scanning in the controller. The advertising reports are sent to the upper layer using standard LE Advertising Report Event.
                                                        If privacy is enabled and the peer device (advertiser) is in the resolving list then the link layer will generate a RPA, if it is not then the RPA/NRPA generated by the Host will be used.

                                                        Input parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        LE_Scan_Interval

                                                        2

                                                        This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Window

                                                        2

                                                        Amount of time for the duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0004 (2.500 ms) ... 0x4000 (10240.000 ms)

                                                        • LE_Scan_Type

                                                        1

                                                        -

                                                        Passive or active scanning. With active scanning SCAN_REQ packets are sent.

                                                        -
                                                      • 0x00: Passive Scanning
                                                      • 0x01: Active scanning

                                                        • Passive or active scanning. With passive scanning, no scan request PDUs are sent.

                                                        +
                                                      • 0x00: Passive scanning
                                                      • 0x01: Active scanning

                                                        • Own_Address_Type

                                                        1

                                                        -

                                                        Own address type

                                                        -
                                                      • 0x00: Public Device Address -(only if privacy is disabled)
                                                      • 0x01: Random Device Address -(only if privacy is disabled)
                                                      • 0x02: Resolvable Private Address -(only if privacy is enabled)
                                                      • 0x03: Non Resolvable Private Address -(only if privacy is enabled)

                                                        • Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Filter_Duplicates

                                                        1

                                                        Enable/disable duplicate filtering.

                                                        @@ -3589,11 +3837,10 @@ Time = N * 0.625 msec.

                                                        Scanning filter policy:
                                                          -
                                                        • 0x00 Accept all advertisement packets (it is allowed only if controller privacy is enabled).Directed advertising packets which are not addressed for this device shall be ignored.
                                                          • -
                                                        • 0x01 Ignore advertisement packets from devices not in the White List Only.Directed advertising packets which are not addressed for this device shall be ignored.
                                                          • -
                                                        • 0x02 Accept all undirected advertisement packets (it is allowed only if controller privacy or host privacy is enabled).Directed advertisement packets where initiator address is a RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                          • -
                                                        • 0x03 Accept all undirected advertisement packets from devices that are in the White List.Directed advertisement packets where initiator address is RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                          • -
                                                        • NOTE: If Host privacy is enabled Scanning_Filter_Policy can only take values 0x00 or 0x01;
                                                          • +
                                                        • 0x00 Accept all advertisement packets (it is allowed only if privacy is enabled). Directed advertising packets which are not addressed for this device shall be ignored.
                                                          • +
                                                        • 0x01 Ignore advertisement packets from devices not in the White List Only. Directed advertising packets which are not addressed for this device shall be ignored.
                                                          • +
                                                        • 0x02 Accept all undirected advertisement packets (it is allowed only if privacy is enabled). Directed advertisement packets where initiator address is a RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                          • +
                                                        • 0x03 Accept all undirected advertisement packets from devices that are in the White List. Directed advertisement packets where initiator address is RPA and Directed advertisement packets addressed to this device shall be accepted.
                                                        @@ -3648,7 +3895,7 @@ Time = N * 0.625 msec.

                                                        1

                                                        0 : The Numeric Values showed on both local and peer device are different! 1 : The Numeric Values showed on both local and peer device are equal!

                                                        -
                                                      • 0x00: No
                                                      • 0x01: YES
                                                      • 0x00: No
                                                      • 0x01: Yes

                                                        • Output parameters

                                                        -
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        @@ -3735,11 +3982,11 @@ Time = N * 0.625 msec.

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADD_DEVICES_TO_RESOLVING_LIST

                                                        Description

                                                        This command is used to add one device to the list of address translations used to resolve Resolvable Private Addresses in the Controller.

                                                        Input parameters

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADD_DEVICES_TO_RESOLVING_LIST

                                                        Description

                                                        This command is used to add devices to the list of address translations used to resolve Resolvable Private Addresses in the Controller.

                                                        Input parameters

                                                        +
                                                        ParameterSizeDescriptionPossible values

                                                        Num_of_Resolving_list_Entries

                                                        1

                                                        -

                                                        Number of devices that have to be added to the resolving list.

                                                        +

                                                        Number of devices that have to be added to the list.

                                                        Peer_Identity_Address_Type[i]

                                                        1

                                                        @@ -3752,7 +3999,7 @@ Time = N * 0.625 msec.

                                                        Clear_Resolving_List

                                                        1

                                                        Clear the resolving list

                                                        -
                                                      • 0x00: Do not clear
                                                      • 0x01: Clear before adding

                                                        • Output parameters

                                                        +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        @@ -3775,23 +4022,46 @@ Time = N * 0.625 msec.

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADD_DEVICES_TO_LIST

                                                        Description

                                                        This command is used to add specific device addresses to the white and/or resolving list.

                                                        Input parameters

                                                        + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Num_of_List_Entries

                                                        +

                                                        1

                                                        +

                                                        Number of devices that have to be added to the list.

                                                        +

                                                        Address_Type[i]

                                                        +

                                                        1

                                                        +

                                                        Address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address

                                                        • Address[i]

                                                        +

                                                        6

                                                        +

                                                        Public Device Address or Random Device Address.

                                                        +

                                                        Mode

                                                        +

                                                        1

                                                        +

                                                        Mode used for adding devices in the lists.

                                                        +
                                                      • 0x00: Append to the resolving list only
                                                      • 0x01: Clear and set the resolving list only
                                                      • 0x02: Append to the white list only
                                                      • 0x03: Clear and set the white list only
                                                      • 0x04: Append to both resolving and white lists
                                                      • 0x05: Clear and set both resolving and white lists

                                                        • Output parameters

                                                        + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADDITIONAL_BEACON_START

                                                        Description

                                                        This command starts an advertising beacon. It allows additional advertising packets to be transmitted independently of the packets transmitted with GAP advertising commands such as ACI_GAP_SET_DISCOVERABLE or ACI_GAP_SET_LIMITED_DISCOVERABLE.

                                                        Input parameters

                                                        + +
                                                        ParameterSizeDescriptionPossible values

                                                        Adv_Interval_Min

                                                        2

                                                        Minimum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Adv_Interval_Max

                                                        2

                                                        Maximum advertising interval. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0020 (20.000 ms) ... 0x4000 (10240.000 ms)

                                                        • Adv_Channel_Map

                                                        1

                                                        -

                                                        Advertising channel map. -Default: 00000111b (all channels enabled).

                                                        -

                                                        Bitmask of:

                                                      • 0x01: ch 37
                                                      • 0x02: ch 38
                                                      • 0x04: ch 39

                                                        • Advertising channel map.

                                                        +

                                                        Bitmask of:

                                                      • 0x01: Channel 37 shall be used
                                                      • 0x02: Channel 38 shall be used
                                                      • 0x04: Channel 39 shall be used

                                                        • Own_Address_Type

                                                        1

                                                        Own address type: public or static random.

                                                        @@ -3832,6 +4102,179 @@ Default: 00000111b (all channels enabled).

                                                        1

                                                        Status error code.

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADV_SET_CONFIGURATION

                                                        Description

                                                        This command is used to set the extended advertising configration.

                                                        Input parameters

                                                        + + + + + + + + + + + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Adv_Mode

                                                        +

                                                        1

                                                        +

                                                        Not used. Shall be set to 0.

                                                        +

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Adv_Event_Properties

                                                        +

                                                        2

                                                        +

                                                        Type of advertising event.

                                                        +

                                                        Bitmask of:

                                                      • 0x0001: Connectable advertising
                                                      • 0x0002: Scannable advertising
                                                      • 0x0004: Directed advertising
                                                      • 0x0008: High Duty Cycle Directed Connectable advertising
                                                      • 0x0010: Use legacy advertising PDUs
                                                      • 0x0020: Anonymous advertising
                                                      • 0x0040: Include TxPower in at least one advertising PDU

                                                        • Primary_Adv_Interval_Min

                                                        +

                                                        4

                                                        +

                                                        Minimum advertising interval. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x00000020 (20.000 ms) ... 0x00FFFFFF (10485759.375 ms)

                                                        • Primary_Adv_Interval_Max

                                                        +

                                                        4

                                                        +

                                                        Maximum advertising interval. +Time = N * 0.625 ms.

                                                        +
                                                      • 0x00000020 (20.000 ms) ... 0x00FFFFFF (10485759.375 ms)

                                                        • Primary_Adv_Channel_Map

                                                        +

                                                        1

                                                        +

                                                        Advertising channel map.

                                                        +

                                                        Bitmask of:

                                                      • 0x01: Channel 37 shall be used
                                                      • 0x02: Channel 38 shall be used
                                                      • 0x04: Channel 39 shall be used

                                                        • Own_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Own address type: if Privacy is disabled, the address can be public or static random; otherwise, it can be a resolvable private address or a non-resolvable private address.

                                                        +
                                                      • 0x00: Public address
                                                      • 0x01: Static random address
                                                      • 0x02: Resolvable private address
                                                      • 0x03: Non-resolvable private address

                                                        • Peer_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Address type of the peer device.

                                                        +
                                                      • 0x00: Public Device Address or Public Identity Address
                                                      • 0x01: Random Device Address or Random (static) Identity Address

                                                        • Peer_Address

                                                        +

                                                        6

                                                        +

                                                        Public Device Address, Random Device Address, Public Identity Address, or Random (static) Identity Address of the device to be connected.

                                                        +

                                                        Adv_Filter_Policy

                                                        +

                                                        1

                                                        +

                                                        Advertising filter policy

                                                        +
                                                      • 0x00: Process scan and connection requests from all devices (i.e., the White List is not in use)
                                                      • 0x01: Process connection requests from all devices and scan requests only from devices that are in the White List.
                                                      • 0x02: Process scan requests from all devices and connection requests only from devices that are in the White List.
                                                      • 0x03: Process scan and connection requests only from devices in the White List.

                                                        • Adv_TX_Power

                                                        +

                                                        1

                                                        +

                                                        Advertising TX power. Units: dBm.

                                                        +
                                                      • -127 ... 20

                                                        • Secondary_Adv_Max_Skip

                                                        +

                                                        1

                                                        +

                                                        Secondary advertising maximum skip.

                                                        +
                                                      • 0x00: AUX_ADV_IND shall be sent prior to the next advertising event
                                                      • 0x01 ... 0xFF: Maximum advertising events the Controller can skip before sending the AUX_ADV_IND packets on the secondary advertising physical channel

                                                        • Secondary_Adv_PHY

                                                        +

                                                        1

                                                        +

                                                        Secondary advertising PHY.

                                                        +
                                                      • 0x01: Secondary advertisement PHY is LE 1M
                                                      • 0x02: Secondary advertisement PHY is LE 2M
                                                      • 0x03: Secondary advertisement PHY is LE Coded (not supported)

                                                        • Adv_SID

                                                        +

                                                        1

                                                        +

                                                        Value of the Advertising SID subfield in the ADI field of the PDU.

                                                        +
                                                      • 0x00 ... 0x0F

                                                        • Scan_Req_Notification_Enable

                                                        +

                                                        1

                                                        +

                                                        Scan request notifications.

                                                        +
                                                      • 0x00: Scan request notifications disabled
                                                      • 0x01: Scan request notifications enabled

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADV_SET_ENABLE

                                                        Description

                                                        This command is used to request the Controller to enable or disable one or more extended advertising sets.

                                                        Input parameters

                                                        + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Enable

                                                        +

                                                        1

                                                        +

                                                        Enable/disable advertising.

                                                        +
                                                      • 0x00: Advertising is disabled
                                                      • 0x01: Advertising is enabled

                                                        • Num_Sets

                                                        +

                                                        1

                                                        +

                                                        Number of advertising sets.

                                                        +
                                                      • 0x00: Disable all advertising sets
                                                      • 0x01 ... 0x3F: Number of advertising sets to enable or disable

                                                        • Advertising_Handle[i]

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Duration[i]

                                                        +

                                                        2

                                                        +

                                                        Duration of advertising set. +Time = N * 10 ms.

                                                        +
                                                      • 0x0000 (0 ms) : No advertising duration.
                                                      • 0x0001 (10 ms) ... 0xFFFF (655350 ms) : Advertising duration

                                                        • Max_Extended_Advertising_Events[i]

                                                        +

                                                        1

                                                        +

                                                        Maximum number of advertising events.

                                                        +
                                                      • 0x00: No maximum number of advertising events
                                                      • 0x01 ... 0xFF: Maximum number of extended advertising events the Controller shall attempt to send prior to terminating the extended advertising

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADV_SET_ADV_DATA

                                                        Description

                                                        This command is used to set the data used in extended advertising PDUs that have a data field.

                                                        Input parameters

                                                        + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Operation

                                                        +

                                                        1

                                                        +

                                                        Advertising operation.

                                                        +
                                                      • 0x00: Intermediate fragment of fragmented extended advertising data
                                                      • 0x01: First fragment of fragmented extended advertising data
                                                      • 0x02: Last fragment of fragmented extended advertising data
                                                      • 0x03: Complete extended advertising data
                                                      • 0x04: Unchanged data (just update the Advertising DID)

                                                        • Fragment_Preference

                                                        +

                                                        1

                                                        +

                                                        Fragment preference.

                                                        +
                                                      • 0x00: The Controller may fragment all data
                                                      • 0x01: The Controller should not fragment or should minimize fragmentation of data

                                                        • Advertising_Data_Length

                                                        +

                                                        1

                                                        +

                                                        Length of Advertising_Data in octets

                                                        +

                                                        Advertising_Data

                                                        +

                                                        Advertising_Data_Length

                                                        +

                                                        Data formatted as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 11].

                                                        +

                                                        Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADV_SET_SCAN_RESP_DATA

                                                        Description

                                                        This command is used to provide scan response data used during extended advertising.

                                                        Input parameters

                                                        + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Operation

                                                        +

                                                        1

                                                        +

                                                        Scan response operation.

                                                        +
                                                      • 0x00: Intermediate fragment of fragmented scan response data
                                                      • 0x01: First fragment of fragmented scan response data
                                                      • 0x02: Last fragment of fragmented scan response data
                                                      • 0x03: Complete scan response data

                                                        • Fragment_Preference

                                                        +

                                                        1

                                                        +

                                                        Fragment preference.

                                                        +
                                                      • 0x00: The Controller may fragment all data
                                                      • 0x01: The Controller should not fragment or should minimize fragmentation of data

                                                        • Scan_Response_Data_Length

                                                        +

                                                        1

                                                        +

                                                        Length of Scan_Response_Data in octets

                                                        +

                                                        Scan_Response_Data

                                                        +

                                                        Scan_Response_Data_Length

                                                        +

                                                        Data formatted as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 11].

                                                        +

                                                        Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADV_REMOVE_SET

                                                        Description

                                                        This command is used to remove an advertising set from the Controller.

                                                        Input parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Output parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI_GAP_ADV_CLEAR_SETS

                                                        Description

                                                        This command is used to remove all existing advertising sets from the Controller.

                                                        Input parameters

                                                        None

                                                        Output parameters

                                                        + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Events generated

                                                      • HCI_COMMAND_COMPLETE_EVENT

                                                        • ACI GATT/ATT commands

                                                        CommandOpcodeBFPOLOBO
                                                        ACI_GATT_INIT

                                                        0xFD01

                                                        @@ -5088,12 +5531,12 @@ In case of a variable size characteristic, this field specifies the new length o

                                                        Conn_Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Slave_latency

                                                        2

                                                        @@ -5118,12 +5561,12 @@ Time = N * 1.25 msec.

                                                        Conn_Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Slave_latency

                                                        2

                                                        @@ -5136,12 +5579,12 @@ Time = N * 1.25 msec.

                                                        Minimum_CE_Length

                                                        2

                                                        Information parameter about the minimum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Maximum_CE_Length

                                                        2

                                                        Information parameter about the maximum length of connection needed for this LE connection. -Time = N * 0.625 msec.

                                                        +Time = N * 0.625 ms.

                                                      • 0x0000 (0.000 ms) ... 0xFFFF (40959.375 ms)

                                                        • Identifier

                                                        1

                                                        @@ -5368,7 +5811,7 @@ Time = N * 0.625 msec.

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection_Handle which was disconnected.

                                                        +

                                                        Connection handle for which the event applies.

                                                      • 0x0000 ... 0x0EFF

                                                        • Reason

                                                        1

                                                        @@ -5382,7 +5825,7 @@ Time = N * 0.625 msec.

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle for which the command applies.

                                                        +

                                                        Connection handle for which the event applies.

                                                      • 0x0000 ... 0x0EFF

                                                        • Encryption_Enabled

                                                        1

                                                        @@ -5396,7 +5839,7 @@ Time = N * 0.625 msec.

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle for which the command applies.

                                                        +

                                                        Connection handle for which the event applies.

                                                      • 0x0000 ... 0x0EFF

                                                        • Version

                                                        1

                                                        @@ -5470,7 +5913,7 @@ Error code 3 is internal FIFO full.

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle for which the command applies.

                                                        +

                                                        Connection handle for which the event applies.

                                                      • 0x0000 ... 0x0EFF

                                                        • HCI LE meta events

                                                        @@ -5518,11 +5961,25 @@ Error code 3 is internal FIFO full.

                                                         + + + + + +
                                                        Event nameLE subevent codeBFPOLOBO
                                                        HCI_LE_DIRECT_ADVERTISING_REPORT_EVENT

                                                        0x0B

                                                        Y

                                                        Y

                                                        -

                                                        Y

                                                        -
                                                        HCI_LE_PHY_UPDATE_COMPLETE_EVENT

                                                        0x0C

                                                        Y

                                                        HCI_LE_EXTENDED_ADVERTISING_REPORT_EVENT

                                                        0x0D

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SCAN_TIMEOUT_EVENT

                                                        0x11

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_ADVERTISING_SET_TERMINATED_EVENT

                                                        0x12

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_SCAN_REQUEST_RECEIVED_EVENT

                                                        0x13

                                                        +

                                                        Y

                                                        +
                                                        HCI_LE_CHANNEL_SELECTION_ALGORITHM_EVENT

                                                        0x14

                                                        +

                                                        Y

                                                        +

                                                        HCI_LE_CONNECTION_COMPLETE_EVENT

                                                        Description

                                                        The LE Connection Complete event indicates to both of the Hosts forming the connection that a new connection has been created. Upon the creation of the connection a Connection_Handle shall be assigned by the Controller, and passed to the Host in this event. If the connection establishment fails this event shall be provided to the Host that had issued the LE_Create_Connection command.
                                                        This event indicates to the Host which issued a LE_Create_Connection command and received a Command Status event if the connection establishment failed or was successful.
                                                        The Master_Clock_Accuracy parameter is only valid for a slave. On a master, this parameter shall be set to 0x00.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.1].

                                                        Event parameters

                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        @@ -5548,7 +6005,7 @@ Error code 3 is internal FIFO full.

                                                        Conn_Interval

                                                        2

                                                        Connection interval used on this connection. -Time = N * 1.25 msec

                                                        +Time = N * 1.25 ms

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -5558,7 +6015,7 @@ Time = N * 1.25 msec

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Master_Clock_Accuracy

                                                        1

                                                        @@ -5593,17 +6050,16 @@ SCAN_RSP: Scan response.

                                                        Length_Data[i]

                                                        1

                                                        -

                                                        Length of the Data[i] field for each device which responded.

                                                        +

                                                        Length of the Data field for each device which responded.

                                                      • 0 ... 31

                                                        • Data[i]

                                                        Length_Data[i]

                                                        -

                                                        Length_Data[i] octets of advertising or scan response data formatted -as defined in [Vol 3] Part C, Section 8.

                                                        +

                                                        Octets of advertising or scan response data formatted as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 11].

                                                        RSSI[i]

                                                        1

                                                        -

                                                        N Size: 1 Octet (signed integer) -Units: dBm

                                                        +

                                                        RSSI (signed integer). +Units: dBm.

                                                      • 127: RSSI not available
                                                      • -127 ... 20

                                                        • HCI_LE_CONNECTION_UPDATE_COMPLETE_EVENT

                                                        Description

                                                        The LE Connection Update Complete event is used to indicate that the Controller process to update the connection has completed.
                                                        On a slave, if no connection parameters are updated, then this event shall not be issued.
                                                        On a master, this event shall be issued if the Connection_Update command was sent.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.3].

                                                        Event parameters

                                                        @@ -5618,7 +6074,7 @@ Units: dBm

                                                        ParameterSizeDescriptionPossible values

                                                        Conn_Interval

                                                        2

                                                        Connection interval used on this connection. -Time = N * 1.25 msec

                                                        +Time = N * 1.25 ms

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -5628,7 +6084,7 @@ Time = N * 1.25 msec

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • HCI_LE_READ_REMOTE_FEATURES_COMPLETE_EVENT

                                                        Description

                                                        The LE Read Remote Features Complete event is used to indicate the completion of the process of the Controller obtaining the used features of the remote Bluetooth device specified by the Connection_Handle event parameter.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.4].

                                                        Event parameters

                                                        @@ -5658,7 +6114,7 @@ Time = N * 10 msec.

                                                         -
                                                        ParameterSizeDescriptionPossible values

                                                        2

                                                        16-bit encrypted diversifier

                                                        HCI_LE_DATA_LENGTH_CHANGE_EVENT

                                                        Description

                                                        The LE Data Length Change event notifies the Host of a change to either the maximum Payload length or the maximum transmission time of packets in either direction. The values reported are the maximum that will actually be used on the connection following the change, except that on the LE Coded PHY a packet taking up to 2704 us to transmit may be sent even though the corresponding parameter has a lower value.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.7].

                                                        Event parameters

                                                        +

                                                        HCI_LE_DATA_LENGTH_CHANGE_EVENT

                                                        Description

                                                        The LE Data Length Change event notifies the Host of a change to either the maximum Payload length or the maximum transmission time of packets in either direction. The values reported are the maximum that will actually be used on the connection following the change, except that on the LE Coded PHY a packet taking up to 2704 us to transmit may be sent even though the corresponding parameter has a lower value.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.7] and [Vol 6, Part B, 4.5.10].

                                                        Event parameters

                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        @@ -5666,19 +6122,19 @@ Time = N * 10 msec.

                                                      • 0x0000 ... 0x0EFF

                                                        • MaxTxOctets

                                                        2

                                                        -

                                                        The maximum number of payload octets in a Link Layer packet that the local Controller will send on this connection (connEffectiveMaxTxOctets defined in [Vol 6] Part B, Section 4.5.10).

                                                        +

                                                        The maximum number of payload octets in a Link Layer packet that the local Controller will send on this connection (connEffectiveMaxTxOctets).

                                                      • 0x001B ... 0x00FB

                                                        • MaxTxTime

                                                        2

                                                        -

                                                        The maximum time that the local Controller will take to send a Link Layer packet on this connection (connEffectiveMaxTxTime defined in [Vol 6] Part B, Section 4.5.10).

                                                        +

                                                        The maximum time that the local Controller will take to send a Link Layer packet on this connection (connEffectiveMaxTxTime).

                                                      • 0x0148 ... 0x4290

                                                        • MaxRxOctets

                                                        2

                                                        -

                                                        The maximum number of payload octets in a Link Layer packet that the local Controller expects to receive on this connection (connEffectiveMaxRxOctets defined in [Vol 6] Part B, Section 4.5.10).

                                                        +

                                                        The maximum number of payload octets in a Link Layer packet that the local Controller expects to receive on this connection (connEffectiveMaxRxOctets).

                                                      • 0x001B ... 0x00FB

                                                        • MaxRxTime

                                                        2

                                                        -

                                                        The maximum time that the local Controller expects to take to receive a Link Layer packet on this connection (connEffectiveMaxRxTime defined in [Vol 6] Part B, Section 4.5.10).

                                                        +

                                                        The maximum time that the local Controller expects to take to receive a Link Layer packet on this connection (connEffectiveMaxRxTime).

                                                      • 0x0148 ... 0x4290

                                                        • HCI_LE_READ_LOCAL_P256_PUBLIC_KEY_COMPLETE_EVENT

                                                        Description

                                                        This event is generated when local P-256 key generation is complete.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.8].

                                                        Event parameters

                                                        @@ -5739,7 +6195,7 @@ This is only valid for Peer_Address_Type 0x02 and 0x03. For other Peer_Address_T
                                                        ParameterSizeDescriptionPossible values

                                                        Conn_Interval

                                                        2

                                                        Connection interval used on this connection. -Time = N * 1.25 msec

                                                        +Time = N * 1.25 ms

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Conn_Latency

                                                        2

                                                        @@ -5749,7 +6205,7 @@ Time = N * 1.25 msec

                                                        2

                                                        Supervision timeout for the LE Link. It shall be a multiple of 10 ms and larger than (1 + connSlaveLatency) * connInterval * 2. -Time = N * 10 msec.

                                                        +Time = N * 10 ms.

                                                      • 0x000A (100 ms) ... 0x0C80 (32000 ms)

                                                        • Master_Clock_Accuracy

                                                        1

                                                        @@ -5787,8 +6243,8 @@ Time = N * 10 msec.

                                                        RSSI[i]

                                                        1

                                                        -

                                                        N Size: 1 Octet (signed integer) -Units: dBm

                                                        +

                                                        RSSI (signed integer). +Units: dBm.

                                                      • 127: RSSI not available
                                                      • -127 ... 20

                                                        • HCI_LE_PHY_UPDATE_COMPLETE_EVENT

                                                        Description

                                                        The LE PHY Update Complete Event is used to indicate that the Controller has changed the transmitter PHY or receiver PHY in use.
                                                        If the Controller changes the transmitter PHY, the receiver PHY, or both PHYs, this event shall be issued.
                                                        If an LE_Set_PHY command was sent and the Controller determines that neither PHY will change as a result, it issues this event immediately.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.12].

                                                        Event parameters

                                                        @@ -5798,18 +6254,118 @@ Units: dBm

                                                         + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle to be used to identify the connection with the peer device.

                                                        +

                                                        Connection handle for which the event applies.

                                                      • 0x0000 ... 0x0EFF

                                                        • TX_PHY

                                                        1

                                                        Transmitter PHY in use

                                                        -
                                                      • 0x01: The transmitter PHY for the connection is LE 1M
                                                      • 0x02: The transmitter PHY for the connection is LE 2M
                                                      • 0x03: The transmitter PHY for the connection is LE Coded -(Not supported by STM32WB)
                                                      • 0x01: The transmitter PHY for the connection is LE 1M
                                                      • 0x02: The transmitter PHY for the connection is LE 2M
                                                      • 0x03: The transmitter PHY for the connection is LE Coded (not supported)

                                                        • RX_PHY

                                                        1

                                                        Receiver PHY in use

                                                        -
                                                      • 0x01: The receiver PHY for the connection is LE 1M
                                                      • 0x02: The receiver PHY for the connection is LE 2M
                                                      • 0x03: The receiver PHY for the connection is LE Coded -(Not supported by STM32WB)
                                                      • 0x01: The receiver PHY for the connection is LE 1M
                                                      • 0x02: The receiver PHY for the connection is LE 2M
                                                      • 0x03: The receiver PHY for the connection is LE Coded (not supported)

                                                        • HCI_LE_EXTENDED_ADVERTISING_REPORT_EVENT

                                                        Description

                                                        The HCI_LE_Extended_Advertising_Report event indicates that a Bluetooth device has responded to an active scan or has broadcast advertisements that were received during a passive scan.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.13].

                                                        Event parameters

                                                        + + + + + + + + + + + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Num_Reports

                                                        +

                                                        1

                                                        +

                                                        Number of responses in this event.

                                                        +
                                                      • 0x01

                                                        • Event_Type

                                                        +

                                                        2

                                                        +

                                                        Event type.

                                                        +

                                                        Bitmask of:

                                                      • 0x0001: Connectable advertising
                                                      • 0x0002: Scannable advertising
                                                      • 0x0004: Directed advertising
                                                      • 0x0008: Scan response
                                                      • 0x0010: Legacy advertising PDUs used
                                                      • 0x0020: Incomplete, more data to come
                                                      • 0x0040: Incomplete, data truncated, no more to come

                                                        • Address_Type

                                                        +

                                                        1

                                                        +

                                                        Address type of the advertising device.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Public Identity Address (corresponds to Resolved Private Address)
                                                      • 0x03: Random (static) Identity Address (corresponds to Resolved Private Address)
                                                      • 0xFF: No address provided (anonymous advertisement)

                                                        • Address

                                                        +

                                                        6

                                                        +

                                                        Public Device Address, Random Device Address, Public Identity Address, or Random (static) Identity Address of the advertising device.

                                                        +

                                                        Primary_PHY

                                                        +

                                                        1

                                                        +

                                                        Primary advetising PHY.

                                                        +
                                                      • 0x01: Advertiser PHY is LE 1M

                                                        • Secondary_PHY

                                                        +

                                                        1

                                                        +

                                                        Secondary advetising PHY.

                                                        +
                                                      • 0x00: No packets on the secondary advertising physical channel
                                                      • 0x01: Advertiser PHY is LE 1M
                                                      • 0x02: Advertiser PHY is LE 2M
                                                      • 0x03: Advertiser PHY is LE Coded

                                                        • Advertising_SID

                                                        +

                                                        1

                                                        +

                                                        Value of the Advertising SID subfield in the ADI field of the PDU or, for scan responses, in the ADI field of the original scannable.

                                                        +
                                                      • 0xFF: No ADI field provided
                                                      • 0x00 ... 0x0F: Advertising SID subfield

                                                        • TX_Power

                                                        +

                                                        1

                                                        +

                                                        Tx Power (signed integer). +Units: dBm.

                                                        +
                                                      • 127: Tx power information not available
                                                      • -127 ... 20: Tx power

                                                        • RSSI

                                                        +

                                                        1

                                                        +

                                                        RSSI (signed integer). +Units: dBm.

                                                        +
                                                      • 127: RSSI not available
                                                      • -127 ... 20

                                                        • Periodic_Adv_Interval

                                                        +

                                                        2

                                                        +

                                                        Interval of the periodic advertising.

                                                        +
                                                      • 0x0000: No periodic advertising

                                                        • Direct_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Target device address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Public Identity Address (Corresponds to Resolved Private Address)
                                                      • 0x03: Random (static) Identity Address (Corresponds to Resolved Private Address)
                                                      • 0xFE: Random Device Address (Controller unable to resolve)

                                                        • Direct_Address

                                                        +

                                                        6

                                                        +

                                                        Public Device Address, Random Device Address, Public Identity Address, or Random (static) Identity Address of the target device.

                                                        +

                                                        Data_Length

                                                        +

                                                        1

                                                        +

                                                        Length of Data

                                                        +

                                                        Data

                                                        +

                                                        Data_Length

                                                        +

                                                        Octets of advertising or scan response data formatted as defined in Bluetooth spec. v.5.2 [Vol 3, Part C, 11].

                                                        +

                                                        HCI_LE_SCAN_TIMEOUT_EVENT

                                                        Description

                                                        The HCI_LE_Scan_Timeout event indicates that scanning has ended because the duration has expired.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.17].

                                                        Event parameters

                                                        None

                                                        HCI_LE_ADVERTISING_SET_TERMINATED_EVENT

                                                        Description

                                                        The HCI_LE_Advertising_Set_Terminated event indicates that the Controller has terminated advertising in the advertising sets specified by the Advertising_Handle parameter.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.18].

                                                        Event parameters

                                                        + + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Status

                                                        +

                                                        1

                                                        +

                                                        Status error code.

                                                        +

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Connection_Handle

                                                        +

                                                        2

                                                        +

                                                        Connection handle for which the event applies.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • Num_Completed_Ext_Adv_Events

                                                        +

                                                        1

                                                        +

                                                        Number of completed extended advertising events transmitted by the Controller.

                                                        +
                                                      • 0x00 ... 0xFF

                                                        • HCI_LE_SCAN_REQUEST_RECEIVED_EVENT

                                                        Description

                                                        The HCI_LE_Scan_Request_Received event indicates that a SCAN_REQ PDU or an AUX_SCAN_REQ PDU has been received by the advertiser. The request contains a device address from a scanner that is allowed by the advertising filter policy. The advertising set is identified by Advertising_Handle.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.19].

                                                        Event parameters

                                                        + + + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Advertising_Handle

                                                        +

                                                        1

                                                        +

                                                        Used to identify an advertising set.

                                                        +
                                                      • 0x00 ... 0xEF

                                                        • Scanner_Address_Type

                                                        +

                                                        1

                                                        +

                                                        Scanner address type.

                                                        +
                                                      • 0x00: Public Device Address
                                                      • 0x01: Random Device Address
                                                      • 0x02: Public Identity Address (corresponds to Resolved Private Address)
                                                      • 0x03: Random (static) Identity Address (corresponds to Resolved Private Address)

                                                        • Scanner_Address

                                                        +

                                                        6

                                                        +

                                                        Public Device Address, Random Device Address, Public Identity Address, or Random (static) Identity Address of the scanner device.

                                                        +

                                                        HCI_LE_CHANNEL_SELECTION_ALGORITHM_EVENT

                                                        Description

                                                        The HCI_LE_Channel_Selection_Algorithm event indicates which channel selection algorithm is used on a data physical channel connection.
                                                        See Bluetooth spec. v.5.2 [Vol 4, Part E, 7.7.65.20].

                                                        Event parameters

                                                        + + +
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        +

                                                        2

                                                        +

                                                        Connection handle for which the event applies.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • Channel_Selection_Algorithm

                                                        +

                                                        1

                                                        +

                                                        LE Channel Selection Algorithm.

                                                        +
                                                      • 0x00: Algorithm #1 is used
                                                      • 0x01: Algorithm #2 is used

                                                        • ACI GAP events

                                                        + +
                                                        Event nameVendor specific subevent codeBFPOLOBO
                                                        ACI_GAP_LIMITED_DISCOVERABLE_EVENT

                                                        0x0400

                                                        @@ -5856,8 +6412,8 @@ Units: dBm

                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle on which the pairing procedure completed

                                                        -

                                                        Handle of the connection where this event occurred.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • Status

                                                        1

                                                        Pairing status

                                                        @@ -5870,20 +6426,20 @@ Units: dBm

                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle for which the passkey has been requested.

                                                        -

                                                        Handle of the connection where this event occurred.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • ACI_GAP_AUTHORIZATION_REQ_EVENT

                                                        Description

                                                        This event is generated by the Security manager to the application when the application has set that authorization is required for reading/writing of attributes. This event will be generated as soon as the pairing is complete. When this event is received, ACI_GAP_AUTHORIZATION_RESP command should be used to respond by the application.

                                                        Event parameters

                                                        +
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle for which authorization has been requested.

                                                        -

                                                        Handle of the connection where this event occurred.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • ACI_GAP_SLAVE_SECURITY_INITIATED_EVENT

                                                        Description

                                                        This event is generated when the slave security request is successfully sent to the master.

                                                        Event parameters

                                                        None

                                                        ACI_GAP_BOND_LOST_EVENT

                                                        Description

                                                        This event is generated when a pairing request is issued in response to a slave security request from a master which has previously bonded with the slave. When this event is received, the upper layer has to issue the command ACI_GAP_ALLOW_REBOND in order to allow the slave to continue the pairing process with the master.

                                                        Event parameters

                                                        None

                                                        ACI_GAP_PROC_COMPLETE_EVENT

                                                        Description

                                                        This event is sent by the GAP to the upper layers when a procedure previously started has been terminated by the upper layer or has completed for any other reason

                                                        Event parameters

                                                        + +
                                                        ParameterSizeDescriptionPossible values

                                                        Procedure_Code

                                                        1

                                                        Terminated procedure.

                                                        -
                                                      • 0x01: GAP_LIMITED_DISCOVERY_PROC
                                                      • 0x02: GAP_GENERAL_DISCOVERY_PROC
                                                      • 0x04: GAP_NAME_DISCOVERY_PROC
                                                      • 0x08: GAP_AUTO_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x10: GAP_GENERAL_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x20: GAP_SELECTIVE_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x40: GAP_DIRECT_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x80: GAP_OBSERVATION_PROC
                                                      • 0x01: GAP_LIMITED_DISCOVERY_PROC
                                                      • 0x02: GAP_GENERAL_DISCOVERY_PROC
                                                      • 0x08: GAP_AUTO_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x10: GAP_GENERAL_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x20: GAP_SELECTIVE_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x40: GAP_DIRECT_CONNECTION_ESTABLISHMENT_PROC
                                                      • 0x80: GAP_OBSERVATION_PROC

                                                        • Status

                                                        1

                                                        Status error code.

                                                        @@ -5901,26 +6457,27 @@ Units: dBm

                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle for which the private address could not be resolved with any of the stored IRK's.

                                                        -

                                                        Handle of the connection where this event occurred.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • ACI_GAP_NUMERIC_COMPARISON_VALUE_EVENT

                                                        Description

                                                        This event is sent only during SC Pairing, when Numeric Comparison Association model is selected, in order to show the Numeric Value generated, and to ask for Confirmation to the User. When this event is received, the application has to respond with the ACI_GAP_NUMERIC_COMPARISON_RESP command.

                                                        Event parameters

                                                        + +
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle related to the underlying Pairing

                                                        -

                                                        Handle of the connection where this event occurred.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • Numeric_Value

                                                        4

                                                        -

                                                        Generated numeric value.

                                                        +

                                                        ACI_GAP_KEYPRESS_NOTIFICATION_EVENT

                                                        Description

                                                        This event is sent only during SC Pairing, when Keypress Notifications are supported, in order to show the input type signalled by the peer device, having Keyboard only I/O capabilities. When this event is received, no action is required to the User.

                                                        Event parameters

                                                        +
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle related to the underlying Pairing

                                                        -

                                                        Handle of the connection where this event occurred.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • Notification_Type

                                                        1

                                                        -

                                                        Type of Keypress input notified/signaled by peer device (having Keyboard only I/O capabilities

                                                        +

                                                        Type of Keypress input notified/signaled by peer device (having Keyboard only I/O capabilities.

                                                        ACI GATT/ATT events

                                                        @@ -6016,8 +6573,8 @@ Units: dBm

                                                         + +
                                                        Event nameVendor specific subevent codeBFPOLOBO
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        The connection handle which modified the attribute.

                                                        -

                                                        Connection handle for which the event applies.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • Attr_Handle

                                                        2

                                                        Handle of the attribute that was modified.

                                                        @@ -6038,8 +6595,8 @@ Units: dBm

                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Connection handle on which the GATT procedure has timed out

                                                        -

                                                        Connection handle for which the event applies.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • ACI_ATT_EXCHANGE_MTU_RESP_EVENT

                                                        Description

                                                        This event is generated in response to an Exchange MTU request. See ACI_GATT_EXCHANGE_CONFIG.

                                                        Event parameters

                                                        + @@ -6461,7 +7018,8 @@ It will be the value of the Characteristic if a "Read using Characteristic +
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        @@ -6312,8 +6869,8 @@ It will be the value of the Characteristic if a "Read using Characteristic
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        2

                                                        -

                                                        Handle of the connection which requested to read the attribute

                                                        -

                                                        Connection handle for which the event applies.

                                                        +
                                                      • 0x0000 ... 0x0EFF

                                                        • Number_of_Handles

                                                        1

                                                      • 0x0000 ... 0x0EFF

                                                        • Result

                                                        2

                                                        -

                                                        Result field from the response packet.

                                                        +
                                                      • 0x0000: Connection Parameters accepted
                                                      • 0x0001: Connection Parameters rejected

                                                        • ACI_L2CAP_PROC_TIMEOUT_EVENT

                                                        Description

                                                        This event is generated when the master does not respond to the connection update request packet with a connection update response packet or a command reject packet within 30 seconds.

                                                        Event parameters

                                                        -
                                                        ParameterSizeDescriptionPossible values

                                                        Connection_Handle

                                                        @@ -6492,12 +7050,12 @@ It will be the value of the Characteristic if a "Read using Characteristic

                                                        Interval_Min

                                                        2

                                                        Minimum value for the connection event interval. This shall be less than or equal to Conn_Interval_Max. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Interval_Max

                                                        2

                                                        Maximum value for the connection event interval. This shall be greater than or equal to Conn_Interval_Min. -Time = N * 1.25 msec.

                                                        +Time = N * 1.25 ms.

                                                      • 0x0006 (7.50 ms) ... 0x0C80 (4000.00 ms)

                                                        • Slave_Latency

                                                        2

                                                        @@ -6679,8 +7237,8 @@ Time = N * 1.25 msec.

                                                        ParameterSizeDescriptionPossible values

                                                        RSSI

                                                        1

                                                        -

                                                        N Size: 1 Octet (signed integer) -Units: dBm

                                                        +

                                                        RSSI (signed integer). +Units: dBm.

                                                      • 127: RSSI not available
                                                      • -127 ... 20

                                                        • Peer_Address_Type

                                                        1

                                                        @@ -6708,7 +7266,7 @@ Units: dBm

                                                        Data_Length

                                                        The error event info

                                                        Status error codes

                                                        Status error codes are used for the return status of all commands. Only the codes from 0 to 0x3E are used for HCI commands (see Core Specification Vol. 2, part D), while more codes are defined for ACI commands (see table below).

                                                        +

                                                        Status error codes

                                                        Status error codes are used for the return status of all commands. Only the codes from 0 to 0x45 are used for HCI commands (see Bluetooth spec. v.5.2 [Vol 1, Part F]), while more codes are defined for ACI commands (see table below).

                                                        - - - - @@ -6764,12 +7310,6 @@ Units: dBm

                                                         - - @@ -6779,29 +7319,23 @@ Units: dBm

                                                         - - - - - @@ -6863,32 +7388,11 @@ Units: dBm

                                                         - - - - - - - + + + + + +
                                                        Status error codeDescription

                                                        0x00

                                                        Success

                                                        @@ -6743,18 +7301,6 @@ Units: dBm

                                                        0x0C

                                                        Command Disallowed

                                                        0x0D

                                                        -

                                                        Connection Rejected Due To Limited Resources

                                                        -

                                                        0x0E

                                                        -

                                                        Connection Rejected Due To Security Reasons

                                                        -

                                                        0x0F

                                                        -

                                                        Connection Rejected due to Unacceptable BD_ADDR

                                                        -

                                                        0x10

                                                        -

                                                        Connection Accept Timeout Exceeded

                                                        -

                                                        0x11

                                                        Unsupported Feature Or Parameter Value

                                                        0x13

                                                        Remote User Terminated Connection

                                                        0x14

                                                        -

                                                        Remote Device Terminated Connection due to Low Resources

                                                        -

                                                        0x15

                                                        -

                                                        Remote Device Terminated Connection due to Power Off

                                                        -

                                                        0x16

                                                        Connection Terminated By Local Host

                                                        0x18

                                                        Pairing Not Allowed

                                                        0x19

                                                        -

                                                        Unknown LMP PDU

                                                        -

                                                        0x1A

                                                        -

                                                        Unsupported Remote Feature / Unsupported LMP Feature

                                                        +

                                                        Unsupported Remote Feature

                                                        0x1E

                                                        -

                                                        Invalid LMP Parameters

                                                        +

                                                        Invalid LL Parameters

                                                        0x1F

                                                        Unspecified Error

                                                        0x20

                                                        -

                                                        Unsupported LMP Parameter Value

                                                        -

                                                        0x21

                                                        Role Change Not Allowed

                                                        0x22

                                                        -

                                                        LMP Response Timeout / LL Response Timeout

                                                        +

                                                        LL Response Timeout

                                                        0x23

                                                        -

                                                        LMP Error Transaction Collision

                                                        +

                                                        LL Procedure Collision

                                                        0x24

                                                        LMP PDU Not Allowed

                                                        @@ -6830,15 +7364,6 @@ Units: dBm

                                                        0x30

                                                        Parameter Out Of Mandatory Range

                                                        0x32

                                                        -

                                                        Role Switch Pending

                                                        -

                                                        0x34

                                                        -

                                                        Reserved Slot Violation

                                                        -

                                                        0x35

                                                        -

                                                        Role Switch Failed

                                                        -

                                                        0x37

                                                        Secure Simple Pairing Not Supported by Host

                                                        0x3E

                                                        Connection Failed to be Established

                                                        0x40

                                                        -

                                                        Unknown connection identifier at SMP level

                                                        -

                                                        0x41

                                                        -

                                                        Failed

                                                        -

                                                        0x42

                                                        -

                                                        Invalid parameters

                                                        -

                                                        0x43

                                                        -

                                                        Busy

                                                        +

                                                        Unknown Advertising Identifier

                                                        0x45

                                                        -

                                                        Pending

                                                        -

                                                        0x46

                                                        -

                                                        Not allowed

                                                        -

                                                        0x47

                                                        -

                                                        Host error

                                                        -

                                                        0x48

                                                        -

                                                        Out of memory

                                                        -

                                                        0x50

                                                        -

                                                        Invalid CID

                                                        +

                                                        Packet Too Long

                                                        0x59

                                                        Device in blacklist

                                                        @@ -6947,4 +7451,22 @@ Units: dBm

                                                        0x86

                                                        Slot length failed

                                                        0x91

                                                        +

                                                        Failed

                                                        +

                                                        0x92

                                                        +

                                                        Invalid parameters

                                                        +

                                                        0x93

                                                        +

                                                        Busy

                                                        +

                                                        0x95

                                                        +

                                                        Pending

                                                        +

                                                        0x97

                                                        +

                                                        Host error

                                                        +

                                                        0x98

                                                        +

                                                        Out of memory

                                                        +
                                                        \ No newline at end of file diff --git a/Middlewares/ST/STM32_WPAN/ble/core/template/ble_const.h b/Middlewares/ST/STM32_WPAN/ble/core/template/ble_const.h index 8396b41ce..d388795fc 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/template/ble_const.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/template/ble_const.h @@ -5,15 +5,14 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef BLE_CONST_H__ @@ -121,5 +120,3 @@ extern int hci_send_req( struct hci_request* req, uint8_t async ); #endif /* BLE_CONST_H__ */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/template/compiler.h b/Middlewares/ST/STM32_WPAN/ble/core/template/compiler.h index 622ea9df5..2e51752fb 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/template/compiler.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/template/compiler.h @@ -5,15 +5,14 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef COMPILER_H__ @@ -151,5 +150,3 @@ #endif /* COMPILER_H__ */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c b/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c index 6d662798e..581478cb3 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c +++ b/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c @@ -6,15 +6,14 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #include diff --git a/Middlewares/ST/STM32_WPAN/ble/core/template/osal.h b/Middlewares/ST/STM32_WPAN/ble/core/template/osal.h index abfa90733..b68cf32c1 100644 --- a/Middlewares/ST/STM32_WPAN/ble/core/template/osal.h +++ b/Middlewares/ST/STM32_WPAN/ble/core/template/osal.h @@ -8,15 +8,14 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ***************************************************************************** */ #ifndef OSAL_H__ diff --git a/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.c b/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.c index 0a7e92a81..707c86c5c 100644 --- a/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.c +++ b/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.c @@ -5,17 +5,16 @@ * @brief This file contains functions for creating MMI on a terminal. ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ diff --git a/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.h b/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.h index 6dc945ddb..94a5f7d6a 100644 --- a/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.h +++ b/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.h @@ -1,21 +1,20 @@ /** ****************************************************************************** * @file DispTools.h - * @author MCD Application Team - * @brief Header file for functions for creating MMI on a terminal. + * @author MCD Application Team + * @brief Header file for functions for creating MMI on a terminal. ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ diff --git a/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.c b/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.c index ac72df9d5..0f04f65b1 100644 --- a/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.c +++ b/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -139,4 +138,4 @@ void HIDS_Menu (uint8_t * action_type, uint8_t * report) } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.h b/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.h index fa7adcb9d..e7defcd0b 100644 --- a/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.h +++ b/Middlewares/ST/STM32_WPAN/ble/menu/hids_menu.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -43,4 +42,4 @@ void HIDS_Menu (uint8_t * action_type, uint8_t * report); #endif /*__HIDS_MENU_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/menu/hids_mouse_menu.c b/Middlewares/ST/STM32_WPAN/ble/menu/hids_mouse_menu.c index c37c2ce55..84ae004c7 100644 --- a/Middlewares/ST/STM32_WPAN/ble/menu/hids_mouse_menu.c +++ b/Middlewares/ST/STM32_WPAN/ble/menu/hids_mouse_menu.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -167,4 +166,4 @@ void HIDS_Menu (uint8_t * action_type, uint8_t * report) DeleteMenu(Handle); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/appli_test.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/appli_test.h index 584645b23..9f30f7a8f 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/appli_test.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/appli_test.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,5 +43,5 @@ MOBLEUINT8 processDelay(MOBLEUINT16 waitPeriod); #endif /* __RESPONSE_TEST_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_clock.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_clock.h index 8f92cbcc2..613d28a0e 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_clock.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_clock.h @@ -1,23 +1,24 @@ -/******************** (C) COPYRIGHT 2012 STMicroelectronics ******************** -* File Name : ble_clock.h -* Author : AMS - HEA&RF BU -* @version V1.12.000 -* @date 06-12-2019 -* Description : Header file for clock library, that gives a simple time -* reference to the BLE Stack. -******************************************************************************** -* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS -* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME. -* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, -* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE -* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING -* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. -*******************************************************************************/ - +/** +****************************************************************************** +* @file ble_clock.h +* @author BLE Mesh Team +* @brief Header file for clock library, that gives a simple time +* reference to the BLE Stack. +****************************************************************************** +* @attention +* +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. +* +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. +* +****************************************************************************** +*/ #ifndef __BLE_CLOCK_H__ #define __BLE_CLOCK_H__ -//#include "bluenrg_itf.h" #include typedef uint32_t tClockTime; diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_mesh.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_mesh.h index d278d9927..d9ecd7cd1 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_mesh.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/ble_mesh.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1465,5 +1464,5 @@ void* GetMemoryDataBuffer(MOBLEUINT8 type, MOBLEUINT32 len); #endif /* __BLE_MESH_ */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/mesh_cfg.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/mesh_cfg.h index 34b0f878b..be944345b 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/mesh_cfg.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/mesh_cfg.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -27,7 +26,12 @@ /* Exported macro ------------------------------------------------------------*/ /* Flash parameters */ +#if defined(STM32WB55xx) #define PAGE_SIZE 4096 +#endif +#if defined(STM32WB15xx) +#define PAGE_SIZE 2048 +#endif #define RESET_MANAGER_FLASH_BASE_ADDRESS (0x10040000) @@ -70,9 +74,9 @@ void MemoryDumpHex(const MOBLEUINT8* memory_addr, int size); /* No OOB Type Authentication Configuration */ #ifdef ENABLE_AUTH_TYPE_NO_OOB -#define AUTH_TYPE_NO_OOB_ENABLE_STATE TRUE +#define AUTH_TYPE_NO_OOB_ENABLE_STATE MOBLE_TRUE #else -#define AUTH_TYPE_NO_OOB_ENABLE_STATE FALSE +#define AUTH_TYPE_NO_OOB_ENABLE_STATE MOBLE_FALSE #endif /* Static OOB Configurations */ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_if.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_if.h index a95435cf0..22d063ba4 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_if.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_if.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_nvm.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_nvm.h index bd39bf008..12f2ea134 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_nvm.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/pal_nvm.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -34,7 +33,11 @@ extern const void* mobleNvmBase; /* Private define ------------------------------------------------------------*/ #define NVM_BASE ((unsigned int)mobleNvmBase) +#if defined(STM32WB55xx) #define NVM_SIZE 8192U +#elif defined(STM32WB15xx) +#define NVM_SIZE 4096U +#endif typedef enum { diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ctrl.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ctrl.h index c99cf9ee1..801895b93 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ctrl.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ctrl.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -32,5 +31,5 @@ void SerialCtrlVendorRead_Process(char *rcvdStringBuff, uint16_t rcvdStringSize) void SerialCtrlVendorWrite_Process(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __SERIAL_CTRL_H */ -/******************* (C) COPYRIGHT 2018 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_if.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_if.h index 4a7ec6255..896312f2d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_if.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_if.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -35,5 +34,5 @@ MOBLEUINT8 Serial_CharToHexConvert(char addr); #endif /* __SERIAL_IF_H */ -/******************* (C) COPYRIGHT 2018 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_prvn.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_prvn.h index a28f0ba8b..b5f4d6c90 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_prvn.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_prvn.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -32,5 +31,5 @@ void SerialPrvn_Process(char *rcvdStringBuff, uint16_t rcvdStringSize); void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInProcess, MOBLEUINT16 nodeAddress); #endif /* __SERIAL_PRVN_H */ -/******************* (C) COPYRIGHT 2018 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ut.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ut.h index 5702d62ed..75c1446a6 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ut.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/serial_ut.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,5 @@ void SerialUt_Process(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __UPPER_TESTER_H */ -/******************* (C) COPYRIGHT 2018 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/types.h b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/types.h index aab07a197..a8ccfb67b 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/types.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Inc/types.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -148,5 +147,5 @@ typedef struct __attribute__((packed)) #endif /* _TYPES_H */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC.a index b3f279d93..364f1c22c 100644 Binary files a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC.a and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC_DEBUG.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC_DEBUG.a index c86f0094e..8c731c458 100644 Binary files a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC_DEBUG.a and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_GCC_DEBUG.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR.a index 314828748..9fb704012 100644 Binary files a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR.a and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR_DEBUG.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR_DEBUG.a index 2fe07dffe..295dcaad5 100644 Binary files a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR_DEBUG.a and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_IAR_DEBUG.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil.lib b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil.lib index 45cc25085..e3153e839 100644 Binary files a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil.lib and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil.lib differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil_DEBUG.lib b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil_DEBUG.lib index eb4781e5b..48b72ea22 100644 Binary files a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil_DEBUG.lib and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_Keil_DEBUG.lib differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC.a new file mode 100644 index 000000000..ac461c9ca Binary files /dev/null and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC_DEBUG.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC_DEBUG.a new file mode 100644 index 000000000..ce0295276 Binary files /dev/null and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_GCC_DEBUG.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR.a new file mode 100644 index 000000000..a8b5c4ef3 Binary files /dev/null and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR_DEBUG.a b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR_DEBUG.a new file mode 100644 index 000000000..b17efd2ad Binary files /dev/null and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_IAR_DEBUG.a differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil.lib b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil.lib new file mode 100644 index 000000000..4b7238136 Binary files /dev/null and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil.lib differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil_DEBUG.lib b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil_DEBUG.lib new file mode 100644 index 000000000..dc5a0dcb5 Binary files /dev/null and b/Middlewares/ST/STM32_WPAN/ble/mesh/Library/libBle_Mesh_CM4_WB15xx_Keil_DEBUG.lib differ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/common.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/common.h index 7762aaa94..447e9d4c6 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/common.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -702,5 +701,5 @@ MOBLEBOOL Wait_RandomTime(void); #endif /* __COMMON_H */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/config_client.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/config_client.h index 62f4020b3..2ffa227c2 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/config_client.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/config_client.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -462,5 +461,5 @@ MOBLE_RESULT ConfigClientModel_ProcessMessageCb(MODEL_MessageHeader_t *pmsgParam #endif /* __CONFIG_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic.h index 8848224e7..799c0a3ff 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,5 +407,5 @@ void Generic_SaveModelStates(void *model_State,MOBLEUINT8 elementIndex); #endif /* __GENERIC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic_client.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic_client.h index 6cf09c696..0a810e266 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic_client.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/generic_client.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -120,5 +119,5 @@ MOBLE_RESULT Generic_Client_DefaultTransitionTime_Status(MOBLEUINT8 const *pTran #endif /* __GENERIC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light.h index ece4fc6f6..b9c04a1ed 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -555,5 +554,5 @@ void Light_SaveModelStates(void *model_State,MOBLEUINT8 elementIndex); #endif /* __LIGHT_MODEL_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_client.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_client.h index 4da4029f5..6952d3583 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_client.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_client.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -301,5 +300,5 @@ MOBLE_RESULT LightLC_Client_Property_Status(MOBLEUINT8 const *pLCProperty_status #endif /* __LIGHT_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_lc.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_lc.h index 63a22437d..d3cd93391 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_lc.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/light_lc.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,5 +144,5 @@ MOBLE_RESULT ExtractLcServerElementIndex(MOBLEUINT8* pLcsElementIndex, #endif /* __LIGHT_LC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors.h index a7d6416a9..d5eaed0fd 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -266,5 +265,5 @@ MOBLE_RESULT SensorServer_Init(void* sensorBuff, MOBLE_RESULT Sensor_ModelPublishSet(model_publicationparams_t* pPublishParams); #endif /* __SENSORS_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors_client.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors_client.h index d2e931f95..27c46fffb 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors_client.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/sensors_client.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -143,5 +142,5 @@ MOBLE_RESULT SensorsClient_Series_Get(MOBLEUINT8 elementIndex, #endif /* __SENSORS_CLIENT */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/time_scene.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/time_scene.h index 895f9209d..ca61392f0 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/time_scene.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/time_scene.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,5 @@ MOBLE_RESULT Time_SceneModelServer_ProcessMessageCb(MOBLE_ADDRESS peer_addr, #endif /* __TIME_SCENE_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/vendor.h b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/vendor.h index 9b6de8700..2aa514ce1 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/vendor.h +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc/vendor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,4 +170,4 @@ MOBLE_RESULT VendorModel_PID1_ProcessMessageCb(MODEL_MessageHeader_t *pmsgParams #endif /* __VENDOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c index 7b6db2877..5c98e62aa 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1880,4 +1879,4 @@ MOBLEBOOL Wait_RandomTime(void) return MOBLE_FALSE; } -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/config_client.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/config_client.c index 4dd80bd9c..c3c9a43c3 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/config_client.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/config_client.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1702,5 +1701,5 @@ WEAK_FUNCTION (MOBLEUINT8* GetNewProvNodeDevKey(void)) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c index c681fc6c8..ad1fbcc46 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1799,5 +1798,5 @@ WEAK_FUNCTION(MOBLE_RESULT Appli_GenericClient_Level_Set_Unack(void)) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic_client.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic_client.c index ef2b56581..cf3e05a88 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic_client.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic_client.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1062,5 +1061,5 @@ MOBLE_RESULT GenericModelClient_ProcessMessageCb(MODEL_MessageHeader_t *pmsgPara * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c index 2b04b7770..6af031043 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -4236,6 +4235,12 @@ WEAK_FUNCTION(MOBLE_RESULT Appli_Light_Lightness_Default_Status(MOBLEUINT8 const uint8_t elementIndex)) { return MOBLE_RESULT_SUCCESS;} +WEAK_FUNCTION(MOBLE_RESULT Appli_Light_Lightness_Last_Status(MOBLEUINT8 const *pLightnessLast_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex)) +{ return MOBLE_RESULT_SUCCESS;} + WEAK_FUNCTION(MOBLE_RESULT Appli_Light_Lightness_Range_Status(MOBLEUINT8 const *pLightnessRange_status, MOBLEUINT32 pLength, uint16_t dstPeer, @@ -4379,6 +4384,6 @@ WEAK_FUNCTION(void Light_UpdatePWMValue(MOBLEUINT8 state) {}) */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_client.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_client.c index 7d194edfb..818b383ff 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_client.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_client.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -3194,5 +3193,5 @@ MOBLE_RESULT LightModelClient_ProcessMessageCb(MODEL_MessageHeader_t *pmsgParam, * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c index 29cbf328e..dd65f406d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -4198,5 +4197,5 @@ MOBLE_RESULT ExtractLcServerElementIndex(MOBLEUINT8* pLcsElementIndex, * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c index 306b59a86..92634f0d4 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -4537,5 +4536,5 @@ WEAK_FUNCTION(MOBLE_RESULT Appli_Sensor_Update(MOBLEUINT8 sensorOffset, MOBLEUINT32 value)) { return MOBLE_RESULT_SUCCESS;} #endif -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors_client.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors_client.c index 8d5e4bdec..bd87e46d7 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors_client.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors_client.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -669,5 +668,5 @@ MOBLE_RESULT SensorsModelClient_ProcessMessageCb(MODEL_MessageHeader_t *pmsgPara * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/time_scene.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/time_scene.c index b8980a62d..9d711a31c 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/time_scene.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/time_scene.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,5 +214,5 @@ MOBLE_RESULT Time_SceneModelServer_ProcessMessageCb(MOBLE_ADDRESS peer_addr, } -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c index ea2437f9d..b071e3aa4 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -762,7 +761,7 @@ __weak MOBLE_RESULT Packet_ResponseTimeStamp(MOBLEUINT32 rcvTimeStamp) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/PAL/STM32WB/pal_nvm.c b/Middlewares/ST/STM32_WPAN/ble/mesh/PAL/STM32WB/pal_nvm.c index 5d4a7f95c..77cf90e8d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/PAL/STM32WB/pal_nvm.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/PAL/STM32WB/pal_nvm.c @@ -1,40 +1,17 @@ /** ****************************************************************************** * @file pal_nvm.c -* @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 +* @author MCD Application Team * @brief Flash management for the Controller ****************************************************************************** * @attention * -*

                                                        © COPYRIGHT(c) 2017 STMicroelectronics

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -322,4 +299,4 @@ MOBLE_RESULT BnrgmPalNvmProcess(void) return MOBLE_RESULT_SUCCESS; } -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/appli_test.c b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/appli_test.c index 5d9a7ea05..9544139b8 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/appli_test.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/appli_test.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c index 72e9cf51c..15d92c20a 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1852,4 +1851,4 @@ MOBLE_RESULT MoblePBADVStopProvisioning(void* param){return MOBLE_RESULT_SUCCESS /* PLEASE REFER TO THE .h file for different settings */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ctrl.c b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ctrl.c index ba35b5a4a..dbe762575 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ctrl.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ctrl.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -391,4 +390,4 @@ MOBLEUINT8 SerialCtrl_GetData(char *rcvdStringBuff, uint16_t rcvdStringSize, MOB /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_if.c b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_if.c index f9fc13ec8..834e06a66 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_if.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_if.c @@ -1,18 +1,17 @@ /** ****************************************************************************** * @file serial_if.c -* @date 06-12-2019 +* @author MCD Application Team * @brief Serial Interface file ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -457,4 +456,4 @@ void BLEMesh_PrintDataCb(MOBLEUINT8* data, MOBLEUINT16 size) /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_prvn.c b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_prvn.c index f9a56b1d9..7f60455c5 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_prvn.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_prvn.c @@ -1,18 +1,17 @@ /** ****************************************************************************** * @file serial_prvn.c -* @date 06-12-2019 +* @author MCD Application Team * @brief Embedded provisioner Serial Control file ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -256,4 +255,4 @@ void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInProcess, MOBLEUI /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ut.c b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ut.c index ca6215c21..a9264919f 100644 --- a/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ut.c +++ b/Middlewares/ST/STM32_WPAN/ble/mesh/Src/serial_ut.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * -*

                                                        © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                        +* Copyright (c) 2018-2021 STMicroelectronics. +* All rights reserved. * -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 +* This software is licensed under terms that can be found in the LICENSE file +* in the root directory of this software component. +* If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bas.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bas.h index f8562e014..34b581c7b 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bas.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bas.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,4 +59,4 @@ void BAS_Notification(BAS_Notification_evt_t * pNotification); #endif /*__BAS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bls.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bls.h index 5c979316c..fa11ceeb3 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bls.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bls.h @@ -5,17 +5,16 @@ * @brief Header for bls.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -100,4 +99,4 @@ void BLS_App_Notification(BLS_App_Notification_evt_t * pNotification); #endif /*__BLS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bvopus_service_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bvopus_service_stm.h index 1973b79d5..5e6145360 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bvopus_service_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/bvopus_service_stm.h @@ -1,36 +1,17 @@ /** ****************************************************************************** * @file bluevoice_opus.h - * @author SRA-A&SP - * @version V1.0.1 - * @date 22-Oct-2019 + * @author MCD Application Team * @brief This file contains definitions for BlueVoiceOPUS service. ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2019 STMicroelectronics

                                                        - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -206,4 +187,4 @@ BV_OPUS_Status BluevoiceOPUS_SendDisableNotifReq(void); #endif /* __BVOPUS_SERVICE_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/crs_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/crs_stm.h index ecf9d0e29..c95aeaada 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/crs_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/crs_stm.h @@ -1,24 +1,21 @@ /** ****************************************************************************** - * @file crs_stm.h + * @file crs_stm.h * @author MCD Application Team - * @version V0.0.1.alpha - * @date 04-September-2018 * @brief Header for crs_stm.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -72,4 +69,4 @@ tBleStatus CRSAPP_Update_Char(uint16_t UUID, uint8_t *pPayload); #endif /*__STM32XX_CRS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/dis.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/dis.h index d23ec7d20..4b430eb3c 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/dis.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/dis.h @@ -5,17 +5,16 @@ * @brief Header for dis.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -50,4 +49,4 @@ tBleStatus DIS_UpdateChar(uint16_t uuid, DIS_Data_t *p_data); #endif /*__DIS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/eds_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/eds_stm.h index 5a3328af1..eee5867a2 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/eds_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/eds_stm.h @@ -6,17 +6,16 @@ * @brief Header for stm32xx_enddevicemanagement.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,4 +76,4 @@ tBleStatus EDS_STM_Update_Char(uint16_t UUID, uint8_t *pPayload); #endif /*__EDS_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hids.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hids.h index a37c9f4bf..02af66098 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hids.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hids.h @@ -5,17 +5,16 @@ * @brief Header for hids.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -77,4 +76,4 @@ void HIDS_Notification(HIDS_App_Notification_evt_t *pNotification); #endif /*__HIDS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hrs.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hrs.h index 3abc5a798..741951dcd 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hrs.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hrs.h @@ -5,17 +5,16 @@ * @brief Header for stm32xx_heartrate.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -97,4 +96,4 @@ typedef struct #endif /*__HRS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hts.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hts.h index f8bc169e3..b41f188bb 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hts.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/hts.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,4 +110,4 @@ void HTS_App_Notification(HTS_App_Notification_evt_t * pNotification); #endif /*__HTS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/ias.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/ias.h index a18dd4172..076af5aca 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/ias.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/ias.h @@ -5,17 +5,16 @@ * @brief Header for ias.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -60,4 +59,4 @@ void IAS_App_Notification(IAS_App_Notification_evt_t *pNotification); #endif /*__IAS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/lls.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/lls.h index 25e85ce1c..244af4da6 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/lls.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/lls.h @@ -5,17 +5,16 @@ * @brief Header for lls.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -61,4 +60,4 @@ void LLS_App_Notification(LLS_App_Notification_evt_t *pNotification); #endif /*__LLS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/mesh.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/mesh.h index 818665dea..03a1cad7f 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/mesh.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/mesh.h @@ -6,39 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright c 2017 STMicroelectronics International N.V. - * All rights reserved.

                                                        - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,4 +40,4 @@ extern "C" #endif /*__MESH_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/motenv_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/motenv_stm.h index 3761caaae..8d8642724 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/motenv_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/motenv_stm.h @@ -6,17 +6,16 @@ * @brief Header for motenv_stm.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -165,4 +164,4 @@ tBleStatus MOTENV_STM_App_Update_Char(uint16_t UUID, uint8_t payloadLen, uint8_t #endif /* MOTENV_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/opus_interface_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/opus_interface_stm.h index 1a7ea9386..16d0ca903 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/opus_interface_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/opus_interface_stm.h @@ -1,36 +1,17 @@ /** ****************************************************************************** * @file opus_interface_stm.h - * @author SRA-A&SP - * @version V1.0.0 - * @date 08-May-2019 + * @author MCD Application Team * @brief This file contains definitions for the opus interface. ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2019 STMicroelectronics

                                                        - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -209,4 +190,4 @@ int OPUS_IF_DEC_Decode(uint8_t * buf_in, uint32_t len, uint8_t * buf_out); #endif /* __OPUS_INTERFACE_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/otas_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/otas_stm.h index 58ebbee2b..627d5932f 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/otas_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/otas_stm.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -106,4 +105,4 @@ extern "C" { #endif /*__OTAS_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/p2p_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/p2p_stm.h index a77031dc9..11c460683 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/p2p_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/p2p_stm.h @@ -6,17 +6,16 @@ * @brief Header for p2p_stm.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -71,4 +70,4 @@ tBleStatus P2PS_STM_App_Update_Char(uint16_t UUID, uint8_t *pPayload); #endif /*__P2PS_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/svc_ctl.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/svc_ctl.h index 781fa9e4c..01e921d67 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/svc_ctl.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/svc_ctl.h @@ -6,17 +6,16 @@ * @brief Header for ble_controller.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @@ -169,4 +168,4 @@ extern "C" { #endif /*__SVCCTL_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/template_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/template_stm.h index 794ce95fa..c7c5c03cf 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/template_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/template_stm.h @@ -6,17 +6,16 @@ * @brief Header for template_stm.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -71,4 +70,4 @@ tBleStatus TEMPLATE_STM_App_Update_Char(uint16_t UUID, uint8_t *pPayload); #endif /*__TEMPLATE_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/tps.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/tps.h index 1ebed9433..0e0ebeae7 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/tps.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/tps.h @@ -5,17 +5,16 @@ * @brief Header for tps.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -44,4 +43,4 @@ tBleStatus TPS_Update_Char(uint16_t UUID, uint8_t *pPayload); #endif /*__TPS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/uuid.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/uuid.h index a3df79037..bec564ffe 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/uuid.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/uuid.h @@ -2,19 +2,16 @@ ****************************************************************************** * @file uuid.h.h * @author MCD Application Team - * @version V1.0.0 - * @date 04-September-2018 * @brief Header containing the UUIDs of all the services and caharcteristics ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/zdd_stm.h b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/zdd_stm.h index f28c448c3..5d9aa5aaf 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Inc/zdd_stm.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Inc/zdd_stm.h @@ -6,17 +6,16 @@ * @brief Header for zdd_stm.c module ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -98,4 +97,4 @@ tBleStatus ZDD_STM_App_Update_Char(uint16_t UUID, uint8_t payloadLen, uint8_t *p #endif /*__ZDD_STM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/bas.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/bas.c index 1cf8fb325..33dbf28f9 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/bas.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/bas.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") BAS_Context_t BAS_Context[BLE_CFG_BAS_NU /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t BAS_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t BAS_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -287,4 +286,4 @@ void BAS_Update_Char(uint16_t UUID, uint8_t service_instance, uint8_t *pPayload) }/* end BAS_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/bls.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/bls.c index bea787d5c..faf30b81e 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/bls.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/bls.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ static void BLS_Update_Char_Value(uint16_t CharHandle, static void BLS_Update_Char_Feature(uint16_t CharHandle, uint16_t *pBloodPressureFeature); #endif -static SVCCTL_EvtAckStatus_t BLS_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t BLS_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -458,4 +457,4 @@ void BLS_Update_Char(uint16_t UUID, uint8_t *pPayload) }/* end BLS_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/bvopus_service_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/bvopus_service_stm.c index 34665e3ca..3668b31bb 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/bvopus_service_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/bvopus_service_stm.c @@ -1,36 +1,17 @@ /** ****************************************************************************** * @file bvopus_service_stm.c - * @author SRA-A&SP - * @version V1.0.1 - * @date 22-Oct-2019 + * @author MCD Application Team * @brief This file contains definitions for BlueVoice opus service. ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2019 STMicroelectronics

                                                        - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -836,4 +817,4 @@ uint32_t BluevoiceOPUS_TP_Encapsulate(uint8_t* buffer_out, uint8_t* buffer_in, u } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/common_blesvc.h b/Middlewares/ST/STM32_WPAN/ble/svc/Src/common_blesvc.h index 5d284114b..2cf155264 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/common_blesvc.h +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/common_blesvc.h @@ -6,17 +6,16 @@ * @brief Header for ble modules ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -52,4 +51,4 @@ typedef enum #endif /*__COMMON_BLESVC_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/crs_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/crs_stm.c index b7245f017..fed6b5062 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/crs_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/crs_stm.c @@ -2,22 +2,19 @@ ****************************************************************************** * @file crs_stm.c * @author MCD Application Team - * @version V0.0.1.alpha - * @date 04-September-2018 * @brief Cable Replacement Service (Custom STM) ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -57,7 +54,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static CRSContext_t CRSContext; * END of Section BLE_DRIVER_CONTEXT */ /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t CRS_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t CRS_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -307,4 +304,4 @@ tBleStatus CRSAPP_Update_Char(uint16_t UUID, uint8_t *pPayload) }/* end CRSAPP_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c index b44afd62b..c42198b19 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c @@ -5,17 +5,16 @@ * @brief Device Information Service ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -500,4 +499,4 @@ tBleStatus DIS_UpdateChar(uint16_t UUID, DIS_Data_t *pPData) return return_value; }/* end DIS_UpdateChar() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/eds_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/eds_stm.c index dc27e810d..5425a608f 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/eds_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/eds_stm.c @@ -5,17 +5,16 @@ * @brief End Device Service (Custom - STM) ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -36,7 +35,7 @@ typedef struct{ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static EndDeviceManagementContext_t aEndDeviceManagementContext; /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t EndDeviceManagement_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t EndDeviceManagement_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -209,4 +208,4 @@ tBleStatus EDS_STM_Update_Char(uint16_t UUID, uint8_t *pPayload) }/* end BLE_SVC_LedButton_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/hids.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/hids.c index 0907b04c8..9959e46b7 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/hids.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/hids.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1189,4 +1188,4 @@ tBleStatus HIDS_Update_Char(uint16_t UUID, }/* end HIDS_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c index 8f9215091..cd81584d8 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c @@ -5,17 +5,16 @@ * @brief Heart Rate Service ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -76,7 +75,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static HRS_Context_t HRS_Context; static tBleStatus Update_Char_BodySensorLocation( HRS_BodySensorLocation_t *pBodySensorLocationValue ); #endif static tBleStatus Update_Char_Measurement(HRS_MeasVal_t *pMeasurement ); -static SVCCTL_EvtAckStatus_t HearRate_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t HearRate_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -586,4 +585,4 @@ tBleStatus HRS_UpdateChar(uint16_t UUID, uint8_t *pPayload) return return_value; }/* end HRS_UpdateChar() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/hts.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/hts.c index 3f8fbd632..361eb0f0d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/hts.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/hts.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,7 +60,7 @@ static const uint8_t aValidRangeInterval[4] = /* Private function prototypes -----------------------------------------------*/ static tBleStatus Update_Char_TemperatureValue(uint16_t CharHandle, HTS_TemperatureValue_t *pTemperatureValue); -static SVCCTL_EvtAckStatus_t HTS_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t HTS_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -602,4 +601,4 @@ tBleStatus HTS_Update_Char(uint16_t UUID, }/* end HTS_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/ias.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/ias.c index c9d9540e5..aeb88d0ac 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/ias.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/ias.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,7 +45,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static IAS_Context_t IAS_Context; /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t IAS_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t IAS_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -208,4 +207,4 @@ tBleStatus IAS_Update_Char(uint16_t UUID, uint8_t *pPayload) }/* end IAS_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/lls.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/lls.c index 7ea8b3c61..ef435e807 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/lls.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/lls.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,7 +45,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static LLS_Context_t LLS_Context; /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t LLS_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t LLS_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -208,4 +207,4 @@ tBleStatus LLS_Update_Char(uint16_t UUID, uint8_t *pPayload) }/* end LLS_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c index a7990c46e..e6599d649 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -594,4 +593,4 @@ TRACE_I(TF_MISC,"\n[Important Information] \r\n"); } -/************************ (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/motenv_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/motenv_stm.c index 9b59417e3..82062e94d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/motenv_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/motenv_stm.c @@ -5,17 +5,16 @@ * @brief MOTENV Service (Custom STM) ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -62,7 +61,7 @@ typedef struct PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static MotenvContext_t aMotenvContext; /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t Motenv_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t Motenv_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -947,4 +946,4 @@ tBleStatus MOTENV_STM_App_Update_Char(uint16_t UUID, uint8_t payloadLen, uint8_t return result; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/opus_interface_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/opus_interface_stm.c index 4427b0658..f584d8185 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/opus_interface_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/opus_interface_stm.c @@ -1,36 +1,17 @@ /** ****************************************************************************** * @file opus_interface_stm.c - * @author SRA-A&SP - * @version V1.0.0 - * @date 08-May-2019 + * @author MCD Application Team * @brief This file contains definitions for the opus interface. ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2019 STMicroelectronics

                                                        - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -371,4 +352,4 @@ int OPUS_IF_DEC_Decode(uint8_t * buf_in, uint32_t len, uint8_t * buf_out) return opus_decode(hOpus.Decoder, (unsigned char *) buf_in, (opus_int32) len, (opus_int16 *) buf_out, hOpus.DEC_frame_size, 0); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/otas_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/otas_stm.c index 761fdadaa..c6fc76a6d 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/otas_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/otas_stm.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,7 +115,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static OTAS_Context_t OTAS_Context; */ /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t OTAS_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t OTAS_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -309,4 +308,4 @@ tBleStatus OTAS_STM_UpdateChar(OTAS_STM_ChardId_t ChardId, uint8_t *p_payload) } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c index e60a1e62e..d039a517a 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c @@ -5,17 +5,16 @@ * @brief Peer to Peer Service (Custom STM) ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -70,7 +69,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static PeerToPeerContext_t aPeerToPeerCon * END of Section BLE_DRIVER_CONTEXT */ /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t PeerToPeer_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t PeerToPeer_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -290,4 +289,4 @@ tBleStatus P2PS_STM_App_Update_Char(uint16_t UUID, uint8_t *pPayload) return result; }/* end P2PS_STM_Init() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c index 549cdc35e..335e20ed5 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -328,4 +327,4 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_UserEvtRx( void *pckt ) return (return_status); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/template_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/template_stm.c index 6cbcdda0f..6396fb90e 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/template_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/template_stm.c @@ -5,17 +5,16 @@ * @brief Template Service (Custom STM) ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -62,7 +61,7 @@ static const uint8_t BM_REQ_CHAR_UUID[2] = {0x11, 0xFE}; PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static TemplateContext_t aTemplateContext; /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t Template_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t Template_Event_Handler(void *Event); /* Functions Definition ------------------------------------------------------*/ @@ -280,4 +279,4 @@ tBleStatus TEMPLATE_STM_App_Update_Char(uint16_t UUID, uint8_t *pPayload) return result; }/* end TEMPLATE_STM_Init() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/tps.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/tps.c index d37fc505b..ef9a35838 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/tps.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/tps.c @@ -5,17 +5,16 @@ * @brief TX Power Service ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -140,4 +139,4 @@ tBleStatus TPS_Update_Char(uint16_t UUID, uint8_t *pPayload) }/* end TPS_Update_Char() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble/svc/Src/zdd_stm.c b/Middlewares/ST/STM32_WPAN/ble/svc/Src/zdd_stm.c index ee2319c9c..0f06015db 100644 --- a/Middlewares/ST/STM32_WPAN/ble/svc/Src/zdd_stm.c +++ b/Middlewares/ST/STM32_WPAN/ble/svc/Src/zdd_stm.c @@ -5,21 +5,21 @@ * @brief ZDD Service for Zigbee Direct (Custom STM) ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "common_blesvc.h" +#include "ble_events.h" /* Private typedef -----------------------------------------------------------*/ typedef struct{ @@ -68,7 +68,7 @@ PLACE_IN_SECTION("BLE_DRIVER_CONTEXT") static ZDDContext_t aZDDContext; * END of Section BLE_DRIVER_CONTEXT */ /* Private function prototypes -----------------------------------------------*/ -static SVCCTL_EvtAckStatus_t ZDD_Event_Handler(void *pckt); +static SVCCTL_EvtAckStatus_t ZDD_Event_Handler(void *Event); static void ZDD_SECURITY_STM_Init(void); static void ZDD_COMMISSIONING_STM_Init(void); static void ZDD_TUNNELING_STM_Init(void); @@ -221,6 +221,8 @@ static SVCCTL_EvtAckStatus_t ZDD_Event_Handler(void *Event) hci_event_pckt *event_pckt; evt_blecore_aci *blecore_evt; aci_gatt_attribute_modified_event_rp0 * attribute_modified; + aci_gatt_read_permit_req_event_rp0 *attribute_read; + ZDD_STM_App_Notification_evt_t Notification; return_value = SVCCTL_EvtNotAck; event_pckt = (hci_event_pckt *)(((hci_uart_pckt*)Event)->data); @@ -232,32 +234,37 @@ static SVCCTL_EvtAckStatus_t ZDD_Event_Handler(void *Event) blecore_evt = (evt_blecore_aci*)event_pckt->data; switch(blecore_evt->ecode) { - /* Handle Write request or Notification enabling from GATT Client */ - case ACI_GATT_ATTRIBUTE_MODIFIED_VSEVT_CODE: + /****************************************/ + /* Handle Read request from GATT Client */ + /****************************************/ + case ACI_GATT_READ_PERMIT_REQ_VSEVT_CODE: { - attribute_modified = (aci_gatt_attribute_modified_event_rp0*)blecore_evt->data; - - /***********************************/ - /* Handle P2P Characteristics */ - /***********************************/ - - if(attribute_modified->Attr_Handle == (aZDDContext.ZddP2pNotifyServerToClientCharHdle + 2)) + attribute_read = (aci_gatt_read_permit_req_event_rp0*)blecore_evt->data; + /* Env char */ + if(attribute_read->Attribute_Handle == (aZDDContext.ZddCommStatusCharHdle + 1U)) { - return_value = SVCCTL_EvtAckFlowEnable; - ZDD_Event_Notify_Handler(attribute_modified, ZDD_P2P_STM__NOTIFY_ENABLED_EVT, ZDD_P2P_STM_NOTIFY_DISABLED_EVT); + BLE_DBG_ZDD_STM_MSG("\n-- GATT : READ COMM STATUS CHAR INFO RECEIVED\n"); + /* Notify to application */ + Notification.ZDD_Evt_Opcode = ZDD_COMM_STATUS_READ_EVT; + ZDD_STM_App_Notification(&Notification); } + aci_gatt_allow_read(attribute_read->Connection_Handle); + } + break; - else if(attribute_modified->Attr_Handle == (aZDDContext.ZddP2pWriteClientToServerCharHdle + 1)) - { - ZDD_Event_Write_Handler(attribute_modified, ZDD_P2P_STM_WRITE_EVT, "LED CONFIG"); - } + /******************************************************************/ + /* Handle Write request or Notification enabling from GATT Client */ + /******************************************************************/ + case ACI_GATT_ATTRIBUTE_MODIFIED_VSEVT_CODE: + { + attribute_modified = (aci_gatt_attribute_modified_event_rp0*)blecore_evt->data; /***********************************/ /* Handle SECURITY Characteristics */ /***********************************/ /* Write Security P_256 char */ - else if(attribute_modified->Attr_Handle == (aZDDContext.ZddSecP256CharHdle + 1)) + if(attribute_modified->Attr_Handle == (aZDDContext.ZddSecP256CharHdle + 1)) { ZDD_Event_Write_Handler(attribute_modified, ZDD_SEC_P_256_WRITE_EVT, "P_256"); } @@ -337,33 +344,6 @@ static SVCCTL_EvtAckStatus_t ZDD_Event_Handler(void *Event) } break; - /* Handle Read request from GATT Client */ - case ACI_GATT_READ_PERMIT_REQ_VSEVT_CODE: - { - aci_gatt_read_permit_req_event_rp0 *read_permit_req; - ZDD_STM_App_Notification_evt_t Notification; - - read_permit_req = (aci_gatt_read_permit_req_event_rp0*)blecore_evt->data; - /* Env char */ - if(read_permit_req->Attribute_Handle == (aZDDContext.ZddCommStatusCharHdle + 1U)) - { - /* Notify to application */ - BLE_DBG_ZDD_STM_MSG("\n-- GATT : READ COMM STATUS CHAR INFO RECEIVED\n"); - Notification.ZDD_Evt_Opcode = ZDD_COMM_STATUS_READ_EVT; - ZDD_STM_App_Notification(&Notification); - } - else if(read_permit_req->Attribute_Handle == (aZDDContext.ZddP2pWriteClientToServerCharHdle + 1)) - { - /* Notify to application */ - BLE_DBG_ZDD_STM_MSG("\n-- GATT : READ LED CONFIG CHAR INFO RECEIVED\n"); - Notification.ZDD_Evt_Opcode = ZDD_P2P_STM_READ_EVT; - ZDD_STM_App_Notification(&Notification); - } - (void)aci_gatt_allow_read(read_permit_req->Connection_Handle); - - } - break; - default: break; } @@ -540,13 +520,13 @@ static void ZDD_COMMISSIONING_STM_Init(void) COPY_ZDD_COMM_STATUS_CHAR_UUID(uuid_com.Char_UUID_128); aci_gatt_add_char(aZDDContext.ZddCommSvcHdle, UUID_TYPE_128, &uuid_com, - 90, + 85, CHAR_PROP_READ|CHAR_PROP_NOTIFY, // ATTR_PERMISSION_NONE, ATTR_PERMISSION_AUTHEN_READ, GATT_NOTIFY_READ_REQ_AND_WAIT_FOR_APPL_RESP, /* gattEvtMask */ 10, /* encryKeySize */ - 1, /* isVariable */ + 1, /* isVariable: 1 */ &(aZDDContext.ZddCommStatusCharHdle)); return; @@ -579,8 +559,8 @@ static void ZDD_TUNNELING_STM_Init(void) UUID_TYPE_128, &uuid_tun, 250, CHAR_PROP_WRITE|CHAR_PROP_INDICATE, - ATTR_PERMISSION_NONE, -// ATTR_PERMISSION_AUTHEN_WRITE|ATTR_PERMISSION_ENCRY_WRITE, +// ATTR_PERMISSION_NONE, + ATTR_PERMISSION_AUTHEN_WRITE|ATTR_PERMISSION_ENCRY_WRITE, GATT_NOTIFY_ATTRIBUTE_WRITE, /* gattEvtMask */ 10, /* encryKeySize */ 1, /* isVariable */ @@ -602,14 +582,6 @@ tBleStatus ZDD_STM_App_Update_Char(uint16_t UUID, uint8_t payloadLen, uint8_t *p tBleStatus result = BLE_STATUS_INVALID_PARAMS; switch(UUID) { - case ZDD_P2P_NOTIFY_CHAR_UUID: - result = aci_gatt_update_char_value(aZDDContext.ZddP2pSvcHdle, - aZDDContext.ZddP2pNotifyServerToClientCharHdle, - 0, /* charValOffset */ - payloadLen, /* charValueLen */ - pPayload); - break; - case ZDD_SEC_P_256_CHAR_UUID: result = aci_gatt_update_char_value(aZDDContext.ZddSecSvcHdle, aZDDContext.ZddSecP256CharHdle, @@ -649,4 +621,4 @@ tBleStatus ZDD_STM_App_Update_Char(uint16_t UUID, uint8_t payloadLen, uint8_t *p return result; }/* end ZDD_STM_Init() */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/ble_lld/README.md b/Middlewares/ST/STM32_WPAN/ble_lld/README.md new file mode 100644 index 000000000..8185a3621 --- /dev/null +++ b/Middlewares/ST/STM32_WPAN/ble_lld/README.md @@ -0,0 +1,171 @@ +# Introduction +BLE LLD is a radio communication layer. It relies on BLE radio hardware, but it is a proprietary radio abstraction layer, not a BLE stack. + +BLE LLD provides a light and simple layer to develop proprietary protocols and applications. + +Two layers are available: + - LLD with full features + - HAL with simple API + +# Architecture +``` + ┌───────┐ ┌─────────────┐ + │ HAL ◄───┤ │ + └───┬───┘ │ │ + │ │ │ + ┌───▼───┐ │ │ + │ LLD ◄───┤ application │ + └───┬───┘ │ │ + │ │ │ + ┌───▼───┐ │ │ + │ LLD ◄───┤ │ + │ proxy │ │ │ +appli └───────┘ └──────┬──────┘ +core │ +─────────────────────────IPCC──────── +radio │ +core ┌───▼───┐ + │ LLD │ + │ proxy │ + └───┬───┘ + │ + ┌───▼───┐ + │ LLD │ + └───┬───┘ + │ + ┌───▼───┐ + │ BLE │ + │ radio │ + └───────┘ +``` + +On appli core: + - Application is the user program using a custom radio protocol + - HAL is a wrapper based on LLD for simple communications + - LLD is the layer for full features communications + - LLD proxy packs/unpacks data and commands to/from radio core + +On radio core: + - LLD proxy packs/unpacks data and commands to/from appli core + - LLD provides the radio abstraction + - BLE radio is the RF hardware + +## Dual core +BLE LLD is designed to run on a dual core hardware: + - Application core runs user code + - Radio core runs private code dedicated to radio management + +The software communication layer between both core is called IPCC. This transport layer is decoupled from BLE LLD. + +This architecture brings some important constraints: + - no application code runs on radio core + - it takes a long time to run application code after a radio event + +To help implement fast radio operations sequences despite those constraints, "action packets" can be chained by the radio core. This chaining is configured by the application. + +Those constraints impact protocol design and LLD/HAL choice. + +## Action Packet +Action packet is the structure used by radio core to control transmissions and receptions of radio packets. + +Action packets can be chained to execute complex radio sequences. This chaining is configured with two fields of the action packet. One for the next action packet to run if operation (Tx or Rx) succeed, and the other for the next action packet to run if operation failed. + +### Back-to-back vs wake-up +Delay between action packets (or before the first packet) can be configured with two modes: back-to-back or wake-up. + +In back-to-back mode, everything stays powered, so it offers the lowest delays between action packets. Back-to-back time is a global parameter configured with `BLE_LLD_SetBackToBackTime()`, it cannot be configured separately for each action packet. + +In wake-up mode, radio goes to sleep, so the delay between action packets cannot be as short as in back-to-back mode. Wake-up time is configured separately for each action packet. + +For the first packet of a sequence, since the radio is not doing anything, wake-up mode must be used. + +## Radio packet details +Packets include an address that must match configured address of the recipient. +Each packet can carry a payload of maximum 255 bytes (less if using encryption). +Packets include a CRC and are checked for error at reception. + +# Usage + +## Blocking functions +API functions are blocking, they wait for processing by the radio core before returning (but not for radio packet transmission/reception). + +## Radio proxy configuration +Due to the dual core hardware, user cannot directly access radio core, but must control radio through a proxy. Since BLE LLD is independent from the communication layer with the radio core, it must be "wired" by the application, those wiring functions are prefixed BLE_LLD_PRX_. + +`BLE_LLD_PRX_Init()` must be called first to configure the radio core proxy. `BLE_LLD_PRX_EventProcessInter()` and `BLE_LLD_PRX_EventProcessTask()` are responsible for radio events processing and must be called respectively inside and after radio event interruption. + +Note: proxy configuration is required no matter which API (LLD/HAL) is used. + +## Radio events +User can register a callback function when he starts/configures a radio operation. + +When an event occurs on the radio core (e.g. transmission success, reception failure, etc.) the BLE LLD proxy is notified and can in turn run the callback if one was registered for this event. + +This mechanism allows for the user application to react to radio events. + +## HAL interface +HAL is just a layer on top of LLD to make simple communications easier. HAL has a simple API with limited features, it can be used when no custom packet chaining is required. Under the hood, HAL calls LLD to configure some action packets. + +### Configuration +Before packets exchange with HAL, it must be initialized with `HAL_BLE_LLD_Init()` then configured with `HAL_BLE_LLD_Configure()`. + +### Communication +Two set of functions are available: + - without ACK: the radio transmits/receives just one packet + - with ACK: the radio transmits/receives one packet, then another packet goes in the opposite direction + +"With ACK" functions can be used to detect packet loss, thus they can be used to implement a reliable communication channel with retransmissions of lost packets. + +## LLD interface +LLD is the layer that exposes all the features supported by the radio core. Its API is more complex and can be used to implement custom packets chaining. + +### Configuration +Before packets exchange with LLD, it must be initialized with `BLE_LLD_Init()` then configured with: + - `BLE_LLD_SetChannel()` + - `BLE_LLD_SetTxAttributes()` + - `BLE_LLD_SetTxPower()` + - `BLE_LLD_SetTx_Rx_Phy()` + +### Communication +With LLD API, user is responsible for the configuration of each action packet. + +Each action packet must be configured by setting all the required fields for the desired action (some fields are specific to Tx, others to Rx) then calling `BLE_LLD_SetReservedArea()`. + +To start the execution of the first action packet, call `BLE_LLD_MakeActionPacketPending()` on that action packet. The radio core will then chain action packets based on their configuration and the result of the radio operation. At the end of each action packet, an event will be sent to the application if a callback was registered for that action packet. + +Action packets chaining can be interrupted with `BLE_LLD_StopActivity()`. This will kill the radio, and a new initialization will be required before any other operation. + +Below diagram shows the action packets configured to implement `HAL_BLE_LLD_ReceivePacketWithAck()`. +``` + ┌───────┐ + │ START │ + └───┬───┘ + │ + │ + ┌────────▼────────┐ + │ Action Packet 2 │ + │ │ + │ * reception │ + │ * wake-up │ + │ * timeout │ + └──────┬───┬──────┘ +SUCCESS │ │ FAILURE + │ │ + │ └──────────┐ + │ │ + ┌──────▼──────────┐ │ + │ Action Packet 3 │ │ + │ │ │ + │ * transmission │ │ + │ * back-to-back │ │ + └──────┬───┬──────┘ │ +SUCCESS │ │ FAILURE │ + │ │ │ + ┌─▼───▼─┐ │ + │ STOP ◄────────┘ + └───────┘ +``` +Action Packet 2 is run first, it configures the reception for the data packet. If data is properly received (CRC OK), Action Packet 3 is run next and it configures the transmission of the ACK packet. Then the radio stops. If an action packet fails, radio stops. + +## Tone generation +For test purpose, a tone can be generated with `BLE_LLD_StartTone()`. Use `BLE_LLD_StopTone()` to stop this tone. After a tone, the radio needs to be reinitialized before any other operation. \ No newline at end of file diff --git a/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c b/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c index 02298fb9d..2da94f9c0 100644 --- a/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c +++ b/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c @@ -1,27 +1,23 @@ /** - ****************************************************************************** - * File Name : ble_hal.c - * Description : BLE HAL based on LLD + ****************************************************************************** + * @file ble_hal.c + * @author MCD Application Team + * @brief HAL based on BLE LLD + * This file provides functions for a simpler access to radio than LLD + * HAL relies on the LLD API. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ -/** - * This file provides functions for a simpler access to radio than LLD. - * It relies on the LLD API running on application MCU, and so does not depend - * on an HAL API provided by radio MCU. - */ - /* Includes ------------------------------------------------------------------*/ #include "stdint.h" #include "stdbool.h" @@ -47,8 +43,8 @@ static ActionPacket actPack[ACTION_PACKET_NB]; /** * @brief Initializes the radio * + * Whithening is forced. * Before actual use, radio must be configured with HAL_BLE_LLD_Configure(). - * This function enables whitening. * * @param[in] hsStartupTime Startup time (system time unit) * @param[in] lsOscInternal Use internal RO for the 32 kHz slow speed clock @@ -64,18 +60,16 @@ uint8_t HAL_BLE_LLD_Init(uint16_t hsStartupTime, bool lsOscInternal) * @brief Configures the radio * * @param[in] txPower Transmit power for outgoing packets - * @param[in] channel Radio channel + * @param[in] channel Radio channel (0 - 39) * @param[in] phy2mbps Use 2Mb/s PHY speed (else 1Mb/s) * @param[in] b2bTimeUs Back to back time (us), delay between packet and ACK * @param[in] networkId Network ID (access address) */ - uint8_t HAL_BLE_LLD_Configure(txPower_t txPower, uint8_t channel, bool phy2mbps, uint32_t b2bTimeUs, uint32_t networkId) - { BLE_LLD_SetTxPower(txPower); BLE_LLD_SetChannel(STATE_MACHINE_0, channel); @@ -90,14 +84,15 @@ uint8_t HAL_BLE_LLD_Configure(txPower_t txPower, /** * @brief Sends one packet without listening for an acknowledge. * - * @param[in] txBuffer Data to transmit (header+length+payload) + * @param[in] data Data to transmit + * @param[in] size Size of data to transmit * @param[in] callback Function that will be called once radio operation is done * * @retval SUCCESS_0 if success * @retval INVALID_PARAMETER_C0 if invalid parameters * @retval RADIO_BUSY_C4 if radio is busy */ -uint8_t HAL_BLE_LLD_SendPacket(void *txBuffer, +uint8_t HAL_BLE_LLD_SendPacket(void *data, uint8_t size, lldCallback_t *callback) { @@ -109,7 +104,7 @@ uint8_t HAL_BLE_LLD_SendPacket(void *txBuffer, ap->StateMachineNo = STATE_MACHINE_0; ap->ActionTag = TXRX | TIMER_WAKEUP; ap->WakeupTime = WAKEUP_TIME_US; - ap->data = txBuffer; + ap->data = data; ap->dataSize = size; ap->nextTrue = APACKET_STOP; ap->nextFalse = APACKET_STOP; @@ -120,12 +115,11 @@ uint8_t HAL_BLE_LLD_SendPacket(void *txBuffer, return SUCCESS_0; } - - /** * @brief Sends one packet and listen for an acknowledge. * - * @param[in] txBuffer Data to transmit (header+length+payload) + * @param[in] data Data to transmit + * @param[in] size Size of data to transmit * @param[in] receiveTimeout Timeout for ACK reception (us) * @param[in] callback Function that will be called once radio operation is done * @@ -133,7 +127,7 @@ uint8_t HAL_BLE_LLD_SendPacket(void *txBuffer, * @retval INVALID_PARAMETER_C0 if invalid parameters * @retval RADIO_BUSY_C4 if radio is busy */ -uint8_t HAL_BLE_LLD_SendPacketWithAck(void *txBuffer, +uint8_t HAL_BLE_LLD_SendPacketWithAck(void *data, uint8_t size, uint32_t receiveTimeout, lldCallback_t *callback) @@ -146,7 +140,7 @@ uint8_t HAL_BLE_LLD_SendPacketWithAck(void *txBuffer, ap->StateMachineNo = STATE_MACHINE_0; ap->ActionTag = TXRX | TIMER_WAKEUP; ap->WakeupTime = WAKEUP_TIME_US; - ap->data = txBuffer; + ap->data = data; ap->dataSize = size; ap->nextTrue = APACKET_1; ap->nextFalse = APACKET_STOP; @@ -200,9 +194,10 @@ uint8_t HAL_BLE_LLD_ReceivePacket(uint32_t receiveTimeout, } /** - * @brief Receives one packet and transmit an acknowledge. + * @brief Receives one packet and transmits an acknowledge. * - * @param[in] txBuffer Acknowledge to transmit + * @param[in] ack Acknowledge to transmit + * @param[in] size Size of acknowledge to transmit * @param[in] receiveTimeout Timeout for data reception (us) * @param[in] callback Function that will be called once radio operation is done * @@ -210,7 +205,7 @@ uint8_t HAL_BLE_LLD_ReceivePacket(uint32_t receiveTimeout, * @retval INVALID_PARAMETER_C0 if invalid parameters * @retval RADIO_BUSY_C4 if radio is busy */ -uint8_t HAL_BLE_LLD_ReceivePacketWithAck(void *txBuffer, +uint8_t HAL_BLE_LLD_ReceivePacketWithAck(void *ack, uint8_t size, uint32_t receiveTimeout, lldCallback_t *callback) @@ -234,7 +229,7 @@ uint8_t HAL_BLE_LLD_ReceivePacketWithAck(void *txBuffer, ap->actionPacketNb = APACKET_3; ap->StateMachineNo = STATE_MACHINE_0; ap->ActionTag = TXRX; - ap->data = txBuffer; + ap->data = ack; ap->dataSize = size; ap->nextTrue = APACKET_STOP; ap->nextFalse = APACKET_STOP; @@ -244,5 +239,3 @@ uint8_t HAL_BLE_LLD_ReceivePacketWithAck(void *txBuffer, BLE_LLD_MakeActionPacketPending(&actPack[APACKET_2]); return SUCCESS_0; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.h b/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.h index e6dfb39ca..0fca07a09 100644 --- a/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.h +++ b/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.h @@ -1,20 +1,21 @@ -/** - ****************************************************************************** - * File Name : ble_hal.h - * Description : Header for HAL based on LLD + /** + ****************************************************************************** + * @file ble_hal.h + * @author MCD Application Team + * @brief Header for ble_hal.c module ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ + /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef BLE_HAL_H #define BLE_HAL_H @@ -44,20 +45,22 @@ uint8_t HAL_BLE_LLD_Configure(txPower_t txPower, bool phy2mbps, uint32_t b2bTimeUs, uint32_t networkId); -uint8_t HAL_BLE_LLD_SendPacket(void *txBuffer, +uint8_t HAL_BLE_LLD_SendPacket(void *data, uint8_t size, lldCallback_t *callback); -uint8_t HAL_BLE_LLD_SendPacketWithAck(void *txBuffer, +uint8_t HAL_BLE_LLD_SendPacketWithAck(void *data, uint8_t size, uint32_t receiveTimeout, lldCallback_t *callback); uint8_t HAL_BLE_LLD_ReceivePacket(uint32_t receiveTimeout, lldCallback_t *callback); -uint8_t HAL_BLE_LLD_ReceivePacketWithAck(void *txBuffer, +uint8_t HAL_BLE_LLD_ReceivePacketWithAck(void *ack, uint8_t size, uint32_t receiveTimeout, lldCallback_t *callback); +#ifdef __cplusplus +} /* extern "C" */ #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ +#endif /* BLE_HAL_H */ diff --git a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c index 24c24cf8d..bfbcf2dc6 100644 --- a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c +++ b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c @@ -1,27 +1,23 @@ /** - ****************************************************************************** - * File Name : ble_lld.c - * Description : LLD messages management. + ****************************************************************************** + * @file ble_lld.c + * @author MCD Application Team + * @brief BLE LLD messages management + * This file is responsible for command packing and response unpacking + * following ABI defined in ble_lld_transport.h ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ -/** - * This file is responsible for command packing and response unpacking - * following ABI defined in ble_lld_transport.h - * Actual transmission and reception of messages is delagated to other functions - */ - /* Includes ------------------------------------------------------------------*/ #include "app_common.h" #include "ble_lld.h" @@ -54,27 +50,31 @@ static radioEventType radioEvent; static ActionPacket *radioEventAp; // Parameters stored by init + +/** Parameters for command and response to/from radio core */ static param_BLE_LLD_t *params = NULL; + +/** Buffer for packet to send */ static ipBLE_lld_txrxdata_Type *txBuffer = NULL; + +/** Buffer for packet received */ static ipBLE_lld_txrxdata_Type *rxBuffer = NULL; -/** Callback to send commands to M0 */ + +/** Callback to actually send commands to M0 */ static uint8_t (*CB_sendCommand)(BLE_LLD_Code_t bleCmd) = NULL; /* Functions Definition ------------------------------------------------------*/ /** - * @brief Initializes BLE LLD proxy. + * @brief Initializes BLE LLD proxy parameters. * * This function must be called before any BLE LLD function. * - * @param[in] callbackSendCmdM0 Function to send commands to M0 + * @param[in] parameters Parameters for command and response to/from M0 + * @param[in] transmitBuffer Buffer for packet to send + * @param[in] receiveBuffer Buffer for packet received + * @param[in] callbackSend Function to send commands to M0 */ -/* Parameters ble_lld.c needs: - - param_BLE_LLD_t - - Tx buffer - - Rx buffer - - function to send message -*/ void BLE_LLD_PRX_Init(param_BLE_LLD_t *parameters, ipBLE_lld_txrxdata_Type *transmitBuffer, ipBLE_lld_txrxdata_Type *receiveBuffer, @@ -86,30 +86,22 @@ void BLE_LLD_PRX_Init(param_BLE_LLD_t *parameters, CB_sendCommand = callbackSend; } -// DONE: Julien: hs_startup_time documentation is something that even BLE team is not very confident as Hardware Designer have implemented this offset low documentation -// => To understand, this is a global delay that includes: -// the cpu Wake up from Stop mode Low-Power -// the Radio Wake up -// The PLL setting -// The cold config table and hot config table SPI -// => This point is mentionned during CCB BLE -// or a reference to the relevant doc /** * @brief Initializes the radio * * Whitening improves receiver lock, disabling it is only intended for test mode. * When whitening is disabled, data payload is limited to 45 bytes (including header). * - * @param[in] hs_startup_time Startup time (system time unit) - * @param[in] low_speed_osc Source for the 32 kHz slow speed clock: + * @param[in] hsStartupTime Startup time (system time unit) + * @param[in] lowSpeedOsc Source for the 32 kHz slow speed clock: * 1: internal RO * 0: external crystal - * @param[in] whitening ENABLE or DISABLE whitening for transmission and reception + * @param[in] whitening ENABLE or DISABLE whitening for transmission and reception */ -void BLE_LLD_Init(uint16_t hs_startup_time, uint8_t low_speed_osc, FunctionalState whitening) +void BLE_LLD_Init(uint16_t hsStartupTime, uint8_t lowSpeedOsc, FunctionalState whitening) { - params->init.startupTime = (uint32_t)(hs_startup_time); - params->init.lowSpeedOsc = low_speed_osc; + params->init.startupTime = (uint32_t)(hsStartupTime); + params->init.lowSpeedOsc = lowSpeedOsc; params->init.whitening = (uint8_t)whitening; sendCommand(BLE_LLD_INIT_CMDCODE); } @@ -120,8 +112,8 @@ void BLE_LLD_Init(uint16_t hs_startup_time, uint8_t low_speed_osc, FunctionalSta * @retval BLUE_IDLE_0 Radio is not busy * @retval BLUE_BUSY_NOWAKEUP_T2 Radio is busy, but there is no wakeup timer on the schedule but timer2 is * @retval BLUE_BUSY_WAKEUP Radio is busy and wakeup timer is on the schedule - * @retval BLUE_BUSY_TONE. Radio is in Tone - * @retval BLUE_TONE_DESTROY. Radio Tone has destroyed BLE: need an Init + * @retval BLUE_BUSY_TONE Radio is in Tone + * @retval BLUE_TONE_DESTROY Radio Tone has destroyed BLE: need an Init */ uint8_t BLE_LLD_GetStatus(void) { @@ -134,7 +126,7 @@ uint8_t BLE_LLD_GetStatus(void) * Both set the 39-bit count + 1 bit MSB as defined in the Bluetooth Low Energy specifications * for encryption nonce calculation. * - * @param [in] StateMachineNo State machine number in multistate (between 0 and 7) + * @param [in] StateMachineNo State machine (0 - 7) * @param [in] countTx 40-bit transmit packet count * @param [in] countRx 40-bit receive packet count */ @@ -147,9 +139,9 @@ void BLE_LLD_SetEncryptionCount(uint8_t StateMachineNo, const uint8_t (*countTx) } /** - * @brief Set the 8-byte encryption initialization vector and the 16-byte encryption key. + * @brief Sets the encryption initialization vector and the encryption key. * - * @param[in] StateMachineNo State machine number in multistate (between 0 and 7) + * @param[in] StateMachineNo State machine (0 - 7) * @param[in] encIv 8-byte encryption initialization vector * @param[in] encKey 16-byte encryption key */ @@ -164,14 +156,10 @@ void BLE_LLD_SetEncryptionAttributes(uint8_t StateMachineNo, const uint8_t (*enc /** * @brief Enables or disables encryption. * - * Another point is that, when encryption is enabled the hardware will add - * 4 bytes at the end of the packet as MAC (Message Authentication Code). - * So, the user needs to add 4 to the length of packet when encryption is ON. - * - * @param[in] StateMachineNo State Number in multistate (between 0 and 7) - * @param[in] EncryptFlag Encryption Flag: - * 0: Encryption is turned off - * 1: encryption is turned on + * @param[in] StateMachineNo State machine (0 - 7) + * @param[in] EncryptFlag Encryption state: + * 0: disable + * 1: enable */ void BLE_LLD_SetEncryptFlags(uint8_t StateMachineNo, FunctionalState EncryptFlag) { @@ -182,10 +170,10 @@ void BLE_LLD_SetEncryptFlags(uint8_t StateMachineNo, FunctionalState EncryptFlag } /** - * @brief Sets the channel. + * @brief Sets the radio channel. * - * @param[in] StateMachineNo State machine number in multistate (between 0 and 7) - * @param[in] channel Frequency channel (between 0 and 39) + * @param[in] StateMachineNo State machine (0 - 7) + * @param[in] channel Radio channel (0 - 39) */ void BLE_LLD_SetChannel(uint8_t StateMachineNo, uint8_t channel) { @@ -194,15 +182,14 @@ void BLE_LLD_SetChannel(uint8_t StateMachineNo, uint8_t channel) sendCommand(BLE_LLD_SETCHANNEL_CMDCODE); } -/* handle network IDs which may lead to bad radio behavior with one of the following options: - - just document which network IDs are safe to use and why (those conforming to BLE spec) - - add a flag like "rejectNonBle" to the function responsible for network ID setting - - add a function to check for BLE conformance of network ID */ /** - * @brief Sets the access address (AccessAddress), the CRC initialization value and the Slow Clock Accuracy (SCA). + * @brief Sets the network ID (access address). + * + * Network ID is not constrained, but some values might lead to bad radio behavior (whitening). + * See BLE specs for safer values. * - * @param[in] StateMachineNo State machine number in multistate (between 0 and 7) - * @param[in] NetworkID BLE NetworkID + * @param[in] StateMachineNo State machine (0 - 7) + * @param[in] NetworkID Network ID */ void BLE_LLD_SetTxAttributes(uint8_t StateMachineNo, uint32_t NetworkID) { @@ -212,11 +199,13 @@ void BLE_LLD_SetTxAttributes(uint8_t StateMachineNo, uint32_t NetworkID) } /** - * @brief Sets the time between back-to-back radio transmissions. + * @brief Sets the back-to-back time. * - * A minimum value of 50us must be set. + * Back-to-back is a mode where two packets are chained with a short pause between them. + * The back-to-back time is a global parameter. + * Back-to-back time must be at least 50us. * - * @param[in] backToBackTime Time between two frames in back to back mode (us) + * @param[in] backToBackTime Time between two packets in back-to-back mode (us) */ void BLE_LLD_SetBackToBackTime(uint32_t backToBackTime) { @@ -227,7 +216,9 @@ void BLE_LLD_SetBackToBackTime(uint32_t backToBackTime) /** * @brief Sets the transmit power level. * - * @param[in] powerLevel Transmit power level (between 0 and 31) + * See txPower_t for actual power output. + * + * @param[in] powerLevel Transmit power level (0 - 31) */ void BLE_LLD_SetTxPower(txPower_t powerLevel) { @@ -236,11 +227,11 @@ void BLE_LLD_SetTxPower(txPower_t powerLevel) } /** - * @brief Sets the data speed for transmission and reception. + * @brief Sets the bitrate for transmission and reception. * - * @param[in] StateMachineNo State machine number in multistate (between 0 and 7) + * @param[in] StateMachineNo State machine (0 - 7) * @param[in] txPhy Speed for transmission: TX_PHY_1MBPS / TX_PHY_2MBPS - * @param[in] rxPhy Speed for reception RX_PHY_1MBPS / RX_PHY_2MBPS + * @param[in] rxPhy Speed for reception: RX_PHY_1MBPS / RX_PHY_2MBPS */ void BLE_LLD_SetTx_Rx_Phy(uint8_t StateMachineNo, uint8_t txPhy, uint8_t rxPhy) { @@ -251,9 +242,9 @@ void BLE_LLD_SetTx_Rx_Phy(uint8_t StateMachineNo, uint8_t txPhy, uint8_t rxPhy) } /** - * @brief Prepares an action packet for execution. + * @brief Configures an action packet. * - * This function must be called after the action packet fields are set. + * This function must be called after the relevant ActionPacket fields are set. * * @param[in] p Action packet to prepare, memory lifetime must extend until response processing */ @@ -279,8 +270,9 @@ void BLE_LLD_SetReservedArea(ActionPacket *p) } /** - * @brief Schedules an action packet for execution on the radio. + * @brief Starts the radio FSM. * + * This function schedules an action packet to be the first executed by the radio FSM. * BLE_LLD_SetReservedArea() must have been called first to prepare the action packet. * * @param[in] p Action packet to schedule, memory lifetime must extend until response processing @@ -295,7 +287,7 @@ uint8_t BLE_LLD_MakeActionPacketPending(const ActionPacket *p) } /** - * @brief Stops the radio + * @brief Stops the radio FSM. * * After a call to this function ISR will not be triggered, unless * MakeActionPacketPending() is called again. @@ -309,17 +301,17 @@ uint8_t BLE_LLD_StopActivity(void) } /** - * @brief Starts tone transmission on selected channel. + * @brief Starts tone transmission. * * This function is dedicated to tests and destroys context and multistate. * So, after calling this function the radio must be re-initialized. * - * @param[in] RF_channel Radio frequency channel (between 0 and 39) - * @param[in] PowerLevel Output power level (between 0 and 31) + * @param[in] rfChannel Radio channel (0 - 39) + * @param[in] PowerLevel Output power level (0 - 31) */ -void BLE_LLD_StartTone(uint8_t RF_channel, uint8_t powerLevel) +void BLE_LLD_StartTone(uint8_t rfChannel, uint8_t powerLevel) { - params->toneStart.channel = RF_channel; + params->toneStart.channel = rfChannel; params->toneStart.power = powerLevel; sendCommand(BLE_LLD_STARTTONE_CMDCODE); } @@ -337,11 +329,13 @@ void BLE_LLD_StopTone(void) /** - * @brief Processes received event from radio MCU during interruption. + * @brief Processes received event from radio core during interruption. * - * Stores event data for further processing out of interruption. + * Must be called during the interruption triggered when a radio event is + * received from radio core. + * Stores event data for further processing after interruption. * - * @param[in] + * @param[in] event Radio core event type * */ void BLE_LLD_PRX_EventProcessInter(radioEventType event) @@ -357,11 +351,11 @@ void BLE_LLD_PRX_EventProcessInter(radioEventType event) } /** - * @brief Processes received event from radio MCU after interruption. - * - * Run the callback corresponding to the received event. + * @brief Processes received event from radio core after interruption. * - * @param[in] + * Must be called after the interruption triggered when a radio event is + * received from radio core, i.e. in a task. + * Runs the callback registered for the received event. * */ void BLE_LLD_PRX_EventProcessTask(void) @@ -377,11 +371,12 @@ void BLE_LLD_PRX_EventProcessTask(void) } } +// Utility functions + static uint8_t sendCommand(BLE_LLD_Code_t bleCmd){ return CB_sendCommand(bleCmd); } - const char *eventToString(radioEventType evt){ switch(evt){ case TX_OK_BUSY: return "TX_OK_BUSY"; @@ -400,13 +395,10 @@ const char *eventToString(radioEventType evt){ } } -// Utility functions - /* Header field is interpreted by hardware and has an impact on some flags, so user should not change it. This is a default safe value */ #define LLD_HEADER 0x55 -// Data copy uint8_t BLE_LLD_packetPrepareCopy(ipBLE_lld_txrxdata_Type *packet, const void *data, uint8_t size, @@ -424,7 +416,6 @@ uint8_t BLE_LLD_packetPrepareCopy(ipBLE_lld_txrxdata_Type *packet, return (uint8_t)actual_size; // Max value has been checked } -// No copy uint8_t BLE_LLD_packetPrepareInPlace(ipBLE_lld_txrxdata_Type *packet, bool encrypt) { @@ -474,6 +465,3 @@ uint8_t BLE_LLD_packetGetSize(const ipBLE_lld_txrxdata_Type *packet, } return actual_size; } - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.h b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.h index eaf4f93b9..0f5d2a000 100644 --- a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.h +++ b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.h @@ -1,20 +1,21 @@ -/** - ****************************************************************************** - * File Name : ble_lld.h - * Description : Header for BLE LLD application. + /** + ****************************************************************************** + * @file ble_lld.h + * @author MCD Application Team + * @brief Header for ble_lld.c module ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ + /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef BLE_LLD_H #define BLE_LLD_H @@ -45,26 +46,28 @@ extern "C" { /* ---------------------------------------------------------------------------*/ /* ------------------------------- BLE LLD -----------------------------------*/ /* ---------------------------------------------------------------------------*/ +/** Parameters for an action packet */ typedef struct ActPac_s { - uint8_t StateMachineNo ; /* This parameter indicates the state machine number for this action. From 0 to 7. */ - uint8_t ActionTag; /* The configuration of the current action. - * Action Tag: TXRX, TIMER_WAKEUP, INC_CHAN, TIMESTAMP_POSITION */ - uint32_t WakeupTime; /* Contains the wakeup time in microsecond. - * It only applies if TIMER_WAKEUP flag is set in ActionTag. */ - uint32_t ReceiveWindowLength; /* Sets RX window size in microsecond. Applicable only for RX actions. */ - void * data; /* Pointer to the array with the data to send (header, length and data field), for TX. */ - uint8_t dataSize; /* Size of payload for Tx */ - uint32_t status; /* The Status Register with the information on the action. */ - int32_t rssi; /* The rssi of the packet was received with. RX only. */ - uint8_t nextTrue; /* Pointer to next ActionPacket if success */ - uint8_t nextFalse; /* Pointer to next ActionPacket if failure */ - uint8_t actionPacketNb; /* User callback for managing data. */ - void (*callback)(radioEventType , /* Callback to run when action packet has finished */ + uint8_t StateMachineNo ; /* State machine number (0 - 7) */ + uint8_t ActionTag; /* Bitfield for configuration of the action packet + * TXRX, TIMER_WAKEUP, TIMESTAMP_POSITION */ + uint32_t WakeupTime; /* Time before runing the action packet (us) */ + /* Applicable only if TIMER_WAKEUP flag is set in ActionTag */ + uint32_t ReceiveWindowLength; /* Rx window size in (us). Applicable only for Rx */ + void * data; /* Payload to send. Applicable only for Tx */ + uint8_t dataSize; /* Size of payload. Applicable only for Tx */ + uint32_t status; /* Interrupt status register from the hardware */ + int32_t rssi; /* RSSI of the received packet. Applicable only for Rx */ + uint8_t nextTrue; /* Next action packet to run if success */ + uint8_t nextFalse; /* Next action packet to run if failure */ + uint8_t actionPacketNb; /* Action packet number (0 - 7) */ + void (*callback)(radioEventType, /* Function to run when action packet has finished */ struct ActPac_s *, /* If not used, it must be set to NULL */ void *, uint8_t); } ActionPacket; +/** Callback type for end of action packets */ typedef void (lldCallback_t)(radioEventType, ActionPacket *, void *, uint8_t); /* Exported functions ------------------------------------------------------- */ @@ -107,6 +110,9 @@ uint8_t BLE_LLD_packetGetSize(const ipBLE_lld_txrxdata_Type *packet, bool encrypt); const char *eventToString(radioEventType evt); -#endif /* BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* BLE_LLD_H */ diff --git a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld_transport.h b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld_transport.h index 932b6e1bb..71027e9a0 100644 --- a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld_transport.h +++ b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld_transport.h @@ -1,25 +1,28 @@ /** - ****************************************************************************** - * File Name : ble_lld_transport.h - * Description : Header shared between M0 and M4 for BLE LLD - * It contains commands id definitions and structures for - * parameters for each command + ****************************************************************************** + * @file ble_lld_transport.h + * @author MCD Application Team + * @brief Definitions of command id and structures for transport ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2012 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ + #ifndef BLE_LLD_TRANSPORT_H #define BLE_LLD_TRANSPORT_H +#ifdef __cplusplus +extern "C" { +#endif + #include "stm32_wpan_common.h" #include "ipBLE_lld_public.h" @@ -190,6 +193,8 @@ typedef PACKED_STRUCT msg_BLE_LLD_t *msg; } payload_BLE_LLD_t; -#endif /* BLE_LLD_TRANSPORT_H */ +#ifdef __cplusplus +} +#endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ +#endif /* BLE_LLD_TRANSPORT_H */ diff --git a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ipBLE_lld_public.h b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ipBLE_lld_public.h index dbaf2c6d6..41100c74e 100644 --- a/Middlewares/ST/STM32_WPAN/ble_lld/lld/ipBLE_lld_public.h +++ b/Middlewares/ST/STM32_WPAN/ble_lld/lld/ipBLE_lld_public.h @@ -1,21 +1,28 @@ /** ****************************************************************************** * @file ipBLE_lld_public.h - * @author MCD / MCU EmbSW / RF - * @version V0.3.0 - * @date 3-Feb-2021 + * @author MCD Application Team * @brief Public structures and definitions for BLE radio low level driver - * This header is shared between radio and application MCUs ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT 2017 STMicroelectronics

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ -#ifndef __IP_BLE_LLD_PUBLIC_H_ -#define __IP_BLE_LLD_PUBLIC_H_ +#ifndef IPBLE_LLD_PUBLIC_H +#define IPBLE_LLD_PUBLIC_H + +#ifdef __cplusplus +extern "C" { +#endif + /* ---------------------------------------------------------------------------*/ /* ----------------------------- Includes ------------------------------------*/ /* ---------------------------------------------------------------------------*/ @@ -210,4 +217,8 @@ typedef enum{ TX_POW_PLUS_6_DB } txPower_t; +#ifdef __cplusplus +} #endif + +#endif /* IPBLE_LLD_PUBLIC_H */ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/tl_conf_template.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/tl_conf_template.h index 16dc5531f..aff466b87 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/tl_conf_template.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/tl_conf_template.h @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief Transport Layer Configuration ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -31,4 +30,3 @@ #endif /*__TL_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/vcp_conf_template.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/vcp_conf_template.h index ea9808b77..b90214b06 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/vcp_conf_template.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/conf/vcp_conf_template.h @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief Configuration of the vcp interface ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -51,4 +50,3 @@ extern "C" #endif /*__VCP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/hw.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/hw.h index 841c37533..e75455557 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/hw.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/hw.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,4 +103,3 @@ extern "C" { #endif /*__HW_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.c index 7e6372c52..b56e6a765 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief HCI command for the system channel ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -36,92 +35,92 @@ extern uint32_t FW_Version; /* Functions Definition ------------------------------------------------------*/ void LHCI_C1_Write_Register( TL_CmdPacket_t *pcmd ) { - LHCI_C1_Write_Register_cmd_t * p_param; - uint32_t primask_bit; + LHCI_C1_Write_Register_cmd_t * p_param; + uint32_t primask_bit; - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - p_param = (LHCI_C1_Write_Register_cmd_t *) pcmd->cmdserial.cmd.payload; + p_param = (LHCI_C1_Write_Register_cmd_t *) pcmd->cmdserial.cmd.payload; - switch (p_param->busw) - { - case LHCI_8bits: - __disable_irq(); + switch (p_param->busw) + { + case LHCI_8bits: + __disable_irq(); - *(uint8_t *) (p_param->add) = ((*(uint8_t *) (p_param->add)) & (~(p_param->mask))) - | (p_param->val & p_param->mask); + *(uint8_t *) (p_param->add) = ((*(uint8_t *) (p_param->add)) & (~(p_param->mask))) + | (p_param->val & p_param->mask); - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ - break; + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + break; - case LHCI_16bits: - __disable_irq(); + case LHCI_16bits: + __disable_irq(); - *(uint16_t *) (p_param->add) = ((*(uint16_t *) (p_param->add)) & (~(p_param->mask))) - | (p_param->val & p_param->mask); + *(uint16_t *) (p_param->add) = ((*(uint16_t *) (p_param->add)) & (~(p_param->mask))) + | (p_param->val & p_param->mask); - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ - break; + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + break; - default: /**< case SHCI_32BITS */ - __disable_irq(); + default: /**< case SHCI_32BITS */ + __disable_irq(); - *(uint32_t *) (p_param->add) = ((*(uint32_t *) (p_param->add)) & (~(p_param->mask))) - | (p_param->val & p_param->mask); + *(uint32_t *) (p_param->add) = ((*(uint32_t *) (p_param->add)) & (~(p_param->mask))) + | (p_param->val & p_param->mask); - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ - break; - } + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + break; + } - ((TL_EvtPacket_t*) pcmd)->evtserial.type = TL_LOCRSP_PKT_TYPE; - ((TL_EvtPacket_t*) pcmd)->evtserial.evt.evtcode = TL_BLEEVT_CC_OPCODE; - ((TL_EvtPacket_t*) pcmd)->evtserial.evt.plen = TL_EVT_CS_PAYLOAD_SIZE; - ; - ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->cmdcode = LHCI_OPCODE_C1_WRITE_REG; - ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload[0]= 0x00; - ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->numcmd = 1; + ((TL_EvtPacket_t*) pcmd)->evtserial.type = TL_LOCRSP_PKT_TYPE; + ((TL_EvtPacket_t*) pcmd)->evtserial.evt.evtcode = TL_BLEEVT_CC_OPCODE; + ((TL_EvtPacket_t*) pcmd)->evtserial.evt.plen = TL_EVT_CS_PAYLOAD_SIZE; + ; + ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->cmdcode = LHCI_OPCODE_C1_WRITE_REG; + ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload[0]= 0x00; + ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->numcmd = 1; - return; + return; } void LHCI_C1_Read_Register( TL_CmdPacket_t *pcmd ) { - LHCI_C1_Read_Register_cmd_t * p_param; - uint32_t rsp_val; - uint8_t busw; - - p_param = (LHCI_C1_Read_Register_cmd_t *) pcmd->cmdserial.cmd.payload; - busw = p_param->busw; - - switch (busw) - { - case LHCI_8bits: - rsp_val = *(uint8_t *) (p_param->add); - break; - - case LHCI_16bits: - rsp_val = *(uint16_t *) (p_param->add); - break; - - default: /**< case SHCI_32BITS */ - rsp_val = *(uint32_t *) (p_param->add); - break; - } - - ((TL_EvtPacket_t*) pcmd)->evtserial.type = TL_LOCRSP_PKT_TYPE; - ((TL_EvtPacket_t*) pcmd)->evtserial.evt.evtcode = TL_BLEEVT_CC_OPCODE; - ((TL_EvtPacket_t*) pcmd)->evtserial.evt.plen = TL_EVT_HDR_SIZE + sizeof(LHCI_C1_Read_Register_ccrp_t); - ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->cmdcode = LHCI_OPCODE_C1_READ_REG; - ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->numcmd = 1; - ((LHCI_C1_Read_Register_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->status = - 0x00; - - memcpy( - (void*)&(((LHCI_C1_Read_Register_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->val), - &rsp_val, - 4); - - return; + LHCI_C1_Read_Register_cmd_t * p_param; + uint32_t rsp_val; + uint8_t busw; + + p_param = (LHCI_C1_Read_Register_cmd_t *) pcmd->cmdserial.cmd.payload; + busw = p_param->busw; + + switch (busw) + { + case LHCI_8bits: + rsp_val = *(uint8_t *) (p_param->add); + break; + + case LHCI_16bits: + rsp_val = *(uint16_t *) (p_param->add); + break; + + default: /**< case SHCI_32BITS */ + rsp_val = *(uint32_t *) (p_param->add); + break; + } + + ((TL_EvtPacket_t*) pcmd)->evtserial.type = TL_LOCRSP_PKT_TYPE; + ((TL_EvtPacket_t*) pcmd)->evtserial.evt.evtcode = TL_BLEEVT_CC_OPCODE; + ((TL_EvtPacket_t*) pcmd)->evtserial.evt.plen = TL_EVT_HDR_SIZE + sizeof(LHCI_C1_Read_Register_ccrp_t); + ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->cmdcode = LHCI_OPCODE_C1_READ_REG; + ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->numcmd = 1; + ((LHCI_C1_Read_Register_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->status = + 0x00; + + memcpy( + (void*)&(((LHCI_C1_Read_Register_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->val), + &rsp_val, + 4); + + return; } void LHCI_C1_Read_Device_Information( TL_CmdPacket_t *pcmd ) @@ -132,104 +131,103 @@ void LHCI_C1_Read_Device_Information( TL_CmdPacket_t *pcmd ) ipccdba = READ_BIT(FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA); p_ref_table = (MB_RefTable_t*)((ipccdba<<2) + SRAM2A_BASE); - ((TL_EvtPacket_t*) pcmd)->evtserial.type = TL_LOCRSP_PKT_TYPE; - ((TL_EvtPacket_t*) pcmd)->evtserial.evt.evtcode = TL_BLEEVT_CC_OPCODE; - ((TL_EvtPacket_t*) pcmd)->evtserial.evt.plen = TL_EVT_HDR_SIZE + sizeof(LHCI_C1_Device_Information_ccrp_t); - ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->cmdcode = LHCI_OPCODE_C1_DEVICE_INF; - ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->numcmd = 1; - - - /** - * status - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->status = - 0x00; - - /** - * revision id - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->rev_id = - (uint16_t)LL_DBGMCU_GetRevisionID(); - - /** - * device code id - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->dev_code_id = - (uint16_t)LL_DBGMCU_GetDeviceID(); - - /** - * package type - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->package_type = - (uint8_t)LL_GetPackageType(); - - /** - * device type id - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->device_type_id = - (uint8_t)LL_FLASH_GetDeviceID(); - - /** - * st company id - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->st_company_id = - LL_FLASH_GetSTCompanyID(); - - /** - * UID64 - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid64 = - LL_FLASH_GetUDN(); - - /** - * UID96_0 - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid96_0 = - LL_GetUID_Word0(); - - /** - * UID96_1 - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid96_1 = - LL_GetUID_Word1(); - - /** - * UID96_2 - */ - ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid96_2 = - LL_GetUID_Word2(); - - /** - * SafeBootInf - */ - memcpy( - &(((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->SafeBootInf), - &(p_ref_table->p_device_info_table->SafeBootInfoTable), - sizeof(MB_SafeBootInfoTable_t)); - - /** - * FusInf - */ - memcpy( - &(((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->FusInf), - &(p_ref_table->p_device_info_table->FusInfoTable), - sizeof(MB_FusInfoTable_t)); - - /** - * WirelessFwInf - */ - memcpy( - &(((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->WirelessFwInf), - &(p_ref_table->p_device_info_table->WirelessFwInfoTable), - sizeof(MB_WirelessFwInfoTable_t)); - - /** - * AppFwInf - */ - (((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->AppFwInf) = - FW_Version; - - return; + ((TL_EvtPacket_t*) pcmd)->evtserial.type = TL_LOCRSP_PKT_TYPE; + ((TL_EvtPacket_t*) pcmd)->evtserial.evt.evtcode = TL_BLEEVT_CC_OPCODE; + ((TL_EvtPacket_t*) pcmd)->evtserial.evt.plen = TL_EVT_HDR_SIZE + sizeof(LHCI_C1_Device_Information_ccrp_t); + ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->cmdcode = LHCI_OPCODE_C1_DEVICE_INF; + ((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->numcmd = 1; + + + /** + * status + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->status = + 0x00; + + /** + * revision id + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->rev_id = + (uint16_t)LL_DBGMCU_GetRevisionID(); + + /** + * device code id + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->dev_code_id = + (uint16_t)LL_DBGMCU_GetDeviceID(); + + /** + * package type + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->package_type = + (uint8_t)LL_GetPackageType(); + + /** + * device type id + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->device_type_id = + (uint8_t)LL_FLASH_GetDeviceID(); + + /** + * st company id + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->st_company_id = + LL_FLASH_GetSTCompanyID(); + + /** + * UID64 + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid64 = + LL_FLASH_GetUDN(); + + /** + * UID96_0 + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid96_0 = + LL_GetUID_Word0(); + + /** + * UID96_1 + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid96_1 = + LL_GetUID_Word1(); + + /** + * UID96_2 + */ + ((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->uid96_2 = + LL_GetUID_Word2(); + + /** + * SafeBootInf + */ + memcpy( + &(((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->SafeBootInf), + &(p_ref_table->p_device_info_table->SafeBootInfoTable), + sizeof(MB_SafeBootInfoTable_t)); + + /** + * FusInf + */ + memcpy( + &(((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->FusInf), + &(p_ref_table->p_device_info_table->FusInfoTable), + sizeof(MB_FusInfoTable_t)); + + /** + * WirelessFwInf + */ + memcpy( + &(((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->WirelessFwInf), + &(p_ref_table->p_device_info_table->WirelessFwInfoTable), + sizeof(MB_WirelessFwInfoTable_t)); + + /** + * AppFwInf + */ + (((LHCI_C1_Device_Information_ccrp_t *) (((TL_CcEvt_t *) (((TL_EvtPacket_t*) pcmd)->evtserial.evt.payload))->payload))->AppFwInf) = + FW_Version; + + return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.h index b42eee423..2f1ba0aa7 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.h @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief HCI command for the system channel ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C" { #endif /*__LHCI_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c index d6e7c5656..433d5e404 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief HCI command for the system channel ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -741,4 +740,3 @@ SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo ) return (SHCI_Success); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.h index fd6231a3d..5e8f9a514 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.h @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief HCI command for the system channel ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -527,10 +526,12 @@ extern "C" { /** * Options flags - * - bit 0: 1: LL only 0: LL + host - * - bit 1: 1: no service change desc. 0: with service change desc. - * - bit 2: 1: device name Read-Only 0: device name R/W - * - bit 7: 1: LE Power Class 1 0: LE Power Classe 2-3 + * - bit 0: 1: LL only 0: LL + host + * - bit 1: 1: no service change desc. 0: with service change desc. + * - bit 2: 1: device name Read-Only 0: device name R/W + * - bit 3: 1: extended advertizing supported 0: extended advertizing not supported [NOT SUPPORTED] + * - bit 4: 1: CS Algo #2 supported 0: CS Algo #2 not supported + * - bit 7: 1: LE Power Class 1 0: LE Power Classe 2-3 * - other bits: reserved ( shall be set to 0) */ uint8_t Options; @@ -558,7 +559,15 @@ extern "C" { * Range: -127 .. 20 */ int8_t max_tx_power; - } SHCI_C2_Ble_Init_Cmd_Param_t; + + /** + * RX model configuration + * - bit 0: 1: agc_rssi model improved vs RF blockers 0: Legacy agc_rssi model + * - other bits: reserved ( shall be set to 0) + */ + uint8_t rx_model_config; + + } SHCI_C2_Ble_Init_Cmd_Param_t; typedef PACKED_STRUCT{ SHCI_Header_t Header; /** Does not need to be initialized by the user */ @@ -579,9 +588,21 @@ extern "C" { #define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO (1<<2) #define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW (0<<2) +#define SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV (1<<3) /*NOT SUPPORTED*/ +#define SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV (0<<3) /*NOT SUPPORTED*/ + +#define SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 (1<<4) +#define SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 (0<<4) + #define SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 (1<<7) #define SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 (0<<7) + /** + * RX models configuration + */ +#define SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY (0<<0) +#define SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER (1<<0) + #define SHCI_OPCODE_C2_THREAD_INIT (( SHCI_OGF << 10) + SHCI_OCF_C2_THREAD_INIT) /** No command parameters */ @@ -735,6 +756,7 @@ extern "C" { uint8_t Spare1; uint32_t BleNvmRamAddress; uint32_t ThreadNvmRamAddress; + uint16_t RevisionID; } SHCI_C2_CONFIG_Cmd_Param_t; #define SHCI_OPCODE_C2_802_15_4_DEINIT (( SHCI_OGF << 10) + SHCI_OCF_C2_802_15_4_DEINIT) @@ -745,6 +767,13 @@ extern "C" { */ #define SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE (sizeof(SHCI_C2_CONFIG_Cmd_Param_t) - 1) +/** + * Device revision ID + */ +#define SHCI_C2_CONFIG_CUT2_0 (0x2000) +#define SHCI_C2_CONFIG_CUT2_1 (0x2001) +#define SHCI_C2_CONFIG_CUT2_2 (0x2003) + /** * Config1 * Each definition below may be added together to build the Config1 value @@ -1067,6 +1096,7 @@ typedef struct { /** * SHCI_C2_FLASH_EraseActivity * @brief Provides the information of the start and the end of a flash erase window on the CPU1 + * The protection will be active until next end of radio event. * * @param erase_activity: Start/End of erase activity * @retval Status @@ -1249,4 +1279,3 @@ typedef struct { #endif /*__SHCI_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c index d56f9dece..8b8071c1d 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief Function for managing HCI interface. ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.h index 792d86c11..c43c9e053 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.h @@ -5,17 +5,16 @@ * @brief Constants and functions for HCI layer. See Bluetooth Core * v 4.0, Vol. 2, Part E. ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c index 350c1b19e..1cf3ffe11 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c @@ -4,18 +4,18 @@ * @author MCD Application Team * @brief Transport layer interface to BLE ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ + #include "hci_tl.h" #include "tl.h" diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/mbox_def.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/mbox_def.h index d8df67b65..06536d346 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/mbox_def.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/mbox_def.h @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief Mailbox definition ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -278,4 +277,3 @@ typedef struct #define HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL LL_IPCC_CHANNEL_5 #endif /*__MBOX_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c index f20d7c81f..ddb3a02b5 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief System HCI command implementation ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.h index 3fbc492f1..74d0ff38c 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.h @@ -4,20 +4,18 @@ * @author MCD Application Team * @brief System HCI command header for the system channel ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ - #ifndef __SHCI_TL_H_ #define __SHCI_TL_H_ @@ -160,7 +158,7 @@ void shci_user_evt_proc(void); * @brief Initialize the System Host Controller Interface. * This function must be called before any communication on the System Channel * - * @param pData: System events callback function pointer + * @param UserEvtRx: System events callback function pointer * This callback is triggered when an user event is received on * the System Channel from CPU2. * @param pConf: Configuration structure pointer diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c index 6ba345daa..22508e6f3 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c @@ -4,18 +4,18 @@ * @author MCD Application Team * @brief Transport layer interface to the system channel ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ + #include "shci_tl.h" #include "tl.h" diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl.h index 47c2d5471..cb27246be 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl.h @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief Header for tl module ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -331,4 +330,3 @@ void TL_ZIGBEE_SendM4AckToM0Request(void); #endif /*__TL_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mac_802_15_4.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mac_802_15_4.h index 3819eb1cb..2553103bf 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mac_802_15_4.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mac_802_15_4.h @@ -4,20 +4,18 @@ * @author MCD Application Team * @brief Constants and functions for managing MAC 802.15.4 TL ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ - #ifndef __TL_MAC_802_15_4_H #define __TL_MAC_802_15_4_H diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c index 3c02f2d63..33a4aacfc 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -6,18 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ - /* Includes ------------------------------------------------------------------*/ #include "stm32_wpan_common.h" #include "hw.h" @@ -848,4 +846,3 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c index 9a6a61ff2..f44c3a356 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c @@ -4,20 +4,18 @@ * @author MCD Application Team * @brief Function for managing HCI interface. ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ - /* Includes ------------------------------------------------------------------*/ #include "stm32_wpan_common.h" #include "stm_list.h" diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.h index d4f160747..4e2e81268 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.h @@ -4,20 +4,18 @@ * @author MCD Application Team * @brief Constants and functions for managing Thread TL ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ - #ifndef __TL_THREAD_HCI_H_ #define __TL_THREAD_HCI_H_ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c index 4130b3b97..4d451f300 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c @@ -6,18 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ - /* Includes ------------------------------------------------------------------*/ #include "stm32_wpan_common.h" #include "hw.h" diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.h index 6d239a2d4..fcfc0264c 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.h @@ -6,18 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ - #ifndef __TL_ZIGBEE_HCI_H_ #define __TL_ZIGBEE_HCI_H_ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.c index e8c828f7a..b06b5971b 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.c @@ -4,20 +4,18 @@ * @author MCD Application Team * @brief This file implements the USB Device library callbacks and MSP ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ - /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -432,4 +430,3 @@ void USBD_static_free(void *p) } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.h index c594cbad9..7d2dd6193 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_conf.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * @file USB_Device/CDC_Standalone/Inc/usbd_conf.h - * @author MCD Application Team - * @brief General low level driver configuration - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + ****************************************************************************** + * @file USB_Device/CDC_Standalone/Inc/usbd_conf.h + * @author MCD Application Team + * @brief General low level driver configuration + ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -165,4 +164,3 @@ void USBD_static_free(void *p); /** * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.c index 0c89772ac..4dc5f0939 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * @file USB_Device/CDC_Standalone/Src/usbd_desc.c - * @author MCD Application Team - * @brief This file provides the USBD descriptors and string formating method. - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + ****************************************************************************** + * @file USB_Device/CDC_Standalone/Src/usbd_desc.c + * @author MCD Application Team + * @brief This file provides the USBD descriptors and string formating method. + ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -239,4 +238,3 @@ static void IntToUnicode (uint32_t value , uint8_t *pbuf , uint8_t len) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.h index 7bd424cc2..f8b514142 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/usbd_desc.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * @file USB_Device/CDC_Standalone/Inc/usbd_desc.h - * @author MCD Application Team - * @brief Header for usbd_desc.c module - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + ****************************************************************************** + * @file USB_Device/CDC_Standalone/Inc/usbd_desc.h + * @author MCD Application Team + * @brief Header for usbd_desc.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -39,4 +38,3 @@ extern USBD_DescriptorsTypeDef VCP_Desc; #endif /* __USBD_DESC_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.c b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.c index 739413bc2..97d675324 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.c +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.c @@ -4,18 +4,18 @@ * @author MCD Application Team * @brief Virtual Com Port ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ + /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -302,4 +302,3 @@ __weak int8_t VCP_TransmitCplt( uint8_t *Buf, uint32_t *Len, uint8_t epnum ) #endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.h b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.h index 9ed7ff434..f44e23d54 100644 --- a/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.h +++ b/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/vcp/vcp.h @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief VCP Interfaces ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -83,4 +82,3 @@ extern int8_t VCP_TransmitCplt( uint8_t *Buf, uint32_t *Len, uint8_t epnum ); #endif /*__VCP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_config.h b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_config.h index b3346279f..0b106085c 100644 --- a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_config.h +++ b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_config.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_core.h b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_core.h index 58bd97999..41a5d8f50 100644 --- a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_core.h +++ b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_core.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** - * @file 802_15_4_mac_core.h - * @author MCD Application Team - * @brief This file contains all the defines and structures used for the - * communication between the two core M0 and M4. - * This file is shared between the code running on M4 and the code - * running on M0. - * - ****************************************************************************** - * @attention + ****************************************************************************** + * @file 802_15_4_mac_core.h + * @author MCD Application Team + * @brief This file contains all the defines and structures used for the + * communication between the two core M0 and M4. + * This file is shared between the code running on M4 and the code + * running on M0. + * + ****************************************************************************** + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_errors.h b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_errors.h index e45b79a80..dcb3ef62e 100644 --- a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_errors.h +++ b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_errors.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_sap.h b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_sap.h index a67ae1f56..a558a13cf 100644 --- a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_sap.h +++ b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_sap.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_types.h b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_types.h index 093137b1f..40ac1dac7 100644 --- a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_types.h +++ b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/inc/802_15_4_mac_types.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/src/mac_802_15_4_core_wb.c b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/src/mac_802_15_4_core_wb.c index bfcb790e9..a9866a65d 100644 --- a/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/src/mac_802_15_4_core_wb.c +++ b/Middlewares/ST/STM32_WPAN/mac_802_15_4/core/src/mac_802_15_4_core_wb.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/stm32_wpan_common.h b/Middlewares/ST/STM32_WPAN/stm32_wpan_common.h index f4592bc51..b47b804a4 100644 --- a/Middlewares/ST/STM32_WPAN/stm32_wpan_common.h +++ b/Middlewares/ST/STM32_WPAN/stm32_wpan_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -170,5 +169,3 @@ extern "C" { #endif #endif /*__STM32_WPAN_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c index cf4edbe68..3326f2293 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_router.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_router.c index ff2c7bdef..75e9cc4a7 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_router.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_router.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c index dfa346d5d..5acd39384 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c index 7cfa365bd..e5e095832 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c index ed39f1b5b..8949811d2 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c index 2e2ee7d8a..8cd82a41e 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c index 3331d382b..f7f98153f 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -180,6 +179,8 @@ otError otCoapSecureConnect(otInstance * aInstance, /* prepare buffer */ Thread_OT_Cmd_Request_t* p_ot_req = THREAD_Get_OTCmdPayloadBuffer(); + coapSecureClientConnectCb = aHandler; + p_ot_req->ID = MSG_M4TOM0_OT_COAP_SECURE_CONNECT; p_ot_req->Size=3; diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c index 68aa17a92..3accb35cc 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,7 +71,7 @@ otError otCommissionerStop(otInstance *aInstance) p_ot_req->Size=0; - Ot_Cmd_Transfer(); + Ot_Cmd_TransferWithNotif(); p_ot_req = THREAD_Get_OTCmdRspPayloadBuffer(); return (otError)p_ot_req->Data[0]; @@ -129,7 +128,7 @@ otError otCommissionerRemoveJoiner(otInstance *aInstance, const otExtAddress *aE p_ot_req->Size=1; p_ot_req->Data[0] = (uint32_t) aEui64; - Ot_Cmd_Transfer(); + Ot_Cmd_TransferWithNotif(); p_ot_req = THREAD_Get_OTCmdRspPayloadBuffer(); return (otError)p_ot_req->Data[0]; diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c index 8313f1c34..d9394111a 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c index c08cb2fb3..1d936a56b 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c index 7d0c1f139..73e35638e 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c index 0ffdbbdd4..c2d3fa31a 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c index 0561333d5..058780e4f 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/entropy.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/entropy.c index 125b19274..60f44bbbd 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/entropy.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/entropy.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/errors.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/errors.c index 5ba62b0bc..4a58f27d7 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/errors.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/errors.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c index 1232b7b38..7aab3f075 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c index e0c5e6754..83cd339f0 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -150,7 +149,7 @@ void otInstanceReset(otInstance *aInstance) p_ot_req->Size=0; - Ot_Cmd_Transfer(); + Ot_Cmd_TransferWithNotif(); p_ot_req = THREAD_Get_OTCmdRspPayloadBuffer(); } @@ -165,7 +164,7 @@ void otInstanceFactoryReset(otInstance *aInstance) p_ot_req->Size=0; - Ot_Cmd_Transfer(); + Ot_Cmd_TransferWithNotif(); p_ot_req = THREAD_Get_OTCmdRspPayloadBuffer(); } diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c index 286a3fbfe..5d4ba644c 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c index 614633c15..2f1bba4a5 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c index 6007cf641..7c8026ba4 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,7 +103,7 @@ void otJoinerGetId(otInstance *aInstance, otExtAddress *aJoinerId) p_ot_req->ID = MSG_M4TOM0_OT_JOINER_GET_ID; - p_ot_req->Size=2; + p_ot_req->Size=1; p_ot_req->Data[0] = (uint32_t) aJoinerId; Ot_Cmd_Transfer(); diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c index 09eb70adb..10e12cb56 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c index 4bfaef579..294691cf2 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/logging.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/logging.c index 21c7df421..1cebb4b29 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/logging.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/logging.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c index b95c0cae3..867c794ba 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c index cb5374582..a481933f6 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/network_time.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/network_time.c index 29a1883c9..c8717f6b2 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/network_time.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/network_time.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c index fa120ac0b..7e4bdf283 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_concurrent.h b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_concurrent.h index 9b0b5bc5f..cf83f40b8 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_concurrent.h +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_concurrent.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_ftd.h b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_ftd.h index 03ab9d17c..303cedf8a 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_ftd.h +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_ftd.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_mtd.h b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_mtd.h index 76d4f73e4..e724cd415 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_mtd.h +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_config_mtd.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c index a09ba590e..0006b2a2b 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,6 +77,8 @@ otLinkRawEnergyScanDone otLinkRawEnergyScanDoneCb = NULL; /* UDP */ otUdpReceive otUdpReceiveCb = NULL; +otUdpHandler otUdpHandlerCb = NULL; +STUdpHandlerContextType* mySTUdpHandlerContext = NULL; #if OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE otUdpForwardSetForwarder otUdpForwardSetForwarderCb = NULL; #endif /* OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE */ @@ -176,14 +177,10 @@ HAL_StatusTypeDef OpenThread_CallBack_Processing(void) } break; case MSG_M0TOM4_COAP_SECURE_CLIENT_CONNECT: - mySTCoapSecureContext = (STCoapSecureSpecificContextType*) p_notification->Data[1]; - - l_coapSecureClientConnectCb = mySTCoapSecureContext->mHandler; - - if (l_coapSecureClientConnectCb != NULL) + if (coapSecureClientConnectCb != NULL) { - l_coapSecureClientConnectCb((bool) p_notification->Data[0], - mySTCoapSecureContext->mContext); + coapSecureClientConnectCb((bool) p_notification->Data[0], + (void *) p_notification->Data[1]); } break; case MSG_M0TOM4_COAP_SECURE_SET_CLIENT_CONNECT: @@ -281,6 +278,14 @@ HAL_StatusTypeDef OpenThread_CallBack_Processing(void) (void*) p_notification->Data[3]); } break; + case MSG_M0TOM4_COMMISSIONER_PANID_CONFLICT_CALLBACK: + if (otCommissionerPanIdConflictCb != NULL) + { + otCommissionerPanIdConflictCb((uint16_t) p_notification->Data[0], + (uint32_t) p_notification->Data[1], + (void*) p_notification->Data[2]); + } + break; case MSG_M0TOM4_COMMISSIONER_STATE_CALLBACK: if (otCommissionerStateCb != NULL) { @@ -354,6 +359,18 @@ HAL_StatusTypeDef OpenThread_CallBack_Processing(void) (otMessageInfo*) p_notification->Data[2]); } break; + case MSG_M0TOM4_UDP_HANDLER: + mySTUdpHandlerContext = (STUdpHandlerContextType*) p_notification->Data[0]; + + otUdpHandlerCb = mySTUdpHandlerContext->mHandler; + + if (otUdpHandlerCb != NULL) + { + p_notification->Data[0] = otUdpHandlerCb(mySTUdpHandlerContext->mContext, + (otMessage *) p_notification->Data[1], + (otMessageInfo *) p_notification->Data[2]); + } + break; #if OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE case MSG_M0TOM4_UDP_FORWARDER: if (otUdpForwardSetForwarderCb != NULL) diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.h b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.h index 994b218d3..456f1bdc1 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.h +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c index b723235d7..d5deaf743 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c @@ -16,13 +16,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_crypto.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_crypto.c index 77857ce2f..8f60ae7e5 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_crypto.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_crypto.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_noncrypto.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_noncrypto.c index aedd72d69..dfd407e78 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_noncrypto.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_noncrypto.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ uint16_t otRandomNonCryptoGetUint16InRange(uint16_t aMin, uint16_t aMax) /* prepare buffer */ Thread_OT_Cmd_Request_t* p_ot_req = THREAD_Get_OTCmdPayloadBuffer(); - p_ot_req->ID = MSG_M4TOM0_OT_RANDOM_NON_CRYPTO_GET_UINT8_IN_RANGE; + p_ot_req->ID = MSG_M4TOM0_OT_RANDOM_NON_CRYPTO_GET_UINT16_IN_RANGE; p_ot_req->Size=2; p_ot_req->Data[0] = (uint32_t) aMin; diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c index ec71c1e0e..a59e20f66 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/sntp.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/sntp.c index d2f1098a3..9df6acc69 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/sntp.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/sntp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/stm32wbxx_core_interface_def.h b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/stm32wbxx_core_interface_def.h index 0dafd66a0..638e970c3 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/stm32wbxx_core_interface_def.h +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/stm32wbxx_core_interface_def.h @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -29,6 +28,7 @@ #include "stm32_wpan_common.h" #include "coap.h" #include "coap_secure.h" +#include "udp.h" #ifdef __cplusplus extern "C" { @@ -45,7 +45,7 @@ typedef struct { } STCoapResponseContextType; typedef struct { - const char * mUriPath; /* The URI Path string */ + otCoapResource * mResource; STCoapRequestContextType mSpecificContext; /* Contains context and handler */ } STCoapResourceType; @@ -59,6 +59,16 @@ typedef struct { STCoapSecureSpecificContextType mSpecificContext; /* Contains context and handler */ } STCoapSecureConnectType; +typedef struct { + void * mContext; + otUdpHandler mHandler; +} STUdpHandlerContextType; + +typedef struct { + otUdpReceiver * mReceiver; + STUdpHandlerContextType mSpecificContext; /* Contains context and handler */ +} STUdpReceiverType; + /* Structure of the messages exchanged between M0 and M4 */ #define OT_CMD_BUFFER_SIZE 20U typedef PACKED_STRUCT @@ -548,6 +558,7 @@ typedef enum MSG_M0TOM4_COAP_SECURE_CLIENT_CONNECT, MSG_M0TOM4_COAP_SECURE_SET_CLIENT_CONNECT, MSG_M0TOM4_COAP_SECURE_DEFAULT_REQUEST_HANDLER, + MSG_M0TOM4_UDP_HANDLER, MSG_M0TOM4_NETWORK_TIME_SYNC_CALLBACK_FN, MSG_M0TOM4_SNTP_RESPONSE_HANDLER, MSG_M0TOM4_THREAD_PARENT_RESPONSE_HANDLER @@ -590,4 +601,3 @@ typedef enum #endif /* STM32WBxx_CORE_INTERFACE_DEF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c index f60da4859..05a7d1ef4 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c index 3ff128011..9c2ff17dd 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c index 6df1dd536..eb754a890 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c index aeae499ef..e1074dd9f 100644 --- a/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c +++ b/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c b/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c index 3f4d1daec..7c5ab1d27 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c +++ b/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c @@ -4,18 +4,17 @@ * @author MCD Application Team * @brief This file contains the Interface with BLE Drivers functions. ****************************************************************************** - * @attention + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -358,4 +357,4 @@ int fputc(int ch, FILE *f) /** * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.h b/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.h index f83327643..bf08e3d72 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.h +++ b/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.h @@ -4,16 +4,15 @@ * @author MCD Application Team * @brief Header for dbg_trace.c ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * ****************************************************************************** */ @@ -101,4 +100,4 @@ size_t DbgTraceWrite(int handle, const unsigned char * buf, size_t bufSize); #endif /*__DBG_TRACE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/utilities/otp.c b/Middlewares/ST/STM32_WPAN/utilities/otp.c index 177961732..2471bf72f 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/otp.c +++ b/Middlewares/ST/STM32_WPAN/utilities/otp.c @@ -4,18 +4,17 @@ * @author MCD Application Team * @brief OTP manager ****************************************************************************** - * @attention + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -50,4 +49,4 @@ uint8_t * OTP_Read( uint8_t id ) return p_id ; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/utilities/otp.h b/Middlewares/ST/STM32_WPAN/utilities/otp.h index b39a37a1f..c4f2a4062 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/otp.h +++ b/Middlewares/ST/STM32_WPAN/utilities/otp.h @@ -4,18 +4,17 @@ * @author MCD Application Team * @brief OTP manager interface ****************************************************************************** - * @attention + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -63,4 +62,4 @@ extern "C" { #endif /*__OTP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/utilities/stm_list.c b/Middlewares/ST/STM32_WPAN/utilities/stm_list.c index 42e2d5006..69c8c064d 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/stm_list.c +++ b/Middlewares/ST/STM32_WPAN/utilities/stm_list.c @@ -4,18 +4,17 @@ * @author MCD Application Team * @brief TCircular Linked List Implementation. ****************************************************************************** - * @attention + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /****************************************************************************** diff --git a/Middlewares/ST/STM32_WPAN/utilities/stm_list.h b/Middlewares/ST/STM32_WPAN/utilities/stm_list.h index 5c290d5a1..b7c3254c9 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/stm_list.h +++ b/Middlewares/ST/STM32_WPAN/utilities/stm_list.h @@ -4,18 +4,17 @@ * @author MCD Application Team * @brief Header file for linked list library. ****************************************************************************** - * @attention + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ #ifndef _STM_LIST_H_ diff --git a/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c b/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c index 9334bc116..7bf9dac3c 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c +++ b/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c @@ -4,18 +4,17 @@ * @author MCD Application Team * @brief Queue management ****************************************************************************** - * @attention + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ diff --git a/Middlewares/ST/STM32_WPAN/utilities/stm_queue.h b/Middlewares/ST/STM32_WPAN/utilities/stm_queue.h index 5dc63d172..4b0115593 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/stm_queue.h +++ b/Middlewares/ST/STM32_WPAN/utilities/stm_queue.h @@ -4,18 +4,17 @@ * @author MCD Application Team * @brief Header for stm_queue.c ****************************************************************************** - * @attention + * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ @@ -56,5 +55,5 @@ int CircularQueue_NbElement(queue_t *q); uint8_t* CircularQueue_Remove_Copy(queue_t *q, uint16_t* elementSize, uint8_t* buffer); uint8_t* CircularQueue_Sense_Copy(queue_t *q, uint16_t* elementSize, uint8_t* buffer); -/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ + #endif /* __STM_QUEUE_H */ diff --git a/Middlewares/ST/STM32_WPAN/utilities/utilities_common.h b/Middlewares/ST/STM32_WPAN/utilities/utilities_common.h index eb25c4a0a..b0d0cc140 100644 --- a/Middlewares/ST/STM32_WPAN/utilities/utilities_common.h +++ b/Middlewares/ST/STM32_WPAN/utilities/utilities_common.h @@ -4,16 +4,15 @@ * @author MCD Application Team * @brief Common file to utilities ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * ****************************************************************************** */ @@ -157,4 +156,4 @@ extern "C" { #endif /*__UTILITIES_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Middlewares/ST/STM32_WPAN/zigbee/SLA0044.txt b/Middlewares/ST/STM32_WPAN/zigbee/SLA0044.txt deleted file mode 100644 index 6d9df6788..000000000 --- a/Middlewares/ST/STM32_WPAN/zigbee/SLA0044.txt +++ /dev/null @@ -1,65 +0,0 @@ -ULTIMATE LIBERTY SOFTWARE LICENSE AGREEMENT - -BY INSTALLING, COPYING, DOWNLOADING, ACCESSING OR OTHERWISE USING THIS SOFTWARE -OR ANY PART THEREOF (AND THE RELATED DOCUMENTATION) FROM STMICROELECTRONICS -INTERNATIONAL N.V, SWISS BRANCH AND/OR ITS AFFILIATED COMPANIES -(STMICROELECTRONICS), THE RECIPIENT, ON BEHALF OF HIMSELF OR HERSELF, OR ON -BEHALF OF ANY ENTITY BY WHICH SUCH RECIPIENT IS EMPLOYED AND/OR ENGAGED AGREES -TO BE BOUND BY THIS SOFTWARE LICENSE AGREEMENT. - -Under STMicroelectronics intellectual property rights, the redistribution, -reproduction and use in source and binary forms of the software or any part -thereof, with or without modification, are permitted provided that the following -conditions are met: -1. Redistribution of source code (modified or not) must retain any copyright - notice, this list of conditions and the disclaimer set forth below as items - 10 and 11. -2. Redistributions in binary form, except as embedded into microcontroller or - microprocessor device manufactured by or for STMicroelectronics or a software - update for such device, must reproduce any copyright notice provided with the - binary code, this list of conditions, and the disclaimer set forth below as - items 10 and 11, in documentation and/or other materials provided with the - distribution. -3. Neither the name of STMicroelectronics nor the names of other contributors to - this software may be used to endorse or promote products derived from this - software or part thereof without specific written permission. -4. This software or any part thereof, including modifications and/or derivative - works of this software, must be used and execute solely and exclusively on or - in combination with a microcontroller or microprocessor device manufactured - by or for STMicroelectronics. -5. No use, reproduction or redistribution of this software partially or totally - may be done in any manner that would subject this software to any Open Source - Terms. Open Source Terms shall mean any open source license which requires - as part of distribution of software that the source code of such software is - distributed therewith or otherwise made available, or open source license - that substantially complies with the Open Source definition specified at - www.opensource.org and any other comparable open source license such as for - example GNU General Public License (GPL), Eclipse Public License (EPL), Apache - Software License, BSD license or MIT license. -6. STMicroelectronics has no obligation to provide any maintenance, support or - updates for the software. -7. The software is and will remain the exclusive property of STMicroelectronics - and its licensors. The recipient will not take any action that jeopardizes - STMicroelectronics and its licensors' proprietary rights or acquire any - rights in the software, except the limited rights specified hereunder. -8. The recipient shall comply with all applicable laws and regulations affecting - the use of the software or any part thereof including any applicable export - control law or regulation. -9. Redistribution and use of this software or any part thereof other than as - permitted under this license is void and will automatically terminate your - rights under this license. -10. THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, WHICH ARE - DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT SHALL - STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -11. EXCEPT AS EXPRESSLY PERMITTED HEREUNDER, NO LICENSE OR OTHER RIGHTS, WHETHER - EXPRESS OR IMPLIED, ARE GRANTED UNDER ANY PATENT OR OTHER INTELLECTUAL - PROPERTY RIGHTS OF STMICROELECTRONICS OR ANY THIRD PARTY. \ No newline at end of file diff --git a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/stm32wbxx_core_interface_def.h b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/stm32wbxx_core_interface_def.h index 7c253a410..0c19d46ee 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/stm32wbxx_core_interface_def.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/stm32wbxx_core_interface_def.h @@ -3,20 +3,19 @@ * @file stm32wbxx_core_interface_def.h * @author MCD Application Team * @brief This file contains all the defines and structures used for the - * communication between the two core M0 and M4. + * communication between the two core M0 and M4 when using zigbee. * This file is shared between the code running on M4 and the code * running on M0. * ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,6 +109,9 @@ typedef enum { MSG_M4TOM0_ZB_STATE_RESUME, /* ZbStateResume */ /* AES Hashing Functions */ MSG_M4TOM0_ZB_HASH_ADD, /* ZbHashAdd */ +#ifdef ZIGBEE_DIRECT_ACTIVATED + MSG_M4TOM0_ZB_HASH_BYTE, /* ZbHashByte */ +#endif /* ZIGBEE_DIRECT_ACTIVATED */ MSG_M4TOM0_ZB_HASH_DIGEST, /* ZbHashDigest */ /* ECDSA Signature Validation */ MSG_M4TOM0_ZB_SEC_ECDSA_VALIDATE, /* ZbSecEcdsaValidate */ @@ -121,6 +123,22 @@ typedef enum { MSG_M4TOM0_ZCL_TL_SEND_EPINFO_REQ, /* ZbZclTouchlinkTargetSendEpInfoCmd */ MSG_M0TOM4_ZCL_TL_SEND_EPINFO_CB, MSG_M0TOM4_ZCL_TL_EP_INFO_CB, /* ZbTouchlinkCallbacks.ep_info_cb() */ + /* AES CCM* mode functions for private use */ +#ifdef ZIGBEE_DIRECT_ACTIVATED + MSG_M4TOM0_AES_CCM_TRANSFORM, + MSG_M4TOM0_AES_CCM_AUTHENTICATE, + /* Eliptic Curve (semi-private use) */ + MSG_M4TOM0_EC_MUL_X25519, /* ec_mul_x25519 */ + MSG_M4TOM0_EC_MUL_P256, /* ec_mul_p256 */ + /* SHA-256 functions (semi-private use) */ + MSG_M4TOM0_SHA256_RESET, /* SHA256Reset */ + MSG_M4TOM0_SHA256_INPUT, /* SHA256Input */ + MSG_M4TOM0_SHA256_RESULT, /* SHA256Result */ + /* HMAC SHA-256 functions (semi-private use) */ + MSG_M4TOM0_SHA256_HMAC_RESET, /* hmacReset */ + MSG_M4TOM0_SHA256_HMAC_INPUT, /* hmacInput */ + MSG_M4TOM0_SHA256_HMAC_RESULT, /* hmacResult */ +#endif /* ZIGBEE_DIRECT_ACTIVATED */ /* Reserved to 0x00ff for Future Use */ /* ZDO Commands */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_core.h b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_core.h index 14b099fc2..c46d6fbd1 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_core.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_core.h @@ -1,24 +1,21 @@ /** ****************************************************************************** - * @file 802_15_4_mac_core.h + * @file zigbee_core.h * @author MCD Application Team - * @brief This file contains all the defines and structures used for the - * communication between the two core M0 and M4. - * This file is shared between the code running on M4 and the code - * running on M0. + * @brief This file contains the mandatory include files requested by the + * middleware for Zigbee and the error code level. * ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ #ifndef _ZIGBEE_CORE_H_ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_errors.h b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_errors.h deleted file mode 100644 index 2f954c21a..000000000 --- a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_errors.h +++ /dev/null @@ -1,23 +0,0 @@ -/** - ****************************************************************************** - * @file zigbee_errors.h - * @author faarnal - * @brief - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -#ifndef STM32WB_M4_FIRMWARE_FIRMWARE_MIDDLEWARES_ST_STM32_WPAN_MAC_802_15_4_CORE_INC_802_15_4_MAC_ERRORS_H_ -#define STM32WB_M4_FIRMWARE_FIRMWARE_MIDDLEWARES_ST_STM32_WPAN_MAC_802_15_4_CORE_INC_802_15_4_MAC_ERRORS_H_ - -#endif /* STM32WB_M4_FIRMWARE_FIRMWARE_MIDDLEWARES_ST_STM32_WPAN_MAC_802_15_4_CORE_INC_802_15_4_MAC_ERRORS_H_ */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_interface.h b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_interface.h index b590693b3..2099aacab 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_interface.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_interface.h @@ -1,18 +1,17 @@ /** ****************************************************************************** * @file Zigbee_interface.h - * @author - * @brief Header for zigbee interface API (M4 side) + * @author MCD Application Team + * @brief Header for zigbee security keys ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_types.h b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_types.h index 9827b1354..2625e4c2d 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_types.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/core/inc/zigbee_types.h @@ -1,18 +1,17 @@ /** ****************************************************************************** - * @file 802_15_4_mac_types.h - * @author MDG-RF Team - * @brief Header for mac interface types + * @file zigbee_types.h + * @author MDG Application Team + * @brief Header for zigbee types ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c b/Middlewares/ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c index dc82b5fe6..b446186ec 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c +++ b/Middlewares/ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c @@ -2,18 +2,18 @@ ****************************************************************************** * @file zigbee_core_wb.c * @author MCD Application Team - * @brief Contains STM32WB specificities requested to control the Zigbee stack + * @brief Contains STM32WB specificities requested to control the zigbee stack + * from the M4 core. * ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -23,9 +23,7 @@ #include /* ULONG_MAX */ #include -#include "zigbee_errors.h" #include "zigbee_types.h" - #include "zigbee_interface.h" /* zigbee.h, etc */ #include "zcl/zcl.h" #include "zcl/key/zcl.key.h" /* ZbZclKeWithDevice */ @@ -34,6 +32,11 @@ #include "extras/zigbee.extras.h" #include "ieee802154_crc.h" +#ifdef ZIGBEE_DIRECT_ACTIVATED +/* SHA-256 */ +#include "sha.h" +#endif /* ZIGBEE_DIRECT_ACTIVATED */ + #include "zigbee_core.h" #include "tl_zigbee_hci.h" @@ -55,6 +58,19 @@ bool zb_ipc_get_secured_mem_info(uint32_t *unsec_sram2a_sz, uint32_t *unsec_sram unsigned int zb_malloc_current_sz(void); bool ZbZclDeviceLogCheckAllow(struct ZigBeeT *zb, struct ZbApsdeDataIndT *dataIndPtr, struct ZbZclHeaderT *zclHdrPtr); +#ifdef ZIGBEE_DIRECT_ACTIVATED +extern void ZbCcmTransform(const void *key, const void *nonce, uint32_t nonce_len, void *m, uint32_t m_len, void *mic); +extern void ZbCcmAuthenticate(const void *key, const void *nonce, uint32_t nonce_len, const void *a, uint32_t a_len, + const void *m, uint32_t m_len, void *mic, uint32_t mic_len); +int ec_mul_x25519(const void *private, const void *base, void *result); +int ec_mul_p256(const void *priv, const void *pub_x, const void *pub_y, void *result_x, void *result_y); +enum sha_status_t SHA256Reset(SHA256Context *context); +enum sha_status_t SHA256Input(SHA256Context *context, const uint8_t *bytes, unsigned int bytecount); +enum sha_status_t SHA256Result(SHA256Context * context, uint8_t Message_Digest[SHA256HashSize]); +int hmacReset(HMACContext *context, enum SHAversion whichSha, const unsigned char *key, int key_len); +int hmacInput(HMACContext *context, const unsigned char *text, int text_len); +int hmacResult(HMACContext * context, uint8_t digest[USHAMaxHashSize]); +#endif /* ZIGBEE_DIRECT_ACTIVATED */ /* Touchlink callbacks */ static struct ZbTouchlinkCallbacks zigbee_m4_tl_callbacks; @@ -1328,6 +1344,39 @@ ZbApsUnbindAllReq(struct ZigBeeT *zb) ZIGBEE_CmdTransfer(); } +bool +ZbApsBindSrcExists(struct ZigBeeT *zb, uint8_t endpoint, uint16_t clusterId) +{ + struct ZbApsmeBindT entry; + enum ZbStatusCodeT status; + unsigned int i; + uint64_t local_ext = ZbExtendedAddress(zb); + + ZbEnterCritical(zb); + for (i = 0; ; i++) { + status = ZbApsGetIndex(zb, ZB_APS_IB_ID_BINDING_TABLE, &entry, sizeof(entry), i); + if (status != ZB_APS_STATUS_SUCCESS) { + break; + } + if (entry.srcExtAddr == 0ULL) { + continue; + } + if (entry.srcExtAddr != local_ext) { + continue; + } + if (entry.srcEndpt != endpoint) { + continue; + } + if (entry.clusterId != clusterId) { + continue; + } + ZbExitCritical(zb); + return true; + } + ZbExitCritical(zb); + return false; +} + IPC_REQ_FUNC(ZbApsmeTransportKeyReq, MSG_M4TOM0_APSME_TRANSPORT_KEY, struct ZbApsmeTransportKeyReqT); IPC_REQ_FUNC(ZbApsmeRemoveDeviceReq, MSG_M4TOM0_APSME_REMOVE_DEVICE, struct ZbApsmeRemoveDeviceReqT); @@ -1805,28 +1854,31 @@ ZbNwkSetFrameCounter(struct ZigBeeT *zb, uint8_t keySeqno, uint64_t srcAddr, uin return zb_ipc_m4_get_retval() != 0U ? true : false; } -bool -ZbNwkFastPollRequest(struct ZigBeeT *zb) +struct nwk_fastpoll_entry_t * +ZbNwkFastPollRequest(struct ZigBeeT *zb, unsigned int delay, unsigned int timeout) { Zigbee_Cmd_Request_t *ipcc_req; Pre_ZigbeeCmdProcessing(); ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); ipcc_req->ID = MSG_M4TOM0_NWK_FAST_POLL_REQUEST; - ipcc_req->Size = 0; + ipcc_req->Size = 2; + ipcc_req->Data[0] = (uint32_t)delay; + ipcc_req->Data[1] = (uint32_t)timeout; ZIGBEE_CmdTransfer(); - return zb_ipc_m4_get_retval() != 0U ? true : false; + return (struct nwk_fastpoll_entry_t *)zb_ipc_m4_get_retval(); } bool -ZbNwkFastPollRelease(struct ZigBeeT *zb) +ZbNwkFastPollRelease(struct ZigBeeT *zb, struct nwk_fastpoll_entry_t *handle) { Zigbee_Cmd_Request_t *ipcc_req; Pre_ZigbeeCmdProcessing(); ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); ipcc_req->ID = MSG_M4TOM0_NWK_FAST_POLL_RELEASE; - ipcc_req->Size = 0; + ipcc_req->Size = 1; + ipcc_req->Data[0] = (uint32_t)handle; ZIGBEE_CmdTransfer(); return zb_ipc_m4_get_retval() != 0U ? true : false; } @@ -2733,19 +2785,14 @@ ZbApsFragDropTxClear(struct ZigBeeT *zb) ****************************************************************************** */ bool -ZbAesMmoHash(struct ZigBeeT *zb, uint8_t const *data, const unsigned int length, uint8_t *digest) +ZbAesMmoHash(uint8_t const *data, const unsigned int length, uint8_t *digest) { - struct ZbHash *hash; + struct ZbHash hash; - hash = ZbHeapAlloc(zb, sizeof(struct ZbHash)); - if (hash == NULL) { - return false; - } - memset(hash, 0, sizeof(struct ZbHash)); - ZbHashInit(hash); - ZbHashAdd(hash, data, length); - ZbHashDigest(hash, digest); - ZbHeapFree(zb, hash); + memset(&hash, 0, sizeof(struct ZbHash)); + ZbHashInit(&hash); + ZbHashAdd(&hash, data, length); + ZbHashDigest(&hash, digest); return true; } @@ -2772,6 +2819,21 @@ ZbHashAdd(struct ZbHash *h, const void *data, uint32_t len) ipcc_req->Data[2] = (uint32_t)len; ZIGBEE_CmdTransfer(); } +#ifdef ZIGBEE_DIRECT_ACTIVATED +void +ZbHashByte(struct ZbHash *h, uint8_t data) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_ZB_HASH_BYTE; + ipcc_req->Size = 2; + ipcc_req->Data[0] = (uint32_t)h; + ipcc_req->Data[1] = (uint32_t)data; + ZIGBEE_CmdTransfer(); +} +#endif /*ZIGBEE_DIRECT_ACTIVATED */ void ZbHashDigest(struct ZbHash *h, void *digest) @@ -2787,6 +2849,50 @@ ZbHashDigest(struct ZbHash *h, void *digest) ZIGBEE_CmdTransfer(); } +void +ZbHmacInit(struct ZbHash *h, const void *key, uint32_t len) +{ + const unsigned char ipad = 0x36; + const unsigned char opad = 0x5c; + unsigned int i; + + /* Initialize the hash data. */ + ZbHashInit(h); + /* If the key is longer than the digest size, hash it into something smaller. */ + if (len > AES_BLOCK_SIZE) { + ZbHashAdd(h, key, len); + ZbHashDigest(h, h->key); + ZbHashInit(h); + } + else { + (void)memcpy(h->key, key, AES_BLOCK_SIZE); + } + + /* Apply the inner padding and input the key to the hash function. */ + for (i = 0; i < AES_BLOCK_SIZE; i++) { + h->key[i] ^= ipad; + } + ZbHashAdd(h, h->key, AES_BLOCK_SIZE); + + /* Undo the inner padding, and save the outer-padded key for later. */ + for (i = 0; i < AES_BLOCK_SIZE; i++) { + h->key[i] ^= (ipad ^ opad); + } +} + +void +ZbHmacDigest(struct ZbHash *h, void *digest) +{ + /* Compute the inner digest of the inner-padded key and the message. */ + ZbHashDigest(h, digest); + + /* Reset the hash, and compute the digest of the outer-padded key and the inner digest. */ + ZbHashInit(h); + ZbHashAdd(h, h->key, AES_BLOCK_SIZE); + ZbHashAdd(h, digest, AES_BLOCK_SIZE); + ZbHashDigest(h, digest); +} + /****************************************************************************** * Security Helpers ****************************************************************************** @@ -2812,12 +2918,192 @@ ZbSecAddDeviceLinkKeyByInstallCode(struct ZigBeeT *zb, uint64_t extAddr, uint8_t { uint8_t key[ZB_SEC_KEYSIZE]; - if (!ZbAesMmoHash(zb, ic, len, key)) { + if (!ZbAesMmoHash(ic, len, key)) { return ZB_APS_STATUS_INVALID_PARAMETER; } return ZbSecAddDeviceLinkKeyByKey(zb, extAddr, key); } +void +ZbSecKeyTransform(uint8_t *key, uint8_t input, uint8_t *keyOut) +{ + struct ZbHash hash; + + ZbHmacInit(&hash, key, ZB_SEC_KEYSIZE); + ZbHmacAdd(&hash, &input, sizeof(input)); + ZbHmacDigest(&hash, keyOut); +} + +#ifdef ZIGBEE_DIRECT_ACTIVATED +void +ZbCcmTransform(const void *key, const void *nonce, uint32_t nonce_len, void *m, uint32_t m_len, void *mic) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_AES_CCM_TRANSFORM; + ipcc_req->Size = 6; + ipcc_req->Data[0] = (uint32_t)key; + ipcc_req->Data[1] = (uint32_t)nonce; + ipcc_req->Data[2] = (uint32_t)nonce_len; + ipcc_req->Data[3] = (uint32_t)m; + ipcc_req->Data[4] = (uint32_t)m_len; + ipcc_req->Data[5] = (uint32_t)mic; + ZIGBEE_CmdTransfer(); +} + +void +ZbCcmAuthenticate(const void *key, const void *nonce, uint32_t nonce_len, const void *a, uint32_t a_len, + const void *m, uint32_t m_len, void *mic, uint32_t mic_len) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_AES_CCM_AUTHENTICATE; + ipcc_req->Size = 9; + ipcc_req->Data[0] = (uint32_t)key; + ipcc_req->Data[1] = (uint32_t)nonce; + ipcc_req->Data[2] = (uint32_t)nonce_len; + ipcc_req->Data[3] = (uint32_t)a; + ipcc_req->Data[4] = (uint32_t)a_len; + ipcc_req->Data[5] = (uint32_t)m; + ipcc_req->Data[6] = (uint32_t)m_len; + ipcc_req->Data[7] = (uint32_t)mic; + ipcc_req->Data[8] = (uint32_t)mic_len; + ZIGBEE_CmdTransfer(); +} + +int +ec_mul_x25519(const void *private, const void *base, void *result) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_EC_MUL_X25519; + ipcc_req->Size = 3; + ipcc_req->Data[0] = (uint32_t)private; + ipcc_req->Data[1] = (uint32_t)base; + ipcc_req->Data[2] = (uint32_t)result; + ZIGBEE_CmdTransfer(); + return (int)zb_ipc_m4_get_retval(); +} + +int +ec_mul_p256(const void *priv, const void *pub_x, const void *pub_y, void *result_x, void *result_y) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_EC_MUL_P256; + ipcc_req->Size = 5; + ipcc_req->Data[0] = (uint32_t)priv; + ipcc_req->Data[1] = (uint32_t)pub_x; + ipcc_req->Data[2] = (uint32_t)pub_y; + ipcc_req->Data[3] = (uint32_t)result_x; + ipcc_req->Data[4] = (uint32_t)result_y; + ZIGBEE_CmdTransfer(); + return (int)zb_ipc_m4_get_retval(); +} + +enum sha_status_t +SHA256Reset(SHA256Context *context) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_SHA256_RESET; + ipcc_req->Size = 1; + ipcc_req->Data[0] = (uint32_t)context; + ZIGBEE_CmdTransfer(); + return (enum sha_status_t)zb_ipc_m4_get_retval(); +} + +enum sha_status_t +SHA256Input(SHA256Context *context, const uint8_t *bytes, unsigned int bytecount) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_SHA256_INPUT; + ipcc_req->Size = 3; + ipcc_req->Data[0] = (uint32_t)context; + ipcc_req->Data[1] = (uint32_t)bytes; + ipcc_req->Data[2] = (uint32_t)bytecount; + ZIGBEE_CmdTransfer(); + return (enum sha_status_t)zb_ipc_m4_get_retval(); +} + +enum sha_status_t +SHA256Result(SHA256Context * context, uint8_t Message_Digest[SHA256HashSize]) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_SHA256_RESULT; + ipcc_req->Size = 2; + ipcc_req->Data[0] = (uint32_t)context; + ipcc_req->Data[1] = (uint32_t)Message_Digest; + ZIGBEE_CmdTransfer(); + return (enum sha_status_t)zb_ipc_m4_get_retval(); +} + +int +hmacReset(HMACContext *context, enum SHAversion whichSha, + const unsigned char *key, int key_len) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_SHA256_HMAC_RESET; + ipcc_req->Size = 4; + ipcc_req->Data[0] = (uint32_t)context; + ipcc_req->Data[1] = (uint32_t)whichSha; + ipcc_req->Data[2] = (uint32_t)key; + ipcc_req->Data[3] = (uint32_t)key_len; + ZIGBEE_CmdTransfer(); + return (int)zb_ipc_m4_get_retval(); +} + +int +hmacInput(HMACContext *context, const unsigned char *text, int text_len) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_SHA256_HMAC_INPUT; + ipcc_req->Size = 3; + ipcc_req->Data[0] = (uint32_t)context; + ipcc_req->Data[1] = (uint32_t)text; + ipcc_req->Data[2] = (uint32_t)text_len; + ZIGBEE_CmdTransfer(); + return (int)zb_ipc_m4_get_retval(); +} + +int +hmacResult(HMACContext * context, uint8_t digest[USHAMaxHashSize]) +{ + Zigbee_Cmd_Request_t *ipcc_req; + + Pre_ZigbeeCmdProcessing(); + ipcc_req = ZIGBEE_Get_OTCmdPayloadBuffer(); + ipcc_req->ID = MSG_M4TOM0_SHA256_HMAC_RESULT; + ipcc_req->Size = 2; + ipcc_req->Data[0] = (uint32_t)context; + ipcc_req->Data[1] = (uint32_t)digest; + ZIGBEE_CmdTransfer(); + return (int)zb_ipc_m4_get_retval(); +} +#endif /* ZIGBEE_DIRECT_ACTIVATED */ + /****************************************************************************** * Memory Helpers ****************************************************************************** diff --git a/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib.a b/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib.a index 9fbbc9d00..a1146d26e 100644 Binary files a/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib.a and b/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib.a differ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib_keil.lib b/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib_keil.lib index 23106c05a..3a9fb3589 100644 Binary files a/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib_keil.lib and b/Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib_keil.lib differ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.c b/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.c index 0b74a0fea..e1195d973 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.c +++ b/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.c @@ -2,17 +2,16 @@ * @file ee.c * @author MCD Application Team * @brief This file contains the implementation of the EEPROM emulator - * for Dory platform. + * for the STM32WB platform. ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ***************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.h b/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.h index 2be1fc4dd..7f0b4bc43 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/platform/ee.h @@ -2,17 +2,16 @@ * @file ee.h * @author MCD Application Team * @brief This file contains the interface of the EEPROM emulator - * for Dory platform. + * for the STM32WB platform. ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ***************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/platform/ee_cfg.h b/Middlewares/ST/STM32_WPAN/zigbee/platform/ee_cfg.h index 891b81f2c..9940a3974 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/platform/ee_cfg.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/platform/ee_cfg.h @@ -1,19 +1,18 @@ /***************************************************************************** * @file ee_cfg.h * @author MCD Application Team - * @brief This file contains the configuration of the EEPROM emulator - * for Dory platform. - * This file must be customized: see "ee.h" for details. + * @brief This file contains several include files requested for the EEPROM + * emulator + * ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ***************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.c b/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.c index 23256a8c8..d83b6c21c 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.c +++ b/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.c @@ -1,24 +1,20 @@ /***************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module + * @brief This file contains the Flash driver needed by EE module ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ***************************************************************************** */ -//#include "common.h" -#include "stm32_seq.h" -//#include "dbg_gpio.h" #include "hw_flash.h" #include "stm32wbxx_hal.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.h b/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.h index 5ae95c6e1..654eb4f1e 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/platform/hw_flash.h @@ -1,17 +1,16 @@ /***************************************************************************** * @file hw_flash.h * @author MCD Application Team - * @brief This file contains the FLASH driver + * @brief This file contains the header file for the Flash driver ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ***************************************************************************** */ @@ -20,6 +19,8 @@ #ifndef __HW_FLASH_H #define __HW_FLASH_H +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/Middlewares/ST/STM32_WPAN/zigbee/readme.txt b/Middlewares/ST/STM32_WPAN/zigbee/readme.txt index 7d13779c6..9529eb789 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/readme.txt +++ b/Middlewares/ST/STM32_WPAN/zigbee/readme.txt @@ -1,10 +1,4 @@ -LICENSE information -=================== -This software component is licensed to you by ST under Ultimate Liberty license -SLA0044, the "License"; You may not use this file except in compliance with the -License. The terms of the License are contained in the SLA0044.txt file in the -same directory than this readme.txt file. STM32WB Middleware WPAN deliverable =================================== @@ -21,5 +15,6 @@ Ref[2] : AN5498 How to use Zigbee clusters templates on STM32WB Series Ref[3] : AN5500 ZSDK API implementation for ZigBee on STM32WB Series Ref[4] : AN5491 Creating Manufacture Zigbee Specific Clusters on STM32WB Series Ref[5] : AN5492 ZigBee persistent data management non-volatile memory for STM32WB Series - +Ref[6] : AN5627 STM32WB Series ZigBee commissioning guide +Ref[7] : AN5732 Developping Zigbee sleepy end device on STM32WB Series The easiest way to start on Zigbee with STM32WB is to read Ref[1]. diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/mac/ieee802154_enums.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/mac/ieee802154_enums.h index 7598fb841..db44f29e5 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/mac/ieee802154_enums.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/mac/ieee802154_enums.h @@ -58,12 +58,22 @@ #define WPAN_CHANNELMASK_915MHZ 0x000007FEU /* Channels 1-10 */ #define WPAN_CHANNELMASK_2400MHZ 0x07FFF800U /* Channels 11-26 */ +/* NA sub-ghz channel mask */ +#define WPAN_CHANNELMASK_PAGE23 0x01ffffffU /* Channels 0-24 (25) */ + +/* EU sub-ghz channel masks */ +#define WPAN_CHANNELMASK_PAGE24 0x001fffffU /* Channels 56-76 (21) */ +#define WPAN_CHANNELMASK_PAGE25 WPAN_PAGE_CHANNELMASK_ALL /* Channels 0-26 (27) */ +#define WPAN_CHANNELMASK_PAGE26 0x000000ffU /* Channels 27-34 (8) */ +#define WPAN_CHANNELMASK_PAGE27 0x001fffffU /* Channels 35-55 (21) */ + /* GB-868 channel masks (863 to 876 MHz) */ #define WPAN_CHANNELMASK_PAGE28 0x07FFFFFFU /* Channels 0 to 26 */ #define WPAN_CHANNELMASK_PAGE29 0x000000FFU /* Channels 27 to 34 (0 to 7) */ #define WPAN_CHANNELMASK_PAGE30 0x00003FFFU /* Channels 35 to 48 (0 to 13) */ /* GB-868 channel masks (915 to 921 MHz) */ #define WPAN_CHANNELMASK_PAGE31 0x00001FFFU /* Channels 0 to 12 */ +#define WPAN_CHANNELMASK_PAGE31 0x00001FFFU /* Channels 0 to 12 */ /* Virtual channel page (BDL/SCoP). Arbitrarily chosen. */ #define WPAN_CHANNELPAGE_VIRTUAL_MIN 16U diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.alarm.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.alarm.h index ef340c0e7..9b6c622e9 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.alarm.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.alarm.h @@ -4,7 +4,7 @@ * @brief ZCL Alarms cluster header * ZCL 7 section 3.11 * ZCL 8 section 3.11 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_ALARM_H @@ -23,7 +23,7 @@ * Server Attributes * ALM.S.A0000 | AlarmCount | True | Optional * ALM.S.Afffd | ClusterRevision | True - * ALM.S.Afffe | AttributeReportingStatus | False + * ALM.S.Afffe | AttributeReportingStatus | True * * Commands Received * ALM.S.C00.Rsp | Reset Alarm | True @@ -37,7 +37,7 @@ * * Client Attributes * ALM.C.Afffd | ClusterRevision | True - * ALM.C.Afffe | AttributeReportingStatus | False + * ALM.C.Afffe | AttributeReportingStatus | True * * Commands Received * ALM.C.C00.Rsp | Alarm | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ballast.config.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ballast.config.h index 7b670d9c9..7b95180ec 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ballast.config.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ballast.config.h @@ -30,11 +30,11 @@ * BC.S.A0034 | LampAlarmMode | False | Optional * BC.S.A0035 | LampBurnHoursTripPoint | False | Optional * BC.S.Afffd | ClusterRevision | True - * BC.S.Afffe | AttributeReportingStatus | False + * BC.S.Afffe | AttributeReportingStatus | True * * Client Attributes * BC.C.Afffd | ClusterRevision | True - * BC.C.Afffe | AttributeReportingStatus | False + * BC.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.basic.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.basic.h index da2e741ef..a7dcd32d7 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.basic.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.basic.h @@ -6,7 +6,7 @@ * @brief ZCL Basic cluster header * ZCL 7 section 3.2 * ZCL 8 section 3.2 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_BASIC_H @@ -36,14 +36,14 @@ * B.S.A0014 | DisableLocalConfig | True | Optional * B.S.A4000 | SWBuildID | True | Optional * B.S.Afffd | ClusterRevision | True - * B.S.Afffe | AttributeReportingStatus | False + * B.S.Afffe | AttributeReportingStatus | True * * Commands Received * B.S.C00.Rsp | Reset to Factory Defaults | True * * Client Attributes * B.C.Afffd | ClusterRevision | True - * B.C.Afffe | AttributeReportingStatus | False + * B.C.Afffe | AttributeReportingStatus | True * * Commands Generated * B.C.C00.Tx | Reset to Factory Defaults | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.color.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.color.h index dedc944be..a1f799933 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.color.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.color.h @@ -9,7 +9,7 @@ * @brief ZCL Color Control cluster header * ZCL 7 Section 5.2 * ZCL 8 Section 5.2 - * @copyright Copyright [2016 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2016 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_COLOR_H @@ -107,7 +107,7 @@ * CC.S.A400d | ColorTempPhysicalMaxMireds | True * CC.S.A4010 | StartUpColorTemperatureMireds | True * CC.S.Afffd | ClusterRevision | True -* CC.S.Afffe | AttributeReportingStatus | False +* CC.S.Afffe | AttributeReportingStatus | True * * Commands Received * CC.S.C00.Rsp | Move to Hue| True @@ -137,7 +137,7 @@ * CC.C.A0004.Report.Rsp | CurrentY | False * CC.C.A0007.Report.Rsp | ColorTemperatureMireds | False * CC.C.Afffd | ClusterRevision | True -* CC.C.Afffe | AttributeReportingStatus | False +* CC.C.Afffe | AttributeReportingStatus | True * * Commands Generated * CC.C.C00.Tx | Move to Hue| True @@ -831,28 +831,4 @@ enum ZclStatusCodeT ZbZclColorClientStepColorTempReq(struct ZbZclClusterT *clust const struct ZbApsAddrT *dst, struct ZbZclColorClientStepColorTempReqT *req, void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); -/*----------------------------------------------------------------------------- - * Color Client Payload helper functions - *----------------------------------------------------------------------------- - */ -int ZbZclColorClientMoveToHueBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveToHueReqT *req); -int ZbZclColorClientMoveHueBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveHueReqT *req); -int ZbZclColorClientStepHueBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientStepHueReqT *req); -int ZbZclColorClientMoveToSatBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveToSatReqT *req); -int ZbZclColorClientMoveSatBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveSatReqT *req); -int ZbZclColorClientStepSatBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientStepSatReqT *req); -int ZbZclColorClientMoveToHueSatBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveToHueSatReqT *req); -int ZbZclColorClientMoveToColorXYBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveToColorXYReqT *req); -int ZbZclColorClientMoveColorXYBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveColorXYReqT *req); -int ZbZclColorClientStepColorXYBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientStepColorXYReqT *req); -int ZbZclColorClientMoveToColorTempBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveToColorTempReqT *req); -int ZbZclColorClientMoveToHueEnhBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveToHueEnhReqT *req); -int ZbZclColorClientMoveHueEnhBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveHueEnhReqT *req); -int ZbZclColorClientStepHueEnhBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientStepHueEnhReqT *req); -int ZbZclColorClientMoveToHueSatEnhBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveToHueSatEnhReqT *req); -int ZbZclColorClientColorLoopSetBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientColorLoopSetReqT *req); -int ZbZclColorClientStopMoveStepBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientStopMoveStepReqT *req); -int ZbZclColorClientMoveColorTempBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientMoveColorTempReqT *req); -int ZbZclColorClientStepColorTempBuild(uint8_t *payload, unsigned int length, struct ZbZclColorClientStepColorTempReqT *req); - #endif /* ZCL_COLOR_H */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.commission.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.commission.h index 4be2c2609..aa6b75790 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.commission.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.commission.h @@ -42,7 +42,7 @@ * CS.S.A0041 | ConcentratorRadius | False | Optional * CS.S.A0042 | ConcentratorDiscoveryTime | False | Optional * CS.S.Afffd | ClusterRevision | True - * CS.S.Afffe | AttributeReportingStatus | False + * CS.S.Afffe | AttributeReportingStatus | True * * Commands Received * CS.S.C00.Rsp | Restart Device | Depends on customer application @@ -58,7 +58,7 @@ * * Client Attributes * CS.C.Afffd | ClusterRevision | True - * CS.C.Afffe | AttributeReportingStatus | False + * CS.C.Afffe | AttributeReportingStatus | True * * Commands Received * CS.C.C00.Rsp | Restart Device Response | Depends on customer application @@ -109,7 +109,11 @@ enum ZbZclCommissionServerAttrT { ZCL_COMMISSION_SVR_ATTR_PROTOCOLVER = 0x0004, /**< ProtocolVersion. Default value is 0x0002 (ZB_PROTOCOL_VERSION_2007) */ ZCL_COMMISSION_SVR_ATTR_STACKPROFILE = 0x0005, /**< StackProfile. Default value is 0x02 (ZB_NWK_STACK_PROFILE_PRO) */ ZCL_COMMISSION_SVR_ATTR_STARTUPCONTROL = 0x0006, - /**< StartupControl. 0x00 = ZbStartTypePreconfigured, 0x01 = ZbStartTypeForm, 0x02 = ZbStartTypeRejoin, 0x03 = ZbStartTypeJoin. */ + /**< StartupControl. + * ZbStartTypePreconfigured = 0x00, + * ZbStartTypeForm = 0x01, + * ZbStartTypeRejoin = 0x02, + * ZbStartTypeJoin = 0x03 */ ZCL_COMMISSION_SVR_ATTR_TCADDR = 0x0010, /**< TrustCenterAddress. This should only be set if StartupControl is equal to 0x00 (ZbStartTypePreconfigured). * Otherwise it should be zero to allow the Transport Key to be decrypted and processed correctly during joining. */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.dehum.ctrl.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.dehum.ctrl.h index ec41c5f73..3f657bf76 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.dehum.ctrl.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.dehum.ctrl.h @@ -4,7 +4,7 @@ * @brief ZCL Dehumidification Control cluster header * ZCL 7 section 6.5 * ZCL 8 section 6.5 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_DEHUM_CTRL_H @@ -26,12 +26,12 @@ * DHUM.S.A0014 | DehumidificationMaxCool | True * DHUM.S.A0015 | RelativeHumidityDisplay | False | Optional * DHUM.S.Afffd | ClusterRevision | True - * DHUM.S.Afffe | AttributeReportingStatus | False + * DHUM.S.Afffe | AttributeReportingStatus | True * * Client Attributes * DHUM.C.A0001.Report.Tx | DehumidificationCooling | False * DHUM.C.Afffd | ClusterRevision | True - * DHUM.C.Afffe | AttributeReportingStatus | False + * DHUM.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.device.temp.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.device.temp.h index 83f0b496d..fe790b855 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.device.temp.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.device.temp.h @@ -4,7 +4,7 @@ * @brief ZCL Device Temperature Configuration cluster header * ZCL 7 section 3.4 * ZCL 8 section 3.4 - * @copyright Copyright [2017 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2017 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_DEVICE_TEMP_H @@ -31,11 +31,11 @@ * DTMP.S.A0013 | LowTempDwellTripPoint | True | Optional * DTMP.S.A0014 | HighTempDwellTripPoint | True | Optional * DTMP.S.Afffd | ClusterRevision | True - * DTMP.S.Afffe | AttributeReportingStatus | False + * DTMP.S.Afffe | AttributeReportingStatus | True * * Client Attributes * DTMP.C.Afffd | ClusterRevision | True - * DTMP.C.Afffe | AttributeReportingStatus | False + * DTMP.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.diagnostics.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.diagnostics.h index 20aa51135..6c6154b1c 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.diagnostics.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.diagnostics.h @@ -4,7 +4,7 @@ * @brief ZCL Diagnostics cluster header * ZCL 7 section 3.15 * ZCL 8 section 3.15 - * @copyright Copyright [2019 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2019 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_DIAGNOSTICS_H @@ -56,13 +56,14 @@ * DIAG.S.A011c | LastMessageLQI | True | Optional * DIAG.S.A011d | LastMessageRSSI | True | Optional * DIAG.S.Afffd | ClusterRevision | True - * DIAG.S.Afffe | AttributeReportingStatus | False + * DIAG.S.Afffe | AttributeReportingStatus | True * * Client Attributes * DIAG.C.Afffd | ClusterRevision | True - * DIAG.C.Afffe | AttributeReportingStatus | False + * DIAG.C.Afffe | AttributeReportingStatus | True */ +/*lint -save -e621 "Identifier clash (symbol 'ZCL_DIAG_SVR_ATTR_APS_TX_UCAST_FAIL' [MISRA Rule 5.1 REQUIRED, MISRA Rule 5.2 REQUIRED, MISRA Rule 5.4 REQUIRED, MISRA Rule 5.5 REQUIRED]" */ /** Diagnostics Server Attribute IDs */ enum ZbZclDiagSvrAttrT { ZCL_DIAG_SVR_ATTR_RESETS = 0x0000, /**< NumberOfResets (Optional) */ @@ -96,8 +97,9 @@ enum ZbZclDiagSvrAttrT { ZCL_DIAG_SVR_ATTR_PACKET_VAL_DROP_COUNT = 0x011a, /**< PacketValidatedropcount (Optional) */ ZCL_DIAG_SVR_ATTR_AVG_MAC_RETRY_PER_APS_MSG = 0x011b, /**< AverageMACRetryPerAPSMessageSent (Optional) */ ZCL_DIAG_SVR_ATTR_LAST_MSG_LQI = 0x011c, /**< LastMessageLQI (Optional) */ - ZCL_DIAG_SVR_ATTR_LAST_MSG_RSSI = 0x011d, /**< LastMessageRSSI (Optional) */ + ZCL_DIAG_SVR_ATTR_LAST_MSG_RSSI = 0x011d /**< LastMessageRSSI (Optional) */ }; +/*lint -restore */ /*--------------------------------------------------------------- * Diagnostics Client diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.doorlock.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.doorlock.h index f5bbb18f7..e12f7407c 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.doorlock.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.doorlock.h @@ -61,7 +61,7 @@ * DRLK.S.A0046 | RFProgrammingEventMask | False | Optional * DRLK.S.A0047 | RFIDProgrammingEventMask | False | Optional * DRLK.S.Afffd | ClusterRevision | True - * DRLK.S.Afffe | AttributeReportingStatus | False + * DRLK.S.Afffe | AttributeReportingStatus | True * * Commands Received * DRLK.S.C00.Rsp | Lock Door | True @@ -124,7 +124,7 @@ * * Client Attributes * DRLK.C.Afffd | ClusterRevision | True - * DRLK.C.Afffe | AttributeReportingStatus | False + * DRLK.C.Afffe | AttributeReportingStatus | True * * Commands Received * DRLK.C.C00.Rsp | Lock Door Response | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.elec.meas.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.elec.meas.h index 2a898a128..9ae2fb112 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.elec.meas.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.elec.meas.h @@ -145,7 +145,7 @@ * EMR.S.A0a16 | RMSVoltageSagPeriodPhC | False | Optional * EMR.S.A0a17 | RMSVoltageSwellPeriodPhC | False | Optional * EMR.S.Afffd | ClusterRevision | True - * EMR.S.Afffe | AttributeReportingStatus | False + * EMR.S.Afffe | AttributeReportingStatus | True * Commands Received * EMR.S.C00.Rsp | Get Profile Info Command | Depends on customer application @@ -157,7 +157,7 @@ * * Client Attributes * DRLK.C.Afffd | ClusterRevision | True - * DRLK.C.Afffe | AttributeReportingStatus | False + * DRLK.C.Afffe | AttributeReportingStatus | True * * Commands Received * EMR.C.C00.Rsp | Get Profile Info Response Command | Depends on customer application diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.fan.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.fan.h index 9d9bb85bd..490387d7f 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.fan.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.fan.h @@ -4,7 +4,7 @@ * @brief ZCL Fan Control cluster header * ZCL 7 section 6.4 * ZCL 8 section 6.4 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_FAN_H @@ -19,11 +19,11 @@ * FAN.S.A0000 | FanMode | True * FAN.S.A0001 | FanModeSequence | True * FAN.S.Afffd | ClusterRevision | True - * FAN.S.Afffe | AttributeReportingStatus | False + * FAN.S.Afffe | AttributeReportingStatus | True * * Client Attributes * FAN.C.Afffd | ClusterRevision | True - * FAN.C.Afffe | AttributeReportingStatus | False + * FAN.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.groups.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.groups.h index 2c7323481..f53f6077b 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.groups.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.groups.h @@ -4,7 +4,7 @@ * @brief ZCL Groups cluster header * ZCL 7 section 3.6 * ZCL 8 section 3.6 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_GROUPS_H diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.level.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.level.h index fb21001f2..eb4857b66 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.level.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.level.h @@ -4,7 +4,7 @@ * @brief Illuminance Level Sensing cluster header * ZCL 7 section 4.3 * ZCL 8 section 4.3 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_ILLUM_LEVEL_H @@ -32,11 +32,11 @@ * ILLVL.S.A0001 | LightSensorType | False | Optional * ILLVL.S.A0010 | IlluminanceTargetLevel | True * ILLVL.S.Afffd | ClusterRevision | True - * ILLVL.S.Afffe | AttributeReportingStatus | False + * ILLVL.S.Afffe | AttributeReportingStatus | True * * Client Attributes * ILLVL.C.Afffd | ClusterRevision | True - * ILLVL.C.Afffe | AttributeReportingStatus | False + * ILLVL.C.Afffe | AttributeReportingStatus | True */ /** Attribute Identifiers */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.meas.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.meas.h index 8ba356cbc..7f5a2e839 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.meas.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.illum.meas.h @@ -4,7 +4,7 @@ * @brief ZCL Illuminance Measurement cluster header * ZCL 7 section 4.2 * ZCL 8 section 4.2 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_ILLUM_MEAS_H @@ -22,13 +22,13 @@ * IM.S.A0003 | Tolerance | False | Optional * IM.S.A0004 | LightSensorType | False | Optional * IM.S.Afffd | ClusterRevision | True - * IM.S.Afffe | AttributeReportingStatus | False + * IM.S.Afffe | AttributeReportingStatus | True * * * Client Attributes * IM.C.A0000.Report.Rsp | MeasuredValue | False * IM.C.Afffd | ClusterRevision | True - * IM.C.Afffe | AttributeReportingStatus | False + * IM.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.level.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.level.h index a3d353a6a..ff3a78eed 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.level.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.level.h @@ -274,13 +274,4 @@ enum ZclStatusCodeT ZbZclLevelClientStopReq(struct ZbZclClusterT *cluster, const struct ZbApsAddrT *dst, struct ZbZclLevelClientStopReqT *req, void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); -/*----------------------------------------------------------------------------- - * Level Client Payload helper functions - *----------------------------------------------------------------------------- - */ -int ZbZclLevelClientMoveToLevelBuild(uint8_t *payload, unsigned int length, struct ZbZclLevelClientMoveToLevelReqT *req); -int ZbZclLevelClientMoveBuild(uint8_t *payload, unsigned int length, struct ZbZclLevelClientMoveReqT *req); -int ZbZclLevelClientStepBuild(uint8_t *payload, unsigned int length, struct ZbZclLevelClientStepReqT *req); -int ZbZclLevelClientStopBuild(uint8_t *payload, unsigned int length, struct ZbZclLevelClientStopReqT *req); - #endif /* ZCL_LEVEL_H */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.meter.id.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.meter.id.h index b056f3ea0..b07bc6a84 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.meter.id.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.meter.id.h @@ -4,7 +4,7 @@ * @brief ZCL Meter Identification cluster header * ZCL 7 section 10.3 * ZCL 8 section 10.3 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_METER_ID_H @@ -36,7 +36,7 @@ * MTRID.S.A000d | AvailablePower | True * MTRID.S.A000e | PowerThreshold | True * MTRID.S.Afffd | ClusterRevision | True - * MTRID.S.Afffe | AttributeReportingStatus | False + * MTRID.S.Afffe | AttributeReportingStatus | True */ /** Attribute Identifiers */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.nearest.gw.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.nearest.gw.h index d480a008e..63227d363 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.nearest.gw.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.nearest.gw.h @@ -4,7 +4,7 @@ * @brief ZCL Nearest Gateway cluster header * ZCL 7 section 14.5 * ZCL 8 section 14.5 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_NEAREST_GW_H @@ -19,11 +19,11 @@ * NEARGW.S.A0000 | Nearest Gateway | True * NEARGW.S.A0001 | New Mobile Node | True * NEARGW.S.Afffd | ClusterRevision | True - * NEARGW.S.Afffe | AttributeReportingStatus | False + * NEARGW.S.Afffe | AttributeReportingStatus | True * * Client Attributes * NEARGW.C.Afffd | ClusterRevision | True - * NEARGW.C.Afffe | AttributeReportingStatus | False + * NEARGW.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.occupancy.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.occupancy.h index fb274221f..d5db15d23 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.occupancy.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.occupancy.h @@ -4,7 +4,7 @@ * @brief ZCL Occupancy Sensing cluster header * ZCL 7 section 4.8 * ZCL 8 section 4.8 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_OCCUP_H @@ -34,12 +34,12 @@ * OS.S.A0031 | PhysicalContactUnoccupiedToOccupiedDelay | False | Optional * OS.S.A0032 | PhysicalContactUnoccupiedToOccupiedThreshold | False | Optional * OS.S.Afffd | ClusterRevision | True - * OS.S.Afffe | AttributeReportingStatus | False + * OS.S.Afffe | AttributeReportingStatus | True * * Client Attributes * OS.C.A0000.Report.Rsp | Occupancy | False * OS.C.Afffd | ClusterRevision | True - * OS.C.Afffe | AttributeReportingStatus | False + * OS.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.h index 6490f2708..e53c1d5ac 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.h @@ -8,7 +8,7 @@ * @brief ZCL OnOff cluster header * ZCL 7 section 3.8 * ZCL 8 section 3.8 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_ONOFF_H @@ -173,7 +173,7 @@ enum ZclStatusCodeT ZbZclOnOffClientToggleReq(struct ZbZclClusterT *cluster, con void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); #ifdef __cplusplus -} /* extern "C" */ +} #endif #endif /* ZCL_ONOFF_H */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.swconfig.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.swconfig.h index db5a13130..679411aad 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.swconfig.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.onoff.swconfig.h @@ -4,7 +4,7 @@ * @brief ZCL OnOff Switch Configuration cluster header * ZCL 7 section 3.9 * ZCL 8 section 3.9 - * @copyright Copyright [2019 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2019 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_ONOFF_SWCONFIG_H @@ -19,11 +19,11 @@ * OOSC.S.A0000 | SwitchType | True * OOSC.S.A0010 | SwitchActions | True * OOSC.S.Afffd | ClusterRevision | True - * OOSC.S.Afffe | AttributeReportingStatus | False + * OOSC.S.Afffe | AttributeReportingStatus | True * * Client Attributes * OOSC.S.Afffd | ClusterRevision | True - * OOSC.S.Afffe | AttributeReportingStatus | False + * OOSC.S.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ota.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ota.h index dcd3c99b4..34bb323d8 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ota.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.ota.h @@ -19,7 +19,7 @@ * * Server Attributes * OTA.S.Afffd | ClusterRevision | True - * OTA.S.Afffe | AttributeReportingStatus | False + * OTA.S.Afffe | AttributeReportingStatus | True * * Commands Received * OTA.S.C01.Rsp | Query Next Image Request | True @@ -63,7 +63,7 @@ * OTA.C.A000b | UpgradeActivationPolicy | True | Optional * OTA.C.A000c | UpgradeTimeoutPolicy | True | Optional * OTA.C.Afffd | ClusterRevision | True - * OTA.C.Afffe | AttributeReportingStatus | False + * OTA.C.Afffe | AttributeReportingStatus | True * * Commands Received * OTA.C.C00.Rsp | Image Notify | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.poll.control.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.poll.control.h index 1e08d3a30..fa024c3a3 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.poll.control.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.poll.control.h @@ -4,7 +4,7 @@ * @brief ZCL Poll Control cluster header * ZCL 7 section 3.16 * ZCL 8 section 3.16 - * @copyright Copyright [2019 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2019 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_POLL_CONTROL_H @@ -23,7 +23,7 @@ * POLL.S.A0005 | LongPollIntervalMin | True | Optional * POLL.S.A0006 | FastPollTimeoutMax | True | Optional * POLL.S.AFFFD | ClusterRevision | True - * POLL.S.AFFFE | AttributeReportingStatus | False + * POLL.S.AFFFE | AttributeReportingStatus | True * * Commands Received * POLL.S.C00.Rsp | Check-in Response | True @@ -36,7 +36,7 @@ * * Client Attributes * POLL.C.AFFFD | ClusterRevision | True - * POLL.C.AFFFE | AttributeReportingStatus | False + * POLL.C.AFFFE | AttributeReportingStatus | True * * Commands Received * POLL.C.C00.Rsp | Check-in | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.config.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.config.h index f1cf37e38..c8326687b 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.config.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.config.h @@ -73,11 +73,11 @@ * PC.S.A007d | BatteryPercentageThreshold3 - Third Battery | False | Optional * PC.S.A007e | BatteryAlarmState - Third Battery | False | Optional * PC.S.Afffd | ClusterRevision | True - * PC.S.Afffe | AttributeReportingStatus | False + * PC.S.Afffe | AttributeReportingStatus | True * * Client Attributes * PC.C.Afffd | ClusterRevision | True - * PC.C.Afffe | AttributeReportingStatus | False + * PC.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.profile.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.profile.h index 281c7131f..008214c18 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.profile.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.power.profile.h @@ -4,7 +4,7 @@ * @brief ZCL Power Profile cluster header * ZCL 7 section 3.17 * ZCL 8 section 3.17 - * @copyright Copyright [2019 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2019 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_PWR_PROF_H @@ -23,7 +23,7 @@ * PWR.S.A0004 | ScheduleMode | True * PWR.S.A0004.Report.Tx | ScheduleMode | True * PWR.S.Afffd | ClusterRevision | True - * PWR.S.Afffe | AttributeReportingStatus | False + * PWR.S.Afffe | AttributeReportingStatus | True * * Commands Received * PWR.S.C00.Rsp | PowerProfileRequest | True @@ -53,7 +53,7 @@ * Client Attributes * PWR.C.A0004.Report.Rsp | ScheduleMode | False * PWR.C.Afffd | ClusterRevision | True - * PWR.C.Afffe | AttributeReportingStatus | False + * PWR.C.Afffe | AttributeReportingStatus | True * * Commands Received * PWR.C.C00.Rsp | PowerProfileNotification | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.press.meas.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.press.meas.h index baa6d7ecf..706b9f618 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.press.meas.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.press.meas.h @@ -4,7 +4,7 @@ * @brief ZCL Pressure Measurement cluster header * ZCL 7 section 4.5 * ZCL 8 section 4.5 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_PRESS_MEAS_H @@ -27,12 +27,12 @@ * PRS.S.A0013 | ScaledTolerance | False | Optional * PRS.S.A0014 | Scale | False | Optional * PRS.S.Afffd | ClusterRevision | True - * PRS.S.Afffe | AttributeReportingStatus | False + * PRS.S.Afffe | AttributeReportingStatus | True * * Client Attributes * PRS.C.A0000.Report.Rsp | MeasuredValue | False * PRS.C.Afffd | ClusterRevision | True - * PRS.C.Afffe | AttributeReportingStatus | False + * PRS.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.pump.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.pump.h index c7597a617..cd304a54b 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.pump.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.pump.h @@ -4,7 +4,7 @@ * @brief ZCL Pump Configuration and Control cluster header * ZCL 7 section 6.2 * ZCL 8 section 6.2 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_PUMP_H @@ -43,13 +43,13 @@ * PCC.S.A0021 | ControlMode | False | Optional * PCC.S.A0022 | AlarmMask | False | Optional * PCC.S.Afffd | ClusterRevision | True - * PCC.S.Afffe | AttributeReportingStatus | False + * PCC.S.Afffe | AttributeReportingStatus | True * Client Attributes * PCC.C.A0010.Report.Rsp | PumpStatus | False * PCC.S.A0013.Report.Rsp | Capacity | False * PCC.C.Afffd | ClusterRevision | True - * PCC.C.Afffe | AttributeReportingStatus | False + * PCC.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.rssi.loc.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.rssi.loc.h index 6df871e06..7315945f2 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.rssi.loc.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.rssi.loc.h @@ -4,7 +4,7 @@ * @brief ZCL RSSI Location cluster header * ZCL 7 section 3.13 * ZCL 8 section 3.13 - * @copyright Copyright [2019 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2019 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_RSSI_LOC_H @@ -30,7 +30,7 @@ * RSSI.S.A0016 | CalculationPeriod | True | Optional * RSSI.S.A0017 | NumberRSSIMeasurements | True * RSSI.S.Afffd | ClusterRevision | True - * RSSI.S.Afffe | AttributeReportingStatus | False + * RSSI.S.Afffe | AttributeReportingStatus | True * * Commands Received * RSSI.S.C00.Rsp | Set Absolute Location | True @@ -53,7 +53,7 @@ * * Client Attributes * RSSI.C.Afffd | ClusterRevision | True - * RSSI.C.Afffe | AttributeReportingStatus | False + * RSSI.C.Afffe | AttributeReportingStatus | True * * Commands Received * RSSI.C.C00.Rsp | Device configuration response | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.scenes.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.scenes.h index 59bb6f4e4..dfeefdd7b 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.scenes.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.scenes.h @@ -4,7 +4,7 @@ * @brief ZCL Scenes cluster header * ZCL 7 section 3.7 * ZCL 8 section 3.7 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_SCENES_H @@ -25,7 +25,7 @@ * S.S.A0004 | NameSupport | True * S.S.A0005 | LastConfiguredBy | True | Optional * S.S.Afffd | ClusterRevision | True - * S.S.Afffe | AttributeReportingStatus | False + * S.S.Afffe | AttributeReportingStatus | True * * Commands Received * S.S.C00.Rsp | Add Scene | True @@ -52,7 +52,7 @@ * * Client Attributes * S.C.Afffd | ClusterRevision | True - * S.C.Afffe | AttributeReportingStatus | False + * S.C.Afffe | AttributeReportingStatus | True * * Commands Received * S.C.C00.Rsp | Add Scene Response | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.temp.meas.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.temp.meas.h index d164b8b02..208746a4a 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.temp.meas.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.temp.meas.h @@ -4,7 +4,7 @@ * @brief ZCL Temperature Measurement cluster header * ZCL 7 section 4.4 * ZCL 8 section 4.4 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_MEASURE_H @@ -21,12 +21,12 @@ * TM.S.A0002 | MaxMeasuredValue | True * TM.S.A0003 | Tolerance | True | Optional * TM.S.Afffd | ClusterRevision | True - * TM.S.Afffe | AttributeReportingStatus | False + * TM.S.Afffe | AttributeReportingStatus | True * * Client Attributes * TM.C.A0000.Report.Rsp | MeasuredValue | False * TM.C.Afffd | ClusterRevision | True - * TM.C.Afffe | AttributeReportingStatus | False + * TM.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.h index fcb20e661..d05faaa36 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.h @@ -72,7 +72,7 @@ * TSTAT.S.A0046 | ACCoilTemperature | False | Optional * TSTAT.S.A0047 | ACCapacityFormat | False | Optional * TSTAT.S.Afffd | ClusterRevision | True - * TSTAT.S.Afffe | AttributeReportingStatus | False + * TSTAT.S.Afffe | AttributeReportingStatus | True * * Commands Received * TSTAT.S.C00.Rsp | Setpoint Raise/Lower | True @@ -90,7 +90,7 @@ * TSTAT.C.A0007.Report.Rsp | False * TSTAT.C.A0008.Report.Rsp | False * TSTAT.C.Afffd | ClusterRevision | True - * TSTAT.C.Afffd | AttributeReportingStatus | False + * TSTAT.C.Afffd | AttributeReportingStatus | True * * Commands Received * TSTAT.C.C00.Rsp | Get Weekly Schedule Response | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.ui.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.ui.h index 9e7cc5356..e35d854b8 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.ui.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.therm.ui.h @@ -4,7 +4,7 @@ * @brief ZCL Thermostat User Interface cluster header * ZCL 7 section 6.6 * ZCL 8 section 6.6 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_THERM_UI_H @@ -21,11 +21,11 @@ * TSUIC.S.A0001 | KeypadLockout | True * TSUIC.S.A0002 | ScheduleProgrammingVisibility | False | Optional * TSUIC.S.Afffd | ClusterRevision | True - * TSUIC.S.Afffe | AttributeReportingStatus | False + * TSUIC.S.Afffe | AttributeReportingStatus | True * * Client Attributes * TSUIC.C.Afffd | ClusterRevision | True - * TSUIC.C.Afffe | AttributeReportingStatus | False + * TSUIC.C.Afffe | AttributeReportingStatus | True */ /** Thermostat User Interface Attribute IDs */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.time.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.time.h index 54bfa7e5d..e6b65907f 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.time.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.time.h @@ -4,7 +4,7 @@ * @brief ZCL Time cluster header * ZCL 7 section 3.12 * ZCL 8 section 3.12 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_TIME_H @@ -32,11 +32,11 @@ * T.S.A0008 | LastSetTime | True | Optional * T.S.A0009 | ValidUntilTime | True | Optional * T.S.Afffd | ClusterRevision | True - * T.S.Afffe | AttributeReportingStatus | False + * T.S.Afffe | AttributeReportingStatus | True * * Client Attributes * T.C.Afffd | ClusterRevision | True - * T.C.Afffe | AttributeReportingStatus | False + * T.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.voice.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.voice.h index 3f4e2c85e..16e5d2887 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.voice.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.voice.h @@ -4,7 +4,7 @@ * @brief ZCL Voice Over Zigbee cluster header * ZCL 7 section 12.4 * ZCL 8 section 12.3 - * @copyright Copyright [2019 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2019 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_VOICE_H @@ -28,7 +28,7 @@ * Voice.S.A0009 | OptionFlags | False | Optional * Voice.S.A000a | Threshold | False | Optional * Voice.S.Afffd | ClusterRevision | True - * Voice.S.Afffe | AttributeReportingStatus | False + * Voice.S.Afffe | AttributeReportingStatus | True * * Commands Received * Voice.S.C00.Rsp | Establishment Request | True @@ -43,7 +43,7 @@ * * Client Attributes * Voice.C.Afffd | ClusterRevision | True - * Voice.C.Afffe | AttributeReportingStatus | False + * Voice.C.Afffe | AttributeReportingStatus | True * * Commands Received * Voice.C.C00.Rsp | Establishment Response | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.wcm.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.wcm.h index ab544905b..4413430f0 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.wcm.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.wcm.h @@ -4,7 +4,7 @@ * @brief ZCL Water Content Measurement cluster header * ZCL 7 section 4.7 * ZCL 8 section 4.7 - * @copyright Copyright [2019 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2019 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_WATER_CONTENT_MEAS_H # define ZCL_WATER_CONTENT_MEAS_H @@ -26,12 +26,12 @@ * WCM.S.A0002 | MaxMeasuredValue | True * WCM.S.A0003 | Tolerance | False | Optional * WCM.S.Afffd | ClusterRevision | True - * WCM.S.Afffe | AttributeReportingStatus | False + * WCM.S.Afffe | AttributeReportingStatus | True * * Client Attributes * WCM.C.A0000.Report.Rsp | MeasuredValue | False * WCM.C.Afffd | ClusterRevision | True - * WCM.C.Afffe | AttributeReportingStatus | False + * WCM.C.Afffe | AttributeReportingStatus | True */ #include "zcl/zcl.h" diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.window.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.window.h index bf8d5f8c0..e4e6d6fd1 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.window.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/general/zcl.window.h @@ -4,7 +4,7 @@ * @brief ZCL Window Covering cluster header * ZCL 7 section 7.4 * ZCL 8 section 7.4 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_WINDOW_H @@ -58,7 +58,7 @@ * WNCV.S.A0018 | Intermediate Setpoints - Lift | False | Optional * WNCV.S.A0019 | Intermediate Setpoints - Tilt | False | Optional * WNCV.S.Afffd | ClusterRevision | True - * WNCV.S.Afffe | AttributeReportingStatus | False + * WNCV.S.Afffe | AttributeReportingStatus | True * * Commands Received * WNCV.S.C00.Rsp | Up / Open | True @@ -73,7 +73,7 @@ * WNCV.C.A0008.Report.Rsp | CurrentPositionLiftPercentage | False * WNCV.C.A0009.Report.Rsp | CurrentPositionTiltPercentage | False * WNCV.C.Afffd | ClusterRevision | True - * WNCV.C.Afffe | AttributeReportingStatus | False + * WNCV.C.Afffe | AttributeReportingStatus | True * * Commands Generated * WNCV.C.C00.Tx | Up / Open | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.drlc.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.drlc.h index 06465e8aa..9d1ee95fc 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.drlc.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.drlc.h @@ -13,7 +13,7 @@ * * Server Attributes * DRLC.S.Afffd | ClusterRevision | True - * DRLC.S.Afffe | AttributeReportingStatus | False + * DRLC.S.Afffe | AttributeReportingStatus | True * * Commands Received * DRLC.S.C00.Rsp | Report Event Status | True @@ -30,7 +30,7 @@ * DRLC.C.A0002 | StopRandomizeMinutes | True * DRLC.C.A0003 | DeviceClassValue | True * DRLC.C.Afffd | ClusterRevision | True - * DRLC.C.Afffe | AttributeReportingStatus | False + * DRLC.C.Afffe | AttributeReportingStatus | True * * Commands Received * DRLC.C.C00.Rsp | Load Control Event | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.keepalive.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.keepalive.h index 646be478f..6d8e70f97 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.keepalive.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.keepalive.h @@ -3,7 +3,7 @@ * @heading Keep Alive * @brief ZCL Keep Alive cluster header * ZCL 8 Section 3.18 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ /*-------------------------------------------------------------------------- @@ -56,16 +56,16 @@ struct ZbZclClusterT * ZbZclKeepAliveClientAlloc(struct ZigBeeT *zb, uint8_t end /** * Start Keep Alive - * @param cluster Cluster instance from which to send this command + * @param zb Zigbee stack instance * @return Void */ -void ZbZclKeepAliveClientStart(struct ZbZclClusterT *cluster); +void ZbZclKeepAliveClientStart(struct ZigBeeT *zb); /** * Stop Keep Alive and abort the TCSO - * @param cluster Cluster instance from which to send this command + * @param zb Zigbee stack instance * @return Void */ -void ZbZclKeepAliveClientStop(struct ZbZclClusterT *cluster); +void ZbZclKeepAliveClientStop(struct ZigBeeT *zb); #endif /* __ZCL_KEEPALIVE_H */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.message.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.message.h index 384d59bad..42ef662f7 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.message.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.message.h @@ -4,7 +4,7 @@ * @brief ZCL Messaging cluster header * ZCL 7 Section 10.5 * ZCL 8 Section 10.5 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ /* @PICS.ZCL.Message @@ -13,7 +13,7 @@ * * Server Attributes * SEMS.S.Afffd | ClusterRevision | True - * SEMS.S.Afffe | AttributeReportingStatus | False + * SEMS.S.Afffe | AttributeReportingStatus | True * * Commands Received * SEMS.S.C00.Rsp | Get Last Message | False @@ -28,7 +28,7 @@ * * Client Atributes * SEMS.C.Afffd | ClusterRevision | True - * SEMS.C.Afffe | AttributeReportingStatus | False + * SEMS.C.Afffe | AttributeReportingStatus | True * * Commands Received * SEMS.C.C00.Rsp | Display Message | False diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.attr.gbcs.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.attr.gbcs.h index 369d317bb..835033673 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.attr.gbcs.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.attr.gbcs.h @@ -1,280 +1,383 @@ -/* Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. */ +/* Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #include "zcl/se/zcl.meter.h" +#ifndef ZCL_METER_ATTR_GBCS_LIST_NAME +#define ZCL_METER_ATTR_GBCS_LIST_NAME zcl_meter_server_gbcs_attr_list +#endif + #ifdef ZCL_METER_ATTR_GBCS_CALLBACK -/* Optional attribute flags. If providing an attribute callback (), then need to - * specify the appropriate flags: (ZCL_ATTR_FLAG_CB_READ | ZCL_ATTR_FLAG_CB_WRITE) - */ -# ifndef ZCL_METER_ATTR_GBCS_FLAGS -# error "Must define ZCL_METER_ATTR_GBCS_FLAGS if defining ZCL_METER_ATTR_GBCS_CALLBACK" -# endif +#ifndef ZCL_METER_ATTR_GBCS_FLAGS +/* If callback is not NULL, Should define one or both of ZCL_ATTR_FLAG_CB_READ | ZCL_ATTR_FLAG_CB_WRITE */ +#error "If ZCL_METER_ATTR_GBCS_CALLBACK defined, must also define ZCL_METER_ATTR_GBCS_FLAGS. E.g. ZCL_ATTR_FLAG_CB_READ | ZCL_ATTR_FLAG_CB_WRITE" +#endif #else -# define ZCL_METER_ATTR_GBCS_CALLBACK NULL -# define ZCL_METER_ATTR_GBCS_FLAGS ZCL_ATTR_FLAG_NONE +#define ZCL_METER_ATTR_GBCS_CALLBACK NULL #endif +#ifndef ZCL_METER_ATTR_GBCS_FLAGS +#define ZCL_METER_ATTR_GBCS_FLAGS ZCL_ATTR_FLAG_REPORTABLE +#endif + +/* Minimum reporting interval for all attributes. If an attribute changes, its + * report will be sent at least this much time since the last report. + * This value should be less than the sleep cycle for a sleepy Meter device, so + * when the Meter wakes up and calls ZbZclAttrReportKick, any modified attributes + * since the last wake cycle will be reported on. */ +#ifndef ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN +#define ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN 900U /* 15 minutes, assuming a sleepy cycle of 30 minutes. */ +#endif + +/* Maximum reporting interval for attributes that should never change once + * configured by application. Only report if they do change. */ +#ifndef ZCL_METER_ATTR_GBCS_REPORT_INTVL_STATIC +#define ZCL_METER_ATTR_GBCS_REPORT_INTVL_STATIC ZCL_ATTR_REPORT_MAX_INTVL_CHANGE /* change only */ +#endif + +/* Maximum reporting interval for attributes that rarely change, but good to + * keep the COMMs Hub up to date in case a previous report was missed. + * If your application wants to only report when these attributes change, + * redefine this to ZCL_ATTR_REPORT_MAX_INTVL_CHANGE, and these extra redundant + * reports won't be sent. */ +#ifndef ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG +#define ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG ZCL_ATTR_REPORT_MAX_INTVL_MAXIMUM /* ~18 hours */ +#endif + +/* Maximum reporting interval for attributes that may change more frequently, but + * good to keep the COMMs Hub up to date, in case a previous report was missed. + * If your application wants to only report when these attributes change, + * redefine this to ZCL_ATTR_REPORT_MAX_INTVL_CHANGE, and these extra redundant + * reports won't be sent. */ +#ifndef ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT +#define ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT 14400U /* 4 hours */ +#endif + +/*----------------------------------------------------------------------------- + * GBCS Required Attribute List + *----------------------------------------------------------------------------- + */ /* Use this as-is to append the GBCS Metering Attributes to the * Metering Server. Or use this as a template to create the * attribute's as your application requires. */ -const struct ZbZclAttrT zcl_meter_server_gbcs_attr_list[] = { +/* NOTE: Use ZCL_ATTR_LIST_LEN(list) to get the length of the list (number of attributes) */ + +const struct ZbZclAttrT ZCL_METER_ATTR_GBCS_LIST_NAME[] = { /* CurrentNoTierBlock1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(0, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(0, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(0, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(0, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier1Block1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(1, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(1, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(1, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(1, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier2Block1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(2, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(2, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(2, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(2, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier3Block1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(3, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(3, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(3, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(3, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier4Block1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(4, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(4, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(4, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(4, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier5Block1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(5, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(5, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(5, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(5, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier6Block1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(6, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(6, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(6, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(6, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier7Block1-4SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(7, 1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(7, 2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(7, 3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_BLOCKN_DELIV(7, 4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* Misc */ { ZCL_METER_SVR_ATTR_MULTIPLIER, ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_DIVISOR, ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { - ZCL_METER_SVR_ATTR_DEVICE_TYPE, ZCL_DATATYPE_ENUMERATION_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + /* NOTE: not ZCL_DATATYPE_ENUMERATION_8BIT as one would expect. Zero-day bug in Spec. */ + ZCL_METER_SVR_ATTR_DEVICE_TYPE, ZCL_DATATYPE_BITMAP_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_STATIC} }, { ZCL_METER_SVR_ATTR_SITE_ID, ZCL_DATATYPE_STRING_OCTET, ZCL_METER_ATTR_GBCS_FLAGS, 32, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_STATIC} }, { ZCL_METER_SVR_ATTR_SUMMATION_FORMAT, ZCL_DATATYPE_BITMAP_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* DemandFormatting is not listed, but providing since * InstantaneousDemand is included. */ { ZCL_METER_SVR_ATTR_DEMAND_FORMAT, ZCL_DATATYPE_BITMAP_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* HistoricalConsumptionFormatting is not listed, but providing since * various consumption attributes are included. */ { ZCL_METER_SVR_ATTR_HISTORICAL_CONSUMPTION_FORMAT, ZCL_DATATYPE_BITMAP_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_UNIT_OF_MEASURE, ZCL_DATATYPE_ENUMERATION_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_CUSTOMER_ID_NUMBER, ZCL_DATATYPE_STRING_OCTET, ZCL_METER_ATTR_GBCS_FLAGS, 24, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_STATIC} }, { ZCL_METER_SVR_ATTR_INSTANTANEOUS_DEMAND, ZCL_DATATYPE_SIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, { ZCL_METER_SVR_ATTR_BILL_DELIV_TRAILING_DIGIT, ZCL_DATATYPE_BITMAP_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_BTD_DELIV, ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_AMBIENT_CONSUMPTION_INDICATOR, ZCL_DATATYPE_ENUMERATION_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_METER_STATUS, ZCL_DATATYPE_BITMAP_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, { ZCL_METER_SVR_ATTR_CURSUM_DELIV, ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, { ZCL_METER_SVR_ATTR_CURSUM_RECV, ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, { ZCL_METER_SVR_ATTR_SUPPLY_STATUS, ZCL_DATATYPE_ENUMERATION_8BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, /* CurrentDayConsumption */ { ZCL_METER_SVR_ATTR_CURDAY_DM_DELIV, ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, /* PreviousDayConsumption */ { ZCL_METER_SVR_ATTR_PRVDAY_DM_DELIV, ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* PreviousDay[2..8]Consumption */ { ZCL_METER_SVR_ATTR_PRVDAY_N_DELIV_CONSUMP(2), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_PRVDAY_N_DELIV_CONSUMP(3), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_PRVDAY_N_DELIV_CONSUMP(4), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_PRVDAY_N_DELIV_CONSUMP(5), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_PRVDAY_N_DELIV_CONSUMP(6), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_PRVDAY_N_DELIV_CONSUMP(7), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_PRVDAY_N_DELIV_CONSUMP(8), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentMonthConsumptionDelivered and @@ -282,59 +385,73 @@ const struct ZbZclAttrT zcl_meter_server_gbcs_attr_list[] = { * PreviousMonth[2..13]Consumption*/ { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(0), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(1), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(2), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(3), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(4), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(5), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(6), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(7), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(8), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(9), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(10), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(11), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(12), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(13), ZCL_DATATYPE_UNSIGNED_32BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentWeekConsumptionDelivered and @@ -342,230 +459,282 @@ const struct ZbZclAttrT zcl_meter_server_gbcs_attr_list[] = { * PreviousWeek[2..5]Consumption */ { ZCL_METER_SVR_ATTR_WEEK_N_CONSUMP_DELIV(0), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_SHORT} }, { ZCL_METER_SVR_ATTR_WEEK_N_CONSUMP_DELIV(1), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_WEEK_N_CONSUMP_DELIV(2), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_WEEK_N_CONSUMP_DELIV(3), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_WEEK_N_CONSUMP_DELIV(4), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_WEEK_N_CONSUMP_DELIV(5), ZCL_DATATYPE_UNSIGNED_24BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier1-9SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_DELIV(1), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(2), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(3), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(4), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(5), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(6), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(7), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(8), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(9), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier10-19SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_DELIV(10), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(11), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(12), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(13), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(14), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(15), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(16), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(17), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(18), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(19), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier20-29SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_DELIV(20), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(21), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(22), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(23), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(24), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(25), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(26), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(27), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(28), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(29), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier30-39SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_DELIV(30), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(31), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(32), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(33), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(34), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(35), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(36), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(37), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(38), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(39), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, /* CurrentTier40-48SummationDelivered */ { ZCL_METER_SVR_ATTR_TIERN_DELIV(40), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(41), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(42), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(43), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(44), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(45), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(46), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(47), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, { ZCL_METER_SVR_ATTR_TIERN_DELIV(48), ZCL_DATATYPE_UNSIGNED_48BIT, ZCL_METER_ATTR_GBCS_FLAGS, 0, - ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_METER_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_METER_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_METER_ATTR_GBCS_REPORT_INTVL_LONG} }, }; - -const unsigned int ZCL_METER_SVR_GBCS_ATTR_LIST_LEN = ZCL_ATTR_LIST_LEN(zcl_meter_server_gbcs_attr_list); diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.h index 5ff14a533..47ca8519a 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.meter.h @@ -4,7 +4,7 @@ * @brief ZCL Metering cluster header * ZCL 7 section 10.4 * ZCL 8 section 10.4 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ /* @PICS.ZCL.Meter @@ -161,7 +161,7 @@ * SEMT.S.A0b15 | Flow Measurement Period | False | Optional * SEMT.S.A0c00 | AlternativeInstantaneousDemand | False | Optional * SEMT.S.Afffd | ClusterRevision | True - * SEMT.S.Afffe | AttributeReportingStatus | False + * SEMT.S.Afffe | AttributeReportingStatus | True * * Commands Received * SEMT.S.C00.Rsp | Get Profile | False @@ -206,7 +206,7 @@ * SEMT.C.A0006 | NotificationFlags7 | False | Optional * SEMT.C.A0007 | NotificationFlags8 | False | Optional * SEMT.C.Afffd | ClusterRevision | True - * SEMT.C.Afffe | AttributeReportingStatus | False + * SEMT.C.Afffe | AttributeReportingStatus | True * * Commands Received * SEMT.C.C00.Rsp | Get Profile Response | False @@ -500,45 +500,96 @@ enum ZbZclMeteringSvrAttrT { #define ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_DELIV(prev_month) (0x0440U + (2U * (prev_month))) #define ZCL_METER_SVR_ATTR_MONTH_N_CONSUMP_RECV(prev_month) (0x0441U + (2U * (prev_month))) +/** Metering Client Attribute IDs */ enum ZbZclMeterCliAttrT { /* Notification Set (0x00) */ - /* Notification Flags (ZCL_METER_CLI_NOTIF_FLG_) */ - ZCL_METER_CLI_ATTR_NOTIF_FLG_1 = 0x0000, - ZCL_METER_CLI_ATTR_NOTIF_FLG_2, /* 0x0001 */ - ZCL_METER_CLI_ATTR_NOTIF_FLG_3, /* 0x0002 */ - ZCL_METER_CLI_ATTR_NOTIF_FLG_4, /* 0x0003 */ - ZCL_METER_CLI_ATTR_NOTIF_FLG_5, /* 0x0004 */ - ZCL_METER_CLI_ATTR_NOTIF_FLG_6, /* 0x0005 */ - ZCL_METER_CLI_ATTR_NOTIF_FLG_7, /* 0x0006 */ - ZCL_METER_CLI_ATTR_NOTIF_FLG_8 /* 0x0007 */ + ZCL_METER_CLI_ATTR_FUNC_NOTIF_FLAGS = 0x0000, /**< FunctionalNotificationFlags */ + ZCL_METER_CLI_ATTR_NOTIF_FLAGS_2 = 0x0001, /**< NotificationFlags2 (Price) */ + ZCL_METER_CLI_ATTR_NOTIF_FLAGS_3 = 0x0002, /**< NotificationFlags3 (Calendar) */ + ZCL_METER_CLI_ATTR_NOTIF_FLAGS_4 = 0x0003, /**< NotificationFlags4 (Prepayment) */ + ZCL_METER_CLI_ATTR_NOTIF_FLAGS_5 = 0x0004, /**< NotificationFlags5 (Device Management) */ + ZCL_METER_CLI_ATTR_NOTIF_FLAGS_6 = 0x0005, /**< NotificationFlags6 (Not supported) */ + ZCL_METER_CLI_ATTR_NOTIF_FLAGS_7 = 0x0006, /**< NotificationFlags7 (Not supported) */ + ZCL_METER_CLI_ATTR_NOTIF_FLAGS_8 = 0x0007, /**< NotificationFlags8 (Not supported) */ }; -/* ZCL_METER_CLI_ATTR_NOTIF_FLG_ */ -#define ZCL_METER_CLI_NOTIF_FLG_NEW_OTA_FW 0x00000001U /* bit 0 */ -#define ZCL_METER_CLI_NOTIF_FLG_CBKE_UPDATE_REQ 0x00000002U /* bit 1 */ -#define ZCL_METER_CLI_NOTIF_FLG_TIME_SYNC 0x00000004U /* bit 2 */ +/* Functional Notification Flags (ZCL_METER_CLI_ATTR_FUNC_NOTIF_FLAGS) */ +#define ZCL_METER_FUNC_NOTIF_FLAG_NEW_OTA_FW 0x00000001U /* bit 0 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_CBKE_UPDATE_REQ 0x00000002U /* bit 1 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_TIME_SYNC 0x00000004U /* bit 2 */ /* Reserved - 0x00000008U */ -#define ZCL_METER_CLI_NOTIF_FLG_STAY_AWAKE_HAN 0x00000010U /* bit 4 */ -#define ZCL_METER_CLI_NOTIF_FLG_STAY_AWAKE_WAN 0x00000020U /* bit 5 */ -#define ZCL_METER_CLI_NOTIF_FLG_PUSH_HIST_METER_MASK 0x000001C0U /* bits 6-8 */ -#define ZCL_METER_CLI_NOTIF_FLG_PUSH_HIST_PREPAY_SET 0x00000E00U /* bits 9-11 */ -#define ZCL_METER_CLI_NOTIF_FLG_PUSH_STATIC_BASIC 0x00001000U /* bit 12 */ -#define ZCL_METER_CLI_NOTIF_FLG_PUSH_STATIC_METER 0x00002000U /* bit 13 */ -#define ZCL_METER_CLI_NOTIF_FLG_PUSH_STATIC_PREPAY 0x00004000U /* bit 14 */ -#define ZCL_METER_CLI_NOTIF_FLG_NETWORK_KEY_ACTIVE 0x00008000U /* bit 15 */ -#define ZCL_METER_CLI_NOTIF_FLG_DISPLAY_MESSAGE 0x00010000U /* bit 16 */ -#define ZCL_METER_CLI_NOTIF_FLG_CANCEL_ALL_MESSAGES 0x00020000U /* bit 17 */ -#define ZCL_METER_CLI_NOTIF_FLG_CHANGE_SUPPLY 0x00040000U /* bit 18 */ -#define ZCL_METER_CLI_NOTIF_FLG_LOCAL_CHANGE_SUPPLY 0x00080000U /* bit 19 */ -#define ZCL_METER_CLI_NOTIF_FLG_SET_UNCONTROLLED_FLOW_THRESH 0x00100000U /* bit 20 */ -#define ZCL_METER_CLI_NOTIF_FLG_TUNNEL_MESSAGE_PEND 0x00200000U /* bit 21 */ -#define ZCL_METER_CLI_NOTIF_FLG_GET_SNAPSHOT 0x00400000U /* bit 22 */ -#define ZCL_METER_CLI_NOTIF_FLG_GET_SAMPLED_DATA 0x00800000U /* bit 23 */ -#define ZCL_METER_CLI_NOTIF_FLG_NEW_SUBGHZ_CHANNEL_MASKS 0x01000000U /* bit 24 */ -#define ZCL_METER_CLI_NOTIF_FLG_ENERGY_SCAN_PEND 0x02000000U /* bit 25 */ -#define ZCL_METER_CLI_NOTIF_FLG_CHANNEL_CHANGE_PEND 0x04000000U /* bit 26 */ - -/* Metering Status flags */ +#define ZCL_METER_FUNC_NOTIF_FLAG_STAY_AWAKE_HAN 0x00000010U /* bit 4 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_STAY_AWAKE_WAN 0x00000020U /* bit 5 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_PUSH_HIST_METER_MASK 0x000001C0U /* bits 6-8 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_PUSH_HIST_PREPAY_SET 0x00000E00U /* bits 9-11 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_PUSH_STATIC_BASIC 0x00001000U /* bit 12 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_PUSH_STATIC_METER 0x00002000U /* bit 13 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_PUSH_STATIC_PREPAY 0x00004000U /* bit 14 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_NETWORK_KEY_ACTIVE 0x00008000U /* bit 15 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_DISPLAY_MESSAGE 0x00010000U /* bit 16 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_CANCEL_ALL_MESSAGES 0x00020000U /* bit 17 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_CHANGE_SUPPLY 0x00040000U /* bit 18 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_LOCAL_CHANGE_SUPPLY 0x00080000U /* bit 19 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_SET_UNCONTROLLED_FLOW_THRESH 0x00100000U /* bit 20 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_TUNNEL_MESSAGE_PEND 0x00200000U /* bit 21 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_GET_SNAPSHOT 0x00400000U /* bit 22 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_GET_SAMPLED_DATA 0x00800000U /* bit 23 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_NEW_SUBGHZ_CHANNEL_MASKS 0x01000000U /* bit 24 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_ENERGY_SCAN_PEND 0x02000000U /* bit 25 */ +#define ZCL_METER_FUNC_NOTIF_FLAG_CHANNEL_CHANGE_PEND 0x04000000U /* bit 26 */ + +/* NotificationFlags2 (ZCL_METER_CLI_ATTR_NOTIF_FLAGS_2, Price) */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_PRICE 0x00000001U /* bit 0 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_BLOCK_PERIOD 0x00000002U /* bit 1 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_TARIFF_INFO 0x00000004U /* bit 2 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CONV_FACTOR 0x00000008U /* bit 3 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CAL_VAL 0x00000010U /* bit 4 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CO2_VAL 0x00000020U /* bit 5 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_BILL_PERIOD 0x00000040U /* bit 6 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CONS_BILL 0x00000080U /* bit 7 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_PRICE_MATRIX 0x00000100U /* bit 8 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_BLOCK_THRESH 0x00000200U /* bit 9 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CURRENCY_CONV 0x00000400U /* bit 10 */ +/* Reserverd */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CREDIT_PAY_INFO 0x00001000U /* bit 12 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CPP_EVENT 0x00002000U /* bit 13 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_TIER_LABELS 0x00004000U /* bit 14 */ +#define ZCL_METER_NOTIF_FLAG_2_PUBLISH_CANCEL_TARIFF 0x00008000U /* bit 15 */ + +/* NotificationFlags3 (ZCL_METER_CLI_ATTR_NOTIF_FLAGS_3, Calendar) */ +#define ZCL_METER_NOTIF_FLAG_3_PUBLISH_CALENDAR 0x00000001U /* bit 0 */ +#define ZCL_METER_NOTIF_FLAG_3_PUBLISH_SPECIAL_DAYS 0x00000002U /* bit 1 */ +#define ZCL_METER_NOTIF_FLAG_3_PUBLISH_SEASONS 0x00000004U /* bit 2 */ +#define ZCL_METER_NOTIF_FLAG_3_PUBLISH_WEEK 0x00000008U /* bit 3 */ +#define ZCL_METER_NOTIF_FLAG_3_PUBLISH_DAY 0x00000010U /* bit 4 */ +#define ZCL_METER_NOTIF_FLAG_3_PUBLISH_CANCEL_CALENDAR 0x00000020U /* bit 5 */ + +/* NotificationFlags4 (ZCL_METER_CLI_ATTR_NOTIF_FLAGS_4, Prepayment) */ +#define ZCL_METER_NOTIF_FLAG_4_SELECT_AVAIL_EMERG_CREDIT 0x00000001U /* bit 0 */ +#define ZCL_METER_NOTIF_FLAG_4_CHANGE_DEBT 0x00000002U /* bit 1 */ +#define ZCL_METER_NOTIF_FLAG_4_EMERG_CREDIT_SETUP 0x00000004U /* bit 2 */ +#define ZCL_METER_NOTIF_FLAG_4_CONSUMER_TOP_UP 0x00000008U /* bit 3 */ +#define ZCL_METER_NOTIF_FLAG_4_CREDIT_ADJUST 0x00000010U /* bit 4 */ +#define ZCL_METER_NOTIF_FLAG_4_CHANGE_PAY_MODE 0x00000020U /* bit 5 */ +#define ZCL_METER_NOTIF_FLAG_4_GET_PREPAY_SNAPSHOT 0x00000040U /* bit 6 */ +#define ZCL_METER_NOTIF_FLAG_4_GET_TOP_UP_LOG 0x00000080U /* bit 7 */ +#define ZCL_METER_NOTIF_FLAG_4_SET_LOW_CREDIT_WARN_LEVEL 0x00000100U /* bit 8 */ +#define ZCL_METER_NOTIF_FLAG_4_GET_DEBT_REPAY_LOG 0x00000200U /* bit 9 */ +#define ZCL_METER_NOTIF_FLAG_4_SET_MAX_CREDIT_LIMIT 0x00000400U /* bit 10 */ +#define ZCL_METER_NOTIF_FLAG_4_SET_OVERALL_DEBT_CAP 0x00000800U /* bit 11 */ + +/* NotificationFlags5 (ZCL_METER_CLI_ATTR_NOTIF_FLAGS_5, Device Management) */ +#define ZCL_METER_NOTIF_FLAG_5_PUBLISH_CHANGE_TENANCY 0x00000001U /* bit 0 */ +#define ZCL_METER_NOTIF_FLAG_5_PUBLISH_CHANGE_SUPPLIER 0x00000002U /* bit 1 */ +#define ZCL_METER_NOTIF_FLAG_5_REQUEST_NEW_PW_1_RSP 0x00000004U /* bit 2 */ +#define ZCL_METER_NOTIF_FLAG_5_REQUEST_NEW_PW_2_RSP 0x00000008U /* bit 3 */ +#define ZCL_METER_NOTIF_FLAG_5_REQUEST_NEW_PW_3_RSP 0x00000010U /* bit 4 */ +#define ZCL_METER_NOTIF_FLAG_5_REQUEST_NEW_PW_4_RSP 0x00000020U /* bit 5 */ +#define ZCL_METER_NOTIF_FLAG_5_UPDATE_SITE_ID 0x00000040U /* bit 6 */ +#define ZCL_METER_NOTIF_FLAG_5_RESET_BATTERY_COUNTER 0x00000080U /* bit 7 */ +#define ZCL_METER_NOTIF_FLAG_5_UPDATE_CIN 0x00000100U /* bit 8 */ + +/* Metering Status flags (ZCL_METER_SVR_ATTR_METER_STATUS) */ #define ZCL_METER_STATUS_CHECK_METER 0x01U #define ZCL_METER_STATUS_LOW_BATTERY 0x02U #define ZCL_METER_STATUS_TAMPER_DETECT 0x04U @@ -559,7 +610,7 @@ enum ZbZclMeterCliAttrT { #define ZCL_METER_FORMAT_OFFSET_FRACTIONAL 0U #define ZCL_METER_FORMAT_OFFSET_INTEGER 3U -/* Metering Units of Measure enumeration */ +/* Metering Units of Measure enumeration (ZCL_METER_SVR_ATTR_UNIT_OF_MEASURE / UnitofMeasure) */ enum ZbZclMeterUnitsT { ZCL_METER_UNITS_BINARY_KWH = 0x00, ZCL_METER_UNITS_BINARY_CUBIC_METERS = 0x01, @@ -597,9 +648,7 @@ enum ZbZclMeterTypeT { ZCL_METER_TYPE_ELECTRIC = 0x00, ZCL_METER_TYPE_GAS = 0x01, ZCL_METER_TYPE_WATER = 0x02, -#if 0 /* Deprecated as of SE 1.1 */ - ZCL_METER_TYPE_THERMAL = 0x03, -#endif + /* ZCL_METER_TYPE_THERMAL = 0x03, Deprecated as of SE 1.1 */ ZCL_METER_TYPE_PRESSURE = 0x04, ZCL_METER_TYPE_HEAT = 0x05, ZCL_METER_TYPE_COOLING = 0x06, @@ -614,25 +663,23 @@ enum ZbZclMeterTypeT { ZCL_METER_TYPE_ELECTRIC_PHASE_2 = 0x0e, /* SE 1.1b */ ZCL_METER_TYPE_ELECTRIC_PHASE_3 = 0x0f, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_ELECTRIC = 0x7f, - ZCL_METER_TYPE_MIRR_GAS = 0x80, - ZCL_METER_TYPE_MIRR_WATER = 0x81, -#if 0 /* Deprecated as of SE 1.1 */ - ZCL_METER_TYPE_MIRR_THERMAL = 0x82, -#endif - ZCL_METER_TYPE_MIRR_PRESSURE = 0x83, - ZCL_METER_TYPE_MIRR_HEAT = 0x84, - ZCL_METER_TYPE_MIRR_COOLING = 0x85, - - ZCL_METER_TYPE_MIRR_END_USE_METER = 0x86, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_PV_GEN = 0x87, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_WIND_GEN = 0x88, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_WATER_GEN = 0x89, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_MICRO_GEN = 0x8a, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_SOLAR_HW = 0x8b, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_ELECPHS_1 = 0x8c, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_ELECPHS_2 = 0x8d, /* SE 1.1b */ - ZCL_METER_TYPE_MIRR_ELECPHS_3 = 0x8e /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_ELECTRIC = 0x7f, /**< Mirrored Electric Metering */ + ZCL_METER_TYPE_MIRROR_GAS = 0x80, + ZCL_METER_TYPE_MIRROR_WATER = 0x81, + /* ZCL_METER_TYPE_MIRROR_THERMAL = 0x82, Deprecated as of SE 1.1 */ + ZCL_METER_TYPE_MIRROR_PRESSURE = 0x83, + ZCL_METER_TYPE_MIRROR_HEAT = 0x84, + ZCL_METER_TYPE_MIRROR_COOLING = 0x85, + + ZCL_METER_TYPE_MIRROR_END_USE_METER = 0x86, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_PV_GEN = 0x87, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_WIND_GEN = 0x88, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_WATER_GEN = 0x89, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_MICRO_GEN = 0x8a, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_SOLAR_HW = 0x8b, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_ELECPHS_1 = 0x8c, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_ELECPHS_2 = 0x8d, /* SE 1.1b */ + ZCL_METER_TYPE_MIRROR_ELECPHS_3 = 0x8e /* SE 1.1b */ }; /*lint -save -e849 [ !MISRA - multiple string with same enum value. ] */ @@ -716,41 +763,43 @@ enum ZbZclMeterGetProfileStatusT { /* Metering Server Generated Commands */ enum ZbZclMeterServerCommandsT { - ZCL_METER_SVR_CMD_GET_PROFILE_RESPONSE = 0x00, - ZCL_METER_SVR_CMD_REQUEST_MIRROR = 0x01, - ZCL_METER_SVR_CMD_REMOVE_MIRROR = 0x02, - ZCL_METER_SVR_CMD_FAST_POLL_RESPONSE = 0x03, - ZCL_METER_SVR_CMD_SCHEDULE_SNAPSHOT_RESPONSE = 0x04, - ZCL_METER_SVR_CMD_TAKE_SNAPSHOT_RESPONSE = 0x05, - ZCL_METER_SVR_CMD_PUBLISH_SNAPSHOT = 0x06, - ZCL_METER_SVR_CMD_GET_SAMPLED_DATA_RESPONSE = 0x07, - ZCL_METER_SVR_CMD_CONFIGURE_MIRROR = 0x08, - ZCL_METER_SVR_CMD_CONFIGURE_NOTIFICATION_SCHEME = 0x09, - ZCL_METER_SVR_CMD_CONFIGURE_NOTIFICATION_FLAG = 0x0a, - ZCL_METER_SVR_CMD_GET_NOTIFIED_MESSAGE = 0x0b, - ZCL_METER_SVR_CMD_SUPPLY_STATUS_RESPONSE = 0x0c, - ZCL_METER_SVR_CMD_START_SAMPLING_RESPONSE_RESERVED = 0x0d + ZCL_METER_SVR_CMD_GET_PROFILE_RESPONSE = 0x00, /**< Get Profile Response */ + ZCL_METER_SVR_CMD_REQUEST_MIRROR = 0x01, /**< Request Mirror */ + ZCL_METER_SVR_CMD_REMOVE_MIRROR = 0x02, /**< Remove Mirror */ + ZCL_METER_SVR_CMD_FAST_POLL_RESPONSE = 0x03, /**< Request Fast Poll Mode Response */ + ZCL_METER_SVR_CMD_SCHEDULE_SNAPSHOT_RESPONSE = 0x04, /**< ScheduleSnapshot Response */ + ZCL_METER_SVR_CMD_TAKE_SNAPSHOT_RESPONSE = 0x05, /**< TakeSnapshotResponse*/ + ZCL_METER_SVR_CMD_PUBLISH_SNAPSHOT = 0x06, /**< Publish Snapshot */ + ZCL_METER_SVR_CMD_GET_SAMPLED_DATA_RESPONSE = 0x07, /**< GetSampledData Response */ + ZCL_METER_SVR_CMD_CONFIGURE_MIRROR = 0x08, /**< ConfigureMirror */ + ZCL_METER_SVR_CMD_CONFIGURE_NOTIFICATION_SCHEME = 0x09, /**< ConfigureNotification Scheme */ + ZCL_METER_SVR_CMD_CONFIGURE_NOTIFICATION_FLAG = 0x0a, /**< ConfigureNotification Flag */ + ZCL_METER_SVR_CMD_GET_NOTIFIED_MESSAGE = 0x0b, /**< GetNotifiedMessage */ + ZCL_METER_SVR_CMD_SUPPLY_STATUS_RESPONSE = 0x0c, /**< Supply Status Response */ + ZCL_METER_SVR_CMD_START_SAMPLING_RESPONSE_RESERVED = 0x0d /**< StartSamplingResponse */ }; /* Metering Client Generated Commands */ enum ZbZclMeterClientCommandsT { - ZCL_METER_CLI_CMD_GET_PROFILE = 0x00, - ZCL_METER_CLI_CMD_REQUEST_MIRROR_RESPONSE = 0x01, - ZCL_METER_CLI_CMD_MIRROR_REMOVED = 0x02, - ZCL_METER_CLI_CMD_REQUEST_FAST_POLL_MODE = 0x03, - ZCL_METER_CLI_CMD_SCHEDULE_SNAPSHOT = 0x04, - ZCL_METER_CLI_CMD_TAKE_SNAPSHOT = 0x05, - ZCL_METER_CLI_CMD_GET_SNAPSHOT = 0x06, - ZCL_METER_CLI_CMD_START_SAMPLING = 0x07, - ZCL_METER_CLI_CMD_GET_SAMPLED_DATA = 0x08, - ZCL_METER_CLI_CMD_MIRROR_REPORT_ATTRIBUTE_RESPONSE = 0x09, - ZCL_METER_CLI_CMD_RESET_LOADLIMIT_COUNTER = 0x0a, - ZCL_METER_CLI_CMD_CHANGE_SUPPLY = 0x0b, - ZCL_METER_CLI_CMD_LOCAL_CHANGE_SUPPLY = 0x0c, - ZCL_METER_CLI_CMD_SET_SUPPLY_STATUS = 0x0d, - ZCL_METER_CLI_CMD_SET_UNCONTROLLED_FLOW_THRESHOLD = 0x0e + ZCL_METER_CLI_CMD_GET_PROFILE = 0x00, /**< Get Profile */ + ZCL_METER_CLI_CMD_REQUEST_MIRROR_RESPONSE = 0x01, /**< Request Mirror Response */ + ZCL_METER_CLI_CMD_MIRROR_REMOVED = 0x02, /**< Mirror Removed */ + ZCL_METER_CLI_CMD_REQUEST_FAST_POLL_MODE = 0x03, /**< Request Fast Poll Mode */ + ZCL_METER_CLI_CMD_SCHEDULE_SNAPSHOT = 0x04, /**< ScheduleSnapshot */ + ZCL_METER_CLI_CMD_TAKE_SNAPSHOT = 0x05, /**< TakeSnapshot */ + ZCL_METER_CLI_CMD_GET_SNAPSHOT = 0x06, /**< GetSnapshot */ + ZCL_METER_CLI_CMD_START_SAMPLING = 0x07, /**< StartSampling */ + ZCL_METER_CLI_CMD_GET_SAMPLED_DATA = 0x08, /**< GetSampledData */ + ZCL_METER_CLI_CMD_MIRROR_REPORT_ATTRIBUTE_RESPONSE = 0x09, /**< MirrorReport AttributeResponse */ + ZCL_METER_CLI_CMD_RESET_LOADLIMIT_COUNTER = 0x0a, /**< ResetLoadLimit Counter */ + ZCL_METER_CLI_CMD_CHANGE_SUPPLY = 0x0b, /**< Change Supply */ + ZCL_METER_CLI_CMD_LOCAL_CHANGE_SUPPLY = 0x0c, /**< Local Change Supply */ + ZCL_METER_CLI_CMD_SET_SUPPLY_STATUS = 0x0d, /**< SetSupplyStatus */ + ZCL_METER_CLI_CMD_SET_UNCONTROLLED_FLOW_THRESHOLD = 0x0e /**< SetUncontrolledFlowThreshold */ }; +#define ZCL_METER_MIRROR_INVALID_ENDPOINT 0xffffU + /* Metering Sample Type Enumerations. These are the same as Interval Channel Values */ enum ZbZclMeterSampleTypeT { ZCL_METER_SAMPLE_TYPE_CONSUMP_DELIV = 0x00, @@ -772,6 +821,81 @@ struct ZbZclMeterSampleT { }; #endif +/**< NotificationScheme Enumerations */ +enum ZbZclMeterNotifSchemesT { + ZCL_METER_NOTIF_SCHEME_NONE = 0x00, + /**< No Notification Scheme Defined */ + + ZCL_METER_NOTIF_SCHEME_PREDEF_A = 0x01, + /**< Predefined Notification Scheme A. The notification flags equal 0x0FFFFFFF, + * meaning that only the FunctionalNotificationFlags is included in the + * MirrorReportAttributeResponse command. */ + + ZCL_METER_NOTIF_SCHEME_PREDEF_B = 0x02, + /**< Predefined Notification Scheme B. The notification flags equal 0x01234FFF, + * meaning that the first notification flag included in the list will be the + * FunctionalNotificationFlags followed by NotificationFlags2 to NotificationFlags5. */ + + /* 0x03 to 0x80 is Reserved */ + /* 0x81 to 0xfe is For MSP Requirements */ + /* 0xff is Reserved */ +}; + +/**< Notification Flags Order Enumerations. These are the nibble values within + * the 32-bit Notification Flag Order field. There are 8 nibbles in total. */ +enum ZbZclMeterNotifFlagsOrderT { + ZCL_METER_NOTIF_FO_1 = 0x00, /**< NotificationFlag1 */ + ZCL_METER_NOTIF_FO_2 = 0x01, /**< NotificationFlag2 */ + ZCL_METER_NOTIF_FO_3 = 0x02, /**< NotificationFlag3 */ + ZCL_METER_NOTIF_FO_4 = 0x03, /**< NotificationFlag4 */ + ZCL_METER_NOTIF_FO_5 = 0x04, /**< NotificationFlag5 */ + ZCL_METER_NOTIF_FO_6 = 0x05, /**< NotificationFlag6 */ + ZCL_METER_NOTIF_FO_7 = 0x06, /**< NotificationFlag7 */ + ZCL_METER_NOTIF_FO_8 = 0x07, /**< NotificationFlag8 */ + /* 0x08 to 0x0e is Reserved */ + ZCL_METER_NOTIF_NONE = 0x0f, /**< Blank / No Notification Flag */ +}; + +/* There can be a maximum of 8 notification flags (NotificationFlag1-8) */ +#define ZCL_METER_NOTIF_FLAGS_MAX 8U + +#define ZCL_METER_BIT_FIELD_ALLOC_MAX_COMMANDS 32U + +/**< Bit Field Allocation Command Sub Payload */ +struct ZbZclMeterBitFieldAllocT { + uint16_t cluster_id; + uint16_t manuf_id; + uint8_t num_commands; + uint8_t command_ids[ZCL_METER_BIT_FIELD_ALLOC_MAX_COMMANDS]; +}; + +/** ConfigureMirror command structure (ZCL_METER_SVR_CMD_CONFIGURE_MIRROR) */ +struct ZbZclMeterServerConfigMirrorT { + uint32_t issuer_event_id; + /**< Issuer Event ID. This should be a UTC Time Stamp value of when the command + * was issued. */ + uint32_t reporting_interval; /**< Reporting Interval */ + bool mirror_notif_reporting; /**< Mirror Notification Reporting */ + enum ZbZclMeterNotifSchemesT notif_scheme; /**< Notification Scheme */ +}; + +/** ConfigureNotificationScheme command structure (ZCL_METER_SVR_CMD_CONFIGURE_NOTIFICATION_SCHEME) */ +struct ZbZclMeterServerConfigNotifSchemeT { + uint32_t issuer_event_id; /**< Issuer Event ID */ + enum ZbZclMeterNotifSchemesT notif_scheme; /**< Notification Scheme */ + enum ZbZclMeterNotifFlagsOrderT notif_flag_order[8U]; + /**< Notification Flag Order. This is presented to the application as a list of nibbles, + * where the first item in the list is the most-significant nibble of the 32-bit value. */ +}; + +/** ConfigureNotificationFlags command structure (ZCL_METER_SVR_CMD_CONFIGURE_NOTIFICATION_FLAG) */ +struct ZbZclMeterServerConfigNotifFlagsT { + uint32_t issuer_event_id; /**< Issuer Event ID */ + enum ZbZclMeterNotifSchemesT notif_scheme; /**< Notification Scheme */ + uint16_t notif_flag_attrid; /**< Notification Flag Attribute ID */ + struct ZbZclMeterBitFieldAllocT bit_field_alloc; /**< Bit Field Allocation. */ +}; + /** Get Profile command structure */ struct ZbZclMeterClientGetProfileReqT { enum ZbZclMeterSampleTypeT interval_channel; /**< Interval Channel */ @@ -819,6 +943,13 @@ struct ZbZclMeterClientLocalChangeSupplyReqT { enum ZbZclMeterSupplyStatusT prop_supply_status; /**< Proposed Supply Status */ }; +/** MirrorReportAttributeResponse Command */ +struct ZbZclMeterClientMirrorReportAttrRspT { + enum ZbZclMeterNotifSchemesT notif_scheme; /**< Notification Scheme */ + uint8_t num_flags; + uint32_t notif_flags[ZCL_METER_NOTIF_FLAGS_MAX]; /**< Notification Flags */ +}; + /** Metering Server callbacks configuration */ struct ZbZclMeterServerCallbacksT { enum ZclStatusCodeT (*get_profile)(struct ZbZclClusterT *cluster, void *arg, @@ -826,7 +957,7 @@ struct ZbZclMeterServerCallbacksT { /**< Configure callback to handle ZCL_METER_CLI_CMD_GET_PROFILE. * In handling of get_profile(), the application should call * ZbZclMeterServerSendGetProfileRsp to send the response if successful. - * ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error. + * Return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error. */ enum ZclStatusCodeT (*get_sampled_data)(struct ZbZclClusterT *cluster, void *arg, @@ -834,28 +965,19 @@ struct ZbZclMeterServerCallbacksT { /**< Configure callback to handle ZCL_METER_CLI_CMD_GET_SAMPLED_DATA. * In handling of get_sampled_data(), the application should call * ZbZclMeterServerSendGetSampledDataRsp to send the response if successful. - * ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error. + * Return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error. */ enum ZclStatusCodeT (*local_change_supply)(struct ZbZclClusterT *cluster, void *arg, struct ZbZclMeterClientLocalChangeSupplyReqT *req, struct ZbZclAddrInfoT *srcInfo); /**< Configure callback to handle ZCL_METER_CLI_CMD_LOCAL_CHANGE_SUPPLY. - * ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error. + * Return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error. */ - uint16_t (*request_mirror)(void *arg, struct ZbZclClusterT *cluster, - struct ZbZclAddrInfoT *srcInfo, struct ZbApsdeDataIndT *dataIndPtr); - /**< Configure callback to handle ZCL_METER_CLI_CMD_REQUEST_MIRROR_RESPONSE command. - * Callback will register an endpoint for the mirrored metering cluster, - * and return the endpoint ID or 0xFFFF on error. - */ - - uint16_t (*remove_mirror)(void *arg, struct ZbZclClusterT *cluster, - struct ZbZclAddrInfoT *srcInfo, struct ZbApsdeDataIndT *dataIndPtr); - /**< Configure callback to handle ZCL_METER_CLI_CMD_MIRROR_REMOVED command. - * Callback will register an endpoint for the mirrored metering cluster, - * and return the endpoint ID or 0xFFFF on error. - */ + enum ZclStatusCodeT (*mirror_report_attr_rsp)(struct ZbZclClusterT *cluster, void *arg, + struct ZbZclMeterClientMirrorReportAttrRspT *notify, struct ZbZclAddrInfoT *srcInfo); + /**< Configure callback to handle ZCL_METER_CLI_CMD_MIRROR_REPORT_ATTRIBUTE_RESPONSE. + * Return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error. */ enum ZclStatusCodeT (*optional)(struct ZbZclClusterT *cluster, struct ZbZclHeaderT *zclHdrPtr, struct ZbApsdeDataIndT *dataIndPtr); @@ -877,6 +999,41 @@ struct ZbZclMeterServerCallbacksT { struct ZbZclClusterT * ZbZclMeterServerAlloc(struct ZigBeeT *zb, uint8_t endpoint, struct ZbZclMeterServerCallbacksT *callbacks, void *arg); +/** + * Send a Request Mirror Command (ZCL_METER_SVR_CMD_REQUEST_MIRROR) + * @param cluster Cluster instance from which to send this command + * @param dst Destination of command. Should be the Coordinator / TC / Comms Hub in this case. + * @param callback Callback function that will be invoked later when the response is received + * @param arg Pointer to application data that will later be provided back to the callback function when invoked + * @return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error + */ +enum ZclStatusCodeT ZbZclMeterServerSendRequestMirror(struct ZbZclClusterT *cluster, struct ZbApsAddrT *dst, + void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); + +/** + * Send a Remove Mirror Command (ZCL_METER_SVR_CMD_REMOVE_MIRROR) + * @param cluster Cluster instance from which to send this command + * @param dst Destination of command. Should be the Coordinator / TC / Comms Hub in this case. + * @param callback Callback function that will be invoked later when the response is received + * @param arg Pointer to application data that will later be provided back to the callback function when invoked + * @return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error + */ +enum ZclStatusCodeT ZbZclMeterServerSendRemoveMirror(struct ZbZclClusterT *cluster, struct ZbApsAddrT *dst, + void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); + +/** + * Send a ConfigureMirror Command (ZCL_METER_SVR_CMD_CONFIGURE_MIRROR) + * @param cluster Cluster instance from which to send this command + * @param dst Destination of command. Should be the Coordinator / TC / Comms Hub in this case. + * @param req ConfigureMirror parameters + * @param callback Callback function that will be invoked later when the response is received + * @param arg Pointer to application data that will later be provided back to the callback function when invoked + * @return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error + */ +enum ZclStatusCodeT ZbZclMeterServerSendConfigMirror(struct ZbZclClusterT *cluster, struct ZbApsAddrT *dst, + struct ZbZclMeterServerConfigMirrorT *req, + void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); + /** * Convert the profile interval period enumerated value to a time in seconds * @param profile_interval_id Zigbee stack instance @@ -927,19 +1084,48 @@ enum ZclStatusCodeT ZbZclMeterServerSendGetSampledDataRsp(struct ZbZclClusterT * struct ZbZclClusterT * ZbZclMeterServerMirrorAlloc(struct ZigBeeT *zb, uint8_t endpoint, uint64_t mirrorAddr, uint8_t mirrorEndpt); -/** - * Configure an endpoint to mirror to a destination endpoint - * @param cluster Cluster instance from which to send this command - * @param srcExtAddr Source address from where reports originate - * @param dstEndpoint Destination endpoint to where the report is mirrored - * @return Void - */ -void ZbZclMeterServerMirrorConfig(struct ZbZclClusterT *cluster, uint64_t srcExtAddr, uint8_t dstEndpoint); - /* Metering Client */ /** Metering Client callbacks configuration */ struct ZbZclMeterClientCallbacksT { + uint16_t (*request_mirror)(struct ZbZclClusterT *cluster, struct ZbZclAddrInfoT *srcInfo, void *arg); + /**< Callback to handle a ZCL_METER_SVR_CMD_REQUEST_MIRROR command. + * Callback will create a Meter Server cluster to act as the mirror (ZbZclMeterServerAlloc). + * It should also call ZbZclMeterClientMirrorRegister to register the Meter Server with the + * client so any ZCL Reports received from the meter will automatically update the local + * Meter Server mirror. + * + * Return value is the endpoint ID, which is typically the same endpoint this local + * Meter Client cluster is operating on (ZbZclClusterGetEndpoint), or + * ZCL_METER_MIRROR_INVALID_ENDPOINT (0xffff) on error. + */ + + uint16_t (*remove_mirror)(struct ZbZclClusterT *cluster, struct ZbZclAddrInfoT *srcInfo, void *arg); + /**< Callback to handle a ZCL_METER_SVR_CMD_REMOVE_MIRROR command. + * Callback will delete the Meter Server cluster that is acting as a mirror (ZbZclClusterFree). + * If the Meter Server was previously registered through ZbZclMeterClientMirrorRegister, + * this registration will be removed if a valid endpoint ID is returned. + * + * Return value is the endpoint ID the Mete Server was operating on, or + * ZCL_METER_MIRROR_INVALID_ENDPOINT (0xffff) on error. + */ + + enum ZclStatusCodeT (*config_mirror)(struct ZbZclClusterT *cluster, + struct ZbZclMeterServerConfigMirrorT *req, + struct ZbZclAddrInfoT *srcInfo, void *arg); + /**< Callback to handle a ZCL_METER_SVR_CMD_CONFIGURE_MIRROR command. */ + +#if 0 + /* Not certifiable (and not supported) */ + /* enum ZclStatusCodeT (*config_notif_scheme)(struct ZbZclClusterT *cluster, + struct ZbZclMeterServerConfigNotifSchemeT *req, + struct ZbZclAddrInfoT *srcInfo, void *arg); */ + + /* enum ZclStatusCodeT (*config_notif_flags)(struct ZbZclClusterT *cluster, + struct ZbZclMeterServerConfigNotifFlagsT *req, + struct ZbZclAddrInfoT *srcInfo, void *arg); */ +#endif + enum ZclStatusCodeT (*optional)(struct ZbZclClusterT *cluster, struct ZbZclHeaderT *zclHdrPtr, struct ZbApsdeDataIndT *dataIndPtr); /**< Optional commands not parsed into a struct or specific callback. If this is NULL, @@ -959,6 +1145,18 @@ struct ZbZclMeterClientCallbacksT { struct ZbZclClusterT * ZbZclMeterClientAlloc(struct ZigBeeT *zb, uint8_t endpoint, struct ZbZclMeterClientCallbacksT *callbacks, void *arg); +/** + * Register a Meter Server (Mirror) with this client, so any ZCL Attribute Report commands + * will update our local Meter Server. + * @param cluster Meter Client instance + * @param server Meter Server (Mirror) instance + * @param rmt_addr The extended address of the remote Meter Server (real meter) + * @param rmt_endpoint The source endpoint of the remote Meter Server (real meter) + * @return None + */ +void ZbZclMeterClientMirrorRegister(struct ZbZclClusterT *cluster, struct ZbZclClusterT *server, + uint64_t rmt_addr, uint8_t rmt_endpoint); + /** * Send a Get Profile command * @param cluster Cluster instance from which to send this command @@ -968,7 +1166,7 @@ struct ZbZclClusterT * ZbZclMeterClientAlloc(struct ZigBeeT *zb, uint8_t endpoin * @param arg Pointer to application data that will later be provided back to the callback function when invoked * @return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error */ -uint8_t ZbZclMeterClientCommandGetProfileReq(struct ZbZclClusterT *cluster, +enum ZclStatusCodeT ZbZclMeterClientCommandGetProfileReq(struct ZbZclClusterT *cluster, const struct ZbApsAddrT *dst, struct ZbZclMeterClientGetProfileReqT *cmd_req, void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); @@ -981,7 +1179,7 @@ uint8_t ZbZclMeterClientCommandGetProfileReq(struct ZbZclClusterT *cluster, * @param arg Pointer to application data that will later be provided back to the callback function when invoked * @return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error */ -uint8_t ZbZclMeterClientCommandGetSampledDataReq(struct ZbZclClusterT *cluster, +enum ZclStatusCodeT ZbZclMeterClientCommandGetSampledDataReq(struct ZbZclClusterT *cluster, const struct ZbApsAddrT *dst, struct ZbZclMeterClientGetSampledDataReqT *cmd_req, void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); @@ -994,7 +1192,7 @@ uint8_t ZbZclMeterClientCommandGetSampledDataReq(struct ZbZclClusterT *cluster, * @param arg Pointer to application data that will later be provided back to the callback function when invoked * @return ZCL_STATUS_SUCCESS if successful, or other ZclStatusCodeT value on error */ -uint8_t ZbZclMeterClientCommandLocalChangeSupplyReq(struct ZbZclClusterT *cluster, +enum ZclStatusCodeT ZbZclMeterClientCommandLocalChangeSupplyReq(struct ZbZclClusterT *cluster, const struct ZbApsAddrT *dst, struct ZbZclMeterClientLocalChangeSupplyReqT *cmd_req, void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.attr.gbcs.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.attr.gbcs.h index c8ec649c3..9af3082d5 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.attr.gbcs.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.attr.gbcs.h @@ -1,29 +1,38 @@ -/* Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. */ +/* Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #include "zcl/se/zcl.price.h" +#ifndef ZCL_PRICE_ATTR_GBCS_LIST_NAME +#define ZCL_PRICE_ATTR_GBCS_LIST_NAME zcl_price_server_gbcs_attr_list +#endif + #ifdef ZCL_PRICE_ATTR_GBCS_CALLBACK -/* Optional attribute flags. If providing an attribute callback (), then need to - * specify the appropriate flags: (ZCL_ATTR_FLAG_CB_READ | ZCL_ATTR_FLAG_CB_WRITE) - */ -# ifndef ZCL_PRICE_ATTR_GBCS_FLAGS -# error "Must define ZCL_PRICE_ATTR_GBCS_FLAGS if defining ZCL_PRICE_ATTR_GBCS_CALLBACK" -# endif +#ifndef ZCL_PRICE_ATTR_GBCS_FLAGS +/* If callback is not NULL, Should define one or both of ZCL_ATTR_FLAG_CB_READ | ZCL_ATTR_FLAG_CB_WRITE */ +#error "If ZCL_PRICE_ATTR_GBCS_CALLBACK defined, must also define ZCL_PRICE_ATTR_GBCS_FLAGS. E.g. ZCL_ATTR_FLAG_CB_READ | ZCL_ATTR_FLAG_CB_WRITE" +#endif #else -# define ZCL_PRICE_ATTR_GBCS_CALLBACK NULL -# define ZCL_PRICE_ATTR_GBCS_FLAGS ZCL_ATTR_FLAG_NONE +#define ZCL_PRICE_ATTR_GBCS_CALLBACK NULL +#endif + +/* By default, disable reporting */ +#ifndef ZCL_PRICE_ATTR_GBCS_FLAGS +#define ZCL_PRICE_ATTR_GBCS_FLAGS ZCL_ATTR_FLAG_NONE +#define ZCL_PRICE_ATTR_GBCS_REPORT_INTVL_MIN 0x0000U +#define ZCL_PRICE_ATTR_GBCS_REPORT_INTVL_MAX 0xffffU #endif /* Use this as-is to append the GBCS Metering Attributes to the * Metering Server. Or use this as a template to create the * attribute's as your application requires. */ -const struct ZbZclAttrT zcl_price_server_gbcs_attr_list[] = { +/* NOTE: Use ZCL_ATTR_LIST_LEN(list) to get the length of the list (number of attributes) */ + +const struct ZbZclAttrT ZCL_PRICE_ATTR_GBCS_LIST_NAME[] = { /* CommodityType (Read-only) */ { ZCL_PRICE_SVR_ATTR_COMMODITY_TYPE, ZCL_DATATYPE_ENUMERATION_8BIT, ZCL_PRICE_ATTR_GBCS_FLAGS, 0, - ZCL_PRICE_ATTR_GBCS_CALLBACK, {0, 0}, {0, 0} + ZCL_PRICE_ATTR_GBCS_CALLBACK, {0, 0}, + {ZCL_PRICE_ATTR_GBCS_REPORT_INTVL_MIN, ZCL_PRICE_ATTR_GBCS_REPORT_INTVL_MAX} }, }; - -const unsigned int ZCL_PRICE_SVR_GBCS_ATTR_LIST_LEN = ZCL_ATTR_LIST_LEN(zcl_price_server_gbcs_attr_list); diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.h index 4d631e3a0..08ce27008 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.price.h @@ -4,7 +4,7 @@ * @brief ZCL Price cluster header * ZCL 7 section 10.2 * ZCL 8 section 10.2 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ /* @PICS.ZCL.Price @@ -26,7 +26,7 @@ * SEPR.S.A0703 | LastBillingPeriodDuration | False | Optional * SEPR.S.A0704 | LastBillingPeriodConsolidatedBill | False | Optional * SEPR.S.Afffd | ClusterRevision | True - * SEPR.S.Afffe | AttributeReportingStatus | False + * SEPR.S.Afffe | AttributeReportingStatus | True * * Commands Received * SEPR.S.C00.Rsp | Get Current Price | False @@ -69,7 +69,7 @@ * SEPR.C.A0001 | PriceDecreaseRandomizeMinutes | False | Optional * SEPR.C.A0002 | CommodityType | False | Optional * SEPR.C.Afffd | ClusterRevision | True - * SEPR.C.Afffe | AttributeReportingStatus | False + * SEPR.C.Afffe | AttributeReportingStatus | True * * Commands Received * SEPR.C.C00.Rsp | Publish Price | False @@ -112,10 +112,10 @@ # define ZCL_PRICE_H #include "zcl/zcl.h" +#include "zcl/se/zcl.meter.h" /* ZbZclMeterUnitsT */ /** Price Server Attribute IDs */ enum ZbZclPriceSvrAttrT { - /* Tier Label (Delivered) Set (0x00) */ ZCL_PRICE_SVR_ATTR_TIER1_LABEL = 0x0000, /**< Tier1PriceLabel (Optional) @@ -141,6 +141,7 @@ enum ZbZclPriceSvrAttrT { /**< NoTierBlock1Price (Optional) * ZCL_PRICE_SVR_ATTR_NO_TIER_BLOCKN_PRICE(1) * For all the blocks, use the ZCL_PRICE_SVR_ATTR_NO_TIER_BLOCKN_PRICE(block) macro. */ + ZCL_PRICE_SVR_ATTR_TIER1_BLOCK1_PRICE = 0x0401, /**< Tier1Block1Price (Optional) * ZCL_PRICE_SVR_ATTR_TIERN_BLOCKN_PRICE(1,1) @@ -228,6 +229,21 @@ enum ZbZclPriceClientCommandsT { /* Alternate Cost units. */ #define ZCL_PRICE_ALTERNATE_KG_CO2 0x01 +/* Currency, from ISO 4217 */ +enum ZbZclPriceCurrencyCodeT { + ZCL_PRICE_CURRENCY_CODE_AUD = 36, /* Australian dollar */ + ZCL_PRICE_CURRENCY_CODE_CAD = 124, /* Canadian dollar */ + ZCL_PRICE_CURRENCY_CODE_CNY = 156, /* Chinese yuan */ + ZCL_PRICE_CURRENCY_CODE_EUR = 978, /* Euro */ + ZCL_PRICE_CURRENCY_CODE_GBP = 826, /* Pound sterling */ + ZCL_PRICE_CURRENCY_CODE_HKD = 344, /* Hong Kong dollar */ + ZCL_PRICE_CURRENCY_CODE_INR = 356, /* Indian rupee */ + ZCL_PRICE_CURRENCY_CODE_RUB = 643, /* Russian ruble */ + ZCL_PRICE_CURRENCY_CODE_USD = 840, /* United States dollar */ + ZCL_PRICE_CURRENCY_CODE_XTS = 963, /* Code reserved for testing */ + ZCL_PRICE_CURRENCY_CODE_XXX = 999 /* No currency */ +}; + /* Price Cluster Structures */ /* ZCL_PRICE_SVR_CMD_PUB_PRICE */ @@ -244,8 +260,8 @@ struct ZbZclPriceServerPublishPriceT { char rate_lable[ZCL_PRICE_LABEL_MAX_LENGTH + 1U]; /**< Rate Label array */ uint32_t issuer_event_id; /**< Issuer Event ID */ uint32_t current_Time; /**< Current Time - UTC Time */ - uint8_t unit_of_measure; /**< Unit of Measure */ - uint16_t currency; /**< Currency */ + enum ZbZclMeterUnitsT unit_of_measure; /**< Unit of Measure */ + enum ZbZclPriceCurrencyCodeT currency; /**< Currency */ uint8_t trailing_digit_and_price_tier; /**< Price Trailing Digit & Price Tier */ uint8_t num_price_tiers; /**< Number of Price Tiers & Register Tier */ uint32_t start_time; /**< Start Time - UTC Time */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.tunnel.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.tunnel.h index 7dfc6e49b..1556e0f53 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.tunnel.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/se/zcl.tunnel.h @@ -4,7 +4,7 @@ * @brief ZCL Tunneling cluster header * ZCL 7 section 10.6 * ZCL 8 section 10.6 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ /* @PICS.ZCL.Tunnel @@ -14,7 +14,7 @@ * Server Attributes * SETUN.S.A0000 | CloseTunnelTimeout | True * SETUN.S.Afffd | ClusterRevision | True - * SETUN.S.Afffe | AttributeReportingStatus | False + * SETUN.S.Afffe | AttributeReportingStatus | True * * Commands Received * SETUN.S.C00.Rsp | RequestTunnel | True @@ -36,7 +36,7 @@ * * Client Attributes * SETUN.C.Afffd | ClusterRevision | True - * SETUN.C.Afffe | AttributeReportingStatus | False + * SETUN.C.Afffe | AttributeReportingStatus | True * * Commands Received * SETUN.C.C00.Rsp | RequestTunnelResponse | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_ace.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_ace.h index 8ca097a69..031913f64 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_ace.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_ace.h @@ -4,7 +4,7 @@ * @brief ZCL Intruder Alarm Systems Ancillary Control Equipment cluster header * ZCL 7 section 8.3 * ZCL 8 section 8.3 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ /*-------------------------------------------------------------------------- @@ -23,7 +23,7 @@ * * Server Attributes * IASACE.S.Afffd | ClusterRevision | True - * IASACE.S.Afffe | AttributeReportingStatus | False + * IASACE.S.Afffe | AttributeReportingStatus | True * * Commands Received * IASACE.S.C00.Rsp | Arm | True @@ -50,7 +50,7 @@ * * Client Attributes * IASACE.C.Afffd | ClusterRevision | True - * IASACE.C.Afffe | AttributeReportingStatus | False + * IASACE.C.Afffe | AttributeReportingStatus | True * * Coomands Generated * IASACE.C.C00.Tx | Arm | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_wd.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_wd.h index db775b5af..be0bcf90c 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_wd.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_wd.h @@ -4,7 +4,7 @@ * @brief ZCL Security IAS Warning Device cluster header * ZCL 7 section 8.4 * ZCL 8 section 8.4 - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_IAS_WD_H @@ -18,7 +18,7 @@ * Server Attributes * IASWD.S.A0000 | MaxDuration | True * IASWD.S.Afffd | ClusterRevision | True - * IASWD.S.Afffe | AttributeReportingStatus | False + * IASWD.S.Afffe | AttributeReportingStatus | True * * Commands Received * IASWD.S.C00.Rsp | Start warning | True @@ -26,7 +26,7 @@ * * Client Attributes * IASWD.C.Afffd | ClusterRevision | True - * IASWD.C.Afffe | AttributeReportingStatus | False + * IASWD.C.Afffe | AttributeReportingStatus | True * * Commands Generated * IASWD.C.C00.Tx | Start warning | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_zone.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_zone.h index 244cea6c5..1596fab2f 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_zone.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/security/zcl.ias_zone.h @@ -29,7 +29,7 @@ * IASZ.S.A0012 | NumberOfZoneSensitivityLevelsSupported | False | Optional * IASZ.S.A0013 | CurrentZoneSensitivityLevel | False | Optional * IASZ.S.Afffd | ClusterRevision | True - * IASZ.S.Afffe | AttributeReportingStatus | False + * IASZ.S.Afffe | AttributeReportingStatus | True * * Commands Received * IASZ.S.C00.Rsp | Zone Enroll Response | True @@ -42,7 +42,7 @@ * * Client Attributes * IASZ.C.Afffd | ClusterRevision | True - * IASZ.C.Afffe | AttributeReportingStatus | False + * IASZ.C.Afffe | AttributeReportingStatus | True * * Commands Received * IASZ.C.C00.Rsp | Zone Status Change Notification | True diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_ls.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_ls.h index 683a915bd..fa233da13 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_ls.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_ls.h @@ -6,13 +6,12 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_matrix.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_matrix.h index 3f7f48a66..ebf46fae1 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_matrix.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/st_custom/zcl.custom_matrix.h @@ -6,13 +6,12 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -27,6 +26,9 @@ *-------------------------------------------------------------------------- */ +/* Custom Cluster ID */ +#define ZCL_CLUSTER_MATRIX 0x80E1 + /* Attribute Identifiers */ enum { ZCL_CUSTOM_MATRIX_ATTR = 0x0000, diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.enum.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.enum.h index 5986e2172..705111e59 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.enum.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.enum.h @@ -146,11 +146,13 @@ enum { * The default value is 1. All clusters starting with ZCL Spec Revision 6, have their * revision start at 1. */ - ZCL_GLOBAL_ATTR_REPORTING_STATUS = 0xfffe - /**< AttributeReportingStatus. Optional. This is a dummy attribute that can go at the end - * of each ZCL Report Command to indicate whether additional report commands are being - * sent shortly after, or if this is the last report command in a series of reports. - * This is currently not being used when sending reports, because it's not very useful. */ + ZCL_GLOBAL_ATTR_REPORTING_STATUS = 0xfffe, + /**< AttributeReportingStatus. Optional. This is a dummy attribute that can go at the end + * of each ZCL Report Command to indicate whether additional report commands are being + * sent shortly after, or if this is the last report command in a series of reports. + * This is currently not being used when sending reports, because it's not very useful. */ + + ZCL_GLOBAL_ATTR_UNDEFINED = 0xffff /**< Not defined in Spec. Internal use only. */ }; /* AttributeReportingStatus (ZCL_GLOBAL_ATTR_REPORTING_STATUS) values. */ @@ -177,7 +179,7 @@ typedef uint16_t ZclAttrFlagT; #define ZCL_ATTR_FLAG_CB_READ (ZclAttrFlagT)0x0010U /* Enables ZCL_ATTR_CB_TYPE_WRITE for this attribute */ #define ZCL_ATTR_FLAG_CB_WRITE (ZclAttrFlagT)0x0020U -#define ZCL_ATTR_FLAG_CB_NOTIFY (ZclAttrFlagT)0x0040U /* ZCL_ATTR_CB_TYPE_NOTIFY */ +#define ZCL_ATTR_FLAG_CB_NOTIFY (ZclAttrFlagT)0x0040U /* This flag means the attribute is for internal use only. Not discoverable. */ #define ZCL_ATTR_FLAG_INTERNAL (ZclAttrFlagT)0x8000U @@ -254,91 +256,83 @@ enum ZclDataTypeT { }; /* ZCL Invalid Data Values */ -#define ZCL_INVALID_BOOLEAN 0xffU -#define ZCL_INVALID_UNSIGNED_8BIT 0xffU -#define ZCL_INVALID_UNSIGNED_16BIT 0xffffU -#define ZCL_INVALID_UNSIGNED_24BIT 0xffffffU -#define ZCL_INVALID_UNSIGNED_32BIT 0xffffffffU -#define ZCL_INVALID_UNSIGNED_40BIT 0xffffffffffULL -#define ZCL_INVALID_UNSIGNED_48BIT 0xffffffffffffULL -#define ZCL_INVALID_UNSIGNED_56BIT 0xffffffffffffffULL -#define ZCL_INVALID_UNSIGNED_64BIT 0xffffffffffffffffULL - -#define ZCL_INVALID_SIGNED_8BIT -128 /* 0x80 */ -#define ZCL_INVALID_SIGNED_16BIT -32768 /* 0x8000 */ -#define ZCL_INVALID_SIGNED_24BIT -8388608 /* 0x800000 */ -#define ZCL_INVALID_SIGNED_32BIT -2147483648 /* 0x80000000 */ -#define ZCL_INVALID_SIGNED_40BIT -549755813888LL /* 0x8000000000 */ -#define ZCL_INVALID_SIGNED_48BIT -140737488355328LL /* 0x800000000000 */ -#define ZCL_INVALID_SIGNED_56BIT -36028797018963968LL /* 0x80000000000000 */ +#define ZCL_INVALID_BOOLEAN 0xffU +#define ZCL_INVALID_UNSIGNED_8BIT 0xffU +#define ZCL_INVALID_UNSIGNED_16BIT 0xffffU +#define ZCL_INVALID_UNSIGNED_24BIT 0xffffffU +#define ZCL_INVALID_UNSIGNED_32BIT 0xffffffffU +#define ZCL_INVALID_UNSIGNED_40BIT 0xffffffffffULL +#define ZCL_INVALID_UNSIGNED_48BIT 0xffffffffffffULL +#define ZCL_INVALID_UNSIGNED_56BIT 0xffffffffffffffULL +#define ZCL_INVALID_UNSIGNED_64BIT 0xffffffffffffffffULL + +#define ZCL_INVALID_SIGNED_8BIT (-128) /* 0x80 */ +#define ZCL_INVALID_SIGNED_16BIT (-32768) /* 0x8000 */ +#define ZCL_INVALID_SIGNED_24BIT (-8388608) /* 0x800000 */ +#define ZCL_INVALID_SIGNED_32BIT (-2147483648) /* 0x80000000 */ +#define ZCL_INVALID_SIGNED_40BIT (-549755813888LL) /* 0x8000000000 */ +#define ZCL_INVALID_SIGNED_48BIT (-140737488355328LL) /* 0x800000000000 */ +#define ZCL_INVALID_SIGNED_56BIT (-36028797018963968LL) /* 0x80000000000000 */ /*lint -e9048 [ unsigned integer literal without a 'U' suffix ]*/ -#define ZCL_INVALID_SIGNED_64BIT 0x8000000000000000 /* integer constant is so large that it is unsigned */ +#define ZCL_INVALID_SIGNED_64BIT 0x8000000000000000 /* integer constant is so large that it is unsigned */ /*lint -restore */ -#define ZCL_INVALID_ENUMERATION_8BIT 0xffU -#define ZCL_INVALID_ENUMERATION_16BIT 0xffffU +#define ZCL_INVALID_ENUMERATION_8BIT 0xffU +#define ZCL_INVALID_ENUMERATION_16BIT 0xffffU -#define ZCL_INVALID_FLOATING (0.0 / 0.0) +#define ZCL_INVALID_FLOATING (0.0 / 0.0) /* Note, can't bit-or signed values (MISRA rule 10.1) */ -#define ZCL_INVALID_FLOATING_SEMI (ZCL_FLOAT_SEMI_MANTISSA + ZCL_FLOAT_SEMI_EXPONENT) -#define ZCL_INVALID_FLOATING_SINGLE (ZCL_FLOAT_SINGLE_MANTISSA + ZCL_FLOAT_SINGLE_MANTISSA) -#define ZCL_INVALID_FLOATING_DOUBLE (ZCL_FLOAT_DOUBLE_MANTISSA + ZCL_FLOAT_DOUBLE_MANTISSA) - -#define ZCL_INVALID_STRING_OCTET 0xffU -#define ZCL_INVALID_STRING_CHARACTER 0xffU -#define ZCL_INVALID_STRING_LONG_OCTET 0xffffU -#define ZCL_INVALID_STRING_LONG_CHARACTER 0xffffU - -#define ZCL_INVALID_ARRAY 0xffffU -#define ZCL_INVALID_STRUCT 0xffffU -#define ZCL_INVALID_SET 0xffffU -#define ZCL_INVALID_BAG 0xffffU -#define ZCL_INVALID_TIME_OF_DAY 0xffffffffU -#define ZCL_INVALID_DATE 0xffffffffU -#define ZCL_INVALID_TIME_UTC 0xffffffffU -#define ZCL_INVALID_CLUSTER_ID 0xffffU -#define ZCL_INVALID_ATTRIBUTE_ID 0xffffU -#define ZCL_INVALID_BACNET_OID 0xffffffffU -#define ZCL_INVALID_EUI64 0xffffffffffffffffULL +#define ZCL_INVALID_FLOATING_SEMI (ZCL_FLOAT_SEMI_MANTISSA + ZCL_FLOAT_SEMI_EXPONENT) +#define ZCL_INVALID_FLOATING_SINGLE (ZCL_FLOAT_SINGLE_MANTISSA + ZCL_FLOAT_SINGLE_MANTISSA) +#define ZCL_INVALID_FLOATING_DOUBLE (ZCL_FLOAT_DOUBLE_MANTISSA + ZCL_FLOAT_DOUBLE_MANTISSA) + +#define ZCL_INVALID_STRING_OCTET 0xffU +#define ZCL_INVALID_STRING_CHARACTER 0xffU +#define ZCL_INVALID_STRING_LONG_OCTET 0xffffU +#define ZCL_INVALID_STRING_LONG_CHARACTER 0xffffU + +#define ZCL_INVALID_ARRAY 0xffffU +#define ZCL_INVALID_STRUCT 0xffffU +#define ZCL_INVALID_SET 0xffffU +#define ZCL_INVALID_BAG 0xffffU +#define ZCL_INVALID_TIME_OF_DAY 0xffffffffU +#define ZCL_INVALID_DATE 0xffffffffU +#define ZCL_INVALID_TIME_UTC 0xffffffffU +#define ZCL_INVALID_CLUSTER_ID 0xffffU +#define ZCL_INVALID_ATTRIBUTE_ID 0xffffU +#define ZCL_INVALID_BACNET_OID 0xffffffffU +#define ZCL_INVALID_EUI64 0xffffffffffffffffULL /* ZCL Valid Ranges */ -#define ZCL_MIN_SIGNED_8BIT (-(ZCL_INVALID_SIGNED_8BIT - 1)) -#define ZCL_MIN_SIGNED_16BIT (-(ZCL_INVALID_SIGNED_16BIT - 1)) -#define ZCL_MIN_SIGNED_24BIT (-(ZCL_INVALID_SIGNED_24BIT - 1)) -#define ZCL_MIN_SIGNED_32BIT (-(ZCL_INVALID_SIGNED_32BIT - 1)) -#define ZCL_MIN_SIGNED_40BIT (-(ZCL_INVALID_SIGNED_40BIT - 1)) -#define ZCL_MIN_SIGNED_48BIT (-(ZCL_INVALID_SIGNED_48BIT - 1)) -#define ZCL_MIN_SIGNED_56BIT (-(ZCL_INVALID_SIGNED_56BIT - 1)) -#define ZCL_MIN_SIGNED_64BIT (-(ZCL_INVALID_SIGNED_64BIT - 1)) - -#define ZCL_MAX_SIGNED_8BIT 0x7f -#define ZCL_MAX_SIGNED_16BIT 0x7fff -#define ZCL_MAX_SIGNED_24BIT 0x7fffff -#define ZCL_MAX_SIGNED_32BIT 0x7fffffff -#define ZCL_MAX_SIGNED_40BIT 0x7fffffffffULL -#define ZCL_MAX_SIGNED_48BIT 0x7fffffffffffULL -#define ZCL_MAX_SIGNED_56BIT 0x7fffffffffffffULL -#define ZCL_MAX_SIGNED_64BIT 0x7fffffffffffffffULL - -#define ZCL_MAX_UNSIGNED_8BIT (ZCL_INVALID_UNSIGNED_8BIT - 1U) -#define ZCL_MAX_UNSIGNED_16BIT (ZCL_INVALID_UNSIGNED_16BIT - 1U) -#define ZCL_MAX_UNSIGNED_24BIT (ZCL_INVALID_UNSIGNED_24BIT - 1U) -#define ZCL_MAX_UNSIGNED_32BIT (ZCL_INVALID_UNSIGNED_32BIT - 1U) -#define ZCL_MAX_UNSIGNED_40BIT (ZCL_INVALID_UNSIGNED_40BIT - 1U) -#define ZCL_MAX_UNSIGNED_48BIT (ZCL_INVALID_UNSIGNED_48BIT - 1U) -#define ZCL_MAX_UNSIGNED_56BIT (ZCL_INVALID_UNSIGNED_56BIT - 1U) -#define ZCL_MAX_UNSIGNED_64BIT (ZCL_INVALID_UNSIGNED_64BIT - 1U) - -/* Type sizes */ -#define ZCL_SIZEOF_8BIT 1U -#define ZCL_SIZEOF_16BIT 2U -#define ZCL_SIZEOF_24BIT 3U -#define ZCL_SIZEOF_32BIT 4U -#define ZCL_SIZEOF_40BIT 5U -#define ZCL_SIZEOF_48BIT 6U -#define ZCL_SIZEOF_56BIT 7U -#define ZCL_SIZEOF_64BIT 8U -#define ZCL_SIZEOF_128BIT 16U +#define ZCL_MIN_SIGNED_8BIT (-(ZCL_INVALID_SIGNED_8BIT - 1)) +#define ZCL_MIN_SIGNED_16BIT (-(ZCL_INVALID_SIGNED_16BIT - 1)) +#define ZCL_MIN_SIGNED_24BIT (-(ZCL_INVALID_SIGNED_24BIT - 1)) +#define ZCL_MIN_SIGNED_32BIT (-(ZCL_INVALID_SIGNED_32BIT - 1)) +#define ZCL_MIN_SIGNED_40BIT (-(ZCL_INVALID_SIGNED_40BIT - 1)) +#define ZCL_MIN_SIGNED_48BIT (-(ZCL_INVALID_SIGNED_48BIT - 1)) +#define ZCL_MIN_SIGNED_56BIT (-(ZCL_INVALID_SIGNED_56BIT - 1)) +#define ZCL_MIN_SIGNED_64BIT (-(ZCL_INVALID_SIGNED_64BIT - 1)) + +#define ZCL_MAX_SIGNED_8BIT 0x7f +#define ZCL_MAX_SIGNED_16BIT 0x7fff +#define ZCL_MAX_SIGNED_24BIT 0x7fffff +#define ZCL_MAX_SIGNED_32BIT 0x7fffffff +#define ZCL_MAX_SIGNED_40BIT 0x7fffffffffULL +#define ZCL_MAX_SIGNED_48BIT 0x7fffffffffffULL +#define ZCL_MAX_SIGNED_56BIT 0x7fffffffffffffULL +#define ZCL_MAX_SIGNED_64BIT 0x7fffffffffffffffULL + +#define ZCL_MAX_UNSIGNED_8BIT (ZCL_INVALID_UNSIGNED_8BIT - 1U) +#define ZCL_MAX_UNSIGNED_16BIT (ZCL_INVALID_UNSIGNED_16BIT - 1U) +#define ZCL_MAX_UNSIGNED_24BIT (ZCL_INVALID_UNSIGNED_24BIT - 1U) +#define ZCL_MAX_UNSIGNED_32BIT (ZCL_INVALID_UNSIGNED_32BIT - 1U) +#define ZCL_MAX_UNSIGNED_40BIT (ZCL_INVALID_UNSIGNED_40BIT - 1U) +#define ZCL_MAX_UNSIGNED_48BIT (ZCL_INVALID_UNSIGNED_48BIT - 1U) +#define ZCL_MAX_UNSIGNED_56BIT (ZCL_INVALID_UNSIGNED_56BIT - 1U) +#define ZCL_MAX_UNSIGNED_64BIT (ZCL_INVALID_UNSIGNED_64BIT - 1U) + +#define ZCL_MIN_FLOAT_SEMI (-65504) +#define ZCL_MAX_FLOAT_SEMI (65504) /* ZCL Status Codes */ enum ZclStatusCodeT { @@ -437,7 +431,47 @@ enum ZbZclDeviceIdT { ZCL_DEVICE_ONOFF_COLOR_DIMMER_SWITCH = 0x0105, ZCL_DEVICE_ONOFF_LIGHT_SENSOR = 0x0106, ZCL_DEVICE_ONOFF_OCCUPANCY_SENSOR = 0x0107, - /* EXEGIN - add more from Lighting and Occupancy Device Spec */ + ZCL_DEVICE_ONOFF_BALLAST = 0x0108, + ZCL_DEVICE_DIMMABLE_BALLAST = 0x0109, + ZCL_DEVICE_ONOFF_PLUGIN_UNIT = 0x010a, + ZCL_DEVICE_DIMMABLE_PLUGIN_UNIT = 0x010b, + ZCL_DEVICE_COLOR_TEMPERATURE_LIGHT = 0x010c, + ZCL_DEVICE_EXTENDED_COLOR_LIGHT = 0x010d, + ZCL_DEVICE_LIGHT_LEVEL_SENSOR = 0x010e, + + /* Information (0x0120) */ + ZCL_DEVICE_ZIGBEE_ACCESS_POINT = 0x0120, + ZCL_DEVICE_ZIGBEE_INFORMATION_NODE = 0x0121, + ZCL_DEVICE_ZIGBEE_INFORMATION_TERMINAL = 0x0122, + + /* Closures (0x0200) */ + ZCL_DEVICE_SHADE = 0x0200, + ZCL_DEVICE_SHADE_CONTROLLER = 0x0201, + ZCL_DEVICE_WINDOW_COVERING_DEVICE = 0x0202, + ZCL_DEVICE_WINDOW_COVERING_CONTROLLER = 0x0203, + ZCL_DEVICE_BARRIER_DEVICE = 0x0204, + ZCL_DEVICE_BARRIER_DEVICE_CONTROLLER = 0x0205, + + /* Payments (0x0220) */ + ZCL_DEVICE_POINT_OF_SALE = 0x0220, + ZCL_DEVICE_TICKETING_MACHINE = 0x0221, + ZCL_DEVICE_PAY_CONTROLLER = 0x0222, + ZCL_DEVICE_BILLING_UNIT = 0x0223, + ZCL_DEVICE_CHARGING_UNIT = 0x0224, + + /* HVAC (0x0300) */ + ZCL_DEVICE_HEATING_COOLING_UNIT = 0x0300, + ZCL_DEVICE_THERMOSTAT = 0x0301, + ZCL_DEVICE_TEMPERATURE_SENSOR = 0x0302, + ZCL_DEVICE_PUMP = 0x0303, + ZCL_DEVICE_PUMP_CONTROLLER = 0x0304, + ZCL_DEVICE_PRESSURE_SENSOR = 0x0305, + ZCL_DEVICE_FLOW_SENSOR = 0x0306, + ZCL_DEVICE_HUMIDITY_SENSOR = 0x0307, + + /* Cards (0x0320) */ + ZCL_DEVICE_FLASH_CARD = 0x0320, + ZCL_DEVICE_PC_SMART_CARD_READER = 0x0321, /* IAS (0x0400) */ ZCL_DEVICE_IAS_CONTROL_AND_INDICATING_EQUIPMENT = 0x0400, @@ -445,7 +479,10 @@ enum ZbZclDeviceIdT { ZCL_DEVICE_IAS_ZONE = 0x0402, ZCL_DEVICE_IAS_WARNING_DEVICE = 0x0403, - /* Smart Energy device identifiers. (0x0500) */ + /* Security (0x0445) */ + ZCL_DEVICE_GLASS_BREAK_SENSOR = 0x0445, + + /* Smart Energy device identifiers (0x0500) */ ZCL_DEVICE_ESP = 0x0500, ZCL_DEVICE_METER = 0x0501, ZCL_DEVICE_IN_HOME_DISPLAY = 0x0502, @@ -456,6 +493,7 @@ enum ZbZclDeviceIdT { ZCL_DEVICE_PHYSICAL_DEVICE = 0x0507, ZCL_DEVICE_REMOTE_COMMUNICATIONS_DEVICE = 0x0508, ZCL_DEVICE_ERL_INTERFACE = 0x0509, + ZCL_DEVICE_ELECTRIC_VEHICLE_STATION_EQUIPMENT = 0x050a, /* Lighting and Occupancy Continued (0x0800) */ ZCL_DEVICE_COLOR_CONTROLLER = 0x0800, @@ -463,7 +501,43 @@ enum ZbZclDeviceIdT { ZCL_DEVICE_NON_COLOR_CONTROLLER = 0x0820, ZCL_DEVICE_NON_COLOR_SCENE_CONTROLLER = 0x0830, ZCL_DEVICE_CONTROL_BRIDGE = 0x0840, - ZCL_DEVICE_ONOFF_SENSOR = 0x0850 /* aka Door Sensor? */ + ZCL_DEVICE_ONOFF_SENSOR = 0x0850, /* aka Door Sensor? */ + + /* Multifunction (0x0f00) */ + ZCL_DEVICE_GENERIC_MULTIFUNCTION_HEALTHCARE_DEVICE = 0x0f00, + + /* Health and Fitness (0x1004) */ + ZCL_DEVICE_PULSE_OXIMETER = 0x1004, + ZCL_DEVICE_ECG = 0x1006, + ZCL_DEVICE_BLOOD_PRESSURE_MONITOR = 0x1007, + ZCL_DEVICE_THERMOMETER = 0x1008, + ZCL_DEVICE_WEIGHT_SCALE = 0x100f, + ZCL_DEVICE_GLUCOSE_METER = 0x1011, + ZCL_DEVICE_INTERNATIONAL_NORMALIZED_RATIO = 0x1012, + ZCL_DEVICE_INSULIN_PUMP = 0x1013, + ZCL_DEVICE_PEAK_FLOW_MONITOR = 0x1015, + ZCL_DEVICE_CARDIOVASCULAR_FITNESS_AND_ACTIVITY_MONITOR = 0x1029, + ZCL_DEVICE_STRENGTH_FITNESS_EQUIPMENT = 0x102a, + ZCL_DEVICE_PHYSICAL_ACTIVITY_MONITOR = 0x102b, + ZCL_DEVICE_INDEPENDENT_LIVING_ACTIVITY_HUB = 0x1047, + ZCL_DEVICE_ADHERENCE_MONITOR = 0x1048, + ZCL_DEVICE_STEP_COUNTER = 0x1068, + ZCL_DEVICE_FALL_SENSOR = 0x1075, + ZCL_DEVICE_PERS_SENSOR = 0x1076, + ZCL_DEVICE_SMOKE_SENSOR = 0x1077, + ZCL_DEVICE_CO_SENSOR = 0x1078, + ZCL_DEVICE_WATER_SENSOR = 0x1079, + ZCL_DEVICE_GAS_SENSOR = 0x107a, + ZCL_DEVICE_MOTION_SENSOR = 0x107b, + ZCL_DEVICE_PROPERTY_EXIT_SENSOR = 0x107c, + ZCL_DEVICE_ENURESIS_SENSOR = 0x107d, + ZCL_DEVICE_CONTACT_CLOSURE_SENSOR = 0x107e, + ZCL_DEVICE_USAGE_SENSOR = 0x107f, + ZCL_DEVICE_SWITCH_USE_SENSOR = 0x1080, + ZCL_DEVICE_DOSAGE_SENSOR = 0x1081, + ZCL_DEVICE_BODY_TEMPERATURE_SENSOR = 0x1082 + + /* ZCL_DEVICE_GREEN_POWER_DEVICES = 0x20xx */ }; /* Cluster ID Ranges */ @@ -585,7 +659,9 @@ enum ZbZclClusterIdT { /* TOUCHLINK */ ZCL_CLUSTER_TOUCHLINK = 0x1000, + /* MANUFACTURER CUSTOM CLUSTER */ + /* Note :These are just example of custom clusters provided by ST */ ZCL_CLUSTER_CUSTOM_LS = 0xfc01, /* Long string custom cluster */ ZCL_CLUSTER_CUSTOM_MATRIX = 0xfc02, /* Matrix custom cluster */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.h index a40d64c0b..8d3326624 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.h @@ -99,12 +99,9 @@ enum ZclStatusCodeT ZbZclCommandReq(struct ZigBeeT *zb, struct ZbZclCommandReqT void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg); /*--------------------------------------------------------------- - * Cluster Attributes + * Attribute Reporting Intervals *--------------------------------------------------------------- */ - -#define ZCL_ATTRIBUTE_BUFFER_SIZE_MAX 256U - /*** Reporting Intervals ***/ /* If max interval == 0xffff, then reporting is disabled */ #define ZCL_ATTR_REPORT_MAX_INTVL_DISABLE 0xffffU @@ -112,16 +109,22 @@ enum ZclStatusCodeT ZbZclCommandReq(struct ZigBeeT *zb, struct ZbZclCommandReqT /* If max interval == 0x0000, then reporting is enabled, but only when attribute changes, no timer. */ #define ZCL_ATTR_REPORT_MAX_INTVL_CHANGE 0x0000U -#define ZCL_ATTR_REPORT_MIN_INTVL_CHANGE 0x0000U /* doesn't matter what this is */ /* BDB Spec Section 6.7: Maximum reporting interval is either 0x0000 or in the range 0x003d to 0xfffe */ #define ZCL_ATTR_REPORT_MAX_INTVL_MINIMUM 0x003dU /* 61 seconds */ -#define ZCL_ATTR_REPORT_MAX_INTVL_MAXIMUM 0xfffeU +#define ZCL_ATTR_REPORT_MAX_INTVL_MAXIMUM 0xfffeU /* 18 hours, 12 minutes, 14 seconds */ /* If max interval == 0x0000 and min interval == 0xffff, then reset reporting back to default. */ #define ZCL_ATTR_REPORT_MAX_INTVL_DEFAULT 0x0000U #define ZCL_ATTR_REPORT_MIN_INTVL_DEFAULT 0xffffU +/*--------------------------------------------------------------- + * Cluster Attributes + *--------------------------------------------------------------- + */ + +#define ZCL_ATTRIBUTE_BUFFER_SIZE_MAX 256U + struct ZbZclAttrCbInfoT; /** @@ -158,9 +161,9 @@ struct ZbZclAttrT { * this callback is called for attribute read or write commands. */ struct { - long long min; - long long max; - } integer_range; + double min; + double max; + } range; /**< Optional integer attribute value range. If both are set to zero, range checking is disabled. */ struct { @@ -252,14 +255,14 @@ int ZbZclAttrDefaultValue(enum ZclDataTypeT type, uint8_t *buf, unsigned int max /** * ZbZclClusterReverseBind is used by the Alarms Server so it can receive loopback * messages sent in the direction of the client (i.e. reverse). - * @param cluster + * @param cluster Cluster instance * @return Filter pointer (handle) */ struct ZbApsFilterT * ZbZclClusterReverseBind(struct ZbZclClusterT *cluster); /** * Remove the reverse (loopback) filter and free it. - * @param cluster + * @param cluster Cluster instance * @param filter Filter to remove and free * @return None */ @@ -271,7 +274,7 @@ void ZbZclClusterReverseUnbind(struct ZbZclClusterT *cluster, struct ZbApsFilter * If the cluster appears on multiple endpoints (e.g. Basic Cluster), the src_endpoint * is required to know which one to actually send the Alarm Command from. * The alarm message is sent via APS binding(s). - * @param cluster + * @param cluster Cluster instance * @param src_endpoint * @param alarm_code * @return None @@ -324,10 +327,14 @@ struct ZbZclClusterT { struct ZbApsFilterT *dataind_filter; struct LinkListT attributeList; struct { - struct LinkListT list; /* struct ZbZclReportT */ - struct ZbTimerT *timer; - bool kicked; struct ZbMsgFilterT *reset_filter; + struct LinkListT list; /* List of "struct ZbZclReportT" reports */ + struct ZbTimerT *timer; /* Report timer */ + bool send_all; + bool kicked; + /* Callback for ZbZclAttrReportKick when done sending reports */ + void (*callback)(struct ZbZclClusterT *cluster, unsigned int next_timeout, void *arg); + void *arg; } reports; struct { struct ZbApsFilterT *reset_filter; @@ -349,10 +356,9 @@ struct ZbZclClusterT { enum ZclStatusCodeT (*command)(struct ZbZclClusterT *cluster, struct ZbZclHeaderT *zclHdrPtr, struct ZbApsdeDataIndT *dataIndPtr); - /* Configure reporting */ - void (*config)(struct ZbZclClusterT *cluster, struct ZbApsdeDataIndT *dataIndPtr, uint16_t attributeId, - enum ZclStatusCodeT status, uint8_t direction); - + /* Callback to receive ZCL Report Commands. Configured by calling ZbZclClusterReportCallbackAttach. + * Attribute reporting can be configured on the remote device by calling ZbZclAttrReportConfigReq. + * When the remote device sends reports, those reports can be received through this callback. */ void (*report)(struct ZbZclClusterT *cluster, struct ZbApsdeDataIndT *dataIndPtr, uint16_t attributeId, enum ZclDataTypeT dataType, const uint8_t *in_payload, uint16_t in_len); @@ -433,14 +439,17 @@ int ZbZclPrependHeader(struct ZbZclHeaderT *zclHdrPtr, uint8_t *data, unsigned i int ZbZclAppendHeader(struct ZbZclHeaderT *zclHdrPtr, uint8_t *data, unsigned int max_len); /*--------------------------------------------------------------- - * Generic Attribute Functions + * Cluster Attributes *--------------------------------------------------------------- */ -int ZbZclAttrParseLength(enum ZclDataTypeT type, const uint8_t *ptr, unsigned int max_len, uint8_t recurs_depth); - +bool ZbZclAttrIsInteger(enum ZclDataTypeT dataType); bool ZbZclAttrIsFloat(enum ZclDataTypeT dataType); bool ZbZclAttrIsAnalog(enum ZclDataTypeT dataType); -bool ZbZclAttrIsInteger(enum ZclDataTypeT dataType); + +/* Based on attribute data type and attribute data (if necessary), determine the + * length of the attribute. */ +int ZbZclAttrParseLength(enum ZclDataTypeT type, const uint8_t *ptr, + unsigned int max_len, uint8_t recurs_depth); int ZbZclAppendInteger(unsigned long long value, enum ZclDataTypeT dataType, uint8_t *data, unsigned int len); @@ -456,36 +465,36 @@ int ZbZclAppendInteger(unsigned long long value, enum ZclDataTypeT dataType, uin */ long long ZbZclParseInteger(enum ZclDataTypeT dataType, const uint8_t *data, enum ZclStatusCodeT *statusPtr); -int ZbZclAppendFloat(double value, enum ZclDataTypeT dataType, uint8_t *data, unsigned int len); -double ZbZclParseFloat(enum ZclDataTypeT dataType, const uint8_t *data); - -/*--------------------------------------------------------------- - * Local Reading and Writing of Attributes - *--------------------------------------------------------------- - */ +/* Write a float value to the output 'data' pointer in ZCL format based on the attribute data type. */ +int ZbZclAppendFloat(double value, enum ZclDataTypeT dataType, uint8_t *data, unsigned int maxlen); +double ZbZclParseFloat(enum ZclDataTypeT dataType, const uint8_t *data, enum ZclStatusCodeT *statusPtr); -/*FUNCTION - * ZbZclAttrRead - *PARAMETERS - * cluster ; IN: Cluster Structure Pointer - * attrId ; IN: Cluster's Attribute ID - * attrType ; OUT (optional): Attribute Data Type - * outputBuf ; OUT: Attribute data in ZCL format (i.e. same as what is sent over-the-air) - * max_len ; IN: Maximum length that can be written to outputBuf. - * isReporting ; IN: This read is from ZCL reporting. If the attribute does not support reporting, the read request will fail. +/** + * Reads a local cluster's attribute value. Returns the attribute type if provided as + * a pointer through 'attrType'. + * @param cluster Cluster instance + * @param attrId Attribute Id of the attribute to read + * @param attrType Pointer to the attribute type. If not NULL and this function returns + * ZCL_STATUS_SUCCESS, the type value of the attribute is returned in this parameter. + * @param outputBuf Buffer to write attribute value data to. + * @param max_len Maximum length of 'outputBuf'. + * @param isReporting If true and this attribute is being read for generating a report, + * the attribute's flag is checked for ZCL_ATTR_FLAG_REPORTABLE and if not set, a status + * of ZCL_STATUS_UNREPORTABLE_ATTRIBUTE is returned. + * @return ZCL Status Code */ enum ZclStatusCodeT ZbZclAttrRead(struct ZbZclClusterT *cluster, uint16_t attrId, enum ZclDataTypeT *attrType, void *outputBuf, unsigned int max_len, bool isReporting); -/*FUNCTION - * ZbZclAttrWrite - *PARAMETERS - * cluster ; IN: Cluster Structure Pointer - * src ; IN: Source address of this command. May be NULL if generated locally. - * attr_id ; IN: Cluster's Attribute ID - * attr_data ; IN: Attribute data in ZCL format (i.e. same as what is sent over-the-air) - * max_len ; IN: Length of attribute data - * mode ; IN: Write mode +/** + * Writes a local cluster's attribute value. + * @param cluster Cluster instance + * @param src Source address of this command. May be NULL if generated locally. + * @param attr_id Attribute Id of the attribute to write + * @param attr_data Attribute data in ZCL format (i.e. same as what is sent over-the-air) + * @param max_len Maximum length of attribute data (attr_data) buffer. + * @param mode Write mode + * @return ZCL Status Code */ enum ZclStatusCodeT ZbZclAttrWrite(struct ZbZclClusterT *cluster, const struct ZbApsAddrT *src, uint16_t attr_id, const uint8_t *attr_data, unsigned int max_len, ZclWriteModeT mode); @@ -513,32 +522,73 @@ extern const uint8_t zcl_attr_str_short_zero[1]; /* i.e. {0x00} */ extern const uint8_t zcl_attr_str_long_zero[2]; /* i.e. {0x00, 0x00} */ /*--------------------------------------------------------------- - * Configure Reporting + * Attribute Reporting + *--------------------------------------------------------------- + */ +enum ZbZclReportDirectionT { + /* For Configure Reporting: receiver configures attribute to send + * reports via binding table. + * + * For Read Reporting: specifies whether values of the attribute are reported */ + ZCL_REPORT_DIRECTION_NORMAL = 0x00, + + /* For Configure Reporting: sender is sending reports to the receiver, + * based on the state of the sender's bindings. Tells receiver how / when + * it should expect reports. + * + * For Read Reporting: specifies whether reports of the attribute are received. */ + ZCL_REPORT_DIRECTION_REVERSE = 0x01 +}; + +/*--------------------------------------------------------------- + * Attribute Reporting *--------------------------------------------------------------- */ -struct ZbZclAttrReportableChangeT { - union { - long long integer; /* If ZbZclAttrIsAnalog */ - double floating; /* If ZCL_DATATYPE_FLOATING_xxx */ - /* All other types send report on any change of value. */ - } epsilon; +/* Maximum number of Attribute reporting configuration records. */ +#define ZCL_ATTR_REPORT_CONFIG_NUM_MAX 6U + +/* Attribute reporting configuration record. Max size is 16 */ +struct ZbZclAttrReportConfigRecordT { + enum ZbZclReportDirectionT direction; /* e.g. ZCL_REPORT_DIRECTION_NORMAL. */ + uint16_t attr_id; + uint8_t attr_type; /* Only if ZCL_REPORT_DIRECTION_NORMAL. */ + uint16_t min; /* Only if ZCL_REPORT_DIRECTION_NORMAL. */ + uint16_t max; /* Only if ZCL_REPORT_DIRECTION_NORMAL. */ + double change; /**< Reportable change. Only if ZCL_REPORT_DIRECTION_NORMAL. */ + uint16_t timeout_period; /* Only if ZCL_REPORT_DIRECTION_REVERSE. */ }; struct ZbZclAttrReportConfigT { struct ZbApsAddrT dst; - uint16_t min; - uint16_t max; - uint16_t attr_id; - uint8_t attr_type; - struct ZbZclAttrReportableChangeT change; + uint8_t num_records; + struct ZbZclAttrReportConfigRecordT record_list[ZCL_ATTR_REPORT_CONFIG_NUM_MAX]; }; -enum ZclStatusCodeT ZbZclAttrReportConfigReq(struct ZbZclClusterT *cluster, struct ZbZclAttrReportConfigT *report, +/** + * Configure an attribute's default reporting intervals. It will also set the + * active reporting intervals to these values and reset the reporting timer. + * The Reportable Change value will also be reset back to defaults (value = 1). + * @param cluster Cluster instance + * @param config SAL + * @param callback Callback function + * @param arg Callback argument + * @return ZCL Status Code + */ +enum ZclStatusCodeT ZbZclAttrReportConfigReq(struct ZbZclClusterT *cluster, struct ZbZclAttrReportConfigT *config, void (*callback)(struct ZbZclCommandRspT *cmd_rsp, void *arg), void *arg); +/* Attribute reporting configuration record. Max size is 16 */ +struct ZbZclAttrReportReadRecordT { + enum ZbZclReportDirectionT direction; /* e.g. ZCL_REPORT_DIRECTION_NORMAL. */ + uint16_t attr_id; +}; + +#define ZCL_ATTR_REPORT_READ_NUM_MAX ZCL_ATTR_REPORT_CONFIG_NUM_MAX + struct ZbZclAttrReportReadT { struct ZbApsAddrT dst; - uint16_t attr_id; + uint8_t num_records; + struct ZbZclAttrReportConfigRecordT record_list[ZCL_ATTR_REPORT_READ_NUM_MAX]; }; enum ZclStatusCodeT ZbZclAttrReportReadReq(struct ZbZclClusterT *cluster, struct ZbZclAttrReportReadT *report, @@ -556,8 +606,20 @@ enum ZclStatusCodeT ZbZclAttrReportReadReq(struct ZbZclClusterT *cluster, struct * @return ZCL Status Code */ enum ZclStatusCodeT ZbZclAttrReportConfigDefault(struct ZbZclClusterT *clusterPtr, - uint16_t attrId, uint16_t default_min, uint16_t default_max, - struct ZbZclAttrReportableChangeT *default_change); + uint16_t attrId, uint16_t default_min, uint16_t default_max, double *default_change); + +/** + * This function is called to manually drive the attribute reporting mechanism. + * The application may disable the automatic periodic reporting by setting the Network + * Attribute 'ZB_NWK_NIB_ID_DisablePeriodicTimers' to 1. + * @param cluster Cluster instance + * @param callback Callback that is called once all reports have been sent. The 'next_timeout' + * parameter is the time until the next scheduled report, in milliseconds. + * @param arg Callback argument + * @return ZCL Status Code. If not ZCL_STATUS_SUCCESS, then callback will not be called. + */ +enum ZclStatusCodeT ZbZclAttrReportKick(struct ZbZclClusterT *cluster, bool send_all, + void (*callback)(struct ZbZclClusterT *cluster, unsigned int next_timeout, void *arg), void *arg); /*--------------------------------------------------------------- * Remote Reading and Writing of Attributes @@ -651,43 +713,6 @@ typedef struct ZbZclDiscoverAttrRspT { enum ZclStatusCodeT ZbZclDiscoverAttrReq(struct ZbZclClusterT *cluster, struct ZbZclDiscoverAttrReqT *req, void (*callback)(const struct ZbZclDiscoverAttrRspT *discRsp, void *cb_arg), void *arg); -/*--------------------------------------------------------------- - * Attribute Reporting - *--------------------------------------------------------------- - */ -enum ZbZclReportDirectionT { - /* For Configure Reporting: receiver configures attribute to send - * reports via binding table. - * - * For Read Reporting: specifies whether values of the attribute are reported */ - ZCL_REPORT_DIRECTION_NORMAL = 0x00, - - /* For Configure Reporting: sender is sending reports to the receiver, - * based on the state of the sender's bindings. Tells receiver how / when - * it should expect reports. - * - * For Read Reporting: specifies whether reports of the attribute are received. */ - ZCL_REPORT_DIRECTION_REVERSE = 0x01 -}; - -/* ZCL Reporting Configuration Record Structure. */ -struct ZbZclReportConfigT { - enum ZbZclReportDirectionT direction; - uint16_t attributeId; - enum ZclDataTypeT dataType; - uint16_t minInterval; - uint16_t maxInterval; - union { - long long integer; - double floating; - } minChange; - uint16_t reportTimeout; -}; - -/* Appends a Reporting configuration record to the end of the provided buffer. - * Returns Length of data written, or negative value (-1) on error. */ -int ZbZclAppendReportConfig(struct ZbZclReportConfigT *configPtr, uint8_t *payload, unsigned int max_len); - /*--------------------------------------------------------------- * Attribute Persistence *--------------------------------------------------------------- @@ -720,8 +745,6 @@ struct ZbZclClusterCommandReqT { enum ZclStatusCodeT ZbZclClusterCommandReq(struct ZbZclClusterT *cluster, struct ZbZclClusterCommandReqT *req, void (*callback)(struct ZbZclCommandRspT *zcl_rsp, void *arg), void *arg); -#define ZCL_REQ_DELAY_DEFAULT 200U /* ms */ - /** * Same as ZbZclClusterCommandReq, except the message is delayed by 'delay' parameter milliseconds. * @param cluster Cluster instance @@ -803,7 +826,7 @@ enum ZclStateReqReturn { typedef enum ZclStateReqReturn (*ZbZclHandlerFuncT)(struct ZigBeeT *zb, struct ZbZclCommandRspT *cmdRsp, void *callback, void *arg); enum ZclStatusCodeT ZbZclStateBegin(struct ZigBeeT *zb, struct ZbApsdeDataReqT *apsReq, struct ZbZclHeaderT *zclHdr, - unsigned int timeout, ZbZclHandlerFuncT handler, void *callback, void *arg); + ZbZclHandlerFuncT handler, void *callback, void *arg); /*--------------------------------------------------------------- * Helper Functions @@ -848,10 +871,22 @@ const char * ZbZclClusterGetDirectionStr(struct ZbZclClusterT *cluster); uint8_t ZbZclClusterGetRadius(struct ZbZclClusterT *cluster); unsigned int ZbZclClusterGetMaxAsduLength(struct ZbZclClusterT *cluster); +/** + * Attach a callback function to receive ZCL Attribute Report Commands. + * @param cluster Cluster instance + * @param callback Application callback to handle Report commands. + * @return None + */ void ZbZclClusterReportCallbackAttach(struct ZbZclClusterT *cluster, void (*callback)(struct ZbZclClusterT *cluster, struct ZbApsdeDataIndT *dataIndPtr, uint16_t attr_id, enum ZclDataTypeT data_type, const uint8_t *in_payload, uint16_t in_len)); +/** + * An inline helper function that inspects a ZCL header struct and returns true if + * it's for a ZCL Default Response command, or false otherwise. + * @param hdr ZCL Header struct + * @return true if ZCL header indicates it's for a ZCL Default Response command, or false otherwise. + */ static inline bool ZbZclIsDefaultRsp(struct ZbZclHeaderT *hdr) { @@ -881,7 +916,7 @@ enum { }; #ifdef __cplusplus -} /* extern "C" */ +} #endif #endif /* ZCL_H */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.payload.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.payload.h index f6419d783..19d902130 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.payload.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.payload.h @@ -1,4 +1,4 @@ -/* Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. */ +/* Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_PAYLOAD_H # define ZCL_PAYLOAD_H @@ -91,7 +91,7 @@ zb_zcl_append_uint8_array(uint8_t *payload, const unsigned int capacity, unsigne unsigned i; ZCL_BUILDER_CHECK_LEN(value_length); - /* ZbMemCpy is not portable (internal stack use only) */ + /* ZbMemCpy is not portable (internal stack use only), so do a manual copy here. */ for (i = 0; i < value_length; i++) { payload[*index + i] = value[i]; } diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.touchlink.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.touchlink.h index 26999eec9..d50c07b9e 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.touchlink.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zcl/zcl.touchlink.h @@ -2,7 +2,7 @@ * @file zcl.touchlink.h * @heading Touchlink * @brief Touchlink API - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZCL_TOUCHLINK_H diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.aps.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.aps.h index a0aecc883..44846e4dc 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.aps.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.aps.h @@ -509,6 +509,16 @@ void ZbApsmeUnbindReq(struct ZigBeeT *zb, struct ZbApsmeUnbindReqT *unbindReqPtr */ void ZbApsUnbindAllReq(struct ZigBeeT *zb); +/** + * Returns true if there's a binding entry in the Binding Table that matches the + * local device as the source address, and a matching source endpoint and cluster Id. + * @param zb Zigbee stack instance + * @param endpoint Source endpoint + * @param clusterId Cluster Id + * @return Returns true if binding exists, false otherwise. + */ +bool ZbApsBindSrcExists(struct ZigBeeT *zb, uint8_t endpoint, uint16_t clusterId); + /** * Add an entry to the group table. * @param zb Zigbee stack instance diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.h index 3f5478e02..a7c17c99c 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.h @@ -26,8 +26,8 @@ #endif /* stdarg is required for the logging (ZbSetLogging) */ -/*lint -save -e829 [ 'stdarg.h' usage should be deprecated ] */ -/*lint -save -e451 [ header file included withoutstandard guard ] */ +/*lint -save -e829 "'stdarg.h' usage should be deprecated [MISRA Rule 17.1 (REQUIRED)]" */ +/*lint -save -e451 "header file included withoutstandard guard [Dir 4.10 (REQUIRED)]" */ #include /*lint -restore */ /*lint -restore */ @@ -566,19 +566,31 @@ enum ZbTestcaseT { ZB_TESTCASE_SE1X_15_48, /* Client sends a truncated EPHEMERAL_DATA request */ ZB_TESTCASE_CBKE_DELAY_EPH_DATA, /* e.g. SE 1.4 test case 15.25 */ ZB_TESTCASE_CBKE_DELAY_RESPONSE, /* e.g. SE 1.4 test case 15.26 */ - ZB_TESTCASE_GB868_EBR_06, /* Bogus EBR */ + ZB_TESTCASE_NWK_ENH_BEACON_REQ_06, /* Bogus EBR */ /* Override tx power management in the MAC and always set a minimum * power level. Useful for co-ax testing to prevent cross-talk. */ - ZB_TESTCASE_GB868_MIN_TX_POWER, - ZB_TESTCASE_LINKPOWER_DROP_NOTIFY, - ZB_TESTCASE_LINKPOWER_DROP_REQUEST, - ZB_TESTCASE_REJOIN_DROP_RSP, - ZB_TESTCASE_REJOIN_RETURN_FULL, - ZB_TESTCASE_EDKA_DROP_REQUEST, - ZB_TESTCASE_ASSOC_RSP_FULL, + ZB_TESTCASE_NWK_ENH_BEACON_MIN_TX_POWER, + ZB_TESTCASE_NWK_ENH_BEACON_REQ_DROP, + ZB_TESTCASE_NWK_STD_BEACON_REQ_DROP, + ZB_TESTCASE_NWK_LINKPOWER_DROP_NOTIFY, + ZB_TESTCASE_NWK_LINKPOWER_DROP_REQUEST, + ZB_TESTCASE_NWK_REJOIN_DROP_RSP, + ZB_TESTCASE_NWK_REJOIN_RETURN_FULL, + ZB_TESTCASE_NWK_EDKA_DROP_REQUEST, + ZB_TESTCASE_NWK_ASSOC_RSP_FULL, + ZB_TESTCASE_NWK_ROUTE_THRU_NNT_IGNORE_COST, /* */ + ZB_TESTCASE_NWK_FC_MAX_ALLOW, + ZB_TESTCASE_DLK_NOT_ALLOWED, + ZB_TESTCASE_DLK_INVALID_KEY_NEGO_STATE, + ZB_TESTCASE_DLK_INVALID_TLV, + ZB_TESTCASE_DLK_MISSING_TLV, + ZB_TESTCASE_DLK_NO_TLV, + ZB_TESTCASE_DLK_OUT_OF_ORDER_TLVS, + ZB_TESTCASE_APS_REQUEST_KEY_DROP, + ZB_TESTCASE_APS_DISABLE_FC_SYNC, + ZB_TESTCASE_ZDO_SEC_CHLNG_WITH_EXTRA_TLVS, ZB_TESTCASE_TOUCHLINK_DEBUG_KEY, - ZB_TESTCASE_ZED_STACK_SHUTDOWN, - ZB_TESTCASE_REQUEST_KEY_DROP + ZB_TESTCASE_ZED_STACK_SHUTDOWN }; /* External API */ diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.nwk.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.nwk.h index d07e65f0d..e7176a12f 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.nwk.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.nwk.h @@ -8,6 +8,8 @@ #ifndef ZIGBEE_NWK_H # define ZIGBEE_NWK_H +/*lint -e621 "Identifier clash [MISRA Rule 5.1 (REQUIRED), MISRA Rule 5.2 (REQUIRED), MISRA Rule 5.4 (REQUIRED), MISRA Rule 5.5 (REQUIRED)]" */ + /*--------------------------------------------------------------- * Misc. Definitions and Structures *--------------------------------------------------------------- @@ -24,6 +26,11 @@ #define ZB_NWK_ADDR_BCAST_ALL (uint16_t)0xffffU /* IEEE802154_ADDR_SHORT_BCAST */ #define ZB_NWK_ADDR_UNDEFINED (uint16_t)0xffffU /* IEEE802154_ADDR_SHORT_BCAST */ +/* Default delay to wait before generating a response or performing some other + * task to allow the stack to send an APS ACK first, if required, or prevent + * other contention on the RF due to simultaneous bi-directional Zigbee traffic. */ +#define ZB_NWK_RSP_DELAY_DEFAULT 200U /* ms */ + /* ZigBee Stack Profiles (StackProfile or nwkStackProfile) */ enum { ZB_NWK_STACK_PROFILE_NWKSPFC = 0x00, @@ -141,7 +148,6 @@ enum ZbNwkNibAttrIdT { * subsequent packets will use the better route. */ ZB_NWK_NIB_ID_RouteDiscoverySendDelay, ZB_NWK_NIB_ID_FastPollPeriod, /* Only used as sleepy end devices to set the fast polling inverval. */ - ZB_NWK_NIB_ID_SlowPollPeriod, ZB_NWK_NIB_ID_FrameCounterCooldown, /* Cooldown timer (in seconds) to apply to frame counter resets. */ ZB_NWK_NIB_ID_OutgoingCounter, /* Global outgoing frame counter. */ ZB_NWK_NIB_ID_PersistCounter, /* Persisted outgoing frame counter. */ @@ -200,9 +206,6 @@ enum WpanJoinPolicyT { #define ZB_NWK_LINK_COST_MAX 7U /* NWK Constants */ -#if 0 /* not used */ -#define ZB_NWK_CONST_COORDINATOR_CAPABLE true -#endif #define ZB_NWK_CONST_SECURITY_LEVEL 0x05U #define ZB_NWK_CONST_DISCOVERY_RETRY_LIMIT 0x03U #define ZB_NWK_CONST_MAX_DEPTH 0x0fU @@ -334,7 +337,6 @@ struct ZbNwkNeighborT { uint16_t nwkAddr; /* Set to ZB_NWK_ADDR_UNDEFINED to invalidate entry */ uint8_t capability; enum ZbNwkNeighborTypeT deviceType; - bool rxOnWhenIdle; /* EXEGIN - why not just use capability? */ enum ZbNwkNeighborRelT relationship; uint8_t txFailure; uint8_t lqi; /* Average LQI. */ @@ -342,7 +344,7 @@ struct ZbNwkNeighborT { uint8_t outgoingCost; /* ZigBee 2007. */ uint8_t age; /* ZigBee 2007. */ uint8_t interval; /* R21 draft. */ - ZbUptimeT timeout; /* R21 draft. Disabled if zero. */ + ZbUptimeT timeout; /* R21 draft. End-device keep-alive timeout. Disabled if zero. */ uint8_t ifc_index; /* R22 - set to ZB_NWK_NEIGHBOR_IFINDEX_UNKNOWN if not known (e.g. after persistence) */ }; @@ -794,12 +796,13 @@ enum ZbStatusCodeT ZbNwkSetIndex(struct ZigBeeT *zb, enum ZbNwkNibAttrIdT attrId *--------------------------------------------------------------- */ unsigned int ZbNwkAddrMapFreeSpace(struct ZigBeeT *zb); -bool ZbNwkAddrStoreMap(struct ZigBeeT *zb, uint16_t nwkAddr, uint64_t extAddr, bool resolve_conflict); +bool ZbNwkAddrStoreMap(struct ZigBeeT *zb, uint16_t nwkAddr, uint64_t extAddr, bool resolve_now); void ZbNwkAddrClearMap(struct ZigBeeT *zb, bool isShortAddr, uint64_t addr); /* Returns the network address that corresponds to the extended address * if known, otherwise returns ZB_NWK_ADDR_UNDEFINED. */ uint16_t ZbNwkAddrLookupNwk(struct ZigBeeT *zb, uint64_t extAddr); + /* Returns the extended address that corresponds to the network address * if known, otherwise returns 0. */ uint64_t ZbNwkAddrLookupExt(struct ZigBeeT *zb, uint16_t nwkAddr); @@ -831,13 +834,38 @@ void ZbNwkNeighborClearAll(struct ZigBeeT *zb, bool keep_parent, bool keep_child * Fast Polling *--------------------------------------------------------------- */ +/* NLME-SYNC.request parent polling */ /* The default delay before sending the first NLME-SYNC */ #define ZB_NWK_SYNC_DEFAULT_DELAY_MS 50U -/* NLME-SYNC.request parent polling */ -bool ZB_WARN_UNUSED ZbNwkFastPollRequest(struct ZigBeeT *zb); -bool ZbNwkFastPollRelease(struct ZigBeeT *zb); +/** + * Make the stack begin (or continue) fast polling. Fast polling period is defined by + * ZB_NWK_NIB_ID_FastPollPeriod. + * @param zb Zigbee instance + * @param delay Delay in milliseconds before sending the first NLME-SYNC + * (e.g. ZB_NWK_SYNC_DEFAULT_DELAY_MS) + * @param timeout Timeout in milliseconds for this fast polling interval. If 0, + * then interval is indefinite and only stopped by calling ZbNwkFastPollRelease + * @return Fast polling entry pointer, to be used as a handle to track this polling request. + */ +struct nwk_fastpoll_entry_t * ZbNwkFastPollRequest(struct ZigBeeT *zb, + unsigned int delay, unsigned int timeout); + +/** + * Release a fast polling request. If this is the last fast polling request, then + * fast polling will be stopped. + * @param zb Zigbee instance + * @param entry Fast polling entry pointer (handle) returned by ZbNwkFastPollRequest + * @return True if found and removed, false otherwise. + */ +bool ZbNwkFastPollRelease(struct ZigBeeT *zb, struct nwk_fastpoll_entry_t *handle); + +/** + * Get the current number of fast polling requests to the stack. + * @param zb Zigbee instance + * @return Number of outstanding fast polling requests. + */ unsigned int ZbNwkFastPollResourceCount(struct ZigBeeT *zb); /*--------------------------------------------------------------- diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.security.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.security.h index b41a8b5bf..e5ac3b3b1 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.security.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.security.h @@ -270,7 +270,18 @@ void ZbSecMakeNonce(uint8_t *nonce, uint64_t extAddr, uint32_t frameCounter, uin * @param digest hash must be AES_BLOCK_SIZE in size! * @return */ -bool ZbAesMmoHash(struct ZigBeeT *zb, uint8_t const *data, const unsigned int length, uint8_t *digest); +bool ZbAesMmoHash(uint8_t const *data, const unsigned int length, uint8_t *digest); + +/** + * Performs the Keyed Hash function for Message Authentication. The HMAC operation described + * in section B.1.4, and specified by FIPS pub 198. This is used to trasmute the link keys into + * key-load and key-transport keys. + * @param key The encryption key to use + * @param input The input data byte + * @param keyOut The resultant tranformed key + * @return None + */ +void ZbSecKeyTransform(uint8_t *key, uint8_t input, uint8_t *keyOut); /** * Adds a device key-pair to the stack as a Trust Center Link Key type. diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.startup.h b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.startup.h index 48f71aea6..b0aa106f7 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.startup.h +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/include/zigbee.startup.h @@ -2,7 +2,7 @@ * @file zigbee.startup.h * @brief Zigbee startup header file * @author Exegin Technologies - * @copyright Copyright [2009 - 2020] Exegin Technologies Limited. All rights reserved. + * @copyright Copyright [2009 - 2021] Exegin Technologies Limited. All rights reserved. */ #ifndef ZIGBEE_STARTUP_H @@ -47,7 +47,8 @@ struct ZbStartupCbkeT { /* Keep Alive Server or Client */ bool tc_keepalive_server_enable; /**< If CBKE is enabled (suite_mask != 0), this flag determines whether to allocate the - * Trust Center Keep Alive Server (true) or Client (false). */ + * Trust Center Keep Alive Server (true) or Client (false). The Trust Center should + * set this flag to true, and all other joiners should set this flag to false. */ /* Keep Alive Server attributes */ uint8_t tc_keepalive_base; @@ -137,12 +138,12 @@ struct ZbStartupT { uint8_t networkKey[ZB_SEC_KEYSIZE]; /**< Configures the Network Key with key type set to ZB_SEC_KEYTYPE_STANDARD_NWK. - * Only applicable if startupControl is ZbStartTypeForm or ZbStartTypePreconfigured. */ + * Only applicable if startupControl is ZbStartTypePreconfigured. */ uint8_t networkKeySeqNum; /**< Configures the Network Key Sequence Number for the Network Key. * Also sets ZB_NWK_NIB_ID_ActiveKeySeqNumber to this value. - * Only applicable if startupControl is ZbStartTypeForm or ZbStartTypePreconfigured. + * Only applicable if startupControl is ZbStartTypePreconfigured. */ enum ZbSecKeyTypeT networkKeyType; /**< Deprecated and not used. */ @@ -150,12 +151,6 @@ struct ZbStartupT { struct ZbStartupCbkeT cbke; /**< CBKE certificate configuration */ } security; - struct { - uint16_t timeBetweenScans; /**< Deprecated and not used. */ - uint16_t rejoinInterval; /**< Deprecated and not used. */ - uint16_t maxRejoinInterval; /**< Deprecated and not used. */ - } join; - uint8_t capability; /**< Device capability mask. Default value includes: * MCP_ASSOC_CAP_PWR_SRC (mains power), diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_client.c b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_client.c index 271c91d8b..d0ed43df0 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_client.c +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_client.c @@ -6,13 +6,12 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,15 +32,15 @@ ZbZcl_custom_ls_ClientAlloc(struct ZigBeeT *zb, uint8_t endpoint) { struct zcl_custom_ls_client_cluster_t *clusterPtr; - clusterPtr = ZbZclClusterAlloc(zb, sizeof(struct zcl_custom_ls_client_cluster_t),\ + clusterPtr = ZbZclClusterAlloc(zb, sizeof(struct zcl_custom_ls_client_cluster_t), ZCL_CLUSTER_CUSTOM_LS, endpoint, ZCL_DIRECTION_TO_CLIENT); if (clusterPtr == NULL) { return NULL; } - + /* This is the flags for Fragmentation */ clusterPtr->cluster.txOptions |= (uint16_t)(ZB_APSDE_DATAREQ_TXOPTIONS_SECURITY | ZB_APSDE_DATAREQ_TXOPTIONS_ACK | ZB_APSDE_DATAREQ_TXOPTIONS_FRAG); - //ZbZclClusterSetTxOptions(&clusterPtr->cluster, ZB_APSDE_DATAREQ_TXOPTIONS_FRAG); + //ZbZclClusterSetTxOptions(&clusterPtr->cluster, ZB_APSDE_DATAREQ_TXOPTIONS_FRAG); (void)ZbZclAttrIntegerWrite(&clusterPtr->cluster, ZCL_GLOBAL_ATTR_CLUSTER_REV, 1); ZbZclClusterAttach(&clusterPtr->cluster); @@ -56,15 +55,15 @@ ZbZclSet_custom_ls_ClientCommand(struct ZbZclClusterT *cluster, struct ZbApsAddr struct ZbZclClusterCommandReqT req; uint8_t payload[2050]; uint16_t len; - + len = (uint16_t)strlen(string); if (len > 2048) { return ZCL_STATUS_INVALID_VALUE; } - + putle16(&payload[0], len); memcpy(&payload[2], string, len); - + (void)memset(&req, 0, sizeof(req)); req.dst = *dst; req.cmdId = ZCL_SET_CUSTOM_LS_COMMAND_REQ; diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_server.c b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_server.c index 903e758bb..96547bbb4 100644 --- a/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_server.c +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_ls_server.c @@ -6,13 +6,12 @@ ***************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -43,7 +42,7 @@ ZbZcl_custom_ls_ServerAlloc(struct ZigBeeT *zb, uint8_t endpoint,\ } clusterPtr->cluster.txOptions |= ZB_APSDE_DATAREQ_TXOPTIONS_SECURITY; - + memset(&clusterPtr->callbacks, 0, sizeof(clusterPtr->callbacks)); if (callbacks != NULL) { memcpy(&clusterPtr->callbacks, callbacks, sizeof(clusterPtr->callbacks)); @@ -59,7 +58,7 @@ ZbZcl_custom_ls_ServerAlloc(struct ZigBeeT *zb, uint8_t endpoint,\ return NULL; } #endif - + (void)ZbZclAttrIntegerWrite(&clusterPtr->cluster, ZCL_GLOBAL_ATTR_CLUSTER_REV, 1); ZbZclClusterSetCallbackArg(&clusterPtr->cluster, arg); @@ -120,7 +119,7 @@ ZbZcl_custom_ls_ServerSendCommandRsp(struct ZbZclClusterT *clusterPtr, struct Zb uint8_t rsp_payload[2]; unsigned int length = 0U; struct ZbApsBufT bufv[1]; - dst_info->tx_options = ZB_APSDE_DATAREQ_TXOPTIONS_SECURITY; + dst_info->tx_options = ZB_APSDE_DATAREQ_TXOPTIONS_SECURITY; /* Form the payload */ putle16(&rsp_payload[length], rsp->one); length += 2U; diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_client.c b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_client.c new file mode 100644 index 000000000..0d4b119a7 --- /dev/null +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_client.c @@ -0,0 +1,66 @@ +/***************************************************************************** + * @file zcl_custom_matrix_client.c + * @author MCD Application Team + * @brief This file contains the implementation of the Custom Matrix + * cluster (client part). + ***************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +#include +#include "zigbee.h" +#include "zcl/zcl.h" +#include "zcl/st_custom/zcl.custom_matrix.h" + +struct zcl_custom_matrix_client_cluster_t { + struct ZbZclClusterT cluster; +}; + +/* Custom cluster long string allocation */ +struct ZbZclClusterT * +ZbZcl_custom_matrix_ClientAlloc(struct ZigBeeT *zb, uint8_t endpoint) +{ + struct zcl_custom_matrix_client_cluster_t *clusterPtr; + + clusterPtr = ZbZclClusterAlloc(zb, sizeof(struct zcl_custom_matrix_client_cluster_t),\ + ZCL_CLUSTER_CUSTOM_MATRIX, endpoint, ZCL_DIRECTION_TO_CLIENT); + if (clusterPtr == NULL) { + return NULL; + } + + /* This is the flags for Fragmentation */ + clusterPtr->cluster.txOptions |= (uint16_t)(ZB_APSDE_DATAREQ_TXOPTIONS_SECURITY | ZB_APSDE_DATAREQ_TXOPTIONS_ACK | ZB_APSDE_DATAREQ_TXOPTIONS_FRAG); + (void)ZbZclAttrIntegerWrite(&clusterPtr->cluster, ZCL_GLOBAL_ATTR_CLUSTER_REV, ZCL_CLUSTER_REVISION_ZCL6); + + ZbZclClusterAttach(&clusterPtr->cluster); + return &clusterPtr->cluster; +} + +/* Client command */ +enum ZclStatusCodeT +ZbZclSet_custom_matrix_ClientCommand(struct ZbZclClusterT *cluster, struct ZbApsAddrT *dst, uint8_t pattern_code, + void (*callback)(struct ZbZclCommandRspT *rsp, void *arg), void *arg) +{ + struct ZbZclClusterCommandReqT req; + uint8_t payload[3]; + putle16(&payload[0], 1); // length + payload[2]=pattern_code; + + (void)memset(&req, 0, sizeof(req)); + req.dst = *dst; + req.cmdId = ZCL_SET_CUSTOM_MATRIX_COMMAND_REQ; + req.noDefaultResp = ZCL_NO_DEFAULT_RESPONSE_TRUE; + req.payload = payload; + req.length = 3;//len + 2; + ZbZclClusterCommandReq(cluster, &req, callback, arg); + return ZCL_STATUS_SUCCESS; +} diff --git a/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_server.c b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_server.c new file mode 100644 index 000000000..a8fdf989d --- /dev/null +++ b/Middlewares/ST/STM32_WPAN/zigbee/stack/zcl/st_custom/zcl_custom_matrix_server.c @@ -0,0 +1,127 @@ +/***************************************************************************** + * @file zcl_custom_matrix_server.c + * @author MCD Application Team + * @brief This file contains the implementation of the Custom Matrix + * cluster (server part). + ***************************************************************************** + * @attention + * + * Copyright (c) 2018-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + + +#include "zigbee.h" +#include "zcl/zcl.h" +#include "zcl/st_custom/zcl.custom_matrix.h" + +static enum ZclStatusCodeT +custom_matrix_command_handler(struct ZbZclClusterT *clusterPtr, struct ZbZclHeaderT *zclHdrPtr,\ + struct ZbApsdeDataIndT *dataIndPtr); + +struct zcl_custom_matrix_server_cluster_t { + struct ZbZclClusterT cluster; + struct zcl_custom_matrix_server_callbacks_t callbacks; +}; + +struct ZbZclClusterT * +ZbZcl_custom_matrix_ServerAlloc(struct ZigBeeT *zb, uint8_t endpoint,\ + struct zcl_custom_matrix_server_callbacks_t *callbacks, void *arg) +{ + struct zcl_custom_matrix_server_cluster_t *clusterPtr; + + clusterPtr = ZbZclClusterAlloc(zb, sizeof(struct zcl_custom_matrix_server_cluster_t),\ + ZCL_CLUSTER_CUSTOM_MATRIX, endpoint, ZCL_DIRECTION_TO_SERVER); + if (clusterPtr == NULL) { + return NULL; + } + + clusterPtr->cluster.txOptions |= ZB_APSDE_DATAREQ_TXOPTIONS_SECURITY; + + memset(&clusterPtr->callbacks, 0, sizeof(clusterPtr->callbacks)); + if (callbacks != NULL) { + memcpy(&clusterPtr->callbacks, callbacks, sizeof(clusterPtr->callbacks)); + } + + clusterPtr->cluster.command = custom_matrix_command_handler; + + /* not used in our case */ + + + // (void)ZbZclAttrIntegerWrite(&clusterPtr->cluster, ZCL_GLOBAL_ATTR_CLUSTER_REV, ZCL_CLUSTER_REVISION_ZCL6); + + ZbZclClusterSetCallbackArg(&clusterPtr->cluster, arg); + + ZbZclClusterAttach(&clusterPtr->cluster); + return &clusterPtr->cluster; +} + +static enum ZclStatusCodeT +custom_matrix_command_handler(struct ZbZclClusterT *clusterPtr, struct ZbZclHeaderT *zclHdrPtr,\ + struct ZbApsdeDataIndT *dataIndPtr) +{ + struct zcl_custom_matrix_server_cluster_t *custom_matrix_cluster = (struct zcl_custom_matrix_server_cluster_t *)clusterPtr; + struct ZbZclAddrInfoT src_info; + uint8_t cmd_id = zclHdrPtr->cmdId; + enum ZclStatusCodeT return_status = ZCL_STATUS_SUCCESS_NO_DEFAULT_RESPONSE; + + (void)memset(&src_info, 0, sizeof(src_info)); + src_info.addr = dataIndPtr->src; + src_info.seqnum = zclHdrPtr->seqNum; + //src_info.tx_options = dataIndPtr->securityStatus.; + + switch (cmd_id) { + case ZCL_SET_CUSTOM_MATRIX_COMMAND_REQ: + { + struct set_custom_matrix_command_req_t req; + memset(&req, 0, sizeof(req)); + + if (custom_matrix_cluster->callbacks.set_custom_matrix_command == NULL) { + return_status = ZCL_STATUS_UNSUPP_CLUSTER_COMMAND; + break; + } + req.pattern_code = dataIndPtr->asdu[2]; + //len = pletoh16(&dataIndPtr->asdu[0]); + //memcpy(string, &dataIndPtr->asdu[2], len); + //string[len] = '\0'; + //req.string = string; + + return_status = custom_matrix_cluster->callbacks.set_custom_matrix_command(clusterPtr, &req, &src_info, clusterPtr->app_cb_arg); + break; + } + default: + return_status = ZCL_STATUS_UNSUPP_CLUSTER_COMMAND; + break; + } + return return_status; +} + +/* not used in our custom cluster */ + + +enum ZclStatusCodeT +ZbZcl_custom_matrix_ServerSendCommandRsp(struct ZbZclClusterT *clusterPtr, struct ZbZclAddrInfoT *dst_info, + struct custom_matrix_command_rsp_t *rsp) +{ + + uint8_t rsp_payload[2]; + unsigned int length = 0U; + struct ZbApsBufT bufv[1]; + dst_info->tx_options = ZB_APSDE_DATAREQ_TXOPTIONS_SECURITY; + /* Form the payload */ + putle16(&rsp_payload[length], rsp->one); + length += 2U; + + bufv[0].data = rsp_payload; + bufv[0].len = length; + + return ZbZclClusterCommandRsp(clusterPtr, dst_info, ZCL_CUSTOM_MATRIX_COMMAND_RSP, bufv, 1U); + + +} diff --git a/Middlewares/ST/STM32_WPAN/zigbee/utilities/zigbee.string.c b/Middlewares/ST/STM32_WPAN/zigbee/utilities/zigbee.string.c new file mode 100644 index 000000000..0aa727a52 --- /dev/null +++ b/Middlewares/ST/STM32_WPAN/zigbee/utilities/zigbee.string.c @@ -0,0 +1,183 @@ +/* Copyright [2009 - 2019] Exegin Technologies Limited. All rights reserved. */ + +#include "zigbee.h" + +/*FUNCTION:------------------------------------------------------------------- + * NAME + * char_is_space + * DESCRIPTION + * Checks if character is one of the standard white-space characters: + * + * ' ' (0x20) space (SPC) + * '\t' (0x09) horizontal tab (TAB) + * '\n' (0x0a) newline (LF) + * '\v' (0x0b) vertical tab (VT) + * '\f' (0x0c) feed (FF) + * '\r' (0x0d) carriage return (CR) + * + * PARAMETERS + * none + * RETURNS + * none + *---------------------------------------------------------------------------- + */ +static bool +char_is_space(uint8_t c) +{ + bool rc; + + switch (c) { + case 0x09: /* '\t' */ + case 0x0a: /* '\n' */ + case 0x0b: /* '\v' */ + case 0x0c: /* '\f' */ + case 0x0d: /* '\r' */ + case 0x20: /* ' ' */ + rc = true; + break; + + default: + rc = false; + break; + } /* switch */ + return (rc); +} /* char_is_space */ + +/*FUNCTION:------------------------------------------------------ + * NAME + * zb_hex_str_to_bin + * DESCRIPTION + * A helper for parsing hex strings to binary blobs. + * + * Parses a hexadecimal string into memory. Will skip over + * separator characters. Will stop when maxlen bytes + * have been written, or a NULL character is encountered. + * PARAMETERS + * str ; Input string. + * out ; Output pointer. + * maxlen ; Size of memory that can be written to. + * RETURNS + * int ; Number of bytes written. + *--------------------------------------------------------------- + */ +int +zb_hex_str_to_bin(const char *string, void *out, unsigned int maxlen) +{ + unsigned int i = 0; + const uint8_t *str = (const uint8_t *)string; + char c; + + if (!str) { + return 0; + } + + while (i < maxlen) { + if (*str == 0U) { + return (int)i; + } + + /* Ignore separators and whitespace. */ + c = (char)*str; + if (char_is_space(*str) || (c == ':') || (c == '-') || (c == ',')) { + str++; + continue; + } + + /* Convert first nibble. */ + if ((c >= 'a') && (c <= 'f')) { + ((uint8_t *)out)[i] = (*str - (uint8_t)'a' + 10U) << 4; + } + else if ((c >= 'A') && (c <= 'F')) { + ((uint8_t *)out)[i] = (*str - (uint8_t)'A' + 10U) << 4; + } + else if ((c >= '0') && (c <= '9')) { + ((uint8_t *)out)[i] = ((uint8_t)(*str - (uint8_t)'0')) << 4; + } + else { /* Invalid nibble */ + return -1; + } + + str++; + + if (*str == 0U) { + return (int)i; + } + + /* Ignore separators and whitespace. */ + c = (char)*str; + if (char_is_space(*str) || (c == ':') || (c == '-') || (c == ',')) { + str++; + continue; + } + + /* Convert the second nibble. */ + if ((c >= 'a') && (c <= 'f')) { + ((uint8_t *)out)[i] |= (*str - (uint8_t)'a' + 10U); + } + else if ((c >= 'A') && (c <= 'F')) { + ((uint8_t *)out)[i] |= (*str - (uint8_t)'A' + 10U); + } + else if ((c >= '0') && (c <= '9')) { + ((uint8_t *)out)[i] |= (*str - (uint8_t)'0'); + } + else { /* Invalid nibble */ + return -1; + } + str++; + + i++; + } /* while */ + + /* Done */ + return (int)i; +} /* zb_hex_str_to_bin */ + +/*FUNCTION:------------------------------------------------------ + * NAME + * zb_hex_bin_to_str + * DESCRIPTION + * Convert an array of bytes to a null terminated string of + * hex. For an array of length bytes, without delimiters the + * buffer must be at least 2 * length + 1 . With delimiters + * add the number of delimiters. + * PARAMETERS + * output buffer to store string, WARNING must be at + * least: 2 * length + 1 + #delimiters in length! + * data data to convert + * length number of bytes of data to convert + * delimiter character to use as a delimiter + * interval space between delimiters or zero for none + * RETURNS + * output string length + *--------------------------------------------------------------- + */ +unsigned int +zb_hex_bin_to_str(const uint8_t *in_data, unsigned int in_len, char *out_str, unsigned int max_len, + const char delimiter, unsigned int interval) +{ + unsigned int i, j; + const char *hex = "0123456789abcdef"; + + /* FIXME */ + if (max_len == 0U) { + return 0; + } + j = 0; + for (i = 0; i < in_len; i++) { + if ((interval != 0U) && (i != 0U) && ((i % interval) == 0U)) { + if ((j + 2U) > max_len) { + out_str[0] = (char)0; + return 0; + } + out_str[j++] = delimiter; + } + if ((j + 3U) > max_len) { + out_str[0] = (char)0; + return 0; + } + out_str[j++] = hex[(in_data[i] >> 4) & 0x0fU]; + out_str[j++] = hex[in_data[i] & 0x0fU]; + } /* for */ + out_str[j] = (char)0; + return j; +} /* zb_hex_bin_to_str */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h index 65e0783fc..96da2415d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -155,7 +155,7 @@ /** * Encryption enable when set to 1 - * Encryption disabe when set to 0 + * Encryption disable when set to 0 */ #define CFG_ENCRYPTION_ENABLE 0 @@ -333,6 +333,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -342,11 +346,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -354,6 +362,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -698,5 +719,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h index c95d8bea9..286cf657d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h index 8d9ecd40f..9ab15a5c6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,5 +215,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h index 0d3694d72..b8a514d28 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h index de4bd47e1..a34040522 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h index 1b2606699..87a9f8ab2 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -74,5 +73,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c index ad883ef7d..4e6fdf391 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -58,7 +58,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -143,8 +143,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -428,5 +436,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c index d067a0077..b825fa693 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +30,10 @@ #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" + + /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -68,6 +72,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ @@ -181,22 +187,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -303,4 +446,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry_origin.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry_origin.c index e816cb864..6e0827534 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry_origin.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry_origin.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -283,5 +282,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/main.c index 4dd7b0585..a45d3d3b7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -616,5 +616,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/standby_stm32wb15.c index 67aa3b3be..6a2584a0c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,4 +162,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c index 9f1157cde..52630483c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -283,5 +282,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c index cbc072b39..45cbc8b18 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -311,4 +310,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c index 28a954956..d89236231 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,7 +161,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -348,5 +347,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb15xx_flash_cm4.icf index 56d9d33c5..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb15xx_cm4.s index f7cdf820d..3b925699a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject new file mode 100644 index 000000000..4882ab29a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.project b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.project new file mode 100644 index 000000000..9d5bee611 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.project @@ -0,0 +1,319 @@ + + + BLE_DataThroughput + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.st.stm32cube.ide.mcu.MCUProjectNature + org.eclipse.cdt.core.cnature + com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature + com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature + com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature + com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature + com.st.stm32cube.ide.mcu.MCURootProjectNature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + Doc/readme.txt + 1 + PARENT-1-PROJECT_LOC/readme.txt + + + Utilities/stm32_lpm.c + 1 + PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c + + + Utilities/stm32_seq.c + 1 + PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c + + + Application/Core/app_debug.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/app_debug.c + + + Application/Core/app_entry.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/app_entry.c + + + Application/Core/hw_timerserver.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/hw_timerserver.c + + + Application/Core/hw_uart.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/hw_uart.c + + + Application/Core/main.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/main.c + + + Application/Core/standby_stm32wb15.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/standby_stm32wb15.c + + + Application/Core/stm32_lpm_if.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c + + + Application/Core/stm32wbxx_hal_msp.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32wbxx_hal_msp.c + + + Application/Core/stm32wbxx_it.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32wbxx_it.c + + + Drivers/CMSIS/system_stm32wbxx.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/system_stm32wbxx.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_adc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_adc_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_adc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_cortex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_exti.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_gpio.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_ipcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_hsem.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_spi.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_spi_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_spi_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + Application/STM32_WPAN/app/app_ble.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/app_ble.c + + + Application/STM32_WPAN/app/dt_client_app.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/dt_client_app.c + + + Application/STM32_WPAN/app/dt_server_app.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/dt_server_app.c + + + Application/STM32_WPAN/app/dts.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/dts.c + + + Application/STM32_WPAN/target/hw_ipcc.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/Target/hw_ipcc.c + + + Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c + + + Middlewares/STM32_WPAN/utilities/DispTools.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/menu/DispTools.c + + + Middlewares/STM32_WPAN/utilities/dbg_trace.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + Middlewares/STM32_WPAN/utilities/otp.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/otp.c + + + Middlewares/STM32_WPAN/utilities/stm_list.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + Middlewares/STM32_WPAN/utilities/stm_queue.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + Middlewares/STM32_WPAN/ble/blesvc/svc_ctl.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + Middlewares/STM32_WPAN/ble/core/ble_gap_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_gatt_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_hal_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_hci_le.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + Middlewares/STM32_WPAN/ble/core/ble_l2cap_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + Middlewares/STM32_WPAN/ble/core/osal.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c new file mode 100644 index 000000000..0a2679a25 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c @@ -0,0 +1,158 @@ +/** + ****************************************************************************** + * @file syscalls.c + * @author Auto-generated by STM32CubeIDE + * @brief STM32CubeIDE Minimal System calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include +#include +#include +#include +#include +#include +#include + + +/* Variables */ +//#undef errno +extern int errno; +extern int __io_putchar(int ch) __attribute__((weak)); +extern int __io_getchar(void) __attribute__((weak)); + +register char * stack_ptr asm("sp"); + +char *__env[1] = { 0 }; +char **environ = __env; + + +/* Functions */ +void initialise_monitor_handles() +{ +} + +int _getpid(void) +{ + return 1; +} + +int _kill(int pid, int sig) +{ + errno = EINVAL; + return -1; +} + +void _exit (int status) +{ + _kill(status, -1); + while (1) {} /* Make sure we hang here */ +} + +__attribute__((weak)) int _read(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + *ptr++ = __io_getchar(); + } + +return len; +} + +__attribute__((weak)) int _write(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + __io_putchar(*ptr++); + } + return len; +} + +int _close(int file) +{ + return -1; +} + + +int _fstat(int file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _isatty(int file) +{ + return 1; +} + +int _lseek(int file, int ptr, int dir) +{ + return 0; +} + +int _open(char *path, int flags, ...) +{ + /* Pretend like we always fail */ + return -1; +} + +int _wait(int *status) +{ + errno = ECHILD; + return -1; +} + +int _unlink(char *name) +{ + errno = ENOENT; + return -1; +} + +int _times(struct tms *buf) +{ + return -1; +} + +int _stat(char *file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _link(char *old, char *new) +{ + errno = EMLINK; + return -1; +} + +int _fork(void) +{ + errno = EAGAIN; + return -1; +} + +int _execve(char *name, char **argv, char **env) +{ + errno = ENOMEM; + return -1; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c new file mode 100644 index 000000000..dda5abe79 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c @@ -0,0 +1,79 @@ +/** + ****************************************************************************** + * @file sysmem.c + * @author Generated by STM32CubeIDE + * @brief STM32CubeIDE System Memory calls file + * + * For more information about which C functions + * need which of these lowlevel functions + * please consult the newlib libc manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include + +/** + * Pointer to the current high watermark of the heap usage + */ +static uint8_t *__sbrk_heap_end = NULL; + +/** + * @brief _sbrk() allocates memory to the newlib heap and is used by malloc + * and others from the C library + * + * @verbatim + * ############################################################################ + * # .data # .bss # newlib heap # MSP stack # + * # # # # Reserved by _Min_Stack_Size # + * ############################################################################ + * ^-- RAM start ^-- _end _estack, RAM end --^ + * @endverbatim + * + * This implementation starts allocating at the '_end' linker symbol + * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack + * The implementation considers '_estack' linker symbol to be RAM end + * NOTE: If the MSP stack, at any point during execution, grows larger than the + * reserved size, please increase the '_Min_Stack_Size'. + * + * @param incr Memory size + * @return Pointer to allocated memory + */ +void *_sbrk(ptrdiff_t incr) +{ + extern uint8_t _end; /* Symbol defined in the linker script */ + extern uint8_t _estack; /* Symbol defined in the linker script */ + extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */ + const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size; + const uint8_t *max_heap = (uint8_t *)stack_limit; + uint8_t *prev_heap_end; + + /* Initialize heap end at first call */ + if (NULL == __sbrk_heap_end) + { + __sbrk_heap_end = &_end; + } + + /* Protect heap from growing into the reserved MSP stack */ + if (__sbrk_heap_end + incr > max_heap) + { + errno = ENOMEM; + return (void *)-1; + } + + prev_heap_end = __sbrk_heap_end; + __sbrk_heap_end += incr; + + return (void *)prev_heap_end; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s new file mode 100644 index 000000000..447865dae --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -0,0 +1,392 @@ +/** + ****************************************************************************** + * @file startup_stm32wb15xx_cm4.s + * @author MCD Application Team + * @brief STM32WB15xx devices vector table GCC toolchain. + * This module performs: + * - Set the initial SP + * - Set the initial PC == Reset_Handler, + * - Set the vector table entries with the exceptions ISR address + * - Branches to main in the C library (which eventually + * calls main()). + * After Reset the Cortex-M4 processor is in Thread mode, + * priority is Privileged, and the Stack is set to Main. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + + .syntax unified + .cpu cortex-m4 + .fpu softvfp + .thumb + +.global g_pfnVectors +.global Default_Handler + +/* start address for the initialization values of the .data section. +defined in linker script */ +.word _sidata +/* start address for the .data section. defined in linker script */ +.word _sdata +/* end address for the .data section. defined in linker script */ +.word _edata +/* start address for the .bss section. defined in linker script */ +.word _sbss +/* end address for the .bss section. defined in linker script */ +.word _ebss +/* start address for the .MB_MEM2 section. defined in linker script */ +.word _sMB_MEM2 +/* end address for the .MB_MEM2 section. defined in linker script */ +.word _eMB_MEM2 + +/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */ +.macro INIT_BSS start, end + ldr r0, =\start + ldr r1, =\end + movs r3, #0 + bl LoopFillZerobss +.endm + +/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */ +.macro INIT_DATA start, end, src + ldr r0, =\start + ldr r1, =\end + ldr r2, =\src + movs r3, #0 + bl LoopCopyDataInit +.endm + +.section .text.data_initializers +CopyDataInit: + ldr r4, [r2, r3] + str r4, [r0, r3] + adds r3, r3, #4 + +LoopCopyDataInit: + adds r4, r0, r3 + cmp r4, r1 + bcc CopyDataInit + bx lr + +FillZerobss: + str r3, [r0] + adds r0, r0, #4 + +LoopFillZerobss: + cmp r0, r1 + bcc FillZerobss + bx lr + + .section .text.Reset_Handler + .weak Reset_Handler + .type Reset_Handler, %function +Reset_Handler: + ldr r0, =_estack + mov sp, r0 /* set stack pointer */ +/* Call the clock system initialization function.*/ + bl SystemInit + +/* Copy the data segment initializers from flash to SRAM */ + INIT_DATA _sdata, _edata, _sidata + +/* Zero fill the bss segments. */ + INIT_BSS _sbss, _ebss + INIT_BSS _sMB_MEM2, _eMB_MEM2 + +/* Call static constructors */ + bl __libc_init_array +/* Call the application s entry point.*/ + bl main + +LoopForever: + b LoopForever + +.size Reset_Handler, .-Reset_Handler + +/** + * @brief This is the code that gets called when the processor receives an + * unexpected interrupt. This simply enters an infinite loop, preserving + * the system state for examination by a debugger. + * + * @param None + * @retval None +*/ + .section .text.Default_Handler,"ax",%progbits +Default_Handler: +Infinite_Loop: + b Infinite_Loop + .size Default_Handler, .-Default_Handler +/****************************************************************************** +* +* The minimal vector table for a Cortex-M4. Note that the proper constructs +* must be placed on this to ensure that it ends up at physical address +* 0x0000.0000. +* +******************************************************************************/ + .section .isr_vector,"a",%progbits + .type g_pfnVectors, %object + .size g_pfnVectors, .-g_pfnVectors + + +g_pfnVectors: + .word _estack + .word Reset_Handler + .word NMI_Handler + .word HardFault_Handler + .word MemManage_Handler + .word BusFault_Handler + .word UsageFault_Handler + .word 0 + .word 0 + .word 0 + .word 0 + .word SVC_Handler + .word DebugMon_Handler + .word 0 + .word PendSV_Handler + .word SysTick_Handler + .word WWDG_IRQHandler + .word PVD_PVM_IRQHandler + .word TAMP_STAMP_LSECSS_IRQHandler + .word RTC_WKUP_IRQHandler + .word FLASH_IRQHandler + .word RCC_IRQHandler + .word EXTI0_IRQHandler + .word EXTI1_IRQHandler + .word EXTI2_IRQHandler + .word EXTI3_IRQHandler + .word EXTI4_IRQHandler + .word DMA1_Channel1_IRQHandler + .word DMA1_Channel2_IRQHandler + .word DMA1_Channel3_IRQHandler + .word DMA1_Channel4_IRQHandler + .word DMA1_Channel5_IRQHandler + .word DMA1_Channel6_IRQHandler + .word DMA1_Channel7_IRQHandler + .word ADC1_IRQHandler + .word 0 + .word 0 + .word C2SEV_PWR_C2H_IRQHandler + .word COMP_IRQHandler + .word EXTI9_5_IRQHandler + .word TIM1_BRK_IRQHandler + .word TIM1_UP_IRQHandler + .word TIM1_TRG_COM_IRQHandler + .word TIM1_CC_IRQHandler + .word TIM2_IRQHandler + .word PKA_IRQHandler + .word I2C1_EV_IRQHandler + .word I2C1_ER_IRQHandler + .word 0 + .word 0 + .word SPI1_IRQHandler + .word 0 + .word USART1_IRQHandler + .word LPUART1_IRQHandler + .word 0 + .word TSC_IRQHandler + .word EXTI15_10_IRQHandler + .word RTC_Alarm_IRQHandler + .word 0 + .word PWR_SOTF_BLEACT_RFPHASE_IRQHandler + .word IPCC_C1_RX_IRQHandler + .word IPCC_C1_TX_IRQHandler + .word HSEM_IRQHandler + .word LPTIM1_IRQHandler + .word LPTIM2_IRQHandler + .word 0 + .word 0 + .word 0 + .word AES2_IRQHandler + .word RNG_IRQHandler + .word FPU_IRQHandler + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word DMAMUX1_OVR_IRQHandler + +/******************************************************************************* +* +* Provide weak aliases for each Exception handler to the Default_Handler. +* As they are weak aliases, any function with the same name will override +* this definition. +* +*******************************************************************************/ + .weak NMI_Handler + .thumb_set NMI_Handler,Default_Handler + + .weak HardFault_Handler + .thumb_set HardFault_Handler,Default_Handler + + .weak MemManage_Handler + .thumb_set MemManage_Handler,Default_Handler + + .weak BusFault_Handler + .thumb_set BusFault_Handler,Default_Handler + + .weak UsageFault_Handler + .thumb_set UsageFault_Handler,Default_Handler + + .weak SVC_Handler + .thumb_set SVC_Handler,Default_Handler + + .weak DebugMon_Handler + .thumb_set DebugMon_Handler,Default_Handler + + .weak PendSV_Handler + .thumb_set PendSV_Handler,Default_Handler + + .weak SysTick_Handler + .thumb_set SysTick_Handler,Default_Handler + + .weak WWDG_IRQHandler + .thumb_set WWDG_IRQHandler,Default_Handler + + .weak PVD_PVM_IRQHandler + .thumb_set PVD_PVM_IRQHandler,Default_Handler + + .weak TAMP_STAMP_LSECSS_IRQHandler + .thumb_set TAMP_STAMP_LSECSS_IRQHandler,Default_Handler + + .weak RTC_WKUP_IRQHandler + .thumb_set RTC_WKUP_IRQHandler,Default_Handler + + .weak FLASH_IRQHandler + .thumb_set FLASH_IRQHandler,Default_Handler + + .weak RCC_IRQHandler + .thumb_set RCC_IRQHandler,Default_Handler + + .weak EXTI0_IRQHandler + .thumb_set EXTI0_IRQHandler,Default_Handler + + .weak EXTI1_IRQHandler + .thumb_set EXTI1_IRQHandler,Default_Handler + + .weak EXTI2_IRQHandler + .thumb_set EXTI2_IRQHandler,Default_Handler + + .weak EXTI3_IRQHandler + .thumb_set EXTI3_IRQHandler,Default_Handler + + .weak EXTI4_IRQHandler + .thumb_set EXTI4_IRQHandler,Default_Handler + + .weak DMA1_Channel1_IRQHandler + .thumb_set DMA1_Channel1_IRQHandler,Default_Handler + + .weak DMA1_Channel2_IRQHandler + .thumb_set DMA1_Channel2_IRQHandler,Default_Handler + + .weak DMA1_Channel3_IRQHandler + .thumb_set DMA1_Channel3_IRQHandler,Default_Handler + + .weak DMA1_Channel4_IRQHandler + .thumb_set DMA1_Channel4_IRQHandler,Default_Handler + + .weak DMA1_Channel5_IRQHandler + .thumb_set DMA1_Channel5_IRQHandler,Default_Handler + + .weak DMA1_Channel6_IRQHandler + .thumb_set DMA1_Channel6_IRQHandler,Default_Handler + + .weak DMA1_Channel7_IRQHandler + .thumb_set DMA1_Channel7_IRQHandler,Default_Handler + + .weak ADC1_IRQHandler + .thumb_set ADC1_IRQHandler,Default_Handler + + .weak C2SEV_PWR_C2H_IRQHandler + .thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler + + .weak COMP_IRQHandler + .thumb_set COMP_IRQHandler,Default_Handler + + .weak EXTI9_5_IRQHandler + .thumb_set EXTI9_5_IRQHandler,Default_Handler + + .weak TIM1_BRK_IRQHandler + .thumb_set TIM1_BRK_IRQHandler,Default_Handler + + .weak TIM1_UP_IRQHandler + .thumb_set TIM1_UP_IRQHandler,Default_Handler + + .weak TIM1_TRG_COM_IRQHandler + .thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler + + .weak TIM1_CC_IRQHandler + .thumb_set TIM1_CC_IRQHandler,Default_Handler + + .weak TIM2_IRQHandler + .thumb_set TIM2_IRQHandler,Default_Handler + + .weak PKA_IRQHandler + .thumb_set PKA_IRQHandler,Default_Handler + + .weak I2C1_EV_IRQHandler + .thumb_set I2C1_EV_IRQHandler,Default_Handler + + .weak I2C1_ER_IRQHandler + .thumb_set I2C1_ER_IRQHandler,Default_Handler + + .weak SPI1_IRQHandler + .thumb_set SPI1_IRQHandler,Default_Handler + + .weak USART1_IRQHandler + .thumb_set USART1_IRQHandler,Default_Handler + + .weak LPUART1_IRQHandler + .thumb_set LPUART1_IRQHandler,Default_Handler + + .weak TSC_IRQHandler + .thumb_set TSC_IRQHandler,Default_Handler + + .weak EXTI15_10_IRQHandler + .thumb_set EXTI15_10_IRQHandler,Default_Handler + + .weak RTC_Alarm_IRQHandler + .thumb_set RTC_Alarm_IRQHandler,Default_Handler + + .weak PWR_SOTF_BLEACT_RFPHASE_IRQHandler + .thumb_set PWR_SOTF_BLEACT_RFPHASE_IRQHandler,Default_Handler + + .weak IPCC_C1_RX_IRQHandler + .thumb_set IPCC_C1_RX_IRQHandler,Default_Handler + + .weak IPCC_C1_TX_IRQHandler + .thumb_set IPCC_C1_TX_IRQHandler,Default_Handler + + .weak HSEM_IRQHandler + .thumb_set HSEM_IRQHandler,Default_Handler + + .weak LPTIM1_IRQHandler + .thumb_set LPTIM1_IRQHandler,Default_Handler + + .weak LPTIM2_IRQHandler + .thumb_set LPTIM2_IRQHandler,Default_Handler + + .weak AES2_IRQHandler + .thumb_set AES2_IRQHandler,Default_Handler + + .weak RNG_IRQHandler + .thumb_set RNG_IRQHandler,Default_Handler + + .weak FPU_IRQHandler + .thumb_set FPU_IRQHandler,Default_Handler + + .weak DMAMUX1_OVR_IRQHandler + .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld new file mode 100644 index 000000000..4e53aee02 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -0,0 +1,175 @@ +/* +****************************************************************************** +** +** File : LinkerScript.ld +** +** Author : STM32CubeIDE +** +** Abstract : Linker script for STM32WB15xC Device +** 320Kbytes FLASH +** 48Kbytes RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** Distribution: The file is distributed as is without any warranty +** of any kind. +** +***************************************************************************** +** @attention +** +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. +** +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x20003000; /* end of RAM */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K +RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 +RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + *(.RamFunc) /* .RamFunc sections */ + *(.RamFunc*) /* .RamFunc* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM1 AT> FLASH + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss section */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(.bss*) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM1 + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM1 + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } + MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED + MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED + MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED +} + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c index 5094415fa..73189310b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_ble.c * Description : Application file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -231,7 +230,7 @@ static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'D', 'T', '_', ' uint8_t index_con_int, mutex; -uint8_t const manuf_data[22] = { 2, AD_TYPE_TX_POWER_LEVEL, 0x00 /* 0 dBm */, /* Trasmission Power */ +uint8_t const manuf_data[22] = { 2, AD_TYPE_TX_POWER_LEVEL, 0x00 /* 0 dBm */, /* Transmission Power */ 10, AD_TYPE_COMPLETE_LOCAL_NAME, 'D', 'T', '_', 'S', 'E', 'R', 'V', 'E', 'R', /* Complete Name */ 7, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, 0x01/*SKD version */, CFG_DEV_ID_PERIPH_SERVER, /* NUCLEO-Board WB - DT Periph Server*/ @@ -307,7 +306,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1219,4 +1219,3 @@ void SVCCTL_InitCustomSvc( void ) } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h index 559808169..5e6be9dc3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h index e9e85881b..7937863b0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -86,4 +85,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_HR_SENSOR_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h index c3304bccc..51bec2537 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,5 +227,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c index 20b2549cf..df7a62b0e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_client_app.c * @author MCD Application Team * @brief data throughput client Application - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -476,5 +475,3 @@ static SVCCTL_EvtAckStatus_t DTC_Event_Handler( void *Event ) return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h index 372a3246a..92facc094 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_client_app.h * @author MCD Application Team * @brief Header for dt_client_app.c module - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +40,3 @@ void DTC_App_LinkReadyNotification(uint16_t ConnectionHandle); #endif #endif /*__DTC_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c index 15520599a..80f418cab 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_server_app.c * @author MCD Application Team * @brief data throughput server Application - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -292,4 +291,3 @@ static void BLE_App_Delay_DataThroughput(void) DTS_STM_UpdateCharThroughput( (DTS_STM_Payload_t*) &ThroughputToSend); DataReceived = 0; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h index b40127259..a5c23835b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_server_app.h * @author MCD Application Team * @brief Header for dt_server_app.c module - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -51,5 +50,3 @@ typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t #endif #endif /*__DTS_SERVER_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c index 4d6d37f0f..85f3e044b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dts.c * @author MCD Application Team * @brief Data Transfer Service (Custom) - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -353,5 +352,3 @@ tBleStatus DTS_STM_UpdateCharThroughput(DTS_STM_Payload_t *pDataValue ) (uint8_t *) pDataValue->pPayload); return result; }/* end DTS_STM_UpdateChar() */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h index a4afee9ba..bf30a32c8 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dts.h * @author MCD Application Team * @brief Header for ble_application.c module - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -79,5 +78,3 @@ tBleStatus DTS_STM_UpdateCharThroughput(DTS_STM_Payload_t *pDataValue ); #endif #endif /*__DTS_STM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h index fc8f3cbca..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..4eecadfdd 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +701,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/readme.txt index a3067555b..81da97319 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_DataThroughput/readme.txt @@ -8,12 +8,12 @@ * @brief Data transfer via notification from server to client with a timer that enables to calculate the throughput at application level. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc index bf944b52a..670601b18 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc @@ -35,8 +35,8 @@ Mcu.PinsNb=14 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -73,6 +73,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB15CCUx +ProjectManager.Example=BLE_HeartRate +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -177,5 +179,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_HeartRate -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex index bd3482b3d..997ac83ad 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:10000000081000204D3B0008E93B0008EB3B0008CE -:10001000ED3B0008EF3B0008F13B0008000000004A -:10002000000000000000000000000000F33B00089A -:10003000F53B000800000000F73B0008F93B000812 -:10004000B13D0008B53D0008B93D00081B3C000863 -:10005000BD3D0008C13D0008093C0008C53D000841 -:10006000C93D0008CD3D00080F3C0008D13D000807 -:10007000D53D0008D93D0008DD3D0008E13D000800 -:10008000E53D0008E93D0008ED3D000800000000E6 -:1000900000000000F13D0008F53D0008153C000897 -:1000A000F93D0008FD3D0008013E0008053E00083E -:1000B000093E00080D3E0008113E0008153E0008EC -:1000C0000000000000000000193E000800000000D1 -:1000D0001D3E0008213E000800000000253E0008EB -:1000E000293E00082D3E000800000000313E0008B7 -:1000F000FD3B0008013C0008053C0008353E0008B7 -:10010000393E000800000000000000000000000070 -:100110003D3E0008413E0008453E0008000000004A +:1000000008100020453E0008E13E0008E33E0008DD +:10001000E53E0008E73E0008E93E00080000000059 +:10002000000000000000000000000000EB3E00089F +:10003000ED3E000800000000EF3E0008F13E000821 +:10004000A9400008AD400008B1400008F53E000896 +:10005000B5400008B9400008053F0008BD40000851 +:10006000C1400008C54000080B3F0008C940000817 +:10007000CD400008D1400008D5400008D940000814 +:10008000DD400008E1400008E540000800000000F5 +:1000900000000000E9400008ED400008113F0008A2 +:1000A000F1400008F5400008F9400008FD40000854 +:1000B0000141000805410008094100080D41000800 +:1000C00000000000000000001141000800000000D6 +:1000D0001541000819410008000000001D410008FA +:1000E00021410008254100080000000029410008C6 +:1000F000F93E0008FD3E0008013F00082D410008C0 +:100100003141000800000000000000000000000075 +:1001100035410008394100083D4100080000000059 :1001200000000000000000000000000000000000CF -:100130000000000000000000493E00084FF0B04001 +:100130000000000000000000414100084FF0B04006 :10014000006800F0F000B02888BFB02070472DE9AB :10015000F041040054D0207881064FF0B04538D5E6 :10016000A868E96810F00C0001F0030103D00C2826 @@ -146,8 +146,8 @@ :10090000C00000F023F80646296801F00701A14263 :10091000E7D1002070BD00000801005898100020A9 :100920008C10002090000058000400588C80C111E9 -:1009300000400058080000580C3B00080024F40058 -:100940000048E801CC3A000840420F00286000F05F +:100930000040005808000058043E00080024F4005D +:100940000048E801C43D000840420F00286000F064 :1009500033B8000012000000240000003600000040 :100960004000000000000000010000000200000044 :100970000300000070B50F4E044630780025A8B182 @@ -180,830 +180,878 @@ :100B200000F01F010A4B8A40400943F8202070471B :100B300000E400E018ED00E00CED00E00000FA0534 :100B400000E100E080E100E010E000E000E200E011 -:100B500080E200E02C4981B00A6802430A6009681B +:100B500080E200E0474981B00A6802430A60096800 :100B600008400090009801B0704780B54FF4002015 :100B7000FFF7F0FF002200212E20FFF777FFBDE8EE -:100B800002402E20FFF790BF00682049884200D025 +:100B800002402E20FFF790BF00683B49884200D00A :100B9000704780B54FF48010FFF7DCFF0022002182 :100BA0002C20FFF763FF2C20FFF77EFF002200219F :100BB0002D20FFF75BFFBDE802402D20FFF774BF3B -:100BC0001CB504461249206888421CD1FFF7FAFE82 -:100BD000FFF7F8FE0F48816B21F4407141F48071FA -:100BE0008163816B41F400418163026842F4806259 -:100BF0000260006800F48060009000982046BDE824 -:100C0000164000F015B813BD50000058000C0058F5 -:100C100000280040580000588A60FF210268516295 -:100C2000012180F82110002180F820100020704759 -:100C300090F82010012901D102207047012280F88C -:100C40002020022180F82110CA210268516253211C -:100C50000368596201688A6842F02002DCE7704745 -:100C6000DFF83C150A6892B200E00246086880B2DC -:100C70008242FAD170472DE9FC4104461825DFF87D -:100C80002485DFF82465684308EB000730780628E0 -:100C900008D131787170347078754FF0FF30706022 -:100CA000002039E000F077F8B9680918B96008F158 -:100CB0000803B96832786A439A589142327813D35C -:100CC00008F1150315FB02FC13F80C30062B25D098 -:100CD00008F108066B43F358994222BF08F1150347 -:100CE0006A439A5CEED219E01146337869439A421E -:100CF0000BD008F1140308F1150C5B5C15FB03F530 -:100D00000CF805407A753B7500E07A7508F114021D -:100D10005454317871703470BDE8F68111466943DE -:100D200008F115035B5C062B04D008F1140615FBD3 -:100D300003F574557B753A7508F115025454EBE7C9 -:100D4000F8B5DFF86434DFF85C541E7818240246E6 -:100D50006243B0422A4404D118785870507D18700C -:100D60000FE0167D507D92F815C005F1150766431A -:100D7000062807F806C004D0167D143514FB00F4CD -:100D80002E55012010731878062802BF00294FF055 -:100D9000FF315960F1BD10B5DFF80C44606810F107 -:100DA000010F0FD0FFF75CFF6168DFF8002481427C -:100DB00061683CBF5388C918081A517848431178B4 -:100DC000C84000E0002080B210BD2DE9F84FDFF8E8 -:100DD000DC53DFF8DCB3D5F80880D8F80000DBF886 -:100DE00000104A0500F090F9DFF8BC63DFF8B4A307 -:100DF00021F4806181604FF0180934780AF108000D -:100E000019FB04F14758FFF7C6FF874217D20027A6 -:100E10000121B170062C3DD019FB04F40AF1080140 -:100E20000AF108020959814223BF0AF10801095950 -:100E3000091A002111510AEB04014C7DEAE7A98847 -:100E40004118B94202D2AF880021E2E73F1ADFE73A -:100E5000022802DA2878012800D07F1ED8F8000086 -:100E6000C1684A07FAD500F055F9DBF80C00000C10 -:100E7000BFB247EA0047CBF80C70FFF7F1FE706095 -:100E8000A8680068816841F480618160AFF30080E8 -:100E9000BDE8F18FB8B20028DAD1FFF7E1FE70604B -:100EA0000320BDE8F24FFFF72DBE2DE9F843EFF325 -:100EB000108872B6BD4DBB4BA8680168CA224A6251 -:100EC00053204862B84A886820F4806088601820FF -:100ED0001678374647431F44387B022826D13C68A2 -:100EE000D7F810909078F0B17A7B012A0AD10121CD -:100EF0003046FFF725FF88F310887968304600F008 -:100F000016F904E088F31088304600F0C1F8A868AC -:100F10000068CA2141622246532141624846314657 -:100F200000F050F90BE0FFF750FF06E0C8684207F9 -:100F3000FCD500F07EF89F49086088F31088FF21F7 -:100F4000A86802685162BDE8F183F8B5974CA160CA -:100F5000CA2209684A6253224A62954A136843F0DA -:100F600020031360136803F00703C3F10403237025 -:100F700095682D0C05F07F056D1C6570EDB29268CB -:100F8000C2F30E02521C628092B2521E6A43A2F554 -:100F9000A072DA404FF6FF739A422CBFA380A28062 -:100FA000854A136843F400231360844B1D6845F49D -:100FB00000251D6048BB7C487A4E012383701825AC -:100FC0004FF0FF33436000235FFA83FC06F10C0708 -:100FD00015FB0CFC4FF0000E07F80CE05B1CDFB2B9 -:100FE000062FF1DB06230370886820F48060886098 -:100FF00000F01FF8D0600320FFF78FFDA16808689C -:10100000826842F48042826005E0C868410544BFBE -:101010000320FFF777FDA1680A68FF2050620022D5 -:1010200003210320FFF722FDBDE8F2400320FFF774 -:101030003BBDC86800F0800060F49060C8604FF469 -:1010400000207047F0B504460025EFF3108672B615 -:101050001827DFF850C10CF10C0007FB05FE10F853 -:101060000E0010B16D1C062DF5DB062D0CD06F4364 -:101070000CEB07000127077386F3108804614273A5 -:1010800003600D700020F0BD86F310880120F0BDD4 -:10109000F8B50746EFF3108472B60320FFF70FFD93 -:1010A000424DAE683068CA2141623A4653214162DE -:1010B000182043494243895C02291BD1002138464C -:1010C000FFF73EFE3848017806290ED130683849CE -:1010D0000A68530500F018F821F480618160C16846 -:1010E0004A07FCD500F016F804E04078884218BFA3 -:1010F000FFF76BFEA9680A68FF2050620320FFF724 -:10110000D3FC84F31088F1BD02D5C1684A07FCD432 -:1011100081687047C16801F0800161F49061C1602D -:101120004FF40020234908600320FFF7F6BC2DE9A7 -:10113000F04180460F46424618201A4942438C1817 -:10114000207B022804BF4046FFF7A2FFEFF3108583 -:1011500072B60320FFF7B3FC144EB0680068CA21D2 -:1011600041625321416202202073A76067604046BC -:10117000FFF781FD0C490A784978914202D0FFF7C8 -:1011800024FE02E0A168081AA060FF20B1680A6886 -:1011900050620320FFF788FC85F31088BDE8F081DA -:1011A000282800409C1000206413002030130020E9 -:1011B000082800400C080058000800588008005813 -:1011C000A81000201047704710B58EB002A80FF28B -:1011D0000441D54C302200F025FA0FF2A9300190DD -:1011E000009469460FF2853000F060FA0121022078 -:1011F00000F045FBCD4A0021042000F0D8FB02A8F6 -:1012000000F056FC08B100F04BFD00F09FF800F034 -:1012100049FDC74C0FF23D32002084F880000021C8 -:101220004FF6FF70E082012000F0C1FB00F09EFD50 -:1012300000F0C5FD0FF21533002204F181010020FA -:10124000FFF700FF022060768021012020760D202C -:10125000A076022020761820E07603202076B5487C -:101260000180A0214180012000F019F90EB010BDCD -:101270007CB50646AE4D7078052805F1800404D093 -:101280003E280DD0FF2824D03AE0B088E98A884271 -:1012900002D10020E8822070012000F000F92FE048 -:1012A000F178012908D00C292AD1E88A6A460DF183 -:1012B000010100F000FE23E06078FFF7E9FE2078EE -:1012C00004280CBF062005202070B6F80500E8822F -:1012D00016E0B6F8030040F20241401A08D0C01EE2 -:1012E0000BD0001F02BF0121E88A01F01EF807E0C1 -:1012F000E88A914900F009FF02E0E88A00F0BDFFAA -:10130000012076BD00F0A7BF8948C08A00F04ABF1F -:101310001CB5874CE08A01AA0DF1050100F0CBFD58 -:1013200098B99DF80500022804BF9DF80410022911 -:1013300003D100200090012302E00020009002234E -:10134000E08A1A46002100F011FE13BD78B50FF2B5 -:1013500048207A4D00887A4E89B0ADF81A0000F026 -:1013600075FD286810F1010F0ED069683074090A04 -:10137000000A707406F110046868B074F174080A09 -:10138000090C3075717506E0002000F0E9FF0400DB -:1013900008BF0FF2102422460621002000F0F2FFC1 -:1013A00060793072102120797072E078B072A07884 -:1013B000F0726078307320780FF2F0147073224668 -:1013C000182000F0DFFF0FF2F41600F063F84EF67D -:1013D0006E50089007AA2868079006212E2000F07A -:1013E000D1FF22461021182000F0CCFF00F052F867 -:1013F0001821012000F0EDFF01F016F80DF11600A4 -:1014000006A90190009105AB07220021012000F000 -:1014100099FE0FF28810BDF81810454C0090052376 -:10142000BDF81400002201F0BFF80DF11A00009081 -:101430000223BDF81610BDF81400002201F0B4F824 -:1014400002220221002000F069FD0120207000F03E -:1014500010FE01206070012108202071A170102071 -:10146000607100210020E070049110213548A060D7 -:101470000390082200200290019100920023012293 -:101480000121012000F00EFEA07808B100F0C8FE96 -:101490000AB070BD32461021082000F073BF2DE95C -:1014A000F8420746012F87B003D1224805884688B5 -:1014B00003E04FF4C8654FF47A66DFF8749009F1E1 -:1014C00080046078FFF7E4FD022F05D12078012821 -:1014D00014BF022800F072FD2770002006900590CE -:1014E00009F119010491062299F818000FF2DC01A4 -:1014F0000390029101920023009332462946002076 -:1015000000F06EFD0E490E2000F062FE002808BFBC -:10151000012F06D160780C4908B0BDE8F042FFF712 -:1015200006BE08B0BDE8F082A0080320EB16000854 -:101530002C1100207813002040E201008075FF1F6D -:101540006C10002007B2010046E0010000210120DC -:1015500000F03ABA0220A2E70021042000F034BAD9 -:10156000012000F057BA012000F05CBA10B5044623 -:10157000616801F1080000F0A5FB00B101202070B6 -:1015800010BD000010B1012803D07047072000F003 -:101590002FBA072000F034BA4003000048525354D9 -:1015A0004D000000000000000000000012345678DA -:1015B0009ABCDEF0123456789ABCDEF0FEDCBA0932 -:1015C00087654321FEDCBA098765432109485253E8 -:1015D000544D00000000000000000000000000006A -:1015E00000000000000000001E0004000A050201C7 -:1015F00012279C00F4010000FFFF000048010100D9 -:101600000020000062B38B0708D0521E11F8013B86 -:1016100000F8013B00F024808B07F6D1830740F0EF -:10162000208000BF103A07D330B4B1E83810103A28 -:10163000A0E83810F9D230BC530724BFB1E8081035 -:10164000A0E8081044BF51F8043B40F8043BD2071F -:1016500024BF31F8022B20F8022B44BF0B78037013 -:101660007047121F17D35B0009D151F8043B20F8D3 -:10167000023B1B0C121F20F8023BF6D20BE051F884 -:10168000043B00F8013B1B0A20F8023B1B0C121F15 -:1016900000F8013BF3D238BF121D521E24BF11F8CF -:1016A000013B00F8013BF8D8704700007FB50C46BD -:1016B0006D4D61686D4EE8612962284600F0E0FFDB -:1016C000246805F1240000F0E5FF746006F10800CD -:1016D00000F0E0FF01203070296829B10FF25510A9 -:1016E00000900294684688477FBD1FB55F4C04F1A7 -:1016F000080000F0D2FF00BB2178F1B1694604F187 -:10170000080000F0F3FF5848C16949B10098029001 -:1017100001228DF8042001A888479DF8040000E00C -:1017200001202070207818B1009801F094F804E0AE -:10173000009904F1080000F0B9FF04F1080000F07E -:10174000ACFF28B9207818B104F10800FFF704FFB6 -:101750001FBD2DE9F8430646002000F05FF87488AD -:101760003088B268DFF80081C4F3090444EA8024B9 -:10177000F068A4B2C1B2204600F03CF8002748F25D -:10178000E8094846FFF7EFFE08E06888A04202D16A -:10179000316928780870687800B1012708F12400C1 -:1017A00000F07BFFF0B9694608F1240000F09EFFCD -:1017B000009800F10B05407A0F28E6D0B5F801102B -:1017C000A1420DD10098817AC81E7169C0B28842C9 -:1017D000C8BF0846706102463069E91CFFF712FF76 -:1017E0002878D9E73800CCD0012000F017F8002085 -:1017F000BDE8F28310B513461C4A5468A4F80900EA -:10180000E1720A46194604F10C00FFF7FBFE164A86 -:101810001369BDE810400021002018471249096AE9 -:1018200082B008B921B101E011B1012002B008472E -:1018300002B0704710B50146487A0F2818BF0E282D -:1018400007D10B4800F03CFFBDE810400020FFF737 -:1018500087BE064C04F1080000F032FF04F10800D6 -:10186000BDE81040FFF778BE6C1200201013002076 -:10187000901200201948002101604160704710B5A6 -:1018800000F00CF85C6819B1012904D1204301E093 -:1018900024EA0000586082F3108810BDEFF3108234 -:1018A00072B60E4B704738B5EFF3108472B60B4921 -:1018B0000B4D086820B129688847686880470AE0AE -:1018C000486820B1A9688847E868804703E028692C -:1018D00080476869804784F3108831BD3C1300203D -:1018E000843D00082DE9FC475B4CDFF87091A56949 -:1018F0002840A0614FF0FF3A4FF0010830E0491C4A -:1019000054F831000642FAD004EBC1061840716861 -:101910001040014208BFC6F804A07768384000F0C4 -:101920009FF8606208FA00F087437760EFF3108158 -:1019300072B6626A206908FA02F2D243104020614E -:10194000022004EBC00353F8086C1640401E43F815 -:10195000086CF6D181F31088606A59F82010884726 -:1019600063692069A2691840104207D0E069216AC2 -:10197000084203D1002103EA0206C1E7C4F824A00B -:1019800000F0B7FFEFF3108972B62169606901407A -:10199000A069014201BFE169206A014201F012F829 -:1019A00089F3108801F02BF8A561BDE8F38738B5FD -:1019B0001446EFF3108572B600F052F8274941F84B -:1019C000204085F3108831BD10B500F00BF80443BA -:1019D0001C6153F83140204343F83100FFE782F3A4 -:1019E000108810BDEFF3108272B61B4B1C69704754 -:1019F000EFF3108172B6184A536923EA000005E03C -:101A0000EFF3108172B6144A53691843506181F3A1 -:101A100010887047EFF3108172B60F4AD3691843EC -:101A2000D061F4E7F8B50C4C656A276A2E4615F1CB -:101A3000010F0EBF0025012101FA05F5206202E029 -:101A4000284600F0C1FF216AE0690842F8D08843C7 -:101A50006662E0612762F1BD44100020B0110020F1 -:101A600002460020110C090404BF1020120412F0D9 -:101A70007F4F04BF083012020FF2180112F0704FAE -:101A800004BF001D1201120FC0F11F00895C401A33 -:101A9000C0B270470403020201010101000000000E -:101AA0000000000001F001F89DF80E0005B000BD37 -:101AB000F8B500F10C026B4624214FF66640F1E7C1 -:101AC000F8B500F10C026B460F214FF66840E9E7CC -:101AD00080B567494FF400400860FEF77BFF0020A7 -:101AE00000F03EFC48B180796249634A0A600A68A6 -:101AF00022F47C5242EA00220A6000F015F800F05D -:101B000080F85E48016800220260026902F050021B -:101B1000026100F0A0F800F07FF800F0EBFE4FF05B -:101B2000FF30FFF7DFFEFAE718B5A5B014A844218F -:101B300001F00AF801A81C2101F006F808A83021DC -:101B400001F002F8FEF73EFF4D48016821F0180150 -:101B50000160072014904FF48031012016901591F8 -:101B60004020189000214FF480741E91179414A8FF -:101B7000FEF7EDFA08B100F093F86F200190022112 -:101B80000020029103900490059006900790012197 -:101B900001A8FEF759FD08B100F082F84FF460503B -:101BA000089002214FF48040119012911020139060 -:101BB000109408A800F0D6FF08B100F071F8314980 -:101BC000086820F0700008602F480268C2F3032004 -:101BD0000090009830B90A681209120142F004021C -:101BE0000A6008E000980A68801E80F30400120969 -:101BF00040EA02100860086840F40040086026B01F -:101C000010BD80B521482249016001F067F810B18C -:101C1000BDE8014044E001BD002110B51D481E4C47 -:101C2000416004600F21816047F6FF71C1600021AF -:101C300001618161416101F089F808B100F030F87B -:101C4000CA206062FF2153206062A068C008C00003 -:101C5000A060616210BD114881B0016841F00401CB -:101C60000160006800F004000090009801B0704727 -:101C7000104000589C000058FECAFECA8008005858 -:101C8000900000581C0400585875FF1F30120020A7 -:101C9000000C005898120020002800404C0000580A -:101CA00072B6FEE71C490020087700221B4802702C -:101CB00000F036B818490A7F41F82200087F401C1E -:101CC0000877704770B504466078FF2802BFB4F803 -:101CD000031001F47F41B1F5406F12D100260E4D83 -:101CE00000E0761C297FF0B288420AD2F1B255F8A2 -:101CF0002110204688470100F3D002D0022805D0E9 -:101D000006E02046BDE87040FFF7B2BA002070BD83 -:101D1000012070BD00000000E012002080130020B0 -:101D200080B501F0B7F801F0B6F801F0B5F801F0B0 -:101D3000B5F801F0EDF801F0ECF801F069F901F007 -:101D4000CDF901F0CCF901F0CBF901F0CAF901F0BD -:101D5000C9F901F0C8F901F0C7F901F0C6F901F0BD -:101D6000C5F9BDE8014001F0C2B90000E0B505A029 -:101D7000042100908DF8041042F62920694601F0F4 -:101D8000B4F807BD53544D0010B500782B4C18B172 -:101D900002280FD004D310BDA0800120207310BDF5 -:101DA000607BFFF775F9607BBDE8104040F60101EC -:101DB000FFF7BDB9607BBDE81040FFF769B910B50A -:101DC0000FF2450200210220FFF7F1FD1B4C00211C -:101DD000042021732070214642F6382001F063F977 -:101DE0001F20E07204F10D010A20A0800120A072E2 -:101DF0004FF48060E0800122BDE810400FF24503FF -:101E00000020FFF71FB900000D480C490068CA7A8E -:101E100000F00700413048801307087B04D518B94B -:101E20008888401D888003E0012804BF00200873D3 -:101E3000891C42F6372001F036B90000001300205B -:101E40002828004000210220FFF7BEBD00B587B062 -:101E500000F010F8012003220690ADF80420ADF840 -:101E6000062000F0A5F800284CBFFF209DF80000D8 -:101E700007B000BD00208DF800001822002101A845 -:101E800001F03CB9ADF80600049107A80121082231 -:101E900003900691ADF8042070470922002168469E -:101EA00001F02CB91822002102A801F027B918224C -:101EB00001A801F023B970B5C8B006460C46154616 -:101EC0000522FFF7EBFFADF82060FFF7EBFF3021B5 -:101ED00000F014F80521049000F019F8002848BF1C -:101EE000FF2009D49DF8000030B99DF80300207050 -:101EF0009DF804002870002048B070BDADF80A10AD -:101F000008200221ADF80800059108A87047079144 -:101F1000CDF818D0002102A8FFF71BBC00B5C7B050 -:101F200000F00EF8FFF7C3FF312000F013F800F0C7 -:101F30003FF800284CBFFF209DF8000047B000BDCF -:101F400000238DF81C008DF8003007A841708270C6 -:101F500000217047ADF8060007A90320049008226D -:101F6000012003910690ADF80420704730B5C7B04A -:101F70000025ADF81C008DF81F2007A84A9C817031 -:101F800003718DF80050ADF82140FFF776FF0F2167 -:101F9000029132200721FFF775FF00F009F80028B1 -:101FA0004CBFFF209DF8000047B030BD0390069164 -:101FB000CDF814D0002101A8FFF7CBBB00B587B046 -:101FC00000F045F900F073F9812000F03BF900F0D2 -:101FD00085F900284CBFFF209DF8000007B000BD28 -:101FE0002DE9F84DC7B09446DDF840E1519A559D72 -:101FF000569EDDF84CA1ADF81D108DF81C004FF079 -:10200000000BADF81FC08DF821308DF822E000F0F4 -:1020100024F800F017F824F8095F668000F047F90B -:102020003F20832100F075F9574406910D3704973E -:1020300000F057F900284CBFFF209DF8000048B081 -:10204000BDE8F08D88F800A007AC5499E419524619 -:1020500008F10100544401F04BB88DF823201746D5 -:1020600052998DF800B00DF1240809A8B84401F088 -:102070003FB800B5C7B000F00CF8852000F0C3F8F9 -:1020800000F02CF900284CBFFF209DF8000047B05D -:1020900000BD00218DF81C008DF80010182201A849 -:1020A00001F02CB82DE9F841C7B04FF0000800F05E -:1020B00026F80DF12300DDF844E14E9F4F9E509D20 -:1020C000529C8DF81F30C0F800E08DF800808DF82C -:1020D00020708DF821608DF822508DF8274000F097 -:1020E000E6F88620ADF8060007A90C2000F0F2F80B -:1020F00000284CBFFF209DF8000000F024B98DF8A7 -:102100001C0007A841708270704700B5C7B000225C -:10211000ADF81C008DF800200DF11E0018220160A2 -:1021200001A8002100F0EAFF8820ADF8060007A909 -:10213000062000F0CFF800284CBFFF209DF80000DB -:1021400047B000BDF8B5C8B005460E4617461C4658 -:1021500000F023F808A8467087708DF8205000F032 -:10216000D3F88A21ADF80A103F20032100F0BFF810 -:10217000002848BFFF200ED49DF8000058B94F99A1 -:102180004E98BDF801202280BDF803200280BDF8E2 -:1021900005000880002049B0F0BD072200216846F4 -:1021A00000F0ACBF00B5C7B00021ADF81C00FFF7D0 -:1021B00073FF0F2102918D20022100F07EF800F0C4 -:1021C0008EF800284CBFFF209DF8000047B000BDEE -:1021D00018B5C7B0044600F03AF88DF81C40224606 -:1021E00000F09FF800F063F83F208E2100F0AEF879 -:1021F000641C049400F075F800284CBFFF209DF883 -:10220000000048B010BDADF8060007A901203F222C -:10221000039104907047ADF8060007A902207047AB -:1022200000B587B000F013F800F041F8922000F0FC -:1022300009F800F053F800284CBFFF209DF800007B -:1022400007B000BDADF806003F2201207047002016 -:102250008DF80000704700B587B0FFF7F8FF00F079 -:1022600026F89420FFF7EEFF00F038F800284CBF66 -:10227000FF209DF8000007B000BD00B5C7B00021E9 -:10228000ADF81C00FFF708FF9520FFF7C4FF00F032 -:1022900021F800284CBFFF209DF8000047B000BD8A -:1022A00000228DF80020ADF81C008DF81E101822B9 -:1022B000002101A800F022BF0321ADF8060004911F -:1022C00007A801213F22039006917047ADF8060050 -:1022D00007A9032004903F22012003910690ADF846 -:1022E0000420CDF814D0002101A8FFF732BAADF8D0 -:1022F0000800059108A8072104900791CDF818D08F -:10230000002102A8FFF725BA1822002102A800F038 -:10231000F5BEADF80400ADF8061007A80121039042 -:1023200070470DF11D0000F0E3BE00B5C7B0FFF728 -:10233000B7FFA520FFF7CAFF00284CBFFF209DF87C -:10234000000047B000BD48B0BDE8F081ADF8040022 -:10235000ADF8061007A80121039006917047000010 -:1023600001460648064AC3798B4218BF904218BFFF -:102370000838F8D18B4218BF00207047F873FF1F50 -:102380000070FF1F18B50C46C7B0114600228DF82B -:1023900000208DF81C008DF81D4022460DF11E0016 -:1023A00000F0A6FE00F02AF83F200C21ADF8040052 -:1023B000ADF8061007A8012103900691A41C04940F -:1023C00000F02CF800284CBFFF209DF8000048B01A -:1023D00010BD00B5C7B000F00AF80F2000F013F8E8 -:1023E00000284CBFFF209DF8000047B000BD002230 -:1023F0008DF800208DF81C008DF81D10182200218A -:1024000001A800F07BBEADF8060007A902200490E9 -:102410003F22012003910690ADF80420CDF814D09E -:10242000002101A8FFF795B900B587B000208DF80D -:10243000000000F0E0F840F20110ADF806003F2285 -:102440000120069000F013F900284CBFFF209DF8F2 -:10245000000007B000BD2DE9F84107460128C7B0CC -:10246000884615461E4608BF022003D002280CBF2E -:10247000102000200DF11D010C1800F036F8012F7E -:102480008DF81C7002D0022F18D019E002273A46AE -:1024900041460DF11D0000F02BFE2570667000F026 -:1024A000AAF83F204FF4817100F016F8FF1C049742 -:1024B00000F0DFF8002805D5FF2009E01027E6E747 -:1024C000472005E09DF8000010B94E9800F067F82D -:1024D000FFE748B0BDE8F081ADF80400ADF80610A4 -:1024E00007A8032103900691704703220021684644 -:1024F00000F004BE2DE9F64F0C460546012CC7B08E -:102500009B4608BF022003D0022C0CBF10200020E5 -:102510000DF11F010E18FFF7E8FF012CADF81C505C -:102520008DF81E4002D0022C2CD02DE00227569CA4 -:10253000559DDDF85091DDF84CA1DDF848814899B2 -:102540003A4600F054F8A6F800B086F8028086F803 -:1025500003A086F804907571B47100F04CF83F2028 -:10256000ADF804004FF4827107A8ADF8061003908F -:1025700003210A370497069100F07BF8002805D55F -:10258000FF2009E01027D2E7472005E09DF8000072 -:1025900010B9579800F003F849B0BDE8F08FBDF8C6 -:1025A000011001800020704730B5C7B01C464A9B1F -:1025B00000F049F800258DF800508DF821402246A2 -:1025C00019460DF1220000F093FD00F014F83F20B1 -:1025D0004FF4837100F042F8A41D049400F049F810 -:1025E00000284CBFFF209DF8000047B030BD0DF122 -:1025F0001F0000F07DBD1822002101A800F07EBD63 -:1026000078B5C7B04C9C4D9D00F01DF800268DF8A4 -:1026100021308DF800608DF822402246294600F0D6 -:1026200019F8FFF7E8FF3F204FF4937100F016F818 -:10263000E41D049400F01DF800284CBFFF209DF815 -:10264000000048B070BDADF81C00ADF81E108DF84C -:10265000202070470DF1230000F04ABDADF80400C2 -:10266000ADF8061007A80121039006917047ADF858 -:102670000420CDF814D0002101A8FFF76AB80000AB -:102680000249016002490161704700BF53270008F9 -:1026900079270008006040607047EFF3108172B640 -:1026A000026882420CBF012000201CE0EFF3108280 -:1026B00072B603680B60486001600868416023E0FF -:1026C000EFF3108272B6086043684B60416048685F -:1026D000016019E0EFF3108172B64268036813607D -:1026E00002684368536081F31088704710B5EFF3B8 -:1026F000108472B602680A600068FFE7FFF7EAFF1D -:1027000084F3108810BD0B6082F3108870470000BE -:1027100000F072BD6C486D49016001F12002426019 -:1027200001F13002826001F13C02026201F14402D7 -:10273000426201F14C02C26001F15402026101F1F6 -:102740007002426101F1740282618031C16100F066 -:1027500071BD38B504465E4D2846FFF79BFF5A48C9 -:102760004068A1680160E168C160856059494160C5 -:1027700000F07CFD58482AE080B553484268136851 -:1027800001211972406800F077FD002002BD38B5C4 -:10279000514C4F4D04E000F041F800982168884703 -:1027A0002846FFF77AFF0028F5D031BD4A48416836 -:1027B000084738B50446494D2846FFF76BFF4248A5 -:1027C000C068A1680160456000F05BFD4448216875 -:1027D000016061684160002032BD80B53A48C2683E -:1027E000136810211972C06800F051FD002002BD6D -:1027F00035483B4AC168C16813680868184738B54E -:10280000374C364D04E000F009F8009861688847BD -:102810002846FFF742FF0028F5D031BD694628461B -:10282000FFF764BF38B504462E4D2846FFF732FF48 -:102830002D48FFF72FFF24480069A1688160E168F7 -:10284000C160056121680160616841602169416181 -:102850006169816131BD80B501462348FFF730FFD2 -:10286000BDE802400FF2050000F021BD38B5164C5E -:102870001D4D06E0FFF7D2FF009920690069FFF7C0 -:102880001FFF2846FFF709FF0028F3D031BD10B520 -:10289000164C2046FFF7FEFE0B4841690C60BDE870 -:1028A000104000F018BD1CB5104C06E069462046EB -:1028B000FFF71CFF009800F01BF82046FFF7EDFE25 -:1028C0000028F3D013BD000000000320AC09032052 -:1028D000480A0320900803204C130020500A0320CC -:1028E00054130020380A032044130020400A032018 -:1028F0007047704710B52048204C88B0016841F4FB -:1029000000410160FEF7B6FF1D480168C908C90013 -:1029100041F00401016000F0F7FC1A490020FEF7C5 -:1029200014FB00F006FD01210120FEF7A8FF00F0D6 -:102930003AF8FFF7EFFE144A00210820FFF737F8B6 -:1029400004F23C500FF245010090019169460FF2EC -:10295000410000F055F804F25470029004F5C9618A -:1029600040F23C5005900391049402A8FFF75AFFEF -:10297000FFF7CEFE08B010BD08000058300003205D -:102980008004005898120020432A00087047000075 -:1029900080B500F0FCFCFEF717FCBDE80440002108 -:1029A0000120FEF76CBF80B50121002000F011FE70 -:1029B0000121012000F00DFEBDE8044001210220AC -:1029C00000F007BEFEF76FBF4FF0FF30FEF78ABF83 -:1029D00000210820FEF7F8BF0220FFF71BB80220F5 -:1029E000FFF720B8012804D0102804D0402804D0D4 -:1029F0007047FEF787BCFEF787BCFEF789BC7047BF -:102A00007FB50C464D4D61684D4EE8612962284600 -:102A100000F046FE2468746006F10800FFF73AFEF5 -:102A2000012000F068F801203070296841B10FF2F0 -:102A3000E9000FF2ED020090019202946846884787 -:102A40007FBD1FB53E4C04F10800FFF726FE00BB1A -:102A50002178F1B1694604F10800FFF747FE3748D5 -:102A6000C16949B10098029001228DF8042001A8A3 -:102A700088479DF8040000E001202070207818B1FC -:102A80000098FFF7E8FE04E0009904F10800FFF762 -:102A90000DFE04F10800FFF700FE28B9207818B1F8 -:102AA00004F10800FFF794FF1FBD2DE9F041054632 -:102AB0000E4690461C46002000F01DF8204F786816 -:102AC000A0F80950C672324641460C30FEF79AFD16 -:102AD0001A4A136900210020984748F2E800FFF7DE -:102AE0007EFF79688A78D21C04F10800FEF78AFD1F -:102AF000BDE8F04101201CB51049124C096A20B90B -:102B000001B188470020207013BD0120207011B151 -:102B1000BDE81C40084713BD0020FFF75DBF000063 -:102B200010B50146064C04F10800FFF7C9FD04F199 -:102B30000800BDE81040FFF74BBF0000BC120020AA -:102B40002013002081130020002200F0B3BD0000FC -:102B5000DFF87C211368010C23EA014343EA0043B8 -:102B6000136070472DE9F041054600272868DFF81B -:102B700064610105B8462FD53468286A04F44074AE -:102B8000844229D0FDF71EFF002C316805D1286A48 -:102B900021F44071014331601DE0306840F4803021 -:102BA000306021F44071326822F480323260286A49 -:102BB000014331603068C0070DD5FDF7FDFE0446C6 -:102BC00041F289383068800705D4FDF7F5FE001B17 -:102BD0004045F7D30327B8462878DFF8FC40C10703 -:102BE00005D5E16F6868890840EA8101E1672878C6 -:102BF000810705D5E16FA86821F440610143E167D1 -:102C00002878C10644BF2869FFF7A2FF287881060B -:102C100044BF6869FFF79CFF287841070AD5E86838 -:102C2000E16F020902F47F220001914300F47F204A -:102C30000843E067286881051ED5A869B0F1804F78 -:102C400018BFB0F1004F00D018B9E16F21F040413A -:102C500008E0E16F21F04041E16720F08050E16F32 -:102C600021F040610843E067A869B0F1C05F03D17B -:102C7000216841F080712160286841050DD5E16F20 -:102C8000E86921F040510143E167E869B0F1005F74 -:102C900003D1216841F4803121602868C10405D541 -:102CA0007168686A21F440410143716028688104B9 -:102CB0000BD5A169E86A21F030010143A161A16946 -:102CC000A86A890840EA8101A1614046BDE8F08117 -:102CD00088000058900000580C000058F8B50446D1 -:102CE0000025ACB104F13406307910B92046FDF767 -:102CF0004BFF0F4F384600F021F8386840F00110C4 -:102D00003860204600F007F835600120307100E09F -:102D100001252846F2BD10B50021064A064B00EBFE -:102D20008104491C06296360E261F8D310BD0000EC -:102D3000000C0058C71100085F0C0008002101605A -:102D40004FF03F1141603F218160704738B504006A -:102D500044D094F8210028B9002184F8201020469E -:102D6000FDF72EFF00F049F8FF2510B100F03FF805 -:102D700034E02168DFF8B0008A6802408A60216888 -:102D80008A68636820690343A06903431A438A6021 -:102D90002168E068086120680169A26841EA02418F -:102DA00001612068C16821F08001C1602068C16CA8 -:102DB00021F00201C1642168CA6CE36960690343C0 -:102DC0001A43CA6420688168880609D400F020F894 -:102DD00030B120684562042100F01FF8012032BDA7 -:102DE00020684562012184F82110002032BD20684E -:102DF0004562042184F821107047022084F82100E4 -:102E0000CA2021684862532022685062204626E08A -:102E100020460BE02068C0F8248084F821100020B0 -:102E200084F8200070470000BFFF8FFF70B5044694 -:102E300040F2E9362068C16821F0A001C160FDF7C9 -:102E4000BBFD05462068C168880606D4FDF7B4FDC1 -:102E5000401BB042F6D3032070BD002070BD70B59A -:102E600004462068C1684A0612D44FF0FF32C2609F -:102E700040F2E936FDF7A0FD05462068C168480626 -:102E800006D4FDF799FD401BB042F6D3032070BD78 -:102E9000002070BD704770477047000018B51B4C8C -:102EA0000020206087B041F60A00ADF818000094B9 -:102EB0000323012206A90120FFF7CDFA42F62922B9 -:102EC0000121ADF818200491A01C05900A220023CE -:102ED000022103920293019300912023208806AAE5 -:102EE0000121FFF707FB08B010BD80B542F629228B -:102EF000904209D10A680548009200220B79418866 -:102F00000088FFF751FB02BD002002BD7C130020AA -:102F10007047704738B5024686B050780024FF28C5 -:102F200039D1B2F803106B4840F60143C91A1FD0DB -:102F3000123901BFB2F80710C088401C81422AD163 -:102F4000957AB2F80500537A0124012D08D10A328E -:102F50000192009300220023FFF752FB002015E0AE -:102F60000A320192009301228023FFF749FB12E00D -:102F70004088B2F80710801C81420CD1507B01249C -:102F8000C10748BF8DF8084002D402208DF8080020 -:102F900002A8FEF7F9FE204607B030BDFEB5014697 -:102FA00001AA487A8DF804004B7A08885070DC0733 -:102FB00004D50888000A9070032300E00223487AB1 -:102FC000040707D54888D0545B1C4888DCB2000A47 -:102FD00010555B1C4C7AE00610D50D7A00200BE0F2 -:102FE00001EB4004DFB2A688D6555B1CA488DEB294 -:102FF000240A94555B1C401CA842F1DB01A935480A -:103000000091DBB2418800880022FFF7CDFAFEBDB7 -:1030100018B587B030482F4CFEF74CFE41F60D0135 -:10302000ADF8181000940823012206A90120FFF72B -:1030300012FA42F63720ADF81800012204920A2055 -:10304000A11C03900023102205910293019300928A -:10305000072300F023F842F63820ADF818000022CC -:103060000492029201920A20211D039002220591EE -:1030700000F012F842F63920ADF818000022049250 -:1030800001920A20A11D03900223082205910293B8 -:1030900000F002F808B010BD00920123208806AAB3 -:1030A0000121FFF727BA80B5002242F63723C01A64 -:1030B00009D0401E0BD10748009101238188008868 -:1030C000FFF772FA02E00846FFF768FF0246104673 -:1030D00002BD00005C130020152F000870477047E8 -:1030E0007047704770477047704770477047704728 -:1030F00010B50446FEF786FA204610BD10B504460A -:1031000010460A460146204600F0EEFA204610BD61 -:10311000C0680840884201D10120704700207047F4 -:10312000C0690840884201D10120704700207047E3 -:1031300010B56C4C02212046FFF7F2FF38B16068F1 -:10314000C043810703D5FFF75AFB022018E0012195 -:103150002046FFF7E5FF38B16068C043C10703D5DB -:10316000FFF715FB01200BE008212046FFF7D8FFF1 -:1031700038B16068C043010703D5FFF794FB08200E -:10318000A06010BD10B5574C00F033F818B9606856 -:10319000C043810306D400F02CF830B96068C04306 -:1031A000810302D5BDE810407AE0082100F022F842 -:1031B00070B96068C04301030AD560684A4940F4A9 -:1031C00000206060086880474FF40020A06010BDB8 -:1031D000202100F00FF858B96068C043810207D57C -:1031E000606840F400106060BDE81040FFF7DEBA90 -:1031F00010BD022120468BE73C4881B0016841F4B4 -:1032000080110160006800F4801000900098384838 -:10321000016841F4007101603648026842F40072AE -:10322000026040BF20BF3448016841F400410160A2 -:1032300001B0704780B53148016841F480110160E8 -:10324000006800F48010009000982648016841F062 -:1032500001010160026842F4803202602C20FDF717 -:1032600023FCBDE802402D20FDF71EBC2448016868 -:10327000490849000160704722494FF480300860D6 -:1032800070471F48016821F00201016070471C4827 -:103290004FF400314160016821F400310160704752 -:1032A0001748016841F400310160FFF7A1BA38B551 -:1032B00004460C4D08212846FFF72AFF30B10A4882 -:1032C0000460686820F40020686031BDA0474FF4B6 -:1032D0000021A96031BD0A48016821F008010160A0 -:1032E00070470000000C00586C130020500100587B -:1032F000D4080058200800580C040058500000580A -:10330000040C0058080C00580248016841F4007190 -:103310000160704708040058564900E0564981B0E2 -:103320000A6802430A60096808400090009801B0EA -:10333000704718B585B068461421FFF705FC0320D7 -:1033400001904FF460410024009102940120FFF7A6 -:10335000E3FF00F097F8474C2068400840002060E9 -:10336000182100910220FFF7D7FF6946434800F07B -:10337000EFF9206820F002002060FDF742FBFDF726 -:1033800046FBFDF74AFB00F011F806B010BD00B592 -:1033900087B068460FF208211C22FEF743F9FFF7B9 -:1033A00076FA6846FEF78CFB07B000BDF0B585B035 -:1033B00068461421FFF7C8FB0026002500240021E1 -:1033C0000FF2CC0000EBC102907988B11368B3F121 -:1033D000904F08D0294FBB4208D0294FBB4204BFB1 -:1033E0009088044304E09088064301E090880543F8 -:1033F000491C2229E4DB00200290012103200390D4 -:103400000191B0B270B100900120FFF785FF01205B -:10341000FFF784FF00F036F80022B1B24FF0904081 -:1034200000F04EFAA8B280B100900220FFF774FFBE -:103430000220FFF773FF114E6946304600F088F90D -:103440000022A9B2304600F03BFAA0B280B1009051 -:103450000420FFF761FF0420FFF760FF084D694675 -:10346000284600F075F90022A1B2284600F028FA9B -:1034700005B0F0BD4C0000584C0100580004004855 -:103480000008004869464FF0904000F061B9000024 -:10349000000000480100000000000048010000009A -:1034A000000000480100000000000048010000008A -:1034B000000000480100000000000048010000007A -:1034C000000000480100000000000048010000006A -:1034D000000000480100000000000048010000005A -:1034E000000000480100000000000048010000004A -:1034F000000000480100000000000048010000003A -:103500000000004801000000000000480100000029 -:103510000000004801000000000000480100000019 -:103520000000004801000000000000480100000009 -:1035300000000048010000000000004801000000F9 -:1035400000000048010000000000004801000000E9 -:1035500000000048010000000000004801000000D9 -:1035600000000048010000000000004801000000C9 -:1035700000000048010000000000004801000000B9 -:1035800000000048010000000000004801000000A9 -:103590000000004801000000000000480100000099 -:1035A000000000000000000000000000903400084F -:1035B000280003202C00032022040400294981B0A4 -:1035C0000A6802430A60096808400090009801B048 -:1035D0007047F0B585B005460C4668461421FFF7E4 -:1035E000B3FA2DB1012D08BF102002D0022D02D157 -:1035F0000120FFF7E3FF0FF28C001B4F30F815009E -:10360000009001210220039007EB850602913068AB -:103610002CB900210191694600F09AF81FE0134986 -:10362000019107EBC504694600F092F80FF26000C3 -:1036300050F8251004F1240000F067F9F268002129 -:1036400004F1240000F05AF90FF240004457B16928 -:1036500000222046FDF70AFA2046FDF725FA002051 -:1036600005B0F0BD4C0000580810002000002110EB -:10367000002000F013B8012000F010B8022000F084 -:103680000DB800000100100040000000060A1700FD -:103690000000001604000016060000167047000027 -:1036A0000249016002490161704700BFB327000869 -:1036B000DB27000800B500BF13009646944610397A -:1036C00028BFA0E80C50FAD85FEA417C28BF0CC0A4 -:1036D00048BF40F8042BC90728BF20F8022B48BF79 -:1036E00000F8012B00BD000062F30F2262F31F42BD -:1036F000401810F0030308D0C91A1FD3DB0748BFD6 -:1037000000F8012D28BF20F8022D130030B4144614 -:103710001546103928BF20E93C00FAD8490728BFD0 -:1037200020E90C0048BF40F8042D890028BF20F88C -:10373000022D48BF00F8012D30BC7047C91818BFD2 -:1037400000F8012DCB0728BF00F8012D70470000BD -:103750002DE9F84F4FF00009614A624B4FF00F0816 -:1037600005460E4633E0604FBD4214BF07270427CD -:103770008F4027434CF82E70C1431C6801EA040CAB -:103780007468E40348BF40EA0C0CC3F800C05C68EE -:1037900001EA040C7468A40348BF40EA0C0CC3F8A7 -:1037A00004C0146801EA040C7468E40248BF40EAEB -:1037B0000C0CC2F800C0546801EA040C716889025C -:1037C00048BF40EA0C0CC2F804C009F10109316895 -:1037D00031FA09F072D0012404FA09F414EA010064 -:1037E000F3D04FEA490C032101FA0CF16FEA010E04 -:1037F0007168012918BF022903D0112918BF1229A5 -:1038000011D1A968F7680EEA010107FA0CF73943EC -:10381000A960696821EA04047168C1F3001101FA22 -:1038200009F10C436C60E968B4680EEA010104FA1E -:103830000CF42143E9604FEA89017468022C18BF37 -:10384000122C12D14FEAD90405EB840401F01C07B5 -:10385000D4F820A008FA07FB2AEA0B0AD6F810B021 -:103860000BFA07F747EA0A0727622C680EEA0407F3 -:10387000347904F0030404FA0CF43C432C607468BB -:10388000E400A2D5DFF864C04FEA990E5CF82E7010 -:1038900001F00C0108FA01F427EA0404B5F1904F95 -:1038A00008BF002709D0124FBD4208BF012704D02E -:1038B000104FBD427FF457AF022759E7BDE8F18FA3 -:1038C00081B0002A14BF8161816201B070470A4A49 -:1038D000136803421CBF1060FFF784B870470000F4 -:1038E00000080058800800580010004808000140F7 -:1038F00000040048000800480C0800580346002057 -:1039000009B95A6070470120704708B90120704713 -:10391000016000207047000000EB8100374AD0F8BA -:103920008010914201D0012070470020704742F47E -:10393000806240F8212070477047704710B500F052 -:1039400083F82F4C00F049F80028FBD1042100F047 -:1039500045F828B92B480068010403D500F040F869 -:1039600000F058F80022032100F03CF826480168D6 -:10397000C908C90041F0010101602448016841F013 -:103980000401016030BF10BD10B51D4C00F028F8D7 -:1039900000F023F80028FBD14FF0B040816801F01F -:1039A0000C01042911D1016841F4803101600168E2 -:1039B0008903FCD581688908890041F00201816092 -:1039C000816801F00C010829FAD10022032100F0DE -:1039D00009F8BDE8104000F03FB8032120469BE7FE -:1039E000002204212046A2E780B500F02DF8074808 -:1039F000016821F00401016030BF01BD00040080B6 -:103A000000140058880400580004005810ED00E02D -:103A100000F022B84FF0B040016841F480710160BD -:103A200001684905FCD581688908890041F00101D8 -:103A30008160416A890889004162816801F00C0156 -:103A40000429FAD1704700000248016821F0020100 -:103A50000160704710E000E00248016841F0020197 -:103A60000160704710E000E01349002008604FF447 -:103A7000E0221248016841F4700101604FF0B0414A -:103A8000086840F0010008608A600D480A6802403A -:103A90000C480A60036823F005030360426852087B -:103AA0005200426000220848C860086820F4802064 -:103AB00008608A617047000008ED00E088ED00E0D2 -:103AC000FBFEF6FA940000580010042201000000EA -:103AD00003000000050000000100000001000000DC -:103AE000060000000A0000002000000002000000A4 -:103AF000040000000800000010000000400000006A -:103B0000800000000001000000020000A08601000B -:103B1000400D0300801A060000350C0040420F00E3 -:103B200080841E0000093D0000127A000024F40089 -:103B300000366E010048E801006CDC020000000065 -:103B400000000000000000000000000000F024F869 -:103B5000012810D00D4880470D480047F0B5434676 -:103B60004C4655465E466746F8B40A4C6B462360A1 -:103B7000BFF34F8F30BF074C2468A546F8BC98466A -:103B8000A146AA46B346BC46F0BD0000693A00080B -:103B90009D3D000870130020024900200860704716 -:103BA000000000007413002019E050F8042BD30724 -:103BB00044BFA9F101039A18091F0023042942F800 -:103BC000043BF9D25FEA817C134604D54FF0000C28 -:103BD000A2F800C09B1CC90744BF0021197050F80F -:103BE000041B0029E1D17047FEE7FEE7FEE7FEE790 -:103BF000FEE770477047704700F012B8FFF798BAB9 -:103C0000FFF7C0BA00F014B80120FFF760BE102023 -:103C1000FFF75DBE4020FFF75ABEFDF746B9000032 -:103C2000024841680278891841607047841000207A -:103C30000449C8680A6882430A60486000F004B812 -:103C400000000000001500587047000010B500F09B -:103C500013F802000023DB4300241068984203D0CD -:103C600011000220ABBE14605068984203D0111DB1 -:103C70000220ABBE546010BD014870470000000038 -:103C80009010002010B450F8041B79B1026843680A -:103C900002440830DC0744BFA9F10104E31852F8DC -:103CA000044B43F8044B091FF9D1ECE710BC7047F3 -:103CB00010B5074979441831064C7C44163404E0A9 -:103CC0000A68081D114488470146A142F8D110BD79 -:103CD0002C000000680000004EF68851CEF2000172 -:103CE000086840F470000860BFF34F8FBFF36F8F18 -:103CF0004FF00070E1EE100A70470000ADFEFFFFCC -:103D0000E80200009C100020700800003000032032 -:103D10000000000071FFFFFF080000008C000000A1 -:103D200028000320000000005DFFFFFF940000005A -:103D30001C010000081000200000000000F00DF839 -:103D4000002801D0FFF7B4FFAFF300800020AFF3ED -:103D50000080FDF7BDFE00F002F80120704700F082 -:103D600001B800000746384600F002F8FBE7000003 -:103D700080B5FFF76BFF024A11001820ABBEFBE7CE -:103D800026000200E9390008113A00083D39000810 -:103D900089390008393900083B390008AFF3008041 -:103DA000FFF79AFFFFF7CAFF0000000000000000C5 -:103DB000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF37 -:103DC000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF27 -:103DD000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF17 -:103DE000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF07 -:103DF000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF7 -:103E0000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFE6 -:103E1000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFD6 -:103E2000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC6 -:103E3000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB6 -:103E4000FFF7FEBFFFF7FEBFFFF7FEBF0000004811 -:103E5000001000480000004871360008773600085E -:103E60007D3600080F0000000F0000000F0000006A -:103E70000000000000000000000000000000000042 -:103E80000000000000000000000000000000000032 -:103E9000000000000000000000000000FFFFFFFF26 -:103EA000FFFFFFFF00000000000000000000000016 -:103EB0000DFF0100000000000000000000000000F5 -:103EC00000000000000000000100000000000000F1 -:103ED00010000000FFFFFFFFFFFFFFFF00093D0094 -:0400000508003D9D15 +:100BC00010B58CB004466846302100F05DF821680D +:100BD0002A4A91420FD14FF4007000904FF000412B +:100BE0000691684600F05EF808B100F0BBF94FF4DA +:100BF0008020FFF7AFFF0CB010BD30B58DB00446BC +:100C000001A8302100F040F821681D4A91422ED100 +:100C1000FFF7D8FEFFF7D6FE1A4DA86B20F4407000 +:100C200040F48070A8634FF480714FF4006001902D +:100C3000099101A800F036F808B100F093F9A86B0B +:100C400040F40040A8630022296841F480612960D3 +:100C50000021286800F48060009000980320FFF7CE +:100C600005FF0320FFF720FF204600F019FA0DB022 +:100C700030BD000050000058000C00580010005813 +:100C80000028004058000058002200F021BA7047A8 +:100C9000DFF87C211368010C23EA014343EA004397 +:100CA000136070472DE9F041054600272868DFF8FA +:100CB00064610105B8462FD53468286A04F440748D +:100CC000844229D0FFF77EFE002C316805D1286AC6 +:100CD00021F44071014331601DE0306840F4803000 +:100CE000306021F44071326822F480323260286A28 +:100CF000014331603068C0070DD5FFF75DFE044643 +:100D000041F289383068800705D4FFF755FE001B93 +:100D10004045F7D30327B8462878DFF8FC40C107E1 +:100D200005D5E16F6868890840EA8101E1672878A4 +:100D3000810705D5E16FA86821F440610143E167AF +:100D40002878C10644BF2869FFF7A2FF28788106EA +:100D500044BF6869FFF79CFF287841070AD5E86817 +:100D6000E16F020902F47F220001914300F47F2029 +:100D70000843E067286881051ED5A869B0F1804F57 +:100D800018BFB0F1004F00D018B9E16F21F0404119 +:100D900008E0E16F21F04041E16720F08050E16F11 +:100DA00021F040610843E067A869B0F1C05F03D15A +:100DB000216841F080712160286841050DD5E16FFF +:100DC000E86921F040510143E167E869B0F1005F53 +:100DD00003D1216841F4803121602868C10405D520 +:100DE0007168686A21F44041014371602868810498 +:100DF0000BD5A169E86A21F030010143A161A16925 +:100E0000A86A890840EA8101A1614046BDE8F081F5 +:100E100088000058900000580C00005810B5FFF7EB +:100E2000D9FD00F06FF900F019F800F049F8464CD0 +:100E30004648606104F1140000F042FA00F077F8CF +:100E400000F053F84248206000206060204600F027 +:100E50006FFA00F06BF900F013FAFCE780B598B078 +:100E600007A84421FFF710FF68461C21FFF70CFF7D +:100E7000FFF7A8FD3748016821F01801016007203D +:100E800007904FF480310891012009904FF4807150 +:100E90000A9140200B900021119107A8FFF757F904 +:100EA0006F20009002210020019102900390049095 +:100EB0000590069001216846FFF7C6FB19B000BDFA +:100EC00010B58CB068463021FFF7DEFE4FF480404D +:100ED0000990022110200B904FF440540A91009485 +:100EE0006846FFF7DFFE0CB010BD002038B51A4D84 +:100EF0001A4C68602C600F20A86047F6FF70E8600D +:100F000000202861A8616861284600F031FA0022BB +:100F10000021284600F034F8CA206062FF215320E7 +:100F20006062A068C008C000A060616231BD0C486A +:100F300081B0016841F004010160006800F0040024 +:100F40000090009801B0704730120020000C00584B +:100F50000010005890000058AC12002000280040FB +:100F60004C000058704770478A60FF210268516248 +:100F7000012180F82110002180F820100020704706 +:100F80002DE9F84300F065F808BF022038D000F0E2 +:100F900067F814D5FFF710FD07462068C1684807B9 +:100FA0000DD5FFF709FDC01B4845F6D300F039F811 +:100FB00026E0FFF701FDC01B484507D3F6E700F028 +:100FC0002AF800F065F8FFF7F7FC07462068C168CB +:100FD0004A07EED5C0F81480206800F013F82A48BC +:100FE000016841F4002101602848026842F40022AF +:100FF00002602068816841F48041816000F01BF844 +:10100000BDE8F2838168C908C900816020688168F1 +:101010000D43856070472068816821F4806181609C +:10102000704720684662032184F82110002084F86C +:101030002000032070472068816841F4806181604E +:1010400001212068466284F82110002084F82000E5 +:1010500070470446884694F82000012815467047DA +:10106000012184F82010022084F82100CA20216880 +:101070004862532022685062FF2620688168480534 +:1010800040F2E93970470000800800580008005815 +:101090002068C16801F0800161F49061C16070470F +:1010A00090F82010012901D102207047012280F818 +:1010B0002020022180F82110CA21026851625321A8 +:1010C0000368596201688A6842F020024CE7000018 +:1010D00000B500BF130096469446103928BFA0E81B +:1010E0000C50FAD85FEA417C28BF0CC048BF40F8DA +:1010F000042BC90728BF20F8022B48BF00F8012B9A +:1011000000BD000080B553484FF40041016000204D +:1011100000F0D2F948B180794F49504A0A600A6814 +:1011200022F47C5242EA00220A6001BD10B54C480C +:101130004C4C88B001680160CA214B48C161532101 +:10114000C161FF220168C908C9000160C261474846 +:10115000016841F40041016000F0C0F944480168B1 +:10116000C908C90041F00401016000F0EFF94149EC +:10117000002000F068FB00F0B2FC0121012000F02B +:10118000B2F900F057F800F001FE3B4A00210820B8 +:1011900000F053FF04F23C500FF231010090019136 +:1011A00069460FF22D0000F0CBFF04F2547002905C +:1011B00004F5C96140F23C5005900391049402A8E3 +:1011C00000F06CFE00F0E0FD08B010BD70470000BC +:1011D00038B5044688B0616801F10B0504A801F038 +:1011E00070F82988B1F5124F22D168461021FFF717 +:1011F0004BFD60680D300078B0B900F09EFC0D200A +:101200008DF800007F218DF802101C480168090C40 +:10121000ADF80C10684601F04DF801F091F800218E +:10122000012000F060F903E0012804BF00202070D5 +:1012300009B030BD80B50121002001F0A2FA0121E2 +:10124000012001F09EFABDE804400121022001F0D6 +:1012500098BA0000104000589C000058FECAFECA10 +:10126000900800583000032008280040080000586B +:1012700080040058AC12002083210008002004E004 +:1012800002E000F044B900BF4FF0FF3000F06EBE46 +:101290000021082000F0DEBE022000F001BF022085 +:1012A00000F006BF012804D0102804D0402804D044 +:1012B000704701F0E3B801F0E3B801F0E5B80000D1 +:1012C000F8B504460025ACB104F13406307910B904 +:1012D0002046FFF759FC0F4F384600F021F83868D8 +:1012E00040F001103860204600F007F8356001201A +:1012F000307100E001252846F2BD10B50021064AF4 +:10130000064B00EB8104491C06296360E261F8D3B7 +:1013100010BD0000000C0058670F00088F0C00087B +:10132000002101604FF03F1141603F218160704713 +:1013300010B5040001D1012010BD607A20B9002150 +:1013400021722046FFF73CFC0220607221680A6887 +:10135000606822F0200202430A602068016841F0C0 +:1013600004010160012060720020E06010BD0000F7 +:1013700038B5040044D094F8210028B9002184F83D +:1013800020102046FFF739FC00F049F8FF2510B186 +:1013900000F03FF834E02168DFF8B0008A680240CE +:1013A0008A6021688A68636820690343A0690343EF +:1013B0001A438A602168E068086120680169A268B0 +:1013C00041EA024101612068C16821F08001C160E9 +:1013D0002068C16C21F00201C1642168CA6CE36914 +:1013E000606903431A43CA6420688168880609D487 +:1013F00000F020F830B120684562042100F01FF8A9 +:10140000012032BD20684562012184F821100020AE +:1014100032BD20684562042184F821107047022003 +:1014200084F82100CA202168486253202268506253 +:10143000204626E020460BE02068C0F8248084F88F +:101440002110002084F8200070470000BFFF8FFFAC +:1014500070B5044640F2E9362068C16821F0A00169 +:10146000C160FFF7A9FA05462068C168880606D45E +:10147000FFF7A2FA401BB042F6D3032070BD002054 +:1014800070BD70B504462068C1684A0612D44FF09A +:10149000FF32C26040F2E936FFF78EFA0546206857 +:1014A000C168480606D4FFF787FA401BB042F6D35E +:1014B000032070BD002070BD01460648064AC3796E +:1014C0008B4218BF904218BF0838F8D18B4218BF22 +:1014D00000207047F873FF1F0070FF1F194800219C +:1014E00001604160704710B500F00CF85C6819B1FC +:1014F000012904D1204301E024EA0000586082F36E +:10150000108810BDEFF3108272B60E4B704738B5DD +:10151000EFF3108472B60B490B4D086820B12968AF +:101520008847686880470AE0486820B1A96888470A +:10153000E868804703E0286980476869804784F34A +:10154000108831BD501300207C400008024801681B +:1015500041F400710160704708040058DFF83C1541 +:101560000A6892B200E00246086880B28242FAD16C +:1015700070472DE9FC4104461825DFF82485DFF883 +:101580002465684308EB00073078062808D13178D5 +:101590007170347078754FF0FF307060002039E062 +:1015A00000F077F8B9680918B96008F10803B9685C +:1015B00032786A439A589142327813D308F115036E +:1015C00015FB02FC13F80C30062B25D008F1080699 +:1015D0006B43F358994222BF08F115036A439A5CA2 +:1015E000EED219E01146337869439A420BD008F1E4 +:1015F000140308F1150C5B5C15FB03F50CF80540B2 +:101600007A753B7500E07A7508F11402545431780C +:1016100071703470BDE8F6811146694308F1150315 +:101620005B5C062B04D008F1140615FB03F574551A +:101630007B753A7508F115025454EBE7F8B5DFF8FD +:101640006434DFF85C541E78182402466243B042CA +:101650002A4404D118785870507D18700FE0167D18 +:10166000507D92F815C005F115076643062807F866 +:1016700006C004D0167D143514FB00F42E5501204D +:1016800010731878062802BF00294FF0FF31596007 +:10169000F1BD10B5DFF80C44606810F1010F0FD0F8 +:1016A000FFF75CFF6168DFF80024814261683CBF9E +:1016B0005388C918081A517848431178C84000E087 +:1016C000002080B210BD2DE9F84FDFF8DC53DFF8C1 +:1016D000DCB3D5F80880D8F80000DBF800104A0524 +:1016E00000F090F9DFF8BC63DFF8B4A321F4806167 +:1016F00081604FF0180934780AF1080019FB04F1F1 +:101700004758FFF7C6FF874217D200270121B17063 +:10171000062C3DD019FB04F40AF108010AF1080275 +:101720000959814223BF0AF108010959091A002108 +:1017300011510AEB04014C7DEAE7A9884118B9422E +:1017400002D2AF880021E2E73F1ADFE7022802DA7F +:101750002878012800D07F1ED8F80000C1684A0709 +:10176000FAD500F055F9DBF80C00000CBFB247EADF +:101770000047CBF80C70FFF7F1FE7060A8680068B6 +:10178000816841F480618160AFF30080BDE8F18F32 +:10179000B8B20028DAD1FFF7E1FE70600320BDE89F +:1017A000F24FFFF7AFB92DE9F843EFF3108872B6A7 +:1017B000BD4DBB4BA8680168CA224A6253204862EB +:1017C000B84A886820F48060886018201678374608 +:1017D00047431F44387B022826D13C68D7F8109035 +:1017E0009078F0B17A7B012A0AD101213046FFF7C7 +:1017F00025FF88F310887968304600F016F904E078 +:1018000088F31088304600F0C1F8A8680068CA2143 +:1018100041622246532141624846314600F050F968 +:101820000BE0FFF750FF06E0C8684207FCD500F068 +:101830007EF89F49086088F31088FF21A868026835 +:101840005162BDE8F183F8B5974CA160CA220968DE +:101850004A6253224A62954A136843F02003136098 +:10186000136803F00703C3F10403237095682D0C7C +:1018700005F07F056D1C6570EDB29268C2F30E0233 +:10188000521C628092B2521E6A43A2F5A072DA40E4 +:101890004FF6FF739A422CBFA380A280854A13683B +:1018A00043F400231360844B1D6845F400251D603C +:1018B00048BB7C487A4E0123837018254FF0FF33D4 +:1018C000436000235FFA83FC06F10C0715FB0CFC58 +:1018D0004FF0000E07F80CE05B1CDFB2062FF1DBC7 +:1018E00006230370886820F48060886000F01FF889 +:1018F000D0600320FFF711F9A1680868826842F4FC +:101900008042826005E0C868410544BF0320FFF7BC +:10191000F9F8A1680A68FF20506200220321032021 +:10192000FFF7A4F8BDE8F2400320FFF7BDB8C86890 +:1019300000F0800060F49060C8604FF400207047B1 +:10194000F0B504460025EFF3108672B61827DFF8CD +:1019500050C10CF10C0007FB05FE10F80E0010B191 +:101960006D1C062DF5DB062D0CD06F430CEB07002C +:101970000127077386F310880461427303600D70BA +:101980000020F0BD86F310880120F0BDF8B50746B1 +:10199000EFF3108472B60320FFF791F8424DAE6862 +:1019A0003068CA2141623A465321416218204349B6 +:1019B0004243895C02291BD100213846FFF73EFED5 +:1019C0003848017806290ED1306838490A6853052D +:1019D00000F018F821F480618160C1684A07FCD5E5 +:1019E00000F016F804E04078884218BFFFF76BFE5D +:1019F000A9680A68FF2050620320FFF755F884F3B6 +:101A00001088F1BD02D5C1684A07FCD481687047CF +:101A1000C16801F0800161F49061C1604FF4002061 +:101A2000234908600320FFF778B82DE9F04180468C +:101A30000F46424618201A4942438C18207B022840 +:101A400004BF4046FFF7A2FFEFF3108572B60320F4 +:101A5000FFF735F8144EB0680068CA21416253217F +:101A6000416202202073A76067604046FFF781FD56 +:101A70000C490A784978914202D0FFF724FE02E02F +:101A8000A168081AA060FF20B1680A6850620320AC +:101A9000FFF70AF885F31088BDE8F0812828004098 +:101AA0009C100020781300204413002008280040D8 +:101AB0000C0800580008005880080058A8100020A2 +:101AC00010470000564900E0564981B00A680243B9 +:101AD0000A60096808400090009801B0704718B586 +:101AE00085B068461421FFF7CFF8032001904FF42A +:101AF00060410024009102940120FFF7E3FF00F011 +:101B000097F8474C20684008400020601821009159 +:101B10000220FFF7D7FF6946434800F099FE20688E +:101B200020F002002060FEF76CFFFEF770FFFEF76A +:101B300074FF00F011F806B010BD00B587B068461C +:101B40000FF228211C2200F06FFF00F0DCF968463C +:101B500000F0A8FB07B000BDF0B585B068461421C1 +:101B6000FFF792F800260025002400210FF2CC0098 +:101B700000EBC102907988B11368B3F1904F08D09F +:101B8000294FBB4208D0294FBB4204BF9088044371 +:101B900004E09088064301E090880543491C26290B +:101BA000E4DB002002900121032003900191B0B2F8 +:101BB00070B100900120FFF785FF0120FFF784FF3F +:101BC00000F036F80022B1B24FF0904000F0FEFE77 +:101BD000A8B280B100900220FFF774FF0220FFF747 +:101BE00073FF114E6946304600F032FE0022A9B262 +:101BF000304600F0EBFEA0B280B100900420FFF769 +:101C000061FF0420FFF760FF084D6946284600F099 +:101C10001FFE0022A1B2284600F0D8FE05B0F0BD9C +:101C20004C0000584C0100580004004800080048CF +:101C300069464FF0904000F00BBE000000000048E5 +:101C40000100000000000048010000000000004802 +:101C500001000000000000480100000000000048F2 +:101C600001000000000000480100000000000048E2 +:101C700001000000000000480100000000000048D2 +:101C800001000000000000480100000000000048C2 +:101C900001000000000000480100000000000048B2 +:101CA00001000000000000480100000000000048A2 +:101CB0000100000000000048010000000000004892 +:101CC0000100000000000048010000000000004882 +:101CD0000100000000000048010000000000004872 +:101CE0000100000000000048010000000000004862 +:101CF0000100000000000048010000000000004852 +:101D00000100000000000048010000000000004841 +:101D10000100000000000048010000000000004831 +:101D20000100000000000048010000000000004821 +:101D30000100000000000048010000000000004811 +:101D40000100000000000048010000000000004801 +:101D500001000000000000480100000000000048F1 +:101D60000100000000000048010000000000000029 +:101D700000000000000000003C1C000828000320B8 +:101D80002C0003202604040000F005BF6C486D49B8 +:101D9000016001F12002426001F13002826001F134 +:101DA0003C02026201F14402426201F14C02C26053 +:101DB00001F15402026101F17002426101F1740209 +:101DC00082618031C16100F004BF38B504465E4DC8 +:101DD000284600F061FF5A484068A1680160E16848 +:101DE000C16085605949416000F00FFF58482AE002 +:101DF00080B553484268136801211972406800F0A9 +:101E00000AFF002002BD38B5514C4F4D04E000F0F0 +:101E100041F8009821688847284600F040FF0028D4 +:101E2000F5D031BD4A484168084738B50446494DA8 +:101E3000284600F031FF4248C068A1680160456053 +:101E400000F0EEFE444821680160616841600020B6 +:101E500032BD80B53A48C268136810211972C06853 +:101E600000F0E4FE002002BD35483B4AC168C1686D +:101E700013680868184738B5374C364D04E000F051 +:101E800009F8009861688847284600F008FF002894 +:101E9000F5D031BD6946284600F02ABF38B5044662 +:101EA0002E4D284600F0F8FE2D4800F0F5FE24489F +:101EB0000069A1688160E168C16005612168016015 +:101EC00061684160216941616169816131BD80B5AD +:101ED0000146234800F0F6FEBDE802400FF205007F +:101EE00000F0ADBE38B5164C1D4D06E0FFF7D2FF31 +:101EF00000992069006900F0E5FE284600F0CFFE59 +:101F00000028F3D031BD10B5164C204600F0C4FEB9 +:101F10000B4841690C60BDE8104000F0A4BE1CB540 +:101F2000104C06E06946204600F0E2FE009800F002 +:101F30001BF8204600F0B3FE0028F3D013BD0000CC +:101F400000000320AC090320480A03209008032066 +:101F500060130020500A032068130020380A032071 +:101F600058130020400A0320704700002DE9FC4769 +:101F7000604CDFF88491A5692840A0614FF0FF3ADA +:101F800021694FF0010834E0521C54F832006169B5 +:101F900019400142F8D0616904EBC206084071683B +:101FA0001840014208BFC6F804A07768384000F026 +:101FB000A5F8606208FA00F087437760EFF31081BC +:101FC00072B6626A206908FA02F2D24310402061B8 +:101FD000022004EBC00353F8086C1640401E43F87F +:101FE000086CF6D181F31088606A59F82010884790 +:101FF0002169A36960690140194205D0E069216A3D +:10200000084208BF0022C0D0C4F824A000F081FE1E +:10201000EFF3108972B6216960690140A06901423D +:1020200001BFE169206A0142FFF72BF989F31088AB +:1020300000F070FEA561BDE8F38738B51446EFF3F4 +:10204000108572B600F05AF82B4941F8204085F30C +:10205000108831BD10B500F00BF804431C6153F833 +:102060003140204343F83100FFE782F3108810BD70 +:10207000EFF3108272B61F4B1C697047EFF31081AB +:1020800072B61C4A536923EA000005E0EFF31081A1 +:1020900072B6184A53691843506181F3108870472B +:1020A000EFF3108172B6134AD3691843D061F4E795 +:1020B000F8B5104C666A256A374616F1010F0EBF57 +:1020C0000026012101FA06F6206202E03046FFF701 +:1020D000DAF8216AE0690842F8D06762EFF310810C +:1020E00072B6E269206A8243E26181F31088256258 +:1020F000F1BD000044100020B01100200246002075 +:10210000110C090404BF1020120412F07F4F04BF09 +:10211000083012020FF2180112F0704F04BF001DB8 +:102120001201120FC0F11F00895C401AC0B2704743 +:102130000403020201010101000000000000000090 +:102140007FB50C464D4D61684D4EE86129622846C9 +:1021500000F0E2FD2468746006F1080000F09CFDC8 +:10216000012000F068F801203070296841B10FF2B9 +:10217000E9000FF2ED020090019202946846884750 +:102180007FBD1FB53E4C04F1080000F088FD00BB88 +:102190002178F1B1694604F1080000F0A9FD374843 +:1021A000C16949B10098029001228DF8042001A86C +:1021B00088479DF8040000E001202070207818B1C5 +:1021C0000098FFF784FE04E0009904F1080000F095 +:1021D0006FFD04F1080000F062FD28B9207818B105 +:1021E00004F10800FFF754F81FBD2DE9F041054642 +:1021F0000E4690461C46002000F01DF8204F7868DF +:10220000A0F80950C672324641460C3000F0FCFB83 +:102210001A4A136900210020984748F2E800FFF7A6 +:102220003EF879688A78D21C04F1080000F0ECFBD3 +:10223000BDE8F04101201CB51049124C096A20B9D3 +:1022400001B188470020207013BD0120207011B11A +:10225000BDE81C40084713BD0020FFF71DB8000073 +:1022600010B50146064C04F1080000F02BFD04F106 +:102270000800BDE81040FFF70BB80000D0120020A6 +:102280003413002095130020FFF7AFFF9DF80E00D8 +:1022900005B000BDF8B500F10C026B4625214FF6E4 +:1022A0006640F1E7F8B500F10C026B460F214FF6DE +:1022B0006840E9E7F8B502466B460E214FF67540D7 +:1022C000E2E770B51B491C4B0A681C49C2F30D02BA +:1022D00001EB82010C6822689A4205D16569A16907 +:1022E000E269E368246904E025696169A2696368B9 +:1022F000A4682E0E067001722E0C467042722E0AD1 +:102300008670C473C5F3031605F00F050571C6701A +:102310000D0E45710D0C85710D0A190E8172C57176 +:10232000190CC1721B0A210E41730373210C8173B6 +:10233000002070BD3C400058B95646A9000003205B +:1023400018B58FB002A80FF2F031D04C342200F053 +:102350006BFB0FF295300190009469460FF27130DB +:1023600000F0E4FC01210220FFF7BDF8C84A00217B +:102370000420FFF762FE02A8FFF78CFF08B1FEF70A +:10238000F1FD00F09FF800F0B5FDC24C0FF22932CC +:10239000002084F8800000214FF6FF70E0820120C9 +:1023A000FFF74BFE00F00CFE00F033FE0FF201339E +:1023B000002204F181010020FFF7C2FA02206076BA +:1023C0008021012020760D20A07602202076182082 +:1023D000E07603202076B0480180A02141800120D2 +:1023E00000F00FF910B010BD7CB50646A94D70780D +:1023F000052805F1800404D03E280DD0FF2824D004 +:102400003AE0B088E98A884202D10020E882207050 +:10241000012000F0F6F82FE0F178012908D00C290E +:102420002AD1E88A6A460DF1010100F06EFE23E030 +:102430006078FFF7ABFA207804280CBF062005204F +:102440002070B6F80500E88216E0B6F8030040F206 +:102450000241401A08D0C01E0BD0001F02BF01214C +:10246000E88A01F07CF807E0E88A8C4900F077FF01 +:1024700002E0E88A01F017F8012076BD00F0FCBF09 +:102480008448C08A00F0B8BF1CB5824CE08A01AA1B +:102490000DF1050100F039FE98B99DF805000228FC +:1024A00004BF9DF80410022903D1002000900123ED +:1024B00002E0002000900223E08A1A46002100F08A +:1024C0007FFE13BD30B50FF23420754D008887B004 +:1024D000ADF81A0000F0E4FD7248016811F1010F37 +:1024E0000ED042682974120A090A697405F11004B1 +:1024F0004068A874EA74100A120C28756A7506E020 +:102500000020FEF7D9FF040008BF0FF2FC1422469A +:102510000621002001F04EF8607928721021207900 +:102520006872E078A872A078E872607828732078E2 +:102530000FF2DC1468732246182001F03BF80FF20A +:10254000E01500F059F822461021182001F032F869 +:1025500000F052F81821012001F053F801F07CF846 +:102560000DF1160006A90190009105AB072200218C +:10257000012000F011FF0FF28810BDF81810454C33 +:1025800000900523BDF81400002201F025F90DF19B +:102590001A0000900223BDF81610BDF814000022A6 +:1025A00001F01AF902220221002000F0E1FD0120D1 +:1025B000207000F088FE0120607001210820207149 +:1025C000A1701020607100210020E07004911021A2 +:1025D0003548A060039008220020029001910092EB +:1025E000002301220121012000F086FEA07808B11D +:1025F00000F030FF07B030BD2A461021082000F05F +:10260000D9BF2DE9F8420746012F87B003D12248F0 +:102610000588468803E04FF4C8654FF47A66DFF812 +:10262000749009F180046078FFF7B0F9022F05D1AA +:102630002078012814BF022800F0EAFD277000204E +:102640000690059009F119010491062299F81800E5 +:102650000FF2DC01039002910192002300933246B5 +:102660002946002000F0E6FD0D490E2000F0DAFEBC +:10267000002808BF012F06D160780C4908B0BDE8DA +:10268000F042FFF7D2B908B0BDE8F082A0080320FD +:102690006B2D00082C1100208C13002040E201005B +:1026A0006C1000208075FF1F07B2010046E001009A +:1026B00000210120FFF7CEBC0220A2E70021042068 +:1026C000FFF7C8BC0120FFF7EBBC0120FFF7F0BC0F +:1026D00010B50446616801F1080000F01BFC00B170 +:1026E0000120207010BD000010B1012803D07047F8 +:1026F0000720FFF7C3BC0720FFF7C8BC400300005A +:10270000485253544D0000006C7AD8AC5772000008 +:10271000123456789ABCDEF0123456789ABCDEF049 +:10272000FEDCBA0987654321FEDCBA0987654321CF +:1027300009485253544D0000000000000000000002 +:102740000000000000000000000000001E00040067 +:102750000A05020112279C00F4010000FFFFFFFFA1 +:102760004801010000200000000000002A4981B05B +:102770000A6802430A60096808400090009801B0A6 +:102780007047F0B585B005460C4668461421FEF743 +:102790007BFA2DB1012D08BF102002D0022D02D1ED +:1027A0000120FFF7E3FF0FF28C001C4F30F81500FB +:1027B000009001210220039007EB8506029130680A +:1027C0002CB900210191694600F042F820E04FF455 +:1027D0000411019107EBC504694600F039F80FF2C6 +:1027E000600050F8251004F1240001F068F8F26848 +:1027F000002104F1240001F05BF80FF2400044577F +:10280000B16900222046FEF731F92046FEF74CF967 +:10281000002005B0F0BD00004C000058081000205A +:10282000002000F013B8012000F010B8022000F0E2 +:102830000DB800000100100040000000060A17005B +:102840000000001604000016060000167047000085 +:102850002DE9F84F4FF00009644A654B4FF00F081F +:1028600005460E4633E0634FBD4214BF07270427D9 +:102870008F4027434CF82E70C1431C6801EA040CBA +:102880007468E40248BF40EA0C0CC3F800C05C68FE +:1028900001EA040C7468A40248BF40EA0C0CC3F8B7 +:1028A00004C0146801EA040C7468E40348BF40EAF9 +:1028B0000C0CC2F800C0546801EA040C716889036A +:1028C00048BF40EA0C0CC2F804C009F101093168A4 +:1028D00031FA09F078D0012404FA09F414EA01006D +:1028E000F3D04FEA490C032101FA0CF16FEA010E13 +:1028F000716801F00307012F1CBF01F003010229D9 +:1029000011D1A968F7680EEA010107FA0CF73943FB +:10291000A960696821EA04047168C1F3001101FA31 +:1029200009F10C436C604FEA8901347904F0030427 +:10293000032C1FD0EC68B7680EEA040407FA0CF702 +:102940003C43EC60347904F00304022C12D14FEACA +:10295000D90705EB870401F01C07D4F820A008FA7A +:1029600007FB2AEA0B0AD6F810B00BFA07F747EA7A +:102970000A0727622C680EEA0407347904F003047E +:1029800004FA0CF43C432C60746814F4403F9CD06F +:10299000DFF864C04FEA990E5CF82E7001F00C016C +:1029A00008FA01F427EA0404B5F1904F08BF0027A4 +:1029B00009D0124FBD4208BF012704D0104FBD42BD +:1029C0007FF451AF022753E7BDE8F18F81B0002AB1 +:1029D00014BF8161816201B070470A4A13680342E3 +:1029E0001CBF1060FEF75EBC7047000080080058F6 +:1029F000000800580010004808000140000400488A +:102A0000000800480C08005862B38B0708D0521E1B +:102A100011F8013B00F8013B00F024808B07F6D150 +:102A2000830740F0208000BF103A07D330B4B1E8EC +:102A30003810103AA0E83810F9D230BC530724BF40 +:102A4000B1E80810A0E8081044BF51F8043B40F872 +:102A5000043BD20724BF31F8022B20F8022B44BFDD +:102A60000B7803707047121F17D35B0009D151F820 +:102A7000043B20F8023B1B0C121F20F8023BF6D24D +:102A80000BE051F8043B00F8013B1B0A20F8023B25 +:102A90001B0C121F00F8013BF3D238BF121D521E4F +:102AA00024BF11F8013B00F8013BF8D87047000043 +:102AB000C0680840884201D101207047002070475B +:102AC000C0690840884201D101207047002070474A +:102AD00010B5684C02212046FFF7F2FF38B160685C +:102AE000C043810703D5FFF7C6F9022018E0012192 +:102AF0002046FFF7E5FF38B16068C043C10703D542 +:102B0000FFF781F901200BE008212046FFF7D8FFED +:102B100038B16068C043010703D5FFF700FA082009 +:102B2000A06010BD10B5534C02212046FFF7C0FF36 +:102B300058B96068C043810307D5606840F400302D +:102B40006060BDE81040FFF78FB908212046FFF70D +:102B5000AFFF70B96068C04301030AD56068464999 +:102B600040F400206060086880474FF40020A060B7 +:102B700010BD20212046FFF79BFF58B96068C04375 +:102B8000810207D5606840F400106060BDE8104025 +:102B9000FFF748B910BD394881B0016841F4801190 +:102BA0000160006800F480100090009834480168CB +:102BB00041F4007101603348026842F4007202601F +:102BC00040BF20BF3048016841F40041016001B0BE +:102BD000704780B52D48016841F48011016000689C +:102BE00000F48010009000982248016841F0010133 +:102BF0000160026842F4803202602C20FDF754FF2D +:102C0000BDE802402D20FDF74FBF2148016849086B +:102C10004900016070471F494FF4803008607047D9 +:102C20001B48016821F002010160704718484FF409 +:102C300000314160016821F400310160704738B50E +:102C400004460C4D08212846FFF732FF30B10A48F0 +:102C50000460686820F40020686031BDA0474FF42C +:102C60000021A96031BD0A48016821F00801016016 +:102C700070470000000C00588013002050010058DD +:102C8000D4080058200800580C0400585000005880 +:102C9000040C0058080C0058006040607047EFF3C7 +:102CA000108172B6026882420CBF012000201CE035 +:102CB000EFF3108272B603680B6048600160086829 +:102CC000416023E0EFF3108272B6086043684B6006 +:102CD00041604868016019E0EFF3108172B6426804 +:102CE0000368136002684368536081F3108870477B +:102CF00010B5EFF3108472B602680A600068FFE74F +:102D0000FFF7EAFF84F3108810BD0B6082F3108890 +:102D10007047704770470000024901600249016135 +:102D2000704700BF2B1E0008531E00087FB50C46DD +:102D30006D4D61686D4EE8612962284600F0C6FD60 +:102D4000246805F12400FFF7A7FF746006F108006E +:102D5000FFF7A2FF01203070296829B10FF255104A +:102D600000900294684688477FBD1FB55F4C04F110 +:102D70000800FFF794FF00BB2178F1B1694604F128 +:102D80000800FFF7B5FF5848C16949B100980290A3 +:102D900001228DF8042001A888479DF8040000E076 +:102DA00001202070207818B10098FFF790F804E017 +:102DB000009904F10800FFF77BFF04F10800FFF71A +:102DC0006EFF28B9207818B104F10800FFF776FCEF +:102DD0001FBD2DE9F8430646002000F05FF8748817 +:102DE0003088B268DFF80081C4F3090444EA802423 +:102DF000F068A4B2C1B2204600F03CF8002748F2C7 +:102E0000E8094846FFF761FC08E06888A04202D163 +:102E1000316928780870687800B1012708F124002A +:102E2000FFF73DFFF0B9694608F12400FFF760FFA6 +:102E3000009800F10B05407A0F28E6D0B5F8011094 +:102E4000A1420DD10098817AC81E7169C0B2884232 +:102E5000C8BF0846706102463069E91CFFF7D4FD1F +:102E60002878D9E73800CCD0012000F017F80020EE +:102E7000BDE8F28310B513461C4A5468A4F8090053 +:102E8000E1720A46194604F10C00FFF7BDFD164A2F +:102E90001369BDE810400021002018471249096A53 +:102EA00082B008B921B101E011B1012002B0084798 +:102EB00002B0704710B50146487A0F2818BF0E2897 +:102EC00007D10B48FFF7FEFEBDE810400020FFF7DA +:102ED000F9BB064C04F10800FFF7F4FE04F108000A +:102EE000BDE81040FFF7EABB801200202413002049 +:102EF000A41200201C490020087700221B48027001 +:102F000000F036B818490A7F41F82200087F401CBB +:102F10000877704770B504466078FF2802BFB4F8A0 +:102F2000031001F47F41B1F5406F12D100260E4D20 +:102F300000E0761C297FF0B288420AD2F1B255F83F +:102F40002110204688470100F3D002D0022805D086 +:102F500006E02046BDE87040FFF746BA002070BD8D +:102F6000012070BD00000000F41200209413002026 +:102F700080B500F0B5FC00F0B4FC00F0B3FC00F04C +:102F8000B3FC00F0EBFC00F0EAFC00F067FD00F0A1 +:102F9000CBFD00F0CAFD00F0C9FD00F0C8FD00F057 +:102FA000C7FD00F0C6FD00F0C5FD00F0C4FD00F057 +:102FB000C3FD00F0C2FDBDE8014000F0BFBD000050 +:102FC000E0B505A0042100908DF8041042F62920F8 +:102FD000694600F0B0FC07BD53544D0010B50078B1 +:102FE0002B4C18B102280FD004D310BDA0800120B3 +:102FF000207310BD607BFEF7C9FC607BBDE810400C +:1030000040F60101FEF711BD607BBDE81040FEF700 +:10301000BDBC10B50FF2450200210220FFF70DF8EC +:103020001B4C0021042021732070214642F63820D9 +:1030300000F05FFD1F20E07204F10D010A20A08066 +:103040000120A0724FF48060E0800122BDE81040B2 +:103050000FF245030020FEF773BC00000D480C4939 +:103060000068CA7A00F00700413048801307087BE7 +:1030700004D518B98888401D888003E0012804BF62 +:1030800000200873891C42F6372000F032BD000092 +:10309000141300202828004000210220FEF7DABF88 +:1030A00000B587B000F01FF8012003220690ADF8AC +:1030B0000420ADF8062000F0A5F800284CBFFF2042 +:1030C0009DF8000007B000BD182201A800F03DBD2A +:1030D000ADF80600049107A801210822039006918B +:1030E000ADF80420704700208DF800001822002160 +:1030F00001A800F02ABD09220021684600F025BD84 +:103100001822002102A800F020BD70B5C8B0064604 +:103110000C4615460522FFF7EFFFADF82060FFF7DC +:10312000EFFF302100F014F80521049000F019F8A9 +:10313000002848BFFF2009D49DF8000030B99DF851 +:10314000030020709DF804002870002048B070BD76 +:10315000ADF80A1008200221ADF80800059108A872 +:1031600070470791CDF818D0002102A8FFF731BEB3 +:1031700000B5C7B000F00EF8FFF7A6FF312000F051 +:1031800013F800F03FF800284CBFFF209DF8000026 +:1031900047B000BD00238DF81C008DF8003007A853 +:1031A0004170827000217047ADF8060007A9032026 +:1031B00004900822012003910690ADF80420704786 +:1031C00030B5C7B00025ADF81C008DF81F2007A84A +:1031D0004A9C817003718DF80050ADF82140FFF7D3 +:1031E00085FF0F21029132200721FFF771FF00F0C8 +:1031F00009F800284CBFFF209DF8000047B030BD03 +:1032000003900691CDF814D0002101A8FFF7E1BD8D +:1032100000B587B000F0B4F900F09CF9812000F00F +:103220003DF900F05BF900284CBFFF209DF800003D +:1032300007B000BD2DE9F84DC7B09446DDF840E178 +:10324000519A559D569EDDF84CA1ADF81D108DF894 +:103250001C004FF0000BADF81FC08DF821308DF829 +:1032600022E000F024F800F017F824F8095F6680E7 +:1032700000F070F93F20832100F05DF9574406917A +:103280000D37049700F02DF900284CBFFF209DF862 +:10329000000048B0BDE8F08D88F800A007AC549954 +:1032A000E419524608F10100544400F048BC8DF87E +:1032B0002320174652998DF800B00DF1240809A873 +:1032C000B84400F03CBC00B5C7B000F00CF8852055 +:1032D00000F00DF900F002F900284CBFFF209DF826 +:1032E000000047B000BD00218DF81C008DF80010D3 +:1032F000182201A800F029BC2DE9F841C7B04FF011 +:10330000000800F026F80DF12300DDF844E14E9F9F +:103310004F9E509D529C8DF81F30C0F800E08DF8F4 +:1033200000808DF820708DF821608DF822508DF886 +:10333000274000F00FF98620ADF8060007A90C2001 +:1033400000F0C8F800284CBFFF209DF8000000F0F6 +:1033500014B98DF81C0007A841708270704700B541 +:10336000C7B00022ADF81C008DF800200DF11E0042 +:103370001822016001A8002100F0E7FB8820ADF8C9 +:10338000060007A9062000F0A5F800284CBFFF2082 +:103390009DF8000047B000BDF8B5C8B005460E4620 +:1033A00017461C4600F023F808A8467087708DF871 +:1033B000205000F0BBF88A21ADF80A103F2003210D +:1033C00000F0A7F8002848BFFF200ED49DF80000A9 +:1033D00058B94F994E98BDF801202280BDF80320BE +:1033E0000280BDF805000880002049B0F0BD07222A +:1033F0000021684600F0A9BB00B5C7B00021ADF8B8 +:103400001C00FFF773FF0F2102918D20022100F0B5 +:1034100077F800F064F800284CBFFF209DF800000A +:1034200047B000BD18B5C7B000F0B9F800F092F889 +:103430003F208E2100F0A8F800F053F800284CBF80 +:10344000FF209DF8000048B010BDADF8060007A9A8 +:103450000220704700B587B000F092F800F07AF8CB +:10346000922000F01BF800F039F800284CBFFF2034 +:103470009DF8000007B000BD00B587B000F080F8EF +:1034800000F068F8942000F009F800F027F8002810 +:103490004CBFFF209DF8000007B000BDADF806004E +:1034A0003F220120704700B5C7B00021ADF81C00D5 +:1034B000FFF71CFF9520FFF7C8FF00F00BF800286E +:1034C0004CBFFF209DF8000047B000BDADF80600DE +:1034D00007A9032004903F22012003910690ADF834 +:1034E0000420CDF814D0002101A8FFF772BCADF87C +:1034F000060007A901203F22039104907047032191 +:10350000ADF80600049107A801213F22039006911F +:103510007047ADF80800059108A8072104900791AD +:10352000CDF818D0002102A8FFF753BC18220021C3 +:1035300002A800F00ABBADF80400ADF8061007A819 +:1035400001210390704700228DF80020ADF81C0087 +:103550008DF81E101822002101A800F0F6BA00B55F +:10356000C7B0FFF7F0FFA520FFF7B0FF00284CBF62 +:10357000FF209DF8000047B000BD48B0BDE8F081D5 +:1035800000208DF800007047ADF80400ADF806107B +:1035900007A8012103900691641C04947047044617 +:1035A00000208DF800008DF81C4022460DF11D0012 +:1035B00000F0C5BA18B50C46C7B0114600228DF808 +:1035C00000208DF81C008DF81D4022460DF11E00D4 +:1035D00000F0B5FA00F02AF83F200C21ADF8040005 +:1035E000ADF8061007A8012103900691A41C0494CD +:1035F00000F02CF800284CBFFF209DF8000048B0D8 +:1036000010BD00B5C7B000F00AF80F2000F013F8A5 +:1036100000284CBFFF209DF8000047B000BD0022ED +:103620008DF800208DF81C008DF81D101822002147 +:1036300001A800F08ABAADF8060007A9022004909C +:103640003F22012003910690ADF80420CDF814D05C +:10365000002101A8FFF7BDBB00B587B000208DF8A1 +:10366000000000F0E0F840F20110ADF806003F2243 +:103670000120069000F013F900284CBFFF209DF8B0 +:10368000000007B000BD2DE9F84107460128C7B08A +:10369000884615461E4608BF022003D002280CBFEC +:1036A000102000200DF11D010C1800F036F8012F3C +:1036B0008DF81C7002D0022F18D019E002273A466C +:1036C00041460DF11D0000F03AFA2570667000F0D9 +:1036D000AAF83F204FF4817100F016F8FF1C049700 +:1036E00000F0DFF8002805D5FF2009E01027E6E705 +:1036F000972005E09DF8000010B94E9800F067F89B +:10370000FFE748B0BDE8F081ADF80400ADF8061061 +:1037100007A8032103900691704703220021684601 +:1037200000F013BA2DE9F64F0C460546012CC7B040 +:103730009B4608BF022003D0022C0CBF10200020A3 +:103740000DF11F010E18FFF7E8FF012CADF81C501A +:103750008DF81E4002D0022C2CD02DE00227569C62 +:10376000559DDDF85091DDF84CA1DDF84881489970 +:103770003A4600F054F8A6F800B086F8028086F8C1 +:1037800003A086F804907571B47100F04CF83F20E6 +:10379000ADF804004FF4827107A8ADF8061003904D +:1037A00003210A370497069100F07BF8002805D51D +:1037B000FF2009E01027D2E7972005E09DF80000E0 +:1037C00010B9579800F003F849B0BDE8F08FBDF884 +:1037D000011001800020704730B5C7B01C464A9BDD +:1037E00000F049F800258DF800508DF82140224660 +:1037F00019460DF1220000F0A2F900F014F83F2064 +:103800004FF4837100F042F8A41D049400F049F8CD +:1038100000284CBFFF209DF8000047B030BD0DF1DF +:103820001F0000F08CB91822002101A800F08DB90A +:1038300078B5C7B04C9C4D9D00F01DF800268DF862 +:1038400021308DF800608DF822402246294600F094 +:1038500019F8FFF7E8FF3F204FF4937100F016F8D6 +:10386000E41D049400F01DF800284CBFFF209DF8D3 +:10387000000048B070BDADF81C00ADF81E108DF80A +:10388000202070470DF1230000F059B9ADF8040075 +:10389000ADF8061007A80121039006917047ADF816 +:1038A0000420CDF814D0002101A8FFF792BA00003F +:1038B0000346002009B95A6070470120704708B9D3 +:1038C000012070470160002070470000024901603C +:1038D00002490161704700BFCB1D0008F11D0008BF +:1038E000704770477047000018B51B4C00202060DF +:1038F00087B041F60A00ADF81800009403230122B6 +:1039000006A90120FFF7BFFE42F629220121ADF8EA +:1039100018200491A01C05900A2200230221039282 +:103920000293019300912023208806AA0121FFF72A +:10393000F9FE08B010BD80B542F62922904209D1A7 +:103940000A680548009200220B7941880088FFF739 +:1039500043FF02BD002002BD901300207047704756 +:1039600038B5024686B050780024FF2839D1B2F825 +:1039700003106B4840F60143C91A1FD0123901BF2A +:10398000B2F80710C088401C81422AD1957AB2F85B +:103990000500537A0124012D08D10A3201920093C7 +:1039A00000220023FFF744FF002015E00A320192B5 +:1039B000009301228023FFF73BFF12E04088B2F81A +:1039C0000710801C81420CD1507B0124C10748BFE5 +:1039D0008DF8084002D402208DF8080002A8FFF7F5 +:1039E000FDFA204607B030BDFEB5014601AA487A6F +:1039F0008DF804004B7A08885070DC0704D50888DD +:103A0000000A9070032300E00223487A040707D5D8 +:103A10004888D0545B1C4888DCB2000A10555B1CF7 +:103A20004C7AE00610D50D7A00200BE001EB400443 +:103A3000DFB2A688D6555B1CA488DEB2240A945552 +:103A40005B1C401CA842F1DB01A935480091DBB2A8 +:103A5000418800880022FFF7BFFEFEBD18B587B081 +:103A600030482F4CFFF74EFA41F60D01ADF8181013 +:103A700000940823012206A90120FFF704FE42F664 +:103A80003720ADF81800012204920A20A11C0390EF +:103A9000002310220591029301930092072300F066 +:103AA00023F842F63820ADF8180000220492029262 +:103AB00001920A20211D03900222059100F012F8C4 +:103AC00042F63920ADF818000022049201920A2033 +:103AD000A11D0390022308220591029300F002F831 +:103AE00008B010BD00920123208806AA0121FFF72B +:103AF00019BE80B5002242F63723C01A09D0401EF5 +:103B00000BD107480091012381880088FFF764FEEC +:103B100002E00846FFF768FF0246104602BD0000BB +:103B20007013002061390008704770477047704774 +:103B3000704770477047704770477047704710B5BF +:103B40000446FEF761FF204610BD10B5044610463E +:103B50000A460146204600F003F8204610BD00004A +:103B600062F30F2262F31F42401810F0030308D0E3 +:103B7000C91A1FD3DB0748BF00F8012D28BF20F862 +:103B8000022D130030B414461546103928BF20E921 +:103B90003C00FAD8490728BF20E90C0048BF40F88C +:103BA000042D890028BF20F8022D48BF00F8012D00 +:103BB00030BC7047C91818BF00F8012DCB0728BFCB +:103BC00000F8012D7047000000EB8100474AD0F853 +:103BD0008010914201D0012070470020704742F4CC +:103BE000806240F82120704780B500F0A9F800F00D +:103BF00061F83F48092181610168C908C90041F0A5 +:103C0000030100F011F8016001BD704780B500F0BC +:103C100097F800F04FF836480168C908C90041F02C +:103C2000010100F001F840E001603248016841F014 +:103C30000401704710B5304C00F064F800F02BF828 +:103C40000028FBD14FF0B040816801F00C0104293D +:103C500018D1016841F48031016028490A68D2080E +:103C6000D20042F001020A6001688903FCD5816834 +:103C70008908890041F002018160816801F00C012E +:103C80000829FAD1002203212046FFF7A8FFBDE84A +:103C9000104000F05DB80321204695E780B500F0A4 +:103CA0004FF81448016821F00401016030BF01BDE4 +:103CB00000F04EB810B5104CFFF7EDFF0028FBD117 +:103CC0000421FFF7E9FF40B90D480168090402D457 +:103CD0000068400503D500F015F800F017F82046FD +:103CE000BDE810400022032179E7000000040080B5 +:103CF0000004005810ED00E0001400580040005887 +:103D00008804005800220421204668E74FF0B040A4 +:103D1000016841F48071016001684905FCD5816842 +:103D20008908890041F001018160416A89088900A0 +:103D30004162816801F00C010429FAD1704700004A +:103D40000248016821F002010160704710E000E0C4 +:103D50000248016841F002010160704710E000E094 +:103D60001349002008604FF4E0221248016841F432 +:103D7000700101604FF0B041086840F00100086038 +:103D80008A600D480A6802400C480A60036823F004 +:103D9000050303604268520852004260002208484E +:103DA000C860086820F4802008608A6170470000BD +:103DB00008ED00E088ED00E0FBFEF6FA9400005804 +:103DC00000100422010000000300000005000000B4 +:103DD0000100000001000000060000000A000000D1 +:103DE00020000000020000000400000008000000A5 +:103DF00010000000400000008000000000010000F2 +:103E000000020000A0860100400D0300801A060099 +:103E100000350C0040420F0080841E0000093D0068 +:103E200000127A000024F40000366E010048E80118 +:103E3000006CDC0200000000000000000000000038 +:103E40000000000000F024F8012810D00D48804741 +:103E50000D480047F0B543464C4655465E4667461A +:103E6000F8B40A4C6B462360BFF34F8F30BF074C4A +:103E70002468A546F8BC9846A146AA46B346BC4667 +:103E8000F0BD0000613D000895400008841300204B +:103E900002490020086070470000000088130020DD +:103EA00019E050F8042BD30744BFA9F101039A1875 +:103EB000091F0023042942F8043BF9D25FEA817C00 +:103EC000134604D54FF0000CA2F800C09B1CC90794 +:103ED00044BF0021197050F8041B0029E1D170473C +:103EE000FEE7FEE7FEE7FEE7FEE770477047704734 +:103EF00000F012B8FDF757BCFEF7EABDFEF712BEA0 +:103F000000F012B80120FEF768BD1020FEF765BD75 +:103F10004020FEF762BD000002484168027889181F +:103F200041607047841000200449C8680A688243D1 +:103F30000A60486000F004B8000000000015005856 +:103F40007047000010B500F013F802000023DB43B7 +:103F500000241068984203D011000220ABBE146008 +:103F60005068984203D0111D0220ABBE546010BDB2 +:103F700001487047000000009010002010B450F875 +:103F8000041B79B10268436802440830DC0744BF6F +:103F9000A9F10104E31852F8044B43F8044B091F3C +:103FA000F9D1ECE710BC704710B5074979441831D6 +:103FB000064C7C44163404E00A68081D1144884706 +:103FC0000146A142F8D110BD2C000000680000009D +:103FD0004EF68851CEF20001086840F47000086087 +:103FE000BFF34F8FBFF36F8F4FF00070E1EE100AF9 +:103FF00070470000ADFEFFFFFC0200009C10002097 +:1040000070080000300003200000000071FFFFFF77 +:10401000080000008C0000002800032000000000C1 +:104020005DFFFFFF940000001C010000081000204D +:104030000000000000F00DF8002801D0FFF7B4FFE9 +:10404000AFF300800020AFF30080FCF7E7FE00F044 +:1040500002F80120704700F001B80000074638461A +:1040600000F002F8FBE7000080B5FFF76BFF024AA3 +:1040700011001820ABBEFBE7260002009D3C0008A3 +:10408000B13C00080D3C0008353C0008E93B000845 +:104090000B3C0008AFF30080FFF79AFFFFF7CAFF61 +:1040A0000000000000000000FFF7FEBFFFF7FEBFAA +:1040B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF34 +:1040C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF24 +:1040D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF14 +:1040E000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF04 +:1040F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF4 +:10410000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFE3 +:10411000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFD3 +:10412000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC3 +:10413000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB3 +:10414000FFF7FEBF000000480010004800000048D4 +:1041500021280008272800082D2800080F0000004B +:104160000F0000000F000000000000000000000031 +:10417000000000000000000000000000000000003F +:10418000000000000000000000000000000000002F +:1041900000000000FFFFFFFFFFFFFFFF0000000027 +:1041A00000000000000000000DFF01000000000002 +:1041B00000000000000000000000000000000000FF +:1041C000010000000000000010000000FFFFFFFFE2 +:0841D000FFFFFFFF00093D00A5 +:04000005080040951A :00000001FF diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h index 631d94432..b60051212 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -260,6 +260,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -269,11 +273,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -281,6 +289,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -437,8 +457,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -555,9 +576,9 @@ typedef enum CFG_TASK_ADV_UPDATE_ID, CFG_TASK_MEAS_REQ_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -566,11 +587,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -603,9 +625,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -616,5 +638,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h index 008724b5c..4f47130d3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +70,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h index c4403f591..5255ded52 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,5 +171,3 @@ #define CFG_HW_USART1_DMA_TX_SUPPORTED 0 #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/main.h index 43d93be5e..7af156239 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void MX_RTC_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h index 02364762d..f647cac83 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h index 984796b54..72671e977 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -72,5 +71,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c index 562e3a22c..852be7f8e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -413,5 +421,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c index b0658e5f2..ad9ff8cd1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -76,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -157,9 +161,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -358,12 +361,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -464,6 +606,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -508,4 +652,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/main.c index f6d75db83..4287c1eb6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -71,6 +71,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_RNG_Init(void); /* USER CODE BEGIN PFP */ @@ -105,6 +106,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -142,7 +146,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -178,15 +181,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_LSE; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -340,5 +351,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/standby_stm32wb15.c index 122b6e843..f7172d804 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/standby_stm32wb15.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : standby_stm32wb15.c - * Description : Application configuration file for STM32WPAN Middleware. + * @file standby_stm32wb15.c + * @author MCD Application Team + * @brief Specific code for standby mode ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,5 +162,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c index d6212b968..8e2573fc4 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,11 +141,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -186,6 +195,7 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -199,6 +209,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -241,5 +260,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c index cfa17eb62..390a69a52 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -291,4 +290,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c index c0af3469e..1394ae132 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp index d5e180a9d..2e3bf6a30 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp @@ -1,1259 +1,1260 @@ - 3 - - BLE_HeartRate - - ARM - + 3 + + BLE_HeartRate + + ARM + + 1 + + General + 3 + + 30 + 1 1 - - General - 3 - - 30 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 34 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 20 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application - Application + EWARM + + $PROJ_DIR$\startup_stm32wb15xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\standby_stm32wb15.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + + STM32_WPAN - EWARM - - $PROJ_DIR$\startup_stm32wb15xx_cm4.s - + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c + - User - - Core - - $PROJ_DIR$\..\Core\Src\app_debug.c - - - $PROJ_DIR$\..\Core\Src\app_entry.c - - - $PROJ_DIR$\..\Core\Src\hw_timerserver.c - - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\standby_stm32wb15.c - - - $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c - - - - STM32_WPAN - - App - - $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c - - - $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c - - - $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c - - - - Target - - $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c - - - + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers - Doc + BSP + + NUCLEO-WB15CC - $PROJ_DIR$\..\readme.txt + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c + - Drivers - - BSP - - NUCLEO-WB15CC - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c - - - - - CMSIS - - $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c - - - - STM32WBxx_HAL_Driver - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - - + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + - Middlewares - - STM32_WPAN - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c - - + STM32WBxx_HAL_Driver + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + + Middlewares - Utilities - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c - - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c - + STM32_WPAN + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + + Utilities + + $PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + $PROJ_DIR$/../../../../../../Utilities/sequencer/stm32_seq.c + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/stm32wb15xx_flash_cm4.icf index 56d9d33c5..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..3b925699a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -29,7 +29,7 @@ ; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Stack_Size EQU 0x400 +Stack_Size EQU 0x1000 AREA STACK, NOINIT, READWRITE, ALIGN=3 Stack_Mem SPACE Stack_Size @@ -40,7 +40,7 @@ __initial_sp ; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Heap_Size EQU 0x200 +Heap_Size EQU 0x400 AREA HEAP, NOINIT, READWRITE, ALIGN=3 __heap_base @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 72feb3a18..4e53aee02 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -45,7 +44,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 110K +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c index 087a6c793..4a2e0d1e7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.c - * Description : Application file for BLE Middleware. - * - ***************************************************************************** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -268,26 +267,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1109,6 +1109,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1151,4 +1153,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h index d2b6fc3d7..86f1d1046 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h index 4a5dbf4d5..20ae2567d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h index 5f3ac9dd2..20ff53b14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c index 396fcad74..c7c8e1f2f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void DISAPP_Init(void) /* USER CODE END FD */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h index 5dba6ce9f..138e1c0bc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/dis_app.h * Description : Entry application source file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -74,4 +73,3 @@ void DISAPP_Init(void); #endif /*__DIS_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c index 48e0fde4f..1c46caa07 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE END FD */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h index ccf3d4b32..d068166e8 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ void HRSAPP_Init( void ); #endif /*__HRS_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h index bd808a41b..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..57294e04f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +700,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/readme.txt index 81580bf3b..09580027b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRate example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin index 73b596342..fea123783 100644 Binary files a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin and b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin differ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h index 78b986e56..12010a6e9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -258,6 +258,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -267,11 +271,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -279,6 +287,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -607,5 +628,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h index c95d8bea9..286cf657d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h index c4403f591..5255ded52 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,5 +171,3 @@ #define CFG_HW_USART1_DMA_TX_SUPPORTED 0 #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h index bbd0ab5f7..94f556f9f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void MX_RTC_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h index ff2efb206..91543a418 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h index 4c592a29f..3e374f1f5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -71,5 +70,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c index 562e3a22c..852be7f8e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -413,5 +421,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c index 5e80e5506..3d215290f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +30,10 @@ #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" + + /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -68,6 +72,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ @@ -181,22 +187,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -302,4 +445,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c index f17921b57..dbf853e8e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -514,5 +514,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/standby_stm32wb15.c index e11afe16e..631f9557e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,4 +161,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c index 510729d2c..6fa0d5687 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -191,5 +190,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c index 2d5c2fcf1..117e93b96 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -281,4 +280,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c index 1b2e121cb..1d92460c6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -352,5 +351,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf index 8a6d86378..1c5dd3ab9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08007000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08007000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -34,13 +34,13 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; keep { section TAG_OTA_START}; keep { section TAG_OTA_END }; place in OTA_TAG_region { section TAG_OTA_START }; place in ROM_region { readonly, last section TAG_OTA_END }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb15xx_cm4.s index f7cdf820d..3b925699a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct index cac6c00bd..60ea7fdde 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -14,21 +14,23 @@ LR_IROM2 0x08007140 0x4{ ; load region size_region } } -LR_IROM3 0x08007144 0x146BC{ - ER_IROM1_HIGH 0x08007144 0x146BC { ; load address = execution address - *(InRoot$$Sections) - .ANY (+RO) - *.o (TAG_OTA_END) +LR_IROM3 0x08007144 0x116BC{ + ER_IROM1_HIGH 0x08007144 0x116BC { ; load address = execution address + *(InRoot$$Sections) + .ANY (+RO) + *.o (TAG_OTA_END) } - + RW_IRAM1 0x20000008 0x2FF8 { ; RW data - .ANY (+RW +ZI) + ANY (+RW +ZI) } - - RW_RAM2aRet_SHARED 0x20030000 0x2800 { ; RW data + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } } - \ No newline at end of file diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 7320fe370..407cd567c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -45,7 +44,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08007000, LENGTH = 82K +FLASH (rx) : ORIGIN = 0x08007000, LENGTH = 70K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -147,7 +146,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c index 6586330fe..57b329b04 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.c - * Description : Application file for BLE Middleware. - * - ***************************************************************************** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -281,7 +280,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1101,4 +1101,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h index d2b6fc3d7..86f1d1046 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h index 989bc44ff..acb69a6db 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 1/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h index 5f3ac9dd2..20ff53b14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c index 396fcad74..c7c8e1f2f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void DISAPP_Init(void) /* USER CODE END FD */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h index 5dba6ce9f..138e1c0bc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/dis_app.h * Description : Entry application source file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -74,4 +73,3 @@ void DISAPP_Init(void); #endif /*__DIS_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c index 48e0fde4f..1c46caa07 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE END FD */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h index ccf3d4b32..d068166e8 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ void HRSAPP_Init( void ); #endif /*__HRS_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h index bd808a41b..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..4eecadfdd 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +701,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/readme.txt index c06774c3b..62cb39e20 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRate_ota example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h new file mode 100644 index 000000000..62e8ad603 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h @@ -0,0 +1,116 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_COMMON_H +#define APP_COMMON_H + +#ifdef __cplusplus +extern "C"{ +#endif + +#include +#include +#include +#include +#include + +#include "app_conf.h" + + /* -------------------------------- * + * Basic definitions * + * -------------------------------- */ + +#undef NULL +#define NULL 0 + +#undef FALSE +#define FALSE 0 + +#undef TRUE +#define TRUE (!0) + + /* -------------------------------- * + * Critical Section definition * + * -------------------------------- */ +#define BACKUP_PRIMASK() uint32_t primask_bit= __get_PRIMASK() +#define DISABLE_IRQ() __disable_irq() +#define RESTORE_PRIMASK() __set_PRIMASK(primask_bit) + + /* -------------------------------- * + * Macro delimiters * + * -------------------------------- */ + +#define M_BEGIN do { + +#define M_END } while(0) + + /* -------------------------------- * + * Some useful macro definitions * + * -------------------------------- */ + +#ifndef MAX +#define MAX( x, y ) (((x)>(y))?(x):(y)) +#endif + +#ifndef MIN +#define MIN( x, y ) (((x)<(y))?(x):(y)) +#endif + +#define MODINC( a, m ) M_BEGIN (a)++; if ((a)>=(m)) (a)=0; M_END + +#define MODDEC( a, m ) M_BEGIN if ((a)==0) (a)=(m); (a)--; M_END + +#define MODADD( a, b, m ) M_BEGIN (a)+=(b); if ((a)>=(m)) (a)-=(m); M_END + +#define MODSUB( a, b, m ) MODADD( a, (m)-(b), m ) + +#define PAUSE( t ) M_BEGIN \ + __IO int _i; \ + for ( _i = t; _i > 0; _i -- ); \ + M_END + +#define DIVF( x, y ) ((x)/(y)) + +#define DIVC( x, y ) (((x)+(y)-1)/(y)) + +#define DIVR( x, y ) (((x)+((y)/2))/(y)) + +#define SHRR( x, n ) ((((x)>>((n)-1))+1)>>1) + +#define BITN( w, n ) (((w)[(n)/32] >> ((n)%32)) & 1) + +#define BITNSET( w, n, b ) M_BEGIN (w)[(n)/32] |= ((U32)(b))<<((n)%32); M_END + + /* -------------------------------- * + * Compiler * + * -------------------------------- */ +#define PLACE_IN_SECTION( __x__ ) __attribute__((section (__x__))) + +#ifdef WIN32 +#define ALIGN(n) +#else +#define ALIGN(n) __attribute__((aligned(n))) +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_COMMON_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h new file mode 100644 index 000000000..21df7efd7 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h @@ -0,0 +1,639 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_CONF_H +#define APP_CONF_H + +#include "hw.h" +#include "hw_conf.h" +#include "hw_if.h" +#include "ble_bufsize.h" + +/****************************************************************************** + * MESH Application Config + ******************************************************************************/ + +/**< generic parameters ******************************************************/ + +/** + * Define Tx Power + */ +#define CFG_TX_POWER (0x18) /* -0.15dBm */ + +/** + * Define Advertising parameters + */ +#define CFG_ADV_BD_ADDRESS (0x7257acd87a6c) +#define CFG_FAST_CONN_ADV_INTERVAL_MIN (0x80) /**< 80ms */ +#define CFG_FAST_CONN_ADV_INTERVAL_MAX (0xA0) /**< 100ms */ +#define CFG_LP_CONN_ADV_INTERVAL_MIN (0x640) /**< 1s */ +#define CFG_LP_CONN_ADV_INTERVAL_MAX (0xFA0) /**< 2.5s */ + +/** + * Define IO Authentication + */ +#define CFG_BONDING_MODE (1) +#define CFG_FIXED_PIN (111111) +#define CFG_USED_FIXED_PIN (0) +#define CFG_ENCRYPTION_KEY_SIZE_MAX (16) +#define CFG_ENCRYPTION_KEY_SIZE_MIN (8) + +/** + * Define IO capabilities + */ +#define CFG_IO_CAPABILITY_DISPLAY_ONLY (0x00) +#define CFG_IO_CAPABILITY_DISPLAY_YES_NO (0x01) +#define CFG_IO_CAPABILITY_KEYBOARD_ONLY (0x02) +#define CFG_IO_CAPABILITY_NO_INPUT_NO_OUTPUT (0x03) +#define CFG_IO_CAPABILITY_KEYBOARD_DISPLAY (0x04) + +#define CFG_IO_CAPABILITY CFG_IO_CAPABILITY_DISPLAY_YES_NO + +/** + * Define MITM modes + */ +#define CFG_MITM_PROTECTION_NOT_REQUIRED (0x00) +#define CFG_MITM_PROTECTION_REQUIRED (0x01) + +#define CFG_MITM_PROTECTION CFG_MITM_PROTECTION_REQUIRED + +/** + * Define Secure Connections Support + */ +#define CFG_SECURE_NOT_SUPPORTED (0x00) +#define CFG_SECURE_OPTIONAL (0x01) +#define CFG_SECURE_MANDATORY (0x02) + +#define CFG_SC_SUPPORT CFG_SECURE_OPTIONAL + +/** + * Define Keypress Notification Support + */ +#define CFG_KEYPRESS_NOT_SUPPORTED (0x00) +#define CFG_KEYPRESS_SUPPORTED (0x01) + +#define CFG_KEYPRESS_NOTIFICATION_SUPPORT CFG_KEYPRESS_NOT_SUPPORTED + +/** + * Numeric Comparison Answers + */ +#define YES (0x01) +#define NO (0x00) + +/** + * Device name configuration for Generic Access Service + */ +#define CFG_GAP_DEVICE_NAME "TEMPLATE" +#define CFG_GAP_DEVICE_NAME_LENGTH (8) + +/** + * Define PHY + */ +#define ALL_PHYS_PREFERENCE 0x00 +#define RX_2M_PREFERRED 0x02 +#define TX_2M_PREFERRED 0x02 +#define TX_1M 0x01 +#define TX_2M 0x02 +#define RX_1M 0x01 +#define RX_2M 0x02 + +/** +* Identity root key used to derive LTK and CSRK +*/ +#define CFG_BLE_IRK {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0} + +/** +* Encryption root key used to derive LTK and CSRK +*/ +#define CFG_BLE_ERK {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21} + +/** + * SMPS supply + * SMPS not used when Set to 0 + * SMPS used when Set to 1 + */ +#define CFG_USE_SMPS 0 + +/* USER CODE BEGIN Generic_Parameters */ + +/* USER CODE END Generic_Parameters */ + +/**< specific parameters */ +/****************************************************************************** + * BLE Stack + ******************************************************************************/ +/** + * Maximum number of simultaneous connections that the device will support. + * Valid values are from 1 to 8 + */ +#define CFG_BLE_NUM_LINK 2 + +/** + * Maximum number of Services that can be stored in the GATT database. + * Note that the GAP and GATT services are automatically added so this parameter should be 2 plus the number of user services + */ +#define CFG_BLE_NUM_GATT_SERVICES 4 + +/** + * Maximum number of Attributes + * (i.e. the number of characteristic + the number of characteristic values + the number of descriptors, excluding the services) + * that can be stored in the GATT database. + * Note that certain characteristics and relative descriptors are added automatically during device initialization + * so this parameters should be 9 plus the number of user Attributes + */ +#define CFG_BLE_NUM_GATT_ATTRIBUTES 30 + +/** + * Maximum supported ATT_MTU size + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_MAX_ATT_MTU (23/*156*/) + +/** + * Size of the storage area for Attribute values + * This value depends on the number of attributes used by application. In particular the sum of the following quantities (in octets) should be made for each attribute: + * - attribute value length + * - 5, if UUID is 16 bit; 19, if UUID is 128 bit + * - 2, if server configuration descriptor is used + * - 2*DTM_NUM_LINK, if client configuration descriptor is used + * - 2, if extended properties is used + * The total amount of memory needed is the sum of the above quantities for each attribute. + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1290) + +/** + * Prepare Write List size in terms of number of packet + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_PREPARE_WRITE_LIST_SIZE BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU) + +/** + * Number of allocated memory blocks + * This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter when CFG_BLE_OPTIONS is set to 1 + */ +#define CFG_BLE_MBLOCK_COUNT (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK)) + +/** + * Enable or disable the Extended Packet length feature. Valid values are 0 or 1. + */ +#define CFG_BLE_DATA_LENGTH_EXTENSION 1 + +/** + * Sleep clock accuracy in Slave mode (ppm value) + */ +#define CFG_BLE_SLAVE_SCA 500 + +/** + * Sleep clock accuracy in Master mode + * 0 : 251 ppm to 500 ppm + * 1 : 151 ppm to 250 ppm + * 2 : 101 ppm to 150 ppm + * 3 : 76 ppm to 100 ppm + * 4 : 51 ppm to 75 ppm + * 5 : 31 ppm to 50 ppm + * 6 : 21 ppm to 30 ppm + * 7 : 0 ppm to 20 ppm + */ +#define CFG_BLE_MASTER_SCA 0 + +/** + * Source for the low speed clock for RF wake-up + * 1 : external high speed crystal HSE/32/32 + * 0 : external low speed crystal ( no calibration ) + */ +#define CFG_BLE_LSE_SOURCE 0 + +/** + * Start up time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us) + */ +#define CFG_BLE_HSE_STARTUP_TIME 0x148 + +/** + * Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us) + */ +#define CFG_BLE_MAX_CONN_EVENT_LENGTH (0xFFFFFFFF) + +/** + * Viterbi Mode + * 1 : enabled + * 0 : disabled + */ +#define CFG_BLE_VITERBI_MODE 1 + +/** + * BLE stack Options flags to be configured with: + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: + * (bit 0): 1: LL only + * 0: LL + host + * (bit 1): 1: no service change desc. + * 0: with service change desc. + * (bit 2): 1: device name Read-Only + * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 + * other bits: reserved (shall be set to 0) + */ +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) + +#define CFG_BLE_MAX_COC_INITIATOR_NBR (32) + +#define CFG_BLE_MIN_TX_POWER (0) + +#define CFG_BLE_MAX_TX_POWER (0) + + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + +/****************************************************************************** + * Transport Layer + ******************************************************************************/ +/** + * Queue length of BLE Event + * This parameter defines the number of asynchronous events that can be stored in the HCI layer before + * being reported to the application. When a command is sent to the BLE core coprocessor, the HCI layer + * is waiting for the event with the Num_HCI_Command_Packets set to 1. The receive queue shall be large + * enough to store all asynchronous events received in between. + * When CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE is set to 27, this allow to store three 255 bytes long asynchronous events + * between the HCI command and its event. + * This parameter depends on the value given to CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE. When the queue size is to small, + * the system may hang if the queue is full with asynchronous events and the HCI layer is still waiting + * for a CC/CS event, In that case, the notification TL_BLE_HCI_ToNot() is called to indicate + * to the application a HCI command did not receive its command event within 30s (Default HCI Timeout). + */ +#define CFG_TLBLE_EVT_QUEUE_LENGTH 5 +/** + * This parameter should be set to fit most events received by the HCI layer. It defines the buffer size of each element + * allocated in the queue of received events and can be used to optimize the amount of RAM allocated by the Memory Manager. + * It should not exceed 255 which is the maximum HCI packet payload size (a greater value is a lost of memory as it will + * never be used) + * It shall be at least 4 to receive the command status event in one frame. + * The default value is set to 27 to allow receiving an event of MTU size in a single buffer. This value maybe reduced + * further depending on the application. + */ +#define CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE 255 /**< Set to 255 with the memory manager and the mailbox */ + +#define TL_BLE_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE ) +/****************************************************************************** + * UART interfaces + ******************************************************************************/ + +/** + * Select UART interfaces + */ +#define CFG_DEBUG_TRACE_UART hw_uart1 +#define CFG_CONSOLE_MENU hw_lpuart1 + +/****************************************************************************** + * USB interface + ******************************************************************************/ + +/** + * Enable/Disable USB interface + */ +#define CFG_USB_INTERFACE_ENABLE 0 + +/****************************************************************************** + * IPCC interface + ******************************************************************************/ + +/** + * The IPCC is dedicated to the communication between the CPU2 and the CPU1 + * and shall not be modified by the application + * The two following definitions shall not be modified + */ +#define HAL_IPCC_TX_IRQHandler(...) HW_IPCC_Tx_Handler( ) +#define HAL_IPCC_RX_IRQHandler(...) HW_IPCC_Rx_Handler( ) + +/****************************************************************************** + * Low Power + ******************************************************************************/ +/** + * When set to 1, the low power mode is enable + * When set to 0, the device stays in RUN mode + */ +#define CFG_LPM_SUPPORTED 1 + + /** + * This shall be set to 1 when standby is supported while the wireless stack on CPU2 is running + * (i.e the CPU2 is allowed to enter standby between RF activity) + * Otherwise, it should be set to 0 for marginal code and test execution saving + * In this case the lowest power mode available will be Stop 1 + * Note that keeping that setting to 1 when standby is not supported does not hurt + */ +#define CFG_LPM_STANDBY_SUPPORTED 0 + +/****************************************************************************** + * RTC interface + ******************************************************************************/ +#define HAL_RTCEx_WakeUpTimerIRQHandler(...) HW_TS_RTC_Wakeup_Handler( ) + +/****************************************************************************** + * Timer Server + ******************************************************************************/ +/** + * CFG_RTC_WUCKSEL_DIVIDER: This sets the RTCCLK divider to the wakeup timer. + * The lower is the value, the better is the power consumption and the accuracy of the timerserver + * The higher is the value, the finest is the granularity + * + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output + * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding + * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. + * + * CFG_RTC_SYNCH_PRESCALER: This sets the synchronous prescaler of the RTC. + * When the 1Hz calendar clock is required, it shall be sets according to other settings + * When the 1Hz calendar clock is not needed, CFG_RTC_SYNCH_PRESCALER should be set to 0x7FFF (MAX VALUE) + * + * CFG_RTCCLK_DIVIDER_CONF: + * Shall be set to either 0,2,4,8,16 + * When set to either 2,4,8,16, the 1Hhz calendar is supported + * When set to 0, the user sets its own configuration + * + * The following settings are computed with LSI as input to the RTC + */ + +#define CFG_RTCCLK_DIVIDER_CONF 0 + +#if (CFG_RTCCLK_DIVIDER_CONF == 0) +/** + * Custom configuration + * It does not support 1Hz calendar + * It divides the RTC CLK by 16 + */ + +#define CFG_RTCCLK_DIV (16) +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#define CFG_RTC_ASYNCH_PRESCALER (0x0F) +#define CFG_RTC_SYNCH_PRESCALER (0x7FFF) + +#else + +#if (CFG_RTCCLK_DIVIDER_CONF == 2) +/** + * It divides the RTC CLK by 2 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (3) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 4) +/** + * It divides the RTC CLK by 4 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (2) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 8) +/** + * It divides the RTC CLK by 8 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (1) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 16) +/** + * It divides the RTC CLK by 16 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#endif + +#define CFG_RTCCLK_DIV CFG_RTCCLK_DIVIDER_CONF +#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) +#define CFG_RTC_SYNCH_PRESCALER (DIVR( LSE_VALUE, (CFG_RTC_ASYNCH_PRESCALER+1) ) - 1 ) + +#endif + +/** tick timer values */ +#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) + +typedef enum +{ + CFG_TIM_PROC_ID_ISR, + /* USER CODE BEGIN CFG_TimProcID_t */ + + /* USER CODE END CFG_TimProcID_t */ +} CFG_TimProcID_t; + +/****************************************************************************** + * Debug + ******************************************************************************/ +/** + * When set, this resets some hw resources to set the device in the same state than the power up + * The FW resets only register that may prevent the FW to run properly + * + * This shall be set to 0 in a final product + * + */ +#define CFG_HW_RESET_BY_FW 0 + +/** + * keep debugger enabled while in any low power mode when set to 1 + * should be set to 0 in production + */ +#define CFG_DEBUGGER_SUPPORTED 0 + +/** + * When set to 1, the traces are enabled in the BLE services + */ +#define CFG_DEBUG_BLE_TRACE 0 + +/** + * Enable or Disable traces in application + */ +#define CFG_DEBUG_APP_TRACE 0 + +#if (CFG_DEBUG_APP_TRACE != 0) +#define APP_DBG_MSG PRINT_MESG_DBG +#else +#define APP_DBG_MSG PRINT_NO_MESG +#endif + +#if ( (CFG_DEBUG_BLE_TRACE != 0) || (CFG_DEBUG_APP_TRACE != 0) ) +#define CFG_DEBUG_TRACE 1 +#endif + +#if (CFG_DEBUG_TRACE != 0) +#undef CFG_LPM_SUPPORTED +#undef CFG_DEBUGGER_SUPPORTED +#define CFG_LPM_SUPPORTED 0 +#define CFG_DEBUGGER_SUPPORTED 1 +#endif + +/** + * When CFG_DEBUG_TRACE_FULL is set to 1, the trace are output with the API name, the file name and the line number + * When CFG_DEBUG_TRACE_LIGHT is set to 1, only the debug message is output + * + * When both are set to 0, no trace are output + * When both are set to 1, CFG_DEBUG_TRACE_FULL is selected + */ +#define CFG_DEBUG_TRACE_LIGHT 0 +#define CFG_DEBUG_TRACE_FULL 0 + +#if (( CFG_DEBUG_TRACE != 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 ) && (CFG_DEBUG_TRACE_FULL == 0)) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 1 +#endif + +#if ( CFG_DEBUG_TRACE == 0 ) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 0 +#endif + +/** + * When not set, the traces is looping on sending the trace over UART + */ +#define DBG_TRACE_USE_CIRCULAR_QUEUE 1 + +/** + * max buffer Size to queue data traces and max data trace allowed. + * Only Used if DBG_TRACE_USE_CIRCULAR_QUEUE is defined + */ +#define DBG_TRACE_MSG_QUEUE_SIZE 4096 +#define MAX_DBG_TRACE_MSG_SIZE 1024 + +/* USER CODE BEGIN Defines */ +#define CFG_LED_SUPPORTED 1 +#define CFG_BUTTON_SUPPORTED 1 + +#define PUSH_BUTTON_SW1_EXTI_IRQHandler EXTI0_IRQHandler +#define PUSH_BUTTON_SW2_EXTI_IRQHandler EXTI4_IRQHandler +#define PUSH_BUTTON_SW3_EXTI_IRQHandler EXTI9_5_IRQHandler + +#define PIRSensor_EXTI_IRQHandler EXTI1_IRQHandler +#define POWEROFF_EXTI_IRQHandler EXTI15_10_IRQHandler +/* USER CODE END Defines */ + +/****************************************************************************** + * Scheduler + ******************************************************************************/ + +/** + * These are the lists of task id registered to the scheduler + * Each task id shall be in the range [0:31] + * This mechanism allows to implement a generic code in the API TL_BLE_HCI_StatusNot() to comply with + * the requirement that a HCI/ACI command shall never be sent if there is already one pending + */ + +/**< Add in that list all tasks that may send a ACI/HCI command */ +typedef enum +{ + CFG_TASK_ADV_UPDATE_ID, + CFG_TASK_MESH_REQ_ID, + CFG_TASK_MESH_BEACON_REQ_ID, + CFG_TASK_MESH_UART_RX_REQ_ID, + CFG_TASK_APPLI_REQ_ID, + CFG_TASK_MESH_SW1_REQ_ID, + CFG_TASK_MESH_SW3_REQ_ID, + CFG_TASK_MESH_PIR_REQ_ID, + CFG_TASK_MESH_LPN_REQ_ID, + CFG_TASK_HCI_ASYNCH_EVT_ID, +/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + +/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ +} CFG_Task_Id_With_HCI_Cmd_t; + +/**< Add in that list all tasks that never send a ACI/HCI command */ +typedef enum +{ + CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ + CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, + +/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + +/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + + CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ +} CFG_Task_Id_With_NO_HCI_Cmd_t; +#define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD + +/** + * This is the list of priority required by the application + * Each Id shall be in the range 0..31 + */ +typedef enum +{ + CFG_SCH_PRIO_0, + CFG_PRIO_NBR, +} CFG_SCH_Prio_Id_t; + +/** + * This is a bit mapping over 32bits listing all events id supported in the application + */ +typedef enum +{ + CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID, + CFG_IDLEEVT_SYSTEM_HCI_CMD_EVT_RSP_ID, +} CFG_IdleEvt_Id_t; + +/****************************************************************************** + * LOW POWER + ******************************************************************************/ +/** + * Supported requester to the MCU Low Power Manager - can be increased up to 32 + * It list a bit mapping of all user of the Low Power Manager + */ +typedef enum +{ + CFG_LPM_APP, + CFG_LPM_APP_BLE, + /* USER CODE BEGIN CFG_LPM_Id_t */ + + /* USER CODE END CFG_LPM_Id_t */ +} CFG_LPM_Id_t; + +/****************************************************************************** + * OTP manager + ******************************************************************************/ +#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE + +#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR + +#endif /*APP_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h new file mode 100644 index 000000000..9237f301f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h @@ -0,0 +1,67 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APP_DEBUG_H +#define __APP_DEBUG_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void APPD_Init( void ); + void APPD_EnableCPU2( void ); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__APP_DEBUG_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h new file mode 100644 index 000000000..4f47130d3 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h @@ -0,0 +1,72 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_ENTRY_H +#define APP_ENTRY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void MX_APPE_Config( void ); + void MX_APPE_Init( void ); + void MX_APPE_Process( void ); + void Init_Exti( void ); + void Init_Smps( void ); + +/* USER CODE BEGIN EF */ + void APPE_Led_Init( void ); + void APPE_Button_Init( void ); +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_ENTRY_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h new file mode 100644 index 000000000..9126af678 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h @@ -0,0 +1,173 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_CONF_H +#define HW_CONF_H + +/****************************************************************************** + * Semaphores + * THIS SHALL NO BE CHANGED AS THESE SEMAPHORES ARE USED AS WELL ON THE CM0+ + *****************************************************************************/ +/** +* Index of the semaphore used the prevent conflicts after standby sleep. +* Each CPUs takes this semaphore at standby wakeup until conclicting elements are restored. +*/ +#define CFG_HW_PWR_STANDBY_SEMID 10 +/** +* The CPU2 may be configured to store the Thread persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* CFG_HW_THREAD_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_THREAD_NVM_SRAM_SEMID 9 + +/** +* The CPU2 may be configured to store the BLE persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* CFG_HW_BLE_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_BLE_NVM_SRAM_SEMID 8 + +/** +* Index of the semaphore used by CPU2 to prevent the CPU1 to either write or erase data in flash +* The CPU1 shall not either write or erase in flash when this semaphore is taken by the CPU2 +* When the CPU1 needs to either write or erase in flash, it shall first get the semaphore and release it just +* after writing a raw (64bits data) or erasing one sector. +* Once the Semaphore has been released, there shall be at least 1us before it can be taken again. This is required +* to give the opportunity to CPU2 to take it. +* On v1.4.0 and older CPU2 wireless firmware, this semaphore is unused and CPU2 is using PES bit. +* By default, CPU2 is using the PES bit to protect its timing. The CPU1 may request the CPU2 to use the semaphore +* instead of the PES bit by sending the system command SHCI_C2_SetFlashActivityControl() +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID 7 + +/** +* Index of the semaphore used by CPU1 to prevent the CPU2 to either write or erase data in flash +* In order to protect its timing, the CPU1 may get this semaphore to prevent the CPU2 to either +* write or erase in flash (as this will stall both CPUs) +* The PES bit shall not be used as this may stall the CPU2 in some cases. +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID 6 + +/** +* Index of the semaphore used to manage the CLK48 clock configuration +* When the USB is required, this semaphore shall be taken before configuring te CLK48 for USB +* and should be released after the application switch OFF the clock when the USB is not used anymore +* When using the RNG, it is good enough to use CFG_HW_RNG_SEMID to control CLK48. +* More details in AN5289 +*/ +#define CFG_HW_CLK48_CONFIG_SEMID 5 + +/* Index of the semaphore used to manage the entry Stop Mode procedure */ +#define CFG_HW_ENTRY_STOP_MODE_SEMID 4 + +/* Index of the semaphore used to access the RCC */ +#define CFG_HW_RCC_SEMID 3 + +/* Index of the semaphore used to access the FLASH */ +#define CFG_HW_FLASH_SEMID 2 + +/* Index of the semaphore used to access the PKA */ +#define CFG_HW_PKA_SEMID 1 + +/* Index of the semaphore used to access the RNG */ +#define CFG_HW_RNG_SEMID 0 + +/****************************************************************************** + * HW TIMER SERVER + *****************************************************************************/ +/** + * The user may define the maximum number of virtual timers supported. + * It shall not exceed 255 + */ +#define CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER 6 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the preemptpriority part of the NVIC. + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO 3 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the subpriority part of the NVIC. It does not exist on all processors. When it is not supported + * on the CPU, the setting is ignored + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO 0 + +/** + * Define a critical section in the Timer server + * The Timer server does not support the API to be nested + * The Application shall either: + * a) Ensure this will never happen + * b) Define the critical section + * The default implementations is masking all interrupts using the PRIMASK bit + * The TimerServer driver uses critical sections to avoid context corruption. This is achieved with the macro + * TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION. When CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION is set + * to 1, all STM32 interrupts are masked with the PRIMASK bit of the CortexM CPU. It is possible to use the BASEPRI + * register of the CortexM CPU to keep allowed some interrupts with high priority. In that case, the user shall + * re-implement TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION and shall make sure that no TimerServer + * API are called when the TIMER critical section is entered + */ +#define CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION 1 + +/** + * This value shall reflect the maximum delay there could be in the application between the time the RTC interrupt + * is generated by the Hardware and the time when the RTC interrupt handler is called. This time is measured in + * number of RTCCLK ticks. + * A relaxed timing would be 10ms + * When the value is too short, the timerserver will not be able to count properly and all timeout may be random. + * When the value is too long, the device may wake up more often than the most optimal configuration. However, the + * impact on power consumption would be marginal (unless the value selected is extremely too long). It is strongly + * recommended to select a value large enough to make sure it is not too short to ensure reliability of the system + * as this will have marginal impact on low power mode + */ +#define CFG_HW_TS_RTC_HANDLER_MAX_DELAY ( 10 * (LSI_VALUE/1000) ) + + /** + * Interrupt ID in the NVIC of the RTC Wakeup interrupt handler + * It shall be type of IRQn_Type + */ +#define CFG_HW_TS_RTC_WAKEUP_HANDLER_ID RTC_WKUP_IRQn + +/****************************************************************************** + * HW UART + *****************************************************************************/ +#define CFG_HW_LPUART1_ENABLED 0 +#define CFG_HW_LPUART1_DMA_TX_SUPPORTED 0 + +#define CFG_HW_USART1_ENABLED 1 +#define CFG_HW_USART1_DMA_TX_SUPPORTED 1 + +#endif /*HW_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h new file mode 100644 index 000000000..b463b92d6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h @@ -0,0 +1,87 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_flash.h + * @author MCD Application Team + * @brief Header for hw_flash.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __HW_FLASH_H +#define __HW_FLASH_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +/** + * @brief Write 64 bits double word in FLASH + * + * @param FLASH destination address + * @param 64 bits double word data + * @retval result + */ +MOBLE_RESULT HW_FLASH_Write(uint32_t address, uint64_t data); + +/** + * @brief Erase FLASH page + * + * @param address of FLASH page + * @param number of page + * @param interrupt not used + * @retval result + */ +MOBLE_RESULT HW_FLASH_Erase(uint32_t page, uint16_t n, int interrupt); + +#if 0 +/** + * @brief Get Option Byte IPCC buffer address + * + * @param None + * @retval Option Byte IPCC buffer address + */ +uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void); + +/** + * @brief Get Option Byte SFSA + * + * @param None + * @retval Option Byte SFSA + */ +uint32_t HW_FLASH_OB_GetSFSA(void); + +/** + * @brief Get Option Byte SBSRA + * + * @param None + * @retval Option Byte SBSRA + */ +uint32_t HW_FLASH_OB_GetSBRSA(void); + +/** + * @brief Get Option Byte SNBRSA + * + * @param None + * @retval Option Byte SNBRSA + */ +uint32_t HW_FLASH_OB_GetSNBRSA(void); +#endif + +#ifdef __cplusplus +} +#endif + +#endif /*__HW_FLASH_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h new file mode 100644 index 000000000..834c17171 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h @@ -0,0 +1,247 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_if.h + * @author MCD Application Team + * @brief Hardware Interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_IF_H +#define HW_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + + /* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx.h" +#include "stm32wbxx_ll_exti.h" +#include "stm32wbxx_ll_system.h" +#include "stm32wbxx_ll_rcc.h" +#include "stm32wbxx_ll_ipcc.h" +#include "stm32wbxx_ll_bus.h" +#include "stm32wbxx_ll_pwr.h" +#include "stm32wbxx_ll_cortex.h" +#include "stm32wbxx_ll_utils.h" +#include "stm32wbxx_ll_hsem.h" +#include "stm32wbxx_ll_gpio.h" +#include "stm32wbxx_ll_rtc.h" + +#ifdef USE_STM32WBXX_USB_DONGLE +#include "stm32wbxx_usb_dongle.h" +#endif +#ifdef USE_STM32WBXX_NUCLEO +#include "nucleo_wb15cc.h" +#endif +#ifdef USE_X_NUCLEO_EPD +#include "x_nucleo_epd.h" +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /****************************************************************************** + * HW UART + ******************************************************************************/ + typedef enum + { + hw_uart1, + hw_uart2, + hw_lpuart1, + } hw_uart_id_t; + + typedef enum + { + hw_uart_ok, + hw_uart_error, + hw_uart_busy, + hw_uart_to, + } hw_status_t; + + void HW_UART_Init(hw_uart_id_t hw_uart_id); + void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout); + hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*Callback)(void)); + void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); + void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); + + /****************************************************************************** + * HW TimerServer + ******************************************************************************/ + /* Exported types ------------------------------------------------------------*/ + /** + * This setting is used when standby mode is supported. + * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does + * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured + * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. + */ + typedef enum + { + hw_ts_InitMode_Full, + hw_ts_InitMode_Limited, + } HW_TS_InitMode_t; + + /** + * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, + * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() + * + * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. + */ + typedef enum + { + hw_ts_SingleShot, + hw_ts_Repeated + } HW_TS_Mode_t; + + /** + * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed + * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a + * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased + */ + typedef enum + { + hw_ts_Successful, + hw_ts_Failed, + }HW_TS_ReturnStatus_t; + + typedef void (*HW_TS_pTimerCb_t)(void); + + /** + * @brief Initialize the timer server + * This API shall be called by the application before any timer is requested to the timer server. It + * configures the RTC module to be connected to the LSI input clock. + * + * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the + * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested + * @param hrtc: RTC Handle + * @retval None + */ + void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); + + /** + * @brief Interface to create a virtual timer + * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it + * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the + * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler + * which module is concerned. In return, the user gets a timer ID to handle it. + * + * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow + * identification of the requester + * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) + * @param TimerMode: Mode of the virtual timer (Single shot or repeated) + * @param pTimerCallBack: Callback when the virtual timer expires + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not + */ + HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Stop a virtual timer + * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. + * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. + * Nothing is done when it is called to stop a timer which has been already stopped + * + * @param TimerID: Id of the timer to stop + * @retval None + */ + void HW_TS_Stop(uint8_t TimerID); + + /** + * @brief Start a virtual timer + * This API shall be used to start a timer. The timeout value is specified and may be different each time. + * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may + * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always + * stay in the running state. When the timer expires, it will be restarted with the same timeout value. + * This API shall not be called on a running timer. + * + * @param TimerID: The ID Id of the timer to start + * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) + * @retval None + */ + void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); + + /** + * @brief Delete a virtual timer from the list + * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from + * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the + * creation of a new timer if required and may get a different timer id + * + * @param TimerID: The ID of the timer to remove from the list + * @retval None + */ + void HW_TS_Delete(uint8_t TimerID); + + /** + * @brief Schedule the timer list on the timer interrupt handler + * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes + * care of clearing all status flag required in the RTC and EXTI peripherals + * + * @param None + * @retval None + */ + void HW_TS_RTC_Wakeup_Handler(void); + + /** + * @brief Return the number of ticks to count before the interrupt + * This API returns the number of ticks left to be counted before an interrupt is generated by the + * Timer Server. This API may be used by the application for power management optimization. When the system + * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running + * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the + * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time + * versus time in low power mode is implementation specific + * When the timer is disabled (No timer in the list), it returns 0xFFFF + * + * @param None + * @retval The number of ticks left to count + */ + uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); + + /** + * @brief Notify the application that a registered timer has expired + * This API shall be implemented by the user application. + * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt + * context. The application may implement an Operating System to change the context priority where the timer + * callback may be handled. This API provides the module ID to identify which module is concerned and to allow + * sending the information to the correct task + * + * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created + * @param TimerID: The TimerID of the expired timer + * @param pTimerCallBack: The Callback associated with the timer when it has been created + * @retval None + */ + void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Notify the application that the wakeupcounter has been updated + * This API should be implemented by the user application + * This API notifies the application that the counter has been updated. This is expected to be used along + * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the + * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification + * provides a way to the application to solve that race condition to reevaluate the counter value before + * entering low power mode + * + * @param None + * @retval None + */ + void HW_TS_RTC_CountUpdated_AppNot(void); + +#ifdef __cplusplus +} +#endif + +#endif /*HW_IF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h new file mode 100644 index 000000000..5dbf9a570 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h @@ -0,0 +1,60 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file lp_timer.h + * @author MCD Application Team + * @brief Header for lp_timer.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __LP_TIMER_H +#define __LP_TIMER_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + + /** + * @brief Initialize the low power timer + * + * @param None + * @retval None + */ + void LpTimerInit(void); + + /** + * @brief Request to start a low power timer ( running is stop mode ) + * + * @param time_to_sleep : in ms + * @retval None + */ + void LpTimerStart(uint32_t time_to_sleep); + + /** + * @brief Read how long the timer has run + * + * @param None + * @retval The time elapsed in ms + */ + uint32_t LpGetElapsedTime(void); + + +#ifdef __cplusplus +} +#endif + +#endif /*__LP_TIMER_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h new file mode 100644 index 000000000..7af156239 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h @@ -0,0 +1,75 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.h + * @brief : Header for main.c file. + * This file contains the common defines of the application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MAIN_H +#define __MAIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" +#include "app_conf.h" +#include "app_entry.h" +#include "app_common.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void Error_Handler(void); + +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +/* Private defines -----------------------------------------------------------*/ +void MX_GPIO_Init(void); +void MX_IPCC_Init(void); +void MX_RF_Init(void); +void MX_RTC_Init(void); +/* USER CODE BEGIN Private defines */ + +/* USER CODE END Private defines */ + +#ifdef __cplusplus +} +#endif + +#endif /* __MAIN_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/nucleo_wb15cc_conf.h new file mode 100644 index 000000000..0593858cc --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/nucleo_wb15cc_conf.h @@ -0,0 +1,74 @@ +/** + ****************************************************************************** + * @file nucleo_wb15cc_conf.h + * @author MCD Application Team + * @brief NUCLEO-WB15CC board configuration file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef NUCLEO_WB15CC_CONF_H +#define NUCLEO_WB15CC_CONF_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" + +/** @addtogroup BSP + * @{ + */ + +/** @addtogroup NUCLEO_WB15CC + * @{ + */ + +/** @defgroup NUCLEO_WB15CC_CONFIG CONFIG + * @{ + */ + +/** @defgroup NUCLEO_WB15CC_CONFIG_Exported_Constants Exported Constants + * @{ + */ +/* COM usage define */ +#define USE_BSP_COM_FEATURE 0U + +/* COM log define */ +#define USE_COM_LOG 0U + +/* IRQ priorities */ +#define BSP_BUTTON_USER_IT_PRIORITY 15U + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif /* NUCLEO_WB15CC_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h new file mode 100644 index 000000000..45c31caa5 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h @@ -0,0 +1,79 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32_LPM_IF_H +#define __STM32_LPM_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ); +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ); + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ); +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ); + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ); + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ); + +#ifdef __cplusplus +} +#endif + +#endif /*__STM32_LPM_IF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h new file mode 100644 index 000000000..eb093e5e7 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h @@ -0,0 +1,352 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_conf.h + * @author MCD Application Team + * @brief HAL configuration file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_HAL_CONF_H +#define __STM32WBxx_HAL_CONF_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ + +/* ########################## Module Selection ############################## */ +/** + * @brief This is the list of modules to be used in the HAL driver + */ +#define HAL_MODULE_ENABLED +/* #define HAL_ADC_MODULE_ENABLED */ +#define HAL_CRYP_MODULE_ENABLED +#define HAL_COMP_MODULE_ENABLED +#define HAL_CRC_MODULE_ENABLED +#define HAL_HSEM_MODULE_ENABLED +/*#define HAL_I2C_MODULE_ENABLED*/ +#define HAL_IPCC_MODULE_ENABLED +/*#define HAL_IRDA_MODULE_ENABLED*/ +/*#define HAL_IWDG_MODULE_ENABLED*/ +/*#define HAL_LCD_MODULE_ENABLED*/ +/*#define HAL_LPTIM_MODULE_ENABLED*/ +/*#define HAL_PCD_MODULE_ENABLED*/ +#define HAL_PKA_MODULE_ENABLED +/*#define HAL_QSPI_MODULE_ENABLED*/ +#define HAL_RNG_MODULE_ENABLED +#define HAL_RTC_MODULE_ENABLED +/*#define HAL_SAI_MODULE_ENABLED*/ +/*#define HAL_SMBUS_MODULE_ENABLED*/ +/*#define HAL_SMARTCARD_MODULE_ENABLED*/ +/* #define HAL_SPI_MODULE_ENABLED */ +#define HAL_TIM_MODULE_ENABLED +/*#define HAL_TSC_MODULE_ENABLED*/ +#define HAL_UART_MODULE_ENABLED +#define HAL_USART_MODULE_ENABLED +/*#define HAL_WWDG_MODULE_ENABLED*/ +#define HAL_EXTI_MODULE_ENABLED +#define HAL_CORTEX_MODULE_ENABLED +#define HAL_DMA_MODULE_ENABLED +#define HAL_FLASH_MODULE_ENABLED +#define HAL_GPIO_MODULE_ENABLED +#define HAL_PWR_MODULE_ENABLED +#define HAL_RCC_MODULE_ENABLED + +#define USE_HAL_ADC_REGISTER_CALLBACKS 0u +#define USE_HAL_COMP_REGISTER_CALLBACKS 0u +#define USE_HAL_CRYP_REGISTER_CALLBACKS 0u +#define USE_HAL_I2C_REGISTER_CALLBACKS 0u +#define USE_HAL_IRDA_REGISTER_CALLBACKS 0u +#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0u +#define USE_HAL_PCD_REGISTER_CALLBACKS 0u +#define USE_HAL_PKA_REGISTER_CALLBACKS 0u +#define USE_HAL_QSPI_REGISTER_CALLBACKS 0u +#define USE_HAL_RNG_REGISTER_CALLBACKS 0u +#define USE_HAL_RTC_REGISTER_CALLBACKS 0u +#define USE_HAL_SAI_REGISTER_CALLBACKS 0u +#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0u +#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0u +#define USE_HAL_SPI_REGISTER_CALLBACKS 0u +#define USE_HAL_TIM_REGISTER_CALLBACKS 0u +#define USE_HAL_TSC_REGISTER_CALLBACKS 0u +#define USE_HAL_UART_REGISTER_CALLBACKS 0u +#define USE_HAL_USART_REGISTER_CALLBACKS 0u +#define USE_HAL_WWDG_REGISTER_CALLBACKS 0u + +/* ########################## Oscillator Values adaptation ####################*/ +/** + * @brief Adjust the value of External High Speed oscillator (HSE) used in your application. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSE is used as system clock source, directly or through the PLL). + */ +#if !defined (HSE_VALUE) +#define HSE_VALUE 32000000U /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (HSE_STARTUP_TIMEOUT) + #define HSE_STARTUP_TIMEOUT ((uint32_t)100) /*!< Time out for HSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief Internal Multiple Speed oscillator (MSI) default value. + * This value is the default MSI range value after Reset. + */ +#if !defined (MSI_VALUE) + #define MSI_VALUE ((uint32_t)4000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +/** + * @brief Internal High Speed oscillator (HSI) value. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSI is used as system clock source, directly or through the PLL). + */ +#if !defined (HSI_VALUE) +#define HSI_VALUE 16000000U /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +/** + * @brief Internal Low Speed oscillator (LSI1) value. + */ +#if !defined (LSI1_VALUE) + #define LSI1_VALUE ((uint32_t)32000) /*!< LSI1 Typical Value in Hz*/ +#endif /* LSI1_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ +/** + * @brief Internal Low Speed oscillator (LSI2) value. + */ +#if !defined (LSI2_VALUE) + #define LSI2_VALUE ((uint32_t)32000) /*!< LSI2 Typical Value in Hz*/ +#endif /* LSI2_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ + +/** + * @brief External Low Speed oscillator (LSE) value. + * This value is used by the UART, RTC HAL module to compute the system frequency + */ +#if !defined (LSE_VALUE) +#define LSE_VALUE 32768U /*!< Value of the External oscillator in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @brief Internal Multiple Speed oscillator (HSI48) default value. + * This value is the default HSI48 range value after Reset. + */ +#if !defined (HSI48_VALUE) + #define HSI48_VALUE ((uint32_t)48000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI48_VALUE */ + +#if !defined (LSE_STARTUP_TIMEOUT) +#define LSE_STARTUP_TIMEOUT 5000U /*!< Time out for LSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief External clock source for SAI1 peripheral + * This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source + * frequency. + */ +#if !defined (EXTERNAL_SAI1_CLOCK_VALUE) + #define EXTERNAL_SAI1_CLOCK_VALUE ((uint32_t)48000) /*!< Value of the SAI1 External clock source in Hz*/ +#endif /* EXTERNAL_SAI1_CLOCK_VALUE */ + +/* Tip: To avoid modifying this file each time you need to use different HSE, + === you can define the HSE value in your toolchain compiler preprocessor. */ + +/* ########################### System Configuration ######################### */ +/** + * @brief This is the HAL system configuration section + */ + +#define VDD_VALUE 3300U /*!< Value of VDD in mv */ +#define TICK_INT_PRIORITY 0U /*!< tick interrupt priority */ +#define USE_RTOS 0U +#define PREFETCH_ENABLE 1U +#define INSTRUCTION_CACHE_ENABLE 1U +#define DATA_CACHE_ENABLE 1U + +/* ########################## Assert Selection ############################## */ +/** + * @brief Uncomment the line below to expanse the "assert_param" macro in the + * HAL drivers code + */ +/* #define USE_FULL_ASSERT 1U */ + +/* ################## SPI peripheral configuration ########################## */ + +/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver + * Activated: CRC code is present inside driver + * Deactivated: CRC code cleaned from driver + */ + +#define USE_SPI_CRC 0U + +/* Includes ------------------------------------------------------------------*/ +/** + * @brief Include module's header file + */ +#ifdef HAL_DMA_MODULE_ENABLED + #include "stm32wbxx_hal_dma.h" +#endif /* HAL_DMA_MODULE_ENABLED */ + +#ifdef HAL_ADC_MODULE_ENABLED + #include "stm32wbxx_hal_adc.h" +#endif /* HAL_ADC_MODULE_ENABLED */ + +#ifdef HAL_COMP_MODULE_ENABLED + #include "stm32wbxx_hal_comp.h" +#endif /* HAL_COMP_MODULE_ENABLED */ + +#ifdef HAL_CORTEX_MODULE_ENABLED + #include "stm32wbxx_hal_cortex.h" +#endif /* HAL_CORTEX_MODULE_ENABLED */ + +#ifdef HAL_CRC_MODULE_ENABLED + #include "stm32wbxx_hal_crc.h" +#endif /* HAL_CRC_MODULE_ENABLED */ + +#ifdef HAL_CRYP_MODULE_ENABLED + #include "stm32wbxx_hal_cryp.h" +#endif /* HAL_CRYP_MODULE_ENABLED */ + +#ifdef HAL_EXTI_MODULE_ENABLED + #include "stm32wbxx_hal_exti.h" +#endif /* HAL_EXTI_MODULE_ENABLED */ + +#ifdef HAL_FLASH_MODULE_ENABLED + #include "stm32wbxx_hal_flash.h" +#endif /* HAL_FLASH_MODULE_ENABLED */ + +#ifdef HAL_GPIO_MODULE_ENABLED + #include "stm32wbxx_hal_gpio.h" +#endif /* HAL_GPIO_MODULE_ENABLED */ + +#ifdef HAL_HSEM_MODULE_ENABLED + #include "stm32wbxx_hal_hsem.h" +#endif /* HAL_HSEM_MODULE_ENABLED */ + +#ifdef HAL_I2C_MODULE_ENABLED + #include "stm32wbxx_hal_i2c.h" +#endif /* HAL_I2C_MODULE_ENABLED */ + +#ifdef HAL_IPCC_MODULE_ENABLED + #include "stm32wbxx_hal_ipcc.h" +#endif /* HAL_IPCC_MODULE_ENABLED */ + +#ifdef HAL_IRDA_MODULE_ENABLED + #include "stm32wbxx_hal_irda.h" +#endif /* HAL_IRDA_MODULE_ENABLED */ + +#ifdef HAL_IWDG_MODULE_ENABLED + #include "stm32wbxx_hal_iwdg.h" +#endif /* HAL_IWDG_MODULE_ENABLED */ + +#ifdef HAL_LCD_MODULE_ENABLED + #include "stm32wbxx_hal_lcd.h" +#endif /* HAL_LCD_MODULE_ENABLED */ + +#ifdef HAL_LPTIM_MODULE_ENABLED + #include "stm32wbxx_hal_lptim.h" +#endif /* HAL_LPTIM_MODULE_ENABLED */ + +#ifdef HAL_PCD_MODULE_ENABLED + #include "stm32wbxx_hal_pcd.h" +#endif /* HAL_PCD_MODULE_ENABLED */ + +#ifdef HAL_PKA_MODULE_ENABLED + #include "stm32wbxx_hal_pka.h" +#endif /* HAL_PKA_MODULE_ENABLED */ + +#ifdef HAL_PWR_MODULE_ENABLED + #include "stm32wbxx_hal_pwr.h" +#endif /* HAL_PWR_MODULE_ENABLED */ + +#ifdef HAL_QSPI_MODULE_ENABLED + #include "stm32wbxx_hal_qspi.h" +#endif /* HAL_QSPI_MODULE_ENABLED */ + +#ifdef HAL_RCC_MODULE_ENABLED + #include "stm32wbxx_hal_rcc.h" +#endif /* HAL_RCC_MODULE_ENABLED */ + +#ifdef HAL_RNG_MODULE_ENABLED + #include "stm32wbxx_hal_rng.h" +#endif /* HAL_RNG_MODULE_ENABLED */ + +#ifdef HAL_RTC_MODULE_ENABLED + #include "stm32wbxx_hal_rtc.h" +#endif /* HAL_RTC_MODULE_ENABLED */ + +#ifdef HAL_SAI_MODULE_ENABLED + #include "stm32wbxx_hal_sai.h" +#endif /* HAL_SAI_MODULE_ENABLED */ + +#ifdef HAL_SMARTCARD_MODULE_ENABLED + #include "stm32wbxx_hal_smartcard.h" +#endif /* HAL_SMARTCARD_MODULE_ENABLED */ + +#ifdef HAL_SMBUS_MODULE_ENABLED + #include "stm32wbxx_hal_smbus.h" +#endif /* HAL_SMBUS_MODULE_ENABLED */ + +#ifdef HAL_SPI_MODULE_ENABLED + #include "stm32wbxx_hal_spi.h" +#endif /* HAL_SPI_MODULE_ENABLED */ + +#ifdef HAL_TIM_MODULE_ENABLED + #include "stm32wbxx_hal_tim.h" +#endif /* HAL_TIM_MODULE_ENABLED */ + +#ifdef HAL_TSC_MODULE_ENABLED + #include "stm32wbxx_hal_tsc.h" +#endif /* HAL_TSC_MODULE_ENABLED */ + +#ifdef HAL_UART_MODULE_ENABLED + #include "stm32wbxx_hal_uart.h" +#endif /* HAL_UART_MODULE_ENABLED */ + +#ifdef HAL_USART_MODULE_ENABLED + #include "stm32wbxx_hal_usart.h" +#endif /* HAL_USART_MODULE_ENABLED */ + +#ifdef HAL_WWDG_MODULE_ENABLED + #include "stm32wbxx_hal_wwdg.h" +#endif /* HAL_WWDG_MODULE_ENABLED */ + +/* Exported macro ------------------------------------------------------------*/ +#ifdef USE_FULL_ASSERT +/** + * @brief The assert_param macro is used for function's parameters check. + * @param expr If expr is false, it calls assert_failed function + * which reports the name of the source file and the source + * line number of the call that failed. + * If expr is true, it returns no value. + * @retval None + */ + #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) +/* Exported functions ------------------------------------------------------- */ + void assert_failed(uint8_t* file, uint32_t line); +#else + #define assert_param(expr) ((void)0U) +#endif /* USE_FULL_ASSERT */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_HAL_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h new file mode 100644 index 000000000..81d22b49b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h @@ -0,0 +1,83 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.h + * @brief This file contains the headers of the interrupt handlers. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_IT_H +#define __STM32WBxx_IT_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void NMI_Handler(void); +void HardFault_Handler(void); +void MemManage_Handler(void); +void BusFault_Handler(void); +void UsageFault_Handler(void); +void SVC_Handler(void); +void DebugMon_Handler(void); +void PendSV_Handler(void); +void SysTick_Handler(void); +void RTC_WKUP_IRQHandler(void); +void IPCC_C1_RX_IRQHandler(void); +void IPCC_C1_TX_IRQHandler(void); +void HSEM_IRQHandler(void); +/* USER CODE BEGIN EFP */ +void RTC_WKUP_IRQHandler(void); +void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); +void PUSH_BUTTON_SW2_EXTI_IRQHandler(void); +void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); +void USART1_IRQHandler(void); +void CFG_HW_USART1_DMA_TX_IRQHandler( void ); +void LPUART1_IRQHandler(void); +void CFG_HW_LPUART1_DMA_TX_IRQHandler( void ); + +void POWEROFF_EXTI_IRQHandler(void); +void PIRSensor_EXTI_IRQHandler(void); + +void TIM2_IRQHandler(void); +void TIM1_CC_IRQHandler(void); +/* USER CODE END EFP */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_IT_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h new file mode 100644 index 000000000..66b51180a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h @@ -0,0 +1,65 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef UTILITIES_CONF_H +#define UTILITIES_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "cmsis_compiler.h" +#include "string.h" + +/****************************************************************************** + * common + ******************************************************************************/ +#define UTILS_ENTER_CRITICAL_SECTION( ) uint32_t primask_bit = __get_PRIMASK( );\ + __disable_irq( ) + +#define UTILS_EXIT_CRITICAL_SECTION( ) __set_PRIMASK( primask_bit ) + +#define UTILS_MEMSET8( dest, value, size ) memset( dest, value, size); + +/****************************************************************************** + * tiny low power manager + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_LPM_INIT_CRITICAL_SECTION( ) +#define UTIL_LPM_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_LPM_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) + +/****************************************************************************** + * sequencer + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_SEQ_INIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_SEQ_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_CONF_TASK_NBR (32) +#define UTIL_SEQ_CONF_PRIO_NBR (2) +#define UTIL_SEQ_MEMSET8( dest, value, size ) UTILS_MEMSET8( dest, value, size ) + +#ifdef __cplusplus +} +#endif + +#endif /*UTILITIES_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h new file mode 100644 index 000000000..87adc0aea --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h @@ -0,0 +1,51 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file vcp_conf.h + * @author MCD Application Team + * @brief Configuration of the vcp interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __VCP_CONF_H +#define __VCP_CONF_H + +#ifdef __cplusplus +extern "C" +{ +#endif + +/* Includes ------------------------------------------------------------------*/ +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ +#define VCP_BAUD_RATE (115200) +#define VCP_TX_PATH_INTERFACE_READY_SETUP_TIME (20*1000*1000/CFG_TS_TICK_VAL) /** 20s */ +#define VCP_TASK_ID (CFG_TASK_VCP_SEND_DATA_ID) +#define VCP_TASK_PRIO (CFG_SEQ_PRIO_1) + +#ifdef VCP_TX_PATH_INTERFACE_READY_SETUP_TIME +#define VCP_TIMER_PROC_ID (CFG_TIM_PROC_ID_ISR) +#endif + +/* External variables --------------------------------------------------------*/ +/* Exported macros -----------------------------------------------------------*/ +/* Exported functions ------------------------------------------------------- */ + + +#ifdef __cplusplus +} +#endif + +#endif /*__VCP_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c new file mode 100644 index 000000000..c3bd73aa5 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c @@ -0,0 +1,423 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "app_common.h" + +#include "app_debug.h" +#include "utilities_common.h" +#include "shci.h" +#include "tl.h" +#include "dbg_trace.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ +typedef PACKED_STRUCT +{ + GPIO_TypeDef* port; + uint16_t pin; + uint8_t enable; + uint8_t reserved; +} APPD_GpioConfig_t; +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +/* USER CODE BEGIN PD */ +#define GPIO_NBR_OF_RF_SIGNALS 9 +#define GPIO_CFG_NBR_OF_FEATURES 38 +#define NBR_OF_TRACES_CONFIG_PARAMETERS 4 +#define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 + +/** + * THIS SHALL BE SET TO A VALUE DIFFERENT FROM 0 ONLY ON REQUEST FROM ST SUPPORT + */ +#define BLE_DTB_CFG 0 + +/** + * System Debug Options flags to be configured with: + * - SHCI_C2_DEBUG_OPTIONS_IPCORE_LP + * - SHCI_C2_DEBUG_OPTIONS_IPCORE_NO_LP + * - SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_EN + * - SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_DIS + * which are used to set following configuration bits: + * - bit 0: 0: IP BLE core in LP mode 1: IP BLE core in run mode (no LP supported) + * - bit 1: 0: CPU2 STOP mode Enable 1: CPU2 STOP mode Disable + * - bit [2-7]: bits reserved ( shall be set to 0) + */ +#define SYS_DBG_CFG1 (SHCI_C2_DEBUG_OPTIONS_IPCORE_LP | SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_EN) +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static SHCI_C2_DEBUG_TracesConfig_t APPD_TracesConfig={0, 0, 0, 0}; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static SHCI_C2_DEBUG_GeneralConfig_t APPD_GeneralConfig={BLE_DTB_CFG, SYS_DBG_CFG1, {0, 0}}; + +#ifdef CFG_DEBUG_TRACE_UART +#if(CFG_HW_LPUART1_ENABLED == 1) +extern void MX_LPUART1_UART_Init(void); +#endif +#if(CFG_HW_USART1_ENABLED == 1) +extern void MX_USART1_UART_Init(void); +#endif +#endif + +/** + * THE DEBUG ON GPIO FOR CPU2 IS INTENDED TO BE USED ONLY ON REQUEST FROM ST SUPPORT + * It provides timing information on the CPU2 activity. + * All configuration of (port, pin) is supported for each features and can be selected by the user + * depending on the availability + */ +static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = +{ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ISR - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_STACK_TICK - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_CMD_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ACL_DATA_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* SYS_CMD_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* RNG_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVM_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_GENERAL - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_EVT_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_ACL_DATA_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_SYS_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_SYS_EVT_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_CLI_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_OT_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_OT_ACK_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_CLI_ACK_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_MEM_MANAGER_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_TRACES_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* HARD_FAULT - Set on Entry / Reset on Exit */ +/* From v1.1.1 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IP_CORE_LP_STATUS - Set on Entry / Reset on Exit */ +/* From v1.2.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* END_OF_CONNECTION_EVENT - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* TIMER_SERVER_CALLBACK - Toggle on Entry */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* PES_ACTIVITY - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* MB_BLE_SEND_EVT - Set on Entry / Reset on Exit */ +/* From v1.3.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_NO_DELAY - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_STACK_STORE_NVM_CB - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_WRITE_ONGOING - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_WRITE_COMPLETE - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_CLEANUP - Set on Entry / Reset on Exit */ +/* From v1.4.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ +}; + +/** + * THE DEBUG ON GPIO FOR CPU2 IS INTENDED TO BE USED ONLY ON REQUEST FROM ST SUPPORT + * This table is relevant only for BLE + * It provides timing information on BLE RF activity. + * New signals may be allocated at any location when requested by ST + * The GPIO allocated to each signal depend on the BLE_DTB_CFG value and cannot be changed + */ +#if( BLE_DTB_CFG == 7) +static const APPD_GpioConfig_t aRfConfigList[GPIO_NBR_OF_RF_SIGNALS] = +{ + { GPIOB, LL_GPIO_PIN_2, 0, 0}, /* DTB10 - Tx/Rx SPI */ + { GPIOB, LL_GPIO_PIN_7, 0, 0}, /* DTB11 - Tx/Tx SPI Clk */ + { GPIOA, LL_GPIO_PIN_8, 0, 0}, /* DTB12 - Tx/Rx Ready & SPI Select */ + { GPIOA, LL_GPIO_PIN_9, 0, 0}, /* DTB13 - Tx/Rx Start */ + { GPIOA, LL_GPIO_PIN_10, 0, 0}, /* DTB14 - FSM0 */ + { GPIOA, LL_GPIO_PIN_11, 0, 0}, /* DTB15 - FSM1 */ + { GPIOB, LL_GPIO_PIN_8, 0, 0}, /* DTB16 - FSM2 */ +#if (STM32WB55xx != 0) + { GPIOB, LL_GPIO_PIN_11, 0, 0}, /* DTB17 - FSM3 */ + { GPIOB, LL_GPIO_PIN_10, 0, 0}, /* DTB18 - FSM4 */ +#else + { GPIOA, LL_GPIO_PIN_13, 0, 0}, /* DTB17 - FSM3 */ + { GPIOA, LL_GPIO_PIN_14, 0, 0}, /* DTB18 - FSM4 */ +#endif +}; +#endif +/* USER CODE END PV */ + +/* Global variables ----------------------------------------------------------*/ +/* USER CODE BEGIN GV */ +/* USER CODE END GV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ +static void APPD_SetCPU2GpioConfig( void ); +static void APPD_BleDtbCfg( void ); +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void APPD_Init( void ) +{ +/* USER CODE BEGIN APPD_Init */ +#if (CFG_DEBUGGER_SUPPORTED == 1) + /** + * Keep debugger enabled while in any low power mode + */ + HAL_DBGMCU_EnableDBGSleepMode(); + HAL_DBGMCU_EnableDBGStopMode(); + + /***************** ENABLE DEBUGGER *************************************/ + LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); + +#else + GPIO_InitTypeDef gpio_config = {0}; + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_ANALOG; + + gpio_config.Pin = GPIO_PIN_15 | GPIO_PIN_14 | GPIO_PIN_13; + __HAL_RCC_GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + __HAL_RCC_GPIOA_CLK_DISABLE(); + + gpio_config.Pin = GPIO_PIN_4 | GPIO_PIN_3; + __HAL_RCC_GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + __HAL_RCC_GPIOB_CLK_DISABLE(); + + HAL_DBGMCU_DisableDBGSleepMode(); + HAL_DBGMCU_DisableDBGStopMode(); + HAL_DBGMCU_DisableDBGStandbyMode(); + +#endif /* (CFG_DEBUGGER_SUPPORTED == 1) */ + +#if(CFG_DEBUG_TRACE != 0) + DbgTraceInit(); +#endif + + APPD_SetCPU2GpioConfig( ); + APPD_BleDtbCfg( ); + +/* USER CODE END APPD_Init */ + return; +} + +void APPD_EnableCPU2( void ) +{ +/* USER CODE BEGIN APPD_EnableCPU2 */ + SHCI_C2_DEBUG_Init_Cmd_Packet_t DebugCmdPacket = + { + {{0,0,0}}, /**< Does not need to be initialized */ + {(uint8_t *)aGpioConfigList, + (uint8_t *)&APPD_TracesConfig, + (uint8_t *)&APPD_GeneralConfig, + GPIO_CFG_NBR_OF_FEATURES, + NBR_OF_TRACES_CONFIG_PARAMETERS, + NBR_OF_GENERAL_CONFIG_PARAMETERS} + }; + + /**< Traces channel initialization */ + TL_TRACES_Init( ); + + /** GPIO DEBUG Initialization */ + SHCI_C2_DEBUG_Init( &DebugCmdPacket ); + +/* USER CODE END APPD_EnableCPU2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void APPD_SetCPU2GpioConfig( void ) +{ +/* USER CODE BEGIN APPD_SetCPU2GpioConfig */ + GPIO_InitTypeDef gpio_config = {0}; + uint8_t local_loop; + uint16_t gpioa_pin_list; + uint16_t gpiob_pin_list; + uint16_t gpioc_pin_list; + + gpioa_pin_list = 0; + gpiob_pin_list = 0; + gpioc_pin_list = 0; + + for(local_loop = 0 ; local_loop < GPIO_CFG_NBR_OF_FEATURES; local_loop++) + { + if( aGpioConfigList[local_loop].enable != 0) + { + switch((uint32_t)aGpioConfigList[local_loop].port) + { + case (uint32_t)GPIOA: + gpioa_pin_list |= aGpioConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOB: + gpiob_pin_list |= aGpioConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOC: + gpioc_pin_list |= aGpioConfigList[local_loop].pin; + break; + + default: + break; + } + } + } + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_OUTPUT_PP; + gpio_config.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + + if(gpioa_pin_list != 0) + { + gpio_config.Pin = gpioa_pin_list; + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_C2GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + HAL_GPIO_WritePin(GPIOA, gpioa_pin_list, GPIO_PIN_RESET); + } + + if(gpiob_pin_list != 0) + { + gpio_config.Pin = gpiob_pin_list; + __HAL_RCC_GPIOB_CLK_ENABLE(); + __HAL_RCC_C2GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + HAL_GPIO_WritePin(GPIOB, gpiob_pin_list, GPIO_PIN_RESET); + } + + if(gpioc_pin_list != 0) + { + gpio_config.Pin = gpioc_pin_list; + __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_C2GPIOC_CLK_ENABLE(); + HAL_GPIO_Init(GPIOC, &gpio_config); + HAL_GPIO_WritePin(GPIOC, gpioc_pin_list, GPIO_PIN_RESET); + } + +/* USER CODE END APPD_SetCPU2GpioConfig */ + return; +} + +static void APPD_BleDtbCfg( void ) +{ +/* USER CODE BEGIN APPD_BleDtbCfg */ +#if (BLE_DTB_CFG != 0) + GPIO_InitTypeDef gpio_config = {0}; + uint8_t local_loop; + uint16_t gpioa_pin_list; + uint16_t gpiob_pin_list; + + gpioa_pin_list = 0; + gpiob_pin_list = 0; + + for(local_loop = 0 ; local_loop < GPIO_NBR_OF_RF_SIGNALS; local_loop++) + { + if( aRfConfigList[local_loop].enable != 0) + { + switch((uint32_t)aRfConfigList[local_loop].port) + { + case (uint32_t)GPIOA: + gpioa_pin_list |= aRfConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOB: + gpiob_pin_list |= aRfConfigList[local_loop].pin; + break; + + default: + break; + } + } + } + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_AF_PP; + gpio_config.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + gpio_config.Alternate = GPIO_AF6_RF_DTB7; + + if(gpioa_pin_list != 0) + { + gpio_config.Pin = gpioa_pin_list; + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_C2GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + } + + if(gpiob_pin_list != 0) + { + gpio_config.Pin = gpiob_pin_list; + __HAL_RCC_GPIOB_CLK_ENABLE(); + __HAL_RCC_C2GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + } +#endif + +/* USER CODE END APPD_BleDtbCfg */ + return; +} + +/************************************************************* + * + * WRAP FUNCTIONS + * +*************************************************************/ +#if(CFG_DEBUG_TRACE != 0) +void DbgOutputInit( void ) +{ +/* USER CODE BEGIN DbgOutputInit */ +#ifdef CFG_DEBUG_TRACE_UART +if (CFG_DEBUG_TRACE_UART == hw_lpuart1) +{ +#if(CFG_HW_LPUART1_ENABLED == 1) + MX_LPUART1_UART_Init(); +#endif +} +else if (CFG_DEBUG_TRACE_UART == hw_uart1) +{ +#if(CFG_HW_USART1_ENABLED == 1) + MX_USART1_UART_Init(); +#endif +} +#endif + +/* USER CODE END DbgOutputInit */ + return; +} + +void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) +{ +/* USER CODE END DbgOutputTraces */ + HW_UART_Transmit_DMA(CFG_DEBUG_TRACE_UART, p_data, size, cb); + +/* USER CODE END DbgOutputTraces */ + return; +} +#endif diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c new file mode 100644 index 000000000..b7f58d70f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c @@ -0,0 +1,743 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "main.h" +#include "app_entry.h" +#include "app_ble.h" +#include "ble.h" +#include "tl.h" +#include "stm32_seq.h" +#include "shci_tl.h" +#include "stm32_lpm.h" +#include "app_debug.h" +#include "otp.h" + +#include "appli_mesh.h" +#include "appli_nvm.h" +#include "pal_nvm.h" +#include "lp_timer.h" +#include "mesh_cfg.h" + +#include "shci.h" +#include "dbg_trace.h" + + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +extern RTC_HandleTypeDef hrtc; +#ifdef SAVE_MODEL_STATE_POWER_FAILURE_DETECTION +extern MOBLEUINT8 PowerOnOff_flag; +#endif +#ifdef ENABLE_OCCUPANCY_SENSOR +extern MOBLEUINT8 Occupancy_Flag; +#endif +extern const void *mobleNvmBase; +extern const void *appNvmBase; +extern const void *prvsnr_data; +#if (LOW_POWER_FEATURE == 1) +extern __IO uint32_t uwTick; +extern HAL_TickFreqTypeDef uwTickFreq; +#if ( CFG_LPM_SUPPORTED == 1) +static uint32_t BleMesh_sleepTime; +#endif +extern volatile uint8_t BleProcessInit; +#endif + +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define POOL_SIZE (CFG_TLBLE_EVT_QUEUE_LENGTH*4U*DIVC(( sizeof(TL_PacketHeader_t) + TL_BLE_EVENT_FRAME_SIZE ), 4U)) + +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t BleSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255]; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private functions prototypes-----------------------------------------------*/ +static void Config_HSE(void); +static void Reset_Device( void ); +#if ( CFG_HW_RESET_BY_FW == 1 ) +static void Reset_IPCC( void ); +static void Reset_BackupDomain( void ); +#endif /* CFG_HW_RESET_BY_FW */ +static void System_Init( void ); +static void SystemPower_Config( void ); +static void appe_Tl_Init( void ); +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); +static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); +static void Init_Rtc( void ); + +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +uint8_t Mesh_Stop_Mode; + +/* Functions Definition ------------------------------------------------------*/ +void MX_APPE_Config( void ) +{ + /** + * The OPTVERR flag is wrongly set at power on + * It shall be cleared before using any HAL_FLASH_xxx() api + */ + __HAL_FLASH_CLEAR_FLAG( FLASH_FLAG_OPTVERR ); + + /** + * Reset some configurations so that the system behave in the same way + * when either out of nReset or Power On + */ + Reset_Device( ); + + /* Configure HSE Tuning */ + Config_HSE(); + + return; +} + +void MX_APPE_Init( void ) +{ +#ifdef STM32WB15xx + MOBLEUINT32 last_user_flash_address = ((READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos) << 11) + FLASH_BASE; +#endif +#ifdef STM32WB55xx + MOBLEUINT32 last_user_flash_address = ((READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos) << 12) + FLASH_BASE; +#endif + + System_Init( ); /**< System initialization */ + + SystemPower_Config(); /**< Configure the system Power Mode */ + + HW_TS_Init(hw_ts_InitMode_Full, &hrtc); /**< Initialize the TimerServer */ + +/* USER CODE BEGIN APPE_Init_1 */ + APPD_Init( ); + + /** + * The Standby mode should not be entered before the initialization is over + * The default state of the Low Power Manager is to allow the Standby Mode so an request is needed here + */ + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_DISABLE); + + APPE_Led_Init(); + + APPE_Button_Init(); + + mobleNvmBase = (const void *)(last_user_flash_address - NVM_SIZE); + appNvmBase = (const void *)(last_user_flash_address - NVM_SIZE - APP_NVM_SIZE); + prvsnr_data = (const void *)(last_user_flash_address - NVM_SIZE - APP_NVM_SIZE - PRVN_NVM_PAGE_SIZE); + +#if (LOW_POWER_FEATURE == 1) + /** + * Initialize the lp timer to be used when the systick is stopped in low power mode + */ + LpTimerInit(); +#endif + +/* USER CODE END APPE_Init_1 */ + appe_Tl_Init(); /* Initialize all transport layers */ + + /** + * From now, the application is waiting for the ready event ( VS_HCI_C2_Ready ) + * received on the system channel before starting the Stack + * This system event is received with APPE_SysUserEvtRx() + */ +/* USER CODE BEGIN APPE_Init_2 */ + +/* USER CODE END APPE_Init_2 */ + return; +} + +void Init_Smps( void ) +{ +#if (CFG_USE_SMPS != 0) + /** + * Configure and enable SMPS + * + * The SMPS configuration is not yet supported by CubeMx + * when SMPS output voltage is set to 1.4V, the RF output power is limited to 3.7dBm + * the SMPS output voltage shall be increased for higher RF output power + */ + LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA); + LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40); + LL_PWR_SMPS_Enable(); +#endif + + return; +} + +void Init_Exti( void ) +{ + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); + + return; +} + +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void Reset_Device( void ) +{ +#if ( CFG_HW_RESET_BY_FW == 1 ) + Reset_BackupDomain(); + + Reset_IPCC(); +#endif /* CFG_HW_RESET_BY_FW */ + + return; +} + +#if ( CFG_HW_RESET_BY_FW == 1 ) +static void Reset_BackupDomain( void ) +{ + if ((LL_RCC_IsActiveFlag_PINRST() != FALSE) && (LL_RCC_IsActiveFlag_SFTRST() == FALSE)) + { + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_BACKUPRESET_FORCE(); + __HAL_RCC_BACKUPRESET_RELEASE(); + } + + return; +} + +static void Reset_IPCC( void ) +{ + LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_IPCC); + + LL_C1_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + return; +} +#endif /* CFG_HW_RESET_BY_FW */ + +static void Config_HSE(void) +{ + OTP_ID0_t * p_otp; + + /** + * Read HSE_Tuning from OTP + */ + p_otp = (OTP_ID0_t *) OTP_Read(0); + if (p_otp) + { + LL_RCC_HSE_SetCapacitorTuning(p_otp->hse_tuning); + } + + return; +} + +static void System_Init( void ) +{ + Init_Smps( ); + + Init_Exti( ); + + Init_Rtc( ); + + return; +} + +static void Init_Rtc( void ) +{ + /* Disable RTC registers write protection */ + LL_RTC_DisableWriteProtection(RTC); + + LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); + + /* Enable RTC registers write protection */ + LL_RTC_EnableWriteProtection(RTC); + + return; +} + +/** + * @brief Configure the system for power optimization + * + * @note This API configures the system to be ready for low power mode + * + * @param None + * @retval None + */ +static void SystemPower_Config( void ) +{ + /** + * Select HSI as system clock source after Wake Up from Stop mode + */ + LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); + + /* Initialize low power manager */ + UTIL_LPM_Init( ); + /* Initialize the CPU2 reset value before starting CPU2 with C2BOOT */ + LL_C2_PWR_SetPowerMode(LL_PWR_MODE_SHUTDOWN); + +#if (CFG_USB_INTERFACE_ENABLE != 0) + /** + * Enable USB power + */ + HAL_PWREx_EnableVddUSB(); +#endif + /** + * Active SRAM retention for standby support + */ + HAL_PWREx_EnableSRAMRetention(); + + return; +} + +static void appe_Tl_Init( void ) +{ + TL_MM_Config_t tl_mm_config; + SHCI_TL_HciInitConf_t SHci_Tl_Init_Conf; + /**< Reference table initialization */ + TL_Init(); + + /**< System channel initialization */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, UTIL_SEQ_RFU, shci_user_evt_proc ); + SHci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&SystemCmdBuffer; + SHci_Tl_Init_Conf.StatusNotCallBack = APPE_SysStatusNot; + shci_init(APPE_SysUserEvtRx, (void*) &SHci_Tl_Init_Conf); + + /**< Memory Manager channel initialization */ + tl_mm_config.p_BleSpareEvtBuffer = BleSpareEvtBuffer; + tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer; + tl_mm_config.p_AsynchEvtPool = EvtPool; + tl_mm_config.AsynchEvtPoolSize = POOL_SIZE; + TL_MM_Init( &tl_mm_config ); + + TL_Enable(); + + return; +} + +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) +{ + UNUSED(status); + return; +} + +/** +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ +static void APPE_SysUserEvtRx( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} + +/* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ +void APPE_Led_Init( void ) +{ +#if (CFG_LED_SUPPORTED == 1) + /** + * Leds Initialization + */ + + BSP_LED_Init(LED_BLUE); + BSP_LED_Init(LED_GREEN); + BSP_LED_Init(LED_RED); +#endif + + return; +} + +void APPE_Button_Init( void ) +{ +#if (CFG_BUTTON_SUPPORTED == 1) + /** + * Button Initialization + */ + + BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW3, BUTTON_MODE_EXTI); +#endif + + return; +} +/* USER CODE END FD_LOCAL_FUNCTIONS */ + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void HAL_Delay(uint32_t Delay) +{ + uint32_t tickstart = HAL_GetTick(); + uint32_t wait = Delay; + + /* Add a freq to guarantee minimum wait */ + if (wait < HAL_MAX_DELAY) + { + wait += HAL_GetTickFreq(); + } + + while ((HAL_GetTick() - tickstart) < wait) + { + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ + #if defined ( __CC_ARM) + __force_stores(); + #endif + + __WFI( ); + } +} + +void MX_APPE_Process(void) +{ + /* USER CODE BEGIN MX_APPE_Process_1 */ + + /* USER CODE END MX_APPE_Process_1 */ + UTIL_SEQ_Run(UTIL_SEQ_DEFAULT); + /* USER CODE BEGIN MX_APPE_Process_2 */ + + /* USER CODE END MX_APPE_Process_2 */ +} + +void UTIL_SEQ_Idle( void ) +{ +#if ( CFG_LPM_SUPPORTED == 1) +#if (LOW_POWER_FEATURE == 1) + if(BleProcessInit != 0) + { + BleMesh_sleepTime = (uint32_t)BLEMesh_GetSleepDuration(); + + if (BleMesh_sleepTime > 0) + { + LpTimerStart(BleMesh_sleepTime); + + UTIL_LPM_EnterLowPower( ); + + uwTick += (uwTickFreq*LpGetElapsedTime()); + } + UTIL_SEQ_SetTask( 1<CR, FLASH_CR_PG); + + return (MOBLE_RESULT_SUCCESS); +} + +/*****************************************************************************/ + +MOBLE_RESULT HW_FLASH_Erase(uint32_t page, uint16_t n, int interrupt) +{ + UNUSED(interrupt); + + uint32_t loop; + + /* Enable EOP interrupt */ + __HAL_FLASH_ENABLE_IT(FLASH_IT_EOP); + + for( loop = 0; loop < n ; loop++) + { + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP); + + HW_FLASH_PageErase(page+loop); + +// HW_FLASH_WaitEndOfOperation(); + } + + /* Disable EOP interrupt */ + __HAL_FLASH_DISABLE_IT(FLASH_IT_EOP); + + /* Clear the page erase bit */ + CLEAR_BIT(FLASH->CR, (FLASH_CR_PER | FLASH_CR_PNB)); + + return (MOBLE_RESULT_SUCCESS); +} + +#if 0 +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void) +{ + return READ_BIT(FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA); +} + +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetSFSA(void) +{ + return (READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos); +} + +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetSBRSA(void) +{ + return (READ_BIT(FLASH->SRRVR, FLASH_SRRVR_SBRSA) >> FLASH_SRRVR_SBRSA_Pos); +} + +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetSNBRSA(void) +{ + return (READ_BIT(FLASH->SRRVR, FLASH_SRRVR_SNBRSA) >> FLASH_SRRVR_SNBRSA_Pos); +} +#endif + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ + +/** + * This is a copy of FLASH_Program_DoubleWord() from the HAL + */ +static void HW_FLASH_Program_DoubleWord(uint32_t Address, uint64_t Data) +{ +// DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_WRITE); + + /* Set PG bit */ + SET_BIT(FLASH->CR, FLASH_CR_PG); + + /* Program first word */ + *(uint32_t *)Address = (uint32_t)Data; + + /* Barrier to ensure programming is performed in 2 steps, in right order + (independently of compiler optimization behavior) */ + __ISB(); + + /* Program second word */ + *(uint32_t *)(Address + 4U) = (uint32_t)(Data >> 32U); + +// DBG_GPIO_Gr2Reset(DBG_GPIO_GR2_FLASH_WRITE); +} + +/** + * This is a copy of LASH_PageErase() from the HAL + */ +static void HW_FLASH_PageErase(uint32_t Page) +{ +// DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); + + /* Proceed to erase the page */ + MODIFY_REG(FLASH->CR, FLASH_CR_PNB, ((Page << FLASH_CR_PNB_Pos) | FLASH_CR_PER | FLASH_CR_STRT)); + +// DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c new file mode 100644 index 000000000..23a5bcdc6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c @@ -0,0 +1,892 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "hw_conf.h" + +/* Private typedef -----------------------------------------------------------*/ +typedef enum +{ + TimerID_Free, + TimerID_Created, + TimerID_Running +}TimerIDStatus_t; + +typedef enum +{ + SSR_Read_Requested, + SSR_Read_Not_Requested +}RequestReadSSR_t; + +typedef enum +{ + WakeupTimerValue_Overpassed, + WakeupTimerValue_LargeEnough +}WakeupTimerLimitation_Status_t; + +typedef struct +{ + HW_TS_pTimerCb_t pTimerCallBack; + uint32_t CounterInit; + uint32_t CountLeft; + TimerIDStatus_t TimerIDStatus; + HW_TS_Mode_t TimerMode; + uint32_t TimerProcessID; + uint8_t PreviousID; + uint8_t NextID; +}TimerContext_t; + +/* Private defines -----------------------------------------------------------*/ +#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF +#define TIMER_LIST_EMPTY 0xFFFF + +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +/** + * START of Section TIMERSERVER_CONTEXT + */ + +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; + +/** + * END of Section TIMERSERVER_CONTEXT + */ + +static RTC_HandleTypeDef *phrtc; /**< RTC handle */ +static uint8_t WakeupTimerDivider; +static uint8_t AsynchPrescalerUserConfig; +static uint16_t SynchPrescalerUserConfig; +static volatile uint16_t MaxWakeupTimerSetup; + +/* Global variables ----------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +static void RestartWakeupCounter(uint16_t Value); +static uint16_t ReturnTimeElapsed(void); +static void RescheduleTimerList(void); +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); +static uint16_t linkTimer(uint8_t TimerID); +static uint32_t ReadRtcSsrValue(void); + +__weak void HW_TS_RTC_CountUpdated_AppNot(void); + +/* Functions Definition ------------------------------------------------------*/ + +/** + * @brief Read the RTC_SSR value + * As described in the reference manual, the RTC_SSR shall be read twice to ensure + * reliability of the value + * @param None + * @retval SSR value read + */ +static uint32_t ReadRtcSsrValue(void) +{ + uint32_t first_read; + uint32_t second_read; + + first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + while(first_read != second_read) + { + first_read = second_read; + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + } + + return second_read; +} + +/** + * @brief Insert a Timer in the list after the Timer ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked after + * @retval None + */ +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t next_id; + + next_id = aTimerContext[RefTimerID].NextID; + + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = TimerID; + } + aTimerContext[TimerID].NextID = next_id; + aTimerContext[TimerID].PreviousID = RefTimerID ; + aTimerContext[RefTimerID].NextID = TimerID; + + return; +} + +/** + * @brief Insert a Timer in the list before the ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked before + * @retval None + */ +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t previous_id; + + if(RefTimerID != CurrentRunningTimerID) + { + previous_id = aTimerContext[RefTimerID].PreviousID; + + aTimerContext[previous_id].NextID = TimerID; + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[TimerID].PreviousID = previous_id ; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + else + { + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + + return; +} + +/** + * @brief Insert a Timer in the list + * @param TimerID: The ID of the Timer + * @retval None + */ +static uint16_t linkTimer(uint8_t TimerID) +{ + uint32_t time_left; + uint16_t time_elapsed; + uint8_t timer_id_lookup; + uint8_t next_id; + + if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * No timer in the list + */ + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; + + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + time_elapsed = 0; + } + else + { + time_elapsed = ReturnTimeElapsed(); + + /** + * update count of the timer to be linked + */ + aTimerContext[TimerID].CountLeft += time_elapsed; + time_left = aTimerContext[TimerID].CountLeft; + + /** + * Search for index where the new timer shall be linked + */ + if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) + { + /** + * Search for the ID after the first one + */ + timer_id_lookup = CurrentRunningTimerID; + next_id = aTimerContext[timer_id_lookup].NextID; + while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) + { + timer_id_lookup = aTimerContext[timer_id_lookup].NextID; + next_id = aTimerContext[timer_id_lookup].NextID; + } + + /** + * Link after the ID + */ + LinkTimerAfter(TimerID, timer_id_lookup); + } + else + { + /** + * Link before the first ID + */ + LinkTimerBefore(TimerID, CurrentRunningTimerID); + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + } + } + + return time_elapsed; +} + +/** + * @brief Remove a Timer from the list + * @param TimerID: The ID of the Timer + * @param RequestReadSSR: Request to read the SSR register or not + * @retval None + */ +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) +{ + uint8_t previous_id; + uint8_t next_id; + + if(TimerID == CurrentRunningTimerID) + { + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = aTimerContext[TimerID].NextID; + } + else + { + previous_id = aTimerContext[TimerID].PreviousID; + next_id = aTimerContext[TimerID].NextID; + + aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; + } + } + + /** + * Timer is out of the list + */ + aTimerContext[TimerID].TimerIDStatus = TimerID_Created; + + if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) + { + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + } + + return; +} + +/** + * @brief Return the number of ticks counted by the wakeuptimer since it has been started + * @note The API is reading the SSR register to get how many ticks have been counted + * since the time the timer has been started + * @param None + * @retval Time expired in Ticks + */ +static uint16_t ReturnTimeElapsed(void) +{ + uint32_t return_value; + uint32_t wrap_counter; + + if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) + { + return_value = ReadRtcSsrValue(); /**< Read SSR register first */ + + if (SSRValueOnLastSetup >= return_value) + { + return_value = SSRValueOnLastSetup - return_value; + } + else + { + wrap_counter = SynchPrescalerUserConfig - return_value; + return_value = SSRValueOnLastSetup + wrap_counter; + } + + /** + * At this stage, ReturnValue holds the number of ticks counted by SSR + * Need to translate in number of ticks counted by the Wakeuptimer + */ + return_value = return_value*AsynchPrescalerUserConfig; + return_value = return_value >> WakeupTimerDivider; + } + else + { + return_value = 0; + } + + return (uint16_t)return_value; +} + +/** + * @brief Set the wakeup counter + * @note The API is writing the counter value so that the value is decreased by one to cope with the fact + * the interrupt is generated with 1 extra clock cycle (See RefManuel) + * It assumes all condition are met to be allowed to write the wakeup counter + * @param Value: Value to be written in the counter + * @retval None + */ +static void RestartWakeupCounter(uint16_t Value) +{ + /** + * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + */ + + if(Value == 0) + { + SSRValueOnLastSetup = ReadRtcSsrValue(); + + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + else + { + if((Value > 1) ||(WakeupTimerDivider != 1)) + { + Value -= 1; + } + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + + MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); + + /** + * Update the value here after the WUTWF polling that may take some time + */ + SSRValueOnLastSetup = ReadRtcSsrValue(); + + __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ + + HW_TS_RTC_CountUpdated_AppNot(); + } + + return ; +} + +/** + * @brief Reschedule the list of timer + * @note 1) Update the count left for each timer in the list + * 2) Setup the wakeuptimer + * @param None + * @retval None + */ +static void RescheduleTimerList(void) +{ + uint8_t localTimerID; + uint32_t timecountleft; + uint16_t wakeup_timer_value; + uint16_t time_elapsed; + + /** + * The wakeuptimer is disabled now to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + localTimerID = CurrentRunningTimerID; + + /** + * Calculate what will be the value to write in the wakeuptimer + */ + timecountleft = aTimerContext[localTimerID].CountLeft; + + /** + * Read how much has been counted + */ + time_elapsed = ReturnTimeElapsed(); + + if(timecountleft < time_elapsed ) + { + /** + * There is no tick left to count + */ + wakeup_timer_value = 0; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + else + { + if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) + { + /** + * The number of tick left is greater than the Wakeuptimer maximum value + */ + wakeup_timer_value = MaxWakeupTimerSetup; + + WakeupTimerLimitation = WakeupTimerValue_Overpassed; + } + else + { + wakeup_timer_value = timecountleft - time_elapsed; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + + } + + /** + * update ticks left to be counted for each timer + */ + while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + if (aTimerContext[localTimerID].CountLeft < time_elapsed) + { + aTimerContext[localTimerID].CountLeft = 0; + } + else + { + aTimerContext[localTimerID].CountLeft -= time_elapsed; + } + localTimerID = aTimerContext[localTimerID].NextID; + } + + /** + * Write next count + */ + RestartWakeupCounter(wakeup_timer_value); + + return ; +} + +/* Public functions ----------------------------------------------------------*/ + +/** + * For all public interface except that may need write access to the RTC, the RTC + * shall be unlock at the beginning and locked at the output + * In order to ease maintainability, the unlock is done at the top and the lock at then end + * in case some new implementation is coming in the future + */ + +void HW_TS_RTC_Wakeup_Handler(void) +{ + HW_TS_pTimerCb_t ptimer_callback; + uint32_t timer_process_id; + uint8_t local_current_running_timer_id; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + +/* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + /** + * Disable the Wakeup Timer + * This may speed up a bit the processing to wait the timer to be disabled + * The timer is still counting 2 RTCCLK + */ + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + + local_current_running_timer_id = CurrentRunningTimerID; + + if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) + { + ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; + timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; + + /** + * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted + * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick + * to be left whereas the count is over + * A more secure implementation has been done with a flag to state whereas the full count has been written + * in the wakeuptimer or not + */ + if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) + { + if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) + { + UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Stop(local_current_running_timer_id); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + + HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); + } + else + { + RescheduleTimerList(); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + } + else + { + /** + * We should never end up in this case + * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. + * We could just clean the interrupt flag and get out from this unexpected interrupt + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + return; +} + +void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) +{ + uint8_t loop; + uint32_t localmaxwakeuptimersetup; + + /** + * Get RTC handler + */ + phrtc = hrtc; + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + SET_BIT(RTC->CR, RTC_CR_BYPSHAD); + + /** + * Readout the user config + */ + WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); + + AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; + + SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; + + /** + * Margin is taken to avoid wrong calculation when the wrap around is there and some + * application interrupts may have delayed the reading + */ + localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); + + if(localmaxwakeuptimersetup >= 0xFFFF) + { + MaxWakeupTimerSetup = 0xFFFF; + } + else + { + MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; + } + + /** + * Configure EXTI module + */ + LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + + if(TimerInitMode == hw_ts_InitMode_Full) + { + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + + /** + * Initialize the timer server + */ + for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) + { + aTimerContext[loop].TimerIDStatus = TimerID_Free; + } + + CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ + + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ + } + else + { + if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) + { + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + + return; +} + +HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) +{ + HW_TS_ReturnStatus_t localreturnstatus; + uint8_t loop = 0; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) + { + loop++; + } + + if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[loop].TimerIDStatus = TimerID_Created; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + aTimerContext[loop].TimerProcessID = TimerProcessID; + aTimerContext[loop].TimerMode = TimerMode; + aTimerContext[loop].pTimerCallBack = pftimeout_handler; + *pTimerId = loop; + + localreturnstatus = hw_ts_Successful; + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + localreturnstatus = hw_ts_Failed; + } + + return(localreturnstatus); +} + +void HW_TS_Delete(uint8_t timer_id) +{ + HW_TS_Stop(timer_id); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ + + return; +} + +void HW_TS_Stop(uint8_t timer_id) +{ + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + UnlinkTimer(timer_id, SSR_Read_Requested); + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * List is empty + */ + + /** + * Disable the timer + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + } + else if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) +{ + uint16_t time_elapsed; + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + HW_TS_Stop( timer_id ); + } + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Running; + + aTimerContext[timer_id].CountLeft = timeout_ticks; + aTimerContext[timer_id].CounterInit = timeout_ticks; + + time_elapsed = linkTimer(timer_id); + + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + else + { + aTimerContext[timer_id].CountLeft -= time_elapsed; + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) +{ + uint32_t primask_bit; + uint16_t return_value, auro_reload_value, elapsed_time_value; + + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ + + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); + + elapsed_time_value = ReturnTimeElapsed(); + + if(auro_reload_value > elapsed_time_value) + { + return_value = auro_reload_value - elapsed_time_value; + } + else + { + return_value = 0; + } + } + else + { + return_value = TIMER_LIST_EMPTY; + } + + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + + return (return_value); +} + +__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) +{ + pTimerCallBack(); + + return; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c new file mode 100644 index 000000000..025dc182c --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c @@ -0,0 +1,236 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief hardware access + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" + +extern UART_HandleTypeDef hlpuart1; +extern UART_HandleTypeDef huart1; + +/* Macros --------------------------------------------------------------------*/ +#define HW_UART_RX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##RxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Receive_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##TxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Transmit_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX(__HANDLE__, __USART_BASE__) \ + do{ \ + (__HANDLE__).Instance = (__USART_BASE__); \ + hal_status = HAL_UART_Transmit(&(__HANDLE__), p_data, size, timeout); \ + } while(0) + +/* Variables -----------------------------------------------------------------*/ +DMA_HandleTypeDef HW_hdma_huart1_tx ={0}; +void (*HW_huart1RxCb)(void); +void (*HW_huart1TxCb)(void); + +DMA_HandleTypeDef HW_hdma_hlpuart1_tx ={0}; +void (*HW_hlpuart1RxCb)(void); +void (*HW_hlpuart1TxCb)(void); + +void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { + case hw_uart1: + HW_UART_RX_IT(huart1, USART1); + break; + + case hw_lpuart1: + HW_UART_RX_IT(hlpuart1, LPUART1); + break; + + default: + break; + } + + return; +} + +void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { + case hw_uart1: + HW_UART_TX_IT(huart1, USART1); + break; + + case hw_lpuart1: + HW_UART_TX_IT(hlpuart1, LPUART1); + break; + + default: + break; + } + + return; +} + +hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { + case hw_uart1: + HW_UART_TX(huart1, USART1); + break; + + case hw_lpuart1: + HW_UART_TX(hlpuart1, LPUART1); + break; + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { + case hw_uart1: + HW_huart1TxCb = cb; + huart1.Instance = USART1; + hal_status = HAL_UART_Transmit_DMA(&huart1, p_data, size); + break; + + case hw_lpuart1: + HW_hlpuart1TxCb = cb; + hlpuart1.Instance = LPUART1; + hal_status = HAL_UART_Transmit_DMA(&hlpuart1, p_data, size); + break; + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { + case (uint32_t)USART1: + if(HW_huart1RxCb) + { + HW_huart1RxCb(); + } + break; + + case (uint32_t)LPUART1: + if(HW_hlpuart1RxCb) + { + HW_hlpuart1RxCb(); + } + break; + + default: + break; + } + + return; +} + +void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { + case (uint32_t)USART1: + if(HW_huart1TxCb) + { + HW_huart1TxCb(); + } + break; + + case (uint32_t)LPUART1: + if(HW_hlpuart1TxCb) + { + HW_hlpuart1TxCb(); + } + break; + + default: + break; + } + + return; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c new file mode 100644 index 000000000..9eac8fb92 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c @@ -0,0 +1,134 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file lp_timer.c + * @author MCD Application Team + * @brief Low power timer to be used within Mesh Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" + +#include "lp_timer.h" + +/* Exported variables --------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +static void LpTimerCb(void); + +/* Private typedef -----------------------------------------------------------*/ +typedef struct +{ + uint32_t LpTimeLeftOnEntry; + uint8_t LpTimer_Id; +} LpTimerContext_t; + +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static LpTimerContext_t LpTimerContext; + +/* Functions Definition ------------------------------------------------------*/ + +/** + * @brief Initialize the low power timer + * + * @param None + * @retval None + */ +void LpTimerInit(void) +{ + (void) HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(LpTimerContext.LpTimer_Id), hw_ts_SingleShot, LpTimerCb); + + return; +} + +/** + * @brief Request to start a low power timer ( running is stop mode ) + * + * @param time_to_sleep : in ms + * @retval None + */ +void LpTimerStart(uint32_t time_to_sleep) +{ + /* Converts the number of ms into hw timer tick */ + if(time_to_sleep > 0x400000) + { + time_to_sleep = time_to_sleep / (CFG_TS_TICK_VAL); + time_to_sleep *= 1000; + } + else + { + time_to_sleep *= 1000; + time_to_sleep = time_to_sleep / (CFG_TS_TICK_VAL); + } + + HW_TS_Start(LpTimerContext.LpTimer_Id, time_to_sleep); + + /** + * There might be other timers already running in the timer server that may elapse + * before this one. + * Store how long before the next event so that on wakeup, it will be possible to calculate + * how long the tick has been suppressed + */ + LpTimerContext.LpTimeLeftOnEntry = HW_TS_RTC_ReadLeftTicksToCount(); + + return; +} + +/** + * @brief Read how long the timer has run + * + * @param None + * @retval The time elapsed in ms + */ +uint32_t LpGetElapsedTime(void) +{ + uint32_t return_value; + + return_value = (CFG_TS_TICK_VAL) * (uint32_t)(LpTimerContext.LpTimeLeftOnEntry - HW_TS_RTC_ReadLeftTicksToCount()); + return_value = return_value / 1000; + + /** + * The system may have been out from another reason than the timer + * Stop the timer after the elapsed time is calculated other wise, HW_TS_RTC_ReadLeftTicksToCount() + * may return 0xFFFF ( TIMER LIST EMPTY ) + * It does not hurt stopping a timer that exists but is not running. + */ + HW_TS_Stop(LpTimerContext.LpTimer_Id); + + return return_value; +} + + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief Low power timer callback + * + * @param None + * @retval None + */ +static void LpTimerCb( void ) +{ + /** + * Nothing to be done + */ + + return; +} + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c new file mode 100644 index 000000000..f61078fdb --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c @@ -0,0 +1,337 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.c + * @brief : Main program body + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @verbatim + ============================================================================== + ##### IMPORTANT NOTE ##### + ============================================================================== + + This application requests having the stm32wb1x_BLE_Stack_fw.bin binary + flashed on the Wireless Coprocessor. + If it is not the case, you need to use STM32CubeProgrammer to load the appropriate + binary. + + All available binaries are located under following directory: + /Projects/STM32_Copro_Wireless_Binaries + + Refer to UM2237 to learn how to use/install STM32CubeProgrammer. + Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the + detailed procedure to change the Wireless Coprocessor binary. + + @endverbatim + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "stm32_lpm.h" +#include "stm32_seq.h" +#include "dbg_trace.h" +#include "hw_conf.h" +#include "otp.h" + +#include "app_entry.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "models_if.h" +#include "mesh_cfg.h" +#include "stm32wbxx_hal_rcc.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +IPCC_HandleTypeDef hipcc; + +RTC_HandleTypeDef hrtc = { 0 }; /**< RTC handler declaration */ +TIM_HandleTypeDef htim1 = { 0 }; +TIM_HandleTypeDef htim2 = { 0 }; +UART_HandleTypeDef hlpuart1; +UART_HandleTypeDef huart1; +DMA_HandleTypeDef hdma_lpuart1_tx; +DMA_HandleTypeDef hdma_usart1_tx; +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +void SystemClock_Config( void ); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/** + * @brief The application entry point. + * @retval int + */ +int main( void ) +{ + /* USER CODE BEGIN 1 */ + + /* USER CODE END 1 */ + + /* MCU Configuration--------------------------------------------------------*/ + + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + HAL_Init(); + /* Config code for STM32_WPAN (HSE Tuning must be done before system clock configuration) */ + MX_APPE_Config(); + + /* USER CODE BEGIN Init */ + + /* USER CODE END Init */ + + /* Configure the system clock */ + SystemClock_Config(); + + /* IPCC initialisation */ + MX_IPCC_Init(); + + /* USER CODE BEGIN SysInit */ + + /* USER CODE END SysInit */ + + /* Initialize all configured peripherals */ + MX_GPIO_Init(); + MX_RTC_Init(); + /* USER CODE BEGIN 2 */ + + /* USER CODE END 2 */ + + /* Init code for STM32_WPAN */ + MX_APPE_Init(); + /* Infinite loop */ + /* USER CODE BEGIN WHILE */ + while(1) + { + /* USER CODE END WHILE */ + MX_APPE_Process(); + + /* USER CODE BEGIN 3 */ + } + /* USER CODE END 3 */ +} + +/** + * @brief System Clock Configuration + * @retval None + */ +void SystemClock_Config(void) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Configure LSE Drive Capability + */ + HAL_PWR_EnableBkUpAccess(); + __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW); + /** Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE + |RCC_OSCILLATORTYPE_LSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.LSEState = RCC_LSE_ON; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } + /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK4|RCC_CLOCKTYPE_HCLK2 + |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK + |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSE; +#if ( CFG_LPM_SUPPORTED == 1) + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV2; +#else + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; +#endif + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.AHBCLK4Divider = RCC_SYSCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + Error_Handler(); + } + /** Initializes the peripherals clocks + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP + |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 + |RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; + PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; + PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN Smps */ + + /* USER CODE END Smps */ +} + +/** + * @brief IPCC Initialization Function + * @param None + * @retval None + */ +void MX_IPCC_Init(void) +{ + + /* USER CODE BEGIN IPCC_Init 0 */ + + /* USER CODE END IPCC_Init 0 */ + + /* USER CODE BEGIN IPCC_Init 1 */ + + /* USER CODE END IPCC_Init 1 */ + hipcc.Instance = IPCC; + if (HAL_IPCC_Init(&hipcc) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN IPCC_Init 2 */ + + /* USER CODE END IPCC_Init 2 */ + +} + +/** + * @brief RTC Initialization Function + * @param None + * @retval None + */ +void MX_RTC_Init(void) +{ + + /* USER CODE BEGIN RTC_Init 0 */ + + /* USER CODE END RTC_Init 0 */ + + /* USER CODE BEGIN RTC_Init 1 */ + + /* USER CODE END RTC_Init 1 */ + /** Initialize RTC Only + */ + hrtc.Instance = RTC; + hrtc.Init.HourFormat = RTC_HOURFORMAT_24; + hrtc.Init.AsynchPrediv = CFG_RTC_ASYNCH_PRESCALER; + hrtc.Init.SynchPrediv = CFG_RTC_SYNCH_PRESCALER; + hrtc.Init.OutPut = RTC_OUTPUT_DISABLE; + hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH; + hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE; + if (HAL_RTC_Init(&hrtc) != HAL_OK) + { + Error_Handler(); + } + /** Enable the WakeUp + */ + if (HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, 0, RTC_WAKEUPCLOCK_RTCCLK_DIV16) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN RTC_Init 2 */ + /* Disable RTC registers write protection */ + LL_RTC_DisableWriteProtection(RTC); + + LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); + + /* Enable RTC registers write protection */ + LL_RTC_EnableWriteProtection(RTC); + /* USER CODE END RTC_Init 2 */ + +} + +/** + * @brief GPIO Initialization Function + * @param None + * @retval None + */ +void MX_GPIO_Init(void) +{ + + /* GPIO Ports Clock Enable */ + __HAL_RCC_GPIOC_CLK_ENABLE(); + +} + +/* USER CODE BEGIN 4 */ + +/* USER CODE END 4 */ + +/** + * @brief This function is executed in case of error occurrence. + * @retval None + */ +void Error_Handler(void) +{ + /* USER CODE BEGIN Error_Handler_Debug */ + /* User can add his own implementation to report the HAL error return state */ + __disable_irq(); + while (1) + { + } + /* USER CODE END Error_Handler_Debug */ +} + +#ifdef USE_FULL_ASSERT +/** + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ +void assert_failed(uint8_t *file, uint32_t line) +{ + /* USER CODE BEGIN 6 */ + /* User can add his own implementation to report the file name and line number, + ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* USER CODE END 6 */ +} +#endif /* USE_FULL_ASSERT */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/standby_stm32wb15.c new file mode 100644 index 000000000..f7172d804 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/standby_stm32wb15.c @@ -0,0 +1,164 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file standby_stm32wb15.c + * @author MCD Application Team + * @brief Specific code for standby mode + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "app_entry.h" +#include "app_common.h" +#include "app_debug.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +uint32_t backup_MSP; +uint32_t backup_IPCC_C1MR; +uint32_t boot_after_standby; +extern RTC_HandleTypeDef hrtc; +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +uint32_t standby_boot_mng(void); +void standby_hw_save(void); +void standby_hw_restore(void); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/******************************************************************************* + * This part may be updated by the user + ******************************************************************************/ + + /** + * @brief standby_hw_save function, saves hardware context to restore + * @param None + * @retval None + */ +void standby_hw_save(void) +{ + backup_IPCC_C1MR = READ_REG(IPCC->C1MR); + + /* USER CODE BEGIN standby_hw_save */ + + /* USER CODE END standby_hw_save */ + return; +} + + /** + * @brief standby_hw_restore function, restore and reconfigure hardware context + * @param None + * @retval None + */ +void standby_hw_restore(void) +{ + /* USER CODE BEGIN standby_hw_restore_1 */ + + /* USER CODE END standby_hw_restore_1 */ + + APPD_Init(); + Init_Exti(); + Init_Smps(); + HAL_Init(); + + HW_IPCC_Init(); + HW_IPCC_Enable(); + WRITE_REG(IPCC->C1MR, backup_IPCC_C1MR); + + if( !LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ) + { + LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + } + LL_HSEM_ReleaseLock( HSEM, CFG_HW_PWR_STANDBY_SEMID, 0 ); + + /* In this user section add MX init functions present in main.c , except MX_RTC_Init() */ + /* USER CODE BEGIN standby_hw_restore_2 */ + + MX_GPIO_Init(); + + /* USER CODE END standby_hw_restore_2 */ + + HW_TS_Init(hw_ts_InitMode_Limited, &hrtc); + + LL_PWR_EnableSRAM2Retention(); + + /* USER CODE BEGIN standby_hw_restore_3 */ + APPE_Led_Init(); + APPE_Button_Init(); + /* USER CODE END standby_hw_restore_3 */ + + return; +} + +/******************************************************************************* + * Do not update code from this limit. + ******************************************************************************/ + + /** + * @brief standby_boot_mng function, will restore MCU context if wakeup from standby + * @param None + * @retval None + */ +uint32_t standby_boot_mng(void) +{ +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + __HAL_RCC_HSEM_CLK_ENABLE(); + while( LL_HSEM_1StepLock( HSEM, CFG_HW_PWR_STANDBY_SEMID ) ); + + if( __HAL_PWR_GET_FLAG(PWR_FLAG_SB) != RESET ) + { + __disable_irq( ); + + boot_after_standby = 1; + }else{ + boot_after_standby = 0; + + LL_HSEM_ReleaseLock( HSEM, CFG_HW_PWR_STANDBY_SEMID, 0 ); + } +#else + boot_after_standby = 0; +#endif + + return boot_after_standby; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c new file mode 100644 index 000000000..0847a023f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c @@ -0,0 +1,446 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32_lpm_if.h" +#include "stm32_lpm.h" +#include "app_conf.h" +/* USER CODE BEGIN include */ + +/* USER CODE END include */ + +/* Exported variables --------------------------------------------------------*/ +const struct UTIL_LPM_Driver_s UTIL_PowerDriver = +{ + PWR_EnterSleepMode, + PWR_ExitSleepMode, + + PWR_EnterStopMode, + PWR_ExitStopMode, + + PWR_EnterOffMode, + PWR_ExitOffMode, +}; + +extern uint32_t boot_after_standby; +extern RTC_HandleTypeDef hrtc; + +#define CSTACK_PREAMBLE_NUMBER 16 +uint32_t cStackPreamble[CSTACK_PREAMBLE_NUMBER]; + +typedef void( *intfunc )( void ); +typedef union { intfunc __fun; void * __ptr; } intvec_elem; +extern const intvec_elem __vector_table[]; + +void CPUcontextSave(void); /* this function is implemented in startup assembly file */ +void standby_hw_save(void); +void standby_hw_restore(void); +void SystemClock_Config(void); + +/* Private function prototypes -----------------------------------------------*/ +static void Switch_On_HSI( void ); +static void EnterLowPower( void ); +static void ExitLowPower( void ); +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) +static void ExitLowPower_standby( void ); +#endif +/* USER CODE BEGIN Private_Function_Prototypes */ + +/* USER CODE END Private_Function_Prototypes */ +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN Private_Typedef */ + +/* USER CODE END Private_Typedef */ +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Define */ + +/* USER CODE END Private_Define */ +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Macro */ + +/* USER CODE END Private_Macro */ +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN Private_Variables */ + +/* USER CODE END Private_Variables */ + +/* Functions Definition ------------------------------------------------------*/ +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ) +{ +/* USER CODE BEGIN PWR_EnterOffMode_1 */ + +/* USER CODE END PWR_EnterOffMode_1 */ + /** + * The systick should be disabled for the same reason than when the device enters stop mode because + * at this time, the device may enter either OffMode or StopMode. + */ + HAL_SuspendTick(); + + EnterLowPower(); + + /************************************************************************************ + * ENTER OFF MODE + ***********************************************************************************/ + /* + * There is no risk to clear all the WUF here because in the current implementation, this API is called + * in critical section. If an interrupt occurs while in that critical section before that point, + * the flag is set and will be cleared here but the system will not enter Off Mode + * because an interrupt is pending in the NVIC. The ISR will be executed when moving out + * of this critical section + */ + LL_PWR_ClearFlag_WU( ); + + LL_PWR_SetPowerMode( LL_PWR_MODE_STANDBY ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + /* This part of code must not put in a function as it deals with C stack calls. + * A function call will push data in C stack and impact algorithm. + */ + /* local variable are here for better view */ + uint8_t i = 0; + uint32_t* ptr; + /* Save part of the stack that will be restored at wakeup */ + ptr = __vector_table[0].__ptr ; + ptr -= CSTACK_PREAMBLE_NUMBER; + do { + cStackPreamble[i] = *ptr; + i++; + ptr++; + } while (i < CSTACK_PREAMBLE_NUMBER); + + LL_EXTI_EnableEvent_32_63( LL_EXTI_LINE_40 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_40 ); + + standby_hw_save(); + + CPUcontextSave();/* this function will call WFI instruction */ +#endif + +/* USER CODE BEGIN PWR_EnterOffMode_2 */ + +/* USER CODE END PWR_EnterOffMode_2 */ + return; +} + +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ) +{ +/* USER CODE BEGIN PWR_ExitOffMode_1 */ + +/* USER CODE END PWR_ExitOffMode_1 */ +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + /* This part of code must not put in a function as it deals with C stack calls. + * A function call will push data in C stack and impact algorithm. + */ + if(boot_after_standby != 0) + { + boot_after_standby = 0; + /* local variable are here for better view */ + uint8_t i = 0; + uint32_t* ptr; + /* Restore the part of stack that has been saved before the sleep */ + ptr = __vector_table[0].__ptr ; + ptr -= CSTACK_PREAMBLE_NUMBER; + do { + *ptr = cStackPreamble[i]; + i++; + ptr++; + } while (i < CSTACK_PREAMBLE_NUMBER); + + standby_hw_restore(); + + ExitLowPower_standby(); + } + else + { + ExitLowPower(); + } + + HAL_ResumeTick(); +#endif +/* USER CODE BEGIN PWR_ExitOffMode_2 */ + +/* USER CODE END PWR_ExitOffMode_2 */ + return; +} + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ) +{ +/* USER CODE BEGIN PWR_EnterStopMode_1 */ + +/* USER CODE END PWR_EnterStopMode_1 */ + /** + * When HAL_DBGMCU_EnableDBGStopMode() is called to keep the debugger active in Stop Mode, + * the systick shall be disabled otherwise the cpu may crash when moving out from stop mode + * + * When in production, the HAL_DBGMCU_EnableDBGStopMode() is not called so that the device can reach best power consumption + * However, the systick should be disabled anyway to avoid the case when it is about to expire at the same time the device enters + * stop mode ( this will abort the Stop Mode entry ). + */ + HAL_SuspendTick(); + + /** + * This function is called from CRITICAL SECTION + */ + EnterLowPower(); + + /************************************************************************************ + * ENTER STOP MODE + ***********************************************************************************/ + LL_PWR_SetPowerMode( LL_PWR_MODE_STOP1 ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterStopMode_2 */ + +/* USER CODE END PWR_EnterStopMode_2 */ + return; +} + +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ) +{ +/* USER CODE BEGIN PWR_ExitStopMode_1 */ + +/* USER CODE END PWR_ExitStopMode_1 */ + /** + * This function is called from CRITICAL SECTION + */ + ExitLowPower(); + + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitStopMode_2 */ + +/* USER CODE END PWR_ExitStopMode_2 */ + return; +} + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ) +{ +/* USER CODE BEGIN PWR_EnterSleepMode_1 */ + +/* USER CODE END PWR_EnterSleepMode_1 */ + + HAL_SuspendTick(); + + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores(); +#endif + + __WFI( ); +/* USER CODE BEGIN PWR_EnterSleepMode_2 */ + +/* USER CODE END PWR_EnterSleepMode_2 */ + return; +} + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ) +{ +/* USER CODE BEGIN PWR_ExitSleepMode_1 */ + +/* USER CODE END PWR_ExitSleepMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitSleepMode_2 */ + +/* USER CODE END PWR_ExitSleepMode_2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief Setup the system to enter either stop or off mode + * @param none + * @retval none + */ +static void EnterLowPower( void ) +{ + /** + * This function is called from CRITICAL SECTION + */ + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if ( ! LL_HSEM_1StepLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID ) ) + { + if( LL_PWR_IsActiveFlag_C2DS() || LL_PWR_IsActiveFlag_C2SB() ) + { + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + Switch_On_HSI( ); + } + } + else + { + Switch_On_HSI( ); + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Restore the system to exit stop mode + * @param none + * @retval none + */ +static void ExitLowPower( void ) +{ + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if(LL_RCC_GetSysClkSource( ) == LL_RCC_SYS_CLKSOURCE_STATUS_HSI) + { +/* Restore the clock configuration of the application in this user section */ +/* USER CODE BEGIN ExitLowPower_1 */ + LL_RCC_HSE_Enable( ); + __HAL_FLASH_SET_LATENCY(FLASH_LATENCY_1); + while(!LL_RCC_HSE_IsReady( )); + LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSE); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSE); +/* USER CODE END ExitLowPower_1 */ + } + else + { +/* If the application is not running on HSE restore the clock configuration in this user section */ +/* USER CODE BEGIN ExitLowPower_2 */ + +/* USER CODE END ExitLowPower_2 */ + } +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + + __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB); +#endif + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) +/** + * @brief Restore the system to exit standby mode + * @param none + * @retval none + */ +static void ExitLowPower_standby( void ) +{ +/* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); +/* USER CODE BEGIN ExitLowPower_standby */ + SystemClock_Config(); +/* USER CODE END ExitLowPower_standby */ + __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB); + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} +#endif + +/** + * @brief Switch the system clock on HSI + * @param none + * @retval none + */ +static void Switch_On_HSI( void ) +{ + LL_RCC_HSI_Enable( ); + while(!LL_RCC_HSI_IsReady( )); + LL_RCC_SetSysClkSource( LL_RCC_SYS_CLKSOURCE_HSI ); + LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSI); + return; +} + +/* USER CODE BEGIN Private_Functions */ + +/* USER CODE END Private_Functions */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_hal_msp.c new file mode 100644 index 000000000..8414ecb7b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_hal_msp.c @@ -0,0 +1,198 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_msp.c + * @brief This file provides code for the MSP Initialization + * and de-Initialization codes. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Define */ + +/* USER CODE END Define */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Macro */ + +/* USER CODE END Macro */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* External functions --------------------------------------------------------*/ +/* USER CODE BEGIN ExternalFunctions */ + +/* USER CODE END ExternalFunctions */ + +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ +/** + * Initializes the Global MSP. + */ +void HAL_MspInit(void) +{ + /* USER CODE BEGIN MspInit 0 */ + + /* USER CODE END MspInit 0 */ + + __HAL_RCC_HSEM_CLK_ENABLE(); + + /* System interrupt init*/ + + /* Peripheral interrupt init */ + /* HSEM_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(HSEM_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(HSEM_IRQn); + + /* USER CODE BEGIN MspInit 1 */ + + /* USER CODE END MspInit 1 */ +} + +/** +* @brief IPCC MSP Initialization +* This function configures the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspInit 0 */ + + /* USER CODE END IPCC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_IPCC_CLK_ENABLE(); + /* IPCC interrupt Init */ + HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspInit 1 */ + + /* USER CODE END IPCC_MspInit 1 */ + } + +} + +/** +* @brief IPCC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspDeInit 0 */ + + /* USER CODE END IPCC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_IPCC_CLK_DISABLE(); + + /* IPCC interrupt DeInit */ + HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspDeInit 1 */ + + /* USER CODE END IPCC_MspDeInit 1 */ + } + +} + +/** +* @brief RTC MSP Initialization +* This function configures the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspInit 0 */ + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ + /* USER CODE END RTC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_RTC_ENABLE(); + __HAL_RCC_RTCAPB_CLK_ENABLE(); + /* RTC interrupt Init */ + HAL_NVIC_SetPriority(RTC_WKUP_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(RTC_WKUP_IRQn); + /* USER CODE BEGIN RTC_MspInit 1 */ + HAL_RTCEx_EnableBypassShadow(hrtc); + /* USER CODE END RTC_MspInit 1 */ + } + +} + +/** +* @brief RTC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspDeInit 0 */ + + /* USER CODE END RTC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_RTC_DISABLE(); + __HAL_RCC_RTCAPB_CLK_DISABLE(); + + /* RTC interrupt DeInit */ + HAL_NVIC_DisableIRQ(RTC_WKUP_IRQn); + /* USER CODE BEGIN RTC_MspDeInit 1 */ + + /* USER CODE END RTC_MspDeInit 1 */ + } + +} + +/* USER CODE BEGIN 1 */ + +/* USER CODE END 1 */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c new file mode 100644 index 000000000..979e09fd6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c @@ -0,0 +1,387 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.c + * @brief Interrupt Service Routines. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "stm32wbxx_it.h" +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "appli_mesh.h" +#include "PWM_handlers.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/* External variables --------------------------------------------------------*/ +extern IPCC_HandleTypeDef hipcc; +extern RTC_HandleTypeDef hrtc; +extern TIM_HandleTypeDef htim1; +extern TIM_HandleTypeDef htim2; +extern UART_HandleTypeDef hlpuart1; +extern UART_HandleTypeDef huart1; +extern DMA_HandleTypeDef hdma_lpuart1_tx; +extern DMA_HandleTypeDef hdma_usart1_tx; +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/******************************************************************************/ +/* Cortex Processor Interruption and Exception Handlers */ +/******************************************************************************/ +/** + * @brief This function handles Non maskable interrupt. + */ +void NMI_Handler(void) +{ + /* USER CODE BEGIN NonMaskableInt_IRQn 0 */ + + /* USER CODE END NonMaskableInt_IRQn 0 */ + /* USER CODE BEGIN NonMaskableInt_IRQn 1 */ + while (1) + { + } + /* USER CODE END NonMaskableInt_IRQn 1 */ +} + +/** + * @brief This function handles Hard fault interrupt. + */ +void HardFault_Handler(void) +{ + /* USER CODE BEGIN HardFault_IRQn 0 */ + BSP_LED_On(LED_RED); +#ifndef DISABLE_TRACES + printf("HARDFAULT !\r\n"); +#endif + /* USER CODE END HardFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + /* USER CODE END W1_HardFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Memory management fault. + */ +void MemManage_Handler(void) +{ + /* USER CODE BEGIN MemoryManagement_IRQn 0 */ + + /* USER CODE END MemoryManagement_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */ + /* USER CODE END W1_MemoryManagement_IRQn 0 */ + } +} + +/** + * @brief This function handles Prefetch fault, memory access fault. + */ +void BusFault_Handler(void) +{ + /* USER CODE BEGIN BusFault_IRQn 0 */ + + /* USER CODE END BusFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_BusFault_IRQn 0 */ + /* USER CODE END W1_BusFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Undefined instruction or illegal state. + */ +void UsageFault_Handler(void) +{ + /* USER CODE BEGIN UsageFault_IRQn 0 */ + + /* USER CODE END UsageFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_UsageFault_IRQn 0 */ + /* USER CODE END W1_UsageFault_IRQn 0 */ + } +} + +/** + * @brief This function handles System service call via SWI instruction. + */ +void SVC_Handler(void) +{ + /* USER CODE BEGIN SVCall_IRQn 0 */ + + /* USER CODE END SVCall_IRQn 0 */ + /* USER CODE BEGIN SVCall_IRQn 1 */ + + /* USER CODE END SVCall_IRQn 1 */ +} + +/** + * @brief This function handles Debug monitor. + */ +void DebugMon_Handler(void) +{ + /* USER CODE BEGIN DebugMonitor_IRQn 0 */ + + /* USER CODE END DebugMonitor_IRQn 0 */ + /* USER CODE BEGIN DebugMonitor_IRQn 1 */ + + /* USER CODE END DebugMonitor_IRQn 1 */ +} + +/** + * @brief This function handles Pendable request for system service. + */ +void PendSV_Handler(void) +{ + /* USER CODE BEGIN PendSV_IRQn 0 */ + + /* USER CODE END PendSV_IRQn 0 */ + /* USER CODE BEGIN PendSV_IRQn 1 */ + + /* USER CODE END PendSV_IRQn 1 */ +} + +/** + * @brief This function handles System tick timer. + */ +void SysTick_Handler(void) +{ + /* USER CODE BEGIN SysTick_IRQn 0 */ + + /* USER CODE END SysTick_IRQn 0 */ + HAL_IncTick(); + /* USER CODE BEGIN SysTick_IRQn 1 */ + + /* USER CODE END SysTick_IRQn 1 */ +} + +/******************************************************************************/ +/* STM32WBxx Peripheral Interrupt Handlers */ +/* Add here the Interrupt Handlers for the used peripherals. */ +/* For the available peripheral interrupt handler names, */ +/* please refer to the startup file (startup_stm32wbxx.s). */ +/******************************************************************************/ + +/** + * @brief This function handles RTC wake-up interrupt through EXTI line 19. + */ +void RTC_WKUP_IRQHandler(void) +{ + /* USER CODE BEGIN RTC_WKUP_IRQn 0 */ + + /* USER CODE END RTC_WKUP_IRQn 0 */ + HAL_RTCEx_WakeUpTimerIRQHandler(&hrtc); + /* USER CODE BEGIN RTC_WKUP_IRQn 1 */ + + /* USER CODE END RTC_WKUP_IRQn 1 */ +} + +/** + * @brief This function handles IPCC RX occupied interrupt. + */ +void IPCC_C1_RX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */ + + /* USER CODE END IPCC_C1_RX_IRQn 0 */ + HAL_IPCC_RX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */ + + /* USER CODE END IPCC_C1_RX_IRQn 1 */ +} + +/** + * @brief This function handles IPCC TX free interrupt. + */ +void IPCC_C1_TX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */ + + /* USER CODE END IPCC_C1_TX_IRQn 0 */ + HAL_IPCC_TX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */ + + /* USER CODE END IPCC_C1_TX_IRQn 1 */ +} + +/** + * @brief This function handles HSEM global interrupt. + */ +void HSEM_IRQHandler(void) +{ + /* USER CODE BEGIN HSEM_IRQn 0 */ + + /* USER CODE END HSEM_IRQn 0 */ + HAL_HSEM_IRQHandler(); + /* USER CODE BEGIN HSEM_IRQn 1 */ + + /* USER CODE END HSEM_IRQn 1 */ +} + +/* USER CODE BEGIN 1 */ +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW1_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); +} + +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW2_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW2_PIN); +} + +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW3_PIN); +} + +#ifdef SAVE_MODEL_STATE_POWER_FAILURE_DETECTION +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void POWEROFF_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(POWEROFF_PIN); +} +#endif + +#ifdef ENABLE_PIR_SENSOR +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PIRSensor_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(PIRSENSOR_PIN); +} +#endif + +#if(CFG_HW_USART1_ENABLED == 1) +void USART1_IRQHandler(void) +{ + HAL_UART_IRQHandler(&huart1); +} +#endif + +#if(CFG_HW_USART1_DMA_TX_SUPPORTED == 1) +void CFG_HW_USART1_DMA_TX_IRQHandler( void ) +{ + HAL_DMA_IRQHandler(&hdma_usart1_tx); +} +#endif + +#if(CFG_HW_LPUART1_ENABLED == 1) +void LPUART1_IRQHandler(void) +{ + HAL_UART_IRQHandler(&hw_lpuart1); +} +#endif + +#if(CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) +void CFG_HW_LPUART1_DMA_TX_IRQHandler( void ) +{ + HAL_DMA_IRQHandler(&hdma_lpuart1_tx); +} +#endif + +#if 0 +/** + * @brief This function handles TIM2 global interrupt. + */ +void TIM2_IRQHandler(void) +{ + /* USER CODE BEGIN TIM2_IRQn 0 */ + + /* USER CODE END TIM2_IRQn 0 */ + HAL_TIM_IRQHandler(&htim2); + /* USER CODE BEGIN TIM2_IRQn 1 */ + + /* USER CODE END TIM2_IRQn 1 */ +} + +/** + * @brief This function handles TIM1 global interrupt. + */ +void TIM1_CC_IRQHandler(void) +{ + /* USER CODE BEGIN TIM1_IRQn 0 */ + + /* USER CODE END TIM1_IRQn 0 */ + HAL_TIM_IRQHandler(&htim1); + /* USER CODE BEGIN TIM1_IRQn 1 */ + + /* USER CODE END TIM1_IRQn 1 */ +} +#endif + +/* USER CODE END 1 */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c new file mode 100644 index 000000000..6a4aa6327 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c @@ -0,0 +1,354 @@ +/** + ****************************************************************************** + * @file system_stm32wbxx.c + * @author MCD Application Team + * @brief CMSIS Cortex Device Peripheral Access Layer System Source File + * + * This file provides two functions and one global variable to be called from + * user application: + * - SystemInit(): This function is called at startup just after reset and + * before branch to main program. This call is made inside + * the "startup_stm32wbxx.s" file. + * + * - SystemCoreClock variable: Contains the core clock (HCLK), it can be used + * by the user application to setup the SysTick + * timer or configure other parameters. + * + * - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must + * be called whenever the core clock is changed + * during program execution. + * + * After each device reset the MSI (4 MHz) is used as system clock source. + * Then SystemInit() function is called, in "startup_stm32wbxx.s" file, to + * configure the system clock before to branch to main program. + * + * This file configures the system clock as follows: + *============================================================================= + *----------------------------------------------------------------------------- + * System Clock source | MSI + *----------------------------------------------------------------------------- + * SYSCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * HCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * AHB Prescaler | 1 + *----------------------------------------------------------------------------- + * APB1 Prescaler | 1 + *----------------------------------------------------------------------------- + * APB2 Prescaler | 1 + *----------------------------------------------------------------------------- + * PLL_M | 1 + *----------------------------------------------------------------------------- + * PLL_N | 8 + *----------------------------------------------------------------------------- + * PLL_P | 7 + *----------------------------------------------------------------------------- + * PLL_Q | 2 + *----------------------------------------------------------------------------- + * PLL_R | 2 + *----------------------------------------------------------------------------- + * PLLSAI1_P | NA + *----------------------------------------------------------------------------- + * PLLSAI1_Q | NA + *----------------------------------------------------------------------------- + * PLLSAI1_R | NA + *----------------------------------------------------------------------------- + * Require 48MHz for USB OTG FS, | Disabled + * SDIO and RNG clock | + *----------------------------------------------------------------------------- + *============================================================================= + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/** @addtogroup CMSIS + * @{ + */ + +/** @addtogroup stm32WBxx_system + * @{ + */ + +/** @addtogroup stm32WBxx_System_Private_Includes + * @{ + */ + +#include "stm32wbxx.h" + +#if !defined (HSE_VALUE) + #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (MSI_VALUE) + #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +#if !defined (HSI_VALUE) + #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +#if !defined (LSI_VALUE) + #define LSI_VALUE (32000UL) /*!< Value of LSI in Hz*/ +#endif /* LSI_VALUE */ + +#if !defined (LSE_VALUE) + #define LSE_VALUE (32768UL) /*!< Value of LSE in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_TypesDefinitions + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Defines + * @{ + */ + +/*!< Uncomment the following line if you need to relocate your vector Table in + Internal SRAM. */ +/* #define VECT_TAB_SRAM */ +#define VECT_TAB_OFFSET 0x0U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ + +#define VECT_TAB_BASE_ADDRESS SRAM1_BASE /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Macros + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Variables + * @{ + */ +/* The SystemCoreClock variable is updated in three ways: + 1) by calling CMSIS function SystemCoreClockUpdate() + 2) by calling HAL API function HAL_RCC_GetHCLKFreq() + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency + Note: If you use this function to configure the system clock; then there + is no need to call the 2 first functions listed above, since SystemCoreClock + variable is updated automatically. + */ + uint32_t SystemCoreClock = 4000000UL ; /*CPU1: M4 on MSI clock after startup (4MHz)*/ + + const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL}; + + const uint32_t APBPrescTable[8UL] = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL}; + + const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ + 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif + +/** + * @} + */ + + /** @addtogroup STM32WBxx_System_Private_FunctionPrototypes + * @{ + */ + + /** + * @} + */ + + /** @addtogroup STM32WBxx_System_Private_Functions + * @{ + */ + +/** + * @brief Setup the microcontroller system. + * @param None + * @retval None + */ +void SystemInit(void) +{ + /* Configure the Vector Table location add offset address ------------------*/ +#if defined(VECT_TAB_SRAM) && defined(VECT_TAB_BASE_ADDRESS) + /* program in SRAMx */ + SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAMx for CPU1 */ +#else /* program in FLASH */ + SCB->VTOR = VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */ +#endif + + /* FPU settings ------------------------------------------------------------*/ +#if (__FPU_PRESENT == 1) && (__FPU_USED == 1) + SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL))); /* set CP10 and CP11 Full Access */ +#endif + + /* Reset the RCC clock configuration to the default reset state ------------*/ + /* Set MSION bit */ + RCC->CR |= RCC_CR_MSION; + + /* Reset CFGR register */ + RCC->CFGR = 0x00070000U; + + /* Reset PLLSAI1ON, PLLON, HSECSSON, HSEON, HSION, and MSIPLLON bits */ + RCC->CR &= (uint32_t)0xFAF6FEFBU; + + /*!< Reset LSI1 and LSI2 bits */ + RCC->CSR &= (uint32_t)0xFFFFFFFAU; + + /*!< Reset HSI48ON bit */ + RCC->CRRCR &= (uint32_t)0xFFFFFFFEU; + + /* Reset PLLCFGR register */ + RCC->PLLCFGR = 0x22041000U; + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) + /* Reset PLLSAI1CFGR register */ + RCC->PLLSAI1CFGR = 0x22041000U; +#endif + + /* Reset HSEBYP bit */ + RCC->CR &= 0xFFFBFFFFU; + + /* Disable all interrupts */ + RCC->CIER = 0x00000000; +} + +/** + * @brief Update SystemCoreClock variable according to Clock Register Values. + * The SystemCoreClock variable contains the core clock (HCLK), it can + * be used by the user application to setup the SysTick timer or configure + * other parameters. + * + * @note Each time the core clock (HCLK) changes, this function must be called + * to update SystemCoreClock variable value. Otherwise, any configuration + * based on this variable will be incorrect. + * + * @note - The system frequency computed by this function is not the real + * frequency in the chip. It is calculated based on the predefined + * constant and the selected clock source: + * + * - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*) + * + * - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**) + * + * - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***) + * + * - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***) + * or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors. + * + * (*) MSI_VALUE is a constant defined in stm32wbxx_hal.h file (default value + * 4 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (**) HSI_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 16 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (***) HSE_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 32 MHz), user has to ensure that HSE_VALUE is same as the real + * frequency of the crystal used. Otherwise, this function may + * have wrong result. + * + * - The result of this function could be not correct when using fractional + * value for HSE crystal. + * + * @param None + * @retval None + */ +void SystemCoreClockUpdate(void) +{ + uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm; + + /* Get MSI Range frequency--------------------------------------------------*/ + + /*MSI frequency range in Hz*/ + msirange = MSIRangeTable[(RCC->CR & RCC_CR_MSIRANGE) >> RCC_CR_MSIRANGE_Pos]; + + /* Get SYSCLK source -------------------------------------------------------*/ + switch (RCC->CFGR & RCC_CFGR_SWS) + { + case 0x00: /* MSI used as system clock source */ + SystemCoreClock = msirange; + break; + + case 0x04: /* HSI used as system clock source */ + /* HSI used as system clock source */ + SystemCoreClock = HSI_VALUE; + break; + + case 0x08: /* HSE used as system clock source */ + SystemCoreClock = HSE_VALUE; + break; + + case 0x0C: /* PLL used as system clock source */ + /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN + SYSCLK = PLL_VCO / PLLR + */ + pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC); + pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ; + + if(pllsource == 0x02UL) /* HSI used as PLL clock source */ + { + pllvco = (HSI_VALUE / pllm); + } + else if(pllsource == 0x03UL) /* HSE used as PLL clock source */ + { + pllvco = (HSE_VALUE / pllm); + } + else /* MSI used as PLL clock source */ + { + pllvco = (msirange / pllm); + } + + pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos); + pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL); + + SystemCoreClock = pllvco/pllr; + break; + + default: + SystemCoreClock = msirange; + break; + } + + /* Compute HCLK clock frequency --------------------------------------------*/ + /* Get HCLK1 prescaler */ + tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)]; + /* HCLK clock frequency */ + SystemCoreClock = SystemCoreClock / tmp; + +} + + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewd b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewd new file mode 100644 index 000000000..0b3534b03 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewd @@ -0,0 +1,2834 @@ + + + 3 + + Lighting_LPN + + ARM + + 0 + + C-SPY + 2 + + 29 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 0 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 0 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 0 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 0 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 0 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 0 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + + Lighting_Provisioner + + ARM + + 0 + + C-SPY + 2 + + 29 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 0 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 0 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 0 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 0 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 0 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 0 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewp b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewp new file mode 100644 index 000000000..d0b2e1c29 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/BLE_MeshLightingLPN.ewp @@ -0,0 +1,1310 @@ + + + 3 + + Lighting_LPN + + ARM + + 0 + + General + 3 + + 30 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 0 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 0 + + + + + + + BILINK + 0 + + + + Coder + 0 + + + + + Application + + EWARM + + $PROJ_DIR$\startup_stm32wb15xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\hw_flash.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\lp_timer.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\standby_stm32wb15.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + + STM32_WPAN + + App + + $PROJ_DIR$\..\STM32_WPAN\app\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_config.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_generic.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_light.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_light_lc.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_mesh.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_nvm.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_sensor.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_vendor.c + + + $PROJ_DIR$\..\STM32_WPAN\app\models_if.c + + + $PROJ_DIR$\..\STM32_WPAN\app\pal_nvm.c + + + + Target + + $PROJ_DIR$\..\STM32_WPAN\target\hw_ipcc.c + + + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers + + BSP + + NUCLEO-WB15CC + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c + + + + + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + + + + STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + + + + + Middlewares + + STM32_WPAN + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\common.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\generic.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\light.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\light_lc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\mesh.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\Src\mesh_cfg.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\sensors.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\vendor.c + + + + + Utilities + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/Project.eww b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/Project.eww new file mode 100644 index 000000000..d692bd89f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/Project.eww @@ -0,0 +1,7 @@ + + + + $WS_DIR$\BLE_MeshLightingLPN.ewp + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb15xx_cm4.s new file mode 100644 index 000000000..1a107ce9a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb15xx_cm4.s @@ -0,0 +1,469 @@ +;****************************************************************************** +;* File Name : startup_stm32wb15xx_cm4.s +;* Author : MCD Application Team +;* Description : M4 core vector table of the STM32WB15xx devices for the +;* IAR (EWARM) toolchain with support of standby. +;* +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == _iar_program_start, +;* - Set the vector table entries with the exceptions ISR +;* address. +;* - Branches to main in the C library (which eventually +;* calls main()). +;* After Reset the Cortex-M4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +; +; +; The modules in this file are included in the libraries, and may be replaced +; by any user-defined modules that define the PUBLIC symbol _program_start or +; a user defined start symbol. +; To override the cstartup defined in the library, simply add your modified +; version to the workbench project. +; +; The vector table is normally located at address 0. +; When debugging in RAM, it can be located in RAM, aligned to at least 2^6. +; The name "__vector_table" has special meaning for C-SPY: +; it is where the SP start value is found, and the NVIC vector +; table register (VTOR) is initialized to this address if != 0. +; +; Cortex-M version +; + + MODULE ?cstartup + + ;; Forward declaration of sections. + SECTION CSTACK:DATA:NOROOT(3) + + SECTION .intvec:CODE:NOROOT(2) + + EXTERN __iar_program_start + EXTERN SystemInit + EXTERN standby_boot_mng + PUBLIC __vector_table + + DATA +__vector_table + DCD sfe(CSTACK) + DCD Reset_Handler ; Reset Handler + + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM Interrupt + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper, TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_IRQHandler ; TIM1 Update Interrupt + DCD TIM1_TRG_COM_IRQHandler ; TIM1 Trigger and Communication Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD 0 ; Reserved + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD 0 ; Reserved + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD 0 ; Reserved + DCD PWR_SOTF_BLEACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; Default interrupt handlers. +;; + THUMB + + IMPORT backup_MSP + EXPORT CPUcontextSave + PUBWEAK Reset_Handler + SECTION .text:CODE:NOROOT:REORDER(2) +Reset_Handler +/* If we exit from standby mode, restore CPU context and jump to asleep point. */ + BL standby_boot_mng + CMP R0, #1 + BEQ CPUcontextRestore +/* end of specific code section for standby */ + LDR R0, =SystemInit + BLX R0 + LDR R0, =__iar_program_start + BX R0 +/* These 2 functions are designed to save and then restore CPU context. */ +CPUcontextSave + PUSH { r4 - r7, lr } /* store R4-R7 and LR (5 words) onto the stack */ + MOV R3, R8 /* mov thread {r8 - r12} to {r3 - r7} */ + MOV R4, R9 + MOV R5, R10 + MOV R6, R11 + MOV R7, R12 + PUSH {R3-R7} /* store R8-R12 (5 words) onto the stack */ + LDR R4, =backup_MSP /* load address of backup_MSP into R4 */ + MOV R3, SP /* load the stack pointer into R3 */ + STR R3, [R4] /* store the MSP into backup_MSP */ + DSB + WFI /* all saved, trigger deep sleep */ + +CPUcontextRestore + /* Even if we fall through the WFI instruction, we will immediately + * execute a context restore and end up where we left off with no + * ill effects. Normally at this point the core will either be + * powered off or reset (depending on the deep sleep level). */ + LDR R4, =backup_MSP /* load address of backup_MSP into R4 */ + LDR R4, [R4] /* load the SP from backup_MSP */ + MOV SP, R4 /* restore the SP from R4 */ + POP {R3-R7} /* load R8-R12 (5 words) from the stack */ + MOV R8, R3 /* mov {r3 - r7} to {r8 - r12} */ + MOV R9, R4 + MOV R10, R5 + MOV R11, R6 + MOV R12, R7 + POP { R4 - R7, PC } /*load R4-R7 and PC (5 words) from the stack */ +/* end of specific code section for standby */ + + PUBWEAK NMI_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +NMI_Handler + B NMI_Handler + + PUBWEAK HardFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +HardFault_Handler + B HardFault_Handler + + PUBWEAK MemManage_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +MemManage_Handler + B MemManage_Handler + + PUBWEAK BusFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +BusFault_Handler + B BusFault_Handler + + PUBWEAK UsageFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +UsageFault_Handler + B UsageFault_Handler + + PUBWEAK SVC_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SVC_Handler + B SVC_Handler + + PUBWEAK DebugMon_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +DebugMon_Handler + B DebugMon_Handler + + PUBWEAK PendSV_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +PendSV_Handler + B PendSV_Handler + + PUBWEAK SysTick_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SysTick_Handler + B SysTick_Handler + + PUBWEAK WWDG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +WWDG_IRQHandler + B WWDG_IRQHandler + + PUBWEAK PVD_PVM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PVD_PVM_IRQHandler + B PVD_PVM_IRQHandler + + PUBWEAK TAMP_STAMP_LSECSS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TAMP_STAMP_LSECSS_IRQHandler + B TAMP_STAMP_LSECSS_IRQHandler + + PUBWEAK RTC_WKUP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_WKUP_IRQHandler + B RTC_WKUP_IRQHandler + + PUBWEAK FLASH_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FLASH_IRQHandler + B FLASH_IRQHandler + + PUBWEAK RCC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RCC_IRQHandler + B RCC_IRQHandler + + PUBWEAK EXTI0_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI0_IRQHandler + B EXTI0_IRQHandler + + PUBWEAK EXTI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI1_IRQHandler + B EXTI1_IRQHandler + + PUBWEAK EXTI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI2_IRQHandler + B EXTI2_IRQHandler + + PUBWEAK EXTI3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI3_IRQHandler + B EXTI3_IRQHandler + + PUBWEAK EXTI4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI4_IRQHandler + B EXTI4_IRQHandler + + PUBWEAK DMA1_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel1_IRQHandler + B DMA1_Channel1_IRQHandler + + PUBWEAK DMA1_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel2_IRQHandler + B DMA1_Channel2_IRQHandler + + PUBWEAK DMA1_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel3_IRQHandler + B DMA1_Channel3_IRQHandler + + PUBWEAK DMA1_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel4_IRQHandler + B DMA1_Channel4_IRQHandler + + PUBWEAK DMA1_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel5_IRQHandler + B DMA1_Channel5_IRQHandler + + PUBWEAK DMA1_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel6_IRQHandler + B DMA1_Channel6_IRQHandler + + PUBWEAK DMA1_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel7_IRQHandler + B DMA1_Channel7_IRQHandler + + PUBWEAK ADC1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +ADC1_IRQHandler + B ADC1_IRQHandler + + PUBWEAK C2SEV_PWR_C2H_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +C2SEV_PWR_C2H_IRQHandler + B C2SEV_PWR_C2H_IRQHandler + + PUBWEAK COMP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +COMP_IRQHandler + B COMP_IRQHandler + + PUBWEAK EXTI9_5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI9_5_IRQHandler + B EXTI9_5_IRQHandler + + PUBWEAK TIM1_BRK_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_BRK_IRQHandler + B TIM1_BRK_IRQHandler + + PUBWEAK TIM1_UP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_UP_IRQHandler + B TIM1_UP_IRQHandler + + PUBWEAK TIM1_TRG_COM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_TRG_COM_IRQHandler + B TIM1_TRG_COM_IRQHandler + + PUBWEAK TIM1_CC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_CC_IRQHandler + B TIM1_CC_IRQHandler + + PUBWEAK TIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM2_IRQHandler + B TIM2_IRQHandler + + PUBWEAK PKA_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PKA_IRQHandler + B PKA_IRQHandler + + PUBWEAK I2C1_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_EV_IRQHandler + B I2C1_EV_IRQHandler + + PUBWEAK I2C1_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_ER_IRQHandler + B I2C1_ER_IRQHandler + + PUBWEAK SPI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI1_IRQHandler + B SPI1_IRQHandler + + PUBWEAK USART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USART1_IRQHandler + B USART1_IRQHandler + + PUBWEAK LPUART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPUART1_IRQHandler + B LPUART1_IRQHandler + + PUBWEAK TSC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TSC_IRQHandler + B TSC_IRQHandler + + PUBWEAK EXTI15_10_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI15_10_IRQHandler + B EXTI15_10_IRQHandler + + PUBWEAK RTC_Alarm_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_Alarm_IRQHandler + B RTC_Alarm_IRQHandler + + PUBWEAK PWR_SOTF_BLEACT_RFPHASE_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PWR_SOTF_BLEACT_RFPHASE_IRQHandler + B PWR_SOTF_BLEACT_RFPHASE_IRQHandler + + PUBWEAK IPCC_C1_RX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_RX_IRQHandler + B IPCC_C1_RX_IRQHandler + + PUBWEAK IPCC_C1_TX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_TX_IRQHandler + B IPCC_C1_TX_IRQHandler + + PUBWEAK HSEM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +HSEM_IRQHandler + B HSEM_IRQHandler + + PUBWEAK LPTIM1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM1_IRQHandler + B LPTIM1_IRQHandler + + PUBWEAK LPTIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM2_IRQHandler + B LPTIM2_IRQHandler + + PUBWEAK AES2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES2_IRQHandler + B AES2_IRQHandler + + PUBWEAK RNG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RNG_IRQHandler + B RNG_IRQHandler + + PUBWEAK FPU_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FPU_IRQHandler + B FPU_IRQHandler + + PUBWEAK DMAMUX1_OVR_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMAMUX1_OVR_IRQHandler + B DMAMUX1_OVR_IRQHandler + + END + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb15xx_flash_cm4.icf new file mode 100644 index 000000000..85c580b6e --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb15xx_flash_cm4.icf @@ -0,0 +1,42 @@ +/*###ICF### Section handled by ICF editor, don't touch! ****/ +/*-Editor annotation file-*/ +/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ +/*-Specials-*/ +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +/*-Memory Regions-*/ +/***** FLASH Part dedicated to M4 *****/ +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_end__ = 0x080217FF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; +define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x400; +/**** End of ICF editor section. ###ICF###*/ + +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; + +/* MB_MEM1 and MB_MEM2 are sections reserved to mailbox communication. It is placed in the shared memory */ +initialize by copy { readwrite }; +do not initialize { section .noinit, + section MAPPING_TABLE, + section MB_MEM1 }; + +place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; + +place in ROM_region { readonly }; +place in RAM_region { block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvoptx b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvoptx new file mode 100644 index 000000000..a22d76302 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvoptx @@ -0,0 +1,1144 @@ + + + + 1.0 + +
                                                        ### uVision Project, (C) Keil Software
                                                        + + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc; *.md + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + Lighting_LPN + 0x4 + ARM-ADS + + 32000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 18 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + + + + + + + + + + + BIN\UL2CM3.DLL + + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WB1x_320_M4 -FL050000 -FS08000000 -FP0($$Device:STM32WB15CCUx$CMSIS\Flash\STM32WB1x_320_M4.FLM) + + + + + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + + + Application/Core + 1 + 0 + 0 + 0 + + 1 + 1 + 1 + 0 + 0 + 0 + ../Core/Src/app_debug.c + app_debug.c + 0 + 0 + + + 1 + 2 + 1 + 0 + 0 + 0 + ../Core/Src/app_entry.c + app_entry.c + 0 + 0 + + + 1 + 3 + 1 + 0 + 0 + 0 + ../Core/Src/hw_flash.c + hw_flash.c + 0 + 0 + + + 1 + 4 + 1 + 0 + 0 + 0 + ../Core/Src/hw_timerserver.c + hw_timerserver.c + 0 + 0 + + + 1 + 5 + 1 + 0 + 0 + 0 + ../Core/Src/hw_uart.c + hw_uart.c + 0 + 0 + + + 1 + 6 + 1 + 0 + 0 + 0 + ../Core/Src/lp_timer.c + lp_timer.c + 0 + 0 + + + 1 + 7 + 1 + 0 + 0 + 0 + ../Core/Src/main.c + main.c + 0 + 0 + + + 1 + 8 + 1 + 0 + 0 + 0 + ../Core/Src/stm32_lpm_if.c + stm32_lpm_if.c + 0 + 0 + + + 1 + 9 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_it.c + stm32wbxx_it.c + 0 + 0 + + + + + Application/MDK-ARM + 1 + 0 + 0 + 0 + + 2 + 10 + 2 + 0 + 0 + 0 + .\startup_stm32wb15xx_cm4.s + startup_stm32wb15xx_cm4.s + 0 + 0 + + + + + Application/STM32_WPAN/app + 1 + 0 + 0 + 0 + + 3 + 11 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/app_ble.c + app_ble.c + 0 + 0 + + + 3 + 12 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_generic.c + appli_generic.c + 0 + 0 + + + 3 + 13 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_light.c + appli_light.c + 0 + 0 + + + 3 + 14 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_light_lc.c + appli_light_lc.c + 0 + 0 + + + 3 + 15 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_mesh.c + appli_mesh.c + 0 + 0 + + + 3 + 16 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_nvm.c + appli_nvm.c + 0 + 0 + + + 3 + 17 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_sensor.c + appli_sensor.c + 0 + 0 + + + 3 + 18 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/models_if.c + models_if.c + 0 + 0 + + + 3 + 19 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/pal_nvm.c + pal_nvm.c + 0 + 0 + + + 3 + 20 + 1 + 0 + 0 + 0 + ..\STM32_WPAN\app\appli_config.c + appli_config.c + 0 + 0 + + + 3 + 21 + 1 + 0 + 0 + 0 + ..\STM32_WPAN\app\appli_vendor.c + appli_vendor.c + 0 + 0 + + + + + Application/STM32_WPAN/target + 0 + 0 + 0 + 0 + + 4 + 22 + 1 + 0 + 0 + 0 + ../STM32_WPAN/target/hw_ipcc.c + hw_ipcc.c + 0 + 0 + + + + + Doc + 0 + 0 + 0 + 0 + + 5 + 23 + 5 + 0 + 0 + 0 + ../readme.txt + readme.txt + 0 + 0 + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + 1 + 0 + 0 + 0 + + 6 + 24 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c + nucleo_wb15cc.c + 0 + 0 + + + + + Drivers/CMSIS + 1 + 0 + 0 + 0 + + 7 + 25 + 1 + 0 + 0 + 0 + ../Core/Src/system_stm32wbxx.c + system_stm32wbxx.c + 0 + 0 + + + + + Drivers/STM32WBxx_HAL_Driver + 1 + 0 + 0 + 0 + + 8 + 26 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + stm32wbxx_hal.c + 0 + 0 + + + 8 + 27 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + stm32wbxx_hal_cortex.c + 0 + 0 + + + 8 + 28 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + stm32wbxx_hal_dma.c + 0 + 0 + + + 8 + 29 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + stm32wbxx_hal_flash.c + 0 + 0 + + + 8 + 30 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + stm32wbxx_hal_flash_ex.c + 0 + 0 + + + 8 + 31 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + stm32wbxx_hal_gpio.c + 0 + 0 + + + 8 + 32 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + stm32wbxx_hal_pwr.c + 0 + 0 + + + 8 + 33 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + stm32wbxx_hal_pwr_ex.c + 0 + 0 + + + 8 + 34 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + stm32wbxx_hal_rcc.c + 0 + 0 + + + 8 + 35 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + stm32wbxx_hal_rcc_ex.c + 0 + 0 + + + 8 + 36 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + stm32wbxx_hal_rtc.c + 0 + 0 + + + 8 + 37 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + stm32wbxx_hal_rtc_ex.c + 0 + 0 + + + 8 + 38 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + stm32wbxx_hal_uart.c + 0 + 0 + + + 8 + 39 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + stm32wbxx_hal_uart_ex.c + 0 + 0 + + + 8 + 40 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + stm32wbxx_hal_ipcc.c + 0 + 0 + + + 8 + 41 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + stm32wbxx_hal_hsem.c + 0 + 0 + + + 8 + 42 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + stm32wbxx_hal_exti.c + 0 + 0 + + + 8 + 43 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + stm32wbxx_hal_dma_ex.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/ble/blesvc + 1 + 0 + 0 + 0 + + 9 + 44 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c + common.c + 0 + 0 + + + 9 + 45 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c + generic.c + 0 + 0 + + + 9 + 46 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c + light.c + 0 + 0 + + + 9 + 47 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c + light_lc.c + 0 + 0 + + + 9 + 48 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c + mesh.c + 0 + 0 + + + 9 + 49 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c + mesh_cfg.c + 0 + 0 + + + 9 + 50 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c + sensors.c + 0 + 0 + + + 9 + 51 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + svc_ctl.c + 0 + 0 + + + 9 + 52 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c + vendor.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/ble/core + 0 + 0 + 0 + 0 + + 10 + 53 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + ble_gap_aci.c + 0 + 0 + + + 10 + 54 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + ble_gatt_aci.c + 0 + 0 + + + 10 + 55 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + ble_hal_aci.c + 0 + 0 + + + 10 + 56 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + ble_hci_le.c + 0 + 0 + + + 10 + 57 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + ble_l2cap_aci.c + 0 + 0 + + + 10 + 58 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + osal.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci + 0 + 0 + 0 + 0 + + 11 + 59 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + shci.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl + 0 + 0 + 0 + 0 + + 12 + 60 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + hci_tl.c + 0 + 0 + + + 12 + 61 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + hci_tl_if.c + 0 + 0 + + + 12 + 62 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + shci_tl.c + 0 + 0 + + + 12 + 63 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + shci_tl_if.c + 0 + 0 + + + 12 + 64 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + tl_mbox.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/utilities + 1 + 0 + 0 + 0 + + 13 + 65 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + dbg_trace.c + 0 + 0 + + + 13 + 66 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + otp.c + 0 + 0 + + + 13 + 67 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + stm32_lpm.c + 0 + 0 + + + 13 + 68 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/sequencer/stm32_seq.c + stm32_seq.c + 0 + 0 + + + 13 + 69 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + stm_list.c + 0 + 0 + + + 13 + 70 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + stm_queue.c + 0 + 0 + + + + + Middlewares/ST/STM32_WPAN/ble/mesh/Library + 1 + 0 + 0 + 0 + + 14 + 71 + 4 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\Library\libBle_Mesh_CM4_WB15xx_Keil.lib + libBle_Mesh_CM4_WB15xx_Keil.lib + 0 + 0 + + + + + ::CMSIS + 0 + 0 + 0 + 1 + + +                                                         diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvprojx b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvprojx new file mode 100644 index 000000000..5f474fee8 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/BLE_MeshLightingDemoLPN.uvprojx @@ -0,0 +1,828 @@ + + + + 2.1 + +
                                                        ### uVision Project, (C) Keil Software
                                                        + + + + Lighting_LPN + 0x4 + ARM-ADS + 5060960::V5.06 update 7 (build 960)::.\ARMCC + 0 + + + STM32WB15CCUx + STMicroelectronics + Keil.STM32WBxx_DFP.1.2.0 + http://www.keil.com/pack/ + IRAM(0x20000000,0x00003000) IRAM2(0x20030000,0x00009000) IROM(0x08000000,0x00050000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE + + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB1x_320_M4 -FS08000000 -FL050000 -FP0($$Device:STM32WB15CCUx$CMSIS\Flash\STM32WB1x_320_M4.FLM)) + 0 + $$Device:STM32WB15CCUx$Drivers\CMSIS\Device\ST\STM32WBxx\Include\stm32wbxx.h + + + + + + + + + + $$Device:STM32WB15CCUx$CMSIS\SVD\STM32WB15_CM4.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + Lighting_LPN\Exe\ + BLE_MeshLightingLPNDemo + 1 + 0 + 1 + 1 + 1 + + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 0 + + + SARMCM3.DLL + -REMAP -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 1 + 1 + 4096 + + 1 + BIN\UL2CM3.DLL + "" () + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 2 + 0 + 0 + 1 + 0 + 8 + 1 + 1 + 0 + 0 + 3 + 4 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 1 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x3000 + + + 1 + 0x8000000 + 0x50000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8000000 + 0x21800 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x3000 + + + 0 + 0x20030000 + 0x2800 + + + + + + 1 + 4 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + + + USE_STM32WBXX_NUCLEO,USE_HAL_DRIVER,STM32WB15xx,ENABLE_USART + + ../../../../../../Drivers/CMSIS/Device/ST/STM32WBxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/NUCLEO-WB15CC;../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/Inc;../Core/Inc;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto;../../../../../../Middlewares/ST/STM32_WPAN/utilities;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/sequencer;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci;../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../STM32_WPAN/app;../../../../../../Middlewares/ST/STM32_WPAN/ble + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + + + + + + + + + 0 + 0 + 0 + 0 + 1 + 0 + 0x08000000 + 0x20000000 + + .\stm32wb15xx_flash_cm4.sct + + + + + + + + + + + Application/Core + + + app_debug.c + 1 + ../Core/Src/app_debug.c + + + app_entry.c + 1 + ../Core/Src/app_entry.c + + + hw_flash.c + 1 + ../Core/Src/hw_flash.c + + + hw_timerserver.c + 1 + ../Core/Src/hw_timerserver.c + + + hw_uart.c + 1 + ../Core/Src/hw_uart.c + + + lp_timer.c + 1 + ../Core/Src/lp_timer.c + + + main.c + 1 + ../Core/Src/main.c + + + stm32_lpm_if.c + 1 + ../Core/Src/stm32_lpm_if.c + + + stm32wbxx_it.c + 1 + ../Core/Src/stm32wbxx_it.c + + + + + Application/MDK-ARM + + + startup_stm32wb15xx_cm4.s + 2 + .\startup_stm32wb15xx_cm4.s + + + + + Application/STM32_WPAN/app + + + app_ble.c + 1 + ../STM32_WPAN/app/app_ble.c + + + appli_generic.c + 1 + ../STM32_WPAN/app/appli_generic.c + + + appli_light.c + 1 + ../STM32_WPAN/app/appli_light.c + + + appli_light_lc.c + 1 + ../STM32_WPAN/app/appli_light_lc.c + + + appli_mesh.c + 1 + ../STM32_WPAN/app/appli_mesh.c + + + appli_nvm.c + 1 + ../STM32_WPAN/app/appli_nvm.c + + + appli_sensor.c + 1 + ../STM32_WPAN/app/appli_sensor.c + + + models_if.c + 1 + ../STM32_WPAN/app/models_if.c + + + pal_nvm.c + 1 + ../STM32_WPAN/app/pal_nvm.c + + + appli_config.c + 1 + ..\STM32_WPAN\app\appli_config.c + + + appli_vendor.c + 1 + ..\STM32_WPAN\app\appli_vendor.c + + + + + Application/STM32_WPAN/target + + + hw_ipcc.c + 1 + ../STM32_WPAN/target/hw_ipcc.c + + + + + Doc + + + readme.txt + 5 + ../readme.txt + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + + + nucleo_wb15cc.c + 1 + ..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c + + + + + Drivers/CMSIS + + + system_stm32wbxx.c + 1 + ../Core/Src/system_stm32wbxx.c + + + + + Drivers/STM32WBxx_HAL_Driver + + + stm32wbxx_hal.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + stm32wbxx_hal_cortex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + stm32wbxx_hal_dma.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + stm32wbxx_hal_flash.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + stm32wbxx_hal_flash_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + stm32wbxx_hal_gpio.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + stm32wbxx_hal_pwr.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + stm32wbxx_hal_pwr_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + stm32wbxx_hal_rcc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + stm32wbxx_hal_rcc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + stm32wbxx_hal_rtc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + stm32wbxx_hal_rtc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + stm32wbxx_hal_uart.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + stm32wbxx_hal_uart_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + stm32wbxx_hal_ipcc.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + stm32wbxx_hal_hsem.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + stm32wbxx_hal_exti.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + stm32wbxx_hal_dma_ex.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + + + + Middlewares/STM32_WPAN/ble/blesvc + + + common.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c + + + generic.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c + + + light.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c + + + light_lc.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c + + + mesh.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c + + + mesh_cfg.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c + + + sensors.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c + + + svc_ctl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + vendor.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c + + + + + Middlewares/STM32_WPAN/ble/core + + + ble_gap_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + ble_gatt_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + ble_hal_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + ble_hci_le.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + ble_l2cap_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + osal.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci + + + shci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl + + + hci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + hci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + shci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + shci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + tl_mbox.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + + + Middlewares/STM32_WPAN/utilities + + + dbg_trace.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + otp.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + stm32_lpm.c + 1 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + stm32_seq.c + 1 + ../../../../../../Utilities/sequencer/stm32_seq.c + + + stm_list.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + stm_queue.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + + + Middlewares/ST/STM32_WPAN/ble/mesh/Library + + + libBle_Mesh_CM4_WB15xx_Keil.lib + 4 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\Library\libBle_Mesh_CM4_WB15xx_Keil.lib + + + + + ::CMSIS + + + + + + + + + + + + + + + + + + +                                                         diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb15xx_cm4.s new file mode 100644 index 000000000..3b925699a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -0,0 +1,335 @@ +;****************************************************************************** +;* File Name : startup_stm32wb15xx_cm4.s +;* Author : MCD Application Team +;* Description : STM32WB15xx devices vector table for MDK-ARM toolchain. +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == Reset_Handler +;* - Set the vector table entries with the exceptions ISR address +;* - Branches to __main in the C library (which eventually +;* calls main()). +;* After Reset the CortexM4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;* <<< Use Configuration Wizard in Context Menu >>> +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** + +; Amount of memory (in bytes) allocated for Stack +; Tailor this value to your application needs +; Stack Configuration +; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Stack_Size EQU 0x1000 + + AREA STACK, NOINIT, READWRITE, ALIGN=3 +Stack_Mem SPACE Stack_Size +__initial_sp + + +; Heap Configuration +; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Heap_Size EQU 0x400 + + AREA HEAP, NOINIT, READWRITE, ALIGN=3 +__heap_base +Heap_Mem SPACE Heap_Size +__heap_limit + + PRESERVE8 + THUMB + + +; Vector Table Mapped to Address 0 at Reset + AREA RESET, DATA, READONLY + EXPORT __Vectors + EXPORT __Vectors_End + EXPORT __Vectors_Size + +__Vectors DCD __initial_sp ; Top of Stack + DCD Reset_Handler ; Reset Handler + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM detector + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper and TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_IRQHandler ; TIM1 Update Interrupt + DCD TIM1_TRG_COM_IRQHandler ; TIM1 Trigger and Communication Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD 0 ; Reserved + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD 0 ; Reserved + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD 0 ; Reserved + DCD PWR_SOTF_BLEACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +__Vectors_End + +__Vectors_Size EQU __Vectors_End - __Vectors + + AREA |.text|, CODE, READONLY + +; Reset handler +Reset_Handler PROC + EXPORT Reset_Handler [WEAK] + IMPORT SystemInit + IMPORT __main + + LDR R0, =SystemInit + BLX R0 + LDR R0, =__main + BX R0 + ENDP + +; Dummy Exception Handlers (infinite loops which can be modified) + +NMI_Handler PROC + EXPORT NMI_Handler [WEAK] + B . + ENDP +HardFault_Handler\ + PROC + EXPORT HardFault_Handler [WEAK] + B . + ENDP +MemManage_Handler\ + PROC + EXPORT MemManage_Handler [WEAK] + B . + ENDP +BusFault_Handler\ + PROC + EXPORT BusFault_Handler [WEAK] + B . + ENDP +UsageFault_Handler\ + PROC + EXPORT UsageFault_Handler [WEAK] + B . + ENDP +SVC_Handler PROC + EXPORT SVC_Handler [WEAK] + B . + ENDP +DebugMon_Handler\ + PROC + EXPORT DebugMon_Handler [WEAK] + B . + ENDP +PendSV_Handler PROC + EXPORT PendSV_Handler [WEAK] + B . + ENDP +SysTick_Handler PROC + EXPORT SysTick_Handler [WEAK] + B . + ENDP + +Default_Handler PROC + + EXPORT WWDG_IRQHandler [WEAK] + EXPORT PVD_PVM_IRQHandler [WEAK] + EXPORT TAMP_STAMP_LSECSS_IRQHandler [WEAK] + EXPORT RTC_WKUP_IRQHandler [WEAK] + EXPORT FLASH_IRQHandler [WEAK] + EXPORT RCC_IRQHandler [WEAK] + EXPORT EXTI0_IRQHandler [WEAK] + EXPORT EXTI1_IRQHandler [WEAK] + EXPORT EXTI2_IRQHandler [WEAK] + EXPORT EXTI3_IRQHandler [WEAK] + EXPORT EXTI4_IRQHandler [WEAK] + EXPORT DMA1_Channel1_IRQHandler [WEAK] + EXPORT DMA1_Channel2_IRQHandler [WEAK] + EXPORT DMA1_Channel3_IRQHandler [WEAK] + EXPORT DMA1_Channel4_IRQHandler [WEAK] + EXPORT DMA1_Channel5_IRQHandler [WEAK] + EXPORT DMA1_Channel6_IRQHandler [WEAK] + EXPORT DMA1_Channel7_IRQHandler [WEAK] + EXPORT ADC1_IRQHandler [WEAK] + EXPORT C2SEV_PWR_C2H_IRQHandler [WEAK] + EXPORT COMP_IRQHandler [WEAK] + EXPORT EXTI9_5_IRQHandler [WEAK] + EXPORT TIM1_BRK_IRQHandler [WEAK] + EXPORT TIM1_UP_IRQHandler [WEAK] + EXPORT TIM1_TRG_COM_IRQHandler [WEAK] + EXPORT TIM1_CC_IRQHandler [WEAK] + EXPORT TIM2_IRQHandler [WEAK] + EXPORT PKA_IRQHandler [WEAK] + EXPORT I2C1_EV_IRQHandler [WEAK] + EXPORT I2C1_ER_IRQHandler [WEAK] + EXPORT SPI1_IRQHandler [WEAK] + EXPORT USART1_IRQHandler [WEAK] + EXPORT LPUART1_IRQHandler [WEAK] + EXPORT TSC_IRQHandler [WEAK] + EXPORT EXTI15_10_IRQHandler [WEAK] + EXPORT RTC_Alarm_IRQHandler [WEAK] + EXPORT PWR_SOTF_BLEACT_RFPHASE_IRQHandler [WEAK] + EXPORT IPCC_C1_RX_IRQHandler [WEAK] + EXPORT IPCC_C1_TX_IRQHandler [WEAK] + EXPORT HSEM_IRQHandler [WEAK] + EXPORT LPTIM1_IRQHandler [WEAK] + EXPORT LPTIM2_IRQHandler [WEAK] + EXPORT AES1_IRQHandler [WEAK] + EXPORT AES2_IRQHandler [WEAK] + EXPORT RNG_IRQHandler [WEAK] + EXPORT FPU_IRQHandler [WEAK] + EXPORT DMAMUX1_OVR_IRQHandler [WEAK] + +WWDG_IRQHandler +PVD_PVM_IRQHandler +TAMP_STAMP_LSECSS_IRQHandler +RTC_WKUP_IRQHandler +FLASH_IRQHandler +RCC_IRQHandler +EXTI0_IRQHandler +EXTI1_IRQHandler +EXTI2_IRQHandler +EXTI3_IRQHandler +EXTI4_IRQHandler +DMA1_Channel1_IRQHandler +DMA1_Channel2_IRQHandler +DMA1_Channel3_IRQHandler +DMA1_Channel4_IRQHandler +DMA1_Channel5_IRQHandler +DMA1_Channel6_IRQHandler +DMA1_Channel7_IRQHandler +ADC1_IRQHandler +C2SEV_PWR_C2H_IRQHandler +COMP_IRQHandler +EXTI9_5_IRQHandler +TIM1_BRK_IRQHandler +TIM1_UP_IRQHandler +TIM1_TRG_COM_IRQHandler +TIM1_CC_IRQHandler +TIM2_IRQHandler +PKA_IRQHandler +I2C1_EV_IRQHandler +I2C1_ER_IRQHandler +SPI1_IRQHandler +USART1_IRQHandler +LPUART1_IRQHandler +TSC_IRQHandler +EXTI15_10_IRQHandler +RTC_Alarm_IRQHandler +PWR_SOTF_BLEACT_RFPHASE_IRQHandler +IPCC_C1_RX_IRQHandler +IPCC_C1_TX_IRQHandler +HSEM_IRQHandler +LPTIM1_IRQHandler +LPTIM2_IRQHandler +AES1_IRQHandler +AES2_IRQHandler +RNG_IRQHandler +FPU_IRQHandler +DMAMUX1_OVR_IRQHandler + + B . + + ENDP + + ALIGN + +;******************************************************************************* +; User Stack and Heap initialization +;******************************************************************************* + IF :DEF:__MICROLIB + + EXPORT __initial_sp + EXPORT __heap_base + EXPORT __heap_limit + + ELSE + + IMPORT __use_two_region_memory + EXPORT __user_initial_stackheap + +__user_initial_stackheap + + LDR R0, = Heap_Mem + LDR R1, =(Stack_Mem + Stack_Size) + LDR R2, = (Heap_Mem + Heap_Size) + LDR R3, = Stack_Mem + BX LR + + ALIGN + + ENDIF + + END + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb15xx_flash_cm4.sct new file mode 100644 index 000000000..41a12523f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -0,0 +1,26 @@ +; ************************************************************* +; *** Scatter-Loading Description File generated by uVision *** +; ************************************************************* + +LR_IROM1 0x08000000 0x00021800 { ; load region size_region + ER_IROM1 0x08000000 0x00021800 { ; load address = execution address + *.o (RESET, +First) + *(InRoot$$Sections) + .ANY (+RO) + } + RW_IRAM1 0x20000000 0x2FFF { ; RW data + .ANY (+RW +ZI) + } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + + } + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.cproject b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.cproject new file mode 100644 index 000000000..64be9d5a6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.cproject @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.project b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.project new file mode 100644 index 000000000..ca44befa1 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/.project @@ -0,0 +1,380 @@ + + + BLE_MeshLightingLPN + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.st.stm32cube.ide.mcu.MCUProjectNature + org.eclipse.cdt.core.cnature + com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature + com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature + com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature + com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature + com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature + com.st.stm32cube.ide.mcu.MCURootProjectNature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + Doc/readme.txt + 1 + $%7BPARENT-1-PROJECT_LOC%7D/readme.txt + + + Application/Core/app_debug.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/app_debug.c + + + Application/Core/app_entry.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/app_entry.c + + + Application/Core/hw_flash.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_flash.c + + + Application/Core/hw_timerserver.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_timerserver.c + + + Application/Core/hw_uart.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_uart.c + + + Application/Core/lp_timer.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/lp_timer.c + + + Application/Core/main.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c + + + Application/Core/stm32_lpm_if.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c + + + Application/Core/stm32wbxx_it.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wbxx_it.c + + + Drivers/CMSIS/system_stm32wbxx.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wbxx.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_cortex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_exti.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_gpio.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_hsem.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_ipcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + Application/STM32_WPAN/app/app_ble.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/app_ble.c + + + Application/STM32_WPAN/app/appli_config.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_config.c + + + Application/STM32_WPAN/app/appli_generic.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_generic.c + + + Application/STM32_WPAN/app/appli_light.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_light.c + + + Application/STM32_WPAN/app/appli_light_lc.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_light_lc.c + + + Application/STM32_WPAN/app/appli_mesh.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_mesh.c + + + Application/STM32_WPAN/app/appli_nvm.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_nvm.c + + + Application/STM32_WPAN/app/appli_sensor.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_sensor.c + + + Application/STM32_WPAN/app/appli_vendor.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/app/appli_vendor.c + + + Application/STM32_WPAN/app/models_if.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/models_if.c + + + Application/STM32_WPAN/app/pal_nvm.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/pal_nvm.c + + + Application/STM32_WPAN/target/hw_ipcc.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/target/hw_ipcc.c + + + Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c + + + Middlewares/STM32_WPAN/utilities/dbg_trace.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + Middlewares/STM32_WPAN/utilities/otp.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/otp.c + + + Middlewares/STM32_WPAN/utilities/stm32_lpm.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c + + + Middlewares/STM32_WPAN/utilities/stm32_seq.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c + + + Middlewares/STM32_WPAN/utilities/stm_list.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + Middlewares/STM32_WPAN/utilities/stm_queue.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + Middlewares/STM32_WPAN/ble/blesvc/common.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c + + + Middlewares/STM32_WPAN/ble/blesvc/generic.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c + + + Middlewares/STM32_WPAN/ble/blesvc/light.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c + + + Middlewares/STM32_WPAN/ble/blesvc/light_lc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c + + + Middlewares/STM32_WPAN/ble/blesvc/mesh.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c + + + Middlewares/STM32_WPAN/ble/blesvc/mesh_cfg.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c + + + Middlewares/STM32_WPAN/ble/blesvc/sensors.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c + + + Middlewares/STM32_WPAN/ble/blesvc/svc_ctl.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + Middlewares/STM32_WPAN/ble/blesvc/vendor.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c + + + Middlewares/STM32_WPAN/ble/core/ble_gap_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_gatt_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_hal_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_hci_le.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + Middlewares/STM32_WPAN/ble/core/ble_l2cap_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + Middlewares/STM32_WPAN/ble/core/osal.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c new file mode 100644 index 000000000..0a2679a25 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c @@ -0,0 +1,158 @@ +/** + ****************************************************************************** + * @file syscalls.c + * @author Auto-generated by STM32CubeIDE + * @brief STM32CubeIDE Minimal System calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include +#include +#include +#include +#include +#include +#include + + +/* Variables */ +//#undef errno +extern int errno; +extern int __io_putchar(int ch) __attribute__((weak)); +extern int __io_getchar(void) __attribute__((weak)); + +register char * stack_ptr asm("sp"); + +char *__env[1] = { 0 }; +char **environ = __env; + + +/* Functions */ +void initialise_monitor_handles() +{ +} + +int _getpid(void) +{ + return 1; +} + +int _kill(int pid, int sig) +{ + errno = EINVAL; + return -1; +} + +void _exit (int status) +{ + _kill(status, -1); + while (1) {} /* Make sure we hang here */ +} + +__attribute__((weak)) int _read(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + *ptr++ = __io_getchar(); + } + +return len; +} + +__attribute__((weak)) int _write(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + __io_putchar(*ptr++); + } + return len; +} + +int _close(int file) +{ + return -1; +} + + +int _fstat(int file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _isatty(int file) +{ + return 1; +} + +int _lseek(int file, int ptr, int dir) +{ + return 0; +} + +int _open(char *path, int flags, ...) +{ + /* Pretend like we always fail */ + return -1; +} + +int _wait(int *status) +{ + errno = ECHILD; + return -1; +} + +int _unlink(char *name) +{ + errno = ENOENT; + return -1; +} + +int _times(struct tms *buf) +{ + return -1; +} + +int _stat(char *file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _link(char *old, char *new) +{ + errno = EMLINK; + return -1; +} + +int _fork(void) +{ + errno = EAGAIN; + return -1; +} + +int _execve(char *name, char **argv, char **env) +{ + errno = ENOMEM; + return -1; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c new file mode 100644 index 000000000..dda5abe79 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c @@ -0,0 +1,79 @@ +/** + ****************************************************************************** + * @file sysmem.c + * @author Generated by STM32CubeIDE + * @brief STM32CubeIDE System Memory calls file + * + * For more information about which C functions + * need which of these lowlevel functions + * please consult the newlib libc manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include + +/** + * Pointer to the current high watermark of the heap usage + */ +static uint8_t *__sbrk_heap_end = NULL; + +/** + * @brief _sbrk() allocates memory to the newlib heap and is used by malloc + * and others from the C library + * + * @verbatim + * ############################################################################ + * # .data # .bss # newlib heap # MSP stack # + * # # # # Reserved by _Min_Stack_Size # + * ############################################################################ + * ^-- RAM start ^-- _end _estack, RAM end --^ + * @endverbatim + * + * This implementation starts allocating at the '_end' linker symbol + * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack + * The implementation considers '_estack' linker symbol to be RAM end + * NOTE: If the MSP stack, at any point during execution, grows larger than the + * reserved size, please increase the '_Min_Stack_Size'. + * + * @param incr Memory size + * @return Pointer to allocated memory + */ +void *_sbrk(ptrdiff_t incr) +{ + extern uint8_t _end; /* Symbol defined in the linker script */ + extern uint8_t _estack; /* Symbol defined in the linker script */ + extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */ + const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size; + const uint8_t *max_heap = (uint8_t *)stack_limit; + uint8_t *prev_heap_end; + + /* Initialize heap end at first call */ + if (NULL == __sbrk_heap_end) + { + __sbrk_heap_end = &_end; + } + + /* Protect heap from growing into the reserved MSP stack */ + if (__sbrk_heap_end + incr > max_heap) + { + errno = ENOMEM; + return (void *)-1; + } + + prev_heap_end = __sbrk_heap_end; + __sbrk_heap_end += incr; + + return (void *)prev_heap_end; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s new file mode 100644 index 000000000..447865dae --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -0,0 +1,392 @@ +/** + ****************************************************************************** + * @file startup_stm32wb15xx_cm4.s + * @author MCD Application Team + * @brief STM32WB15xx devices vector table GCC toolchain. + * This module performs: + * - Set the initial SP + * - Set the initial PC == Reset_Handler, + * - Set the vector table entries with the exceptions ISR address + * - Branches to main in the C library (which eventually + * calls main()). + * After Reset the Cortex-M4 processor is in Thread mode, + * priority is Privileged, and the Stack is set to Main. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + + .syntax unified + .cpu cortex-m4 + .fpu softvfp + .thumb + +.global g_pfnVectors +.global Default_Handler + +/* start address for the initialization values of the .data section. +defined in linker script */ +.word _sidata +/* start address for the .data section. defined in linker script */ +.word _sdata +/* end address for the .data section. defined in linker script */ +.word _edata +/* start address for the .bss section. defined in linker script */ +.word _sbss +/* end address for the .bss section. defined in linker script */ +.word _ebss +/* start address for the .MB_MEM2 section. defined in linker script */ +.word _sMB_MEM2 +/* end address for the .MB_MEM2 section. defined in linker script */ +.word _eMB_MEM2 + +/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */ +.macro INIT_BSS start, end + ldr r0, =\start + ldr r1, =\end + movs r3, #0 + bl LoopFillZerobss +.endm + +/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */ +.macro INIT_DATA start, end, src + ldr r0, =\start + ldr r1, =\end + ldr r2, =\src + movs r3, #0 + bl LoopCopyDataInit +.endm + +.section .text.data_initializers +CopyDataInit: + ldr r4, [r2, r3] + str r4, [r0, r3] + adds r3, r3, #4 + +LoopCopyDataInit: + adds r4, r0, r3 + cmp r4, r1 + bcc CopyDataInit + bx lr + +FillZerobss: + str r3, [r0] + adds r0, r0, #4 + +LoopFillZerobss: + cmp r0, r1 + bcc FillZerobss + bx lr + + .section .text.Reset_Handler + .weak Reset_Handler + .type Reset_Handler, %function +Reset_Handler: + ldr r0, =_estack + mov sp, r0 /* set stack pointer */ +/* Call the clock system initialization function.*/ + bl SystemInit + +/* Copy the data segment initializers from flash to SRAM */ + INIT_DATA _sdata, _edata, _sidata + +/* Zero fill the bss segments. */ + INIT_BSS _sbss, _ebss + INIT_BSS _sMB_MEM2, _eMB_MEM2 + +/* Call static constructors */ + bl __libc_init_array +/* Call the application s entry point.*/ + bl main + +LoopForever: + b LoopForever + +.size Reset_Handler, .-Reset_Handler + +/** + * @brief This is the code that gets called when the processor receives an + * unexpected interrupt. This simply enters an infinite loop, preserving + * the system state for examination by a debugger. + * + * @param None + * @retval None +*/ + .section .text.Default_Handler,"ax",%progbits +Default_Handler: +Infinite_Loop: + b Infinite_Loop + .size Default_Handler, .-Default_Handler +/****************************************************************************** +* +* The minimal vector table for a Cortex-M4. Note that the proper constructs +* must be placed on this to ensure that it ends up at physical address +* 0x0000.0000. +* +******************************************************************************/ + .section .isr_vector,"a",%progbits + .type g_pfnVectors, %object + .size g_pfnVectors, .-g_pfnVectors + + +g_pfnVectors: + .word _estack + .word Reset_Handler + .word NMI_Handler + .word HardFault_Handler + .word MemManage_Handler + .word BusFault_Handler + .word UsageFault_Handler + .word 0 + .word 0 + .word 0 + .word 0 + .word SVC_Handler + .word DebugMon_Handler + .word 0 + .word PendSV_Handler + .word SysTick_Handler + .word WWDG_IRQHandler + .word PVD_PVM_IRQHandler + .word TAMP_STAMP_LSECSS_IRQHandler + .word RTC_WKUP_IRQHandler + .word FLASH_IRQHandler + .word RCC_IRQHandler + .word EXTI0_IRQHandler + .word EXTI1_IRQHandler + .word EXTI2_IRQHandler + .word EXTI3_IRQHandler + .word EXTI4_IRQHandler + .word DMA1_Channel1_IRQHandler + .word DMA1_Channel2_IRQHandler + .word DMA1_Channel3_IRQHandler + .word DMA1_Channel4_IRQHandler + .word DMA1_Channel5_IRQHandler + .word DMA1_Channel6_IRQHandler + .word DMA1_Channel7_IRQHandler + .word ADC1_IRQHandler + .word 0 + .word 0 + .word C2SEV_PWR_C2H_IRQHandler + .word COMP_IRQHandler + .word EXTI9_5_IRQHandler + .word TIM1_BRK_IRQHandler + .word TIM1_UP_IRQHandler + .word TIM1_TRG_COM_IRQHandler + .word TIM1_CC_IRQHandler + .word TIM2_IRQHandler + .word PKA_IRQHandler + .word I2C1_EV_IRQHandler + .word I2C1_ER_IRQHandler + .word 0 + .word 0 + .word SPI1_IRQHandler + .word 0 + .word USART1_IRQHandler + .word LPUART1_IRQHandler + .word 0 + .word TSC_IRQHandler + .word EXTI15_10_IRQHandler + .word RTC_Alarm_IRQHandler + .word 0 + .word PWR_SOTF_BLEACT_RFPHASE_IRQHandler + .word IPCC_C1_RX_IRQHandler + .word IPCC_C1_TX_IRQHandler + .word HSEM_IRQHandler + .word LPTIM1_IRQHandler + .word LPTIM2_IRQHandler + .word 0 + .word 0 + .word 0 + .word AES2_IRQHandler + .word RNG_IRQHandler + .word FPU_IRQHandler + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word DMAMUX1_OVR_IRQHandler + +/******************************************************************************* +* +* Provide weak aliases for each Exception handler to the Default_Handler. +* As they are weak aliases, any function with the same name will override +* this definition. +* +*******************************************************************************/ + .weak NMI_Handler + .thumb_set NMI_Handler,Default_Handler + + .weak HardFault_Handler + .thumb_set HardFault_Handler,Default_Handler + + .weak MemManage_Handler + .thumb_set MemManage_Handler,Default_Handler + + .weak BusFault_Handler + .thumb_set BusFault_Handler,Default_Handler + + .weak UsageFault_Handler + .thumb_set UsageFault_Handler,Default_Handler + + .weak SVC_Handler + .thumb_set SVC_Handler,Default_Handler + + .weak DebugMon_Handler + .thumb_set DebugMon_Handler,Default_Handler + + .weak PendSV_Handler + .thumb_set PendSV_Handler,Default_Handler + + .weak SysTick_Handler + .thumb_set SysTick_Handler,Default_Handler + + .weak WWDG_IRQHandler + .thumb_set WWDG_IRQHandler,Default_Handler + + .weak PVD_PVM_IRQHandler + .thumb_set PVD_PVM_IRQHandler,Default_Handler + + .weak TAMP_STAMP_LSECSS_IRQHandler + .thumb_set TAMP_STAMP_LSECSS_IRQHandler,Default_Handler + + .weak RTC_WKUP_IRQHandler + .thumb_set RTC_WKUP_IRQHandler,Default_Handler + + .weak FLASH_IRQHandler + .thumb_set FLASH_IRQHandler,Default_Handler + + .weak RCC_IRQHandler + .thumb_set RCC_IRQHandler,Default_Handler + + .weak EXTI0_IRQHandler + .thumb_set EXTI0_IRQHandler,Default_Handler + + .weak EXTI1_IRQHandler + .thumb_set EXTI1_IRQHandler,Default_Handler + + .weak EXTI2_IRQHandler + .thumb_set EXTI2_IRQHandler,Default_Handler + + .weak EXTI3_IRQHandler + .thumb_set EXTI3_IRQHandler,Default_Handler + + .weak EXTI4_IRQHandler + .thumb_set EXTI4_IRQHandler,Default_Handler + + .weak DMA1_Channel1_IRQHandler + .thumb_set DMA1_Channel1_IRQHandler,Default_Handler + + .weak DMA1_Channel2_IRQHandler + .thumb_set DMA1_Channel2_IRQHandler,Default_Handler + + .weak DMA1_Channel3_IRQHandler + .thumb_set DMA1_Channel3_IRQHandler,Default_Handler + + .weak DMA1_Channel4_IRQHandler + .thumb_set DMA1_Channel4_IRQHandler,Default_Handler + + .weak DMA1_Channel5_IRQHandler + .thumb_set DMA1_Channel5_IRQHandler,Default_Handler + + .weak DMA1_Channel6_IRQHandler + .thumb_set DMA1_Channel6_IRQHandler,Default_Handler + + .weak DMA1_Channel7_IRQHandler + .thumb_set DMA1_Channel7_IRQHandler,Default_Handler + + .weak ADC1_IRQHandler + .thumb_set ADC1_IRQHandler,Default_Handler + + .weak C2SEV_PWR_C2H_IRQHandler + .thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler + + .weak COMP_IRQHandler + .thumb_set COMP_IRQHandler,Default_Handler + + .weak EXTI9_5_IRQHandler + .thumb_set EXTI9_5_IRQHandler,Default_Handler + + .weak TIM1_BRK_IRQHandler + .thumb_set TIM1_BRK_IRQHandler,Default_Handler + + .weak TIM1_UP_IRQHandler + .thumb_set TIM1_UP_IRQHandler,Default_Handler + + .weak TIM1_TRG_COM_IRQHandler + .thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler + + .weak TIM1_CC_IRQHandler + .thumb_set TIM1_CC_IRQHandler,Default_Handler + + .weak TIM2_IRQHandler + .thumb_set TIM2_IRQHandler,Default_Handler + + .weak PKA_IRQHandler + .thumb_set PKA_IRQHandler,Default_Handler + + .weak I2C1_EV_IRQHandler + .thumb_set I2C1_EV_IRQHandler,Default_Handler + + .weak I2C1_ER_IRQHandler + .thumb_set I2C1_ER_IRQHandler,Default_Handler + + .weak SPI1_IRQHandler + .thumb_set SPI1_IRQHandler,Default_Handler + + .weak USART1_IRQHandler + .thumb_set USART1_IRQHandler,Default_Handler + + .weak LPUART1_IRQHandler + .thumb_set LPUART1_IRQHandler,Default_Handler + + .weak TSC_IRQHandler + .thumb_set TSC_IRQHandler,Default_Handler + + .weak EXTI15_10_IRQHandler + .thumb_set EXTI15_10_IRQHandler,Default_Handler + + .weak RTC_Alarm_IRQHandler + .thumb_set RTC_Alarm_IRQHandler,Default_Handler + + .weak PWR_SOTF_BLEACT_RFPHASE_IRQHandler + .thumb_set PWR_SOTF_BLEACT_RFPHASE_IRQHandler,Default_Handler + + .weak IPCC_C1_RX_IRQHandler + .thumb_set IPCC_C1_RX_IRQHandler,Default_Handler + + .weak IPCC_C1_TX_IRQHandler + .thumb_set IPCC_C1_TX_IRQHandler,Default_Handler + + .weak HSEM_IRQHandler + .thumb_set HSEM_IRQHandler,Default_Handler + + .weak LPTIM1_IRQHandler + .thumb_set LPTIM1_IRQHandler,Default_Handler + + .weak LPTIM2_IRQHandler + .thumb_set LPTIM2_IRQHandler,Default_Handler + + .weak AES2_IRQHandler + .thumb_set AES2_IRQHandler,Default_Handler + + .weak RNG_IRQHandler + .thumb_set RNG_IRQHandler,Default_Handler + + .weak FPU_IRQHandler + .thumb_set FPU_IRQHandler,Default_Handler + + .weak DMAMUX1_OVR_IRQHandler + .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld new file mode 100644 index 000000000..0e7e6c389 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -0,0 +1,188 @@ +/* +****************************************************************************** +** +** File : LinkerScript.ld +** +** Author : STM32CubeIDE +** +** Abstract : Linker script for STM32WB15xC Device +** 320Kbytes FLASH +** 48Kbytes RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** Distribution: The file is distributed as is without any warranty +** of any kind. +** +***************************************************************************** +** @attention +** +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. +** +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +/*_estack = 0x20003000;*/ /* end of RAM */ +_estack = 0x20032800; /* end of RAM_SHARED */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 134K +RAM1 (xrw) : ORIGIN = 0x20000004, LENGTH = 0x2FFC +RAM_SHARED1 (xrw) : ORIGIN = 0x20030000, LENGTH = 0x28 +RAM_SHARED2 (xrw) : ORIGIN = 0x20030028, LENGTH = 0x27D8 +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + *(.RamFunc) /* .RamFunc sections */ + *(.RamFunc*) /* .RamFunc* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM1 AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss1 : + { + /* This is used by the startup in order to initialize the .bss section */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM1 + + .bss2 : + { + . = ALIGN(4); + __bss2_start__ = .; + *(.bss*) + . = ALIGN(4); + __bss2_end__ = .; + } > RAM_SHARED2 AT > RAM_SHARED2 + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM1 + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } + MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED1 + MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED2 + MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED2 +} + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c new file mode 100644 index 000000000..08b9446b5 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c @@ -0,0 +1,110 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_config.c + * @author MCD Application Team + * @brief Configuration file for PWM. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "PWM_config.h" + +extern TIM_HandleTypeDef htim1; +extern TIM_HandleTypeDef htim2; + +#define PRESCALER_VALUE (uint32_t)(((SystemCoreClock) / 1000000) - 1) + +/** + *@brief Configure PWM sources and GPIO + *@retval None + */ +void PWM_Init() +{ + TIM_OC_InitTypeDef sConfigOC = {0}; + TIM_MasterConfigTypeDef sMasterConfig = {0}; + + /* GPIO Configuration */ + GPIO_InitTypeDef GPIO_InitStructure = {0}; + + + /* Configure PWM pins */ + GPIO_InitStructure.Pin = PWM0_PIN | PWM1_PIN; + GPIO_InitStructure.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure.Pull = GPIO_PULLUP; + GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure); + + /* Configure PWM pins */ + GPIO_InitStructure.Pin = PWM2_PIN | PWM3_PIN | PWM4_PIN; + GPIO_InitStructure.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure.Pull = GPIO_PULLUP; + GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure.Alternate = GPIO_AF1_TIM2; + HAL_GPIO_Init(GPIOA, &GPIO_InitStructure); + + /* MFT Configuration */ + HAL_NVIC_SetPriority((IRQn_Type)(TIM1_CC_IRQn), 15, 0); + HAL_NVIC_EnableIRQ((IRQn_Type)(TIM1_CC_IRQn)); + HAL_NVIC_SetPriority((IRQn_Type)(TIM2_IRQn), 15, 0); + HAL_NVIC_EnableIRQ((IRQn_Type)(TIM2_IRQn)); + + htim1.Instance = TIM1; + htim1.Init.Prescaler = 0/*PRESCALER_VALUE*/; + htim1.Init.CounterMode = TIM_COUNTERMODE_UP; + htim1.Init.Period = TIME_PERIOD; + htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + HAL_TIM_PWM_Init(&htim1); + + htim2.Instance = TIM2; + htim2.Init.Prescaler = 0/*PRESCALER_VALUE*/; + htim2.Init.CounterMode = TIM_COUNTERMODE_UP; + htim2.Init.Period = TIME_PERIOD; + htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + HAL_TIM_PWM_Init(&htim2); + + sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET; + sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; + HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig); + HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig); + + sConfigOC.OCMode = TIM_OCMODE_PWM1; + sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; + sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; + sConfigOC.Pulse = MFT1_TON_1; + HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1); + sConfigOC.Pulse = MFT2_TON_1; + HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_2); + sConfigOC.Pulse = MFT1_TON_2; + HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1); + sConfigOC.Pulse = MFT2_TON_2; + HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_2); + sConfigOC.Pulse = MFT2_TON_3; + HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_3); + + /* Start channel 1 */ + HAL_TIM_PWM_Start_IT(&htim1, TIM_CHANNEL_1); + /* Start channel 2 */ + HAL_TIM_PWM_Start_IT(&htim1, TIM_CHANNEL_2); + /* Start channel 1 */ + HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_1); + /* Start channel 2 */ + HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_2); + /* Start channel 3 */ + HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_3); +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.h new file mode 100644 index 000000000..7fc56056b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.h @@ -0,0 +1,74 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_config.h + * @author MCD Application Team + * @brief Header Configuration file for PWM. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "mesh_cfg_usr.h" + +/* Macros defined for the number of PWM Provided */ +#define PWM0 0 +#define PWM1 1 +#define PWM2 2 +#define PWM3 3 +#define PWM4 4 + +/************************************************************************/ + +/*STM32WB + * This configuration given below is for the STM32WB board. + * Here user has selected the PWM0 in SERIAL2_MODE and PWM1 in SERIAL1_MODE. + * User can configure software PWM to any of the GPIO which are not used for + * hardware PWM. +*/ +/* PWM pins for MFT1 and MFT2 respectively */ +#if defined USE_STM32WBXX_NUCLEO || defined USE_STM32WBXX_USB_DONGLE + +#define PWM0_PIN GPIO_PIN_14 /* TIM1_CH1 AF1 */ +#define PWM1_PIN GPIO_PIN_15 /* TIM1_CH2 AF1 */ + +/* GPIOs pins (SOFTWARE PWM) used to output a PWM signal */ +#define PWM2_PIN GPIO_PIN_0 /* TIM2_CH1 AF1 */ +#define PWM3_PIN GPIO_PIN_1 /* TIM2_CH2 AF1 */ +#define PWM4_PIN GPIO_PIN_2 /* TIM2_CH3 AF1 */ +#endif +/************************************************************************/ + +#define TIME_PERIOD 32000 + +/* TIM1 Channel 1 Timer Ton and T0ff (ticks number) PWM0*/ +#define MFT1_TON_1 (12000 - 1) +#define MFT1_TOFF_1 (20000 - 1) + +/* TIM1 Channel 2 Timer 1 Ton and T0ff (ticks number) PWM1*/ +#define MFT2_TON_1 (8000 - 1 ) +#define MFT2_TOFF_1 (24000 - 1) + +/* TIM2 Channel 1 Timer 2 Ton and T0ff (ticks number) PWM2*/ +#define MFT1_TON_2 (16000 - 1) +#define MFT1_TOFF_2 (16000 -1) + +/* TIM2 Channel 2 Timer 2 Ton and T0ff (ticks number) PWM3*/ +#define MFT2_TON_2 (4000 - 1) +#define MFT2_TOFF_2 (28000 - 1) + +/* TIM2 Channel 3 Timer 2 Ton and T0ff (ticks number) PWM4*/ +#define MFT2_TON_3 (4000 - 1) +#define MFT2_TOFF_3 (28000 - 1) + +void PWM_Init(void); + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c new file mode 100644 index 000000000..74d3bc848 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c @@ -0,0 +1,279 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_handlers.c + * @author MCD Application Team + * @brief Handlers for PWM and other support functions. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "app_conf.h" +#include "PWM_handlers.h" +#include "mesh_cfg_usr.h" + +extern TIM_HandleTypeDef htim1; +extern TIM_HandleTypeDef htim2; + +/* Global Variables */ +uint16_t DUTY; +int NonZeroPWM0=0; +int NonZeroPWM1=0; +uint8_t Duty_flag_A = 0; +uint16_t PWM0_on, + PWM1_on, + PWM2_on = MFT1_TON_2, /* Timer2, MFT1 */ + PWM3_on = MFT2_TON_2, /* Timer2, MFT2 */ + PWM4_on = MFT2_TON_3; /* Timer2, MFT2 */ + +uint32_t channel = PWM3_PIN; /* It is the channel with initial lowest duty-cycle */ +uint32_t period = TIME_PERIOD; /* Period in ticks of the PWM signal */ +uint8_t channel_number = 0; + +uint32_t PWM_channels[] = {PWM3_PIN, PWM4_PIN}; /* Channels managed by MFT2 Timer 2 */ +uint16_t Ton_values[] = {MFT2_TON_2, MFT2_TON_3}; /* Sorted array containing duty-cycle values + respectively for PWM3_PIN and PWM4_PIN */ +uint16_t delta_1 = MFT2_TON_3 - MFT2_TON_2; /* Delta between the first two duty-cycles */ +uint16_t delta = MFT2_TON_3 - MFT2_TON_2; + +int number_of_channels = 2; /* Number of channels managed by MFT2 Timer 2 */ +int max_duty = MFT2_TON_3; /* Maximum duty-cycle */ + +/** + *@brief PWM2 handler + *@retval None + */ +void PWM2_handler() +{ + if(__HAL_TIM_GET_FLAG(&htim1, TIM_FLAG_CC1) > 0) + { + __HAL_TIM_CLEAR_FLAG(&htim1, TIM_FLAG_CC1); + if(Duty_flag_A == 1) + { + HAL_GPIO_WritePin(GPIOA, PWM2_PIN, GPIO_PIN_SET); + Duty_flag_A = 0; + htim1.Instance->CCR1 = PWM2_on; + } + else + { + HAL_GPIO_WritePin(GPIOA, PWM2_PIN, GPIO_PIN_RESET); + Duty_flag_A = 1; + htim1.Instance->CCR1 = TIME_PERIOD - PWM2_on; + } + } +} + +/** + *@brief PWM3 and PWM4 handler + *@retval None + */ +void PWM3_PWM4_handler() +{ + /*STATE 0 + if delta != 0, there is a channel with a duty lower than the other one. + So the channel with the lower duty is cleared. Delta is period - max_duty + (the duty of the other channel) + The machine passes to STATE 1. + + if delta == 0, the two channel are cleared together. + The machine passes to STATE 2 + + The delta is computed for the next timer event*/ + + if (channel_number < number_of_channels - 1) + { + if (delta != 0) + { +// HAL_GPIO_WritePin(GPIOA, channel, GPIO_PIN_RESET); + htim2.Instance->CCR2 = delta - 1; + htim2.Instance->CCR3 = delta - 1; + channel_number ++; + delta = period - max_duty; /*computed delta for the next reset of the counter*/ + channel = PWM_channels[channel_number]; + } + else + { +// HAL_GPIO_WritePin(GPIOA, PWM3_PIN |PWM4_PIN, GPIO_PIN_RESET); + delta = period - max_duty; + htim2.Instance->CCR2 = delta - 1; + htim2.Instance->CCR3 = delta - 1; + channel_number = number_of_channels; + } + } + /*STATE 1 + Here the channel with the max duty-cycle is cleared. The delta is that one + computed in STATE 0. The machine passes to STATE 2 */ + else if (channel_number == number_of_channels - 1) + { +// HAL_GPIO_WritePin(GPIOA, channel, GPIO_PIN_RESET); + htim2.Instance->CCR2 = delta - 1; + htim2.Instance->CCR3 = delta - 1; + channel_number ++; + } + /*STATE 2 + All the channels have been cleared and now are set again. The machine passes to STATE 0 */ + else + { /* channel_number > number_of_channels - 1 */ + HAL_GPIO_WritePin(GPIOA, PWM3_PIN | PWM4_PIN, GPIO_PIN_SET); + htim2.Instance->CCR2 = Ton_values[0] - 1; + htim2.Instance->CCR3 = Ton_values[1] - 1; + Ton_sorting(); + channel_number = 0; + delta = Ton_values[1] - Ton_values[0]; + channel = PWM_channels[0]; + } +} + +/** + *@brief Sorting on basis of duty cycle + *@retval None + */ + +void Ton_sorting(void) +{ + if (PWM3_on > PWM4_on) + { + max_duty = PWM3_on; + Ton_values[1] = PWM3_on; + Ton_values[0] = PWM4_on; + PWM_channels[1] = PWM3_PIN; + PWM_channels[0] = PWM4_PIN; + } + else + { + max_duty = PWM4_on; + Ton_values[0] = PWM3_on; + Ton_values[1] = PWM4_on; + PWM_channels[0] = PWM3_PIN; + PWM_channels[1] = PWM4_PIN; + } +} + + +/** + *@brief PWM modification + *@param PWM_ID: PWM number + *@param duty_cycle: Duty cycle at output + *@retval None + */ +void Modify_PWM(uint8_t PWM_ID, uint16_t duty_cycle) +{ +#if (( CFG_LPM_SUPPORTED == 0) && (ENABLE_PWM_SUPPORT == 1)) + GPIO_InitTypeDef GPIO_InitStructure1 = {0}; + + if (PWM_ID == 0) /* PD14 */ + { + if (duty_cycle == 0 && NonZeroPWM0 == 0) + { + GPIO_InitStructure1.Pin = PWM0_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStructure1.Pull = GPIO_NOPULL; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + HAL_GPIO_WritePin(GPIOD, PWM0_PIN, GPIO_PIN_RESET); + + NonZeroPWM0=1; + } + else if ((duty_cycle != 0 && NonZeroPWM0 == 1)) + { + GPIO_InitStructure1.Pin = PWM0_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure1.Pull = GPIO_PULLUP; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure1.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + + NonZeroPWM0=0; + } + } + else if((PWM_ID == 1)) /* GPIO3 */ + { + if (duty_cycle == 0 && NonZeroPWM1 == 0) + { + GPIO_InitStructure1.Pin = PWM1_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStructure1.Pull = GPIO_NOPULL; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + HAL_GPIO_WritePin(GPIOD, PWM1_PIN, GPIO_PIN_RESET); + + NonZeroPWM1=1; + } + else if ((duty_cycle != 0 && NonZeroPWM1 == 1)) + { + GPIO_InitStructure1.Pin = PWM1_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure1.Pull = GPIO_PULLUP; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure1.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + + NonZeroPWM1=0; + } + } + else + { + } + + DUTY = duty_cycle; + switch (PWM_ID) + { + case 0: /* PWM0 */ + { + htim1.Instance->CCR1 = DUTY; + } + break; + case 1: /* PWM1 */ + { + htim1.Instance->CCR2 = DUTY; + } + break; + case 2: /* PWM2 */ + { + PWM2_on = DUTY; + htim2.Instance->CCR1 = PWM2_on; + } + break; + case 3: /* PWM3 */ + { + PWM3_on = DUTY; + htim2.Instance->CCR2 = PWM3_on; + } + break; + case 4: /* PWM4 */ + { + PWM4_on = DUTY; + htim2.Instance->CCR3 = PWM4_on; + } + break; + } +#endif +} + +/** + * @brief Period elapsed callback in non blocking mode + * @param htim : TIM handle + * @retval None + */ +void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) +{ +#if 0 + if(htim->Instance == TIM1) + PWM2_handler(); + else + PWM3_PWM4_handler(); +#endif +} + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h new file mode 100644 index 000000000..4882feaae --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h @@ -0,0 +1,34 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_handlers.h + * @author MCD Application Team + * @brief Header Handlers for PWM and other support functions. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "PWM_config.h" +//#include "SDK_EVAL_Config.h" + +/* PWM2 handler */ +void PWM2_handler(void); + +/* PWM3 and PWM4 handler */ +void PWM3_PWM4_handler(void); + +/* Here the channel with the lower duty-cycle is established*/ +void Ton_sorting(void); + +/* Handle modifications in duty cycle */ +void Modify_PWM(uint8_t PWM_ID, uint16_t duty_cycle); diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c new file mode 100644 index 000000000..9f3857506 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c @@ -0,0 +1,509 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +#include "app_common.h" + +#include "dbg_trace.h" +#include "ble.h" +#include "tl.h" +#include "app_ble.h" + +#include "stm32_seq.h" +#include "shci.h" +#include "stm32_lpm.h" +#include "otp.h" + +#include "types.h" +#include "ble_mesh.h" +#include "mesh_cfg.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ + +/** + * security parameters structure + */ +typedef struct _tSecurityParams +{ + /** + * IO capability of the device + */ + uint8_t ioCapability; + + /** + * Authentication requirement of the device + * Man In the Middle protection required? + */ + uint8_t mitm_mode; + + /** + * bonding mode of the device + */ + uint8_t bonding_mode; + + /** + * this variable indicates whether to use a fixed pin + * during the pairing process or a passkey has to be + * requested to the application during the pairing process + * 0 implies use fixed pin and 1 implies request for passkey + */ + uint8_t Use_Fixed_Pin; + + /** + * minimum encryption key size requirement + */ + uint8_t encryptionKeySizeMin; + + /** + * maximum encryption key size requirement + */ + uint8_t encryptionKeySizeMax; + + /** + * fixed pin to be used in the pairing process if + * Use_Fixed_Pin is set to 1 + */ + uint32_t Fixed_Pin; + + /** + * this flag indicates whether the host has to initiate + * the security, wait for pairing or does not have any security + * requirements.\n + * 0x00 : no security required + * 0x01 : host should initiate security by sending the slave security + * request command + * 0x02 : host need not send the clave security request but it + * has to wait for paiirng to complete before doing any other + * processing + */ + uint8_t initiateSecurity; +}tSecurityParams; + +/** + * global context + * contains the variables common to all + * services + */ +typedef struct _tBLEProfileGlobalContext +{ + + /** + * security requirements of the host + */ + tSecurityParams bleSecurityParam; + + /** + * gap service handle + */ + uint16_t gapServiceHandle; + + /** + * device name characteristic handle + */ + uint16_t devNameCharHandle; + + /** + * appearance characteristic handle + */ + uint16_t appearanceCharHandle; + + /** + * connection handle of the current active connection + * When not in connection, the handle is set to 0xFFFF + */ + uint16_t connectionHandle; + + /** + * length of the UUID list to be used while advertising + */ + uint8_t advtServUUIDlen; + + /** + * the UUID list to be used while advertising + */ + uint8_t advtServUUID[100]; + +}BleGlobalContext_t; + +typedef struct +{ + BleGlobalContext_t BleApplicationContext_legacy; + APP_BLE_ConnStatus_t Device_Connection_Status; + + /** + * ID of the Advertising Timeout + */ + uint8_t Advertising_mgr_timer_Id; + +} BleApplicationContext_t; +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define APPBLE_GAP_DEVICE_NAME_LENGTH 7 +#define FAST_ADV_TIMEOUT (30*1000*1000/CFG_TS_TICK_VAL) /**< 30s */ +#define INITIAL_ADV_TIMEOUT (60*1000*1000/CFG_TS_TICK_VAL) /**< 60s */ + +#define BD_ADDR_SIZE_LOCAL 6 + +/* USER CODE BEGIN PD */ +#define LED_ON_TIMEOUT (0.005*1000*1000/CFG_TS_TICK_VAL) /**< 5ms */ +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer; + +uint8_t Test_Status =0x00; + +static const uint8_t M_bd_addr[BD_ADDR_SIZE_LOCAL] = +{ + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) +}; + +static uint8_t bd_addr_udn[BD_ADDR_SIZE_LOCAL]; + +PLACE_IN_SECTION("BLE_APP_CONTEXT") static BleApplicationContext_t BleApplicationContext; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Extern function prototypes -----------------------------------------------*/ +extern void HCI_Event_CB(void *pckt); + +/* Global variables ----------------------------------------------------------*/ +const uint8_t *bd_addr; + +/* Private function prototypes -----------------------------------------------*/ +static void BLE_UserEvtRx( void * pPayload ); +static void BLE_StatusNot( HCI_TL_CmdStatus_t status ); +static void Ble_Tl_Init( void ); +static const uint8_t* BleGetBdAddress( void ); + +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* External variables --------------------------------------------------------*/ + +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Functions Definition ------------------------------------------------------*/ +void APP_BLE_Init( void ) +{ +/* USER CODE BEGIN APP_BLE_Init_1 */ + +/* USER CODE END APP_BLE_Init_1 */ + SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = + { + {{0,0,0}}, /**< Header unused */ + {0, /** pBleBufferAddress not used */ + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} + }; + + /** + * Initialize Ble Transport Layer + */ + Ble_Tl_Init( ); + +#if (CFG_LPM_STANDBY_SUPPORTED == 0) + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP_BLE, UTIL_LPM_DISABLE); +#endif + + /** + * Do not allow stop mode in the application + */ +#if (LOW_POWER_FEATURE == 0) + UTIL_LPM_SetStopMode(1 << CFG_LPM_APP_BLE, UTIL_LPM_DISABLE); +#endif + + /** + * Register the hci transport layer to handle BLE User Asynchronous Events + */ + UTIL_SEQ_RegTask( 1<> 8 ); + bd_addr_udn[2] = (uint8_t)device_id; + bd_addr_udn[3] = (uint8_t)(company_id & 0x000000FF); + bd_addr_udn[4] = (uint8_t)( (company_id & 0x0000FF00) >> 8 ); + bd_addr_udn[5] = (uint8_t)( (company_id & 0x00FF0000) >> 16 ); + + bd_addr = (const uint8_t *)bd_addr_udn; + } + else + { + otp_addr = OTP_Read(0); + if(otp_addr) + { + bd_addr = ((OTP_ID0_t*)otp_addr)->bd_address; + } + else + { + bd_addr = M_bd_addr; + } + } + + return bd_addr; +} + +/* USER CODE BEGIN FD_LOCAL_FUNCTION */ + +/* USER CODE END FD_LOCAL_FUNCTION */ + +/************************************************************* + * + *SPECIFIC FUNCTIONS + * + *************************************************************/ +/* USER CODE BEGIN FD_SPECIFIC_FUNCTIONS */ + +/* USER CODE END FD_SPECIFIC_FUNCTIONS */ +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void hci_notify_asynch_evt(void* pdata) +{ + UTIL_SEQ_SetTask( 1<pckt->evtserial)); + if (svctl_return_status != SVCCTL_UserEvtFlowDisable) + { + pParam->status = HCI_TL_UserEventFlow_Enable; + } + else + { + pParam->status = HCI_TL_UserEventFlow_Disable; + } +} + +static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) +{ + uint32_t task_id_list; + switch (status) + { + case HCI_TL_CmdBusy: + /** + * All tasks that may send an aci/hci commands shall be listed here + * This is to prevent a new command is sent while one is already pending + */ + task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; + UTIL_SEQ_PauseTask(task_id_list); + + break; + + case HCI_TL_CmdAvailable: + /** + * All tasks that may send an aci/hci commands shall be listed here + * This is to prevent a new command is sent while one is already pending + */ + task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; + UTIL_SEQ_ResumeTask(task_id_list); + + break; + + default: + break; + } + return; +} + +void SVCCTL_ResumeUserEventFlow( void ) +{ + hci_resume_flow(); + return; +} + +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ + +/* USER CODE END FD_WRAP_FUNCTIONS */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h new file mode 100644 index 000000000..6fd1b71af --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h @@ -0,0 +1,76 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_BLE_H +#define APP_BLE_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "hci_tl.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ + +typedef enum +{ + APP_BLE_IDLE, + APP_BLE_FAST_ADV, + APP_BLE_LP_ADV, + APP_BLE_SCAN, + APP_BLE_LP_CONNECTING, + APP_BLE_CONNECTED_SERVER, + APP_BLE_CONNECTED_CLIENT +} APP_BLE_ConnStatus_t; + +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ +void APP_BLE_Init( void ); + +#ifdef __cplusplus +} +#endif + +#endif /*APP_BLE_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c new file mode 100644 index 000000000..b1f206c0e --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c @@ -0,0 +1,358 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config.c + * @author MCD Application Team + * @brief Config Model APIs callback from ST BLE Mesh Library + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include +#include "hal_common.h" +#include "ble_mesh.h" +#include "appli_config.h" +#include "mesh_cfg.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private define ------------------------------------------------------------*/ + +/* Private macro -------------------------------------------------------------*/ + +/* Private variables ---------------------------------------------------------*/ + + +/*****************************Config Model Callbacks***************************/ +/** +* @brief Callback from Config Model to receive the AppKey Add Command +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndex +* appKey, keySize & status +* @retval none +*/ +void Appli_GetAppKeyAddParamsCb(model_securityKeyParams_t* appKeyAddParams) +{ + TRACE_I(TF_CONFIG_SERVER,"AppKey Add received for netKeyIndex %.2x, appKeyIndex %.2x \r\n",\ + appKeyAddParams->netKeyIndex, appKeyAddParams->appKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyAddParams->status); + /*Success Command*/ + if(appKeyAddParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"AppKey is: "); + for (MOBLEUINT8 count=0 ; countkeySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(appKeyAddParams->appKey)); + appKeyAddParams->appKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the AppKey Delete Command +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndex +* appKey, keySize & status +* @retval none +*/ +void Appli_GetAppKeyDeleteParamsCb(model_securityKeyParams_t* appKeyDeleteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"App Key Delete received for netKeyIndex %.2x, appKeyIndex %.2x \r\n",\ + appKeyDeleteParams->netKeyIndex, appKeyDeleteParams->appKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyDeleteParams->status); +} + +/** +* @brief Callback from Config Model to receive the AppKey List +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndexes & appKeyListParams Size +* @retval none +*/ +void Appli_GetAppKeyListParamsCb(model_appKeyListParams_t* appKeyListParams) +{ + TRACE_I(TF_CONFIG_SERVER,"App Key List for netKeyIndex %.2x is \r\n", appKeyListParams->netKeyIndex); + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyListParams->status); + /*Success*/ + if(appKeyListParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"AppKey Indexes are: \r\n"); + for (MOBLEUINT8 count=0 ; count< appKeyListParams->appKeyIndexList_size; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(appKeyListParams->appKeyIndexList)); + appKeyListParams->appKeyIndexList++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the Updated App Key +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndex +* appKey, keySize & status +* @retval none +*/ +void Appli_GetAppKeyUpdateParamsCb(model_securityKeyParams_t* appKeyUpdatedParams) +{ + TRACE_I(TF_CONFIG_SERVER,"App Key Update received for netKeyIndex %.2x, appKeyIndex %.2x \r\n",\ + appKeyUpdatedParams->netKeyIndex, appKeyUpdatedParams->appKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyUpdatedParams->status); + + /*Success Command*/ + if(appKeyUpdatedParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"Updated AppKey is: "); + for (MOBLEUINT8 count=0 ; countkeySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(appKeyUpdatedParams->appKey)); + appKeyUpdatedParams->appKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + TRACE_I(TF_CONFIG_SERVER,"It will be replaced by old appKey after Key Refresh \r\n"); + } + +} + +/** +* @brief Callback from Config Model to receive the NetKey Add Command +* @param Structure Pointer having parameters - netKeyIndex & netKey +* @retval none +*/ +void Appli_GetNetKeyAddParamsCb(model_securityKeyParams_t* netKeyAddParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Net Key Add received for netKeyIndex %.2x \r\n",\ + netKeyAddParams->netKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyAddParams->status); + + /*Success Command*/ + if(netKeyAddParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"NetKey is: "); + for (MOBLEUINT8 count=0 ; count < netKeyAddParams->keySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(netKeyAddParams->netKey)); + netKeyAddParams->netKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the NetKey Delete Command +* @param Structure Pointer having parameters - netKeyIndex & netKey +* @retval none +*/ +void Appli_GetNetKeyDeleteParamsCb(model_securityKeyParams_t* netKeyDeleteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Net Key Delete received for netKeyIndex %d \r\n",\ + netKeyDeleteParams->netKeyIndex); + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyDeleteParams->status); +} + +/** +* @brief Callback from Config Model to receive the NetKey List +* @param Structure Pointer having parameters - netKeyIndexes & netKeyListParams Size +* @retval none +*/ +void Appli_GetNetKeyListParamsCb(model_netKeyListParams_t* netKeyListParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyListParams->status); + TRACE_I(TF_CONFIG_SERVER,"NetKey Indexes are: \r\n"); + for (MOBLEUINT8 count=0 ; count< netKeyListParams->netKeyIndexList_size; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(netKeyListParams->netKeyIndexList)); + netKeyListParams->netKeyIndexList++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); +} + + +/** +* @brief Callback from Config Model to receive the Updated NetKey Command +* @param Structure Pointer having parameters - netKeyIndex & netKey +* @retval none +*/ +void Appli_GetNetKeyUpdateParamsCb(model_securityKeyParams_t* netKeyUpdatedParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Net Key Update received for netKeyIndex %d \r\n",\ + netKeyUpdatedParams->netKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyUpdatedParams->status); + if(netKeyUpdatedParams->status == 0) + { + TRACE_I(TF_CONFIG_SERVER,"Updated NetKey is:"); + for (MOBLEUINT8 count=0; countkeySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(netKeyUpdatedParams->netKey)); + netKeyUpdatedParams->netKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + TRACE_I(TF_CONFIG_SERVER,"It will be replaced by old netKey after Key Refresh \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the AppKey binding params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex & modelID +* @retval none +*/ +void Appli_GetAppKeyBindingParamsCb(model_appKeyBindingParams_t* appKeyBindParams) +{ + TRACE_I(TF_CONFIG_SERVER,"AppKey binding received for elementIndex %d, modelID %.2lx,\ + appKeyIndex %.2x & status %.2x \r\n", appKeyBindParams->elementIndex,\ + appKeyBindParams->modelID, appKeyBindParams->appKeyIndex, appKeyBindParams->status); +} + +/** +* @brief Callback from Config Model to receive the AppKey Unbinding params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex & modelID +* @retval none +*/ +void Appli_GetAppKeyUnBindingParamsCb(model_appKeyBindingParams_t* appKeyUnbindParams) +{ + TRACE_I(TF_CONFIG_SERVER,"AppKey unbinding received for elementIndex %d, modelID %.2lx,\ + appKeyIndex %.2x & status %.2x \r\n",appKeyUnbindParams->elementIndex,\ + appKeyUnbindParams->modelID, appKeyUnbindParams->appKeyIndex,\ + appKeyUnbindParams->status); +} + +/** +* @brief Callback from Config Model to receive the Subscription Add params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex, modelID +* subAddress, isVirtual & allSubDeleted +* @retval none +*/ +void Appli_GetSubAddParamsCb(model_subParams_t* subAddParams) +{ + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", subAddParams->status); + if(subAddParams->isVirtual) + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Virtual Add received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subAddParams->elementIndex, subAddParams->modelID,\ + subAddParams->subAddress); + } + + else + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Add received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subAddParams->elementIndex, subAddParams->modelID,\ + subAddParams->subAddress); + } +} + +/** +* @brief Callback from Config Model to receive the Subscription Delete params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex, modelID +* subAddress, isVirtual & allSubDeleted +* @retval none +*/ +void Appli_GetSubDeleteParamsCb(model_subParams_t* subDeleteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", subDeleteParams->status); + if(subDeleteParams->isVirtual) + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Virtual Add Delete received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subDeleteParams->elementIndex, subDeleteParams->modelID,\ + subDeleteParams->subAddress); + + } + + else if(subDeleteParams->allSubDeleted) + { + + TRACE_I(TF_CONFIG_SERVER,"Delete All Subscription received for elementIndex %d, modelID %.2lx \r\n",\ + subDeleteParams->elementIndex, subDeleteParams->modelID); + + } + else + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Delete received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subDeleteParams->elementIndex, subDeleteParams->modelID,\ + subDeleteParams->subAddress); + } +} + +/** +* @brief Callback from Config Model to receive the Subscription Overwrite params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex, modelID +* subAddress, isVirtual & allSubDeleted +* @retval none +*/ +void Appli_GetSubOverwriteParamsCb(model_subParams_t* subOverwriteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", subOverwriteParams->status); + if(subOverwriteParams->isVirtual) + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Virtual Overwrite received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subOverwriteParams->elementIndex, subOverwriteParams->modelID,\ + subOverwriteParams->subAddress); + + } + + else + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Overwrite received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subOverwriteParams->elementIndex, subOverwriteParams->modelID,\ + subOverwriteParams->subAddress); + } +} + +/** +* @brief Callback from Config Model to receive the Publication Parameters +* @param Structure Pointer having parameters - modelID, elementAddress, +* Publish Address, PublishPeriod, PublishTTL, Credential Flag, +* Publish AppKeyIndex, Retransmit Count, Restransmit Interval Steps & status +* @retval none +*/ +void Appli_GetPublicationSetParamsCb(model_publicationparams_t* pPubParameters) +{ + if(pPubParameters->modelID == SENSOR_SERVER_MODEL_ID) + { + Sensor_ModelPublishSet(pPubParameters); + } +} + +/** +* @brief Callback from Config Model to receive the Publication Parameters +* @param Structure Pointer having parameters - modelID, elementAddress, +* Publish Address, PublishPeriod, PublishTTL, Credential Flag, +* Publish AppKeyIndex, Retransmit Count, Restransmit Interval Steps & status +* @retval none +*/ +void Appli_GetPublicationGetParamsCb(model_publicationparams_t* pPubParameters) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", pPubParameters->status); + TRACE_I(TF_CONFIG_SERVER,"Received Publication parameters: credentialFlag = %.2x,\ + elementAddress = %.2x, modelID = %.2lx, appKeyIndex = %.2x,\ + publishPeriod = %.2x, publishRetransmitCount = %.2x, publishRetransmitIntervalSteps = %.2x,\ + publishTTL = %.2x \r\n", pPubParameters->credentialFlag, pPubParameters->elementAddress, pPubParameters->modelID,\ + pPubParameters->publishAppKeyIndex, pPubParameters->publishPeriod, pPubParameters->publishRetransmitCount,\ + pPubParameters->publishRetransmitIntervalSteps, pPubParameters->publishTTL); +} + +/** +* @} +*/ + +/** +* @} +*/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h new file mode 100644 index 000000000..b33d059fc --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h @@ -0,0 +1,52 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config.h + * @author MCD Application Team + * @brief Header file for the application config file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_CONFIG_H +#define __APPLI_CONFIG_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "mesh_cfg.h" +#include "mesh_cfg_usr.h" +#include "sensors.h" +#include "common.h" +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ + +/* Exported Functions Prototypes ---------------------------------------------*/ +void Appli_GetAppKeyAddParamsCb(model_securityKeyParams_t*); +void Appli_GetAppKeyDeleteParamsCb(model_securityKeyParams_t*); +void Appli_GetAppKeyListParamsCb(model_appKeyListParams_t*); +void Appli_GetAppKeyUpdateParamsCb(model_securityKeyParams_t*); +void Appli_GetNetKeyAddParamsCb(model_securityKeyParams_t*); +void Appli_GetNetKeyDeleteParamsCb(model_securityKeyParams_t*); +void Appli_GetNetKeyListParamsCb(model_netKeyListParams_t*); +void Appli_GetNetKeyUpdateParamsCb(model_securityKeyParams_t*); +void Appli_GetAppKeyBindingParamsCb(model_appKeyBindingParams_t*); +void Appli_GetAppKeyUnBindingParamsCb(model_appKeyBindingParams_t*); +void Appli_GetSubAddParamsCb(model_subParams_t*); +void Appli_GetSubDeleteParamsCb(model_subParams_t*); +void Appli_GetSubOverwriteParamsCb(model_subParams_t*); +void Appli_GetPublicationSetParamsCb(model_publicationparams_t*); +void Appli_GetPublicationGetParamsCb(model_publicationparams_t*); + +#endif /* __APPLI_CONFIG_H */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c new file mode 100644 index 000000000..30f54770c --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c @@ -0,0 +1,1917 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config_client.c + * @author MCD Application Team + * @brief Application interface for Config CLient Mesh Model + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "mesh_cfg.h" +#include "appli_nvm.h" +#include "config_client.h" +#include "appli_config_client.h" +#include "appli_mesh.h" +#include "sensors.h" +#include "light_lc.h" +#include "vendor.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ + +#define DEFAULT_GROUP_ADDR 0xC000 +#define DEFAULT_PUBLISH_ADDR 0xC000 +#define DEFAULT_NETKEY_INDEX 0x0000 +#define DEFAULT_APPKEY_INDEX 0x0000 +#define DEFAULT_CREDENTIAL_FLAG 0x00 +#define DEFAULT_PUBLISH_TTL 0x08 +#define DEFAULT_PUBLISH_PERIOD 0x00 +#define DEFAULT_PUBLISH_RETRANSMIT_COUNT 0x00 +#define DEFAULT_PUBLISH_RETRANSMIT_INTERVAL_STEPS 0x00 + +#define NUM_VENDOR_MODELS_TO_SUBSCRIBE 0 +#define NUM_VENDOR_MODELS_TO_PUBLISH 0 +#define NUM_VENDOR_MODELS_TO_BIND_APP 0 + +/******************************************************************************/ +#if defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) +/******************************************************************************/ + +const MOBLEUINT8 aConfigAppKeyDefault[19]= + { /* NetKeyIndexAndAppKeyIndex : 3B + Index of the NetKey and index of the AppKey*/ + (MOBLEUINT8)(DEFAULT_NETKEY_INDEX & 0x00ff), + (MOBLEUINT8)((DEFAULT_NETKEY_INDEX & 0x0f00) >> 8) | (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX & 0x000f) << 4), + (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX >>4) & 0xff), + /* AppKey is initialised as below = 16B */ + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10 }; + + +const MOBLEUINT8 aConfigAppKeyDeleteDefault[3]= + { /* NetKeyIndexAndAppKeyIndex : 3B + Index of the NetKey and index of the AppKey*/ + (MOBLEUINT8)(DEFAULT_NETKEY_INDEX & 0x00ff), + (MOBLEUINT8)((DEFAULT_NETKEY_INDEX & 0x0f00) >> 8) | (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX & 0x000f) << 4), + (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX >>4) & 0xff)}; + + +const MOBLEUINT8 aConfigAppKeyGetDefault[2]= + { /* NetKeyIndex : 2B + Index of the NetKey */ + (MOBLEUINT8)(DEFAULT_NETKEY_INDEX & 0x00ff), + (MOBLEUINT8)((DEFAULT_NETKEY_INDEX & 0x0f00) >> 8) }; + +const MOBLEUINT8 aNoParamDefaultConfig; + +const MOBLEUINT8 aNoInitParamDefault[MAX_CONFIG_PARAM_SIZE]= {0}; + +/* Private macro -------------------------------------------------------------*/ + +const MODEL_CONFIG_CLIENT_OpcodeTableParam_t ConfigClient_MessageOpcodes_Table[] = { + /* MOBLEUINT16 opcode, + MOBLEUINT8 min_payload_size, + MOBLEUINT8 max_payload_size; + Here in this array, Handler is not defined; */ + + /* 4.3.2.37 Config AppKey Add, Opcode = 0x00 + The Config AppKey Add is an acknowledged message used to add an AppKey + to the AppKey List on a node and bind it to the NetKey identified by + NetKeyIndex. The added AppKey can be used by the node only as a pair with + the specified NetKey. + The AppKey is used to authenticate and decrypt messages it receives, as well + as authenticate and encrypt messages it sends. + The response to a Config AppKey Add message is a Config AppKey Status message. + + message parameters: + ------------------- + NetKeyIndexAndAppKeyIndex: 3B : Index of the NetKey and index of the AppKey + AppKey 16B : AppKey value */ + { OPCODE_CONFIG_APPKEY_ADD, 19, 19, aConfigAppKeyDefault }, + + /* 4.3.2.39 Config AppKey Delete, Opcode = 0x80 0x00 + The Config AppKey Delete is an acknowledged message used to delete an + AppKey from the AppKey List on a node. + The response to a Config AppKey Delete message is a + Config AppKey Status message. + + message parameters: + ------------------- + NetKeyIndexAndAppKeyIndex : 3B : Index of the NetKey and index of the AppKey + */ + { OPCODE_CONFIG_APPKEY_DELETE, 3, 3, aConfigAppKeyDeleteDefault }, + + /* 4.3.2.41 Config AppKey Get, Opcode = 0x80 0x01 + The AppKey Get is an acknowledged message used to report all AppKeys bound + to the NetKey. + The response to a Config AppKey Get message is a Config AppKey List message */ + { OPCODE_CONFIG_APPKEY_GET, 2, 2, aConfigAppKeyGetDefault }, + + /* 4.3.2.38 Config AppKey Update, Opcode = 0x01 + The Config AppKey Update is an acknowledged message used to update an + AppKey value on the AppKey List on a node. The updated AppKey is used by + the node to authenticate and decrypt messages it receives, as well as + authenticate and encrypt messages it sends, as defined by the Key Refresh procedure (see Section 3.10.4). + The response to an Config AppKey Update message is an Config AppKey Status message. + + message parameters: + ------------------- + NetKeyIndexAndAppKeyIndex: 3B : Index of the NetKey and index of the AppKey + AppKey 16B : AppKey value */ + { OPCODE_CONFIG_APPKEY_UPDATE, 19, 19, aConfigAppKeyDefault }, + + /* 4.3.2.1 Config Beacon Get, Opcode = 0x80 0x09 + The Config Beacon Get is an acknowledged message used to get the current + Secure Network Beacon state of a node (see Section 4.2.10). + The response to a Config Beacon Get message is a Config Beacon Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_BEACON_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.2 Config Beacon Set, Opcode = 0x80 0x0A + The Config Beacon Set is an acknowledged message used to set the + Secure Network Beacon state of a node (see Section 4.2.10). + The response to a Config Beacon Set message is a Config Beacon Status message. + Beacon : 1B: New Secure Network Beacon state*/ + { OPCODE_CONFIG_BEACON_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.4 Config Composition Data Get, Opcode = 0x80 0x08 + The Config Composition Data Get is an acknowledged message used to read + one page of the Composition Data (see Section 4.2.1). + The response to a Config Composition Data Get message is a + Config Composition Data Status message. + Page : 1B : Page number of the Composition Data */ + { OPCODE_CONFIG_COMPOSITION_DATA_GET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.16 Config Model Publication Set, Opcode = 0x03 + The Config Model Publication Set is an acknowledged message used to set the + Model Publication state (see Section 4.2.2) of an outgoing message that + originates from a model. + The response to a Config Model Publication Set message is a + Config Model Publication Status message. + The Config Model Publication Set message uses a single octet opcode to + maximize the size of a payload. + + ElementAddress : 16b : Address of the element + PublishAddress : 16b : Value of the publish address + AppKeyIndex : 12b : Index of the application key + CredentialFlag : 1b : Value of the Friendship Credential Flag + RFU : 3b : Reserved for Future Use + PublishTTL : 8b : Default TTL value for the outgoing messages + PublishPeriod : 8b : Period for periodic status publishing + PublishRetransmitCount : 3b : Number of retransmissions for each published message + PublishRetransmitIntervalSteps : 5b: Number of 50-millisecond steps between retransmissions + ModelIdentifier: 16 or 32b: SIG Model ID or Vendor Model ID + */ + + { OPCODE_CONFIG_CONFIG_MODEL_PUBLICATION_SET, 11, 13, }, + + /* 4.3.2.6 Config Default TTL Get, Opcode = 0x80 0x0C + The Config Default TTL Get is an acknowledged message used to get the + current Default TTL state of a node. + The response to a Config Default TTL Get message is a Config Default TTL Status message. + There are no Parameters for this message. + */ + { OPCODE_CONFIG_DEFAULT_TTL_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.7 Config Default TTL Set, Opcode = 0x80 0x0D + The Config Default TTL Set is an acknowledged message used to set the + Default TTL state of a node (see Section 4.2.7). + The response to a Config Default TTL Set message is a + Config Default TTL Status message. + TTL : 1B : New Default TTL value*/ + { OPCODE_CONFIG_DEFAULT_TTL_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.55 Config Friend Get, Opcode = 0x80 0x0F + The Config Friend Get is an acknowledged message used to get the current + Friend state of a node (see Section 4.2.13). + The response to a Config Friend Get message is a Config Friend Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_FRIEND_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.56 Config Friend Set, Opcode = 0x80 0x10 + The Config Friend Set is an acknowledged message used to set the + Friend state of a node (see Section 4.2.13). + The response to a Config Friend Set message is a Config Friend Status message. + Friend : 1B : New Friend state */ + { OPCODE_CONFIG_FRIEND_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.9 Config GATT Proxy Get, Opcode = 0x80 0x12 + The Config GATT Proxy Get is an acknowledged message used to get the + current GATT Proxy state of a node (see Section 4.2.11). + The response to a Config GATT Proxy Get message is a + Config GATT Proxy Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_GATT_PROXY_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.10 Config GATT Proxy Set, Opcode = 0x80 0x12 + The Config GATT Proxy Set is an acknowledged message used to set the + GATT Proxy state of a node (see Section 4.2.11). + The response to a Config GATT Proxy Set message is a Config GATT Proxy + Status message + GATTProxy : 1B : New GATT Proxy state */ + { OPCODE_CONFIG_GATT_PROXY_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.61 Config Heartbeat Publication Get, Opcode = 0x80 0x38 + The Config Heartbeat Publication Get is an acknowledged message used to get + the current Heartbeat Publication state of an element (see Section 4.2.17). + The response to a Config Heartbeat Publication Get message is a + Config Heartbeat Publication Status message. + The message has no parameters.*/ + { OPCODE_CONFIG_HEARTBEAT_PUBLICATION_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.62 Config Heartbeat Publication Set, Opcode = 0x80 0x39 + The Config Heartbeat Publication Set is an acknowledged message used to set + the current Heartbeat Publication state of an element (see Section 4.2.17). + The response to a Config Heartbeat Publication Set message is a + Config Heartbeat Publication Status message. + + Destination : 2B : Destination address for Heartbeat messages + CountLog : 1B : Number of Heartbeat messages to be sent + PeriodLog : 1B : Period for sending Heartbeat messages + TTL : 1B : TTL to be used when sending Heartbeat messages + Features : 2B : Bit field indicating features that trigger Heartbeat messages when changed + NetKeyIndex : 2B : NetKey Index + */ + { OPCODE_CONFIG_HEARTBEAT_PUBLICATION_SET, 9, 9, aNoInitParamDefault }, + + /* 4.3.2.64 Config Heartbeat Subscription Get, Opcode = 0x80 0x3A + The Config Heartbeat Subscription Get is an acknowledged message used to get + the current Heartbeat Subscription state of an element (see Section 4.2.18). + The response to a Config Heartbeat Subscription Get message is a + Config Heartbeat Subscription Status message. + The message has no parameters. */ + { OPCODE_CONFIG_HEARTBEAT_SUBSCRIPTION_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.65 Config Heartbeat Subscription Set, Opcode = 0x80 0x3B + The Config Heartbeat Subscription Set is an acknowledged message used to + set the current Heartbeat Subscription state of an element (see Section 4.2.18). + The response to a Config Heartbeat Subscription Set message is a + Config Heartbeat Subscription Status message. + + Source : 2B : Source address for Heartbeat messages + Destination : 2B : Destination address for Heartbeat messages + PeriodLog : 1B : Period for receiving Heartbeat messages */ + { OPCODE_CONFIG_HEARTBEAT_SUBSCRIPTION_SET, 5, 5, aNoInitParamDefault }, + + /* 4.3.2.58 Config Key Refresh Phase Get, Opcode = 0x80 0x15 + The Config Key Refresh Phase Get is an acknowledged message used to get the + current Key Refresh Phase state of the identified network key. + The response to a Config Key Refresh Phase Get message is a + Config Key Refresh Phase Status message. + NetKeyIndex : 2B : NetKey Index*/ + { OPCODE_CONFIG_KEY_REFRESH_PHASE_GET, 2, 2, aNoInitParamDefault }, + + /* 4.3.2.59 Config Key Refresh Phase Set, Opcode = 0x80 0x16 + The Config Key Refresh Phase Set is an acknowledged message used to set the + Key Refresh Phase state of the identified network key (see Section 4.2.14). + The response to a Config Key Refresh Phase Set message is a + Config Key Refresh Phase Status message. + + NetKeyIndex : 2B : NetKey Index + Transition : 1B : New Key Refresh Phase Transition */ + { OPCODE_CONFIG_KEY_REFRESH_PHASE_SET, 3, 3, aNoInitParamDefault }, + + /* 4.3.2.67 Config Low Power Node PollTimeout Get, Opcode = 0x80 0x2D + The Config Low Power Node PollTimeout Get is an acknowledged message used + to get the current value of PollTimeout timer of the Low Power node within + a Friend node (see Section 3.6.6.1). The message is sent to a Friend node + that has claimed to be handling messages by sending ACKs On Behalf Of (OBO) + the indicated Low Power node. This message should only be sent to a node + that has the Friend feature supported and enabled. + The response to a Config Low Power Node PollTimeout Get message is a + Config Low Power Node PollTimeout Status message. + + LPNAddress : 2B : The unicast address of the Low Power node */ + { OPCODE_CONFIG_LOW_POWER_NODE_POLLTIMEOUT_GET, 2, 2, aNoInitParamDefault }, + + + /* 4.3.3.12 Health Attention Get + The Health Attention Get is an acknowledged message used to get the current + Attention Timer state of an element (see Section 4.2.9). + The response to a Health Attention Get message is an Attention Status message. + There are no Parameters for this message.*/ + { OPCODE_HEALTH_ATTENTION_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.3.13 Health Attention Set + The Health Attention Set is an acknowledged message used to set the + Attention Timer state of an element (see Section 4.2.9). + The response to a Health Attention Set message is a + Health Attention Status message + Attention: 1B: Value of the Attention Timer state*/ + { OPCODE_HEALTH_ATTENTION_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.3.14 Health Attention Set Unacknowledged + The Health Attention Set Unacknowledged is an unacknowledged message used + to set the Attention Timer state of an element (see Section 4.2.9). */ + { OPCODE_HEALTH_ATTENTION_SET_UNACKNOWLEDGED, 1, 1, aNoInitParamDefault }, + + + + + + + /* 4.3.2.15 Config Model Publication Get + The Config Model Publication Get is an acknowledged message used to get the + publish address and parameters of an outgoing message that originates + from a model. + The response to a Config Model Publication Get message is a + Config Model Publication Status message. + + ElementAddress : 2B : Address of the element + ModelIdentifier : 2 or 4B : SIG Model ID or Vendor Model ID + */ + { OPCODE_CONFIG_MODEL_PUBLICATION_GET, 4, 6, aNoInitParamDefault }, + + /* 4.3.2.17 Config Model Publication Virtual Address Set + The Config Model Publication Virtual Address Set is an acknowledged message + used to set the model Publication state (see Section 4.2.2) of an + outgoing message that originates from a model. + The response to a Config Model Publication Virtual Address Set message is + a Config Model Publication Status message. + + ElementAddress : 16b : Address of the element + PublishAddress : 128b : Value of the Label UUID publish address + AppKeyIndex : 12b : Index of the application key + CredentialFlag : 1b : Value of the Friendship Credential Flag + RFU : 3b : Reserved for Future Use + PublishTTL : 8b : Default TTL value for the outgoing messages + PublishPeriod : 8b : Period for periodic status publishing + PublishRetransmitCount : 3b : Number of retransmissions for each published message + PublishRetransmitIntervalSteps : 5b: Number of 50-millisecond steps between retransmissions + ModelIdentifier: 16 or 32b: SIG Model ID or Vendor Model ID + */ + { OPCODE_CONFIG_MODEL_PUBLICATION_VIRTUAL_ADDRESS_SET, 25, 27, aNoInitParamDefault }, + + /* 4.3.2.19 Config Model Subscription Add + The Config Model Subscription Add is an acknowledged message used to add an + address to a Subscription List of a model (see Section 4.2.3). + + The response to a Config Model Subscription Add message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + address : 2B : Value of the address + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID +*/ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_ADD, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.21 Config Model Subscription Delete + The Config Model Subscription Delete is an acknowledged message used to + delete a subscription address from the Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Delete message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + address : 2B : Value of the address + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID + */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_DELETE, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.25 Config Model Subscription Delete All + The Config Model Subscription Delete All is an acknowledged message used to + discard the Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Delete All message is a + Config Model Subscription Status message. + ElementAddress : 2B : Address of the element + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_DELETE_ALL, 4, 6, aNoInitParamDefault }, + + /* 4.3.2.23 Config Model Subscription Overwrite + The Config Model Subscription Overwrite is an acknowledged message used to + discard the Subscription List and add an address to the + cleared Subscription List of a model (see Section 4.2.3). + + The response to a Config Model Subscription Overwrite message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + address : 2B : Value of the address + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_OVERWRITE, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.20 Config Model Subscription Virtual Address Add + The Config Model Subscription Virtual Address Add is an acknowledged message + used to add an address to a Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Virtual Address Add message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + Label : 16B : Value of the Label UUID + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_VIRTUAL_ADDRESS_ADD, 20, 22, aNoInitParamDefault }, + + /* 4.3.2.22 Config Model Subscription Virtual Address Delete + The Config Model Subscription Virtual Address Delete is an acknowledged + message used to delete a subscription address from the + Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Virtual Address Delete message + is a Config Model Subscription Status message. + ElementAddress : 2B : Address of the element + Address : 16B : Value of the Label UUID + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_VIRTUAL_ADDRESS_DELETE, 20, 22, aNoInitParamDefault }, + + /* 4.3.2.24 Config Model Subscription Virtual Address Overwrite + The Config Model Subscription Virtual Address Overwrite is an acknowledged + message used to discard the Subscription List and add an address to the + cleared Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Virtual Address Overwrite + message is a Config Model Subscription Status message. + Element Address : 2B : Address of the element + Address : 16B : Value of the Label UUID + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_VIRTUAL_ADDRESS_OVERWRITE, 20, 22, aNoInitParamDefault }, + + /* 4.3.2.69 Config Network Transmit Get + The Config Network Transmit Get is an acknowledged message used to get the + current Network Transmit state of a node (see Section 4.2.19). + The response to a Config Network Transmit Get message is a Config Network + Transmit Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_NETWORK_TRANSMIT_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.70 Config Network Transmit Set + The Config Network Transmit Set is an acknowledged message used to set the + Network Transmit state of a node (see Section 4.2.19). + The response to a Config Network Transmit Set message is a Config Network + Transmit Status message. + + NetworkTransmitCount : 3b : Number of transmissions for each Network PDU originating from the node + NetworkTransmitIntervalSteps : 5b : Number of 10-millisecond steps between transmissions + */ + { OPCODE_CONFIG_NETWORK_TRANSMIT_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.12 Config Relay Get + The Config Relay Get is an acknowledged message used to get the + current Relay (see Section 4.2.8) and Relay Retransmit (see Section 4.2.20) + states of a node. + The response to a Config Relay Get message is a Config Relay Status message. + There are no Parameters for this message.*/ + { OPCODE_CONFIG_RELAY_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.13 Config Relay Set + The Config Relay Set is an acknowledged message used to set the Relay + (see Section 4.2.8) and Relay Retransmit (see Section 4.2.20) states of a node. + The response to a Config Relay Set message is a Config Relay Status message. + Relay : 8 bits : Relay + RelayRetransmitCount : 3b : Number of retransmissions on advertising bearer for each Network PDU relayed by the node + RelayRetransmitIntervalSteps : 5b : Number of 10-millisecond steps between retransmissions + */ + { OPCODE_CONFIG_RELAY_SET, 2, 2, aNoInitParamDefault }, + + /* 4.3.2.27 Config SIG Model Subscription Get + The Config SIG Model Subscription Get is an acknowledged message used to + get the list of subscription addresses of a model within the element. + This message is only for SIG Models. + The response to a Config SIG Model Subscription Get message is a Config SIG + Model Subscription List message. + Element Address : 2B : Address of the element + ModelIdentifier : 2B : SIG Model ID */ + + { OPCODE_CONFIG_SIG_MODEL_SUBSCRIPTION_GET, 4, 4, aNoInitParamDefault }, + + /* 4.3.2.29 Config Vendor Model Subscription Get + The Config Vendor Model Subscription Get is an acknowledged message used to + get the list of subscription addresses of a model within the element. + This message is only for Vendor Models. + The response to a Config Vendor Model Subscription Get message is a + Config Vendor Model Subscription List message. + Element Address : 2B : Address of the element + ModelIdentifier : 4B : Vendor Model ID */ + + { OPCODE_CONFIG_VENDOR_MODEL_SUBSCRIPTION_GET, 6, 6, aNoInitParamDefault }, + + + /* 4.3.3.4 Health Fault Clear + The Health Fault Clear is an acknowledged message used to clear the current + Registered Fault state identified by Company ID of an element + (see Section 4.2.15.2). + The response to a Health Fault Clear message is a Health Fault Status message */ + { OPCODE_HEALTH_FAULT_CLEAR, 2, 2, aNoInitParamDefault }, + + /* 4.3.3.3 Health Fault Clear Unacknowledged + The Health Fault Clear Unacknowledged is an unacknowledged message used to + clear the current Registered Fault state identified by Company ID of an + element (see Section 4.2.15.2). + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + + { OPCODE_HEALTH_FAULT_CLEAR_UNACKNOWLEDGED, 2, 2, aNoInitParamDefault }, + + /* 4.3.3.2 Health Fault Get + The Health Fault Get is an acknowledged message used to get the current + Registered Fault state identified by Company ID of an element + (see Section 4.2.15.2). + The response to a Health Fault Get message is a Health Fault Status message + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + { OPCODE_HEALTH_FAULT_GET, 2, 2, aNoInitParamDefault }, + + /* 4.3.3.5 Health Fault Test + The Health Fault Test is an acknowledged message used to invoke a + self-test procedure of an element. + The procedure is implementation specific and may result in changing the + Health Fault state of an element (see Section 4.2.15). + The response to a Health Fault Test message is a Health Fault Status message. + + Test ID : 1B : Identifier of a specific test to be performed + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + { OPCODE_HEALTH_FAULT_TEST, 3, 3, aNoInitParamDefault }, + + /* 4.3.3.6 Health Fault Test Unacknowledged + The Health Fault Test Unacknowledged is an unacknowledged message used to + invoke a self-test procedure of an element. The procedure is implementation + specific and may result in changing the Health Fault state of an element + (see Section 4.2.15). + + Test ID : 1B : Identifier of a specific test to be performed + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + { OPCODE_HEALTH_FAULT_TEST_UNACKNOWLEDGED, 3, 3, aNoInitParamDefault }, + + /* 4.3.3.8 Health Period Get + The Health Period Get is an acknowledged message used to get the + current Health Fast Period Divisor state of an element (see Section 4.2.16). + The response to a Health Period Get message is a Health Period Status message. + There are no parameters for this message. */ + { OPCODE_HEALTH_PERIOD_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.3.10 Health Period Set + The Health Period Set is an acknowledged message used to set the current + Health Fast Period Divisor state of an element (see Section 4.2.16). + The response to a Health Period Set message is a Health Period Status message + + FastPeriodDivisor : 1B: Divider for the Publish Period. + Modified Publish Period is used for sending Current */ + { OPCODE_HEALTH_PERIOD_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.3.9 Health Period Set Unacknowledged + The Health Period Set Unacknowledged is an unacknowledged message used to + set the current Health Fast Period Divisor state of an element + (see Section 4.2.16). + + FastPeriodDivisor : 1B: Divider for the Publish Period. + Modified Publish Period is used for sending Current + Health Status messages when there are active faults to communicate */ + { OPCODE_HEALTH_PERIOD_SET_UNACKNOWLEDGED, 1, 1, aNoInitParamDefault }, + /* { OPCODE_HEALTH_PERIOD_STATUS 0x8037 */ + + + + /* 4.3.2.46 Config Model App Bind + The Config Model App Bind is an acknowledged message used to bind an + AppKey to a model. + The response to a Config Model App Bind message is a + Config Model App Status message. + + ElementAddress : 2B : Address of the element + AppKeyIndex : 2B : Index of the AppKey + ModelIdentifier : 2 or 4: SIG Model ID or Vendor Model ID */ + + { OPCODE_CONFIG_MODEL_APP_BIND, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.47 Config Model App Unbind + The Config Model App Unbind is an acknowledged message used to remove the + binding between an AppKey and a model. + The response to a Config Model App Unbind message is a Config Model App Status message. + + + ElementAddress : 2B : Address of the element + AppKeyIndex : 2B : Index of the AppKey + ModelIdentifier : 2 or 4: SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_APP_UNBIND, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.31 Config NetKey Add + The Config NetKey Add is an acknowledged message used to add a NetKey + to a NetKey List (see Section 4.2.4) on a node. + The added NetKey is then used by the node to authenticate and decrypt messages it receives, as well as authenticate and encrypt messages it sends. + The response to a Config NetKey Add message is a Config NetKey Status message. + NetKeyIndex : 2B + NetKey : 16B NetKey */ + { OPCODE_CONFIG_NETKEY_ADD, 18, 18, aNoInitParamDefault }, + + /* 4.3.2.33 Config NetKey Delete + The Config NetKey Delete is an acknowledged message used to delete a NetKey + on a NetKey List from a node. + The response to a Config NetKey Delete message is a + Config NetKey Status message. + NetKeyIndex : 2B */ + { OPCODE_CONFIG_NETKEY_DELETE, 2, 2, aNoInitParamDefault }, + + /* 4.3.2.35 Config NetKey Get + The Config NetKey Get is an acknowledged message used to report all NetKeys + known to the node. + The response to a Config NetKey Get message is a Config NetKey List message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_NETKEY_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.32 Config NetKey Update + The Config NetKey Update is an acknowledged message used to update a NetKey + on a node. The updated NetKey is then used by the node to authenticate and + decrypt messages it receives, as well as authenticate and encrypt messages + it sends, as defined by the Key Refresh procedure (see Section 3.10.4). + The response to a Config NetKey Update message is a Config NetKey Status message. + NetKeyIndex : 2B : Index of the NetKey + NetKey : 16B : NetKey */ + { OPCODE_CONFIG_NETKEY_UPDATE, 18, 18, aNoInitParamDefault}, + + /* 4.3.2.43 Config Node Identity Get + The Config Node Identity Get is an acknowledged message used to get the + current Node Identity state for a subnet (see Section 4.2.12). + The response to a Config Node Identity Get message is a + Config Node Identity Status message. + + NetKeyIndex : 2B : Index of the NetKey */ + { OPCODE_CONFIG_NODE_IDENTITY_GET, 2, 2, aNoInitParamDefault}, + + /* 4.3.2.44 Config Node Identity Set + The Config Node Identity Set is an acknowledged message used to set the + current Node Identity state for a subnet (see Section 4.2.12). + The response to a Config Node Identity Set message is a + Config Node Identity Status message. + + NetKeyIndex : 2B : Index of the NetKey + Identity : 1B : New Node Identity state */ + { OPCODE_CONFIG_NODE_IDENTITY_SET, 3, 3, aNoInitParamDefault}, + + /* 4.3.2.53 Config Node Reset + The Config Node Reset is an acknowledged message used to reset a node + (other than a Provisioner) and remove it from the network. + The response to a Config Node Reset message is a Config Node Reset + Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_NODE_RESET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.49 Config SIG Model App Get + The Config SIG Model App Get is an acknowledged message used to request + report of all AppKeys bound to the SIG Model. + The response to a Config SIG Model App Get message is a Config SIG Model + App List message. + + ElementAddress : 2B : Address of the element + ModelIdentifier : 2B : SIG Model ID */ + { OPCODE_CONFIG_SIG_MODEL_APP_GET, 4, 4, aNoInitParamDefault }, + + /* 4.3.2.51 Config Vendor Model App Get + The Config Vendor Model App Get is an acknowledged message used to request + report of all AppKeys bound to the model. This message is only for Vendor Models. + The response to a Config Vendor Model App Get message is a Config Vendor Model App List message + + ElementAddress : 2B : Address of the element + ModelIdentifier : 4B : Vendor Model ID */ + { OPCODE_CONFIG_VENDOR_MODEL_APP_GET, 6, 6, aNoInitParamDefault }, + +}; +/* Private variables ---------------------------------------------------------*/ + +eClientSendMsgState_t eClientSendMsgState; /* Keeps the state of Sent Message */ +eServerRespRecdState_t eServerRespRecdState; /* Keeps the state of Received Message */ + +/* Private function prototypes -----------------------------------------------*/ +MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx); + +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief This function is callback from library after the Provisioning is + completed by embedded Provisioner +* @param prvState: Provisioning State of the Node. Expecting "1" when the + provisioning is completed +* @retval None +*/ +void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState) +{ + if (prvState==1 ) + { + Appli_ConfigClient_Init(); + eClientSendMsgState = ProvisioningDone_State; + NodeInfo.nodePrimaryAddress = GetAddressToConfigure(); + } +} + + +/** +* @brief This function is Init function for the state machine of the + Configuration Client. The Function shall be called every time a new + node is provisioned +* @param None +* @retval None +*/ +MOBLE_RESULT Appli_ConfigClient_Init(void) +{ + eClientSendMsgState = ClientIdle_State; /* Init the value of state machine */ + eServerRespRecdState = NodeIdle_State; /* Init the value of state machine */ + ConfigClient_ResetTrials(); + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_ConfigClient_Process: This function is Process function and + shall be called from while(1) loop +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_Process(void) +{ + + Appli_ConfigClient_ConfigureNode(); + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief This function is used to configure the Node after provisioning +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_ConfigureNode(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT32 nowClockTime; + + /* + State response called function + -------------------------------------------------------------------------------- + ClientIdle_State X None + ProvisioningDone_State X Start the configuration + CompositionGet_State ConfigRespInit_State GetComposition + CompositionGet_State CompositionRecd_State ChangeThe State to next + AppKeyAdd_State X Issue AppKey + AppKeyAdd_State AppkeyAck_State ChangeThe State to next + AppBindModel_State X Issue AppKetBind + AppBindModel_State AppBindModelAck_State ChangeThe State to next + AddSubscription_State X Issue the Subscription + AddSubscription_State SubscriptionAck_State ChangeThe State to next + SetPublication_State PublicationStatus_State Issue the Subscription + SetPublication_State PublicationStatus_State ChangeThe State to next + + */ + + /* If the Node is already configured, return from here */ + if (eClientSendMsgState == ConfigurationDone_State) + return result; + + if (eClientSendMsgState == ClientIdle_State) + { + /* Waiting for the Provisioning to be done before to Start the + node configuration procedure */ + return result; + } + + if (eServerRespRecdState == NodeNoResponse_State) + { + /* No Response received from Node under Provisioning for some config + messages. So, no need to do the trials */ + return MOBLE_RESULT_FAIL; + } + + if (eClientSendMsgState == ProvisioningDone_State) + { + /* Start the node configuration procedure */ + eClientSendMsgState = CompositionGet_State; + ConfigClient_SaveMsgSendingTime(); + } + + else if (eClientSendMsgState == CompositionGet_State) + { + nowClockTime = Clock_Time(); + if( (nowClockTime - NodeInfo.Initial_time) < CONFIGURATION_START_DELAY) + { + return result; + } + /*------------- Add the delay before to start the configuration messages */ + + if (eServerRespRecdState == CompositionRecdCompleted_State) + { + eClientSendMsgState = AppKeyAdd_State; /* Change the state to Next */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the GetComposition servicing */ + Appli_ConfigClient_GetCompositionData(); + } + } + + else if (eClientSendMsgState == AppKeyAdd_State) + { + if (eServerRespRecdState == AppkeyAckCompleted_State) + { + eClientSendMsgState = AppBindModel_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the AppKeyAdd servicing */ + Appli_ConfigClient_DefaultAppKeyAdd(); + } + } + + else if (eClientSendMsgState == AppBindModel_State) + { + if (eServerRespRecdState == AppBindModelAckCompleted_State) + { + eClientSendMsgState = AddSubscription_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the AppKeyBIND servicing */ + Appli_ConfigClient_DefaultAppKeyBind(); + } + } + + else if (eClientSendMsgState == AddSubscription_State) + { + if (eServerRespRecdState == SubscriptionAckCompleted_State) + { + eClientSendMsgState = SetPublication_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the Subscription add servicing */ + AppliConfigClient_SubscriptionAddDefault(); + } + } + + else if (eClientSendMsgState == SetPublication_State) + { + if (eServerRespRecdState == PublicationStatusCompleted_State) + { + eClientSendMsgState = ConfigurationDone_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + TRACE_M(TF_CONFIG_CLIENT,"**Node is configured** \r\n"); + } + else + { + /* Continue the Publication add servicing */ + AppliConfigClient_PublicationSetDefault(); + } + } + + return result; +} + + +/** +* @brief This function is called to Get the Composition data from the +* a node under configuration +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_GetCompositionData (void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + MOBLEUINT16 dst_peer; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + + ConfigClient_SaveMsgSendingTime(); + + dst_peer = GetAddressToConfigure(); + + /* Start the Get Composition Message */ + ConfigClient_CompositionDataGet(dst_peer); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + break; + + case CompositionRecd_State: + /* Switch the state to next state AddAppKey_State */ + ConfigClient_ResetTrials(); + eServerRespRecdState = CompositionRecdCompleted_State; + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeIdle_State; /* Run next re-trial cycle again */ + } + + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief Appli_ConfigClient_DefaultAppKeyAdd: This function is called to + add the default AppKeys and NetKeys to a node under configuration +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyAdd (void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + MOBLEUINT8 *pAppKey; + MOBLEUINT16 netKeyIndex = DEFAULT_NETKEY_INDEX; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLE_ADDRESS dst_addr; + + pAppKey = GetNewProvNodeAppKey(); + + switch(eServerRespRecdState) + { + case NodeIdle_State: + ConfigClient_SaveMsgSendingTime(); + + dst_addr = GetAddressToConfigure(); + + /* Start the Set Appkey message */ + ConfigClient_AppKeyAdd ( dst_addr, + netKeyIndex, + appKeyIndex, + pAppKey); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + break; + + case AppkeyAck_State: + ConfigClient_ResetTrials(); + eServerRespRecdState = AppkeyAckCompleted_State; + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeIdle_State; /* Run next re-trial cycle again */ + } + + break; + + default: + /* Error State */ + break; +} + + return result; +} + + +/** +* @brief Appli_ConfigClient_DefaultAppKeyBind: This function is application used for + function to Bind the element(node) with AppKeyIndex and Models +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyBind (void) +{ + static MOBLEUINT32 modelIdentifier; + static MOBLEUINT8 elementIndex; + static MOBLEUINT8 indexSIGmodels; + static MOBLEUINT8 indexVendormodels; + MOBLEUINT16 elementAddress; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + + MOBLEUINT8 numSIGmodels; + MOBLEUINT8 numVendorModels; + MOBLEUINT8 numofElements; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + /* Start the AppBindModel_State message */ + elementIndex = 0; /* Initialize it for the complete loop */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + case NodeNextSigModel_State: + numSIGmodels = GetCountSIGModelToBindApp(elementIndex); + modelIdentifier = GetSIGModelToBindApp(elementIndex, + &indexSIGmodels, + numSIGmodels); + + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeNextVendorModel_State: + modelIdentifier = GetVendorModelToBindApp(elementIndex,indexVendormodels ); + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeSendMessage_State: + /* Start the AppBindModel_State message */ + elementAddress = GetServerElementAddress(elementIndex); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + + ConfigClient_SaveMsgSendingTime(); + + /* Send the Message to the server */ + ConfigClient_ModelAppBind (elementAddress, appKeyIndex, modelIdentifier); + break; + + case AppBindModelAck_State: + /* Need to check if all SIG Models are binded ? */ + + ConfigClient_ResetTrials(); + + numSIGmodels = GetCountSIGModelToBindApp(elementIndex); + numVendorModels = GetCountVendorModelToBindApp(elementIndex); + + if (indexSIGmodels < numSIGmodels ) + { /* Even when all SIG Models are serviced, we need to start for Vendor Models */ + indexSIGmodels++; + indexVendormodels =0; /* Reset back, bcoz, we are still process the SIG Models */ + } + else if (indexVendormodels < numVendorModels) + { + indexVendormodels++; /* When SIG Models and Vendor Models are processed + the loop condition will become true */ + } + + if (indexSIGmodels < numSIGmodels ) + {/* if index is still less, then we have scope of reading 1 more index */ + + eServerRespRecdState = NodeNextSigModel_State; + /* Switch to InProgress_State */ + } + else if (indexVendormodels < numVendorModels) + { + /*Now, do binding for Vendor Model */ + eServerRespRecdState = NodeNextVendorModel_State; + } + else + { + /* Now, the element index is handled, change the element index */ + elementIndex++; + numofElements = ConfigClient_GetNodeElements(); + if (elementIndex >= numofElements) + {/* we are comparing Index whose counting started from 0, becomes equal, + then exit the loop */ + + eServerRespRecdState = AppBindModelAckCompleted_State; + } + else if (elementIndex < numofElements) + { /* When the Element Index is still less than the total number of + elements in the Node: So, Restart the cycle */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + eServerRespRecdState = NodeNextSigModel_State; + } + } + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeSendMessage_State; /* Run next re-trial cycle again */; + } + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief AppliConfigClient_SubscriptionAddDefault: This function is application + used for adding subscription to the element(node) for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_SubscriptionAddDefault (void) +{ + static MOBLEUINT32 modelIdentifier; + static MOBLEUINT16 elementAddress; + static MOBLEUINT8 elementIndex; + static MOBLEUINT8 indexSIGmodels; + static MOBLEUINT8 indexVendormodels; + MOBLEUINT8 numSIGmodels; + MOBLEUINT8 numVendorModels; + MOBLEUINT8 numofElements; + MOBLEUINT16 address = DEFAULT_GROUP_ADDR; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + /* Start the SubscriptionAdd message */ + + elementIndex = 0; /* Initialize it for the complete loop */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + case NodeNextSigModel_State: + numSIGmodels = GetCountSIGModelToSubscribe(elementIndex); + modelIdentifier = GetSIGModelToSubscribe(elementIndex, + &indexSIGmodels, + numSIGmodels); + + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeNextVendorModel_State: + modelIdentifier = GetVendorModelToSubscribe(elementIndex,indexVendormodels ); + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeSendMessage_State: + elementAddress = GetServerElementAddress(elementIndex); + ConfigClient_SaveMsgSendingTime(); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + ConfigClient_SubscriptionAdd (elementAddress, address, modelIdentifier); + + break; + + + case SubscriptionAck_State: + /* Need to check if all SIG Models are subscribed ? */ + ConfigClient_ResetTrials(); + + numSIGmodels = GetCountSIGModelToSubscribe(elementIndex); + numVendorModels = GetCountVendorModelToSubscribe(elementIndex); + elementAddress = GetServerElementAddress(elementIndex); + + if (indexSIGmodels < numSIGmodels ) + { /* Even when all SIG Models are serviced, we need to start for Vendor Models */ + indexSIGmodels++; + indexVendormodels =0; /* Reset back, bcoz, we are still process the SIG Models */ + } + else if (indexVendormodels < numVendorModels) + { + indexVendormodels++; /* When SIG Models and Vendor Models are processed + the loop condition will become true */ + } + + if (indexSIGmodels < numSIGmodels ) + {/* if index is still less, then we have scope of reading 1 more index */ + + /* Get the Next Model and Bind it again till all SIG Models are binded */ + eServerRespRecdState = NodeNextSigModel_State; + + } + else if (indexVendormodels < numVendorModels) +{ + eServerRespRecdState = NodeNextVendorModel_State; + } + else + { + /* Now, the element index is handled, change the element index */ + elementIndex++; + numofElements = ConfigClient_GetNodeElements(); + if (elementIndex == numofElements) + {/* we are comparing Index whose counting started from 0, becomes equal, + then exit the loop */ + eServerRespRecdState = SubscriptionAckCompleted_State; + } + else if (elementIndex < numofElements) + { /* When the Element Index is still less than the total number of + elements in the Node: So, Restart the cycle */ + + eServerRespRecdState = NodeNextSigModel_State; + indexSIGmodels =0; /* Reset the variable again for the next element */ + indexVendormodels = 0; + } + } + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeSendMessage_State; /* Run next re-trial cycle again */; + } + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief AppliConfigClient_PublicationSetDefault: This function is application + used for adding publication settings to the element(node) + for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_PublicationSetDefault (void) +{ + MOBLEUINT16 publishAddress = DEFAULT_PUBLISH_ADDR; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLEUINT8 credentialFlag = DEFAULT_CREDENTIAL_FLAG; + MOBLEUINT8 publishTTL = DEFAULT_PUBLISH_TTL; + MOBLEUINT8 publishPeriod = DEFAULT_PUBLISH_PERIOD; + MOBLEUINT8 publishRetransmitCount = DEFAULT_PUBLISH_RETRANSMIT_COUNT; + MOBLEUINT8 publishRetransmitIntervalSteps= DEFAULT_PUBLISH_RETRANSMIT_INTERVAL_STEPS; + + static MOBLEUINT16 elementAddress; + static MOBLEUINT32 modelIdentifier; + static MOBLEUINT8 elementIndex; + static MOBLEUINT8 indexSIGmodels; + static MOBLEUINT8 indexVendormodels; + MOBLEUINT8 numSIGmodels; + MOBLEUINT8 numVendorModels; + MOBLEUINT8 numofElements; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + /* Start the Publication Add message */ + + elementIndex = 0; /* Initialize it for the complete loop */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + case NodeNextSigModel_State: + numSIGmodels = GetCountSIGModelToPublish(elementIndex); + modelIdentifier = GetSIGModelToPublish(elementIndex, + &indexSIGmodels, + numSIGmodels); + + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeNextVendorModel_State: + modelIdentifier = GetVendorModelToPublish(elementIndex,indexVendormodels); + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + + case NodeSendMessage_State: + elementAddress = GetServerElementAddress(elementIndex); + + ConfigClient_SaveMsgSendingTime(); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + ConfigClient_PublicationSet(elementAddress, + publishAddress, + appKeyIndex, + credentialFlag, + publishTTL, + publishPeriod, + publishRetransmitCount, + publishRetransmitIntervalSteps, + modelIdentifier); + + break; + + + case PublicationStatus_State: + /* Need to check if all SIG Models are subscribed ? */ + ConfigClient_ResetTrials(); + + numSIGmodels = GetCountSIGModelToPublish(elementIndex); + numVendorModels = GetCountVendorModelToPublish(elementIndex); + elementAddress = GetServerElementAddress(elementIndex); + + if (indexSIGmodels < numSIGmodels ) + { /* Even when all SIG Models are serviced, we need to start for Vendor Models */ + indexSIGmodels++; + indexVendormodels =0; /* Reset back, bcoz, we are still process the SIG Models */ + } + else if (indexVendormodels < numVendorModels) + { + indexVendormodels++; /* When SIG Models and Vendor Models are processed + the loop condition will become true */ + } + + + if (indexSIGmodels < numSIGmodels ) + {/* if index is still less, then we have scope of reading 1 more index */ + eServerRespRecdState = NodeNextSigModel_State; + } + else if (indexVendormodels < numVendorModels) + { + eServerRespRecdState = NodeNextVendorModel_State; + } + else + { + /* Now, the element index is handled, change the element index */ + elementIndex++; + numofElements = ConfigClient_GetNodeElements(); + + if (elementIndex == numofElements) + {/* we are comparing Index whose counting started from 0, becomes equal, + then exit the loop */ + eServerRespRecdState = PublicationStatusCompleted_State; + } + else if (elementIndex < numofElements) + { /* When the Element Index is still less than the total number of + elements in the Node: So, Restart the cycle */ + + eServerRespRecdState = NodeNextSigModel_State; + indexSIGmodels =0; /* Reset the variable again for the next element */ + indexVendormodels = 0; + } + } + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeSendMessage_State; /* Run next re-trial cycle again */; + } + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief AppliConfigClient_SelfPublicationSetDefault: This function is application + used for adding publication settings to the element(node) + for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void) +{ + MOBLEUINT16 publishAddress = DEFAULT_PUBLISH_ADDR; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLEUINT8 credentialFlag = DEFAULT_CREDENTIAL_FLAG; + MOBLEUINT8 publishTTL = DEFAULT_PUBLISH_TTL; + MOBLEUINT8 publishPeriod = DEFAULT_PUBLISH_PERIOD; + MOBLEUINT8 publishRetransmitCount = DEFAULT_PUBLISH_RETRANSMIT_COUNT; + MOBLEUINT8 publishRetransmitIntervalSteps= DEFAULT_PUBLISH_RETRANSMIT_INTERVAL_STEPS; + + MOBLEUINT16 elementAddress; + MOBLEUINT32 modelIdentifier=0; + MOBLEUINT8 elementIndex; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + for (elementIndex=0; elementIndex < APPLICATION_NUMBER_OF_ELEMENTS; elementIndex++ ) + { + /*Checking for SIG Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_SIG_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT16) Appli_SIG_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) + { + /* If Model is Foundation Model, then it does not need to be + added for Publishing */ + + /* Do NOTHING, let the next Model be picked */ + } + + else + { + ConfigClient_PublicationSet(elementAddress, + publishAddress, + appKeyIndex, + credentialFlag, + publishTTL, + publishPeriod, + publishRetransmitCount, + publishRetransmitIntervalSteps, + modelIdentifier); + } + } + + /*Checking for VENDOR Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_VENDOR_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT32) Appli_Vendor_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else + { + ConfigClient_PublicationSet(elementAddress, + publishAddress, + appKeyIndex, + credentialFlag, + publishTTL, + publishPeriod, + publishRetransmitCount, + publishRetransmitIntervalSteps, + modelIdentifier); + } + } + } + return result; +} + + +/** +* @brief AppliConfigClient_SelfSubscriptionSetDefault: This function is application + used for adding Subscription settings to the element(node) + for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void) +{ + MOBLEUINT32 modelIdentifier=0; + MOBLEUINT16 elementAddress; + MOBLEUINT8 elementIndex; + MOBLEUINT16 address = DEFAULT_GROUP_ADDR; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + for (elementIndex=0; elementIndex < APPLICATION_NUMBER_OF_ELEMENTS; elementIndex++ ) + { + /*Checking for SIG Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_SIG_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT16) Appli_SIG_Models[elementIndex][index]; + + /*If limit is reaching to no models*/ + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) + { + /* If Model is Foundation Model, then it does not need to be + Subscribed */ + + /* Do NOTHING, let the next Model be picked */ + } + else + { + ConfigClient_SubscriptionAdd (elementAddress, address, modelIdentifier); + } + } + + /*Checking for Vendor Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_VENDOR_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT32) Appli_Vendor_Models[elementIndex][index]; + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else + { + ConfigClient_SubscriptionAdd (elementAddress, address, modelIdentifier); + } + } + + } + return result; +} + + +/** +* @brief Appli_ConfigClient_DefaultAppKeyBind: This function is application used for + function to Bind the element(node) with AppKeyIndex and Models +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void) +{ + + MOBLEUINT32 modelIdentifier=0; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLEUINT16 elementAddress; + MOBLEUINT8 elementIndex; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + appKeyIndex = DEFAULT_APPKEY_INDEX; + + for (elementIndex=0; elementIndex < APPLICATION_NUMBER_OF_ELEMENTS; elementIndex++ ) + { + /*Checking for SIG Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_SIG_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT16) Appli_SIG_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) + { + /* If Model is Foundation Model, then it does not need to be binded + with AppKey */ + + /* Do NOTHING, let the next Model be picked */ + } + else + { + ConfigClient_ModelAppBind (elementAddress, appKeyIndex, modelIdentifier); + } + } + + /*Checking for VENDOR Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_VENDOR_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT32) Appli_Vendor_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else + { + ConfigClient_ModelAppBind (elementAddress, appKeyIndex, modelIdentifier); + } + } + + } + return result; +} + +/** +* @brief Appli_CompositionDataStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_CompositionDataStatusCb(MOBLE_RESULT status) +{ + eServerRespRecdState = CompositionRecd_State; +} + + +/** +* @brief Appli_AppKeyStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_AppKeyStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = AppkeyAck_State; +} + + +/** +* @brief Appli_AppBindModelStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_AppBindModelStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = AppBindModelAck_State; +} + + +/** +* @brief Appli_SubscriptionAddStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_SubscriptionAddStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = SubscriptionAck_State; +} + + +/** +* @brief Appli_PublicationStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_PublicationStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = PublicationStatus_State; +} + + +/** +* @brief Appli_NodeResetStatusCb: This function is callback from config + client middleware on reception of the Node Reset response +* @param None +* @retval None +*/ +void Appli_NodeResetStatusCb(void) +{ + /* Change the received state for application */ + eServerRespRecdState = NodeResetStatus_State; +} + + +/** +* @brief GetSIGModelToBindApp: This function gets the SIG Model to Bind +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT16 GetSIGModelToBindApp(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels) +{ + + MOBLEUINT16 model_id; + MOBLEUINT8 index; + MOBLEUINT8 idxSIG = *pModelIndex; + + for (index = idxSIG; index < numberOfModels ; index++ ) + { + model_id = aNodeElements[elementIndex].aSIGModels[index]; + if (MODEL_IS_FOUNDATION_MODEL(model_id)) + { + /* Do nothing, let the next model_if be scanned */ + model_id = 0xffff; /* Invalid Model ID */ + } + else + { + break; + } + } + + *pModelIndex = index; + return model_id; + +} + + +/** +* @brief GetVendorModelToBindApp: This function gets the Vendor Model to Bind +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT32 GetVendorModelToBindApp(MOBLEUINT8 elementIndex, MOBLEUINT8 indexModels) +{ + return aNodeElements[elementIndex].aVendorModels[indexModels]; +} + +/** +* @brief GetCountSIGModelToBindApp: This function gets the NUMBER of SIG Model + to Bind +* @param elementIndex Index of the Element for which the Count is needed +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountSIGModelToBindApp(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumSIGmodels; +} + + +/** +* @brief GetCountVendorModelToBindApp: This function gets the Vendor Model to Bind +* @param elementIndex Index of the Element for which the Count is needed +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountVendorModelToBindApp(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumVendorModels; +} + + +/** +* @brief GetSIGModelToPublish: This function gets the SIG Model to Publish +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT16 GetSIGModelToPublish(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels) + +{ + return GetSIGModelToBindApp(elementIndex, + pModelIndex, + numberOfModels); +} + + +/** +* @brief GetVendorModelToPublish: This function gets the Vendor Model to Publish +* @param elementIndex Index of the Element +* @param idxSIG Pointer to Index of the Model +* @retval MOBLE_RESULT +*/ +MOBLEUINT32 GetVendorModelToPublish(MOBLEUINT8 elementIndex, MOBLEUINT8 idxSIG) +{ + return aNodeElements[elementIndex].aVendorModels[idxSIG]; +} + + +/** +* @brief GetCountSIGModelToPublish: This function gets the SIG Model to Bind +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountSIGModelToPublish(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumSIGmodels; +} + + +/** +* @brief GetCountVendorModelToPublish: This function gets the Vendor Model to Publish +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumVendorModels; +} + + +/** +* @brief GetSIGModelToSubscribe: This function gets the SIG Model to Bind +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT16 GetSIGModelToSubscribe(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels) +{ + return GetSIGModelToBindApp(elementIndex, + pModelIndex, + numberOfModels); +} + + +/** +* @brief GetVendorModelToSubscribe: This function Gets the Vendor Model ID for + Subscription +* @param elementIndex Index of the Element +* @param idxSIG Index to the Model ID to Subscribe +* @retval MOBLE_RESULT +*/ +MOBLEUINT32 GetVendorModelToSubscribe(MOBLEUINT8 elementIndex, + MOBLEUINT8 idxSIG) +{ + return aNodeElements[elementIndex].aVendorModels[idxSIG]; +} + + +/** +* @brief GetCountSIGModelToSubscribe: This function gets the SIG Model to Subscribe +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountSIGModelToSubscribe(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumSIGmodels; +} + + +/** +* @brief GetCountVendorModelToPublish: This function gets the Count of the + Vendor Model to Subscribe +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountVendorModelToSubscribe(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumVendorModels; +} + + +/** +* @brief AppliConfigClient_SendMessageDefault: This function is used for sending + a message. + ** The Function is not yet written fully +* @param None +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx) +{ + return NUM_VENDOR_MODELS_TO_SUBSCRIBE; +} + +/******************************************************************************/ +#endif /* defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) */ +/******************************************************************************/ + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h new file mode 100644 index 000000000..2a1fa19e6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h @@ -0,0 +1,93 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config_client.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_CONFIG_CLIENT_H +#define __APPLI_CONFIG_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" +#include "config_client.h" +#include "mesh_cfg_usr.h" + +/* Exported macro ------------------------------------------------------------*/ +#define MAX_CONFIG_PARAM_SIZE 22 +#define CONFIGURE_AS_PER_COMPOSITION_DATA + +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ + +#if defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) + +MOBLE_RESULT Appli_ConfigClient_Init(void); +MOBLE_RESULT Appli_ConfigClient_Process(void); +MOBLE_RESULT Appli_ConfigClient_ConfigureNode(void); +void Appli_CompositionDataStatusCb(MOBLE_RESULT); +void Appli_AppKeyStatusCb(MOBLEUINT8 status); +void Appli_AppBindModelStatusCb(MOBLEUINT8 status); +void Appli_PublicationStatusCb(MOBLEUINT8 status); +void Appli_SubscriptionAddStatusCb(MOBLEUINT8 status); +void Appli_NodeResetStatusCb(void); + +void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState); +MOBLE_RESULT Appli_ConfigClient_GetCompositionData (void); +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyAdd (void); +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyBind (void); +MOBLE_RESULT AppliConfigClient_SubscriptionAddDefault (void); +MOBLE_RESULT AppliConfigClient_PublicationSetDefault (void); +MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void); +MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void); +MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void); +Composition_Data_Page0_t* Appli_GetNodeCompositionBuff (void); + +MOBLEUINT16 GetSIGModelToBindApp(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels); + +MOBLEUINT32 GetVendorModelToBindApp(MOBLEUINT8 elementIdx, MOBLEUINT8 idxSIG); +MOBLEUINT8 GetCountSIGModelToBindApp(MOBLEUINT8 elementIdx); +MOBLEUINT8 GetCountVendorModelToBindApp(MOBLEUINT8 elementIdx); + +MOBLEUINT16 GetSIGModelToSubscribe(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels); + + +MOBLEUINT32 GetVendorModelToSubscribe(MOBLEUINT8 elementIdx, MOBLEUINT8 idxSIG); +MOBLEUINT8 GetCountSIGModelToSubscribe(MOBLEUINT8); +MOBLEUINT8 GetCountVendorModelToSubscribe(MOBLEUINT8); + +MOBLEUINT16 GetSIGModelToPublish(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels); + +MOBLEUINT32 GetVendorModelToPublish(MOBLEUINT8 elementIdx, MOBLEUINT8 idxSIG); +MOBLEUINT8 GetCountSIGModelToPublish(MOBLEUINT8 elementIdx); + +MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIdx); + +#endif /*defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) */ + +#endif /* __APPLI_CONFIG_CLIENT_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c new file mode 100644 index 000000000..52dbed1e8 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c @@ -0,0 +1,484 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" +#include "hal_common.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "mesh_cfg.h" +#include "generic.h" +#include "light.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" + +/** @addtogroup ST_BLE_Mesh + * @{ + */ + +/** @addtogroup Application_Mesh_Models + * @{ + */ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +extern MOBLEUINT8 RestoreFlag; +extern MOBLEUINT16 IntensityValue; +extern MOBLEUINT8 IntensityFlag; +extern MOBLEUINT8 PowerOnOff_flag; +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +extern Appli_LightPwmValue_t Appli_LightPwmValue; +#endif + +Appli_Generic_OnOffSet AppliOnOffSet[APPLICATION_NUMBER_OF_ELEMENTS]; +Appli_Generic_LevelSet AppliLevelSet[APPLICATION_NUMBER_OF_ELEMENTS]; +Appli_Generic_PowerOnOffSet AppliPowerOnSet[APPLICATION_NUMBER_OF_ELEMENTS]; +Appli_Generic_DefaultTransitionSet AppliDefaultTransitionSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/* Private function prototypes -----------------------------------------------*/ +MOBLE_RESULT Appli_Generic_LevelDelta_Set(Generic_LevelStatus_t* pdeltalevelParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_LevelMove_Set(Generic_LevelStatus_t* pdeltaMoveParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +/* Private functions ---------------------------------------------------------*/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_ONOFF +/******************************************************************************/ + +/** +* @brief Appli_Generic_OnOff_Set: This function is callback for Application +* when Generic OnOff message is received +* @param pGeneric_OnOffParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_OnOff_Set(Generic_OnOffStatus_t* pGeneric_OnOffParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + /* LED control only for main element */ + if(elementIndex == GENERIC_SERVER_MAIN_ELEMENT_INDEX) + { + /*User need to modify the parameters as per the number of elements per node*/ + AppliOnOffSet[elementIndex].Present_OnOff = pGeneric_OnOffParam->Present_OnOff_State; + AppliOnOffSet[elementIndex].Present_OnOffValue = pGeneric_OnOffParam->Present_OnOff_Value; + + /* This condition is applicable when user want to on off the light with some + default transition value, or optionalValid =IN_TRANSITION , + transition is in progress. + */ + if((OptionalValid == DEFAULT_TRANSITION) || (OptionalValid == IN_TRANSITION)) + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = AppliOnOffSet[elementIndex].Present_OnOffValue; + Light_UpdateLedValue(LOAD_STATE ,Appli_LightPwmValue); +#endif + + #if 0 /* EME */ + if(AppliOnOffSet[elementIndex].Present_OnOff == APPLI_LED_ON) + { + AppliOnOffSet[elementIndex].TargetValue = PWM_TIME_PERIOD; + } + else + { + AppliOnOffSet[elementIndex].TargetValue = APPLI_LED_OFF; + } + #else + AppliOnOffSet[elementIndex].TargetValue = pGeneric_OnOffParam->Target_OnOff; + #endif /* EME */ + + if(AppliOnOffSet[elementIndex].Present_OnOffValue == AppliOnOffSet[elementIndex].TargetValue) + { + if(AppliOnOffSet[elementIndex].Present_OnOffValue > 0) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } + } + } + else + { + if((AppliOnOffSet[elementIndex].Present_OnOff == APPLI_LED_ON) && (OptionalValid == NO_TRANSITION)) + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); +#endif + BSP_LED_On(LED_BLUE); + } + else + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; + Light_UpdateLedValue(RESET_STATE , Appli_LightPwmValue); +#endif + BSP_LED_Off(LED_BLUE); + } + } + } + + TRACE_M(TF_GENERIC, "Appli_Generic_OnOff_Set callback received for elementIndex %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL, "#8202!for elementIndex %d \r\n", elementIndex); + + NvmStatePowerFlag_Set(GENERIC_ON_OFF_NVM_FLAG, elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_SERVER_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_LEVEL +/******************************************************************************/ + +/** +* @brief Appli_Generic_Level_Set: This function is callback for Application +* when Generic Level message is received +* @param plevelParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_Level_Set(Generic_LevelStatus_t* plevelParam, + MOBLEUINT8 OptionalValid,MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT16 duty; + static MOBLEUINT16 previousIntensity = 0; + + AppliLevelSet[elementIndex].Present_Level16= plevelParam->Present_Level16; + if(AppliLevelSet[elementIndex].Present_Level16 <= 0) + { + AppliLevelSet[elementIndex].Present_Level16 = 0; + } + + IntensityValue = AppliLevelSet[elementIndex].Present_Level16; + + if(((IntensityValue > previousIntensity) && (IntensityValue Present_Level16; + + /* For demo, if Level is more than 50, switch ON the LED */ + if (AppliLevelSet[elementIndex].Present_Level16 >= 50) + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); +#endif + BSP_LED_On(LED_BLUE); + } + else + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Light_UpdateLedValue(RESET_STATE , Appli_LightPwmValue); +#endif + BSP_LED_Off(LED_BLUE); + } + + TRACE_M(TF_GENERIC,"Generic_LevelDelta_Set callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8209!\r\n"); + + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_Move_Set: This function is callback for Application +* when Generic Level Move message is received +* @param pdeltaMoveParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_Move_Set(Generic_LevelStatus_t* pdeltaMoveParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +// if(OptionalValid == 1) +// { + AppliLevelSet[elementIndex].Last_delta_level = pdeltaMoveParam->Last_delta_level; + AppliLevelSet[elementIndex].Last_Level_TID = pdeltaMoveParam->Last_Level_TID; + AppliLevelSet[elementIndex].Last_Present_Level16 = pdeltaMoveParam->Last_Present_Level16; + AppliLevelSet[elementIndex].Present_Level16 = pdeltaMoveParam->Present_Level16; + AppliLevelSet[elementIndex].RemainingTime = pdeltaMoveParam->RemainingTime; + AppliLevelSet[elementIndex].Target_Level16 = pdeltaMoveParam->Target_Level16; +// } + + TRACE_M(TF_GENERIC,"Generic_LevelMove_Set callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#820B! \r\n"); + return MOBLE_RESULT_SUCCESS; + +} + +/******************************************************************************/ +#endif /* ENABLE_GENERIC_MODEL_SERVER_LEVEL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF +/******************************************************************************/ + +/** +* @brief Appli_Generic_PowerOnOff_Set: This function is callback for Application +* when Generic Power on off set message is received +* @param pPowerOnOffParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_PowerOnOff_Set(Generic_PowerOnOffParam_t* pPowerOnOffParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + + AppliPowerOnSet[elementIndex].PowerOnState = pPowerOnOffParam->PowerOnOffState; + TRACE_M(TF_SERIAL_CTRL,"#8213! for elementIndex %d \r\n", elementIndex); + TRACE_M(TF_GENERIC,"Appli_Generic_PowerOnOff_Set callback received for elementIndex %d \r\n", elementIndex); + + if(AppliPowerOnSet[elementIndex].PowerOnState == GENERIC_POWER_ON_STATE) + { + /* set the flag value for NVM store */ + RestoreFlag = GENERIC_ON_OFF_NVM_FLAG; + } + + AppliNvm_SaveMessageParam(); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME +/******************************************************************************/ + +/** +* @brief Appli_Generic_DefaultTransitionTime_Set: This function is callback for Application +* when Generic Power on off set message is received +* @param pDefaultTimeParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Set(Generic_DefaultTransitionParam_t* pDefaultTimeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + AppliDefaultTransitionSet[elementIndex].DefaultTransitionTime = pDefaultTimeParam->DefaultTransitionTime; + + TRACE_M(TF_GENERIC,"Generic_DefaultTransitionTime_Set callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#820E!\r\n"); + return MOBLE_RESULT_SUCCESS; +} + + + +/******************************************************************************/ +#endif /* ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME */ +/******************************************************************************/ + + +/** +* @brief Appli_Generic_GetOnOffState: This function is callback for Application +* when Generic on off status message is to be provided +* @param pOnOff_status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetOnOffStatus(MOBLEUINT8* pOnOff_Status,MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pOnOff_Status = AppliOnOffSet[elementIndex].Present_OnOff; + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetOnOffValue: This function is callback for Application + to get the PWM value for the generic on off +* @param pOnOff_Value: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetOnOffValue(MOBLEUINT8* pOnOff_Value, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pOnOff_Value = AppliOnOffSet[elementIndex].Present_OnOffValue; + *(pOnOff_Value+1) = AppliOnOffSet[elementIndex].Present_OnOffValue >> 8; + *(pOnOff_Value+2) = AppliOnOffSet[elementIndex].TargetValue; + *(pOnOff_Value+3) = AppliOnOffSet[elementIndex].TargetValue >> 8; + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetLevelStatus: This function is callback for Application + when Generic Level status message is to be provided +* @param pLevel_status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetLevelStatus(MOBLEUINT8* pLevel_Status, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pLevel_Status = AppliLevelSet[elementIndex].Present_Level16; + *(pLevel_Status+1) = AppliLevelSet[elementIndex].Present_Level16 >> 8; + *(pLevel_Status+2) = AppliLevelSet[elementIndex].Target_Level16; + *(pLevel_Status+3) = AppliLevelSet[elementIndex].Target_Level16 >> 8; + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetPowerOnOffStatus: This function is callback for Application +* when Generic Get Power status message is to be provided +* @param pLevel_status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetPowerOnOffStatus(MOBLEUINT8* pPower_Status, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pPower_Status = AppliPowerOnSet[elementIndex].PowerOnState; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetDefaultTransitionStatus: This function is callback for +* Application when Generic Level status message is to be provided +* @param pTransition_Status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_Status,MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pTransition_Status = AppliDefaultTransitionSet[elementIndex].DefaultTransitionTime; + + return MOBLE_RESULT_SUCCESS; +} + + +/** + * @} + */ + +/** + * @} + */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h new file mode 100644 index 000000000..755e95db5 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h @@ -0,0 +1,158 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_GENERIC_H +#define __APPLI_GENERIC_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* user configuration for Battery status */ +#define BATTERY_ABSENT 0X00 +#define BATTERY_PRESENT_REMOVABLE 0X01 +#define BATTERY_PRESENT_NON_REMOVABLE 0X02 +#define BATTERY_UNKNOWN 0X03 +#define BATTERY_CRITICAL_LOW_LEVEL 0X00 +#define BATTERY_LOW_LEVEL 0X01 +#define BATTERY_GOOD_LEVEL 0X02 +#define BATTERY_LEVEL_UNKNOWN 0X03 +#define BATTERY_NOT_CHARGEABLE 0X00 +#define BATTERY_NOT_CHARGING 0X01 +#define BATTERY_IS_CHARGING 0X02 +#define BATTERY_CHARGING_UNKNOWN 0X03 +#define BATTERY_SERVICE_RFU 0X00 +#define BATTERY_REQUIRE_NO_SERVICE 0X01 +#define BATTERY_REQUIRE_SERVICE 0X02 +#define BATTERY_SERVICE_UNKNOWN 0X03 + +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ + +#pragma pack(push, 1) + +typedef struct +{ + MOBLEUINT8 Present_OnOff; + MOBLEUINT16 Present_OnOffValue; + MOBLEUINT16 TargetValue; +}Appli_Generic_OnOffSet; + +typedef struct +{ + MOBLEINT16 Present_Level16; + MOBLEINT16 Target_Level16; + MOBLEUINT8 RemainingTime; + MOBLEUINT8 Last_Level_TID; + MOBLEINT16 Last_Present_Level16; + MOBLEINT32 Last_delta_level; +}Appli_Generic_LevelSet; + +typedef struct +{ + MOBLEINT16 PowerOnState; +}Appli_Generic_PowerOnOffSet; + +typedef struct +{ + MOBLEUINT8 DefaultTransitionTime; +}Appli_Generic_DefaultTransitionSet; + +typedef struct +{ + MOBLEUINT8 Is_BatteryPresent; + MOBLEUINT8 Is_Chargeable; + MOBLEUINT8 Is_Serviceable; +}Appli_BatteryUserflag_param_t; + +#pragma pack(pop) + +/* Exported Functions Prototypes ---------------------------------------------*/ + +MOBLE_RESULT Appli_Generic_OnOff_Set(Generic_OnOffStatus_t*, + MOBLEUINT8, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_OnOff_Status(MOBLEUINT8 const *pOnOff_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Level_Set(Generic_LevelStatus_t*, + MOBLEUINT8, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Delta_Set(Generic_LevelStatus_t*, + MOBLEUINT8, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Move_Set(Generic_LevelStatus_t* pdeltaMoveParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Level_Status(MOBLEUINT8 const *plevel_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_PowerOnOff_Set(Generic_PowerOnOffParam_t* pPowerOnOffParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_PowerOnOff_Status(MOBLEUINT8 const *powerOnOff_status , + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Set(Generic_DefaultTransitionParam_t* pDefaultTimeParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Status(MOBLEUINT8 const *pTransition_status , + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Generic_GetOnOffStatus(MOBLEUINT8* pOnOff_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetOnOffValue(MOBLEUINT8* pOnOff_Value, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetLevelStatus(MOBLEUINT8* pLevel_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetPowerOnOffStatus(MOBLEUINT8* pLevel_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Generic_Restore_PowerOn_Value(MOBLEUINT8 restoreValue, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + + + +#endif /* __APPLI_GENERIC_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c new file mode 100644 index 000000000..9c9ff6480 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c @@ -0,0 +1,345 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic_client.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "appli_mesh.h" +#include "generic_client.h" +#include "appli_generic_client.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief Appli_Generic_OnOff_Status: This function is callback for Application +* when Generic OnOff message is received +* @param pOnOff_status: Pointer to the parameters received for message +* @param plength: length of the data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_OnOff_Status(MOBLEUINT8 const *pOnOff_status, MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_GENERIC,"Generic_OnOff_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8204!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Present OnOff value: %d\n\r", pOnOff_status[i]); + else if(i == 1) + TRACE_M(TF_SERIAL_CTRL,"Target OnOff value: %d\n\r", pOnOff_status[i]); + else if(i == 2) + TRACE_M(TF_SERIAL_CTRL,"Remaining Time value: %d\n\r", pOnOff_status[i]); + } + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL +/******************************************************************************/ + + /** +* @brief Appli_Generic_Level_Status: This function is callback for Application +* when Generic Level Move message is received +* @param plevel_status: Pointer to the parameters message +* @param plength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_Level_Status(MOBLEUINT8 const *plevel_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT8 i; + MOBLEUINT8 level = 0; +#endif + + TRACE_M(TF_GENERIC,"Generic_Level_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8208! \r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < plength; i++) + { + if((i == 0) || (i == 2)) + level = plevel_status[i]; + else if(i == 1) + TRACE_M(TF_SERIAL_CTRL,"Present Level value: %d%\n\r", + (((plevel_status[i]<<8)|level)*100/LEVEL_MAX_VALID_RANGE)); + else if(i == 3) + TRACE_M(TF_SERIAL_CTRL,"Target Level value: %d%\n\r", + (((plevel_status[i]<<8)|level)*100/LEVEL_MAX_VALID_RANGE)); + else if(i == 4) + TRACE_M(TF_SERIAL_CTRL,"Remaining Time value: %d\n\r", plevel_status[i]); + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL */ +/******************************************************************************/ + +/** +* @brief Appli_Generic_DefaultTransitionTime_Status: This function is callback for Application +* when Generic Power on off set message is received +* @param pTransition_status: Pointer to the parameters message +* @param plength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Status(MOBLEUINT8 const *pTransition_status , MOBLEUINT32 plength,MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + TRACE_M(TF_GENERIC,"Generic_DefaultTransitionTime_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8210!\r\n"); + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Generic_PowerOnOff_Set: This function is callback for Application +* when Generic Power on off set message is received +* @param powerOnOff_status: Pointer to the parameters message +* @param plength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_PowerOnOff_Status(MOBLEUINT8 const *powerOnOff_status,\ + MOBLEUINT32 plength, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_GENERIC,"Generic_PowerOnOff_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8212!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"On Power up value: %d\n\r", + powerOnOff_status[i]); + } + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_GenericClient_API: This function is a Wrapper to call Generic Client API depending on opcode received in input +* @param elementIndex: Index of the element +* @param msg_opcode: opcode of the desired API +* @param msg_params: buffer containing the desired API parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + switch(msg_opcode){ +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_ONOFF +/******************************************************************************/ + case GENERIC_ON_OFF_GET: + { + result = GenericClient_OnOff_Get(elementIndex); + break; + } + case GENERIC_ON_OFF_SET_ACK: + { + result = GenericClient_OnOff_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_OnOffParam_t) ); + break; + } + case GENERIC_ON_OFF_SET_UNACK: + { + result = GenericClient_OnOff_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_OnOffParam_t) ); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL +/******************************************************************************/ + case GENERIC_LEVEL_GET: + { + result = GenericClient_Level_Get(elementIndex); + break; + } + case GENERIC_LEVEL_SET_ACK: + { + result = GenericClient_Level_Set_Ack(elementIndex, + msg_params, + (sizeof(Generic_LevelParam_t)-2)); + break; + } + case GENERIC_LEVEL_SET_UNACK: + { + result = GenericClient_Level_Set_Unack(elementIndex, + msg_params, + (sizeof(Generic_LevelParam_t)-2)); + break; + } + case GENERIC_DELTA_SET: + { + + result = GenericClient_Delta_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_DeltaLevelParam_t)); + break; + } + case GENERIC_DELTA_SET_UNACK: + { + result = GenericClient_Delta_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_DeltaLevelParam_t)); + break; + } + case GENERIC_MOVE_SET: + { + result = GenericClient_Move_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_LevelMoveParam_t)); + break; + } + case GENERIC_MOVE_SET_UNACK: + { + result = GenericClient_Move_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_LevelMoveParam_t)); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_POWER_ONOFF +/******************************************************************************/ + case GENERIC_POWER_ON_OFF_GET: + { + GenericClient_PowerOnOff_Get(elementIndex); + break; + } + case GENERIC_POWER_ON_OFF_SET: + { + result = GenericClient_PowerOnOff_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_PowerOnOffParam_t)); + break; + } + case GENERIC_POWER_ON_OFF_SET_UNACK: + { + result = GenericClient_PowerOnOff_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_PowerOnOffParam_t)); + break; + } + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_POWER_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_DEFAULT_TRANSITION_TIME +/******************************************************************************/ + case GENERIC_DEFAULT_TRANSITION_TIME_GET: + { + result = GenericClient_DefaultTransitionTime_Get(elementIndex); + break; + } + + case GENERIC_DEFAULT_TRANSITION_TIME_SET: + { + result = GenericClient_DefaultTransitionTime_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_DefaultTransitionParam_t)); + break; + } + + case GENERIC_DEFAULT_TRANSITION_TIME_SET_UNACK: + { + result = GenericClient_DefaultTransitionTime_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_DefaultTransitionParam_t)); + break; + } + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_DEFAULT_TRANSITION_TIME */ +/******************************************************************************/ + + default: + { + TRACE_M(TF_GENERIC, "OpCode value invalid %d \r\n", msg_opcode); + result = MOBLE_RESULT_FAIL; + } + } + return result; +} + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h new file mode 100644 index 000000000..d3fa85d31 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h @@ -0,0 +1,40 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic_client.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_GENERIC_CLIENT_H +#define __APPLI_GENERIC_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_ConfigClient_Set(void); +MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params); + +#endif /* __APPLI_GENERIC_CLIENT_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c new file mode 100644 index 000000000..d7846a4cc --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c @@ -0,0 +1,1351 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light.c + * @author MCD Application Team + * @brief Application interface for Lighting Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" +#include "hal_common.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "light.h" +#include "appli_light.h" +#include "appli_generic.h" +#include "common.h" +#include "mesh_cfg.h" +#include "PWM_handlers.h" +#include "PWM_config.h" +#include "appli_nvm.h" +#include "math.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + + +/******************************************************************************* +Following Variables are used for the LIGHTING Lightness MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ +Appli_Light_lightnessSet ApplilightnessSet[APPLICATION_NUMBER_OF_ELEMENTS] = {{1,0,0,0,0,0}}; +Appli_Light_lightnessLinearSet ApplilightnessLinearSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************* +Following Variables are used for the LIGHTING CTL MODEL +*******************************************************************************/ + +/******************************************************************************/ +#if defined (ENABLE_LIGHT_MODEL_SERVER_CTL) || defined (ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP) \ + || defined (ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE) +/******************************************************************************/ + Appli_Light_CtlSet AppliCtlSet[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_CtlTemperatureRangeSet AppliCtlTemperatureRangeSet[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_CtlDefaultSet AppliCtlDefaultSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL */ +/******************************************************************************/ + +/******************************************************************************* +Following Variables are used for the LIGHTING HSL MODEL +*******************************************************************************/ + +#if defined (ENABLE_LIGHT_MODEL_SERVER_HSL) || defined (ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP) \ + || defined (ENABLE_LIGHT_MODEL_SERVER_HSL_HUE) || defined (ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION) +/******************************************************************************/ + Appli_Light_HslSet AppliHslSet[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_HslDefaultSet Appli_HslDefaultSet[APPLICATION_NUMBER_OF_ELEMENTS] = {{0x7FFF,0x7FFF,0x7FFF}}; + Appli_Light_RGBSet Appli_RGBParam[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_HslRangeSet AppliHslRangeSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/*******************************************************************************/ +#endif /*End of the LIGHTING HSL MODEL variables */ +/*******************************************************************************/ + +/******************************************************************************* +Following Variables are used for the RGB board. +*******************************************************************************/ + +Appli_LightPwmValue_t Appli_LightPwmValue; +extern MOBLEUINT8 RestoreFlag; +extern MOBLEUINT8 PowerOnOff_flag; +extern MOBLEUINT8 IntensityFlag; +extern MOBLEUINT16 IntensityValue; +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Set: This function is callback for Application +* when Light Lightness Set message is received +* @param pLight_LightnessParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Set(Light_LightnessStatus_t* pLight_LightnessParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT16 duty; + static MOBLEUINT16 previousIntensity = 0; + + TRACE_M(TF_SERIAL_CTRL, "#824C!\n\r"); + TRACE_M(TF_LIGHT, "Element index %d present 0x%.2x last 0x%.2x\r\n", + elementIndex, + pLight_LightnessParam->LightnessPresentValue16, + pLight_LightnessParam->LightnessLastStatus); + + ApplilightnessSet[elementIndex].PresentState16 = pLight_LightnessParam->LightnessPresentValue16; + ApplilightnessSet[elementIndex].LastLightness16 = pLight_LightnessParam->LightnessLastStatus; + + if(pLight_LightnessParam->LightnessPresentValue16 != 0x00) + { + ApplilightnessSet[elementIndex].LastLightness16 = pLight_LightnessParam->LightnessPresentValue16; + } + + if(((IntensityValue > previousIntensity) && (IntensityValue LightnessPresentValue16 >= 0x8000) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } +#endif + + duty = PwmValueMapping(ApplilightnessSet[elementIndex].PresentState16 , 0xfFFF ,0); + Appli_LightPwmValue.IntensityValue = duty; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + /* set the flag value for NVM store */ + NvmStatePowerFlag_Set(LIGHT_LIGHTNESS_NVM_FLAG, elementIndex); + + return MOBLE_RESULT_SUCCESS; + +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Linear_Set: This function is callback for Application +* when Light Lightness Linear Set message is received +* @param pLight_LightnessLinearParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Linear_Set(Light_LightnessStatus_t* pLight_LightnessLinearParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + ApplilightnessLinearSet[elementIndex].PresentState16 = pLight_LightnessLinearParam->LinearPresentValue16; + + TRACE_M(TF_LIGHT,"Light_LightnessLinear_Set callback received for elementIndex %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8250!\n\r"); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Default_Set: This function is callback for Application +* when Light Lightness Default Set message is received +* @param pLight_LightnessDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Default_Set(Light_LightnessDefaultParam_t* pLight_LightnessDefaultParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + if(pLight_LightnessDefaultParam->LightnessDefaultStatus > 0) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } + + ApplilightnessSet[elementIndex].LightnessDefault = + pLight_LightnessDefaultParam->LightnessDefaultStatus; + + TRACE_M(TF_SERIAL_CTRL,"#8259! \r\n"); + TRACE_M(TF_LIGHT,"Appli_Light_Lightness_Default_Set callback received for elementIndex %d \r\n", elementIndex); + + NvmStatePowerFlag_Set(LIGHT_LIGHTNESS_NVM_FLAG,elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Last_Set: This function is callback for Application +* when Light Lightness Default Set message is received +* @param pLight_LightnessDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Last_Set(Light_LightnessStatus_t* pLight_LightnessParam, + MOBLEUINT8 elementIndex) +{ + ApplilightnessSet[elementIndex].LastLightness16 = pLight_LightnessParam->LightnessLastStatus; + + TRACE_M(TF_SERIAL_CTRL,"#8259!\n\r"); + TRACE_M(TF_LIGHT, + "Appli_Light_Lightness_Last_Set Light Last Value 0x%.2x \r\n", + ApplilightnessSet[elementIndex].LastLightness16); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP */ +/******************************************************************************/ + + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Range_Set: This function is callback for Application +* when Light Lightness Range Set message is received +* @param pLight_LightnessRangeParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Range_Set(Light_LightnessRangeParam_t* pLight_LightnessRangeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + ApplilightnessSet[elementIndex].StatusCode = pLight_LightnessRangeParam->StatusCode; + ApplilightnessSet[elementIndex].RangeMin = pLight_LightnessRangeParam->MinRangeStatus; + ApplilightnessSet[elementIndex].RangeMax = pLight_LightnessRangeParam->MaxRangeStatus; + + TRACE_M(TF_SERIAL_CTRL,"#825B! \n\r"); + TRACE_M(TF_LIGHT,"Appli_Light_Lightness_Range_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL +/******************************************************************************/ + +/** +* @brief Appli_Light_Ctl_Set: This function is callback for Application +* when Light Ctl Set message is received +* @param pLight_CtlParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Ctl_Set(Light_CtlStatus_t* pLight_CtlParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + float colourRatio; + float brightRatio; + + TRACE_M(TF_SERIAL_CTRL,"#825E! \n\r"); + + AppliCtlSet[elementIndex].PresentLightness16 = pLight_CtlParam->PresentCtlLightness16; + AppliCtlSet[elementIndex].PresentTemperature16 = pLight_CtlParam->PresentCtlTemperature16; + AppliCtlSet[elementIndex].PresentCtlDelta16 = pLight_CtlParam->PresentCtlDelta16; + + /* Save target parameters if transition is available */ + AppliCtlSet[elementIndex].TargetLightness16 = pLight_CtlParam->TargetCtlLightness16; + AppliCtlSet[elementIndex].TargetTemperature16 = pLight_CtlParam->TargetCtlTemperature16; + AppliCtlSet[elementIndex].TargetCtlDelta16 = pLight_CtlParam->TargetCtlDeltaUv16; + + colourRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentTemperature16 ,MAX_CTL_TEMP_RANGE ,MIN_CTL_TEMP_RANGE); + + brightRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentLightness16 ,0XFFFF ,0); + + Appli_LightPwmValue.PwmCoolValue = PWM_CoolValue(colourRatio , brightRatio); + Appli_LightPwmValue.PwmWarmValue = PWM_WarmValue(colourRatio , brightRatio); + + Rgb_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_CTL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_Ctl_Set callback received for elementIndex %d \r\n", elementIndex); + + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE +/******************************************************************************/ + +/** +* @brief Appli_Light_CtlTemperature_Set: This function is callback for Application +* when Light Ctl Temperature Set message is received +* @param pLight_CtltempParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Set(Light_CtlStatus_t* pLight_CtltempParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + float colourRatio; + float brightRatio; + TRACE_M(TF_SERIAL_CTRL,"#8264!\n\r"); + + AppliCtlSet[elementIndex].PresentTemperature16 = pLight_CtltempParam->PresentCtlTemperature16; + AppliCtlSet[elementIndex].PresentCtlDelta16 = pLight_CtltempParam->PresentCtlDelta16; + + /* Made a copy of target in case of transition values change */ + AppliCtlSet[elementIndex].TargetTemperature16 = pLight_CtltempParam->TargetCtlTemperature16; + AppliCtlSet[elementIndex].TargetCtlDelta16 = pLight_CtltempParam->TargetCtlDeltaUv16; + + colourRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentTemperature16 ,MAX_CTL_TEMP_RANGE ,MIN_CTL_TEMP_RANGE); + + brightRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentLightness16 ,0XFFFF ,0); + + Appli_LightPwmValue.PwmCoolValue = PWM_CoolValue(colourRatio , brightRatio); + Appli_LightPwmValue.PwmWarmValue = PWM_WarmValue(colourRatio , brightRatio); + + Rgb_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_CTL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_CtlTemperature_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_CtlTemperature_Range_Set: This function is callback for Application +* when Light Ctl Temperature range Set message is received +* @param pLight_CtlTempRangeParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Set(Light_CtlTemperatureRangeParam_t* pLight_CtlTempRangeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + AppliCtlTemperatureRangeSet[elementIndex].RangeMin = pLight_CtlTempRangeParam->MinRangeStatus; + AppliCtlTemperatureRangeSet[elementIndex].RangeMax = pLight_CtlTempRangeParam->MaxRangeStatus; + AppliCtlTemperatureRangeSet[elementIndex].StatusCode = pLight_CtlTempRangeParam->StatusCode; + + TRACE_M(TF_SERIAL_CTRL,"#826B!\n\r"); + TRACE_M(TF_LIGHT,"Light_CtlTemperature_Range_Set callback received for elementIndex %d \r\n", elementIndex); + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_CtlDefault_Set: This function is callback for Application +* when Light Ctl Default Set message is received +* @param pLight_CtlDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlDefault_Set(Light_CtlDefaultParam_t* pLight_CtlDefaultParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + AppliCtlDefaultSet[elementIndex].CtlDefaultLightness16 = pLight_CtlDefaultParam->CtlDefaultLightness16; + AppliCtlDefaultSet[elementIndex].CtlDefaultTemperature16 = pLight_CtlDefaultParam->CtlDefaultTemperature16; + AppliCtlDefaultSet[elementIndex].CtlDefaultDeltaUv = pLight_CtlDefaultParam->CtlDefaultDeltaUv; + + TRACE_M(TF_SERIAL_CTRL,"#8269!\n\r"); + TRACE_M(TF_LIGHT,"Light_CtlDefault_Set callback received for elementIndex %d \r\n", elementIndex); + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL +/******************************************************************************/ + +/** +* @brief Appli_Light_Hsl_Set: This function is callback for Application +* when Light Hsl Set message is received +* @param pLight_HslParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Hsl_Set(Light_HslStatus_t* pLight_HslParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#8276!\n\r"); + + AppliHslSet[elementIndex].HslLightness16 = pLight_HslParam->PresentHslLightness16; + AppliHslSet[elementIndex].HslHueLightness16 = pLight_HslParam->PresentHslHueLightness16; + AppliHslSet[elementIndex].HslSaturation16 = pLight_HslParam->PresentHslSaturation16; + + /* Save target parameters if transition is available */ + AppliHslSet[elementIndex].TargetHslLightness16 = pLight_HslParam->TargetHslLightness16; + AppliHslSet[elementIndex].TargetHslHueLightness16 = pLight_HslParam->TargetHslHueLightness16; + AppliHslSet[elementIndex].TargetHslSaturation16 = pLight_HslParam->TargetHslSaturation16; + + /* Function to convert HSL values in RGB values */ + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + TRACE_M(TF_SERIAL_CTRL,"Red Value: %04hx\n\r",Appli_LightPwmValue.PwmRedValue); + TRACE_M(TF_SERIAL_CTRL,"Green Value: %04hx\n\r",Appli_LightPwmValue.PwmGreenValue); + TRACE_M(TF_SERIAL_CTRL,"Blue Value: %04hx\n\r",Appli_LightPwmValue.PwmBlueValue); + +/* when HSL is set, make CTL pwm will bw zero */ + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_Hsl_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_HUE +/******************************************************************************/ + +/** +* @brief Appli_Light_HslHue_Set: This function is callback for Application +* when Light Hsl Hue Set message is received +* @param pLight_HslHueParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslHue_Set(Light_HslStatus_t* pLight_HslHueParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL, "#826F! \n\r"); + + AppliHslSet[elementIndex].HslHueLightness16 = pLight_HslHueParam->PresentHslHueLightness16; + + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_HslHue_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; + +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_HUE */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION +/******************************************************************************/ + +/** +* @brief Appli_Light_HslSaturation_Set: This function is callback for Application +* when Light Hsl Saturation Set message is received +* @param pLight_HslSaturationParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslSaturation_Set(Light_HslStatus_t* pLight_HslSaturationParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#8273! \n\r"); + + AppliHslSet[elementIndex].HslSaturation16 = pLight_HslSaturationParam->PresentHslSaturation16; + + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_HslSaturation_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_HslDefault_Set: This function is callback for Application +* when Light Hsl Default Set message is received +* @param pLight_HslDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslDefault_Set(Light_HslDefaultParam_t* pLight_HslDefaultParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#827F! \n\r"); + + Appli_HslDefaultSet[elementIndex].HslDefaultLightness16 = pLight_HslDefaultParam->HslLightnessDefault16; + Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16 = pLight_HslDefaultParam->HslHueDefault16; + Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16 = pLight_HslDefaultParam->HslSaturationDefault16; + + AppliHslSet[elementIndex].HslLightness16 = Appli_HslDefaultSet[elementIndex].HslDefaultLightness16; + AppliHslSet[elementIndex].HslHueLightness16 = Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16; + AppliHslSet[elementIndex].HslSaturation16 = Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16; + + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_HslDefault_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_HslRange_Set: This function is callback for Application +* when Light Hsl Range Set message is received +* @param pLight_HslRangeParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslRange_Set(Light_HslRangeParam_t* pLight_HslRangeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#8281! \n\r"); + + AppliHslRangeSet[elementIndex].HslHueMinRange16 = pLight_HslRangeParam->HslHueMinRange16; + AppliHslRangeSet[elementIndex].HslHueMaxRange16 = pLight_HslRangeParam->HslHueMaxRange16; + AppliHslRangeSet[elementIndex].HslMinSaturation16 = pLight_HslRangeParam->HslMinSaturation16; + AppliHslRangeSet[elementIndex].HslMaxSaturation16 = pLight_HslRangeParam->HslMaxSaturation16; + + TRACE_M(TF_LIGHT,"Appli_Light_HslRange_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP */ +/******************************************************************************/ + + +/******************************************************************************* +Following Functions are used for the LIGHTING Lightness MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ + +/** +* @brief Appli_Light_GetLightnessStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lLightnessState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessStatus(MOBLEUINT8* lLightnessState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lLightnessState) = ApplilightnessSet[elementIndex].PresentState16; + *(lLightnessState+1) = ApplilightnessSet[elementIndex].PresentState16 >> 8; + *(lLightnessState+2) = ApplilightnessSet[elementIndex].LastLightness16 ; + *(lLightnessState+3) = ApplilightnessSet[elementIndex].LastLightness16 >> 8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetLightnessLinearStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lLightnessState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessLinearStatus(MOBLEUINT8* lLightnessState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lLightnessState) = ApplilightnessLinearSet[elementIndex].PresentState16; + *(lLightnessState+1) = ApplilightnessLinearSet[elementIndex].PresentState16 >> 8; + *(lLightnessState+2) = ApplilightnessSet[elementIndex].LastLightness16 ; + *(lLightnessState+3) = ApplilightnessSet[elementIndex].LastLightness16 >> 8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetLightnessDefaultStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lDefaultState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessDefaultStatus(MOBLEUINT8* lDefaultState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lDefaultState) = ApplilightnessSet[elementIndex].LightnessDefault; + *(lDefaultState+1) = ApplilightnessSet[elementIndex].LightnessDefault >> 8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetLightnessLastStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lLastState: Pointer to the status message +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessLastStatus(MOBLEUINT8* lLastState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lLastState) = ApplilightnessSet[elementIndex].LastLightness16; + *(lLastState+1) = ApplilightnessSet[elementIndex].LastLightness16 >> 8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetLightnessRangeStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lRangeState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessRangeStatus(MOBLEUINT8* lRangeState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lRangeState) = ApplilightnessSet[elementIndex].StatusCode; + *(lRangeState+1) = ApplilightnessSet[elementIndex].RangeMin; + *(lRangeState+2) = ApplilightnessSet[elementIndex].RangeMin >> 8; + *(lRangeState+3) = ApplilightnessSet[elementIndex].RangeMax; + *(lRangeState+4) = ApplilightnessSet[elementIndex].RangeMax >> 8; + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************* +Following Functions are used for the LIGHTING CTL MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL +/******************************************************************************/ + +/** +* @brief Appli_Light_GetCtlLightStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlLightState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlLightStatus(MOBLEUINT8* lCtlLightState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlLightState) = AppliCtlSet[elementIndex].PresentLightness16; + *(lCtlLightState+1) = AppliCtlSet[elementIndex].PresentLightness16 >> 8; + *(lCtlLightState+2) = AppliCtlSet[elementIndex].PresentTemperature16; + *(lCtlLightState+3) = AppliCtlSet[elementIndex].PresentTemperature16 >>8; + *(lCtlLightState+4) = AppliCtlSet[elementIndex].PresentCtlDelta16; + *(lCtlLightState+5) = AppliCtlSet[elementIndex].PresentCtlDelta16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetCtlTargetStatus: This function is callback for Application +* to get the application values in middleware used for target state. +* @param lCtlLightState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlTargetStatus(MOBLEUINT8* lCtlLightState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlLightState) = AppliCtlSet[elementIndex].TargetLightness16; + *(lCtlLightState+1) = AppliCtlSet[elementIndex].TargetLightness16 >> 8; + *(lCtlLightState+2) = AppliCtlSet[elementIndex].TargetTemperature16; + *(lCtlLightState+3) = AppliCtlSet[elementIndex].TargetTemperature16 >>8; + *(lCtlLightState+4) = AppliCtlSet[elementIndex].TargetCtlDelta16; + *(lCtlLightState+5) = AppliCtlSet[elementIndex].TargetCtlDelta16 >>8; + + return MOBLE_RESULT_SUCCESS; +} +/** +* @brief Appli_Light_GetCtlTeperatureStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlTempState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlTemperatureStatus(MOBLEUINT8* lCtlTempState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlTempState) = AppliCtlSet[elementIndex].PresentTemperature16; + *(lCtlTempState+1) = AppliCtlSet[elementIndex].PresentTemperature16 >> 8; + *(lCtlTempState+2) = AppliCtlSet[elementIndex].PresentCtlDelta16; + *(lCtlTempState+3) = AppliCtlSet[elementIndex].PresentCtlDelta16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetCtlTemperatureRange: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlTempRange: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlTemperatureRange(MOBLEUINT8* lCtlTempRange, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlTempRange) = AppliCtlTemperatureRangeSet[elementIndex].StatusCode; + *(lCtlTempRange+1) = AppliCtlTemperatureRangeSet[elementIndex].RangeMin; + *(lCtlTempRange+2) = AppliCtlTemperatureRangeSet[elementIndex].RangeMin >> 8; + *(lCtlTempRange+3) = AppliCtlTemperatureRangeSet[elementIndex].RangeMax; + *(lCtlTempRange+4) = AppliCtlTemperatureRangeSet[elementIndex].RangeMax >>8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetCtlDefaultStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlDefaultState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlDefaultStatus(MOBLEUINT8* lCtlDefaultState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlDefaultState) = AppliCtlDefaultSet[elementIndex].CtlDefaultLightness16; + *(lCtlDefaultState+1) = AppliCtlDefaultSet[elementIndex].CtlDefaultLightness16 >> 8; + *(lCtlDefaultState+2) = AppliCtlDefaultSet[elementIndex].CtlDefaultTemperature16; + *(lCtlDefaultState+3) = AppliCtlDefaultSet[elementIndex].CtlDefaultTemperature16 >>8; + *(lCtlDefaultState+4) = AppliCtlDefaultSet[elementIndex].CtlDefaultDeltaUv; + *(lCtlDefaultState+5) = AppliCtlDefaultSet[elementIndex].CtlDefaultDeltaUv >> 8; + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL */ +/******************************************************************************/ + +/******************************************************************************* +Following Functions are used for the LIGHTING HSL MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL +/******************************************************************************/ + +/** +* @brief Appli_Light_GetHslStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslStatus(MOBLEUINT8* lHslState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslState) = AppliHslSet[elementIndex].HslLightness16; + *(lHslState+1) = AppliHslSet[elementIndex].HslLightness16 >> 8; + *(lHslState+2) = AppliHslSet[elementIndex].HslHueLightness16; + *(lHslState+3) = AppliHslSet[elementIndex].HslHueLightness16 >>8; + *(lHslState+4) = AppliHslSet[elementIndex].HslSaturation16; + *(lHslState+5) = AppliHslSet[elementIndex].HslSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} +/** +* @brief Appli_Light_GetHslTargetStatus: This function is callback for Application +* to get the application values in middleware used for target state. +* @param lHslState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslTargetStatus(MOBLEUINT8* lHslState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslState) = AppliHslSet[elementIndex].TargetHslLightness16; + *(lHslState+1) = AppliHslSet[elementIndex].TargetHslLightness16 >> 8; + *(lHslState+2) = AppliHslSet[elementIndex].TargetHslHueLightness16; + *(lHslState+3) = AppliHslSet[elementIndex].TargetHslHueLightness16 >>8; + *(lHslState+4) = AppliHslSet[elementIndex].TargetHslSaturation16; + *(lHslState+5) = AppliHslSet[elementIndex].TargetHslSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} +/** +* @brief Appli_Light_GetHslHueStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslHueState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslHueStatus(MOBLEUINT8* lHslHueState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslHueState) = AppliHslSet[elementIndex].HslHueLightness16; + *(lHslHueState+1) = AppliHslSet[elementIndex].HslHueLightness16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetHslSaturationStatus: This function is callback for Application +* to get the application values in middleware used for transition change +* @param lHslSaturationState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslSaturationStatus(MOBLEUINT8* lHslSaturationState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslSaturationState) = AppliHslSet[elementIndex].HslSaturation16; + *(lHslSaturationState+1) = AppliHslSet[elementIndex].HslSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetHslDefaultStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslDefaultState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslDefaultStatus(MOBLEUINT8* lHslDefaultState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslDefaultState) = Appli_HslDefaultSet[elementIndex].HslDefaultLightness16; + *(lHslDefaultState+1) = Appli_HslDefaultSet[elementIndex].HslDefaultLightness16 >> 8; + *(lHslDefaultState+2) = Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16; + *(lHslDefaultState+3) = Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16 >>8; + *(lHslDefaultState+4) = Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16; + *(lHslDefaultState+5) = Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetHslSatRange: This function is callback for Application +* to get the application values in middleware used for transition change +* @param lHslSatRange: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslSatRange(MOBLEUINT8* lHslSatRange, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslSatRange) = AppliHslRangeSet[elementIndex].StatusCode; + *(lHslSatRange+1) = AppliHslRangeSet[elementIndex].HslMinSaturation16; + *(lHslSatRange+2) = AppliHslRangeSet[elementIndex].HslMinSaturation16 >> 8; + *(lHslSatRange+3) = AppliHslRangeSet[elementIndex].HslMaxSaturation16; + *(lHslSatRange+4) = AppliHslRangeSet[elementIndex].HslMaxSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetHslHueRange: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslHueRange: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslHueRange(MOBLEUINT8* lHslHueRange, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslHueRange) = AppliHslRangeSet[elementIndex].StatusCode; + *(lHslHueRange+1) = AppliHslRangeSet[elementIndex].HslHueMinRange16; + *(lHslHueRange+2) = AppliHslRangeSet[elementIndex].HslHueMinRange16 >> 8; + *(lHslHueRange+3) = AppliHslRangeSet[elementIndex].HslHueMaxRange16; + *(lHslHueRange+4) = AppliHslRangeSet[elementIndex].HslHueMaxRange16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* ENABLE_LIGHT_MODEL_SERVER_HSL */ +/******************************************************************************/ + +/* This Function used to initialise the PWM . This is used for the RGB board */ +void Appli_Light_PwmInit() +{ + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmCoolValue = 0; + Appli_LightPwmValue.PwmWarmValue = 0; + Appli_LightPwmValue.PwmRedValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmGreenValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmBlueValue = PWM_VALUE_OFF; + Light_UpdateLedValue(RESET_STATE , Appli_LightPwmValue); +} + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL +/******************************************************************************/ + +/** +* @brief Function to convert the map the RGB values in real values. +* @param value1: This value corresponds to red led. +* @param value2: This value corresponds to green led . +* @param value3: This value corresponds to blue led . +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval void +*/ +void RgbF_Create(MOBLEUINT16 value1, MOBLEUINT16 value2, MOBLEUINT16 value3, MOBLEUINT8 elementIndex) +{ + Appli_RGBParam[elementIndex].Red_Value = (MOBLEUINT16)(65535 * value1/1000); + Appli_RGBParam[elementIndex].Green_Value = (MOBLEUINT16)(65535 * value2/1000); + Appli_RGBParam[elementIndex].Blue_Value = (MOBLEUINT16)(65535 * value3/1000); +} + +/** +* @brief Function to convert the HSL values in RGB values. +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval void +*/ +void HSL2RGB_Conversion(MOBLEUINT8 elementIndex) +{ + + MOBLEUINT16 hueValue; + float lightnessvalue; + float saturationValue; + MOBLEUINT16 cValue; /* chroma */ + MOBLEUINT16 mValue; /* intermediate value used for creating the r,g,b baseline */ + MOBLEUINT16 xValue; /* intermediate value used for computing r,g,b */ + + if(AppliHslSet[elementIndex].HslSaturation16 == 0) + { + Appli_RGBParam[elementIndex].Red_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Green_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Blue_Value = AppliHslSet[elementIndex].HslLightness16 ; + } + else if((AppliHslSet[elementIndex].HslLightness16 == 0xFFFF) || (AppliHslSet[elementIndex].HslLightness16 == 0x00)) + { + Appli_RGBParam[elementIndex].Red_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Green_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Blue_Value = AppliHslSet[elementIndex].HslLightness16 ; + } + else + { + /* Hue is calculated for angular value. so converting in between 0 to 360 degree */ + hueValue = (MOBLEUINT16)(360 * (float)AppliHslSet[elementIndex].HslHueLightness16/65535); + lightnessvalue = (float)AppliHslSet[elementIndex].HslLightness16/65535; + saturationValue = (float)AppliHslSet[elementIndex].HslSaturation16/65535; + + /* Formula to get the values used for RGB conversion */ + cValue = (MOBLEUINT16)(((1- fabs(2 * lightnessvalue-1))*saturationValue) * 1000); + mValue = (MOBLEUINT16)((lightnessvalue * 1000) - (cValue/2)); + xValue = (MOBLEUINT16)(cValue * (1 - fabs(fmod(hueValue / 60.0, 2.0) - 1))); + + /* Conditions applied for the different angle of hue value */ + if (hueValue > 0 && hueValue < (HUE_UPPER_LIMIT / 6)) + { + RgbF_Create(cValue + mValue, xValue + mValue, mValue, elementIndex); + } + else if (hueValue >= (HUE_UPPER_LIMIT / 6) && hueValue < (HUE_UPPER_LIMIT / 3)) + { + RgbF_Create(xValue + mValue, cValue + mValue, mValue, elementIndex); + } + else if (hueValue >= (HUE_UPPER_LIMIT / 3) && hueValue < (HUE_UPPER_LIMIT / 2)) + { + RgbF_Create(mValue, cValue + mValue, xValue + mValue, elementIndex); + } + else if (hueValue >= (HUE_UPPER_LIMIT / 2) + && hueValue < (2 * HUE_UPPER_LIMIT / 3)) + { + RgbF_Create(mValue, xValue + mValue, cValue + mValue, elementIndex); + } + else if (hueValue >= (2 * HUE_UPPER_LIMIT / 3) + && hueValue < (5 * HUE_UPPER_LIMIT / 6)) + { + RgbF_Create(xValue + mValue, mValue, cValue + mValue, elementIndex); + } + else if ((hueValue >= (5 * HUE_UPPER_LIMIT / 6) && hueValue <= HUE_UPPER_LIMIT) || (hueValue == 0)) + { + RgbF_Create(cValue + mValue, mValue, xValue + mValue, elementIndex); + } + else + { + RgbF_Create(mValue, mValue, mValue, elementIndex); + } + } +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL */ +/******************************************************************************/ + +/** +* @brief Rgb_LedOffState: This function is called while using CTL, makes all the RGB +* PWM off state for Application. +* @param void: +* @retval void +*/ +void Rgb_LedOffState(void) +{ + Appli_LightPwmValue.PwmRedValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmGreenValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmBlueValue = PWM_VALUE_OFF; + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; +} + +/** +* @brief Ctl_LedOffState: This function is called while using HSL, makes all the +* cool Warm PWM off state for Application. +* @param void: +* @retval void +*/ +void Ctl_LedOffState(void) +{ + Appli_LightPwmValue.PwmWarmValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmCoolValue = PWM_VALUE_OFF; + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; +} + +/** +* @brief Function to set the values for PWM for RGB board. +* @param state: decided the state of PWM according to the condition. +* @retval void +*/ +void Light_UpdateLedValue(MOBLEUINT8 state ,Appli_LightPwmValue_t light_state) +{ + +#ifndef USER_BOARD_1LED + if(light_state.IntensityValue > 0) + { +#ifdef USER_BOARD_COOL_WHITE_LED + if((light_state.PwmCoolValue == 0) && (light_state.PwmWarmValue == 0)) + light_state.PwmWarmValue = light_state.IntensityValue; +#endif +#ifdef USER_BOARD_RGB_LED + if((light_state.PwmRedValue == PWM_VALUE_OFF) && + (light_state.PwmGreenValue == PWM_VALUE_OFF) && + (light_state.PwmBlueValue == PWM_VALUE_OFF)) + light_state.PwmBlueValue = light_state.IntensityValue; +#endif + } +#endif + + if(state == RESUME_STATE) + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, light_state.IntensityValue); +#endif + +#ifdef USER_BOARD_COOL_WHITE_LED + + Modify_PWM(COOL_LED, light_state.PwmCoolValue); + Modify_PWM(WARM_LED, light_state.PwmWarmValue); +#endif + +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, light_state.PwmRedValue); + Modify_PWM(GREEN_LED, light_state.PwmGreenValue); + Modify_PWM(BLUE_LED, light_state.PwmBlueValue); +#endif + + } + else if(state == RESET_STATE) + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, PWM_VALUE_OFF); +#endif +#ifdef USER_BOARD_COOL_WHITE_LED + Modify_PWM(COOL_LED, 0); + Modify_PWM(WARM_LED, 0); +#endif +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, PWM_VALUE_OFF); + Modify_PWM(GREEN_LED, PWM_VALUE_OFF); + Modify_PWM(BLUE_LED, PWM_VALUE_OFF); +#endif + } + else if(state == LOAD_STATE) + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, light_state.IntensityValue); +#endif + +#ifdef USER_BOARD_COOL_WHITE_LED + Modify_PWM(COOL_LED, light_state.PwmCoolValue); + Modify_PWM(WARM_LED, light_state.PwmWarmValue); +#endif +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, light_state.PwmRedValue); + Modify_PWM(GREEN_LED, light_state.PwmGreenValue); + Modify_PWM(BLUE_LED, light_state.PwmBlueValue); +#endif + } + else + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, light_state.IntensityValue); +#endif + +#ifdef USER_BOARD_COOL_WHITE_LED + light_state.PwmCoolValue = PWM_DEFAULT_VALUE; + + Modify_PWM(COOL_LED, light_state.PwmCoolValue); + Modify_PWM(WARM_LED, light_state.PwmWarmValue); +#endif +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, light_state.PwmRedValue); + Modify_PWM(GREEN_LED, light_state.PwmGreenValue); + Modify_PWM(BLUE_LED, light_state.PwmBlueValue); +#endif + } +} + +/** +* @} +*/ + +/** +* @} +*/ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h new file mode 100644 index 000000000..d36af58c0 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h @@ -0,0 +1,281 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light.h + * @author MCD Application Team + * @brief Application interface for Light Mesh Model + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_LIGHT_H +#define __APPLI_LIGHT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "light.h" + +/* Exported macro ------------------------------------------------------------*/ +#define HUE_UPPER_LIMIT 360 +/* Exported variables -------------------------------------------------------*/ + +/* Light Lightness set */ + +#pragma pack(push, 1) + +typedef struct +{ + MOBLEUINT16 PresentState16; + MOBLEUINT16 LastLightness16; + MOBLEUINT16 LightnessDefault; + MOBLEUINT8 StatusCode; + MOBLEUINT16 RangeMin; + MOBLEUINT16 RangeMax; +}Appli_Light_lightnessSet; + + +/* Light Lightness Linear set */ +typedef struct +{ + MOBLEUINT16 PresentState16; +}Appli_Light_lightnessLinearSet; + +/* Light Ctl Set */ +typedef struct +{ + MOBLEUINT16 PresentLightness16; + MOBLEUINT16 PresentTemperature16; + MOBLEINT16 PresentCtlDelta16; + MOBLEUINT16 TargetLightness16; + MOBLEUINT16 TargetTemperature16; + MOBLEINT16 TargetCtlDelta16; +}Appli_Light_CtlSet; + +/* Light Ctl Temperature Range Set */ +typedef struct +{ + MOBLEUINT8 StatusCode; + MOBLEUINT16 RangeMin; + MOBLEUINT16 RangeMax; +}Appli_Light_CtlTemperatureRangeSet; + +/* Light Ctl Default set */ +typedef struct +{ + MOBLEUINT16 CtlDefaultLightness16; + MOBLEUINT16 CtlDefaultTemperature16; + MOBLEINT16 CtlDefaultDeltaUv; +}Appli_Light_CtlDefaultSet; + +/* Light Hsl Hue set */ +typedef struct +{ + MOBLEUINT16 HslLightness16; + MOBLEUINT16 HslHueLightness16; + MOBLEUINT16 HslSaturation16; + MOBLEUINT16 TargetHslLightness16; + MOBLEUINT16 TargetHslHueLightness16; + MOBLEUINT16 TargetHslSaturation16; +}Appli_Light_HslSet; + +/* Light Hsl Hue set */ +typedef struct +{ + MOBLEUINT16 HslDefaultLightness16; + MOBLEUINT16 HslDefaultHueLightness16; + MOBLEUINT16 HslDefaultSaturation16; +}Appli_Light_HslDefaultSet; + +typedef struct +{ + MOBLEUINT16 Red_Value; + MOBLEUINT16 Green_Value; + MOBLEUINT16 Blue_Value; +}Appli_Light_RGBSet; + +typedef struct +{ + MOBLEUINT8 StatusCode; + MOBLEUINT16 HslHueMinRange16; + MOBLEUINT16 HslHueMaxRange16; + MOBLEUINT16 HslMinSaturation16; + MOBLEUINT16 HslMaxSaturation16; +}Appli_Light_HslRangeSet; + +typedef struct +{ + MOBLEUINT16 IntensityValue; + MOBLEUINT16 PwmRedValue; + MOBLEUINT16 PwmGreenValue; + MOBLEUINT16 PwmBlueValue; + MOBLEUINT16 PwmWarmValue; + MOBLEUINT16 PwmCoolValue; +}Appli_LightPwmValue_t; + +#pragma pack(pop) + +/* Exported Functions Prototypes ---------------------------------------------*/ + +MOBLE_RESULT Appli_Light_Lightness_Set(Light_LightnessStatus_t*, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Linear_Set(Light_LightnessStatus_t* pLight_LightnessLinearParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Default_Set(Light_LightnessDefaultParam_t* pLight_LightnessDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Last_Set(Light_LightnessStatus_t* pLight_LightnessParam, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Range_Set(Light_LightnessRangeParam_t* pLight_LightnessRangeParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Ctl_Set(Light_CtlStatus_t* pLight_CtlParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Set(Light_CtlStatus_t* pLight_CtltempParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Set(Light_CtlTemperatureRangeParam_t* pLight_CtlTempRangeParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlDefault_Set(Light_CtlDefaultParam_t* pLight_CtlDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Hsl_Set(Light_HslStatus_t* pLight_HslParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslHue_Set(Light_HslStatus_t* pLight_HslHueParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslSaturation_Set(Light_HslStatus_t* pLight_HslSaturationParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslDefault_Set(Light_HslDefaultParam_t* pLight_HslDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslRange_Set(Light_HslRangeParam_t* pLight_HslDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessStatus(MOBLEUINT8* lLightnessState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessLinearStatus(MOBLEUINT8* lLightnessState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessDefaultStatus(MOBLEUINT8* lDefaultState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessLastStatus(MOBLEUINT8* lLastState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessRangeStatus(MOBLEUINT8* lRangeState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlLightStatus(MOBLEUINT8* lCtlLightState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlTargetStatus(MOBLEUINT8* lCtlLightState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlTemperatureStatus(MOBLEUINT8* lCtlTempState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlTemperatureRange(MOBLEUINT8* lCtlTempRange, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlDefaultStatus(MOBLEUINT8* lCtlDefaultState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslStatus(MOBLEUINT8* lHslState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslTargetStatus(MOBLEUINT8* lHslState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslHueStatus(MOBLEUINT8* lHslHueState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslSaturationStatus(MOBLEUINT8* lHslSaturationState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslHueRange(MOBLEUINT8* lHslHueRange, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslSatRange(MOBLEUINT8* lHslSatRange, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslDefaultStatus(MOBLEUINT8* lHslDefaultState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +void Appli_Light_PwmInit(void); +void HSL2RGB_Conversion(MOBLEUINT8 elementIndex); +void Ctl_LedOffState(void); +void Rgb_LedOffState(void); +void RgbF_Create(MOBLEUINT16 value1, + MOBLEUINT16 value2, + MOBLEUINT16 value3, + MOBLEUINT8 elementIndex); +void Light_UpdateLedValue(MOBLEUINT8 state, + Appli_LightPwmValue_t light_state); + +/******************************************************************************/ +#endif /* __APPLI_LIGHT_H */ +/******************************************************************************/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c new file mode 100644 index 000000000..14b713458 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c @@ -0,0 +1,1206 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_client.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "appli_light_lc.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "appli_mesh.h" +#include "generic_client.h" +#include "appli_light_client.h" +#include "light_lc.h" +#include "light_client.h" + + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +extern MOBLEUINT8 Tid_Client; +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief Appli_LightClient_API: This function is a Wrapper to call Light Client API depending on opcode received in input +* @param elementIndex: Index of the element +* @param msg_opcode: opcode of the desired API +* @param msg_params: buffer containing the desired API parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + + switch(msg_opcode){ +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS +/******************************************************************************/ + case LIGHT_LIGHTNESS_GET: + { + result = LightClient_Lightness_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_SET: + { + result = LightClient_Lightness_Set_Ack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Linear Lightness params, Transition Time and Delay + break; + } + case LIGHT_LIGHTNESS_SET_UNACK: + { + result = LightClient_Lightness_Set_Unack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Linear Lightness params, Transition Time and Delay + break; + } + + case LIGHT_LIGHTNESS_LINEAR_GET: + { + result = LightClient_Lightness_Linear_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_LINEAR_SET: + { + result = LightClient_Lightness_Linear_Set_Ack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Lightness params, Transition Time and Delay + break; + } + case LIGHT_LIGHTNESS_LINEAR_SET_UNACK: + { + result = LightClient_Lightness_Linear_Set_Unack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Lightness params, Transition Time and Delay + break; + } + + case LIGHT_LIGHTNESS_DEFAULT_GET: + { + result = LightClient_Lightness_Default_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_DEFAULT_SET: + { + result = LightClient_Lightness_Default_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LightnessDefaultParam_t)); + break; + } + case LIGHT_LIGHTNESS_DEFAULT_SET_UNACK: + { + result = LightClient_Lightness_Default_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LightnessDefaultParam_t)); + break; + } + + + case LIGHT_LIGHTNESS_RANGE_GET: + { + result = LightClient_Lightness_Range_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_RANGE_SET: + { + result = LightClient_Lightness_Range_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LightnessRangeParam_t)-1); //Remove the size of StatusCode + break; + } + case LIGHT_LIGHTNESS_RANGE_SET_UNACK: + { + result = LightClient_Lightness_Range_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LightnessRangeParam_t)-1); //Remove the size of StatusCode + break; + } + + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_CTL +/******************************************************************************/ + case LIGHT_CTL_GET: + { + result = LightClient_Ctl_Get(elementIndex); + break; + } + case LIGHT_CTL_SET: + { + result = LightClient_Ctl_Set_Ack(elementIndex, + msg_params, + (sizeof(Light_CtlParam_t)-4) ); //Remove the size of Last_Lightness and Last_Temperature + break; + } + case LIGHT_CTL_SET_UNACK: + { + result = LightClient_Ctl_Set_Unack(elementIndex, + msg_params, + (sizeof(Light_CtlParam_t)-4) ); //Remove the size of Last_Lightness and Last_Temperature + break; + } + + case LIGHT_CTL_TEMPERATURE_GET: + { + result = LightClient_Ctl_Temperature_Get(elementIndex); + break; + } + case LIGHT_CTL_TEMPERATURE_SET: + { + result = LightClient_Ctl_Temperature_Set_Ack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + case LIGHT_CTL_TEMPERATURE_SET_UNACK: + { + result = LightClient_Ctl_Temperature_Set_Unack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + + case LIGHT_CTL_TEMPERATURE_RANGE_GET: + { + result = LightClient_Ctl_Temperature_Range_Get(elementIndex); + break; + } + case LIGHT_CTL_TEMPERATURE_RANGE_SET: + { + result = LightClient_Ctl_Temperature_Range_Set_Ack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureRangeParam_t)-1); //Remove the size of StatusCode + break; + } + case LIGHT_CTL_TEMPERATURE_RANGE_SET_UNACK: + { + result = LightClient_Ctl_Temperature_Range_Set_Unack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureRangeParam_t)-1); //Remove the size of StatusCode + break; + } + + case LIGHT_CTL_DEFAULT_GET: + { + result = LightClient_Ctl_Default_Get(elementIndex); + break; + } + case LIGHT_CTL_DEFAULT_SET: + { + result = LightClient_Ctl_Default_Set_Ack(elementIndex, + msg_params, + sizeof(Light_CtlDefaultParam_t)); + break; + } + case LIGHT_CTL_DEFAULT_SET_UNACK: + { + result = LightClient_Ctl_Default_Set_Unack(elementIndex, + msg_params, + sizeof(Light_CtlDefaultParam_t)); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_CTL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_HSL +/******************************************************************************/ + case LIGHT_HSL_GET: + { + result = LightClient_Hsl_Get(elementIndex); + break; + } + case LIGHT_HSL_SET: + { + result = LightClient_Hsl_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslParam_t) ); + break; + } + case LIGHT_HSL_SET_UNACK: + { + result = LightClient_Hsl_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslParam_t) ); + break; + } + + case LIGHT_HSL_DEFAULT_GET: + { + result = LightClient_Hsl_Default_Get(elementIndex); + break; + } + case LIGHT_HSL_DEFAULT_SET: + { + result = LightClient_Hsl_Default_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslDefaultParam_t) ); + break; + } + case LIGHT_HSL_DEFAULT_SET_UNACK: + { + result = LightClient_Hsl_Default_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslDefaultParam_t) ); + break; + } + + case LIGHT_HSL_RANGE_GET: + { + result = LightClient_Hsl_Range_Get(elementIndex); + break; + } + case LIGHT_HSL_RANGE_SET: + { + result = LightClient_Hsl_Range_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslRangeParam_t)-1); //Remove the size of StatusCode + break; + } + case LIGHT_HSL_RANGE_SET_UNACK: + { + result = LightClient_Hsl_Range_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslRangeParam_t)-1); //Remove the size of StatusCode + break; + } + + case LIGHT_HSL_HUE_GET: + { + result = LightClient_Hsl_Hue_Get(elementIndex); + break; + } + case LIGHT_HSL_HUE_SET: + { + result = LightClient_Hsl_Hue_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslHueParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + case LIGHT_HSL_HUE_SET_UNACK: + { + result = LightClient_Hsl_Hue_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslHueParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + + case LIGHT_HSL_SATURATION_GET: + { + result = LightClient_Hsl_Saturation_Get(elementIndex); + break; + } + case LIGHT_HSL_SATURATION_SET: + { + result = LightClient_Hsl_Saturation_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslSaturationParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + case LIGHT_HSL_SATURATION_SET_UNACK: + { + result = LightClient_Hsl_Saturation_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslSaturationParam_t)-2); //Remove the size of Transition Time and Delay + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_HSL */ +/******************************************************************************/ +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_LC +/******************************************************************************/ + case LIGHT_LC_MODE_GET: + { + result = LightClient_LC_Mode_Get(elementIndex); + break; + } + case LIGHT_LC_MODE_SET: + { + result = LightClient_LC_Mode_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LC_ModeParam_t)); + break; + } + case LIGHT_LC_MODE_SET_UNACK: + { + result = LightClient_LC_Mode_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LC_ModeParam_t)); + break; + } + case LIGHT_LC_OM_GET: + { + result = LightClient_LC_OM_Get(elementIndex); + break; + } + case LIGHT_LC_OM_SET: + { + result = LightClient_LC_OM_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LC_OccupancyModeParam_t)); + break; + } + case LIGHT_LC_OM_SET_UNACK: + { + result = LightClient_LC_OM_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LC_OccupancyModeParam_t)); + break; + } + case LIGHT_LC_ON_OFF_GET: + { + result = LightClient_LC_OnOff_Get(elementIndex); + break; + } + case LIGHT_LC_ON_OFF_SET: + { + result = LightClient_LC_OnOff_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LC_OnOffParam_t)); + break; + } + case LIGHT_LC_ON_OFF_SET_UNACK: + { + result = LightClient_LC_OnOff_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LC_OnOffParam_t)); + break; + } + + case LIGHT_LC_PROPERTY_GET: + { + result = LightClient_LC_Property_Get(elementIndex, msg_params); + break; + } + case LIGHT_LC_PROPERTY_SET: + { + + result = LightClient_LC_Property_Set_Ack(elementIndex, + msg_params, + 5); + break; + } + case LIGHT_LC_PROPERTY_SET_UNACK: + { + + result = LightClient_LC_Property_Set_Unack(elementIndex, + msg_params, + 5); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_LC */ +/******************************************************************************/ + default: + { + TRACE_M(TF_LIGHT, "OpCode value invalid %d \r\n", msg_opcode); + result = MOBLE_RESULT_FAIL; + } + } + return result; +} + +/** +* @brief Appli_Light_Lightness_Status: This function is callback for Application +* when Light Lightness status message is received +* @param pLightness_status: Pointer to the parameters received for message +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Status(MOBLEUINT8 const *pLightness_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#824E!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pLightness_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Lightness: 0x%x (%d)\r\n", + value | pLightness_status[i] << 8, + value | pLightness_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Lightness: 0x%x (%d)\r\n", + value | pLightness_status[i] << 8, + value | pLightness_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\r\n", + pLightness_status[i], + pLightness_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Linear_Status: This function is callback for Application +* when Light Lightness Linear status message is received +* @param pLightnessLinear_status: Pointer to the parameters received for message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Linear_Status(MOBLEUINT8 const *pLightnessLinear_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Linear_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8252!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pLightnessLinear_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Lightness: 0x%x (%d)\r\n", + value | pLightnessLinear_status[i] << 8, + value | pLightnessLinear_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Lightness: 0x%x (%d)\r\n", + value | pLightnessLinear_status[i] << 8, + value | pLightnessLinear_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\r\n", + pLightnessLinear_status[i], + pLightnessLinear_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Last_Status: This function is callback for Application +* when Light Lightness Last status message is received +* @param pLightnessDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Last_Status(MOBLEUINT8 const *pLightnessLast_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Last_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8256!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + value = pLightnessLast_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness Last: 0x%x (%d)\r\n", + value | pLightnessLast_status[i] << 8, + value | pLightnessLast_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Default_Status: This function is callback for Application +* when Light Lightness Default status message is received +* @param pLightnessDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Default_Status(MOBLEUINT8 const *pLightnessDefault_status, MOBLEUINT32 pLength + , MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Default_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8256!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + value = pLightnessDefault_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness Default: 0x%x (%d)\r\n", + value | pLightnessDefault_status[i] << 8, + value | pLightnessDefault_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Range_Status: This function is callback for Application +* when Light Lightness range ststus message is received +* @param pLightnessRange_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Range_Status(MOBLEUINT8 const *pLightnessRange_status, MOBLEUINT32 pLength + , MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Range_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8258!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + TRACE_M(TF_LIGHT,"Status Code: 0x%x (%d)\r\n", + pLightnessRange_status[i], + pLightnessRange_status[i]); + } + else if((i == 1) || (i == 3)) + { + value = pLightnessRange_status[i]; + } + else if(i == 2) + { + TRACE_M(TF_LIGHT,"Range Min: 0x%x (%d)\r\n", + value | pLightnessRange_status[i] << 8, + value | pLightnessRange_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Range Max: 0x%x (%d)\r\n", + value | pLightnessRange_status[i] << 8, + value | pLightnessRange_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Ctl_Status: This function is callback for Application +* when Light CTL status message is received +* @param pLightCtl_status: Pointer to the parameters received for message +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Ctl_Status(MOBLEUINT8 const *pLightCtl_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Ctl_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8260!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4) || (i == 6)) + { + value = pLightCtl_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present CTL Lightness: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Present CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Target CTL Lightness: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 7) + { + TRACE_M(TF_LIGHT,"Target CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 8) + { + TRACE_M(TF_LIGHT,"Remaining Time:0x%x (%d)\r\n", + pLightCtl_status[i], + pLightCtl_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_CtlTemperature_Status: This function is callback for Application +* when Light CTL temperature status message is received +* @param pLightCtlTemp_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Status(MOBLEUINT8 const *pLightCtlTemp_status, MOBLEUINT32 pLength + , MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_CtlTemperature_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8266!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4) || (i == 6)) + { + value = pLightCtlTemp_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Present CTL Delta UV: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Target CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 7) + { + TRACE_M(TF_LIGHT,"Target CTL Delta UV: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 8) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\r\n", + pLightCtlTemp_status[i], + pLightCtlTemp_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_CtlTemperature_Range_Set: This function is callback for Application +* when Light CTL temperature range status message is received +* @param pCtlTempRange_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Status(MOBLEUINT8 const *pCtlTempRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_CtlTemperature_Range_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8263!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + TRACE_M(TF_LIGHT,"Status Code: 0x%x (%d)\r\n", + pCtlTempRange_status[i], + pCtlTempRange_status[i]); + } + else if((i == 1) || (i == 3)) + { + value = pCtlTempRange_status[i]; + } + else if(i == 2) + { + TRACE_M(TF_LIGHT,"Range Min: 0x%x (%d)\r\n", + value | pCtlTempRange_status[i] << 8, + value | pCtlTempRange_status[i] << 8 ); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Range Max: 0x%x (%d)\r\n", + value | pCtlTempRange_status[i] << 8, + value | pCtlTempRange_status[i] << 8 ); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_CtlDefault_Status: This function is callback for Application +* when Light CTL Default status message is received +* @param pCtlDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlDefault_Status(MOBLEUINT8 const *pCtlDefault_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Ctl_DefaultStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8268!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4)) + { + value = pCtlDefault_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness: 0x%x (%d)\n\r", + value | pCtlDefault_status[i] << 8, + value | pCtlDefault_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Temperature: 0x%x (%d)\n\r", + value | pCtlDefault_status[i] << 8, + value | pCtlDefault_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Delta UV: 0x%x (%d)\n\r", + value | pCtlDefault_status[i] << 8, + value | pCtlDefault_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Hsl_Status: This function is callback for Application +* when Light HSL status message is received +* @param pHsl_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Hsl_Status(MOBLEUINT8 const *pHsl_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Hsl_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8278!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4)) + { + value = pHsl_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"HSL Lightness: 0x%x (%d)\n\r", + value | pHsl_status[i] << 8, + value | pHsl_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"HSL Hue: 0x%x (%d)\n\r", + value | pHsl_status[i] << 8, + value | pHsl_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"HSL Saturation: 0x%x (%d)\n\r", + value | pHsl_status[i] << 8, + value | pHsl_status[i] << 8); + } + else if(i == 6) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\n\r", + pHsl_status[i], + pHsl_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslHue_Status: This function is callback for Application +* when Light HSL HUE status message is received +* @param pHslHue_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslHue_Status(MOBLEUINT8 const *pHslHue_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslHue_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8271!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pHslHue_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Hue: 0x%x (%d)\n\r", + value | pHslHue_status[i] << 8, + value | pHslHue_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Hue: 0x%x (%d)\n\r", + value | pHslHue_status[i] << 8, + value | pHslHue_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\n\r", + pHslHue_status[i], + pHslHue_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslSaturation_Status: This function is callback for Application +* when Light HSL Saturation status message is received +* @param pHslSaturation_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslSaturation_Status(MOBLEUINT8 const *pHslSaturation_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslSaturation_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8275!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pHslSaturation_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Saturation: 0x%x (%d)\n\r", + value | pHslSaturation_status[i] << 8, + value | pHslSaturation_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Saturation: 0x%x (%d)\n\r", + value | pHslSaturation_status[i] << 8, + value | pHslSaturation_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\n\r", + pHslSaturation_status[i], + pHslSaturation_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslDefault_Status: This function is callback for Application +* when Light HSL Default status message is received +* @param pHslDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslDefault_Status(MOBLEUINT8 const *pHslDefault_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslDefault_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#827C!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4)) + { + value = pHslDefault_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness: 0x%x (%d)\n\r", + value | pHslDefault_status[i] << 8, + value | pHslDefault_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Hue: 0x%x (%d)\n\r", + value | pHslDefault_status[i] << 8, + value | pHslDefault_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Saturation: 0x%x (%d)\n\r", + value | pHslDefault_status[i] << 8, + value | pHslDefault_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslRange_Status: This function is callback for Application +* when Light HSL range status message is received +* @param pHslRange_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslRange_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#827E!\r\n"); + + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + TRACE_M(TF_LIGHT,"Status Code: 0x%x (%d)\n\r", + pHslRange_status[i], + pHslRange_status[i]); + } + else if((i == 1) || (i == 3) || (i == 5) || (i == 7)) + { + value = pHslRange_status[i]; + } + else if(i == 2) + { + TRACE_M(TF_LIGHT,"Hue Range Min: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Hue Range Max: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + else if(i == 6) + { + TRACE_M(TF_LIGHT,"Saturation Range Min: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + else if(i == 8) + { + TRACE_M(TF_LIGHT,"Saturation Range Max: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h new file mode 100644 index 000000000..2a2dfc254 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h @@ -0,0 +1,111 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_client.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_LIGHT_CLIENT_H +#define __APPLI_LIGHT_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_Light_Lightness_Status(MOBLEUINT8 const *pLightness_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Linear_Status(MOBLEUINT8 const *pLightnessLinear_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Last_Status(MOBLEUINT8 const *pLightnessLast_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Default_Status(MOBLEUINT8 const *pLightnessDefault_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Range_Status(MOBLEUINT8 const *pLightnessRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Ctl_Status(MOBLEUINT8 const *pLightCtl_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Status(MOBLEUINT8 const *pLightCtlTemp_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Status(MOBLEUINT8 const *pCtlTempRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlDefault_Status(MOBLEUINT8 const *pCtlDefault_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Hsl_Status(MOBLEUINT8 const *pHsl_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslSaturation_Status(MOBLEUINT8 const *pHslSaturation_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslHue_Status(MOBLEUINT8 const *pHslHue_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslDefault_Status(MOBLEUINT8 const *pHslDefault_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, + MOBLEUINT16 msg_opcode, + MOBLEUINT8* msg_params); + +#endif /* __APPLI_LIGHT_CLIENT_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c new file mode 100644 index 000000000..17bc31377 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c @@ -0,0 +1,454 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_lc.c + * @author MCD Application Team + * @brief Application interface for light LC Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_light_lc.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variable ----------------------------------------------------------*/ + +__attribute__((aligned(4)))const light_lc_cb_t AppliLightLc_cb = +{ + Appli_LightLCs_ModeGet, + Appli_LightLCs_ModeSet, + Appli_LightLCs_ModeSetUnack, + Appli_LightLCs_ModeStatus, + Appli_LightLCs_OmGet, + Appli_LightLCs_OmSet, + Appli_LightLCs_OmSetUnack, + Appli_LightLCs_OmStatus, + Appli_LightLCs_OnOffGet, + Appli_LightLCs_OnOffSet, + Appli_LightLCs_OnOffSetUnack, + Appli_LightLCs_OnOffStatus, + Appli_LightLCs_PropertyGet, + Appli_LightLCs_PropertySet, + Appli_LightLCs_PropertySetUnack, + Appli_LightLCs_PropertyStatus +}; + +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ +/** + * @brief Callback corresponding to LightLCs_ModeGet_cb + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeGet(MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_ModeSet_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeSet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_ModeSetUnack_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeSetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_ModeSatus_cb + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeStatus(MOBLEUINT8 const* pLightLCMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_ModeStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8294!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC Mode value: %d\n\r", + pLightLCMode_status[i]); + } +} + + +/** + * @brief Callback corresponding to LightLCs_OmGet_cb + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmGet(MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OmSet_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmSet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OmSetUnack_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmSetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OmStatus_cb + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmStatus(MOBLEUINT8 const* pLightLCOccupancyMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_OmStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8298!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC OM value: %d\n\r", + pLightLCOccupancyMode_status[i]); + } +} + + +/** + * @brief Callback corresponding to LightLCs_OnOffGet_cb + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OnOffGet(MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLC_OnOffSet_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_OnOffSet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OnOffSetUnack_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_OnOffSetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OnOffStatus_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_OnOffStatus(MOBLEUINT8 const* pLightLCOnOff_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_OnOffStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#829C!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC OnOff status: %d\n\r", + pLightLCOnOff_status[i]); + } +} + + +/** + * @brief Callback corresponding to LightLCs_PropertyGet_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_PropertyGet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_PropertySet_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_PropertySet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_PropertySetUnack_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_PropertySetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) + { + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); + } + + +/** + * @brief Callback corresponding to LightLCs_PropertyStatus_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_PropertyStatus(MOBLEUINT8 const* pLightLCProperty_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_PropertyStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#64!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC Property status: %d\n\r", + pLightLCProperty_status[i]); + } +} + + +/** + * @brief + * @param + * @retval + */ +__weak MOBLE_RESULT Appli_Light_LCs_Init(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + MOBLEUINT8 lcsElementIndex = 0; + + /* Extract element index of LC server */ + result = ExtractLcServerElementIndex(&lcsElementIndex, +#ifdef APPLICATION_NUMBER_OF_ELEMENTS + APPLICATION_NUMBER_OF_ELEMENTS, +#else + 0, +#endif +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + ENABLE_LIGHT_MODEL_SERVER_LC, + ENABLE_LIGHT_MODEL_SERVER_LC_SETUP, +#else + 0, + 0, +#endif +#ifdef ENABLE_GENERIC_MODEL_SERVER_ONOFF + ENABLE_GENERIC_MODEL_SERVER_ONOFF, +#else + 0, +#endif +#ifdef ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF, +#else + 0, +#endif +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS); +#else + 0); +#endif + + if(MOBLE_SUCCEEDED(result)) + { + result = Light_LCs_Init(&BufferLcServer, lcsElementIndex, &AppliLightLc_cb, SIZE_OF_LC_SERVER_T); + } + + if(MOBLE_FAILED(result)) + { + TRACE_M(TF_LIGHT_LC, "Light LC Server init failed\r\n"); + } + + return result; +} + + +/** + * @brief + * @param + * @retval + */ +__weak MOBLE_RESULT Appli_Light_LC_SensorPropertyUpdate(MOBLEUINT8 elementIndex, + MOBLEUINT16 propertyId, + MOBLEUINT32 value) +{ + return Light_LC_SensorPropertyUpdate(elementIndex, + propertyId, + value); +} + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC +/** + * @brief Handling of serial inputs to LC model + * @param serial string + * @param serial string size + * @retval void + */ +void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) +{ + MOBLE_RESULT result = MOBLE_RESULT_INVALIDARG; + + if (!strncmp(rcvdStringBuff+6, "TR0", 3)) + { + if (rcvdStringSize == 9) + { + /* call to function corresponding MMDL/SR/LLC/BV-03-C */ + result = Light_LC_SetTransitionTimeZero(1); + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else if (!strncmp(rcvdStringBuff+6, "OCCUPANCY", 9)) /* occupancy detect */ + { + if (rcvdStringSize == 15) + { + /* occupancy detected for element index 0 */ + Appli_Light_LC_SensorPropertyUpdate(0, + PRESENCE_DETECTED_PID, + 1); + result = MOBLE_RESULT_SUCCESS; + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + /* Check the result of command processing */ + if(result == MOBLE_RESULT_SUCCESS) + { + BLEMesh_PrintStringCb("Success\r\n"); + } + else if(result == MOBLE_RESULT_OUTOFMEMORY) + { + BLEMesh_PrintStringCb("Fail Out of memory\r\n"); + } + else if(result == MOBLE_RESULT_INVALIDARG) + { + BLEMesh_PrintStringCb("Fail Invalid Argument\r\n"); + } + else + { + BLEMesh_PrintStringCb("Fail\r\n"); + } +} +#endif + + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h new file mode 100644 index 000000000..e9ce605f2 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h @@ -0,0 +1,81 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_lc.h + * @author MCD Application Team + * @brief Application interface for Light Control Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_LIGHT_LC_H +#define __APPLI_LIGHT_LC_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "light_lc.h" + +/* Exported macro ------------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +/******************************************************************************* +Following Variables are used for the Light LC Mode MODEL +*******************************************************************************/ +void Appli_LightLCs_ModeGet(MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_ModeSet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_ModeSetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_ModeStatus(MOBLEUINT8 const* pLightLCMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +void Appli_LightLCs_OmGet(MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OmSet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OmSetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OmStatus(MOBLEUINT8 const* pLightLCOccupancyMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +void Appli_LightLCs_OnOffGet(MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OnOffSet(MOBLEUINT8 const* pRxData, + + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OnOffSetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OnOffStatus(MOBLEUINT8 const* pLightLCOnOff_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +void Appli_LightLCs_PropertyGet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_PropertySet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_PropertySetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_PropertyStatus(MOBLEUINT8 const* pLightLCOccupancyMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Light_LCs_Init(void); +MOBLE_RESULT Appli_Light_LC_SensorPropertyUpdate(MOBLEUINT8 elementIndex, + MOBLEUINT16 propertyId, + MOBLEUINT32 value); +void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, + uint16_t rcvdStringSize); +#endif /* __APPLI_LIGHT_LC_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c new file mode 100644 index 000000000..944a926b2 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c @@ -0,0 +1,1957 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_mesh.c + * @author MCD Application Team + * @brief User Application file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "ble_common.h" +#include "app_conf.h" +#include "hal_common.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "types.h" +#include "ble_hal_aci.h" +#include "ble_hci_le.h" +#include +#include "models_if.h" +#include "mesh_cfg.h" +#include "generic.h" +#include "light.h" +#include "light_lc.h" +#include "sensors.h" +#include "common.h" +#include "serial_if.h" +#include "appli_nvm.h" +#include "pal_nvm.h" +#include "appli_config_client.h" +#include "appli_generic_client.h" +#include "appli_light_client.h" +#include "appli_sensor.h" +#include "appli_sensors_client.h" + +#include "stm32_seq.h" +#if (( CFG_LPM_SUPPORTED == 0) && (ENABLE_PWM_SUPPORT == 1)) +#include "PWM_config.h" +#include "PWM_handlers.h" +#endif +#include "mesh_cfg_usr.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private define ------------------------------------------------------------*/ +#define APPLI_OPTIM 0 + +/*********** Macros to be modified according to the requirement *************/ +#define BOUNCE_THRESHOLD 20U +#define LONG_PRESS_THRESHOLD 1000U +#define MANUAL_UNPROVISION_TIMER 3000U +#define FLASH_ERASE_TIME 100U +//#define DISCOVER_TIMER 10*60*1000 /* 10 minutes */ +#define DISCOVER_TIMER_INTERVAL 10*60*(1000000/CFG_TS_TICK_VAL) /* 10 minutes */ +#if (APPLI_OPTIM == 1) +#define APPLI_MESH_TIMER_INTERVAL 1*(1000/CFG_TS_TICK_VAL) /* 1 ms */ +#endif +#define DEFAULT_DELAY_PACKET_FROM 500U +#define DEFAULT_DELAY_PACKET_RANDOM_TIME 500U +#define USER_OUTPUT_OOB_APPLI_PROCESS 0U +#define INPUT_OOB_TIMEOUT 300U /* input Oob30 Sec timeout*/ +#define PBADV_UNPROV_DEV_BEACON_INTERVAL 100U /* 100 ms */ + +#define DEVICE_KEY_SIZE 16U +#define APP_KEY_SIZE 16U +#if (LOW_POWER_FEATURE == 1) +#define LPN_API_TIMER_INTERVAL 5*(1000000/CFG_TS_TICK_VAL) /* 5 secondes */ +#endif +/* Private macro -------------------------------------------------------------*/ +#define MAX_APPLI_BUFF_SIZE 8 +#define MAX_PENDING_PACKETS_QUE_SIZE 2 +#define DATA_BUFFER_LENGTH 8 +#define MAX_NUMB_ELEMENTS APPLICATION_NUMBER_OF_ELEMENTS +#define CUSTOM_BEACON_AD_TYPE 0x00 +#define ENABLE_CUSTOM_BEACON 0 +#define CUSTOM_BEACON_INTERVAL 2000U + +/**********************Friendship callbacks macros ****************************/ +#define FN_CLEARED_REPEAT_REQUEST 1 +#define FN_CLEARED_POLL_TIMEOUT 2 +#define FN_CLEARED_FRIEND_CLEAR 3 +#define LPN_CLEARED_NO_RESPONSE 1 + +/* Private variables ---------------------------------------------------------*/ + + +enum ButtonState +{ + BS_OFF, + BS_DEBOUNCE, + BS_SHORT_PRESS, + BS_LONG_PRESS +}; + +enum ButtonState buttonState = BS_OFF; +tClockTime tBounce = 0; +/*Will be an array aligned with number of elements*/ +MOBLEUINT8 Appli_LedState = 0; +MOBLEUINT16 IntensityValue = INTENSITY_LEVEL_ZERO; +MOBLEUINT8 IntensityFlag = FALSE; +MOBLEUINT8 ProxyFlag = 0; +MOBLEUINT8 ProvisionFlag = 0; +MOBLEUINT8 UnprovisionInProgress = 0; + +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB +static MOBLEUINT8 PrvngInProcess = 0; +static MOBLEUINT32 OutputOobData = 0; +static MOBLEUINT32 OutputOobBlinkCount = 0; +#endif + +#ifdef ENABLE_AUTH_TYPE_INPUT_OOB +MOBLEUINT8 InputOobData[8] = {0}; +MOBLEUINT8 inputOOBDataReady = 0; +#endif + +/*Number Of Elements selected per Node. Maximum Elements supported = 3*/ +MOBLEUINT8 NumberOfElements = APPLICATION_NUMBER_OF_ELEMENTS; + +#ifdef ENABLE_AUTH_TYPE_STATIC_OOB +/* 16 octets Static OOB information to be input here. Used during provisioning by Library */ +const MOBLEUINT8 StaticOobBuff[SIZE_STATIC_OOB] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}; +#else +const MOBLEUINT8 StaticOobBuff[] = {0}; +#endif + +#ifdef PUB_KEY_TYPE_OOB +/* 64 octets Public Key information to be input here. It is only required for Public Key OOB case. +Used during provisioning by Library */ +const MOBLEUINT8 PubKeyBuff[64] = {0xF4, 0x65, 0xE4, 0x3F, 0xF2, 0x3D, 0x3F, 0x1B, 0x9D, 0xC7, +0xDF, 0xC0, 0x4D, 0xA8, 0x75, 0x81, 0x84, 0xDB, 0xC9, 0x66, 0x20, 0x47, 0x96, 0xEC, 0xCF, +0x0D, 0x6C, 0xF5, 0xE1, 0x65, 0x00, 0xCC, 0x02, 0x01, 0xD0, 0x48, 0xBC, 0xBB, 0xD8, 0x99, +0xEE, 0xEF, 0xC4, 0x24, 0x16, 0x4E, 0x33, 0xC2, 0x01, 0xC2, 0xB0, 0x10, 0xCA, 0x6B, 0x4D, +0x43, 0xA8, 0xA1, 0x55, 0xCA, 0xD8, 0xEC, 0xB2, 0x79}; + +/* 32 octets Private Key information to be input here. It is only required for Public Key OOB case. +Used during provisioning by Library */ +const MOBLEUINT8 PrivKeyBuff[32] = {0x52, 0x9A, 0xA0, 0x67, 0x0D, 0x72, 0xCD, 0x64, 0x97, 0x50, +0x2E, 0xD4, 0x73, 0x50, 0x2B, 0x03, 0x7E, 0x88, 0x03, 0xB5, 0xC6, 0x08, 0x29, 0xA5, 0xA3, +0xCA, 0xA2, 0x19, 0x50, 0x55, 0x30, 0xBA}; +#else +const MOBLEUINT8 PubKeyBuff[] = NULL; +const MOBLEUINT8 PrivKeyBuff[] = NULL; +#endif + + + +/* Select Node as Sniffer, Means able to sniff all the packets +* 0 - Filters are enabled and packets not targeted to node are filtered +* 1 - Filters are disabled and packets not targeted to node are not filtered +*/ +MOBLEUINT8 DisableFilter = 0; + +#if LOW_POWER_FEATURE +MOBLEINT32 BLEMesh_sleepTime; +MOBLEUINT32 SysRefCount; +MOBLEBOOL LPN_scan_enabled; +#endif + +MOBLEUINT8 nvm_operation; +MOBLEUINT8 nvm_flash_page; +MOBLEUINT8 provisioning_completion; + +/* Timer to control unprovisioned device beacons */ +#if PB_ADV_SUPPORTED +MOBLEUINT8 discoverTimer_Id; +tClockTime discoverTimerinterval = DISCOVER_TIMER_INTERVAL; +#endif + +#if (APPLI_OPTIM == 1) +MOBLEUINT8 appliTaskTimer_Id; +#endif +#if LOW_POWER_FEATURE +volatile uint8_t BleProcessInit = 0; +#endif +#if (LOW_POWER_FEATURE == 1) +MOBLEUINT8 lowPowerNodeApiTimer_Id; +#endif + +MOBLEUINT8 pPropertyId[4]; + +#ifdef ENABLE_PIR_SENSOR +MOBLEUINT8 pLightLCOnOffParam2[sizeof(Light_LC_OnOffParam_t)]; +#endif +/********************* Application configuration **************************/ +#if defined(__GNUC__) || defined(__IAR_SYSTEMS_ICC__) || defined(__CC_ARM) +MOBLEUINT8 bdaddr[8]; + +#ifdef INTERNAL_UNIQUE_NUMBER_MAC +static void Appli_GetMACfromUniqueNumber(void); +#endif /* INTERNAL_UNIQUE_NUMBER_MAC */ + +const void *mobleNvmBase; +const void *appNvmBase; +const void *prvsnr_data; +#else +#error "Unknown compiler" +#endif /* __GNUC__ || defined(__IAR_SYSTEMS_ICC__) || defined(__CC_ARM) */ + +/* Private function prototypes -----------------------------------------------*/ +static void Appli_LongButtonPress(void); +static void Appli_ShortButtonPress(void); +#if USER_OUTPUT_OOB_APPLI_PROCESS +void Appli_OobAuthenticationProcess(void); +#endif +void BLEMesh_UnprovisionCallback(MOBLEUINT8 reason); +void Appli_LowPowerProcess(void); +#if (APPLI_OPTIM == 1) +static void AppliMeshTask(void); +#endif +void Appli_GetPublicationParamsCb(model_publicationparams_t* pPubParameters); +WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInProcess, + MOBLEUINT16 nodeAddress)); + +/* Private functions ---------------------------------------------------------*/ + +/************************* Button Control functions ********************/ +/** +* @brief Function calls when a button is pressed for short duration +* @param void +* @retval void +*/ +static void Appli_ShortButtonPress(void) +{ + BLEMesh_ModelsCommand(); +} + + +/** +* @brief Function calls when a button is pressed for Long duration +* @param void +* @retval void +*/ +static void Appli_LongButtonPress(void) +{ + /** GENERIC ONOFF **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_ON_OFF_GET, NULL); + + /** GENERIC LEVEL **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_LEVEL_GET, NULL); + + /** GENERIC POWER ONOFF **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_GET, NULL); + + /** GENERIC TRANSITION TIME **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_GET, NULL); + + /** LIGHT LIGHTNESS **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_GET, NULL); + + /** LIGHT LIGHTNESS LINEAR **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS LINEAR GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_GET, NULL); + + /** LIGHT LIGHTNESS DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_GET, NULL); + + /** LIGHT LIGHTNESS RANGE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_GET, NULL); + + /** LIGHT LIGHTNESS CTL **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_GET, NULL); + + /** LIGHT LIGHTNESS CTL TEMPERATURE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_GET, NULL); + + /** LIGHT LIGHTNESS CTL TEMPERATURE RANGE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_GET, NULL); + + /** LIGHT LIGHTNESS CTL DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_GET, NULL); + + /** LIGHT LIGHTNESS HSL **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_GET, NULL); + + /** LIGHT LIGHTNESS HSL DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_GET, NULL); + + /** LIGHT LIGHTNESS HSL RANGE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_RANGE_GET, NULL); + + /** LIGHT LIGHTNESS HSL HUE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_HUE_GET, NULL); + + /** LIGHT LIGHTNESS HSL SATURATION**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_SATURATION_GET, NULL); + + /** LIGHT LC MODE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_MODE_GET, NULL); + + /** LIGHT LC OM**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_OM_GET, NULL); + + /** LIGHT LC ON OFF**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ON OFF GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_ON_OFF_GET, NULL); + + /** LIGHT LC PROPERTY **/ +//LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B + pPropertyId[0]= 0x2B; // Property ID byte 0 : Property ID identifying a Light LC Property. + pPropertyId[1]= 0x00; // Property ID byte 1 : Property ID identifying a Light LC Property. +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_PROPERTY_GET, pPropertyId); + + + /* SENSOR APIs */ + //PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + pPropertyId[0]= 0x4F; // Property ID byte 0 : Property ID for the sensor + pPropertyId[1]= 0x00; // Property ID byte 1 : Property ID for the sensor + + /** SENSOR DESCRIPTOR**/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR DESCRIPTOR GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_DESCRIPTOR_GET, pPropertyId); + + /** SENSOR CADENCE**/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_CADENCE_GET, pPropertyId); + + /** SENSOR SETTINGS **/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTINGS GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SETTINGS_GET, pPropertyId); + + /** SENSOR SETTING **/ + pPropertyId[2]= 0xAD; // Sensor Setting Property ID byte 0 : Property ID for the sensor setting + pPropertyId[3]= 0x00; // Sensor Setting Property ID byte 1 : Property ID for the sensor setting + +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SETTING_GET, pPropertyId); + + /** SENSOR GET **/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_GET, pPropertyId); + + /** SENSOR COLUMN **/ +// pPropertyId[2]= 0x01; // Raw Value X byte 0 : Raw value identifying a column +// pPropertyId[3]= 0x00; // Raw Value X byte 1 : Raw value identifying a column +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR COLUMN GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_COLUMN_GET, pPropertyId); + + /** SENSOR SERIES **/ +// pPropertyId[2]= 0x01; // Raw Value X1 byte 0 : Raw value identifying a starting column. +// pPropertyId[3]= 0x02; // Raw Value X2 byte 0 : Raw value identifying an ending column. +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SERIES GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SERIES_GET, pPropertyId); + + IntensityPublish(); + +} + +/** +* @brief Updates the button status +* @param int isPressed +* @retval void +*/ +static void Appli_UpdateButtonState(int isPressed) +{ + uint32_t t0 = 0,t1 = 1; + + t0 = Clock_Time(); /* SW1 press timing */ + + while(BSP_PB_GetState(BUTTON_SW1) == BUTTON_PRESSED); + t1 = Clock_Time(); /* SW1 release timing */ + + if((t1 - t0) > LONG_PRESS_THRESHOLD) + { + Appli_LongButtonPress(); + } + else if((t1 - t0) > BOUNCE_THRESHOLD) + { + /* Button 1 short press action */ + Appli_ShortButtonPress(); + } +} + +/** +* @brief task for the BLE MESH, the MESH Models and the Appli processes +* @param void +* @retval void +*/ +static void Mesh_Task() +{ + BLEMesh_Process(); + BLEMesh_ModelsProcess(); /* Models Processing */ + + if((UnprovisionInProgress > 0) && + (!LL_FLASH_IsActiveFlag_OperationSuspended())) + { + UnprovisionInProgress = 0; + AppliNvm_ClearModelState(); + PalNvmErase(NVM_BASE, 0); + PalNvmErase(NVM_BASE, (NVM_SIZE >> 1)); + PalNvmErase(APP_NVM_BASE, 0); + PalNvmErase(PRVN_NVM_BASE_OFFSET, 0); + TRACE_M(TF_PROVISION,"NVM erased\r\n"); + TRACE_M(TF_PROVISION,"Device is unprovisioned by application \r\n"); + } + +#if (APPLI_OPTIM == 0) + /* Set the task in the scheduler for the next execution */ +#if (LOW_POWER_FEATURE == 0) + UTIL_SEQ_SetTask( 1< 0) + { + Appli_LedState = 1; + } + /* Switch Off the LED */ + else + { + Appli_LedState = 0; + } + + Appli_LedCtrl(); + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief initializes BLE Stack +* @param none +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleStackInitCb() +{ + /* BLE Stack initialization */ + /* Not Required in BLE */ + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Sets transmission power of RF +* @param none +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleSetTxPowerCb(void) +{ + tBleStatus status; + /* API to change the Transmission power of BLE Device */ + /* uint8_t en_high_power, uint8_t pa_level + en_high_power Can be only 0 or 1. Set high power bit on or off. + pa_level Can be from 0 to 7. Set the PA level value + */ + status = aci_hal_set_tx_power_level(1, CFG_TX_POWER); + if (status) + return MOBLE_RESULT_FAIL; + else + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief SET UUID value +* @param uuid_prefix_data : Pointer of UUID buffer data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleSetUUIDCb(MOBLEUINT8 *uuid_prefix_data) +{ + /* UUID is 128 bits (16 bytes) and can guarantee uniqueness across space and time. + It can be Time-based UUID or truly-random or pseudo-random numbers + + In this buffer user need to fill 10 bytes of UUID data. + Remaining 6 bytes, library fill this data with BDaddress. + + For example : + F81D4FAE-7DEC-XBC4-Y12F-17D1AD07A961 (16 bytes) + |_| |_| + + X = 1 i.e. Time Base UUID + X = 4 i.e. Random Number + Y = 4 i.e. Conforming to the current spec + For UUID information refer RFC4122 + */ + + /* copy UUID prefix data*/ + uint8_t uuid_buff[10] = {0xF8,0x1D,0x4F,0xAE,0x7D,0xEC};/*random value by user */ + + uuid_buff[6] = 0x4B; /* 0x4B => 4 : Random */ + uuid_buff[7] = 'S' ; /* User define value */ + uuid_buff[8] = 0xA1; /* 0xA1 => A : Conforming to the current Spec */ + uuid_buff[9] = 'T' ; /* User define value */ + + memcpy(uuid_prefix_data,uuid_buff,sizeof(uuid_buff)); + memcpy(&uuid_prefix_data[10],bdaddr,6); /* Copy bdaddr to last 6 bytes of UUID */ + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief SET CID , PID and VID values +* @param company_product_info : vendor fill product information in this buffer +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleSetProductInfoCB(MOBLEUINT8 *company_product_info) +{ + /* CID : provide 16-bit company identifier assigned by the Bluetooth SIG */ + uint16_t company_id = COMPANY_ID; + + /* PID : Provide 16-bit vendor-assigned product identifier */ + uint16_t product_id = PRODUCT_ID; + + /* VID : Provide 16-bit vendor-assigned product version identifier*/ + uint16_t product_version_id = PRODUCT_VERSION_ID; + + memcpy(company_product_info + 0,(void *)&company_id,sizeof(company_id)); + memcpy(company_product_info + 2 ,(void *)&product_id,sizeof(product_id)); + memcpy(company_product_info + 4 ,(void *)&product_version_id,sizeof(product_version_id)); + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Call back function called when GATT Connection Created +* @param none +* @retval none +*/ +void Appli_BleGattConnectionCompleteCb(void) +{ + ProvisionFlag = 1; + /* Proxy Node, will be called whenever Gatt connection is established */ + /* Turn ON Red LED*/ + ProxyFlag = 1; + BSP_LED_On(LED_GREEN); +} + +/** +* @brief Call back function called when GATT Disconnection Complete +* @param none +* @retval none +*/ +void Appli_BleGattDisconnectionCompleteCb(void) +{ + ProvisionFlag = 0; + /* Proxy Node, will be called whenever Gatt disconnected */ + /* Turn Off Red LED*/ + ProxyFlag = 0; + BSP_LED_Off(LED_GREEN); +} + +/** +* @brief Unprovisioned Node Identification +* @param MOBLEUINT8 data +* @retval none +*/ +void Appli_BleUnprovisionedIdentifyCb(MOBLEUINT8 data) +{ +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + PrvngInProcess = 1; +#endif + TRACE_M(TF_PROVISION,"Unprovisioned Node Identifier received: %02x\n\r", data); +} + +/** +* @brief Set Number of Elements in a Node +* @param none +* @retval Sending the value to BLE Mesh Library +*/ +MOBLEUINT8 Appli_BleSetNumberOfElementsCb(void) +{ + if(NumberOfElements > BLEMesh_GetNumberOfElements()) + { + TRACE_M(TF_MISC, "Number of Elements enabled in application exceeding from Library Capability!\r\n"); + return BLEMesh_GetNumberOfElements(); + } + + else if(NumberOfElements == 0) + { + TRACE_M(TF_MISC,"Number Of Elements must be 1 or greater than 1!\r\n"); + return 1; + } + + else + { + return NumberOfElements; + } +} + +/** +* @brief Sets the Attention Timer Callback function +* @param none +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleAttentionTimerCb(void) +{ +/* avoid printf, if low power feature is supported */ +#if (LOW_POWER_FEATURE == 0) + TRACE_M(TF_MISC, " \r\n"); +#endif /* LOW_POWER_FEATURE == 0 */ + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Call back function to give Output OOB information +* @param MOBLEUINT8* output_oob +* @param MOBLEUINT8 size +* @retval void +*/ +void Appli_BleOutputOOBAuthCb(MOBLEUINT8* output_oob, MOBLEUINT8 size) +{ +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + uint32_t ooBData = 0; + for (MOBLEUINT8 i = 0; i < size; i++) + { + ooBData |= (output_oob[i] << 8*i); + } + OutputOobData = ooBData; + TRACE_M(TF_PROVISION,"Output OOB information for provisioner: %ld\n\r", ooBData); + #endif +} + + +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB +/** +* @brief Process for both output and Input OOB handling +* @param void +* @retval void +*/ +void Appli_OobAuthenticationProcess(void) +{ + if(OutputOobBlinkCount < OutputOobData) + { + OutputOobBlinkCount++; + Appli_LedBlink(); + } + else + { + OutputOobBlinkCount++; + Clock_Wait(1000); + if(OutputOobBlinkCount > OutputOobData+3) + { + OutputOobBlinkCount = 0; + } + } +} +#endif + + +/** +* @brief Call back function to provide Input OOB information +* @param MOBLEUINT8 size +* @retval MOBLEUINT8* +*/ +MOBLEUINT8* Appli_BleInputOOBAuthCb(MOBLEUINT8 size) +{ +#if defined (ENABLE_AUTH_TYPE_INPUT_OOB) && (ENABLE_SERIAL_INTERFACE) + MOBLEUINT16 inputTimer = 0; + TRACE_M(TF_PROVISION,"Input OOB information for provisioner-Size: %d\n\r", size); + while(1) + { + Serial_InterfaceProcess(); + /* Enable Mesh process working in while loop */ + BTLE_StackTick(); + /* Check if input is completed or timeout */ + if((inputOOBDataReady != 0x00) | (inputTimer > INPUT_OOB_TIMEOUT)) + { + inputOOBDataReady = 0; + break; + } + Clock_Wait(100); + inputTimer++; + } + return InputOobData; +#else + return NULL; +#endif +} + + +/** +* @brief Call back function to provide Input OOB information +* @param rcvdStringBuff: buffer to store input string +* @param rcvdStringSize: length of the input string +* @retval void +*/ +void Appli_BleSerialInputOOBValue(char *rcvdStringBuff, uint16_t rcvdStringSize) +{ +#ifdef ENABLE_AUTH_TYPE_INPUT_OOB + unsigned long long InputOobDatatemp; + sscanf(rcvdStringBuff + 5, "%lld", &InputOobDatatemp); + memmove(&InputOobData, &InputOobDatatemp, sizeof(InputOobDatatemp)); + inputOOBDataReady = 1; +#endif +} + + +/** +* @brief Application BLE Disable Filter +* @param none +* @retval Status is replied +*/ +MOBLEUINT8 Appli_BleDisableFilterCb(void) +{ + return DisableFilter; +} + +/** +* @brief Checks and do Manual Unprovision of board +* @param void +* @retval void +*/ +void Appli_CheckForUnprovision(void) +{ + /* Checks if the User button is pressed or not at the startup */ + if (BSP_PB_GetState(BUTTON_SW1) == BUTTON_PRESSED) + { + BSP_LED_On(LED_BLUE); + tClockTime t = Clock_Time(); + int interrupted = 0; + + /*Wait to check if user is pressing the button persistently*/ + while ((Clock_Time() - t) < MANUAL_UNPROVISION_TIMER) + { + if (BSP_PB_GetState(BUTTON_SW1) != BUTTON_PRESSED) + { + interrupted = 1; + break; + } + } + /* Unprovision, show that unprovisioning is completed, and + wait until user releases button*/ + if (!interrupted) + { + PalNvmErase(NVM_BASE, 0); + PalNvmErase(NVM_BASE, (NVM_SIZE >> 1)); + PalNvmErase(APP_NVM_BASE, 0); + PalNvmErase(PRVN_NVM_BASE_OFFSET, 0); + TRACE_M(TF_PROVISION,"NVM erased\r\n"); + + BLEMesh_Unprovision(); + AppliNvm_ClearModelState(); + TRACE_M(TF_PROVISION,"Device is unprovisioned by application \r\n"); + t = Clock_Time(); + while ((Clock_Time() - t) < FLASH_ERASE_TIME) + { + BLEMesh_Process(); + } + + while (BSP_PB_GetState(BUTTON_SW1) == BUTTON_PRESSED) + { + Appli_LedBlink(); + } + } + BSP_LED_Off(LED_BLUE); + NVIC_SystemReset(); + } + + /* Register the task for all MESH dedicated processes */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_MESH_REQ_ID, UTIL_SEQ_RFU, Mesh_Task ); + /* Set the task in the scheduler for the next scheduling */ +#if (LOW_POWER_FEATURE == 0) + UTIL_SEQ_SetTask( 1<> 1)); + PalNvmErase(APP_NVM_BASE, 0); + PalNvmErase(PRVN_NVM_BASE_OFFSET, 0); + TRACE_M(TF_PROVISION,"NVM erased\r\n"); + + BLEMesh_Unprovision(); + AppliNvm_ClearModelState(); + TRACE_M(TF_PROVISION,"Device is unprovisioned by application \r\n"); + + BLEMesh_Process(); + + NVIC_SystemReset(); + } +} + + +/** +* @brief Checks and updates Mac address to generate MAC Address +* @param void +* @retval MOBLEUINT8 sum return the sum calculated mac +*/ +int Appli_CheckBdMacAddr(void) +{ + MOBLEUINT8 sum = 239; + MOBLEUINT8 result = 0; + tBleStatus status = BLE_STATUS_SUCCESS; + +#ifdef EXTERNAL_MAC_ADDR_MGMT + memcpy(bdaddr, (MOBLEUINT8 *)CFG_ADV_BD_ADDRESS, 7); + bdaddr[7] = (EXTERNAL_MAC_ADDR_MGMT | EXTERNAL_MAC_TYPE); +#endif + +#ifdef INTERNAL_UNIQUE_NUMBER_MAC + status = aci_hal_read_config_data(CONFIG_DATA_PUBADDR_OFFSET, + &bdaddr[7], + bdaddr); + if(status != BLE_STATUS_SUCCESS) + { + TRACE_M(TF_PROVISION, "Failed to read Public Address %d", status); + } + + Appli_GetMACfromUniqueNumber(); + bdaddr[7] = INTERNAL_UNIQUE_NUMBER_MAC; +#endif + + for (int i = 0; i < 6; ++i) + { + sum = (sum << 1) + bdaddr[i]; + } + + if (sum == bdaddr[6]) + { + result = 1; + } + +#if defined(EXTERNAL_MAC_ADDR_MGMT) && defined(EXTERNAL_MAC_IS_PUBLIC_ADDR) + /* Do nothing for modification of 2 MSb */ +#else + bdaddr[5] |= 0xC0; /* 2 Msb bits shall be 11b for Static Random Address */ +#endif + +#ifdef GENERATE_STATIC_RANDOM_MAC + /* 6bytes of MAC will be filled, baddr_tmp[7] will contain the length */ + status = aci_hal_read_config_data(CONFIG_DATA_RANDOM_ADDRESS_OFFSET, + &bdaddr[7], + bdaddr); + if(status != BLE_STATUS_SUCCESS) + { + TRACE_M(TF_PROVISION, "Failed to read Random Address %d", status); + } + + bdaddr[7] = GENERATE_STATIC_RANDOM_MAC; + /* Do nothing for bdaddr, just pass the identification */ + result = 1; /* This will overwrite the above for loop result, + which is redundant for this case */ +#endif + + return result; +} + + +/** +* @brief Reads the unique serial number of the device +* @param void +* @retval void +*/ +#ifdef INTERNAL_UNIQUE_NUMBER_MAC +static void Appli_GetMACfromUniqueNumber(void) +{ +#ifdef STM32L152xE + /************************STM32L152RE 96 bit Unique ID addresses***************/ +#define DEVICE_ID_REG0 (0x1FF800D0) +#define DEVICE_ID_REG1 (0x1FF800D4) +#define DEVICE_ID_REG2 (0x1FF800E4) +#endif + + /* + The unique serial number is a six bytes value generated from STM32 UID + stored at DEVICE_ID_REG0, DEVICE_ID_REG1 and DEVICE_ID_REG2. It is generated + cancating 4bytes from DEVICE_ID_REG2 and first bytes of DEVICE_ID_REG0 and + DEVICE_ID_REG1. Since the UID at DEVICE_ID_REG0 and + DEVICE_ID_REG1 could be identical for same batch samples, + 4 bytes have been taken from DEVICE_ID_REG2 + */ + + uint8_t i; + uint8_t sum = 239; +#if 0 + uint8_t *ls_addr; + + ls_addr = (uint8_t*)DEVICE_ID_REG2; + + for(i = 0; i < 4; i += 1) + { + bdaddr[i] = *ls_addr; + ls_addr++; + } + + bdaddr[4] = *(uint8_t*)(DEVICE_ID_REG0); + bdaddr[5] = (*(uint8_t*)(DEVICE_ID_REG1)) | 0xC0; +#endif + /* Static Device Address: + The two most significant bits + of the address shall be equal to 1, + hence ORed with 0xC0)*/ + + for (i = 0; i < 6; ++i) + { + sum = (sum << 1) + bdaddr[i]; + } + bdaddr[6] = sum; +} +#endif + + +#if 0 +/** +* @brief provides the information of the power saving mode +* @param sleepMode curently unused, to be used in future +* @retval SleepModes returns the mode of the controller +*/ +SleepModes App_SleepMode_Check(SleepModes sleepMode) +{ + if (buttonState == BS_OFF) + { + return SLEEPMODE_WAKETIMER; + } + else + { + return SLEEPMODE_RUNNING; + } +} +#endif + +/** +* @brief callback for unprovision the node by provisioner. +* @param status reserved for future +* @retval void +*/ +void BLEMesh_UnprovisionCallback(MOBLEUINT8 reason) +{ + ProvisionFlag = 0; + + TRACE_I(TF_PROVISION,"Device is unprovisioned by provisioner \n\r"); +#if PB_ADV_SUPPORTED + BLEMesh_SetUnprovisionedDevBeaconInterval(PBADV_UNPROV_DEV_BEACON_INTERVAL); +#endif + AppliNvm_ClearModelState(); +} + +/** +* @brief This function scans and prints unprovisioned devices +* @param unprovDeviceArray: Pointer of an array for filling unprovisioned device UUIDs +* @param noOfUnprovDevices: Pointer to take total count of nearby unprovisioned devices +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT BLEMesh_ScanDevices(neighbor_params_t *unprovDeviceArray, MOBLEUINT8 *noOfUnprovDevices) +{ + MOBLE_RESULT result; + + result = BLEMesh_GetNeighborState(unprovDeviceArray,noOfUnprovDevices); + /* Array print for testing */ + /* Check if any unprovisioned device is available */ + if(!(*noOfUnprovDevices)) + { + TRACE_I(TF_PROVISION,"No Unprovisioned Device Nearby\r\n"); + } + else + { + for(MOBLEINT8 count=0; count < *noOfUnprovDevices; count++) + { + BLEMesh_PrintStringCb(""); + TRACE_I(TF_PROVISION,"Device-%d -> ", count); + BLEMesh_PrintDataCb(unprovDeviceArray[count].uuid, 16); + } + } + return result; +} +/** +* @brief This function returns starts the provisioning of one of the devices +* @param unprovDeviceArray: Pointer of an array having unprovisioned device UUIDs +* @param index: Index of the device to be provisioned +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLEUINT16 index) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + result = BLEMesh_ProvisionRemote((unprovDeviceArray+index)->uuid); + + return result; +} + +/* Customized implementation for provisioning a device from mesh node - End */ + +/** +* @brief Call back function called when PB-ADV link Opened +* @param none +* @retval none +*/ +void BLEMesh_PbAdvLinkOpenCb(void) +{ + ProvisionFlag = 0; + TRACE_M(TF_PROVISION,"PB-ADV Link opened successfully \n\r"); + /* Turn ON Red LED*/ +#if LOW_POWER_FEATURE + /* do nothing */ +#else + BSP_LED_On(LED_RED); +#endif +} + + +/** +* @brief Call back function called when PB-ADV link Closed +* @param none +* @retval none +*/ +void BLEMesh_PbAdvLinkCloseCb(void) +{ + TRACE_M(TF_PROVISION,"PB-ADV Link Closed successfully \n\r"); + /* Turn Off Red LED*/ +#if LOW_POWER_FEATURE + /* do nothing */ +#else + BSP_LED_Off(LED_RED); +#endif +} + + +/** +* @brief callback for provision the node by provisioner. +* @param void +* @retval void +*/ +void BLEMesh_ProvisionCallback(void) +{ + ProvisionFlag = 1; +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + PrvngInProcess = 0; +#endif + TRACE_I(TF_PROVISION,"Device is provisioned by provisioner \r\n"); + +#if (LOW_POWER_FEATURE == 1) + /* Call API LPN_API_TIMER_INTERVAL after LPN provisioning */ +// HW_TS_Start(lowPowerNodeApiTimer_Id, LPN_API_TIMER_INTERVAL); +#endif +} + + +/** +* @brief callback for configuration the node by provisioner. +* @param void +* @retval void +*/ +void BLEMesh_ConfigurationCallback(void) +{ +#if (LOW_POWER_FEATURE == 1) +// /* Set the task in the scheduler for the next execution */ +// UTIL_SEQ_SetTask( 1< Provisioned node. \n\r"); + } + else + { + TRACE_M(TF_NEIGHBOUR,"-> Unprovisioned device. \n\r"); + } + + TRACE_M(TF_NEIGHBOUR,"rssi: %d. ", rssi); + + if (networkAddress != MOBLE_ADDRESS_UNASSIGNED) + { + TRACE_M(TF_NEIGHBOUR,"Network address: 0x%.4x\n\r", networkAddress); + } + else + { + TRACE_M(TF_NEIGHBOUR,"Network address not available\n\r"); + } + + for (MOBLEUINT8 i=0; i<16; i++) + { + if (uuid[i] == 0x00) + { + continue; + } + else + { + TRACE_M(TF_NEIGHBOUR,"UUID: "); + + for (MOBLEUINT8 count=0 ; count<16; count++) + { + TRACE_M(TF_NEIGHBOUR,"%.2x ", uuid[count]); + } + + break; + } + } + + TRACE_M(TF_NEIGHBOUR,"\n\r"); +} + +/** +* @brief Existing neighbor refreshed callback in neighbor table. + If MAC address of neighbor changes it appears as new neighbor. +* @param MAC address of neighbor. +* is neighbor provisioned or unprovisioned device. +* uuid of neighbor. NULL if not available +* network address of neighbor. MOBLE_ADDRESS_UNASSIGNED if not available +* last updated rssi value. +* @retval void +*/ +void BLEMesh_NeighborRefreshedCallback(const MOBLEUINT8* bdAddr, + MOBLEBOOL provisioned, + const MOBLEUINT8* uuid, + MOBLE_ADDRESS networkAddress, + MOBLEINT8 rssi) +{ + TRACE_M(TF_NEIGHBOUR,"Existing neighbor refreshed. Neighbor MAC address:"); + + for (MOBLEUINT8 count=0 ; count<6; count++) + { + TRACE_M(TF_NEIGHBOUR,"%.2x ", bdAddr[count]); + } + + if (provisioned == MOBLE_TRUE) + { + TRACE_M(TF_NEIGHBOUR,"-> Provisioned node. \n\r"); + } + else + { + TRACE_M(TF_NEIGHBOUR,"-> Unprovisioned device. \n\r"); + } + + TRACE_M(TF_NEIGHBOUR,"rssi: %d. ", rssi); + + if (networkAddress != MOBLE_ADDRESS_UNASSIGNED) + { + TRACE_M(TF_NEIGHBOUR,"Network address: 0x%.4x\n\r", networkAddress); + } + else + { + TRACE_M(TF_NEIGHBOUR,"Network address not available\n\r"); + } + + for (MOBLEUINT8 i=0; i<16; i++) + { + if (uuid[i] == 0x00) + { + continue; + } + else + { + TRACE_M(TF_NEIGHBOUR,"UUID: "); + + for (MOBLEUINT8 count=0 ; count<16; count++) + { + TRACE_M(TF_NEIGHBOUR,"%.2x ", uuid[count]); + } + + break; + } + } + + TRACE_M(TF_NEIGHBOUR,"\n\r"); +} + +/** +* @brief Beacon received callback +* Beacons are received only if received beacon ad type is not +* Mesh Message, Mesh Beacon or PB-ADV +* @param MAC address +* data +* length of beacon +* rssi value of beacon +* @retval void +*/ +#if (ENABLE_CUSTOM_BEACON == 1) +/* BLEMesh_CustomBeaconReceivedCallback high frequency callback */ +void BLEMesh_CustomBeaconReceivedCallback(const MOBLEUINT8* bdAddr, + const MOBLEUINT8* data, + MOBLEUINT8 length, + MOBLEINT8 rssi) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + if (length < 2) + { + result = MOBLE_RESULT_FAIL; + TRACE_M(TF_BEACON, "Message is too small \r\n"); + } + + if (result == MOBLE_RESULT_SUCCESS) + { + if (data[1] == CUSTOM_BEACON_AD_TYPE) + { + TRACE_M(TF_BEACON, "Message length(%d), rssi(%d) \r\n", length, rssi); + + if (TF_BEACON == 1) + { + TRACE_I(TF_BEACON, "Data: "); + for (MOBLEUINT8 count=0; count 31 bytes, beacon is rejected +* BLEMesh_SetCustomBeaconInterval should be set to get this callback +* @param beacon data buffer. It includes length and AD type fields +* buffer size +* @retval void +*/ +void BLEMesh_CustomBeaconGeneratorCallback(void* buffer, MOBLEUINT8* size) +{ + MOBLEUINT8 adType = CUSTOM_BEACON_AD_TYPE; + MOBLEUINT8 dataLength = 5; + MOBLEUINT8 data[5] = {0x00,0x01,0x02,0x03,0x04}; + MOBLEUINT8* buf = (MOBLEUINT8*)buffer; + + buf[0] = dataLength+1; + buf[1] = adType; + memcpy(buf+2, data, dataLength); + + *size = dataLength+2; +} + +/** +* @brief Low Power mode process +* If low power feature is supported, device enables low power mode +* @param void +* @retval void +*/ +void Appli_LowPowerProcess(void) +{ +#if 0 +#if LOW_POWER_FEATURE + BluenrgMesh_sleepTime = (MOBLEINT32)BluenrgMesh_GetSleepDuration(); + + if (BluenrgMesh_sleepTime > 0) + { + /* Timer 0 used for low power */ + HAL_VTimerStart_ms(0, BluenrgMesh_sleepTime); + + /* To start virtual timer */ + BTLE_StackTick(); + + /* save virtual timer current count */ + SysRefCount = HAL_VTimerGetCurrentTime_sysT32(); + + /* wakeup either from io or virtual timer */ + BlueNRG_Sleep(SLEEPMODE_WAKETIMER, WAKEUP_IO13, WAKEUP_IOx_LOW); + + /* update systick count based on updated virtual timer count */ + Set_Clock_Time(Clock_Time() + + HAL_VTimerDiff_ms_sysT32(HAL_VTimerGetCurrentTime_sysT32(), SysRefCount)); + + /* Stop Timer 0 */ + HAL_VTimer_Stop(0); + } +#endif /* LOW_POWER_FEATURE */ +#endif +} + +/** +* @brief Appli_IntensityControlPublishing:Function is used to set the intensity value. +* Publishing the value. +* @param void +* @retval void +*/ +void Appli_IntensityControlPublishing(MOBLEUINT8* value) +{ + + if(IntensityFlag == FALSE) + { + + IntensityValue = IntensityValue + (INTENSITY_LEVEL_FULL/5); + value[0] = (MOBLEUINT8)IntensityValue; + value[1] = (MOBLEUINT8)(IntensityValue >> 8) ; + + if(IntensityValue >= INTENSITY_LEVEL_FULL) + { + IntensityFlag = TRUE; + } + + } + else + { + + IntensityValue = IntensityValue - (INTENSITY_LEVEL_FULL/5); + value[0] = (MOBLEUINT8)IntensityValue; + value[1] = (MOBLEUINT8)(IntensityValue >> 8) ; + + if(IntensityValue <= INTENSITY_LEVEL_ZERO) + { + IntensityFlag = FALSE; + } + + } +} + + +/** +* @brief Publish the intensity value for generic level or light lightness +* This function should be called in main loop +* @param void +* @retval void +*/ +void IntensityPublish(void) +{ + +#ifdef LIGHT_CLIENT_MODEL_PUBLISH +#ifdef ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS + MOBLEUINT8 elementIndex = 0; + MOBLEUINT8 pLightnessParam[3]; + Appli_IntensityControlPublishing(pLightnessParam); + Appli_LightClient_API(elementIndex, LIGHT_LIGHTNESS_SET, pLightnessParam); +#endif + +#else +#ifdef GENERIC_CLIENT_MODEL_PUBLISH + MOBLEUINT8 elementIndex = 0; + MOBLEUINT8 pGeneric_LevelParam[3]; + + Appli_IntensityControlPublishing(pGeneric_LevelParam); + Appli_GenericClient_API(elementIndex, GENERIC_LEVEL_SET_ACK, pGeneric_LevelParam); +#endif +#endif +} + +/** +* @brief Application processing +* This function should be called in main loop +* @param void +* @retval void +*/ +void Appli_Process(void) +{ +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + AppliNvm_Process(); +#endif + +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + if(PrvngInProcess) + { +#if USER_OUTPUT_OOB_APPLI_PROCESS + Appli_OobAuthenticationProcess(); +#endif + } +#endif + +#ifdef TPT_LAYER_BUSY_TEST + if(BLEMesh_TrsptIsBusyState()) + { + //SdkEvalLedOn(LED1); + } + else + { + //SdkEvalLedOff(LED1); + } +#endif +} + +#if PB_ADV_SUPPORTED +static void UnprovisionedDeviceBeaconApp(void) +{ + BLEMesh_SetUnprovisionedDevBeaconInterval(0); +} + +static void UnprovisionedDeviceBeaconTask(void) +{ + /** + * The code shall be executed in the background as aci command may be sent + * The background is the only place where the application can make sure a new aci command + * is not sent if there is a pending one + */ + UTIL_SEQ_SetTask( 1< PIR Sensor output + */ + PIRSENSOR_GPIO_CLK_ENABLE(); + + GPIO_InitStruct.Pin = PIRSENSOR_PIN; + GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + HAL_GPIO_Init(PIRSENSOR_GPIO_PORT, &GPIO_InitStruct); + + /* Enable and set PowerOff EXTI Interrupt to the lowest priority */ + HAL_NVIC_SetPriority((IRQn_Type)(PIRSENSOR_EXTI_IRQn), 0x0F, 0x00); + HAL_NVIC_EnableIRQ((IRQn_Type)(PIRSENSOR_EXTI_IRQn)); + + + return; +} +#endif + +/** +* @brief Initializes the Application +* @param void +* @retval void +*/ +void Appli_Init(MOBLEUINT8 *flag) +{ +#if 0 +#ifdef ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE +/* Hardware Factory Restore implementation */ + AppliNvm_FactorySettingReset(); +#endif +#endif + +#if PB_ADV_SUPPORTED + UTIL_SEQ_RegTask( 1<< CFG_TASK_MESH_BEACON_REQ_ID, UTIL_SEQ_RFU, UnprovisionedDeviceBeaconApp ); + /** + * Create Timer to control unprovisioned device beacons + */ + HW_TS_Create(CFG_TIM_PROC_ID_ISR, &discoverTimer_Id, hw_ts_SingleShot, UnprovisionedDeviceBeaconTask); + + HW_TS_Start(discoverTimer_Id, DISCOVER_TIMER_INTERVAL); +#endif + +#if ENABLE_SERIAL_INTERFACE + Serial_Init(); +#endif + +#ifdef SAVE_MODEL_STATE_POWER_FAILURE_DETECTION + GPIO_InitNVICPowerOff(); +#endif + +#ifdef ENABLE_PIR_SENSOR + GPIO_InitNVICPir(); +#endif + +#if 0 +#if (( CFG_LPM_SUPPORTED == 0) && (ENABLE_PWM_SUPPORT == 1)) + __HAL_RCC_TIM1_CLK_ENABLE(); + __HAL_RCC_TIM2_CLK_ENABLE(); + PWM_Init(); +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, 1); +#endif +#ifdef USER_BOARD_COOL_WHITE_LED + Modify_PWM(COOL_LED, 0); + Modify_PWM(WARM_LED, 0); +#endif +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, 1); + Modify_PWM(GREEN_LED, 1); + Modify_PWM(BLUE_LED, 1); +#endif +#endif +#endif + + UTIL_SEQ_RegTask( 1<< CFG_TASK_MESH_SW1_REQ_ID, UTIL_SEQ_RFU, AppliMeshSW1Task ); + +#if (ENABLE_CUSTOM_BEACON == 1) + BLEMesh_SetCustomBeaconInterval(CUSTOM_BEACON_INTERVAL); +#endif + +#if (LOW_POWER_FEATURE == 1) /** + * Create Timer to control unprovisioned device beacons + */ + HW_TS_Create(CFG_TIM_PROC_ID_ISR, &lowPowerNodeApiTimer_Id, hw_ts_SingleShot, LowPowerNodeApiTask); + + UTIL_SEQ_RegTask( 1<< CFG_TASK_MESH_LPN_REQ_ID, UTIL_SEQ_RFU, LowPowerNodeApiApp ); + LPN_scan_enabled = MOBLE_FALSE; +#endif +#if (ENABLE_SENSOR_MODEL_SERVER != 0) + UTIL_SEQ_RegTask( 1<< CFG_TASK_MESH_SW3_REQ_ID, UTIL_SEQ_RFU, AppliMeshSW3Task ); +#ifdef ENABLE_PIR_SENSOR + UTIL_SEQ_RegTask( 1<< CFG_TASK_MESH_PIR_REQ_ID, UTIL_SEQ_RFU, AppliMeshPIRTask ); +#endif +#endif +} + +/*****************************Config Model Callbacks***************************/ +/** +* @brief Callback from Config Model to receive the Publication Parameters +* @param Structure Pointer having parameters - modelID, elementAddress, +* Publish Address, PublishPeriod, PublishTTL, Credential Flag, +* Publish AppKeyIndex, Retransmit Count & Restransmit Interval Steps +* @retval none +*/ +void Appli_GetPublicationParamsCb(model_publicationparams_t* pPubParameters) +{ + if(pPubParameters->modelID == SENSOR_SERVER_MODEL_ID) + { + Sensor_ModelPublishSet(pPubParameters); + } +} + + +/** +* @brief PWM_CoolValue: This function is used to calculate the value for the + cool temperature for the light. +* @param colourValue: Temperature value ratio +* @param brightValue: Lightness value ratio. +* @retval duty: duty fot the PWM +*/ +MOBLEUINT16 PWM_CoolValue(float colourValue ,float brightValue) +{ + float colourDuty; + MOBLEUINT16 duty; + + colourDuty = colourValue * brightValue; + duty = (MOBLEUINT16)(colourDuty * PWM_TIME_PERIOD); + + return duty; +} + + +/** +* @brief PWM_WarmValue: This function is used to calculate the value for the + warm temperature for the light. +* @param colourValue: Temperature value ratio +* @param brightValue: Lightness value ratio. +* @retval duty: duty fot the PWM +*/ +MOBLEUINT16 PWM_WarmValue(float colourValue ,float brightValue) +{ + float warmDuty; + MOBLEUINT16 duty; + + warmDuty = (1-colourValue)* brightValue; + duty = (MOBLEUINT16)(warmDuty * PWM_TIME_PERIOD); + + return duty; +} + +/** +* @brief PwmValueMapping: This function takes the value as parameter from the +* model and return the value according to . +* @param setValue: value to be set from model +* @param maxRange: Max range of the parameter +* @param minRange: Min range of the parameter +* @retval MOBLEUINT8 +*/ +MOBLEUINT16 PwmValueMapping(MOBLEUINT16 setValue , MOBLEUINT16 maxRange , MOBLEINT16 minRange) +{ + MOBLEUINT16 percentValue; + MOBLEUINT16 duty; + +#ifdef SMART_PLUG + percentValue = (setValue * 100)/ (maxRange - minRange); + + if(percentValue < 2) + { + duty = 0; + } + else if((percentValue > 2) && (percentValue <= 10)) + { + duty = 1; + } + else if((percentValue > 10) && (percentValue <= 20)) + { + duty = 2; + } + else if((percentValue > 20) && (percentValue <= 30)) + { + duty = 3; + } + else if((percentValue > 30) && (percentValue <= 40)) + { + duty = 4; + } + else if((percentValue > 40) && (percentValue <= 50)) + { + duty = 5; + } + else if((percentValue > 50) && (percentValue <= 60)) + { + duty = 6; + } + else if((percentValue > 60) && (percentValue <= 70)) + { + duty = 7; + } + else if((percentValue > 70) && (percentValue <= 80)) + { + duty = 8; + } + else if((percentValue > 80) && (percentValue <= 90)) + { + duty = 9; + } + else if(percentValue > 90) + { + duty = 10; + } +#else + if(minRange > 0x00) + { + percentValue = (setValue - 800)/ (maxRange - minRange); + percentValue = (percentValue*100); + } + else + { + percentValue = (setValue * 100)/ (maxRange - minRange); + } + + duty = percentValue*320 ; + + if(duty >= 32000) + { + duty = 31999; + } + if(duty == 0) + { + duty = 1; + } +#endif + + return duty; +} + + +/************************************ Weak linking *********************************** +If implemented in application, linker would replace weak linking in library */ +WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInProcess, MOBLEUINT16 nodeAddress)) +{ + +} + + +/** +* @} +*/ + +/** +* @} +*/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h new file mode 100644 index 000000000..202075e10 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h @@ -0,0 +1,144 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_mesh.h + * @author MCD Application Team + * @brief Header file for the user application file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_MESH_H +#define __APPLI_MESH_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "mesh_cfg_usr.h" +#include "mesh_cfg.h" + +/* Exported macro ------------------------------------------------------------*/ +/* MACROS for Power Level definitions */ +#define POWER_LEVEL_LOW 0 +#define TX_POWER_LEVEL_MINUS_18DBM 0 /* = -18 dBm, */ +#define TX_POWER_LEVEL_MINUS_15DBM 1 /* = -15 dBm, */ +#define TX_POWER_LEVEL_MINUS_12DBM 2 /* = -12 dBm, */ +#define TX_POWER_LEVEL_MINUS_9DBM 3 /* = -9 dBm, */ +#define TX_POWER_LEVEL_MINUS_6DBM 4 /* = -6 dBm, */ +#define TX_POWER_LEVEL_MINUS_2DBM 5 /* = -2 dBm, */ +#define TX_POWER_LEVEL_0DBM 6 /* = 0 dBm, */ +#define TX_POWER_LEVEL_PLUS_5DBM 7 /* = 5 dBm. */ +#define POWER_LEVEL_HIGH 1 +#define TX_POWER_LEVEL_MINUS_14DBM 0 /* = -14 dBm, */ +#define TX_POWER_LEVEL_MINUS_11DBM 1 /* = -11 dBm, */ +#define TX_POWER_LEVEL_MINUS_8DBM 2 /* = -8 dBm, */ +#define TX_POWER_LEVEL_MINUS_5DBM 3 /* = -5 dBm, */ +#define TX_POWER_LEVEL_PLUS_2DBM 5 /* = 2 dBm, */ +#define TX_POWER_LEVEL_PLUS_4DBM 6 /* = 4 dBm, */ +#define TX_POWER_LEVEL_PLUS_8DBM 7 /* = 8 dBm */ + +#ifdef SAVE_MODEL_STATE_POWER_FAILURE_DETECTION +#define POWEROFF_PIN GPIO_PIN_12 +#define POWEROFF_GPIO_PORT GPIOB +#define POWEROFF_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define POWEROFF_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() +#define POWEROFF_EXTI_LINE GPIO_PIN_12 +#define POWEROFF_EXTI_IRQn EXTI15_10_IRQn +#endif + +#ifdef ENABLE_PIR_SENSOR +#define PIRSENSOR_PIN GPIO_PIN_5 +#define PIRSENSOR_GPIO_PORT GPIOC +#define PIRSENSOR_GPIO_CLK_ENABLE() __HAL_RCC_GPIOC_CLK_ENABLE() +#define PIRSENSOR_GPIO_CLK_DISABLE() __HAL_RCC_GPIOC_CLK_DISABLE() +#define PIRSENSOR_EXTI_LINE GPIO_PIN_5 +#define PIRSENSOR_EXTI_IRQn EXTI9_5_IRQn +#endif + +typedef enum _prvn_nvm_state +{ + NVM_INIT = 0, + NVM_SAVE_PENDING, +} prvn_nvm_state; + +/* Exported variables ------------------------------------------------------- */ + +extern MOBLEUINT8 bdaddr[]; + +typedef struct +{ + MOBLEUINT16 nodeAddress; + MOBLEUINT8 numOfElements; + MOBLEUINT8 Reserved1; /* For Alignment by 4*/ + MOBLEUINT16 newNodeAddress; + MOBLEUINT8 newNodeElements; + prvn_nvm_state saveToNVM; + MOBLEUINT8 NewProvNodeDevKey[DEVICE_KEY_SIZE]; + MOBLEUINT8 NewProvNodeAppKey[APP_KEY_SIZE]; + MOBLEUINT8 NewProvNodeUUID[UUID_SIZE]; +} NodeUnderProvisionParam_t; + +extern NodeUnderProvisionParam_t NodeUnderProvisionParam; +extern MOBLEUINT16 Appli_SIG_Models[APPLICATION_NUMBER_OF_ELEMENTS][APPLICATION_SIG_MODELS_MAX_COUNT]; +#ifdef ENABLE_VENDOR_MODEL_SERVER +extern MOBLEUINT32 Appli_Vendor_Models[APPLICATION_NUMBER_OF_ELEMENTS][APPLICATION_VENDOR_MODELS_MAX_COUNT]; +#endif +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_BleStackInitCb(void); +MOBLE_RESULT Appli_BleSetTxPowerCb(void); +MOBLE_RESULT Appli_BleSetUUIDCb(MOBLEUINT8 *uuid_prefix_data); +MOBLE_RESULT Appli_BleSetProductInfoCB(MOBLEUINT8 *company_product_info); +void Appli_BleUnprovisionedIdentifyCb(MOBLEUINT8 data); +void Appli_BleGattConnectionCompleteCb(void); +void Appli_BleGattDisconnectionCompleteCb(void); +MOBLEUINT8 Appli_BleSetNumberOfElementsCb(void); +MOBLE_RESULT Appli_BleAttentionTimerCb(void); +void Appli_BleOutputOOBAuthCb(MOBLEUINT8* output_oob, MOBLEUINT8 size); +MOBLEUINT8* Appli_BleInputOOBAuthCb(MOBLEUINT8 size); +void Appli_BleSerialInputOOBValue(char *rcvdStringBuff, uint16_t rcvdStringSize); +MOBLEUINT8 Appli_BleDisableFilterCb(void); +void BLEMesh_PbAdvLinkCloseCb(void); +void Appli_IntensityControlPublishing(MOBLEUINT8* value); + +int Appli_CheckBdMacAddr(void); +MOBLE_RESULT Appli_LedBlink(void); +MOBLE_RESULT Appli_LedStateCtrlCb(MOBLEUINT16 ctrl); + +void Appli_CheckForUnprovision(void); +void Appli_Unprovision(void); +void Appli_Process(void); +void Appli_LedCtrl(void); +void Appli_Init(MOBLEUINT8 *flag); + +MOBLE_ADDRESS GetAddressToConfigure(void); +MOBLE_ADDRESS GetNewAddressToProvision(void); +void SaveProvisionedNodeAddress(void); +MOBLEUINT8* GetNewProvNodeDevKey(void); +MOBLEUINT8* GetNewProvNodeAppKey(void); +void IntensityPublish(void); +void Start_SelfConfiguration (void); +void Appli_ProvisionerInit(void); +void Appli_StartProvisionerMode(MOBLEUINT8 mode); + +void Appli_GetPublicationParamsCb(model_publicationparams_t*); + +MOBLEUINT16 PWM_CoolValue(float colourValue ,float brightValue); +MOBLEUINT16 PWM_WarmValue(float colourValue ,float brightValue); +MOBLEUINT16 PwmValueMapping(MOBLEUINT16 setValue , MOBLEUINT16 maxRange , MOBLEINT16 minRange); + +MOBLE_RESULT BLEMesh_ScanDevices(neighbor_params_t *unprovDeviceArray, MOBLEUINT8 *noOfUnprovDevices); +MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLEUINT16 index); + +#endif /* __APPLI_MESH_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c new file mode 100644 index 000000000..c75c3ede2 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c @@ -0,0 +1,751 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_nvm.c + * @author MCD Application Team + * @brief User Application file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include +#include "hal_common.h" +#include "ble_mesh.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "mesh_cfg.h" +#include "pal_nvm.h" +#include "appli_mesh.h" +#ifdef SAVE_MODEL_STATE_FOR_ALL_MESSAGES +#include "common.h" +#endif +#if (LOW_POWER_FEATURE == 1) +#include "app_conf.h" +#include "stm32_seq.h" +#endif +#include "config_client.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ +/* Private define ------------------------------------------------------------*/ + +extern const MOBLEUINT8* _bdaddr[]; + +#ifdef SAVE_MODEL_STATE_FOR_ALL_MESSAGES +extern MOBLEUINT8 PowerOnOff_flag; +#endif + +extern const void* appNvmBase; + + +/* +* Page of size 4k, STM32WB, reserved for application is divided into 16 subpages of each 256 bytes +* First subpage is reserved (for e.g. External MAC is present in this area) +* Rest 15 subpages are used on rolling basis for application states. +* First byte of each subpage indicates if page is valid or not +*/ + +#define APP_NVM_RESERVED_SIZE 256U +#define APP_NVM_SUBPAGE_SIZE 256U +#define APP_NVM_MAX_SUBPAGE 15U +#define APP_NVM_SUBPAGE_OFFSET(i) (unsigned int)(APP_NVM_RESERVED_SIZE + APP_NVM_SUBPAGE_SIZE*(i)) + +/* offsets defined wrt start of subpage */ +#define APP_NVM_VALID_FLAG_OFFSET 0U +#define APP_NVM_VALID_FLAG_SIZE 4U +#define APP_NVM_RESET_COUNT_OFFSET (unsigned int)APP_NVM_VALID_FLAG_SIZE +#define APP_NVM_RESET_COUNT_SIZE 12U /* 12 bytes reserved for write cycle optimization */ +#define APP_NVM_GENERIC_MODEL_OFFSET (unsigned int)(APP_NVM_VALID_FLAG_SIZE+APP_NVM_RESET_COUNT_SIZE) +//#define APP_NVM_GENERIC_MODEL_SIZE 16U +#define APP_NVM_LIGHT_MODEL_OFFSET (unsigned int)(APP_NVM_VALID_FLAG_SIZE+APP_NVM_RESET_COUNT_SIZE+APP_NVM_GENERIC_MODEL_SIZE) +//#define APP_NVM_LIGHT_MODEL_SIZE 16U + +#define FLASH_EMPTY_SIGNATURE 0xFFFFFFFF + +#define RADIO_OFF_DELAY 1000 + +/* Private variables ---------------------------------------------------------*/ + +typedef struct +{ + MOBLEUINT8 modelData[APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE]; + MOBLEBOOL erasePageReq; + MOBLEBOOL writeReq; +} APPLI_NVM_REQS; + +/* ALIGN(4) */ +__attribute__((aligned(4))) APPLI_NVM_REQS AppliNvm_Reqs; +MOBLEUINT16 StopRadioInProgress; + +MOBLE_RESULT AppliNvm_EraseRestoreResvNvm(void); +MOBLE_RESULT AppliNvm_FindFirstEmptyPage(MOBLEINT16* subPageIndex, + MOBLEUINT32 SubPageSize, + MOBLEUINT32 totalSubPage, + MOBLEUINT32 nvmBaseOffset); +MOBLE_RESULT AppliNvm_MarkSubpageInvalid(void); +MOBLE_RESULT AppliNvm_FlashProgram(MOBLEUINT32 offset, + void const *buf, MOBLEUINT32 size); + +#if 0 //#ifdef ENABLE_NVM_TEST +/** +* @brief This function erases a specified flash page +* @param Page Number +* @retval MOBLE_RESULT_INVALIDARG if PageNumber overflow +* MOBLE_RESULT_FALSE if flash operation is very close to next radio event +* MOBLE_RESULT_FAIL if flash command error is set +* MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FlashErase(uint16_t PageNumber) +{ + MOBLE_RESULT result; + + if (PageNumber < FLASH_PAGE_NB) + { + BLEMesh_StopAdvScan(); + ATOMIC_SECTION_BEGIN(); + result = PalNvmErase(APP_NVM_BASE, 0); + ATOMIC_SECTION_END(); + } + else /* Invalid page no */ + { + result = MOBLE_RESULT_INVALIDARG; + } + + return result; +} +#endif + +/** +* @brief Program word (32-bit) at a APP_NVM_BASE + APP_NVM_RESERVED_SIZE +* @param TypeProgram Indicate the way to program at a specified address +* @param Address: address to write +* @param Data: word to write +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FlashProgram(MOBLEUINT32 offset, + void const *buf, + MOBLEUINT32 size) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + if (offset > PAGE_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > (APP_NVM_BASE + PAGE_SIZE)) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + result = PalNvmWrite(APP_NVM_BASE, + offset, + buf, + size); + } + + return result; +} + + +/** +* @brief Mark first valid subpage as invalid. +* @param void +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_MarkSubpageInvalid(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; +#if 0 + MOBLEUINT32 valid = 0; + MOBLEINT16 currSubPageIdx; + MOBLEUINT8 subPageTemp[APP_NVM_SUBPAGE_SIZE]; + + /* find valid subpage */ + result = AppliNvm_FindFirstEmptyPage(&currSubPageIdx, + APP_NVM_SUBPAGE_SIZE, + APP_NVM_MAX_SUBPAGE, + (APP_NVM_BASE+APP_NVM_RESERVED_SIZE)); + + + if (result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; + } + else + { + /* mark valid subpage as invalid */ + memcpy((void*)subPageTemp, + (void*)(PRVN_NVM_BASE_OFFSET + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)), + APP_NVM_SUBPAGE_SIZE); + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(currSubPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + if (MOBLE_FAILED(result)) + { + result = MOBLE_RESULT_FAIL; + } + else if (result == MOBLE_RESULT_FALSE) + { + /* radio busy, try again later */ + } + else + { + /* do nothing */ + } + } +#endif + return result; +} + + +/** +* @brief This function writes Reset count value in flash at APP_NVM_BASE + APP_NVM_RESERVED_SIZE +* if device has been turned ON 5 times consecutively with each ON duration < 2s, reset to factory settings +* LED blinks 2 times to indicate device startup without reset +* LED blinks 5 times to indicate reset at device startup +* @param void +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FactorySettingReset(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; +#if 0 + MOBLEINT16 currSubPageIdx = 0; + MOBLEUINT32 resetCount; + MOBLEUINT8 subPageTemp[APP_NVM_SUBPAGE_SIZE]; + + result = AppliNvm_FindFirstEmptyPage(&currSubPageIdx,APP_NVM_SUBPAGE_SIZE,APP_NVM_MAX_SUBPAGE, + (APP_NVM_BASE+APP_NVM_RESERVED_SIZE)); + + if(result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { + /* Not the first reset */ + /* read the previous subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx-1)), + APP_NVM_SUBPAGE_SIZE); + } + else + { + /* read the current subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)), + APP_NVM_SUBPAGE_SIZE); + } + + /* read reset count from the subpage */ + memcpy((void*)&resetCount, + (void*)&(subPageTemp[APP_NVM_RESET_COUNT_OFFSET]), + 4); + resetCount = resetCount << 1; /* Shifting for making Bits 0 from LSB */ + memcpy((void*)&(subPageTemp[APP_NVM_RESET_COUNT_OFFSET]), (void*)&resetCount, 4); + + /* Check for "POWER_ON_OFF_CYCLES_FOR_UNPROVISIONING" times, that many bits shall be zero */ + if (resetCount > MASK_BITS_FOR_POWER_ON_OFF_CYCLES) + { + /* MASK_BITS_FOR_POWER_ON_OFF_CYCLES = 0xFFFFFFE0 */ + + /* update reset count */ + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(currSubPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + + if (!memcmp((void*)&subPageTemp[APP_NVM_RESET_COUNT_OFFSET], + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)+APP_NVM_RESET_COUNT_OFFSET), + 4)) + { + /* updated value of reset count in flash */ + } + + /* Blink twice to indicate device startup + 1 second to blink once and 2 seconds to blink twice */ + for (MOBLEUINT8 i=0; i< ON_TIME_IN_SECONDS_FOR_POWER_CYCLING; i++) + { + Appli_LedBlink(); + } + + /* Load model data copy from nvm */ + memcpy((void*)AppliNvm_Reqs.modelData, + (void*)(APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)+APP_NVM_GENERIC_MODEL_OFFSET), + APP_NVM_MODELDATA_PER_ELEMENT_SIZE); + + result = AppliNvm_MarkSubpageInvalid(); + + if (MOBLE_FAILED(result)) + { + result = MOBLE_RESULT_FAIL; + } + } + else /* Device is forced to factory reset, 5 LSBs are zero */ + { + /* Unprovision node */ + BLEMesh_Unprovision(); + + /* Clear lib data, primary and backup nvm used by BLE-Mesh lib */ + PalNvmErase(NVM_BASE, 0); + PalNvmErase(NVM_BASE, 0x1000); + + AppliNvm_ClearModelState(); + + BLEMesh_SetUnprovisionedDevBeaconInterval(100); + + /* Blink 5 times to indicate factory setting reset */ + for (MOBLEUINT8 i=0; i APP_NVM_MODEL_SIZE) + { + /* incorrect size */ + result = MOBLE_RESULT_FAIL; + } + else + { + memcpy(AppliNvm_Reqs.modelData, + state, + size); + + AppliNvm_Reqs.writeReq = MOBLE_TRUE; + AppliNvm_Reqs.erasePageReq = MOBLE_FALSE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { /* Not the first subpage */ + /* clear models states */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx-1)), + APP_NVM_SUBPAGE_SIZE); + memcpy((void*)&subPageTemp[APP_NVM_GENERIC_MODEL_OFFSET], + (void*)(clearBuff), + APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE); + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(subPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + } + else + { /* First subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx)), + APP_NVM_SUBPAGE_SIZE); + memcpy((void*)&subPageTemp[APP_NVM_GENERIC_MODEL_OFFSET], + (void*)(clearBuff), + APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE); + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(subPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + } + } +#endif /* SAVE_MODEL_STATE_NVM */ + return result; +} + + +/** +* @brief Load Model states from nvm +* @param model state buff +* @param model state buff size +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_LoadModelState(uint8_t state[], + uint16_t* size) +{ +#if (SAVE_MODEL_STATE_NVM == 1) + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEINT16 currSubPageIdx = 0; + + *size = 0; + result = AppliNvm_FindFirstEmptyPage(&currSubPageIdx, + APP_NVM_SUBPAGE_SIZE, + APP_NVM_MAX_SUBPAGE, + APP_NVM_BASE + APP_NVM_RESERVED_SIZE); + + if(result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { + /* Not the first reset */ + /* Load model data copy from nvm */ + memcpy((void*)AppliNvm_Reqs.modelData, + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx-1) + APP_NVM_GENERIC_MODEL_OFFSET), + APP_NVM_GENERIC_MODEL_SIZE + APP_NVM_LIGHT_MODEL_SIZE); + memcpy((void*)state, + (void*)(AppliNvm_Reqs.modelData), + APP_NVM_MODEL_SIZE); + *size = APP_NVM_MODEL_SIZE; + } + } + return result; +#else /* SAVE_MODEL_STATE_NVM */ + *size = 0; + return MOBLE_RESULT_SUCCESS; +#endif /* SAVE_MODEL_STATE_NVM */ +} + + +/** +* @brief Process NVM erase and write requests +* @param void +* @retval void +*/ +void AppliNvm_Process(void) +{ + MOBLE_RESULT result; + MOBLEINT16 subPageIdx; + uint8_t reserveAreaCopy[APP_NVM_RESERVED_SIZE]; + + /* Erase if required */ + if ((AppliNvm_Reqs.erasePageReq == MOBLE_TRUE) && + (!LL_FLASH_IsActiveFlag_OperationSuspended())) + { + if(StopRadioInProgress == 0) + { + /* save reserve flash area */ + memcpy((void*)reserveAreaCopy, + (void*)APP_NVM_BASE, + APP_NVM_RESERVED_SIZE); + + TRACE_M(TF_PROVISION,"Erase flash page\r\n"); + result = PalNvmErase(APP_NVM_BASE, 0); + + if(result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { + /* Not the first reset */ + /* read the previous subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx-1)), + APP_NVM_SUBPAGE_SIZE); + } + else + { + /* read the current subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx)), + APP_NVM_SUBPAGE_SIZE); + } + + memcpy((void*)&(subPageTemp[APP_NVM_GENERIC_MODEL_OFFSET]), + (void*)&(AppliNvm_Reqs.modelData), + APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE); + + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(subPageIdx), + (uint8_t*)subPageTemp, + APP_NVM_SUBPAGE_SIZE); + + if (result == MOBLE_RESULT_SUCCESS) + { + AppliNvm_Reqs.writeReq = MOBLE_FALSE; + } + } + } +} + + +/** +* @brief Function used to set the flag which is responsible for storing the + states in flash. +* @param void +* @retval void +*/ +void AppliNvm_SaveMessageParam (void) +{ +#ifdef SAVE_MODEL_STATE_FOR_ALL_MESSAGES + PowerOnOff_flag = FLAG_SET; +#endif +} + + +/** +* @brief Find first valid subpage available. +* If no valid subpage found, erase page appli nvm to reset it +* @param pointer to variable to update first valid subpage index +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FindFirstEmptyPage(MOBLEINT16* subPageIndex, + MOBLEUINT32 SubPageSize, + MOBLEUINT32 totalSubPage, + MOBLEUINT32 nvmBaseOffset) +{ + MOBLEUINT32 valid[2]; + MOBLEINT8 subPageIdx = -1; + MOBLEUINT32 *subPageOffset; + MOBLEUINT32 addressValidPage; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + for (MOBLEUINT16 count=0; countproperty_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_CadenceSet_cb + * @param Cadence parameters +* @retval None +*/ +void Appli_Sensor_CadenceSet(sensor_CadenceCbParam_t* pCadenceParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pCadenceParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_CadenceSetUnack_cb + * @param Cadence parameters +* @retval None +*/ +void Appli_Sensor_CadenceSetUnack(sensor_CadenceCbParam_t* pCadenceParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pCadenceParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SettingsGet_cb + * @param Setting parameters +* @retval None +*/ +void Appli_Sensor_SettingsGet(sensor_SettingsCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->propertyId, elementIndex, peerAddr, dstPeer); +} + +/** + * @brief Callback corresponding to Sensor_SettingGet_cb + * @param Setting parameters +* @retval None + */ +void Appli_Sensor_SettingGet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SettingSet_cb + * @param Setting parameters +* @retval None +*/ +void Appli_Sensor_SettingSet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SettingSetUnack_cb + * @param Setting parameters +* @retval None +*/ +void Appli_Sensor_SettingSetUnack(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_DescriptorGet_cb + * @param Descriptor parameters +* @retval None +*/ +void Appli_Sensor_DescriptorGet(MOBLEUINT8 prop_ID, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + if(length == 0) + { + TRACE_M(TF_SENSOR, "Sensor Descriptor data for all sensors on element index %X peer addr %X, dst peer %X\r\n", + elementIndex, peerAddr, dstPeer); + } + else + { + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X, dst peer %X\r\n", + prop_ID, elementIndex, peerAddr, dstPeer); + } +} + + +/** + * @brief Callback corresponding to Sensor_Get_cb + * @param Get parameters +* @retval None +*/ +void Appli_Sensor_Get(MOBLEUINT16 prop_ID, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + if(length == 0) + { + TRACE_M(TF_SENSOR, "Sensor Data for all sensors on element index %X peer addr %X dst peer %X\r\n", + elementIndex, peerAddr, dstPeer); + } + else + { + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X \r\n", + prop_ID, elementIndex, peerAddr, dstPeer); + } +} + + +/** + * @brief Callback corresponding to Sensor_ColumnGet_cb + * @param Column parameters +* @retval None +*/ +void Appli_Sensor_ColumnGet(sensor_ColumnCbParams_t* pColumnParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pColumnParam->propertyId, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SeriesGet_cb + * @param Series parameters +* @retval None +*/ +void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pSeriesParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X Raw Value X1 %d Raw Value X2 %d\r\n", + pSeriesParam->propertyId, + pSeriesParam->rawValueX1, + pSeriesParam->rawValueX2); +} + + +/** + * @brief Callback corresponding to Sensor_ReadDescriptor_cb + * Update SENSORX descriptor identified by sensorOffset + * Read from application to optimize RAM + * @param Sensor offset in sensor init structure + * @param descriptor parameters + * @retval Fail if sensor doesn't exist or property ID mismatch occurs + * else Success + */ +MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, + sensor_DescriptorCbParams_t* pDescriptorParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + const sensor_init_params_t* pSensorInitParams = NULL; + + if (sensorOffset < SensorServerInitParams.sensorsCount) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + if (pSensorInitParams->propertyId != pDescriptorParams->propertyId) + { + result = MOBLE_RESULT_FAIL; + } + else + { + /* */ + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + if (pSensorInitParams != NULL && + pDescriptorParams != NULL) + { + pDescriptorParams->positiveTolerance = pSensorInitParams->positiveTolerance; + pDescriptorParams->negativeTolerance = pSensorInitParams->negativeTolerance; + pDescriptorParams->samplingFunction = pSensorInitParams->samplingFunction; + pDescriptorParams->measurementPeriod = pSensorInitParams->measurementPeriod; + pDescriptorParams->updateInterval = pSensorInitParams->updateInterval; + } + else + { + result = MOBLE_RESULT_FAIL; + } + + return result; +} + + +/** + * @brief Callback corresponding to Sensor_ReadValue_cb + * Read sensor value and update buffer + * data length <= 128 + * PreviousTemperatureValue, PresentTemperatureValue to be updated + * every time sensor value is changed and call to Sensor_UpdateCadence + * @param Sensor offset in sensor init structure + * @param Value parameters + * @retval Fail if sensor doesn't exist + * else Success + */ +MOBLE_RESULT Appli_Sensor_ReadValue(MOBLEUINT8 sensorOffset, + sensor_ValueCbParams_t* pValueParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + TRACE_M(TF_SENSOR_M, ">>> \r\n"); + + switch(SensorServerInitParams.sensorInitParams[sensorOffset].propertyId) + { + case PRESENCE_DETECTED_PID: + { + pValueParams->data[0] = Occupancy_Flag; + } + break; + + default: + break; + } + + return result; +} + +#endif + + +/** + * @brief Callback corresponding to Sensor_ReadColumn_cb + * Fill column width and raw valye Y in data buffer + * data length <= 8 + * @param Sensor offset in sensor init structure + * @param Series column parameters + * @retval Fail if sensor doesn't exist + * else Success +*/ +MOBLE_RESULT Appli_Sensor_ReadColumn(MOBLEUINT8 sensorOffset, + MOBLEUINT8 columnOffset, + sensor_ColumnCbParams_t* pColumnParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + const sensor_init_params_t* pSensorInitParams = NULL; + MOBLEUINT8 dataLength = 0; + MOBLEUINT8* data = pColumnParams->data; + + if (sensorOffset < SensorServerInitParams.sensorsCount) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + /* fill sensor column data */ + memcpy(data+dataLength, + &(pSensorInitParams->seriesColumn[columnOffset].columnWidth), + pSensorInitParams->dataLength); + dataLength = pSensorInitParams->dataLength; + + memset(data+dataLength, 0xAA, pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + + pColumnParams->dataLength = dataLength; + } + else + { + result = MOBLE_RESULT_FAIL; + } + + return result; +} + + +/** + * @brief Callback corresponding to Sensor_ReadSeries_cb + * Fill sensor series state for all columns between and including X1 and X2 + * Series data to be concatenated in triplet of raw value X, column width and raw value Y + * X[n] CW[n] Y[n] X[n+1] CW[n+1] Y[n+1] ... + * data length should be less than minimum of 379 or max application packet length supported + * @param Sensor offset in sensor init structure + * @param Series parameters + * @retval Fail if sensor doesn't exist + * else Success + */ +MOBLE_RESULT Appli_Sensor_ReadSeries(MOBLEUINT8 sensorOffset, + sensor_SeriesCbParams_t* pSeriesParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + const sensor_init_params_t* pSensorInitParams = NULL; + MOBLEUINT16 dataLength = 0; + MOBLEUINT8* data = pSeriesParams->data; + + if (sensorOffset < SensorServerInitParams.sensorsCount) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + for (MOBLEUINT8 count=0; countseriesCount; count++) + { + /* fill sensor series data */ + if (pSensorInitParams->seriesColumn[count].rawX >= pSeriesParams->rawValueX1 && + pSensorInitParams->seriesColumn[count].rawX <= pSeriesParams->rawValueX2) + { + memcpy(data+dataLength, + &(pSensorInitParams->seriesColumn[count].rawX), + pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + memcpy(data+dataLength, + &(pSensorInitParams->seriesColumn[count].columnWidth), + pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + memset(data+dataLength, 0xAA, pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + + pSeriesParams->dataLength = dataLength; + } + else + { + /* */ + } + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + return result; +} + + +/** + * @brief Callback corresponding to Sensor_IsFastCadence_cb + * To check if fast cadence to be used for current sensor state + * @param Sensor offset in sensor init structure + * @param Fast Cadence Low + * @param Fast Cadence High + * @retval Trigger status + */ +MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, + void* pFastCadenceLow, + void* pFastCadenceHigh) +{ + MOBLEUINT8 fastCadenceStatus = 0; + MOBLEUINT32 fastCadenceLow = *((MOBLEUINT32*)pFastCadenceLow); + MOBLEUINT32 fastCadenceHigh = *((MOBLEUINT32*)pFastCadenceHigh); + MOBLEUINT32 sensorValue = PresentTemperatureValue; + + if (sensorOffset == 0) + { + if (fastCadenceLow <= fastCadenceHigh) + { + fastCadenceStatus = sensorValue >= fastCadenceLow && + sensorValue <= fastCadenceHigh; + } + else + { + fastCadenceStatus = sensorValue > fastCadenceLow || + sensorValue < fastCadenceHigh; + } +} + else + { + /* Implemented only for sensor at offset 0 */ + } + + return fastCadenceStatus; +} + + +/** + * @brief Callback corresponding to Sensor_IsStatusTrigger_cb + * To check if sensor change in sensor state (delta) is more than + * given trigger state value + * delta up values + * @param Sensor offset in sensor init structure + * @param Trigger type -> value or percent change + * @param Status trigger delta down + * @param Status trigger delta up + * @retval Trigger status +*/ +MOBLEUINT8 Appli_Sensor_IsStatusTrigger(MOBLEUINT8 sensorOffset, + status_trigger_type_e triggerType, + void* pDeltaDown, + void* pDeltaUp) +{ + const sensor_init_params_t* pSensorInitParams = NULL; + MOBLEUINT8 triggerStatus = 0; + MOBLEUINT32 deltaDown = *((MOBLEUINT32*)pDeltaDown); + MOBLEUINT32 deltaUp = *((MOBLEUINT32*)pDeltaUp); + status_trigger_delta_e statusTriggerDelta; + MOBLEUINT32 delta; + + if (sensorOffset == 0) + { + if (PresentTemperatureValue < PreviousTemperatureValue) + { + /* status trigger delta down */ + statusTriggerDelta = STATUS_TRIGGER_DELTA_DOWN; + delta = PreviousTemperatureValue - PresentTemperatureValue; + + TRACE_M(TF_SENSOR, "Delta down value %ld\r\n", delta); + } + else + { + /* status trigger delta up */ + statusTriggerDelta = STATUS_TRIGGER_DELTA_UP; + delta = PresentTemperatureValue - PreviousTemperatureValue; + + TRACE_M(TF_SENSOR, "Delta up value %ld\r\n", delta); + } + + if (triggerType == STATUS_TRIGGER_TYPE_PC) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + if (pSensorInitParams->valuesRange != 0) + { + /* change delta to percentage change (of 0.01 % steps) */ + delta = (MOBLEUINT32)((delta*10000)/pSensorInitParams->valuesRange); + } + else + { + triggerStatus = 0; + } + } + + if ((statusTriggerDelta == STATUS_TRIGGER_DELTA_DOWN && delta >= deltaDown) || + (statusTriggerDelta == STATUS_TRIGGER_DELTA_UP && delta >= deltaUp)) + { + triggerStatus = 1; + } + else + { + triggerStatus = 0; + } + } + + return triggerStatus; +} + + +/** +* @brief Initialize hardware interfaces for sensors and mesh sensor model structures +* Sensor init parameters to be defined in sensor_cfg_usr.h +* Sensors are initialized in the order as defined in sensor_cfg_usr.h + * LPS25HB supports pressure and temperature sensor +* @param void + * @retval + */ +MOBLE_RESULT Appli_Sensor_Init(void) + { + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; +// PRESSURE_StatusTypeDef lps25Status; + + /* Hardware interface initialization */ +#ifndef CUSTOM_BOARD_PWM_SELECTION +// PRESSURE_StatusTypeDef tempStatus; +// PRESSURE_StatusTypeDef pressStatus; +// int16_t temperature; +// int32_t pressure; + +#if 0 + /* Initiallization of sensors */ + lps25Status = LPS25HB_Init((PRESSURE_InitTypeDef*)(&Lps25InitParams)); + + if (lps25Status != PRESSURE_OK) + { + TRACE_M(TF_SENSOR, "Error initializing LPS25HB. status (%d)\r\n", lps25Status); + } + + tempStatus = LPS25HB_I2C_ReadRawTemperature(&temperature); + pressStatus = LPS25HB_I2C_ReadRawPressure(&pressure); + + if (tempStatus == PRESSURE_OK && + pressStatus == PRESSURE_OK) + { + /* TRACE_M(TF_SENSOR, "Raw temperature (%d) and raw pressure (%d)\r\n", + temperature, pressure); */ + } + else + { + TRACE_M(TF_SENSOR, "Error reading LPS25HB at init\r\n"); + } +#endif + +#else + TRACE_M(TF_SENSOR, "LPS25HB not initialized\r\n"); +#endif + + /* initialize sensor server model */ + result = SensorServer_Init(&BufferSensorServer, + &AppliSensor_cb, + TOTAL_SENSOR_SERVER_BUFF_SIZE, + &SensorServerInitParams); + + if(MOBLE_FAILED(result)) + { + TRACE_M(TF_SENSOR, "Sensor Server init failed\r\n"); + } + + return result; + } + + +/** + * @brief Handling of serial inputs to sensor model + * @param Sensor offset in sensor init structure + * @param Sensor value + * @retval void + */ +MOBLE_RESULT Appli_Sensor_Update(MOBLEUINT8 sensorOffset, MOBLEUINT32 value) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + TRACE_M(TF_SENSOR_M, ">>> \r\n"); + Occupancy_Flag = (MOBLEUINT8)value; + return result; +} + + +/** + * @brief Handling of serial inputs to sensor model + * Appli_Sensor_SerialCmd can be used for testing periodic publishing and + * triggered publishing with PTS + * @param serial string + * @param serial string size + * @retval void + */ +void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) +{ + MOBLE_RESULT result = MOBLE_RESULT_INVALIDARG; + MOBLEUINT16 value = 0; + MOBLEUINT8 sensorOffset = 0; + + if (!strncmp(rcvdStringBuff+6, "SETV", 4)) + { + if (rcvdStringSize == 15) + { + sscanf(rcvdStringBuff+11, "%4hx", &value); + + /* Set SENSOR1 value at offset 0 */ + result = Appli_Sensor_Update(sensorOffset, value); + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else if (!strncmp(rcvdStringBuff+6, "PUBLISH", 7)) + { + if (rcvdStringSize == 17) + { + sscanf(rcvdStringBuff+14, "%1hx", &value); + + sensorOffset = value; + + sscanf(rcvdStringBuff+16, "%1hx", &value); + + /* Enable / Disable publishing of sensor as identified by sensor offset */ + if(value == 0) /* Disable */ + { + result = Sensor_UpdatePublishState(sensorOffset, 0); + } + else /* Enable */ + { + result = Sensor_UpdatePublishState(sensorOffset, 1); + } + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + /* Check the result of command processing */ + if(result == MOBLE_RESULT_SUCCESS) + { + BLEMesh_PrintStringCb("Success\r\n"); + } + else if(result == MOBLE_RESULT_OUTOFMEMORY) + { + BLEMesh_PrintStringCb("Fail Out of memory\r\n"); + } + else if(result == MOBLE_RESULT_INVALIDARG) + { + BLEMesh_PrintStringCb("Fail Invalid Argument\r\n"); + } + else + { + BLEMesh_PrintStringCb("Fail\r\n"); + } +} + + +/** + * @} + */ + +/** + * @} + */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h new file mode 100644 index 000000000..4f6cefe6b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h @@ -0,0 +1,111 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_sensor.h + * @author MCD Application Team + * @brief Application interface for Light Mesh Model + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_SENSOR_H +#define __APPLI_SENSOR_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "sensors.h" +#include "mesh_cfg.h" + +/* Exported functions ------------------------------------------------------- */ +void Appli_Sensor_CadenceGet(sensor_CadenceCbParam_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_CadenceSet(sensor_CadenceCbParam_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_CadenceSetUnack(sensor_CadenceCbParam_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingsGet(sensor_SettingsCbParams_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingGet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingSet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingSetUnack(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_DescriptorGet(MOBLEUINT8 pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Get (MOBLEUINT16 prop_ID, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_ColumnGet(sensor_ColumnCbParams_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, + sensor_DescriptorCbParams_t* pDescriptorParams); +MOBLE_RESULT Appli_Sensor_ReadValue(MOBLEUINT8 sensorOffset, + sensor_ValueCbParams_t* pValueParams); +MOBLE_RESULT Appli_Sensor_ReadColumn(MOBLEUINT8 sensorOffset, + MOBLEUINT8 columnOffset, + sensor_ColumnCbParams_t* pColumnParams); +MOBLE_RESULT Appli_Sensor_ReadSeries(MOBLEUINT8 sensorOffset, + sensor_SeriesCbParams_t* pSeriesParams); +MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, + void* pFastCadenceLow, + void* pFastCadenceHigh); +MOBLEUINT8 Appli_Sensor_IsStatusTrigger(MOBLEUINT8 sensorOffset, + status_trigger_type_e triggerType, + void* pDeltaDown, + void* pDeltaUp); +MOBLE_RESULT Appli_Sensor_Init(void); +MOBLE_RESULT Appli_Sensor_Update(MOBLEUINT8 sensorOffset, MOBLEUINT32 value); + +MOBLE_RESULT Appli_Sensor_Update(MOBLEUINT8 sensorOffset, + MOBLEUINT32 value); +void Appli_Sensor_SerialCmd(char *rcvdStringBuff, + uint16_t rcvdStringSize); +#endif /* __APPLI_SENSOR_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c new file mode 100644 index 000000000..cdf66e0f9 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c @@ -0,0 +1,332 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_sensors_client.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_sensor.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "appli_mesh.h" +#include "sensors_client.h" +#include "appli_sensors_client.h" +#include "appli_light_lc.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ + + +/* Private functions ---------------------------------------------------------*/ +/** +* @brief Appli_SensorsClient_API: This function is a Wrapper to call Sensors Client API depending on opcode received in input +* @param elementIndex: Index of the element +* @param msg_opcode: opcode of the desired API +* @param msg_params: buffer containing the desired API parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_SensorsClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + switch(msg_opcode){ +/******************************************************************************/ +#ifdef ENABLE_SENSOR_MODEL_CLIENT +/******************************************************************************/ + case SENSOR_DESCRIPTOR_GET: + { + result = SensorsClient_Descriptor_Get(elementIndex, msg_params); + break; + } + case SENSOR_CADENCE_GET: + { + result = SensorsClient_Cadence_Get(elementIndex, msg_params); + break; + } + case SENSOR_CADENCE_SET: + { + result = SensorsClient_Cadence_Set(elementIndex, + msg_params, + 10); //(sizeof(sensor_CadenceCbParam_t)-3)); + break; + } + case SENSOR_CADENCE_SET_UNACK: + { + result = SensorsClient_Cadence_Set_Unack(elementIndex, + msg_params, + 10); //(sizeof(sensor_CadenceCbParam_t)-3)); + break; + } + case SENSOR_SETTINGS_GET: + { + result = SensorsClient_Settings_Get(elementIndex, msg_params); + break; + } + + case SENSOR_SETTING_GET: + { + result = SensorsClient_Setting_Get(elementIndex, msg_params, sizeof(sensor_SettingsCbParams_t)); + break; + } + case SENSOR_SETTING_SET: + { + + result = SensorsClient_Setting_Set(elementIndex, + msg_params, + 6); + break; + } + case SENSOR_SETTING_SET_UNACK: + { + + result = SensorsClient_Setting_Set_Unack(elementIndex, + msg_params, + 6); + break; + } + case SENSOR_GET: + { + result = SensorsClient_Get(elementIndex, msg_params); + break; + } + case SENSOR_COLUMN_GET: + { + result = SensorsClient_Column_Get(elementIndex, msg_params, 4); + break; + } + case SENSOR_SERIES_GET: + { + result = SensorsClient_Series_Get(elementIndex, msg_params, 4); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_SENSOR_MODEL_CLIENT */ +/******************************************************************************/ + + + default: + { + TRACE_M(TF_SENSOR, "OpCode value invalid %d \r\n", msg_opcode); + result = MOBLE_RESULT_FAIL; + } + } + return result; +} + +/** + * @brief Callback corresponding to Appli_Sensor_Cadence_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Cadence_Status(const MOBLEUINT8 *pCadence, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Cadence_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_CADENCE_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Cadence value: %d\n\r", pCadence[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Settings_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Settings_Status(const MOBLEUINT8 *pSettings, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Settings_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_SETTINGS_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Settings value: %d\n\r", pSettings[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Setting_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Setting_Status(const MOBLEUINT8 *pSetting, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Setting_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_SETTING_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Setting value: %d\n\r", pSetting[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Descriptor_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Descriptor_Status(const MOBLEUINT8 *pDescriptor, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Descriptor_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_DESCRIPTOR_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Descriptor value: %d\n\r", pDescriptor[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Status(const MOBLEUINT8 *pStatus, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Status value: %d\n\r", pStatus[i]); + } +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + Appli_Light_LC_SensorPropertyUpdate(elementIndex, + PRESENCE_DETECTED_PID, + (MOBLEUINT32) pStatus[length-1]); +#endif +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Column_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Column_Status(const MOBLEUINT8 *pColumn, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Column_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_COLUMN_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Column Status value: %d\n\r", pColumn[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Series_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Series_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_SERIES_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Series Status value: %d\n\r", pSeries[i]); + } +} + + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h new file mode 100644 index 000000000..b5c605d15 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h @@ -0,0 +1,72 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_sensor_client.h + * @author MCD Application Team + * @brief Application interface for Sensor Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_SENSOR_CLIENT_H +#define __APPLI_SENSOR_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "sensors.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_ConfigClient_Set(void); +MOBLE_RESULT Appli_SensorsClient_API(MOBLEUINT8 elementIndex, + MOBLEUINT16 msg_opcode, + MOBLEUINT8 *msg_params); +void Appli_Sensor_Descriptor_Status(const MOBLEUINT8 *pDescriptor, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Cadence_Status(const MOBLEUINT8 *pCadence, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Settings_Status(const MOBLEUINT8 *pSettings, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Setting_Status(const MOBLEUINT8 *pSetting, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Status(const MOBLEUINT8 *pStatus, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Column_Status(const MOBLEUINT8 *pColumn, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); + + + + +#endif /* __APPLI_SENSOR_CLIENT_H */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c new file mode 100644 index 000000000..06a5730fe --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c @@ -0,0 +1,565 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_vendor.c + * @author MCD Application Team + * @brief Application interface for Vendor Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" +#include "hal_common.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "vendor.h" +#include "appli_vendor.h" +#include "common.h" +#include "appli_light.h" +#include "models_if.h" +#include "mesh_cfg.h" +#include + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +typedef struct +{ + MOBLE_ADDRESS dst; + MOBLEUINT8 data[VENDOR_DATA_BUFFER_SIZE]; + MOBLEUINT32 length; + MOBLEUINT8 elementIndex; +} APPLI_SEND_BIG_DATA_PACKET; + +/* Private variables ---------------------------------------------------------*/ + +MOBLEUINT8 ResponseBuffer[VENDOR_DATA_BUFFER_SIZE]; +MOBLEUINT16 BuffLength; +APPLI_SEND_BIG_DATA_PACKET Appli_VendorBigData; + +/*Variable to enable OTA for received vendor command*/ +extern MOBLEUINT8 Appli_LedState; +#ifdef USER_BOARD_1LED +extern uint16_t DUTY; +#endif +extern MOBLEUINT8 NumberOfElements; +MOBLEUINT32 TestHitCounter = 0; +extern Appli_LightPwmValue_t Appli_LightPwmValue; + +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief Process the Vendor Device Info Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_DeviceInfo(MOBLEUINT8 const *data, MOBLEUINT32 length) +{ + MOBLEUINT8 tempBuffer[10]; + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + + MOBLEUINT8 subCmd = data[0]; + char *libVersion; + char *subLibVersion; + MOBLEUINT8 inc = 0; + /*First Byte is sending the Sub Command*/ + ResponseBuffer[0] = subCmd; + TRACE_M(TF_VENDOR,"#02-%02hx! \n\r",data[0]); + + switch(subCmd) + { + case IC_TYPE: + { +#ifdef BLUENRG1_DEVICE + ResponseBuffer[1] = BLUENRG1_BRD; +#endif + +#ifdef BLUENRG2_DEVICE + ResponseBuffer[1] = BLUENRG2_BRD; +#endif + +#ifdef BLUENRG_MS + ResponseBuffer[1] = BLUENRG_MS_BRD; +#endif + +#ifdef STM32WB55xx + ResponseBuffer[1] = STM32WB55XX_BRD; +#endif + + BuffLength = 2; + break; + } + case LIB_VER: + { + libVersion = BLEMesh_GetLibraryVersion(); + while(*libVersion != '\0') + { + tempBuffer[inc] = *libVersion; + if(tempBuffer[inc] != 0x2E) + { + tempBuffer[inc] = BLEMesh_ModelsASCII_To_Char(tempBuffer[inc]); + TRACE_M(TF_VENDOR,"Lib version is %x\n\r" ,(unsigned char)tempBuffer[inc]); + } + else + { + TRACE_M(TF_VENDOR,"Lib version is %c\n\r" ,(unsigned char)tempBuffer[inc]); + } + libVersion++; + + inc++; + } + ResponseBuffer[1]= tempBuffer[0]; + ResponseBuffer[2]= tempBuffer[1]; + ResponseBuffer[3]= tempBuffer[3]; + ResponseBuffer[4]= tempBuffer[4]; + ResponseBuffer[5]= tempBuffer[6]; + ResponseBuffer[6]= tempBuffer[7]; + ResponseBuffer[7]= tempBuffer[8]; + BuffLength = 8; + break; + } + case LIB_SUB_VER: + { + subLibVersion = BLEMesh_GetLibrarySubVersion(); + while(*subLibVersion != '\0') + { + tempBuffer[inc] = * subLibVersion; + if((tempBuffer[inc] != 0x2E) && (tempBuffer[inc] != 0x52)) + { + tempBuffer[inc] = BLEMesh_ModelsASCII_To_Char(tempBuffer[inc]); + TRACE_M(TF_VENDOR,"Sub Lib version is %x\n\r" ,(unsigned char)tempBuffer[inc]); + } + else + { + TRACE_M(TF_VENDOR,"Sub Lib version is %c\n\r" ,(unsigned char)tempBuffer[inc]); + } + subLibVersion++; + inc++; + } + ResponseBuffer[1]= tempBuffer[0]; + ResponseBuffer[2]= tempBuffer[1]; + ResponseBuffer[3]= tempBuffer[3]; + ResponseBuffer[4]= tempBuffer[5]; + ResponseBuffer[5]= tempBuffer[7]; + ResponseBuffer[6]= tempBuffer[9]; + + BuffLength = 7; + + break; + } + case APPLICATION_VER: + { + /*Insert Command to check Application Version*/ + break; + } + + default: + { + status = MOBLE_RESULT_FALSE; + break; + } + + } + + return status; +} + + +/** +* @brief Process the Vendor Test Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_Test(MOBLEUINT8 const *data, MOBLEUINT32 length) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 subCmd = data[0]; + /*First Byte is sending the Sub Command*/ + ResponseBuffer[0]=subCmd; + TRACE_M(TF_VENDOR,"#01-%02hx! \n\r",data[0]); + switch(subCmd) + { + case APPLI_TEST_ECHO: + { + if(length > sizeof(ResponseBuffer)) + { + length = sizeof(ResponseBuffer); + TRACE_M(TF_VENDOR,"Length received greater than size of response buffer \r\n"); + } + memcpy (&(ResponseBuffer[1]),&(data[1]),(length-1)); + BuffLength = length; + break; + } + case APPLI_TEST_RANDOMIZATION_RANGE: + { + /*Insert Test related Commands here*/ + break; + } + case APPLI_TEST_COUNTER: + { +#ifdef USER_BOARD_1LED + if((DUTY <= PWM_TIME_PERIOD) && (DUTY > 1)) + { + Appli_LightPwmValue.IntensityValue = LED_OFF_VALUE; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + else + { + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + TRACE_M(TF_VENDOR,"Test Counter is running \r\n"); + ResponseBuffer[0] = subCmd; + ResponseBuffer[1] = Appli_LedState ; + BuffLength = 2; + /*Insert Test related Commands here*/ +#endif + break; + } + case APPLI_TEST_INC_COUNTER: + { +#ifdef USER_BOARD_1LED + if((DUTY <= PWM_TIME_PERIOD) && (DUTY > 1)) + { + Appli_LightPwmValue.IntensityValue = LED_OFF_VALUE; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + else + { + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + + TestHitCounter++; + TRACE_M(TF_VENDOR,"Command received Count %.2lx \r\n",TestHitCounter); + ResponseBuffer[0] = subCmd; + ResponseBuffer[1] = Appli_LedState ; + BuffLength = 2; +#endif + /*Insert Test related Commands here*/ + break; + } + case APPLI_MODEL_PUBLISH_SELECT: + { + for (MOBLEUINT8 idx=0; idx 16000) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } + break; + } + /* Default case - Not valid command */ + default: + { + status = MOBLE_RESULT_FALSE; + break; + } + } + /*Buffer will be sent for Reliable Response*/ + /*First Byte is Sub Command and 2nd Byte is LED Status*/ + ResponseBuffer[0] = subCommand; + if(subCommand == APPLI_CMD_LED_INTENSITY) + { + ResponseBuffer[1] = intensityValue >> 8 ; + ResponseBuffer[2] = intensityValue ; + BuffLength = 3; + } + else + { + ResponseBuffer[1] = Appli_LedState ; + BuffLength = 2; + } + + return status; +} + +/** +* @brief Process the Vendor Data write Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_Data_write(MOBLEUINT8 const *data, MOBLEUINT32 length) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 subCmd = data[0]; + /*First Byte is sending the Sub Command*/ + ResponseBuffer[0]=subCmd; + + TRACE_M(TF_VENDOR, "#0E-%02hx %02lx! \n\r",data[0], length); + for(MOBLEUINT16 i=0; i> 8; + *(responseValue+2) = TestHitCounter >> 16; + *(responseValue+3) = TestHitCounter >> 24; + TestHitCounter = 0; +} +/** +* @brief Process the Vendor LED Control Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @param elementIndex : selected element where '0' is first element +* @param dst_peer : Destination address +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, + MOBLEUINT8 elementIndex , MOBLE_ADDRESS dst_peer) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + + if (length > VENDOR_DATA_BUFFER_SIZE) + { + status = MOBLE_RESULT_INVALIDARG; + } + memmove(Appli_VendorBigData.data, data, length); + Appli_VendorBigData.dst = dst_peer; + Appli_VendorBigData.length = length; + Appli_VendorBigData.elementIndex = elementIndex; + return status; +} +/** +* @brief Send Vendor big data packet +* @param void +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_SendBigDataPacket(void) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + + if(BLEMesh_TrsptIsBusyState()) + { + BSP_LED_On(LED_BLUE); + status = MOBLE_RESULT_FALSE; + } + else + { + BSP_LED_Off(LED_BLUE); + status = BLEMesh_SetRemoteData(Appli_VendorBigData.dst, + Appli_VendorBigData.elementIndex, + 0x000E, + Appli_VendorBigData.data, + Appli_VendorBigData.length, + MOBLE_FALSE, + MOBLE_TRUE); + + } + return status; +} + +/** +* @brief Publish Command for Vendor Model +* @param srcAddress: Source Address of Node +* @retval void +*/ +void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 AppliBuff[1]; + /* changes the LED status on other nodes in the network */ + + AppliBuff[0] = APPLI_CMD_TOGGLE; + + result = BLEMesh_SetRemotePublication(VENDORMODEL_STMICRO_ID1, srcAddress, + APPLI_LED_CONTROL_STATUS_CMD, + AppliBuff, sizeof(AppliBuff), + MOBLE_FALSE, MOBLE_TRUE); + + if(result) + { + TRACE_I(TF_VENDOR_M, "Publication Error \r\n"); + } +} +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h new file mode 100644 index 000000000..a1b98db75 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h @@ -0,0 +1,46 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_vendor.h + * @author MCD Application Team + * @brief Application interface for Vendor Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_VENDOR_H +#define __APPLI_VENDOR_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "ble_mesh.h" + +/* Exported macro ------------------------------------------------------------*/ +#define LED_OFF_VALUE 1U +#define LED_ON_VALUE 32000U +/* Private define ------------------------------------------------------------*/ + +MOBLE_RESULT Appli_Vendor_LEDControl( MOBLEUINT8 const *data, MOBLEUINT32 length, + MOBLEUINT8 elementNumber, MOBLE_ADDRESS dst_peer); +MOBLE_RESULT Appli_Vendor_DeviceInfo(MOBLEUINT8 const *data, MOBLEUINT32 length); +MOBLE_RESULT Appli_Vendor_Test(MOBLEUINT8 const *data, MOBLEUINT32 length); +MOBLE_RESULT Appli_Vendor_Data_write(MOBLEUINT8 const *data, MOBLEUINT32 length); +void Appli_GetTestValue (MOBLEUINT8 *responseValue); +MOBLE_RESULT Appli_Vendor_SendBigDataPacket(void); +MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, + MOBLEUINT8 elementIndex , MOBLE_ADDRESS dst_peer); +void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress); +#endif /* __APPLI_VENDOR_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h new file mode 100644 index 000000000..dfad3c5fa --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h @@ -0,0 +1,72 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef BLE_CONF_H +#define BLE_CONF_H + +#include "app_conf.h" + +/****************************************************************************** + * + * BLE SERVICES CONFIGURATION + * blesvc + * + ******************************************************************************/ +#define BLE_CFG_MESH 1 + +/** + * This setting shall be set to '1' if the device needs to support the Peripheral Role + * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' + */ +#define BLE_CFG_PERIPHERAL 1 + +/** + * This setting shall be set to '1' if the device needs to support the Central Role + * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' + */ +#define BLE_CFG_CENTRAL 1 + +#define BLE_CFG_BROADCASTER 1 + +#define BLE_CFG_OBSERVER 1 + +#define BLE_CFG_DATA_ROLE_MODE 4 + + +/** + * There is one handler per service enabled + * Note: There is no handler for the Device Information Service + * + * This shall take into account all registered handlers + * (from either the provided services or the custom services) + */ +#define BLE_CFG_SVC_MAX_NBR_CB 7 + +#define BLE_CFG_CLT_MAX_NBR_CB 5 + +/****************************************************************************** + * GAP Service - Appearance + ******************************************************************************/ +#define BLE_CFG_UNKNOWN_APPEARANCE (0) +#define BLE_CFG_HR_SENSOR_APPEARANCE (832) +#define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) + +#endif /*BLE_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h new file mode 100644 index 000000000..132a0d68c --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h @@ -0,0 +1,199 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __BLE_DBG_CONF_H +#define __BLE_DBG_CONF_H + +/** + * Enable or Disable traces from BLE + */ + +#define BLE_DBG_DIS_EN 0 +#define BLE_DBG_HRS_EN 0 +#define BLE_DBG_EDS_STM_EN 0 +#define BLE_DBG_LBS_STM_EN 0 +#define BLE_DBG_SVCCTL_EN 1 +#define BLE_DBG_BLS_EN 0 +#define BLE_DBG_HTS_EN 0 +#define BLE_DBG_P2P_STM_EN 0 + +/** + * Macro definition + */ +#if ( BLE_DBG_APP_EN != 0 ) +#define BLE_DBG_APP_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_APP_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_DIS_EN != 0 ) +#define BLE_DBG_DIS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_DIS_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_HRS_EN != 0 ) +#define BLE_DBG_HRS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HRS_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_P2P_STM_EN != 0 ) +#define BLE_DBG_P2P_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_P2P_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_TEMPLATE_STM_EN != 0 ) +#define BLE_DBG_TEMPLATE_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_TEMPLATE_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_EDS_STM_EN != 0 ) +#define BLE_DBG_EDS_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_EDS_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_LBS_STM_EN != 0 ) +#define BLE_DBG_LBS_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LBS_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_SVCCTL_EN != 0 ) +#define BLE_DBG_SVCCTL_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_SVCCTL_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_CTS_EN != 0) +#define BLE_DBG_CTS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_CTS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HIDS_EN != 0) +#define BLE_DBG_HIDS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HIDS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_PASS_EN != 0) +#define BLE_DBG_PASS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_PASS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_BLS_EN != 0) +#define BLE_DBG_BLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_BLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HTS_EN != 0) +#define BLE_DBG_HTS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HTS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_ANS_EN != 0) +#define BLE_DBG_ANS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_ANS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_ESS_EN != 0) +#define BLE_DBG_ESS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_ESS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_GLS_EN != 0) +#define BLE_DBG_GLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_GLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_BAS_EN != 0) +#define BLE_DBG_BAS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_BAS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_RTUS_EN != 0) +#define BLE_DBG_RTUS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_RTUS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HPS_EN != 0) +#define BLE_DBG_HPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_TPS_EN != 0) +#define BLE_DBG_TPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_TPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_LLS_EN != 0) +#define BLE_DBG_LLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_IAS_EN != 0) +#define BLE_DBG_IAS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_IAS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_WSS_EN != 0) +#define BLE_DBG_WSS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_WSS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_LNS_EN != 0) +#define BLE_DBG_LNS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LNS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_SCPS_EN != 0) +#define BLE_DBG_SCPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_SCPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_DTS_EN != 0) +#define BLE_DBG_DTS_MSG PRINT_MESG_DBG +#define BLE_DBG_DTS_BUF PRINT_LOG_BUFF_DBG +#else +#define BLE_DBG_DTS_MSG PRINT_NO_MESG +#define BLE_DBG_DTS_BUF PRINT_NO_MESG +#endif + +#endif /*__BLE_DBG_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h new file mode 100644 index 000000000..c00aae92d --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h @@ -0,0 +1,48 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file cube_hal.h + * @author MCD Application Team + * @brief + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#ifndef _CUBE_HAL_H_ +#define _CUBE_HAL_H_ + +/* Includes ------------------------------------------------------------------*/ + +#include "stm32wbxx_hal.h" +#include "stm32wbxx_hal_conf.h" + +#define B1_Pin GPIO_PIN_13 +#define B1_GPIO_Port GPIOC +#define USART_TX_Pin GPIO_PIN_2 +#define USART_TX_GPIO_Port GPIOA +#define USART_RX_Pin GPIO_PIN_3 +#define USART_RX_GPIO_Port GPIOA +#define LD2_Pin GPIO_PIN_5 +#define LD2_GPIO_Port GPIOA + +#define UART_TX_TIMEOUT 5 + +#define Uart_Irq_Handler USART2_IRQHandler + + +void SystemClock_Config(void); +void Init_Device(void); +void MX_USART2_UART_Init(void); + + +#endif /* _CUBE_HAL_H_ */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s new file mode 100644 index 000000000..782844084 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s @@ -0,0 +1,28 @@ +;/** +;****************************************************************************** +;* @file data.s +;* @author BLE Mesh Team +;* @version V1.07.000 +;* @date 15-June-2018 +;* @brief Memory management +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +;*/ +_bdaddr EQU 0x0807E000 + EXPORT _bdaddr + + AREA CONFIG, READONLY +_mobleNvmBase_data + EXPORT _mobleNvmBase_data + FILL 4096, 0x00 + + END diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h new file mode 100644 index 000000000..d580f16a7 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h @@ -0,0 +1,53 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hal_common.h + * @author MCD Application Team + * @brief Common functions of HAL file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef _HAL_H_ +#define _HAL_H_ + +/* Includes ------------------------------------------------------------------*/ + +#if defined(NUCLEO_L152RE) || defined(USE_STM32WBXX_NUCLEO) || USE_STM32WBXX_USB_DONGLE /* NUCLEO_L152RE */ +#include "user_if.h" +#else /* not NUCLEO_L152RE */ +#if defined(BLUENRG1) || defined(BLUENRG2) /* BLUENRG1 or BLUENRG2 */ +#include "hal.h" +#else /* not BLUENRG1 or BLUENRG2 */ +#error "Unsupported board" +#endif /* BLUENRG1 or BLUENRG2 */ +#endif /* NUCLEO_L152RE */ + +#include +#include + +#include +#include + +#include "types.h" + +void SetLed(int state); +BUTTON_STATE GetButtonState(void); +BUTTON_STATE GetButton2State(void); +void InitDevice(void); + +void ShouldSleepFunc(void); + +#endif /* _HAL_H_ */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h new file mode 100644 index 000000000..010a0aa90 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h @@ -0,0 +1,583 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file mesh_cfg_usr.h + * @author MCD Application Team + * @brief user configurable settings + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MESH_CFG_USR_H +#define __MESH_CFG_USR_H + +/* Includes ------------------------------------------------------------------*/ +#include "ble_mesh.h" + +/* Exported macro ------------------------------------------------------------*/ + +/* +* Different features supported by BLE-Mesh. Uncomment according to application. +* Low power feature enabled node do not support other features. +* Do not define any other feature if Low Power feature is defined +*/ +#define ENABLE_LOW_POWER_FEATURE + +/* +* Different provision bearer supported by BLE-Mesh. +* Define according to application. +* At least one of PB-ADV and PB-GATT should be defined +*/ + +#define ENABLE_PB_ADV +#define ENABLE_PB_GATT +//#define ENABLE_PUB_KEY_TYPE_OOB +#define ENABLE_AUTH_TYPE_NO_OOB +//#define ENABLE_AUTH_TYPE_STATIC_OOB +//#define ENABLE_AUTH_TYPE_OUTPUT_OOB +//#define ENABLE_AUTH_TYPE_INPUT_OOB + +/* Static OOB Configurations */ +#define STATIC_OOB_SIZE 16U + +/* Output OOB Configurations */ +#define OUTPUT_OOB_SIZE 1U +#define OUTPUT_OOB_ACTION OUTPUT_OOB_ACTION_BIT_BLINK + +/* Input OOB Configurations */ +#define INPUT_OOB_SIZE 1U +#define INPUT_OOB_ACTION INPUT_OOB_ACTION_BIT_PUSH + +/******************************************************************************/ +/* Note: Please use Full Library configuration in project options to use the full + configuration of the C/C++ runtime library + for printf and scanf functionality */ + +/* Enables the serial interface using Uart */ +#define ENABLE_SERIAL_INTERFACE 0 +#define ENABLE_SIG_MODELS_AT_COMMANDS 0 +#define ENABLE_VENDOR_MODELS_AT_COMMANDS 0 +#define ENABLE_UT 0 + +/* Macros Used for user defined serial print data for models. +Either use 0 to disable or 1 to enable +@ TF_GENERIC -> Generic server +@ TF_GENERIC_CLIENT -> Generic client +@ TF_SENSOR -> Sensor server +@ TF_LIGHT -> Lighting server +@ TF_LIGHT_CLIENT -> Lighting client +@ TF_LIGHT_LC -> Light LC server +@ TF_VENDOR -> vendor model +@ TF_CONFIG_CLIENT -> config client +@ TF_LPN_FRND -> Friendship, Friend and Low Power +@ TF_PROVISION -> Provisioning related +@ TF_HANDLER -> interrupt handler +@ TF_INIT -> main function +@ TF_MISC -> others +@ TF_COMMON -> common (middleware) +@ TF_GENERIC_M -> Generic server (middleware) +@ TF_GENERIC_CLIENT_M -> Config client (middleware) +@ TF_SENSOR_M -> Sensor server (middleware) +@ TF_LIGHT_M -> Lighting server (middleware) +@ TF_LIGHT_CLIENT_M -> Lighting client (middleware) +@ TF_LIGHT_LC_M -> Light LC server (middleware) +@ TF_VENDOR_M -> vendor model (middleware) +@ TF_CONFIG_CLIENT_M -> Config client (middleware) +@ TF_NEIGHBOUR -> neighbour table +@ TF_MEMORY +@ TF_BEACON -> Beacons +@ TF_SERIAL_CTRL +*/ +/* Enabled by default */ +#define TF_GENERIC 1 +#define TF_GENERIC_CLIENT 1 +#define TF_SENSOR 1 +#define TF_LIGHT 1 +#define TF_LIGHT_CLIENT 1 +#define TF_LIGHT_LC 1 +#define TF_VENDOR 1 +#define TF_CONFIG_CLIENT 1 +#define TF_CONFIG_SERVER 1 +#define TF_LPN_FRND 1 +#define TF_PROVISION 1 +#define TF_HANDLER 1 +#define TF_INIT 1 +#define TF_MISC 1 +/* Disabled by default */ +#define TF_COMMON 0 +#define TF_GENERIC_M 0 +#define TF_GENERIC_CLIENT_M 0 +#define TF_SENSOR_M 0 +#define TF_SENSOR_CLIENT_M 0 +#define TF_LIGHT_M 0 +#define TF_LIGHT_CLIENT_M 0 +#define TF_LIGHT_LC_M 0 +#define TF_VENDOR_M 0 +#define TF_CONFIG_CLIENT_M 0 +#define TF_NEIGHBOUR 0 +#define TF_MEMORY 0 +#define TF_BEACON 0 +#define TF_SERIAL_CTRL 0 +#define TF_VENDOR_APPLI_TEST 0 /* Vendor commands testing */ +#define TF_NVM 0 + +/******************************************************************************* +*** Following section helps to define Device Name during Provisioning ********* +*******************************************************************************/ + +#define DEVICE_NAME_SIZE 11 +#define DEVICE_NAME 'S','T',' ','B','L','E',' ','M','e','s','h' + +/******************************************************************************* +*** Following section helps to select right configuration of Models *********** +*******************************************************************************/ +/******************************************************************************/ +/* Define the following Macros to enable the usage of the */ +/* Server Generic Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +/* Define the following Macros to enable the usage of the Server Generic Models */ +#define ENABLE_GENERIC_MODEL_SERVER_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_SERVER_LEVEL (1) +//#define ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF_SETUP (1) +//#define ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME (1) + +//#define ENABLE_GENERIC_MODEL_CLIENT_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_CLIENT_LEVEL (1) +//#define ENABLE_GENERIC_MODEL_CLIENT_POWER_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_CLIENT_DEFAULT_TRANSITION_TIME (1) + +/* The Following Models are not available in this version, will be developed in + next version. +*/ +/* +#define ENABLE_GENERIC_MODEL_SERVER_POWER_LEVEL +#define ENABLE_GENERIC_MODEL_SERVER_POWER_LEVEL_SETUP +#define ENABLE_GENERIC_MODEL_SERVER_BATTERY +#define ENABLE_GENERIC_MODEL_SERVER_LOCATION +#define ENABLE_GENERIC_MODEL_SERVER_LOCATION_SETUP +#define ENABLE_GENERIC_MODEL_SERVER_ADMIN_PROPERTY +#define ENABLE_GENERIC_MODEL_SERVER_MANUFACTURER_PROPERTY +#define ENABLE_GENERIC_MODEL_SERVER_USER_PROPERTY +#define ENABLE_GENERIC_MODEL_SERVER_CLIENT_PROPERTY + +*/ + +/******************************************************************************/ +/******* Define the following Macros to enable the usage of the Light Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +//#define ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS (1) +//#define ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP (1) +//#define ENABLE_LIGHT_MODEL_SERVER_CTL (1) +//#define ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP (1) +//#define ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL_HUE (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION (1) + +//#define ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS (1) +//#define ENABLE_LIGHT_MODEL_CLIENT_CTL (1) +//#define ENABLE_LIGHT_MODEL_CLIENT_HSL (1) + +/* + The following Models are managed in different file light_lc.c in middleware +*/ +//#define ENABLE_LIGHT_MODEL_SERVER_LC (1) + +//#define ENABLE_LIGHT_MODEL_CLIENT_LC (1) + +/******************************************************************************/ +/* Define the following Macros to enable the usage of the Sensor Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +//#define ENABLE_SENSOR_MODEL_SERVER (1) + +//#define ENABLE_SENSOR_MODEL_CLIENT (1) + +/******************************************************************************/ +/* Define the following Macros to enable the usage of the time and */ +/* scene Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +//#define ENABLE_TIME_MODEL_SERVER +//#define ENABLE_TIME_MODEL_SERVER_SETUP +//#define ENABLE_SCENE_MODEL_SERVER +//#define ENABLE_SCENE_MODEL_SERVER_SETUP + +/* + The Following Models are not available in this version +*/ +//#define ENABLE_LIGHT_MODEL_SERVER_XYL +//#define ENABLE_LIGHT_MODEL_SERVER_XYL_SETUP + +/******* Define the following Macros to enable the vendor model ******/ +#define ENABLE_VENDOR_MODEL_SERVER (1) +#define GENERIC_SERVER_MODEL_PUBLISH + +/******************************************************************************/ +/* +Define the Macro for enabling/disabling the Publishing with Generic on off +or by Vendor Model. +@ define Macro for Vendor Publishing +@ Undefine or comment Macro for Generic On Off Publishing +*/ +//#define VENDOR_CLIENT_MODEL_PUBLISH +//#define GENERIC_CLIENT_MODEL_PUBLISH +//#define LIGHT_CLIENT_MODEL_PUBLISH + + +/* Define the macros for the numbers of sensor present.*/ +//#define NUMBER_OF_SENSOR 1 +//#define ENABLE_OCCUPANCY_SENSOR +//#define ENABLE_PIR_SENSOR +/* +Macro is responsible for enabling and desabling the sensor publication. +Comment this macro to disable the publication +*/ +//#define ENABLE_SENSOR_PUBLICATION + +/******************************************************************************/ + + +/* Maximum Time period value of PWM */ +#define PWM_TIME_PERIOD 31990U + +/******************************************************************************/ +/***** MACROS for POWER ON-OFF CYCLE BASED UNPROVISIONING *********************/ +/******************************************************************************/ + +/* +Define the following Macro to check the Power-OnOff Cycles +5 Continuous cycles of OnOff with Ontime <2 sec will cause unprovisioning +*/ +//#define ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE + +#define POWER_ON_OFF_CYCLES_FOR_UNPROVISIONING 5 +#define MASK_BITS_FOR_POWER_ON_OFF_CYCLES (0xFFFFFFFF << POWER_ON_OFF_CYCLES_FOR_UNPROVISIONING) + /* 0xFFFFFFE0 */ +#define ON_TIME_IN_SECONDS_FOR_POWER_CYCLING 2 +#define BLINK_TIMES_FOR_FACTORY_RESET 5 + +/* +Define the following Macro to save Generic and Light Model states in NVM +This may result into excessive flash erase operations, +this should be avoided to ensure flash longevity +*/ +#define ENABLE_SAVE_MODEL_STATE_NVM + +/* Only one Macro will be enable at one time */ +//#define SAVE_MODEL_STATE_FOR_ALL_MESSAGES +//#define SAVE_MODEL_STATE_POWER_FAILURE_DETECTION + + +/* Macros defined for the number of bytes saved, number of bytes dedicated for ganeric + model and light model. +*/ +#define APP_NVM_GENERIC_MODEL_SIZE 16U +#define APP_NVM_LIGHT_MODEL_SIZE 48U/*32U*/ +#define APP_NVM_MODELDATA_PER_ELEMENT_SIZE (APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE) +//#define APP_NVM_MODEL_SIZE 50U +#define APP_NVM_MODEL_SIZE (APP_NVM_MODELDATA_PER_ELEMENT_SIZE * APPLICATION_NUMBER_OF_ELEMENTS) +//#define APP_NVM_MODEL_ALL_ELEMENTS_SIZE + + +/*Macros are defined for the selection of the number of led and type of lighting + used for the application. +*if board has one led, uncomment USER_BOARD_1LED +*if board has cool warm leds, uncomment USER_BOARD_COOL_WHITE_LED +*if board has RGB leds, uncomment USER_BOARD_RGB_LED +*if board has RGB leds as well as cool warm leds, + uncomment USER_BOARD_COOL_WHITE_LED and USER_BOARD_RGB_LED +*/ +/* comment ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME when using + USER_BOARD_COOL_WHITE_LED ,USER_BOARD_RGB_LED + Default transition is provided only for one led. +*/ +//#define USER_BOARD_1LED +//#define USER_BOARD_COOL_WHITE_LED +//#define USER_BOARD_RGB_LED + +/* Pulse Width Modulation support for external LED control */ +#define ENABLE_PWM_SUPPORT 0 + +/******************************************************************************* +*** Following section helps to configure the Application of Mesh *********** +*******************************************************************************/ + +/* Max elements supported by the MESH library: 1 */ +/* Max elements in the MESH application: 1 */ +#define APPLICATION_NUMBER_OF_ELEMENTS 1 +/* Max total Models per element supported by the MESH library (SIG + Vendor): 3 */ +/* Max SIG Models per element in the MESH application */ +#define USER_SIG_MODELS_MAX_COUNT 1 +/* Max Vendor Models per element in the MESH application */ +#define USER_VENDOR_MODELS_MAX_COUNT 1 + + +/* Contains a 16-bit company identifier assigned by the Bluetooth SIG +(the list is available +@ https://www.bluetooth.com/specifications/assigned-numbers/company-identifiers) +For STMicroelectronics : it is 0x0030 */ +#define COMPANY_ID 0x0030 + +/* Contains a 16-bit vendor-assigned product identifier */ +#define PRODUCT_ID 0x0002 + +/* Contains a 16-bit vendor-assigned product version ID */ +#define PRODUCT_VERSION_ID 0x010A + +#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go up to 160*/ + +#define TPT_SEGMENT_COUNT (((MAX_APPLICATION_PACKET_SIZE)/12)+2) + +/******************************************************************************* +********** MAC Address Configuration ******************************************* +*******************************************************************************/ + +/* +* Define to enable external MAC handling, +* DONT change the Values 0x01, 0x02, 0x03 +* SELECT ONLY One of the Option +*/ +//#define GENERATE_STATIC_RANDOM_MAC 0x01 +//#define EXTERNAL_MAC_ADDR_MGMT 0x02 +#define INTERNAL_UNIQUE_NUMBER_MAC 0x03 + +/* Declare this value as 0x01 if the External Address is PUBLIC Address */ +/* For example like this: #define EXTERNAL_MAC_IS_PUBLIC_ADDR 0x1 */ +/* Else, by default, the external address will be treated as RANDOM */ +#define EXTERNAL_MAC_IS_PUBLIC_ADDR 0x0 + +/******************************************************************************/ + + +/******************************************************************************* +****** Following section helps to select right configuration of node *********** +*******************************************************************************/ +/* +* Minimum gap between successive transmissions +* varies from 10 to 65535 +*/ +#define TR_GAP_BETWEEN_TRANSMISSION 50U + + +/* +* Friend node receive window size is 50 ms +*/ + +/* +* Friend node subscription list size is 4 +*/ + +/* +* Friend node message queue is 16 +*/ + +/* +* Number of Low power nodes that can be associated with Friend node +* varies from 1 to 10 +*/ +#define FN_NO_OF_LPNS 1U/*6U*/ + +/* +* For prioritizing friendship offer with good RSSI link +* varies from 0 to 3 +* Ref @Mesh_v1.0 +* 0 -> 1 +* 1 -> 1.5 +* 2 -> 2 +* 3 -> 2.5 +*/ +#define LPN_RSSI_FACTOR_LEVEL 1U + +/* +* For prioritizing friendship offer with good receive window factor +* varies from 0 to 3 +* Ref @Mesh_v1.0 +* 0 -> 1 +* 1 -> 1.5 +* 2 -> 2 +* 3 -> 2.5 +*/ +#define LPN_RECIVE_WINDOW_FACTOR_LEVEL 1U + +/* +* Minimum packets queue size required by Low Power node +* varies from 1 to 7 +* Ref @Mesh_v1.0 +* 1 -> 2 +* 2 -> 4 +* 3 -> 8 +* 4 -> 16 +* 5 -> 32 +* 6 -> 64 +* 7 -> 128 +*/ +#define LPN_MINIMUM_QUEUE_SIZE_LOG 2U + +/* +* (unit ms) +* varies from 0x0A to 0xFF +* Ref @Mesh_v1.0 +* 0x0A -> 10ms +* 0xFF -> 255ms +*/ +#define LPN_RECEIVE_DELAY 150U + +/* +* Poll timeout value after which friendship cease to exist (unit 100ms) +* varies from 0x00000A to 0x34BBFF +* Ref @Mesh_v1.0 +* 0x00000A -> 1 second +* 0x34BBFF -> 96 hours +*/ +#define LPN_POLL_TIMEOUT 2000U + +/* +* Maximum receive window size acceptable to low power node (unit ms) +* varies from 0x0A to 0xFF +* Ref @Mesh_v1.0 +* 0x0A -> 10ms +* 0xFF -> 255ms +*/ +#define LPN_RECEIVE_WINDOW_SIZE 255U/*55U*/ + +/* +* Minimum friend's subscription list size capability required by lpn +* varies from 1 to 5 +* Ref @Mesh_v1.0 +*/ +#define LPN_SUBSCR_LIST_SIZE 2U + +/* +* Frequency at which low power node would send friend request (unit 100ms) +* varies from 0 to 255 +* 100 -> 10s +*/ +#define LPN_FRIEND_REQUEST_FREQUENCY 50U + +/* +* Frequency at which low power node would poll friend node (unit 100ms) +* should be less than poll timeout +* 100 -> 10s +*/ +#define LPN_FRIEND_POLL_FREQUENCY 25U + +/* +* Minimum RSSI required by low power node +* should be less than equal to -60 +*/ +#define LPN_MINIMUM_RSSI -100 + +/* +* Retries to be made by lpn before termination of friendship +* varies from 2 to 10 +*/ +#define LPN_NO_OF_RETRIES 10U + +/* +* Maximum address list size buffer in +* Friend Subscription List Add Message is 10 +*/ + + +/* +* Enable or disable neighbor table +* if defined -> enabled +* If MAC address of neighbor changes it appears as new neighbor +* Neighbor table update can be triggered (configurable) in following cases +* On receiving Unprovisioned device beacon +* On receiving Secure network beacon +* On receiving Mesh message +* Message with any TTL +* Message with TTL = 0 +* if not defined -> disabled +*/ +#define ENABLE_NEIGHBOR_TABLE + +/* +* Size of neighbor table +*/ +#define NEIGHBOR_COUNT 5U + +/* +* (unit s) +* Duration (wrt appear or last refresh) +* for which neighbor exists in neighbor table +*/ +#define NEIGHBOR_ALIVE_TIME 20U + +/* +* Enable/disable neighbor table update with unprovisioned device beacon +* 0: Disable neighbor table update with unprovisioned device beacon +* 1: Enable neighbor table update with unprovisioned device beacon +*/ +#define NEIGHBOR_UNPRVND_DEV_BEACON_NTU 1U + +/* +* Enable/disable neighbor table update with secure network beacon +* 0: Disable neighbor table update with secure network beacon +* 1: Enable neighbor table update with secure network beacon +*/ +#define NEIGHBOR_SECURE_NET_BEACON_NTU 0U + +/* +* Enable/disable neighbor table update with TTL 0 message +* 0: Disable neighbor table update messages +* 1: Enable neighbor table update with messages with 0 TTL +* 2: Enable neighbor table update with messages with any TTL +*/ +#define NEIGHBOR_MSG_TTLX_NTU 0U + +/******************************************************************************* +*** Following section helps to configure the LEDs of Application of Mesh *** +*******************************************************************************/ + +#if defined USE_STM32WBXX_NUCLEO || defined USE_STM32WBXX_USB_DONGLE + #define SINGLE_LED PWM4 + #define COOL_LED PWM0 + #define WARM_LED PWM1 + #define RED_LED PWM2 + #define GREEN_LED PWM3 + #define BLUE_LED PWM4 +#endif + + +/* Exported variables -------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ + +#endif /* __MESH_CFG_USR_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c new file mode 100644 index 000000000..4d3fa8a2d --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c @@ -0,0 +1,1163 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file models_if.c + * @author MCD Application Team + * @brief Mesh Modes interface file of the application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "appli_mesh.h" +#include "appli_nvm.h" +#include "ble_hci_le.h" +#include "models_if.h" + +#include "common.h" +#include "generic.h" +#include "light.h" +#include "light_lc.h" +#include "time_scene.h" +#include "sensors.h" +#include "vendor.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "appli_light_lc.h" +#include "appli_sensor.h" +#include "appli_vendor.h" +#include "config_client.h" +#include "generic_client.h" +#include "light_client.h" +#include "sensors_client.h" +#include "appli_generic_client.h" +#include "appli_light_client.h" +#include "appli_sensors_client.h" + +#if (( CFG_LPM_SUPPORTED == 0) && (ENABLE_PWM_SUPPORT == 1)) +#include "PWM_config.h" +#include "PWM_handlers.h" +#endif + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ +/* Private variables ---------------------------------------------------------*/ +MOBLEUINT8 Led_Value = 0; + +MOBLEUINT8 ButtonIndex_Value = 0; + +/* Private typedef -----------------------------------------------------------*/ +#pragma pack(push, 1) + +typedef struct +{ + MOBLE_ADDRESS peer; + MOBLE_ADDRESS dst; + MOBLEUINT8 command; + MOBLEUINT8 elementIndex; + MOBLEUINT8 appKeyOffset; + MOBLEUINT8 netKeyOffset; + MOBLEUINT8 data[DATA_BUFFER_LENGTH]; /* 8-Bytes response packet */ + MOBLEUINT32 length; +} APPLI_SEND_RESPONSE_MODULE; + + +typedef struct +{ + MOBLEUINT8 packet_count; + MOBLEUINT32 send_time; + APPLI_SEND_RESPONSE_MODULE* head; + MOBLEUINT8 head_index; + APPLI_SEND_RESPONSE_MODULE packet[MAX_PENDING_PACKETS_QUE_SIZE]; +} APPLI_PENDING_PACKETS; + +#pragma pack(pop) +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ + + +/* Private variables ---------------------------------------------------------*/ + +MOBLEUINT8 pGeneric_OnOffParam[sizeof(Generic_OnOffParam_t)]; +MOBLEUINT8 pGeneric_LevelParam[sizeof(Generic_LevelParam_t)]; +MOBLEUINT8 pGeneric_DeltaLevelParam[sizeof(Generic_DeltaLevelParam_t)]; +MOBLEUINT8 pGeneric_MoveLevelParam[sizeof(Generic_LevelMoveParam_t)]; +MOBLEUINT8 pGeneric_PowerOnOffParam[sizeof(Generic_PowerOnOffParam_t)]; +MOBLEUINT8 pGeneric_DefaultTransitionTimeParam[sizeof(Generic_DefaultTransitionParam_t)]; + +MOBLEUINT8 pLightnessParam[sizeof(Light_LightnessParam_t)]; +MOBLEUINT8 pLightnessRangeParam[sizeof(Light_LightnessRangeParam_t)]; + +MOBLEUINT8 pLightCtlParam[sizeof(Light_CtlParam_t)]; +MOBLEUINT8 pLightCtlTemperatureParam[sizeof(Light_CtlTemperatureParam_t)]; +MOBLEUINT8 pLightCtlTemperatureRangeParam[sizeof(Light_CtlTemperatureRangeParam_t)]; +MOBLEUINT8 pLightCtlDefaultParam[sizeof(Light_CtlDefaultParam_t)]; + +MOBLEUINT8 pLightHslParam[sizeof(Light_HslParam_t)]; +MOBLEUINT8 pLightHslRangeParam[sizeof(Light_HslRangeParam_t)]; +MOBLEUINT8 pLightHslHueParam[sizeof(Light_HslHueParam_t)]; +MOBLEUINT8 pLightHslSaturationParam[sizeof(Light_HslSaturationParam_t)]; + +MOBLEUINT8 pLightLCModeParam[sizeof(Light_LC_ModeParam_t)]; +MOBLEUINT8 pLightLCOccupancyModeParam[sizeof(Light_LC_ModeParam_t)]; +MOBLEUINT8 pLightLCOnOffParam[sizeof(Light_LC_OnOffParam_t)]; +MOBLEUINT8 pLightLCPropertyParam[6]; + +MOBLEUINT8 pSensorsCadenceParam[sizeof(sensor_CadenceCbParam_t)]; +MOBLEUINT8 pSensorsSettingParam[sizeof(sensor_SettingCbParams_t)]; + +APPLI_PENDING_PACKETS Appli_PendingPackets = {0}; + +#ifdef ENABLE_VENDOR_MODEL_SERVER +__attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = +{ + Vendor_WriteLocalDataCb, + Vendor_ReadLocalDataCb, + Vendor_OnResponseDataCb +}; + +__attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = +{ + /*Vendor Commands*/ + Appli_Vendor_LEDControl, + Appli_Vendor_DeviceInfo, + Appli_Vendor_Test, + Appli_LedCtrl, + Appli_GetTestValue, + Appli_Vendor_Data_write +}; +#endif + +__attribute__((aligned(4)))const Appli_Generic_cb_t GenericAppli_cb = +{ + /* Generic OnOff callbacks */ + Appli_Generic_OnOff_Set, + /* Generic OnOff Status callbacks */ + Appli_Generic_OnOff_Status, + /* Generic Level callbacks */ + Appli_Generic_Level_Set, + Appli_Generic_Delta_Set, + Appli_Generic_Move_Set, + /* Generic Level Status callbacks */ + Appli_Generic_Level_Status, + /* Generic Power on off callbacks */ + Appli_Generic_PowerOnOff_Set, + /* Generic Power on off callbacks */ + Appli_Generic_PowerOnOff_Status, + + /* Generic Default transition time callbacks */ + Appli_Generic_DefaultTransitionTime_Set, + /* Generic Default transition time callbacks */ + Appli_Generic_DefaultTransitionTime_Status +}; + +__attribute__((aligned(4)))const Appli_Generic_State_cb_t Appli_GenericState_cb = +{ + + /* Generic Get On Off status */ + Appli_Generic_GetOnOffStatus, + Appli_Generic_GetOnOffValue, + /* Generic Get level status */ + Appli_Generic_GetLevelStatus, + /* Generic Get Power on off status */ + Appli_Generic_GetPowerOnOffStatus, + /* Generic Get Default transition time status */ + Appli_Generic_GetDefaultTransitionStatus +}; + +__attribute__((aligned(4)))const Appli_Light_GetStatus_cb_t Appli_Light_GetStatus_cb = +{ + Appli_Light_GetLightnessStatus, + Appli_Light_GetLightnessLinearStatus, + Appli_Light_GetLightnessDefaultStatus, + Appli_Light_GetLightnessLastStatus, + Appli_Light_GetLightnessRangeStatus, + Appli_Light_GetCtlLightStatus, + Appli_Light_GetCtlTargetStatus, + Appli_Light_GetCtlTemperatureStatus, + Appli_Light_GetCtlTemperatureRange, + Appli_Light_GetCtlDefaultStatus, + Appli_Light_GetHslStatus, + Appli_Light_GetHslTargetStatus, + Appli_Light_GetHslHueStatus, + Appli_Light_GetHslSaturationStatus, + Appli_Light_GetHslHueRange, + Appli_Light_GetHslSatRange, + Appli_Light_GetHslDefaultStatus +}; + + +__attribute__((aligned(4)))const Appli_Light_cb_t LightAppli_cb = +{ + /* Light Lightness callbacks */ + Appli_Light_Lightness_Set, + Appli_Light_Lightness_Status, + + Appli_Light_Lightness_Linear_Set, + Appli_Light_Lightness_Linear_Status, + + Appli_Light_Lightness_Default_Set, + Appli_Light_Lightness_Default_Status, + + Appli_Light_Lightness_Last_Set, + Appli_Light_Lightness_Last_Status, + + Appli_Light_Lightness_Range_Set, + Appli_Light_Lightness_Range_Status, + + Appli_Light_Ctl_Set, + Appli_Light_Ctl_Status, + + Appli_Light_CtlTemperature_Set, + Appli_Light_CtlTemperature_Status, + + Appli_Light_CtlTemperature_Range_Set, + Appli_Light_CtlTemperature_Range_Status, + + Appli_Light_CtlDefault_Set, + Appli_Light_CtlDefault_Status, + + Appli_Light_Hsl_Set, + Appli_Light_Hsl_Status, + + Appli_Light_HslHue_Set, + Appli_Light_HslHue_Status, + + Appli_Light_HslSaturation_Set, + Appli_Light_HslSaturation_Status, + + Appli_Light_HslDefault_Set, + Appli_Light_HslDefault_Status, + + Appli_Light_HslRange_Set, + Appli_Light_HslRange_Status +}; + +/*#ifdef ENABLE_SENSOR_MODEL_CLIENT*/ +__attribute__((aligned(4))) const sensor_client_cb_t SensorAppli_cb = +{ + Appli_Sensor_Descriptor_Status, + Appli_Sensor_Cadence_Status, + Appli_Sensor_Settings_Status, + Appli_Sensor_Setting_Status, + Appli_Sensor_Status, + Appli_Sensor_Column_Status, + Appli_Sensor_Series_Status +}; +/*#endif*/ + +__attribute__((aligned(4)))const MODEL_SIG_cb_t Model_SIG_cb[] = +{ +#ifdef ENABLE_GENERIC_MODEL_SERVER + { + GenericModelServer_GetOpcodeTableCb, + GenericModelServer_GetStatusRequestCb, + GenericModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER + { + LightModelServer_GetOpcodeTableCb, + LightModelServer_GetStatusRequestCb, + LightModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_SENSOR_MODEL_SERVER +{ + SensorModelServer_GetOpcodeTableCb, + SensorModelServer_GetStatusRequestCb, + SensorModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_TIME_SCENE_MODEL_SERVER + { + Time_SceneModelServer_GetOpcodeTableCb, + Time_SceneModelServer_GetStatusRequestCb, + Time_SceneModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + { + LightLcServer_GetOpcodeTableCb, + LightLcServer_GetStatusRequestCb, + LightLcServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_GENERIC_MODEL_CLIENT + { + GenericModelClient_GetOpcodeTableCb, + GenericModelClient_GetStatusRequestCb, + GenericModelClient_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_CONFIG_MODEL_CLIENT + { + ConfigClientModel_GetOpcodeTableCb, + ConfigClientModel_GetStatusRequestCb, + ConfigClientModel_ProcessMessageCb + }, +#endif +#ifdef ENABLE_LIGHT_MODEL_CLIENT + { + LightModelClient_GetOpcodeTableCb, + LightModelClient_GetStatusRequestCb, + LightModelClient_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_SENSOR_MODEL_CLIENT + { + SensorsModelClient_GetOpcodeTableCb, + SensorsModelClient_GetStatusRequestCb, + SensorsModelClient_ProcessMessageCb + }, +#endif + + { + 0, 0, 0 + } +}; + +__attribute__((aligned(4)))const APPLI_SAVE_MODEL_STATE_CB SaveModelState_cb = AppliNvm_SaveModelState; + +#if 0 +__attribute__((aligned(4)))const APPLI_SAVE_MODEL_TEST_STATE_CB SaveModelTestState_cb = AppliNVM_Save_FlashTesting; +__attribute__((aligned(4)))const APPLI_RETRIEVE_MODEL_TEST_STATE_CB RetrieveModelTestState_cb = AppliNVM_Retrieve_FlashTesting; +#endif + +#define MODEL_SIG_COUNT ( ( sizeof(Model_SIG_cb)/sizeof(Model_SIG_cb[0]) - 1 )) + +#ifdef ENABLE_VENDOR_MODEL_SERVER +__attribute__((aligned(4)))const MODEL_Vendor_cb_t Model_Vendor_cb[] = +{ + { + VendorModel_PID1_GetOpcodeTableCb, + VendorModel_PID1_GetStatusRequestCb, + VendorModel_PID1_ProcessMessageCb + }, + { 0, 0,0 } +}; + +#define MODEL_VENDOR_COUNT ( ( sizeof(Model_Vendor_cb)/sizeof(Model_Vendor_cb[0]) - 1 )) +#endif + +extern MOBLEUINT8 NumberOfElements; + +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +void GetApplicationVendorModels(const MODEL_Vendor_cb_t** pModelsTable, MOBLEUINT32* VendorModelscount) +{ +#ifdef ENABLE_VENDOR_MODEL_SERVER + *pModelsTable = Model_Vendor_cb ; + *VendorModelscount = MODEL_VENDOR_COUNT; + + TRACE_M(TF_VENDOR_M, "GetApplicationVendorModels \r\n"); +#endif +} + +/** +* @brief Initialization Commands for Models +* @param void +* @retval void +*/ +void BLEMesh_ModelsInit(void) +{ + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + + MOBLEUINT16 modelStateLoad_Size; + MOBLEUINT8 modelStateLoadBuff[APP_NVM_MODEL_SIZE]; + +#ifdef CLIENT + MOBLEUINT8 PrvnStateLoad_Size; + MOBLEUINT8 PrvnlStateLoadBuff[16]; +#endif + +#if 0 +#ifdef ENABLE_NVM_TEST + /* Testing of flash code */ + Device_FlashTesting(); +#endif +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + /* Inintialise the light model range states with default values */ + Light_ModelRangeInit(); +#endif + + /* Callbacks used by BlueNRG-Mesh Models */ + BLEMesh_SetSIGModelsCbMap(Model_SIG_cb, MODEL_SIG_COUNT); + +#if defined ENABLE_SENSOR_MODEL_SERVER && !defined CUSTOM_BOARD_PWM_SELECTION + /* Initialization of sensors */ + Appli_Sensor_Init(); +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + Appli_Light_LCs_Init(); +#endif +#endif + + /* Load generic model states from nvm */ + AppliNvm_LoadModelState(modelStateLoadBuff, &modelStateLoad_Size); + if (modelStateLoad_Size != 0) + { + /* update states of generic model */ + Model_RestoreStates(modelStateLoadBuff, modelStateLoad_Size); + } + +#ifdef CLIENT + AppliPrvnNvm_LoadData(PrvnlStateLoadBuff,&PrvnStateLoad_Size); +#endif + +} + +/** +* @brief Process Commands for Models +* @param void +* @retval void +*/ +void BLEMesh_ModelsProcess(void) +{ +#ifdef ENABLE_GENERIC_MODEL_SERVER + Generic_Process(); +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER + Lighting_Process(); +#endif + +#ifdef ENABLE_VENDOR_MODEL_SERVER + Vendor_Process(); +#endif +/* Define this Macro to enable the publication of sensors data.*/ +#if defined ENABLE_SENSOR_MODEL_SERVER + Sensor_Process(); +#endif + +#if ENABLE_APPLI_TEST + Test_Process(); +#endif + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + ModelSave_Process(); +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + Light_LC_Process(); +#endif +} + +/** +* @brief Publish Command for Models +* @param void +* @retval void +*/ +void BLEMesh_ModelsCommand(void) +{ +#ifdef VENDOR_CLIENT_MODEL_PUBLISH + Appli_Vendor_Publish(BLEMesh_GetAddress()); +#endif + +#if defined(GENERIC_CLIENT_MODEL_PUBLISH) || defined(LIGHT_CLIENT_MODEL_PUBLISH) + Led_Value ^= APPLI_LED_ON; + pGeneric_OnOffParam[0] = Led_Value; /* OnOff parameter byte 0 : The target value of the Generic Onoff state */ + + pLightLCModeParam[0] = Led_Value; + pLightLCOccupancyModeParam[0] = Led_Value; + pLightLCOnOffParam[0] = Led_Value; + + /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functioning */ + switch (ButtonIndex_Value){ + case 0: + ButtonIndex_Value=0x1; + + pGeneric_LevelParam[0]= 0xE8; /* Level parameter byte 0 : The target value of the Generic Level state */ + pGeneric_LevelParam[1]= 0x03; /* Level parameter byte 1 : The target value of the Generic Level state */ + + pGeneric_DeltaLevelParam[0]= 0xE8; /* Delta Level parameter byte 0 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[1]= 0x03; /* Delta Level parameter byte 1 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[2]= 0x00; /* Delta Level parameter byte 2 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[3]= 0x00; /* Delta Level parameter byte 3 : The Delta change of the Generic Level state */ + + pGeneric_MoveLevelParam[0]= 0xE8; /*Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state */ + pGeneric_MoveLevelParam[1]= 0x03; /*Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state */ + + pGeneric_DefaultTransitionTimeParam[0]=0x0F; /*Transition time parameter byte 0 : The value of the Generic Default Transition Time state */ + + pGeneric_PowerOnOffParam[0]=0x1; /*OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state */ + + pLightnessParam[0] = 0xE8; /*Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state */ + pLightnessParam[1] = 0x03; /*Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state */ + + pLightnessRangeParam[0] = 0xE8; /*Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[1] = 0x03; /*Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[2] = 0x88; /*Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state */ + pLightnessRangeParam[3] = 0x13; /*Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state */ + + pLightCtlParam[0] = 0xE8; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state */ + pLightCtlParam[1] = 0x03; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state */ + pLightCtlParam[2] = 0xE8; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlParam[4] = 0xE8; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlParam[5] = 0x03; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureParam[0] = 0xE8; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[1] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[2] = 0xE8; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlTemperatureParam[3] = 0x03; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureRangeParam[0] = 0xE8; /*Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[1] = 0x03; /*Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[2] = 0x88; /*Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[3] = 0x13; /*Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + + pLightCtlDefaultParam[0] = 0xE8; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[1] = 0x03; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[2] = 0xE8; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[4] = 0xE8; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state*/ + pLightCtlDefaultParam[5] = 0x03; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state*/ + /** Red color **/ + pLightHslParam[0] = 0x44; /*HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state*/ + pLightHslParam[1] = 0x44; /*HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state*/ + pLightHslParam[2] = 0x64; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslParam[3] = 0x04; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + pLightHslParam[4] = 0xff; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslParam[5] = 0xff; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + pLightHslRangeParam[0] = 0xE8; /*HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[1] = 0x03; /*HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[2] = 0x88; /*HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[3] = 0x13; /*HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[4] = 0x88; /*HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[5] = 0x13; /*HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[6] = 0x70; /*HSL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[7] = 0x17; /*HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + + pLightHslHueParam[0] = 0xE8; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslHueParam[1] = 0x03; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + + pLightHslSaturationParam[0] = 0xE8; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslSaturationParam[1] = 0x03; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + /*LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B*/ + pLightLCPropertyParam[0]= 0x2B; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[1]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[2]= 0x44; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[3]= 0x44; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[4]= 0x44; /* Property ID byte 2 : Property ID identifying a Light LC Property.*/ + break; + + case 1: + ButtonIndex_Value=0x2; + + pGeneric_LevelParam[0]= 0xff; /* Level parameter byte 0 : The target value of the Generic Level state */ + pGeneric_LevelParam[1]= 0x7f; /* Level parameter byte 1 : The target value of the Generic Level state */ + + pGeneric_DeltaLevelParam[0]= 0x10; /* Delta Level parameter byte 0 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[1]= 0x27; /* Delta Level parameter byte 1 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[2]= 0x00; /* Delta Level parameter byte 2 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[3]= 0x00; /* Delta Level parameter byte 3 : The Delta change of the Generic Level state */ + + pGeneric_MoveLevelParam[0]= 0xff; /*Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state */ + pGeneric_MoveLevelParam[1]= 0x7f; /*Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state */ + + pGeneric_DefaultTransitionTimeParam[0]=0x10; /*Transition time parameter byte 0 : The value of the Generic Default Transition Time state */ + + pGeneric_PowerOnOffParam[0]=0x2; /*OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state. */ + + pLightnessParam[0] = 0xff; /*Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state */ + pLightnessParam[1] = 0xff; /*Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state */ + + pLightnessRangeParam[0] = 0x00; /*Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[1] = 0x00; /*Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[2] = 0xff; /*Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state */ + pLightnessRangeParam[3] = 0xff; /*Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state */ + + pLightCtlParam[0] = 0xff; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state */ + pLightCtlParam[1] = 0xff; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state */ + pLightCtlParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlParam[3] = 0x4e; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlParam[4] = 0xff; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlParam[5] = 0x7f; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureParam[0] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[1] = 0x4e; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[2] = 0xff; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlTemperatureParam[3] = 0x7f; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureRangeParam[0] = 0x19; /*Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[1] = 0x4e; /*Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[2] = 0x20; /*Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[3] = 0x4e; /*Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + + pLightCtlDefaultParam[0] = 0xff; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[1] = 0xff; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[3] = 0x4e; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[4] = 0xff; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state*/ + pLightCtlDefaultParam[5] = 0x7f; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state*/ + /** Green color **/ + pLightHslParam[0] = 0xc6; /*HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state*/ + pLightHslParam[1] = 0x46; /*HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state*/ + pLightHslParam[2] = 0x19; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslParam[3] = 0x51; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + pLightHslParam[4] = 0xd7; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslParam[5] = 0xed; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + pLightHslRangeParam[0] = 0x00; /*HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[1] = 0xf0; /*HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[2] = 0xff; /*HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[3] = 0xff; /*HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[4] = 0x00; /*HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[5] = 0xe0; /*HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[6] = 0xff; /*HSL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[7] = 0xef; /*HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + + pLightHslHueParam[0] = 0xff; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslHueParam[1] = 0xff; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + + pLightHslSaturationParam[0] = 0xff; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslSaturationParam[1] = 0xff; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + /*LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B*/ + pLightLCPropertyParam[0]= 0x2B; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[1]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[2]= 0x01; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[3]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[4]= 0x10; /* Property ID byte 2 : Property ID identifying a Light LC Property.*/ + break; + + case 2: + ButtonIndex_Value=0x0; + + pGeneric_LevelParam[0]= 0x00; /* Level parameter byte 0 : The target value of the Generic Level state */ + pGeneric_LevelParam[1]= 0x00; /* Level parameter byte 1 : The target value of the Generic Level state */ + + pGeneric_DeltaLevelParam[0]= 0x00; /* Delta Level parameter byte 0 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[1]= 0x00; /* Delta Level parameter byte 1 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[2]= 0x00; /* Delta Level parameter byte 2 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[3]= 0x00; /* Delta Level parameter byte 3 : The Delta change of the Generic Level state */ + + pGeneric_MoveLevelParam[0]= 0x00; /*Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state */ + pGeneric_MoveLevelParam[1]= 0x00; /*Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state */ + + pGeneric_DefaultTransitionTimeParam[0]=0x00; /*Transition time parameter byte 0 : The value of the Generic Default Transition Time state */ + + pGeneric_PowerOnOffParam[0]=0x0; /*OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state. */ + + pLightnessParam[0] = 0x00; /*Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state */ + pLightnessParam[1] = 0x00; /*Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state */ + + pLightnessRangeParam[0] = 0x00; /*Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[1] = 0x00; /*Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[2] = 0x00; /*Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state */ + pLightnessRangeParam[3] = 0x10; /*Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state */ + + pLightCtlParam[0] = 0x00; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state */ + pLightCtlParam[1] = 0x00; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state */ + pLightCtlParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlParam[4] = 0x00; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlParam[5] = 0x00; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureParam[0] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[1] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[2] = 0x00; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlTemperatureParam[3] = 0x00; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureRangeParam[0] = 0x20; /*Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[1] = 0x03; /*Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[2] = 0x21; /*Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[3] = 0x03; /*Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + + pLightCtlDefaultParam[0] = 0x00; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state */ + pLightCtlDefaultParam[1] = 0x00; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state */ + pLightCtlDefaultParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state */ + pLightCtlDefaultParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state */ + pLightCtlDefaultParam[4] = 0x00; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state */ + pLightCtlDefaultParam[5] = 0x00; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state */ + + pLightHslParam[0] = 0x00; /*HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state */ + pLightHslParam[1] = 0x00; /*HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state */ + pLightHslParam[2] = 0x00; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state */ + pLightHslParam[3] = 0x00; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state */ + pLightHslParam[4] = 0x00; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state */ + pLightHslParam[5] = 0x00; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state */ + + pLightHslRangeParam[0] = 0x00; /*HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[1] = 0x00; /*HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[2] = 0x00; /*HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[3] = 0x10; /*HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[4] = 0x00; /*HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[5] = 0x00; /*HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[6] = 0x00; /*SL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[7] = 0x20; /*HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + + pLightHslHueParam[0] = 0x00; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state */ + pLightHslHueParam[1] = 0x00; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state */ + + pLightHslSaturationParam[0] = 0x00; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslSaturationParam[1] = 0x00; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + /*LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B */ + pLightLCPropertyParam[0]= 0x2B; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[1]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[2]= 0x00; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[3]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[4]= 0x00; /* Property ID byte 2 : Property ID identifying a Light LC Property.*/ + break; + + default: + break; + } + + +#ifdef GENERIC_CLIENT_MODEL_PUBLISH + /** GENERIC ONOFF **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF SET ACK ------------- \r\n"); + Appli_GenericClient_API(0, GENERIC_ON_OFF_SET_ACK, pGeneric_OnOffParam); + */ + TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF SET UNACK ------------- \r\n"); + Appli_GenericClient_API(0, GENERIC_ON_OFF_SET_UNACK, pGeneric_OnOffParam); + + /** GENERIC LEVEL **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_LEVEL_SET_ACK, pGeneric_LevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_LEVEL_SET_UNACK, pGeneric_LevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DELTA LEVEL SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DELTA_SET, pGeneric_DeltaLevelParam);*/ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DELTA LEVEL SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DELTA_SET_UNACK, pGeneric_DeltaLevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API MOVE DELTA LEVEL SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_MOVE_SET, pGeneric_MoveLevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API MOVE DELTA LEVEL SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_MOVE_SET_UNACK, pGeneric_MoveLevelParam); */ + + /** GENERIC POWER ONOFF **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_SET, pGeneric_PowerOnOffParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_SET_UNACK, pGeneric_PowerOnOffParam); */ + + /** GENERIC TRANSITION TIME **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_SET, pGeneric_DefaultTransitionTimeParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_SET_UNACK, pGeneric_DefaultTransitionTimeParam); */ +#endif + +#ifdef LIGHT_CLIENT_MODEL_PUBLISH + /** LIGHT LIGHTNESS **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_SET, pLightnessParam); */ +/* */ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_SET_UNACK, pLightnessParam); */ + + /** LIGHT LIGHTNESS LINEAR **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET LINEAR ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_SET, pLightnessParam); */ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET LINEAR UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_SET_UNACK, pLightnessParam); */ + + /** LIGHT LIGHTNESS DEFAULT **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_SET, pLightnessParam); */ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_SET_UNACK, pLightnessParam); */ + + /** LIGHT LIGHTNESS RANGE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_SET, pLightnessRangeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_SET_UNACK, pLightnessRangeParam);*/ + + /** LIGHT LIGHTNESS CTL **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_SET, pLightCtlParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_SET_UNACK, pLightCtlParam);*/ + + /** LIGHT LIGHTNESS CTL TEMPERATURE**/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_SET, pLightCtlTemperatureParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_SET_UNACK, pLightCtlTemperatureParam);*/ + + /** LIGHT LIGHTNESS CTL TEMPERATURE RANGE**/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_SET, pLightCtlTemperatureRangeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_SET_UNACK, pLightCtlTemperatureRangeParam);*/ + + /** LIGHT LIGHTNESS CTL DEFAULT**/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_SET, pLightCtlDefaultParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_SET_UNACK, pLightCtlDefaultParam);*/ + + /** LIGHT LIGHTNESS HSL **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SET, pLightHslParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SET_UNACK, pLightHslParam);*/ + + /** LIGHT LIGHTNESS HSL DEFAULT **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_SET, pLightHslParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_SET_UNACK, pLightHslParam);*/ + + /** LIGHT LIGHTNESS HSL RANGE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_RANGE_SET, pLightHslRangeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_RANGE_SET_UNACK, pLightHslRangeParam);*/ + + /** LIGHT LIGHTNESS HSL HUE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_HUE_SET, pLightHslHueParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_HUE_SET_UNACK, pLightHslHueParam);*/ + + /** LIGHT LIGHTNESS HSL SATURATION **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SATURATION_SET, pLightHslSaturationParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SATURATION_SET_UNACK, pLightHslSaturationParam);*/ + + /** LIGHT LC MODE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_MODE_SET, pLightLCModeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_MODE_SET_UNACK, pLightLCModeParam);*/ + + /** LIGHT LC OM **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_OM_SET, pLightLCOccupancyModeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_OM_SET_UNACK, pLightLCOccupancyModeParam);*/ + + /** LIGHT LC ONOFF **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ONOFF SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_ON_OFF_SET, pLightLCOnOffParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ONOFF SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_ON_OFF_SET_UNACK, pLightLCOnOffParam);*/ + + /** LIGHT LC PROPERTY **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_PROPERTY_SET, pLightLCPropertyParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_PROPERTY_SET_UNACK, pLightLCPropertyParam);*/ +#endif +#endif + + #ifdef ENABLE_SENSOR_MODEL_CLIENT + /** SENSOR CADENCE**/ + /* + PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + */ + pSensorsCadenceParam[0]= 0x4F; /* Property ID byte 0 : Property ID for the sensor.*/ + pSensorsCadenceParam[1]= 0x00; /* Property ID byte 1 : Property ID for the sensor.*/ + + pSensorsCadenceParam[2]= 0x81; /* Fast Cadence Period Divisor bits 0-7: Divisor for the Publish Period.*/ + /* Status Trigger Type bit 8 : Defines the unit and format of the Status Trigger Delta fields.*/ + pSensorsCadenceParam[3]= 0x11; /* Status Trigger Delta Down byte 0 : Delta down value that triggers a status message.*/ + pSensorsCadenceParam[4]= 0x11; /* Status Trigger Delta Down byte 1 : Delta down value that triggers a status message.*/ + + pSensorsCadenceParam[5]= 0x22; /* Status Trigger Delta Up byte 0 : Delta down value that triggers a status message.*/ + pSensorsCadenceParam[6]= 0x22; /* Status Trigger Delta Up byte 1 : Delta down value that triggers a status message.*/ + + pSensorsCadenceParam[7]= 0x10; /* Status Min Interval byte 0 : Minimum interval between two consecutive Status messages. */ + + pSensorsCadenceParam[8]= 0x33; /* Fast Cadence Low byte 0 : Low value for the fast cadence range.*/ + + pSensorsCadenceParam[9]= 0x44; /* Fast Cadence High byte 0 : High value for the fast cadence range.*/ + +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE SET ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_CADENCE_SET, pSensorsCadenceParam);*/ + +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE SET UNACK ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_CADENCE_SET_UNACK, pSensorsCadenceParam);*/ + + /** SENSOR SETTING**/ + /* + PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + Second Property PID : 0x00AD + */ + pSensorsSettingParam[0]= 0x4F; /* Property ID byte 0 : Property ID for the sensor*/ + pSensorsSettingParam[1]= 0x00; /* Property ID byte 1 : Property ID for the sensor*/ + pSensorsSettingParam[2]= 0xAD; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + pSensorsSettingParam[3]= 0x00; /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + + switch (ButtonIndex_Value){ + case 0: + pSensorsSettingParam[4]= 0x10; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + /*pSensorsSettingParam[5]= 0x10;*/ /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + break; + case 1: + pSensorsSettingParam[4]= 0x20; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + /*pSensorsSettingParam[5]= 0x20;*/ /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + break; + case 2: + pSensorsSettingParam[4]= 0x0F; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + /*pSensorsSettingParam[5]= 0x00;*/ /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + break; + default: + break; + } +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING SET ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_SETTING_SET, pSensorsSettingParam);*/ + +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING SET UNACK ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_SETTING_SET_UNACK, pSensorsSettingParam);*/ +#endif /* ENABLE_SENSOR_MODEL_CLIENT */ + + +/* if CLIENT and SERVER => Publish is already done in CLIENT */ +#ifdef GENERIC_SERVER_MODEL_PUBLISH +#ifndef GENERIC_CLIENT_MODEL_PUBLISH + Generic_Publish(BLEMesh_GetAddress()); +#endif +#endif +} + + +/** +* @brief Get the Element Number for selected Model +* @param dst_peer : Destination Address received +* @retval MOBLEUINT8 : elementNumber +*/ +MOBLEUINT8 BLEMesh_ModelsGetElementNumber(MOBLE_ADDRESS dst_peer) +{ + + MOBLE_ADDRESS nodeAddress; + MOBLEUINT8 elementNumber; + + nodeAddress = BLEMesh_GetAddress(); + elementNumber = ((dst_peer - nodeAddress)+1); + + return elementNumber; +} + +/** +* @brief Get the Element Index for selected Model +* @param dst_peer : Destination Address received +* @retval MOBLEUINT8 : elementIndex +*/ +MOBLEUINT8 BLEMesh_ModelsGetElementIndex(MOBLE_ADDRESS dst_peer) +{ + + MOBLE_ADDRESS nodeAddress; + MOBLEUINT8 elementIndex; + + nodeAddress = BLEMesh_GetAddress(); + elementIndex =(dst_peer - nodeAddress); + + return elementIndex; +} + + +/** +* @brief Schedule a packet to be sent with randomized send timestamp +* If a que is empty, random timestamp is calculated +* Subsequent packets are sent in sequence +* @param *pmsgParam Pointer to structure of message header for parameters: +* elementIndex, src, dst addresses, TTL, RSSI, NetKey & AppKey Offset +* @param status: Command status +* @param data: Data buffer. +* @param length: Length of data in bytes. +* @retval None +*/ +void BLEMesh_ModelsDelayPacket(MODEL_MessageHeader_t *pmsgParams, + MOBLEUINT8 command, + MOBLEUINT8 const * data, + MOBLEUINT32 length) +{ + MOBLEUINT8 random_time[8]; + + if (Appli_PendingPackets.packet_count == 0) + { + Appli_PendingPackets.packet_count = 1; + hci_le_rand(random_time); + Appli_PendingPackets.send_time = Clock_Time() + + DEFAULT_DELAY_PACKET_FROM + + (random_time[0] + random_time[1]*256)\ + %DEFAULT_DELAY_PACKET_RANDOM_TIME; + Appli_PendingPackets.head = Appli_PendingPackets.packet; + Appli_PendingPackets.head_index = 0; + TRACE_M(TF_MISC, "Randomized time: %ld\n\r", Appli_PendingPackets.send_time - Clock_Time()); + } + else + { + Appli_PendingPackets.packet_count += 1; + Appli_PendingPackets.packet_count = (Appli_PendingPackets.packet_count)%\ + (MAX_PENDING_PACKETS_QUE_SIZE+1); + + if (Appli_PendingPackets.head != (Appli_PendingPackets.packet + \ + MAX_PENDING_PACKETS_QUE_SIZE - 1)) + { + Appli_PendingPackets.head = Appli_PendingPackets.head +1; + Appli_PendingPackets.head_index = Appli_PendingPackets.head_index+1; + } + else + { + Appli_PendingPackets.head = Appli_PendingPackets.packet; + Appli_PendingPackets.head_index = 0; + } + } + + Appli_PendingPackets.head->peer = pmsgParams->peer_addr; + Appli_PendingPackets.head->dst = pmsgParams->dst_peer; + Appli_PendingPackets.head->elementIndex = pmsgParams->elementIndex; + Appli_PendingPackets.head->appKeyOffset = pmsgParams->rcvdAppKeyOffset; + Appli_PendingPackets.head->netKeyOffset = pmsgParams->rcvdNetKeyOffset; + Appli_PendingPackets.head->command = command; + Appli_PendingPackets.head->length = length; + for (MOBLEUINT8 count=0; countdata[count] = data[count]; +} + + +/** +* @brief If send timestamp is reached and que is not empty, send all packets +* @param None +* @retval None +*/ +void BLEMesh_ModelsSendDelayedPacket(void) +{ + APPLI_SEND_RESPONSE_MODULE* ptr; + MODEL_MessageHeader_t msgParam; + MOBLEUINT8 temp_index; + + if ((Appli_PendingPackets.packet_count != 0) && + (Appli_PendingPackets.send_time <= Clock_Time())) + { + for (MOBLEUINT8 count=Appli_PendingPackets.packet_count; count!=0; count--) + { + TRACE_M(TF_MISC, "Sending randomized packets. Packet count: %d \n\r",\ + Appli_PendingPackets.packet_count - count + 1); + temp_index = ((Appli_PendingPackets.head_index+MAX_PENDING_PACKETS_QUE_SIZE+1)\ + -count)%MAX_PENDING_PACKETS_QUE_SIZE; + ptr = Appli_PendingPackets.packet + temp_index; + + /* Initialize the messageParam*/ + msgParam.dst_peer = ptr->dst; + msgParam.peer_addr = ptr->peer; + msgParam.elementIndex = 0; + msgParam.rcvdAppKeyOffset = 0; + msgParam.rcvdNetKeyOffset = 0; + msgParam.rssi = 0; + msgParam.ttl = 0; + + VendorModel_SendResponse(VENDOR_STMICRO_CID, + &msgParam, + ptr->command, + ptr->data, + ptr->length); + } + + Appli_PendingPackets.packet_count = 0; + } +} + +/** \brief Set remote publication for the given Model ID & node Address +* User is responsible for serializing data into \a data buffer. Vendor_WriteLocalDataCb +* callback will be called on the remote device. +* @param modelId ID of the model. +* @param elementIdx element index +* @param command vendor model commands +* @param data Data buffer. +* @param length Length of data in bytes. +* @param response If 'MOBLE_TRUE', used to get the response. If 'MOBLE_FALSE', no response +* @return MOBLE_RESULT_SUCCESS on success. +*/ +MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 elementIdx, + MOBLEUINT16 msg_opcode, MOBLEUINT8 const *msg_buff, + MOBLEUINT32 length, MOBLEBOOL ack_flag, + MOBLEUINT8 isVendor) +{ + MOBLE_ADDRESS srcAddress; + + srcAddress = BLEMesh_GetAddress(); + srcAddress += elementIdx; /* Get the Address to send in the message */ + + return BLEMesh_SetRemotePublication(modelId, + srcAddress , + msg_opcode , + msg_buff, length, + ack_flag, + MOBLE_FALSE); +} + +/** +* @brief Convert ASCII value into Character +* @param tempValue : 8bit value for conversion +* @retval MOBLEUINT8 +*/ +MOBLEUINT8 BLEMesh_ModelsASCII_To_Char(MOBLEUINT8 tempValue) +{ + tempValue = tempValue - 0x30; + return tempValue; +} + +__weak void Test_Process(void) +{ +} +/** +* @} +*/ + +/** +* @} +*/ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h new file mode 100644 index 000000000..e20f54d8b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h @@ -0,0 +1,51 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file models_if.h + * @author MCD Application Team + * @brief Mesh Modes interface file header + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MODELS_H +#define __MODELS_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ + +/* Exported Functions Prototypes ---------------------------------------------*/ + +void BLEMesh_ModelsInit(void); +void BLEMesh_ModelsProcess(void); +void BLEMesh_ModelsCommand(void); + +MOBLEUINT8 BLEMesh_ModelsGetElementNumber(MOBLE_ADDRESS dst_peer); +MOBLEUINT8 BLEMesh_ModelsGetElementIndex(MOBLE_ADDRESS dst_peer); +void BLEMesh_ModelsDelayPacket(MODEL_MessageHeader_t *pmsgParams, MOBLEUINT8 command, + MOBLEUINT8 const * data, MOBLEUINT32 length); +void BLEMesh_ModelsSendDelayedPacket(void); +MOBLEUINT8 BLEMesh_ModelsASCII_To_Char(MOBLEUINT8 tempValue); +MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 elementIdx, + MOBLEUINT16 msg_opcode, MOBLEUINT8 const *msg_buff, + MOBLEUINT32 length, MOBLEBOOL ack_flag, + MOBLEUINT8 isVendor); + +#endif /* __MODELS_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c new file mode 100644 index 000000000..a2b6b3570 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c @@ -0,0 +1,443 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file pal_nvm.c + * @author MCD Application Team + * @brief Flash management for the Controller + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "pal_nvm.h" +#include "pal_if.h" +#include + +#include "ble.h" +#include "shci.h" +#include "mesh_cfg_usr.h" + +#include "hw_flash.h" + +/* Private define ------------------------------------------------------------*/ +#define FLASH_SECTOR_SIZE 0x1000 + +/* Private variables ---------------------------------------------------------*/ + +/* Private functions ---------------------------------------------------------*/ +/** + * @brief Gets the page of a given address + * @param Addr: Address of the FLASH Memory + * @retval The page of a given address + */ +static MOBLEUINT32 GetPage(MOBLEUINT32 Addr) +{ + MOBLEUINT32 page = 0; + + if (Addr < (FLASH_BASE + FLASH_BANK_SIZE)) + { + /* Bank 1 */ + page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE; + } + else + { + /* Bank 2 */ + page = (Addr - (FLASH_BASE + FLASH_BANK_SIZE)) / FLASH_PAGE_SIZE; + } + + return page; +} + +#if 0 +/** +* @brief PalNvmErase +* @param None +* @retval Result +*/ +MOBLE_RESULT PalNvmErase(MOBLEUINT32 address, + MOBLEUINT32 offset) +{ + HAL_StatusTypeDef status = HAL_OK; + uint32_t pageError = 0; + +// printf("PalNvmErase >>>\r\n"); + + FLASH_EraseInitTypeDef erase; + erase.TypeErase = FLASH_TYPEERASE_PAGES; + erase.Page = GetPage(address + offset); /* 126 or 127 */; + erase.NbPages = FLASH_SECTOR_SIZE >> 12; + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_FLASH_SEMID ) ); + HAL_FLASH_Unlock(); + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | + FLASH_FLAG_WRPERR | + FLASH_FLAG_OPTVERR); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_ON); + + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + status = HAL_FLASHEx_Erase(&erase, &pageError); + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_OFF); + + HAL_FLASH_Lock(); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_FLASH_SEMID, 0 ); + +// printf("PalNvmErase <<<\r\n"); + + return status == HAL_OK ? MOBLE_RESULT_SUCCESS : MOBLE_RESULT_FAIL; +} +#endif + +/** +* @brief returns NVM write protect status +* @param None +* @retval TRUE if flash is write protected +*/ +MOBLEBOOL PalNvmIsWriteProtected(void) +{ + /* All flash is writable */ + return MOBLE_FALSE; +} + +/** +* @brief Read NVM +* @param address: read start address of nvm +* @param offset: offset read start address of nvm +* @param buf: copy of read content +* @param size: size of memory to be read +* @param backup: If read from backup memory +* @retval Result of read operation +*/ +MOBLE_RESULT PalNvmRead(MOBLEUINT32 address, + MOBLEUINT32 offset, + void *buf, + MOBLEUINT32 size, + MOBLEBOOL backup) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + +// printf("MoblePalNvmRead >>>\r\n"); + + if (offset > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + memcpy(buf, (void *)(address + offset), size); + } + +// printf("MoblePalNvmRead <<<\r\n"); + return result; +} + +/** +* @brief Compare with NVM +* @param offset: start address of nvm to compare +* @param offset: offset start address of nvm +* @param buf: copy of content +* @param size: size of memory to be compared +* @param comparison: outcome of comparison +* @retval Result +*/ +MOBLE_RESULT PalNvmCompare(MOBLEUINT32 address, + MOBLEUINT32 offset, + void const *buf, + MOBLEUINT32 size, + MOBLE_NVM_COMPARE* comparison) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT32 i; + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM +// printf("MoblePalNvmCompare >>>\r\n"); + + if ((comparison == NULL) || (buf == NULL)) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + *comparison = MOBLE_NVM_COMPARE_EQUAL; + size >>= 2; + + MOBLEUINT32 * src = (MOBLEUINT32*)buf; + MOBLEUINT32 * dst = (MOBLEUINT32*)(address + offset); + + i = 0; + do + { + if ((src[i] != dst[i]) && (*comparison == MOBLE_NVM_COMPARE_EQUAL)) + { + *comparison = MOBLE_NVM_COMPARE_NOT_EQUAL; + } + i++; + } while((*comparison != MOBLE_NVM_COMPARE_NOT_EQUAL) && (i < size)); + } + +// printf("MoblePalNvmCompare <<<\r\n"); +#else + *comparison = MOBLE_NVM_COMPARE_EQUAL; +#endif + return result; +} + +/** +* @brief Erase NVM +* @param None +* @retval Result +*/ +MOBLE_RESULT PalNvmErase(MOBLEUINT32 address, + MOBLEUINT32 offset) +{ + HAL_StatusTypeDef status = HAL_OK; + + uint32_t pageError = 0; + +// printf("MoblePalNvmErase >>>\r\n"); + + FLASH_EraseInitTypeDef erase; + erase.TypeErase = FLASH_TYPEERASE_PAGES; + erase.Page = GetPage(address + offset); /* 126 or 127 */; + erase.NbPages = FLASH_SECTOR_SIZE >> 12; + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_FLASH_SEMID ) ); + HAL_FLASH_Unlock(); + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | + FLASH_FLAG_WRPERR | + FLASH_FLAG_OPTVERR); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_ON); + + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + status = HAL_FLASHEx_Erase(&erase, &pageError); + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_OFF); + + HAL_FLASH_Lock(); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_FLASH_SEMID, 0 ); + +// printf("MoblePalNvmErase <<<\r\n"); + + return status == HAL_OK ? MOBLE_RESULT_SUCCESS : MOBLE_RESULT_FAIL; +} + +/** +* @brief Write to NVM +* @param offset: wrt start address of nvm +* @param offset: offset wrt start address of nvm +* @param buf: copy of write content +* @param size: size of memory to be written +* @retval Result +*/ +MOBLE_RESULT PalNvmWrite(MOBLEUINT32 address, + MOBLEUINT32 offset, + void const *buf, + MOBLEUINT32 size) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + + // printf("MoblePalNvmWrite >>>\r\n"); + + if (offset > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + MOBLEUINT32 remain = 0; + MOBLEUINT32 nb_dword = 0; + + nb_dword = (size >> 3); + remain = size - ((nb_dword) << 3); + if(remain > 0) + nb_dword += 1; + + uint64_t* src = (uint64_t*)buf; + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_FLASH_SEMID ) ); + HAL_FLASH_Unlock(); + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | + FLASH_FLAG_WRPERR | + FLASH_FLAG_OPTVERR | + FLASH_FLAG_PGSERR | + FLASH_FLAG_SIZERR | + FLASH_FLAG_PGAERR); + + for (size_t i = 0; i < nb_dword/*size*/; i++) + { + do + { + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, + address + offset + (i <<3), + src[i]); + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + } while(*((uint64_t*)(address + offset + (i <<3))) != src[i]); + } + + HAL_FLASH_Lock(); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_FLASH_SEMID, 0 ); + } +// printf("MoblePalNvmWrite <<<\r\n"); +#endif + + return result; +} + +#if 0 +/** +* @brief Backup process +* @param None +* @retval Result +*/ +static MOBLE_RESULT PalNvmBackupProcess(void) +{ + MOBLEUINT32 buff[4*N_BYTES_WORD]; + static MOBLEUINT8 backup_pages_to_be_erased = 0; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + if (backup_pages_to_be_erased == 0) + { + backup_pages_to_be_erased = 1; + } + + if(backup_pages_to_be_erased != 0) + { +#if 0 + BLEMesh_StopAdvScan(); + ATOMIC_SECTION_BEGIN(); + if(BluenrgMesh_IsFlashReadyToErase()) + { + FLASH_ErasePage((uint16_t)((BNRGM_NVM_BACKUP_BASE - + RESET_MANAGER_FLASH_BASE_ADDRESS) / PAGE_SIZE + + BNRGM_NVM_BACKUP_SIZE/PAGE_SIZE - + backup_pages_to_be_erased)); + + if (FLASH_GetFlagStatus(Flash_CMDERR) == SET) + { + result = MOBLE_RESULT_FAIL; + } + else + { + backup_pages_to_be_erased--; + } + } + else + { + /* do nothing */ + } + ATOMIC_SECTION_END(); +#else + result = PalNvmErase(NVM_BASE, FLASH_SECTOR_SIZE); + if(result == MOBLE_RESULT_SUCCESS) + backup_pages_to_be_erased = 0; +#endif + } + + if (result == MOBLE_RESULT_SUCCESS && backup_pages_to_be_erased == 0) + { +#if 0 + BLEMesh_StopAdvScan(); + ATOMIC_SECTION_BEGIN(); + if(BluenrgMesh_IsFlashReadyToErase()) + { + for (size_t i = 0; i < BNRGM_NVM_BACKUP_SIZE && FLASH_GetFlagStatus(Flash_CMDERR) == RESET; ) + { + memcpy((MOBLEUINT8*)buff, (void *)(BNRGM_NVM_BASE + i), 4*N_BYTES_WORD); + FLASH_ProgramWordBurst(BNRGM_NVM_BACKUP_BASE + i, (uint32_t*)buff); + i += 4*N_BYTES_WORD; + } + + if (FLASH_GetFlagStatus(Flash_CMDERR) == SET) + { + result = MOBLE_RESULT_FAIL; + } + else + { + PalNvmReqs.backup_req = MOBLE_FALSE; + } + } + else + { + /* do nothing */ + } + ATOMIC_SECTION_END(); +#else +#endif + } + return result; +} +#endif + +/** +* @brief NVM process +* @param None +* @retval Result +*/ +MOBLE_RESULT PalNvmProcess(void) +{ + /* do nothing */ + return MOBLE_RESULT_SUCCESS; +} + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h new file mode 100644 index 000000000..7575494d1 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h @@ -0,0 +1,741 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file sensor_cfg_usr.h + * @author MCD Application Team + * @brief sensor server initialization parameters + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __SENSOR_USR_CFG_H +#define __SENSOR_USR_CFG_H + +/** +* Maximum count of settings that can be supported by a sensor +* E.g., 5 sensors +* 1st sensor has 2 settings +* 2nd sensor has 3 settings +* 3rd sensor has 2 settings +* 4th sensor has 1 setting +* 5th sensor has 2 settings +* This value is max(2, 3, 2, 1, 2) = 3 +* value is >=1 +*/ +#define SENSOR_MAX_SETTINGS_COUNT 1 + +/** +* Maximum count of series column that is supported by a sensor +* E.g., 2 sensors supporting series column +* One sensor supports 2 columns while other sensor supports 20 columns +* This value is max(2, 20) = 20 +* value is >=1 +*/ +#define SENSOR_MAX_SERIES_COUNT 1 + +/** +* Total sensors count on all elements +* It is sum of sensors count on all elements +* Sensor init fails in case of mismatch with sensor server initialization parameters +*/ +#define TOTAL_SENSORS_COUNT 1 + +/** +* Sum of sensor settings on all sensors on all elements +* Sensor init fails in case of mismatch with sensor server initialization parameters +*/ +#define TOTAL_SENSOR_SETTINGS_COUNT 0 + +/** +* Sum of sensor series columns on all sensors on all elements +* Sensor init fails in case of mismatch with sensor server initialization parameters +*/ +#define TOTAL_SENSOR_SERIES_COLUMN_COUNT 0 + + +/** +* This structure contains sensor setting initialization parameters +*/ +typedef struct +{ + uint16_t settingPropertyId; + uint8_t settingAccess; + uint32_t settingRaw; +}sensor_settings_init_params_t; + + +/** +* This structure contains sensor series column initialization parameters +*/ +typedef struct +{ + uint32_t rawX; + uint32_t columnWidth; +}sensor_series_column_init_params_t; + + +/** +* This structure contains sensor initialization parameters +*/ +typedef struct +{ + uint8_t elementIdx; + uint16_t propertyId; + uint16_t positiveTolerance; + uint16_t negativeTolerance; + uint8_t samplingFunction; + uint8_t measurementPeriod; + uint8_t updateInterval; + uint8_t dataLength; + uint8_t cadenceState; + uint32_t valuesRange; + uint8_t settingsCount; + sensor_settings_init_params_t settings[SENSOR_MAX_SETTINGS_COUNT]; + uint16_t seriesCount; + sensor_series_column_init_params_t seriesColumn[SENSOR_MAX_SERIES_COUNT]; +}sensor_init_params_t; + + +/** +* This structure contains sensor server initialization parameters +*/ +typedef struct +{ + uint8_t sensorsCount; + sensor_init_params_t sensorInitParams[TOTAL_SENSORS_COUNT]; +} sensor_server_init_params_t; + + +/** +* Below section represents initialization parameters of sensors supported +* Define sensors in ascending order of element index followed by ascending +* order of Property IDs else initialization of sensor structure would fail +* Single element can support one instance of sensor PID, there can't be multiple +* instances of same PID on same element +* For e.g. 10 sensors with PID (PID1 < PIDn ... < PID7) supported on 3 elements +* with element index (0, 1 and 2) in below fashion +* Element index 0 supports sensors corresponding to PID3, PID4, PID6 and PID7 +* Element index 1 supports sensors corresponding to PID2, PID4, PID5 and PID6 +* Element index 2 supports sensors corresponding to PID1, PID5 +* Corrector order of naming sensors (SENSORX) is +* Element index 0 -> SENSOR1(PID3), SENSOR2(PID4), SENSOR3(PID6) and SENSOR4(PID7) +* Element index 1 -> SENSOR5(PID2), SENSOR6(PID4), SENSOR7(PID5), and SENSOR8(PID6) +* Element index 2 -> SENSOR9(PID1), and SENSOR10(PID5) +*/ + +/* Sensor 1 initialization */ + +/** +* Element index for SENSOR1 +* varies from 0 to n-1 (n = number of elements) +*/ +#define SENSOR1_ELEMENT_IDX 0 + +/** +* Property ID of sensor, identifies device characteristics and other features +* Defined by Mesh Device Properties or a custom value +* 16 bit value +* 0x0000 - Prohibited +*/ +#define SENSOR1_PROPERTY_ID PRESENT_AMBIENT_TEMPERATURE_PID +#define SENSOR1_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR1_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR1_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR1_DATA_LENGTH 1 +#define SENSOR1_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR1_VALUES_RANGE 254 +#define SENSOR1_SETTINGS_COUNT 2 +#define SENSOR1_SETTING1_PROPERTY_ID 0x00BB +#define SENSOR1_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR1_SETTING1_RAW 0 +#define SENSOR1_SETTING2_PROPERTY_ID 0x00AD +#define SENSOR1_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR1_SETTING2_RAW 0 +#define SENSOR1_SERIES_COUNT 0 + +#define SENSOR1_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR1_SETTING1_PROPERTY_ID,\ + SENSOR1_SETTING1_ACCESS,\ + SENSOR1_SETTING1_RAW \ +} + +#define SENSOR1_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR1_SETTING2_PROPERTY_ID,\ + SENSOR1_SETTING2_ACCESS,\ + SENSOR1_SETTING2_RAW \ +} + +#define SENSOR1_INIT_PARAMS \ +{\ + SENSOR1_ELEMENT_IDX,\ + SENSOR1_PROPERTY_ID,\ + SENSOR1_POSITIVE_TOLERANCE,\ + SENSOR1_NEGATIVE_TOLERANCE,\ + SENSOR1_SAMPLING_FUNCTION,\ + SENSOR1_MEASUREMENT_PERIOD,\ + SENSOR1_UPDATE_INTERVAL,\ + SENSOR1_DATA_LENGTH,\ + SENSOR1_CADENCE_STATE,\ + SENSOR1_VALUES_RANGE,\ + SENSOR1_SETTINGS_COUNT,\ + {\ + SENSOR1_SETTINGS1_INIT_PARAMS,\ + SENSOR1_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR1_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + + +/* Sensor 2 initialization */ + +#define SENSOR2_ELEMENT_IDX 0 +#define SENSOR2_PROPERTY_ID PRESSURE_PID +#define SENSOR2_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR2_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR2_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR2_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR2_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR2_DATA_LENGTH 4 +#define SENSOR2_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR2_VALUES_RANGE 500 +#define SENSOR2_SETTINGS_COUNT 2 +#define SENSOR2_SETTING1_PROPERTY_ID 0x0AAA +#define SENSOR2_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR2_SETTING1_RAW 35666 +#define SENSOR2_SETTING2_PROPERTY_ID 0x0AAC +#define SENSOR2_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR2_SETTING2_RAW 33666 +#define SENSOR2_SERIES_COUNT 0 + +#define SENSOR2_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR2_SETTING1_PROPERTY_ID,\ + SENSOR2_SETTING1_ACCESS,\ + SENSOR2_SETTING1_RAW\ +} + +#define SENSOR2_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR2_SETTING2_PROPERTY_ID,\ + SENSOR2_SETTING2_ACCESS,\ + SENSOR2_SETTING2_RAW\ +} + +#define SENSOR2_INIT_PARAMS \ +{\ + SENSOR2_ELEMENT_IDX,\ + SENSOR2_PROPERTY_ID,\ + SENSOR2_POSITIVE_TOLERANCE,\ + SENSOR2_NEGATIVE_TOLERANCE,\ + SENSOR2_SAMPLING_FUNCTION,\ + SENSOR2_MEASUREMENT_PERIOD,\ + SENSOR2_UPDATE_INTERVAL,\ + SENSOR2_DATA_LENGTH,\ + SENSOR2_CADENCE_STATE,\ + SENSOR2_VALUES_RANGE,\ + SENSOR2_SETTINGS_COUNT,\ + {\ + SENSOR2_SETTINGS1_INIT_PARAMS,\ + SENSOR2_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR2_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + + +#define SENSOR3_ELEMENT_IDX 0 +#define SENSOR3_PROPERTY_ID PRESENCE_DETECTED_PID +#define SENSOR3_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR3_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR3_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR3_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR3_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR3_DATA_LENGTH 1 +#define SENSOR3_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR3_VALUES_RANGE 0 +#define SENSOR3_SETTINGS_COUNT 0 +#define SENSOR3_SERIES_COUNT 0 + +#define SENSOR3_SETTINGS_INIT_PARAMS \ +{\ + {\ + {0}\ + }\ +} + +#define SENSOR3_INIT_PARAMS \ +{\ + SENSOR3_ELEMENT_IDX,\ + SENSOR3_PROPERTY_ID,\ + SENSOR3_POSITIVE_TOLERANCE,\ + SENSOR3_NEGATIVE_TOLERANCE,\ + SENSOR3_SAMPLING_FUNCTION,\ + SENSOR3_MEASUREMENT_PERIOD,\ + SENSOR3_UPDATE_INTERVAL,\ + SENSOR3_DATA_LENGTH,\ + SENSOR3_CADENCE_STATE,\ + SENSOR3_VALUES_RANGE,\ + SENSOR3_SETTINGS_COUNT,\ + {\ + {0}\ + },\ + SENSOR3_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +/** +* Combined defined of all sensors initialization parameters +*/ + +#define SENSOR_SERVER_INIT_PARAMS \ +{\ + TOTAL_SENSORS_COUNT,\ + {\ + SENSOR3_INIT_PARAMS\ + }\ +} + +#endif /* __SENSOR_USR_CFG_H */ + +/* + +Example for multiple sensors with series column support + +#define SENSOR_MAX_SETTINGS_COUNT 3 +#define SENSOR_MAX_SERIES_COUNT 20 +#define TOTAL_SENSORS_COUNT 5 +#define TOTAL_SENSOR_SETTINGS_COUNT 9 +#define TOTAL_SENSOR_SERIES_COLUMN_COUNT 22 + +#define SENSOR1_ELEMENT_IDX 0 +#define SENSOR1_PROPERTY_ID PEOPLE_COUNT_PID +#define SENSOR1_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR1_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR1_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR1_DATA_LENGTH 2 +#define SENSOR1_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR1_VALUES_RANGE 1000 +#define SENSOR1_SETTINGS_COUNT 3 +#define SENSOR1_SETTING1_PROPERTY_ID 0x000A +#define SENSOR1_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR1_SETTING1_RAW 234 +#define SENSOR1_SETTING2_PROPERTY_ID 0x000C +#define SENSOR1_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR1_SETTING2_RAW 246 +#define SENSOR1_SETTING3_PROPERTY_ID 0x0010 +#define SENSOR1_SETTING3_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR1_SETTING3_RAW 278 +#define SENSOR1_SERIES_COUNT 0 + +#define SENSOR1_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR1_SETTING1_PROPERTY_ID,\ + SENSOR1_SETTING1_ACCESS,\ + SENSOR1_SETTING1_RAW\ +} + +#define SENSOR1_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR1_SETTING2_PROPERTY_ID,\ + SENSOR1_SETTING2_ACCESS,\ + SENSOR1_SETTING2_RAW\ +} + +#define SENSOR1_SETTINGS3_INIT_PARAMS \ +{\ + SENSOR1_SETTING3_PROPERTY_ID,\ + SENSOR1_SETTING3_ACCESS,\ + SENSOR1_SETTING3_RAW\ +} + +#define SENSOR1_INIT_PARAMS \ +{\ + SENSOR1_ELEMENT_IDX,\ + SENSOR1_PROPERTY_ID,\ + SENSOR1_POSITIVE_TOLERANCE,\ + SENSOR1_NEGATIVE_TOLERANCE,\ + SENSOR1_SAMPLING_FUNCTION,\ + SENSOR1_MEASUREMENT_PERIOD,\ + SENSOR1_UPDATE_INTERVAL,\ + SENSOR1_DATA_LENGTH,\ + SENSOR1_CADENCE_STATE,\ + SENSOR1_VALUES_RANGE,\ + SENSOR1_SETTINGS_COUNT,\ + {\ + SENSOR1_SETTINGS1_INIT_PARAMS,\ + SENSOR1_SETTINGS2_INIT_PARAMS,\ + SENSOR1_SETTINGS3_INIT_PARAMS\ + },\ + SENSOR1_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR2_ELEMENT_IDX 0 +#define SENSOR2_PROPERTY_ID DESIRED_AMBIENT_TEMPERATURE_PID +#define SENSOR2_POSITIVE_TOLERANCE 0xabc +#define SENSOR2_NEGATIVE_TOLERANCE 0xdef +#define SENSOR2_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_RMS +#define SENSOR2_MEASUREMENT_PERIOD 0x04 +#define SENSOR2_UPDATE_INTERVAL 0x05 +#define SENSOR2_DATA_LENGTH 1 +#define SENSOR2_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR2_VALUES_RANGE 100 +#define SENSOR2_SETTINGS_COUNT 2 +#define SENSOR2_SETTING1_PROPERTY_ID 0x00BB +#define SENSOR2_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR2_SETTING1_RAW 345 +#define SENSOR2_SETTING2_PROPERTY_ID 0x00AD +#define SENSOR2_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR2_SETTING2_RAW 435 +#define SENSOR2_SERIES_COUNT 0 + +#define SENSOR2_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR2_SETTING1_PROPERTY_ID,\ + SENSOR2_SETTING1_ACCESS,\ + SENSOR2_SETTING1_RAW\ +} + +#define SENSOR2_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR2_SETTING2_PROPERTY_ID,\ + SENSOR2_SETTING2_ACCESS,\ + SENSOR2_SETTING2_RAW \ +} + +#define SENSOR2_INIT_PARAMS \ +{\ + SENSOR2_ELEMENT_IDX,\ + SENSOR2_PROPERTY_ID,\ + SENSOR2_POSITIVE_TOLERANCE,\ + SENSOR2_NEGATIVE_TOLERANCE,\ + SENSOR2_SAMPLING_FUNCTION,\ + SENSOR2_MEASUREMENT_PERIOD,\ + SENSOR2_UPDATE_INTERVAL,\ + SENSOR2_DATA_LENGTH,\ + SENSOR2_CADENCE_STATE,\ + SENSOR2_VALUES_RANGE,\ + SENSOR2_SETTINGS_COUNT,\ + {\ + SENSOR2_SETTINGS1_INIT_PARAMS,\ + SENSOR2_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR2_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR3_ELEMENT_IDX 0 +#define SENSOR3_PROPERTY_ID PRESSURE_PID +#define SENSOR3_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR3_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR3_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR3_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR3_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR3_DATA_LENGTH 2 +#define SENSOR3_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR3_VALUES_RANGE 500 +#define SENSOR3_SETTINGS_COUNT 2 +#define SENSOR3_SETTING1_PROPERTY_ID 0x0AAA +#define SENSOR3_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR3_SETTING1_RAW 35666 +#define SENSOR3_SETTING2_PROPERTY_ID 0x0AAC +#define SENSOR3_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR3_SETTING2_RAW 33666 +#define SENSOR3_SERIES_COUNT 20 +#define SENSOR3_SERIES1_RAWX 0 +#define SENSOR3_SERIES1_CW 10 +#define SENSOR3_SERIES2_RAWX 23 +#define SENSOR3_SERIES2_CW 10 +#define SENSOR3_SERIES3_RAWX 34 +#define SENSOR3_SERIES3_CW 10 +#define SENSOR3_SERIES4_RAWX 35 +#define SENSOR3_SERIES4_CW 10 +#define SENSOR3_SERIES5_RAWX 36 +#define SENSOR3_SERIES5_CW 10 +#define SENSOR3_SERIES6_RAWX 40 +#define SENSOR3_SERIES6_CW 10 +#define SENSOR3_SERIES7_RAWX 41 +#define SENSOR3_SERIES7_CW 10 +#define SENSOR3_SERIES8_RAWX 42 +#define SENSOR3_SERIES8_CW 10 +#define SENSOR3_SERIES9_RAWX 43 +#define SENSOR3_SERIES9_CW 10 +#define SENSOR3_SERIES10_RAWX 45 +#define SENSOR3_SERIES10_CW 10 +#define SENSOR3_SERIES11_RAWX 46 +#define SENSOR3_SERIES11_CW 10 +#define SENSOR3_SERIES12_RAWX 47 +#define SENSOR3_SERIES12_CW 10 +#define SENSOR3_SERIES13_RAWX 48 +#define SENSOR3_SERIES13_CW 10 +#define SENSOR3_SERIES14_RAWX 49 +#define SENSOR3_SERIES14_CW 10 +#define SENSOR3_SERIES15_RAWX 50 +#define SENSOR3_SERIES15_CW 10 +#define SENSOR3_SERIES16_RAWX 51 +#define SENSOR3_SERIES16_CW 10 +#define SENSOR3_SERIES17_RAWX 52 +#define SENSOR3_SERIES17_CW 10 +#define SENSOR3_SERIES18_RAWX 53 +#define SENSOR3_SERIES18_CW 10 +#define SENSOR3_SERIES19_RAWX 55 +#define SENSOR3_SERIES19_CW 10 +#define SENSOR3_SERIES20_RAWX 89 +#define SENSOR3_SERIES20_CW 10 + +#define SENSOR3_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR3_SETTING1_PROPERTY_ID,\ + SENSOR3_SETTING1_ACCESS,\ + SENSOR3_SETTING1_RAW\ +} + +#define SENSOR3_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR3_SETTING2_PROPERTY_ID,\ + SENSOR3_SETTING2_ACCESS,\ + SENSOR3_SETTING2_RAW\ +} + +#define SENSOR3_COLUMN1_INIT_PARAMS {SENSOR3_SERIES1_RAWX,SENSOR3_SERIES1_CW} +#define SENSOR3_COLUMN2_INIT_PARAMS {SENSOR3_SERIES2_RAWX,SENSOR3_SERIES2_CW} +#define SENSOR3_COLUMN3_INIT_PARAMS {SENSOR3_SERIES3_RAWX,SENSOR3_SERIES3_CW} +#define SENSOR3_COLUMN4_INIT_PARAMS {SENSOR3_SERIES4_RAWX,SENSOR3_SERIES4_CW} +#define SENSOR3_COLUMN5_INIT_PARAMS {SENSOR3_SERIES5_RAWX,SENSOR3_SERIES5_CW} +#define SENSOR3_COLUMN6_INIT_PARAMS {SENSOR3_SERIES6_RAWX,SENSOR3_SERIES6_CW} +#define SENSOR3_COLUMN7_INIT_PARAMS {SENSOR3_SERIES7_RAWX,SENSOR3_SERIES7_CW} +#define SENSOR3_COLUMN8_INIT_PARAMS {SENSOR3_SERIES8_RAWX,SENSOR3_SERIES8_CW} +#define SENSOR3_COLUMN9_INIT_PARAMS {SENSOR3_SERIES9_RAWX,SENSOR3_SERIES9_CW} +#define SENSOR3_COLUMN10_INIT_PARAMS {SENSOR3_SERIES10_RAWX,SENSOR3_SERIES10_CW} +#define SENSOR3_COLUMN11_INIT_PARAMS {SENSOR3_SERIES11_RAWX,SENSOR3_SERIES11_CW} +#define SENSOR3_COLUMN12_INIT_PARAMS {SENSOR3_SERIES12_RAWX,SENSOR3_SERIES12_CW} +#define SENSOR3_COLUMN13_INIT_PARAMS {SENSOR3_SERIES13_RAWX,SENSOR3_SERIES13_CW} +#define SENSOR3_COLUMN14_INIT_PARAMS {SENSOR3_SERIES14_RAWX,SENSOR3_SERIES14_CW} +#define SENSOR3_COLUMN15_INIT_PARAMS {SENSOR3_SERIES15_RAWX,SENSOR3_SERIES15_CW} +#define SENSOR3_COLUMN16_INIT_PARAMS {SENSOR3_SERIES16_RAWX,SENSOR3_SERIES16_CW} +#define SENSOR3_COLUMN17_INIT_PARAMS {SENSOR3_SERIES17_RAWX,SENSOR3_SERIES17_CW} +#define SENSOR3_COLUMN18_INIT_PARAMS {SENSOR3_SERIES18_RAWX,SENSOR3_SERIES18_CW} +#define SENSOR3_COLUMN19_INIT_PARAMS {SENSOR3_SERIES19_RAWX,SENSOR3_SERIES19_CW} +#define SENSOR3_COLUMN20_INIT_PARAMS {SENSOR3_SERIES20_RAWX,SENSOR3_SERIES20_CW} + +#define SENSOR3_INIT_PARAMS \ +{\ + SENSOR3_ELEMENT_IDX,\ + SENSOR3_PROPERTY_ID,\ + SENSOR3_POSITIVE_TOLERANCE,\ + SENSOR3_NEGATIVE_TOLERANCE,\ + SENSOR3_SAMPLING_FUNCTION,\ + SENSOR3_MEASUREMENT_PERIOD,\ + SENSOR3_UPDATE_INTERVAL,\ + SENSOR3_DATA_LENGTH,\ + SENSOR3_CADENCE_STATE,\ + SENSOR3_VALUES_RANGE,\ + SENSOR3_SETTINGS_COUNT,\ + {\ + SENSOR3_SETTINGS1_INIT_PARAMS,\ + SENSOR3_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR3_SERIES_COUNT,\ + {\ + SENSOR3_COLUMN1_INIT_PARAMS,\ + SENSOR3_COLUMN2_INIT_PARAMS,\ + SENSOR3_COLUMN3_INIT_PARAMS,\ + SENSOR3_COLUMN4_INIT_PARAMS,\ + SENSOR3_COLUMN5_INIT_PARAMS,\ + SENSOR3_COLUMN6_INIT_PARAMS,\ + SENSOR3_COLUMN7_INIT_PARAMS,\ + SENSOR3_COLUMN8_INIT_PARAMS,\ + SENSOR3_COLUMN9_INIT_PARAMS,\ + SENSOR3_COLUMN10_INIT_PARAMS,\ + SENSOR3_COLUMN11_INIT_PARAMS,\ + SENSOR3_COLUMN12_INIT_PARAMS,\ + SENSOR3_COLUMN13_INIT_PARAMS,\ + SENSOR3_COLUMN14_INIT_PARAMS,\ + SENSOR3_COLUMN15_INIT_PARAMS,\ + SENSOR3_COLUMN16_INIT_PARAMS,\ + SENSOR3_COLUMN17_INIT_PARAMS,\ + SENSOR3_COLUMN18_INIT_PARAMS,\ + SENSOR3_COLUMN19_INIT_PARAMS,\ + SENSOR3_COLUMN20_INIT_PARAMS}\ +} + +#define SENSOR4_ELEMENT_IDX 0 +#define SENSOR4_PROPERTY_ID HUMIDITY_PID +#define SENSOR4_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR4_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR4_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR4_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR4_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR4_DATA_LENGTH 2 +#define SENSOR4_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR4_VALUES_RANGE 200 +#define SENSOR4_SETTINGS_COUNT 1 +#define SENSOR4_SETTING1_PROPERTY_ID 0xAAAA +#define SENSOR4_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR4_SETTING1_RAW 35666 +#define SENSOR4_SERIES_COUNT 0 + +#define SENSOR4_SETTINGS_INIT_PARAMS \ +{\ + SENSOR4_SETTING1_PROPERTY_ID,\ + SENSOR4_SETTING1_ACCESS,\ + SENSOR4_SETTING1_RAW\ +} + +#define SENSOR4_INIT_PARAMS \ +{\ + SENSOR4_ELEMENT_IDX,\ + SENSOR4_PROPERTY_ID,\ + SENSOR4_POSITIVE_TOLERANCE,\ + SENSOR4_NEGATIVE_TOLERANCE,\ + SENSOR4_SAMPLING_FUNCTION,\ + SENSOR4_MEASUREMENT_PERIOD,\ + SENSOR4_UPDATE_INTERVAL,\ + SENSOR4_DATA_LENGTH,\ + SENSOR4_CADENCE_STATE,\ + SENSOR4_VALUES_RANGE,\ + SENSOR4_SETTINGS_COUNT,\ + {\ + SENSOR4_SETTINGS_INIT_PARAMS\ + },\ + SENSOR4_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR5_ELEMENT_IDX 0 +#define SENSOR5_PROPERTY_ID TIME_OF_FLIGHT_PID +#define SENSOR5_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR5_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR5_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR5_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR5_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR5_DATA_LENGTH 2 +#define SENSOR5_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR5_VALUES_RANGE 0 +#define SENSOR5_SETTINGS_COUNT 1 +#define SENSOR5_SETTING1_PROPERTY_ID 0xAAFA +#define SENSOR5_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR5_SETTING1_RAW 35666 +#define SENSOR5_SERIES_COUNT 2 +#define SENSOR5_SERIES1_RAWX 20 +#define SENSOR5_SERIES1_CW 30 +#define SENSOR5_SERIES2_RAWX 50 +#define SENSOR5_SERIES2_CW 40 + +#define SENSOR5_SETTINGS_INIT_PARAMS \ +{\ + SENSOR5_SETTING1_PROPERTY_ID,\ + SENSOR5_SETTING1_ACCESS,\ + SENSOR5_SETTING1_RAW\ +} + +#define SENSOR5_COLUMN1_INIT_PARAMS {SENSOR5_SERIES1_RAWX,SENSOR5_SERIES1_CW} +#define SENSOR5_COLUMN2_INIT_PARAMS {SENSOR5_SERIES2_RAWX,SENSOR5_SERIES2_CW} + +#define SENSOR5_INIT_PARAMS \ +{\ + SENSOR5_ELEMENT_IDX,\ + SENSOR5_PROPERTY_ID,\ + SENSOR5_POSITIVE_TOLERANCE,\ + SENSOR5_NEGATIVE_TOLERANCE,\ + SENSOR5_SAMPLING_FUNCTION,\ + SENSOR5_MEASUREMENT_PERIOD,\ + SENSOR5_UPDATE_INTERVAL,\ + SENSOR5_DATA_LENGTH,\ + SENSOR5_CADENCE_STATE,\ + SENSOR5_VALUES_RANGE,\ + SENSOR5_SETTINGS_COUNT,\ + {\ + SENSOR5_SETTINGS_INIT_PARAMS\ + },\ + SENSOR5_SERIES_COUNT,\ + {\ + SENSOR5_COLUMN1_INIT_PARAMS,\ + SENSOR5_COLUMN2_INIT_PARAMS\ + }\ +} + +#define SENSOR6_ELEMENT_IDX 0 +#define SENSOR6_PROPERTY_ID PRESENCE_PID +#define SENSOR6_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR6_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR6_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR6_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR6_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR6_DATA_LENGTH 1 +#define SENSOR6_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR6_VALUES_RANGE 0 +#define SENSOR6_SETTINGS_COUNT 0 +#define SENSOR6_SERIES_COUNT 0 + +#define SENSOR6_SETTINGS_INIT_PARAMS \ +{\ + {\ + {0}\ + }\ +} + +#define SENSOR6_INIT_PARAMS \ +{\ + SENSOR6_ELEMENT_IDX,\ + SENSOR6_PROPERTY_ID,\ + SENSOR6_POSITIVE_TOLERANCE,\ + SENSOR6_NEGATIVE_TOLERANCE,\ + SENSOR6_SAMPLING_FUNCTION,\ + SENSOR6_MEASUREMENT_PERIOD,\ + SENSOR6_UPDATE_INTERVAL,\ + SENSOR6_DATA_LENGTH,\ + SENSOR6_CADENCE_STATE,\ + SENSOR6_VALUES_RANGE,\ + SENSOR6_SETTINGS_COUNT,\ + {\ + {0}\ + },\ + SENSOR6_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR_SERVER_INIT_PARAMS \ +{\ + TOTAL_SENSORS_COUNT,\ + {\ + SENSOR1_INIT_PARAMS,\ + SENSOR2_INIT_PARAMS,\ + SENSOR3_INIT_PARAMS,\ + SENSOR4_INIT_PARAMS,\ + SENSOR5_INIT_PARAMS\ + }\ +} +*/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c new file mode 100644 index 000000000..041fe7fe2 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c @@ -0,0 +1,82 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file svctl_conf.c + * @author MCD Application Team + * @brief Configuration of the BLE service controller + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "app_common.h" + +#include "otp.h" + +/* Private defines -----------------------------------------------------------*/ +#define BD_ADDR_SIZE_LOCAL 6 + +/* Private variables ---------------------------------------------------------*/ +static const uint8_t M_bd_addr[BD_ADDR_SIZE_LOCAL] = +{ + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) +}; + +static uint8_t bd_addr_udn[BD_ADDR_SIZE_LOCAL]; + +const uint8_t* SVCCTL_GetBdAddress( void ) +{ + uint8_t *otp_addr; + const uint8_t *bd_addr; + uint32_t udn; + uint32_t company_id; + uint32_t device_id; + + udn = LL_FLASH_GetUDN(); + + if(udn != 0xFFFFFFFF) + { + company_id = LL_FLASH_GetSTCompanyID(); + device_id = LL_FLASH_GetDeviceID(); + + bd_addr_udn[0] = (uint8_t)(udn & 0x000000FF); + bd_addr_udn[1] = (uint8_t)( (udn & 0x0000FF00) >> 8 ); + bd_addr_udn[2] = (uint8_t)( (udn & 0x00FF0000) >> 16 ); + bd_addr_udn[3] = (uint8_t)device_id; + bd_addr_udn[4] = (uint8_t)(company_id & 0x000000FF); + bd_addr_udn[5] = (uint8_t)( (company_id & 0x0000FF00) >> 8 ); + + bd_addr = (const uint8_t *)bd_addr_udn; + } + else + { + otp_addr = OTP_Read(0); + if(otp_addr) + { + bd_addr = ((OTP_ID0_t*)otp_addr)->bd_address; + } + else + { + bd_addr = M_bd_addr; + } + + } + + return bd_addr; +} + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h new file mode 100644 index 000000000..6a88e53c1 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h @@ -0,0 +1,32 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file tl_conf.h + * @author MCD Application Team + * @brief Transport Layer Configuration + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __TL_CONF_H +#define __TL_CONF_H + +/** + * It shall be set to 1 for power optimization when standby is supported + */ +#define CFG_BLE_HCI_STDBY 0 + + + +#endif /*__TL_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h new file mode 100644 index 000000000..04ed3d88d --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h @@ -0,0 +1,133 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __TL_DBG_CONF_H +#define __TL_DBG_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* USER CODE BEGIN Tl_Conf */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" /* required as some configuration used in dbg_trace.h are set there */ +#include "dbg_trace.h" +#include "hw_if.h" + +/** + * Enable or Disable traces + * The raw data output is the hci binary packet format as specified by the BT specification * + */ +#define TL_SHCI_CMD_DBG_EN 0 /* Reports System commands sent to CPU2 and the command response */ +#define TL_SHCI_CMD_DBG_RAW_EN 0 /* Reports raw data System commands sent to CPU2 and the command response */ +#define TL_SHCI_EVT_DBG_EN 0 /* Reports System Asynchronous Events received from CPU2 */ +#define TL_SHCI_EVT_DBG_RAW_EN 0 /* Reports raw data System Asynchronous Events received from CPU2 */ + +#define TL_HCI_CMD_DBG_EN 0 /* Reports BLE command sent to CPU2 and the command response */ +#define TL_HCI_CMD_DBG_RAW_EN 0 /* Reports raw data BLE command sent to CPU2 and the command response */ +#define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ +#define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ + +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ + +/** + * Macro definition + */ + +/** + * System Transport Layer + */ +#if (TL_SHCI_CMD_DBG_EN != 0) +#define TL_SHCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_CMD_DBG_MSG(...) +#define TL_SHCI_CMD_DBG_BUF(...) +#endif + +#if (TL_SHCI_CMD_DBG_RAW_EN != 0) +#define TL_SHCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_CMD_DBG_RAW(...) +#endif + +#if (TL_SHCI_EVT_DBG_EN != 0) +#define TL_SHCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_EVT_DBG_MSG(...) +#define TL_SHCI_EVT_DBG_BUF(...) +#endif + +#if (TL_SHCI_EVT_DBG_RAW_EN != 0) +#define TL_SHCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_EVT_DBG_RAW(...) +#endif + +/** + * BLE Transport Layer + */ +#if (TL_HCI_CMD_DBG_EN != 0) +#define TL_HCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_CMD_DBG_MSG(...) +#define TL_HCI_CMD_DBG_BUF(...) +#endif + +#if (TL_HCI_CMD_DBG_RAW_EN != 0) +#define TL_HCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_CMD_DBG_RAW(...) +#endif + +#if (TL_HCI_EVT_DBG_EN != 0) +#define TL_HCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_EVT_DBG_MSG(...) +#define TL_HCI_EVT_DBG_BUF(...) +#endif + +#if (TL_HCI_EVT_DBG_RAW_EN != 0) +#define TL_HCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_EVT_DBG_RAW(...) +#endif + +/** + * Memory Manager - Released buffer tracing + */ +#if (TL_MM_DBG_EN != 0) +#define TL_MM_DBG_MSG PRINT_MESG_DBG +#else +#define TL_MM_DBG_MSG(...) +#endif + +/* USER CODE END Tl_Conf */ + +#ifdef __cplusplus +} +#endif + +#endif /*__TL_DBG_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c new file mode 100644 index 000000000..7b9d0a443 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c @@ -0,0 +1,47 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file tl_if.c + * @author MCD Application Team + * @brief Transport layer interface to BLE + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "app_common.h" + +#include "hci_tl.h" +#include "shci_tl.h" +#include "tl.h" + + +void hci_register_io_bus(tHciIO* fops) +{ + /* Register IO bus services */ + fops->Init = TL_BLE_Init; + fops->Send = TL_BLE_SendCmd; + + return; +} + +void shci_register_io_bus(tSHciIO* fops) +{ + /* Register IO bus services */ + fops->Init = TL_SYS_Init; + fops->Send = TL_SYS_SendCmd; + + return; +} + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c new file mode 100644 index 000000000..37b671c48 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c @@ -0,0 +1,343 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file user_if.c + * @author MCD Application Team + * @brief User interface file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "cube_hal.h" +#include "ble_clock.h" +#include "hci.h" +#include "user_if.h" +#include "hal.h" +#include "hal_common.h" +#include "mesh_cfg.h" + +#include +#ifdef IAR +#include +#else +#define _LLIO_STDIN 0 +#define _LLIO_STDOUT 1 +#define _LLIO_STDERR 2 +#define _LLIO_ERROR ((size_t)-1) /* For __read and __write. */ +#endif + + + +typedef struct _IO_ReceiveCallBack +{ + /** + * callback to notify the application with the received I/O data + */ + IO_RECEIVE_DATA_USER_CALLBACK_TYPE IO_user_application; +} IO_ReceiveCallBack; +/** +* @} +*/ + +#define READ_DATA_SIZE 1024 +#define READ_BUFFER_IS_EMPTY() (Read_ptr_in == Read_ptr_out) + +/* IO User Callback used to handle received data from I/O channel*/ +static uint8_t Read_Buffer [READ_DATA_SIZE]; +static uint32_t Read_ptr_in = 0; +static uint32_t Read_ptr_out = 0; +/*static volatile uint8_t s_SdkEvalVersion = ID_UNKNOWN;*/ +static IO_ReceiveCallBack IO_Receive_Data; +static void SdkEval_IO_processInputData(uint8_t * rx_data, uint16_t data_size); + + +/** +* @brief SetLed Sets the state of led +* @param int state State for the led GPIO +* @retval void +*/ +void SetLed(int state) +{ + if (state) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } +} + +#if 0 +/** +* @brief GetButtonState +* @param void +* @retval BUTTON_STATE returns the status of the userbutton GPIO +*/ +BUTTON_STATE GetButtonState(void) +{ + return HAL_GPIO_ReadPin(GPIOC, GPIO_PIN_13); +} + +/** +* @brief InitButton initializes the GPIO for the user button +* @param void +* @retval void +*/ +void InitButton(void) +{ + GPIO_InitTypeDef init; + init.Pin = GPIO_PIN_13; + init.Mode = GPIO_MODE_INPUT | GPIO_MODE_EVT_FALLING; + init.Pull = GPIO_NOPULL; + init.Speed = GPIO_SPEED_VERY_LOW; + init.Alternate = 0; + __HAL_RCC_GPIOC_CLK_ENABLE(); + HAL_GPIO_Init(GPIOC, &init); + EXTI->FTSR |= EXTI_RTSR_TR13; /* enable wake-up event on falling edge */ + EXTI->IMR &= ~EXTI_IMR_MR13; /* disable interrupt */ + EXTI->EMR |= EXTI_EMR_MR13; /* enable event */ +} +#endif + +/** +* @brief processInputData +* @param uint8_t * rx_data pointer to receive data +* @param uint16_t data_size size of receive data +* @retval void +*/ +void processInputData(uint8_t * rx_data, uint16_t data_size) +{ + SdkEval_IO_processInputData(rx_data, data_size); +} + +/** +* @brief Configure the selected I/O communication channel +* @param None. +* @retval None. +*/ +void SdkEval_IO_Config(IO_RECEIVE_DATA_USER_CALLBACK_TYPE io_receive_function) +{ + IO_Receive_Data.IO_user_application = io_receive_function; +#if defined (ENABLE_USB) + /* Init Device Library */ + USBD_Init(&USBD_Device, &VCP_Desc, 0); + + /* Add Supported Class */ + USBD_RegisterClass(&USBD_Device, USBD_CDC_CLASS); + + /* Add CDC Interface Class */ + USBD_CDC_RegisterInterface(&USBD_Device, &USBD_CDC_fops); + + /* Start Device Process */ + USBD_Start(&USBD_Device); + +#elif defined (ENABLE_USART) + /* Init Serial Uart */ + MX_USART2_UART_Init(); +#endif +} + +/** +* @brief InitDevice intitializes the Device +* @param void +* @retval void +*/ +void InitDevice(void) +{ + Init_Device(); /* Initializes HAL and System Clock */ + +#ifndef NEWLIB_SYSCALLS + SdkEval_IO_Config(processInputData); +#endif + /* Delay for debug purpose, in order to see printed data at startup. */ +#if defined(ENABLE_USART) + Clock_Wait(2000); +#endif + +#if defined(ACCELEROMETER_TYPE) || defined(THERMOMETER_TYPE) + I2C_Reset(); + Temperature_Init(); + Accel_Init(); +#endif + InitButton(); +} + + +/** +* @brief ShouldSleepFunc sleep mode function +* @param void +* @retval void +*/ +void ShouldSleepFunc(void) +{ + __disable_irq(); + __WFE(); + __NOP(); + __enable_irq(); +} + +/** +* @brief Receive data on selected I/O port +* @param rx_data pointer to buffer of received +* @param data_size number of received data +* @retval None. +*/ +void SdkEval_IO_Receive_Data(uint8_t * rx_data, uint16_t data_size) +{ + if(IO_Receive_Data.IO_user_application) + IO_Receive_Data.IO_user_application(rx_data,data_size); + +} +/** +* @brief Read buffer push +* @param byte +* @retval None. +*/ +void Read_Buffer_Push(uint8_t byte) +{ + Read_Buffer[Read_ptr_in] = byte; + + Read_ptr_in++; + + /* To avoid buffer overflow */ + if(Read_ptr_in == READ_DATA_SIZE) + { + Read_ptr_in = 0; + } +} +/** +* @brief Read buffer pop +* @param byte +* @retval None. +*/ +int Read_Buffer_Pop(uint8_t *byte) +{ + if(READ_BUFFER_IS_EMPTY()) + return 0; + + *byte = Read_Buffer[Read_ptr_out]; + + Read_ptr_out++; + + if(Read_ptr_out == READ_DATA_SIZE) + Read_ptr_out = 0; + + return 1; +} +/** +* @brief Process input data +* @param byte +* @retval None. +*/ +static void SdkEval_IO_processInputData(uint8_t * rx_data, uint16_t data_size) +{ + for(int i = 0; i < data_size; i++){ + Read_Buffer_Push(rx_data[i]); + } +} +extern UART_HandleTypeDef huart2; +#undef putchar +/** +* @brief Put character +* @param byte +* @retval None. +*/ +int putchar(int c) +{ + /* wait for the transmission end */ + while(!(__HAL_UART_GET_FLAG(&huart2, UART_FLAG_TXE))); + /* send the data */ + HAL_UART_Transmit(&huart2, (uint8_t*)&c, 1, UART_TX_TIMEOUT); + return c; +} + +void __io_putchar(char c) +{ + putchar(c); +} + +/* Required for Keil */ +#ifndef __IAR_SYSTEMS_ICC__ +void _ttywrch(int ch) +{ + putchar(ch); +} + +int fputc(int ch, FILE *f) +{ + _ttywrch(ch); + return(ch); +} +int fgetc(FILE *f) +{ + return -1; +} +#endif + +/** +* @brief Write handle +* @param buffer +* @param size +* @retval None. +*/ +size_t _write(int handle, const unsigned char * buffer, size_t size) +{ + size_t nChars = 0; + + if (handle != _LLIO_STDOUT && handle != _LLIO_STDERR) { + return _LLIO_ERROR; + } + + if (buffer == 0) { + /* This means that we should flush internal buffers. + spin until TX complete (TX is idle)*/ +#ifdef ENABLE_USB + while (!USB_OUT_BUFFER_IS_EMPTY()) {} +#endif /* ENABLE_USB */ + return 0; + } + + while(size--) { + __io_putchar(*buffer++); + ++nChars; + } + + return nChars; +} + +/** +* @brief Read handle +* @param buffer +* @param size +* @retval None. +*/ +size_t __read(int handle, unsigned char * buffer, size_t size) +{ + size_t bytes = 0; + + while(bytes < size && Read_Buffer_Pop(buffer+bytes)){ + bytes++; + } + return bytes; +} + +uint8_t __io_getcharNonBlocking(uint8_t *data) +{ + if (__read(_LLIO_STDIN,data,1)) + return 1; + else + return 0; +}/* end serialReadByte() */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h new file mode 100644 index 000000000..01985c068 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h @@ -0,0 +1,40 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file user_if.h + * @author MCD Application Team + * @brief Header file for User interface file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef _USER_INTERFACE_H_ +#define _USER_INTERFACE_H_ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" +#include "stm32wbxx_hal_conf.h" +#include "ble_clock.h" + +#define BUTTON_PRESSED GPIO_PIN_RESET + +/* Exported typedefs ---------------------------------------------*/ +typedef GPIO_PinState BUTTON_STATE; +typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t data_size); + +/* Exported Functions Prototypes ---------------------------------------------*/ + +#endif /* _USER_INTERFACE_H_ */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h new file mode 100644 index 000000000..18421e257 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h @@ -0,0 +1,51 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file vcp_conf.h + * @author MCD Application Team + * @brief Configuration of the vcp interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __VCP_CONF_H +#define __VCP_CONF_H + +#ifdef __cplusplus +extern "C" +{ +#endif + +/* Includes ------------------------------------------------------------------*/ +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ +#define VCP_BAUD_RATE (115200) +#define VCP_TX_PATH_INTERFACE_READY_SETUP_TIME (20*1000*1000/CFG_TS_TICK_VAL) /** 20s */ +#define VCP_TASK_ID (CFG_IdleTask_VCP_SendData) +#define VCP_TASK_PRIO (CFG_SCH_Prio_1) + +#ifdef VCP_TX_PATH_INTERFACE_READY_SETUP_TIME +#define VCP_TIMER_PROC_ID (CFG_TimProcID_isr) +#endif + +/* External variables --------------------------------------------------------*/ +/* Exported macros -----------------------------------------------------------*/ +/* Exported functions ------------------------------------------------------- */ + + +#ifdef __cplusplus +} +#endif + +#endif /*__VCP_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c new file mode 100644 index 000000000..ad5c868c8 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c @@ -0,0 +1,706 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "mbox_def.h" + +/* Global variables ---------------------------------------------------------*/ +/* Private defines -----------------------------------------------------------*/ +#define HW_IPCC_TX_PENDING( channel ) ( !(LL_C1_IPCC_IsActiveFlag_CHx( IPCC, channel )) ) && (((~(IPCC->C1MR)) & (channel << 16U))) +#define HW_IPCC_RX_PENDING( channel ) (LL_C2_IPCC_IsActiveFlag_CHx( IPCC, channel )) && (((~(IPCC->C1MR)) & (channel << 0U))) + +/* Private macros ------------------------------------------------------------*/ +#if ( (STM32WB15xx != 0) && (CFG_LPM_STANDBY_SUPPORTED != 0) ) +#define HW_IPCC_SET_FLAG_CHX(x) HW_IPCC_SetFlagCHx(x) +#else +#define HW_IPCC_SET_FLAG_CHX(x) LL_C1_IPCC_SetFlag_CHx(IPCC, x) +#endif +/* Private typedef -----------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static void (*FreeBufCb)( void ); + +/* Private function prototypes -----------------------------------------------*/ +static void HW_IPCC_BLE_EvtHandler( void ); +static void HW_IPCC_BLE_AclDataEvtHandler( void ); +static void HW_IPCC_MM_FreeBufHandler( void ); +static void HW_IPCC_SYS_CmdEvtHandler( void ); +static void HW_IPCC_SYS_EvtHandler( void ); +static void HW_IPCC_TRACES_EvtHandler( void ); + +#ifdef THREAD_WB +static void HW_IPCC_OT_CmdEvtHandler( void ); +static void HW_IPCC_THREAD_NotEvtHandler( void ); +static void HW_IPCC_THREAD_CliNotEvtHandler( void ); +#endif + +#ifdef LLD_TESTS_WB +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ); +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ); +#endif +#ifdef LLD_BLE_WB +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void );*/ +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ); +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ); +#endif + +#ifdef MAC_802_15_4_WB +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ); +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ); +#endif + +#ifdef ZIGBEE_WB +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ); +#endif + +#if ( (STM32WB15xx != 0) && (CFG_LPM_STANDBY_SUPPORTED != 0) ) +static void IPCC_Wakeup_CPU2(void); +static void HW_IPCC_SetFlagCHx(uint32_t Channel); +#endif +/* Public function definition -----------------------------------------------*/ + +/****************************************************************************** + * INTERRUPT HANDLER + ******************************************************************************/ +void HW_IPCC_Rx_Handler( void ) +{ + if (HW_IPCC_RX_PENDING( HW_IPCC_SYSTEM_EVENT_CHANNEL )) + { + HW_IPCC_SYS_EvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_NotEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_NotEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_CliNotEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveCliRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_M0_CMD_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef LLD_BLE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_RSP_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_M0_CMD_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackNotifEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackM0RequestHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL )) + { + HW_IPCC_BLE_EvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_TRACES_CHANNEL )) + { + HW_IPCC_TRACES_EvtHandler(); + } + + return; +} + +void HW_IPCC_Tx_Handler( void ) +{ + if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_CmdEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL )) + { + HW_IPCC_OT_CmdEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB +// No TX handler for LLD tests +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL )) + { + HW_IPCC_ZIGBEE_CmdEvtHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) + { + HW_IPCC_MM_FreeBufHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_HCI_ACL_DATA_CHANNEL )) + { + HW_IPCC_BLE_AclDataEvtHandler(); + } + + return; +} +/****************************************************************************** + * GENERAL + ******************************************************************************/ +void HW_IPCC_Enable( void ) +{ + /** + * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running + when FUS is running on CPU2 and CPU1 enters deep sleep mode + */ + LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC); + + /** + * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 + */ + LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); + + /** + * In case the SBSFU is implemented, it may have already set the C2BOOT bit to startup the CPU2. + * In that case, to keep the mechanism transparent to the user application, it shall call the system command + * SHCI_C2_Reinit( ) before jumping to the application. + * When the CPU2 receives that command, it waits for its event input to be set to restart the CPU2 firmware. + * This is required because once C2BOOT has been set once, a clear/set on C2BOOT has no effect. + * When SHCI_C2_Reinit( ) is not called, generating an event to the CPU2 does not have any effect + * So, by default, the application shall both set the event flag and set the C2BOOT bit. + */ + __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ + __WFE( ); /* Clear the internal event flag */ + LL_PWR_EnableBootC2( ); + + return; +} + +void HW_IPCC_Init( void ) +{ + LL_AHB3_GRP1_EnableClock( LL_AHB3_GRP1_PERIPH_IPCC ); + + LL_C1_IPCC_EnableIT_RXO( IPCC ); + LL_C1_IPCC_EnableIT_TXF( IPCC ); + + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + + return; +} + +#if(CFG_LPM_STANDBY_SUPPORTED != 0) +static void IPCC_Wakeup_CPU2(void) +{ + + /** + * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 + */ + LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); + + __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ + __WFE( ); /* Clear the internal event flag */ + + return; +} + +static void HW_IPCC_SetFlagCHx(uint32_t Channel) +{ + IPCC_Wakeup_CPU2(); + LL_C1_IPCC_SetFlag_CHx(IPCC, Channel); + + return; +} +#endif +/****************************************************************************** + * BLE + ******************************************************************************/ +void HW_IPCC_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_BLE_CMD_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_EvtHandler( void ) +{ + HW_IPCC_BLE_RxEvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendAclData( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_HCI_ACL_DATA_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_AclDataEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + HW_IPCC_BLE_AclDataAckNot(); + + return; +} + +__weak void HW_IPCC_BLE_AclDataAckNot( void ){}; +__weak void HW_IPCC_BLE_RxEvtNot( void ){}; + +/****************************************************************************** + * SYSTEM + ******************************************************************************/ +void HW_IPCC_SYS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_SYS_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + return; +} + +static void HW_IPCC_SYS_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + HW_IPCC_SYS_CmdEvtNot(); + + return; +} + +static void HW_IPCC_SYS_EvtHandler( void ) +{ + HW_IPCC_SYS_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +__weak void HW_IPCC_SYS_CmdEvtNot( void ){}; +__weak void HW_IPCC_SYS_EvtNot( void ){}; + +/****************************************************************************** + * MAC 802.15.4 + ******************************************************************************/ +#ifdef MAC_802_15_4_WB +void HW_IPCC_MAC_802_15_4_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + HW_IPCC_MAC_802_15_4_CmdEvtNot(); + + return; +} + +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_MAC_802_15_4_EvtNot(); + + return; +} +__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; +__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; +#endif + +/****************************************************************************** + * THREAD + ******************************************************************************/ +#ifdef THREAD_WB +void HW_IPCC_THREAD_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_OT_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_CLI_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_THREAD_CLI_CMD_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_CliSendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_OT_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + HW_IPCC_OT_CmdEvtNot(); + + return; +} + +static void HW_IPCC_THREAD_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_EvtNot(); + + return; +} + +static void HW_IPCC_THREAD_CliNotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_CliEvtNot(); + + return; +} + +__weak void HW_IPCC_OT_CmdEvtNot( void ){}; +__weak void HW_IPCC_CLI_CmdEvtNot( void ){}; +__weak void HW_IPCC_THREAD_EvtNot( void ){}; + +#endif /* THREAD_WB */ + +/****************************************************************************** + * LLD TESTS + ******************************************************************************/ +#ifdef LLD_TESTS_WB +void HW_IPCC_LLDTESTS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLDTESTS_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveCliRsp(); + return; +} + +void HW_IPCC_LLDTESTS_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLDTESTS_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLDTESTS_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void ){}; +#endif /* LLD_TESTS_WB */ + +/****************************************************************************** + * LLD BLE + ******************************************************************************/ +#ifdef LLD_BLE_WB +void HW_IPCC_LLD_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLD_BLE_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_CMD_CHANNEL ); + return; +} + +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveCliRsp(); + return; +}*/ + +void HW_IPCC_LLD_BLE_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ) +{ + //LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLD_BLE_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + //LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLD_BLE_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLD_BLE_ReceiveM0Cmd( void ){}; + +/* Transparent Mode */ +void HW_IPCC_LLD_BLE_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveRsp(); + return; +} + +void HW_IPCC_LLD_BLE_SendRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + return; +} + +#endif /* LLD_BLE_WB */ + +/****************************************************************************** + * ZIGBEE + ******************************************************************************/ +#ifdef ZIGBEE_WB +void HW_IPCC_ZIGBEE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4RequestToM0( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvAppliAckFromM0(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0NotifyToM4(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0RequestToM4(); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){}; +#endif /* ZIGBEE_WB */ + +/****************************************************************************** + * MEMORY MANAGER + ******************************************************************************/ +void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) ) +{ + if ( LL_C1_IPCC_IsActiveFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ) ) + { + FreeBufCb = cb; + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + else + { + cb(); + + HW_IPCC_SET_FLAG_CHX( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + + return; +} + +static void HW_IPCC_MM_FreeBufHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + FreeBufCb(); + + HW_IPCC_SET_FLAG_CHX( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + return; +} + +/****************************************************************************** + * TRACES + ******************************************************************************/ +void HW_IPCC_TRACES_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +static void HW_IPCC_TRACES_EvtHandler( void ) +{ + HW_IPCC_TRACES_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +__weak void HW_IPCC_TRACES_EvtNot( void ){}; + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/readme.txt new file mode 100644 index 000000000..d2be02698 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN/readme.txt @@ -0,0 +1,245 @@ +/** + @page BLE_MeshLightingLPN example + + @verbatim + ******************** (C) COPYRIGHT 2020 STMicroelectronics ******************* + * @file BLE/BLE_MeshLightingLPN/readme.txt + * @author MCD Application Team + * @brief Description of the BLE Mesh Lighting Low Power Node demo example. + ****************************************************************************** + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @endverbatim + +@par Example Description +This is the implementation of the BLE Mesh Low Power Node profile as specified by the BLE SIG, +a Low Power Node with the capacity to be associated to a Proxy-Relay-Friend Node for Friendship. + +@note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) + based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from + a peripheral ISR process, then the SysTick interrupt must have higher priority (numerically lower) + than the peripheral interrupt. Otherwise the caller ISR process will be blocked. + To change the SysTick interrupt priority you have to use HAL_NVIC_SetPriority() function. + +@note The application needs to ensure that the SysTick time base is always set to 1 millisecond + to have correct HAL operation. + +@par Keywords + +Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core + +@par Directory contents + mesh_lighting_demo + - BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h Header for all modules with common definition + - BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h Parameters configuration file of the application + - BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h Interface to support debug in the application + - BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h Parameters configuration file of the application + - BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h Configuration file of the HW + - BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h Configuration file of the FLASH driver needed by EE module + - BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h Configuration file of the Hardware Interface + - BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h Configuration file of the Low power timer to be used within Mesh Application. + - BLE/BLE_MeshLightingLPN/Core/Inc/main.h Header for main.c module + - BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file + - BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h Configuration file of the Low layer function to enter/exit low power modes (stop, sleep). + - BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h Interrupt handlers header file + - BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h Configuration file of the utilities + - BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h Configuration file of Virtual Com Port Interface + - BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c Interface to support debug in the application + - BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c Initialization of the application + - BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c FLASH driver needed by EE module + - BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c Timer Server based on RTC + - BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c UART Driver + - BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c Low power timer to be used within Mesh Application. + - BLE/BLE_MeshLightingLPN/Core/Src/main.c Main program + - BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c Low Power Manager Interface + - BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c Interrupt handlers + - BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c stm32wbxx system source file + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/app_ble.c BLE Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/app_ble.h Header of BLE Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config.c Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config.h Header of Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config_client.c Application interface for Config CLient Mesh Model + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config_client.h Header of Application interface for Config CLient Mesh Model + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic.c Application interface for Generic Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic.h Header of Application interface for Generic Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic_client.c Application interface for Client Generic Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic_client.h Header of Application interface for Client Generic Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light.c BLE Mesh Light Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light.h Header of BLE Mesh Light Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_client.c Application interface for Client Light Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_client.h Header of Application interface for Client Light Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_lc.c BLE Mesh Light Lightness Controller Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_lc.h Header of BLE Mesh Light Lightness Controller Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_mesh.c BLE Mesh application implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_mesh.h Header of BLE Mesh application implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_nvm.c BLE Mesh NVM application implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_nvm.h Header of BLE Mesh NVM application implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor.c BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor_client.c BLE Mesh Client Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor_client.h Header of BLE Mesh Client Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_vendor.c BLE Mesh Vendor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_vendor.h Header of BLE Mesh Vendor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/ble_conf.h BLE Services configuration + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/ble_dbg_conf.h BLE Traces configuration of the BLE services + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/hal_common.h Header for common function of HAL file + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/mesh_cfg.h Header for Mesh configuration + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/mesh_cfg_usr.h Header for user Mesh configuration + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/models_if.h Header for the BLE Mesh Models Interface file + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/models_if.c BLE Mesh Models Interface file + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/pal_nvm.c BLE Mesh NVM management implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/pal_nvm.h Header of BLE Mesh NVM management implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/PWM_config.c Pulse Width Modulation configuration + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/PWM_config.h Header of Pulse Width Modulation configuration + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/PWM_handlers.c Pulse Width Modulation handlers + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/PWM_handlers.h Header of Pulse Width Modulation handlers + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/sensor_cfg_usr.c Header for user Mesh Sensor Model configuration + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/svcctl_conf.c Service Controller configuration API + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/tl_conf.h Configuration file of the Transport layer + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/tl_dbg_conf.h Debug configuration file for stm32wpan transport layer interface. + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/tl_if.c Transport Layer interface + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/user_if.h Header file for User interface file + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/user_if.c User interface file + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/vcp_conf.h Configuration of the vcp interface + - BLE/BLE_MeshLightingLPN/STM32_WPAN/Target/hw_ipcc.c IPCC Driver + + +@par Hardware and Software environment + + - This example runs on STM32WB15xx devices. + + - This example has been tested with an STMicroelectronics STM32WB15CC-Nucleo + board and can be easily tailored to any other supported device + and development board. + +@par How to use it ? + +This application requires having the stm32wb1x_BLE_Stack_basic_fw.bin binary flashed on the Wireless Coprocessor. +If it is not the case, you need to use STM32CubeProgrammer to load the appropriate binary. +All available binaries are located under /Projects/STM32_Copro_Wireless_Binaries directory. +Refer to UM2237 to learn how to use/install STM32CubeProgrammer. +Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the +Wireless Coprocessor binary. + +In order to make the program work, you must do the following: + - Open your preferred toolchain + - Rebuild all files and load your image into target memory + - Run the example + +For more details refer to the Application Note: + AN5292_STM32WB_How_to_build_BLE_Mesh_Application + +@Introduction + +The ST BLE-Mesh library supports all of the following features in a Mesh node: +1. Relay: to forward received network PDUs on advertising or GATT bearer, if the Proxy feature is enabled +2. Proxy: to forward received network PDUs between GATT and advertising bearers +3. Friend: can perform duties such as scanning for other associated nodes that are usually Low Power mode +4. Low Power: consumes much less power as the node usually does not perform any scanning +A typical BLE Mesh node radio should always be in scanning mode to avoid missing packets over the air, but this kind of +operation is not supported by many devices due to continuous energy requirements. +To enable low power operation, BLE Mesh Profile v1.0 defines the concept of Friendship. +In a Mesh network, a Low Power feature-enabled Mesh node (LPN) offloads its packet receiving (scanning) duty to an adjacent +Friend feature-enabled Mesh node (FN). The LPN is not always scanning and remains inactive (or sleeps) for most of its life +cycle, significantly reducing its energy requirements. Nodes running on batteries or energy harvesting techniques usually +support the Low Power feature. +Once connected to each other, the FN and LPN are considered friends and their connection is known as a Friendship. At least +one FN must be in the direct radio range of an LPN to establish Friendship. + +@Configuration + +Low Power Node +Low Power feature support is defined in mesh_cfg_usr.h by the predefinition of ENABLE_LOW_POWER_FEATURE. +Note: A Low Power feature-enabled node does not support any other feature: all the other features should be +undefined. + +@Demo setup based on STM32WB15CC-Nucleo + +General default setting defined in mesh_cfg_usr.h: + ENABLE_GENERIC_MODEL_SERVER_ONOFF (1) /* GENERIC SERVER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_VENDOR_MODEL_SERVER (1) /* VENDOR SERVER MODEL ON FIRST ELEMENT */ + APPLICATION_NUMBER_OF_ELEMENTS 1 /* NUMBER OF ELEMENT SUPPORTED */ + APPLICATION_SIG_MODELS_MAX_COUNT 1 /* TOTAL NUMBER OF MODELS SUPPORTED */ + APPLICATION_VENDOR_MODELS_MAX_COUNT 1 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + ENABLE_LOW_POWER_FEATURE /* LOW POWER SUPPORT */ + ENABLE_PB_ADV /* Provisioning Bearer over advertising channels support */ + ENABLE_PB_GATT /* Provisioning Bearer over GATT proxy support */ + +The following demo based on STM32WB15CC-Nucleo has been set up using one board as a Friend node and two +boards as Low Power nodes. + +Low Power node setup: +Step 1. Configure LPN parameters. + Change only if required otherwise skip this step (use example parameters defined in mesh_cfg_usr.h) + LPN_RSSI_FACTOR_LEVEL 1 + LPN_RECIVE_WINDOW_FACTOR_LEVEL 1 + LPN_MINIMUM_QUEUE_SIZE_LOG 2 + LPN_RECEIVE_DELAY 150 ms + LPN_POLL_TIMEOUT 2000 (*100 ms) + LPN_RECEIVE_WINDOW_SIZE 55 ms + LPN_SUBSCR_LIST_SIZE 2 + LPN_FRIEND_REQUEST_FREQUENCY 50 (*100 ms) + LPN_FRIEND_POLL_FREQUENCY 25 (*100 ms) + LPN_MINIMUM_RSSI -100 + LPN_NO_OF_RETRIES 10 +Step 2. Generate and flash binary in 2 boards (LPN1, LPN2) + +Friend Node setup (use the Proxy Relay Friend Node BLE_MeshLightingPRFNode project): +Step 1. Generate and flash binary in a board (FN) +Step 2. Provision the 3 boards with the default parameters, using BLE-Mesh Android (https://play.google.com/store/apps/details?id=com.st.bluenrgmesh&hl=en) or + BLE-Mesh iOS (https://apps.apple.com/us/app/st-ble-mesh/id1348645067) smartphone application (subscribe and publish to default group) + + +Demo operation +After provisioning, it might take a few seconds for Friendship to be established between FN and LPNs. +In this demo, the FN establishes Friendship with LPN1 and LPN2, LPN2 is optional. +Any packet targeted to LPN1/LPN2 or to a group address subscribed by LPN1 or LPN2 is put in queue by the FN +that forwards packets to LPN1/LPN2 as soon as it receives a Friend Poll from the respective LPN. +The LPN is free to send packets (generate traffic) any time. + +By pressing [SW1] button on the Friend Node: +1. FN publishes a LED ON command to the default group and the FN blue LED immediately turns on (when the +FN belongs to the default group). +2. FN forwards a LED ON command to the LPNs subscribed to the default group. As soon as the FN receives +poll from an LPN, it sends LED ON to the respective LPN. + + FN LPN1 LPN2 + | | | + SW1 PUSH->| | | + Blue LED on->| | | + |<--Friend Poll--| | + | | | + |-----LED on---->|<-Blue LED on | + | | + |<----------Friend Poll----------| + | | + |-------------LED on------------>|<-Blue LED on + | | + +By pressing [SW1] button on the Low Power Node 1: +1. LPN1 publishes an LED OFF command to the default group. LPN1 blue LED tunrs off. + LPN1 immediately forwards LED OFF command to the default group. +2. FN receives an LED OFF command (as it is subscribed to the default group) and the FN blue LED turns off. +3. FN also sends an LED OFF command to LPN2 (subscribed to the default group) as soon as FN receives + poll from LPN2. + + FN LPN1 LPN2 + | | | + | SW1 PUSH->|<-Blue LED off | + Blue LED off->|<----LED off----| | + | | + |<----------Friend Poll----------| + | | + |------------LED off------------>|<-Blue LED off + | | + +*

                                                        © COPYRIGHT STMicroelectronics

                                                        + */ + \ No newline at end of file diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h new file mode 100644 index 000000000..62e8ad603 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h @@ -0,0 +1,116 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_COMMON_H +#define APP_COMMON_H + +#ifdef __cplusplus +extern "C"{ +#endif + +#include +#include +#include +#include +#include + +#include "app_conf.h" + + /* -------------------------------- * + * Basic definitions * + * -------------------------------- */ + +#undef NULL +#define NULL 0 + +#undef FALSE +#define FALSE 0 + +#undef TRUE +#define TRUE (!0) + + /* -------------------------------- * + * Critical Section definition * + * -------------------------------- */ +#define BACKUP_PRIMASK() uint32_t primask_bit= __get_PRIMASK() +#define DISABLE_IRQ() __disable_irq() +#define RESTORE_PRIMASK() __set_PRIMASK(primask_bit) + + /* -------------------------------- * + * Macro delimiters * + * -------------------------------- */ + +#define M_BEGIN do { + +#define M_END } while(0) + + /* -------------------------------- * + * Some useful macro definitions * + * -------------------------------- */ + +#ifndef MAX +#define MAX( x, y ) (((x)>(y))?(x):(y)) +#endif + +#ifndef MIN +#define MIN( x, y ) (((x)<(y))?(x):(y)) +#endif + +#define MODINC( a, m ) M_BEGIN (a)++; if ((a)>=(m)) (a)=0; M_END + +#define MODDEC( a, m ) M_BEGIN if ((a)==0) (a)=(m); (a)--; M_END + +#define MODADD( a, b, m ) M_BEGIN (a)+=(b); if ((a)>=(m)) (a)-=(m); M_END + +#define MODSUB( a, b, m ) MODADD( a, (m)-(b), m ) + +#define PAUSE( t ) M_BEGIN \ + __IO int _i; \ + for ( _i = t; _i > 0; _i -- ); \ + M_END + +#define DIVF( x, y ) ((x)/(y)) + +#define DIVC( x, y ) (((x)+(y)-1)/(y)) + +#define DIVR( x, y ) (((x)+((y)/2))/(y)) + +#define SHRR( x, n ) ((((x)>>((n)-1))+1)>>1) + +#define BITN( w, n ) (((w)[(n)/32] >> ((n)%32)) & 1) + +#define BITNSET( w, n, b ) M_BEGIN (w)[(n)/32] |= ((U32)(b))<<((n)%32); M_END + + /* -------------------------------- * + * Compiler * + * -------------------------------- */ +#define PLACE_IN_SECTION( __x__ ) __attribute__((section (__x__))) + +#ifdef WIN32 +#define ALIGN(n) +#else +#define ALIGN(n) __attribute__((aligned(n))) +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_COMMON_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h new file mode 100644 index 000000000..75ab68238 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h @@ -0,0 +1,637 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_CONF_H +#define APP_CONF_H + +#include "hw.h" +#include "hw_conf.h" +#include "hw_if.h" +#include "ble_bufsize.h" + +/****************************************************************************** + * MESH Application Config + ******************************************************************************/ + +/**< generic parameters ******************************************************/ + +/** + * Define Tx Power + */ +#define CFG_TX_POWER (0x18) /* -0.15dBm */ + +/** + * Define Advertising parameters + */ +#define CFG_ADV_BD_ADDRESS (0x7257acd87a6c) +#define CFG_FAST_CONN_ADV_INTERVAL_MIN (0x80) /**< 80ms */ +#define CFG_FAST_CONN_ADV_INTERVAL_MAX (0xA0) /**< 100ms */ +#define CFG_LP_CONN_ADV_INTERVAL_MIN (0x640) /**< 1s */ +#define CFG_LP_CONN_ADV_INTERVAL_MAX (0xFA0) /**< 2.5s */ + +/** + * Define IO Authentication + */ +#define CFG_BONDING_MODE (1) +#define CFG_FIXED_PIN (111111) +#define CFG_USED_FIXED_PIN (0) +#define CFG_ENCRYPTION_KEY_SIZE_MAX (16) +#define CFG_ENCRYPTION_KEY_SIZE_MIN (8) + +/** + * Define IO capabilities + */ +#define CFG_IO_CAPABILITY_DISPLAY_ONLY (0x00) +#define CFG_IO_CAPABILITY_DISPLAY_YES_NO (0x01) +#define CFG_IO_CAPABILITY_KEYBOARD_ONLY (0x02) +#define CFG_IO_CAPABILITY_NO_INPUT_NO_OUTPUT (0x03) +#define CFG_IO_CAPABILITY_KEYBOARD_DISPLAY (0x04) + +#define CFG_IO_CAPABILITY CFG_IO_CAPABILITY_DISPLAY_YES_NO + +/** + * Define MITM modes + */ +#define CFG_MITM_PROTECTION_NOT_REQUIRED (0x00) +#define CFG_MITM_PROTECTION_REQUIRED (0x01) + +#define CFG_MITM_PROTECTION CFG_MITM_PROTECTION_REQUIRED + +/** + * Define Secure Connections Support + */ +#define CFG_SECURE_NOT_SUPPORTED (0x00) +#define CFG_SECURE_OPTIONAL (0x01) +#define CFG_SECURE_MANDATORY (0x02) + +#define CFG_SC_SUPPORT CFG_SECURE_OPTIONAL + +/** + * Define Keypress Notification Support + */ +#define CFG_KEYPRESS_NOT_SUPPORTED (0x00) +#define CFG_KEYPRESS_SUPPORTED (0x01) + +#define CFG_KEYPRESS_NOTIFICATION_SUPPORT CFG_KEYPRESS_NOT_SUPPORTED + +/** + * Numeric Comparison Answers + */ +#define YES (0x01) +#define NO (0x00) + +/** + * Device name configuration for Generic Access Service + */ +#define CFG_GAP_DEVICE_NAME "TEMPLATE" +#define CFG_GAP_DEVICE_NAME_LENGTH (8) + +/** + * Define PHY + */ +#define ALL_PHYS_PREFERENCE 0x00 +#define RX_2M_PREFERRED 0x02 +#define TX_2M_PREFERRED 0x02 +#define TX_1M 0x01 +#define TX_2M 0x02 +#define RX_1M 0x01 +#define RX_2M 0x02 + +/** +* Identity root key used to derive LTK and CSRK +*/ +#define CFG_BLE_IRK {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0} + +/** +* Encryption root key used to derive LTK and CSRK +*/ +#define CFG_BLE_ERK {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21} + +/** + * SMPS supply + * SMPS not used when Set to 0 + * SMPS used when Set to 1 + */ +#define CFG_USE_SMPS 0 + +/* USER CODE BEGIN Generic_Parameters */ + +/* USER CODE END Generic_Parameters */ + +/**< specific parameters */ +/****************************************************************************** + * BLE Stack + ******************************************************************************/ +/** + * Maximum number of simultaneous connections that the device will support. + * Valid values are from 1 to 8 + */ +#define CFG_BLE_NUM_LINK 2 + +/** + * Maximum number of Services that can be stored in the GATT database. + * Note that the GAP and GATT services are automatically added so this parameter should be 2 plus the number of user services + */ +#define CFG_BLE_NUM_GATT_SERVICES 4 + +/** + * Maximum number of Attributes + * (i.e. the number of characteristic + the number of characteristic values + the number of descriptors, excluding the services) + * that can be stored in the GATT database. + * Note that certain characteristics and relative descriptors are added automatically during device initialization + * so this parameters should be 9 plus the number of user Attributes + */ +#define CFG_BLE_NUM_GATT_ATTRIBUTES 30 + +/** + * Maximum supported ATT_MTU size + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_MAX_ATT_MTU (23/*156*/) + +/** + * Size of the storage area for Attribute values + * This value depends on the number of attributes used by application. In particular the sum of the following quantities (in octets) should be made for each attribute: + * - attribute value length + * - 5, if UUID is 16 bit; 19, if UUID is 128 bit + * - 2, if server configuration descriptor is used + * - 2*DTM_NUM_LINK, if client configuration descriptor is used + * - 2, if extended properties is used + * The total amount of memory needed is the sum of the above quantities for each attribute. + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1290) + +/** + * Prepare Write List size in terms of number of packet + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_PREPARE_WRITE_LIST_SIZE BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU) + +/** + * Number of allocated memory blocks + * This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter when CFG_BLE_OPTIONS is set to 1 + */ +#define CFG_BLE_MBLOCK_COUNT (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK)) + +/** + * Enable or disable the Extended Packet length feature. Valid values are 0 or 1. + */ +#define CFG_BLE_DATA_LENGTH_EXTENSION 1 + +/** + * Sleep clock accuracy in Slave mode (ppm value) + */ +#define CFG_BLE_SLAVE_SCA 500 + +/** + * Sleep clock accuracy in Master mode + * 0 : 251 ppm to 500 ppm + * 1 : 151 ppm to 250 ppm + * 2 : 101 ppm to 150 ppm + * 3 : 76 ppm to 100 ppm + * 4 : 51 ppm to 75 ppm + * 5 : 31 ppm to 50 ppm + * 6 : 21 ppm to 30 ppm + * 7 : 0 ppm to 20 ppm + */ +#define CFG_BLE_MASTER_SCA 0 + +/** + * Source for the low speed clock for RF wake-up + * 1 : external high speed crystal HSE/32/32 + * 0 : external low speed crystal ( no calibration ) + */ +#define CFG_BLE_LSE_SOURCE 0 + +/** + * Start up time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us) + */ +#define CFG_BLE_HSE_STARTUP_TIME 0x148 + +/** + * Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us) + */ +#define CFG_BLE_MAX_CONN_EVENT_LENGTH (0xFFFFFFFF) + +/** + * Viterbi Mode + * 1 : enabled + * 0 : disabled + */ +#define CFG_BLE_VITERBI_MODE 1 + +/** + * BLE stack Options flags to be configured with: + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: + * (bit 0): 1: LL only + * 0: LL + host + * (bit 1): 1: no service change desc. + * 0: with service change desc. + * (bit 2): 1: device name Read-Only + * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 + * other bits: reserved (shall be set to 0) + */ +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) + +#define CFG_BLE_MAX_COC_INITIATOR_NBR (32) + +#define CFG_BLE_MIN_TX_POWER (0) + +#define CFG_BLE_MAX_TX_POWER (0) + + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + +/****************************************************************************** + * Transport Layer + ******************************************************************************/ +/** + * Queue length of BLE Event + * This parameter defines the number of asynchronous events that can be stored in the HCI layer before + * being reported to the application. When a command is sent to the BLE core coprocessor, the HCI layer + * is waiting for the event with the Num_HCI_Command_Packets set to 1. The receive queue shall be large + * enough to store all asynchronous events received in between. + * When CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE is set to 27, this allow to store three 255 bytes long asynchronous events + * between the HCI command and its event. + * This parameter depends on the value given to CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE. When the queue size is to small, + * the system may hang if the queue is full with asynchronous events and the HCI layer is still waiting + * for a CC/CS event, In that case, the notification TL_BLE_HCI_ToNot() is called to indicate + * to the application a HCI command did not receive its command event within 30s (Default HCI Timeout). + */ +#define CFG_TLBLE_EVT_QUEUE_LENGTH 5 +/** + * This parameter should be set to fit most events received by the HCI layer. It defines the buffer size of each element + * allocated in the queue of received events and can be used to optimize the amount of RAM allocated by the Memory Manager. + * It should not exceed 255 which is the maximum HCI packet payload size (a greater value is a lost of memory as it will + * never be used) + * It shall be at least 4 to receive the command status event in one frame. + * The default value is set to 27 to allow receiving an event of MTU size in a single buffer. This value maybe reduced + * further depending on the application. + */ +#define CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE 255 /**< Set to 255 with the memory manager and the mailbox */ + +#define TL_BLE_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE ) +/****************************************************************************** + * UART interfaces + ******************************************************************************/ + +/** + * Select UART interfaces + */ +#define CFG_DEBUG_TRACE_UART hw_uart1 +#define CFG_CONSOLE_MENU hw_lpuart1 + +/****************************************************************************** + * USB interface + ******************************************************************************/ + +/** + * Enable/Disable USB interface + */ +#define CFG_USB_INTERFACE_ENABLE 0 + +/****************************************************************************** + * IPCC interface + ******************************************************************************/ + +/** + * The IPCC is dedicated to the communication between the CPU2 and the CPU1 + * and shall not be modified by the application + * The two following definitions shall not be modified + */ +#define HAL_IPCC_TX_IRQHandler(...) HW_IPCC_Tx_Handler( ) +#define HAL_IPCC_RX_IRQHandler(...) HW_IPCC_Rx_Handler( ) + +/****************************************************************************** + * Low Power + ******************************************************************************/ +/** + * When set to 1, the low power mode is enable + * When set to 0, the device stays in RUN mode + */ +#define CFG_LPM_SUPPORTED 0 + + /** + * This shall be set to 1 when standby is supported while the wireless stack on CPU2 is running + * (i.e the CPU2 is allowed to enter standby between RF activity) + * Otherwise, it should be set to 0 for marginal code and test execution saving + * In this case the lowest power mode available will be Stop 1 + * Note that keeping that setting to 1 when standby is not supported does not hurt + */ +#define CFG_LPM_STANDBY_SUPPORTED 0 + +/****************************************************************************** + * RTC interface + ******************************************************************************/ +#define HAL_RTCEx_WakeUpTimerIRQHandler(...) HW_TS_RTC_Wakeup_Handler( ) + +/****************************************************************************** + * Timer Server + ******************************************************************************/ +/** + * CFG_RTC_WUCKSEL_DIVIDER: This sets the RTCCLK divider to the wakeup timer. + * The lower is the value, the better is the power consumption and the accuracy of the timerserver + * The higher is the value, the finest is the granularity + * + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output + * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding + * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. + * + * CFG_RTC_SYNCH_PRESCALER: This sets the synchronous prescaler of the RTC. + * When the 1Hz calendar clock is required, it shall be sets according to other settings + * When the 1Hz calendar clock is not needed, CFG_RTC_SYNCH_PRESCALER should be set to 0x7FFF (MAX VALUE) + * + * CFG_RTCCLK_DIVIDER_CONF: + * Shall be set to either 0,2,4,8,16 + * When set to either 2,4,8,16, the 1Hhz calendar is supported + * When set to 0, the user sets its own configuration + * + * The following settings are computed with LSI as input to the RTC + */ + +#define CFG_RTCCLK_DIVIDER_CONF 0 + +#if (CFG_RTCCLK_DIVIDER_CONF == 0) +/** + * Custom configuration + * It does not support 1Hz calendar + * It divides the RTC CLK by 16 + */ + +#define CFG_RTCCLK_DIV (16) +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#define CFG_RTC_ASYNCH_PRESCALER (0x0F) +#define CFG_RTC_SYNCH_PRESCALER (0x7FFF) + +#else + +#if (CFG_RTCCLK_DIVIDER_CONF == 2) +/** + * It divides the RTC CLK by 2 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (3) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 4) +/** + * It divides the RTC CLK by 4 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (2) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 8) +/** + * It divides the RTC CLK by 8 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (1) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 16) +/** + * It divides the RTC CLK by 16 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#endif + +#define CFG_RTCCLK_DIV CFG_RTCCLK_DIVIDER_CONF +#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) +#define CFG_RTC_SYNCH_PRESCALER (DIVR( LSE_VALUE, (CFG_RTC_ASYNCH_PRESCALER+1) ) - 1 ) + +#endif + +/** tick timer values */ +#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) + +typedef enum +{ + CFG_TIM_PROC_ID_ISR, + /* USER CODE BEGIN CFG_TimProcID_t */ + + /* USER CODE END CFG_TimProcID_t */ +} CFG_TimProcID_t; + +/****************************************************************************** + * Debug + ******************************************************************************/ +/** + * When set, this resets some hw resources to set the device in the same state than the power up + * The FW resets only register that may prevent the FW to run properly + * + * This shall be set to 0 in a final product + * + */ +#define CFG_HW_RESET_BY_FW 0 + +/** + * keep debugger enabled while in any low power mode when set to 1 + * should be set to 0 in production + */ +#define CFG_DEBUGGER_SUPPORTED 1 + +/** + * When set to 1, the traces are enabled in the BLE services + */ +#define CFG_DEBUG_BLE_TRACE 0 + +/** + * Enable or Disable traces in application + */ +#define CFG_DEBUG_APP_TRACE 0 + +#if (CFG_DEBUG_APP_TRACE != 0) +#define APP_DBG_MSG PRINT_MESG_DBG +#else +#define APP_DBG_MSG PRINT_NO_MESG +#endif + +#if ( (CFG_DEBUG_BLE_TRACE != 0) || (CFG_DEBUG_APP_TRACE != 0) ) +#define CFG_DEBUG_TRACE 1 +#endif + +#if (CFG_DEBUG_TRACE != 0) +#undef CFG_LPM_SUPPORTED +#undef CFG_DEBUGGER_SUPPORTED +#define CFG_LPM_SUPPORTED 0 +#define CFG_DEBUGGER_SUPPORTED 1 +#endif + +/** + * When CFG_DEBUG_TRACE_FULL is set to 1, the trace are output with the API name, the file name and the line number + * When CFG_DEBUG_TRACE_LIGHT is set to 1, only the debug message is output + * + * When both are set to 0, no trace are output + * When both are set to 1, CFG_DEBUG_TRACE_FULL is selected + */ +#define CFG_DEBUG_TRACE_LIGHT 0 +#define CFG_DEBUG_TRACE_FULL 0 + +#if (( CFG_DEBUG_TRACE != 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 ) && (CFG_DEBUG_TRACE_FULL == 0)) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 1 +#endif + +#if ( CFG_DEBUG_TRACE == 0 ) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 0 +#endif + +/** + * When not set, the traces is looping on sending the trace over UART + */ +#define DBG_TRACE_USE_CIRCULAR_QUEUE 1 + +/** + * max buffer Size to queue data traces and max data trace allowed. + * Only Used if DBG_TRACE_USE_CIRCULAR_QUEUE is defined + */ +#define DBG_TRACE_MSG_QUEUE_SIZE 4096 +#define MAX_DBG_TRACE_MSG_SIZE 1024 + +/* USER CODE BEGIN Defines */ +#define CFG_LED_SUPPORTED 1 +#define CFG_BUTTON_SUPPORTED 1 + +#define PUSH_BUTTON_SW1_EXTI_IRQHandler EXTI0_IRQHandler +#define PUSH_BUTTON_SW2_EXTI_IRQHandler EXTI4_IRQHandler +#define PUSH_BUTTON_SW3_EXTI_IRQHandler EXTI9_5_IRQHandler + +#define POWEROFF_EXTI_IRQHandler EXTI15_10_IRQHandler +/* USER CODE END Defines */ + +/****************************************************************************** + * Scheduler + ******************************************************************************/ + +/** + * These are the lists of task id registered to the scheduler + * Each task id shall be in the range [0:31] + * This mechanism allows to implement a generic code in the API TL_BLE_HCI_StatusNot() to comply with + * the requirement that a HCI/ACI command shall never be sent if there is already one pending + */ + +/**< Add in that list all tasks that may send a ACI/HCI command */ +typedef enum +{ + CFG_TASK_ADV_UPDATE_ID, + CFG_TASK_MESH_REQ_ID, + CFG_TASK_MESH_BEACON_REQ_ID, + CFG_TASK_MESH_UART_RX_REQ_ID, + CFG_TASK_APPLI_REQ_ID, + CFG_TASK_MESH_SW1_REQ_ID, + CFG_TASK_MESH_SW3_REQ_ID, + CFG_TASK_MESH_LPN_REQ_ID, + CFG_TASK_HCI_ASYNCH_EVT_ID, +/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + +/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ +} CFG_Task_Id_With_HCI_Cmd_t; + +/**< Add in that list all tasks that never send a ACI/HCI command */ +typedef enum +{ + CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ + CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, + +/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + +/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + + CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ +} CFG_Task_Id_With_NO_HCI_Cmd_t; +#define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD + +/** + * This is the list of priority required by the application + * Each Id shall be in the range 0..31 + */ +typedef enum +{ + CFG_SCH_PRIO_0, + CFG_PRIO_NBR, +} CFG_SCH_Prio_Id_t; + +/** + * This is a bit mapping over 32bits listing all events id supported in the application + */ +typedef enum +{ + CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID, + CFG_IDLEEVT_SYSTEM_HCI_CMD_EVT_RSP_ID, +} CFG_IdleEvt_Id_t; + +/****************************************************************************** + * LOW POWER + ******************************************************************************/ +/** + * Supported requester to the MCU Low Power Manager - can be increased up to 32 + * It list a bit mapping of all user of the Low Power Manager + */ +typedef enum +{ + CFG_LPM_APP, + CFG_LPM_APP_BLE, + /* USER CODE BEGIN CFG_LPM_Id_t */ + + /* USER CODE END CFG_LPM_Id_t */ +} CFG_LPM_Id_t; + +/****************************************************************************** + * OTP manager + ******************************************************************************/ +#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE + +#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR + +#endif /*APP_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h new file mode 100644 index 000000000..9237f301f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h @@ -0,0 +1,67 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APP_DEBUG_H +#define __APP_DEBUG_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void APPD_Init( void ); + void APPD_EnableCPU2( void ); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__APP_DEBUG_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h new file mode 100644 index 000000000..4f47130d3 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h @@ -0,0 +1,72 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_ENTRY_H +#define APP_ENTRY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void MX_APPE_Config( void ); + void MX_APPE_Init( void ); + void MX_APPE_Process( void ); + void Init_Exti( void ); + void Init_Smps( void ); + +/* USER CODE BEGIN EF */ + void APPE_Led_Init( void ); + void APPE_Button_Init( void ); +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_ENTRY_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h new file mode 100644 index 000000000..9126af678 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h @@ -0,0 +1,173 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_CONF_H +#define HW_CONF_H + +/****************************************************************************** + * Semaphores + * THIS SHALL NO BE CHANGED AS THESE SEMAPHORES ARE USED AS WELL ON THE CM0+ + *****************************************************************************/ +/** +* Index of the semaphore used the prevent conflicts after standby sleep. +* Each CPUs takes this semaphore at standby wakeup until conclicting elements are restored. +*/ +#define CFG_HW_PWR_STANDBY_SEMID 10 +/** +* The CPU2 may be configured to store the Thread persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* CFG_HW_THREAD_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_THREAD_NVM_SRAM_SEMID 9 + +/** +* The CPU2 may be configured to store the BLE persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* CFG_HW_BLE_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_BLE_NVM_SRAM_SEMID 8 + +/** +* Index of the semaphore used by CPU2 to prevent the CPU1 to either write or erase data in flash +* The CPU1 shall not either write or erase in flash when this semaphore is taken by the CPU2 +* When the CPU1 needs to either write or erase in flash, it shall first get the semaphore and release it just +* after writing a raw (64bits data) or erasing one sector. +* Once the Semaphore has been released, there shall be at least 1us before it can be taken again. This is required +* to give the opportunity to CPU2 to take it. +* On v1.4.0 and older CPU2 wireless firmware, this semaphore is unused and CPU2 is using PES bit. +* By default, CPU2 is using the PES bit to protect its timing. The CPU1 may request the CPU2 to use the semaphore +* instead of the PES bit by sending the system command SHCI_C2_SetFlashActivityControl() +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID 7 + +/** +* Index of the semaphore used by CPU1 to prevent the CPU2 to either write or erase data in flash +* In order to protect its timing, the CPU1 may get this semaphore to prevent the CPU2 to either +* write or erase in flash (as this will stall both CPUs) +* The PES bit shall not be used as this may stall the CPU2 in some cases. +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID 6 + +/** +* Index of the semaphore used to manage the CLK48 clock configuration +* When the USB is required, this semaphore shall be taken before configuring te CLK48 for USB +* and should be released after the application switch OFF the clock when the USB is not used anymore +* When using the RNG, it is good enough to use CFG_HW_RNG_SEMID to control CLK48. +* More details in AN5289 +*/ +#define CFG_HW_CLK48_CONFIG_SEMID 5 + +/* Index of the semaphore used to manage the entry Stop Mode procedure */ +#define CFG_HW_ENTRY_STOP_MODE_SEMID 4 + +/* Index of the semaphore used to access the RCC */ +#define CFG_HW_RCC_SEMID 3 + +/* Index of the semaphore used to access the FLASH */ +#define CFG_HW_FLASH_SEMID 2 + +/* Index of the semaphore used to access the PKA */ +#define CFG_HW_PKA_SEMID 1 + +/* Index of the semaphore used to access the RNG */ +#define CFG_HW_RNG_SEMID 0 + +/****************************************************************************** + * HW TIMER SERVER + *****************************************************************************/ +/** + * The user may define the maximum number of virtual timers supported. + * It shall not exceed 255 + */ +#define CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER 6 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the preemptpriority part of the NVIC. + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO 3 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the subpriority part of the NVIC. It does not exist on all processors. When it is not supported + * on the CPU, the setting is ignored + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO 0 + +/** + * Define a critical section in the Timer server + * The Timer server does not support the API to be nested + * The Application shall either: + * a) Ensure this will never happen + * b) Define the critical section + * The default implementations is masking all interrupts using the PRIMASK bit + * The TimerServer driver uses critical sections to avoid context corruption. This is achieved with the macro + * TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION. When CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION is set + * to 1, all STM32 interrupts are masked with the PRIMASK bit of the CortexM CPU. It is possible to use the BASEPRI + * register of the CortexM CPU to keep allowed some interrupts with high priority. In that case, the user shall + * re-implement TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION and shall make sure that no TimerServer + * API are called when the TIMER critical section is entered + */ +#define CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION 1 + +/** + * This value shall reflect the maximum delay there could be in the application between the time the RTC interrupt + * is generated by the Hardware and the time when the RTC interrupt handler is called. This time is measured in + * number of RTCCLK ticks. + * A relaxed timing would be 10ms + * When the value is too short, the timerserver will not be able to count properly and all timeout may be random. + * When the value is too long, the device may wake up more often than the most optimal configuration. However, the + * impact on power consumption would be marginal (unless the value selected is extremely too long). It is strongly + * recommended to select a value large enough to make sure it is not too short to ensure reliability of the system + * as this will have marginal impact on low power mode + */ +#define CFG_HW_TS_RTC_HANDLER_MAX_DELAY ( 10 * (LSI_VALUE/1000) ) + + /** + * Interrupt ID in the NVIC of the RTC Wakeup interrupt handler + * It shall be type of IRQn_Type + */ +#define CFG_HW_TS_RTC_WAKEUP_HANDLER_ID RTC_WKUP_IRQn + +/****************************************************************************** + * HW UART + *****************************************************************************/ +#define CFG_HW_LPUART1_ENABLED 0 +#define CFG_HW_LPUART1_DMA_TX_SUPPORTED 0 + +#define CFG_HW_USART1_ENABLED 1 +#define CFG_HW_USART1_DMA_TX_SUPPORTED 1 + +#endif /*HW_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h new file mode 100644 index 000000000..2c26fd8c6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h @@ -0,0 +1,87 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** +* @file hw_flash.h + * @author MCD Application Team +* @brief Header for hw_flash.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __HW_FLASH_H +#define __HW_FLASH_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +/** + * @brief Write 64 bits double word in FLASH + * + * @param FLASH destination address + * @param 64 bits double word data + * @retval result + */ +MOBLE_RESULT HW_FLASH_Write(uint32_t address, uint64_t data); + +/** + * @brief Erase FLASH page + * + * @param address of FLASH page + * @param number of page + * @param interrupt not used + * @retval result + */ +MOBLE_RESULT HW_FLASH_Erase(uint32_t page, uint16_t n, int interrupt); + +#if 0 +/** + * @brief Get Option Byte IPCC buffer address + * + * @param None + * @retval Option Byte IPCC buffer address + */ +uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void); + +/** + * @brief Get Option Byte SFSA + * + * @param None + * @retval Option Byte SFSA + */ +uint32_t HW_FLASH_OB_GetSFSA(void); + +/** + * @brief Get Option Byte SBSRA + * + * @param None + * @retval Option Byte SBSRA + */ +uint32_t HW_FLASH_OB_GetSBRSA(void); + +/** + * @brief Get Option Byte SNBRSA + * + * @param None + * @retval Option Byte SNBRSA + */ +uint32_t HW_FLASH_OB_GetSNBRSA(void); +#endif + +#ifdef __cplusplus +} +#endif + +#endif /*__HW_FLASH_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h new file mode 100644 index 000000000..834c17171 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h @@ -0,0 +1,247 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_if.h + * @author MCD Application Team + * @brief Hardware Interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_IF_H +#define HW_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + + /* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx.h" +#include "stm32wbxx_ll_exti.h" +#include "stm32wbxx_ll_system.h" +#include "stm32wbxx_ll_rcc.h" +#include "stm32wbxx_ll_ipcc.h" +#include "stm32wbxx_ll_bus.h" +#include "stm32wbxx_ll_pwr.h" +#include "stm32wbxx_ll_cortex.h" +#include "stm32wbxx_ll_utils.h" +#include "stm32wbxx_ll_hsem.h" +#include "stm32wbxx_ll_gpio.h" +#include "stm32wbxx_ll_rtc.h" + +#ifdef USE_STM32WBXX_USB_DONGLE +#include "stm32wbxx_usb_dongle.h" +#endif +#ifdef USE_STM32WBXX_NUCLEO +#include "nucleo_wb15cc.h" +#endif +#ifdef USE_X_NUCLEO_EPD +#include "x_nucleo_epd.h" +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /****************************************************************************** + * HW UART + ******************************************************************************/ + typedef enum + { + hw_uart1, + hw_uart2, + hw_lpuart1, + } hw_uart_id_t; + + typedef enum + { + hw_uart_ok, + hw_uart_error, + hw_uart_busy, + hw_uart_to, + } hw_status_t; + + void HW_UART_Init(hw_uart_id_t hw_uart_id); + void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout); + hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*Callback)(void)); + void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); + void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); + + /****************************************************************************** + * HW TimerServer + ******************************************************************************/ + /* Exported types ------------------------------------------------------------*/ + /** + * This setting is used when standby mode is supported. + * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does + * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured + * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. + */ + typedef enum + { + hw_ts_InitMode_Full, + hw_ts_InitMode_Limited, + } HW_TS_InitMode_t; + + /** + * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, + * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() + * + * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. + */ + typedef enum + { + hw_ts_SingleShot, + hw_ts_Repeated + } HW_TS_Mode_t; + + /** + * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed + * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a + * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased + */ + typedef enum + { + hw_ts_Successful, + hw_ts_Failed, + }HW_TS_ReturnStatus_t; + + typedef void (*HW_TS_pTimerCb_t)(void); + + /** + * @brief Initialize the timer server + * This API shall be called by the application before any timer is requested to the timer server. It + * configures the RTC module to be connected to the LSI input clock. + * + * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the + * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested + * @param hrtc: RTC Handle + * @retval None + */ + void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); + + /** + * @brief Interface to create a virtual timer + * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it + * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the + * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler + * which module is concerned. In return, the user gets a timer ID to handle it. + * + * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow + * identification of the requester + * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) + * @param TimerMode: Mode of the virtual timer (Single shot or repeated) + * @param pTimerCallBack: Callback when the virtual timer expires + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not + */ + HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Stop a virtual timer + * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. + * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. + * Nothing is done when it is called to stop a timer which has been already stopped + * + * @param TimerID: Id of the timer to stop + * @retval None + */ + void HW_TS_Stop(uint8_t TimerID); + + /** + * @brief Start a virtual timer + * This API shall be used to start a timer. The timeout value is specified and may be different each time. + * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may + * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always + * stay in the running state. When the timer expires, it will be restarted with the same timeout value. + * This API shall not be called on a running timer. + * + * @param TimerID: The ID Id of the timer to start + * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) + * @retval None + */ + void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); + + /** + * @brief Delete a virtual timer from the list + * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from + * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the + * creation of a new timer if required and may get a different timer id + * + * @param TimerID: The ID of the timer to remove from the list + * @retval None + */ + void HW_TS_Delete(uint8_t TimerID); + + /** + * @brief Schedule the timer list on the timer interrupt handler + * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes + * care of clearing all status flag required in the RTC and EXTI peripherals + * + * @param None + * @retval None + */ + void HW_TS_RTC_Wakeup_Handler(void); + + /** + * @brief Return the number of ticks to count before the interrupt + * This API returns the number of ticks left to be counted before an interrupt is generated by the + * Timer Server. This API may be used by the application for power management optimization. When the system + * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running + * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the + * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time + * versus time in low power mode is implementation specific + * When the timer is disabled (No timer in the list), it returns 0xFFFF + * + * @param None + * @retval The number of ticks left to count + */ + uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); + + /** + * @brief Notify the application that a registered timer has expired + * This API shall be implemented by the user application. + * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt + * context. The application may implement an Operating System to change the context priority where the timer + * callback may be handled. This API provides the module ID to identify which module is concerned and to allow + * sending the information to the correct task + * + * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created + * @param TimerID: The TimerID of the expired timer + * @param pTimerCallBack: The Callback associated with the timer when it has been created + * @retval None + */ + void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Notify the application that the wakeupcounter has been updated + * This API should be implemented by the user application + * This API notifies the application that the counter has been updated. This is expected to be used along + * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the + * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification + * provides a way to the application to solve that race condition to reevaluate the counter value before + * entering low power mode + * + * @param None + * @retval None + */ + void HW_TS_RTC_CountUpdated_AppNot(void); + +#ifdef __cplusplus +} +#endif + +#endif /*HW_IF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h new file mode 100644 index 000000000..beee3a132 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h @@ -0,0 +1,60 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** +* @file lp_timer.h + * @author MCD Application Team +* @brief Header for lp_timer.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __LP_TIMER_H +#define __LP_TIMER_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + + /** + * @brief Initialize the low power timer + * + * @param None + * @retval None + */ + void LpTimerInit(void); + + /** + * @brief Request to start a low power timer ( running is stop mode ) + * + * @param time_to_sleep : in ms + * @retval None + */ + void LpTimerStart(uint32_t time_to_sleep); + + /** + * @brief Read how long the timer has run + * + * @param None + * @retval The time elapsed in ms + */ + uint32_t LpGetElapsedTime(void); + + +#ifdef __cplusplus +} +#endif + +#endif /*__LP_TIMER_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h new file mode 100644 index 000000000..7af156239 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h @@ -0,0 +1,75 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.h + * @brief : Header for main.c file. + * This file contains the common defines of the application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MAIN_H +#define __MAIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" +#include "app_conf.h" +#include "app_entry.h" +#include "app_common.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void Error_Handler(void); + +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +/* Private defines -----------------------------------------------------------*/ +void MX_GPIO_Init(void); +void MX_IPCC_Init(void); +void MX_RF_Init(void); +void MX_RTC_Init(void); +/* USER CODE BEGIN Private defines */ + +/* USER CODE END Private defines */ + +#ifdef __cplusplus +} +#endif + +#endif /* __MAIN_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/nucleo_wb15cc_conf.h new file mode 100644 index 000000000..0593858cc --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/nucleo_wb15cc_conf.h @@ -0,0 +1,74 @@ +/** + ****************************************************************************** + * @file nucleo_wb15cc_conf.h + * @author MCD Application Team + * @brief NUCLEO-WB15CC board configuration file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef NUCLEO_WB15CC_CONF_H +#define NUCLEO_WB15CC_CONF_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" + +/** @addtogroup BSP + * @{ + */ + +/** @addtogroup NUCLEO_WB15CC + * @{ + */ + +/** @defgroup NUCLEO_WB15CC_CONFIG CONFIG + * @{ + */ + +/** @defgroup NUCLEO_WB15CC_CONFIG_Exported_Constants Exported Constants + * @{ + */ +/* COM usage define */ +#define USE_BSP_COM_FEATURE 0U + +/* COM log define */ +#define USE_COM_LOG 0U + +/* IRQ priorities */ +#define BSP_BUTTON_USER_IT_PRIORITY 15U + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif /* NUCLEO_WB15CC_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h new file mode 100644 index 000000000..45c31caa5 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h @@ -0,0 +1,79 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32_LPM_IF_H +#define __STM32_LPM_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ); +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ); + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ); +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ); + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ); + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ); + +#ifdef __cplusplus +} +#endif + +#endif /*__STM32_LPM_IF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h new file mode 100644 index 000000000..eb093e5e7 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h @@ -0,0 +1,352 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_conf.h + * @author MCD Application Team + * @brief HAL configuration file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_HAL_CONF_H +#define __STM32WBxx_HAL_CONF_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ + +/* ########################## Module Selection ############################## */ +/** + * @brief This is the list of modules to be used in the HAL driver + */ +#define HAL_MODULE_ENABLED +/* #define HAL_ADC_MODULE_ENABLED */ +#define HAL_CRYP_MODULE_ENABLED +#define HAL_COMP_MODULE_ENABLED +#define HAL_CRC_MODULE_ENABLED +#define HAL_HSEM_MODULE_ENABLED +/*#define HAL_I2C_MODULE_ENABLED*/ +#define HAL_IPCC_MODULE_ENABLED +/*#define HAL_IRDA_MODULE_ENABLED*/ +/*#define HAL_IWDG_MODULE_ENABLED*/ +/*#define HAL_LCD_MODULE_ENABLED*/ +/*#define HAL_LPTIM_MODULE_ENABLED*/ +/*#define HAL_PCD_MODULE_ENABLED*/ +#define HAL_PKA_MODULE_ENABLED +/*#define HAL_QSPI_MODULE_ENABLED*/ +#define HAL_RNG_MODULE_ENABLED +#define HAL_RTC_MODULE_ENABLED +/*#define HAL_SAI_MODULE_ENABLED*/ +/*#define HAL_SMBUS_MODULE_ENABLED*/ +/*#define HAL_SMARTCARD_MODULE_ENABLED*/ +/* #define HAL_SPI_MODULE_ENABLED */ +#define HAL_TIM_MODULE_ENABLED +/*#define HAL_TSC_MODULE_ENABLED*/ +#define HAL_UART_MODULE_ENABLED +#define HAL_USART_MODULE_ENABLED +/*#define HAL_WWDG_MODULE_ENABLED*/ +#define HAL_EXTI_MODULE_ENABLED +#define HAL_CORTEX_MODULE_ENABLED +#define HAL_DMA_MODULE_ENABLED +#define HAL_FLASH_MODULE_ENABLED +#define HAL_GPIO_MODULE_ENABLED +#define HAL_PWR_MODULE_ENABLED +#define HAL_RCC_MODULE_ENABLED + +#define USE_HAL_ADC_REGISTER_CALLBACKS 0u +#define USE_HAL_COMP_REGISTER_CALLBACKS 0u +#define USE_HAL_CRYP_REGISTER_CALLBACKS 0u +#define USE_HAL_I2C_REGISTER_CALLBACKS 0u +#define USE_HAL_IRDA_REGISTER_CALLBACKS 0u +#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0u +#define USE_HAL_PCD_REGISTER_CALLBACKS 0u +#define USE_HAL_PKA_REGISTER_CALLBACKS 0u +#define USE_HAL_QSPI_REGISTER_CALLBACKS 0u +#define USE_HAL_RNG_REGISTER_CALLBACKS 0u +#define USE_HAL_RTC_REGISTER_CALLBACKS 0u +#define USE_HAL_SAI_REGISTER_CALLBACKS 0u +#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0u +#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0u +#define USE_HAL_SPI_REGISTER_CALLBACKS 0u +#define USE_HAL_TIM_REGISTER_CALLBACKS 0u +#define USE_HAL_TSC_REGISTER_CALLBACKS 0u +#define USE_HAL_UART_REGISTER_CALLBACKS 0u +#define USE_HAL_USART_REGISTER_CALLBACKS 0u +#define USE_HAL_WWDG_REGISTER_CALLBACKS 0u + +/* ########################## Oscillator Values adaptation ####################*/ +/** + * @brief Adjust the value of External High Speed oscillator (HSE) used in your application. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSE is used as system clock source, directly or through the PLL). + */ +#if !defined (HSE_VALUE) +#define HSE_VALUE 32000000U /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (HSE_STARTUP_TIMEOUT) + #define HSE_STARTUP_TIMEOUT ((uint32_t)100) /*!< Time out for HSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief Internal Multiple Speed oscillator (MSI) default value. + * This value is the default MSI range value after Reset. + */ +#if !defined (MSI_VALUE) + #define MSI_VALUE ((uint32_t)4000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +/** + * @brief Internal High Speed oscillator (HSI) value. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSI is used as system clock source, directly or through the PLL). + */ +#if !defined (HSI_VALUE) +#define HSI_VALUE 16000000U /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +/** + * @brief Internal Low Speed oscillator (LSI1) value. + */ +#if !defined (LSI1_VALUE) + #define LSI1_VALUE ((uint32_t)32000) /*!< LSI1 Typical Value in Hz*/ +#endif /* LSI1_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ +/** + * @brief Internal Low Speed oscillator (LSI2) value. + */ +#if !defined (LSI2_VALUE) + #define LSI2_VALUE ((uint32_t)32000) /*!< LSI2 Typical Value in Hz*/ +#endif /* LSI2_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ + +/** + * @brief External Low Speed oscillator (LSE) value. + * This value is used by the UART, RTC HAL module to compute the system frequency + */ +#if !defined (LSE_VALUE) +#define LSE_VALUE 32768U /*!< Value of the External oscillator in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @brief Internal Multiple Speed oscillator (HSI48) default value. + * This value is the default HSI48 range value after Reset. + */ +#if !defined (HSI48_VALUE) + #define HSI48_VALUE ((uint32_t)48000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI48_VALUE */ + +#if !defined (LSE_STARTUP_TIMEOUT) +#define LSE_STARTUP_TIMEOUT 5000U /*!< Time out for LSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief External clock source for SAI1 peripheral + * This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source + * frequency. + */ +#if !defined (EXTERNAL_SAI1_CLOCK_VALUE) + #define EXTERNAL_SAI1_CLOCK_VALUE ((uint32_t)48000) /*!< Value of the SAI1 External clock source in Hz*/ +#endif /* EXTERNAL_SAI1_CLOCK_VALUE */ + +/* Tip: To avoid modifying this file each time you need to use different HSE, + === you can define the HSE value in your toolchain compiler preprocessor. */ + +/* ########################### System Configuration ######################### */ +/** + * @brief This is the HAL system configuration section + */ + +#define VDD_VALUE 3300U /*!< Value of VDD in mv */ +#define TICK_INT_PRIORITY 0U /*!< tick interrupt priority */ +#define USE_RTOS 0U +#define PREFETCH_ENABLE 1U +#define INSTRUCTION_CACHE_ENABLE 1U +#define DATA_CACHE_ENABLE 1U + +/* ########################## Assert Selection ############################## */ +/** + * @brief Uncomment the line below to expanse the "assert_param" macro in the + * HAL drivers code + */ +/* #define USE_FULL_ASSERT 1U */ + +/* ################## SPI peripheral configuration ########################## */ + +/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver + * Activated: CRC code is present inside driver + * Deactivated: CRC code cleaned from driver + */ + +#define USE_SPI_CRC 0U + +/* Includes ------------------------------------------------------------------*/ +/** + * @brief Include module's header file + */ +#ifdef HAL_DMA_MODULE_ENABLED + #include "stm32wbxx_hal_dma.h" +#endif /* HAL_DMA_MODULE_ENABLED */ + +#ifdef HAL_ADC_MODULE_ENABLED + #include "stm32wbxx_hal_adc.h" +#endif /* HAL_ADC_MODULE_ENABLED */ + +#ifdef HAL_COMP_MODULE_ENABLED + #include "stm32wbxx_hal_comp.h" +#endif /* HAL_COMP_MODULE_ENABLED */ + +#ifdef HAL_CORTEX_MODULE_ENABLED + #include "stm32wbxx_hal_cortex.h" +#endif /* HAL_CORTEX_MODULE_ENABLED */ + +#ifdef HAL_CRC_MODULE_ENABLED + #include "stm32wbxx_hal_crc.h" +#endif /* HAL_CRC_MODULE_ENABLED */ + +#ifdef HAL_CRYP_MODULE_ENABLED + #include "stm32wbxx_hal_cryp.h" +#endif /* HAL_CRYP_MODULE_ENABLED */ + +#ifdef HAL_EXTI_MODULE_ENABLED + #include "stm32wbxx_hal_exti.h" +#endif /* HAL_EXTI_MODULE_ENABLED */ + +#ifdef HAL_FLASH_MODULE_ENABLED + #include "stm32wbxx_hal_flash.h" +#endif /* HAL_FLASH_MODULE_ENABLED */ + +#ifdef HAL_GPIO_MODULE_ENABLED + #include "stm32wbxx_hal_gpio.h" +#endif /* HAL_GPIO_MODULE_ENABLED */ + +#ifdef HAL_HSEM_MODULE_ENABLED + #include "stm32wbxx_hal_hsem.h" +#endif /* HAL_HSEM_MODULE_ENABLED */ + +#ifdef HAL_I2C_MODULE_ENABLED + #include "stm32wbxx_hal_i2c.h" +#endif /* HAL_I2C_MODULE_ENABLED */ + +#ifdef HAL_IPCC_MODULE_ENABLED + #include "stm32wbxx_hal_ipcc.h" +#endif /* HAL_IPCC_MODULE_ENABLED */ + +#ifdef HAL_IRDA_MODULE_ENABLED + #include "stm32wbxx_hal_irda.h" +#endif /* HAL_IRDA_MODULE_ENABLED */ + +#ifdef HAL_IWDG_MODULE_ENABLED + #include "stm32wbxx_hal_iwdg.h" +#endif /* HAL_IWDG_MODULE_ENABLED */ + +#ifdef HAL_LCD_MODULE_ENABLED + #include "stm32wbxx_hal_lcd.h" +#endif /* HAL_LCD_MODULE_ENABLED */ + +#ifdef HAL_LPTIM_MODULE_ENABLED + #include "stm32wbxx_hal_lptim.h" +#endif /* HAL_LPTIM_MODULE_ENABLED */ + +#ifdef HAL_PCD_MODULE_ENABLED + #include "stm32wbxx_hal_pcd.h" +#endif /* HAL_PCD_MODULE_ENABLED */ + +#ifdef HAL_PKA_MODULE_ENABLED + #include "stm32wbxx_hal_pka.h" +#endif /* HAL_PKA_MODULE_ENABLED */ + +#ifdef HAL_PWR_MODULE_ENABLED + #include "stm32wbxx_hal_pwr.h" +#endif /* HAL_PWR_MODULE_ENABLED */ + +#ifdef HAL_QSPI_MODULE_ENABLED + #include "stm32wbxx_hal_qspi.h" +#endif /* HAL_QSPI_MODULE_ENABLED */ + +#ifdef HAL_RCC_MODULE_ENABLED + #include "stm32wbxx_hal_rcc.h" +#endif /* HAL_RCC_MODULE_ENABLED */ + +#ifdef HAL_RNG_MODULE_ENABLED + #include "stm32wbxx_hal_rng.h" +#endif /* HAL_RNG_MODULE_ENABLED */ + +#ifdef HAL_RTC_MODULE_ENABLED + #include "stm32wbxx_hal_rtc.h" +#endif /* HAL_RTC_MODULE_ENABLED */ + +#ifdef HAL_SAI_MODULE_ENABLED + #include "stm32wbxx_hal_sai.h" +#endif /* HAL_SAI_MODULE_ENABLED */ + +#ifdef HAL_SMARTCARD_MODULE_ENABLED + #include "stm32wbxx_hal_smartcard.h" +#endif /* HAL_SMARTCARD_MODULE_ENABLED */ + +#ifdef HAL_SMBUS_MODULE_ENABLED + #include "stm32wbxx_hal_smbus.h" +#endif /* HAL_SMBUS_MODULE_ENABLED */ + +#ifdef HAL_SPI_MODULE_ENABLED + #include "stm32wbxx_hal_spi.h" +#endif /* HAL_SPI_MODULE_ENABLED */ + +#ifdef HAL_TIM_MODULE_ENABLED + #include "stm32wbxx_hal_tim.h" +#endif /* HAL_TIM_MODULE_ENABLED */ + +#ifdef HAL_TSC_MODULE_ENABLED + #include "stm32wbxx_hal_tsc.h" +#endif /* HAL_TSC_MODULE_ENABLED */ + +#ifdef HAL_UART_MODULE_ENABLED + #include "stm32wbxx_hal_uart.h" +#endif /* HAL_UART_MODULE_ENABLED */ + +#ifdef HAL_USART_MODULE_ENABLED + #include "stm32wbxx_hal_usart.h" +#endif /* HAL_USART_MODULE_ENABLED */ + +#ifdef HAL_WWDG_MODULE_ENABLED + #include "stm32wbxx_hal_wwdg.h" +#endif /* HAL_WWDG_MODULE_ENABLED */ + +/* Exported macro ------------------------------------------------------------*/ +#ifdef USE_FULL_ASSERT +/** + * @brief The assert_param macro is used for function's parameters check. + * @param expr If expr is false, it calls assert_failed function + * which reports the name of the source file and the source + * line number of the call that failed. + * If expr is true, it returns no value. + * @retval None + */ + #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) +/* Exported functions ------------------------------------------------------- */ + void assert_failed(uint8_t* file, uint32_t line); +#else + #define assert_param(expr) ((void)0U) +#endif /* USE_FULL_ASSERT */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_HAL_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h new file mode 100644 index 000000000..51355b028 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h @@ -0,0 +1,81 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.h + * @brief This file contains the headers of the interrupt handlers. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_IT_H +#define __STM32WBxx_IT_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void NMI_Handler(void); +void HardFault_Handler(void); +void MemManage_Handler(void); +void BusFault_Handler(void); +void UsageFault_Handler(void); +void SVC_Handler(void); +void DebugMon_Handler(void); +void PendSV_Handler(void); +void SysTick_Handler(void); +void RTC_WKUP_IRQHandler(void); +void IPCC_C1_RX_IRQHandler(void); +void IPCC_C1_TX_IRQHandler(void); +void HSEM_IRQHandler(void); +/* USER CODE BEGIN EFP */ +void RTC_WKUP_IRQHandler(void); +void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); +void PUSH_BUTTON_SW2_EXTI_IRQHandler(void); +void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); +void USART1_IRQHandler(void); +void CFG_HW_USART1_DMA_TX_IRQHandler( void ); +void LPUART1_IRQHandler(void); +void CFG_HW_LPUART1_DMA_TX_IRQHandler( void ); + +void POWEROFF_EXTI_IRQHandler(void); +void TIM2_IRQHandler(void); +void TIM1_CC_IRQHandler(void); +/* USER CODE END EFP */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_IT_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h new file mode 100644 index 000000000..66b51180a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h @@ -0,0 +1,65 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef UTILITIES_CONF_H +#define UTILITIES_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "cmsis_compiler.h" +#include "string.h" + +/****************************************************************************** + * common + ******************************************************************************/ +#define UTILS_ENTER_CRITICAL_SECTION( ) uint32_t primask_bit = __get_PRIMASK( );\ + __disable_irq( ) + +#define UTILS_EXIT_CRITICAL_SECTION( ) __set_PRIMASK( primask_bit ) + +#define UTILS_MEMSET8( dest, value, size ) memset( dest, value, size); + +/****************************************************************************** + * tiny low power manager + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_LPM_INIT_CRITICAL_SECTION( ) +#define UTIL_LPM_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_LPM_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) + +/****************************************************************************** + * sequencer + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_SEQ_INIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_SEQ_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_CONF_TASK_NBR (32) +#define UTIL_SEQ_CONF_PRIO_NBR (2) +#define UTIL_SEQ_MEMSET8( dest, value, size ) UTILS_MEMSET8( dest, value, size ) + +#ifdef __cplusplus +} +#endif + +#endif /*UTILITIES_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h new file mode 100644 index 000000000..91a63aceb --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h @@ -0,0 +1,51 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file vcp_conf.h + * @author MCD Application Team + * @brief Configuration of the vcp interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __VCP_CONF_H +#define __VCP_CONF_H + +#ifdef __cplusplus +extern "C" +{ +#endif + +/* Includes ------------------------------------------------------------------*/ +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ +#define VCP_BAUD_RATE (115200) +#define VCP_TX_PATH_INTERFACE_READY_SETUP_TIME (20*1000*1000/CFG_TS_TICK_VAL) /** 20s */ +#define VCP_TASK_ID (CFG_TASK_VCP_SEND_DATA_ID) +#define VCP_TASK_PRIO (CFG_SEQ_PRIO_1) + +#ifdef VCP_TX_PATH_INTERFACE_READY_SETUP_TIME +#define VCP_TIMER_PROC_ID (CFG_TIM_PROC_ID_ISR) +#endif + +/* External variables --------------------------------------------------------*/ +/* Exported macros -----------------------------------------------------------*/ +/* Exported functions ------------------------------------------------------- */ + + +#ifdef __cplusplus +} +#endif + +#endif /*__VCP_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c new file mode 100644 index 000000000..852be7f8e --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c @@ -0,0 +1,423 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "app_common.h" + +#include "app_debug.h" +#include "utilities_common.h" +#include "shci.h" +#include "tl.h" +#include "dbg_trace.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ +typedef PACKED_STRUCT +{ + GPIO_TypeDef* port; + uint16_t pin; + uint8_t enable; + uint8_t reserved; +} APPD_GpioConfig_t; +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +/* USER CODE BEGIN PD */ +#define GPIO_NBR_OF_RF_SIGNALS 9 +#define GPIO_CFG_NBR_OF_FEATURES 38 +#define NBR_OF_TRACES_CONFIG_PARAMETERS 4 +#define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 + +/** + * THIS SHALL BE SET TO A VALUE DIFFERENT FROM 0 ONLY ON REQUEST FROM ST SUPPORT + */ +#define BLE_DTB_CFG 0 + +/** + * System Debug Options flags to be configured with: + * - SHCI_C2_DEBUG_OPTIONS_IPCORE_LP + * - SHCI_C2_DEBUG_OPTIONS_IPCORE_NO_LP + * - SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_EN + * - SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_DIS + * which are used to set following configuration bits: + * - bit 0: 0: IP BLE core in LP mode 1: IP BLE core in run mode (no LP supported) + * - bit 1: 0: CPU2 STOP mode Enable 1: CPU2 STOP mode Disable + * - bit [2-7]: bits reserved ( shall be set to 0) + */ +#define SYS_DBG_CFG1 (SHCI_C2_DEBUG_OPTIONS_IPCORE_LP | SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_EN) +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static SHCI_C2_DEBUG_TracesConfig_t APPD_TracesConfig={0, 0, 0, 0}; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static SHCI_C2_DEBUG_GeneralConfig_t APPD_GeneralConfig={BLE_DTB_CFG, SYS_DBG_CFG1, {0, 0}}; + +#ifdef CFG_DEBUG_TRACE_UART +#if(CFG_HW_LPUART1_ENABLED == 1) +extern void MX_LPUART1_UART_Init(void); +#endif +#if(CFG_HW_USART1_ENABLED == 1) +extern void MX_USART1_UART_Init(void); +#endif +#endif + +/** + * THE DEBUG ON GPIO FOR CPU2 IS INTENDED TO BE USED ONLY ON REQUEST FROM ST SUPPORT + * It provides timing information on the CPU2 activity. + * All configuration of (port, pin) is supported for each features and can be selected by the user + * depending on the availability + */ +static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = +{ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ISR - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_STACK_TICK - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_CMD_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ACL_DATA_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* SYS_CMD_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* RNG_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVM_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_GENERAL - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_EVT_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_ACL_DATA_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_SYS_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_SYS_EVT_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_CLI_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_OT_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_OT_ACK_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_CLI_ACK_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_MEM_MANAGER_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_TRACES_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* HARD_FAULT - Set on Entry / Reset on Exit */ +/* From v1.1.1 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IP_CORE_LP_STATUS - Set on Entry / Reset on Exit */ +/* From v1.2.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* END_OF_CONNECTION_EVENT - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* TIMER_SERVER_CALLBACK - Toggle on Entry */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* PES_ACTIVITY - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* MB_BLE_SEND_EVT - Set on Entry / Reset on Exit */ +/* From v1.3.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_NO_DELAY - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_STACK_STORE_NVM_CB - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_WRITE_ONGOING - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_WRITE_COMPLETE - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_CLEANUP - Set on Entry / Reset on Exit */ +/* From v1.4.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ +}; + +/** + * THE DEBUG ON GPIO FOR CPU2 IS INTENDED TO BE USED ONLY ON REQUEST FROM ST SUPPORT + * This table is relevant only for BLE + * It provides timing information on BLE RF activity. + * New signals may be allocated at any location when requested by ST + * The GPIO allocated to each signal depend on the BLE_DTB_CFG value and cannot be changed + */ +#if( BLE_DTB_CFG == 7) +static const APPD_GpioConfig_t aRfConfigList[GPIO_NBR_OF_RF_SIGNALS] = +{ + { GPIOB, LL_GPIO_PIN_2, 0, 0}, /* DTB10 - Tx/Rx SPI */ + { GPIOB, LL_GPIO_PIN_7, 0, 0}, /* DTB11 - Tx/Tx SPI Clk */ + { GPIOA, LL_GPIO_PIN_8, 0, 0}, /* DTB12 - Tx/Rx Ready & SPI Select */ + { GPIOA, LL_GPIO_PIN_9, 0, 0}, /* DTB13 - Tx/Rx Start */ + { GPIOA, LL_GPIO_PIN_10, 0, 0}, /* DTB14 - FSM0 */ + { GPIOA, LL_GPIO_PIN_11, 0, 0}, /* DTB15 - FSM1 */ + { GPIOB, LL_GPIO_PIN_8, 0, 0}, /* DTB16 - FSM2 */ +#if (STM32WB55xx != 0) + { GPIOB, LL_GPIO_PIN_11, 0, 0}, /* DTB17 - FSM3 */ + { GPIOB, LL_GPIO_PIN_10, 0, 0}, /* DTB18 - FSM4 */ +#else + { GPIOA, LL_GPIO_PIN_13, 0, 0}, /* DTB17 - FSM3 */ + { GPIOA, LL_GPIO_PIN_14, 0, 0}, /* DTB18 - FSM4 */ +#endif +}; +#endif +/* USER CODE END PV */ + +/* Global variables ----------------------------------------------------------*/ +/* USER CODE BEGIN GV */ +/* USER CODE END GV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ +static void APPD_SetCPU2GpioConfig( void ); +static void APPD_BleDtbCfg( void ); +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void APPD_Init( void ) +{ +/* USER CODE BEGIN APPD_Init */ +#if (CFG_DEBUGGER_SUPPORTED == 1) + /** + * Keep debugger enabled while in any low power mode + */ + HAL_DBGMCU_EnableDBGSleepMode(); + HAL_DBGMCU_EnableDBGStopMode(); + + /***************** ENABLE DEBUGGER *************************************/ + LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); + +#else + GPIO_InitTypeDef gpio_config = {0}; + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_ANALOG; + + gpio_config.Pin = GPIO_PIN_15 | GPIO_PIN_14 | GPIO_PIN_13; + __HAL_RCC_GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + __HAL_RCC_GPIOA_CLK_DISABLE(); + + gpio_config.Pin = GPIO_PIN_4 | GPIO_PIN_3; + __HAL_RCC_GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + __HAL_RCC_GPIOB_CLK_DISABLE(); + + HAL_DBGMCU_DisableDBGSleepMode(); + HAL_DBGMCU_DisableDBGStopMode(); + HAL_DBGMCU_DisableDBGStandbyMode(); + +#endif /* (CFG_DEBUGGER_SUPPORTED == 1) */ + +#if(CFG_DEBUG_TRACE != 0) + DbgTraceInit(); +#endif + + APPD_SetCPU2GpioConfig( ); + APPD_BleDtbCfg( ); + +/* USER CODE END APPD_Init */ + return; +} + +void APPD_EnableCPU2( void ) +{ +/* USER CODE BEGIN APPD_EnableCPU2 */ + SHCI_C2_DEBUG_Init_Cmd_Packet_t DebugCmdPacket = + { + {{0,0,0}}, /**< Does not need to be initialized */ + {(uint8_t *)aGpioConfigList, + (uint8_t *)&APPD_TracesConfig, + (uint8_t *)&APPD_GeneralConfig, + GPIO_CFG_NBR_OF_FEATURES, + NBR_OF_TRACES_CONFIG_PARAMETERS, + NBR_OF_GENERAL_CONFIG_PARAMETERS} + }; + + /**< Traces channel initialization */ + TL_TRACES_Init( ); + + /** GPIO DEBUG Initialization */ + SHCI_C2_DEBUG_Init( &DebugCmdPacket ); + +/* USER CODE END APPD_EnableCPU2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void APPD_SetCPU2GpioConfig( void ) +{ +/* USER CODE BEGIN APPD_SetCPU2GpioConfig */ + GPIO_InitTypeDef gpio_config = {0}; + uint8_t local_loop; + uint16_t gpioa_pin_list; + uint16_t gpiob_pin_list; + uint16_t gpioc_pin_list; + + gpioa_pin_list = 0; + gpiob_pin_list = 0; + gpioc_pin_list = 0; + + for(local_loop = 0 ; local_loop < GPIO_CFG_NBR_OF_FEATURES; local_loop++) + { + if( aGpioConfigList[local_loop].enable != 0) + { + switch((uint32_t)aGpioConfigList[local_loop].port) + { + case (uint32_t)GPIOA: + gpioa_pin_list |= aGpioConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOB: + gpiob_pin_list |= aGpioConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOC: + gpioc_pin_list |= aGpioConfigList[local_loop].pin; + break; + + default: + break; + } + } + } + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_OUTPUT_PP; + gpio_config.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + + if(gpioa_pin_list != 0) + { + gpio_config.Pin = gpioa_pin_list; + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_C2GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + HAL_GPIO_WritePin(GPIOA, gpioa_pin_list, GPIO_PIN_RESET); + } + + if(gpiob_pin_list != 0) + { + gpio_config.Pin = gpiob_pin_list; + __HAL_RCC_GPIOB_CLK_ENABLE(); + __HAL_RCC_C2GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + HAL_GPIO_WritePin(GPIOB, gpiob_pin_list, GPIO_PIN_RESET); + } + + if(gpioc_pin_list != 0) + { + gpio_config.Pin = gpioc_pin_list; + __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_C2GPIOC_CLK_ENABLE(); + HAL_GPIO_Init(GPIOC, &gpio_config); + HAL_GPIO_WritePin(GPIOC, gpioc_pin_list, GPIO_PIN_RESET); + } + +/* USER CODE END APPD_SetCPU2GpioConfig */ + return; +} + +static void APPD_BleDtbCfg( void ) +{ +/* USER CODE BEGIN APPD_BleDtbCfg */ +#if (BLE_DTB_CFG != 0) + GPIO_InitTypeDef gpio_config = {0}; + uint8_t local_loop; + uint16_t gpioa_pin_list; + uint16_t gpiob_pin_list; + + gpioa_pin_list = 0; + gpiob_pin_list = 0; + + for(local_loop = 0 ; local_loop < GPIO_NBR_OF_RF_SIGNALS; local_loop++) + { + if( aRfConfigList[local_loop].enable != 0) + { + switch((uint32_t)aRfConfigList[local_loop].port) + { + case (uint32_t)GPIOA: + gpioa_pin_list |= aRfConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOB: + gpiob_pin_list |= aRfConfigList[local_loop].pin; + break; + + default: + break; + } + } + } + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_AF_PP; + gpio_config.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + gpio_config.Alternate = GPIO_AF6_RF_DTB7; + + if(gpioa_pin_list != 0) + { + gpio_config.Pin = gpioa_pin_list; + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_C2GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + } + + if(gpiob_pin_list != 0) + { + gpio_config.Pin = gpiob_pin_list; + __HAL_RCC_GPIOB_CLK_ENABLE(); + __HAL_RCC_C2GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + } +#endif + +/* USER CODE END APPD_BleDtbCfg */ + return; +} + +/************************************************************* + * + * WRAP FUNCTIONS + * +*************************************************************/ +#if(CFG_DEBUG_TRACE != 0) +void DbgOutputInit( void ) +{ +/* USER CODE BEGIN DbgOutputInit */ +#ifdef CFG_DEBUG_TRACE_UART +if (CFG_DEBUG_TRACE_UART == hw_lpuart1) +{ +#if(CFG_HW_LPUART1_ENABLED == 1) + MX_LPUART1_UART_Init(); +#endif +} +else if (CFG_DEBUG_TRACE_UART == hw_uart1) +{ +#if(CFG_HW_USART1_ENABLED == 1) + MX_USART1_UART_Init(); +#endif +} +#endif + +/* USER CODE END DbgOutputInit */ + return; +} + +void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) +{ +/* USER CODE END DbgOutputTraces */ + HW_UART_Transmit_DMA(CFG_DEBUG_TRACE_UART, p_data, size, cb); + +/* USER CODE END DbgOutputTraces */ + return; +} +#endif diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c new file mode 100644 index 000000000..91272fbeb --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c @@ -0,0 +1,735 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "main.h" +#include "app_entry.h" +#include "app_ble.h" +#include "ble.h" +#include "tl.h" +#include "stm32_seq.h" +#include "shci_tl.h" +#include "stm32_lpm.h" +#include "app_debug.h" +#include "otp.h" + +#include "appli_mesh.h" +#include "appli_nvm.h" +#include "pal_nvm.h" +#include "lp_timer.h" +#include "mesh_cfg.h" + +#include "shci.h" +#include "dbg_trace.h" + + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +extern RTC_HandleTypeDef hrtc; +#ifdef SAVE_MODEL_STATE_POWER_FAILURE_DETECTION +extern MOBLEUINT8 PowerOnOff_flag; +#endif +#ifdef ENABLE_OCCUPANCY_SENSOR +extern MOBLEUINT8 Occupancy_Flag; +#endif +extern const void *mobleNvmBase; +extern const void *appNvmBase; +extern const void *prvsnr_data; +#if (LOW_POWER_FEATURE == 1) +extern __IO uint32_t uwTick; +extern HAL_TickFreqTypeDef uwTickFreq; +#if ( CFG_LPM_SUPPORTED == 1) +static uint32_t BleMesh_sleepTime; +#endif +extern volatile uint8_t BleProcessInit; +#endif + +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define POOL_SIZE (CFG_TLBLE_EVT_QUEUE_LENGTH*4U*DIVC(( sizeof(TL_PacketHeader_t) + TL_BLE_EVENT_FRAME_SIZE ), 4U)) + +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t BleSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255]; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private functions prototypes-----------------------------------------------*/ +static void Config_HSE(void); +static void Reset_Device( void ); +#if ( CFG_HW_RESET_BY_FW == 1 ) +static void Reset_IPCC( void ); +static void Reset_BackupDomain( void ); +#endif /* CFG_HW_RESET_BY_FW */ +static void System_Init( void ); +static void SystemPower_Config( void ); +static void appe_Tl_Init( void ); +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); +static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); +static void Init_Rtc( void ); + +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +uint8_t Mesh_Stop_Mode; + +/* Functions Definition ------------------------------------------------------*/ +void MX_APPE_Config( void ) +{ + /** + * The OPTVERR flag is wrongly set at power on + * It shall be cleared before using any HAL_FLASH_xxx() api + */ + __HAL_FLASH_CLEAR_FLAG( FLASH_FLAG_OPTVERR ); + + /** + * Reset some configurations so that the system behave in the same way + * when either out of nReset or Power On + */ + Reset_Device( ); + + /* Configure HSE Tuning */ + Config_HSE(); + + return; +} + +void MX_APPE_Init( void ) +{ +#ifdef STM32WB15xx + MOBLEUINT32 last_user_flash_address = ((READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos) << 11) + FLASH_BASE; +#endif +#ifdef STM32WB55xx + MOBLEUINT32 last_user_flash_address = ((READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos) << 12) + FLASH_BASE; +#endif + + System_Init( ); /**< System initialization */ + + SystemPower_Config(); /**< Configure the system Power Mode */ + + HW_TS_Init(hw_ts_InitMode_Full, &hrtc); /**< Initialize the TimerServer */ + +/* USER CODE BEGIN APPE_Init_1 */ + APPD_Init( ); + + /** + * The Standby mode should not be entered before the initialization is over + * The default state of the Low Power Manager is to allow the Standby Mode so an request is needed here + */ + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_DISABLE); + + APPE_Led_Init(); + + APPE_Button_Init(); + + mobleNvmBase = (const void *)(last_user_flash_address - NVM_SIZE); + appNvmBase = (const void *)(last_user_flash_address - NVM_SIZE - APP_NVM_SIZE); + prvsnr_data = (const void *)(last_user_flash_address - NVM_SIZE - APP_NVM_SIZE - PRVN_NVM_PAGE_SIZE); + +#if (LOW_POWER_FEATURE == 1) + /** + * Initialize the lp timer to be used when the systick is stopped in low power mode + */ + LpTimerInit(); +#endif + +/* USER CODE END APPE_Init_1 */ + appe_Tl_Init(); /* Initialize all transport layers */ + + /** + * From now, the application is waiting for the ready event ( VS_HCI_C2_Ready ) + * received on the system channel before starting the Stack + * This system event is received with APPE_SysUserEvtRx() + */ +/* USER CODE BEGIN APPE_Init_2 */ + +/* USER CODE END APPE_Init_2 */ + return; +} + +void Init_Smps( void ) +{ +#if (CFG_USE_SMPS != 0) + /** + * Configure and enable SMPS + * + * The SMPS configuration is not yet supported by CubeMx + * when SMPS output voltage is set to 1.4V, the RF output power is limited to 3.7dBm + * the SMPS output voltage shall be increased for higher RF output power + */ + LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA); + LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40); + LL_PWR_SMPS_Enable(); +#endif + + return; +} + +void Init_Exti( void ) +{ + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); + + return; +} + +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void Reset_Device( void ) +{ +#if ( CFG_HW_RESET_BY_FW == 1 ) + Reset_BackupDomain(); + + Reset_IPCC(); +#endif /* CFG_HW_RESET_BY_FW */ + + return; +} + +#if ( CFG_HW_RESET_BY_FW == 1 ) +static void Reset_BackupDomain( void ) +{ + if ((LL_RCC_IsActiveFlag_PINRST() != FALSE) && (LL_RCC_IsActiveFlag_SFTRST() == FALSE)) + { + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_BACKUPRESET_FORCE(); + __HAL_RCC_BACKUPRESET_RELEASE(); + } + + return; +} + +static void Reset_IPCC( void ) +{ + LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_IPCC); + + LL_C1_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + return; +} +#endif /* CFG_HW_RESET_BY_FW */ + +static void Config_HSE(void) +{ + OTP_ID0_t * p_otp; + + /** + * Read HSE_Tuning from OTP + */ + p_otp = (OTP_ID0_t *) OTP_Read(0); + if (p_otp) + { + LL_RCC_HSE_SetCapacitorTuning(p_otp->hse_tuning); + } + + return; +} + +static void System_Init( void ) +{ + Init_Smps( ); + + Init_Exti( ); + + Init_Rtc( ); + + return; +} + +static void Init_Rtc( void ) +{ + /* Disable RTC registers write protection */ + LL_RTC_DisableWriteProtection(RTC); + + LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); + + /* Enable RTC registers write protection */ + LL_RTC_EnableWriteProtection(RTC); + + return; +} + +/** + * @brief Configure the system for power optimization + * + * @note This API configures the system to be ready for low power mode + * + * @param None + * @retval None + */ +static void SystemPower_Config( void ) +{ + /** + * Select HSI as system clock source after Wake Up from Stop mode + */ + LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); + + /* Initialize low power manager */ + UTIL_LPM_Init( ); + /* Initialize the CPU2 reset value before starting CPU2 with C2BOOT */ + LL_C2_PWR_SetPowerMode(LL_PWR_MODE_SHUTDOWN); + +#if (CFG_USB_INTERFACE_ENABLE != 0) + /** + * Enable USB power + */ + HAL_PWREx_EnableVddUSB(); +#endif + /** + * Active SRAM retention for standby support + */ + HAL_PWREx_EnableSRAMRetention(); + + return; +} + +static void appe_Tl_Init( void ) +{ + TL_MM_Config_t tl_mm_config; + SHCI_TL_HciInitConf_t SHci_Tl_Init_Conf; + /**< Reference table initialization */ + TL_Init(); + + /**< System channel initialization */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, UTIL_SEQ_RFU, shci_user_evt_proc ); + SHci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&SystemCmdBuffer; + SHci_Tl_Init_Conf.StatusNotCallBack = APPE_SysStatusNot; + shci_init(APPE_SysUserEvtRx, (void*) &SHci_Tl_Init_Conf); + + /**< Memory Manager channel initialization */ + tl_mm_config.p_BleSpareEvtBuffer = BleSpareEvtBuffer; + tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer; + tl_mm_config.p_AsynchEvtPool = EvtPool; + tl_mm_config.AsynchEvtPoolSize = POOL_SIZE; + TL_MM_Init( &tl_mm_config ); + + TL_Enable(); + + return; +} + +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) +{ + UNUSED(status); + return; +} + +/** +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ +static void APPE_SysUserEvtRx( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} + +/* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ +void APPE_Led_Init( void ) +{ +#if (CFG_LED_SUPPORTED == 1) + /** + * Leds Initialization + */ + + BSP_LED_Init(LED_BLUE); + BSP_LED_Init(LED_GREEN); + BSP_LED_Init(LED_RED); +#endif + + return; +} + +void APPE_Button_Init( void ) +{ +#if (CFG_BUTTON_SUPPORTED == 1) + /** + * Button Initialization + */ + + BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW3, BUTTON_MODE_EXTI); +#endif + + return; +} +/* USER CODE END FD_LOCAL_FUNCTIONS */ + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void HAL_Delay(uint32_t Delay) +{ + uint32_t tickstart = HAL_GetTick(); + uint32_t wait = Delay; + + /* Add a freq to guarantee minimum wait */ + if (wait < HAL_MAX_DELAY) + { + wait += HAL_GetTickFreq(); + } + + while ((HAL_GetTick() - tickstart) < wait) + { + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ + #if defined ( __CC_ARM) + __force_stores(); + #endif + + __WFI( ); + } +} + +void MX_APPE_Process(void) +{ + /* USER CODE BEGIN MX_APPE_Process_1 */ + + /* USER CODE END MX_APPE_Process_1 */ + UTIL_SEQ_Run(UTIL_SEQ_DEFAULT); + /* USER CODE BEGIN MX_APPE_Process_2 */ + + /* USER CODE END MX_APPE_Process_2 */ +} + +void UTIL_SEQ_Idle( void ) +{ +#if ( CFG_LPM_SUPPORTED == 1) +#if (LOW_POWER_FEATURE == 1) + if(BleProcessInit != 0) + { + BleMesh_sleepTime = (uint32_t)BLEMesh_GetSleepDuration(); + + if (BleMesh_sleepTime > 0) + { + LpTimerStart(BleMesh_sleepTime); + + UTIL_LPM_EnterLowPower( ); + + uwTick += (uwTickFreq*LpGetElapsedTime()); + } + UTIL_SEQ_SetTask( 1<CR, FLASH_CR_PG); + + return (MOBLE_RESULT_SUCCESS); +} + +/*****************************************************************************/ + +MOBLE_RESULT HW_FLASH_Erase(uint32_t page, uint16_t n, int interrupt) +{ + UNUSED(interrupt); + + uint32_t loop; + + /* Enable EOP interrupt */ + __HAL_FLASH_ENABLE_IT(FLASH_IT_EOP); + + for( loop = 0; loop < n ; loop++) + { + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP); + + HW_FLASH_PageErase(page+loop); + +// HW_FLASH_WaitEndOfOperation(); + } + + /* Disable EOP interrupt */ + __HAL_FLASH_DISABLE_IT(FLASH_IT_EOP); + + /* Clear the page erase bit */ + CLEAR_BIT(FLASH->CR, (FLASH_CR_PER | FLASH_CR_PNB)); + + return (MOBLE_RESULT_SUCCESS); +} + +#if 0 +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void) +{ + return READ_BIT(FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA); +} + +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetSFSA(void) +{ + return (READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos); +} + +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetSBRSA(void) +{ + return (READ_BIT(FLASH->SRRVR, FLASH_SRRVR_SBRSA) >> FLASH_SRRVR_SBRSA_Pos); +} + +/*****************************************************************************/ + +uint32_t HW_FLASH_OB_GetSNBRSA(void) +{ + return (READ_BIT(FLASH->SRRVR, FLASH_SRRVR_SNBRSA) >> FLASH_SRRVR_SNBRSA_Pos); +} +#endif + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ + +/** + * This is a copy of FLASH_Program_DoubleWord() from the HAL + */ +static void HW_FLASH_Program_DoubleWord(uint32_t Address, uint64_t Data) +{ +// DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_WRITE); + + /* Set PG bit */ + SET_BIT(FLASH->CR, FLASH_CR_PG); + + /* Program first word */ + *(uint32_t *)Address = (uint32_t)Data; + + /* Barrier to ensure programming is performed in 2 steps, in right order + (independently of compiler optimization behavior) */ + __ISB(); + + /* Program second word */ + *(uint32_t *)(Address + 4U) = (uint32_t)(Data >> 32U); + +// DBG_GPIO_Gr2Reset(DBG_GPIO_GR2_FLASH_WRITE); +} + +/** + * This is a copy of LASH_PageErase() from the HAL + */ +static void HW_FLASH_PageErase(uint32_t Page) +{ +// DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); + + /* Proceed to erase the page */ + MODIFY_REG(FLASH->CR, FLASH_CR_PNB, ((Page << FLASH_CR_PNB_Pos) | FLASH_CR_PER | FLASH_CR_STRT)); + +// DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c new file mode 100644 index 000000000..23a5bcdc6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c @@ -0,0 +1,892 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "hw_conf.h" + +/* Private typedef -----------------------------------------------------------*/ +typedef enum +{ + TimerID_Free, + TimerID_Created, + TimerID_Running +}TimerIDStatus_t; + +typedef enum +{ + SSR_Read_Requested, + SSR_Read_Not_Requested +}RequestReadSSR_t; + +typedef enum +{ + WakeupTimerValue_Overpassed, + WakeupTimerValue_LargeEnough +}WakeupTimerLimitation_Status_t; + +typedef struct +{ + HW_TS_pTimerCb_t pTimerCallBack; + uint32_t CounterInit; + uint32_t CountLeft; + TimerIDStatus_t TimerIDStatus; + HW_TS_Mode_t TimerMode; + uint32_t TimerProcessID; + uint8_t PreviousID; + uint8_t NextID; +}TimerContext_t; + +/* Private defines -----------------------------------------------------------*/ +#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF +#define TIMER_LIST_EMPTY 0xFFFF + +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +/** + * START of Section TIMERSERVER_CONTEXT + */ + +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; + +/** + * END of Section TIMERSERVER_CONTEXT + */ + +static RTC_HandleTypeDef *phrtc; /**< RTC handle */ +static uint8_t WakeupTimerDivider; +static uint8_t AsynchPrescalerUserConfig; +static uint16_t SynchPrescalerUserConfig; +static volatile uint16_t MaxWakeupTimerSetup; + +/* Global variables ----------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +static void RestartWakeupCounter(uint16_t Value); +static uint16_t ReturnTimeElapsed(void); +static void RescheduleTimerList(void); +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); +static uint16_t linkTimer(uint8_t TimerID); +static uint32_t ReadRtcSsrValue(void); + +__weak void HW_TS_RTC_CountUpdated_AppNot(void); + +/* Functions Definition ------------------------------------------------------*/ + +/** + * @brief Read the RTC_SSR value + * As described in the reference manual, the RTC_SSR shall be read twice to ensure + * reliability of the value + * @param None + * @retval SSR value read + */ +static uint32_t ReadRtcSsrValue(void) +{ + uint32_t first_read; + uint32_t second_read; + + first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + while(first_read != second_read) + { + first_read = second_read; + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + } + + return second_read; +} + +/** + * @brief Insert a Timer in the list after the Timer ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked after + * @retval None + */ +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t next_id; + + next_id = aTimerContext[RefTimerID].NextID; + + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = TimerID; + } + aTimerContext[TimerID].NextID = next_id; + aTimerContext[TimerID].PreviousID = RefTimerID ; + aTimerContext[RefTimerID].NextID = TimerID; + + return; +} + +/** + * @brief Insert a Timer in the list before the ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked before + * @retval None + */ +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t previous_id; + + if(RefTimerID != CurrentRunningTimerID) + { + previous_id = aTimerContext[RefTimerID].PreviousID; + + aTimerContext[previous_id].NextID = TimerID; + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[TimerID].PreviousID = previous_id ; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + else + { + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + + return; +} + +/** + * @brief Insert a Timer in the list + * @param TimerID: The ID of the Timer + * @retval None + */ +static uint16_t linkTimer(uint8_t TimerID) +{ + uint32_t time_left; + uint16_t time_elapsed; + uint8_t timer_id_lookup; + uint8_t next_id; + + if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * No timer in the list + */ + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; + + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + time_elapsed = 0; + } + else + { + time_elapsed = ReturnTimeElapsed(); + + /** + * update count of the timer to be linked + */ + aTimerContext[TimerID].CountLeft += time_elapsed; + time_left = aTimerContext[TimerID].CountLeft; + + /** + * Search for index where the new timer shall be linked + */ + if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) + { + /** + * Search for the ID after the first one + */ + timer_id_lookup = CurrentRunningTimerID; + next_id = aTimerContext[timer_id_lookup].NextID; + while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) + { + timer_id_lookup = aTimerContext[timer_id_lookup].NextID; + next_id = aTimerContext[timer_id_lookup].NextID; + } + + /** + * Link after the ID + */ + LinkTimerAfter(TimerID, timer_id_lookup); + } + else + { + /** + * Link before the first ID + */ + LinkTimerBefore(TimerID, CurrentRunningTimerID); + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + } + } + + return time_elapsed; +} + +/** + * @brief Remove a Timer from the list + * @param TimerID: The ID of the Timer + * @param RequestReadSSR: Request to read the SSR register or not + * @retval None + */ +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) +{ + uint8_t previous_id; + uint8_t next_id; + + if(TimerID == CurrentRunningTimerID) + { + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = aTimerContext[TimerID].NextID; + } + else + { + previous_id = aTimerContext[TimerID].PreviousID; + next_id = aTimerContext[TimerID].NextID; + + aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; + } + } + + /** + * Timer is out of the list + */ + aTimerContext[TimerID].TimerIDStatus = TimerID_Created; + + if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) + { + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + } + + return; +} + +/** + * @brief Return the number of ticks counted by the wakeuptimer since it has been started + * @note The API is reading the SSR register to get how many ticks have been counted + * since the time the timer has been started + * @param None + * @retval Time expired in Ticks + */ +static uint16_t ReturnTimeElapsed(void) +{ + uint32_t return_value; + uint32_t wrap_counter; + + if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) + { + return_value = ReadRtcSsrValue(); /**< Read SSR register first */ + + if (SSRValueOnLastSetup >= return_value) + { + return_value = SSRValueOnLastSetup - return_value; + } + else + { + wrap_counter = SynchPrescalerUserConfig - return_value; + return_value = SSRValueOnLastSetup + wrap_counter; + } + + /** + * At this stage, ReturnValue holds the number of ticks counted by SSR + * Need to translate in number of ticks counted by the Wakeuptimer + */ + return_value = return_value*AsynchPrescalerUserConfig; + return_value = return_value >> WakeupTimerDivider; + } + else + { + return_value = 0; + } + + return (uint16_t)return_value; +} + +/** + * @brief Set the wakeup counter + * @note The API is writing the counter value so that the value is decreased by one to cope with the fact + * the interrupt is generated with 1 extra clock cycle (See RefManuel) + * It assumes all condition are met to be allowed to write the wakeup counter + * @param Value: Value to be written in the counter + * @retval None + */ +static void RestartWakeupCounter(uint16_t Value) +{ + /** + * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + */ + + if(Value == 0) + { + SSRValueOnLastSetup = ReadRtcSsrValue(); + + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + else + { + if((Value > 1) ||(WakeupTimerDivider != 1)) + { + Value -= 1; + } + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + + MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); + + /** + * Update the value here after the WUTWF polling that may take some time + */ + SSRValueOnLastSetup = ReadRtcSsrValue(); + + __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ + + HW_TS_RTC_CountUpdated_AppNot(); + } + + return ; +} + +/** + * @brief Reschedule the list of timer + * @note 1) Update the count left for each timer in the list + * 2) Setup the wakeuptimer + * @param None + * @retval None + */ +static void RescheduleTimerList(void) +{ + uint8_t localTimerID; + uint32_t timecountleft; + uint16_t wakeup_timer_value; + uint16_t time_elapsed; + + /** + * The wakeuptimer is disabled now to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + localTimerID = CurrentRunningTimerID; + + /** + * Calculate what will be the value to write in the wakeuptimer + */ + timecountleft = aTimerContext[localTimerID].CountLeft; + + /** + * Read how much has been counted + */ + time_elapsed = ReturnTimeElapsed(); + + if(timecountleft < time_elapsed ) + { + /** + * There is no tick left to count + */ + wakeup_timer_value = 0; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + else + { + if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) + { + /** + * The number of tick left is greater than the Wakeuptimer maximum value + */ + wakeup_timer_value = MaxWakeupTimerSetup; + + WakeupTimerLimitation = WakeupTimerValue_Overpassed; + } + else + { + wakeup_timer_value = timecountleft - time_elapsed; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + + } + + /** + * update ticks left to be counted for each timer + */ + while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + if (aTimerContext[localTimerID].CountLeft < time_elapsed) + { + aTimerContext[localTimerID].CountLeft = 0; + } + else + { + aTimerContext[localTimerID].CountLeft -= time_elapsed; + } + localTimerID = aTimerContext[localTimerID].NextID; + } + + /** + * Write next count + */ + RestartWakeupCounter(wakeup_timer_value); + + return ; +} + +/* Public functions ----------------------------------------------------------*/ + +/** + * For all public interface except that may need write access to the RTC, the RTC + * shall be unlock at the beginning and locked at the output + * In order to ease maintainability, the unlock is done at the top and the lock at then end + * in case some new implementation is coming in the future + */ + +void HW_TS_RTC_Wakeup_Handler(void) +{ + HW_TS_pTimerCb_t ptimer_callback; + uint32_t timer_process_id; + uint8_t local_current_running_timer_id; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + +/* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + /** + * Disable the Wakeup Timer + * This may speed up a bit the processing to wait the timer to be disabled + * The timer is still counting 2 RTCCLK + */ + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + + local_current_running_timer_id = CurrentRunningTimerID; + + if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) + { + ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; + timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; + + /** + * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted + * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick + * to be left whereas the count is over + * A more secure implementation has been done with a flag to state whereas the full count has been written + * in the wakeuptimer or not + */ + if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) + { + if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) + { + UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Stop(local_current_running_timer_id); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + + HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); + } + else + { + RescheduleTimerList(); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + } + else + { + /** + * We should never end up in this case + * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. + * We could just clean the interrupt flag and get out from this unexpected interrupt + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + return; +} + +void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) +{ + uint8_t loop; + uint32_t localmaxwakeuptimersetup; + + /** + * Get RTC handler + */ + phrtc = hrtc; + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + SET_BIT(RTC->CR, RTC_CR_BYPSHAD); + + /** + * Readout the user config + */ + WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); + + AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; + + SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; + + /** + * Margin is taken to avoid wrong calculation when the wrap around is there and some + * application interrupts may have delayed the reading + */ + localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); + + if(localmaxwakeuptimersetup >= 0xFFFF) + { + MaxWakeupTimerSetup = 0xFFFF; + } + else + { + MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; + } + + /** + * Configure EXTI module + */ + LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + + if(TimerInitMode == hw_ts_InitMode_Full) + { + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + + /** + * Initialize the timer server + */ + for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) + { + aTimerContext[loop].TimerIDStatus = TimerID_Free; + } + + CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ + + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ + } + else + { + if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) + { + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + + return; +} + +HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) +{ + HW_TS_ReturnStatus_t localreturnstatus; + uint8_t loop = 0; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) + { + loop++; + } + + if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[loop].TimerIDStatus = TimerID_Created; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + aTimerContext[loop].TimerProcessID = TimerProcessID; + aTimerContext[loop].TimerMode = TimerMode; + aTimerContext[loop].pTimerCallBack = pftimeout_handler; + *pTimerId = loop; + + localreturnstatus = hw_ts_Successful; + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + localreturnstatus = hw_ts_Failed; + } + + return(localreturnstatus); +} + +void HW_TS_Delete(uint8_t timer_id) +{ + HW_TS_Stop(timer_id); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ + + return; +} + +void HW_TS_Stop(uint8_t timer_id) +{ + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + UnlinkTimer(timer_id, SSR_Read_Requested); + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * List is empty + */ + + /** + * Disable the timer + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + } + else if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) +{ + uint16_t time_elapsed; + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + HW_TS_Stop( timer_id ); + } + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Running; + + aTimerContext[timer_id].CountLeft = timeout_ticks; + aTimerContext[timer_id].CounterInit = timeout_ticks; + + time_elapsed = linkTimer(timer_id); + + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + else + { + aTimerContext[timer_id].CountLeft -= time_elapsed; + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) +{ + uint32_t primask_bit; + uint16_t return_value, auro_reload_value, elapsed_time_value; + + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ + + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); + + elapsed_time_value = ReturnTimeElapsed(); + + if(auro_reload_value > elapsed_time_value) + { + return_value = auro_reload_value - elapsed_time_value; + } + else + { + return_value = 0; + } + } + else + { + return_value = TIMER_LIST_EMPTY; + } + + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + + return (return_value); +} + +__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) +{ + pTimerCallBack(); + + return; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c new file mode 100644 index 000000000..77b78c12f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c @@ -0,0 +1,236 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief hardware access + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" + +extern UART_HandleTypeDef hlpuart1; +extern UART_HandleTypeDef huart1; + +/* Macros --------------------------------------------------------------------*/ +#define HW_UART_RX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##RxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Receive_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##TxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Transmit_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX(__HANDLE__, __USART_BASE__) \ + do{ \ + (__HANDLE__).Instance = (__USART_BASE__); \ + hal_status = HAL_UART_Transmit(&(__HANDLE__), p_data, size, timeout); \ + } while(0) + +/* Variables -----------------------------------------------------------------*/ +DMA_HandleTypeDef HW_hdma_huart1_tx ={0}; +void (*HW_huart1RxCb)(void); +void (*HW_huart1TxCb)(void); + +DMA_HandleTypeDef HW_hdma_hlpuart1_tx ={0}; +void (*HW_hlpuart1RxCb)(void); +void (*HW_hlpuart1TxCb)(void); + +void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { + case hw_uart1: + HW_UART_RX_IT(huart1, USART1); + break; + + case hw_lpuart1: + HW_UART_RX_IT(hlpuart1, LPUART1); + break; + + default: + break; + } + + return; +} + +void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { + case hw_uart1: + HW_UART_TX_IT(huart1, USART1); + break; + + case hw_lpuart1: + HW_UART_TX_IT(hlpuart1, LPUART1); + break; + + default: + break; + } + + return; +} + +hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { + case hw_uart1: + HW_UART_TX(huart1, USART1); + break; + + case hw_lpuart1: + HW_UART_TX(hlpuart1, LPUART1); + break; + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { + case hw_uart1: + HW_huart1TxCb = cb; + huart1.Instance = USART1; + hal_status = HAL_UART_Transmit_DMA(&huart1, p_data, size); + break; + + case hw_lpuart1: + HW_hlpuart1TxCb = cb; + hlpuart1.Instance = LPUART1; + hal_status = HAL_UART_Transmit_DMA(&hlpuart1, p_data, size); + break; + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { + case (uint32_t)USART1: + if(HW_huart1RxCb) + { + HW_huart1RxCb(); + } + break; + + case (uint32_t)LPUART1: + if(HW_hlpuart1RxCb) + { + HW_hlpuart1RxCb(); + } + break; + + default: + break; + } + + return; +} + +void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { + case (uint32_t)USART1: + if(HW_huart1TxCb) + { + HW_huart1TxCb(); + } + break; + + case (uint32_t)LPUART1: + if(HW_hlpuart1TxCb) + { + HW_hlpuart1TxCb(); + } + break; + + default: + break; + } + + return; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c new file mode 100644 index 000000000..9eac8fb92 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c @@ -0,0 +1,134 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file lp_timer.c + * @author MCD Application Team + * @brief Low power timer to be used within Mesh Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" + +#include "lp_timer.h" + +/* Exported variables --------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +static void LpTimerCb(void); + +/* Private typedef -----------------------------------------------------------*/ +typedef struct +{ + uint32_t LpTimeLeftOnEntry; + uint8_t LpTimer_Id; +} LpTimerContext_t; + +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static LpTimerContext_t LpTimerContext; + +/* Functions Definition ------------------------------------------------------*/ + +/** + * @brief Initialize the low power timer + * + * @param None + * @retval None + */ +void LpTimerInit(void) +{ + (void) HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(LpTimerContext.LpTimer_Id), hw_ts_SingleShot, LpTimerCb); + + return; +} + +/** + * @brief Request to start a low power timer ( running is stop mode ) + * + * @param time_to_sleep : in ms + * @retval None + */ +void LpTimerStart(uint32_t time_to_sleep) +{ + /* Converts the number of ms into hw timer tick */ + if(time_to_sleep > 0x400000) + { + time_to_sleep = time_to_sleep / (CFG_TS_TICK_VAL); + time_to_sleep *= 1000; + } + else + { + time_to_sleep *= 1000; + time_to_sleep = time_to_sleep / (CFG_TS_TICK_VAL); + } + + HW_TS_Start(LpTimerContext.LpTimer_Id, time_to_sleep); + + /** + * There might be other timers already running in the timer server that may elapse + * before this one. + * Store how long before the next event so that on wakeup, it will be possible to calculate + * how long the tick has been suppressed + */ + LpTimerContext.LpTimeLeftOnEntry = HW_TS_RTC_ReadLeftTicksToCount(); + + return; +} + +/** + * @brief Read how long the timer has run + * + * @param None + * @retval The time elapsed in ms + */ +uint32_t LpGetElapsedTime(void) +{ + uint32_t return_value; + + return_value = (CFG_TS_TICK_VAL) * (uint32_t)(LpTimerContext.LpTimeLeftOnEntry - HW_TS_RTC_ReadLeftTicksToCount()); + return_value = return_value / 1000; + + /** + * The system may have been out from another reason than the timer + * Stop the timer after the elapsed time is calculated other wise, HW_TS_RTC_ReadLeftTicksToCount() + * may return 0xFFFF ( TIMER LIST EMPTY ) + * It does not hurt stopping a timer that exists but is not running. + */ + HW_TS_Stop(LpTimerContext.LpTimer_Id); + + return return_value; +} + + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief Low power timer callback + * + * @param None + * @retval None + */ +static void LpTimerCb( void ) +{ + /** + * Nothing to be done + */ + + return; +} + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c new file mode 100644 index 000000000..f61078fdb --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c @@ -0,0 +1,337 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.c + * @brief : Main program body + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @verbatim + ============================================================================== + ##### IMPORTANT NOTE ##### + ============================================================================== + + This application requests having the stm32wb1x_BLE_Stack_fw.bin binary + flashed on the Wireless Coprocessor. + If it is not the case, you need to use STM32CubeProgrammer to load the appropriate + binary. + + All available binaries are located under following directory: + /Projects/STM32_Copro_Wireless_Binaries + + Refer to UM2237 to learn how to use/install STM32CubeProgrammer. + Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the + detailed procedure to change the Wireless Coprocessor binary. + + @endverbatim + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "stm32_lpm.h" +#include "stm32_seq.h" +#include "dbg_trace.h" +#include "hw_conf.h" +#include "otp.h" + +#include "app_entry.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "models_if.h" +#include "mesh_cfg.h" +#include "stm32wbxx_hal_rcc.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +IPCC_HandleTypeDef hipcc; + +RTC_HandleTypeDef hrtc = { 0 }; /**< RTC handler declaration */ +TIM_HandleTypeDef htim1 = { 0 }; +TIM_HandleTypeDef htim2 = { 0 }; +UART_HandleTypeDef hlpuart1; +UART_HandleTypeDef huart1; +DMA_HandleTypeDef hdma_lpuart1_tx; +DMA_HandleTypeDef hdma_usart1_tx; +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +void SystemClock_Config( void ); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/** + * @brief The application entry point. + * @retval int + */ +int main( void ) +{ + /* USER CODE BEGIN 1 */ + + /* USER CODE END 1 */ + + /* MCU Configuration--------------------------------------------------------*/ + + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + HAL_Init(); + /* Config code for STM32_WPAN (HSE Tuning must be done before system clock configuration) */ + MX_APPE_Config(); + + /* USER CODE BEGIN Init */ + + /* USER CODE END Init */ + + /* Configure the system clock */ + SystemClock_Config(); + + /* IPCC initialisation */ + MX_IPCC_Init(); + + /* USER CODE BEGIN SysInit */ + + /* USER CODE END SysInit */ + + /* Initialize all configured peripherals */ + MX_GPIO_Init(); + MX_RTC_Init(); + /* USER CODE BEGIN 2 */ + + /* USER CODE END 2 */ + + /* Init code for STM32_WPAN */ + MX_APPE_Init(); + /* Infinite loop */ + /* USER CODE BEGIN WHILE */ + while(1) + { + /* USER CODE END WHILE */ + MX_APPE_Process(); + + /* USER CODE BEGIN 3 */ + } + /* USER CODE END 3 */ +} + +/** + * @brief System Clock Configuration + * @retval None + */ +void SystemClock_Config(void) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Configure LSE Drive Capability + */ + HAL_PWR_EnableBkUpAccess(); + __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW); + /** Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE + |RCC_OSCILLATORTYPE_LSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.LSEState = RCC_LSE_ON; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } + /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK4|RCC_CLOCKTYPE_HCLK2 + |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK + |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSE; +#if ( CFG_LPM_SUPPORTED == 1) + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV2; +#else + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; +#endif + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.AHBCLK4Divider = RCC_SYSCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + Error_Handler(); + } + /** Initializes the peripherals clocks + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP + |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 + |RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; + PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; + PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN Smps */ + + /* USER CODE END Smps */ +} + +/** + * @brief IPCC Initialization Function + * @param None + * @retval None + */ +void MX_IPCC_Init(void) +{ + + /* USER CODE BEGIN IPCC_Init 0 */ + + /* USER CODE END IPCC_Init 0 */ + + /* USER CODE BEGIN IPCC_Init 1 */ + + /* USER CODE END IPCC_Init 1 */ + hipcc.Instance = IPCC; + if (HAL_IPCC_Init(&hipcc) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN IPCC_Init 2 */ + + /* USER CODE END IPCC_Init 2 */ + +} + +/** + * @brief RTC Initialization Function + * @param None + * @retval None + */ +void MX_RTC_Init(void) +{ + + /* USER CODE BEGIN RTC_Init 0 */ + + /* USER CODE END RTC_Init 0 */ + + /* USER CODE BEGIN RTC_Init 1 */ + + /* USER CODE END RTC_Init 1 */ + /** Initialize RTC Only + */ + hrtc.Instance = RTC; + hrtc.Init.HourFormat = RTC_HOURFORMAT_24; + hrtc.Init.AsynchPrediv = CFG_RTC_ASYNCH_PRESCALER; + hrtc.Init.SynchPrediv = CFG_RTC_SYNCH_PRESCALER; + hrtc.Init.OutPut = RTC_OUTPUT_DISABLE; + hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH; + hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE; + if (HAL_RTC_Init(&hrtc) != HAL_OK) + { + Error_Handler(); + } + /** Enable the WakeUp + */ + if (HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, 0, RTC_WAKEUPCLOCK_RTCCLK_DIV16) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN RTC_Init 2 */ + /* Disable RTC registers write protection */ + LL_RTC_DisableWriteProtection(RTC); + + LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); + + /* Enable RTC registers write protection */ + LL_RTC_EnableWriteProtection(RTC); + /* USER CODE END RTC_Init 2 */ + +} + +/** + * @brief GPIO Initialization Function + * @param None + * @retval None + */ +void MX_GPIO_Init(void) +{ + + /* GPIO Ports Clock Enable */ + __HAL_RCC_GPIOC_CLK_ENABLE(); + +} + +/* USER CODE BEGIN 4 */ + +/* USER CODE END 4 */ + +/** + * @brief This function is executed in case of error occurrence. + * @retval None + */ +void Error_Handler(void) +{ + /* USER CODE BEGIN Error_Handler_Debug */ + /* User can add his own implementation to report the HAL error return state */ + __disable_irq(); + while (1) + { + } + /* USER CODE END Error_Handler_Debug */ +} + +#ifdef USE_FULL_ASSERT +/** + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ +void assert_failed(uint8_t *file, uint32_t line) +{ + /* USER CODE BEGIN 6 */ + /* User can add his own implementation to report the file name and line number, + ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* USER CODE END 6 */ +} +#endif /* USE_FULL_ASSERT */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/standby_stm32wb15.c new file mode 100644 index 000000000..f7172d804 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/standby_stm32wb15.c @@ -0,0 +1,164 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file standby_stm32wb15.c + * @author MCD Application Team + * @brief Specific code for standby mode + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "app_entry.h" +#include "app_common.h" +#include "app_debug.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +uint32_t backup_MSP; +uint32_t backup_IPCC_C1MR; +uint32_t boot_after_standby; +extern RTC_HandleTypeDef hrtc; +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +uint32_t standby_boot_mng(void); +void standby_hw_save(void); +void standby_hw_restore(void); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/******************************************************************************* + * This part may be updated by the user + ******************************************************************************/ + + /** + * @brief standby_hw_save function, saves hardware context to restore + * @param None + * @retval None + */ +void standby_hw_save(void) +{ + backup_IPCC_C1MR = READ_REG(IPCC->C1MR); + + /* USER CODE BEGIN standby_hw_save */ + + /* USER CODE END standby_hw_save */ + return; +} + + /** + * @brief standby_hw_restore function, restore and reconfigure hardware context + * @param None + * @retval None + */ +void standby_hw_restore(void) +{ + /* USER CODE BEGIN standby_hw_restore_1 */ + + /* USER CODE END standby_hw_restore_1 */ + + APPD_Init(); + Init_Exti(); + Init_Smps(); + HAL_Init(); + + HW_IPCC_Init(); + HW_IPCC_Enable(); + WRITE_REG(IPCC->C1MR, backup_IPCC_C1MR); + + if( !LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ) + { + LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + } + LL_HSEM_ReleaseLock( HSEM, CFG_HW_PWR_STANDBY_SEMID, 0 ); + + /* In this user section add MX init functions present in main.c , except MX_RTC_Init() */ + /* USER CODE BEGIN standby_hw_restore_2 */ + + MX_GPIO_Init(); + + /* USER CODE END standby_hw_restore_2 */ + + HW_TS_Init(hw_ts_InitMode_Limited, &hrtc); + + LL_PWR_EnableSRAM2Retention(); + + /* USER CODE BEGIN standby_hw_restore_3 */ + APPE_Led_Init(); + APPE_Button_Init(); + /* USER CODE END standby_hw_restore_3 */ + + return; +} + +/******************************************************************************* + * Do not update code from this limit. + ******************************************************************************/ + + /** + * @brief standby_boot_mng function, will restore MCU context if wakeup from standby + * @param None + * @retval None + */ +uint32_t standby_boot_mng(void) +{ +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + __HAL_RCC_HSEM_CLK_ENABLE(); + while( LL_HSEM_1StepLock( HSEM, CFG_HW_PWR_STANDBY_SEMID ) ); + + if( __HAL_PWR_GET_FLAG(PWR_FLAG_SB) != RESET ) + { + __disable_irq( ); + + boot_after_standby = 1; + }else{ + boot_after_standby = 0; + + LL_HSEM_ReleaseLock( HSEM, CFG_HW_PWR_STANDBY_SEMID, 0 ); + } +#else + boot_after_standby = 0; +#endif + + return boot_after_standby; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c new file mode 100644 index 000000000..0847a023f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c @@ -0,0 +1,446 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32_lpm_if.h" +#include "stm32_lpm.h" +#include "app_conf.h" +/* USER CODE BEGIN include */ + +/* USER CODE END include */ + +/* Exported variables --------------------------------------------------------*/ +const struct UTIL_LPM_Driver_s UTIL_PowerDriver = +{ + PWR_EnterSleepMode, + PWR_ExitSleepMode, + + PWR_EnterStopMode, + PWR_ExitStopMode, + + PWR_EnterOffMode, + PWR_ExitOffMode, +}; + +extern uint32_t boot_after_standby; +extern RTC_HandleTypeDef hrtc; + +#define CSTACK_PREAMBLE_NUMBER 16 +uint32_t cStackPreamble[CSTACK_PREAMBLE_NUMBER]; + +typedef void( *intfunc )( void ); +typedef union { intfunc __fun; void * __ptr; } intvec_elem; +extern const intvec_elem __vector_table[]; + +void CPUcontextSave(void); /* this function is implemented in startup assembly file */ +void standby_hw_save(void); +void standby_hw_restore(void); +void SystemClock_Config(void); + +/* Private function prototypes -----------------------------------------------*/ +static void Switch_On_HSI( void ); +static void EnterLowPower( void ); +static void ExitLowPower( void ); +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) +static void ExitLowPower_standby( void ); +#endif +/* USER CODE BEGIN Private_Function_Prototypes */ + +/* USER CODE END Private_Function_Prototypes */ +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN Private_Typedef */ + +/* USER CODE END Private_Typedef */ +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Define */ + +/* USER CODE END Private_Define */ +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Macro */ + +/* USER CODE END Private_Macro */ +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN Private_Variables */ + +/* USER CODE END Private_Variables */ + +/* Functions Definition ------------------------------------------------------*/ +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ) +{ +/* USER CODE BEGIN PWR_EnterOffMode_1 */ + +/* USER CODE END PWR_EnterOffMode_1 */ + /** + * The systick should be disabled for the same reason than when the device enters stop mode because + * at this time, the device may enter either OffMode or StopMode. + */ + HAL_SuspendTick(); + + EnterLowPower(); + + /************************************************************************************ + * ENTER OFF MODE + ***********************************************************************************/ + /* + * There is no risk to clear all the WUF here because in the current implementation, this API is called + * in critical section. If an interrupt occurs while in that critical section before that point, + * the flag is set and will be cleared here but the system will not enter Off Mode + * because an interrupt is pending in the NVIC. The ISR will be executed when moving out + * of this critical section + */ + LL_PWR_ClearFlag_WU( ); + + LL_PWR_SetPowerMode( LL_PWR_MODE_STANDBY ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + /* This part of code must not put in a function as it deals with C stack calls. + * A function call will push data in C stack and impact algorithm. + */ + /* local variable are here for better view */ + uint8_t i = 0; + uint32_t* ptr; + /* Save part of the stack that will be restored at wakeup */ + ptr = __vector_table[0].__ptr ; + ptr -= CSTACK_PREAMBLE_NUMBER; + do { + cStackPreamble[i] = *ptr; + i++; + ptr++; + } while (i < CSTACK_PREAMBLE_NUMBER); + + LL_EXTI_EnableEvent_32_63( LL_EXTI_LINE_40 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_40 ); + + standby_hw_save(); + + CPUcontextSave();/* this function will call WFI instruction */ +#endif + +/* USER CODE BEGIN PWR_EnterOffMode_2 */ + +/* USER CODE END PWR_EnterOffMode_2 */ + return; +} + +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ) +{ +/* USER CODE BEGIN PWR_ExitOffMode_1 */ + +/* USER CODE END PWR_ExitOffMode_1 */ +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + /* This part of code must not put in a function as it deals with C stack calls. + * A function call will push data in C stack and impact algorithm. + */ + if(boot_after_standby != 0) + { + boot_after_standby = 0; + /* local variable are here for better view */ + uint8_t i = 0; + uint32_t* ptr; + /* Restore the part of stack that has been saved before the sleep */ + ptr = __vector_table[0].__ptr ; + ptr -= CSTACK_PREAMBLE_NUMBER; + do { + *ptr = cStackPreamble[i]; + i++; + ptr++; + } while (i < CSTACK_PREAMBLE_NUMBER); + + standby_hw_restore(); + + ExitLowPower_standby(); + } + else + { + ExitLowPower(); + } + + HAL_ResumeTick(); +#endif +/* USER CODE BEGIN PWR_ExitOffMode_2 */ + +/* USER CODE END PWR_ExitOffMode_2 */ + return; +} + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ) +{ +/* USER CODE BEGIN PWR_EnterStopMode_1 */ + +/* USER CODE END PWR_EnterStopMode_1 */ + /** + * When HAL_DBGMCU_EnableDBGStopMode() is called to keep the debugger active in Stop Mode, + * the systick shall be disabled otherwise the cpu may crash when moving out from stop mode + * + * When in production, the HAL_DBGMCU_EnableDBGStopMode() is not called so that the device can reach best power consumption + * However, the systick should be disabled anyway to avoid the case when it is about to expire at the same time the device enters + * stop mode ( this will abort the Stop Mode entry ). + */ + HAL_SuspendTick(); + + /** + * This function is called from CRITICAL SECTION + */ + EnterLowPower(); + + /************************************************************************************ + * ENTER STOP MODE + ***********************************************************************************/ + LL_PWR_SetPowerMode( LL_PWR_MODE_STOP1 ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterStopMode_2 */ + +/* USER CODE END PWR_EnterStopMode_2 */ + return; +} + +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ) +{ +/* USER CODE BEGIN PWR_ExitStopMode_1 */ + +/* USER CODE END PWR_ExitStopMode_1 */ + /** + * This function is called from CRITICAL SECTION + */ + ExitLowPower(); + + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitStopMode_2 */ + +/* USER CODE END PWR_ExitStopMode_2 */ + return; +} + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ) +{ +/* USER CODE BEGIN PWR_EnterSleepMode_1 */ + +/* USER CODE END PWR_EnterSleepMode_1 */ + + HAL_SuspendTick(); + + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores(); +#endif + + __WFI( ); +/* USER CODE BEGIN PWR_EnterSleepMode_2 */ + +/* USER CODE END PWR_EnterSleepMode_2 */ + return; +} + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ) +{ +/* USER CODE BEGIN PWR_ExitSleepMode_1 */ + +/* USER CODE END PWR_ExitSleepMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitSleepMode_2 */ + +/* USER CODE END PWR_ExitSleepMode_2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief Setup the system to enter either stop or off mode + * @param none + * @retval none + */ +static void EnterLowPower( void ) +{ + /** + * This function is called from CRITICAL SECTION + */ + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if ( ! LL_HSEM_1StepLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID ) ) + { + if( LL_PWR_IsActiveFlag_C2DS() || LL_PWR_IsActiveFlag_C2SB() ) + { + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + Switch_On_HSI( ); + } + } + else + { + Switch_On_HSI( ); + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Restore the system to exit stop mode + * @param none + * @retval none + */ +static void ExitLowPower( void ) +{ + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if(LL_RCC_GetSysClkSource( ) == LL_RCC_SYS_CLKSOURCE_STATUS_HSI) + { +/* Restore the clock configuration of the application in this user section */ +/* USER CODE BEGIN ExitLowPower_1 */ + LL_RCC_HSE_Enable( ); + __HAL_FLASH_SET_LATENCY(FLASH_LATENCY_1); + while(!LL_RCC_HSE_IsReady( )); + LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSE); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSE); +/* USER CODE END ExitLowPower_1 */ + } + else + { +/* If the application is not running on HSE restore the clock configuration in this user section */ +/* USER CODE BEGIN ExitLowPower_2 */ + +/* USER CODE END ExitLowPower_2 */ + } +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) + + __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB); +#endif + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +#if ( CFG_LPM_STANDBY_SUPPORTED != 0 ) +/** + * @brief Restore the system to exit standby mode + * @param none + * @retval none + */ +static void ExitLowPower_standby( void ) +{ +/* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); +/* USER CODE BEGIN ExitLowPower_standby */ + SystemClock_Config(); +/* USER CODE END ExitLowPower_standby */ + __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB); + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} +#endif + +/** + * @brief Switch the system clock on HSI + * @param none + * @retval none + */ +static void Switch_On_HSI( void ) +{ + LL_RCC_HSI_Enable( ); + while(!LL_RCC_HSI_IsReady( )); + LL_RCC_SetSysClkSource( LL_RCC_SYS_CLKSOURCE_HSI ); + LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSI); + return; +} + +/* USER CODE BEGIN Private_Functions */ + +/* USER CODE END Private_Functions */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_hal_msp.c new file mode 100644 index 000000000..8414ecb7b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_hal_msp.c @@ -0,0 +1,198 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_msp.c + * @brief This file provides code for the MSP Initialization + * and de-Initialization codes. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Define */ + +/* USER CODE END Define */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Macro */ + +/* USER CODE END Macro */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* External functions --------------------------------------------------------*/ +/* USER CODE BEGIN ExternalFunctions */ + +/* USER CODE END ExternalFunctions */ + +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ +/** + * Initializes the Global MSP. + */ +void HAL_MspInit(void) +{ + /* USER CODE BEGIN MspInit 0 */ + + /* USER CODE END MspInit 0 */ + + __HAL_RCC_HSEM_CLK_ENABLE(); + + /* System interrupt init*/ + + /* Peripheral interrupt init */ + /* HSEM_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(HSEM_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(HSEM_IRQn); + + /* USER CODE BEGIN MspInit 1 */ + + /* USER CODE END MspInit 1 */ +} + +/** +* @brief IPCC MSP Initialization +* This function configures the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspInit 0 */ + + /* USER CODE END IPCC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_IPCC_CLK_ENABLE(); + /* IPCC interrupt Init */ + HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspInit 1 */ + + /* USER CODE END IPCC_MspInit 1 */ + } + +} + +/** +* @brief IPCC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspDeInit 0 */ + + /* USER CODE END IPCC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_IPCC_CLK_DISABLE(); + + /* IPCC interrupt DeInit */ + HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspDeInit 1 */ + + /* USER CODE END IPCC_MspDeInit 1 */ + } + +} + +/** +* @brief RTC MSP Initialization +* This function configures the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspInit 0 */ + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ + /* USER CODE END RTC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_RTC_ENABLE(); + __HAL_RCC_RTCAPB_CLK_ENABLE(); + /* RTC interrupt Init */ + HAL_NVIC_SetPriority(RTC_WKUP_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(RTC_WKUP_IRQn); + /* USER CODE BEGIN RTC_MspInit 1 */ + HAL_RTCEx_EnableBypassShadow(hrtc); + /* USER CODE END RTC_MspInit 1 */ + } + +} + +/** +* @brief RTC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspDeInit 0 */ + + /* USER CODE END RTC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_RTC_DISABLE(); + __HAL_RCC_RTCAPB_CLK_DISABLE(); + + /* RTC interrupt DeInit */ + HAL_NVIC_DisableIRQ(RTC_WKUP_IRQn); + /* USER CODE BEGIN RTC_MspDeInit 1 */ + + /* USER CODE END RTC_MspDeInit 1 */ + } + +} + +/* USER CODE BEGIN 1 */ + +/* USER CODE END 1 */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c new file mode 100644 index 000000000..50214eaa6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c @@ -0,0 +1,374 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.c + * @brief Interrupt Service Routines. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "stm32wbxx_it.h" +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "appli_mesh.h" +#include "PWM_handlers.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/* External variables --------------------------------------------------------*/ +extern IPCC_HandleTypeDef hipcc; +extern RTC_HandleTypeDef hrtc; +extern TIM_HandleTypeDef htim1; +extern TIM_HandleTypeDef htim2; +extern UART_HandleTypeDef hlpuart1; +extern UART_HandleTypeDef huart1; +extern DMA_HandleTypeDef hdma_lpuart1_tx; +extern DMA_HandleTypeDef hdma_usart1_tx; +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/******************************************************************************/ +/* Cortex Processor Interruption and Exception Handlers */ +/******************************************************************************/ +/** + * @brief This function handles Non maskable interrupt. + */ +void NMI_Handler(void) +{ + /* USER CODE BEGIN NonMaskableInt_IRQn 0 */ + + /* USER CODE END NonMaskableInt_IRQn 0 */ + /* USER CODE BEGIN NonMaskableInt_IRQn 1 */ + while (1) + { + } + /* USER CODE END NonMaskableInt_IRQn 1 */ +} + +/** + * @brief This function handles Hard fault interrupt. + */ +void HardFault_Handler(void) +{ + /* USER CODE BEGIN HardFault_IRQn 0 */ + BSP_LED_On(LED_RED); +#ifndef DISABLE_TRACES + printf("HARDFAULT !\r\n"); +#endif + /* USER CODE END HardFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + /* USER CODE END W1_HardFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Memory management fault. + */ +void MemManage_Handler(void) +{ + /* USER CODE BEGIN MemoryManagement_IRQn 0 */ + + /* USER CODE END MemoryManagement_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */ + /* USER CODE END W1_MemoryManagement_IRQn 0 */ + } +} + +/** + * @brief This function handles Prefetch fault, memory access fault. + */ +void BusFault_Handler(void) +{ + /* USER CODE BEGIN BusFault_IRQn 0 */ + + /* USER CODE END BusFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_BusFault_IRQn 0 */ + /* USER CODE END W1_BusFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Undefined instruction or illegal state. + */ +void UsageFault_Handler(void) +{ + /* USER CODE BEGIN UsageFault_IRQn 0 */ + + /* USER CODE END UsageFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_UsageFault_IRQn 0 */ + /* USER CODE END W1_UsageFault_IRQn 0 */ + } +} + +/** + * @brief This function handles System service call via SWI instruction. + */ +void SVC_Handler(void) +{ + /* USER CODE BEGIN SVCall_IRQn 0 */ + + /* USER CODE END SVCall_IRQn 0 */ + /* USER CODE BEGIN SVCall_IRQn 1 */ + + /* USER CODE END SVCall_IRQn 1 */ +} + +/** + * @brief This function handles Debug monitor. + */ +void DebugMon_Handler(void) +{ + /* USER CODE BEGIN DebugMonitor_IRQn 0 */ + + /* USER CODE END DebugMonitor_IRQn 0 */ + /* USER CODE BEGIN DebugMonitor_IRQn 1 */ + + /* USER CODE END DebugMonitor_IRQn 1 */ +} + +/** + * @brief This function handles Pendable request for system service. + */ +void PendSV_Handler(void) +{ + /* USER CODE BEGIN PendSV_IRQn 0 */ + + /* USER CODE END PendSV_IRQn 0 */ + /* USER CODE BEGIN PendSV_IRQn 1 */ + + /* USER CODE END PendSV_IRQn 1 */ +} + +/** + * @brief This function handles System tick timer. + */ +void SysTick_Handler(void) +{ + /* USER CODE BEGIN SysTick_IRQn 0 */ + + /* USER CODE END SysTick_IRQn 0 */ + HAL_IncTick(); + /* USER CODE BEGIN SysTick_IRQn 1 */ + + /* USER CODE END SysTick_IRQn 1 */ +} + +/******************************************************************************/ +/* STM32WBxx Peripheral Interrupt Handlers */ +/* Add here the Interrupt Handlers for the used peripherals. */ +/* For the available peripheral interrupt handler names, */ +/* please refer to the startup file (startup_stm32wbxx.s). */ +/******************************************************************************/ + +/** + * @brief This function handles RTC wake-up interrupt through EXTI line 19. + */ +void RTC_WKUP_IRQHandler(void) +{ + /* USER CODE BEGIN RTC_WKUP_IRQn 0 */ + + /* USER CODE END RTC_WKUP_IRQn 0 */ + HAL_RTCEx_WakeUpTimerIRQHandler(&hrtc); + /* USER CODE BEGIN RTC_WKUP_IRQn 1 */ + + /* USER CODE END RTC_WKUP_IRQn 1 */ +} + +/** + * @brief This function handles IPCC RX occupied interrupt. + */ +void IPCC_C1_RX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */ + + /* USER CODE END IPCC_C1_RX_IRQn 0 */ + HAL_IPCC_RX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */ + + /* USER CODE END IPCC_C1_RX_IRQn 1 */ +} + +/** + * @brief This function handles IPCC TX free interrupt. + */ +void IPCC_C1_TX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */ + + /* USER CODE END IPCC_C1_TX_IRQn 0 */ + HAL_IPCC_TX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */ + + /* USER CODE END IPCC_C1_TX_IRQn 1 */ +} + +/** + * @brief This function handles HSEM global interrupt. + */ +void HSEM_IRQHandler(void) +{ + /* USER CODE BEGIN HSEM_IRQn 0 */ + + /* USER CODE END HSEM_IRQn 0 */ + HAL_HSEM_IRQHandler(); + /* USER CODE BEGIN HSEM_IRQn 1 */ + + /* USER CODE END HSEM_IRQn 1 */ +} + +/* USER CODE BEGIN 1 */ +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW1_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); +} + +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW2_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW2_PIN); +} + +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW3_PIN); +} + +#ifdef SAVE_MODEL_STATE_POWER_FAILURE_DETECTION +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void POWEROFF_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(POWEROFF_PIN); +} +#endif + +#if(CFG_HW_USART1_ENABLED == 1) +void USART1_IRQHandler(void) +{ + HAL_UART_IRQHandler(&huart1); +} +#endif + +#if(CFG_HW_USART1_DMA_TX_SUPPORTED == 1) +void CFG_HW_USART1_DMA_TX_IRQHandler( void ) +{ + HAL_DMA_IRQHandler(&hdma_usart1_tx); +} +#endif + +#if(CFG_HW_LPUART1_ENABLED == 1) +void LPUART1_IRQHandler(void) +{ + HAL_UART_IRQHandler(&hw_lpuart1); +} +#endif + +#if(CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) +void CFG_HW_LPUART1_DMA_TX_IRQHandler( void ) +{ + HAL_DMA_IRQHandler(&hdma_lpuart1_tx); +} +#endif + +#if 0 +/** + * @brief This function handles TIM2 global interrupt. + */ +void TIM2_IRQHandler(void) +{ + /* USER CODE BEGIN TIM2_IRQn 0 */ + + /* USER CODE END TIM2_IRQn 0 */ + HAL_TIM_IRQHandler(&htim2); + /* USER CODE BEGIN TIM2_IRQn 1 */ + + /* USER CODE END TIM2_IRQn 1 */ +} + +/** + * @brief This function handles TIM1 global interrupt. + */ +void TIM1_CC_IRQHandler(void) +{ + /* USER CODE BEGIN TIM1_IRQn 0 */ + + /* USER CODE END TIM1_IRQn 0 */ + HAL_TIM_IRQHandler(&htim1); + /* USER CODE BEGIN TIM1_IRQn 1 */ + + /* USER CODE END TIM1_IRQn 1 */ +} +#endif + +/* USER CODE END 1 */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c new file mode 100644 index 000000000..6a4aa6327 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c @@ -0,0 +1,354 @@ +/** + ****************************************************************************** + * @file system_stm32wbxx.c + * @author MCD Application Team + * @brief CMSIS Cortex Device Peripheral Access Layer System Source File + * + * This file provides two functions and one global variable to be called from + * user application: + * - SystemInit(): This function is called at startup just after reset and + * before branch to main program. This call is made inside + * the "startup_stm32wbxx.s" file. + * + * - SystemCoreClock variable: Contains the core clock (HCLK), it can be used + * by the user application to setup the SysTick + * timer or configure other parameters. + * + * - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must + * be called whenever the core clock is changed + * during program execution. + * + * After each device reset the MSI (4 MHz) is used as system clock source. + * Then SystemInit() function is called, in "startup_stm32wbxx.s" file, to + * configure the system clock before to branch to main program. + * + * This file configures the system clock as follows: + *============================================================================= + *----------------------------------------------------------------------------- + * System Clock source | MSI + *----------------------------------------------------------------------------- + * SYSCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * HCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * AHB Prescaler | 1 + *----------------------------------------------------------------------------- + * APB1 Prescaler | 1 + *----------------------------------------------------------------------------- + * APB2 Prescaler | 1 + *----------------------------------------------------------------------------- + * PLL_M | 1 + *----------------------------------------------------------------------------- + * PLL_N | 8 + *----------------------------------------------------------------------------- + * PLL_P | 7 + *----------------------------------------------------------------------------- + * PLL_Q | 2 + *----------------------------------------------------------------------------- + * PLL_R | 2 + *----------------------------------------------------------------------------- + * PLLSAI1_P | NA + *----------------------------------------------------------------------------- + * PLLSAI1_Q | NA + *----------------------------------------------------------------------------- + * PLLSAI1_R | NA + *----------------------------------------------------------------------------- + * Require 48MHz for USB OTG FS, | Disabled + * SDIO and RNG clock | + *----------------------------------------------------------------------------- + *============================================================================= + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/** @addtogroup CMSIS + * @{ + */ + +/** @addtogroup stm32WBxx_system + * @{ + */ + +/** @addtogroup stm32WBxx_System_Private_Includes + * @{ + */ + +#include "stm32wbxx.h" + +#if !defined (HSE_VALUE) + #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (MSI_VALUE) + #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +#if !defined (HSI_VALUE) + #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +#if !defined (LSI_VALUE) + #define LSI_VALUE (32000UL) /*!< Value of LSI in Hz*/ +#endif /* LSI_VALUE */ + +#if !defined (LSE_VALUE) + #define LSE_VALUE (32768UL) /*!< Value of LSE in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_TypesDefinitions + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Defines + * @{ + */ + +/*!< Uncomment the following line if you need to relocate your vector Table in + Internal SRAM. */ +/* #define VECT_TAB_SRAM */ +#define VECT_TAB_OFFSET 0x0U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ + +#define VECT_TAB_BASE_ADDRESS SRAM1_BASE /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Macros + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Variables + * @{ + */ +/* The SystemCoreClock variable is updated in three ways: + 1) by calling CMSIS function SystemCoreClockUpdate() + 2) by calling HAL API function HAL_RCC_GetHCLKFreq() + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency + Note: If you use this function to configure the system clock; then there + is no need to call the 2 first functions listed above, since SystemCoreClock + variable is updated automatically. + */ + uint32_t SystemCoreClock = 4000000UL ; /*CPU1: M4 on MSI clock after startup (4MHz)*/ + + const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL}; + + const uint32_t APBPrescTable[8UL] = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL}; + + const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ + 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif + +/** + * @} + */ + + /** @addtogroup STM32WBxx_System_Private_FunctionPrototypes + * @{ + */ + + /** + * @} + */ + + /** @addtogroup STM32WBxx_System_Private_Functions + * @{ + */ + +/** + * @brief Setup the microcontroller system. + * @param None + * @retval None + */ +void SystemInit(void) +{ + /* Configure the Vector Table location add offset address ------------------*/ +#if defined(VECT_TAB_SRAM) && defined(VECT_TAB_BASE_ADDRESS) + /* program in SRAMx */ + SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAMx for CPU1 */ +#else /* program in FLASH */ + SCB->VTOR = VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */ +#endif + + /* FPU settings ------------------------------------------------------------*/ +#if (__FPU_PRESENT == 1) && (__FPU_USED == 1) + SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL))); /* set CP10 and CP11 Full Access */ +#endif + + /* Reset the RCC clock configuration to the default reset state ------------*/ + /* Set MSION bit */ + RCC->CR |= RCC_CR_MSION; + + /* Reset CFGR register */ + RCC->CFGR = 0x00070000U; + + /* Reset PLLSAI1ON, PLLON, HSECSSON, HSEON, HSION, and MSIPLLON bits */ + RCC->CR &= (uint32_t)0xFAF6FEFBU; + + /*!< Reset LSI1 and LSI2 bits */ + RCC->CSR &= (uint32_t)0xFFFFFFFAU; + + /*!< Reset HSI48ON bit */ + RCC->CRRCR &= (uint32_t)0xFFFFFFFEU; + + /* Reset PLLCFGR register */ + RCC->PLLCFGR = 0x22041000U; + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) + /* Reset PLLSAI1CFGR register */ + RCC->PLLSAI1CFGR = 0x22041000U; +#endif + + /* Reset HSEBYP bit */ + RCC->CR &= 0xFFFBFFFFU; + + /* Disable all interrupts */ + RCC->CIER = 0x00000000; +} + +/** + * @brief Update SystemCoreClock variable according to Clock Register Values. + * The SystemCoreClock variable contains the core clock (HCLK), it can + * be used by the user application to setup the SysTick timer or configure + * other parameters. + * + * @note Each time the core clock (HCLK) changes, this function must be called + * to update SystemCoreClock variable value. Otherwise, any configuration + * based on this variable will be incorrect. + * + * @note - The system frequency computed by this function is not the real + * frequency in the chip. It is calculated based on the predefined + * constant and the selected clock source: + * + * - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*) + * + * - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**) + * + * - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***) + * + * - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***) + * or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors. + * + * (*) MSI_VALUE is a constant defined in stm32wbxx_hal.h file (default value + * 4 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (**) HSI_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 16 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (***) HSE_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 32 MHz), user has to ensure that HSE_VALUE is same as the real + * frequency of the crystal used. Otherwise, this function may + * have wrong result. + * + * - The result of this function could be not correct when using fractional + * value for HSE crystal. + * + * @param None + * @retval None + */ +void SystemCoreClockUpdate(void) +{ + uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm; + + /* Get MSI Range frequency--------------------------------------------------*/ + + /*MSI frequency range in Hz*/ + msirange = MSIRangeTable[(RCC->CR & RCC_CR_MSIRANGE) >> RCC_CR_MSIRANGE_Pos]; + + /* Get SYSCLK source -------------------------------------------------------*/ + switch (RCC->CFGR & RCC_CFGR_SWS) + { + case 0x00: /* MSI used as system clock source */ + SystemCoreClock = msirange; + break; + + case 0x04: /* HSI used as system clock source */ + /* HSI used as system clock source */ + SystemCoreClock = HSI_VALUE; + break; + + case 0x08: /* HSE used as system clock source */ + SystemCoreClock = HSE_VALUE; + break; + + case 0x0C: /* PLL used as system clock source */ + /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN + SYSCLK = PLL_VCO / PLLR + */ + pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC); + pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ; + + if(pllsource == 0x02UL) /* HSI used as PLL clock source */ + { + pllvco = (HSI_VALUE / pllm); + } + else if(pllsource == 0x03UL) /* HSE used as PLL clock source */ + { + pllvco = (HSE_VALUE / pllm); + } + else /* MSI used as PLL clock source */ + { + pllvco = (msirange / pllm); + } + + pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos); + pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL); + + SystemCoreClock = pllvco/pllr; + break; + + default: + SystemCoreClock = msirange; + break; + } + + /* Compute HCLK clock frequency --------------------------------------------*/ + /* Get HCLK1 prescaler */ + tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)]; + /* HCLK clock frequency */ + SystemCoreClock = SystemCoreClock / tmp; + +} + + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewd b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewd new file mode 100644 index 000000000..371665414 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewd @@ -0,0 +1,2834 @@ + + + 3 + + Lighting_PRF_Node + + ARM + + 0 + + C-SPY + 2 + + 29 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 0 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 0 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 0 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 0 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 0 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 0 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + + Lighting_Provisioner + + ARM + + 0 + + C-SPY + 2 + + 29 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 0 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 0 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 0 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 0 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 0 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 0 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewp b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewp new file mode 100644 index 000000000..435e65d0f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/BLE_MeshLightingPRFNode.ewp @@ -0,0 +1,1313 @@ + + + 3 + + Lighting_PRF_Node + + ARM + + 0 + + General + 3 + + 30 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 0 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 0 + + + + + + + BILINK + 0 + + + + Coder + 0 + + + + + Application + + EWARM + + $PROJ_DIR$\startup_stm32wb15xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\hw_flash.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\lp_timer.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\standby_stm32wb15.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + + STM32_WPAN + + App + + $PROJ_DIR$\..\STM32_WPAN\app\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_config.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_generic.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_light.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_light_lc.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_mesh.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_nvm.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_sensor.c + + + $PROJ_DIR$\..\STM32_WPAN\app\appli_vendor.c + + + $PROJ_DIR$\..\STM32_WPAN\app\models_if.c + + + $PROJ_DIR$\..\STM32_WPAN\app\pal_nvm.c + + + + Target + + $PROJ_DIR$\..\STM32_WPAN\target\hw_ipcc.c + + + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers + + BSP + + NUCLEO-WB15CC + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c + + + + + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + + + + STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + + + + + Middlewares + + STM32_WPAN + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\common.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\generic.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\light.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\light_lc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\mesh.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\Src\mesh_cfg.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\sensors.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\MeshModel\Src\vendor.c + + + + + Utilities + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/Project.eww b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/Project.eww new file mode 100644 index 000000000..0ac00f960 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/Project.eww @@ -0,0 +1,7 @@ + + + + $WS_DIR$\BLE_MeshLightingPRFNode.ewp + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb15xx_cm4.s new file mode 100644 index 000000000..1a107ce9a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb15xx_cm4.s @@ -0,0 +1,469 @@ +;****************************************************************************** +;* File Name : startup_stm32wb15xx_cm4.s +;* Author : MCD Application Team +;* Description : M4 core vector table of the STM32WB15xx devices for the +;* IAR (EWARM) toolchain with support of standby. +;* +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == _iar_program_start, +;* - Set the vector table entries with the exceptions ISR +;* address. +;* - Branches to main in the C library (which eventually +;* calls main()). +;* After Reset the Cortex-M4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +; +; +; The modules in this file are included in the libraries, and may be replaced +; by any user-defined modules that define the PUBLIC symbol _program_start or +; a user defined start symbol. +; To override the cstartup defined in the library, simply add your modified +; version to the workbench project. +; +; The vector table is normally located at address 0. +; When debugging in RAM, it can be located in RAM, aligned to at least 2^6. +; The name "__vector_table" has special meaning for C-SPY: +; it is where the SP start value is found, and the NVIC vector +; table register (VTOR) is initialized to this address if != 0. +; +; Cortex-M version +; + + MODULE ?cstartup + + ;; Forward declaration of sections. + SECTION CSTACK:DATA:NOROOT(3) + + SECTION .intvec:CODE:NOROOT(2) + + EXTERN __iar_program_start + EXTERN SystemInit + EXTERN standby_boot_mng + PUBLIC __vector_table + + DATA +__vector_table + DCD sfe(CSTACK) + DCD Reset_Handler ; Reset Handler + + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM Interrupt + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper, TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_IRQHandler ; TIM1 Update Interrupt + DCD TIM1_TRG_COM_IRQHandler ; TIM1 Trigger and Communication Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD 0 ; Reserved + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD 0 ; Reserved + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD 0 ; Reserved + DCD PWR_SOTF_BLEACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; Default interrupt handlers. +;; + THUMB + + IMPORT backup_MSP + EXPORT CPUcontextSave + PUBWEAK Reset_Handler + SECTION .text:CODE:NOROOT:REORDER(2) +Reset_Handler +/* If we exit from standby mode, restore CPU context and jump to asleep point. */ + BL standby_boot_mng + CMP R0, #1 + BEQ CPUcontextRestore +/* end of specific code section for standby */ + LDR R0, =SystemInit + BLX R0 + LDR R0, =__iar_program_start + BX R0 +/* These 2 functions are designed to save and then restore CPU context. */ +CPUcontextSave + PUSH { r4 - r7, lr } /* store R4-R7 and LR (5 words) onto the stack */ + MOV R3, R8 /* mov thread {r8 - r12} to {r3 - r7} */ + MOV R4, R9 + MOV R5, R10 + MOV R6, R11 + MOV R7, R12 + PUSH {R3-R7} /* store R8-R12 (5 words) onto the stack */ + LDR R4, =backup_MSP /* load address of backup_MSP into R4 */ + MOV R3, SP /* load the stack pointer into R3 */ + STR R3, [R4] /* store the MSP into backup_MSP */ + DSB + WFI /* all saved, trigger deep sleep */ + +CPUcontextRestore + /* Even if we fall through the WFI instruction, we will immediately + * execute a context restore and end up where we left off with no + * ill effects. Normally at this point the core will either be + * powered off or reset (depending on the deep sleep level). */ + LDR R4, =backup_MSP /* load address of backup_MSP into R4 */ + LDR R4, [R4] /* load the SP from backup_MSP */ + MOV SP, R4 /* restore the SP from R4 */ + POP {R3-R7} /* load R8-R12 (5 words) from the stack */ + MOV R8, R3 /* mov {r3 - r7} to {r8 - r12} */ + MOV R9, R4 + MOV R10, R5 + MOV R11, R6 + MOV R12, R7 + POP { R4 - R7, PC } /*load R4-R7 and PC (5 words) from the stack */ +/* end of specific code section for standby */ + + PUBWEAK NMI_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +NMI_Handler + B NMI_Handler + + PUBWEAK HardFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +HardFault_Handler + B HardFault_Handler + + PUBWEAK MemManage_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +MemManage_Handler + B MemManage_Handler + + PUBWEAK BusFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +BusFault_Handler + B BusFault_Handler + + PUBWEAK UsageFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +UsageFault_Handler + B UsageFault_Handler + + PUBWEAK SVC_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SVC_Handler + B SVC_Handler + + PUBWEAK DebugMon_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +DebugMon_Handler + B DebugMon_Handler + + PUBWEAK PendSV_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +PendSV_Handler + B PendSV_Handler + + PUBWEAK SysTick_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SysTick_Handler + B SysTick_Handler + + PUBWEAK WWDG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +WWDG_IRQHandler + B WWDG_IRQHandler + + PUBWEAK PVD_PVM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PVD_PVM_IRQHandler + B PVD_PVM_IRQHandler + + PUBWEAK TAMP_STAMP_LSECSS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TAMP_STAMP_LSECSS_IRQHandler + B TAMP_STAMP_LSECSS_IRQHandler + + PUBWEAK RTC_WKUP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_WKUP_IRQHandler + B RTC_WKUP_IRQHandler + + PUBWEAK FLASH_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FLASH_IRQHandler + B FLASH_IRQHandler + + PUBWEAK RCC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RCC_IRQHandler + B RCC_IRQHandler + + PUBWEAK EXTI0_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI0_IRQHandler + B EXTI0_IRQHandler + + PUBWEAK EXTI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI1_IRQHandler + B EXTI1_IRQHandler + + PUBWEAK EXTI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI2_IRQHandler + B EXTI2_IRQHandler + + PUBWEAK EXTI3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI3_IRQHandler + B EXTI3_IRQHandler + + PUBWEAK EXTI4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI4_IRQHandler + B EXTI4_IRQHandler + + PUBWEAK DMA1_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel1_IRQHandler + B DMA1_Channel1_IRQHandler + + PUBWEAK DMA1_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel2_IRQHandler + B DMA1_Channel2_IRQHandler + + PUBWEAK DMA1_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel3_IRQHandler + B DMA1_Channel3_IRQHandler + + PUBWEAK DMA1_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel4_IRQHandler + B DMA1_Channel4_IRQHandler + + PUBWEAK DMA1_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel5_IRQHandler + B DMA1_Channel5_IRQHandler + + PUBWEAK DMA1_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel6_IRQHandler + B DMA1_Channel6_IRQHandler + + PUBWEAK DMA1_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel7_IRQHandler + B DMA1_Channel7_IRQHandler + + PUBWEAK ADC1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +ADC1_IRQHandler + B ADC1_IRQHandler + + PUBWEAK C2SEV_PWR_C2H_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +C2SEV_PWR_C2H_IRQHandler + B C2SEV_PWR_C2H_IRQHandler + + PUBWEAK COMP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +COMP_IRQHandler + B COMP_IRQHandler + + PUBWEAK EXTI9_5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI9_5_IRQHandler + B EXTI9_5_IRQHandler + + PUBWEAK TIM1_BRK_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_BRK_IRQHandler + B TIM1_BRK_IRQHandler + + PUBWEAK TIM1_UP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_UP_IRQHandler + B TIM1_UP_IRQHandler + + PUBWEAK TIM1_TRG_COM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_TRG_COM_IRQHandler + B TIM1_TRG_COM_IRQHandler + + PUBWEAK TIM1_CC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_CC_IRQHandler + B TIM1_CC_IRQHandler + + PUBWEAK TIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM2_IRQHandler + B TIM2_IRQHandler + + PUBWEAK PKA_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PKA_IRQHandler + B PKA_IRQHandler + + PUBWEAK I2C1_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_EV_IRQHandler + B I2C1_EV_IRQHandler + + PUBWEAK I2C1_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_ER_IRQHandler + B I2C1_ER_IRQHandler + + PUBWEAK SPI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI1_IRQHandler + B SPI1_IRQHandler + + PUBWEAK USART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USART1_IRQHandler + B USART1_IRQHandler + + PUBWEAK LPUART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPUART1_IRQHandler + B LPUART1_IRQHandler + + PUBWEAK TSC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TSC_IRQHandler + B TSC_IRQHandler + + PUBWEAK EXTI15_10_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI15_10_IRQHandler + B EXTI15_10_IRQHandler + + PUBWEAK RTC_Alarm_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_Alarm_IRQHandler + B RTC_Alarm_IRQHandler + + PUBWEAK PWR_SOTF_BLEACT_RFPHASE_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PWR_SOTF_BLEACT_RFPHASE_IRQHandler + B PWR_SOTF_BLEACT_RFPHASE_IRQHandler + + PUBWEAK IPCC_C1_RX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_RX_IRQHandler + B IPCC_C1_RX_IRQHandler + + PUBWEAK IPCC_C1_TX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_TX_IRQHandler + B IPCC_C1_TX_IRQHandler + + PUBWEAK HSEM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +HSEM_IRQHandler + B HSEM_IRQHandler + + PUBWEAK LPTIM1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM1_IRQHandler + B LPTIM1_IRQHandler + + PUBWEAK LPTIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM2_IRQHandler + B LPTIM2_IRQHandler + + PUBWEAK AES2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES2_IRQHandler + B AES2_IRQHandler + + PUBWEAK RNG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RNG_IRQHandler + B RNG_IRQHandler + + PUBWEAK FPU_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FPU_IRQHandler + B FPU_IRQHandler + + PUBWEAK DMAMUX1_OVR_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMAMUX1_OVR_IRQHandler + B DMAMUX1_OVR_IRQHandler + + END + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb15xx_flash_cm4.icf new file mode 100644 index 000000000..85c580b6e --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb15xx_flash_cm4.icf @@ -0,0 +1,42 @@ +/*###ICF### Section handled by ICF editor, don't touch! ****/ +/*-Editor annotation file-*/ +/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ +/*-Specials-*/ +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +/*-Memory Regions-*/ +/***** FLASH Part dedicated to M4 *****/ +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_end__ = 0x080217FF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; +define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x400; +/**** End of ICF editor section. ###ICF###*/ + +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; + +/* MB_MEM1 and MB_MEM2 are sections reserved to mailbox communication. It is placed in the shared memory */ +initialize by copy { readwrite }; +do not initialize { section .noinit, + section MAPPING_TABLE, + section MB_MEM1 }; + +place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; + +place in ROM_region { readonly }; +place in RAM_region { block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvoptx b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvoptx new file mode 100644 index 000000000..0b0461e1d --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvoptx @@ -0,0 +1,1144 @@ + + + + 1.0 + +
                                                        ### uVision Project, (C) Keil Software
                                                        + + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc; *.md + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + Lighting_PRFNode + 0x4 + ARM-ADS + + 32000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 18 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + + + + + + + + + + + BIN\UL2CM3.DLL + + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WB1x_320_M4 -FL050000 -FS08000000 -FP0($$Device:STM32WB15CCUx$CMSIS\Flash\STM32WB1x_320_M4.FLM) + + + + + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + + + Application/Core + 1 + 0 + 0 + 0 + + 1 + 1 + 1 + 0 + 0 + 0 + ../Core/Src/app_debug.c + app_debug.c + 0 + 0 + + + 1 + 2 + 1 + 0 + 0 + 0 + ../Core/Src/app_entry.c + app_entry.c + 0 + 0 + + + 1 + 3 + 1 + 0 + 0 + 0 + ../Core/Src/hw_flash.c + hw_flash.c + 0 + 0 + + + 1 + 4 + 1 + 0 + 0 + 0 + ../Core/Src/hw_timerserver.c + hw_timerserver.c + 0 + 0 + + + 1 + 5 + 1 + 0 + 0 + 0 + ../Core/Src/hw_uart.c + hw_uart.c + 0 + 0 + + + 1 + 6 + 1 + 0 + 0 + 0 + ../Core/Src/lp_timer.c + lp_timer.c + 0 + 0 + + + 1 + 7 + 1 + 0 + 0 + 0 + ../Core/Src/main.c + main.c + 0 + 0 + + + 1 + 8 + 1 + 0 + 0 + 0 + ../Core/Src/stm32_lpm_if.c + stm32_lpm_if.c + 0 + 0 + + + 1 + 9 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_it.c + stm32wbxx_it.c + 0 + 0 + + + + + Application/MDK-ARM + 1 + 0 + 0 + 0 + + 2 + 10 + 2 + 0 + 0 + 0 + .\startup_stm32wb15xx_cm4.s + startup_stm32wb15xx_cm4.s + 0 + 0 + + + + + Application/STM32_WPAN/app + 1 + 0 + 0 + 0 + + 3 + 11 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/app_ble.c + app_ble.c + 0 + 0 + + + 3 + 12 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_generic.c + appli_generic.c + 0 + 0 + + + 3 + 13 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_light.c + appli_light.c + 0 + 0 + + + 3 + 14 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_light_lc.c + appli_light_lc.c + 0 + 0 + + + 3 + 15 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_mesh.c + appli_mesh.c + 0 + 0 + + + 3 + 16 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_nvm.c + appli_nvm.c + 0 + 0 + + + 3 + 17 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/appli_sensor.c + appli_sensor.c + 0 + 0 + + + 3 + 18 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/models_if.c + models_if.c + 0 + 0 + + + 3 + 19 + 1 + 0 + 0 + 0 + ../STM32_WPAN/app/pal_nvm.c + pal_nvm.c + 0 + 0 + + + 3 + 20 + 1 + 0 + 0 + 0 + ..\STM32_WPAN\app\appli_config.c + appli_config.c + 0 + 0 + + + 3 + 21 + 1 + 0 + 0 + 0 + ..\STM32_WPAN\app\appli_vendor.c + appli_vendor.c + 0 + 0 + + + + + Application/STM32_WPAN/target + 0 + 0 + 0 + 0 + + 4 + 22 + 1 + 0 + 0 + 0 + ../STM32_WPAN/target/hw_ipcc.c + hw_ipcc.c + 0 + 0 + + + + + Doc + 0 + 0 + 0 + 0 + + 5 + 23 + 5 + 0 + 0 + 0 + ../readme.txt + readme.txt + 0 + 0 + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + 0 + 0 + 0 + 0 + + 6 + 24 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c + nucleo_wb15cc.c + 0 + 0 + + + + + Drivers/CMSIS + 1 + 0 + 0 + 0 + + 7 + 25 + 1 + 0 + 0 + 0 + ../Core/Src/system_stm32wbxx.c + system_stm32wbxx.c + 0 + 0 + + + + + Drivers/STM32WBxx_HAL_Driver + 1 + 0 + 0 + 0 + + 8 + 26 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + stm32wbxx_hal.c + 0 + 0 + + + 8 + 27 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + stm32wbxx_hal_cortex.c + 0 + 0 + + + 8 + 28 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + stm32wbxx_hal_dma.c + 0 + 0 + + + 8 + 29 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + stm32wbxx_hal_flash.c + 0 + 0 + + + 8 + 30 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + stm32wbxx_hal_flash_ex.c + 0 + 0 + + + 8 + 31 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + stm32wbxx_hal_gpio.c + 0 + 0 + + + 8 + 32 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + stm32wbxx_hal_pwr.c + 0 + 0 + + + 8 + 33 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + stm32wbxx_hal_pwr_ex.c + 0 + 0 + + + 8 + 34 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + stm32wbxx_hal_rcc.c + 0 + 0 + + + 8 + 35 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + stm32wbxx_hal_rcc_ex.c + 0 + 0 + + + 8 + 36 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + stm32wbxx_hal_rtc.c + 0 + 0 + + + 8 + 37 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + stm32wbxx_hal_rtc_ex.c + 0 + 0 + + + 8 + 38 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + stm32wbxx_hal_uart.c + 0 + 0 + + + 8 + 39 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + stm32wbxx_hal_uart_ex.c + 0 + 0 + + + 8 + 40 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + stm32wbxx_hal_ipcc.c + 0 + 0 + + + 8 + 41 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + stm32wbxx_hal_hsem.c + 0 + 0 + + + 8 + 42 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + stm32wbxx_hal_exti.c + 0 + 0 + + + 8 + 43 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + stm32wbxx_hal_dma_ex.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/ble/blesvc + 1 + 0 + 0 + 0 + + 9 + 44 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c + common.c + 0 + 0 + + + 9 + 45 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c + generic.c + 0 + 0 + + + 9 + 46 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c + light.c + 0 + 0 + + + 9 + 47 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c + light_lc.c + 0 + 0 + + + 9 + 48 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c + mesh.c + 0 + 0 + + + 9 + 49 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c + mesh_cfg.c + 0 + 0 + + + 9 + 50 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c + sensors.c + 0 + 0 + + + 9 + 51 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + svc_ctl.c + 0 + 0 + + + 9 + 52 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c + vendor.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/ble/core + 0 + 0 + 0 + 0 + + 10 + 53 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + ble_gap_aci.c + 0 + 0 + + + 10 + 54 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + ble_gatt_aci.c + 0 + 0 + + + 10 + 55 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + ble_hal_aci.c + 0 + 0 + + + 10 + 56 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + ble_hci_le.c + 0 + 0 + + + 10 + 57 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + ble_l2cap_aci.c + 0 + 0 + + + 10 + 58 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + osal.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci + 0 + 0 + 0 + 0 + + 11 + 59 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + shci.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl + 0 + 0 + 0 + 0 + + 12 + 60 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + hci_tl.c + 0 + 0 + + + 12 + 61 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + hci_tl_if.c + 0 + 0 + + + 12 + 62 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + shci_tl.c + 0 + 0 + + + 12 + 63 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + shci_tl_if.c + 0 + 0 + + + 12 + 64 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + tl_mbox.c + 0 + 0 + + + + + Middlewares/STM32_WPAN/utilities + 0 + 0 + 0 + 0 + + 13 + 65 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + dbg_trace.c + 0 + 0 + + + 13 + 66 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + otp.c + 0 + 0 + + + 13 + 67 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + stm32_lpm.c + 0 + 0 + + + 13 + 68 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/sequencer/stm32_seq.c + stm32_seq.c + 0 + 0 + + + 13 + 69 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + stm_list.c + 0 + 0 + + + 13 + 70 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + stm_queue.c + 0 + 0 + + + + + Middlewares/ST/STM32_WPAN/ble/mesh/Library + 1 + 0 + 0 + 0 + + 14 + 71 + 4 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\Library\libBle_Mesh_CM4_WB15xx_Keil.lib + libBle_Mesh_CM4_WB15xx_Keil.lib + 0 + 0 + + + + + ::CMSIS + 0 + 0 + 0 + 1 + + +                                                         diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvprojx b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvprojx new file mode 100644 index 000000000..20cda1348 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/BLE_MeshLightingDemoPRFNode.uvprojx @@ -0,0 +1,828 @@ + + + + 2.1 + +
                                                        ### uVision Project, (C) Keil Software
                                                        + + + + Lighting_PRFNode + 0x4 + ARM-ADS + 5060960::V5.06 update 7 (build 960)::.\ARMCC + 0 + + + STM32WB15CCUx + STMicroelectronics + Keil.STM32WBxx_DFP.1.2.0 + http://www.keil.com/pack/ + IRAM(0x20000000,0x00003000) IRAM2(0x20030000,0x00009000) IROM(0x08000000,0x00050000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE + + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB1x_320_M4 -FS08000000 -FL050000 -FP0($$Device:STM32WB15CCUx$CMSIS\Flash\STM32WB1x_320_M4.FLM)) + 0 + $$Device:STM32WB15CCUx$Drivers\CMSIS\Device\ST\STM32WBxx\Include\stm32wbxx.h + + + + + + + + + + $$Device:STM32WB15CCUx$CMSIS\SVD\STM32WB15_CM4.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + Lighting_PRFNode\Exe\ + BLE_MeshLightingPRFNodeDemo + 1 + 0 + 1 + 1 + 1 + + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 0 + + + SARMCM3.DLL + -REMAP -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 1 + 1 + 4096 + + 1 + BIN\UL2CM3.DLL + "" () + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 2 + 0 + 0 + 1 + 0 + 8 + 1 + 1 + 0 + 0 + 3 + 4 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 1 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x3000 + + + 1 + 0x8000000 + 0x50000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8000000 + 0x21800 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x3000 + + + 0 + 0x20030000 + 0x2800 + + + + + + 1 + 4 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + + + USE_STM32WBXX_NUCLEO,USE_HAL_DRIVER,STM32WB15xx,ENABLE_USART + + ../../../../../../Drivers/CMSIS/Device/ST/STM32WBxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/NUCLEO-WB15CC;../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/Inc;../Core/Inc;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto;../../../../../../Middlewares/ST/STM32_WPAN/utilities;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/sequencer;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci;../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Inc;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../STM32_WPAN/app;../../../../../../Middlewares/ST/STM32_WPAN/ble + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + + + + + + + + + 0 + 0 + 0 + 0 + 1 + 0 + 0x08000000 + 0x20000000 + + .\stm32wb15xx_flash_cm4.sct + + + + + + + + + + + Application/Core + + + app_debug.c + 1 + ../Core/Src/app_debug.c + + + app_entry.c + 1 + ../Core/Src/app_entry.c + + + hw_flash.c + 1 + ../Core/Src/hw_flash.c + + + hw_timerserver.c + 1 + ../Core/Src/hw_timerserver.c + + + hw_uart.c + 1 + ../Core/Src/hw_uart.c + + + lp_timer.c + 1 + ../Core/Src/lp_timer.c + + + main.c + 1 + ../Core/Src/main.c + + + stm32_lpm_if.c + 1 + ../Core/Src/stm32_lpm_if.c + + + stm32wbxx_it.c + 1 + ../Core/Src/stm32wbxx_it.c + + + + + Application/MDK-ARM + + + startup_stm32wb15xx_cm4.s + 2 + .\startup_stm32wb15xx_cm4.s + + + + + Application/STM32_WPAN/app + + + app_ble.c + 1 + ../STM32_WPAN/app/app_ble.c + + + appli_generic.c + 1 + ../STM32_WPAN/app/appli_generic.c + + + appli_light.c + 1 + ../STM32_WPAN/app/appli_light.c + + + appli_light_lc.c + 1 + ../STM32_WPAN/app/appli_light_lc.c + + + appli_mesh.c + 1 + ../STM32_WPAN/app/appli_mesh.c + + + appli_nvm.c + 1 + ../STM32_WPAN/app/appli_nvm.c + + + appli_sensor.c + 1 + ../STM32_WPAN/app/appli_sensor.c + + + models_if.c + 1 + ../STM32_WPAN/app/models_if.c + + + pal_nvm.c + 1 + ../STM32_WPAN/app/pal_nvm.c + + + appli_config.c + 1 + ..\STM32_WPAN\app\appli_config.c + + + appli_vendor.c + 1 + ..\STM32_WPAN\app\appli_vendor.c + + + + + Application/STM32_WPAN/target + + + hw_ipcc.c + 1 + ../STM32_WPAN/target/hw_ipcc.c + + + + + Doc + + + readme.txt + 5 + ../readme.txt + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + + + nucleo_wb15cc.c + 1 + ..\..\..\..\..\..\Drivers\BSP\NUCLEO-WB15CC\nucleo_wb15cc.c + + + + + Drivers/CMSIS + + + system_stm32wbxx.c + 1 + ../Core/Src/system_stm32wbxx.c + + + + + Drivers/STM32WBxx_HAL_Driver + + + stm32wbxx_hal.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + stm32wbxx_hal_cortex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + stm32wbxx_hal_dma.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + stm32wbxx_hal_flash.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + stm32wbxx_hal_flash_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + stm32wbxx_hal_gpio.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + stm32wbxx_hal_pwr.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + stm32wbxx_hal_pwr_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + stm32wbxx_hal_rcc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + stm32wbxx_hal_rcc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + stm32wbxx_hal_rtc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + stm32wbxx_hal_rtc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + stm32wbxx_hal_uart.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + stm32wbxx_hal_uart_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + stm32wbxx_hal_ipcc.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + stm32wbxx_hal_hsem.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + stm32wbxx_hal_exti.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + stm32wbxx_hal_dma_ex.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + + + + Middlewares/STM32_WPAN/ble/blesvc + + + common.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c + + + generic.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c + + + light.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c + + + light_lc.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c + + + mesh.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c + + + mesh_cfg.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c + + + sensors.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c + + + svc_ctl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + vendor.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c + + + + + Middlewares/STM32_WPAN/ble/core + + + ble_gap_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + ble_gatt_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + ble_hal_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + ble_hci_le.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + ble_l2cap_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + osal.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci + + + shci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl + + + hci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + hci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + shci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + shci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + tl_mbox.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + + + Middlewares/STM32_WPAN/utilities + + + dbg_trace.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + otp.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + stm32_lpm.c + 1 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + stm32_seq.c + 1 + ../../../../../../Utilities/sequencer/stm32_seq.c + + + stm_list.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + stm_queue.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + + + Middlewares/ST/STM32_WPAN/ble/mesh/Library + + + libBle_Mesh_CM4_WB15xx_Keil.lib + 4 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\mesh\Library\libBle_Mesh_CM4_WB15xx_Keil.lib + + + + + ::CMSIS + + + + + + + + + + + + + + + + + + +                                                         diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb15xx_cm4.s new file mode 100644 index 000000000..3b925699a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -0,0 +1,335 @@ +;****************************************************************************** +;* File Name : startup_stm32wb15xx_cm4.s +;* Author : MCD Application Team +;* Description : STM32WB15xx devices vector table for MDK-ARM toolchain. +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == Reset_Handler +;* - Set the vector table entries with the exceptions ISR address +;* - Branches to __main in the C library (which eventually +;* calls main()). +;* After Reset the CortexM4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;* <<< Use Configuration Wizard in Context Menu >>> +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** + +; Amount of memory (in bytes) allocated for Stack +; Tailor this value to your application needs +; Stack Configuration +; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Stack_Size EQU 0x1000 + + AREA STACK, NOINIT, READWRITE, ALIGN=3 +Stack_Mem SPACE Stack_Size +__initial_sp + + +; Heap Configuration +; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Heap_Size EQU 0x400 + + AREA HEAP, NOINIT, READWRITE, ALIGN=3 +__heap_base +Heap_Mem SPACE Heap_Size +__heap_limit + + PRESERVE8 + THUMB + + +; Vector Table Mapped to Address 0 at Reset + AREA RESET, DATA, READONLY + EXPORT __Vectors + EXPORT __Vectors_End + EXPORT __Vectors_Size + +__Vectors DCD __initial_sp ; Top of Stack + DCD Reset_Handler ; Reset Handler + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM detector + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper and TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_IRQHandler ; TIM1 Update Interrupt + DCD TIM1_TRG_COM_IRQHandler ; TIM1 Trigger and Communication Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD 0 ; Reserved + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD 0 ; Reserved + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD 0 ; Reserved + DCD PWR_SOTF_BLEACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +__Vectors_End + +__Vectors_Size EQU __Vectors_End - __Vectors + + AREA |.text|, CODE, READONLY + +; Reset handler +Reset_Handler PROC + EXPORT Reset_Handler [WEAK] + IMPORT SystemInit + IMPORT __main + + LDR R0, =SystemInit + BLX R0 + LDR R0, =__main + BX R0 + ENDP + +; Dummy Exception Handlers (infinite loops which can be modified) + +NMI_Handler PROC + EXPORT NMI_Handler [WEAK] + B . + ENDP +HardFault_Handler\ + PROC + EXPORT HardFault_Handler [WEAK] + B . + ENDP +MemManage_Handler\ + PROC + EXPORT MemManage_Handler [WEAK] + B . + ENDP +BusFault_Handler\ + PROC + EXPORT BusFault_Handler [WEAK] + B . + ENDP +UsageFault_Handler\ + PROC + EXPORT UsageFault_Handler [WEAK] + B . + ENDP +SVC_Handler PROC + EXPORT SVC_Handler [WEAK] + B . + ENDP +DebugMon_Handler\ + PROC + EXPORT DebugMon_Handler [WEAK] + B . + ENDP +PendSV_Handler PROC + EXPORT PendSV_Handler [WEAK] + B . + ENDP +SysTick_Handler PROC + EXPORT SysTick_Handler [WEAK] + B . + ENDP + +Default_Handler PROC + + EXPORT WWDG_IRQHandler [WEAK] + EXPORT PVD_PVM_IRQHandler [WEAK] + EXPORT TAMP_STAMP_LSECSS_IRQHandler [WEAK] + EXPORT RTC_WKUP_IRQHandler [WEAK] + EXPORT FLASH_IRQHandler [WEAK] + EXPORT RCC_IRQHandler [WEAK] + EXPORT EXTI0_IRQHandler [WEAK] + EXPORT EXTI1_IRQHandler [WEAK] + EXPORT EXTI2_IRQHandler [WEAK] + EXPORT EXTI3_IRQHandler [WEAK] + EXPORT EXTI4_IRQHandler [WEAK] + EXPORT DMA1_Channel1_IRQHandler [WEAK] + EXPORT DMA1_Channel2_IRQHandler [WEAK] + EXPORT DMA1_Channel3_IRQHandler [WEAK] + EXPORT DMA1_Channel4_IRQHandler [WEAK] + EXPORT DMA1_Channel5_IRQHandler [WEAK] + EXPORT DMA1_Channel6_IRQHandler [WEAK] + EXPORT DMA1_Channel7_IRQHandler [WEAK] + EXPORT ADC1_IRQHandler [WEAK] + EXPORT C2SEV_PWR_C2H_IRQHandler [WEAK] + EXPORT COMP_IRQHandler [WEAK] + EXPORT EXTI9_5_IRQHandler [WEAK] + EXPORT TIM1_BRK_IRQHandler [WEAK] + EXPORT TIM1_UP_IRQHandler [WEAK] + EXPORT TIM1_TRG_COM_IRQHandler [WEAK] + EXPORT TIM1_CC_IRQHandler [WEAK] + EXPORT TIM2_IRQHandler [WEAK] + EXPORT PKA_IRQHandler [WEAK] + EXPORT I2C1_EV_IRQHandler [WEAK] + EXPORT I2C1_ER_IRQHandler [WEAK] + EXPORT SPI1_IRQHandler [WEAK] + EXPORT USART1_IRQHandler [WEAK] + EXPORT LPUART1_IRQHandler [WEAK] + EXPORT TSC_IRQHandler [WEAK] + EXPORT EXTI15_10_IRQHandler [WEAK] + EXPORT RTC_Alarm_IRQHandler [WEAK] + EXPORT PWR_SOTF_BLEACT_RFPHASE_IRQHandler [WEAK] + EXPORT IPCC_C1_RX_IRQHandler [WEAK] + EXPORT IPCC_C1_TX_IRQHandler [WEAK] + EXPORT HSEM_IRQHandler [WEAK] + EXPORT LPTIM1_IRQHandler [WEAK] + EXPORT LPTIM2_IRQHandler [WEAK] + EXPORT AES1_IRQHandler [WEAK] + EXPORT AES2_IRQHandler [WEAK] + EXPORT RNG_IRQHandler [WEAK] + EXPORT FPU_IRQHandler [WEAK] + EXPORT DMAMUX1_OVR_IRQHandler [WEAK] + +WWDG_IRQHandler +PVD_PVM_IRQHandler +TAMP_STAMP_LSECSS_IRQHandler +RTC_WKUP_IRQHandler +FLASH_IRQHandler +RCC_IRQHandler +EXTI0_IRQHandler +EXTI1_IRQHandler +EXTI2_IRQHandler +EXTI3_IRQHandler +EXTI4_IRQHandler +DMA1_Channel1_IRQHandler +DMA1_Channel2_IRQHandler +DMA1_Channel3_IRQHandler +DMA1_Channel4_IRQHandler +DMA1_Channel5_IRQHandler +DMA1_Channel6_IRQHandler +DMA1_Channel7_IRQHandler +ADC1_IRQHandler +C2SEV_PWR_C2H_IRQHandler +COMP_IRQHandler +EXTI9_5_IRQHandler +TIM1_BRK_IRQHandler +TIM1_UP_IRQHandler +TIM1_TRG_COM_IRQHandler +TIM1_CC_IRQHandler +TIM2_IRQHandler +PKA_IRQHandler +I2C1_EV_IRQHandler +I2C1_ER_IRQHandler +SPI1_IRQHandler +USART1_IRQHandler +LPUART1_IRQHandler +TSC_IRQHandler +EXTI15_10_IRQHandler +RTC_Alarm_IRQHandler +PWR_SOTF_BLEACT_RFPHASE_IRQHandler +IPCC_C1_RX_IRQHandler +IPCC_C1_TX_IRQHandler +HSEM_IRQHandler +LPTIM1_IRQHandler +LPTIM2_IRQHandler +AES1_IRQHandler +AES2_IRQHandler +RNG_IRQHandler +FPU_IRQHandler +DMAMUX1_OVR_IRQHandler + + B . + + ENDP + + ALIGN + +;******************************************************************************* +; User Stack and Heap initialization +;******************************************************************************* + IF :DEF:__MICROLIB + + EXPORT __initial_sp + EXPORT __heap_base + EXPORT __heap_limit + + ELSE + + IMPORT __use_two_region_memory + EXPORT __user_initial_stackheap + +__user_initial_stackheap + + LDR R0, = Heap_Mem + LDR R1, =(Stack_Mem + Stack_Size) + LDR R2, = (Heap_Mem + Heap_Size) + LDR R3, = Stack_Mem + BX LR + + ALIGN + + ENDIF + + END + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb15xx_flash_cm4.sct new file mode 100644 index 000000000..41a12523f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -0,0 +1,26 @@ +; ************************************************************* +; *** Scatter-Loading Description File generated by uVision *** +; ************************************************************* + +LR_IROM1 0x08000000 0x00021800 { ; load region size_region + ER_IROM1 0x08000000 0x00021800 { ; load address = execution address + *.o (RESET, +First) + *(InRoot$$Sections) + .ANY (+RO) + } + RW_IRAM1 0x20000000 0x2FFF { ; RW data + .ANY (+RW +ZI) + } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + + } + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.cproject b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.cproject new file mode 100644 index 000000000..b99b1833a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.cproject @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.project b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.project new file mode 100644 index 000000000..4ea7494de --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/.project @@ -0,0 +1,380 @@ + + + BLE_MeshLightingPRFNode + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.st.stm32cube.ide.mcu.MCUProjectNature + org.eclipse.cdt.core.cnature + com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature + com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature + com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature + com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature + com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature + com.st.stm32cube.ide.mcu.MCURootProjectNature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + Doc/readme.txt + 1 + $%7BPARENT-1-PROJECT_LOC%7D/readme.txt + + + Application/Core/app_debug.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/app_debug.c + + + Application/Core/app_entry.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/app_entry.c + + + Application/Core/hw_flash.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_flash.c + + + Application/Core/hw_timerserver.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_timerserver.c + + + Application/Core/hw_uart.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_uart.c + + + Application/Core/lp_timer.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/lp_timer.c + + + Application/Core/main.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c + + + Application/Core/stm32_lpm_if.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c + + + Application/Core/stm32wbxx_it.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wbxx_it.c + + + Drivers/CMSIS/system_stm32wbxx.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wbxx.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_cortex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_exti.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_gpio.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_hsem.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_ipcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + Application/STM32_WPAN/app/app_ble.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/app_ble.c + + + Application/STM32_WPAN/app/appli_config.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_config.c + + + Application/STM32_WPAN/app/appli_generic.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_generic.c + + + Application/STM32_WPAN/app/appli_light.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_light.c + + + Application/STM32_WPAN/app/appli_light_lc.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_light_lc.c + + + Application/STM32_WPAN/app/appli_mesh.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_mesh.c + + + Application/STM32_WPAN/app/appli_nvm.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_nvm.c + + + Application/STM32_WPAN/app/appli_sensor.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/appli_sensor.c + + + Application/STM32_WPAN/app/appli_vendor.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/app/appli_vendor.c + + + Application/STM32_WPAN/app/models_if.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/models_if.c + + + Application/STM32_WPAN/app/pal_nvm.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/app/pal_nvm.c + + + Application/STM32_WPAN/target/hw_ipcc.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/target/hw_ipcc.c + + + Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/NUCLEO-WB15CC/nucleo_wb15cc.c + + + Middlewares/STM32_WPAN/utilities/dbg_trace.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + Middlewares/STM32_WPAN/utilities/otp.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/otp.c + + + Middlewares/STM32_WPAN/utilities/stm32_lpm.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c + + + Middlewares/STM32_WPAN/utilities/stm32_seq.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c + + + Middlewares/STM32_WPAN/utilities/stm_list.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + Middlewares/STM32_WPAN/utilities/stm_queue.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + Middlewares/STM32_WPAN/ble/blesvc/common.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/common.c + + + Middlewares/STM32_WPAN/ble/blesvc/generic.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/generic.c + + + Middlewares/STM32_WPAN/ble/blesvc/light.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light.c + + + Middlewares/STM32_WPAN/ble/blesvc/light_lc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/light_lc.c + + + Middlewares/STM32_WPAN/ble/blesvc/mesh.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/svc/Src/mesh.c + + + Middlewares/STM32_WPAN/ble/blesvc/mesh_cfg.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/Src/mesh_cfg.c + + + Middlewares/STM32_WPAN/ble/blesvc/sensors.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/sensors.c + + + Middlewares/STM32_WPAN/ble/blesvc/svc_ctl.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + Middlewares/STM32_WPAN/ble/blesvc/vendor.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/mesh/MeshModel/Src/vendor.c + + + Middlewares/STM32_WPAN/ble/core/ble_gap_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_gatt_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_hal_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + Middlewares/STM32_WPAN/ble/core/ble_hci_le.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + Middlewares/STM32_WPAN/ble/core/ble_l2cap_aci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + Middlewares/STM32_WPAN/ble/core/osal.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c new file mode 100644 index 000000000..0a2679a25 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c @@ -0,0 +1,158 @@ +/** + ****************************************************************************** + * @file syscalls.c + * @author Auto-generated by STM32CubeIDE + * @brief STM32CubeIDE Minimal System calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include +#include +#include +#include +#include +#include +#include + + +/* Variables */ +//#undef errno +extern int errno; +extern int __io_putchar(int ch) __attribute__((weak)); +extern int __io_getchar(void) __attribute__((weak)); + +register char * stack_ptr asm("sp"); + +char *__env[1] = { 0 }; +char **environ = __env; + + +/* Functions */ +void initialise_monitor_handles() +{ +} + +int _getpid(void) +{ + return 1; +} + +int _kill(int pid, int sig) +{ + errno = EINVAL; + return -1; +} + +void _exit (int status) +{ + _kill(status, -1); + while (1) {} /* Make sure we hang here */ +} + +__attribute__((weak)) int _read(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + *ptr++ = __io_getchar(); + } + +return len; +} + +__attribute__((weak)) int _write(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + __io_putchar(*ptr++); + } + return len; +} + +int _close(int file) +{ + return -1; +} + + +int _fstat(int file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _isatty(int file) +{ + return 1; +} + +int _lseek(int file, int ptr, int dir) +{ + return 0; +} + +int _open(char *path, int flags, ...) +{ + /* Pretend like we always fail */ + return -1; +} + +int _wait(int *status) +{ + errno = ECHILD; + return -1; +} + +int _unlink(char *name) +{ + errno = ENOENT; + return -1; +} + +int _times(struct tms *buf) +{ + return -1; +} + +int _stat(char *file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _link(char *old, char *new) +{ + errno = EMLINK; + return -1; +} + +int _fork(void) +{ + errno = EAGAIN; + return -1; +} + +int _execve(char *name, char **argv, char **env) +{ + errno = ENOMEM; + return -1; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c new file mode 100644 index 000000000..dda5abe79 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c @@ -0,0 +1,79 @@ +/** + ****************************************************************************** + * @file sysmem.c + * @author Generated by STM32CubeIDE + * @brief STM32CubeIDE System Memory calls file + * + * For more information about which C functions + * need which of these lowlevel functions + * please consult the newlib libc manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include + +/** + * Pointer to the current high watermark of the heap usage + */ +static uint8_t *__sbrk_heap_end = NULL; + +/** + * @brief _sbrk() allocates memory to the newlib heap and is used by malloc + * and others from the C library + * + * @verbatim + * ############################################################################ + * # .data # .bss # newlib heap # MSP stack # + * # # # # Reserved by _Min_Stack_Size # + * ############################################################################ + * ^-- RAM start ^-- _end _estack, RAM end --^ + * @endverbatim + * + * This implementation starts allocating at the '_end' linker symbol + * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack + * The implementation considers '_estack' linker symbol to be RAM end + * NOTE: If the MSP stack, at any point during execution, grows larger than the + * reserved size, please increase the '_Min_Stack_Size'. + * + * @param incr Memory size + * @return Pointer to allocated memory + */ +void *_sbrk(ptrdiff_t incr) +{ + extern uint8_t _end; /* Symbol defined in the linker script */ + extern uint8_t _estack; /* Symbol defined in the linker script */ + extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */ + const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size; + const uint8_t *max_heap = (uint8_t *)stack_limit; + uint8_t *prev_heap_end; + + /* Initialize heap end at first call */ + if (NULL == __sbrk_heap_end) + { + __sbrk_heap_end = &_end; + } + + /* Protect heap from growing into the reserved MSP stack */ + if (__sbrk_heap_end + incr > max_heap) + { + errno = ENOMEM; + return (void *)-1; + } + + prev_heap_end = __sbrk_heap_end; + __sbrk_heap_end += incr; + + return (void *)prev_heap_end; +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s new file mode 100644 index 000000000..447865dae --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -0,0 +1,392 @@ +/** + ****************************************************************************** + * @file startup_stm32wb15xx_cm4.s + * @author MCD Application Team + * @brief STM32WB15xx devices vector table GCC toolchain. + * This module performs: + * - Set the initial SP + * - Set the initial PC == Reset_Handler, + * - Set the vector table entries with the exceptions ISR address + * - Branches to main in the C library (which eventually + * calls main()). + * After Reset the Cortex-M4 processor is in Thread mode, + * priority is Privileged, and the Stack is set to Main. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + + .syntax unified + .cpu cortex-m4 + .fpu softvfp + .thumb + +.global g_pfnVectors +.global Default_Handler + +/* start address for the initialization values of the .data section. +defined in linker script */ +.word _sidata +/* start address for the .data section. defined in linker script */ +.word _sdata +/* end address for the .data section. defined in linker script */ +.word _edata +/* start address for the .bss section. defined in linker script */ +.word _sbss +/* end address for the .bss section. defined in linker script */ +.word _ebss +/* start address for the .MB_MEM2 section. defined in linker script */ +.word _sMB_MEM2 +/* end address for the .MB_MEM2 section. defined in linker script */ +.word _eMB_MEM2 + +/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */ +.macro INIT_BSS start, end + ldr r0, =\start + ldr r1, =\end + movs r3, #0 + bl LoopFillZerobss +.endm + +/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */ +.macro INIT_DATA start, end, src + ldr r0, =\start + ldr r1, =\end + ldr r2, =\src + movs r3, #0 + bl LoopCopyDataInit +.endm + +.section .text.data_initializers +CopyDataInit: + ldr r4, [r2, r3] + str r4, [r0, r3] + adds r3, r3, #4 + +LoopCopyDataInit: + adds r4, r0, r3 + cmp r4, r1 + bcc CopyDataInit + bx lr + +FillZerobss: + str r3, [r0] + adds r0, r0, #4 + +LoopFillZerobss: + cmp r0, r1 + bcc FillZerobss + bx lr + + .section .text.Reset_Handler + .weak Reset_Handler + .type Reset_Handler, %function +Reset_Handler: + ldr r0, =_estack + mov sp, r0 /* set stack pointer */ +/* Call the clock system initialization function.*/ + bl SystemInit + +/* Copy the data segment initializers from flash to SRAM */ + INIT_DATA _sdata, _edata, _sidata + +/* Zero fill the bss segments. */ + INIT_BSS _sbss, _ebss + INIT_BSS _sMB_MEM2, _eMB_MEM2 + +/* Call static constructors */ + bl __libc_init_array +/* Call the application s entry point.*/ + bl main + +LoopForever: + b LoopForever + +.size Reset_Handler, .-Reset_Handler + +/** + * @brief This is the code that gets called when the processor receives an + * unexpected interrupt. This simply enters an infinite loop, preserving + * the system state for examination by a debugger. + * + * @param None + * @retval None +*/ + .section .text.Default_Handler,"ax",%progbits +Default_Handler: +Infinite_Loop: + b Infinite_Loop + .size Default_Handler, .-Default_Handler +/****************************************************************************** +* +* The minimal vector table for a Cortex-M4. Note that the proper constructs +* must be placed on this to ensure that it ends up at physical address +* 0x0000.0000. +* +******************************************************************************/ + .section .isr_vector,"a",%progbits + .type g_pfnVectors, %object + .size g_pfnVectors, .-g_pfnVectors + + +g_pfnVectors: + .word _estack + .word Reset_Handler + .word NMI_Handler + .word HardFault_Handler + .word MemManage_Handler + .word BusFault_Handler + .word UsageFault_Handler + .word 0 + .word 0 + .word 0 + .word 0 + .word SVC_Handler + .word DebugMon_Handler + .word 0 + .word PendSV_Handler + .word SysTick_Handler + .word WWDG_IRQHandler + .word PVD_PVM_IRQHandler + .word TAMP_STAMP_LSECSS_IRQHandler + .word RTC_WKUP_IRQHandler + .word FLASH_IRQHandler + .word RCC_IRQHandler + .word EXTI0_IRQHandler + .word EXTI1_IRQHandler + .word EXTI2_IRQHandler + .word EXTI3_IRQHandler + .word EXTI4_IRQHandler + .word DMA1_Channel1_IRQHandler + .word DMA1_Channel2_IRQHandler + .word DMA1_Channel3_IRQHandler + .word DMA1_Channel4_IRQHandler + .word DMA1_Channel5_IRQHandler + .word DMA1_Channel6_IRQHandler + .word DMA1_Channel7_IRQHandler + .word ADC1_IRQHandler + .word 0 + .word 0 + .word C2SEV_PWR_C2H_IRQHandler + .word COMP_IRQHandler + .word EXTI9_5_IRQHandler + .word TIM1_BRK_IRQHandler + .word TIM1_UP_IRQHandler + .word TIM1_TRG_COM_IRQHandler + .word TIM1_CC_IRQHandler + .word TIM2_IRQHandler + .word PKA_IRQHandler + .word I2C1_EV_IRQHandler + .word I2C1_ER_IRQHandler + .word 0 + .word 0 + .word SPI1_IRQHandler + .word 0 + .word USART1_IRQHandler + .word LPUART1_IRQHandler + .word 0 + .word TSC_IRQHandler + .word EXTI15_10_IRQHandler + .word RTC_Alarm_IRQHandler + .word 0 + .word PWR_SOTF_BLEACT_RFPHASE_IRQHandler + .word IPCC_C1_RX_IRQHandler + .word IPCC_C1_TX_IRQHandler + .word HSEM_IRQHandler + .word LPTIM1_IRQHandler + .word LPTIM2_IRQHandler + .word 0 + .word 0 + .word 0 + .word AES2_IRQHandler + .word RNG_IRQHandler + .word FPU_IRQHandler + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word 0 + .word DMAMUX1_OVR_IRQHandler + +/******************************************************************************* +* +* Provide weak aliases for each Exception handler to the Default_Handler. +* As they are weak aliases, any function with the same name will override +* this definition. +* +*******************************************************************************/ + .weak NMI_Handler + .thumb_set NMI_Handler,Default_Handler + + .weak HardFault_Handler + .thumb_set HardFault_Handler,Default_Handler + + .weak MemManage_Handler + .thumb_set MemManage_Handler,Default_Handler + + .weak BusFault_Handler + .thumb_set BusFault_Handler,Default_Handler + + .weak UsageFault_Handler + .thumb_set UsageFault_Handler,Default_Handler + + .weak SVC_Handler + .thumb_set SVC_Handler,Default_Handler + + .weak DebugMon_Handler + .thumb_set DebugMon_Handler,Default_Handler + + .weak PendSV_Handler + .thumb_set PendSV_Handler,Default_Handler + + .weak SysTick_Handler + .thumb_set SysTick_Handler,Default_Handler + + .weak WWDG_IRQHandler + .thumb_set WWDG_IRQHandler,Default_Handler + + .weak PVD_PVM_IRQHandler + .thumb_set PVD_PVM_IRQHandler,Default_Handler + + .weak TAMP_STAMP_LSECSS_IRQHandler + .thumb_set TAMP_STAMP_LSECSS_IRQHandler,Default_Handler + + .weak RTC_WKUP_IRQHandler + .thumb_set RTC_WKUP_IRQHandler,Default_Handler + + .weak FLASH_IRQHandler + .thumb_set FLASH_IRQHandler,Default_Handler + + .weak RCC_IRQHandler + .thumb_set RCC_IRQHandler,Default_Handler + + .weak EXTI0_IRQHandler + .thumb_set EXTI0_IRQHandler,Default_Handler + + .weak EXTI1_IRQHandler + .thumb_set EXTI1_IRQHandler,Default_Handler + + .weak EXTI2_IRQHandler + .thumb_set EXTI2_IRQHandler,Default_Handler + + .weak EXTI3_IRQHandler + .thumb_set EXTI3_IRQHandler,Default_Handler + + .weak EXTI4_IRQHandler + .thumb_set EXTI4_IRQHandler,Default_Handler + + .weak DMA1_Channel1_IRQHandler + .thumb_set DMA1_Channel1_IRQHandler,Default_Handler + + .weak DMA1_Channel2_IRQHandler + .thumb_set DMA1_Channel2_IRQHandler,Default_Handler + + .weak DMA1_Channel3_IRQHandler + .thumb_set DMA1_Channel3_IRQHandler,Default_Handler + + .weak DMA1_Channel4_IRQHandler + .thumb_set DMA1_Channel4_IRQHandler,Default_Handler + + .weak DMA1_Channel5_IRQHandler + .thumb_set DMA1_Channel5_IRQHandler,Default_Handler + + .weak DMA1_Channel6_IRQHandler + .thumb_set DMA1_Channel6_IRQHandler,Default_Handler + + .weak DMA1_Channel7_IRQHandler + .thumb_set DMA1_Channel7_IRQHandler,Default_Handler + + .weak ADC1_IRQHandler + .thumb_set ADC1_IRQHandler,Default_Handler + + .weak C2SEV_PWR_C2H_IRQHandler + .thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler + + .weak COMP_IRQHandler + .thumb_set COMP_IRQHandler,Default_Handler + + .weak EXTI9_5_IRQHandler + .thumb_set EXTI9_5_IRQHandler,Default_Handler + + .weak TIM1_BRK_IRQHandler + .thumb_set TIM1_BRK_IRQHandler,Default_Handler + + .weak TIM1_UP_IRQHandler + .thumb_set TIM1_UP_IRQHandler,Default_Handler + + .weak TIM1_TRG_COM_IRQHandler + .thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler + + .weak TIM1_CC_IRQHandler + .thumb_set TIM1_CC_IRQHandler,Default_Handler + + .weak TIM2_IRQHandler + .thumb_set TIM2_IRQHandler,Default_Handler + + .weak PKA_IRQHandler + .thumb_set PKA_IRQHandler,Default_Handler + + .weak I2C1_EV_IRQHandler + .thumb_set I2C1_EV_IRQHandler,Default_Handler + + .weak I2C1_ER_IRQHandler + .thumb_set I2C1_ER_IRQHandler,Default_Handler + + .weak SPI1_IRQHandler + .thumb_set SPI1_IRQHandler,Default_Handler + + .weak USART1_IRQHandler + .thumb_set USART1_IRQHandler,Default_Handler + + .weak LPUART1_IRQHandler + .thumb_set LPUART1_IRQHandler,Default_Handler + + .weak TSC_IRQHandler + .thumb_set TSC_IRQHandler,Default_Handler + + .weak EXTI15_10_IRQHandler + .thumb_set EXTI15_10_IRQHandler,Default_Handler + + .weak RTC_Alarm_IRQHandler + .thumb_set RTC_Alarm_IRQHandler,Default_Handler + + .weak PWR_SOTF_BLEACT_RFPHASE_IRQHandler + .thumb_set PWR_SOTF_BLEACT_RFPHASE_IRQHandler,Default_Handler + + .weak IPCC_C1_RX_IRQHandler + .thumb_set IPCC_C1_RX_IRQHandler,Default_Handler + + .weak IPCC_C1_TX_IRQHandler + .thumb_set IPCC_C1_TX_IRQHandler,Default_Handler + + .weak HSEM_IRQHandler + .thumb_set HSEM_IRQHandler,Default_Handler + + .weak LPTIM1_IRQHandler + .thumb_set LPTIM1_IRQHandler,Default_Handler + + .weak LPTIM2_IRQHandler + .thumb_set LPTIM2_IRQHandler,Default_Handler + + .weak AES2_IRQHandler + .thumb_set AES2_IRQHandler,Default_Handler + + .weak RNG_IRQHandler + .thumb_set RNG_IRQHandler,Default_Handler + + .weak FPU_IRQHandler + .thumb_set FPU_IRQHandler,Default_Handler + + .weak DMAMUX1_OVR_IRQHandler + .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld new file mode 100644 index 000000000..0e7e6c389 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -0,0 +1,188 @@ +/* +****************************************************************************** +** +** File : LinkerScript.ld +** +** Author : STM32CubeIDE +** +** Abstract : Linker script for STM32WB15xC Device +** 320Kbytes FLASH +** 48Kbytes RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** Distribution: The file is distributed as is without any warranty +** of any kind. +** +***************************************************************************** +** @attention +** +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. +** +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +/*_estack = 0x20003000;*/ /* end of RAM */ +_estack = 0x20032800; /* end of RAM_SHARED */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 134K +RAM1 (xrw) : ORIGIN = 0x20000004, LENGTH = 0x2FFC +RAM_SHARED1 (xrw) : ORIGIN = 0x20030000, LENGTH = 0x28 +RAM_SHARED2 (xrw) : ORIGIN = 0x20030028, LENGTH = 0x27D8 +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + *(.RamFunc) /* .RamFunc sections */ + *(.RamFunc*) /* .RamFunc* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM1 AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss1 : + { + /* This is used by the startup in order to initialize the .bss section */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM1 + + .bss2 : + { + . = ALIGN(4); + __bss2_start__ = .; + *(.bss*) + . = ALIGN(4); + __bss2_end__ = .; + } > RAM_SHARED2 AT > RAM_SHARED2 + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM1 + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } + MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED1 + MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED2 + MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED2 +} + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c new file mode 100644 index 000000000..08b9446b5 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c @@ -0,0 +1,110 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_config.c + * @author MCD Application Team + * @brief Configuration file for PWM. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "PWM_config.h" + +extern TIM_HandleTypeDef htim1; +extern TIM_HandleTypeDef htim2; + +#define PRESCALER_VALUE (uint32_t)(((SystemCoreClock) / 1000000) - 1) + +/** + *@brief Configure PWM sources and GPIO + *@retval None + */ +void PWM_Init() +{ + TIM_OC_InitTypeDef sConfigOC = {0}; + TIM_MasterConfigTypeDef sMasterConfig = {0}; + + /* GPIO Configuration */ + GPIO_InitTypeDef GPIO_InitStructure = {0}; + + + /* Configure PWM pins */ + GPIO_InitStructure.Pin = PWM0_PIN | PWM1_PIN; + GPIO_InitStructure.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure.Pull = GPIO_PULLUP; + GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure); + + /* Configure PWM pins */ + GPIO_InitStructure.Pin = PWM2_PIN | PWM3_PIN | PWM4_PIN; + GPIO_InitStructure.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure.Pull = GPIO_PULLUP; + GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure.Alternate = GPIO_AF1_TIM2; + HAL_GPIO_Init(GPIOA, &GPIO_InitStructure); + + /* MFT Configuration */ + HAL_NVIC_SetPriority((IRQn_Type)(TIM1_CC_IRQn), 15, 0); + HAL_NVIC_EnableIRQ((IRQn_Type)(TIM1_CC_IRQn)); + HAL_NVIC_SetPriority((IRQn_Type)(TIM2_IRQn), 15, 0); + HAL_NVIC_EnableIRQ((IRQn_Type)(TIM2_IRQn)); + + htim1.Instance = TIM1; + htim1.Init.Prescaler = 0/*PRESCALER_VALUE*/; + htim1.Init.CounterMode = TIM_COUNTERMODE_UP; + htim1.Init.Period = TIME_PERIOD; + htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + HAL_TIM_PWM_Init(&htim1); + + htim2.Instance = TIM2; + htim2.Init.Prescaler = 0/*PRESCALER_VALUE*/; + htim2.Init.CounterMode = TIM_COUNTERMODE_UP; + htim2.Init.Period = TIME_PERIOD; + htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + HAL_TIM_PWM_Init(&htim2); + + sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET; + sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; + HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig); + HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig); + + sConfigOC.OCMode = TIM_OCMODE_PWM1; + sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; + sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; + sConfigOC.Pulse = MFT1_TON_1; + HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1); + sConfigOC.Pulse = MFT2_TON_1; + HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_2); + sConfigOC.Pulse = MFT1_TON_2; + HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1); + sConfigOC.Pulse = MFT2_TON_2; + HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_2); + sConfigOC.Pulse = MFT2_TON_3; + HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_3); + + /* Start channel 1 */ + HAL_TIM_PWM_Start_IT(&htim1, TIM_CHANNEL_1); + /* Start channel 2 */ + HAL_TIM_PWM_Start_IT(&htim1, TIM_CHANNEL_2); + /* Start channel 1 */ + HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_1); + /* Start channel 2 */ + HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_2); + /* Start channel 3 */ + HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_3); +} diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.h new file mode 100644 index 000000000..7fc56056b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.h @@ -0,0 +1,74 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_config.h + * @author MCD Application Team + * @brief Header Configuration file for PWM. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "mesh_cfg_usr.h" + +/* Macros defined for the number of PWM Provided */ +#define PWM0 0 +#define PWM1 1 +#define PWM2 2 +#define PWM3 3 +#define PWM4 4 + +/************************************************************************/ + +/*STM32WB + * This configuration given below is for the STM32WB board. + * Here user has selected the PWM0 in SERIAL2_MODE and PWM1 in SERIAL1_MODE. + * User can configure software PWM to any of the GPIO which are not used for + * hardware PWM. +*/ +/* PWM pins for MFT1 and MFT2 respectively */ +#if defined USE_STM32WBXX_NUCLEO || defined USE_STM32WBXX_USB_DONGLE + +#define PWM0_PIN GPIO_PIN_14 /* TIM1_CH1 AF1 */ +#define PWM1_PIN GPIO_PIN_15 /* TIM1_CH2 AF1 */ + +/* GPIOs pins (SOFTWARE PWM) used to output a PWM signal */ +#define PWM2_PIN GPIO_PIN_0 /* TIM2_CH1 AF1 */ +#define PWM3_PIN GPIO_PIN_1 /* TIM2_CH2 AF1 */ +#define PWM4_PIN GPIO_PIN_2 /* TIM2_CH3 AF1 */ +#endif +/************************************************************************/ + +#define TIME_PERIOD 32000 + +/* TIM1 Channel 1 Timer Ton and T0ff (ticks number) PWM0*/ +#define MFT1_TON_1 (12000 - 1) +#define MFT1_TOFF_1 (20000 - 1) + +/* TIM1 Channel 2 Timer 1 Ton and T0ff (ticks number) PWM1*/ +#define MFT2_TON_1 (8000 - 1 ) +#define MFT2_TOFF_1 (24000 - 1) + +/* TIM2 Channel 1 Timer 2 Ton and T0ff (ticks number) PWM2*/ +#define MFT1_TON_2 (16000 - 1) +#define MFT1_TOFF_2 (16000 -1) + +/* TIM2 Channel 2 Timer 2 Ton and T0ff (ticks number) PWM3*/ +#define MFT2_TON_2 (4000 - 1) +#define MFT2_TOFF_2 (28000 - 1) + +/* TIM2 Channel 3 Timer 2 Ton and T0ff (ticks number) PWM4*/ +#define MFT2_TON_3 (4000 - 1) +#define MFT2_TOFF_3 (28000 - 1) + +void PWM_Init(void); + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c new file mode 100644 index 000000000..74d3bc848 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c @@ -0,0 +1,279 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_handlers.c + * @author MCD Application Team + * @brief Handlers for PWM and other support functions. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "app_conf.h" +#include "PWM_handlers.h" +#include "mesh_cfg_usr.h" + +extern TIM_HandleTypeDef htim1; +extern TIM_HandleTypeDef htim2; + +/* Global Variables */ +uint16_t DUTY; +int NonZeroPWM0=0; +int NonZeroPWM1=0; +uint8_t Duty_flag_A = 0; +uint16_t PWM0_on, + PWM1_on, + PWM2_on = MFT1_TON_2, /* Timer2, MFT1 */ + PWM3_on = MFT2_TON_2, /* Timer2, MFT2 */ + PWM4_on = MFT2_TON_3; /* Timer2, MFT2 */ + +uint32_t channel = PWM3_PIN; /* It is the channel with initial lowest duty-cycle */ +uint32_t period = TIME_PERIOD; /* Period in ticks of the PWM signal */ +uint8_t channel_number = 0; + +uint32_t PWM_channels[] = {PWM3_PIN, PWM4_PIN}; /* Channels managed by MFT2 Timer 2 */ +uint16_t Ton_values[] = {MFT2_TON_2, MFT2_TON_3}; /* Sorted array containing duty-cycle values + respectively for PWM3_PIN and PWM4_PIN */ +uint16_t delta_1 = MFT2_TON_3 - MFT2_TON_2; /* Delta between the first two duty-cycles */ +uint16_t delta = MFT2_TON_3 - MFT2_TON_2; + +int number_of_channels = 2; /* Number of channels managed by MFT2 Timer 2 */ +int max_duty = MFT2_TON_3; /* Maximum duty-cycle */ + +/** + *@brief PWM2 handler + *@retval None + */ +void PWM2_handler() +{ + if(__HAL_TIM_GET_FLAG(&htim1, TIM_FLAG_CC1) > 0) + { + __HAL_TIM_CLEAR_FLAG(&htim1, TIM_FLAG_CC1); + if(Duty_flag_A == 1) + { + HAL_GPIO_WritePin(GPIOA, PWM2_PIN, GPIO_PIN_SET); + Duty_flag_A = 0; + htim1.Instance->CCR1 = PWM2_on; + } + else + { + HAL_GPIO_WritePin(GPIOA, PWM2_PIN, GPIO_PIN_RESET); + Duty_flag_A = 1; + htim1.Instance->CCR1 = TIME_PERIOD - PWM2_on; + } + } +} + +/** + *@brief PWM3 and PWM4 handler + *@retval None + */ +void PWM3_PWM4_handler() +{ + /*STATE 0 + if delta != 0, there is a channel with a duty lower than the other one. + So the channel with the lower duty is cleared. Delta is period - max_duty + (the duty of the other channel) + The machine passes to STATE 1. + + if delta == 0, the two channel are cleared together. + The machine passes to STATE 2 + + The delta is computed for the next timer event*/ + + if (channel_number < number_of_channels - 1) + { + if (delta != 0) + { +// HAL_GPIO_WritePin(GPIOA, channel, GPIO_PIN_RESET); + htim2.Instance->CCR2 = delta - 1; + htim2.Instance->CCR3 = delta - 1; + channel_number ++; + delta = period - max_duty; /*computed delta for the next reset of the counter*/ + channel = PWM_channels[channel_number]; + } + else + { +// HAL_GPIO_WritePin(GPIOA, PWM3_PIN |PWM4_PIN, GPIO_PIN_RESET); + delta = period - max_duty; + htim2.Instance->CCR2 = delta - 1; + htim2.Instance->CCR3 = delta - 1; + channel_number = number_of_channels; + } + } + /*STATE 1 + Here the channel with the max duty-cycle is cleared. The delta is that one + computed in STATE 0. The machine passes to STATE 2 */ + else if (channel_number == number_of_channels - 1) + { +// HAL_GPIO_WritePin(GPIOA, channel, GPIO_PIN_RESET); + htim2.Instance->CCR2 = delta - 1; + htim2.Instance->CCR3 = delta - 1; + channel_number ++; + } + /*STATE 2 + All the channels have been cleared and now are set again. The machine passes to STATE 0 */ + else + { /* channel_number > number_of_channels - 1 */ + HAL_GPIO_WritePin(GPIOA, PWM3_PIN | PWM4_PIN, GPIO_PIN_SET); + htim2.Instance->CCR2 = Ton_values[0] - 1; + htim2.Instance->CCR3 = Ton_values[1] - 1; + Ton_sorting(); + channel_number = 0; + delta = Ton_values[1] - Ton_values[0]; + channel = PWM_channels[0]; + } +} + +/** + *@brief Sorting on basis of duty cycle + *@retval None + */ + +void Ton_sorting(void) +{ + if (PWM3_on > PWM4_on) + { + max_duty = PWM3_on; + Ton_values[1] = PWM3_on; + Ton_values[0] = PWM4_on; + PWM_channels[1] = PWM3_PIN; + PWM_channels[0] = PWM4_PIN; + } + else + { + max_duty = PWM4_on; + Ton_values[0] = PWM3_on; + Ton_values[1] = PWM4_on; + PWM_channels[0] = PWM3_PIN; + PWM_channels[1] = PWM4_PIN; + } +} + + +/** + *@brief PWM modification + *@param PWM_ID: PWM number + *@param duty_cycle: Duty cycle at output + *@retval None + */ +void Modify_PWM(uint8_t PWM_ID, uint16_t duty_cycle) +{ +#if (( CFG_LPM_SUPPORTED == 0) && (ENABLE_PWM_SUPPORT == 1)) + GPIO_InitTypeDef GPIO_InitStructure1 = {0}; + + if (PWM_ID == 0) /* PD14 */ + { + if (duty_cycle == 0 && NonZeroPWM0 == 0) + { + GPIO_InitStructure1.Pin = PWM0_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStructure1.Pull = GPIO_NOPULL; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + HAL_GPIO_WritePin(GPIOD, PWM0_PIN, GPIO_PIN_RESET); + + NonZeroPWM0=1; + } + else if ((duty_cycle != 0 && NonZeroPWM0 == 1)) + { + GPIO_InitStructure1.Pin = PWM0_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure1.Pull = GPIO_PULLUP; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure1.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + + NonZeroPWM0=0; + } + } + else if((PWM_ID == 1)) /* GPIO3 */ + { + if (duty_cycle == 0 && NonZeroPWM1 == 0) + { + GPIO_InitStructure1.Pin = PWM1_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStructure1.Pull = GPIO_NOPULL; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + HAL_GPIO_WritePin(GPIOD, PWM1_PIN, GPIO_PIN_RESET); + + NonZeroPWM1=1; + } + else if ((duty_cycle != 0 && NonZeroPWM1 == 1)) + { + GPIO_InitStructure1.Pin = PWM1_PIN; + GPIO_InitStructure1.Mode = GPIO_MODE_AF_PP; + GPIO_InitStructure1.Pull = GPIO_PULLUP; + GPIO_InitStructure1.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + GPIO_InitStructure1.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOD, &GPIO_InitStructure1); + + NonZeroPWM1=0; + } + } + else + { + } + + DUTY = duty_cycle; + switch (PWM_ID) + { + case 0: /* PWM0 */ + { + htim1.Instance->CCR1 = DUTY; + } + break; + case 1: /* PWM1 */ + { + htim1.Instance->CCR2 = DUTY; + } + break; + case 2: /* PWM2 */ + { + PWM2_on = DUTY; + htim2.Instance->CCR1 = PWM2_on; + } + break; + case 3: /* PWM3 */ + { + PWM3_on = DUTY; + htim2.Instance->CCR2 = PWM3_on; + } + break; + case 4: /* PWM4 */ + { + PWM4_on = DUTY; + htim2.Instance->CCR3 = PWM4_on; + } + break; + } +#endif +} + +/** + * @brief Period elapsed callback in non blocking mode + * @param htim : TIM handle + * @retval None + */ +void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) +{ +#if 0 + if(htim->Instance == TIM1) + PWM2_handler(); + else + PWM3_PWM4_handler(); +#endif +} + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h new file mode 100644 index 000000000..4882feaae --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h @@ -0,0 +1,34 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file PWM_handlers.h + * @author MCD Application Team + * @brief Header Handlers for PWM and other support functions. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "PWM_config.h" +//#include "SDK_EVAL_Config.h" + +/* PWM2 handler */ +void PWM2_handler(void); + +/* PWM3 and PWM4 handler */ +void PWM3_PWM4_handler(void); + +/* Here the channel with the lower duty-cycle is established*/ +void Ton_sorting(void); + +/* Handle modifications in duty cycle */ +void Modify_PWM(uint8_t PWM_ID, uint16_t duty_cycle); diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c new file mode 100644 index 000000000..9f3857506 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c @@ -0,0 +1,509 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +#include "app_common.h" + +#include "dbg_trace.h" +#include "ble.h" +#include "tl.h" +#include "app_ble.h" + +#include "stm32_seq.h" +#include "shci.h" +#include "stm32_lpm.h" +#include "otp.h" + +#include "types.h" +#include "ble_mesh.h" +#include "mesh_cfg.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ + +/** + * security parameters structure + */ +typedef struct _tSecurityParams +{ + /** + * IO capability of the device + */ + uint8_t ioCapability; + + /** + * Authentication requirement of the device + * Man In the Middle protection required? + */ + uint8_t mitm_mode; + + /** + * bonding mode of the device + */ + uint8_t bonding_mode; + + /** + * this variable indicates whether to use a fixed pin + * during the pairing process or a passkey has to be + * requested to the application during the pairing process + * 0 implies use fixed pin and 1 implies request for passkey + */ + uint8_t Use_Fixed_Pin; + + /** + * minimum encryption key size requirement + */ + uint8_t encryptionKeySizeMin; + + /** + * maximum encryption key size requirement + */ + uint8_t encryptionKeySizeMax; + + /** + * fixed pin to be used in the pairing process if + * Use_Fixed_Pin is set to 1 + */ + uint32_t Fixed_Pin; + + /** + * this flag indicates whether the host has to initiate + * the security, wait for pairing or does not have any security + * requirements.\n + * 0x00 : no security required + * 0x01 : host should initiate security by sending the slave security + * request command + * 0x02 : host need not send the clave security request but it + * has to wait for paiirng to complete before doing any other + * processing + */ + uint8_t initiateSecurity; +}tSecurityParams; + +/** + * global context + * contains the variables common to all + * services + */ +typedef struct _tBLEProfileGlobalContext +{ + + /** + * security requirements of the host + */ + tSecurityParams bleSecurityParam; + + /** + * gap service handle + */ + uint16_t gapServiceHandle; + + /** + * device name characteristic handle + */ + uint16_t devNameCharHandle; + + /** + * appearance characteristic handle + */ + uint16_t appearanceCharHandle; + + /** + * connection handle of the current active connection + * When not in connection, the handle is set to 0xFFFF + */ + uint16_t connectionHandle; + + /** + * length of the UUID list to be used while advertising + */ + uint8_t advtServUUIDlen; + + /** + * the UUID list to be used while advertising + */ + uint8_t advtServUUID[100]; + +}BleGlobalContext_t; + +typedef struct +{ + BleGlobalContext_t BleApplicationContext_legacy; + APP_BLE_ConnStatus_t Device_Connection_Status; + + /** + * ID of the Advertising Timeout + */ + uint8_t Advertising_mgr_timer_Id; + +} BleApplicationContext_t; +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define APPBLE_GAP_DEVICE_NAME_LENGTH 7 +#define FAST_ADV_TIMEOUT (30*1000*1000/CFG_TS_TICK_VAL) /**< 30s */ +#define INITIAL_ADV_TIMEOUT (60*1000*1000/CFG_TS_TICK_VAL) /**< 60s */ + +#define BD_ADDR_SIZE_LOCAL 6 + +/* USER CODE BEGIN PD */ +#define LED_ON_TIMEOUT (0.005*1000*1000/CFG_TS_TICK_VAL) /**< 5ms */ +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer; + +uint8_t Test_Status =0x00; + +static const uint8_t M_bd_addr[BD_ADDR_SIZE_LOCAL] = +{ + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) +}; + +static uint8_t bd_addr_udn[BD_ADDR_SIZE_LOCAL]; + +PLACE_IN_SECTION("BLE_APP_CONTEXT") static BleApplicationContext_t BleApplicationContext; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Extern function prototypes -----------------------------------------------*/ +extern void HCI_Event_CB(void *pckt); + +/* Global variables ----------------------------------------------------------*/ +const uint8_t *bd_addr; + +/* Private function prototypes -----------------------------------------------*/ +static void BLE_UserEvtRx( void * pPayload ); +static void BLE_StatusNot( HCI_TL_CmdStatus_t status ); +static void Ble_Tl_Init( void ); +static const uint8_t* BleGetBdAddress( void ); + +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* External variables --------------------------------------------------------*/ + +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Functions Definition ------------------------------------------------------*/ +void APP_BLE_Init( void ) +{ +/* USER CODE BEGIN APP_BLE_Init_1 */ + +/* USER CODE END APP_BLE_Init_1 */ + SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = + { + {{0,0,0}}, /**< Header unused */ + {0, /** pBleBufferAddress not used */ + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} + }; + + /** + * Initialize Ble Transport Layer + */ + Ble_Tl_Init( ); + +#if (CFG_LPM_STANDBY_SUPPORTED == 0) + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP_BLE, UTIL_LPM_DISABLE); +#endif + + /** + * Do not allow stop mode in the application + */ +#if (LOW_POWER_FEATURE == 0) + UTIL_LPM_SetStopMode(1 << CFG_LPM_APP_BLE, UTIL_LPM_DISABLE); +#endif + + /** + * Register the hci transport layer to handle BLE User Asynchronous Events + */ + UTIL_SEQ_RegTask( 1<> 8 ); + bd_addr_udn[2] = (uint8_t)device_id; + bd_addr_udn[3] = (uint8_t)(company_id & 0x000000FF); + bd_addr_udn[4] = (uint8_t)( (company_id & 0x0000FF00) >> 8 ); + bd_addr_udn[5] = (uint8_t)( (company_id & 0x00FF0000) >> 16 ); + + bd_addr = (const uint8_t *)bd_addr_udn; + } + else + { + otp_addr = OTP_Read(0); + if(otp_addr) + { + bd_addr = ((OTP_ID0_t*)otp_addr)->bd_address; + } + else + { + bd_addr = M_bd_addr; + } + } + + return bd_addr; +} + +/* USER CODE BEGIN FD_LOCAL_FUNCTION */ + +/* USER CODE END FD_LOCAL_FUNCTION */ + +/************************************************************* + * + *SPECIFIC FUNCTIONS + * + *************************************************************/ +/* USER CODE BEGIN FD_SPECIFIC_FUNCTIONS */ + +/* USER CODE END FD_SPECIFIC_FUNCTIONS */ +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void hci_notify_asynch_evt(void* pdata) +{ + UTIL_SEQ_SetTask( 1<pckt->evtserial)); + if (svctl_return_status != SVCCTL_UserEvtFlowDisable) + { + pParam->status = HCI_TL_UserEventFlow_Enable; + } + else + { + pParam->status = HCI_TL_UserEventFlow_Disable; + } +} + +static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) +{ + uint32_t task_id_list; + switch (status) + { + case HCI_TL_CmdBusy: + /** + * All tasks that may send an aci/hci commands shall be listed here + * This is to prevent a new command is sent while one is already pending + */ + task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; + UTIL_SEQ_PauseTask(task_id_list); + + break; + + case HCI_TL_CmdAvailable: + /** + * All tasks that may send an aci/hci commands shall be listed here + * This is to prevent a new command is sent while one is already pending + */ + task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; + UTIL_SEQ_ResumeTask(task_id_list); + + break; + + default: + break; + } + return; +} + +void SVCCTL_ResumeUserEventFlow( void ) +{ + hci_resume_flow(); + return; +} + +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ + +/* USER CODE END FD_WRAP_FUNCTIONS */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h new file mode 100644 index 000000000..6fd1b71af --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h @@ -0,0 +1,76 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_BLE_H +#define APP_BLE_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "hci_tl.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ + +typedef enum +{ + APP_BLE_IDLE, + APP_BLE_FAST_ADV, + APP_BLE_LP_ADV, + APP_BLE_SCAN, + APP_BLE_LP_CONNECTING, + APP_BLE_CONNECTED_SERVER, + APP_BLE_CONNECTED_CLIENT +} APP_BLE_ConnStatus_t; + +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ +void APP_BLE_Init( void ); + +#ifdef __cplusplus +} +#endif + +#endif /*APP_BLE_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c new file mode 100644 index 000000000..b1f206c0e --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c @@ -0,0 +1,358 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config.c + * @author MCD Application Team + * @brief Config Model APIs callback from ST BLE Mesh Library + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include +#include "hal_common.h" +#include "ble_mesh.h" +#include "appli_config.h" +#include "mesh_cfg.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private define ------------------------------------------------------------*/ + +/* Private macro -------------------------------------------------------------*/ + +/* Private variables ---------------------------------------------------------*/ + + +/*****************************Config Model Callbacks***************************/ +/** +* @brief Callback from Config Model to receive the AppKey Add Command +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndex +* appKey, keySize & status +* @retval none +*/ +void Appli_GetAppKeyAddParamsCb(model_securityKeyParams_t* appKeyAddParams) +{ + TRACE_I(TF_CONFIG_SERVER,"AppKey Add received for netKeyIndex %.2x, appKeyIndex %.2x \r\n",\ + appKeyAddParams->netKeyIndex, appKeyAddParams->appKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyAddParams->status); + /*Success Command*/ + if(appKeyAddParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"AppKey is: "); + for (MOBLEUINT8 count=0 ; countkeySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(appKeyAddParams->appKey)); + appKeyAddParams->appKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the AppKey Delete Command +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndex +* appKey, keySize & status +* @retval none +*/ +void Appli_GetAppKeyDeleteParamsCb(model_securityKeyParams_t* appKeyDeleteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"App Key Delete received for netKeyIndex %.2x, appKeyIndex %.2x \r\n",\ + appKeyDeleteParams->netKeyIndex, appKeyDeleteParams->appKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyDeleteParams->status); +} + +/** +* @brief Callback from Config Model to receive the AppKey List +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndexes & appKeyListParams Size +* @retval none +*/ +void Appli_GetAppKeyListParamsCb(model_appKeyListParams_t* appKeyListParams) +{ + TRACE_I(TF_CONFIG_SERVER,"App Key List for netKeyIndex %.2x is \r\n", appKeyListParams->netKeyIndex); + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyListParams->status); + /*Success*/ + if(appKeyListParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"AppKey Indexes are: \r\n"); + for (MOBLEUINT8 count=0 ; count< appKeyListParams->appKeyIndexList_size; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(appKeyListParams->appKeyIndexList)); + appKeyListParams->appKeyIndexList++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the Updated App Key +* @param Structure Pointer having parameters - netKeyIndex, appKeyIndex +* appKey, keySize & status +* @retval none +*/ +void Appli_GetAppKeyUpdateParamsCb(model_securityKeyParams_t* appKeyUpdatedParams) +{ + TRACE_I(TF_CONFIG_SERVER,"App Key Update received for netKeyIndex %.2x, appKeyIndex %.2x \r\n",\ + appKeyUpdatedParams->netKeyIndex, appKeyUpdatedParams->appKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", appKeyUpdatedParams->status); + + /*Success Command*/ + if(appKeyUpdatedParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"Updated AppKey is: "); + for (MOBLEUINT8 count=0 ; countkeySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(appKeyUpdatedParams->appKey)); + appKeyUpdatedParams->appKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + TRACE_I(TF_CONFIG_SERVER,"It will be replaced by old appKey after Key Refresh \r\n"); + } + +} + +/** +* @brief Callback from Config Model to receive the NetKey Add Command +* @param Structure Pointer having parameters - netKeyIndex & netKey +* @retval none +*/ +void Appli_GetNetKeyAddParamsCb(model_securityKeyParams_t* netKeyAddParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Net Key Add received for netKeyIndex %.2x \r\n",\ + netKeyAddParams->netKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyAddParams->status); + + /*Success Command*/ + if(netKeyAddParams->status == 0x00) + { + TRACE_I(TF_CONFIG_SERVER,"NetKey is: "); + for (MOBLEUINT8 count=0 ; count < netKeyAddParams->keySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(netKeyAddParams->netKey)); + netKeyAddParams->netKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the NetKey Delete Command +* @param Structure Pointer having parameters - netKeyIndex & netKey +* @retval none +*/ +void Appli_GetNetKeyDeleteParamsCb(model_securityKeyParams_t* netKeyDeleteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Net Key Delete received for netKeyIndex %d \r\n",\ + netKeyDeleteParams->netKeyIndex); + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyDeleteParams->status); +} + +/** +* @brief Callback from Config Model to receive the NetKey List +* @param Structure Pointer having parameters - netKeyIndexes & netKeyListParams Size +* @retval none +*/ +void Appli_GetNetKeyListParamsCb(model_netKeyListParams_t* netKeyListParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyListParams->status); + TRACE_I(TF_CONFIG_SERVER,"NetKey Indexes are: \r\n"); + for (MOBLEUINT8 count=0 ; count< netKeyListParams->netKeyIndexList_size; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(netKeyListParams->netKeyIndexList)); + netKeyListParams->netKeyIndexList++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); +} + + +/** +* @brief Callback from Config Model to receive the Updated NetKey Command +* @param Structure Pointer having parameters - netKeyIndex & netKey +* @retval none +*/ +void Appli_GetNetKeyUpdateParamsCb(model_securityKeyParams_t* netKeyUpdatedParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Net Key Update received for netKeyIndex %d \r\n",\ + netKeyUpdatedParams->netKeyIndex); + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", netKeyUpdatedParams->status); + if(netKeyUpdatedParams->status == 0) + { + TRACE_I(TF_CONFIG_SERVER,"Updated NetKey is:"); + for (MOBLEUINT8 count=0; countkeySize; count++) + { + TRACE_I(TF_CONFIG_SERVER,"%.2x", *(netKeyUpdatedParams->netKey)); + netKeyUpdatedParams->netKey++; + } + TRACE_I(TF_CONFIG_SERVER," \r\n"); + TRACE_I(TF_CONFIG_SERVER,"It will be replaced by old netKey after Key Refresh \r\n"); + } +} + +/** +* @brief Callback from Config Model to receive the AppKey binding params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex & modelID +* @retval none +*/ +void Appli_GetAppKeyBindingParamsCb(model_appKeyBindingParams_t* appKeyBindParams) +{ + TRACE_I(TF_CONFIG_SERVER,"AppKey binding received for elementIndex %d, modelID %.2lx,\ + appKeyIndex %.2x & status %.2x \r\n", appKeyBindParams->elementIndex,\ + appKeyBindParams->modelID, appKeyBindParams->appKeyIndex, appKeyBindParams->status); +} + +/** +* @brief Callback from Config Model to receive the AppKey Unbinding params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex & modelID +* @retval none +*/ +void Appli_GetAppKeyUnBindingParamsCb(model_appKeyBindingParams_t* appKeyUnbindParams) +{ + TRACE_I(TF_CONFIG_SERVER,"AppKey unbinding received for elementIndex %d, modelID %.2lx,\ + appKeyIndex %.2x & status %.2x \r\n",appKeyUnbindParams->elementIndex,\ + appKeyUnbindParams->modelID, appKeyUnbindParams->appKeyIndex,\ + appKeyUnbindParams->status); +} + +/** +* @brief Callback from Config Model to receive the Subscription Add params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex, modelID +* subAddress, isVirtual & allSubDeleted +* @retval none +*/ +void Appli_GetSubAddParamsCb(model_subParams_t* subAddParams) +{ + + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", subAddParams->status); + if(subAddParams->isVirtual) + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Virtual Add received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subAddParams->elementIndex, subAddParams->modelID,\ + subAddParams->subAddress); + } + + else + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Add received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subAddParams->elementIndex, subAddParams->modelID,\ + subAddParams->subAddress); + } +} + +/** +* @brief Callback from Config Model to receive the Subscription Delete params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex, modelID +* subAddress, isVirtual & allSubDeleted +* @retval none +*/ +void Appli_GetSubDeleteParamsCb(model_subParams_t* subDeleteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", subDeleteParams->status); + if(subDeleteParams->isVirtual) + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Virtual Add Delete received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subDeleteParams->elementIndex, subDeleteParams->modelID,\ + subDeleteParams->subAddress); + + } + + else if(subDeleteParams->allSubDeleted) + { + + TRACE_I(TF_CONFIG_SERVER,"Delete All Subscription received for elementIndex %d, modelID %.2lx \r\n",\ + subDeleteParams->elementIndex, subDeleteParams->modelID); + + } + else + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Delete received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subDeleteParams->elementIndex, subDeleteParams->modelID,\ + subDeleteParams->subAddress); + } +} + +/** +* @brief Callback from Config Model to receive the Subscription Overwrite params +* @param Structure Pointer having parameters - elementIndex, appKeyIndex, modelID +* subAddress, isVirtual & allSubDeleted +* @retval none +*/ +void Appli_GetSubOverwriteParamsCb(model_subParams_t* subOverwriteParams) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", subOverwriteParams->status); + if(subOverwriteParams->isVirtual) + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Virtual Overwrite received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subOverwriteParams->elementIndex, subOverwriteParams->modelID,\ + subOverwriteParams->subAddress); + + } + + else + { + TRACE_I(TF_CONFIG_SERVER,"Subscription Overwrite received for elementIndex %d, modelID %.2lx & subAddress %.2x \r\n",\ + subOverwriteParams->elementIndex, subOverwriteParams->modelID,\ + subOverwriteParams->subAddress); + } +} + +/** +* @brief Callback from Config Model to receive the Publication Parameters +* @param Structure Pointer having parameters - modelID, elementAddress, +* Publish Address, PublishPeriod, PublishTTL, Credential Flag, +* Publish AppKeyIndex, Retransmit Count, Restransmit Interval Steps & status +* @retval none +*/ +void Appli_GetPublicationSetParamsCb(model_publicationparams_t* pPubParameters) +{ + if(pPubParameters->modelID == SENSOR_SERVER_MODEL_ID) + { + Sensor_ModelPublishSet(pPubParameters); + } +} + +/** +* @brief Callback from Config Model to receive the Publication Parameters +* @param Structure Pointer having parameters - modelID, elementAddress, +* Publish Address, PublishPeriod, PublishTTL, Credential Flag, +* Publish AppKeyIndex, Retransmit Count, Restransmit Interval Steps & status +* @retval none +*/ +void Appli_GetPublicationGetParamsCb(model_publicationparams_t* pPubParameters) +{ + TRACE_I(TF_CONFIG_SERVER,"Status is : %.2x \r\n", pPubParameters->status); + TRACE_I(TF_CONFIG_SERVER,"Received Publication parameters: credentialFlag = %.2x,\ + elementAddress = %.2x, modelID = %.2lx, appKeyIndex = %.2x,\ + publishPeriod = %.2x, publishRetransmitCount = %.2x, publishRetransmitIntervalSteps = %.2x,\ + publishTTL = %.2x \r\n", pPubParameters->credentialFlag, pPubParameters->elementAddress, pPubParameters->modelID,\ + pPubParameters->publishAppKeyIndex, pPubParameters->publishPeriod, pPubParameters->publishRetransmitCount,\ + pPubParameters->publishRetransmitIntervalSteps, pPubParameters->publishTTL); +} + +/** +* @} +*/ + +/** +* @} +*/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h new file mode 100644 index 000000000..b33d059fc --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h @@ -0,0 +1,52 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config.h + * @author MCD Application Team + * @brief Header file for the application config file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_CONFIG_H +#define __APPLI_CONFIG_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "mesh_cfg.h" +#include "mesh_cfg_usr.h" +#include "sensors.h" +#include "common.h" +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ + +/* Exported Functions Prototypes ---------------------------------------------*/ +void Appli_GetAppKeyAddParamsCb(model_securityKeyParams_t*); +void Appli_GetAppKeyDeleteParamsCb(model_securityKeyParams_t*); +void Appli_GetAppKeyListParamsCb(model_appKeyListParams_t*); +void Appli_GetAppKeyUpdateParamsCb(model_securityKeyParams_t*); +void Appli_GetNetKeyAddParamsCb(model_securityKeyParams_t*); +void Appli_GetNetKeyDeleteParamsCb(model_securityKeyParams_t*); +void Appli_GetNetKeyListParamsCb(model_netKeyListParams_t*); +void Appli_GetNetKeyUpdateParamsCb(model_securityKeyParams_t*); +void Appli_GetAppKeyBindingParamsCb(model_appKeyBindingParams_t*); +void Appli_GetAppKeyUnBindingParamsCb(model_appKeyBindingParams_t*); +void Appli_GetSubAddParamsCb(model_subParams_t*); +void Appli_GetSubDeleteParamsCb(model_subParams_t*); +void Appli_GetSubOverwriteParamsCb(model_subParams_t*); +void Appli_GetPublicationSetParamsCb(model_publicationparams_t*); +void Appli_GetPublicationGetParamsCb(model_publicationparams_t*); + +#endif /* __APPLI_CONFIG_H */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c new file mode 100644 index 000000000..30f54770c --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c @@ -0,0 +1,1917 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config_client.c + * @author MCD Application Team + * @brief Application interface for Config CLient Mesh Model + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "mesh_cfg.h" +#include "appli_nvm.h" +#include "config_client.h" +#include "appli_config_client.h" +#include "appli_mesh.h" +#include "sensors.h" +#include "light_lc.h" +#include "vendor.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ + +#define DEFAULT_GROUP_ADDR 0xC000 +#define DEFAULT_PUBLISH_ADDR 0xC000 +#define DEFAULT_NETKEY_INDEX 0x0000 +#define DEFAULT_APPKEY_INDEX 0x0000 +#define DEFAULT_CREDENTIAL_FLAG 0x00 +#define DEFAULT_PUBLISH_TTL 0x08 +#define DEFAULT_PUBLISH_PERIOD 0x00 +#define DEFAULT_PUBLISH_RETRANSMIT_COUNT 0x00 +#define DEFAULT_PUBLISH_RETRANSMIT_INTERVAL_STEPS 0x00 + +#define NUM_VENDOR_MODELS_TO_SUBSCRIBE 0 +#define NUM_VENDOR_MODELS_TO_PUBLISH 0 +#define NUM_VENDOR_MODELS_TO_BIND_APP 0 + +/******************************************************************************/ +#if defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) +/******************************************************************************/ + +const MOBLEUINT8 aConfigAppKeyDefault[19]= + { /* NetKeyIndexAndAppKeyIndex : 3B + Index of the NetKey and index of the AppKey*/ + (MOBLEUINT8)(DEFAULT_NETKEY_INDEX & 0x00ff), + (MOBLEUINT8)((DEFAULT_NETKEY_INDEX & 0x0f00) >> 8) | (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX & 0x000f) << 4), + (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX >>4) & 0xff), + /* AppKey is initialised as below = 16B */ + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10 }; + + +const MOBLEUINT8 aConfigAppKeyDeleteDefault[3]= + { /* NetKeyIndexAndAppKeyIndex : 3B + Index of the NetKey and index of the AppKey*/ + (MOBLEUINT8)(DEFAULT_NETKEY_INDEX & 0x00ff), + (MOBLEUINT8)((DEFAULT_NETKEY_INDEX & 0x0f00) >> 8) | (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX & 0x000f) << 4), + (MOBLEUINT8) ((DEFAULT_APPKEY_INDEX >>4) & 0xff)}; + + +const MOBLEUINT8 aConfigAppKeyGetDefault[2]= + { /* NetKeyIndex : 2B + Index of the NetKey */ + (MOBLEUINT8)(DEFAULT_NETKEY_INDEX & 0x00ff), + (MOBLEUINT8)((DEFAULT_NETKEY_INDEX & 0x0f00) >> 8) }; + +const MOBLEUINT8 aNoParamDefaultConfig; + +const MOBLEUINT8 aNoInitParamDefault[MAX_CONFIG_PARAM_SIZE]= {0}; + +/* Private macro -------------------------------------------------------------*/ + +const MODEL_CONFIG_CLIENT_OpcodeTableParam_t ConfigClient_MessageOpcodes_Table[] = { + /* MOBLEUINT16 opcode, + MOBLEUINT8 min_payload_size, + MOBLEUINT8 max_payload_size; + Here in this array, Handler is not defined; */ + + /* 4.3.2.37 Config AppKey Add, Opcode = 0x00 + The Config AppKey Add is an acknowledged message used to add an AppKey + to the AppKey List on a node and bind it to the NetKey identified by + NetKeyIndex. The added AppKey can be used by the node only as a pair with + the specified NetKey. + The AppKey is used to authenticate and decrypt messages it receives, as well + as authenticate and encrypt messages it sends. + The response to a Config AppKey Add message is a Config AppKey Status message. + + message parameters: + ------------------- + NetKeyIndexAndAppKeyIndex: 3B : Index of the NetKey and index of the AppKey + AppKey 16B : AppKey value */ + { OPCODE_CONFIG_APPKEY_ADD, 19, 19, aConfigAppKeyDefault }, + + /* 4.3.2.39 Config AppKey Delete, Opcode = 0x80 0x00 + The Config AppKey Delete is an acknowledged message used to delete an + AppKey from the AppKey List on a node. + The response to a Config AppKey Delete message is a + Config AppKey Status message. + + message parameters: + ------------------- + NetKeyIndexAndAppKeyIndex : 3B : Index of the NetKey and index of the AppKey + */ + { OPCODE_CONFIG_APPKEY_DELETE, 3, 3, aConfigAppKeyDeleteDefault }, + + /* 4.3.2.41 Config AppKey Get, Opcode = 0x80 0x01 + The AppKey Get is an acknowledged message used to report all AppKeys bound + to the NetKey. + The response to a Config AppKey Get message is a Config AppKey List message */ + { OPCODE_CONFIG_APPKEY_GET, 2, 2, aConfigAppKeyGetDefault }, + + /* 4.3.2.38 Config AppKey Update, Opcode = 0x01 + The Config AppKey Update is an acknowledged message used to update an + AppKey value on the AppKey List on a node. The updated AppKey is used by + the node to authenticate and decrypt messages it receives, as well as + authenticate and encrypt messages it sends, as defined by the Key Refresh procedure (see Section 3.10.4). + The response to an Config AppKey Update message is an Config AppKey Status message. + + message parameters: + ------------------- + NetKeyIndexAndAppKeyIndex: 3B : Index of the NetKey and index of the AppKey + AppKey 16B : AppKey value */ + { OPCODE_CONFIG_APPKEY_UPDATE, 19, 19, aConfigAppKeyDefault }, + + /* 4.3.2.1 Config Beacon Get, Opcode = 0x80 0x09 + The Config Beacon Get is an acknowledged message used to get the current + Secure Network Beacon state of a node (see Section 4.2.10). + The response to a Config Beacon Get message is a Config Beacon Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_BEACON_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.2 Config Beacon Set, Opcode = 0x80 0x0A + The Config Beacon Set is an acknowledged message used to set the + Secure Network Beacon state of a node (see Section 4.2.10). + The response to a Config Beacon Set message is a Config Beacon Status message. + Beacon : 1B: New Secure Network Beacon state*/ + { OPCODE_CONFIG_BEACON_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.4 Config Composition Data Get, Opcode = 0x80 0x08 + The Config Composition Data Get is an acknowledged message used to read + one page of the Composition Data (see Section 4.2.1). + The response to a Config Composition Data Get message is a + Config Composition Data Status message. + Page : 1B : Page number of the Composition Data */ + { OPCODE_CONFIG_COMPOSITION_DATA_GET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.16 Config Model Publication Set, Opcode = 0x03 + The Config Model Publication Set is an acknowledged message used to set the + Model Publication state (see Section 4.2.2) of an outgoing message that + originates from a model. + The response to a Config Model Publication Set message is a + Config Model Publication Status message. + The Config Model Publication Set message uses a single octet opcode to + maximize the size of a payload. + + ElementAddress : 16b : Address of the element + PublishAddress : 16b : Value of the publish address + AppKeyIndex : 12b : Index of the application key + CredentialFlag : 1b : Value of the Friendship Credential Flag + RFU : 3b : Reserved for Future Use + PublishTTL : 8b : Default TTL value for the outgoing messages + PublishPeriod : 8b : Period for periodic status publishing + PublishRetransmitCount : 3b : Number of retransmissions for each published message + PublishRetransmitIntervalSteps : 5b: Number of 50-millisecond steps between retransmissions + ModelIdentifier: 16 or 32b: SIG Model ID or Vendor Model ID + */ + + { OPCODE_CONFIG_CONFIG_MODEL_PUBLICATION_SET, 11, 13, }, + + /* 4.3.2.6 Config Default TTL Get, Opcode = 0x80 0x0C + The Config Default TTL Get is an acknowledged message used to get the + current Default TTL state of a node. + The response to a Config Default TTL Get message is a Config Default TTL Status message. + There are no Parameters for this message. + */ + { OPCODE_CONFIG_DEFAULT_TTL_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.7 Config Default TTL Set, Opcode = 0x80 0x0D + The Config Default TTL Set is an acknowledged message used to set the + Default TTL state of a node (see Section 4.2.7). + The response to a Config Default TTL Set message is a + Config Default TTL Status message. + TTL : 1B : New Default TTL value*/ + { OPCODE_CONFIG_DEFAULT_TTL_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.55 Config Friend Get, Opcode = 0x80 0x0F + The Config Friend Get is an acknowledged message used to get the current + Friend state of a node (see Section 4.2.13). + The response to a Config Friend Get message is a Config Friend Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_FRIEND_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.56 Config Friend Set, Opcode = 0x80 0x10 + The Config Friend Set is an acknowledged message used to set the + Friend state of a node (see Section 4.2.13). + The response to a Config Friend Set message is a Config Friend Status message. + Friend : 1B : New Friend state */ + { OPCODE_CONFIG_FRIEND_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.9 Config GATT Proxy Get, Opcode = 0x80 0x12 + The Config GATT Proxy Get is an acknowledged message used to get the + current GATT Proxy state of a node (see Section 4.2.11). + The response to a Config GATT Proxy Get message is a + Config GATT Proxy Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_GATT_PROXY_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.10 Config GATT Proxy Set, Opcode = 0x80 0x12 + The Config GATT Proxy Set is an acknowledged message used to set the + GATT Proxy state of a node (see Section 4.2.11). + The response to a Config GATT Proxy Set message is a Config GATT Proxy + Status message + GATTProxy : 1B : New GATT Proxy state */ + { OPCODE_CONFIG_GATT_PROXY_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.61 Config Heartbeat Publication Get, Opcode = 0x80 0x38 + The Config Heartbeat Publication Get is an acknowledged message used to get + the current Heartbeat Publication state of an element (see Section 4.2.17). + The response to a Config Heartbeat Publication Get message is a + Config Heartbeat Publication Status message. + The message has no parameters.*/ + { OPCODE_CONFIG_HEARTBEAT_PUBLICATION_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.62 Config Heartbeat Publication Set, Opcode = 0x80 0x39 + The Config Heartbeat Publication Set is an acknowledged message used to set + the current Heartbeat Publication state of an element (see Section 4.2.17). + The response to a Config Heartbeat Publication Set message is a + Config Heartbeat Publication Status message. + + Destination : 2B : Destination address for Heartbeat messages + CountLog : 1B : Number of Heartbeat messages to be sent + PeriodLog : 1B : Period for sending Heartbeat messages + TTL : 1B : TTL to be used when sending Heartbeat messages + Features : 2B : Bit field indicating features that trigger Heartbeat messages when changed + NetKeyIndex : 2B : NetKey Index + */ + { OPCODE_CONFIG_HEARTBEAT_PUBLICATION_SET, 9, 9, aNoInitParamDefault }, + + /* 4.3.2.64 Config Heartbeat Subscription Get, Opcode = 0x80 0x3A + The Config Heartbeat Subscription Get is an acknowledged message used to get + the current Heartbeat Subscription state of an element (see Section 4.2.18). + The response to a Config Heartbeat Subscription Get message is a + Config Heartbeat Subscription Status message. + The message has no parameters. */ + { OPCODE_CONFIG_HEARTBEAT_SUBSCRIPTION_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.65 Config Heartbeat Subscription Set, Opcode = 0x80 0x3B + The Config Heartbeat Subscription Set is an acknowledged message used to + set the current Heartbeat Subscription state of an element (see Section 4.2.18). + The response to a Config Heartbeat Subscription Set message is a + Config Heartbeat Subscription Status message. + + Source : 2B : Source address for Heartbeat messages + Destination : 2B : Destination address for Heartbeat messages + PeriodLog : 1B : Period for receiving Heartbeat messages */ + { OPCODE_CONFIG_HEARTBEAT_SUBSCRIPTION_SET, 5, 5, aNoInitParamDefault }, + + /* 4.3.2.58 Config Key Refresh Phase Get, Opcode = 0x80 0x15 + The Config Key Refresh Phase Get is an acknowledged message used to get the + current Key Refresh Phase state of the identified network key. + The response to a Config Key Refresh Phase Get message is a + Config Key Refresh Phase Status message. + NetKeyIndex : 2B : NetKey Index*/ + { OPCODE_CONFIG_KEY_REFRESH_PHASE_GET, 2, 2, aNoInitParamDefault }, + + /* 4.3.2.59 Config Key Refresh Phase Set, Opcode = 0x80 0x16 + The Config Key Refresh Phase Set is an acknowledged message used to set the + Key Refresh Phase state of the identified network key (see Section 4.2.14). + The response to a Config Key Refresh Phase Set message is a + Config Key Refresh Phase Status message. + + NetKeyIndex : 2B : NetKey Index + Transition : 1B : New Key Refresh Phase Transition */ + { OPCODE_CONFIG_KEY_REFRESH_PHASE_SET, 3, 3, aNoInitParamDefault }, + + /* 4.3.2.67 Config Low Power Node PollTimeout Get, Opcode = 0x80 0x2D + The Config Low Power Node PollTimeout Get is an acknowledged message used + to get the current value of PollTimeout timer of the Low Power node within + a Friend node (see Section 3.6.6.1). The message is sent to a Friend node + that has claimed to be handling messages by sending ACKs On Behalf Of (OBO) + the indicated Low Power node. This message should only be sent to a node + that has the Friend feature supported and enabled. + The response to a Config Low Power Node PollTimeout Get message is a + Config Low Power Node PollTimeout Status message. + + LPNAddress : 2B : The unicast address of the Low Power node */ + { OPCODE_CONFIG_LOW_POWER_NODE_POLLTIMEOUT_GET, 2, 2, aNoInitParamDefault }, + + + /* 4.3.3.12 Health Attention Get + The Health Attention Get is an acknowledged message used to get the current + Attention Timer state of an element (see Section 4.2.9). + The response to a Health Attention Get message is an Attention Status message. + There are no Parameters for this message.*/ + { OPCODE_HEALTH_ATTENTION_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.3.13 Health Attention Set + The Health Attention Set is an acknowledged message used to set the + Attention Timer state of an element (see Section 4.2.9). + The response to a Health Attention Set message is a + Health Attention Status message + Attention: 1B: Value of the Attention Timer state*/ + { OPCODE_HEALTH_ATTENTION_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.3.14 Health Attention Set Unacknowledged + The Health Attention Set Unacknowledged is an unacknowledged message used + to set the Attention Timer state of an element (see Section 4.2.9). */ + { OPCODE_HEALTH_ATTENTION_SET_UNACKNOWLEDGED, 1, 1, aNoInitParamDefault }, + + + + + + + /* 4.3.2.15 Config Model Publication Get + The Config Model Publication Get is an acknowledged message used to get the + publish address and parameters of an outgoing message that originates + from a model. + The response to a Config Model Publication Get message is a + Config Model Publication Status message. + + ElementAddress : 2B : Address of the element + ModelIdentifier : 2 or 4B : SIG Model ID or Vendor Model ID + */ + { OPCODE_CONFIG_MODEL_PUBLICATION_GET, 4, 6, aNoInitParamDefault }, + + /* 4.3.2.17 Config Model Publication Virtual Address Set + The Config Model Publication Virtual Address Set is an acknowledged message + used to set the model Publication state (see Section 4.2.2) of an + outgoing message that originates from a model. + The response to a Config Model Publication Virtual Address Set message is + a Config Model Publication Status message. + + ElementAddress : 16b : Address of the element + PublishAddress : 128b : Value of the Label UUID publish address + AppKeyIndex : 12b : Index of the application key + CredentialFlag : 1b : Value of the Friendship Credential Flag + RFU : 3b : Reserved for Future Use + PublishTTL : 8b : Default TTL value for the outgoing messages + PublishPeriod : 8b : Period for periodic status publishing + PublishRetransmitCount : 3b : Number of retransmissions for each published message + PublishRetransmitIntervalSteps : 5b: Number of 50-millisecond steps between retransmissions + ModelIdentifier: 16 or 32b: SIG Model ID or Vendor Model ID + */ + { OPCODE_CONFIG_MODEL_PUBLICATION_VIRTUAL_ADDRESS_SET, 25, 27, aNoInitParamDefault }, + + /* 4.3.2.19 Config Model Subscription Add + The Config Model Subscription Add is an acknowledged message used to add an + address to a Subscription List of a model (see Section 4.2.3). + + The response to a Config Model Subscription Add message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + address : 2B : Value of the address + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID +*/ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_ADD, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.21 Config Model Subscription Delete + The Config Model Subscription Delete is an acknowledged message used to + delete a subscription address from the Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Delete message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + address : 2B : Value of the address + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID + */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_DELETE, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.25 Config Model Subscription Delete All + The Config Model Subscription Delete All is an acknowledged message used to + discard the Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Delete All message is a + Config Model Subscription Status message. + ElementAddress : 2B : Address of the element + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_DELETE_ALL, 4, 6, aNoInitParamDefault }, + + /* 4.3.2.23 Config Model Subscription Overwrite + The Config Model Subscription Overwrite is an acknowledged message used to + discard the Subscription List and add an address to the + cleared Subscription List of a model (see Section 4.2.3). + + The response to a Config Model Subscription Overwrite message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + address : 2B : Value of the address + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_OVERWRITE, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.20 Config Model Subscription Virtual Address Add + The Config Model Subscription Virtual Address Add is an acknowledged message + used to add an address to a Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Virtual Address Add message is a + Config Model Subscription Status message. + + ElementAddress : 2B : Address of the element + Label : 16B : Value of the Label UUID + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_VIRTUAL_ADDRESS_ADD, 20, 22, aNoInitParamDefault }, + + /* 4.3.2.22 Config Model Subscription Virtual Address Delete + The Config Model Subscription Virtual Address Delete is an acknowledged + message used to delete a subscription address from the + Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Virtual Address Delete message + is a Config Model Subscription Status message. + ElementAddress : 2B : Address of the element + Address : 16B : Value of the Label UUID + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_VIRTUAL_ADDRESS_DELETE, 20, 22, aNoInitParamDefault }, + + /* 4.3.2.24 Config Model Subscription Virtual Address Overwrite + The Config Model Subscription Virtual Address Overwrite is an acknowledged + message used to discard the Subscription List and add an address to the + cleared Subscription List of a model (see Section 4.2.3). + The response to a Config Model Subscription Virtual Address Overwrite + message is a Config Model Subscription Status message. + Element Address : 2B : Address of the element + Address : 16B : Value of the Label UUID + ModelIdentifier : 2B or 4B : SIG Model ID or Vendor Model ID */ + + { OPCODE_CONFIG_MODEL_SUBSCRIPTION_VIRTUAL_ADDRESS_OVERWRITE, 20, 22, aNoInitParamDefault }, + + /* 4.3.2.69 Config Network Transmit Get + The Config Network Transmit Get is an acknowledged message used to get the + current Network Transmit state of a node (see Section 4.2.19). + The response to a Config Network Transmit Get message is a Config Network + Transmit Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_NETWORK_TRANSMIT_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.70 Config Network Transmit Set + The Config Network Transmit Set is an acknowledged message used to set the + Network Transmit state of a node (see Section 4.2.19). + The response to a Config Network Transmit Set message is a Config Network + Transmit Status message. + + NetworkTransmitCount : 3b : Number of transmissions for each Network PDU originating from the node + NetworkTransmitIntervalSteps : 5b : Number of 10-millisecond steps between transmissions + */ + { OPCODE_CONFIG_NETWORK_TRANSMIT_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.2.12 Config Relay Get + The Config Relay Get is an acknowledged message used to get the + current Relay (see Section 4.2.8) and Relay Retransmit (see Section 4.2.20) + states of a node. + The response to a Config Relay Get message is a Config Relay Status message. + There are no Parameters for this message.*/ + { OPCODE_CONFIG_RELAY_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.13 Config Relay Set + The Config Relay Set is an acknowledged message used to set the Relay + (see Section 4.2.8) and Relay Retransmit (see Section 4.2.20) states of a node. + The response to a Config Relay Set message is a Config Relay Status message. + Relay : 8 bits : Relay + RelayRetransmitCount : 3b : Number of retransmissions on advertising bearer for each Network PDU relayed by the node + RelayRetransmitIntervalSteps : 5b : Number of 10-millisecond steps between retransmissions + */ + { OPCODE_CONFIG_RELAY_SET, 2, 2, aNoInitParamDefault }, + + /* 4.3.2.27 Config SIG Model Subscription Get + The Config SIG Model Subscription Get is an acknowledged message used to + get the list of subscription addresses of a model within the element. + This message is only for SIG Models. + The response to a Config SIG Model Subscription Get message is a Config SIG + Model Subscription List message. + Element Address : 2B : Address of the element + ModelIdentifier : 2B : SIG Model ID */ + + { OPCODE_CONFIG_SIG_MODEL_SUBSCRIPTION_GET, 4, 4, aNoInitParamDefault }, + + /* 4.3.2.29 Config Vendor Model Subscription Get + The Config Vendor Model Subscription Get is an acknowledged message used to + get the list of subscription addresses of a model within the element. + This message is only for Vendor Models. + The response to a Config Vendor Model Subscription Get message is a + Config Vendor Model Subscription List message. + Element Address : 2B : Address of the element + ModelIdentifier : 4B : Vendor Model ID */ + + { OPCODE_CONFIG_VENDOR_MODEL_SUBSCRIPTION_GET, 6, 6, aNoInitParamDefault }, + + + /* 4.3.3.4 Health Fault Clear + The Health Fault Clear is an acknowledged message used to clear the current + Registered Fault state identified by Company ID of an element + (see Section 4.2.15.2). + The response to a Health Fault Clear message is a Health Fault Status message */ + { OPCODE_HEALTH_FAULT_CLEAR, 2, 2, aNoInitParamDefault }, + + /* 4.3.3.3 Health Fault Clear Unacknowledged + The Health Fault Clear Unacknowledged is an unacknowledged message used to + clear the current Registered Fault state identified by Company ID of an + element (see Section 4.2.15.2). + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + + { OPCODE_HEALTH_FAULT_CLEAR_UNACKNOWLEDGED, 2, 2, aNoInitParamDefault }, + + /* 4.3.3.2 Health Fault Get + The Health Fault Get is an acknowledged message used to get the current + Registered Fault state identified by Company ID of an element + (see Section 4.2.15.2). + The response to a Health Fault Get message is a Health Fault Status message + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + { OPCODE_HEALTH_FAULT_GET, 2, 2, aNoInitParamDefault }, + + /* 4.3.3.5 Health Fault Test + The Health Fault Test is an acknowledged message used to invoke a + self-test procedure of an element. + The procedure is implementation specific and may result in changing the + Health Fault state of an element (see Section 4.2.15). + The response to a Health Fault Test message is a Health Fault Status message. + + Test ID : 1B : Identifier of a specific test to be performed + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + { OPCODE_HEALTH_FAULT_TEST, 3, 3, aNoInitParamDefault }, + + /* 4.3.3.6 Health Fault Test Unacknowledged + The Health Fault Test Unacknowledged is an unacknowledged message used to + invoke a self-test procedure of an element. The procedure is implementation + specific and may result in changing the Health Fault state of an element + (see Section 4.2.15). + + Test ID : 1B : Identifier of a specific test to be performed + Company ID : 2B : 16-bit Bluetooth assigned Company Identifier */ + { OPCODE_HEALTH_FAULT_TEST_UNACKNOWLEDGED, 3, 3, aNoInitParamDefault }, + + /* 4.3.3.8 Health Period Get + The Health Period Get is an acknowledged message used to get the + current Health Fast Period Divisor state of an element (see Section 4.2.16). + The response to a Health Period Get message is a Health Period Status message. + There are no parameters for this message. */ + { OPCODE_HEALTH_PERIOD_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.3.10 Health Period Set + The Health Period Set is an acknowledged message used to set the current + Health Fast Period Divisor state of an element (see Section 4.2.16). + The response to a Health Period Set message is a Health Period Status message + + FastPeriodDivisor : 1B: Divider for the Publish Period. + Modified Publish Period is used for sending Current */ + { OPCODE_HEALTH_PERIOD_SET, 1, 1, aNoInitParamDefault }, + + /* 4.3.3.9 Health Period Set Unacknowledged + The Health Period Set Unacknowledged is an unacknowledged message used to + set the current Health Fast Period Divisor state of an element + (see Section 4.2.16). + + FastPeriodDivisor : 1B: Divider for the Publish Period. + Modified Publish Period is used for sending Current + Health Status messages when there are active faults to communicate */ + { OPCODE_HEALTH_PERIOD_SET_UNACKNOWLEDGED, 1, 1, aNoInitParamDefault }, + /* { OPCODE_HEALTH_PERIOD_STATUS 0x8037 */ + + + + /* 4.3.2.46 Config Model App Bind + The Config Model App Bind is an acknowledged message used to bind an + AppKey to a model. + The response to a Config Model App Bind message is a + Config Model App Status message. + + ElementAddress : 2B : Address of the element + AppKeyIndex : 2B : Index of the AppKey + ModelIdentifier : 2 or 4: SIG Model ID or Vendor Model ID */ + + { OPCODE_CONFIG_MODEL_APP_BIND, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.47 Config Model App Unbind + The Config Model App Unbind is an acknowledged message used to remove the + binding between an AppKey and a model. + The response to a Config Model App Unbind message is a Config Model App Status message. + + + ElementAddress : 2B : Address of the element + AppKeyIndex : 2B : Index of the AppKey + ModelIdentifier : 2 or 4: SIG Model ID or Vendor Model ID */ + { OPCODE_CONFIG_MODEL_APP_UNBIND, 6, 8, aNoInitParamDefault }, + + /* 4.3.2.31 Config NetKey Add + The Config NetKey Add is an acknowledged message used to add a NetKey + to a NetKey List (see Section 4.2.4) on a node. + The added NetKey is then used by the node to authenticate and decrypt messages it receives, as well as authenticate and encrypt messages it sends. + The response to a Config NetKey Add message is a Config NetKey Status message. + NetKeyIndex : 2B + NetKey : 16B NetKey */ + { OPCODE_CONFIG_NETKEY_ADD, 18, 18, aNoInitParamDefault }, + + /* 4.3.2.33 Config NetKey Delete + The Config NetKey Delete is an acknowledged message used to delete a NetKey + on a NetKey List from a node. + The response to a Config NetKey Delete message is a + Config NetKey Status message. + NetKeyIndex : 2B */ + { OPCODE_CONFIG_NETKEY_DELETE, 2, 2, aNoInitParamDefault }, + + /* 4.3.2.35 Config NetKey Get + The Config NetKey Get is an acknowledged message used to report all NetKeys + known to the node. + The response to a Config NetKey Get message is a Config NetKey List message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_NETKEY_GET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.32 Config NetKey Update + The Config NetKey Update is an acknowledged message used to update a NetKey + on a node. The updated NetKey is then used by the node to authenticate and + decrypt messages it receives, as well as authenticate and encrypt messages + it sends, as defined by the Key Refresh procedure (see Section 3.10.4). + The response to a Config NetKey Update message is a Config NetKey Status message. + NetKeyIndex : 2B : Index of the NetKey + NetKey : 16B : NetKey */ + { OPCODE_CONFIG_NETKEY_UPDATE, 18, 18, aNoInitParamDefault}, + + /* 4.3.2.43 Config Node Identity Get + The Config Node Identity Get is an acknowledged message used to get the + current Node Identity state for a subnet (see Section 4.2.12). + The response to a Config Node Identity Get message is a + Config Node Identity Status message. + + NetKeyIndex : 2B : Index of the NetKey */ + { OPCODE_CONFIG_NODE_IDENTITY_GET, 2, 2, aNoInitParamDefault}, + + /* 4.3.2.44 Config Node Identity Set + The Config Node Identity Set is an acknowledged message used to set the + current Node Identity state for a subnet (see Section 4.2.12). + The response to a Config Node Identity Set message is a + Config Node Identity Status message. + + NetKeyIndex : 2B : Index of the NetKey + Identity : 1B : New Node Identity state */ + { OPCODE_CONFIG_NODE_IDENTITY_SET, 3, 3, aNoInitParamDefault}, + + /* 4.3.2.53 Config Node Reset + The Config Node Reset is an acknowledged message used to reset a node + (other than a Provisioner) and remove it from the network. + The response to a Config Node Reset message is a Config Node Reset + Status message. + There are no Parameters for this message. */ + { OPCODE_CONFIG_NODE_RESET, 0, 0, aNoInitParamDefault }, + + /* 4.3.2.49 Config SIG Model App Get + The Config SIG Model App Get is an acknowledged message used to request + report of all AppKeys bound to the SIG Model. + The response to a Config SIG Model App Get message is a Config SIG Model + App List message. + + ElementAddress : 2B : Address of the element + ModelIdentifier : 2B : SIG Model ID */ + { OPCODE_CONFIG_SIG_MODEL_APP_GET, 4, 4, aNoInitParamDefault }, + + /* 4.3.2.51 Config Vendor Model App Get + The Config Vendor Model App Get is an acknowledged message used to request + report of all AppKeys bound to the model. This message is only for Vendor Models. + The response to a Config Vendor Model App Get message is a Config Vendor Model App List message + + ElementAddress : 2B : Address of the element + ModelIdentifier : 4B : Vendor Model ID */ + { OPCODE_CONFIG_VENDOR_MODEL_APP_GET, 6, 6, aNoInitParamDefault }, + +}; +/* Private variables ---------------------------------------------------------*/ + +eClientSendMsgState_t eClientSendMsgState; /* Keeps the state of Sent Message */ +eServerRespRecdState_t eServerRespRecdState; /* Keeps the state of Received Message */ + +/* Private function prototypes -----------------------------------------------*/ +MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx); + +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief This function is callback from library after the Provisioning is + completed by embedded Provisioner +* @param prvState: Provisioning State of the Node. Expecting "1" when the + provisioning is completed +* @retval None +*/ +void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState) +{ + if (prvState==1 ) + { + Appli_ConfigClient_Init(); + eClientSendMsgState = ProvisioningDone_State; + NodeInfo.nodePrimaryAddress = GetAddressToConfigure(); + } +} + + +/** +* @brief This function is Init function for the state machine of the + Configuration Client. The Function shall be called every time a new + node is provisioned +* @param None +* @retval None +*/ +MOBLE_RESULT Appli_ConfigClient_Init(void) +{ + eClientSendMsgState = ClientIdle_State; /* Init the value of state machine */ + eServerRespRecdState = NodeIdle_State; /* Init the value of state machine */ + ConfigClient_ResetTrials(); + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_ConfigClient_Process: This function is Process function and + shall be called from while(1) loop +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_Process(void) +{ + + Appli_ConfigClient_ConfigureNode(); + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief This function is used to configure the Node after provisioning +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_ConfigureNode(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT32 nowClockTime; + + /* + State response called function + -------------------------------------------------------------------------------- + ClientIdle_State X None + ProvisioningDone_State X Start the configuration + CompositionGet_State ConfigRespInit_State GetComposition + CompositionGet_State CompositionRecd_State ChangeThe State to next + AppKeyAdd_State X Issue AppKey + AppKeyAdd_State AppkeyAck_State ChangeThe State to next + AppBindModel_State X Issue AppKetBind + AppBindModel_State AppBindModelAck_State ChangeThe State to next + AddSubscription_State X Issue the Subscription + AddSubscription_State SubscriptionAck_State ChangeThe State to next + SetPublication_State PublicationStatus_State Issue the Subscription + SetPublication_State PublicationStatus_State ChangeThe State to next + + */ + + /* If the Node is already configured, return from here */ + if (eClientSendMsgState == ConfigurationDone_State) + return result; + + if (eClientSendMsgState == ClientIdle_State) + { + /* Waiting for the Provisioning to be done before to Start the + node configuration procedure */ + return result; + } + + if (eServerRespRecdState == NodeNoResponse_State) + { + /* No Response received from Node under Provisioning for some config + messages. So, no need to do the trials */ + return MOBLE_RESULT_FAIL; + } + + if (eClientSendMsgState == ProvisioningDone_State) + { + /* Start the node configuration procedure */ + eClientSendMsgState = CompositionGet_State; + ConfigClient_SaveMsgSendingTime(); + } + + else if (eClientSendMsgState == CompositionGet_State) + { + nowClockTime = Clock_Time(); + if( (nowClockTime - NodeInfo.Initial_time) < CONFIGURATION_START_DELAY) + { + return result; + } + /*------------- Add the delay before to start the configuration messages */ + + if (eServerRespRecdState == CompositionRecdCompleted_State) + { + eClientSendMsgState = AppKeyAdd_State; /* Change the state to Next */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the GetComposition servicing */ + Appli_ConfigClient_GetCompositionData(); + } + } + + else if (eClientSendMsgState == AppKeyAdd_State) + { + if (eServerRespRecdState == AppkeyAckCompleted_State) + { + eClientSendMsgState = AppBindModel_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the AppKeyAdd servicing */ + Appli_ConfigClient_DefaultAppKeyAdd(); + } + } + + else if (eClientSendMsgState == AppBindModel_State) + { + if (eServerRespRecdState == AppBindModelAckCompleted_State) + { + eClientSendMsgState = AddSubscription_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the AppKeyBIND servicing */ + Appli_ConfigClient_DefaultAppKeyBind(); + } + } + + else if (eClientSendMsgState == AddSubscription_State) + { + if (eServerRespRecdState == SubscriptionAckCompleted_State) + { + eClientSendMsgState = SetPublication_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + } + else + { + /* Continue the Subscription add servicing */ + AppliConfigClient_SubscriptionAddDefault(); + } + } + + else if (eClientSendMsgState == SetPublication_State) + { + if (eServerRespRecdState == PublicationStatusCompleted_State) + { + eClientSendMsgState = ConfigurationDone_State; /* Change the send state */ + eServerRespRecdState = NodeIdle_State; + TRACE_M(TF_CONFIG_CLIENT,"**Node is configured** \r\n"); + } + else + { + /* Continue the Publication add servicing */ + AppliConfigClient_PublicationSetDefault(); + } + } + + return result; +} + + +/** +* @brief This function is called to Get the Composition data from the +* a node under configuration +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_GetCompositionData (void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + MOBLEUINT16 dst_peer; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + + ConfigClient_SaveMsgSendingTime(); + + dst_peer = GetAddressToConfigure(); + + /* Start the Get Composition Message */ + ConfigClient_CompositionDataGet(dst_peer); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + break; + + case CompositionRecd_State: + /* Switch the state to next state AddAppKey_State */ + ConfigClient_ResetTrials(); + eServerRespRecdState = CompositionRecdCompleted_State; + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeIdle_State; /* Run next re-trial cycle again */ + } + + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief Appli_ConfigClient_DefaultAppKeyAdd: This function is called to + add the default AppKeys and NetKeys to a node under configuration +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyAdd (void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + MOBLEUINT8 *pAppKey; + MOBLEUINT16 netKeyIndex = DEFAULT_NETKEY_INDEX; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLE_ADDRESS dst_addr; + + pAppKey = GetNewProvNodeAppKey(); + + switch(eServerRespRecdState) + { + case NodeIdle_State: + ConfigClient_SaveMsgSendingTime(); + + dst_addr = GetAddressToConfigure(); + + /* Start the Set Appkey message */ + ConfigClient_AppKeyAdd ( dst_addr, + netKeyIndex, + appKeyIndex, + pAppKey); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + break; + + case AppkeyAck_State: + ConfigClient_ResetTrials(); + eServerRespRecdState = AppkeyAckCompleted_State; + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeIdle_State; /* Run next re-trial cycle again */ + } + + break; + + default: + /* Error State */ + break; +} + + return result; +} + + +/** +* @brief Appli_ConfigClient_DefaultAppKeyBind: This function is application used for + function to Bind the element(node) with AppKeyIndex and Models +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyBind (void) +{ + static MOBLEUINT32 modelIdentifier; + static MOBLEUINT8 elementIndex; + static MOBLEUINT8 indexSIGmodels; + static MOBLEUINT8 indexVendormodels; + MOBLEUINT16 elementAddress; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + + MOBLEUINT8 numSIGmodels; + MOBLEUINT8 numVendorModels; + MOBLEUINT8 numofElements; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + /* Start the AppBindModel_State message */ + elementIndex = 0; /* Initialize it for the complete loop */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + case NodeNextSigModel_State: + numSIGmodels = GetCountSIGModelToBindApp(elementIndex); + modelIdentifier = GetSIGModelToBindApp(elementIndex, + &indexSIGmodels, + numSIGmodels); + + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeNextVendorModel_State: + modelIdentifier = GetVendorModelToBindApp(elementIndex,indexVendormodels ); + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeSendMessage_State: + /* Start the AppBindModel_State message */ + elementAddress = GetServerElementAddress(elementIndex); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + + ConfigClient_SaveMsgSendingTime(); + + /* Send the Message to the server */ + ConfigClient_ModelAppBind (elementAddress, appKeyIndex, modelIdentifier); + break; + + case AppBindModelAck_State: + /* Need to check if all SIG Models are binded ? */ + + ConfigClient_ResetTrials(); + + numSIGmodels = GetCountSIGModelToBindApp(elementIndex); + numVendorModels = GetCountVendorModelToBindApp(elementIndex); + + if (indexSIGmodels < numSIGmodels ) + { /* Even when all SIG Models are serviced, we need to start for Vendor Models */ + indexSIGmodels++; + indexVendormodels =0; /* Reset back, bcoz, we are still process the SIG Models */ + } + else if (indexVendormodels < numVendorModels) + { + indexVendormodels++; /* When SIG Models and Vendor Models are processed + the loop condition will become true */ + } + + if (indexSIGmodels < numSIGmodels ) + {/* if index is still less, then we have scope of reading 1 more index */ + + eServerRespRecdState = NodeNextSigModel_State; + /* Switch to InProgress_State */ + } + else if (indexVendormodels < numVendorModels) + { + /*Now, do binding for Vendor Model */ + eServerRespRecdState = NodeNextVendorModel_State; + } + else + { + /* Now, the element index is handled, change the element index */ + elementIndex++; + numofElements = ConfigClient_GetNodeElements(); + if (elementIndex >= numofElements) + {/* we are comparing Index whose counting started from 0, becomes equal, + then exit the loop */ + + eServerRespRecdState = AppBindModelAckCompleted_State; + } + else if (elementIndex < numofElements) + { /* When the Element Index is still less than the total number of + elements in the Node: So, Restart the cycle */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + eServerRespRecdState = NodeNextSigModel_State; + } + } + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeSendMessage_State; /* Run next re-trial cycle again */; + } + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief AppliConfigClient_SubscriptionAddDefault: This function is application + used for adding subscription to the element(node) for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_SubscriptionAddDefault (void) +{ + static MOBLEUINT32 modelIdentifier; + static MOBLEUINT16 elementAddress; + static MOBLEUINT8 elementIndex; + static MOBLEUINT8 indexSIGmodels; + static MOBLEUINT8 indexVendormodels; + MOBLEUINT8 numSIGmodels; + MOBLEUINT8 numVendorModels; + MOBLEUINT8 numofElements; + MOBLEUINT16 address = DEFAULT_GROUP_ADDR; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + /* Start the SubscriptionAdd message */ + + elementIndex = 0; /* Initialize it for the complete loop */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + case NodeNextSigModel_State: + numSIGmodels = GetCountSIGModelToSubscribe(elementIndex); + modelIdentifier = GetSIGModelToSubscribe(elementIndex, + &indexSIGmodels, + numSIGmodels); + + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeNextVendorModel_State: + modelIdentifier = GetVendorModelToSubscribe(elementIndex,indexVendormodels ); + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeSendMessage_State: + elementAddress = GetServerElementAddress(elementIndex); + ConfigClient_SaveMsgSendingTime(); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + ConfigClient_SubscriptionAdd (elementAddress, address, modelIdentifier); + + break; + + + case SubscriptionAck_State: + /* Need to check if all SIG Models are subscribed ? */ + ConfigClient_ResetTrials(); + + numSIGmodels = GetCountSIGModelToSubscribe(elementIndex); + numVendorModels = GetCountVendorModelToSubscribe(elementIndex); + elementAddress = GetServerElementAddress(elementIndex); + + if (indexSIGmodels < numSIGmodels ) + { /* Even when all SIG Models are serviced, we need to start for Vendor Models */ + indexSIGmodels++; + indexVendormodels =0; /* Reset back, bcoz, we are still process the SIG Models */ + } + else if (indexVendormodels < numVendorModels) + { + indexVendormodels++; /* When SIG Models and Vendor Models are processed + the loop condition will become true */ + } + + if (indexSIGmodels < numSIGmodels ) + {/* if index is still less, then we have scope of reading 1 more index */ + + /* Get the Next Model and Bind it again till all SIG Models are binded */ + eServerRespRecdState = NodeNextSigModel_State; + + } + else if (indexVendormodels < numVendorModels) +{ + eServerRespRecdState = NodeNextVendorModel_State; + } + else + { + /* Now, the element index is handled, change the element index */ + elementIndex++; + numofElements = ConfigClient_GetNodeElements(); + if (elementIndex == numofElements) + {/* we are comparing Index whose counting started from 0, becomes equal, + then exit the loop */ + eServerRespRecdState = SubscriptionAckCompleted_State; + } + else if (elementIndex < numofElements) + { /* When the Element Index is still less than the total number of + elements in the Node: So, Restart the cycle */ + + eServerRespRecdState = NodeNextSigModel_State; + indexSIGmodels =0; /* Reset the variable again for the next element */ + indexVendormodels = 0; + } + } + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeSendMessage_State; /* Run next re-trial cycle again */; + } + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief AppliConfigClient_PublicationSetDefault: This function is application + used for adding publication settings to the element(node) + for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_PublicationSetDefault (void) +{ + MOBLEUINT16 publishAddress = DEFAULT_PUBLISH_ADDR; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLEUINT8 credentialFlag = DEFAULT_CREDENTIAL_FLAG; + MOBLEUINT8 publishTTL = DEFAULT_PUBLISH_TTL; + MOBLEUINT8 publishPeriod = DEFAULT_PUBLISH_PERIOD; + MOBLEUINT8 publishRetransmitCount = DEFAULT_PUBLISH_RETRANSMIT_COUNT; + MOBLEUINT8 publishRetransmitIntervalSteps= DEFAULT_PUBLISH_RETRANSMIT_INTERVAL_STEPS; + + static MOBLEUINT16 elementAddress; + static MOBLEUINT32 modelIdentifier; + static MOBLEUINT8 elementIndex; + static MOBLEUINT8 indexSIGmodels; + static MOBLEUINT8 indexVendormodels; + MOBLEUINT8 numSIGmodels; + MOBLEUINT8 numVendorModels; + MOBLEUINT8 numofElements; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 retry; + + switch(eServerRespRecdState) + { + case NodeIdle_State: + /* Start the Publication Add message */ + + elementIndex = 0; /* Initialize it for the complete loop */ + indexSIGmodels = 0; /* Initialize it for the complete loop */ + indexVendormodels = 0; + + case NodeNextSigModel_State: + numSIGmodels = GetCountSIGModelToPublish(elementIndex); + modelIdentifier = GetSIGModelToPublish(elementIndex, + &indexSIGmodels, + numSIGmodels); + + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + case NodeNextVendorModel_State: + modelIdentifier = GetVendorModelToPublish(elementIndex,indexVendormodels); + /* Switch to NodeSendMessage_State */ + eServerRespRecdState = NodeSendMessage_State; + break; + + + case NodeSendMessage_State: + elementAddress = GetServerElementAddress(elementIndex); + + ConfigClient_SaveMsgSendingTime(); + + /* Switch to InProgress_State */ + eServerRespRecdState = InProgress_State; + ConfigClient_PublicationSet(elementAddress, + publishAddress, + appKeyIndex, + credentialFlag, + publishTTL, + publishPeriod, + publishRetransmitCount, + publishRetransmitIntervalSteps, + modelIdentifier); + + break; + + + case PublicationStatus_State: + /* Need to check if all SIG Models are subscribed ? */ + ConfigClient_ResetTrials(); + + numSIGmodels = GetCountSIGModelToPublish(elementIndex); + numVendorModels = GetCountVendorModelToPublish(elementIndex); + elementAddress = GetServerElementAddress(elementIndex); + + if (indexSIGmodels < numSIGmodels ) + { /* Even when all SIG Models are serviced, we need to start for Vendor Models */ + indexSIGmodels++; + indexVendormodels =0; /* Reset back, bcoz, we are still process the SIG Models */ + } + else if (indexVendormodels < numVendorModels) + { + indexVendormodels++; /* When SIG Models and Vendor Models are processed + the loop condition will become true */ + } + + + if (indexSIGmodels < numSIGmodels ) + {/* if index is still less, then we have scope of reading 1 more index */ + eServerRespRecdState = NodeNextSigModel_State; + } + else if (indexVendormodels < numVendorModels) + { + eServerRespRecdState = NodeNextVendorModel_State; + } + else + { + /* Now, the element index is handled, change the element index */ + elementIndex++; + numofElements = ConfigClient_GetNodeElements(); + + if (elementIndex == numofElements) + {/* we are comparing Index whose counting started from 0, becomes equal, + then exit the loop */ + eServerRespRecdState = PublicationStatusCompleted_State; + } + else if (elementIndex < numofElements) + { /* When the Element Index is still less than the total number of + elements in the Node: So, Restart the cycle */ + + eServerRespRecdState = NodeNextSigModel_State; + indexSIGmodels =0; /* Reset the variable again for the next element */ + indexVendormodels = 0; + } + } + break; + + case InProgress_State: + /* Just wait and let the messages be completed + or look for timeout */ + retry = ConfigClient_ChkRetries(); + + if (retry == CLIENT_TX_RETRY_ENDS) + { + eServerRespRecdState = NodeNoResponse_State; + } + else if (retry == CLIENT_TX_TIMEOUT) + { + eServerRespRecdState = NodeSendMessage_State; /* Run next re-trial cycle again */; + } + break; + + default: + /* Error State */ + break; + } + + return result; +} + + +/** +* @brief AppliConfigClient_SelfPublicationSetDefault: This function is application + used for adding publication settings to the element(node) + for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void) +{ + MOBLEUINT16 publishAddress = DEFAULT_PUBLISH_ADDR; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLEUINT8 credentialFlag = DEFAULT_CREDENTIAL_FLAG; + MOBLEUINT8 publishTTL = DEFAULT_PUBLISH_TTL; + MOBLEUINT8 publishPeriod = DEFAULT_PUBLISH_PERIOD; + MOBLEUINT8 publishRetransmitCount = DEFAULT_PUBLISH_RETRANSMIT_COUNT; + MOBLEUINT8 publishRetransmitIntervalSteps= DEFAULT_PUBLISH_RETRANSMIT_INTERVAL_STEPS; + + MOBLEUINT16 elementAddress; + MOBLEUINT32 modelIdentifier=0; + MOBLEUINT8 elementIndex; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + for (elementIndex=0; elementIndex < APPLICATION_NUMBER_OF_ELEMENTS; elementIndex++ ) + { + /*Checking for SIG Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_SIG_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT16) Appli_SIG_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) + { + /* If Model is Foundation Model, then it does not need to be + added for Publishing */ + + /* Do NOTHING, let the next Model be picked */ + } + + else + { + ConfigClient_PublicationSet(elementAddress, + publishAddress, + appKeyIndex, + credentialFlag, + publishTTL, + publishPeriod, + publishRetransmitCount, + publishRetransmitIntervalSteps, + modelIdentifier); + } + } + + /*Checking for VENDOR Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_VENDOR_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT32) Appli_Vendor_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else + { + ConfigClient_PublicationSet(elementAddress, + publishAddress, + appKeyIndex, + credentialFlag, + publishTTL, + publishPeriod, + publishRetransmitCount, + publishRetransmitIntervalSteps, + modelIdentifier); + } + } + } + return result; +} + + +/** +* @brief AppliConfigClient_SelfSubscriptionSetDefault: This function is application + used for adding Subscription settings to the element(node) + for default settings +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void) +{ + MOBLEUINT32 modelIdentifier=0; + MOBLEUINT16 elementAddress; + MOBLEUINT8 elementIndex; + MOBLEUINT16 address = DEFAULT_GROUP_ADDR; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + for (elementIndex=0; elementIndex < APPLICATION_NUMBER_OF_ELEMENTS; elementIndex++ ) + { + /*Checking for SIG Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_SIG_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT16) Appli_SIG_Models[elementIndex][index]; + + /*If limit is reaching to no models*/ + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) + { + /* If Model is Foundation Model, then it does not need to be + Subscribed */ + + /* Do NOTHING, let the next Model be picked */ + } + else + { + ConfigClient_SubscriptionAdd (elementAddress, address, modelIdentifier); + } + } + + /*Checking for Vendor Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_VENDOR_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT32) Appli_Vendor_Models[elementIndex][index]; + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else + { + ConfigClient_SubscriptionAdd (elementAddress, address, modelIdentifier); + } + } + + } + return result; +} + + +/** +* @brief Appli_ConfigClient_DefaultAppKeyBind: This function is application used for + function to Bind the element(node) with AppKeyIndex and Models +* @param None +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void) +{ + + MOBLEUINT32 modelIdentifier=0; + MOBLEUINT16 appKeyIndex = DEFAULT_APPKEY_INDEX; + MOBLEUINT16 elementAddress; + MOBLEUINT8 elementIndex; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + appKeyIndex = DEFAULT_APPKEY_INDEX; + + for (elementIndex=0; elementIndex < APPLICATION_NUMBER_OF_ELEMENTS; elementIndex++ ) + { + /*Checking for SIG Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_SIG_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT16) Appli_SIG_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) + { + /* If Model is Foundation Model, then it does not need to be binded + with AppKey */ + + /* Do NOTHING, let the next Model be picked */ + } + else + { + ConfigClient_ModelAppBind (elementAddress, appKeyIndex, modelIdentifier); + } + } + + /*Checking for VENDOR Models*/ + for (MOBLEUINT8 index=0; index < APPLICATION_VENDOR_MODELS_MAX_COUNT; index++) + { + elementAddress = BLEMesh_GetAddress(); + elementAddress += elementIndex; + + modelIdentifier = (MOBLEUINT32) Appli_Vendor_Models[elementIndex][index]; + + if(modelIdentifier == NO_MODEL_AVLBL) + { + break; + } + else + { + ConfigClient_ModelAppBind (elementAddress, appKeyIndex, modelIdentifier); + } + } + + } + return result; +} + +/** +* @brief Appli_CompositionDataStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_CompositionDataStatusCb(MOBLE_RESULT status) +{ + eServerRespRecdState = CompositionRecd_State; +} + + +/** +* @brief Appli_AppKeyStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_AppKeyStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = AppkeyAck_State; +} + + +/** +* @brief Appli_AppBindModelStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_AppBindModelStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = AppBindModelAck_State; +} + + +/** +* @brief Appli_SubscriptionAddStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_SubscriptionAddStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = SubscriptionAck_State; +} + + +/** +* @brief Appli_PublicationStatusCb: This function is callback from config + client middleware on reception of the response +* @param None +* @retval MOBLE_RESULT +*/ +void Appli_PublicationStatusCb(MOBLEUINT8 status) +{ + /* Change the received state for application */ + eServerRespRecdState = PublicationStatus_State; +} + + +/** +* @brief Appli_NodeResetStatusCb: This function is callback from config + client middleware on reception of the Node Reset response +* @param None +* @retval None +*/ +void Appli_NodeResetStatusCb(void) +{ + /* Change the received state for application */ + eServerRespRecdState = NodeResetStatus_State; +} + + +/** +* @brief GetSIGModelToBindApp: This function gets the SIG Model to Bind +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT16 GetSIGModelToBindApp(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels) +{ + + MOBLEUINT16 model_id; + MOBLEUINT8 index; + MOBLEUINT8 idxSIG = *pModelIndex; + + for (index = idxSIG; index < numberOfModels ; index++ ) + { + model_id = aNodeElements[elementIndex].aSIGModels[index]; + if (MODEL_IS_FOUNDATION_MODEL(model_id)) + { + /* Do nothing, let the next model_if be scanned */ + model_id = 0xffff; /* Invalid Model ID */ + } + else + { + break; + } + } + + *pModelIndex = index; + return model_id; + +} + + +/** +* @brief GetVendorModelToBindApp: This function gets the Vendor Model to Bind +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT32 GetVendorModelToBindApp(MOBLEUINT8 elementIndex, MOBLEUINT8 indexModels) +{ + return aNodeElements[elementIndex].aVendorModels[indexModels]; +} + +/** +* @brief GetCountSIGModelToBindApp: This function gets the NUMBER of SIG Model + to Bind +* @param elementIndex Index of the Element for which the Count is needed +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountSIGModelToBindApp(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumSIGmodels; +} + + +/** +* @brief GetCountVendorModelToBindApp: This function gets the Vendor Model to Bind +* @param elementIndex Index of the Element for which the Count is needed +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountVendorModelToBindApp(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumVendorModels; +} + + +/** +* @brief GetSIGModelToPublish: This function gets the SIG Model to Publish +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT16 GetSIGModelToPublish(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels) + +{ + return GetSIGModelToBindApp(elementIndex, + pModelIndex, + numberOfModels); +} + + +/** +* @brief GetVendorModelToPublish: This function gets the Vendor Model to Publish +* @param elementIndex Index of the Element +* @param idxSIG Pointer to Index of the Model +* @retval MOBLE_RESULT +*/ +MOBLEUINT32 GetVendorModelToPublish(MOBLEUINT8 elementIndex, MOBLEUINT8 idxSIG) +{ + return aNodeElements[elementIndex].aVendorModels[idxSIG]; +} + + +/** +* @brief GetCountSIGModelToPublish: This function gets the SIG Model to Bind +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountSIGModelToPublish(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumSIGmodels; +} + + +/** +* @brief GetCountVendorModelToPublish: This function gets the Vendor Model to Publish +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumVendorModels; +} + + +/** +* @brief GetSIGModelToSubscribe: This function gets the SIG Model to Bind +* @param elementIndex Index of the Element +* @param pModelIndex Pointer to Index of the Element to be updated +* @param numberOfModels Total number of Models to be scanned +* @retval MOBLE_RESULT +*/ +MOBLEUINT16 GetSIGModelToSubscribe(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels) +{ + return GetSIGModelToBindApp(elementIndex, + pModelIndex, + numberOfModels); +} + + +/** +* @brief GetVendorModelToSubscribe: This function Gets the Vendor Model ID for + Subscription +* @param elementIndex Index of the Element +* @param idxSIG Index to the Model ID to Subscribe +* @retval MOBLE_RESULT +*/ +MOBLEUINT32 GetVendorModelToSubscribe(MOBLEUINT8 elementIndex, + MOBLEUINT8 idxSIG) +{ + return aNodeElements[elementIndex].aVendorModels[idxSIG]; +} + + +/** +* @brief GetCountSIGModelToSubscribe: This function gets the SIG Model to Subscribe +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountSIGModelToSubscribe(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumSIGmodels; +} + + +/** +* @brief GetCountVendorModelToPublish: This function gets the Count of the + Vendor Model to Subscribe +* @param elementIndex Index of the Element +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 GetCountVendorModelToSubscribe(MOBLEUINT8 elementIndex) +{ + return aNodeElements[elementIndex].NumVendorModels; +} + + +/** +* @brief AppliConfigClient_SendMessageDefault: This function is used for sending + a message. + ** The Function is not yet written fully +* @param None +* @retval MOBLE_RESULT +*/ +MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx) +{ + return NUM_VENDOR_MODELS_TO_SUBSCRIBE; +} + +/******************************************************************************/ +#endif /* defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) */ +/******************************************************************************/ + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h new file mode 100644 index 000000000..2a1fa19e6 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h @@ -0,0 +1,93 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_config_client.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_CONFIG_CLIENT_H +#define __APPLI_CONFIG_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" +#include "config_client.h" +#include "mesh_cfg_usr.h" + +/* Exported macro ------------------------------------------------------------*/ +#define MAX_CONFIG_PARAM_SIZE 22 +#define CONFIGURE_AS_PER_COMPOSITION_DATA + +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ + +#if defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) + +MOBLE_RESULT Appli_ConfigClient_Init(void); +MOBLE_RESULT Appli_ConfigClient_Process(void); +MOBLE_RESULT Appli_ConfigClient_ConfigureNode(void); +void Appli_CompositionDataStatusCb(MOBLE_RESULT); +void Appli_AppKeyStatusCb(MOBLEUINT8 status); +void Appli_AppBindModelStatusCb(MOBLEUINT8 status); +void Appli_PublicationStatusCb(MOBLEUINT8 status); +void Appli_SubscriptionAddStatusCb(MOBLEUINT8 status); +void Appli_NodeResetStatusCb(void); + +void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState); +MOBLE_RESULT Appli_ConfigClient_GetCompositionData (void); +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyAdd (void); +MOBLE_RESULT Appli_ConfigClient_DefaultAppKeyBind (void); +MOBLE_RESULT AppliConfigClient_SubscriptionAddDefault (void); +MOBLE_RESULT AppliConfigClient_PublicationSetDefault (void); +MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void); +MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void); +MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void); +Composition_Data_Page0_t* Appli_GetNodeCompositionBuff (void); + +MOBLEUINT16 GetSIGModelToBindApp(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels); + +MOBLEUINT32 GetVendorModelToBindApp(MOBLEUINT8 elementIdx, MOBLEUINT8 idxSIG); +MOBLEUINT8 GetCountSIGModelToBindApp(MOBLEUINT8 elementIdx); +MOBLEUINT8 GetCountVendorModelToBindApp(MOBLEUINT8 elementIdx); + +MOBLEUINT16 GetSIGModelToSubscribe(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels); + + +MOBLEUINT32 GetVendorModelToSubscribe(MOBLEUINT8 elementIdx, MOBLEUINT8 idxSIG); +MOBLEUINT8 GetCountSIGModelToSubscribe(MOBLEUINT8); +MOBLEUINT8 GetCountVendorModelToSubscribe(MOBLEUINT8); + +MOBLEUINT16 GetSIGModelToPublish(MOBLEUINT8 elementIndex, + MOBLEUINT8 *pModelIndex, + MOBLEUINT8 numberOfModels); + +MOBLEUINT32 GetVendorModelToPublish(MOBLEUINT8 elementIdx, MOBLEUINT8 idxSIG); +MOBLEUINT8 GetCountSIGModelToPublish(MOBLEUINT8 elementIdx); + +MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIdx); + +#endif /*defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) */ + +#endif /* __APPLI_CONFIG_CLIENT_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c new file mode 100644 index 000000000..52dbed1e8 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c @@ -0,0 +1,484 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" +#include "hal_common.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "mesh_cfg.h" +#include "generic.h" +#include "light.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" + +/** @addtogroup ST_BLE_Mesh + * @{ + */ + +/** @addtogroup Application_Mesh_Models + * @{ + */ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +extern MOBLEUINT8 RestoreFlag; +extern MOBLEUINT16 IntensityValue; +extern MOBLEUINT8 IntensityFlag; +extern MOBLEUINT8 PowerOnOff_flag; +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +extern Appli_LightPwmValue_t Appli_LightPwmValue; +#endif + +Appli_Generic_OnOffSet AppliOnOffSet[APPLICATION_NUMBER_OF_ELEMENTS]; +Appli_Generic_LevelSet AppliLevelSet[APPLICATION_NUMBER_OF_ELEMENTS]; +Appli_Generic_PowerOnOffSet AppliPowerOnSet[APPLICATION_NUMBER_OF_ELEMENTS]; +Appli_Generic_DefaultTransitionSet AppliDefaultTransitionSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/* Private function prototypes -----------------------------------------------*/ +MOBLE_RESULT Appli_Generic_LevelDelta_Set(Generic_LevelStatus_t* pdeltalevelParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_LevelMove_Set(Generic_LevelStatus_t* pdeltaMoveParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +/* Private functions ---------------------------------------------------------*/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_ONOFF +/******************************************************************************/ + +/** +* @brief Appli_Generic_OnOff_Set: This function is callback for Application +* when Generic OnOff message is received +* @param pGeneric_OnOffParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_OnOff_Set(Generic_OnOffStatus_t* pGeneric_OnOffParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + /* LED control only for main element */ + if(elementIndex == GENERIC_SERVER_MAIN_ELEMENT_INDEX) + { + /*User need to modify the parameters as per the number of elements per node*/ + AppliOnOffSet[elementIndex].Present_OnOff = pGeneric_OnOffParam->Present_OnOff_State; + AppliOnOffSet[elementIndex].Present_OnOffValue = pGeneric_OnOffParam->Present_OnOff_Value; + + /* This condition is applicable when user want to on off the light with some + default transition value, or optionalValid =IN_TRANSITION , + transition is in progress. + */ + if((OptionalValid == DEFAULT_TRANSITION) || (OptionalValid == IN_TRANSITION)) + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = AppliOnOffSet[elementIndex].Present_OnOffValue; + Light_UpdateLedValue(LOAD_STATE ,Appli_LightPwmValue); +#endif + + #if 0 /* EME */ + if(AppliOnOffSet[elementIndex].Present_OnOff == APPLI_LED_ON) + { + AppliOnOffSet[elementIndex].TargetValue = PWM_TIME_PERIOD; + } + else + { + AppliOnOffSet[elementIndex].TargetValue = APPLI_LED_OFF; + } + #else + AppliOnOffSet[elementIndex].TargetValue = pGeneric_OnOffParam->Target_OnOff; + #endif /* EME */ + + if(AppliOnOffSet[elementIndex].Present_OnOffValue == AppliOnOffSet[elementIndex].TargetValue) + { + if(AppliOnOffSet[elementIndex].Present_OnOffValue > 0) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } + } + } + else + { + if((AppliOnOffSet[elementIndex].Present_OnOff == APPLI_LED_ON) && (OptionalValid == NO_TRANSITION)) + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); +#endif + BSP_LED_On(LED_BLUE); + } + else + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; + Light_UpdateLedValue(RESET_STATE , Appli_LightPwmValue); +#endif + BSP_LED_Off(LED_BLUE); + } + } + } + + TRACE_M(TF_GENERIC, "Appli_Generic_OnOff_Set callback received for elementIndex %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL, "#8202!for elementIndex %d \r\n", elementIndex); + + NvmStatePowerFlag_Set(GENERIC_ON_OFF_NVM_FLAG, elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_SERVER_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_LEVEL +/******************************************************************************/ + +/** +* @brief Appli_Generic_Level_Set: This function is callback for Application +* when Generic Level message is received +* @param plevelParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_Level_Set(Generic_LevelStatus_t* plevelParam, + MOBLEUINT8 OptionalValid,MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT16 duty; + static MOBLEUINT16 previousIntensity = 0; + + AppliLevelSet[elementIndex].Present_Level16= plevelParam->Present_Level16; + if(AppliLevelSet[elementIndex].Present_Level16 <= 0) + { + AppliLevelSet[elementIndex].Present_Level16 = 0; + } + + IntensityValue = AppliLevelSet[elementIndex].Present_Level16; + + if(((IntensityValue > previousIntensity) && (IntensityValue Present_Level16; + + /* For demo, if Level is more than 50, switch ON the LED */ + if (AppliLevelSet[elementIndex].Present_Level16 >= 50) + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); +#endif + BSP_LED_On(LED_BLUE); + } + else + { +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + Light_UpdateLedValue(RESET_STATE , Appli_LightPwmValue); +#endif + BSP_LED_Off(LED_BLUE); + } + + TRACE_M(TF_GENERIC,"Generic_LevelDelta_Set callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8209!\r\n"); + + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_Move_Set: This function is callback for Application +* when Generic Level Move message is received +* @param pdeltaMoveParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_Move_Set(Generic_LevelStatus_t* pdeltaMoveParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +// if(OptionalValid == 1) +// { + AppliLevelSet[elementIndex].Last_delta_level = pdeltaMoveParam->Last_delta_level; + AppliLevelSet[elementIndex].Last_Level_TID = pdeltaMoveParam->Last_Level_TID; + AppliLevelSet[elementIndex].Last_Present_Level16 = pdeltaMoveParam->Last_Present_Level16; + AppliLevelSet[elementIndex].Present_Level16 = pdeltaMoveParam->Present_Level16; + AppliLevelSet[elementIndex].RemainingTime = pdeltaMoveParam->RemainingTime; + AppliLevelSet[elementIndex].Target_Level16 = pdeltaMoveParam->Target_Level16; +// } + + TRACE_M(TF_GENERIC,"Generic_LevelMove_Set callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#820B! \r\n"); + return MOBLE_RESULT_SUCCESS; + +} + +/******************************************************************************/ +#endif /* ENABLE_GENERIC_MODEL_SERVER_LEVEL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF +/******************************************************************************/ + +/** +* @brief Appli_Generic_PowerOnOff_Set: This function is callback for Application +* when Generic Power on off set message is received +* @param pPowerOnOffParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_PowerOnOff_Set(Generic_PowerOnOffParam_t* pPowerOnOffParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + + AppliPowerOnSet[elementIndex].PowerOnState = pPowerOnOffParam->PowerOnOffState; + TRACE_M(TF_SERIAL_CTRL,"#8213! for elementIndex %d \r\n", elementIndex); + TRACE_M(TF_GENERIC,"Appli_Generic_PowerOnOff_Set callback received for elementIndex %d \r\n", elementIndex); + + if(AppliPowerOnSet[elementIndex].PowerOnState == GENERIC_POWER_ON_STATE) + { + /* set the flag value for NVM store */ + RestoreFlag = GENERIC_ON_OFF_NVM_FLAG; + } + + AppliNvm_SaveMessageParam(); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME +/******************************************************************************/ + +/** +* @brief Appli_Generic_DefaultTransitionTime_Set: This function is callback for Application +* when Generic Power on off set message is received +* @param pDefaultTimeParam: Pointer to the parameters message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Set(Generic_DefaultTransitionParam_t* pDefaultTimeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + AppliDefaultTransitionSet[elementIndex].DefaultTransitionTime = pDefaultTimeParam->DefaultTransitionTime; + + TRACE_M(TF_GENERIC,"Generic_DefaultTransitionTime_Set callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#820E!\r\n"); + return MOBLE_RESULT_SUCCESS; +} + + + +/******************************************************************************/ +#endif /* ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME */ +/******************************************************************************/ + + +/** +* @brief Appli_Generic_GetOnOffState: This function is callback for Application +* when Generic on off status message is to be provided +* @param pOnOff_status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetOnOffStatus(MOBLEUINT8* pOnOff_Status,MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pOnOff_Status = AppliOnOffSet[elementIndex].Present_OnOff; + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetOnOffValue: This function is callback for Application + to get the PWM value for the generic on off +* @param pOnOff_Value: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetOnOffValue(MOBLEUINT8* pOnOff_Value, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pOnOff_Value = AppliOnOffSet[elementIndex].Present_OnOffValue; + *(pOnOff_Value+1) = AppliOnOffSet[elementIndex].Present_OnOffValue >> 8; + *(pOnOff_Value+2) = AppliOnOffSet[elementIndex].TargetValue; + *(pOnOff_Value+3) = AppliOnOffSet[elementIndex].TargetValue >> 8; + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetLevelStatus: This function is callback for Application + when Generic Level status message is to be provided +* @param pLevel_status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetLevelStatus(MOBLEUINT8* pLevel_Status, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pLevel_Status = AppliLevelSet[elementIndex].Present_Level16; + *(pLevel_Status+1) = AppliLevelSet[elementIndex].Present_Level16 >> 8; + *(pLevel_Status+2) = AppliLevelSet[elementIndex].Target_Level16; + *(pLevel_Status+3) = AppliLevelSet[elementIndex].Target_Level16 >> 8; + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetPowerOnOffStatus: This function is callback for Application +* when Generic Get Power status message is to be provided +* @param pLevel_status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetPowerOnOffStatus(MOBLEUINT8* pPower_Status, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pPower_Status = AppliPowerOnSet[elementIndex].PowerOnState; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Generic_GetDefaultTransitionStatus: This function is callback for +* Application when Generic Level status message is to be provided +* @param pTransition_Status: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_Status,MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + *pTransition_Status = AppliDefaultTransitionSet[elementIndex].DefaultTransitionTime; + + return MOBLE_RESULT_SUCCESS; +} + + +/** + * @} + */ + +/** + * @} + */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h new file mode 100644 index 000000000..755e95db5 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h @@ -0,0 +1,158 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_GENERIC_H +#define __APPLI_GENERIC_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* user configuration for Battery status */ +#define BATTERY_ABSENT 0X00 +#define BATTERY_PRESENT_REMOVABLE 0X01 +#define BATTERY_PRESENT_NON_REMOVABLE 0X02 +#define BATTERY_UNKNOWN 0X03 +#define BATTERY_CRITICAL_LOW_LEVEL 0X00 +#define BATTERY_LOW_LEVEL 0X01 +#define BATTERY_GOOD_LEVEL 0X02 +#define BATTERY_LEVEL_UNKNOWN 0X03 +#define BATTERY_NOT_CHARGEABLE 0X00 +#define BATTERY_NOT_CHARGING 0X01 +#define BATTERY_IS_CHARGING 0X02 +#define BATTERY_CHARGING_UNKNOWN 0X03 +#define BATTERY_SERVICE_RFU 0X00 +#define BATTERY_REQUIRE_NO_SERVICE 0X01 +#define BATTERY_REQUIRE_SERVICE 0X02 +#define BATTERY_SERVICE_UNKNOWN 0X03 + +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ + +#pragma pack(push, 1) + +typedef struct +{ + MOBLEUINT8 Present_OnOff; + MOBLEUINT16 Present_OnOffValue; + MOBLEUINT16 TargetValue; +}Appli_Generic_OnOffSet; + +typedef struct +{ + MOBLEINT16 Present_Level16; + MOBLEINT16 Target_Level16; + MOBLEUINT8 RemainingTime; + MOBLEUINT8 Last_Level_TID; + MOBLEINT16 Last_Present_Level16; + MOBLEINT32 Last_delta_level; +}Appli_Generic_LevelSet; + +typedef struct +{ + MOBLEINT16 PowerOnState; +}Appli_Generic_PowerOnOffSet; + +typedef struct +{ + MOBLEUINT8 DefaultTransitionTime; +}Appli_Generic_DefaultTransitionSet; + +typedef struct +{ + MOBLEUINT8 Is_BatteryPresent; + MOBLEUINT8 Is_Chargeable; + MOBLEUINT8 Is_Serviceable; +}Appli_BatteryUserflag_param_t; + +#pragma pack(pop) + +/* Exported Functions Prototypes ---------------------------------------------*/ + +MOBLE_RESULT Appli_Generic_OnOff_Set(Generic_OnOffStatus_t*, + MOBLEUINT8, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_OnOff_Status(MOBLEUINT8 const *pOnOff_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Level_Set(Generic_LevelStatus_t*, + MOBLEUINT8, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Delta_Set(Generic_LevelStatus_t*, + MOBLEUINT8, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Move_Set(Generic_LevelStatus_t* pdeltaMoveParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_Level_Status(MOBLEUINT8 const *plevel_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_PowerOnOff_Set(Generic_PowerOnOffParam_t* pPowerOnOffParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_PowerOnOff_Status(MOBLEUINT8 const *powerOnOff_status , + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Set(Generic_DefaultTransitionParam_t* pDefaultTimeParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Status(MOBLEUINT8 const *pTransition_status , + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Generic_GetOnOffStatus(MOBLEUINT8* pOnOff_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetOnOffValue(MOBLEUINT8* pOnOff_Value, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetLevelStatus(MOBLEUINT8* pLevel_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetPowerOnOffStatus(MOBLEUINT8* pLevel_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Generic_Restore_PowerOn_Value(MOBLEUINT8 restoreValue, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_Status, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + + + +#endif /* __APPLI_GENERIC_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c new file mode 100644 index 000000000..9c9ff6480 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c @@ -0,0 +1,345 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic_client.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "appli_mesh.h" +#include "generic_client.h" +#include "appli_generic_client.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief Appli_Generic_OnOff_Status: This function is callback for Application +* when Generic OnOff message is received +* @param pOnOff_status: Pointer to the parameters received for message +* @param plength: length of the data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_OnOff_Status(MOBLEUINT8 const *pOnOff_status, MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_GENERIC,"Generic_OnOff_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8204!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Present OnOff value: %d\n\r", pOnOff_status[i]); + else if(i == 1) + TRACE_M(TF_SERIAL_CTRL,"Target OnOff value: %d\n\r", pOnOff_status[i]); + else if(i == 2) + TRACE_M(TF_SERIAL_CTRL,"Remaining Time value: %d\n\r", pOnOff_status[i]); + } + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL +/******************************************************************************/ + + /** +* @brief Appli_Generic_Level_Status: This function is callback for Application +* when Generic Level Move message is received +* @param plevel_status: Pointer to the parameters message +* @param plength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_Level_Status(MOBLEUINT8 const *plevel_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT8 i; + MOBLEUINT8 level = 0; +#endif + + TRACE_M(TF_GENERIC,"Generic_Level_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8208! \r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < plength; i++) + { + if((i == 0) || (i == 2)) + level = plevel_status[i]; + else if(i == 1) + TRACE_M(TF_SERIAL_CTRL,"Present Level value: %d%\n\r", + (((plevel_status[i]<<8)|level)*100/LEVEL_MAX_VALID_RANGE)); + else if(i == 3) + TRACE_M(TF_SERIAL_CTRL,"Target Level value: %d%\n\r", + (((plevel_status[i]<<8)|level)*100/LEVEL_MAX_VALID_RANGE)); + else if(i == 4) + TRACE_M(TF_SERIAL_CTRL,"Remaining Time value: %d\n\r", plevel_status[i]); + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL */ +/******************************************************************************/ + +/** +* @brief Appli_Generic_DefaultTransitionTime_Status: This function is callback for Application +* when Generic Power on off set message is received +* @param pTransition_status: Pointer to the parameters message +* @param plength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_DefaultTransitionTime_Status(MOBLEUINT8 const *pTransition_status , MOBLEUINT32 plength,MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + + TRACE_M(TF_GENERIC,"Generic_DefaultTransitionTime_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8210!\r\n"); + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Generic_PowerOnOff_Set: This function is callback for Application +* when Generic Power on off set message is received +* @param powerOnOff_status: Pointer to the parameters message +* @param plength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Generic_PowerOnOff_Status(MOBLEUINT8 const *powerOnOff_status,\ + MOBLEUINT32 plength, MOBLEUINT16 dstPeer, MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_GENERIC,"Generic_PowerOnOff_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8212!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"On Power up value: %d\n\r", + powerOnOff_status[i]); + } + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_GenericClient_API: This function is a Wrapper to call Generic Client API depending on opcode received in input +* @param elementIndex: Index of the element +* @param msg_opcode: opcode of the desired API +* @param msg_params: buffer containing the desired API parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + switch(msg_opcode){ +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_ONOFF +/******************************************************************************/ + case GENERIC_ON_OFF_GET: + { + result = GenericClient_OnOff_Get(elementIndex); + break; + } + case GENERIC_ON_OFF_SET_ACK: + { + result = GenericClient_OnOff_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_OnOffParam_t) ); + break; + } + case GENERIC_ON_OFF_SET_UNACK: + { + result = GenericClient_OnOff_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_OnOffParam_t) ); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL +/******************************************************************************/ + case GENERIC_LEVEL_GET: + { + result = GenericClient_Level_Get(elementIndex); + break; + } + case GENERIC_LEVEL_SET_ACK: + { + result = GenericClient_Level_Set_Ack(elementIndex, + msg_params, + (sizeof(Generic_LevelParam_t)-2)); + break; + } + case GENERIC_LEVEL_SET_UNACK: + { + result = GenericClient_Level_Set_Unack(elementIndex, + msg_params, + (sizeof(Generic_LevelParam_t)-2)); + break; + } + case GENERIC_DELTA_SET: + { + + result = GenericClient_Delta_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_DeltaLevelParam_t)); + break; + } + case GENERIC_DELTA_SET_UNACK: + { + result = GenericClient_Delta_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_DeltaLevelParam_t)); + break; + } + case GENERIC_MOVE_SET: + { + result = GenericClient_Move_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_LevelMoveParam_t)); + break; + } + case GENERIC_MOVE_SET_UNACK: + { + result = GenericClient_Move_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_LevelMoveParam_t)); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_LEVEL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_POWER_ONOFF +/******************************************************************************/ + case GENERIC_POWER_ON_OFF_GET: + { + GenericClient_PowerOnOff_Get(elementIndex); + break; + } + case GENERIC_POWER_ON_OFF_SET: + { + result = GenericClient_PowerOnOff_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_PowerOnOffParam_t)); + break; + } + case GENERIC_POWER_ON_OFF_SET_UNACK: + { + result = GenericClient_PowerOnOff_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_PowerOnOffParam_t)); + break; + } + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_POWER_ONOFF */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_GENERIC_MODEL_CLIENT_DEFAULT_TRANSITION_TIME +/******************************************************************************/ + case GENERIC_DEFAULT_TRANSITION_TIME_GET: + { + result = GenericClient_DefaultTransitionTime_Get(elementIndex); + break; + } + + case GENERIC_DEFAULT_TRANSITION_TIME_SET: + { + result = GenericClient_DefaultTransitionTime_Set_Ack(elementIndex, + msg_params, + sizeof(Generic_DefaultTransitionParam_t)); + break; + } + + case GENERIC_DEFAULT_TRANSITION_TIME_SET_UNACK: + { + result = GenericClient_DefaultTransitionTime_Set_Unack(elementIndex, + msg_params, + sizeof(Generic_DefaultTransitionParam_t)); + break; + } + +/******************************************************************************/ +#endif /* #ifdef ENABLE_GENERIC_MODEL_CLIENT_DEFAULT_TRANSITION_TIME */ +/******************************************************************************/ + + default: + { + TRACE_M(TF_GENERIC, "OpCode value invalid %d \r\n", msg_opcode); + result = MOBLE_RESULT_FAIL; + } + } + return result; +} + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h new file mode 100644 index 000000000..d3fa85d31 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h @@ -0,0 +1,40 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_generic_client.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_GENERIC_CLIENT_H +#define __APPLI_GENERIC_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_ConfigClient_Set(void); +MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params); + +#endif /* __APPLI_GENERIC_CLIENT_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c new file mode 100644 index 000000000..d7846a4cc --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c @@ -0,0 +1,1351 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light.c + * @author MCD Application Team + * @brief Application interface for Lighting Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" +#include "hal_common.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "light.h" +#include "appli_light.h" +#include "appli_generic.h" +#include "common.h" +#include "mesh_cfg.h" +#include "PWM_handlers.h" +#include "PWM_config.h" +#include "appli_nvm.h" +#include "math.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + + +/******************************************************************************* +Following Variables are used for the LIGHTING Lightness MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ +Appli_Light_lightnessSet ApplilightnessSet[APPLICATION_NUMBER_OF_ELEMENTS] = {{1,0,0,0,0,0}}; +Appli_Light_lightnessLinearSet ApplilightnessLinearSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************* +Following Variables are used for the LIGHTING CTL MODEL +*******************************************************************************/ + +/******************************************************************************/ +#if defined (ENABLE_LIGHT_MODEL_SERVER_CTL) || defined (ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP) \ + || defined (ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE) +/******************************************************************************/ + Appli_Light_CtlSet AppliCtlSet[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_CtlTemperatureRangeSet AppliCtlTemperatureRangeSet[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_CtlDefaultSet AppliCtlDefaultSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL */ +/******************************************************************************/ + +/******************************************************************************* +Following Variables are used for the LIGHTING HSL MODEL +*******************************************************************************/ + +#if defined (ENABLE_LIGHT_MODEL_SERVER_HSL) || defined (ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP) \ + || defined (ENABLE_LIGHT_MODEL_SERVER_HSL_HUE) || defined (ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION) +/******************************************************************************/ + Appli_Light_HslSet AppliHslSet[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_HslDefaultSet Appli_HslDefaultSet[APPLICATION_NUMBER_OF_ELEMENTS] = {{0x7FFF,0x7FFF,0x7FFF}}; + Appli_Light_RGBSet Appli_RGBParam[APPLICATION_NUMBER_OF_ELEMENTS]; + Appli_Light_HslRangeSet AppliHslRangeSet[APPLICATION_NUMBER_OF_ELEMENTS]; + +/*******************************************************************************/ +#endif /*End of the LIGHTING HSL MODEL variables */ +/*******************************************************************************/ + +/******************************************************************************* +Following Variables are used for the RGB board. +*******************************************************************************/ + +Appli_LightPwmValue_t Appli_LightPwmValue; +extern MOBLEUINT8 RestoreFlag; +extern MOBLEUINT8 PowerOnOff_flag; +extern MOBLEUINT8 IntensityFlag; +extern MOBLEUINT16 IntensityValue; +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Set: This function is callback for Application +* when Light Lightness Set message is received +* @param pLight_LightnessParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Set(Light_LightnessStatus_t* pLight_LightnessParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT16 duty; + static MOBLEUINT16 previousIntensity = 0; + + TRACE_M(TF_SERIAL_CTRL, "#824C!\n\r"); + TRACE_M(TF_LIGHT, "Element index %d present 0x%.2x last 0x%.2x\r\n", + elementIndex, + pLight_LightnessParam->LightnessPresentValue16, + pLight_LightnessParam->LightnessLastStatus); + + ApplilightnessSet[elementIndex].PresentState16 = pLight_LightnessParam->LightnessPresentValue16; + ApplilightnessSet[elementIndex].LastLightness16 = pLight_LightnessParam->LightnessLastStatus; + + if(pLight_LightnessParam->LightnessPresentValue16 != 0x00) + { + ApplilightnessSet[elementIndex].LastLightness16 = pLight_LightnessParam->LightnessPresentValue16; + } + + if(((IntensityValue > previousIntensity) && (IntensityValue LightnessPresentValue16 >= 0x8000) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } +#endif + + duty = PwmValueMapping(ApplilightnessSet[elementIndex].PresentState16 , 0xfFFF ,0); + Appli_LightPwmValue.IntensityValue = duty; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + /* set the flag value for NVM store */ + NvmStatePowerFlag_Set(LIGHT_LIGHTNESS_NVM_FLAG, elementIndex); + + return MOBLE_RESULT_SUCCESS; + +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Linear_Set: This function is callback for Application +* when Light Lightness Linear Set message is received +* @param pLight_LightnessLinearParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Linear_Set(Light_LightnessStatus_t* pLight_LightnessLinearParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + ApplilightnessLinearSet[elementIndex].PresentState16 = pLight_LightnessLinearParam->LinearPresentValue16; + + TRACE_M(TF_LIGHT,"Light_LightnessLinear_Set callback received for elementIndex %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8250!\n\r"); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Default_Set: This function is callback for Application +* when Light Lightness Default Set message is received +* @param pLight_LightnessDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Default_Set(Light_LightnessDefaultParam_t* pLight_LightnessDefaultParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + if(pLight_LightnessDefaultParam->LightnessDefaultStatus > 0) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } + + ApplilightnessSet[elementIndex].LightnessDefault = + pLight_LightnessDefaultParam->LightnessDefaultStatus; + + TRACE_M(TF_SERIAL_CTRL,"#8259! \r\n"); + TRACE_M(TF_LIGHT,"Appli_Light_Lightness_Default_Set callback received for elementIndex %d \r\n", elementIndex); + + NvmStatePowerFlag_Set(LIGHT_LIGHTNESS_NVM_FLAG,elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Last_Set: This function is callback for Application +* when Light Lightness Default Set message is received +* @param pLight_LightnessDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Last_Set(Light_LightnessStatus_t* pLight_LightnessParam, + MOBLEUINT8 elementIndex) +{ + ApplilightnessSet[elementIndex].LastLightness16 = pLight_LightnessParam->LightnessLastStatus; + + TRACE_M(TF_SERIAL_CTRL,"#8259!\n\r"); + TRACE_M(TF_LIGHT, + "Appli_Light_Lightness_Last_Set Light Last Value 0x%.2x \r\n", + ApplilightnessSet[elementIndex].LastLightness16); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP */ +/******************************************************************************/ + + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_Lightness_Range_Set: This function is callback for Application +* when Light Lightness Range Set message is received +* @param pLight_LightnessRangeParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Range_Set(Light_LightnessRangeParam_t* pLight_LightnessRangeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + ApplilightnessSet[elementIndex].StatusCode = pLight_LightnessRangeParam->StatusCode; + ApplilightnessSet[elementIndex].RangeMin = pLight_LightnessRangeParam->MinRangeStatus; + ApplilightnessSet[elementIndex].RangeMax = pLight_LightnessRangeParam->MaxRangeStatus; + + TRACE_M(TF_SERIAL_CTRL,"#825B! \n\r"); + TRACE_M(TF_LIGHT,"Appli_Light_Lightness_Range_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL +/******************************************************************************/ + +/** +* @brief Appli_Light_Ctl_Set: This function is callback for Application +* when Light Ctl Set message is received +* @param pLight_CtlParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Ctl_Set(Light_CtlStatus_t* pLight_CtlParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + float colourRatio; + float brightRatio; + + TRACE_M(TF_SERIAL_CTRL,"#825E! \n\r"); + + AppliCtlSet[elementIndex].PresentLightness16 = pLight_CtlParam->PresentCtlLightness16; + AppliCtlSet[elementIndex].PresentTemperature16 = pLight_CtlParam->PresentCtlTemperature16; + AppliCtlSet[elementIndex].PresentCtlDelta16 = pLight_CtlParam->PresentCtlDelta16; + + /* Save target parameters if transition is available */ + AppliCtlSet[elementIndex].TargetLightness16 = pLight_CtlParam->TargetCtlLightness16; + AppliCtlSet[elementIndex].TargetTemperature16 = pLight_CtlParam->TargetCtlTemperature16; + AppliCtlSet[elementIndex].TargetCtlDelta16 = pLight_CtlParam->TargetCtlDeltaUv16; + + colourRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentTemperature16 ,MAX_CTL_TEMP_RANGE ,MIN_CTL_TEMP_RANGE); + + brightRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentLightness16 ,0XFFFF ,0); + + Appli_LightPwmValue.PwmCoolValue = PWM_CoolValue(colourRatio , brightRatio); + Appli_LightPwmValue.PwmWarmValue = PWM_WarmValue(colourRatio , brightRatio); + + Rgb_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_CTL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_Ctl_Set callback received for elementIndex %d \r\n", elementIndex); + + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE +/******************************************************************************/ + +/** +* @brief Appli_Light_CtlTemperature_Set: This function is callback for Application +* when Light Ctl Temperature Set message is received +* @param pLight_CtltempParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Set(Light_CtlStatus_t* pLight_CtltempParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + float colourRatio; + float brightRatio; + TRACE_M(TF_SERIAL_CTRL,"#8264!\n\r"); + + AppliCtlSet[elementIndex].PresentTemperature16 = pLight_CtltempParam->PresentCtlTemperature16; + AppliCtlSet[elementIndex].PresentCtlDelta16 = pLight_CtltempParam->PresentCtlDelta16; + + /* Made a copy of target in case of transition values change */ + AppliCtlSet[elementIndex].TargetTemperature16 = pLight_CtltempParam->TargetCtlTemperature16; + AppliCtlSet[elementIndex].TargetCtlDelta16 = pLight_CtltempParam->TargetCtlDeltaUv16; + + colourRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentTemperature16 ,MAX_CTL_TEMP_RANGE ,MIN_CTL_TEMP_RANGE); + + brightRatio = Ratio_CalculateValue(AppliCtlSet[elementIndex].PresentLightness16 ,0XFFFF ,0); + + Appli_LightPwmValue.PwmCoolValue = PWM_CoolValue(colourRatio , brightRatio); + Appli_LightPwmValue.PwmWarmValue = PWM_WarmValue(colourRatio , brightRatio); + + Rgb_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_CTL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_CtlTemperature_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_CtlTemperature_Range_Set: This function is callback for Application +* when Light Ctl Temperature range Set message is received +* @param pLight_CtlTempRangeParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Set(Light_CtlTemperatureRangeParam_t* pLight_CtlTempRangeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + AppliCtlTemperatureRangeSet[elementIndex].RangeMin = pLight_CtlTempRangeParam->MinRangeStatus; + AppliCtlTemperatureRangeSet[elementIndex].RangeMax = pLight_CtlTempRangeParam->MaxRangeStatus; + AppliCtlTemperatureRangeSet[elementIndex].StatusCode = pLight_CtlTempRangeParam->StatusCode; + + TRACE_M(TF_SERIAL_CTRL,"#826B!\n\r"); + TRACE_M(TF_LIGHT,"Light_CtlTemperature_Range_Set callback received for elementIndex %d \r\n", elementIndex); + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_CtlDefault_Set: This function is callback for Application +* when Light Ctl Default Set message is received +* @param pLight_CtlDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlDefault_Set(Light_CtlDefaultParam_t* pLight_CtlDefaultParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + AppliCtlDefaultSet[elementIndex].CtlDefaultLightness16 = pLight_CtlDefaultParam->CtlDefaultLightness16; + AppliCtlDefaultSet[elementIndex].CtlDefaultTemperature16 = pLight_CtlDefaultParam->CtlDefaultTemperature16; + AppliCtlDefaultSet[elementIndex].CtlDefaultDeltaUv = pLight_CtlDefaultParam->CtlDefaultDeltaUv; + + TRACE_M(TF_SERIAL_CTRL,"#8269!\n\r"); + TRACE_M(TF_LIGHT,"Light_CtlDefault_Set callback received for elementIndex %d \r\n", elementIndex); + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL +/******************************************************************************/ + +/** +* @brief Appli_Light_Hsl_Set: This function is callback for Application +* when Light Hsl Set message is received +* @param pLight_HslParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Hsl_Set(Light_HslStatus_t* pLight_HslParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#8276!\n\r"); + + AppliHslSet[elementIndex].HslLightness16 = pLight_HslParam->PresentHslLightness16; + AppliHslSet[elementIndex].HslHueLightness16 = pLight_HslParam->PresentHslHueLightness16; + AppliHslSet[elementIndex].HslSaturation16 = pLight_HslParam->PresentHslSaturation16; + + /* Save target parameters if transition is available */ + AppliHslSet[elementIndex].TargetHslLightness16 = pLight_HslParam->TargetHslLightness16; + AppliHslSet[elementIndex].TargetHslHueLightness16 = pLight_HslParam->TargetHslHueLightness16; + AppliHslSet[elementIndex].TargetHslSaturation16 = pLight_HslParam->TargetHslSaturation16; + + /* Function to convert HSL values in RGB values */ + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + TRACE_M(TF_SERIAL_CTRL,"Red Value: %04hx\n\r",Appli_LightPwmValue.PwmRedValue); + TRACE_M(TF_SERIAL_CTRL,"Green Value: %04hx\n\r",Appli_LightPwmValue.PwmGreenValue); + TRACE_M(TF_SERIAL_CTRL,"Blue Value: %04hx\n\r",Appli_LightPwmValue.PwmBlueValue); + +/* when HSL is set, make CTL pwm will bw zero */ + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_Hsl_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_HUE +/******************************************************************************/ + +/** +* @brief Appli_Light_HslHue_Set: This function is callback for Application +* when Light Hsl Hue Set message is received +* @param pLight_HslHueParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslHue_Set(Light_HslStatus_t* pLight_HslHueParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL, "#826F! \n\r"); + + AppliHslSet[elementIndex].HslHueLightness16 = pLight_HslHueParam->PresentHslHueLightness16; + + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_HslHue_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; + +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_HUE */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION +/******************************************************************************/ + +/** +* @brief Appli_Light_HslSaturation_Set: This function is callback for Application +* when Light Hsl Saturation Set message is received +* @param pLight_HslSaturationParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslSaturation_Set(Light_HslStatus_t* pLight_HslSaturationParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#8273! \n\r"); + + AppliHslSet[elementIndex].HslSaturation16 = pLight_HslSaturationParam->PresentHslSaturation16; + + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_HslSaturation_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_HslDefault_Set: This function is callback for Application +* when Light Hsl Default Set message is received +* @param pLight_HslDefaultParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslDefault_Set(Light_HslDefaultParam_t* pLight_HslDefaultParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#827F! \n\r"); + + Appli_HslDefaultSet[elementIndex].HslDefaultLightness16 = pLight_HslDefaultParam->HslLightnessDefault16; + Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16 = pLight_HslDefaultParam->HslHueDefault16; + Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16 = pLight_HslDefaultParam->HslSaturationDefault16; + + AppliHslSet[elementIndex].HslLightness16 = Appli_HslDefaultSet[elementIndex].HslDefaultLightness16; + AppliHslSet[elementIndex].HslHueLightness16 = Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16; + AppliHslSet[elementIndex].HslSaturation16 = Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16; + + HSL2RGB_Conversion(elementIndex); + + Appli_LightPwmValue.PwmRedValue = PwmValueMapping(Appli_RGBParam[elementIndex].Red_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmGreenValue = PwmValueMapping(Appli_RGBParam[elementIndex].Green_Value ,0xFFFF ,0x00); + Appli_LightPwmValue.PwmBlueValue = PwmValueMapping(Appli_RGBParam[elementIndex].Blue_Value ,0xFFFF ,0x00); + + Ctl_LedOffState(); + + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + + NvmStatePowerFlag_Set(LIGHT_HSL_NVM_FLAG, elementIndex); + + TRACE_M(TF_LIGHT,"Appli_Light_HslDefault_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP +/******************************************************************************/ + +/** +* @brief Appli_Light_HslRange_Set: This function is callback for Application +* when Light Hsl Range Set message is received +* @param pLight_HslRangeParam: Pointer to the parameters received for message +* @param OptionalValid: Flag to inform about the validity of optional parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslRange_Set(Light_HslRangeParam_t* pLight_HslRangeParam, + MOBLEUINT8 OptionalValid, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SERIAL_CTRL,"#8281! \n\r"); + + AppliHslRangeSet[elementIndex].HslHueMinRange16 = pLight_HslRangeParam->HslHueMinRange16; + AppliHslRangeSet[elementIndex].HslHueMaxRange16 = pLight_HslRangeParam->HslHueMaxRange16; + AppliHslRangeSet[elementIndex].HslMinSaturation16 = pLight_HslRangeParam->HslMinSaturation16; + AppliHslRangeSet[elementIndex].HslMaxSaturation16 = pLight_HslRangeParam->HslMaxSaturation16; + + TRACE_M(TF_LIGHT,"Appli_Light_HslRange_Set callback received for elementIndex %d \r\n", elementIndex); + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP */ +/******************************************************************************/ + + +/******************************************************************************* +Following Functions are used for the LIGHTING Lightness MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS +/******************************************************************************/ + +/** +* @brief Appli_Light_GetLightnessStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lLightnessState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessStatus(MOBLEUINT8* lLightnessState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lLightnessState) = ApplilightnessSet[elementIndex].PresentState16; + *(lLightnessState+1) = ApplilightnessSet[elementIndex].PresentState16 >> 8; + *(lLightnessState+2) = ApplilightnessSet[elementIndex].LastLightness16 ; + *(lLightnessState+3) = ApplilightnessSet[elementIndex].LastLightness16 >> 8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetLightnessLinearStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lLightnessState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessLinearStatus(MOBLEUINT8* lLightnessState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lLightnessState) = ApplilightnessLinearSet[elementIndex].PresentState16; + *(lLightnessState+1) = ApplilightnessLinearSet[elementIndex].PresentState16 >> 8; + *(lLightnessState+2) = ApplilightnessSet[elementIndex].LastLightness16 ; + *(lLightnessState+3) = ApplilightnessSet[elementIndex].LastLightness16 >> 8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetLightnessDefaultStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lDefaultState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessDefaultStatus(MOBLEUINT8* lDefaultState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lDefaultState) = ApplilightnessSet[elementIndex].LightnessDefault; + *(lDefaultState+1) = ApplilightnessSet[elementIndex].LightnessDefault >> 8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetLightnessLastStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lLastState: Pointer to the status message +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessLastStatus(MOBLEUINT8* lLastState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lLastState) = ApplilightnessSet[elementIndex].LastLightness16; + *(lLastState+1) = ApplilightnessSet[elementIndex].LastLightness16 >> 8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetLightnessRangeStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lRangeState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetLightnessRangeStatus(MOBLEUINT8* lRangeState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lRangeState) = ApplilightnessSet[elementIndex].StatusCode; + *(lRangeState+1) = ApplilightnessSet[elementIndex].RangeMin; + *(lRangeState+2) = ApplilightnessSet[elementIndex].RangeMin >> 8; + *(lRangeState+3) = ApplilightnessSet[elementIndex].RangeMax; + *(lRangeState+4) = ApplilightnessSet[elementIndex].RangeMax >> 8; + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************* +Following Functions are used for the LIGHTING CTL MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_CTL +/******************************************************************************/ + +/** +* @brief Appli_Light_GetCtlLightStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlLightState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlLightStatus(MOBLEUINT8* lCtlLightState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlLightState) = AppliCtlSet[elementIndex].PresentLightness16; + *(lCtlLightState+1) = AppliCtlSet[elementIndex].PresentLightness16 >> 8; + *(lCtlLightState+2) = AppliCtlSet[elementIndex].PresentTemperature16; + *(lCtlLightState+3) = AppliCtlSet[elementIndex].PresentTemperature16 >>8; + *(lCtlLightState+4) = AppliCtlSet[elementIndex].PresentCtlDelta16; + *(lCtlLightState+5) = AppliCtlSet[elementIndex].PresentCtlDelta16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetCtlTargetStatus: This function is callback for Application +* to get the application values in middleware used for target state. +* @param lCtlLightState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlTargetStatus(MOBLEUINT8* lCtlLightState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlLightState) = AppliCtlSet[elementIndex].TargetLightness16; + *(lCtlLightState+1) = AppliCtlSet[elementIndex].TargetLightness16 >> 8; + *(lCtlLightState+2) = AppliCtlSet[elementIndex].TargetTemperature16; + *(lCtlLightState+3) = AppliCtlSet[elementIndex].TargetTemperature16 >>8; + *(lCtlLightState+4) = AppliCtlSet[elementIndex].TargetCtlDelta16; + *(lCtlLightState+5) = AppliCtlSet[elementIndex].TargetCtlDelta16 >>8; + + return MOBLE_RESULT_SUCCESS; +} +/** +* @brief Appli_Light_GetCtlTeperatureStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlTempState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlTemperatureStatus(MOBLEUINT8* lCtlTempState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlTempState) = AppliCtlSet[elementIndex].PresentTemperature16; + *(lCtlTempState+1) = AppliCtlSet[elementIndex].PresentTemperature16 >> 8; + *(lCtlTempState+2) = AppliCtlSet[elementIndex].PresentCtlDelta16; + *(lCtlTempState+3) = AppliCtlSet[elementIndex].PresentCtlDelta16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetCtlTemperatureRange: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlTempRange: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlTemperatureRange(MOBLEUINT8* lCtlTempRange, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlTempRange) = AppliCtlTemperatureRangeSet[elementIndex].StatusCode; + *(lCtlTempRange+1) = AppliCtlTemperatureRangeSet[elementIndex].RangeMin; + *(lCtlTempRange+2) = AppliCtlTemperatureRangeSet[elementIndex].RangeMin >> 8; + *(lCtlTempRange+3) = AppliCtlTemperatureRangeSet[elementIndex].RangeMax; + *(lCtlTempRange+4) = AppliCtlTemperatureRangeSet[elementIndex].RangeMax >>8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetCtlDefaultStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lCtlDefaultState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetCtlDefaultStatus(MOBLEUINT8* lCtlDefaultState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lCtlDefaultState) = AppliCtlDefaultSet[elementIndex].CtlDefaultLightness16; + *(lCtlDefaultState+1) = AppliCtlDefaultSet[elementIndex].CtlDefaultLightness16 >> 8; + *(lCtlDefaultState+2) = AppliCtlDefaultSet[elementIndex].CtlDefaultTemperature16; + *(lCtlDefaultState+3) = AppliCtlDefaultSet[elementIndex].CtlDefaultTemperature16 >>8; + *(lCtlDefaultState+4) = AppliCtlDefaultSet[elementIndex].CtlDefaultDeltaUv; + *(lCtlDefaultState+5) = AppliCtlDefaultSet[elementIndex].CtlDefaultDeltaUv >> 8; + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_CTL */ +/******************************************************************************/ + +/******************************************************************************* +Following Functions are used for the LIGHTING HSL MODEL +*******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL +/******************************************************************************/ + +/** +* @brief Appli_Light_GetHslStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslStatus(MOBLEUINT8* lHslState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslState) = AppliHslSet[elementIndex].HslLightness16; + *(lHslState+1) = AppliHslSet[elementIndex].HslLightness16 >> 8; + *(lHslState+2) = AppliHslSet[elementIndex].HslHueLightness16; + *(lHslState+3) = AppliHslSet[elementIndex].HslHueLightness16 >>8; + *(lHslState+4) = AppliHslSet[elementIndex].HslSaturation16; + *(lHslState+5) = AppliHslSet[elementIndex].HslSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} +/** +* @brief Appli_Light_GetHslTargetStatus: This function is callback for Application +* to get the application values in middleware used for target state. +* @param lHslState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslTargetStatus(MOBLEUINT8* lHslState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslState) = AppliHslSet[elementIndex].TargetHslLightness16; + *(lHslState+1) = AppliHslSet[elementIndex].TargetHslLightness16 >> 8; + *(lHslState+2) = AppliHslSet[elementIndex].TargetHslHueLightness16; + *(lHslState+3) = AppliHslSet[elementIndex].TargetHslHueLightness16 >>8; + *(lHslState+4) = AppliHslSet[elementIndex].TargetHslSaturation16; + *(lHslState+5) = AppliHslSet[elementIndex].TargetHslSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} +/** +* @brief Appli_Light_GetHslHueStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslHueState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslHueStatus(MOBLEUINT8* lHslHueState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslHueState) = AppliHslSet[elementIndex].HslHueLightness16; + *(lHslHueState+1) = AppliHslSet[elementIndex].HslHueLightness16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_GetHslSaturationStatus: This function is callback for Application +* to get the application values in middleware used for transition change +* @param lHslSaturationState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslSaturationStatus(MOBLEUINT8* lHslSaturationState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslSaturationState) = AppliHslSet[elementIndex].HslSaturation16; + *(lHslSaturationState+1) = AppliHslSet[elementIndex].HslSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetHslDefaultStatus: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslDefaultState: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslDefaultStatus(MOBLEUINT8* lHslDefaultState, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslDefaultState) = Appli_HslDefaultSet[elementIndex].HslDefaultLightness16; + *(lHslDefaultState+1) = Appli_HslDefaultSet[elementIndex].HslDefaultLightness16 >> 8; + *(lHslDefaultState+2) = Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16; + *(lHslDefaultState+3) = Appli_HslDefaultSet[elementIndex].HslDefaultHueLightness16 >>8; + *(lHslDefaultState+4) = Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16; + *(lHslDefaultState+5) = Appli_HslDefaultSet[elementIndex].HslDefaultSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetHslSatRange: This function is callback for Application +* to get the application values in middleware used for transition change +* @param lHslSatRange: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslSatRange(MOBLEUINT8* lHslSatRange, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslSatRange) = AppliHslRangeSet[elementIndex].StatusCode; + *(lHslSatRange+1) = AppliHslRangeSet[elementIndex].HslMinSaturation16; + *(lHslSatRange+2) = AppliHslRangeSet[elementIndex].HslMinSaturation16 >> 8; + *(lHslSatRange+3) = AppliHslRangeSet[elementIndex].HslMaxSaturation16; + *(lHslSatRange+4) = AppliHslRangeSet[elementIndex].HslMaxSaturation16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_GetHslHueRange: This function is callback for Application +* to get the application values in middleware used for transition change. +* @param lHslHueRange: Pointer to the status message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_GetHslHueRange(MOBLEUINT8* lHslHueRange, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + *(lHslHueRange) = AppliHslRangeSet[elementIndex].StatusCode; + *(lHslHueRange+1) = AppliHslRangeSet[elementIndex].HslHueMinRange16; + *(lHslHueRange+2) = AppliHslRangeSet[elementIndex].HslHueMinRange16 >> 8; + *(lHslHueRange+3) = AppliHslRangeSet[elementIndex].HslHueMaxRange16; + *(lHslHueRange+4) = AppliHslRangeSet[elementIndex].HslHueMaxRange16 >>8; + + return MOBLE_RESULT_SUCCESS; +} + +/******************************************************************************/ +#endif /* ENABLE_LIGHT_MODEL_SERVER_HSL */ +/******************************************************************************/ + +/* This Function used to initialise the PWM . This is used for the RGB board */ +void Appli_Light_PwmInit() +{ + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmCoolValue = 0; + Appli_LightPwmValue.PwmWarmValue = 0; + Appli_LightPwmValue.PwmRedValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmGreenValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmBlueValue = PWM_VALUE_OFF; + Light_UpdateLedValue(RESET_STATE , Appli_LightPwmValue); +} + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_SERVER_HSL +/******************************************************************************/ + +/** +* @brief Function to convert the map the RGB values in real values. +* @param value1: This value corresponds to red led. +* @param value2: This value corresponds to green led . +* @param value3: This value corresponds to blue led . +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval void +*/ +void RgbF_Create(MOBLEUINT16 value1, MOBLEUINT16 value2, MOBLEUINT16 value3, MOBLEUINT8 elementIndex) +{ + Appli_RGBParam[elementIndex].Red_Value = (MOBLEUINT16)(65535 * value1/1000); + Appli_RGBParam[elementIndex].Green_Value = (MOBLEUINT16)(65535 * value2/1000); + Appli_RGBParam[elementIndex].Blue_Value = (MOBLEUINT16)(65535 * value3/1000); +} + +/** +* @brief Function to convert the HSL values in RGB values. +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval void +*/ +void HSL2RGB_Conversion(MOBLEUINT8 elementIndex) +{ + + MOBLEUINT16 hueValue; + float lightnessvalue; + float saturationValue; + MOBLEUINT16 cValue; /* chroma */ + MOBLEUINT16 mValue; /* intermediate value used for creating the r,g,b baseline */ + MOBLEUINT16 xValue; /* intermediate value used for computing r,g,b */ + + if(AppliHslSet[elementIndex].HslSaturation16 == 0) + { + Appli_RGBParam[elementIndex].Red_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Green_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Blue_Value = AppliHslSet[elementIndex].HslLightness16 ; + } + else if((AppliHslSet[elementIndex].HslLightness16 == 0xFFFF) || (AppliHslSet[elementIndex].HslLightness16 == 0x00)) + { + Appli_RGBParam[elementIndex].Red_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Green_Value = AppliHslSet[elementIndex].HslLightness16 ; + Appli_RGBParam[elementIndex].Blue_Value = AppliHslSet[elementIndex].HslLightness16 ; + } + else + { + /* Hue is calculated for angular value. so converting in between 0 to 360 degree */ + hueValue = (MOBLEUINT16)(360 * (float)AppliHslSet[elementIndex].HslHueLightness16/65535); + lightnessvalue = (float)AppliHslSet[elementIndex].HslLightness16/65535; + saturationValue = (float)AppliHslSet[elementIndex].HslSaturation16/65535; + + /* Formula to get the values used for RGB conversion */ + cValue = (MOBLEUINT16)(((1- fabs(2 * lightnessvalue-1))*saturationValue) * 1000); + mValue = (MOBLEUINT16)((lightnessvalue * 1000) - (cValue/2)); + xValue = (MOBLEUINT16)(cValue * (1 - fabs(fmod(hueValue / 60.0, 2.0) - 1))); + + /* Conditions applied for the different angle of hue value */ + if (hueValue > 0 && hueValue < (HUE_UPPER_LIMIT / 6)) + { + RgbF_Create(cValue + mValue, xValue + mValue, mValue, elementIndex); + } + else if (hueValue >= (HUE_UPPER_LIMIT / 6) && hueValue < (HUE_UPPER_LIMIT / 3)) + { + RgbF_Create(xValue + mValue, cValue + mValue, mValue, elementIndex); + } + else if (hueValue >= (HUE_UPPER_LIMIT / 3) && hueValue < (HUE_UPPER_LIMIT / 2)) + { + RgbF_Create(mValue, cValue + mValue, xValue + mValue, elementIndex); + } + else if (hueValue >= (HUE_UPPER_LIMIT / 2) + && hueValue < (2 * HUE_UPPER_LIMIT / 3)) + { + RgbF_Create(mValue, xValue + mValue, cValue + mValue, elementIndex); + } + else if (hueValue >= (2 * HUE_UPPER_LIMIT / 3) + && hueValue < (5 * HUE_UPPER_LIMIT / 6)) + { + RgbF_Create(xValue + mValue, mValue, cValue + mValue, elementIndex); + } + else if ((hueValue >= (5 * HUE_UPPER_LIMIT / 6) && hueValue <= HUE_UPPER_LIMIT) || (hueValue == 0)) + { + RgbF_Create(cValue + mValue, mValue, xValue + mValue, elementIndex); + } + else + { + RgbF_Create(mValue, mValue, mValue, elementIndex); + } + } +} + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_SERVER_HSL */ +/******************************************************************************/ + +/** +* @brief Rgb_LedOffState: This function is called while using CTL, makes all the RGB +* PWM off state for Application. +* @param void: +* @retval void +*/ +void Rgb_LedOffState(void) +{ + Appli_LightPwmValue.PwmRedValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmGreenValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmBlueValue = PWM_VALUE_OFF; + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; +} + +/** +* @brief Ctl_LedOffState: This function is called while using HSL, makes all the +* cool Warm PWM off state for Application. +* @param void: +* @retval void +*/ +void Ctl_LedOffState(void) +{ + Appli_LightPwmValue.PwmWarmValue = PWM_VALUE_OFF; + Appli_LightPwmValue.PwmCoolValue = PWM_VALUE_OFF; + Appli_LightPwmValue.IntensityValue = PWM_VALUE_OFF; +} + +/** +* @brief Function to set the values for PWM for RGB board. +* @param state: decided the state of PWM according to the condition. +* @retval void +*/ +void Light_UpdateLedValue(MOBLEUINT8 state ,Appli_LightPwmValue_t light_state) +{ + +#ifndef USER_BOARD_1LED + if(light_state.IntensityValue > 0) + { +#ifdef USER_BOARD_COOL_WHITE_LED + if((light_state.PwmCoolValue == 0) && (light_state.PwmWarmValue == 0)) + light_state.PwmWarmValue = light_state.IntensityValue; +#endif +#ifdef USER_BOARD_RGB_LED + if((light_state.PwmRedValue == PWM_VALUE_OFF) && + (light_state.PwmGreenValue == PWM_VALUE_OFF) && + (light_state.PwmBlueValue == PWM_VALUE_OFF)) + light_state.PwmBlueValue = light_state.IntensityValue; +#endif + } +#endif + + if(state == RESUME_STATE) + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, light_state.IntensityValue); +#endif + +#ifdef USER_BOARD_COOL_WHITE_LED + + Modify_PWM(COOL_LED, light_state.PwmCoolValue); + Modify_PWM(WARM_LED, light_state.PwmWarmValue); +#endif + +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, light_state.PwmRedValue); + Modify_PWM(GREEN_LED, light_state.PwmGreenValue); + Modify_PWM(BLUE_LED, light_state.PwmBlueValue); +#endif + + } + else if(state == RESET_STATE) + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, PWM_VALUE_OFF); +#endif +#ifdef USER_BOARD_COOL_WHITE_LED + Modify_PWM(COOL_LED, 0); + Modify_PWM(WARM_LED, 0); +#endif +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, PWM_VALUE_OFF); + Modify_PWM(GREEN_LED, PWM_VALUE_OFF); + Modify_PWM(BLUE_LED, PWM_VALUE_OFF); +#endif + } + else if(state == LOAD_STATE) + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, light_state.IntensityValue); +#endif + +#ifdef USER_BOARD_COOL_WHITE_LED + Modify_PWM(COOL_LED, light_state.PwmCoolValue); + Modify_PWM(WARM_LED, light_state.PwmWarmValue); +#endif +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, light_state.PwmRedValue); + Modify_PWM(GREEN_LED, light_state.PwmGreenValue); + Modify_PWM(BLUE_LED, light_state.PwmBlueValue); +#endif + } + else + { +#ifdef USER_BOARD_1LED + Modify_PWM(SINGLE_LED, light_state.IntensityValue); +#endif + +#ifdef USER_BOARD_COOL_WHITE_LED + light_state.PwmCoolValue = PWM_DEFAULT_VALUE; + + Modify_PWM(COOL_LED, light_state.PwmCoolValue); + Modify_PWM(WARM_LED, light_state.PwmWarmValue); +#endif +#ifdef USER_BOARD_RGB_LED + Modify_PWM(RED_LED, light_state.PwmRedValue); + Modify_PWM(GREEN_LED, light_state.PwmGreenValue); + Modify_PWM(BLUE_LED, light_state.PwmBlueValue); +#endif + } +} + +/** +* @} +*/ + +/** +* @} +*/ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h new file mode 100644 index 000000000..d36af58c0 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h @@ -0,0 +1,281 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light.h + * @author MCD Application Team + * @brief Application interface for Light Mesh Model + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_LIGHT_H +#define __APPLI_LIGHT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "light.h" + +/* Exported macro ------------------------------------------------------------*/ +#define HUE_UPPER_LIMIT 360 +/* Exported variables -------------------------------------------------------*/ + +/* Light Lightness set */ + +#pragma pack(push, 1) + +typedef struct +{ + MOBLEUINT16 PresentState16; + MOBLEUINT16 LastLightness16; + MOBLEUINT16 LightnessDefault; + MOBLEUINT8 StatusCode; + MOBLEUINT16 RangeMin; + MOBLEUINT16 RangeMax; +}Appli_Light_lightnessSet; + + +/* Light Lightness Linear set */ +typedef struct +{ + MOBLEUINT16 PresentState16; +}Appli_Light_lightnessLinearSet; + +/* Light Ctl Set */ +typedef struct +{ + MOBLEUINT16 PresentLightness16; + MOBLEUINT16 PresentTemperature16; + MOBLEINT16 PresentCtlDelta16; + MOBLEUINT16 TargetLightness16; + MOBLEUINT16 TargetTemperature16; + MOBLEINT16 TargetCtlDelta16; +}Appli_Light_CtlSet; + +/* Light Ctl Temperature Range Set */ +typedef struct +{ + MOBLEUINT8 StatusCode; + MOBLEUINT16 RangeMin; + MOBLEUINT16 RangeMax; +}Appli_Light_CtlTemperatureRangeSet; + +/* Light Ctl Default set */ +typedef struct +{ + MOBLEUINT16 CtlDefaultLightness16; + MOBLEUINT16 CtlDefaultTemperature16; + MOBLEINT16 CtlDefaultDeltaUv; +}Appli_Light_CtlDefaultSet; + +/* Light Hsl Hue set */ +typedef struct +{ + MOBLEUINT16 HslLightness16; + MOBLEUINT16 HslHueLightness16; + MOBLEUINT16 HslSaturation16; + MOBLEUINT16 TargetHslLightness16; + MOBLEUINT16 TargetHslHueLightness16; + MOBLEUINT16 TargetHslSaturation16; +}Appli_Light_HslSet; + +/* Light Hsl Hue set */ +typedef struct +{ + MOBLEUINT16 HslDefaultLightness16; + MOBLEUINT16 HslDefaultHueLightness16; + MOBLEUINT16 HslDefaultSaturation16; +}Appli_Light_HslDefaultSet; + +typedef struct +{ + MOBLEUINT16 Red_Value; + MOBLEUINT16 Green_Value; + MOBLEUINT16 Blue_Value; +}Appli_Light_RGBSet; + +typedef struct +{ + MOBLEUINT8 StatusCode; + MOBLEUINT16 HslHueMinRange16; + MOBLEUINT16 HslHueMaxRange16; + MOBLEUINT16 HslMinSaturation16; + MOBLEUINT16 HslMaxSaturation16; +}Appli_Light_HslRangeSet; + +typedef struct +{ + MOBLEUINT16 IntensityValue; + MOBLEUINT16 PwmRedValue; + MOBLEUINT16 PwmGreenValue; + MOBLEUINT16 PwmBlueValue; + MOBLEUINT16 PwmWarmValue; + MOBLEUINT16 PwmCoolValue; +}Appli_LightPwmValue_t; + +#pragma pack(pop) + +/* Exported Functions Prototypes ---------------------------------------------*/ + +MOBLE_RESULT Appli_Light_Lightness_Set(Light_LightnessStatus_t*, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Linear_Set(Light_LightnessStatus_t* pLight_LightnessLinearParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Default_Set(Light_LightnessDefaultParam_t* pLight_LightnessDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Last_Set(Light_LightnessStatus_t* pLight_LightnessParam, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Range_Set(Light_LightnessRangeParam_t* pLight_LightnessRangeParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Ctl_Set(Light_CtlStatus_t* pLight_CtlParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Set(Light_CtlStatus_t* pLight_CtltempParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Set(Light_CtlTemperatureRangeParam_t* pLight_CtlTempRangeParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlDefault_Set(Light_CtlDefaultParam_t* pLight_CtlDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Hsl_Set(Light_HslStatus_t* pLight_HslParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslHue_Set(Light_HslStatus_t* pLight_HslHueParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslSaturation_Set(Light_HslStatus_t* pLight_HslSaturationParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslDefault_Set(Light_HslDefaultParam_t* pLight_HslDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslRange_Set(Light_HslRangeParam_t* pLight_HslDefaultParam, + MOBLEUINT8 OptionalValid, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessStatus(MOBLEUINT8* lLightnessState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessLinearStatus(MOBLEUINT8* lLightnessState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessDefaultStatus(MOBLEUINT8* lDefaultState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessLastStatus(MOBLEUINT8* lLastState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetLightnessRangeStatus(MOBLEUINT8* lRangeState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlLightStatus(MOBLEUINT8* lCtlLightState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlTargetStatus(MOBLEUINT8* lCtlLightState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlTemperatureStatus(MOBLEUINT8* lCtlTempState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlTemperatureRange(MOBLEUINT8* lCtlTempRange, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetCtlDefaultStatus(MOBLEUINT8* lCtlDefaultState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslStatus(MOBLEUINT8* lHslState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslTargetStatus(MOBLEUINT8* lHslState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslHueStatus(MOBLEUINT8* lHslHueState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslSaturationStatus(MOBLEUINT8* lHslSaturationState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslHueRange(MOBLEUINT8* lHslHueRange, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslSatRange(MOBLEUINT8* lHslSatRange, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_GetHslDefaultStatus(MOBLEUINT8* lHslDefaultState, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +void Appli_Light_PwmInit(void); +void HSL2RGB_Conversion(MOBLEUINT8 elementIndex); +void Ctl_LedOffState(void); +void Rgb_LedOffState(void); +void RgbF_Create(MOBLEUINT16 value1, + MOBLEUINT16 value2, + MOBLEUINT16 value3, + MOBLEUINT8 elementIndex); +void Light_UpdateLedValue(MOBLEUINT8 state, + Appli_LightPwmValue_t light_state); + +/******************************************************************************/ +#endif /* __APPLI_LIGHT_H */ +/******************************************************************************/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c new file mode 100644 index 000000000..14b713458 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c @@ -0,0 +1,1206 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_client.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "appli_light_lc.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "appli_mesh.h" +#include "generic_client.h" +#include "appli_light_client.h" +#include "light_lc.h" +#include "light_client.h" + + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +extern MOBLEUINT8 Tid_Client; +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief Appli_LightClient_API: This function is a Wrapper to call Light Client API depending on opcode received in input +* @param elementIndex: Index of the element +* @param msg_opcode: opcode of the desired API +* @param msg_params: buffer containing the desired API parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + + switch(msg_opcode){ +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS +/******************************************************************************/ + case LIGHT_LIGHTNESS_GET: + { + result = LightClient_Lightness_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_SET: + { + result = LightClient_Lightness_Set_Ack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Linear Lightness params, Transition Time and Delay + break; + } + case LIGHT_LIGHTNESS_SET_UNACK: + { + result = LightClient_Lightness_Set_Unack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Linear Lightness params, Transition Time and Delay + break; + } + + case LIGHT_LIGHTNESS_LINEAR_GET: + { + result = LightClient_Lightness_Linear_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_LINEAR_SET: + { + result = LightClient_Lightness_Linear_Set_Ack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Lightness params, Transition Time and Delay + break; + } + case LIGHT_LIGHTNESS_LINEAR_SET_UNACK: + { + result = LightClient_Lightness_Linear_Set_Unack(elementIndex, + msg_params, + (sizeof(Light_LightnessParam_t)-4)); //Remove the size of Lightness params, Transition Time and Delay + break; + } + + case LIGHT_LIGHTNESS_DEFAULT_GET: + { + result = LightClient_Lightness_Default_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_DEFAULT_SET: + { + result = LightClient_Lightness_Default_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LightnessDefaultParam_t)); + break; + } + case LIGHT_LIGHTNESS_DEFAULT_SET_UNACK: + { + result = LightClient_Lightness_Default_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LightnessDefaultParam_t)); + break; + } + + + case LIGHT_LIGHTNESS_RANGE_GET: + { + result = LightClient_Lightness_Range_Get(elementIndex); + break; + } + case LIGHT_LIGHTNESS_RANGE_SET: + { + result = LightClient_Lightness_Range_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LightnessRangeParam_t)-1); //Remove the size of StatusCode + break; + } + case LIGHT_LIGHTNESS_RANGE_SET_UNACK: + { + result = LightClient_Lightness_Range_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LightnessRangeParam_t)-1); //Remove the size of StatusCode + break; + } + + +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_CTL +/******************************************************************************/ + case LIGHT_CTL_GET: + { + result = LightClient_Ctl_Get(elementIndex); + break; + } + case LIGHT_CTL_SET: + { + result = LightClient_Ctl_Set_Ack(elementIndex, + msg_params, + (sizeof(Light_CtlParam_t)-4) ); //Remove the size of Last_Lightness and Last_Temperature + break; + } + case LIGHT_CTL_SET_UNACK: + { + result = LightClient_Ctl_Set_Unack(elementIndex, + msg_params, + (sizeof(Light_CtlParam_t)-4) ); //Remove the size of Last_Lightness and Last_Temperature + break; + } + + case LIGHT_CTL_TEMPERATURE_GET: + { + result = LightClient_Ctl_Temperature_Get(elementIndex); + break; + } + case LIGHT_CTL_TEMPERATURE_SET: + { + result = LightClient_Ctl_Temperature_Set_Ack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + case LIGHT_CTL_TEMPERATURE_SET_UNACK: + { + result = LightClient_Ctl_Temperature_Set_Unack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + + case LIGHT_CTL_TEMPERATURE_RANGE_GET: + { + result = LightClient_Ctl_Temperature_Range_Get(elementIndex); + break; + } + case LIGHT_CTL_TEMPERATURE_RANGE_SET: + { + result = LightClient_Ctl_Temperature_Range_Set_Ack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureRangeParam_t)-1); //Remove the size of StatusCode + break; + } + case LIGHT_CTL_TEMPERATURE_RANGE_SET_UNACK: + { + result = LightClient_Ctl_Temperature_Range_Set_Unack(elementIndex, + msg_params, + sizeof(Light_CtlTemperatureRangeParam_t)-1); //Remove the size of StatusCode + break; + } + + case LIGHT_CTL_DEFAULT_GET: + { + result = LightClient_Ctl_Default_Get(elementIndex); + break; + } + case LIGHT_CTL_DEFAULT_SET: + { + result = LightClient_Ctl_Default_Set_Ack(elementIndex, + msg_params, + sizeof(Light_CtlDefaultParam_t)); + break; + } + case LIGHT_CTL_DEFAULT_SET_UNACK: + { + result = LightClient_Ctl_Default_Set_Unack(elementIndex, + msg_params, + sizeof(Light_CtlDefaultParam_t)); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_CTL */ +/******************************************************************************/ + +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_HSL +/******************************************************************************/ + case LIGHT_HSL_GET: + { + result = LightClient_Hsl_Get(elementIndex); + break; + } + case LIGHT_HSL_SET: + { + result = LightClient_Hsl_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslParam_t) ); + break; + } + case LIGHT_HSL_SET_UNACK: + { + result = LightClient_Hsl_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslParam_t) ); + break; + } + + case LIGHT_HSL_DEFAULT_GET: + { + result = LightClient_Hsl_Default_Get(elementIndex); + break; + } + case LIGHT_HSL_DEFAULT_SET: + { + result = LightClient_Hsl_Default_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslDefaultParam_t) ); + break; + } + case LIGHT_HSL_DEFAULT_SET_UNACK: + { + result = LightClient_Hsl_Default_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslDefaultParam_t) ); + break; + } + + case LIGHT_HSL_RANGE_GET: + { + result = LightClient_Hsl_Range_Get(elementIndex); + break; + } + case LIGHT_HSL_RANGE_SET: + { + result = LightClient_Hsl_Range_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslRangeParam_t)-1); //Remove the size of StatusCode + break; + } + case LIGHT_HSL_RANGE_SET_UNACK: + { + result = LightClient_Hsl_Range_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslRangeParam_t)-1); //Remove the size of StatusCode + break; + } + + case LIGHT_HSL_HUE_GET: + { + result = LightClient_Hsl_Hue_Get(elementIndex); + break; + } + case LIGHT_HSL_HUE_SET: + { + result = LightClient_Hsl_Hue_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslHueParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + case LIGHT_HSL_HUE_SET_UNACK: + { + result = LightClient_Hsl_Hue_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslHueParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + + case LIGHT_HSL_SATURATION_GET: + { + result = LightClient_Hsl_Saturation_Get(elementIndex); + break; + } + case LIGHT_HSL_SATURATION_SET: + { + result = LightClient_Hsl_Saturation_Set_Ack(elementIndex, + msg_params, + sizeof(Light_HslSaturationParam_t)-2); //Remove the size of Transition Time and Delay + break; + } + case LIGHT_HSL_SATURATION_SET_UNACK: + { + result = LightClient_Hsl_Saturation_Set_Unack(elementIndex, + msg_params, + sizeof(Light_HslSaturationParam_t)-2); //Remove the size of Transition Time and Delay + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_HSL */ +/******************************************************************************/ +/******************************************************************************/ +#ifdef ENABLE_LIGHT_MODEL_CLIENT_LC +/******************************************************************************/ + case LIGHT_LC_MODE_GET: + { + result = LightClient_LC_Mode_Get(elementIndex); + break; + } + case LIGHT_LC_MODE_SET: + { + result = LightClient_LC_Mode_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LC_ModeParam_t)); + break; + } + case LIGHT_LC_MODE_SET_UNACK: + { + result = LightClient_LC_Mode_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LC_ModeParam_t)); + break; + } + case LIGHT_LC_OM_GET: + { + result = LightClient_LC_OM_Get(elementIndex); + break; + } + case LIGHT_LC_OM_SET: + { + result = LightClient_LC_OM_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LC_OccupancyModeParam_t)); + break; + } + case LIGHT_LC_OM_SET_UNACK: + { + result = LightClient_LC_OM_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LC_OccupancyModeParam_t)); + break; + } + case LIGHT_LC_ON_OFF_GET: + { + result = LightClient_LC_OnOff_Get(elementIndex); + break; + } + case LIGHT_LC_ON_OFF_SET: + { + result = LightClient_LC_OnOff_Set_Ack(elementIndex, + msg_params, + sizeof(Light_LC_OnOffParam_t)); + break; + } + case LIGHT_LC_ON_OFF_SET_UNACK: + { + result = LightClient_LC_OnOff_Set_Unack(elementIndex, + msg_params, + sizeof(Light_LC_OnOffParam_t)); + break; + } + + case LIGHT_LC_PROPERTY_GET: + { + result = LightClient_LC_Property_Get(elementIndex, msg_params); + break; + } + case LIGHT_LC_PROPERTY_SET: + { + + result = LightClient_LC_Property_Set_Ack(elementIndex, + msg_params, + 5); + break; + } + case LIGHT_LC_PROPERTY_SET_UNACK: + { + + result = LightClient_LC_Property_Set_Unack(elementIndex, + msg_params, + 5); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_LIGHT_MODEL_CLIENT_LC */ +/******************************************************************************/ + default: + { + TRACE_M(TF_LIGHT, "OpCode value invalid %d \r\n", msg_opcode); + result = MOBLE_RESULT_FAIL; + } + } + return result; +} + +/** +* @brief Appli_Light_Lightness_Status: This function is callback for Application +* when Light Lightness status message is received +* @param pLightness_status: Pointer to the parameters received for message +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Status(MOBLEUINT8 const *pLightness_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#824E!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pLightness_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Lightness: 0x%x (%d)\r\n", + value | pLightness_status[i] << 8, + value | pLightness_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Lightness: 0x%x (%d)\r\n", + value | pLightness_status[i] << 8, + value | pLightness_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\r\n", + pLightness_status[i], + pLightness_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Linear_Status: This function is callback for Application +* when Light Lightness Linear status message is received +* @param pLightnessLinear_status: Pointer to the parameters received for message +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Linear_Status(MOBLEUINT8 const *pLightnessLinear_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Linear_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8252!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pLightnessLinear_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Lightness: 0x%x (%d)\r\n", + value | pLightnessLinear_status[i] << 8, + value | pLightnessLinear_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Lightness: 0x%x (%d)\r\n", + value | pLightnessLinear_status[i] << 8, + value | pLightnessLinear_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\r\n", + pLightnessLinear_status[i], + pLightnessLinear_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Last_Status: This function is callback for Application +* when Light Lightness Last status message is received +* @param pLightnessDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Last_Status(MOBLEUINT8 const *pLightnessLast_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Last_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8256!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + value = pLightnessLast_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness Last: 0x%x (%d)\r\n", + value | pLightnessLast_status[i] << 8, + value | pLightnessLast_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Default_Status: This function is callback for Application +* when Light Lightness Default status message is received +* @param pLightnessDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Default_Status(MOBLEUINT8 const *pLightnessDefault_status, MOBLEUINT32 pLength + , MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Default_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8256!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + value = pLightnessDefault_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness Default: 0x%x (%d)\r\n", + value | pLightnessDefault_status[i] << 8, + value | pLightnessDefault_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Lightness_Range_Status: This function is callback for Application +* when Light Lightness range ststus message is received +* @param pLightnessRange_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Lightness_Range_Status(MOBLEUINT8 const *pLightnessRange_status, MOBLEUINT32 pLength + , MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_Lightness_Range_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8258!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + TRACE_M(TF_LIGHT,"Status Code: 0x%x (%d)\r\n", + pLightnessRange_status[i], + pLightnessRange_status[i]); + } + else if((i == 1) || (i == 3)) + { + value = pLightnessRange_status[i]; + } + else if(i == 2) + { + TRACE_M(TF_LIGHT,"Range Min: 0x%x (%d)\r\n", + value | pLightnessRange_status[i] << 8, + value | pLightnessRange_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Range Max: 0x%x (%d)\r\n", + value | pLightnessRange_status[i] << 8, + value | pLightnessRange_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Ctl_Status: This function is callback for Application +* when Light CTL status message is received +* @param pLightCtl_status: Pointer to the parameters received for message +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Ctl_Status(MOBLEUINT8 const *pLightCtl_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Ctl_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8260!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4) || (i == 6)) + { + value = pLightCtl_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present CTL Lightness: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Present CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Target CTL Lightness: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 7) + { + TRACE_M(TF_LIGHT,"Target CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtl_status[i] << 8, + value | pLightCtl_status[i] << 8); + } + else if(i == 8) + { + TRACE_M(TF_LIGHT,"Remaining Time:0x%x (%d)\r\n", + pLightCtl_status[i], + pLightCtl_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_CtlTemperature_Status: This function is callback for Application +* when Light CTL temperature status message is received +* @param pLightCtlTemp_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Status(MOBLEUINT8 const *pLightCtlTemp_status, MOBLEUINT32 pLength + , MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_CtlTemperature_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8266!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4) || (i == 6)) + { + value = pLightCtlTemp_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Present CTL Delta UV: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Target CTL Temperature: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 7) + { + TRACE_M(TF_LIGHT,"Target CTL Delta UV: 0x%x (%d)\r\n", + value | pLightCtlTemp_status[i] << 8, + value | pLightCtlTemp_status[i] << 8); + } + else if(i == 8) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\r\n", + pLightCtlTemp_status[i], + pLightCtlTemp_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Appli_Light_CtlTemperature_Range_Set: This function is callback for Application +* when Light CTL temperature range status message is received +* @param pCtlTempRange_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Status(MOBLEUINT8 const *pCtlTempRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value; +#endif + + TRACE_M(TF_LIGHT,"Light_CtlTemperature_Range_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8263!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + TRACE_M(TF_LIGHT,"Status Code: 0x%x (%d)\r\n", + pCtlTempRange_status[i], + pCtlTempRange_status[i]); + } + else if((i == 1) || (i == 3)) + { + value = pCtlTempRange_status[i]; + } + else if(i == 2) + { + TRACE_M(TF_LIGHT,"Range Min: 0x%x (%d)\r\n", + value | pCtlTempRange_status[i] << 8, + value | pCtlTempRange_status[i] << 8 ); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Range Max: 0x%x (%d)\r\n", + value | pCtlTempRange_status[i] << 8, + value | pCtlTempRange_status[i] << 8 ); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_CtlDefault_Status: This function is callback for Application +* when Light CTL Default status message is received +* @param pCtlDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_CtlDefault_Status(MOBLEUINT8 const *pCtlDefault_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Ctl_DefaultStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8268!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4)) + { + value = pCtlDefault_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness: 0x%x (%d)\n\r", + value | pCtlDefault_status[i] << 8, + value | pCtlDefault_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Temperature: 0x%x (%d)\n\r", + value | pCtlDefault_status[i] << 8, + value | pCtlDefault_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Delta UV: 0x%x (%d)\n\r", + value | pCtlDefault_status[i] << 8, + value | pCtlDefault_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_Hsl_Status: This function is callback for Application +* when Light HSL status message is received +* @param pHsl_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_Hsl_Status(MOBLEUINT8 const *pHsl_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_Hsl_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8278!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4)) + { + value = pHsl_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"HSL Lightness: 0x%x (%d)\n\r", + value | pHsl_status[i] << 8, + value | pHsl_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"HSL Hue: 0x%x (%d)\n\r", + value | pHsl_status[i] << 8, + value | pHsl_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"HSL Saturation: 0x%x (%d)\n\r", + value | pHsl_status[i] << 8, + value | pHsl_status[i] << 8); + } + else if(i == 6) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\n\r", + pHsl_status[i], + pHsl_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslHue_Status: This function is callback for Application +* when Light HSL HUE status message is received +* @param pHslHue_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslHue_Status(MOBLEUINT8 const *pHslHue_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslHue_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8271!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pHslHue_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Hue: 0x%x (%d)\n\r", + value | pHslHue_status[i] << 8, + value | pHslHue_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Hue: 0x%x (%d)\n\r", + value | pHslHue_status[i] << 8, + value | pHslHue_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\n\r", + pHslHue_status[i], + pHslHue_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslSaturation_Status: This function is callback for Application +* when Light HSL Saturation status message is received +* @param pHslSaturation_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslSaturation_Status(MOBLEUINT8 const *pHslSaturation_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslSaturation_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8275!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2)) + { + value = pHslSaturation_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Present Saturation: 0x%x (%d)\n\r", + value | pHslSaturation_status[i] << 8, + value | pHslSaturation_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Target Saturation: 0x%x (%d)\n\r", + value | pHslSaturation_status[i] << 8, + value | pHslSaturation_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Remaining Time: 0x%x (%d)\n\r", + pHslSaturation_status[i], + pHslSaturation_status[i]); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslDefault_Status: This function is callback for Application +* when Light HSL Default status message is received +* @param pHslDefault_status: Pointer to the parameters received for message +* @param pLength: length of data +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslDefault_Status(MOBLEUINT8 const *pHslDefault_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslDefault_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#827C!\r\n"); + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if((i == 0) || (i == 2) || (i == 4)) + { + value = pHslDefault_status[i]; + } + else if(i == 1) + { + TRACE_M(TF_LIGHT,"Lightness: 0x%x (%d)\n\r", + value | pHslDefault_status[i] << 8, + value | pHslDefault_status[i] << 8); + } + else if(i == 3) + { + TRACE_M(TF_LIGHT,"Hue: 0x%x (%d)\n\r", + value | pHslDefault_status[i] << 8, + value | pHslDefault_status[i] << 8); + } + else if(i == 5) + { + TRACE_M(TF_LIGHT,"Saturation: 0x%x (%d)\n\r", + value | pHslDefault_status[i] << 8, + value | pHslDefault_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Appli_Light_HslRange_Status: This function is callback for Application +* when Light HSL range status message is received +* @param pHslRange_status: Pointer to the parameters received for message +* @param pLength: length of data +* @param dstPeer: destination send by peer for this node. It can be a +* unicast or group address +* @param elementIndex: index of the element received from peer for this node which +* is elementNumber-1 +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, MOBLEUINT32 pLength, MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ +#if ( CFG_DEBUG_TRACE != 0 ) + MOBLEUINT32 i; + MOBLEUINT16 value = 0; +#endif + + TRACE_M(TF_LIGHT,"Light_HslRange_Status callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#827E!\r\n"); + + +#if ( CFG_DEBUG_TRACE != 0 ) + for(i = 0; i < pLength; i++) + { + if(i == 0) + { + TRACE_M(TF_LIGHT,"Status Code: 0x%x (%d)\n\r", + pHslRange_status[i], + pHslRange_status[i]); + } + else if((i == 1) || (i == 3) || (i == 5) || (i == 7)) + { + value = pHslRange_status[i]; + } + else if(i == 2) + { + TRACE_M(TF_LIGHT,"Hue Range Min: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + else if(i == 4) + { + TRACE_M(TF_LIGHT,"Hue Range Max: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + else if(i == 6) + { + TRACE_M(TF_LIGHT,"Saturation Range Min: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + else if(i == 8) + { + TRACE_M(TF_LIGHT,"Saturation Range Max: 0x%x (%d)\n\r", + value | pHslRange_status[i] << 8, + value | pHslRange_status[i] << 8); + } + } +#endif + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h new file mode 100644 index 000000000..2a2dfc254 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h @@ -0,0 +1,111 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_client.h + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_LIGHT_CLIENT_H +#define __APPLI_LIGHT_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "generic.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_Light_Lightness_Status(MOBLEUINT8 const *pLightness_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Linear_Status(MOBLEUINT8 const *pLightnessLinear_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Last_Status(MOBLEUINT8 const *pLightnessLast_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Default_Status(MOBLEUINT8 const *pLightnessDefault_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Lightness_Range_Status(MOBLEUINT8 const *pLightnessRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Ctl_Status(MOBLEUINT8 const *pLightCtl_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Status(MOBLEUINT8 const *pLightCtlTemp_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlTemperature_Range_Status(MOBLEUINT8 const *pCtlTempRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_CtlDefault_Status(MOBLEUINT8 const *pCtlDefault_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_Hsl_Status(MOBLEUINT8 const *pHsl_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslSaturation_Status(MOBLEUINT8 const *pHslSaturation_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslHue_Status(MOBLEUINT8 const *pHslHue_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_Light_HslDefault_Status(MOBLEUINT8 const *pHslDefault_status, + MOBLEUINT32 pLength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, + MOBLEUINT16 msg_opcode, + MOBLEUINT8* msg_params); + +#endif /* __APPLI_LIGHT_CLIENT_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c new file mode 100644 index 000000000..17bc31377 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c @@ -0,0 +1,454 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_lc.c + * @author MCD Application Team + * @brief Application interface for light LC Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_light_lc.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variable ----------------------------------------------------------*/ + +__attribute__((aligned(4)))const light_lc_cb_t AppliLightLc_cb = +{ + Appli_LightLCs_ModeGet, + Appli_LightLCs_ModeSet, + Appli_LightLCs_ModeSetUnack, + Appli_LightLCs_ModeStatus, + Appli_LightLCs_OmGet, + Appli_LightLCs_OmSet, + Appli_LightLCs_OmSetUnack, + Appli_LightLCs_OmStatus, + Appli_LightLCs_OnOffGet, + Appli_LightLCs_OnOffSet, + Appli_LightLCs_OnOffSetUnack, + Appli_LightLCs_OnOffStatus, + Appli_LightLCs_PropertyGet, + Appli_LightLCs_PropertySet, + Appli_LightLCs_PropertySetUnack, + Appli_LightLCs_PropertyStatus +}; + +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ +/** + * @brief Callback corresponding to LightLCs_ModeGet_cb + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeGet(MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_ModeSet_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeSet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_ModeSetUnack_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeSetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_ModeSatus_cb + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_ModeStatus(MOBLEUINT8 const* pLightLCMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_ModeStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8294!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC Mode value: %d\n\r", + pLightLCMode_status[i]); + } +} + + +/** + * @brief Callback corresponding to LightLCs_OmGet_cb + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmGet(MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OmSet_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmSet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OmSetUnack_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmSetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OmStatus_cb + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OmStatus(MOBLEUINT8 const* pLightLCOccupancyMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_OmStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#8298!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC OM value: %d\n\r", + pLightLCOccupancyMode_status[i]); + } +} + + +/** + * @brief Callback corresponding to LightLCs_OnOffGet_cb + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_OnOffGet(MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLC_OnOffSet_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_OnOffSet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OnOffSetUnack_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_OnOffSetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_OnOffStatus_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_OnOffStatus(MOBLEUINT8 const* pLightLCOnOff_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_OnOffStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#829C!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC OnOff status: %d\n\r", + pLightLCOnOff_status[i]); + } +} + + +/** + * @brief Callback corresponding to LightLCs_PropertyGet_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_PropertyGet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_PropertySet_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_PropertySet(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) +{ + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); +} + + +/** + * @brief Callback corresponding to LightLCs_PropertySetUnack_cb + * @param Data + * @param Message parameters + * @retval None + */ +void Appli_LightLCs_PropertySetUnack(MOBLEUINT8 const* pRxData, MODEL_MessageHeader_t *pmsgParam) + { + TRACE_M(TF_LIGHT_LC, "Element index %d peer addr %X dst peer %X\r\n", + pmsgParam->elementIndex, pmsgParam->peer_addr, pmsgParam->dst_peer); + } + + +/** + * @brief Callback corresponding to LightLCs_PropertyStatus_cb + * @param Data + * @param Message parameters + * @retval None +*/ +void Appli_LightLCs_PropertyStatus(MOBLEUINT8 const* pLightLCProperty_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + TRACE_M(TF_LIGHT_LC,"LightLCs_PropertyStatus callback received for element %d \r\n", elementIndex); + TRACE_M(TF_SERIAL_CTRL,"#64!\r\n"); + + for(i = 0; i < plength; i++) + { + if(i == 0) + TRACE_M(TF_SERIAL_CTRL,"Light LC Property status: %d\n\r", + pLightLCProperty_status[i]); + } +} + + +/** + * @brief + * @param + * @retval + */ +__weak MOBLE_RESULT Appli_Light_LCs_Init(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + MOBLEUINT8 lcsElementIndex = 0; + + /* Extract element index of LC server */ + result = ExtractLcServerElementIndex(&lcsElementIndex, +#ifdef APPLICATION_NUMBER_OF_ELEMENTS + APPLICATION_NUMBER_OF_ELEMENTS, +#else + 0, +#endif +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + ENABLE_LIGHT_MODEL_SERVER_LC, + ENABLE_LIGHT_MODEL_SERVER_LC_SETUP, +#else + 0, + 0, +#endif +#ifdef ENABLE_GENERIC_MODEL_SERVER_ONOFF + ENABLE_GENERIC_MODEL_SERVER_ONOFF, +#else + 0, +#endif +#ifdef ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF, +#else + 0, +#endif +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS); +#else + 0); +#endif + + if(MOBLE_SUCCEEDED(result)) + { + result = Light_LCs_Init(&BufferLcServer, lcsElementIndex, &AppliLightLc_cb, SIZE_OF_LC_SERVER_T); + } + + if(MOBLE_FAILED(result)) + { + TRACE_M(TF_LIGHT_LC, "Light LC Server init failed\r\n"); + } + + return result; +} + + +/** + * @brief + * @param + * @retval + */ +__weak MOBLE_RESULT Appli_Light_LC_SensorPropertyUpdate(MOBLEUINT8 elementIndex, + MOBLEUINT16 propertyId, + MOBLEUINT32 value) +{ + return Light_LC_SensorPropertyUpdate(elementIndex, + propertyId, + value); +} + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC +/** + * @brief Handling of serial inputs to LC model + * @param serial string + * @param serial string size + * @retval void + */ +void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) +{ + MOBLE_RESULT result = MOBLE_RESULT_INVALIDARG; + + if (!strncmp(rcvdStringBuff+6, "TR0", 3)) + { + if (rcvdStringSize == 9) + { + /* call to function corresponding MMDL/SR/LLC/BV-03-C */ + result = Light_LC_SetTransitionTimeZero(1); + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else if (!strncmp(rcvdStringBuff+6, "OCCUPANCY", 9)) /* occupancy detect */ + { + if (rcvdStringSize == 15) + { + /* occupancy detected for element index 0 */ + Appli_Light_LC_SensorPropertyUpdate(0, + PRESENCE_DETECTED_PID, + 1); + result = MOBLE_RESULT_SUCCESS; + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + /* Check the result of command processing */ + if(result == MOBLE_RESULT_SUCCESS) + { + BLEMesh_PrintStringCb("Success\r\n"); + } + else if(result == MOBLE_RESULT_OUTOFMEMORY) + { + BLEMesh_PrintStringCb("Fail Out of memory\r\n"); + } + else if(result == MOBLE_RESULT_INVALIDARG) + { + BLEMesh_PrintStringCb("Fail Invalid Argument\r\n"); + } + else + { + BLEMesh_PrintStringCb("Fail\r\n"); + } +} +#endif + + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h new file mode 100644 index 000000000..e9ce605f2 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h @@ -0,0 +1,81 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_light_lc.h + * @author MCD Application Team + * @brief Application interface for Light Control Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_LIGHT_LC_H +#define __APPLI_LIGHT_LC_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "light_lc.h" + +/* Exported macro ------------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +/******************************************************************************* +Following Variables are used for the Light LC Mode MODEL +*******************************************************************************/ +void Appli_LightLCs_ModeGet(MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_ModeSet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_ModeSetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_ModeStatus(MOBLEUINT8 const* pLightLCMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); + +void Appli_LightLCs_OmGet(MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OmSet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OmSetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OmStatus(MOBLEUINT8 const* pLightLCOccupancyMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +void Appli_LightLCs_OnOffGet(MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OnOffSet(MOBLEUINT8 const* pRxData, + + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OnOffSetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_OnOffStatus(MOBLEUINT8 const* pLightLCOnOff_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +void Appli_LightLCs_PropertyGet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_PropertySet(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_PropertySetUnack(MOBLEUINT8 const* pRxData, + MODEL_MessageHeader_t *pmsgParam); +void Appli_LightLCs_PropertyStatus(MOBLEUINT8 const* pLightLCOccupancyMode_status, + MOBLEUINT32 plength, + MOBLEUINT16 dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Light_LCs_Init(void); +MOBLE_RESULT Appli_Light_LC_SensorPropertyUpdate(MOBLEUINT8 elementIndex, + MOBLEUINT16 propertyId, + MOBLEUINT32 value); +void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, + uint16_t rcvdStringSize); +#endif /* __APPLI_LIGHT_LC_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c new file mode 100644 index 000000000..b14dd1d72 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c @@ -0,0 +1,1908 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_mesh.c + * @author MCD Application Team + * @brief User Application file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "ble_common.h" +#include "app_conf.h" +#include "hal_common.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "types.h" +#include "ble_hal_aci.h" +#include "ble_hci_le.h" +#include +#include "models_if.h" +#include "mesh_cfg.h" +#include "generic.h" +#include "light.h" +#include "light_lc.h" +#include "sensors.h" +#include "common.h" +#include "serial_if.h" +#include "appli_nvm.h" +#include "pal_nvm.h" +#include "appli_config_client.h" +#include "appli_generic_client.h" +#include "appli_light_client.h" +#include "appli_sensor.h" +#include "appli_sensors_client.h" + +#include "stm32_seq.h" +#if (( CFG_LPM_SUPPORTED == 0) && (ENABLE_PWM_SUPPORT == 1)) +#include "PWM_config.h" +#include "PWM_handlers.h" +#endif +#include "mesh_cfg_usr.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private define ------------------------------------------------------------*/ +#define APPLI_OPTIM 0 + +/*********** Macros to be modified according to the requirement *************/ +#define BOUNCE_THRESHOLD 20U +#define LONG_PRESS_THRESHOLD 1000U +#define MANUAL_UNPROVISION_TIMER 3000U +#define FLASH_ERASE_TIME 100U +//#define DISCOVER_TIMER 10*60*1000 /* 10 minutes */ +#define DISCOVER_TIMER_INTERVAL 10*60*(1000000/CFG_TS_TICK_VAL) /* 10 minutes */ +#if (APPLI_OPTIM == 1) +#define APPLI_MESH_TIMER_INTERVAL 1*(1000/CFG_TS_TICK_VAL) /* 1 ms */ +#endif +#define DEFAULT_DELAY_PACKET_FROM 500U +#define DEFAULT_DELAY_PACKET_RANDOM_TIME 500U +#define USER_OUTPUT_OOB_APPLI_PROCESS 0U +#define INPUT_OOB_TIMEOUT 300U /* input Oob30 Sec timeout*/ +#define PBADV_UNPROV_DEV_BEACON_INTERVAL 100U /* 100 ms */ + +#define DEVICE_KEY_SIZE 16U +#define APP_KEY_SIZE 16U +#if (LOW_POWER_FEATURE == 1) +#define LPN_API_TIMER_INTERVAL 5*(1000000/CFG_TS_TICK_VAL) /* 5 secondes */ +#endif +/* Private macro -------------------------------------------------------------*/ +#define MAX_APPLI_BUFF_SIZE 8 +#define MAX_PENDING_PACKETS_QUE_SIZE 2 +#define DATA_BUFFER_LENGTH 8 +#define MAX_NUMB_ELEMENTS APPLICATION_NUMBER_OF_ELEMENTS +#define CUSTOM_BEACON_AD_TYPE 0x00 +#define ENABLE_CUSTOM_BEACON 0 +#define CUSTOM_BEACON_INTERVAL 2000U + +/**********************Friendship callbacks macros ****************************/ +#define FN_CLEARED_REPEAT_REQUEST 1 +#define FN_CLEARED_POLL_TIMEOUT 2 +#define FN_CLEARED_FRIEND_CLEAR 3 +#define LPN_CLEARED_NO_RESPONSE 1 + +/* Private variables ---------------------------------------------------------*/ + + +enum ButtonState +{ + BS_OFF, + BS_DEBOUNCE, + BS_SHORT_PRESS, + BS_LONG_PRESS +}; + +enum ButtonState buttonState = BS_OFF; +tClockTime tBounce = 0; +/*Will be an array aligned with number of elements*/ +MOBLEUINT8 Appli_LedState = 0; +MOBLEUINT16 IntensityValue = INTENSITY_LEVEL_ZERO; +MOBLEUINT8 IntensityFlag = FALSE; +MOBLEUINT8 ProxyFlag = 0; +MOBLEUINT8 ProvisionFlag = 0; +MOBLEUINT8 UnprovisionInProgress = 0; + +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB +static MOBLEUINT8 PrvngInProcess = 0; +static MOBLEUINT32 OutputOobData = 0; +static MOBLEUINT32 OutputOobBlinkCount = 0; +#endif + +#ifdef ENABLE_AUTH_TYPE_INPUT_OOB +MOBLEUINT8 InputOobData[8] = {0}; +MOBLEUINT8 inputOOBDataReady = 0; +#endif + +/*Number Of Elements selected per Node. Maximum Elements supported = 3*/ +MOBLEUINT8 NumberOfElements = APPLICATION_NUMBER_OF_ELEMENTS; + +#ifdef ENABLE_AUTH_TYPE_STATIC_OOB +/* 16 octets Static OOB information to be input here. Used during provisioning by Library */ +const MOBLEUINT8 StaticOobBuff[SIZE_STATIC_OOB] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}; +#else +const MOBLEUINT8 StaticOobBuff[] = {0}; +#endif + +#ifdef PUB_KEY_TYPE_OOB +/* 64 octets Public Key information to be input here. It is only required for Public Key OOB case. +Used during provisioning by Library */ +const MOBLEUINT8 PubKeyBuff[64] = {0xF4, 0x65, 0xE4, 0x3F, 0xF2, 0x3D, 0x3F, 0x1B, 0x9D, 0xC7, +0xDF, 0xC0, 0x4D, 0xA8, 0x75, 0x81, 0x84, 0xDB, 0xC9, 0x66, 0x20, 0x47, 0x96, 0xEC, 0xCF, +0x0D, 0x6C, 0xF5, 0xE1, 0x65, 0x00, 0xCC, 0x02, 0x01, 0xD0, 0x48, 0xBC, 0xBB, 0xD8, 0x99, +0xEE, 0xEF, 0xC4, 0x24, 0x16, 0x4E, 0x33, 0xC2, 0x01, 0xC2, 0xB0, 0x10, 0xCA, 0x6B, 0x4D, +0x43, 0xA8, 0xA1, 0x55, 0xCA, 0xD8, 0xEC, 0xB2, 0x79}; + +/* 32 octets Private Key information to be input here. It is only required for Public Key OOB case. +Used during provisioning by Library */ +const MOBLEUINT8 PrivKeyBuff[32] = {0x52, 0x9A, 0xA0, 0x67, 0x0D, 0x72, 0xCD, 0x64, 0x97, 0x50, +0x2E, 0xD4, 0x73, 0x50, 0x2B, 0x03, 0x7E, 0x88, 0x03, 0xB5, 0xC6, 0x08, 0x29, 0xA5, 0xA3, +0xCA, 0xA2, 0x19, 0x50, 0x55, 0x30, 0xBA}; +#else +const MOBLEUINT8 PubKeyBuff[] = NULL; +const MOBLEUINT8 PrivKeyBuff[] = NULL; +#endif + + + +/* Select Node as Sniffer, Means able to sniff all the packets +* 0 - Filters are enabled and packets not targeted to node are filtered +* 1 - Filters are disabled and packets not targeted to node are not filtered +*/ +MOBLEUINT8 DisableFilter = 0; + +#if LOW_POWER_FEATURE +MOBLEINT32 BLEMesh_sleepTime; +MOBLEUINT32 SysRefCount; +MOBLEBOOL LPN_scan_enabled; +#endif + +MOBLEUINT8 nvm_operation; +MOBLEUINT8 nvm_flash_page; +MOBLEUINT8 provisioning_completion; + +/* Timer to control unprovisioned device beacons */ +#if PB_ADV_SUPPORTED +MOBLEUINT8 discoverTimer_Id; +tClockTime discoverTimerinterval = DISCOVER_TIMER_INTERVAL; +#endif + +#if (APPLI_OPTIM == 1) +MOBLEUINT8 appliTaskTimer_Id; +#endif +#if LOW_POWER_FEATURE +volatile uint8_t BleProcessInit = 0; +#endif +#if (LOW_POWER_FEATURE == 1) +MOBLEUINT8 lowPowerNodeApiTimer_Id; +#endif + +MOBLEUINT8 pPropertyId[4]; + +/********************* Application configuration **************************/ +#if defined(__GNUC__) || defined(__IAR_SYSTEMS_ICC__) || defined(__CC_ARM) +MOBLEUINT8 bdaddr[8]; + +#ifdef INTERNAL_UNIQUE_NUMBER_MAC +static void Appli_GetMACfromUniqueNumber(void); +#endif /* INTERNAL_UNIQUE_NUMBER_MAC */ + +const void *mobleNvmBase; +const void *appNvmBase; +const void *prvsnr_data; +#else +#error "Unknown compiler" +#endif /* __GNUC__ || defined(__IAR_SYSTEMS_ICC__) || defined(__CC_ARM) */ + +/* Private function prototypes -----------------------------------------------*/ +static void Appli_LongButtonPress(void); +static void Appli_ShortButtonPress(void); +#if USER_OUTPUT_OOB_APPLI_PROCESS +void Appli_OobAuthenticationProcess(void); +#endif +void BLEMesh_UnprovisionCallback(MOBLEUINT8 reason); +void Appli_LowPowerProcess(void); +#if (APPLI_OPTIM == 1) +static void AppliMeshTask(void); +#endif +void Appli_GetPublicationParamsCb(model_publicationparams_t* pPubParameters); +WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInProcess, + MOBLEUINT16 nodeAddress)); + +/* Private functions ---------------------------------------------------------*/ + +/************************* Button Control functions ********************/ +/** +* @brief Function calls when a button is pressed for short duration +* @param void +* @retval void +*/ +static void Appli_ShortButtonPress(void) +{ + BLEMesh_ModelsCommand(); +} + + +/** +* @brief Function calls when a button is pressed for Long duration +* @param void +* @retval void +*/ +static void Appli_LongButtonPress(void) +{ + /** GENERIC ONOFF **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_ON_OFF_GET, NULL); + + /** GENERIC LEVEL **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_LEVEL_GET, NULL); + + /** GENERIC POWER ONOFF **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_GET, NULL); + + /** GENERIC TRANSITION TIME **/ +// TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME GET ------------- \r\n"); +// Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_GET, NULL); + + /** LIGHT LIGHTNESS **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_GET, NULL); + + /** LIGHT LIGHTNESS LINEAR **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS LINEAR GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_GET, NULL); + + /** LIGHT LIGHTNESS DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_GET, NULL); + + /** LIGHT LIGHTNESS RANGE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_GET, NULL); + + /** LIGHT LIGHTNESS CTL **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_GET, NULL); + + /** LIGHT LIGHTNESS CTL TEMPERATURE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_GET, NULL); + + /** LIGHT LIGHTNESS CTL TEMPERATURE RANGE **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_GET, NULL); + + /** LIGHT LIGHTNESS CTL DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_GET, NULL); + + /** LIGHT LIGHTNESS HSL **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_GET, NULL); + + /** LIGHT LIGHTNESS HSL DEFAULT **/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_GET, NULL); + + /** LIGHT LIGHTNESS HSL RANGE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_RANGE_GET, NULL); + + /** LIGHT LIGHTNESS HSL HUE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_HUE_GET, NULL); + + /** LIGHT LIGHTNESS HSL SATURATION**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_HSL_SATURATION_GET, NULL); + + /** LIGHT LC MODE**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_MODE_GET, NULL); + + /** LIGHT LC OM**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_OM_GET, NULL); + + /** LIGHT LC ON OFF**/ +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ON OFF GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_ON_OFF_GET, NULL); + + /** LIGHT LC PROPERTY **/ +//LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B + pPropertyId[0]= 0x2B; // Property ID byte 0 : Property ID identifying a Light LC Property. + pPropertyId[1]= 0x00; // Property ID byte 1 : Property ID identifying a Light LC Property. +// TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY GET ------------- \r\n"); +// Appli_LightClient_API(0, LIGHT_LC_PROPERTY_GET, pPropertyId); + + + /* SENSOR APIs */ + //PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + pPropertyId[0]= 0x4F; // Property ID byte 0 : Property ID for the sensor + pPropertyId[1]= 0x00; // Property ID byte 1 : Property ID for the sensor + + /** SENSOR DESCRIPTOR**/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR DESCRIPTOR GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_DESCRIPTOR_GET, pPropertyId); + + /** SENSOR CADENCE**/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_CADENCE_GET, pPropertyId); + + /** SENSOR SETTINGS **/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTINGS GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SETTINGS_GET, pPropertyId); + + /** SENSOR SETTING **/ + pPropertyId[2]= 0xAD; // Sensor Setting Property ID byte 0 : Property ID for the sensor setting + pPropertyId[3]= 0x00; // Sensor Setting Property ID byte 1 : Property ID for the sensor setting + +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SETTING_GET, pPropertyId); + + /** SENSOR GET **/ +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_GET, pPropertyId); + + /** SENSOR COLUMN **/ +// pPropertyId[2]= 0x01; // Raw Value X byte 0 : Raw value identifying a column +// pPropertyId[3]= 0x00; // Raw Value X byte 1 : Raw value identifying a column +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR COLUMN GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_COLUMN_GET, pPropertyId); + + /** SENSOR SERIES **/ +// pPropertyId[2]= 0x01; // Raw Value X1 byte 0 : Raw value identifying a starting column. +// pPropertyId[3]= 0x02; // Raw Value X2 byte 0 : Raw value identifying an ending column. +// TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SERIES GET ------------- \r\n"); +// Appli_SensorsClient_API(0, SENSOR_SERIES_GET, pPropertyId); + + IntensityPublish(); + +} + +/** +* @brief Updates the button status +* @param int isPressed +* @retval void +*/ +static void Appli_UpdateButtonState(int isPressed) +{ + uint32_t t0 = 0,t1 = 1; + + t0 = Clock_Time(); /* SW1 press timing */ + + while(BSP_PB_GetState(BUTTON_SW1) == BUTTON_PRESSED); + t1 = Clock_Time(); /* SW1 release timing */ + + if((t1 - t0) > LONG_PRESS_THRESHOLD) + { + Appli_LongButtonPress(); + } + else if((t1 - t0) > BOUNCE_THRESHOLD) + { + /* Button 1 short press action */ + Appli_ShortButtonPress(); + } +} + +/** +* @brief task for the BLE MESH, the MESH Models and the Appli processes +* @param void +* @retval void +*/ +static void Mesh_Task() +{ + BLEMesh_Process(); + BLEMesh_ModelsProcess(); /* Models Processing */ + + if((UnprovisionInProgress > 0) && + (!LL_FLASH_IsActiveFlag_OperationSuspended())) + { + UnprovisionInProgress = 0; + AppliNvm_ClearModelState(); + PalNvmErase(NVM_BASE, 0); + PalNvmErase(NVM_BASE, (NVM_SIZE >> 1)); + PalNvmErase(APP_NVM_BASE, 0); + PalNvmErase(PRVN_NVM_BASE_OFFSET, 0); + TRACE_M(TF_PROVISION,"NVM erased\r\n"); + TRACE_M(TF_PROVISION,"Device is unprovisioned by application \r\n"); + } + +#if (APPLI_OPTIM == 0) + /* Set the task in the scheduler for the next execution */ +#if (LOW_POWER_FEATURE == 0) + UTIL_SEQ_SetTask( 1< 0) + { + Appli_LedState = 1; + } + /* Switch Off the LED */ + else + { + Appli_LedState = 0; + } + + Appli_LedCtrl(); + + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief initializes BLE Stack +* @param none +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleStackInitCb() +{ + /* BLE Stack initialization */ + /* Not Required in BLE */ + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief Sets transmission power of RF +* @param none +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleSetTxPowerCb(void) +{ + tBleStatus status; + /* API to change the Transmission power of BLE Device */ + /* uint8_t en_high_power, uint8_t pa_level + en_high_power Can be only 0 or 1. Set high power bit on or off. + pa_level Can be from 0 to 7. Set the PA level value + */ + status = aci_hal_set_tx_power_level(1, CFG_TX_POWER); + if (status) + return MOBLE_RESULT_FAIL; + else + return MOBLE_RESULT_SUCCESS; +} + +/** +* @brief SET UUID value +* @param uuid_prefix_data : Pointer of UUID buffer data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleSetUUIDCb(MOBLEUINT8 *uuid_prefix_data) +{ + /* UUID is 128 bits (16 bytes) and can guarantee uniqueness across space and time. + It can be Time-based UUID or truly-random or pseudo-random numbers + + In this buffer user need to fill 10 bytes of UUID data. + Remaining 6 bytes, library fill this data with BDaddress. + + For example : + F81D4FAE-7DEC-XBC4-Y12F-17D1AD07A961 (16 bytes) + |_| |_| + + X = 1 i.e. Time Base UUID + X = 4 i.e. Random Number + Y = 4 i.e. Conforming to the current spec + For UUID information refer RFC4122 + */ + + /* copy UUID prefix data*/ + uint8_t uuid_buff[10] = {0xF8,0x1D,0x4F,0xAE,0x7D,0xEC};/*random value by user */ + + uuid_buff[6] = 0x4B; /* 0x4B => 4 : Random */ + uuid_buff[7] = 'S' ; /* User define value */ + uuid_buff[8] = 0xA1; /* 0xA1 => A : Conforming to the current Spec */ + uuid_buff[9] = 'T' ; /* User define value */ + + memcpy(uuid_prefix_data,uuid_buff,sizeof(uuid_buff)); + memcpy(&uuid_prefix_data[10],bdaddr,6); /* Copy bdaddr to last 6 bytes of UUID */ + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief SET CID , PID and VID values +* @param company_product_info : vendor fill product information in this buffer +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleSetProductInfoCB(MOBLEUINT8 *company_product_info) +{ + /* CID : provide 16-bit company identifier assigned by the Bluetooth SIG */ + uint16_t company_id = COMPANY_ID; + + /* PID : Provide 16-bit vendor-assigned product identifier */ + uint16_t product_id = PRODUCT_ID; + + /* VID : Provide 16-bit vendor-assigned product version identifier*/ + uint16_t product_version_id = PRODUCT_VERSION_ID; + + memcpy(company_product_info + 0,(void *)&company_id,sizeof(company_id)); + memcpy(company_product_info + 2 ,(void *)&product_id,sizeof(product_id)); + memcpy(company_product_info + 4 ,(void *)&product_version_id,sizeof(product_version_id)); + + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Call back function called when GATT Connection Created +* @param none +* @retval none +*/ +void Appli_BleGattConnectionCompleteCb(void) +{ + ProvisionFlag = 1; + /* Proxy Node, will be called whenever Gatt connection is established */ + /* Turn ON Red LED*/ + ProxyFlag = 1; + BSP_LED_On(LED_GREEN); +} + +/** +* @brief Call back function called when GATT Disconnection Complete +* @param none +* @retval none +*/ +void Appli_BleGattDisconnectionCompleteCb(void) +{ + ProvisionFlag = 0; + /* Proxy Node, will be called whenever Gatt disconnected */ + /* Turn Off Red LED*/ + ProxyFlag = 0; + BSP_LED_Off(LED_GREEN); +} + +/** +* @brief Unprovisioned Node Identification +* @param MOBLEUINT8 data +* @retval none +*/ +void Appli_BleUnprovisionedIdentifyCb(MOBLEUINT8 data) +{ +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + PrvngInProcess = 1; +#endif + TRACE_M(TF_PROVISION,"Unprovisioned Node Identifier received: %02x\n\r", data); +} + +/** +* @brief Set Number of Elements in a Node +* @param none +* @retval Sending the value to BLE Mesh Library +*/ +MOBLEUINT8 Appli_BleSetNumberOfElementsCb(void) +{ + if(NumberOfElements > BLEMesh_GetNumberOfElements()) + { + TRACE_M(TF_MISC, "Number of Elements enabled in application exceeding from Library Capability!\r\n"); + return BLEMesh_GetNumberOfElements(); + } + + else if(NumberOfElements == 0) + { + TRACE_M(TF_MISC,"Number Of Elements must be 1 or greater than 1!\r\n"); + return 1; + } + + else + { + return NumberOfElements; + } +} + +/** +* @brief Sets the Attention Timer Callback function +* @param none +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_BleAttentionTimerCb(void) +{ +/* avoid printf, if low power feature is supported */ +#if (LOW_POWER_FEATURE == 0) + TRACE_M(TF_MISC, " \r\n"); +#endif /* LOW_POWER_FEATURE == 0 */ + return MOBLE_RESULT_SUCCESS; +} + + +/** +* @brief Call back function to give Output OOB information +* @param MOBLEUINT8* output_oob +* @param MOBLEUINT8 size +* @retval void +*/ +void Appli_BleOutputOOBAuthCb(MOBLEUINT8* output_oob, MOBLEUINT8 size) +{ +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + uint32_t ooBData = 0; + for (MOBLEUINT8 i = 0; i < size; i++) + { + ooBData |= (output_oob[i] << 8*i); + } + OutputOobData = ooBData; + TRACE_M(TF_PROVISION,"Output OOB information for provisioner: %ld\n\r", ooBData); + #endif +} + + +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB +/** +* @brief Process for both output and Input OOB handling +* @param void +* @retval void +*/ +void Appli_OobAuthenticationProcess(void) +{ + if(OutputOobBlinkCount < OutputOobData) + { + OutputOobBlinkCount++; + Appli_LedBlink(); + } + else + { + OutputOobBlinkCount++; + Clock_Wait(1000); + if(OutputOobBlinkCount > OutputOobData+3) + { + OutputOobBlinkCount = 0; + } + } +} +#endif + + +/** +* @brief Call back function to provide Input OOB information +* @param MOBLEUINT8 size +* @retval MOBLEUINT8* +*/ +MOBLEUINT8* Appli_BleInputOOBAuthCb(MOBLEUINT8 size) +{ +#if defined (ENABLE_AUTH_TYPE_INPUT_OOB) && (ENABLE_SERIAL_INTERFACE) + MOBLEUINT16 inputTimer = 0; + TRACE_M(TF_PROVISION,"Input OOB information for provisioner-Size: %d\n\r", size); + while(1) + { + Serial_InterfaceProcess(); + /* Enable Mesh process working in while loop */ + BTLE_StackTick(); + /* Check if input is completed or timeout */ + if((inputOOBDataReady != 0x00) | (inputTimer > INPUT_OOB_TIMEOUT)) + { + inputOOBDataReady = 0; + break; + } + Clock_Wait(100); + inputTimer++; + } + return InputOobData; +#else + return NULL; +#endif +} + + +/** +* @brief Call back function to provide Input OOB information +* @param rcvdStringBuff: buffer to store input string +* @param rcvdStringSize: length of the input string +* @retval void +*/ +void Appli_BleSerialInputOOBValue(char *rcvdStringBuff, uint16_t rcvdStringSize) +{ +#ifdef ENABLE_AUTH_TYPE_INPUT_OOB + unsigned long long InputOobDatatemp; + sscanf(rcvdStringBuff + 5, "%lld", &InputOobDatatemp); + memmove(&InputOobData, &InputOobDatatemp, sizeof(InputOobDatatemp)); + inputOOBDataReady = 1; +#endif +} + + +/** +* @brief Application BLE Disable Filter +* @param none +* @retval Status is replied +*/ +MOBLEUINT8 Appli_BleDisableFilterCb(void) +{ + return DisableFilter; +} + +/** +* @brief Checks and do Manual Unprovision of board +* @param void +* @retval void +*/ +void Appli_CheckForUnprovision(void) +{ + /* Checks if the User button is pressed or not at the startup */ + if (BSP_PB_GetState(BUTTON_SW1) == BUTTON_PRESSED) + { + BSP_LED_On(LED_BLUE); + tClockTime t = Clock_Time(); + int interrupted = 0; + + /*Wait to check if user is pressing the button persistently*/ + while ((Clock_Time() - t) < MANUAL_UNPROVISION_TIMER) + { + if (BSP_PB_GetState(BUTTON_SW1) != BUTTON_PRESSED) + { + interrupted = 1; + break; + } + } + /* Unprovision, show that unprovisioning is completed, and + wait until user releases button*/ + if (!interrupted) + { + PalNvmErase(NVM_BASE, 0); + PalNvmErase(NVM_BASE, (NVM_SIZE >> 1)); + PalNvmErase(APP_NVM_BASE, 0); + PalNvmErase(PRVN_NVM_BASE_OFFSET, 0); + TRACE_M(TF_PROVISION,"NVM erased\r\n"); + + BLEMesh_Unprovision(); + AppliNvm_ClearModelState(); + TRACE_M(TF_PROVISION,"Device is unprovisioned by application \r\n"); + t = Clock_Time(); + while ((Clock_Time() - t) < FLASH_ERASE_TIME) + { + BLEMesh_Process(); + } + + while (BSP_PB_GetState(BUTTON_SW1) == BUTTON_PRESSED) + { + Appli_LedBlink(); + } + } + BSP_LED_Off(LED_BLUE); + NVIC_SystemReset(); + } + + /* Register the task for all MESH dedicated processes */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_MESH_REQ_ID, UTIL_SEQ_RFU, Mesh_Task ); + /* Set the task in the scheduler for the next scheduling */ +#if (LOW_POWER_FEATURE == 0) + UTIL_SEQ_SetTask( 1<> 1)); + PalNvmErase(APP_NVM_BASE, 0); + PalNvmErase(PRVN_NVM_BASE_OFFSET, 0); + TRACE_M(TF_PROVISION,"NVM erased\r\n"); + + BLEMesh_Unprovision(); + AppliNvm_ClearModelState(); + TRACE_M(TF_PROVISION,"Device is unprovisioned by application \r\n"); + + BLEMesh_Process(); + + NVIC_SystemReset(); + } +} + + +/** +* @brief Checks and updates Mac address to generate MAC Address +* @param void +* @retval MOBLEUINT8 sum return the sum calculated mac +*/ +int Appli_CheckBdMacAddr(void) +{ + MOBLEUINT8 sum = 239; + MOBLEUINT8 result = 0; + tBleStatus status = BLE_STATUS_SUCCESS; + +#ifdef EXTERNAL_MAC_ADDR_MGMT + memcpy(bdaddr, (MOBLEUINT8 *)CFG_ADV_BD_ADDRESS, 7); + bdaddr[7] = (EXTERNAL_MAC_ADDR_MGMT | EXTERNAL_MAC_TYPE); +#endif + +#ifdef INTERNAL_UNIQUE_NUMBER_MAC + status = aci_hal_read_config_data(CONFIG_DATA_PUBADDR_OFFSET, + &bdaddr[7], + bdaddr); + if(status != BLE_STATUS_SUCCESS) + { + TRACE_M(TF_PROVISION, "Failed to read Public Address %d", status); + } + + Appli_GetMACfromUniqueNumber(); + bdaddr[7] = INTERNAL_UNIQUE_NUMBER_MAC; +#endif + + for (int i = 0; i < 6; ++i) + { + sum = (sum << 1) + bdaddr[i]; + } + + if (sum == bdaddr[6]) + { + result = 1; + } + +#if defined(EXTERNAL_MAC_ADDR_MGMT) && defined(EXTERNAL_MAC_IS_PUBLIC_ADDR) + /* Do nothing for modification of 2 MSb */ +#else + bdaddr[5] |= 0xC0; /* 2 Msb bits shall be 11b for Static Random Address */ +#endif + +#ifdef GENERATE_STATIC_RANDOM_MAC + /* 6bytes of MAC will be filled, baddr_tmp[7] will contain the length */ + status = aci_hal_read_config_data(CONFIG_DATA_RANDOM_ADDRESS_OFFSET, + &bdaddr[7], + bdaddr); + if(status != BLE_STATUS_SUCCESS) + { + TRACE_M(TF_PROVISION, "Failed to read Random Address %d", status); + } + + bdaddr[7] = GENERATE_STATIC_RANDOM_MAC; + /* Do nothing for bdaddr, just pass the identification */ + result = 1; /* This will overwrite the above for loop result, + which is redundant for this case */ +#endif + + return result; +} + + +/** +* @brief Reads the unique serial number of the device +* @param void +* @retval void +*/ +#ifdef INTERNAL_UNIQUE_NUMBER_MAC +static void Appli_GetMACfromUniqueNumber(void) +{ +#ifdef STM32L152xE + /************************STM32L152RE 96 bit Unique ID addresses***************/ +#define DEVICE_ID_REG0 (0x1FF800D0) +#define DEVICE_ID_REG1 (0x1FF800D4) +#define DEVICE_ID_REG2 (0x1FF800E4) +#endif + + /* + The unique serial number is a six bytes value generated from STM32 UID + stored at DEVICE_ID_REG0, DEVICE_ID_REG1 and DEVICE_ID_REG2. It is generated + cancating 4bytes from DEVICE_ID_REG2 and first bytes of DEVICE_ID_REG0 and + DEVICE_ID_REG1. Since the UID at DEVICE_ID_REG0 and + DEVICE_ID_REG1 could be identical for same batch samples, + 4 bytes have been taken from DEVICE_ID_REG2 + */ + + uint8_t i; + uint8_t sum = 239; +#if 0 + uint8_t *ls_addr; + + ls_addr = (uint8_t*)DEVICE_ID_REG2; + + for(i = 0; i < 4; i += 1) + { + bdaddr[i] = *ls_addr; + ls_addr++; + } + + bdaddr[4] = *(uint8_t*)(DEVICE_ID_REG0); + bdaddr[5] = (*(uint8_t*)(DEVICE_ID_REG1)) | 0xC0; +#endif + /* Static Device Address: + The two most significant bits + of the address shall be equal to 1, + hence ORed with 0xC0)*/ + + for (i = 0; i < 6; ++i) + { + sum = (sum << 1) + bdaddr[i]; + } + bdaddr[6] = sum; +} +#endif + + +#if 0 +/** +* @brief provides the information of the power saving mode +* @param sleepMode curently unused, to be used in future +* @retval SleepModes returns the mode of the controller +*/ +SleepModes App_SleepMode_Check(SleepModes sleepMode) +{ + if (buttonState == BS_OFF) + { + return SLEEPMODE_WAKETIMER; + } + else + { + return SLEEPMODE_RUNNING; + } +} +#endif + +/** +* @brief callback for unprovision the node by provisioner. +* @param status reserved for future +* @retval void +*/ +void BLEMesh_UnprovisionCallback(MOBLEUINT8 reason) +{ + ProvisionFlag = 0; + + TRACE_I(TF_PROVISION,"Device is unprovisioned by provisioner \n\r"); +#if PB_ADV_SUPPORTED + BLEMesh_SetUnprovisionedDevBeaconInterval(PBADV_UNPROV_DEV_BEACON_INTERVAL); +#endif + AppliNvm_ClearModelState(); +} + +/** +* @brief This function scans and prints unprovisioned devices +* @param unprovDeviceArray: Pointer of an array for filling unprovisioned device UUIDs +* @param noOfUnprovDevices: Pointer to take total count of nearby unprovisioned devices +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT BLEMesh_ScanDevices(neighbor_params_t *unprovDeviceArray, MOBLEUINT8 *noOfUnprovDevices) +{ + MOBLE_RESULT result; + + result = BLEMesh_GetNeighborState(unprovDeviceArray,noOfUnprovDevices); + /* Array print for testing */ + /* Check if any unprovisioned device is available */ + if(!(*noOfUnprovDevices)) + { + TRACE_I(TF_PROVISION,"No Unprovisioned Device Nearby\r\n"); + } + else + { + for(MOBLEINT8 count=0; count < *noOfUnprovDevices; count++) + { + BLEMesh_PrintStringCb(""); + TRACE_I(TF_PROVISION,"Device-%d -> ", count); + BLEMesh_PrintDataCb(unprovDeviceArray[count].uuid, 16); + } + } + return result; +} +/** +* @brief This function returns starts the provisioning of one of the devices +* @param unprovDeviceArray: Pointer of an array having unprovisioned device UUIDs +* @param index: Index of the device to be provisioned +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLEUINT16 index) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + result = BLEMesh_ProvisionRemote((unprovDeviceArray+index)->uuid); + + return result; +} + +/* Customized implementation for provisioning a device from mesh node - End */ + +/** +* @brief Call back function called when PB-ADV link Opened +* @param none +* @retval none +*/ +void BLEMesh_PbAdvLinkOpenCb(void) +{ + ProvisionFlag = 0; + TRACE_M(TF_PROVISION,"PB-ADV Link opened successfully \n\r"); + /* Turn ON Red LED*/ +#if LOW_POWER_FEATURE + /* do nothing */ +#else + BSP_LED_On(LED_RED); +#endif +} + + +/** +* @brief Call back function called when PB-ADV link Closed +* @param none +* @retval none +*/ +void BLEMesh_PbAdvLinkCloseCb(void) +{ + TRACE_M(TF_PROVISION,"PB-ADV Link Closed successfully \n\r"); + /* Turn Off Red LED*/ +#if LOW_POWER_FEATURE + /* do nothing */ +#else + BSP_LED_Off(LED_RED); +#endif +} + + +/** +* @brief callback for provision the node by provisioner. +* @param void +* @retval void +*/ +void BLEMesh_ProvisionCallback(void) +{ + ProvisionFlag = 1; +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + PrvngInProcess = 0; +#endif + TRACE_I(TF_PROVISION,"Device is provisioned by provisioner \r\n"); + +#if (LOW_POWER_FEATURE == 1) + /* Call API LPN_API_TIMER_INTERVAL after LPN provisioning */ +// HW_TS_Start(lowPowerNodeApiTimer_Id, LPN_API_TIMER_INTERVAL); +#endif +} + + +/** +* @brief callback for configuration the node by provisioner. +* @param void +* @retval void +*/ +void BLEMesh_ConfigurationCallback(void) +{ +#if (LOW_POWER_FEATURE == 1) +// /* Set the task in the scheduler for the next execution */ +// UTIL_SEQ_SetTask( 1< Provisioned node. \n\r"); + } + else + { + TRACE_M(TF_NEIGHBOUR,"-> Unprovisioned device. \n\r"); + } + + TRACE_M(TF_NEIGHBOUR,"rssi: %d. ", rssi); + + if (networkAddress != MOBLE_ADDRESS_UNASSIGNED) + { + TRACE_M(TF_NEIGHBOUR,"Network address: 0x%.4x\n\r", networkAddress); + } + else + { + TRACE_M(TF_NEIGHBOUR,"Network address not available\n\r"); + } + + for (MOBLEUINT8 i=0; i<16; i++) + { + if (uuid[i] == 0x00) + { + continue; + } + else + { + TRACE_M(TF_NEIGHBOUR,"UUID: "); + + for (MOBLEUINT8 count=0 ; count<16; count++) + { + TRACE_M(TF_NEIGHBOUR,"%.2x ", uuid[count]); + } + + break; + } + } + + TRACE_M(TF_NEIGHBOUR,"\n\r"); +} + +/** +* @brief Existing neighbor refreshed callback in neighbor table. + If MAC address of neighbor changes it appears as new neighbor. +* @param MAC address of neighbor. +* is neighbor provisioned or unprovisioned device. +* uuid of neighbor. NULL if not available +* network address of neighbor. MOBLE_ADDRESS_UNASSIGNED if not available +* last updated rssi value. +* @retval void +*/ +void BLEMesh_NeighborRefreshedCallback(const MOBLEUINT8* bdAddr, + MOBLEBOOL provisioned, + const MOBLEUINT8* uuid, + MOBLE_ADDRESS networkAddress, + MOBLEINT8 rssi) +{ + TRACE_M(TF_NEIGHBOUR,"Existing neighbor refreshed. Neighbor MAC address:"); + + for (MOBLEUINT8 count=0 ; count<6; count++) + { + TRACE_M(TF_NEIGHBOUR,"%.2x ", bdAddr[count]); + } + + if (provisioned == MOBLE_TRUE) + { + TRACE_M(TF_NEIGHBOUR,"-> Provisioned node. \n\r"); + } + else + { + TRACE_M(TF_NEIGHBOUR,"-> Unprovisioned device. \n\r"); + } + + TRACE_M(TF_NEIGHBOUR,"rssi: %d. ", rssi); + + if (networkAddress != MOBLE_ADDRESS_UNASSIGNED) + { + TRACE_M(TF_NEIGHBOUR,"Network address: 0x%.4x\n\r", networkAddress); + } + else + { + TRACE_M(TF_NEIGHBOUR,"Network address not available\n\r"); + } + + for (MOBLEUINT8 i=0; i<16; i++) + { + if (uuid[i] == 0x00) + { + continue; + } + else + { + TRACE_M(TF_NEIGHBOUR,"UUID: "); + + for (MOBLEUINT8 count=0 ; count<16; count++) + { + TRACE_M(TF_NEIGHBOUR,"%.2x ", uuid[count]); + } + + break; + } + } + + TRACE_M(TF_NEIGHBOUR,"\n\r"); +} + +/** +* @brief Beacon received callback +* Beacons are received only if received beacon ad type is not +* Mesh Message, Mesh Beacon or PB-ADV +* @param MAC address +* data +* length of beacon +* rssi value of beacon +* @retval void +*/ +#if (ENABLE_CUSTOM_BEACON == 1) +/* BLEMesh_CustomBeaconReceivedCallback high frequency callback */ +void BLEMesh_CustomBeaconReceivedCallback(const MOBLEUINT8* bdAddr, + const MOBLEUINT8* data, + MOBLEUINT8 length, + MOBLEINT8 rssi) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + if (length < 2) + { + result = MOBLE_RESULT_FAIL; + TRACE_M(TF_BEACON, "Message is too small \r\n"); + } + + if (result == MOBLE_RESULT_SUCCESS) + { + if (data[1] == CUSTOM_BEACON_AD_TYPE) + { + TRACE_M(TF_BEACON, "Message length(%d), rssi(%d) \r\n", length, rssi); + + if (TF_BEACON == 1) + { + TRACE_I(TF_BEACON, "Data: "); + for (MOBLEUINT8 count=0; count 31 bytes, beacon is rejected +* BLEMesh_SetCustomBeaconInterval should be set to get this callback +* @param beacon data buffer. It includes length and AD type fields +* buffer size +* @retval void +*/ +void BLEMesh_CustomBeaconGeneratorCallback(void* buffer, MOBLEUINT8* size) +{ + MOBLEUINT8 adType = CUSTOM_BEACON_AD_TYPE; + MOBLEUINT8 dataLength = 5; + MOBLEUINT8 data[5] = {0x00,0x01,0x02,0x03,0x04}; + MOBLEUINT8* buf = (MOBLEUINT8*)buffer; + + buf[0] = dataLength+1; + buf[1] = adType; + memcpy(buf+2, data, dataLength); + + *size = dataLength+2; +} + +/** +* @brief Low Power mode process +* If low power feature is supported, device enables low power mode +* @param void +* @retval void +*/ +void Appli_LowPowerProcess(void) +{ +#if 0 +#if LOW_POWER_FEATURE + BluenrgMesh_sleepTime = (MOBLEINT32)BluenrgMesh_GetSleepDuration(); + + if (BluenrgMesh_sleepTime > 0) + { + /* Timer 0 used for low power */ + HAL_VTimerStart_ms(0, BluenrgMesh_sleepTime); + + /* To start virtual timer */ + BTLE_StackTick(); + + /* save virtual timer current count */ + SysRefCount = HAL_VTimerGetCurrentTime_sysT32(); + + /* wakeup either from io or virtual timer */ + BlueNRG_Sleep(SLEEPMODE_WAKETIMER, WAKEUP_IO13, WAKEUP_IOx_LOW); + + /* update systick count based on updated virtual timer count */ + Set_Clock_Time(Clock_Time() + + HAL_VTimerDiff_ms_sysT32(HAL_VTimerGetCurrentTime_sysT32(), SysRefCount)); + + /* Stop Timer 0 */ + HAL_VTimer_Stop(0); + } +#endif /* LOW_POWER_FEATURE */ +#endif +} + +/** +* @brief Appli_IntensityControlPublishing:Function is used to set the intensity value. +* Publishing the value. +* @param void +* @retval void +*/ +void Appli_IntensityControlPublishing(MOBLEUINT8* value) +{ + + if(IntensityFlag == FALSE) + { + + IntensityValue = IntensityValue + (INTENSITY_LEVEL_FULL/5); + value[0] = (MOBLEUINT8)IntensityValue; + value[1] = (MOBLEUINT8)(IntensityValue >> 8) ; + + if(IntensityValue >= INTENSITY_LEVEL_FULL) + { + IntensityFlag = TRUE; + } + + } + else + { + + IntensityValue = IntensityValue - (INTENSITY_LEVEL_FULL/5); + value[0] = (MOBLEUINT8)IntensityValue; + value[1] = (MOBLEUINT8)(IntensityValue >> 8) ; + + if(IntensityValue <= INTENSITY_LEVEL_ZERO) + { + IntensityFlag = FALSE; + } + + } +} + + +/** +* @brief Publish the intensity value for generic level or light lightness +* This function should be called in main loop +* @param void +* @retval void +*/ +void IntensityPublish(void) +{ + +#ifdef LIGHT_CLIENT_MODEL_PUBLISH +#ifdef ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS + MOBLEUINT8 elementIndex = 0; + MOBLEUINT8 pLightnessParam[3]; + Appli_IntensityControlPublishing(pLightnessParam); + Appli_LightClient_API(elementIndex, LIGHT_LIGHTNESS_SET, pLightnessParam); +#endif + +#else +#ifdef GENERIC_CLIENT_MODEL_PUBLISH + MOBLEUINT8 elementIndex = 0; + MOBLEUINT8 pGeneric_LevelParam[3]; + + Appli_IntensityControlPublishing(pGeneric_LevelParam); + Appli_GenericClient_API(elementIndex, GENERIC_LEVEL_SET_ACK, pGeneric_LevelParam); +#endif +#endif +} + +/** +* @brief Application processing +* This function should be called in main loop +* @param void +* @retval void +*/ +void Appli_Process(void) +{ +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + AppliNvm_Process(); +#endif + +#ifdef ENABLE_AUTH_TYPE_OUTPUT_OOB + if(PrvngInProcess) + { +#if USER_OUTPUT_OOB_APPLI_PROCESS + Appli_OobAuthenticationProcess(); +#endif + } +#endif + +#ifdef TPT_LAYER_BUSY_TEST + if(BLEMesh_TrsptIsBusyState()) + { + //SdkEvalLedOn(LED1); + } + else + { + //SdkEvalLedOff(LED1); + } +#endif +} + +#if PB_ADV_SUPPORTED +static void UnprovisionedDeviceBeaconApp(void) +{ + BLEMesh_SetUnprovisionedDevBeaconInterval(0); +} + +static void UnprovisionedDeviceBeaconTask(void) +{ + /** + * The code shall be executed in the background as aci command may be sent + * The background is the only place where the application can make sure a new aci command + * is not sent if there is a pending one + */ + UTIL_SEQ_SetTask( 1<modelID == SENSOR_SERVER_MODEL_ID) + { + Sensor_ModelPublishSet(pPubParameters); + } +} + + +/** +* @brief PWM_CoolValue: This function is used to calculate the value for the + cool temperature for the light. +* @param colourValue: Temperature value ratio +* @param brightValue: Lightness value ratio. +* @retval duty: duty fot the PWM +*/ +MOBLEUINT16 PWM_CoolValue(float colourValue ,float brightValue) +{ + float colourDuty; + MOBLEUINT16 duty; + + colourDuty = colourValue * brightValue; + duty = (MOBLEUINT16)(colourDuty * PWM_TIME_PERIOD); + + return duty; +} + + +/** +* @brief PWM_WarmValue: This function is used to calculate the value for the + warm temperature for the light. +* @param colourValue: Temperature value ratio +* @param brightValue: Lightness value ratio. +* @retval duty: duty fot the PWM +*/ +MOBLEUINT16 PWM_WarmValue(float colourValue ,float brightValue) +{ + float warmDuty; + MOBLEUINT16 duty; + + warmDuty = (1-colourValue)* brightValue; + duty = (MOBLEUINT16)(warmDuty * PWM_TIME_PERIOD); + + return duty; +} + +/** +* @brief PwmValueMapping: This function takes the value as parameter from the +* model and return the value according to . +* @param setValue: value to be set from model +* @param maxRange: Max range of the parameter +* @param minRange: Min range of the parameter +* @retval MOBLEUINT8 +*/ +MOBLEUINT16 PwmValueMapping(MOBLEUINT16 setValue , MOBLEUINT16 maxRange , MOBLEINT16 minRange) +{ + MOBLEUINT16 percentValue; + MOBLEUINT16 duty; + +#ifdef SMART_PLUG + percentValue = (setValue * 100)/ (maxRange - minRange); + + if(percentValue < 2) + { + duty = 0; + } + else if((percentValue > 2) && (percentValue <= 10)) + { + duty = 1; + } + else if((percentValue > 10) && (percentValue <= 20)) + { + duty = 2; + } + else if((percentValue > 20) && (percentValue <= 30)) + { + duty = 3; + } + else if((percentValue > 30) && (percentValue <= 40)) + { + duty = 4; + } + else if((percentValue > 40) && (percentValue <= 50)) + { + duty = 5; + } + else if((percentValue > 50) && (percentValue <= 60)) + { + duty = 6; + } + else if((percentValue > 60) && (percentValue <= 70)) + { + duty = 7; + } + else if((percentValue > 70) && (percentValue <= 80)) + { + duty = 8; + } + else if((percentValue > 80) && (percentValue <= 90)) + { + duty = 9; + } + else if(percentValue > 90) + { + duty = 10; + } +#else + if(minRange > 0x00) + { + percentValue = (setValue - 800)/ (maxRange - minRange); + percentValue = (percentValue*100); + } + else + { + percentValue = (setValue * 100)/ (maxRange - minRange); + } + + duty = percentValue*320 ; + + if(duty >= 32000) + { + duty = 31999; + } + if(duty == 0) + { + duty = 1; + } +#endif + + return duty; +} + + +/************************************ Weak linking *********************************** +If implemented in application, linker would replace weak linking in library */ +WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInProcess, MOBLEUINT16 nodeAddress)) +{ + +} + + +/** +* @} +*/ + +/** +* @} +*/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h new file mode 100644 index 000000000..3eabd1c68 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h @@ -0,0 +1,135 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_mesh.h + * @author MCD Application Team + * @brief Header file for the user application file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_MESH_H +#define __APPLI_MESH_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "mesh_cfg_usr.h" +#include "mesh_cfg.h" + +/* Exported macro ------------------------------------------------------------*/ +/* MACROS for Power Level definitions */ +#define POWER_LEVEL_LOW 0 +#define TX_POWER_LEVEL_MINUS_18DBM 0 /* = -18 dBm, */ +#define TX_POWER_LEVEL_MINUS_15DBM 1 /* = -15 dBm, */ +#define TX_POWER_LEVEL_MINUS_12DBM 2 /* = -12 dBm, */ +#define TX_POWER_LEVEL_MINUS_9DBM 3 /* = -9 dBm, */ +#define TX_POWER_LEVEL_MINUS_6DBM 4 /* = -6 dBm, */ +#define TX_POWER_LEVEL_MINUS_2DBM 5 /* = -2 dBm, */ +#define TX_POWER_LEVEL_0DBM 6 /* = 0 dBm, */ +#define TX_POWER_LEVEL_PLUS_5DBM 7 /* = 5 dBm. */ +#define POWER_LEVEL_HIGH 1 +#define TX_POWER_LEVEL_MINUS_14DBM 0 /* = -14 dBm, */ +#define TX_POWER_LEVEL_MINUS_11DBM 1 /* = -11 dBm, */ +#define TX_POWER_LEVEL_MINUS_8DBM 2 /* = -8 dBm, */ +#define TX_POWER_LEVEL_MINUS_5DBM 3 /* = -5 dBm, */ +#define TX_POWER_LEVEL_PLUS_2DBM 5 /* = 2 dBm, */ +#define TX_POWER_LEVEL_PLUS_4DBM 6 /* = 4 dBm, */ +#define TX_POWER_LEVEL_PLUS_8DBM 7 /* = 8 dBm */ + +#ifdef SAVE_MODEL_STATE_POWER_FAILURE_DETECTION +#define POWEROFF_PIN GPIO_PIN_12 +#define POWEROFF_GPIO_PORT GPIOB +#define POWEROFF_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define POWEROFF_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() +#define POWEROFF_EXTI_LINE GPIO_PIN_12 +#define POWEROFF_EXTI_IRQn EXTI15_10_IRQn +#endif + +typedef enum _prvn_nvm_state +{ + NVM_INIT = 0, + NVM_SAVE_PENDING, +} prvn_nvm_state; + +/* Exported variables ------------------------------------------------------- */ + +extern MOBLEUINT8 bdaddr[]; + +typedef struct +{ + MOBLEUINT16 nodeAddress; + MOBLEUINT8 numOfElements; + MOBLEUINT8 Reserved1; /* For Alignment by 4*/ + MOBLEUINT16 newNodeAddress; + MOBLEUINT8 newNodeElements; + prvn_nvm_state saveToNVM; + MOBLEUINT8 NewProvNodeDevKey[DEVICE_KEY_SIZE]; + MOBLEUINT8 NewProvNodeAppKey[APP_KEY_SIZE]; + MOBLEUINT8 NewProvNodeUUID[UUID_SIZE]; +} NodeUnderProvisionParam_t; + +extern NodeUnderProvisionParam_t NodeUnderProvisionParam; +extern MOBLEUINT16 Appli_SIG_Models[APPLICATION_NUMBER_OF_ELEMENTS][APPLICATION_SIG_MODELS_MAX_COUNT]; +#ifdef ENABLE_VENDOR_MODEL_SERVER +extern MOBLEUINT32 Appli_Vendor_Models[APPLICATION_NUMBER_OF_ELEMENTS][APPLICATION_VENDOR_MODELS_MAX_COUNT]; +#endif +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_BleStackInitCb(void); +MOBLE_RESULT Appli_BleSetTxPowerCb(void); +MOBLE_RESULT Appli_BleSetUUIDCb(MOBLEUINT8 *uuid_prefix_data); +MOBLE_RESULT Appli_BleSetProductInfoCB(MOBLEUINT8 *company_product_info); +void Appli_BleUnprovisionedIdentifyCb(MOBLEUINT8 data); +void Appli_BleGattConnectionCompleteCb(void); +void Appli_BleGattDisconnectionCompleteCb(void); +MOBLEUINT8 Appli_BleSetNumberOfElementsCb(void); +MOBLE_RESULT Appli_BleAttentionTimerCb(void); +void Appli_BleOutputOOBAuthCb(MOBLEUINT8* output_oob, MOBLEUINT8 size); +MOBLEUINT8* Appli_BleInputOOBAuthCb(MOBLEUINT8 size); +void Appli_BleSerialInputOOBValue(char *rcvdStringBuff, uint16_t rcvdStringSize); +MOBLEUINT8 Appli_BleDisableFilterCb(void); +void BLEMesh_PbAdvLinkCloseCb(void); +void Appli_IntensityControlPublishing(MOBLEUINT8* value); + +int Appli_CheckBdMacAddr(void); +MOBLE_RESULT Appli_LedBlink(void); +MOBLE_RESULT Appli_LedStateCtrlCb(MOBLEUINT16 ctrl); + +void Appli_CheckForUnprovision(void); +void Appli_Unprovision(void); +void Appli_Process(void); +void Appli_LedCtrl(void); +void Appli_Init(MOBLEUINT8 *flag); + +MOBLE_ADDRESS GetAddressToConfigure(void); +MOBLE_ADDRESS GetNewAddressToProvision(void); +void SaveProvisionedNodeAddress(void); +MOBLEUINT8* GetNewProvNodeDevKey(void); +MOBLEUINT8* GetNewProvNodeAppKey(void); +void IntensityPublish(void); +void Start_SelfConfiguration (void); +void Appli_ProvisionerInit(void); +void Appli_StartProvisionerMode(MOBLEUINT8 mode); + +void Appli_GetPublicationParamsCb(model_publicationparams_t*); + +MOBLEUINT16 PWM_CoolValue(float colourValue ,float brightValue); +MOBLEUINT16 PWM_WarmValue(float colourValue ,float brightValue); +MOBLEUINT16 PwmValueMapping(MOBLEUINT16 setValue , MOBLEUINT16 maxRange , MOBLEINT16 minRange); + +MOBLE_RESULT BLEMesh_ScanDevices(neighbor_params_t *unprovDeviceArray, MOBLEUINT8 *noOfUnprovDevices); +MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLEUINT16 index); + +#endif /* __APPLI_MESH_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c new file mode 100644 index 000000000..c75c3ede2 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c @@ -0,0 +1,751 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_nvm.c + * @author MCD Application Team + * @brief User Application file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include +#include "hal_common.h" +#include "ble_mesh.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "mesh_cfg.h" +#include "pal_nvm.h" +#include "appli_mesh.h" +#ifdef SAVE_MODEL_STATE_FOR_ALL_MESSAGES +#include "common.h" +#endif +#if (LOW_POWER_FEATURE == 1) +#include "app_conf.h" +#include "stm32_seq.h" +#endif +#include "config_client.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ +/* Private define ------------------------------------------------------------*/ + +extern const MOBLEUINT8* _bdaddr[]; + +#ifdef SAVE_MODEL_STATE_FOR_ALL_MESSAGES +extern MOBLEUINT8 PowerOnOff_flag; +#endif + +extern const void* appNvmBase; + + +/* +* Page of size 4k, STM32WB, reserved for application is divided into 16 subpages of each 256 bytes +* First subpage is reserved (for e.g. External MAC is present in this area) +* Rest 15 subpages are used on rolling basis for application states. +* First byte of each subpage indicates if page is valid or not +*/ + +#define APP_NVM_RESERVED_SIZE 256U +#define APP_NVM_SUBPAGE_SIZE 256U +#define APP_NVM_MAX_SUBPAGE 15U +#define APP_NVM_SUBPAGE_OFFSET(i) (unsigned int)(APP_NVM_RESERVED_SIZE + APP_NVM_SUBPAGE_SIZE*(i)) + +/* offsets defined wrt start of subpage */ +#define APP_NVM_VALID_FLAG_OFFSET 0U +#define APP_NVM_VALID_FLAG_SIZE 4U +#define APP_NVM_RESET_COUNT_OFFSET (unsigned int)APP_NVM_VALID_FLAG_SIZE +#define APP_NVM_RESET_COUNT_SIZE 12U /* 12 bytes reserved for write cycle optimization */ +#define APP_NVM_GENERIC_MODEL_OFFSET (unsigned int)(APP_NVM_VALID_FLAG_SIZE+APP_NVM_RESET_COUNT_SIZE) +//#define APP_NVM_GENERIC_MODEL_SIZE 16U +#define APP_NVM_LIGHT_MODEL_OFFSET (unsigned int)(APP_NVM_VALID_FLAG_SIZE+APP_NVM_RESET_COUNT_SIZE+APP_NVM_GENERIC_MODEL_SIZE) +//#define APP_NVM_LIGHT_MODEL_SIZE 16U + +#define FLASH_EMPTY_SIGNATURE 0xFFFFFFFF + +#define RADIO_OFF_DELAY 1000 + +/* Private variables ---------------------------------------------------------*/ + +typedef struct +{ + MOBLEUINT8 modelData[APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE]; + MOBLEBOOL erasePageReq; + MOBLEBOOL writeReq; +} APPLI_NVM_REQS; + +/* ALIGN(4) */ +__attribute__((aligned(4))) APPLI_NVM_REQS AppliNvm_Reqs; +MOBLEUINT16 StopRadioInProgress; + +MOBLE_RESULT AppliNvm_EraseRestoreResvNvm(void); +MOBLE_RESULT AppliNvm_FindFirstEmptyPage(MOBLEINT16* subPageIndex, + MOBLEUINT32 SubPageSize, + MOBLEUINT32 totalSubPage, + MOBLEUINT32 nvmBaseOffset); +MOBLE_RESULT AppliNvm_MarkSubpageInvalid(void); +MOBLE_RESULT AppliNvm_FlashProgram(MOBLEUINT32 offset, + void const *buf, MOBLEUINT32 size); + +#if 0 //#ifdef ENABLE_NVM_TEST +/** +* @brief This function erases a specified flash page +* @param Page Number +* @retval MOBLE_RESULT_INVALIDARG if PageNumber overflow +* MOBLE_RESULT_FALSE if flash operation is very close to next radio event +* MOBLE_RESULT_FAIL if flash command error is set +* MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FlashErase(uint16_t PageNumber) +{ + MOBLE_RESULT result; + + if (PageNumber < FLASH_PAGE_NB) + { + BLEMesh_StopAdvScan(); + ATOMIC_SECTION_BEGIN(); + result = PalNvmErase(APP_NVM_BASE, 0); + ATOMIC_SECTION_END(); + } + else /* Invalid page no */ + { + result = MOBLE_RESULT_INVALIDARG; + } + + return result; +} +#endif + +/** +* @brief Program word (32-bit) at a APP_NVM_BASE + APP_NVM_RESERVED_SIZE +* @param TypeProgram Indicate the way to program at a specified address +* @param Address: address to write +* @param Data: word to write +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FlashProgram(MOBLEUINT32 offset, + void const *buf, + MOBLEUINT32 size) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + if (offset > PAGE_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > (APP_NVM_BASE + PAGE_SIZE)) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + result = PalNvmWrite(APP_NVM_BASE, + offset, + buf, + size); + } + + return result; +} + + +/** +* @brief Mark first valid subpage as invalid. +* @param void +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_MarkSubpageInvalid(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; +#if 0 + MOBLEUINT32 valid = 0; + MOBLEINT16 currSubPageIdx; + MOBLEUINT8 subPageTemp[APP_NVM_SUBPAGE_SIZE]; + + /* find valid subpage */ + result = AppliNvm_FindFirstEmptyPage(&currSubPageIdx, + APP_NVM_SUBPAGE_SIZE, + APP_NVM_MAX_SUBPAGE, + (APP_NVM_BASE+APP_NVM_RESERVED_SIZE)); + + + if (result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; + } + else + { + /* mark valid subpage as invalid */ + memcpy((void*)subPageTemp, + (void*)(PRVN_NVM_BASE_OFFSET + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)), + APP_NVM_SUBPAGE_SIZE); + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(currSubPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + if (MOBLE_FAILED(result)) + { + result = MOBLE_RESULT_FAIL; + } + else if (result == MOBLE_RESULT_FALSE) + { + /* radio busy, try again later */ + } + else + { + /* do nothing */ + } + } +#endif + return result; +} + + +/** +* @brief This function writes Reset count value in flash at APP_NVM_BASE + APP_NVM_RESERVED_SIZE +* if device has been turned ON 5 times consecutively with each ON duration < 2s, reset to factory settings +* LED blinks 2 times to indicate device startup without reset +* LED blinks 5 times to indicate reset at device startup +* @param void +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FactorySettingReset(void) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; +#if 0 + MOBLEINT16 currSubPageIdx = 0; + MOBLEUINT32 resetCount; + MOBLEUINT8 subPageTemp[APP_NVM_SUBPAGE_SIZE]; + + result = AppliNvm_FindFirstEmptyPage(&currSubPageIdx,APP_NVM_SUBPAGE_SIZE,APP_NVM_MAX_SUBPAGE, + (APP_NVM_BASE+APP_NVM_RESERVED_SIZE)); + + if(result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { + /* Not the first reset */ + /* read the previous subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx-1)), + APP_NVM_SUBPAGE_SIZE); + } + else + { + /* read the current subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)), + APP_NVM_SUBPAGE_SIZE); + } + + /* read reset count from the subpage */ + memcpy((void*)&resetCount, + (void*)&(subPageTemp[APP_NVM_RESET_COUNT_OFFSET]), + 4); + resetCount = resetCount << 1; /* Shifting for making Bits 0 from LSB */ + memcpy((void*)&(subPageTemp[APP_NVM_RESET_COUNT_OFFSET]), (void*)&resetCount, 4); + + /* Check for "POWER_ON_OFF_CYCLES_FOR_UNPROVISIONING" times, that many bits shall be zero */ + if (resetCount > MASK_BITS_FOR_POWER_ON_OFF_CYCLES) + { + /* MASK_BITS_FOR_POWER_ON_OFF_CYCLES = 0xFFFFFFE0 */ + + /* update reset count */ + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(currSubPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + + if (!memcmp((void*)&subPageTemp[APP_NVM_RESET_COUNT_OFFSET], + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)+APP_NVM_RESET_COUNT_OFFSET), + 4)) + { + /* updated value of reset count in flash */ + } + + /* Blink twice to indicate device startup + 1 second to blink once and 2 seconds to blink twice */ + for (MOBLEUINT8 i=0; i< ON_TIME_IN_SECONDS_FOR_POWER_CYCLING; i++) + { + Appli_LedBlink(); + } + + /* Load model data copy from nvm */ + memcpy((void*)AppliNvm_Reqs.modelData, + (void*)(APP_NVM_SUBPAGE_OFFSET(currSubPageIdx)+APP_NVM_GENERIC_MODEL_OFFSET), + APP_NVM_MODELDATA_PER_ELEMENT_SIZE); + + result = AppliNvm_MarkSubpageInvalid(); + + if (MOBLE_FAILED(result)) + { + result = MOBLE_RESULT_FAIL; + } + } + else /* Device is forced to factory reset, 5 LSBs are zero */ + { + /* Unprovision node */ + BLEMesh_Unprovision(); + + /* Clear lib data, primary and backup nvm used by BLE-Mesh lib */ + PalNvmErase(NVM_BASE, 0); + PalNvmErase(NVM_BASE, 0x1000); + + AppliNvm_ClearModelState(); + + BLEMesh_SetUnprovisionedDevBeaconInterval(100); + + /* Blink 5 times to indicate factory setting reset */ + for (MOBLEUINT8 i=0; i APP_NVM_MODEL_SIZE) + { + /* incorrect size */ + result = MOBLE_RESULT_FAIL; + } + else + { + memcpy(AppliNvm_Reqs.modelData, + state, + size); + + AppliNvm_Reqs.writeReq = MOBLE_TRUE; + AppliNvm_Reqs.erasePageReq = MOBLE_FALSE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { /* Not the first subpage */ + /* clear models states */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx-1)), + APP_NVM_SUBPAGE_SIZE); + memcpy((void*)&subPageTemp[APP_NVM_GENERIC_MODEL_OFFSET], + (void*)(clearBuff), + APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE); + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(subPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + } + else + { /* First subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx)), + APP_NVM_SUBPAGE_SIZE); + memcpy((void*)&subPageTemp[APP_NVM_GENERIC_MODEL_OFFSET], + (void*)(clearBuff), + APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE); + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(subPageIdx), + (uint32_t*)&subPageTemp, + APP_NVM_SUBPAGE_SIZE); + } + } +#endif /* SAVE_MODEL_STATE_NVM */ + return result; +} + + +/** +* @brief Load Model states from nvm +* @param model state buff +* @param model state buff size +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_LoadModelState(uint8_t state[], + uint16_t* size) +{ +#if (SAVE_MODEL_STATE_NVM == 1) + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEINT16 currSubPageIdx = 0; + + *size = 0; + result = AppliNvm_FindFirstEmptyPage(&currSubPageIdx, + APP_NVM_SUBPAGE_SIZE, + APP_NVM_MAX_SUBPAGE, + APP_NVM_BASE + APP_NVM_RESERVED_SIZE); + + if(result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { + /* Not the first reset */ + /* Load model data copy from nvm */ + memcpy((void*)AppliNvm_Reqs.modelData, + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(currSubPageIdx-1) + APP_NVM_GENERIC_MODEL_OFFSET), + APP_NVM_GENERIC_MODEL_SIZE + APP_NVM_LIGHT_MODEL_SIZE); + memcpy((void*)state, + (void*)(AppliNvm_Reqs.modelData), + APP_NVM_MODEL_SIZE); + *size = APP_NVM_MODEL_SIZE; + } + } + return result; +#else /* SAVE_MODEL_STATE_NVM */ + *size = 0; + return MOBLE_RESULT_SUCCESS; +#endif /* SAVE_MODEL_STATE_NVM */ +} + + +/** +* @brief Process NVM erase and write requests +* @param void +* @retval void +*/ +void AppliNvm_Process(void) +{ + MOBLE_RESULT result; + MOBLEINT16 subPageIdx; + uint8_t reserveAreaCopy[APP_NVM_RESERVED_SIZE]; + + /* Erase if required */ + if ((AppliNvm_Reqs.erasePageReq == MOBLE_TRUE) && + (!LL_FLASH_IsActiveFlag_OperationSuspended())) + { + if(StopRadioInProgress == 0) + { + /* save reserve flash area */ + memcpy((void*)reserveAreaCopy, + (void*)APP_NVM_BASE, + APP_NVM_RESERVED_SIZE); + + TRACE_M(TF_PROVISION,"Erase flash page\r\n"); + result = PalNvmErase(APP_NVM_BASE, 0); + + if(result == MOBLE_RESULT_OUTOFMEMORY) + { + AppliNvm_Reqs.erasePageReq = MOBLE_TRUE; +#if (LOW_POWER_FEATURE == 1) + UTIL_SEQ_SetTask( 1< 0) + { + /* Not the first reset */ + /* read the previous subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx-1)), + APP_NVM_SUBPAGE_SIZE); + } + else + { + /* read the current subpage */ + memcpy((void*)&(subPageTemp[0]), + (void*)(APP_NVM_BASE + APP_NVM_SUBPAGE_OFFSET(subPageIdx)), + APP_NVM_SUBPAGE_SIZE); + } + + memcpy((void*)&(subPageTemp[APP_NVM_GENERIC_MODEL_OFFSET]), + (void*)&(AppliNvm_Reqs.modelData), + APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE); + + subPageTemp[APP_NVM_VALID_FLAG_OFFSET] = valid; + + result = AppliNvm_FlashProgram(APP_NVM_SUBPAGE_OFFSET(subPageIdx), + (uint8_t*)subPageTemp, + APP_NVM_SUBPAGE_SIZE); + + if (result == MOBLE_RESULT_SUCCESS) + { + AppliNvm_Reqs.writeReq = MOBLE_FALSE; + } + } + } +} + + +/** +* @brief Function used to set the flag which is responsible for storing the + states in flash. +* @param void +* @retval void +*/ +void AppliNvm_SaveMessageParam (void) +{ +#ifdef SAVE_MODEL_STATE_FOR_ALL_MESSAGES + PowerOnOff_flag = FLAG_SET; +#endif +} + + +/** +* @brief Find first valid subpage available. +* If no valid subpage found, erase page appli nvm to reset it +* @param pointer to variable to update first valid subpage index +* @retval MOBLE_RESULT_SUCCESS on success +*/ +MOBLE_RESULT AppliNvm_FindFirstEmptyPage(MOBLEINT16* subPageIndex, + MOBLEUINT32 SubPageSize, + MOBLEUINT32 totalSubPage, + MOBLEUINT32 nvmBaseOffset) +{ + MOBLEUINT32 valid[2]; + MOBLEINT8 subPageIdx = -1; + MOBLEUINT32 *subPageOffset; + MOBLEUINT32 addressValidPage; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + for (MOBLEUINT16 count=0; countproperty_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_CadenceSet_cb + * @param Cadence parameters +* @retval None +*/ +void Appli_Sensor_CadenceSet(sensor_CadenceCbParam_t* pCadenceParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pCadenceParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_CadenceSetUnack_cb + * @param Cadence parameters +* @retval None +*/ +void Appli_Sensor_CadenceSetUnack(sensor_CadenceCbParam_t* pCadenceParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pCadenceParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SettingsGet_cb + * @param Setting parameters +* @retval None +*/ +void Appli_Sensor_SettingsGet(sensor_SettingsCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->propertyId, elementIndex, peerAddr, dstPeer); +} + +/** + * @brief Callback corresponding to Sensor_SettingGet_cb + * @param Setting parameters +* @retval None + */ +void Appli_Sensor_SettingGet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SettingSet_cb + * @param Setting parameters +* @retval None +*/ +void Appli_Sensor_SettingSet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SettingSetUnack_cb + * @param Setting parameters +* @retval None +*/ +void Appli_Sensor_SettingSetUnack(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pSettingParam->property_ID, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_DescriptorGet_cb + * @param Descriptor parameters +* @retval None +*/ +void Appli_Sensor_DescriptorGet(MOBLEUINT8 prop_ID, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + if(length == 0) + { + TRACE_M(TF_SENSOR, "Sensor Descriptor data for all sensors on element index %X peer addr %X, dst peer %X\r\n", + elementIndex, peerAddr, dstPeer); + } + else + { + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X, dst peer %X\r\n", + prop_ID, elementIndex, peerAddr, dstPeer); + } +} + + +/** + * @brief Callback corresponding to Sensor_Get_cb + * @param Get parameters +* @retval None +*/ +void Appli_Sensor_Get(MOBLEUINT16 prop_ID, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + if(length == 0) + { + TRACE_M(TF_SENSOR, "Sensor Data for all sensors on element index %X peer addr %X dst peer %X\r\n", + elementIndex, peerAddr, dstPeer); + } + else + { + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X \r\n", + prop_ID, elementIndex, peerAddr, dstPeer); + } +} + + +/** + * @brief Callback corresponding to Sensor_ColumnGet_cb + * @param Column parameters +* @retval None +*/ +void Appli_Sensor_ColumnGet(sensor_ColumnCbParams_t* pColumnParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X element index %X peer addr %X dst peer %X\r\n", + pColumnParam->propertyId, elementIndex, peerAddr, dstPeer); +} + + +/** + * @brief Callback corresponding to Sensor_SeriesGet_cb + * @param Series parameters +* @retval None +*/ +void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pSeriesParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + TRACE_M(TF_SENSOR, "Property ID %X Raw Value X1 %d Raw Value X2 %d\r\n", + pSeriesParam->propertyId, + pSeriesParam->rawValueX1, + pSeriesParam->rawValueX2); +} + + +/** + * @brief Callback corresponding to Sensor_ReadDescriptor_cb + * Update SENSORX descriptor identified by sensorOffset + * Read from application to optimize RAM + * @param Sensor offset in sensor init structure + * @param descriptor parameters + * @retval Fail if sensor doesn't exist or property ID mismatch occurs + * else Success + */ +MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, + sensor_DescriptorCbParams_t* pDescriptorParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + const sensor_init_params_t* pSensorInitParams = NULL; + + if (sensorOffset < SensorServerInitParams.sensorsCount) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + if (pSensorInitParams->propertyId != pDescriptorParams->propertyId) + { + result = MOBLE_RESULT_FAIL; + } + else + { + /* */ + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + if (pSensorInitParams != NULL && + pDescriptorParams != NULL) + { + pDescriptorParams->positiveTolerance = pSensorInitParams->positiveTolerance; + pDescriptorParams->negativeTolerance = pSensorInitParams->negativeTolerance; + pDescriptorParams->samplingFunction = pSensorInitParams->samplingFunction; + pDescriptorParams->measurementPeriod = pSensorInitParams->measurementPeriod; + pDescriptorParams->updateInterval = pSensorInitParams->updateInterval; + } + else + { + result = MOBLE_RESULT_FAIL; + } + + return result; +} + + +/** + * @brief Callback corresponding to Sensor_ReadValue_cb + * Read sensor value and update buffer + * data length <= 128 + * PreviousTemperatureValue, PresentTemperatureValue to be updated + * every time sensor value is changed and call to Sensor_UpdateCadence + * @param Sensor offset in sensor init structure + * @param Value parameters + * @retval Fail if sensor doesn't exist + * else Success + */ +MOBLE_RESULT Appli_Sensor_ReadValue(MOBLEUINT8 sensorOffset, + sensor_ValueCbParams_t* pValueParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; +// PRESSURE_StatusTypeDef tempStatus = PRESSURE_OK; + MOBLEINT16 temp = 0; + MOBLEINT8 temperature8 = 0; + float pressure = 0; + + /* sensor offset exist */ + if (sensorOffset < SensorServerInitParams.sensorsCount) + { + if (sensorOffset == 0) /* Present Ambient Temperature */ + { + if(AppliSensorReadFromSensor == 0) /* Normal mode */ + { + /* Temperature, Temperature8 format, M=1, d=0, b=-1 */ +// tempStatus = LPS25HB_I2C_ReadRawTemperature(&temp); +// if (tempStatus == PRESSURE_OK) + { + TRACE_M(TF_SENSOR, "Temperature sensor raw value %d\r\n" , temp); + + /* Convert temperature raw value to Temperature8 format */ + temp = (temp/240) + 85; + + if (temp < -64*2) + { + temp = -64*2; + } + else if (temp > 63.5*2) + { + temp = 63.5*2; + } + + temperature8 = temp; + + pValueParams->data[0] = (MOBLEUINT8)temperature8; + + if (pValueParams->data[0] == 0xFF) + { + /* 0xFF is unknown but here it is -1 + -1 is approximated to 0 */ + pValueParams->data[0] = 0x00; + } + + TRACE_M(TF_SENSOR, "Temperature8 raw value %d, actual value %f\r\n", + temperature8, (float)temperature8/2); + } +#if 0 + else /* error */ + { + pValueParams->data[0] = 0xFF; + } +#endif + } + else /* Value not to be read from sensor */ + { + pValueParams->data[0] = PresentTemperatureValue; + } + } + else if (sensorOffset == 1) /* Pressure */ + { +// tempStatus = LPS25HB_GetPressure(&pressure); +// if (tempStatus == PRESSURE_OK) + { + TRACE_M(TF_SENSOR, "Pressure sensor value %f mbar\r\n" , pressure); + + memcpy(pValueParams->data, (void*)&pressure, 4); + } +#if 0 + else /* error */ + { + memset(pValueParams->data, 0, 4); + } +#endif + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + return result; +} + +#endif + + +/** + * @brief Callback corresponding to Sensor_ReadColumn_cb + * Fill column width and raw valye Y in data buffer + * data length <= 8 + * @param Sensor offset in sensor init structure + * @param Series column parameters + * @retval Fail if sensor doesn't exist + * else Success +*/ +MOBLE_RESULT Appli_Sensor_ReadColumn(MOBLEUINT8 sensorOffset, + MOBLEUINT8 columnOffset, + sensor_ColumnCbParams_t* pColumnParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + const sensor_init_params_t* pSensorInitParams = NULL; + MOBLEUINT8 dataLength = 0; + MOBLEUINT8* data = pColumnParams->data; + + if (sensorOffset < SensorServerInitParams.sensorsCount) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + /* fill sensor column data */ + memcpy(data+dataLength, + &(pSensorInitParams->seriesColumn[columnOffset].columnWidth), + pSensorInitParams->dataLength); + dataLength = pSensorInitParams->dataLength; + + memset(data+dataLength, 0xAA, pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + + pColumnParams->dataLength = dataLength; + } + else + { + result = MOBLE_RESULT_FAIL; + } + + return result; +} + + +/** + * @brief Callback corresponding to Sensor_ReadSeries_cb + * Fill sensor series state for all columns between and including X1 and X2 + * Series data to be concatenated in triplet of raw value X, column width and raw value Y + * X[n] CW[n] Y[n] X[n+1] CW[n+1] Y[n+1] ... + * data length should be less than minimum of 379 or max application packet length supported + * @param Sensor offset in sensor init structure + * @param Series parameters + * @retval Fail if sensor doesn't exist + * else Success + */ +MOBLE_RESULT Appli_Sensor_ReadSeries(MOBLEUINT8 sensorOffset, + sensor_SeriesCbParams_t* pSeriesParams) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + const sensor_init_params_t* pSensorInitParams = NULL; + MOBLEUINT16 dataLength = 0; + MOBLEUINT8* data = pSeriesParams->data; + + if (sensorOffset < SensorServerInitParams.sensorsCount) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + for (MOBLEUINT8 count=0; countseriesCount; count++) + { + /* fill sensor series data */ + if (pSensorInitParams->seriesColumn[count].rawX >= pSeriesParams->rawValueX1 && + pSensorInitParams->seriesColumn[count].rawX <= pSeriesParams->rawValueX2) + { + memcpy(data+dataLength, + &(pSensorInitParams->seriesColumn[count].rawX), + pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + memcpy(data+dataLength, + &(pSensorInitParams->seriesColumn[count].columnWidth), + pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + memset(data+dataLength, 0xAA, pSensorInitParams->dataLength); + dataLength += pSensorInitParams->dataLength; + + pSeriesParams->dataLength = dataLength; + } + else + { + /* */ + } + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + return result; +} + + +/** + * @brief Callback corresponding to Sensor_IsFastCadence_cb + * To check if fast cadence to be used for current sensor state + * @param Sensor offset in sensor init structure + * @param Fast Cadence Low + * @param Fast Cadence High + * @retval Trigger status + */ +MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, + void* pFastCadenceLow, + void* pFastCadenceHigh) +{ + MOBLEUINT8 fastCadenceStatus = 0; + MOBLEUINT32 fastCadenceLow = *((MOBLEUINT32*)pFastCadenceLow); + MOBLEUINT32 fastCadenceHigh = *((MOBLEUINT32*)pFastCadenceHigh); + MOBLEUINT32 sensorValue = PresentTemperatureValue; + + if (sensorOffset == 0) + { + if (fastCadenceLow <= fastCadenceHigh) + { + fastCadenceStatus = sensorValue >= fastCadenceLow && + sensorValue <= fastCadenceHigh; + } + else + { + fastCadenceStatus = sensorValue > fastCadenceLow || + sensorValue < fastCadenceHigh; + } +} + else + { + /* Implemented only for sensor at offset 0 */ + } + + return fastCadenceStatus; +} + + +/** + * @brief Callback corresponding to Sensor_IsStatusTrigger_cb + * To check if sensor change in sensor state (delta) is more than + * given trigger state value + * delta up values + * @param Sensor offset in sensor init structure + * @param Trigger type -> value or percent change + * @param Status trigger delta down + * @param Status trigger delta up + * @retval Trigger status +*/ +MOBLEUINT8 Appli_Sensor_IsStatusTrigger(MOBLEUINT8 sensorOffset, + status_trigger_type_e triggerType, + void* pDeltaDown, + void* pDeltaUp) +{ + const sensor_init_params_t* pSensorInitParams = NULL; + MOBLEUINT8 triggerStatus = 0; + MOBLEUINT32 deltaDown = *((MOBLEUINT32*)pDeltaDown); + MOBLEUINT32 deltaUp = *((MOBLEUINT32*)pDeltaUp); + status_trigger_delta_e statusTriggerDelta; + MOBLEUINT32 delta; + + if (sensorOffset == 0) + { + if (PresentTemperatureValue < PreviousTemperatureValue) + { + /* status trigger delta down */ + statusTriggerDelta = STATUS_TRIGGER_DELTA_DOWN; + delta = PreviousTemperatureValue - PresentTemperatureValue; + + TRACE_M(TF_SENSOR, "Delta down value %ld\r\n", delta); + } + else + { + /* status trigger delta up */ + statusTriggerDelta = STATUS_TRIGGER_DELTA_UP; + delta = PresentTemperatureValue - PreviousTemperatureValue; + + TRACE_M(TF_SENSOR, "Delta up value %ld\r\n", delta); + } + + if (triggerType == STATUS_TRIGGER_TYPE_PC) + { + pSensorInitParams = &(SensorServerInitParams.sensorInitParams[sensorOffset]); + + if (pSensorInitParams->valuesRange != 0) + { + /* change delta to percentage change (of 0.01 % steps) */ + delta = (MOBLEUINT32)((delta*10000)/pSensorInitParams->valuesRange); + } + else + { + triggerStatus = 0; + } + } + + if ((statusTriggerDelta == STATUS_TRIGGER_DELTA_DOWN && delta >= deltaDown) || + (statusTriggerDelta == STATUS_TRIGGER_DELTA_UP && delta >= deltaUp)) + { + triggerStatus = 1; + } + else + { + triggerStatus = 0; + } + } + + return triggerStatus; +} + + +/** +* @brief Initialize hardware interfaces for sensors and mesh sensor model structures +* Sensor init parameters to be defined in sensor_cfg_usr.h +* Sensors are initialized in the order as defined in sensor_cfg_usr.h + * LPS25HB supports pressure and temperature sensor +* @param void + * @retval + */ +MOBLE_RESULT Appli_Sensor_Init(void) + { + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; +// PRESSURE_StatusTypeDef lps25Status; + + /* Hardware interface initialization */ +#ifndef CUSTOM_BOARD_PWM_SELECTION +// PRESSURE_StatusTypeDef tempStatus; +// PRESSURE_StatusTypeDef pressStatus; +// int16_t temperature; +// int32_t pressure; + +#if 0 + /* Initiallization of sensors */ + lps25Status = LPS25HB_Init((PRESSURE_InitTypeDef*)(&Lps25InitParams)); + + if (lps25Status != PRESSURE_OK) + { + TRACE_M(TF_SENSOR, "Error initializing LPS25HB. status (%d)\r\n", lps25Status); + } + + tempStatus = LPS25HB_I2C_ReadRawTemperature(&temperature); + pressStatus = LPS25HB_I2C_ReadRawPressure(&pressure); + + if (tempStatus == PRESSURE_OK && + pressStatus == PRESSURE_OK) + { + /* TRACE_M(TF_SENSOR, "Raw temperature (%d) and raw pressure (%d)\r\n", + temperature, pressure); */ + } + else + { + TRACE_M(TF_SENSOR, "Error reading LPS25HB at init\r\n"); + } +#endif + +#else + TRACE_M(TF_SENSOR, "LPS25HB not initialized\r\n"); +#endif + + /* initialize sensor server model */ + result = SensorServer_Init(&BufferSensorServer, + &AppliSensor_cb, + TOTAL_SENSOR_SERVER_BUFF_SIZE, + &SensorServerInitParams); + + if(MOBLE_FAILED(result)) + { + TRACE_M(TF_SENSOR, "Sensor Server init failed\r\n"); + } + + return result; + } + + +/** + * @brief Handling of serial inputs to sensor model + * @param Sensor offset in sensor init structure + * @param Sensor value + * @retval void + */ +MOBLE_RESULT Appli_Sensor_Update(MOBLEUINT8 sensorOffset, MOBLEUINT32 value) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + AppliSensorReadFromSensor = 1; + + /* Update previous with current and current with new */ + PreviousTemperatureValue = PresentTemperatureValue; + PresentTemperatureValue = (MOBLEUINT8)value; + + /* To update cadence parameters + results in either status trigger or (and) fast cadence based on change and present + Application may decide not to update cadence parameters if senosr value is changing + very frequently in some cases to save bandwidth */ + if (PresentTemperatureValue != PreviousTemperatureValue) + { + result = Sensor_UpdateCadence(sensorOffset, + SensorServerInitParams.sensorInitParams[0].elementIdx, + SensorServerInitParams.sensorInitParams[0].propertyId); + } + + return result; + } + + +/** + * @brief Handling of serial inputs to sensor model + * Appli_Sensor_SerialCmd can be used for testing periodic publishing and + * triggered publishing with PTS + * @param serial string + * @param serial string size + * @retval void + */ +void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) +{ + MOBLE_RESULT result = MOBLE_RESULT_INVALIDARG; + MOBLEUINT16 value = 0; + MOBLEUINT8 sensorOffset = 0; + + if (!strncmp(rcvdStringBuff+6, "SETV", 4)) + { + if (rcvdStringSize == 15) + { + sscanf(rcvdStringBuff+11, "%4hx", &value); + + /* Set SENSOR1 value at offset 0 */ + result = Appli_Sensor_Update(sensorOffset, value); + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else if (!strncmp(rcvdStringBuff+6, "PUBLISH", 7)) + { + if (rcvdStringSize == 17) + { + sscanf(rcvdStringBuff+14, "%1hx", &value); + + sensorOffset = value; + + sscanf(rcvdStringBuff+16, "%1hx", &value); + + /* Enable / Disable publishing of sensor as identified by sensor offset */ + if(value == 0) /* Disable */ + { + result = Sensor_UpdatePublishState(sensorOffset, 0); + } + else /* Enable */ + { + result = Sensor_UpdatePublishState(sensorOffset, 1); + } + } + else + { + result = MOBLE_RESULT_FAIL; + BLEMesh_PrintStringCb("Invalid size of string\r\n"); + } + } + else + { + result = MOBLE_RESULT_FAIL; + } + + /* Check the result of command processing */ + if(result == MOBLE_RESULT_SUCCESS) + { + BLEMesh_PrintStringCb("Success\r\n"); + } + else if(result == MOBLE_RESULT_OUTOFMEMORY) + { + BLEMesh_PrintStringCb("Fail Out of memory\r\n"); + } + else if(result == MOBLE_RESULT_INVALIDARG) + { + BLEMesh_PrintStringCb("Fail Invalid Argument\r\n"); + } + else + { + BLEMesh_PrintStringCb("Fail\r\n"); + } +} + + +/** + * @} + */ + +/** + * @} + */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h new file mode 100644 index 000000000..4f6cefe6b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h @@ -0,0 +1,111 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_sensor.h + * @author MCD Application Team + * @brief Application interface for Light Mesh Model + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_SENSOR_H +#define __APPLI_SENSOR_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "sensors.h" +#include "mesh_cfg.h" + +/* Exported functions ------------------------------------------------------- */ +void Appli_Sensor_CadenceGet(sensor_CadenceCbParam_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_CadenceSet(sensor_CadenceCbParam_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_CadenceSetUnack(sensor_CadenceCbParam_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingsGet(sensor_SettingsCbParams_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingGet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingSet(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SettingSetUnack(sensor_SettingCbParams_t* pSettingParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_DescriptorGet(MOBLEUINT8 pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Get (MOBLEUINT16 prop_ID, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_ColumnGet(sensor_ColumnCbParams_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pDescriptorParam, + MOBLEUINT32 length, + MOBLE_ADDRESS peerAddr, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, + sensor_DescriptorCbParams_t* pDescriptorParams); +MOBLE_RESULT Appli_Sensor_ReadValue(MOBLEUINT8 sensorOffset, + sensor_ValueCbParams_t* pValueParams); +MOBLE_RESULT Appli_Sensor_ReadColumn(MOBLEUINT8 sensorOffset, + MOBLEUINT8 columnOffset, + sensor_ColumnCbParams_t* pColumnParams); +MOBLE_RESULT Appli_Sensor_ReadSeries(MOBLEUINT8 sensorOffset, + sensor_SeriesCbParams_t* pSeriesParams); +MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, + void* pFastCadenceLow, + void* pFastCadenceHigh); +MOBLEUINT8 Appli_Sensor_IsStatusTrigger(MOBLEUINT8 sensorOffset, + status_trigger_type_e triggerType, + void* pDeltaDown, + void* pDeltaUp); +MOBLE_RESULT Appli_Sensor_Init(void); +MOBLE_RESULT Appli_Sensor_Update(MOBLEUINT8 sensorOffset, MOBLEUINT32 value); + +MOBLE_RESULT Appli_Sensor_Update(MOBLEUINT8 sensorOffset, + MOBLEUINT32 value); +void Appli_Sensor_SerialCmd(char *rcvdStringBuff, + uint16_t rcvdStringSize); +#endif /* __APPLI_SENSOR_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c new file mode 100644 index 000000000..cdf66e0f9 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c @@ -0,0 +1,332 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_sensors_client.c + * @author MCD Application Team + * @brief Application interface for Generic Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "types.h" +#include "appli_sensor.h" +#include "appli_light.h" +#include "common.h" +#include "mesh_cfg_usr.h" +#include "appli_nvm.h" +#include "appli_mesh.h" +#include "sensors_client.h" +#include "appli_sensors_client.h" +#include "appli_light_lc.h" + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ + + +/* Private functions ---------------------------------------------------------*/ +/** +* @brief Appli_SensorsClient_API: This function is a Wrapper to call Sensors Client API depending on opcode received in input +* @param elementIndex: Index of the element +* @param msg_opcode: opcode of the desired API +* @param msg_params: buffer containing the desired API parameters +* @retval MOBLE_RESULT +*/ +MOBLE_RESULT Appli_SensorsClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_opcode, MOBLEUINT8 *msg_params) +{ + MOBLE_RESULT result = MOBLE_RESULT_FAIL; + switch(msg_opcode){ +/******************************************************************************/ +#ifdef ENABLE_SENSOR_MODEL_CLIENT +/******************************************************************************/ + case SENSOR_DESCRIPTOR_GET: + { + result = SensorsClient_Descriptor_Get(elementIndex, msg_params); + break; + } + case SENSOR_CADENCE_GET: + { + result = SensorsClient_Cadence_Get(elementIndex, msg_params); + break; + } + case SENSOR_CADENCE_SET: + { + result = SensorsClient_Cadence_Set(elementIndex, + msg_params, + 10); //(sizeof(sensor_CadenceCbParam_t)-3)); + break; + } + case SENSOR_CADENCE_SET_UNACK: + { + result = SensorsClient_Cadence_Set_Unack(elementIndex, + msg_params, + 10); //(sizeof(sensor_CadenceCbParam_t)-3)); + break; + } + case SENSOR_SETTINGS_GET: + { + result = SensorsClient_Settings_Get(elementIndex, msg_params); + break; + } + + case SENSOR_SETTING_GET: + { + result = SensorsClient_Setting_Get(elementIndex, msg_params, sizeof(sensor_SettingsCbParams_t)); + break; + } + case SENSOR_SETTING_SET: + { + + result = SensorsClient_Setting_Set(elementIndex, + msg_params, + 6); + break; + } + case SENSOR_SETTING_SET_UNACK: + { + + result = SensorsClient_Setting_Set_Unack(elementIndex, + msg_params, + 6); + break; + } + case SENSOR_GET: + { + result = SensorsClient_Get(elementIndex, msg_params); + break; + } + case SENSOR_COLUMN_GET: + { + result = SensorsClient_Column_Get(elementIndex, msg_params, 4); + break; + } + case SENSOR_SERIES_GET: + { + result = SensorsClient_Series_Get(elementIndex, msg_params, 4); + break; + } +/******************************************************************************/ +#endif /* #ifdef ENABLE_SENSOR_MODEL_CLIENT */ +/******************************************************************************/ + + + default: + { + TRACE_M(TF_SENSOR, "OpCode value invalid %d \r\n", msg_opcode); + result = MOBLE_RESULT_FAIL; + } + } + return result; +} + +/** + * @brief Callback corresponding to Appli_Sensor_Cadence_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Cadence_Status(const MOBLEUINT8 *pCadence, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Cadence_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_CADENCE_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Cadence value: %d\n\r", pCadence[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Settings_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Settings_Status(const MOBLEUINT8 *pSettings, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Settings_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_SETTINGS_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Settings value: %d\n\r", pSettings[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Setting_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Setting_Status(const MOBLEUINT8 *pSetting, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Setting_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_SETTING_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Setting value: %d\n\r", pSetting[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Descriptor_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Descriptor_Status(const MOBLEUINT8 *pDescriptor, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Descriptor_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_DESCRIPTOR_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Descriptor value: %d\n\r", pDescriptor[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Status(const MOBLEUINT8 *pStatus, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Status value: %d\n\r", pStatus[i]); + } +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + Appli_Light_LC_SensorPropertyUpdate(elementIndex, + PRESENCE_DETECTED_PID, + (MOBLEUINT32) pStatus[length-1]); +#endif +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Column_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Column_Status(const MOBLEUINT8 *pColumn, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Column_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_COLUMN_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Column Status value: %d\n\r", pColumn[i]); + } +} + + +/** + * @brief Callback corresponding to Appli_Sensor_Series_Status + * @param Descriptor parameters + * @param +* @retval None +*/ +void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex) +{ + MOBLEUINT8 i; + + TRACE_M(TF_SENSOR,"Appli_Sensor_Series_Status callback received \r\n"); + + TRACE_M(TF_SERIAL_CTRL,"#%d! for element %d \r\n", + SENSOR_SERIES_STATUS, + elementIndex); + for(i = 0; i < length; i++) + { + TRACE_M(TF_SERIAL_CTRL,"Series Status value: %d\n\r", pSeries[i]); + } +} + + +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h new file mode 100644 index 000000000..b5c605d15 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h @@ -0,0 +1,72 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_sensor_client.h + * @author MCD Application Team + * @brief Application interface for Sensor Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_SENSOR_CLIENT_H +#define __APPLI_SENSOR_CLIENT_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "sensors.h" +#include "mesh_cfg.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ +/* Application Variable-------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ +MOBLE_RESULT Appli_ConfigClient_Set(void); +MOBLE_RESULT Appli_SensorsClient_API(MOBLEUINT8 elementIndex, + MOBLEUINT16 msg_opcode, + MOBLEUINT8 *msg_params); +void Appli_Sensor_Descriptor_Status(const MOBLEUINT8 *pDescriptor, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Cadence_Status(const MOBLEUINT8 *pCadence, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Settings_Status(const MOBLEUINT8 *pSettings, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Setting_Status(const MOBLEUINT8 *pSetting, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Status(const MOBLEUINT8 *pStatus, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Column_Status(const MOBLEUINT8 *pColumn, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); +void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, + MOBLEUINT32 length, + MOBLE_ADDRESS dstPeer, + MOBLEUINT8 elementIndex); + + + + +#endif /* __APPLI_SENSOR_CLIENT_H */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c new file mode 100644 index 000000000..06a5730fe --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c @@ -0,0 +1,565 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_vendor.c + * @author MCD Application Team + * @brief Application interface for Vendor Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" +#include "hal_common.h" +#include "types.h" +#include "ble_mesh.h" +#include "appli_mesh.h" +#include "vendor.h" +#include "appli_vendor.h" +#include "common.h" +#include "appli_light.h" +#include "models_if.h" +#include "mesh_cfg.h" +#include + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ + +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +typedef struct +{ + MOBLE_ADDRESS dst; + MOBLEUINT8 data[VENDOR_DATA_BUFFER_SIZE]; + MOBLEUINT32 length; + MOBLEUINT8 elementIndex; +} APPLI_SEND_BIG_DATA_PACKET; + +/* Private variables ---------------------------------------------------------*/ + +MOBLEUINT8 ResponseBuffer[VENDOR_DATA_BUFFER_SIZE]; +MOBLEUINT16 BuffLength; +APPLI_SEND_BIG_DATA_PACKET Appli_VendorBigData; + +/*Variable to enable OTA for received vendor command*/ +extern MOBLEUINT8 Appli_LedState; +#ifdef USER_BOARD_1LED +extern uint16_t DUTY; +#endif +extern MOBLEUINT8 NumberOfElements; +MOBLEUINT32 TestHitCounter = 0; +extern Appli_LightPwmValue_t Appli_LightPwmValue; + +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/** +* @brief Process the Vendor Device Info Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_DeviceInfo(MOBLEUINT8 const *data, MOBLEUINT32 length) +{ + MOBLEUINT8 tempBuffer[10]; + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + + MOBLEUINT8 subCmd = data[0]; + char *libVersion; + char *subLibVersion; + MOBLEUINT8 inc = 0; + /*First Byte is sending the Sub Command*/ + ResponseBuffer[0] = subCmd; + TRACE_M(TF_VENDOR,"#02-%02hx! \n\r",data[0]); + + switch(subCmd) + { + case IC_TYPE: + { +#ifdef BLUENRG1_DEVICE + ResponseBuffer[1] = BLUENRG1_BRD; +#endif + +#ifdef BLUENRG2_DEVICE + ResponseBuffer[1] = BLUENRG2_BRD; +#endif + +#ifdef BLUENRG_MS + ResponseBuffer[1] = BLUENRG_MS_BRD; +#endif + +#ifdef STM32WB55xx + ResponseBuffer[1] = STM32WB55XX_BRD; +#endif + + BuffLength = 2; + break; + } + case LIB_VER: + { + libVersion = BLEMesh_GetLibraryVersion(); + while(*libVersion != '\0') + { + tempBuffer[inc] = *libVersion; + if(tempBuffer[inc] != 0x2E) + { + tempBuffer[inc] = BLEMesh_ModelsASCII_To_Char(tempBuffer[inc]); + TRACE_M(TF_VENDOR,"Lib version is %x\n\r" ,(unsigned char)tempBuffer[inc]); + } + else + { + TRACE_M(TF_VENDOR,"Lib version is %c\n\r" ,(unsigned char)tempBuffer[inc]); + } + libVersion++; + + inc++; + } + ResponseBuffer[1]= tempBuffer[0]; + ResponseBuffer[2]= tempBuffer[1]; + ResponseBuffer[3]= tempBuffer[3]; + ResponseBuffer[4]= tempBuffer[4]; + ResponseBuffer[5]= tempBuffer[6]; + ResponseBuffer[6]= tempBuffer[7]; + ResponseBuffer[7]= tempBuffer[8]; + BuffLength = 8; + break; + } + case LIB_SUB_VER: + { + subLibVersion = BLEMesh_GetLibrarySubVersion(); + while(*subLibVersion != '\0') + { + tempBuffer[inc] = * subLibVersion; + if((tempBuffer[inc] != 0x2E) && (tempBuffer[inc] != 0x52)) + { + tempBuffer[inc] = BLEMesh_ModelsASCII_To_Char(tempBuffer[inc]); + TRACE_M(TF_VENDOR,"Sub Lib version is %x\n\r" ,(unsigned char)tempBuffer[inc]); + } + else + { + TRACE_M(TF_VENDOR,"Sub Lib version is %c\n\r" ,(unsigned char)tempBuffer[inc]); + } + subLibVersion++; + inc++; + } + ResponseBuffer[1]= tempBuffer[0]; + ResponseBuffer[2]= tempBuffer[1]; + ResponseBuffer[3]= tempBuffer[3]; + ResponseBuffer[4]= tempBuffer[5]; + ResponseBuffer[5]= tempBuffer[7]; + ResponseBuffer[6]= tempBuffer[9]; + + BuffLength = 7; + + break; + } + case APPLICATION_VER: + { + /*Insert Command to check Application Version*/ + break; + } + + default: + { + status = MOBLE_RESULT_FALSE; + break; + } + + } + + return status; +} + + +/** +* @brief Process the Vendor Test Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_Test(MOBLEUINT8 const *data, MOBLEUINT32 length) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 subCmd = data[0]; + /*First Byte is sending the Sub Command*/ + ResponseBuffer[0]=subCmd; + TRACE_M(TF_VENDOR,"#01-%02hx! \n\r",data[0]); + switch(subCmd) + { + case APPLI_TEST_ECHO: + { + if(length > sizeof(ResponseBuffer)) + { + length = sizeof(ResponseBuffer); + TRACE_M(TF_VENDOR,"Length received greater than size of response buffer \r\n"); + } + memcpy (&(ResponseBuffer[1]),&(data[1]),(length-1)); + BuffLength = length; + break; + } + case APPLI_TEST_RANDOMIZATION_RANGE: + { + /*Insert Test related Commands here*/ + break; + } + case APPLI_TEST_COUNTER: + { +#ifdef USER_BOARD_1LED + if((DUTY <= PWM_TIME_PERIOD) && (DUTY > 1)) + { + Appli_LightPwmValue.IntensityValue = LED_OFF_VALUE; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + else + { + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + TRACE_M(TF_VENDOR,"Test Counter is running \r\n"); + ResponseBuffer[0] = subCmd; + ResponseBuffer[1] = Appli_LedState ; + BuffLength = 2; + /*Insert Test related Commands here*/ +#endif + break; + } + case APPLI_TEST_INC_COUNTER: + { +#ifdef USER_BOARD_1LED + if((DUTY <= PWM_TIME_PERIOD) && (DUTY > 1)) + { + Appli_LightPwmValue.IntensityValue = LED_OFF_VALUE; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + else + { + Appli_LightPwmValue.IntensityValue = PWM_TIME_PERIOD; + Light_UpdateLedValue(LOAD_STATE , Appli_LightPwmValue); + } + + TestHitCounter++; + TRACE_M(TF_VENDOR,"Command received Count %.2lx \r\n",TestHitCounter); + ResponseBuffer[0] = subCmd; + ResponseBuffer[1] = Appli_LedState ; + BuffLength = 2; +#endif + /*Insert Test related Commands here*/ + break; + } + case APPLI_MODEL_PUBLISH_SELECT: + { + for (MOBLEUINT8 idx=0; idx 16000) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } + break; + } + /* Default case - Not valid command */ + default: + { + status = MOBLE_RESULT_FALSE; + break; + } + } + /*Buffer will be sent for Reliable Response*/ + /*First Byte is Sub Command and 2nd Byte is LED Status*/ + ResponseBuffer[0] = subCommand; + if(subCommand == APPLI_CMD_LED_INTENSITY) + { + ResponseBuffer[1] = intensityValue >> 8 ; + ResponseBuffer[2] = intensityValue ; + BuffLength = 3; + } + else + { + ResponseBuffer[1] = Appli_LedState ; + BuffLength = 2; + } + + return status; +} + +/** +* @brief Process the Vendor Data write Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_Data_write(MOBLEUINT8 const *data, MOBLEUINT32 length) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 subCmd = data[0]; + /*First Byte is sending the Sub Command*/ + ResponseBuffer[0]=subCmd; + + TRACE_M(TF_VENDOR, "#0E-%02hx %02lx! \n\r",data[0], length); + for(MOBLEUINT16 i=0; i> 8; + *(responseValue+2) = TestHitCounter >> 16; + *(responseValue+3) = TestHitCounter >> 24; + TestHitCounter = 0; +} +/** +* @brief Process the Vendor LED Control Command +* @param data: Pointer to the data received from peer_addr +* @param length: Length of the data +* @param elementIndex : selected element where '0' is first element +* @param dst_peer : Destination address +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, + MOBLEUINT8 elementIndex , MOBLE_ADDRESS dst_peer) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + + if (length > VENDOR_DATA_BUFFER_SIZE) + { + status = MOBLE_RESULT_INVALIDARG; + } + memmove(Appli_VendorBigData.data, data, length); + Appli_VendorBigData.dst = dst_peer; + Appli_VendorBigData.length = length; + Appli_VendorBigData.elementIndex = elementIndex; + return status; +} +/** +* @brief Send Vendor big data packet +* @param void +* @retval MOBLE_RESULT status of result +*/ +MOBLE_RESULT Appli_Vendor_SendBigDataPacket(void) +{ + MOBLE_RESULT status = MOBLE_RESULT_SUCCESS; + + if(BLEMesh_TrsptIsBusyState()) + { + BSP_LED_On(LED_BLUE); + status = MOBLE_RESULT_FALSE; + } + else + { + BSP_LED_Off(LED_BLUE); + status = BLEMesh_SetRemoteData(Appli_VendorBigData.dst, + Appli_VendorBigData.elementIndex, + 0x000E, + Appli_VendorBigData.data, + Appli_VendorBigData.length, + MOBLE_FALSE, + MOBLE_TRUE); + + } + return status; +} + +/** +* @brief Publish Command for Vendor Model +* @param srcAddress: Source Address of Node +* @retval void +*/ +void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT8 AppliBuff[1]; + /* changes the LED status on other nodes in the network */ + + AppliBuff[0] = APPLI_CMD_TOGGLE; + + result = BLEMesh_SetRemotePublication(VENDORMODEL_STMICRO_ID1, srcAddress, + APPLI_LED_CONTROL_STATUS_CMD, + AppliBuff, sizeof(AppliBuff), + MOBLE_FALSE, MOBLE_TRUE); + + if(result) + { + TRACE_I(TF_VENDOR_M, "Publication Error \r\n"); + } +} +/** +* @} +*/ + +/** +* @} +*/ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h new file mode 100644 index 000000000..a1b98db75 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h @@ -0,0 +1,46 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file appli_vendor.h + * @author MCD Application Team + * @brief Application interface for Vendor Mesh Models + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APPLI_VENDOR_H +#define __APPLI_VENDOR_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "ble_mesh.h" + +/* Exported macro ------------------------------------------------------------*/ +#define LED_OFF_VALUE 1U +#define LED_ON_VALUE 32000U +/* Private define ------------------------------------------------------------*/ + +MOBLE_RESULT Appli_Vendor_LEDControl( MOBLEUINT8 const *data, MOBLEUINT32 length, + MOBLEUINT8 elementNumber, MOBLE_ADDRESS dst_peer); +MOBLE_RESULT Appli_Vendor_DeviceInfo(MOBLEUINT8 const *data, MOBLEUINT32 length); +MOBLE_RESULT Appli_Vendor_Test(MOBLEUINT8 const *data, MOBLEUINT32 length); +MOBLE_RESULT Appli_Vendor_Data_write(MOBLEUINT8 const *data, MOBLEUINT32 length); +void Appli_GetTestValue (MOBLEUINT8 *responseValue); +MOBLE_RESULT Appli_Vendor_SendBigDataPacket(void); +MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, + MOBLEUINT8 elementIndex , MOBLE_ADDRESS dst_peer); +void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress); +#endif /* __APPLI_VENDOR_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h new file mode 100644 index 000000000..dfad3c5fa --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h @@ -0,0 +1,72 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef BLE_CONF_H +#define BLE_CONF_H + +#include "app_conf.h" + +/****************************************************************************** + * + * BLE SERVICES CONFIGURATION + * blesvc + * + ******************************************************************************/ +#define BLE_CFG_MESH 1 + +/** + * This setting shall be set to '1' if the device needs to support the Peripheral Role + * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' + */ +#define BLE_CFG_PERIPHERAL 1 + +/** + * This setting shall be set to '1' if the device needs to support the Central Role + * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' + */ +#define BLE_CFG_CENTRAL 1 + +#define BLE_CFG_BROADCASTER 1 + +#define BLE_CFG_OBSERVER 1 + +#define BLE_CFG_DATA_ROLE_MODE 4 + + +/** + * There is one handler per service enabled + * Note: There is no handler for the Device Information Service + * + * This shall take into account all registered handlers + * (from either the provided services or the custom services) + */ +#define BLE_CFG_SVC_MAX_NBR_CB 7 + +#define BLE_CFG_CLT_MAX_NBR_CB 5 + +/****************************************************************************** + * GAP Service - Appearance + ******************************************************************************/ +#define BLE_CFG_UNKNOWN_APPEARANCE (0) +#define BLE_CFG_HR_SENSOR_APPEARANCE (832) +#define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) + +#endif /*BLE_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h new file mode 100644 index 000000000..132a0d68c --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h @@ -0,0 +1,199 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __BLE_DBG_CONF_H +#define __BLE_DBG_CONF_H + +/** + * Enable or Disable traces from BLE + */ + +#define BLE_DBG_DIS_EN 0 +#define BLE_DBG_HRS_EN 0 +#define BLE_DBG_EDS_STM_EN 0 +#define BLE_DBG_LBS_STM_EN 0 +#define BLE_DBG_SVCCTL_EN 1 +#define BLE_DBG_BLS_EN 0 +#define BLE_DBG_HTS_EN 0 +#define BLE_DBG_P2P_STM_EN 0 + +/** + * Macro definition + */ +#if ( BLE_DBG_APP_EN != 0 ) +#define BLE_DBG_APP_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_APP_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_DIS_EN != 0 ) +#define BLE_DBG_DIS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_DIS_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_HRS_EN != 0 ) +#define BLE_DBG_HRS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HRS_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_P2P_STM_EN != 0 ) +#define BLE_DBG_P2P_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_P2P_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_TEMPLATE_STM_EN != 0 ) +#define BLE_DBG_TEMPLATE_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_TEMPLATE_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_EDS_STM_EN != 0 ) +#define BLE_DBG_EDS_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_EDS_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_LBS_STM_EN != 0 ) +#define BLE_DBG_LBS_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LBS_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_SVCCTL_EN != 0 ) +#define BLE_DBG_SVCCTL_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_SVCCTL_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_CTS_EN != 0) +#define BLE_DBG_CTS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_CTS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HIDS_EN != 0) +#define BLE_DBG_HIDS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HIDS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_PASS_EN != 0) +#define BLE_DBG_PASS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_PASS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_BLS_EN != 0) +#define BLE_DBG_BLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_BLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HTS_EN != 0) +#define BLE_DBG_HTS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HTS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_ANS_EN != 0) +#define BLE_DBG_ANS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_ANS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_ESS_EN != 0) +#define BLE_DBG_ESS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_ESS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_GLS_EN != 0) +#define BLE_DBG_GLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_GLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_BAS_EN != 0) +#define BLE_DBG_BAS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_BAS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_RTUS_EN != 0) +#define BLE_DBG_RTUS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_RTUS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HPS_EN != 0) +#define BLE_DBG_HPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_TPS_EN != 0) +#define BLE_DBG_TPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_TPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_LLS_EN != 0) +#define BLE_DBG_LLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_IAS_EN != 0) +#define BLE_DBG_IAS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_IAS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_WSS_EN != 0) +#define BLE_DBG_WSS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_WSS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_LNS_EN != 0) +#define BLE_DBG_LNS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LNS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_SCPS_EN != 0) +#define BLE_DBG_SCPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_SCPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_DTS_EN != 0) +#define BLE_DBG_DTS_MSG PRINT_MESG_DBG +#define BLE_DBG_DTS_BUF PRINT_LOG_BUFF_DBG +#else +#define BLE_DBG_DTS_MSG PRINT_NO_MESG +#define BLE_DBG_DTS_BUF PRINT_NO_MESG +#endif + +#endif /*__BLE_DBG_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h new file mode 100644 index 000000000..c00aae92d --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h @@ -0,0 +1,48 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file cube_hal.h + * @author MCD Application Team + * @brief + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#ifndef _CUBE_HAL_H_ +#define _CUBE_HAL_H_ + +/* Includes ------------------------------------------------------------------*/ + +#include "stm32wbxx_hal.h" +#include "stm32wbxx_hal_conf.h" + +#define B1_Pin GPIO_PIN_13 +#define B1_GPIO_Port GPIOC +#define USART_TX_Pin GPIO_PIN_2 +#define USART_TX_GPIO_Port GPIOA +#define USART_RX_Pin GPIO_PIN_3 +#define USART_RX_GPIO_Port GPIOA +#define LD2_Pin GPIO_PIN_5 +#define LD2_GPIO_Port GPIOA + +#define UART_TX_TIMEOUT 5 + +#define Uart_Irq_Handler USART2_IRQHandler + + +void SystemClock_Config(void); +void Init_Device(void); +void MX_USART2_UART_Init(void); + + +#endif /* _CUBE_HAL_H_ */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s new file mode 100644 index 000000000..782844084 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s @@ -0,0 +1,28 @@ +;/** +;****************************************************************************** +;* @file data.s +;* @author BLE Mesh Team +;* @version V1.07.000 +;* @date 15-June-2018 +;* @brief Memory management +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +;*/ +_bdaddr EQU 0x0807E000 + EXPORT _bdaddr + + AREA CONFIG, READONLY +_mobleNvmBase_data + EXPORT _mobleNvmBase_data + FILL 4096, 0x00 + + END diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h new file mode 100644 index 000000000..d580f16a7 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h @@ -0,0 +1,53 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hal_common.h + * @author MCD Application Team + * @brief Common functions of HAL file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef _HAL_H_ +#define _HAL_H_ + +/* Includes ------------------------------------------------------------------*/ + +#if defined(NUCLEO_L152RE) || defined(USE_STM32WBXX_NUCLEO) || USE_STM32WBXX_USB_DONGLE /* NUCLEO_L152RE */ +#include "user_if.h" +#else /* not NUCLEO_L152RE */ +#if defined(BLUENRG1) || defined(BLUENRG2) /* BLUENRG1 or BLUENRG2 */ +#include "hal.h" +#else /* not BLUENRG1 or BLUENRG2 */ +#error "Unsupported board" +#endif /* BLUENRG1 or BLUENRG2 */ +#endif /* NUCLEO_L152RE */ + +#include +#include + +#include +#include + +#include "types.h" + +void SetLed(int state); +BUTTON_STATE GetButtonState(void); +BUTTON_STATE GetButton2State(void); +void InitDevice(void); + +void ShouldSleepFunc(void); + +#endif /* _HAL_H_ */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h new file mode 100644 index 000000000..385d6955b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h @@ -0,0 +1,628 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file mesh_cfg_usr.h + * @author MCD Application Team + * @brief user configurable settings + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MESH_CFG_USR_H +#define __MESH_CFG_USR_H + +/* Includes ------------------------------------------------------------------*/ +#include "ble_mesh.h" + +/* Exported macro ------------------------------------------------------------*/ + +/* +* Different features supported by BLE-Mesh. Uncomment according to application. +* Low power feature enabled node do not support other features. +* Do not define any other feature if Low Power feature is defined +*/ +#define ENABLE_RELAY_FEATURE +#define ENABLE_PROXY_FEATURE +#define ENABLE_FRIEND_FEATURE +//#define ENABLE_LOW_POWER_FEATURE +//#define ENABLE_PROVISIONER_FEATURE +//#define DYNAMIC_PROVISIONER + +/* +* Different provision bearer supported by BLE-Mesh. +* Define according to application. +* At least one of PB-ADV and PB-GATT should be defined +*/ + +#define ENABLE_PB_ADV +#define ENABLE_PB_GATT +//#define ENABLE_PUB_KEY_TYPE_OOB +#define ENABLE_AUTH_TYPE_NO_OOB +//#define ENABLE_AUTH_TYPE_STATIC_OOB +//#define ENABLE_AUTH_TYPE_OUTPUT_OOB +//#define ENABLE_AUTH_TYPE_INPUT_OOB + +/* Static OOB Configurations */ +#define STATIC_OOB_SIZE 16U + +/* Output OOB Configurations */ +#define OUTPUT_OOB_SIZE 1U +#define OUTPUT_OOB_ACTION OUTPUT_OOB_ACTION_BIT_BLINK + +/* Input OOB Configurations */ +#define INPUT_OOB_SIZE 1U +#define INPUT_OOB_ACTION INPUT_OOB_ACTION_BIT_PUSH + +/******************************************************************************/ +/* Note: Please use Full Library configuration in project options to use the full + configuration of the C/C++ runtime library + for printf and scanf functionality */ + +/* Enables the serial interface using Uart */ +#define ENABLE_SERIAL_INTERFACE 0 +#define ENABLE_SIG_MODELS_AT_COMMANDS 0 +#define ENABLE_VENDOR_MODELS_AT_COMMANDS 0 +#define ENABLE_UT 0 + +/* Provisioner feature related configuration */ +#if defined (ENABLE_PROVISIONER_FEATURE) || defined(DYNAMIC_PROVISIONER) +#define PROVISIONER_ROOT_ADDR_DEFAULT 0x0001 + +/* +Define the following Macro to save the nodes data in provisioner in NVM +This may result into excessive flash erase operations, this should be avoided to ensure flash longevity +*/ +#define SAVE_EMBD_PROVISION_DATA 1 + +/* Enables the UUID saving per Node - Currently Not Supported */ +#define ENABLE_SAVE_UUID_PER_NODE 0 + +//#define ENABLE_SERIAL_PRVN 1 +//#define ENABLE_CONFIG_MODEL_CLIENT (1) + +#define CLIENT_MAX_SIG_MODELS_PER_ELEMENT 12 /* Number of SIG Models for Node under provisioning */ +#define CLIENT_MAX_VENDOR_MODELS_PER_ELEMENT 1 /* Number of Vendor Models for Node under provisioning */ +#define CLIENT_MAX_ELEMENTS_PER_NODE 1 /* Number of Elements per Node */ + +/* +* Enable or disable neighbor table +* if defined -> enabled +* If MAC address of neighbor changes it appears as new neighbor +* Neighbor table update can be triggered (configurable) in following cases +* On receiving Unprovisioned device beacon +* On receiving Secure network beacon +* On receiving Mesh message +* Message with any TTL +* Message with TTL = 0 +* if not defined -> disabled +*/ +#define ENABLE_NEIGHBOR_TABLE + +#endif + +/* Macro to test the Flash saving data and retrieval process */ +#define ENABLE_NVM_TEST + +/* Macros Used for user defined serial print data for models. +Either use 0 to disable or 1 to enable +@ TF_GENERIC -> Generic server +@ TF_GENERIC_CLIENT -> Generic client +@ TF_SENSOR -> Sensor server +@ TF_LIGHT -> Lighting server +@ TF_LIGHT_CLIENT -> Lighting client +@ TF_LIGHT_LC -> Light LC server +@ TF_VENDOR -> vendor model +@ TF_CONFIG_CLIENT -> config client +@ TF_LPN_FRND -> Friendship, Friend and Low Power +@ TF_PROVISION -> Provisioning related +@ TF_HANDLER -> interrupt handler +@ TF_INIT -> main function +@ TF_MISC -> others +@ TF_COMMON -> common (middleware) +@ TF_GENERIC_M -> Generic server (middleware) +@ TF_GENERIC_CLIENT_M -> Config client (middleware) +@ TF_SENSOR_M -> Sensor server (middleware) +@ TF_LIGHT_M -> Lighting server (middleware) +@ TF_LIGHT_CLIENT_M -> Lighting client (middleware) +@ TF_LIGHT_LC_M -> Light LC server (middleware) +@ TF_VENDOR_M -> vendor model (middleware) +@ TF_CONFIG_CLIENT_M -> Config client (middleware) +@ TF_NEIGHBOUR -> neighbour table +@ TF_MEMORY +@ TF_BEACON -> Beacons +@ TF_SERIAL_CTRL +*/ +/* Enabled by default */ +#ifndef ENABLE_LOW_POWER_FEATURE +#define TF_GENERIC 1 +#define TF_GENERIC_CLIENT 1 +#define TF_SENSOR 1 +#define TF_LIGHT 1 +#define TF_LIGHT_CLIENT 1 +#define TF_LIGHT_LC 1 +#define TF_VENDOR 1 +#define TF_CONFIG_CLIENT 1 +#define TF_CONFIG_SERVER 1 +#define TF_LPN_FRND 1 +#define TF_PROVISION 1 +#define TF_HANDLER 1 +#define TF_INIT 1 +#define TF_MISC 1 +#define TF_SERIAL_CTRL 1 +/* Disabled by default */ +#define TF_COMMON 0 +#define TF_GENERIC_M 0 +#define TF_GENERIC_CLIENT_M 1 +#define TF_SENSOR_M 1 +#define TF_SENSOR_CLIENT_M 1 +#define TF_LIGHT_M 0 +#define TF_LIGHT_CLIENT_M 1 +#define TF_LIGHT_LC_M 1 +#define TF_VENDOR_M 1 +#define TF_CONFIG_CLIENT_M 0 +#define TF_NEIGHBOUR 0 +#define TF_MEMORY 0 +#define TF_BEACON 0 +#define TF_VENDOR_APPLI_TEST 1 /* Vendor commands testing */ +#define TF_NVM 0 +#endif + +/******************************************************************************* +*** Following section helps to define Device Name during Provisioning ********* +*******************************************************************************/ + +#define DEVICE_NAME_SIZE 11 +#define DEVICE_NAME 'S','T',' ','B','L','E',' ','M','e','s','h' + +/******************************************************************************* +*** Following section helps to select right configuration of Models *********** +*******************************************************************************/ +/******************************************************************************/ +/* Define the following Macros to enable the usage of the */ +/* Server Generic Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +/* Define the following Macros to enable the usage of the Server Generic Models */ +#define ENABLE_GENERIC_MODEL_SERVER_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_SERVER_LEVEL (1) +//#define ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF_SETUP (1) +//#define ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME (1) + +//#define ENABLE_GENERIC_MODEL_CLIENT_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_CLIENT_LEVEL (1) +//#define ENABLE_GENERIC_MODEL_CLIENT_POWER_ONOFF (1) +//#define ENABLE_GENERIC_MODEL_CLIENT_DEFAULT_TRANSITION_TIME (1) + +/* The Following Models are not available in this version, will be developed in + next version. +*/ +/* +#define ENABLE_GENERIC_MODEL_SERVER_POWER_LEVEL +#define ENABLE_GENERIC_MODEL_SERVER_POWER_LEVEL_SETUP +#define ENABLE_GENERIC_MODEL_SERVER_BATTERY +#define ENABLE_GENERIC_MODEL_SERVER_LOCATION +#define ENABLE_GENERIC_MODEL_SERVER_LOCATION_SETUP +#define ENABLE_GENERIC_MODEL_SERVER_ADMIN_PROPERTY +#define ENABLE_GENERIC_MODEL_SERVER_MANUFACTURER_PROPERTY +#define ENABLE_GENERIC_MODEL_SERVER_USER_PROPERTY +#define ENABLE_GENERIC_MODEL_SERVER_CLIENT_PROPERTY + +*/ + +/******************************************************************************/ +/******* Define the following Macros to enable the usage of the Light Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +//#define ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS (1) +//#define ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP (1) +//#define ENABLE_LIGHT_MODEL_SERVER_CTL (1) +//#define ENABLE_LIGHT_MODEL_SERVER_CTL_SETUP (1) +//#define ENABLE_LIGHT_MODEL_SERVER_CTL_TEMPERATURE (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL_SETUP (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL_HUE (1) +//#define ENABLE_LIGHT_MODEL_SERVER_HSL_SATURATION (1) + +//#define ENABLE_LIGHT_MODEL_CLIENT_LIGHTNESS (1) +//#define ENABLE_LIGHT_MODEL_CLIENT_CTL (1) +//#define ENABLE_LIGHT_MODEL_CLIENT_HSL (1) + +/* + The following Models are managed in different file light_lc.c in middleware +*/ +//#define ENABLE_LIGHT_MODEL_SERVER_LC (1) + +//#define ENABLE_LIGHT_MODEL_CLIENT_LC (1) + +/******************************************************************************/ +/* Define the following Macros to enable the usage of the Sensor Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +//#define ENABLE_SENSOR_MODEL_SERVER (1) + +//#define ENABLE_SENSOR_MODEL_CLIENT (1) + +/******************************************************************************/ +/* Define the following Macros to enable the usage of the time and */ +/* scene Models */ +/* For a choice of 3 elements (max is 8) */ +/* Definition is a bitmap of 3 bits: bit 2 element 3 */ +/* bit 1 element 2 */ +/* bit 0 element 1 */ +/* Example: 6 means Model enabled in element 2 and 3 */ +/******************************************************************************/ + +//#define ENABLE_TIME_MODEL_SERVER +//#define ENABLE_TIME_MODEL_SERVER_SETUP +//#define ENABLE_SCENE_MODEL_SERVER +//#define ENABLE_SCENE_MODEL_SERVER_SETUP + +/* + The Following Models are not available in this version +*/ +//#define ENABLE_LIGHT_MODEL_SERVER_XYL +//#define ENABLE_LIGHT_MODEL_SERVER_XYL_SETUP + +/******* Define the following Macros to enable the vendor model ******/ +#define ENABLE_VENDOR_MODEL_SERVER (1) +#define GENERIC_SERVER_MODEL_PUBLISH + +/******************************************************************************/ +/* +Define the Macro for enabling/disabling the Publishing with Generic on off +or by Vendor Model. +@ define Macro for Vendor Publishing +@ Undefine or comment Macro for Generic On Off Publishing +*/ +//#define VENDOR_CLIENT_MODEL_PUBLISH +//#define GENERIC_CLIENT_MODEL_PUBLISH +//#define LIGHT_CLIENT_MODEL_PUBLISH + + +/* Define the macros for the numbers of sensor present.*/ +//#define NUMBER_OF_SENSOR 1 +//#define ENABLE_OCCUPANCY_SENSOR +/* +Macro is responsible for enabling and desabling the sensor publication. +Comment this macro to disable the publication +*/ +//#define ENABLE_SENSOR_PUBLICATION + +/******************************************************************************/ + + +/* Maximum Time period value of PWM */ +#define PWM_TIME_PERIOD 31990U + +/******************************************************************************/ +/***** MACROS for POWER ON-OFF CYCLE BASED UNPROVISIONING *********************/ +/******************************************************************************/ + +/* +Define the following Macro to check the Power-OnOff Cycles +5 Continuous cycles of OnOff with Ontime <2 sec will cause unprovisioning +*/ +//#define ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE + +#define POWER_ON_OFF_CYCLES_FOR_UNPROVISIONING 5 +#define MASK_BITS_FOR_POWER_ON_OFF_CYCLES (0xFFFFFFFF << POWER_ON_OFF_CYCLES_FOR_UNPROVISIONING) + /* 0xFFFFFFE0 */ +#define ON_TIME_IN_SECONDS_FOR_POWER_CYCLING 2 +#define BLINK_TIMES_FOR_FACTORY_RESET 5 + +/* +Define the following Macro to save Generic and Light Model states in NVM +This may result into excessive flash erase operations, +this should be avoided to ensure flash longevity +*/ +#define ENABLE_SAVE_MODEL_STATE_NVM + +/* Only one Macro will be enable at one time */ +//#define SAVE_MODEL_STATE_FOR_ALL_MESSAGES +//#define SAVE_MODEL_STATE_POWER_FAILURE_DETECTION + + +/* Macros defined for the number of bytes saved, number of bytes dedicated for ganeric + model and light model. +*/ +#define APP_NVM_GENERIC_MODEL_SIZE 16U +#define APP_NVM_LIGHT_MODEL_SIZE 48U/*32U*/ +#define APP_NVM_MODELDATA_PER_ELEMENT_SIZE (APP_NVM_GENERIC_MODEL_SIZE+APP_NVM_LIGHT_MODEL_SIZE) +//#define APP_NVM_MODEL_SIZE 50U +#define APP_NVM_MODEL_SIZE (APP_NVM_MODELDATA_PER_ELEMENT_SIZE * APPLICATION_NUMBER_OF_ELEMENTS) +//#define APP_NVM_MODEL_ALL_ELEMENTS_SIZE + + +/*Macros are defined for the selection of the number of led and type of lighting + used for the application. +*if board has one led, uncomment USER_BOARD_1LED +*if board has cool warm leds, uncomment USER_BOARD_COOL_WHITE_LED +*if board has RGB leds, uncomment USER_BOARD_RGB_LED +*if board has RGB leds as well as cool warm leds, + uncomment USER_BOARD_COOL_WHITE_LED and USER_BOARD_RGB_LED +*/ +/* comment ENABLE_GENERIC_MODEL_SERVER_DEFAULT_TRANSITION_TIME when using + USER_BOARD_COOL_WHITE_LED ,USER_BOARD_RGB_LED + Default transition is provided only for one led. +*/ +//#define USER_BOARD_1LED +//#define USER_BOARD_COOL_WHITE_LED +//#define USER_BOARD_RGB_LED + +/* Pulse Width Modulation support for external LED control */ +#define ENABLE_PWM_SUPPORT 0 + +/******************************************************************************* +*** Following section helps to configure the Application of Mesh *********** +*******************************************************************************/ + +/* Max elements supported by the MESH library: 1 */ +/* Max elements in the MESH application: 1 */ +#define APPLICATION_NUMBER_OF_ELEMENTS 1 +/* Max total Models per element supported by the MESH library (SIG + Vendor): 3 */ +/* Max SIG Models per element in the MESH application */ +#define USER_SIG_MODELS_MAX_COUNT 1 +/* Max Vendor Models per element in the MESH application */ +#define USER_VENDOR_MODELS_MAX_COUNT 1 + + +/* Contains a 16-bit company identifier assigned by the Bluetooth SIG +(the list is available +@ https://www.bluetooth.com/specifications/assigned-numbers/company-identifiers) +For STMicroelectronics : it is 0x0030 */ +#define COMPANY_ID 0x0030 + +/* Contains a 16-bit vendor-assigned product identifier */ +#define PRODUCT_ID 0x0002 + +/* Contains a 16-bit vendor-assigned product version ID */ +#define PRODUCT_VERSION_ID 0x010A + +#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go up to 160*/ + +#define TPT_SEGMENT_COUNT (((MAX_APPLICATION_PACKET_SIZE)/12)+2) + +/******************************************************************************* +********** MAC Address Configuration ******************************************* +*******************************************************************************/ + +/* +* Define to enable external MAC handling, +* DONT change the Values 0x01, 0x02, 0x03 +* SELECT ONLY One of the Option +*/ +//#define GENERATE_STATIC_RANDOM_MAC 0x01 +//#define EXTERNAL_MAC_ADDR_MGMT 0x02 +#define INTERNAL_UNIQUE_NUMBER_MAC 0x03 + +/* Declare this value as 0x01 if the External Address is PUBLIC Address */ +/* For example like this: #define EXTERNAL_MAC_IS_PUBLIC_ADDR 0x1 */ +/* Else, by default, the external address will be treated as RANDOM */ +#define EXTERNAL_MAC_IS_PUBLIC_ADDR 0x0 + +/******************************************************************************/ + + +/******************************************************************************* +****** Following section helps to select right configuration of node *********** +*******************************************************************************/ +/* +* Minimum gap between successive transmissions +* varies from 10 to 65535 +*/ +#define TR_GAP_BETWEEN_TRANSMISSION 50U + + +/* +* Friend node receive window size is 50 ms +*/ + +/* +* Friend node subscription list size is 4 +*/ + +/* +* Friend node message queue is 16 +*/ + +/* +* Number of Low power nodes that can be associated with Friend node +* varies from 1 to 10 +*/ +#define FN_NO_OF_LPNS 1U/*6U*/ + +/* +* For prioritizing friendship offer with good RSSI link +* varies from 0 to 3 +* Ref @Mesh_v1.0 +* 0 -> 1 +* 1 -> 1.5 +* 2 -> 2 +* 3 -> 2.5 +*/ +#define LPN_RSSI_FACTOR_LEVEL 1U + +/* +* For prioritizing friendship offer with good receive window factor +* varies from 0 to 3 +* Ref @Mesh_v1.0 +* 0 -> 1 +* 1 -> 1.5 +* 2 -> 2 +* 3 -> 2.5 +*/ +#define LPN_RECIVE_WINDOW_FACTOR_LEVEL 1U + +/* +* Minimum packets queue size required by Low Power node +* varies from 1 to 7 +* Ref @Mesh_v1.0 +* 1 -> 2 +* 2 -> 4 +* 3 -> 8 +* 4 -> 16 +* 5 -> 32 +* 6 -> 64 +* 7 -> 128 +*/ +#define LPN_MINIMUM_QUEUE_SIZE_LOG 2U + +/* +* (unit ms) +* varies from 0x0A to 0xFF +* Ref @Mesh_v1.0 +* 0x0A -> 10ms +* 0xFF -> 255ms +*/ +#define LPN_RECEIVE_DELAY 150U + +/* +* Poll timeout value after which friendship cease to exist (unit 100ms) +* varies from 0x00000A to 0x34BBFF +* Ref @Mesh_v1.0 +* 0x00000A -> 1 second +* 0x34BBFF -> 96 hours +*/ +#define LPN_POLL_TIMEOUT 2000U + +/* +* Maximum receive window size acceptable to low power node (unit ms) +* varies from 0x0A to 0xFF +* Ref @Mesh_v1.0 +* 0x0A -> 10ms +* 0xFF -> 255ms +*/ +#define LPN_RECEIVE_WINDOW_SIZE 255U/*55U*/ + +/* +* Minimum friend's subscription list size capability required by lpn +* varies from 1 to 5 +* Ref @Mesh_v1.0 +*/ +#define LPN_SUBSCR_LIST_SIZE 2U + +/* +* Frequency at which low power node would send friend request (unit 100ms) +* varies from 0 to 255 +* 100 -> 10s +*/ +#define LPN_FRIEND_REQUEST_FREQUENCY 50U + +/* +* Frequency at which low power node would poll friend node (unit 100ms) +* should be less than poll timeout +* 100 -> 10s +*/ +#define LPN_FRIEND_POLL_FREQUENCY 25U + +/* +* Minimum RSSI required by low power node +* should be less than equal to -60 +*/ +#define LPN_MINIMUM_RSSI -100 + +/* +* Retries to be made by lpn before termination of friendship +* varies from 2 to 10 +*/ +#define LPN_NO_OF_RETRIES 10U + +/* +* Maximum address list size buffer in +* Friend Subscription List Add Message is 10 +*/ + + +/* +* Enable or disable neighbor table +* if defined -> enabled +* If MAC address of neighbor changes it appears as new neighbor +* Neighbor table update can be triggered (configurable) in following cases +* On receiving Unprovisioned device beacon +* On receiving Secure network beacon +* On receiving Mesh message +* Message with any TTL +* Message with TTL = 0 +* if not defined -> disabled +*/ +#define ENABLE_NEIGHBOR_TABLE + +/* +* Size of neighbor table +*/ +#define NEIGHBOR_COUNT 5U + +/* +* (unit s) +* Duration (wrt appear or last refresh) +* for which neighbor exists in neighbor table +*/ +#define NEIGHBOR_ALIVE_TIME 20U + +/* +* Enable/disable neighbor table update with unprovisioned device beacon +* 0: Disable neighbor table update with unprovisioned device beacon +* 1: Enable neighbor table update with unprovisioned device beacon +*/ +#define NEIGHBOR_UNPRVND_DEV_BEACON_NTU 1U + +/* +* Enable/disable neighbor table update with secure network beacon +* 0: Disable neighbor table update with secure network beacon +* 1: Enable neighbor table update with secure network beacon +*/ +#define NEIGHBOR_SECURE_NET_BEACON_NTU 0U + +/* +* Enable/disable neighbor table update with TTL 0 message +* 0: Disable neighbor table update messages +* 1: Enable neighbor table update with messages with 0 TTL +* 2: Enable neighbor table update with messages with any TTL +*/ +#define NEIGHBOR_MSG_TTLX_NTU 0U + +/******************************************************************************* +*** Following section helps to configure the LEDs of Application of Mesh *** +*******************************************************************************/ + +#if defined USE_STM32WBXX_NUCLEO || defined USE_STM32WBXX_USB_DONGLE + #define SINGLE_LED PWM4 + #define COOL_LED PWM0 + #define WARM_LED PWM1 + #define RED_LED PWM2 + #define GREEN_LED PWM3 + #define BLUE_LED PWM4 +#endif + + +/* Exported variables -------------------------------------------------------*/ +/* Exported Functions Prototypes ---------------------------------------------*/ + +#endif /* __MESH_CFG_USR_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c new file mode 100644 index 000000000..4d3fa8a2d --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c @@ -0,0 +1,1163 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file models_if.c + * @author MCD Application Team + * @brief Mesh Modes interface file of the application + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "hal_common.h" +#include "appli_mesh.h" +#include "appli_nvm.h" +#include "ble_hci_le.h" +#include "models_if.h" + +#include "common.h" +#include "generic.h" +#include "light.h" +#include "light_lc.h" +#include "time_scene.h" +#include "sensors.h" +#include "vendor.h" +#include "appli_generic.h" +#include "appli_light.h" +#include "appli_light_lc.h" +#include "appli_sensor.h" +#include "appli_vendor.h" +#include "config_client.h" +#include "generic_client.h" +#include "light_client.h" +#include "sensors_client.h" +#include "appli_generic_client.h" +#include "appli_light_client.h" +#include "appli_sensors_client.h" + +#if (( CFG_LPM_SUPPORTED == 0) && (ENABLE_PWM_SUPPORT == 1)) +#include "PWM_config.h" +#include "PWM_handlers.h" +#endif + +/** @addtogroup ST_BLE_Mesh +* @{ +*/ + +/** @addtogroup Application_Mesh_Models +* @{ +*/ +/* Private variables ---------------------------------------------------------*/ +MOBLEUINT8 Led_Value = 0; + +MOBLEUINT8 ButtonIndex_Value = 0; + +/* Private typedef -----------------------------------------------------------*/ +#pragma pack(push, 1) + +typedef struct +{ + MOBLE_ADDRESS peer; + MOBLE_ADDRESS dst; + MOBLEUINT8 command; + MOBLEUINT8 elementIndex; + MOBLEUINT8 appKeyOffset; + MOBLEUINT8 netKeyOffset; + MOBLEUINT8 data[DATA_BUFFER_LENGTH]; /* 8-Bytes response packet */ + MOBLEUINT32 length; +} APPLI_SEND_RESPONSE_MODULE; + + +typedef struct +{ + MOBLEUINT8 packet_count; + MOBLEUINT32 send_time; + APPLI_SEND_RESPONSE_MODULE* head; + MOBLEUINT8 head_index; + APPLI_SEND_RESPONSE_MODULE packet[MAX_PENDING_PACKETS_QUE_SIZE]; +} APPLI_PENDING_PACKETS; + +#pragma pack(pop) +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ + + +/* Private variables ---------------------------------------------------------*/ + +MOBLEUINT8 pGeneric_OnOffParam[sizeof(Generic_OnOffParam_t)]; +MOBLEUINT8 pGeneric_LevelParam[sizeof(Generic_LevelParam_t)]; +MOBLEUINT8 pGeneric_DeltaLevelParam[sizeof(Generic_DeltaLevelParam_t)]; +MOBLEUINT8 pGeneric_MoveLevelParam[sizeof(Generic_LevelMoveParam_t)]; +MOBLEUINT8 pGeneric_PowerOnOffParam[sizeof(Generic_PowerOnOffParam_t)]; +MOBLEUINT8 pGeneric_DefaultTransitionTimeParam[sizeof(Generic_DefaultTransitionParam_t)]; + +MOBLEUINT8 pLightnessParam[sizeof(Light_LightnessParam_t)]; +MOBLEUINT8 pLightnessRangeParam[sizeof(Light_LightnessRangeParam_t)]; + +MOBLEUINT8 pLightCtlParam[sizeof(Light_CtlParam_t)]; +MOBLEUINT8 pLightCtlTemperatureParam[sizeof(Light_CtlTemperatureParam_t)]; +MOBLEUINT8 pLightCtlTemperatureRangeParam[sizeof(Light_CtlTemperatureRangeParam_t)]; +MOBLEUINT8 pLightCtlDefaultParam[sizeof(Light_CtlDefaultParam_t)]; + +MOBLEUINT8 pLightHslParam[sizeof(Light_HslParam_t)]; +MOBLEUINT8 pLightHslRangeParam[sizeof(Light_HslRangeParam_t)]; +MOBLEUINT8 pLightHslHueParam[sizeof(Light_HslHueParam_t)]; +MOBLEUINT8 pLightHslSaturationParam[sizeof(Light_HslSaturationParam_t)]; + +MOBLEUINT8 pLightLCModeParam[sizeof(Light_LC_ModeParam_t)]; +MOBLEUINT8 pLightLCOccupancyModeParam[sizeof(Light_LC_ModeParam_t)]; +MOBLEUINT8 pLightLCOnOffParam[sizeof(Light_LC_OnOffParam_t)]; +MOBLEUINT8 pLightLCPropertyParam[6]; + +MOBLEUINT8 pSensorsCadenceParam[sizeof(sensor_CadenceCbParam_t)]; +MOBLEUINT8 pSensorsSettingParam[sizeof(sensor_SettingCbParams_t)]; + +APPLI_PENDING_PACKETS Appli_PendingPackets = {0}; + +#ifdef ENABLE_VENDOR_MODEL_SERVER +__attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = +{ + Vendor_WriteLocalDataCb, + Vendor_ReadLocalDataCb, + Vendor_OnResponseDataCb +}; + +__attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = +{ + /*Vendor Commands*/ + Appli_Vendor_LEDControl, + Appli_Vendor_DeviceInfo, + Appli_Vendor_Test, + Appli_LedCtrl, + Appli_GetTestValue, + Appli_Vendor_Data_write +}; +#endif + +__attribute__((aligned(4)))const Appli_Generic_cb_t GenericAppli_cb = +{ + /* Generic OnOff callbacks */ + Appli_Generic_OnOff_Set, + /* Generic OnOff Status callbacks */ + Appli_Generic_OnOff_Status, + /* Generic Level callbacks */ + Appli_Generic_Level_Set, + Appli_Generic_Delta_Set, + Appli_Generic_Move_Set, + /* Generic Level Status callbacks */ + Appli_Generic_Level_Status, + /* Generic Power on off callbacks */ + Appli_Generic_PowerOnOff_Set, + /* Generic Power on off callbacks */ + Appli_Generic_PowerOnOff_Status, + + /* Generic Default transition time callbacks */ + Appli_Generic_DefaultTransitionTime_Set, + /* Generic Default transition time callbacks */ + Appli_Generic_DefaultTransitionTime_Status +}; + +__attribute__((aligned(4)))const Appli_Generic_State_cb_t Appli_GenericState_cb = +{ + + /* Generic Get On Off status */ + Appli_Generic_GetOnOffStatus, + Appli_Generic_GetOnOffValue, + /* Generic Get level status */ + Appli_Generic_GetLevelStatus, + /* Generic Get Power on off status */ + Appli_Generic_GetPowerOnOffStatus, + /* Generic Get Default transition time status */ + Appli_Generic_GetDefaultTransitionStatus +}; + +__attribute__((aligned(4)))const Appli_Light_GetStatus_cb_t Appli_Light_GetStatus_cb = +{ + Appli_Light_GetLightnessStatus, + Appli_Light_GetLightnessLinearStatus, + Appli_Light_GetLightnessDefaultStatus, + Appli_Light_GetLightnessLastStatus, + Appli_Light_GetLightnessRangeStatus, + Appli_Light_GetCtlLightStatus, + Appli_Light_GetCtlTargetStatus, + Appli_Light_GetCtlTemperatureStatus, + Appli_Light_GetCtlTemperatureRange, + Appli_Light_GetCtlDefaultStatus, + Appli_Light_GetHslStatus, + Appli_Light_GetHslTargetStatus, + Appli_Light_GetHslHueStatus, + Appli_Light_GetHslSaturationStatus, + Appli_Light_GetHslHueRange, + Appli_Light_GetHslSatRange, + Appli_Light_GetHslDefaultStatus +}; + + +__attribute__((aligned(4)))const Appli_Light_cb_t LightAppli_cb = +{ + /* Light Lightness callbacks */ + Appli_Light_Lightness_Set, + Appli_Light_Lightness_Status, + + Appli_Light_Lightness_Linear_Set, + Appli_Light_Lightness_Linear_Status, + + Appli_Light_Lightness_Default_Set, + Appli_Light_Lightness_Default_Status, + + Appli_Light_Lightness_Last_Set, + Appli_Light_Lightness_Last_Status, + + Appli_Light_Lightness_Range_Set, + Appli_Light_Lightness_Range_Status, + + Appli_Light_Ctl_Set, + Appli_Light_Ctl_Status, + + Appli_Light_CtlTemperature_Set, + Appli_Light_CtlTemperature_Status, + + Appli_Light_CtlTemperature_Range_Set, + Appli_Light_CtlTemperature_Range_Status, + + Appli_Light_CtlDefault_Set, + Appli_Light_CtlDefault_Status, + + Appli_Light_Hsl_Set, + Appli_Light_Hsl_Status, + + Appli_Light_HslHue_Set, + Appli_Light_HslHue_Status, + + Appli_Light_HslSaturation_Set, + Appli_Light_HslSaturation_Status, + + Appli_Light_HslDefault_Set, + Appli_Light_HslDefault_Status, + + Appli_Light_HslRange_Set, + Appli_Light_HslRange_Status +}; + +/*#ifdef ENABLE_SENSOR_MODEL_CLIENT*/ +__attribute__((aligned(4))) const sensor_client_cb_t SensorAppli_cb = +{ + Appli_Sensor_Descriptor_Status, + Appli_Sensor_Cadence_Status, + Appli_Sensor_Settings_Status, + Appli_Sensor_Setting_Status, + Appli_Sensor_Status, + Appli_Sensor_Column_Status, + Appli_Sensor_Series_Status +}; +/*#endif*/ + +__attribute__((aligned(4)))const MODEL_SIG_cb_t Model_SIG_cb[] = +{ +#ifdef ENABLE_GENERIC_MODEL_SERVER + { + GenericModelServer_GetOpcodeTableCb, + GenericModelServer_GetStatusRequestCb, + GenericModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER + { + LightModelServer_GetOpcodeTableCb, + LightModelServer_GetStatusRequestCb, + LightModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_SENSOR_MODEL_SERVER +{ + SensorModelServer_GetOpcodeTableCb, + SensorModelServer_GetStatusRequestCb, + SensorModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_TIME_SCENE_MODEL_SERVER + { + Time_SceneModelServer_GetOpcodeTableCb, + Time_SceneModelServer_GetStatusRequestCb, + Time_SceneModelServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + { + LightLcServer_GetOpcodeTableCb, + LightLcServer_GetStatusRequestCb, + LightLcServer_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_GENERIC_MODEL_CLIENT + { + GenericModelClient_GetOpcodeTableCb, + GenericModelClient_GetStatusRequestCb, + GenericModelClient_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_CONFIG_MODEL_CLIENT + { + ConfigClientModel_GetOpcodeTableCb, + ConfigClientModel_GetStatusRequestCb, + ConfigClientModel_ProcessMessageCb + }, +#endif +#ifdef ENABLE_LIGHT_MODEL_CLIENT + { + LightModelClient_GetOpcodeTableCb, + LightModelClient_GetStatusRequestCb, + LightModelClient_ProcessMessageCb + }, +#endif + +#ifdef ENABLE_SENSOR_MODEL_CLIENT + { + SensorsModelClient_GetOpcodeTableCb, + SensorsModelClient_GetStatusRequestCb, + SensorsModelClient_ProcessMessageCb + }, +#endif + + { + 0, 0, 0 + } +}; + +__attribute__((aligned(4)))const APPLI_SAVE_MODEL_STATE_CB SaveModelState_cb = AppliNvm_SaveModelState; + +#if 0 +__attribute__((aligned(4)))const APPLI_SAVE_MODEL_TEST_STATE_CB SaveModelTestState_cb = AppliNVM_Save_FlashTesting; +__attribute__((aligned(4)))const APPLI_RETRIEVE_MODEL_TEST_STATE_CB RetrieveModelTestState_cb = AppliNVM_Retrieve_FlashTesting; +#endif + +#define MODEL_SIG_COUNT ( ( sizeof(Model_SIG_cb)/sizeof(Model_SIG_cb[0]) - 1 )) + +#ifdef ENABLE_VENDOR_MODEL_SERVER +__attribute__((aligned(4)))const MODEL_Vendor_cb_t Model_Vendor_cb[] = +{ + { + VendorModel_PID1_GetOpcodeTableCb, + VendorModel_PID1_GetStatusRequestCb, + VendorModel_PID1_ProcessMessageCb + }, + { 0, 0,0 } +}; + +#define MODEL_VENDOR_COUNT ( ( sizeof(Model_Vendor_cb)/sizeof(Model_Vendor_cb[0]) - 1 )) +#endif + +extern MOBLEUINT8 NumberOfElements; + +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +void GetApplicationVendorModels(const MODEL_Vendor_cb_t** pModelsTable, MOBLEUINT32* VendorModelscount) +{ +#ifdef ENABLE_VENDOR_MODEL_SERVER + *pModelsTable = Model_Vendor_cb ; + *VendorModelscount = MODEL_VENDOR_COUNT; + + TRACE_M(TF_VENDOR_M, "GetApplicationVendorModels \r\n"); +#endif +} + +/** +* @brief Initialization Commands for Models +* @param void +* @retval void +*/ +void BLEMesh_ModelsInit(void) +{ + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + + MOBLEUINT16 modelStateLoad_Size; + MOBLEUINT8 modelStateLoadBuff[APP_NVM_MODEL_SIZE]; + +#ifdef CLIENT + MOBLEUINT8 PrvnStateLoad_Size; + MOBLEUINT8 PrvnlStateLoadBuff[16]; +#endif + +#if 0 +#ifdef ENABLE_NVM_TEST + /* Testing of flash code */ + Device_FlashTesting(); +#endif +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS + /* Inintialise the light model range states with default values */ + Light_ModelRangeInit(); +#endif + + /* Callbacks used by BlueNRG-Mesh Models */ + BLEMesh_SetSIGModelsCbMap(Model_SIG_cb, MODEL_SIG_COUNT); + +#if defined ENABLE_SENSOR_MODEL_SERVER && !defined CUSTOM_BOARD_PWM_SELECTION + /* Initialization of sensors */ + Appli_Sensor_Init(); +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + Appli_Light_LCs_Init(); +#endif +#endif + + /* Load generic model states from nvm */ + AppliNvm_LoadModelState(modelStateLoadBuff, &modelStateLoad_Size); + if (modelStateLoad_Size != 0) + { + /* update states of generic model */ + Model_RestoreStates(modelStateLoadBuff, modelStateLoad_Size); + } + +#ifdef CLIENT + AppliPrvnNvm_LoadData(PrvnlStateLoadBuff,&PrvnStateLoad_Size); +#endif + +} + +/** +* @brief Process Commands for Models +* @param void +* @retval void +*/ +void BLEMesh_ModelsProcess(void) +{ +#ifdef ENABLE_GENERIC_MODEL_SERVER + Generic_Process(); +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER + Lighting_Process(); +#endif + +#ifdef ENABLE_VENDOR_MODEL_SERVER + Vendor_Process(); +#endif +/* Define this Macro to enable the publication of sensors data.*/ +#if defined ENABLE_SENSOR_MODEL_SERVER + Sensor_Process(); +#endif + +#if ENABLE_APPLI_TEST + Test_Process(); +#endif + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + ModelSave_Process(); +#endif + +#ifdef ENABLE_LIGHT_MODEL_SERVER_LC + Light_LC_Process(); +#endif +} + +/** +* @brief Publish Command for Models +* @param void +* @retval void +*/ +void BLEMesh_ModelsCommand(void) +{ +#ifdef VENDOR_CLIENT_MODEL_PUBLISH + Appli_Vendor_Publish(BLEMesh_GetAddress()); +#endif + +#if defined(GENERIC_CLIENT_MODEL_PUBLISH) || defined(LIGHT_CLIENT_MODEL_PUBLISH) + Led_Value ^= APPLI_LED_ON; + pGeneric_OnOffParam[0] = Led_Value; /* OnOff parameter byte 0 : The target value of the Generic Onoff state */ + + pLightLCModeParam[0] = Led_Value; + pLightLCOccupancyModeParam[0] = Led_Value; + pLightLCOnOffParam[0] = Led_Value; + + /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functioning */ + switch (ButtonIndex_Value){ + case 0: + ButtonIndex_Value=0x1; + + pGeneric_LevelParam[0]= 0xE8; /* Level parameter byte 0 : The target value of the Generic Level state */ + pGeneric_LevelParam[1]= 0x03; /* Level parameter byte 1 : The target value of the Generic Level state */ + + pGeneric_DeltaLevelParam[0]= 0xE8; /* Delta Level parameter byte 0 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[1]= 0x03; /* Delta Level parameter byte 1 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[2]= 0x00; /* Delta Level parameter byte 2 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[3]= 0x00; /* Delta Level parameter byte 3 : The Delta change of the Generic Level state */ + + pGeneric_MoveLevelParam[0]= 0xE8; /*Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state */ + pGeneric_MoveLevelParam[1]= 0x03; /*Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state */ + + pGeneric_DefaultTransitionTimeParam[0]=0x0F; /*Transition time parameter byte 0 : The value of the Generic Default Transition Time state */ + + pGeneric_PowerOnOffParam[0]=0x1; /*OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state */ + + pLightnessParam[0] = 0xE8; /*Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state */ + pLightnessParam[1] = 0x03; /*Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state */ + + pLightnessRangeParam[0] = 0xE8; /*Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[1] = 0x03; /*Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[2] = 0x88; /*Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state */ + pLightnessRangeParam[3] = 0x13; /*Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state */ + + pLightCtlParam[0] = 0xE8; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state */ + pLightCtlParam[1] = 0x03; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state */ + pLightCtlParam[2] = 0xE8; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlParam[4] = 0xE8; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlParam[5] = 0x03; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureParam[0] = 0xE8; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[1] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[2] = 0xE8; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlTemperatureParam[3] = 0x03; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureRangeParam[0] = 0xE8; /*Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[1] = 0x03; /*Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[2] = 0x88; /*Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[3] = 0x13; /*Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + + pLightCtlDefaultParam[0] = 0xE8; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[1] = 0x03; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[2] = 0xE8; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[4] = 0xE8; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state*/ + pLightCtlDefaultParam[5] = 0x03; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state*/ + /** Red color **/ + pLightHslParam[0] = 0x44; /*HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state*/ + pLightHslParam[1] = 0x44; /*HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state*/ + pLightHslParam[2] = 0x64; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslParam[3] = 0x04; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + pLightHslParam[4] = 0xff; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslParam[5] = 0xff; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + pLightHslRangeParam[0] = 0xE8; /*HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[1] = 0x03; /*HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[2] = 0x88; /*HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[3] = 0x13; /*HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[4] = 0x88; /*HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[5] = 0x13; /*HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[6] = 0x70; /*HSL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[7] = 0x17; /*HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + + pLightHslHueParam[0] = 0xE8; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslHueParam[1] = 0x03; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + + pLightHslSaturationParam[0] = 0xE8; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslSaturationParam[1] = 0x03; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + /*LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B*/ + pLightLCPropertyParam[0]= 0x2B; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[1]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[2]= 0x44; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[3]= 0x44; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[4]= 0x44; /* Property ID byte 2 : Property ID identifying a Light LC Property.*/ + break; + + case 1: + ButtonIndex_Value=0x2; + + pGeneric_LevelParam[0]= 0xff; /* Level parameter byte 0 : The target value of the Generic Level state */ + pGeneric_LevelParam[1]= 0x7f; /* Level parameter byte 1 : The target value of the Generic Level state */ + + pGeneric_DeltaLevelParam[0]= 0x10; /* Delta Level parameter byte 0 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[1]= 0x27; /* Delta Level parameter byte 1 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[2]= 0x00; /* Delta Level parameter byte 2 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[3]= 0x00; /* Delta Level parameter byte 3 : The Delta change of the Generic Level state */ + + pGeneric_MoveLevelParam[0]= 0xff; /*Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state */ + pGeneric_MoveLevelParam[1]= 0x7f; /*Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state */ + + pGeneric_DefaultTransitionTimeParam[0]=0x10; /*Transition time parameter byte 0 : The value of the Generic Default Transition Time state */ + + pGeneric_PowerOnOffParam[0]=0x2; /*OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state. */ + + pLightnessParam[0] = 0xff; /*Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state */ + pLightnessParam[1] = 0xff; /*Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state */ + + pLightnessRangeParam[0] = 0x00; /*Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[1] = 0x00; /*Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[2] = 0xff; /*Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state */ + pLightnessRangeParam[3] = 0xff; /*Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state */ + + pLightCtlParam[0] = 0xff; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state */ + pLightCtlParam[1] = 0xff; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state */ + pLightCtlParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlParam[3] = 0x4e; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlParam[4] = 0xff; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlParam[5] = 0x7f; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureParam[0] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[1] = 0x4e; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[2] = 0xff; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlTemperatureParam[3] = 0x7f; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureRangeParam[0] = 0x19; /*Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[1] = 0x4e; /*Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[2] = 0x20; /*Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[3] = 0x4e; /*Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + + pLightCtlDefaultParam[0] = 0xff; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[1] = 0xff; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state*/ + pLightCtlDefaultParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[3] = 0x4e; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state*/ + pLightCtlDefaultParam[4] = 0xff; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state*/ + pLightCtlDefaultParam[5] = 0x7f; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state*/ + /** Green color **/ + pLightHslParam[0] = 0xc6; /*HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state*/ + pLightHslParam[1] = 0x46; /*HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state*/ + pLightHslParam[2] = 0x19; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslParam[3] = 0x51; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + pLightHslParam[4] = 0xd7; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslParam[5] = 0xed; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + pLightHslRangeParam[0] = 0x00; /*HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[1] = 0xf0; /*HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[2] = 0xff; /*HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[3] = 0xff; /*HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[4] = 0x00; /*HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[5] = 0xe0; /*HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[6] = 0xff; /*HSL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[7] = 0xef; /*HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + + pLightHslHueParam[0] = 0xff; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state*/ + pLightHslHueParam[1] = 0xff; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state*/ + + pLightHslSaturationParam[0] = 0xff; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslSaturationParam[1] = 0xff; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + /*LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B*/ + pLightLCPropertyParam[0]= 0x2B; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[1]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[2]= 0x01; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[3]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[4]= 0x10; /* Property ID byte 2 : Property ID identifying a Light LC Property.*/ + break; + + case 2: + ButtonIndex_Value=0x0; + + pGeneric_LevelParam[0]= 0x00; /* Level parameter byte 0 : The target value of the Generic Level state */ + pGeneric_LevelParam[1]= 0x00; /* Level parameter byte 1 : The target value of the Generic Level state */ + + pGeneric_DeltaLevelParam[0]= 0x00; /* Delta Level parameter byte 0 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[1]= 0x00; /* Delta Level parameter byte 1 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[2]= 0x00; /* Delta Level parameter byte 2 : The Delta change of the Generic Level state */ + pGeneric_DeltaLevelParam[3]= 0x00; /* Delta Level parameter byte 3 : The Delta change of the Generic Level state */ + + pGeneric_MoveLevelParam[0]= 0x00; /*Move Delta Level parameter byte 0 : The Delta Level step to calculate Move speed for the Generic Level state */ + pGeneric_MoveLevelParam[1]= 0x00; /*Move Delta Level parameter byte 1 : The Delta Level step to calculate Move speed for the Generic Level state */ + + pGeneric_DefaultTransitionTimeParam[0]=0x00; /*Transition time parameter byte 0 : The value of the Generic Default Transition Time state */ + + pGeneric_PowerOnOffParam[0]=0x0; /*OnPowerUp parameter byte 0 : The value of the Generic OnPowerUp state. */ + + pLightnessParam[0] = 0x00; /*Lightness parameter byte 0 : The target value of the Light Lightness Actual/Linear/Default state */ + pLightnessParam[1] = 0x00; /*Lightness parameter byte 1 : The target value of the Light Lightness Actual/Linear/Default state */ + + pLightnessRangeParam[0] = 0x00; /*Lightness Range Min parameter byte 0 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[1] = 0x00; /*Lightness Range Min parameter byte 1 : The value of the Lightness Range Min field of the Light Lightness Range state */ + pLightnessRangeParam[2] = 0x00; /*Lightness Range Max parameter byte 0 : The value of the Lightness Range Max field of the Light Lightness Range state */ + pLightnessRangeParam[3] = 0x10; /*Lightness Range Max parameter byte 1 : The value of the Lightness Range Max field of the Light Lightness Range state */ + + pLightCtlParam[0] = 0x00; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness state */ + pLightCtlParam[1] = 0x00; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness state */ + pLightCtlParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlParam[4] = 0x00; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlParam[5] = 0x00; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureParam[0] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[1] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature state */ + pLightCtlTemperatureParam[2] = 0x00; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV state */ + pLightCtlTemperatureParam[3] = 0x00; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV state */ + + pLightCtlTemperatureRangeParam[0] = 0x20; /*Temperature Range Min parameter byte 0 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[1] = 0x03; /*Temperature Range Min parameter byte 1 : The value of the Temperature Range Min field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[2] = 0x21; /*Temperature Range Max parameter byte 0 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + pLightCtlTemperatureRangeParam[3] = 0x03; /*Temperature Range Max parameter byte 1 : The value of the Temperature Range Max field of the Light CTL Temperature Range state */ + + pLightCtlDefaultParam[0] = 0x00; /*CTL Lightness parameter byte 0 : The target value of the Light CTL Lightness Default state */ + pLightCtlDefaultParam[1] = 0x00; /*CTL Lightness parameter byte 1 : The target value of the Light CTL Lightness Default state */ + pLightCtlDefaultParam[2] = 0x20; /*CTL Temperature parameter byte 0 : The target value of the Light CTL Temperature Default state */ + pLightCtlDefaultParam[3] = 0x03; /*CTL Temperature parameter byte 1 : The target value of the Light CTL Temperature Default state */ + pLightCtlDefaultParam[4] = 0x00; /*CTL Delta UV parameter byte 0 : The target value of the Light CTL Delta UV Default state */ + pLightCtlDefaultParam[5] = 0x00; /*CTL Delta UV parameter byte 1 : The target value of the Light CTL Delta UV Default state */ + + pLightHslParam[0] = 0x00; /*HSL Lightness parameter byte 0 : The target value of the Light HSL Lightness state */ + pLightHslParam[1] = 0x00; /*HSL Lightness parameter byte 1 : The target value of the Light HSL Lightness state */ + pLightHslParam[2] = 0x00; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state */ + pLightHslParam[3] = 0x00; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state */ + pLightHslParam[4] = 0x00; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state */ + pLightHslParam[5] = 0x00; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state */ + + pLightHslRangeParam[0] = 0x00; /*HSL Hue Range Min parameter byte 0 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[1] = 0x00; /*HSL Hue Range Min parameter byte 1 : The value of the Hue Range Min field of the Light HSL Hue Range state*/ + pLightHslRangeParam[2] = 0x00; /*HSL Hue Range Max parameter byte 0 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[3] = 0x10; /*HSL Hue Range Max parameter byte 1 : The value of the Hue Range Max field of the Light HSL Hue Range state*/ + pLightHslRangeParam[4] = 0x00; /*HSL Saturation Min parameter byte 0 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[5] = 0x00; /*HSL Saturation Min parameter byte 1 : The value of the Saturation Range Min field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[6] = 0x00; /*SL Saturation Max parameter byte 0 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + pLightHslRangeParam[7] = 0x20; /*HSL Saturation Max parameter byte 1 : The value of the Saturation Range Max field of the Light HSL Saturation Range state*/ + + pLightHslHueParam[0] = 0x00; /*HSL Hue parameter byte 0 : The target value of the Light HSL Hue state */ + pLightHslHueParam[1] = 0x00; /*HSL Hue parameter byte 1 : The target value of the Light HSL Hue state */ + + pLightHslSaturationParam[0] = 0x00; /*HSL Saturation parameter byte 0 : The target value of the Light HSL Saturation state*/ + pLightHslSaturationParam[1] = 0x00; /*HSL Saturation parameter byte 1 : The target value of the Light HSL Saturation state*/ + + /*LIGHT_CONTROL_AMBIENT_LUXLEVEL_ON_PID : 0x002B */ + pLightLCPropertyParam[0]= 0x2B; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[1]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[2]= 0x00; /* Property ID byte 0 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[3]= 0x00; /* Property ID byte 1 : Property ID identifying a Light LC Property.*/ + pLightLCPropertyParam[4]= 0x00; /* Property ID byte 2 : Property ID identifying a Light LC Property.*/ + break; + + default: + break; + } + + +#ifdef GENERIC_CLIENT_MODEL_PUBLISH + /** GENERIC ONOFF **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF SET ACK ------------- \r\n"); + Appli_GenericClient_API(0, GENERIC_ON_OFF_SET_ACK, pGeneric_OnOffParam); + */ + TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API ONOFF SET UNACK ------------- \r\n"); + Appli_GenericClient_API(0, GENERIC_ON_OFF_SET_UNACK, pGeneric_OnOffParam); + + /** GENERIC LEVEL **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_LEVEL_SET_ACK, pGeneric_LevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API LEVEL SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_LEVEL_SET_UNACK, pGeneric_LevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DELTA LEVEL SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DELTA_SET, pGeneric_DeltaLevelParam);*/ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DELTA LEVEL SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DELTA_SET_UNACK, pGeneric_DeltaLevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API MOVE DELTA LEVEL SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_MOVE_SET, pGeneric_MoveLevelParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API MOVE DELTA LEVEL SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_MOVE_SET_UNACK, pGeneric_MoveLevelParam); */ + + /** GENERIC POWER ONOFF **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_SET, pGeneric_PowerOnOffParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API POWER ON OFF SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_POWER_ON_OFF_SET_UNACK, pGeneric_PowerOnOffParam); */ + + /** GENERIC TRANSITION TIME **/ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME SET ACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_SET, pGeneric_DefaultTransitionTimeParam); */ +/* */ +/* TRACE_M(TF_GENERIC_CLIENT_M, "----------- Generic API DEFAULT TRANSITION TIME SET UNACK ------------- \r\n");*/ +/* Appli_GenericClient_API(0, GENERIC_DEFAULT_TRANSITION_TIME_SET_UNACK, pGeneric_DefaultTransitionTimeParam); */ +#endif + +#ifdef LIGHT_CLIENT_MODEL_PUBLISH + /** LIGHT LIGHTNESS **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_SET, pLightnessParam); */ +/* */ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_SET_UNACK, pLightnessParam); */ + + /** LIGHT LIGHTNESS LINEAR **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET LINEAR ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_SET, pLightnessParam); */ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS SET LINEAR UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_LINEAR_SET_UNACK, pLightnessParam); */ + + /** LIGHT LIGHTNESS DEFAULT **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_SET, pLightnessParam); */ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS DEFAULT SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_DEFAULT_SET_UNACK, pLightnessParam); */ + + /** LIGHT LIGHTNESS RANGE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_SET, pLightnessRangeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LIGHTNESS RANGE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LIGHTNESS_RANGE_SET_UNACK, pLightnessRangeParam);*/ + + /** LIGHT LIGHTNESS CTL **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_SET, pLightCtlParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_SET_UNACK, pLightCtlParam);*/ + + /** LIGHT LIGHTNESS CTL TEMPERATURE**/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_SET, pLightCtlTemperatureParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_SET_UNACK, pLightCtlTemperatureParam);*/ + + /** LIGHT LIGHTNESS CTL TEMPERATURE RANGE**/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_SET, pLightCtlTemperatureRangeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL TEMPERATURE RANGE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_TEMPERATURE_RANGE_SET_UNACK, pLightCtlTemperatureRangeParam);*/ + + /** LIGHT LIGHTNESS CTL DEFAULT**/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_SET, pLightCtlDefaultParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT CTL DEFAULT SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_CTL_DEFAULT_SET_UNACK, pLightCtlDefaultParam);*/ + + /** LIGHT LIGHTNESS HSL **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SET, pLightHslParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SET_UNACK, pLightHslParam);*/ + + /** LIGHT LIGHTNESS HSL DEFAULT **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_SET, pLightHslParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL DEFAULT SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_DEFAULT_SET_UNACK, pLightHslParam);*/ + + /** LIGHT LIGHTNESS HSL RANGE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_RANGE_SET, pLightHslRangeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL RANGE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_RANGE_SET_UNACK, pLightHslRangeParam);*/ + + /** LIGHT LIGHTNESS HSL HUE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_HUE_SET, pLightHslHueParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL HUE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_HUE_SET_UNACK, pLightHslHueParam);*/ + + /** LIGHT LIGHTNESS HSL SATURATION **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SATURATION_SET, pLightHslSaturationParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT HSL SATURATION SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_HSL_SATURATION_SET_UNACK, pLightHslSaturationParam);*/ + + /** LIGHT LC MODE **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_MODE_SET, pLightLCModeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC MODE SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_MODE_SET_UNACK, pLightLCModeParam);*/ + + /** LIGHT LC OM **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_OM_SET, pLightLCOccupancyModeParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC OM SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_OM_SET_UNACK, pLightLCOccupancyModeParam);*/ + + /** LIGHT LC ONOFF **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ONOFF SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_ON_OFF_SET, pLightLCOnOffParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC ONOFF SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_ON_OFF_SET_UNACK, pLightLCOnOffParam);*/ + + /** LIGHT LC PROPERTY **/ +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY SET ACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_PROPERTY_SET, pLightLCPropertyParam);*/ + +/* TRACE_M(TF_LIGHT_CLIENT_M, "----------- API LIGHT LC PROPERTY SET UNACK ------------- \r\n");*/ +/* Appli_LightClient_API(0, LIGHT_LC_PROPERTY_SET_UNACK, pLightLCPropertyParam);*/ +#endif +#endif + + #ifdef ENABLE_SENSOR_MODEL_CLIENT + /** SENSOR CADENCE**/ + /* + PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + */ + pSensorsCadenceParam[0]= 0x4F; /* Property ID byte 0 : Property ID for the sensor.*/ + pSensorsCadenceParam[1]= 0x00; /* Property ID byte 1 : Property ID for the sensor.*/ + + pSensorsCadenceParam[2]= 0x81; /* Fast Cadence Period Divisor bits 0-7: Divisor for the Publish Period.*/ + /* Status Trigger Type bit 8 : Defines the unit and format of the Status Trigger Delta fields.*/ + pSensorsCadenceParam[3]= 0x11; /* Status Trigger Delta Down byte 0 : Delta down value that triggers a status message.*/ + pSensorsCadenceParam[4]= 0x11; /* Status Trigger Delta Down byte 1 : Delta down value that triggers a status message.*/ + + pSensorsCadenceParam[5]= 0x22; /* Status Trigger Delta Up byte 0 : Delta down value that triggers a status message.*/ + pSensorsCadenceParam[6]= 0x22; /* Status Trigger Delta Up byte 1 : Delta down value that triggers a status message.*/ + + pSensorsCadenceParam[7]= 0x10; /* Status Min Interval byte 0 : Minimum interval between two consecutive Status messages. */ + + pSensorsCadenceParam[8]= 0x33; /* Fast Cadence Low byte 0 : Low value for the fast cadence range.*/ + + pSensorsCadenceParam[9]= 0x44; /* Fast Cadence High byte 0 : High value for the fast cadence range.*/ + +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE SET ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_CADENCE_SET, pSensorsCadenceParam);*/ + +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR CADENCE SET UNACK ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_CADENCE_SET_UNACK, pSensorsCadenceParam);*/ + + /** SENSOR SETTING**/ + /* + PRESENT_AMBIENT_TEMPERATURE_PID : 0x004F + Second Property PID : 0x00AD + */ + pSensorsSettingParam[0]= 0x4F; /* Property ID byte 0 : Property ID for the sensor*/ + pSensorsSettingParam[1]= 0x00; /* Property ID byte 1 : Property ID for the sensor*/ + pSensorsSettingParam[2]= 0xAD; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + pSensorsSettingParam[3]= 0x00; /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + + switch (ButtonIndex_Value){ + case 0: + pSensorsSettingParam[4]= 0x10; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + /*pSensorsSettingParam[5]= 0x10;*/ /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + break; + case 1: + pSensorsSettingParam[4]= 0x20; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + /*pSensorsSettingParam[5]= 0x20;*/ /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + break; + case 2: + pSensorsSettingParam[4]= 0x0F; /* Sensor Setting Property ID byte 0 : Property ID for the sensor setting*/ + /*pSensorsSettingParam[5]= 0x00;*/ /* Sensor Setting Property ID byte 1 : Property ID for the sensor setting*/ + break; + default: + break; + } +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING SET ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_SETTING_SET, pSensorsSettingParam);*/ + +/* TRACE_M(TF_SENSOR_CLIENT_M, "----------- API SENSOR SETTING SET UNACK ------------- \r\n");*/ +/* Appli_SensorsClient_API(0, SENSOR_SETTING_SET_UNACK, pSensorsSettingParam);*/ +#endif /* ENABLE_SENSOR_MODEL_CLIENT */ + + +/* if CLIENT and SERVER => Publish is already done in CLIENT */ +#ifdef GENERIC_SERVER_MODEL_PUBLISH +#ifndef GENERIC_CLIENT_MODEL_PUBLISH + Generic_Publish(BLEMesh_GetAddress()); +#endif +#endif +} + + +/** +* @brief Get the Element Number for selected Model +* @param dst_peer : Destination Address received +* @retval MOBLEUINT8 : elementNumber +*/ +MOBLEUINT8 BLEMesh_ModelsGetElementNumber(MOBLE_ADDRESS dst_peer) +{ + + MOBLE_ADDRESS nodeAddress; + MOBLEUINT8 elementNumber; + + nodeAddress = BLEMesh_GetAddress(); + elementNumber = ((dst_peer - nodeAddress)+1); + + return elementNumber; +} + +/** +* @brief Get the Element Index for selected Model +* @param dst_peer : Destination Address received +* @retval MOBLEUINT8 : elementIndex +*/ +MOBLEUINT8 BLEMesh_ModelsGetElementIndex(MOBLE_ADDRESS dst_peer) +{ + + MOBLE_ADDRESS nodeAddress; + MOBLEUINT8 elementIndex; + + nodeAddress = BLEMesh_GetAddress(); + elementIndex =(dst_peer - nodeAddress); + + return elementIndex; +} + + +/** +* @brief Schedule a packet to be sent with randomized send timestamp +* If a que is empty, random timestamp is calculated +* Subsequent packets are sent in sequence +* @param *pmsgParam Pointer to structure of message header for parameters: +* elementIndex, src, dst addresses, TTL, RSSI, NetKey & AppKey Offset +* @param status: Command status +* @param data: Data buffer. +* @param length: Length of data in bytes. +* @retval None +*/ +void BLEMesh_ModelsDelayPacket(MODEL_MessageHeader_t *pmsgParams, + MOBLEUINT8 command, + MOBLEUINT8 const * data, + MOBLEUINT32 length) +{ + MOBLEUINT8 random_time[8]; + + if (Appli_PendingPackets.packet_count == 0) + { + Appli_PendingPackets.packet_count = 1; + hci_le_rand(random_time); + Appli_PendingPackets.send_time = Clock_Time() + + DEFAULT_DELAY_PACKET_FROM + + (random_time[0] + random_time[1]*256)\ + %DEFAULT_DELAY_PACKET_RANDOM_TIME; + Appli_PendingPackets.head = Appli_PendingPackets.packet; + Appli_PendingPackets.head_index = 0; + TRACE_M(TF_MISC, "Randomized time: %ld\n\r", Appli_PendingPackets.send_time - Clock_Time()); + } + else + { + Appli_PendingPackets.packet_count += 1; + Appli_PendingPackets.packet_count = (Appli_PendingPackets.packet_count)%\ + (MAX_PENDING_PACKETS_QUE_SIZE+1); + + if (Appli_PendingPackets.head != (Appli_PendingPackets.packet + \ + MAX_PENDING_PACKETS_QUE_SIZE - 1)) + { + Appli_PendingPackets.head = Appli_PendingPackets.head +1; + Appli_PendingPackets.head_index = Appli_PendingPackets.head_index+1; + } + else + { + Appli_PendingPackets.head = Appli_PendingPackets.packet; + Appli_PendingPackets.head_index = 0; + } + } + + Appli_PendingPackets.head->peer = pmsgParams->peer_addr; + Appli_PendingPackets.head->dst = pmsgParams->dst_peer; + Appli_PendingPackets.head->elementIndex = pmsgParams->elementIndex; + Appli_PendingPackets.head->appKeyOffset = pmsgParams->rcvdAppKeyOffset; + Appli_PendingPackets.head->netKeyOffset = pmsgParams->rcvdNetKeyOffset; + Appli_PendingPackets.head->command = command; + Appli_PendingPackets.head->length = length; + for (MOBLEUINT8 count=0; countdata[count] = data[count]; +} + + +/** +* @brief If send timestamp is reached and que is not empty, send all packets +* @param None +* @retval None +*/ +void BLEMesh_ModelsSendDelayedPacket(void) +{ + APPLI_SEND_RESPONSE_MODULE* ptr; + MODEL_MessageHeader_t msgParam; + MOBLEUINT8 temp_index; + + if ((Appli_PendingPackets.packet_count != 0) && + (Appli_PendingPackets.send_time <= Clock_Time())) + { + for (MOBLEUINT8 count=Appli_PendingPackets.packet_count; count!=0; count--) + { + TRACE_M(TF_MISC, "Sending randomized packets. Packet count: %d \n\r",\ + Appli_PendingPackets.packet_count - count + 1); + temp_index = ((Appli_PendingPackets.head_index+MAX_PENDING_PACKETS_QUE_SIZE+1)\ + -count)%MAX_PENDING_PACKETS_QUE_SIZE; + ptr = Appli_PendingPackets.packet + temp_index; + + /* Initialize the messageParam*/ + msgParam.dst_peer = ptr->dst; + msgParam.peer_addr = ptr->peer; + msgParam.elementIndex = 0; + msgParam.rcvdAppKeyOffset = 0; + msgParam.rcvdNetKeyOffset = 0; + msgParam.rssi = 0; + msgParam.ttl = 0; + + VendorModel_SendResponse(VENDOR_STMICRO_CID, + &msgParam, + ptr->command, + ptr->data, + ptr->length); + } + + Appli_PendingPackets.packet_count = 0; + } +} + +/** \brief Set remote publication for the given Model ID & node Address +* User is responsible for serializing data into \a data buffer. Vendor_WriteLocalDataCb +* callback will be called on the remote device. +* @param modelId ID of the model. +* @param elementIdx element index +* @param command vendor model commands +* @param data Data buffer. +* @param length Length of data in bytes. +* @param response If 'MOBLE_TRUE', used to get the response. If 'MOBLE_FALSE', no response +* @return MOBLE_RESULT_SUCCESS on success. +*/ +MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 elementIdx, + MOBLEUINT16 msg_opcode, MOBLEUINT8 const *msg_buff, + MOBLEUINT32 length, MOBLEBOOL ack_flag, + MOBLEUINT8 isVendor) +{ + MOBLE_ADDRESS srcAddress; + + srcAddress = BLEMesh_GetAddress(); + srcAddress += elementIdx; /* Get the Address to send in the message */ + + return BLEMesh_SetRemotePublication(modelId, + srcAddress , + msg_opcode , + msg_buff, length, + ack_flag, + MOBLE_FALSE); +} + +/** +* @brief Convert ASCII value into Character +* @param tempValue : 8bit value for conversion +* @retval MOBLEUINT8 +*/ +MOBLEUINT8 BLEMesh_ModelsASCII_To_Char(MOBLEUINT8 tempValue) +{ + tempValue = tempValue - 0x30; + return tempValue; +} + +__weak void Test_Process(void) +{ +} +/** +* @} +*/ + +/** +* @} +*/ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h new file mode 100644 index 000000000..e20f54d8b --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h @@ -0,0 +1,51 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file models_if.h + * @author MCD Application Team + * @brief Mesh Modes interface file header + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MODELS_H +#define __MODELS_H + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" + + +/* Exported macro ------------------------------------------------------------*/ +/* Exported variables ------------------------------------------------------- */ + +/* Exported Functions Prototypes ---------------------------------------------*/ + +void BLEMesh_ModelsInit(void); +void BLEMesh_ModelsProcess(void); +void BLEMesh_ModelsCommand(void); + +MOBLEUINT8 BLEMesh_ModelsGetElementNumber(MOBLE_ADDRESS dst_peer); +MOBLEUINT8 BLEMesh_ModelsGetElementIndex(MOBLE_ADDRESS dst_peer); +void BLEMesh_ModelsDelayPacket(MODEL_MessageHeader_t *pmsgParams, MOBLEUINT8 command, + MOBLEUINT8 const * data, MOBLEUINT32 length); +void BLEMesh_ModelsSendDelayedPacket(void); +MOBLEUINT8 BLEMesh_ModelsASCII_To_Char(MOBLEUINT8 tempValue); +MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 elementIdx, + MOBLEUINT16 msg_opcode, MOBLEUINT8 const *msg_buff, + MOBLEUINT32 length, MOBLEBOOL ack_flag, + MOBLEUINT8 isVendor); + +#endif /* __MODELS_H */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c new file mode 100644 index 000000000..a2b6b3570 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c @@ -0,0 +1,443 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file pal_nvm.c + * @author MCD Application Team + * @brief Flash management for the Controller + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "types.h" +#include "pal_nvm.h" +#include "pal_if.h" +#include + +#include "ble.h" +#include "shci.h" +#include "mesh_cfg_usr.h" + +#include "hw_flash.h" + +/* Private define ------------------------------------------------------------*/ +#define FLASH_SECTOR_SIZE 0x1000 + +/* Private variables ---------------------------------------------------------*/ + +/* Private functions ---------------------------------------------------------*/ +/** + * @brief Gets the page of a given address + * @param Addr: Address of the FLASH Memory + * @retval The page of a given address + */ +static MOBLEUINT32 GetPage(MOBLEUINT32 Addr) +{ + MOBLEUINT32 page = 0; + + if (Addr < (FLASH_BASE + FLASH_BANK_SIZE)) + { + /* Bank 1 */ + page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE; + } + else + { + /* Bank 2 */ + page = (Addr - (FLASH_BASE + FLASH_BANK_SIZE)) / FLASH_PAGE_SIZE; + } + + return page; +} + +#if 0 +/** +* @brief PalNvmErase +* @param None +* @retval Result +*/ +MOBLE_RESULT PalNvmErase(MOBLEUINT32 address, + MOBLEUINT32 offset) +{ + HAL_StatusTypeDef status = HAL_OK; + uint32_t pageError = 0; + +// printf("PalNvmErase >>>\r\n"); + + FLASH_EraseInitTypeDef erase; + erase.TypeErase = FLASH_TYPEERASE_PAGES; + erase.Page = GetPage(address + offset); /* 126 or 127 */; + erase.NbPages = FLASH_SECTOR_SIZE >> 12; + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_FLASH_SEMID ) ); + HAL_FLASH_Unlock(); + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | + FLASH_FLAG_WRPERR | + FLASH_FLAG_OPTVERR); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_ON); + + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + status = HAL_FLASHEx_Erase(&erase, &pageError); + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_OFF); + + HAL_FLASH_Lock(); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_FLASH_SEMID, 0 ); + +// printf("PalNvmErase <<<\r\n"); + + return status == HAL_OK ? MOBLE_RESULT_SUCCESS : MOBLE_RESULT_FAIL; +} +#endif + +/** +* @brief returns NVM write protect status +* @param None +* @retval TRUE if flash is write protected +*/ +MOBLEBOOL PalNvmIsWriteProtected(void) +{ + /* All flash is writable */ + return MOBLE_FALSE; +} + +/** +* @brief Read NVM +* @param address: read start address of nvm +* @param offset: offset read start address of nvm +* @param buf: copy of read content +* @param size: size of memory to be read +* @param backup: If read from backup memory +* @retval Result of read operation +*/ +MOBLE_RESULT PalNvmRead(MOBLEUINT32 address, + MOBLEUINT32 offset, + void *buf, + MOBLEUINT32 size, + MOBLEBOOL backup) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + +// printf("MoblePalNvmRead >>>\r\n"); + + if (offset > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + memcpy(buf, (void *)(address + offset), size); + } + +// printf("MoblePalNvmRead <<<\r\n"); + return result; +} + +/** +* @brief Compare with NVM +* @param offset: start address of nvm to compare +* @param offset: offset start address of nvm +* @param buf: copy of content +* @param size: size of memory to be compared +* @param comparison: outcome of comparison +* @retval Result +*/ +MOBLE_RESULT PalNvmCompare(MOBLEUINT32 address, + MOBLEUINT32 offset, + void const *buf, + MOBLEUINT32 size, + MOBLE_NVM_COMPARE* comparison) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + MOBLEUINT32 i; + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM +// printf("MoblePalNvmCompare >>>\r\n"); + + if ((comparison == NULL) || (buf == NULL)) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + *comparison = MOBLE_NVM_COMPARE_EQUAL; + size >>= 2; + + MOBLEUINT32 * src = (MOBLEUINT32*)buf; + MOBLEUINT32 * dst = (MOBLEUINT32*)(address + offset); + + i = 0; + do + { + if ((src[i] != dst[i]) && (*comparison == MOBLE_NVM_COMPARE_EQUAL)) + { + *comparison = MOBLE_NVM_COMPARE_NOT_EQUAL; + } + i++; + } while((*comparison != MOBLE_NVM_COMPARE_NOT_EQUAL) && (i < size)); + } + +// printf("MoblePalNvmCompare <<<\r\n"); +#else + *comparison = MOBLE_NVM_COMPARE_EQUAL; +#endif + return result; +} + +/** +* @brief Erase NVM +* @param None +* @retval Result +*/ +MOBLE_RESULT PalNvmErase(MOBLEUINT32 address, + MOBLEUINT32 offset) +{ + HAL_StatusTypeDef status = HAL_OK; + + uint32_t pageError = 0; + +// printf("MoblePalNvmErase >>>\r\n"); + + FLASH_EraseInitTypeDef erase; + erase.TypeErase = FLASH_TYPEERASE_PAGES; + erase.Page = GetPage(address + offset); /* 126 or 127 */; + erase.NbPages = FLASH_SECTOR_SIZE >> 12; + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_FLASH_SEMID ) ); + HAL_FLASH_Unlock(); + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | + FLASH_FLAG_WRPERR | + FLASH_FLAG_OPTVERR); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_ON); + + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + status = HAL_FLASHEx_Erase(&erase, &pageError); + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + + SHCI_C2_FLASH_EraseActivity( ERASE_ACTIVITY_OFF); + + HAL_FLASH_Lock(); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_FLASH_SEMID, 0 ); + +// printf("MoblePalNvmErase <<<\r\n"); + + return status == HAL_OK ? MOBLE_RESULT_SUCCESS : MOBLE_RESULT_FAIL; +} + +/** +* @brief Write to NVM +* @param offset: wrt start address of nvm +* @param offset: offset wrt start address of nvm +* @param buf: copy of write content +* @param size: size of memory to be written +* @retval Result +*/ +MOBLE_RESULT PalNvmWrite(MOBLEUINT32 address, + MOBLEUINT32 offset, + void const *buf, + MOBLEUINT32 size) +{ + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + +#ifdef ENABLE_SAVE_MODEL_STATE_NVM + + // printf("MoblePalNvmWrite >>>\r\n"); + + if (offset > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size == 0) + { + result = MOBLE_RESULT_FALSE; + } + else if (offset + size > NVM_SIZE) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (offset & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else if (size & 3) + { + result = MOBLE_RESULT_INVALIDARG; + } + else + { + MOBLEUINT32 remain = 0; + MOBLEUINT32 nb_dword = 0; + + nb_dword = (size >> 3); + remain = size - ((nb_dword) << 3); + if(remain > 0) + nb_dword += 1; + + uint64_t* src = (uint64_t*)buf; + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_FLASH_SEMID ) ); + HAL_FLASH_Unlock(); + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | + FLASH_FLAG_WRPERR | + FLASH_FLAG_OPTVERR | + FLASH_FLAG_PGSERR | + FLASH_FLAG_SIZERR | + FLASH_FLAG_PGAERR); + + for (size_t i = 0; i < nb_dword/*size*/; i++) + { + do + { + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, + address + offset + (i <<3), + src[i]); + while(LL_FLASH_IsActiveFlag_OperationSuspended()); + } while(*((uint64_t*)(address + offset + (i <<3))) != src[i]); + } + + HAL_FLASH_Lock(); + LL_HSEM_ReleaseLock( HSEM, CFG_HW_FLASH_SEMID, 0 ); + } +// printf("MoblePalNvmWrite <<<\r\n"); +#endif + + return result; +} + +#if 0 +/** +* @brief Backup process +* @param None +* @retval Result +*/ +static MOBLE_RESULT PalNvmBackupProcess(void) +{ + MOBLEUINT32 buff[4*N_BYTES_WORD]; + static MOBLEUINT8 backup_pages_to_be_erased = 0; + MOBLE_RESULT result = MOBLE_RESULT_SUCCESS; + + if (backup_pages_to_be_erased == 0) + { + backup_pages_to_be_erased = 1; + } + + if(backup_pages_to_be_erased != 0) + { +#if 0 + BLEMesh_StopAdvScan(); + ATOMIC_SECTION_BEGIN(); + if(BluenrgMesh_IsFlashReadyToErase()) + { + FLASH_ErasePage((uint16_t)((BNRGM_NVM_BACKUP_BASE - + RESET_MANAGER_FLASH_BASE_ADDRESS) / PAGE_SIZE + + BNRGM_NVM_BACKUP_SIZE/PAGE_SIZE - + backup_pages_to_be_erased)); + + if (FLASH_GetFlagStatus(Flash_CMDERR) == SET) + { + result = MOBLE_RESULT_FAIL; + } + else + { + backup_pages_to_be_erased--; + } + } + else + { + /* do nothing */ + } + ATOMIC_SECTION_END(); +#else + result = PalNvmErase(NVM_BASE, FLASH_SECTOR_SIZE); + if(result == MOBLE_RESULT_SUCCESS) + backup_pages_to_be_erased = 0; +#endif + } + + if (result == MOBLE_RESULT_SUCCESS && backup_pages_to_be_erased == 0) + { +#if 0 + BLEMesh_StopAdvScan(); + ATOMIC_SECTION_BEGIN(); + if(BluenrgMesh_IsFlashReadyToErase()) + { + for (size_t i = 0; i < BNRGM_NVM_BACKUP_SIZE && FLASH_GetFlagStatus(Flash_CMDERR) == RESET; ) + { + memcpy((MOBLEUINT8*)buff, (void *)(BNRGM_NVM_BASE + i), 4*N_BYTES_WORD); + FLASH_ProgramWordBurst(BNRGM_NVM_BACKUP_BASE + i, (uint32_t*)buff); + i += 4*N_BYTES_WORD; + } + + if (FLASH_GetFlagStatus(Flash_CMDERR) == SET) + { + result = MOBLE_RESULT_FAIL; + } + else + { + PalNvmReqs.backup_req = MOBLE_FALSE; + } + } + else + { + /* do nothing */ + } + ATOMIC_SECTION_END(); +#else +#endif + } + return result; +} +#endif + +/** +* @brief NVM process +* @param None +* @retval Result +*/ +MOBLE_RESULT PalNvmProcess(void) +{ + /* do nothing */ + return MOBLE_RESULT_SUCCESS; +} + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h new file mode 100644 index 000000000..2a6370e14 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h @@ -0,0 +1,698 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** +* @file sensor_cfg_usr.h + * @author MCD Application Team +* @brief sensor server initialization parameters + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __SENSOR_USR_CFG_H +#define __SENSOR_USR_CFG_H + +/** +* Maximum count of settings that can be supported by a sensor +* E.g., 5 sensors +* 1st sensor has 2 settings +* 2nd sensor has 3 settings +* 3rd sensor has 2 settings +* 4th sensor has 1 setting +* 5th sensor has 2 settings +* This value is max(2, 3, 2, 1, 2) = 3 +* value is >=1 +*/ +#define SENSOR_MAX_SETTINGS_COUNT 2 + +/** +* Maximum count of series column that is supported by a sensor +* E.g., 2 sensors supporting series column +* One sensor supports 2 columns while other sensor supports 20 columns +* This value is max(2, 20) = 20 +* value is >=1 +*/ +#define SENSOR_MAX_SERIES_COUNT 1 + +/** +* Total sensors count on all elements +* It is sum of sensors count on all elements +* Sensor init fails in case of mismatch with sensor server initialization parameters +*/ +#define TOTAL_SENSORS_COUNT 2 + +/** +* Sum of sensor settings on all sensors on all elements +* Sensor init fails in case of mismatch with sensor server initialization parameters +*/ +#define TOTAL_SENSOR_SETTINGS_COUNT 4 + +/** +* Sum of sensor series columns on all sensors on all elements +* Sensor init fails in case of mismatch with sensor server initialization parameters +*/ +#define TOTAL_SENSOR_SERIES_COLUMN_COUNT 0 + + +/** +* This structure contains sensor setting initialization parameters +*/ +typedef struct +{ + uint16_t settingPropertyId; + uint8_t settingAccess; + uint32_t settingRaw; +}sensor_settings_init_params_t; + + +/** +* This structure contains sensor series column initialization parameters +*/ +typedef struct +{ + uint32_t rawX; + uint32_t columnWidth; +}sensor_series_column_init_params_t; + + +/** +* This structure contains sensor initialization parameters +*/ +typedef struct +{ + uint8_t elementIdx; + uint16_t propertyId; + uint16_t positiveTolerance; + uint16_t negativeTolerance; + uint8_t samplingFunction; + uint8_t measurementPeriod; + uint8_t updateInterval; + uint8_t dataLength; + uint8_t cadenceState; + uint32_t valuesRange; + uint8_t settingsCount; + sensor_settings_init_params_t settings[SENSOR_MAX_SETTINGS_COUNT]; + uint16_t seriesCount; + sensor_series_column_init_params_t seriesColumn[SENSOR_MAX_SERIES_COUNT]; +}sensor_init_params_t; + + +/** +* This structure contains sensor server initialization parameters +*/ +typedef struct +{ + uint8_t sensorsCount; + sensor_init_params_t sensorInitParams[TOTAL_SENSORS_COUNT]; +} sensor_server_init_params_t; + + +/** +* Below section represents initialization parameters of sensors supported +* Define sensors in ascending order of element index followed by ascending +* order of Property IDs else initialization of sensor structure would fail +* Single element can support one instance of sensor PID, there can't be multiple +* instances of same PID on same element +* For e.g. 10 sensors with PID (PID1 < PIDn ... < PID7) supported on 3 elements +* with element index (0, 1 and 2) in below fashion +* Element index 0 supports sensors corresponding to PID3, PID4, PID6 and PID7 +* Element index 1 supports sensors corresponding to PID2, PID4, PID5 and PID6 +* Element index 2 supports sensors corresponding to PID1, PID5 +* Corrector order of naming sensors (SENSORX) is +* Element index 0 -> SENSOR1(PID3), SENSOR2(PID4), SENSOR3(PID6) and SENSOR4(PID7) +* Element index 1 -> SENSOR5(PID2), SENSOR6(PID4), SENSOR7(PID5), and SENSOR8(PID6) +* Element index 2 -> SENSOR9(PID1), and SENSOR10(PID5) +*/ + +/* Sensor 1 initialization */ + +/** +* Element index for SENSOR1 +* varies from 0 to n-1 (n = number of elements) +*/ +#define SENSOR1_ELEMENT_IDX 0 + +/** +* Property ID of sensor, identifies device characteristics and other features +* Defined by Mesh Device Properties or a custom value +* 16 bit value +* 0x0000 - Prohibited +*/ +#define SENSOR1_PROPERTY_ID PRESENT_AMBIENT_TEMPERATURE_PID +#define SENSOR1_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR1_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR1_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR1_DATA_LENGTH 1 +#define SENSOR1_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR1_VALUES_RANGE 254 +#define SENSOR1_SETTINGS_COUNT 2 +#define SENSOR1_SETTING1_PROPERTY_ID 0x00BB +#define SENSOR1_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR1_SETTING1_RAW 0 +#define SENSOR1_SETTING2_PROPERTY_ID 0x00AD +#define SENSOR1_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR1_SETTING2_RAW 0 +#define SENSOR1_SERIES_COUNT 0 + +#define SENSOR1_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR1_SETTING1_PROPERTY_ID,\ + SENSOR1_SETTING1_ACCESS,\ + SENSOR1_SETTING1_RAW \ +} + +#define SENSOR1_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR1_SETTING2_PROPERTY_ID,\ + SENSOR1_SETTING2_ACCESS,\ + SENSOR1_SETTING2_RAW \ +} + +#define SENSOR1_INIT_PARAMS \ +{\ + SENSOR1_ELEMENT_IDX,\ + SENSOR1_PROPERTY_ID,\ + SENSOR1_POSITIVE_TOLERANCE,\ + SENSOR1_NEGATIVE_TOLERANCE,\ + SENSOR1_SAMPLING_FUNCTION,\ + SENSOR1_MEASUREMENT_PERIOD,\ + SENSOR1_UPDATE_INTERVAL,\ + SENSOR1_DATA_LENGTH,\ + SENSOR1_CADENCE_STATE,\ + SENSOR1_VALUES_RANGE,\ + SENSOR1_SETTINGS_COUNT,\ + {\ + SENSOR1_SETTINGS1_INIT_PARAMS,\ + SENSOR1_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR1_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + + +/* Sensor 2 initialization */ + +#define SENSOR2_ELEMENT_IDX 0 +#define SENSOR2_PROPERTY_ID PRESSURE_PID +#define SENSOR2_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR2_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR2_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR2_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR2_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR2_DATA_LENGTH 4 +#define SENSOR2_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR2_VALUES_RANGE 500 +#define SENSOR2_SETTINGS_COUNT 2 +#define SENSOR2_SETTING1_PROPERTY_ID 0x0AAA +#define SENSOR2_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR2_SETTING1_RAW 35666 +#define SENSOR2_SETTING2_PROPERTY_ID 0x0AAC +#define SENSOR2_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR2_SETTING2_RAW 33666 +#define SENSOR2_SERIES_COUNT 0 + +#define SENSOR2_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR2_SETTING1_PROPERTY_ID,\ + SENSOR2_SETTING1_ACCESS,\ + SENSOR2_SETTING1_RAW\ +} + +#define SENSOR2_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR2_SETTING2_PROPERTY_ID,\ + SENSOR2_SETTING2_ACCESS,\ + SENSOR2_SETTING2_RAW\ +} + +#define SENSOR2_INIT_PARAMS \ +{\ + SENSOR2_ELEMENT_IDX,\ + SENSOR2_PROPERTY_ID,\ + SENSOR2_POSITIVE_TOLERANCE,\ + SENSOR2_NEGATIVE_TOLERANCE,\ + SENSOR2_SAMPLING_FUNCTION,\ + SENSOR2_MEASUREMENT_PERIOD,\ + SENSOR2_UPDATE_INTERVAL,\ + SENSOR2_DATA_LENGTH,\ + SENSOR2_CADENCE_STATE,\ + SENSOR2_VALUES_RANGE,\ + SENSOR2_SETTINGS_COUNT,\ + {\ + SENSOR2_SETTINGS1_INIT_PARAMS,\ + SENSOR2_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR2_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +/** +* Combined defined of all sensors initialization parameters +*/ + +#define SENSOR_SERVER_INIT_PARAMS \ +{\ + TOTAL_SENSORS_COUNT,\ + {\ + SENSOR1_INIT_PARAMS,\ + SENSOR2_INIT_PARAMS,\ + }\ +} +#endif /* __SENSOR_USR_CFG_H */ + +/* + +Example for multiple sensors with series column support + +#define SENSOR_MAX_SETTINGS_COUNT 3 +#define SENSOR_MAX_SERIES_COUNT 20 +#define TOTAL_SENSORS_COUNT 5 +#define TOTAL_SENSOR_SETTINGS_COUNT 9 +#define TOTAL_SENSOR_SERIES_COLUMN_COUNT 22 + +#define SENSOR1_ELEMENT_IDX 0 +#define SENSOR1_PROPERTY_ID PEOPLE_COUNT_PID +#define SENSOR1_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR1_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR1_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR1_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR1_DATA_LENGTH 2 +#define SENSOR1_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR1_VALUES_RANGE 1000 +#define SENSOR1_SETTINGS_COUNT 3 +#define SENSOR1_SETTING1_PROPERTY_ID 0x000A +#define SENSOR1_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR1_SETTING1_RAW 234 +#define SENSOR1_SETTING2_PROPERTY_ID 0x000C +#define SENSOR1_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR1_SETTING2_RAW 246 +#define SENSOR1_SETTING3_PROPERTY_ID 0x0010 +#define SENSOR1_SETTING3_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR1_SETTING3_RAW 278 +#define SENSOR1_SERIES_COUNT 0 + +#define SENSOR1_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR1_SETTING1_PROPERTY_ID,\ + SENSOR1_SETTING1_ACCESS,\ + SENSOR1_SETTING1_RAW\ +} + +#define SENSOR1_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR1_SETTING2_PROPERTY_ID,\ + SENSOR1_SETTING2_ACCESS,\ + SENSOR1_SETTING2_RAW\ +} + +#define SENSOR1_SETTINGS3_INIT_PARAMS \ +{\ + SENSOR1_SETTING3_PROPERTY_ID,\ + SENSOR1_SETTING3_ACCESS,\ + SENSOR1_SETTING3_RAW\ +} + +#define SENSOR1_INIT_PARAMS \ +{\ + SENSOR1_ELEMENT_IDX,\ + SENSOR1_PROPERTY_ID,\ + SENSOR1_POSITIVE_TOLERANCE,\ + SENSOR1_NEGATIVE_TOLERANCE,\ + SENSOR1_SAMPLING_FUNCTION,\ + SENSOR1_MEASUREMENT_PERIOD,\ + SENSOR1_UPDATE_INTERVAL,\ + SENSOR1_DATA_LENGTH,\ + SENSOR1_CADENCE_STATE,\ + SENSOR1_VALUES_RANGE,\ + SENSOR1_SETTINGS_COUNT,\ + {\ + SENSOR1_SETTINGS1_INIT_PARAMS,\ + SENSOR1_SETTINGS2_INIT_PARAMS,\ + SENSOR1_SETTINGS3_INIT_PARAMS\ + },\ + SENSOR1_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR2_ELEMENT_IDX 0 +#define SENSOR2_PROPERTY_ID DESIRED_AMBIENT_TEMPERATURE_PID +#define SENSOR2_POSITIVE_TOLERANCE 0xabc +#define SENSOR2_NEGATIVE_TOLERANCE 0xdef +#define SENSOR2_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_RMS +#define SENSOR2_MEASUREMENT_PERIOD 0x04 +#define SENSOR2_UPDATE_INTERVAL 0x05 +#define SENSOR2_DATA_LENGTH 1 +#define SENSOR2_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR2_VALUES_RANGE 100 +#define SENSOR2_SETTINGS_COUNT 2 +#define SENSOR2_SETTING1_PROPERTY_ID 0x00BB +#define SENSOR2_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR2_SETTING1_RAW 345 +#define SENSOR2_SETTING2_PROPERTY_ID 0x00AD +#define SENSOR2_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR2_SETTING2_RAW 435 +#define SENSOR2_SERIES_COUNT 0 + +#define SENSOR2_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR2_SETTING1_PROPERTY_ID,\ + SENSOR2_SETTING1_ACCESS,\ + SENSOR2_SETTING1_RAW\ +} + +#define SENSOR2_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR2_SETTING2_PROPERTY_ID,\ + SENSOR2_SETTING2_ACCESS,\ + SENSOR2_SETTING2_RAW \ +} + +#define SENSOR2_INIT_PARAMS \ +{\ + SENSOR2_ELEMENT_IDX,\ + SENSOR2_PROPERTY_ID,\ + SENSOR2_POSITIVE_TOLERANCE,\ + SENSOR2_NEGATIVE_TOLERANCE,\ + SENSOR2_SAMPLING_FUNCTION,\ + SENSOR2_MEASUREMENT_PERIOD,\ + SENSOR2_UPDATE_INTERVAL,\ + SENSOR2_DATA_LENGTH,\ + SENSOR2_CADENCE_STATE,\ + SENSOR2_VALUES_RANGE,\ + SENSOR2_SETTINGS_COUNT,\ + {\ + SENSOR2_SETTINGS1_INIT_PARAMS,\ + SENSOR2_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR2_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR3_ELEMENT_IDX 0 +#define SENSOR3_PROPERTY_ID PRESSURE_PID +#define SENSOR3_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR3_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR3_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR3_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR3_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR3_DATA_LENGTH 2 +#define SENSOR3_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR3_VALUES_RANGE 500 +#define SENSOR3_SETTINGS_COUNT 2 +#define SENSOR3_SETTING1_PROPERTY_ID 0x0AAA +#define SENSOR3_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR3_SETTING1_RAW 35666 +#define SENSOR3_SETTING2_PROPERTY_ID 0x0AAC +#define SENSOR3_SETTING2_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR3_SETTING2_RAW 33666 +#define SENSOR3_SERIES_COUNT 20 +#define SENSOR3_SERIES1_RAWX 0 +#define SENSOR3_SERIES1_CW 10 +#define SENSOR3_SERIES2_RAWX 23 +#define SENSOR3_SERIES2_CW 10 +#define SENSOR3_SERIES3_RAWX 34 +#define SENSOR3_SERIES3_CW 10 +#define SENSOR3_SERIES4_RAWX 35 +#define SENSOR3_SERIES4_CW 10 +#define SENSOR3_SERIES5_RAWX 36 +#define SENSOR3_SERIES5_CW 10 +#define SENSOR3_SERIES6_RAWX 40 +#define SENSOR3_SERIES6_CW 10 +#define SENSOR3_SERIES7_RAWX 41 +#define SENSOR3_SERIES7_CW 10 +#define SENSOR3_SERIES8_RAWX 42 +#define SENSOR3_SERIES8_CW 10 +#define SENSOR3_SERIES9_RAWX 43 +#define SENSOR3_SERIES9_CW 10 +#define SENSOR3_SERIES10_RAWX 45 +#define SENSOR3_SERIES10_CW 10 +#define SENSOR3_SERIES11_RAWX 46 +#define SENSOR3_SERIES11_CW 10 +#define SENSOR3_SERIES12_RAWX 47 +#define SENSOR3_SERIES12_CW 10 +#define SENSOR3_SERIES13_RAWX 48 +#define SENSOR3_SERIES13_CW 10 +#define SENSOR3_SERIES14_RAWX 49 +#define SENSOR3_SERIES14_CW 10 +#define SENSOR3_SERIES15_RAWX 50 +#define SENSOR3_SERIES15_CW 10 +#define SENSOR3_SERIES16_RAWX 51 +#define SENSOR3_SERIES16_CW 10 +#define SENSOR3_SERIES17_RAWX 52 +#define SENSOR3_SERIES17_CW 10 +#define SENSOR3_SERIES18_RAWX 53 +#define SENSOR3_SERIES18_CW 10 +#define SENSOR3_SERIES19_RAWX 55 +#define SENSOR3_SERIES19_CW 10 +#define SENSOR3_SERIES20_RAWX 89 +#define SENSOR3_SERIES20_CW 10 + +#define SENSOR3_SETTINGS1_INIT_PARAMS \ +{\ + SENSOR3_SETTING1_PROPERTY_ID,\ + SENSOR3_SETTING1_ACCESS,\ + SENSOR3_SETTING1_RAW\ +} + +#define SENSOR3_SETTINGS2_INIT_PARAMS \ +{\ + SENSOR3_SETTING2_PROPERTY_ID,\ + SENSOR3_SETTING2_ACCESS,\ + SENSOR3_SETTING2_RAW\ +} + +#define SENSOR3_COLUMN1_INIT_PARAMS {SENSOR3_SERIES1_RAWX,SENSOR3_SERIES1_CW} +#define SENSOR3_COLUMN2_INIT_PARAMS {SENSOR3_SERIES2_RAWX,SENSOR3_SERIES2_CW} +#define SENSOR3_COLUMN3_INIT_PARAMS {SENSOR3_SERIES3_RAWX,SENSOR3_SERIES3_CW} +#define SENSOR3_COLUMN4_INIT_PARAMS {SENSOR3_SERIES4_RAWX,SENSOR3_SERIES4_CW} +#define SENSOR3_COLUMN5_INIT_PARAMS {SENSOR3_SERIES5_RAWX,SENSOR3_SERIES5_CW} +#define SENSOR3_COLUMN6_INIT_PARAMS {SENSOR3_SERIES6_RAWX,SENSOR3_SERIES6_CW} +#define SENSOR3_COLUMN7_INIT_PARAMS {SENSOR3_SERIES7_RAWX,SENSOR3_SERIES7_CW} +#define SENSOR3_COLUMN8_INIT_PARAMS {SENSOR3_SERIES8_RAWX,SENSOR3_SERIES8_CW} +#define SENSOR3_COLUMN9_INIT_PARAMS {SENSOR3_SERIES9_RAWX,SENSOR3_SERIES9_CW} +#define SENSOR3_COLUMN10_INIT_PARAMS {SENSOR3_SERIES10_RAWX,SENSOR3_SERIES10_CW} +#define SENSOR3_COLUMN11_INIT_PARAMS {SENSOR3_SERIES11_RAWX,SENSOR3_SERIES11_CW} +#define SENSOR3_COLUMN12_INIT_PARAMS {SENSOR3_SERIES12_RAWX,SENSOR3_SERIES12_CW} +#define SENSOR3_COLUMN13_INIT_PARAMS {SENSOR3_SERIES13_RAWX,SENSOR3_SERIES13_CW} +#define SENSOR3_COLUMN14_INIT_PARAMS {SENSOR3_SERIES14_RAWX,SENSOR3_SERIES14_CW} +#define SENSOR3_COLUMN15_INIT_PARAMS {SENSOR3_SERIES15_RAWX,SENSOR3_SERIES15_CW} +#define SENSOR3_COLUMN16_INIT_PARAMS {SENSOR3_SERIES16_RAWX,SENSOR3_SERIES16_CW} +#define SENSOR3_COLUMN17_INIT_PARAMS {SENSOR3_SERIES17_RAWX,SENSOR3_SERIES17_CW} +#define SENSOR3_COLUMN18_INIT_PARAMS {SENSOR3_SERIES18_RAWX,SENSOR3_SERIES18_CW} +#define SENSOR3_COLUMN19_INIT_PARAMS {SENSOR3_SERIES19_RAWX,SENSOR3_SERIES19_CW} +#define SENSOR3_COLUMN20_INIT_PARAMS {SENSOR3_SERIES20_RAWX,SENSOR3_SERIES20_CW} + +#define SENSOR3_INIT_PARAMS \ +{\ + SENSOR3_ELEMENT_IDX,\ + SENSOR3_PROPERTY_ID,\ + SENSOR3_POSITIVE_TOLERANCE,\ + SENSOR3_NEGATIVE_TOLERANCE,\ + SENSOR3_SAMPLING_FUNCTION,\ + SENSOR3_MEASUREMENT_PERIOD,\ + SENSOR3_UPDATE_INTERVAL,\ + SENSOR3_DATA_LENGTH,\ + SENSOR3_CADENCE_STATE,\ + SENSOR3_VALUES_RANGE,\ + SENSOR3_SETTINGS_COUNT,\ + {\ + SENSOR3_SETTINGS1_INIT_PARAMS,\ + SENSOR3_SETTINGS2_INIT_PARAMS\ + },\ + SENSOR3_SERIES_COUNT,\ + {\ + SENSOR3_COLUMN1_INIT_PARAMS,\ + SENSOR3_COLUMN2_INIT_PARAMS,\ + SENSOR3_COLUMN3_INIT_PARAMS,\ + SENSOR3_COLUMN4_INIT_PARAMS,\ + SENSOR3_COLUMN5_INIT_PARAMS,\ + SENSOR3_COLUMN6_INIT_PARAMS,\ + SENSOR3_COLUMN7_INIT_PARAMS,\ + SENSOR3_COLUMN8_INIT_PARAMS,\ + SENSOR3_COLUMN9_INIT_PARAMS,\ + SENSOR3_COLUMN10_INIT_PARAMS,\ + SENSOR3_COLUMN11_INIT_PARAMS,\ + SENSOR3_COLUMN12_INIT_PARAMS,\ + SENSOR3_COLUMN13_INIT_PARAMS,\ + SENSOR3_COLUMN14_INIT_PARAMS,\ + SENSOR3_COLUMN15_INIT_PARAMS,\ + SENSOR3_COLUMN16_INIT_PARAMS,\ + SENSOR3_COLUMN17_INIT_PARAMS,\ + SENSOR3_COLUMN18_INIT_PARAMS,\ + SENSOR3_COLUMN19_INIT_PARAMS,\ + SENSOR3_COLUMN20_INIT_PARAMS}\ +} + +#define SENSOR4_ELEMENT_IDX 0 +#define SENSOR4_PROPERTY_ID HUMIDITY_PID +#define SENSOR4_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR4_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR4_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR4_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR4_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR4_DATA_LENGTH 2 +#define SENSOR4_CADENCE_STATE SENSOR_CADENCE_SUPPORTED +#define SENSOR4_VALUES_RANGE 200 +#define SENSOR4_SETTINGS_COUNT 1 +#define SENSOR4_SETTING1_PROPERTY_ID 0xAAAA +#define SENSOR4_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ_WRITE +#define SENSOR4_SETTING1_RAW 35666 +#define SENSOR4_SERIES_COUNT 0 + +#define SENSOR4_SETTINGS_INIT_PARAMS \ +{\ + SENSOR4_SETTING1_PROPERTY_ID,\ + SENSOR4_SETTING1_ACCESS,\ + SENSOR4_SETTING1_RAW\ +} + +#define SENSOR4_INIT_PARAMS \ +{\ + SENSOR4_ELEMENT_IDX,\ + SENSOR4_PROPERTY_ID,\ + SENSOR4_POSITIVE_TOLERANCE,\ + SENSOR4_NEGATIVE_TOLERANCE,\ + SENSOR4_SAMPLING_FUNCTION,\ + SENSOR4_MEASUREMENT_PERIOD,\ + SENSOR4_UPDATE_INTERVAL,\ + SENSOR4_DATA_LENGTH,\ + SENSOR4_CADENCE_STATE,\ + SENSOR4_VALUES_RANGE,\ + SENSOR4_SETTINGS_COUNT,\ + {\ + SENSOR4_SETTINGS_INIT_PARAMS\ + },\ + SENSOR4_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR5_ELEMENT_IDX 0 +#define SENSOR5_PROPERTY_ID TIME_OF_FLIGHT_PID +#define SENSOR5_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR5_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR5_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR5_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR5_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR5_DATA_LENGTH 2 +#define SENSOR5_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR5_VALUES_RANGE 0 +#define SENSOR5_SETTINGS_COUNT 1 +#define SENSOR5_SETTING1_PROPERTY_ID 0xAAFA +#define SENSOR5_SETTING1_ACCESS SENSOR_SETTING_ACCESS_READ +#define SENSOR5_SETTING1_RAW 35666 +#define SENSOR5_SERIES_COUNT 2 +#define SENSOR5_SERIES1_RAWX 20 +#define SENSOR5_SERIES1_CW 30 +#define SENSOR5_SERIES2_RAWX 50 +#define SENSOR5_SERIES2_CW 40 + +#define SENSOR5_SETTINGS_INIT_PARAMS \ +{\ + SENSOR5_SETTING1_PROPERTY_ID,\ + SENSOR5_SETTING1_ACCESS,\ + SENSOR5_SETTING1_RAW\ +} + +#define SENSOR5_COLUMN1_INIT_PARAMS {SENSOR5_SERIES1_RAWX,SENSOR5_SERIES1_CW} +#define SENSOR5_COLUMN2_INIT_PARAMS {SENSOR5_SERIES2_RAWX,SENSOR5_SERIES2_CW} + +#define SENSOR5_INIT_PARAMS \ +{\ + SENSOR5_ELEMENT_IDX,\ + SENSOR5_PROPERTY_ID,\ + SENSOR5_POSITIVE_TOLERANCE,\ + SENSOR5_NEGATIVE_TOLERANCE,\ + SENSOR5_SAMPLING_FUNCTION,\ + SENSOR5_MEASUREMENT_PERIOD,\ + SENSOR5_UPDATE_INTERVAL,\ + SENSOR5_DATA_LENGTH,\ + SENSOR5_CADENCE_STATE,\ + SENSOR5_VALUES_RANGE,\ + SENSOR5_SETTINGS_COUNT,\ + {\ + SENSOR5_SETTINGS_INIT_PARAMS\ + },\ + SENSOR5_SERIES_COUNT,\ + {\ + SENSOR5_COLUMN1_INIT_PARAMS,\ + SENSOR5_COLUMN2_INIT_PARAMS\ + }\ +} + +#define SENSOR6_ELEMENT_IDX 0 +#define SENSOR6_PROPERTY_ID PRESENCE_PID +#define SENSOR6_POSITIVE_TOLERANCE SENSOR_POSITIVE_TOLERANCE_UNSPECIFIED +#define SENSOR6_NEGATIVE_TOLERANCE SENSOR_NEGATIVE_TOLERANCE_UNSPECIFIED +#define SENSOR6_SAMPLING_FUNCTION SENSOR_SAMPLING_FUNC_UNSPECIFIED +#define SENSOR6_MEASUREMENT_PERIOD SENSOR_MEASUREMENT_PERIOD_NA +#define SENSOR6_UPDATE_INTERVAL SENSOR_UPDATE_INTERVAL_NA +#define SENSOR6_DATA_LENGTH 1 +#define SENSOR6_CADENCE_STATE SENSOR_CADENCE_NOT_SUPPORTED +#define SENSOR6_VALUES_RANGE 0 +#define SENSOR6_SETTINGS_COUNT 0 +#define SENSOR6_SERIES_COUNT 0 + +#define SENSOR6_SETTINGS_INIT_PARAMS \ +{\ + {\ + {0}\ + }\ +} + +#define SENSOR6_INIT_PARAMS \ +{\ + SENSOR6_ELEMENT_IDX,\ + SENSOR6_PROPERTY_ID,\ + SENSOR6_POSITIVE_TOLERANCE,\ + SENSOR6_NEGATIVE_TOLERANCE,\ + SENSOR6_SAMPLING_FUNCTION,\ + SENSOR6_MEASUREMENT_PERIOD,\ + SENSOR6_UPDATE_INTERVAL,\ + SENSOR6_DATA_LENGTH,\ + SENSOR6_CADENCE_STATE,\ + SENSOR6_VALUES_RANGE,\ + SENSOR6_SETTINGS_COUNT,\ + {\ + {0}\ + },\ + SENSOR6_SERIES_COUNT,\ + {\ + {0}\ + }\ +} + +#define SENSOR_SERVER_INIT_PARAMS \ +{\ + TOTAL_SENSORS_COUNT,\ + {\ + SENSOR1_INIT_PARAMS,\ + SENSOR2_INIT_PARAMS,\ + SENSOR3_INIT_PARAMS,\ + SENSOR4_INIT_PARAMS,\ + SENSOR5_INIT_PARAMS\ + }\ +} +*/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c new file mode 100644 index 000000000..041fe7fe2 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c @@ -0,0 +1,82 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file svctl_conf.c + * @author MCD Application Team + * @brief Configuration of the BLE service controller + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "app_common.h" + +#include "otp.h" + +/* Private defines -----------------------------------------------------------*/ +#define BD_ADDR_SIZE_LOCAL 6 + +/* Private variables ---------------------------------------------------------*/ +static const uint8_t M_bd_addr[BD_ADDR_SIZE_LOCAL] = +{ + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) +}; + +static uint8_t bd_addr_udn[BD_ADDR_SIZE_LOCAL]; + +const uint8_t* SVCCTL_GetBdAddress( void ) +{ + uint8_t *otp_addr; + const uint8_t *bd_addr; + uint32_t udn; + uint32_t company_id; + uint32_t device_id; + + udn = LL_FLASH_GetUDN(); + + if(udn != 0xFFFFFFFF) + { + company_id = LL_FLASH_GetSTCompanyID(); + device_id = LL_FLASH_GetDeviceID(); + + bd_addr_udn[0] = (uint8_t)(udn & 0x000000FF); + bd_addr_udn[1] = (uint8_t)( (udn & 0x0000FF00) >> 8 ); + bd_addr_udn[2] = (uint8_t)( (udn & 0x00FF0000) >> 16 ); + bd_addr_udn[3] = (uint8_t)device_id; + bd_addr_udn[4] = (uint8_t)(company_id & 0x000000FF); + bd_addr_udn[5] = (uint8_t)( (company_id & 0x0000FF00) >> 8 ); + + bd_addr = (const uint8_t *)bd_addr_udn; + } + else + { + otp_addr = OTP_Read(0); + if(otp_addr) + { + bd_addr = ((OTP_ID0_t*)otp_addr)->bd_address; + } + else + { + bd_addr = M_bd_addr; + } + + } + + return bd_addr; +} + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h new file mode 100644 index 000000000..6a88e53c1 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h @@ -0,0 +1,32 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file tl_conf.h + * @author MCD Application Team + * @brief Transport Layer Configuration + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __TL_CONF_H +#define __TL_CONF_H + +/** + * It shall be set to 1 for power optimization when standby is supported + */ +#define CFG_BLE_HCI_STDBY 0 + + + +#endif /*__TL_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h new file mode 100644 index 000000000..04ed3d88d --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h @@ -0,0 +1,133 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __TL_DBG_CONF_H +#define __TL_DBG_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* USER CODE BEGIN Tl_Conf */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" /* required as some configuration used in dbg_trace.h are set there */ +#include "dbg_trace.h" +#include "hw_if.h" + +/** + * Enable or Disable traces + * The raw data output is the hci binary packet format as specified by the BT specification * + */ +#define TL_SHCI_CMD_DBG_EN 0 /* Reports System commands sent to CPU2 and the command response */ +#define TL_SHCI_CMD_DBG_RAW_EN 0 /* Reports raw data System commands sent to CPU2 and the command response */ +#define TL_SHCI_EVT_DBG_EN 0 /* Reports System Asynchronous Events received from CPU2 */ +#define TL_SHCI_EVT_DBG_RAW_EN 0 /* Reports raw data System Asynchronous Events received from CPU2 */ + +#define TL_HCI_CMD_DBG_EN 0 /* Reports BLE command sent to CPU2 and the command response */ +#define TL_HCI_CMD_DBG_RAW_EN 0 /* Reports raw data BLE command sent to CPU2 and the command response */ +#define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ +#define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ + +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ + +/** + * Macro definition + */ + +/** + * System Transport Layer + */ +#if (TL_SHCI_CMD_DBG_EN != 0) +#define TL_SHCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_CMD_DBG_MSG(...) +#define TL_SHCI_CMD_DBG_BUF(...) +#endif + +#if (TL_SHCI_CMD_DBG_RAW_EN != 0) +#define TL_SHCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_CMD_DBG_RAW(...) +#endif + +#if (TL_SHCI_EVT_DBG_EN != 0) +#define TL_SHCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_EVT_DBG_MSG(...) +#define TL_SHCI_EVT_DBG_BUF(...) +#endif + +#if (TL_SHCI_EVT_DBG_RAW_EN != 0) +#define TL_SHCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_EVT_DBG_RAW(...) +#endif + +/** + * BLE Transport Layer + */ +#if (TL_HCI_CMD_DBG_EN != 0) +#define TL_HCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_CMD_DBG_MSG(...) +#define TL_HCI_CMD_DBG_BUF(...) +#endif + +#if (TL_HCI_CMD_DBG_RAW_EN != 0) +#define TL_HCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_CMD_DBG_RAW(...) +#endif + +#if (TL_HCI_EVT_DBG_EN != 0) +#define TL_HCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_EVT_DBG_MSG(...) +#define TL_HCI_EVT_DBG_BUF(...) +#endif + +#if (TL_HCI_EVT_DBG_RAW_EN != 0) +#define TL_HCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_EVT_DBG_RAW(...) +#endif + +/** + * Memory Manager - Released buffer tracing + */ +#if (TL_MM_DBG_EN != 0) +#define TL_MM_DBG_MSG PRINT_MESG_DBG +#else +#define TL_MM_DBG_MSG(...) +#endif + +/* USER CODE END Tl_Conf */ + +#ifdef __cplusplus +} +#endif + +#endif /*__TL_DBG_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c new file mode 100644 index 000000000..7b9d0a443 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c @@ -0,0 +1,47 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file tl_if.c + * @author MCD Application Team + * @brief Transport layer interface to BLE + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#include "app_common.h" + +#include "hci_tl.h" +#include "shci_tl.h" +#include "tl.h" + + +void hci_register_io_bus(tHciIO* fops) +{ + /* Register IO bus services */ + fops->Init = TL_BLE_Init; + fops->Send = TL_BLE_SendCmd; + + return; +} + +void shci_register_io_bus(tSHciIO* fops) +{ + /* Register IO bus services */ + fops->Init = TL_SYS_Init; + fops->Send = TL_SYS_SendCmd; + + return; +} + + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c new file mode 100644 index 000000000..37b671c48 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c @@ -0,0 +1,343 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file user_if.c + * @author MCD Application Team + * @brief User interface file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "cube_hal.h" +#include "ble_clock.h" +#include "hci.h" +#include "user_if.h" +#include "hal.h" +#include "hal_common.h" +#include "mesh_cfg.h" + +#include +#ifdef IAR +#include +#else +#define _LLIO_STDIN 0 +#define _LLIO_STDOUT 1 +#define _LLIO_STDERR 2 +#define _LLIO_ERROR ((size_t)-1) /* For __read and __write. */ +#endif + + + +typedef struct _IO_ReceiveCallBack +{ + /** + * callback to notify the application with the received I/O data + */ + IO_RECEIVE_DATA_USER_CALLBACK_TYPE IO_user_application; +} IO_ReceiveCallBack; +/** +* @} +*/ + +#define READ_DATA_SIZE 1024 +#define READ_BUFFER_IS_EMPTY() (Read_ptr_in == Read_ptr_out) + +/* IO User Callback used to handle received data from I/O channel*/ +static uint8_t Read_Buffer [READ_DATA_SIZE]; +static uint32_t Read_ptr_in = 0; +static uint32_t Read_ptr_out = 0; +/*static volatile uint8_t s_SdkEvalVersion = ID_UNKNOWN;*/ +static IO_ReceiveCallBack IO_Receive_Data; +static void SdkEval_IO_processInputData(uint8_t * rx_data, uint16_t data_size); + + +/** +* @brief SetLed Sets the state of led +* @param int state State for the led GPIO +* @retval void +*/ +void SetLed(int state) +{ + if (state) + { + BSP_LED_On(LED_BLUE); + } + else + { + BSP_LED_Off(LED_BLUE); + } +} + +#if 0 +/** +* @brief GetButtonState +* @param void +* @retval BUTTON_STATE returns the status of the userbutton GPIO +*/ +BUTTON_STATE GetButtonState(void) +{ + return HAL_GPIO_ReadPin(GPIOC, GPIO_PIN_13); +} + +/** +* @brief InitButton initializes the GPIO for the user button +* @param void +* @retval void +*/ +void InitButton(void) +{ + GPIO_InitTypeDef init; + init.Pin = GPIO_PIN_13; + init.Mode = GPIO_MODE_INPUT | GPIO_MODE_EVT_FALLING; + init.Pull = GPIO_NOPULL; + init.Speed = GPIO_SPEED_VERY_LOW; + init.Alternate = 0; + __HAL_RCC_GPIOC_CLK_ENABLE(); + HAL_GPIO_Init(GPIOC, &init); + EXTI->FTSR |= EXTI_RTSR_TR13; /* enable wake-up event on falling edge */ + EXTI->IMR &= ~EXTI_IMR_MR13; /* disable interrupt */ + EXTI->EMR |= EXTI_EMR_MR13; /* enable event */ +} +#endif + +/** +* @brief processInputData +* @param uint8_t * rx_data pointer to receive data +* @param uint16_t data_size size of receive data +* @retval void +*/ +void processInputData(uint8_t * rx_data, uint16_t data_size) +{ + SdkEval_IO_processInputData(rx_data, data_size); +} + +/** +* @brief Configure the selected I/O communication channel +* @param None. +* @retval None. +*/ +void SdkEval_IO_Config(IO_RECEIVE_DATA_USER_CALLBACK_TYPE io_receive_function) +{ + IO_Receive_Data.IO_user_application = io_receive_function; +#if defined (ENABLE_USB) + /* Init Device Library */ + USBD_Init(&USBD_Device, &VCP_Desc, 0); + + /* Add Supported Class */ + USBD_RegisterClass(&USBD_Device, USBD_CDC_CLASS); + + /* Add CDC Interface Class */ + USBD_CDC_RegisterInterface(&USBD_Device, &USBD_CDC_fops); + + /* Start Device Process */ + USBD_Start(&USBD_Device); + +#elif defined (ENABLE_USART) + /* Init Serial Uart */ + MX_USART2_UART_Init(); +#endif +} + +/** +* @brief InitDevice intitializes the Device +* @param void +* @retval void +*/ +void InitDevice(void) +{ + Init_Device(); /* Initializes HAL and System Clock */ + +#ifndef NEWLIB_SYSCALLS + SdkEval_IO_Config(processInputData); +#endif + /* Delay for debug purpose, in order to see printed data at startup. */ +#if defined(ENABLE_USART) + Clock_Wait(2000); +#endif + +#if defined(ACCELEROMETER_TYPE) || defined(THERMOMETER_TYPE) + I2C_Reset(); + Temperature_Init(); + Accel_Init(); +#endif + InitButton(); +} + + +/** +* @brief ShouldSleepFunc sleep mode function +* @param void +* @retval void +*/ +void ShouldSleepFunc(void) +{ + __disable_irq(); + __WFE(); + __NOP(); + __enable_irq(); +} + +/** +* @brief Receive data on selected I/O port +* @param rx_data pointer to buffer of received +* @param data_size number of received data +* @retval None. +*/ +void SdkEval_IO_Receive_Data(uint8_t * rx_data, uint16_t data_size) +{ + if(IO_Receive_Data.IO_user_application) + IO_Receive_Data.IO_user_application(rx_data,data_size); + +} +/** +* @brief Read buffer push +* @param byte +* @retval None. +*/ +void Read_Buffer_Push(uint8_t byte) +{ + Read_Buffer[Read_ptr_in] = byte; + + Read_ptr_in++; + + /* To avoid buffer overflow */ + if(Read_ptr_in == READ_DATA_SIZE) + { + Read_ptr_in = 0; + } +} +/** +* @brief Read buffer pop +* @param byte +* @retval None. +*/ +int Read_Buffer_Pop(uint8_t *byte) +{ + if(READ_BUFFER_IS_EMPTY()) + return 0; + + *byte = Read_Buffer[Read_ptr_out]; + + Read_ptr_out++; + + if(Read_ptr_out == READ_DATA_SIZE) + Read_ptr_out = 0; + + return 1; +} +/** +* @brief Process input data +* @param byte +* @retval None. +*/ +static void SdkEval_IO_processInputData(uint8_t * rx_data, uint16_t data_size) +{ + for(int i = 0; i < data_size; i++){ + Read_Buffer_Push(rx_data[i]); + } +} +extern UART_HandleTypeDef huart2; +#undef putchar +/** +* @brief Put character +* @param byte +* @retval None. +*/ +int putchar(int c) +{ + /* wait for the transmission end */ + while(!(__HAL_UART_GET_FLAG(&huart2, UART_FLAG_TXE))); + /* send the data */ + HAL_UART_Transmit(&huart2, (uint8_t*)&c, 1, UART_TX_TIMEOUT); + return c; +} + +void __io_putchar(char c) +{ + putchar(c); +} + +/* Required for Keil */ +#ifndef __IAR_SYSTEMS_ICC__ +void _ttywrch(int ch) +{ + putchar(ch); +} + +int fputc(int ch, FILE *f) +{ + _ttywrch(ch); + return(ch); +} +int fgetc(FILE *f) +{ + return -1; +} +#endif + +/** +* @brief Write handle +* @param buffer +* @param size +* @retval None. +*/ +size_t _write(int handle, const unsigned char * buffer, size_t size) +{ + size_t nChars = 0; + + if (handle != _LLIO_STDOUT && handle != _LLIO_STDERR) { + return _LLIO_ERROR; + } + + if (buffer == 0) { + /* This means that we should flush internal buffers. + spin until TX complete (TX is idle)*/ +#ifdef ENABLE_USB + while (!USB_OUT_BUFFER_IS_EMPTY()) {} +#endif /* ENABLE_USB */ + return 0; + } + + while(size--) { + __io_putchar(*buffer++); + ++nChars; + } + + return nChars; +} + +/** +* @brief Read handle +* @param buffer +* @param size +* @retval None. +*/ +size_t __read(int handle, unsigned char * buffer, size_t size) +{ + size_t bytes = 0; + + while(bytes < size && Read_Buffer_Pop(buffer+bytes)){ + bytes++; + } + return bytes; +} + +uint8_t __io_getcharNonBlocking(uint8_t *data) +{ + if (__read(_LLIO_STDIN,data,1)) + return 1; + else + return 0; +}/* end serialReadByte() */ + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h new file mode 100644 index 000000000..01985c068 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h @@ -0,0 +1,40 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file user_if.h + * @author MCD Application Team + * @brief Header file for User interface file + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef _USER_INTERFACE_H_ +#define _USER_INTERFACE_H_ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" +#include "stm32wbxx_hal_conf.h" +#include "ble_clock.h" + +#define BUTTON_PRESSED GPIO_PIN_RESET + +/* Exported typedefs ---------------------------------------------*/ +typedef GPIO_PinState BUTTON_STATE; +typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t data_size); + +/* Exported Functions Prototypes ---------------------------------------------*/ + +#endif /* _USER_INTERFACE_H_ */ + + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h new file mode 100644 index 000000000..18421e257 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h @@ -0,0 +1,51 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file vcp_conf.h + * @author MCD Application Team + * @brief Configuration of the vcp interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __VCP_CONF_H +#define __VCP_CONF_H + +#ifdef __cplusplus +extern "C" +{ +#endif + +/* Includes ------------------------------------------------------------------*/ +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ +#define VCP_BAUD_RATE (115200) +#define VCP_TX_PATH_INTERFACE_READY_SETUP_TIME (20*1000*1000/CFG_TS_TICK_VAL) /** 20s */ +#define VCP_TASK_ID (CFG_IdleTask_VCP_SendData) +#define VCP_TASK_PRIO (CFG_SCH_Prio_1) + +#ifdef VCP_TX_PATH_INTERFACE_READY_SETUP_TIME +#define VCP_TIMER_PROC_ID (CFG_TimProcID_isr) +#endif + +/* External variables --------------------------------------------------------*/ +/* Exported macros -----------------------------------------------------------*/ +/* Exported functions ------------------------------------------------------- */ + + +#ifdef __cplusplus +} +#endif + +#endif /*__VCP_CONF_H */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c new file mode 100644 index 000000000..ad5c868c8 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c @@ -0,0 +1,706 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "mbox_def.h" + +/* Global variables ---------------------------------------------------------*/ +/* Private defines -----------------------------------------------------------*/ +#define HW_IPCC_TX_PENDING( channel ) ( !(LL_C1_IPCC_IsActiveFlag_CHx( IPCC, channel )) ) && (((~(IPCC->C1MR)) & (channel << 16U))) +#define HW_IPCC_RX_PENDING( channel ) (LL_C2_IPCC_IsActiveFlag_CHx( IPCC, channel )) && (((~(IPCC->C1MR)) & (channel << 0U))) + +/* Private macros ------------------------------------------------------------*/ +#if ( (STM32WB15xx != 0) && (CFG_LPM_STANDBY_SUPPORTED != 0) ) +#define HW_IPCC_SET_FLAG_CHX(x) HW_IPCC_SetFlagCHx(x) +#else +#define HW_IPCC_SET_FLAG_CHX(x) LL_C1_IPCC_SetFlag_CHx(IPCC, x) +#endif +/* Private typedef -----------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static void (*FreeBufCb)( void ); + +/* Private function prototypes -----------------------------------------------*/ +static void HW_IPCC_BLE_EvtHandler( void ); +static void HW_IPCC_BLE_AclDataEvtHandler( void ); +static void HW_IPCC_MM_FreeBufHandler( void ); +static void HW_IPCC_SYS_CmdEvtHandler( void ); +static void HW_IPCC_SYS_EvtHandler( void ); +static void HW_IPCC_TRACES_EvtHandler( void ); + +#ifdef THREAD_WB +static void HW_IPCC_OT_CmdEvtHandler( void ); +static void HW_IPCC_THREAD_NotEvtHandler( void ); +static void HW_IPCC_THREAD_CliNotEvtHandler( void ); +#endif + +#ifdef LLD_TESTS_WB +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ); +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ); +#endif +#ifdef LLD_BLE_WB +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void );*/ +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ); +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ); +#endif + +#ifdef MAC_802_15_4_WB +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ); +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ); +#endif + +#ifdef ZIGBEE_WB +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ); +#endif + +#if ( (STM32WB15xx != 0) && (CFG_LPM_STANDBY_SUPPORTED != 0) ) +static void IPCC_Wakeup_CPU2(void); +static void HW_IPCC_SetFlagCHx(uint32_t Channel); +#endif +/* Public function definition -----------------------------------------------*/ + +/****************************************************************************** + * INTERRUPT HANDLER + ******************************************************************************/ +void HW_IPCC_Rx_Handler( void ) +{ + if (HW_IPCC_RX_PENDING( HW_IPCC_SYSTEM_EVENT_CHANNEL )) + { + HW_IPCC_SYS_EvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_NotEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_NotEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_CliNotEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveCliRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_M0_CMD_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef LLD_BLE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_RSP_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_M0_CMD_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackNotifEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackM0RequestHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL )) + { + HW_IPCC_BLE_EvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_TRACES_CHANNEL )) + { + HW_IPCC_TRACES_EvtHandler(); + } + + return; +} + +void HW_IPCC_Tx_Handler( void ) +{ + if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_CmdEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL )) + { + HW_IPCC_OT_CmdEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB +// No TX handler for LLD tests +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL )) + { + HW_IPCC_ZIGBEE_CmdEvtHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) + { + HW_IPCC_MM_FreeBufHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_HCI_ACL_DATA_CHANNEL )) + { + HW_IPCC_BLE_AclDataEvtHandler(); + } + + return; +} +/****************************************************************************** + * GENERAL + ******************************************************************************/ +void HW_IPCC_Enable( void ) +{ + /** + * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running + when FUS is running on CPU2 and CPU1 enters deep sleep mode + */ + LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC); + + /** + * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 + */ + LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); + + /** + * In case the SBSFU is implemented, it may have already set the C2BOOT bit to startup the CPU2. + * In that case, to keep the mechanism transparent to the user application, it shall call the system command + * SHCI_C2_Reinit( ) before jumping to the application. + * When the CPU2 receives that command, it waits for its event input to be set to restart the CPU2 firmware. + * This is required because once C2BOOT has been set once, a clear/set on C2BOOT has no effect. + * When SHCI_C2_Reinit( ) is not called, generating an event to the CPU2 does not have any effect + * So, by default, the application shall both set the event flag and set the C2BOOT bit. + */ + __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ + __WFE( ); /* Clear the internal event flag */ + LL_PWR_EnableBootC2( ); + + return; +} + +void HW_IPCC_Init( void ) +{ + LL_AHB3_GRP1_EnableClock( LL_AHB3_GRP1_PERIPH_IPCC ); + + LL_C1_IPCC_EnableIT_RXO( IPCC ); + LL_C1_IPCC_EnableIT_TXF( IPCC ); + + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + + return; +} + +#if(CFG_LPM_STANDBY_SUPPORTED != 0) +static void IPCC_Wakeup_CPU2(void) +{ + + /** + * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 + */ + LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); + + __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ + __WFE( ); /* Clear the internal event flag */ + + return; +} + +static void HW_IPCC_SetFlagCHx(uint32_t Channel) +{ + IPCC_Wakeup_CPU2(); + LL_C1_IPCC_SetFlag_CHx(IPCC, Channel); + + return; +} +#endif +/****************************************************************************** + * BLE + ******************************************************************************/ +void HW_IPCC_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_BLE_CMD_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_EvtHandler( void ) +{ + HW_IPCC_BLE_RxEvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendAclData( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_HCI_ACL_DATA_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_AclDataEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + HW_IPCC_BLE_AclDataAckNot(); + + return; +} + +__weak void HW_IPCC_BLE_AclDataAckNot( void ){}; +__weak void HW_IPCC_BLE_RxEvtNot( void ){}; + +/****************************************************************************** + * SYSTEM + ******************************************************************************/ +void HW_IPCC_SYS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_SYS_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + return; +} + +static void HW_IPCC_SYS_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + HW_IPCC_SYS_CmdEvtNot(); + + return; +} + +static void HW_IPCC_SYS_EvtHandler( void ) +{ + HW_IPCC_SYS_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +__weak void HW_IPCC_SYS_CmdEvtNot( void ){}; +__weak void HW_IPCC_SYS_EvtNot( void ){}; + +/****************************************************************************** + * MAC 802.15.4 + ******************************************************************************/ +#ifdef MAC_802_15_4_WB +void HW_IPCC_MAC_802_15_4_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + HW_IPCC_MAC_802_15_4_CmdEvtNot(); + + return; +} + +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_MAC_802_15_4_EvtNot(); + + return; +} +__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; +__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; +#endif + +/****************************************************************************** + * THREAD + ******************************************************************************/ +#ifdef THREAD_WB +void HW_IPCC_THREAD_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_OT_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_CLI_SendCmd( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_THREAD_CLI_CMD_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_CliSendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_OT_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + HW_IPCC_OT_CmdEvtNot(); + + return; +} + +static void HW_IPCC_THREAD_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_EvtNot(); + + return; +} + +static void HW_IPCC_THREAD_CliNotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_CliEvtNot(); + + return; +} + +__weak void HW_IPCC_OT_CmdEvtNot( void ){}; +__weak void HW_IPCC_CLI_CmdEvtNot( void ){}; +__weak void HW_IPCC_THREAD_EvtNot( void ){}; + +#endif /* THREAD_WB */ + +/****************************************************************************** + * LLD TESTS + ******************************************************************************/ +#ifdef LLD_TESTS_WB +void HW_IPCC_LLDTESTS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLDTESTS_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveCliRsp(); + return; +} + +void HW_IPCC_LLDTESTS_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLDTESTS_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLDTESTS_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void ){}; +#endif /* LLD_TESTS_WB */ + +/****************************************************************************** + * LLD BLE + ******************************************************************************/ +#ifdef LLD_BLE_WB +void HW_IPCC_LLD_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLD_BLE_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_CMD_CHANNEL ); + return; +} + +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveCliRsp(); + return; +}*/ + +void HW_IPCC_LLD_BLE_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ) +{ + //LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLD_BLE_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + //LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLD_BLE_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLD_BLE_ReceiveM0Cmd( void ){}; + +/* Transparent Mode */ +void HW_IPCC_LLD_BLE_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveRsp(); + return; +} + +void HW_IPCC_LLD_BLE_SendRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + return; +} + +#endif /* LLD_BLE_WB */ + +/****************************************************************************** + * ZIGBEE + ******************************************************************************/ +#ifdef ZIGBEE_WB +void HW_IPCC_ZIGBEE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4RequestToM0( void ) +{ + HW_IPCC_SET_FLAG_CHX( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvAppliAckFromM0(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0NotifyToM4(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0RequestToM4(); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){}; +#endif /* ZIGBEE_WB */ + +/****************************************************************************** + * MEMORY MANAGER + ******************************************************************************/ +void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) ) +{ + if ( LL_C1_IPCC_IsActiveFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ) ) + { + FreeBufCb = cb; + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + else + { + cb(); + + HW_IPCC_SET_FLAG_CHX( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + + return; +} + +static void HW_IPCC_MM_FreeBufHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + FreeBufCb(); + + HW_IPCC_SET_FLAG_CHX( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + return; +} + +/****************************************************************************** + * TRACES + ******************************************************************************/ +void HW_IPCC_TRACES_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +static void HW_IPCC_TRACES_EvtHandler( void ) +{ + HW_IPCC_TRACES_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +__weak void HW_IPCC_TRACES_EvtNot( void ){}; + diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt new file mode 100644 index 000000000..242794716 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt @@ -0,0 +1,246 @@ +/** + @page BLE_MeshLightingPRFNode example + + @verbatim + ******************** (C) COPYRIGHT 2020 STMicroelectronics ******************* + * @file BLE/BLE_MeshLightingPRFNode/readme.txt + * @author MCD Application Team + * @brief Description of the BLE Mesh Lighting Proxy Relay Friend Node demo example. + ****************************************************************************** + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @endverbatim + +@par Example Description +This is the implementation of the BLE Mesh Lighting profile as specified by the BLE SIG, +a Proxy-Relay-Friend Node with the capacity to handle a Friendship with a Low Power Node. + +@note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) + based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from + a peripheral ISR process, then the SysTick interrupt must have higher priority (numerically lower) + than the peripheral interrupt. Otherwise the caller ISR process will be blocked. + To change the SysTick interrupt priority you have to use HAL_NVIC_SetPriority() function. + +@note The application needs to ensure that the SysTick time base is always set to 1 millisecond + to have correct HAL operation. + +@par Keywords + +Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core + +@par Directory contents + mesh_lighting_demo + - BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h Header for all modules with common definition + - BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h Parameters configuration file of the application + - BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h Interface to support debug in the application + - BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h Parameters configuration file of the application + - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h Configuration file of the HW + - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h Configuration file of the FLASH driver needed by EE module + - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h Configuration file of the Hardware Interface + - BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h Configuration file of the Low power timer to be used within Mesh Application. + - BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h Header for main.c module + - BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file + - BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h Configuration file of the Low layer function to enter/exit low power modes (stop, sleep). + - BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h Interrupt handlers header file + - BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h Configuration file of the utilities + - BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h Configuration file of Virtual Com Port Interface + - BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c Interface to support debug in the application + - BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c Initialization of the application + - BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c FLASH driver needed by EE module + - BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c Timer Server based on RTC + - BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c UART Driver + - BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c Low power timer to be used within Mesh Application. + - BLE/BLE_MeshLightingPRFNode/Core/Src/main.c Main program + - BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c Low Power Manager Interface + - BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c Interrupt handlers + - BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c stm32wbxx system source file + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/app_ble.c BLE Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/app_ble.h Header of BLE Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config.c Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config.h Header of Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config_client.c Application interface for Config CLient Mesh Model + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config_client.h Header of Application interface for Config CLient Mesh Model + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic.c Application interface for Generic Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic.h Header of Application interface for Generic Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic_client.c Application interface for Client Generic Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic_client.h Header of Application interface for Client Generic Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light.c BLE Mesh Light Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light.h Header of BLE Mesh Light Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_client.c Application interface for Client Light Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_client.h Header of Application interface for Client Light Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_lc.c BLE Mesh Light Lightness Controller Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_lc.h Header of BLE Mesh Light Lightness Controller Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_mesh.c BLE Mesh application implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_mesh.h Header of BLE Mesh application implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_nvm.c BLE Mesh NVM application implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_nvm.h Header of BLE Mesh NVM application implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor.c BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor_client.c BLE Mesh Client Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor_client.h Header of BLE Mesh Client Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_vendor.c BLE Mesh Vendor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_vendor.h Header of BLE Mesh Vendor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/ble_conf.h BLE Services configuration + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/ble_dbg_conf.h BLE Traces configuration of the BLE services + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/hal_common.h Header for common function of HAL file + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/mesh_cfg.h Header for Mesh configuration + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/mesh_cfg_usr.h Header for user Mesh configuration + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/models_if.h Header for the BLE Mesh Models Interface file + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/models_if.c BLE Mesh Models Interface file + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/pal_nvm.c BLE Mesh NVM management implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/pal_nvm.h Header of BLE Mesh NVM management implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/PWM_config.c Pulse Width Modulation configuration + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/PWM_config.h Header of Pulse Width Modulation configuration + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/PWM_handlers.c Pulse Width Modulation handlers + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/PWM_handlers.h Header of Pulse Width Modulation handlers + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/sensor_cfg_usr.c Header for user Mesh Sensor Model configuration + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/svcctl_conf.c Service Controller configuration API + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/tl_conf.h Configuration file of the Transport layer + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/tl_dbg_conf.h Debug configuration file for stm32wpan transport layer interface. + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/tl_if.c Transport Layer interface + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/user_if.h Header file for User interface file + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/user_if.c User interface file + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/vcp_conf.h Configuration of the vcp interface + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/Target/hw_ipcc.c IPCC Driver + + +@par Hardware and Software environment + + - This example runs on STM32WB15xx devices. + + - This example has been tested with an STMicroelectronics STM32WB15RCC-Nucleo + board and can be easily tailored to any other supported device + and development board. + +@par How to use it ? + +This application requires having the stm32wb1x_BLE_Stack_basic_fw.bin binary flashed on the Wireless Coprocessor. +If it is not the case, you need to use STM32CubeProgrammer to load the appropriate binary. +All available binaries are located under /Projects/STM32_Copro_Wireless_Binaries directory. +Refer to UM2237 to learn how to use/install STM32CubeProgrammer. +Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the +Wireless Coprocessor binary. + +In order to make the program work, you must do the following: + - Open your preferred toolchain + - Rebuild all files and load your image into target memory + - Run the example + +For more details refer to the Application Note: + AN5292_STM32WB_How_to_build_BLE_Mesh_Application + +@Introduction + +The ST BLE-Mesh library supports all of the following features in a Mesh node: +1. Relay: to forward received network PDUs on advertising or GATT bearer, if the Proxy feature is enabled +2. Proxy: to forward received network PDUs between GATT and advertising bearers +3. Friend: can perform duties such as scanning for other associated nodes that are usually Low Power mode +4. Low Power: consumes much less power as the node usually does not perform any scanning +A typical BLE Mesh node radio should always be in scanning mode to avoid missing packets over the air, but this kind of +operation is not supported by many devices due to continuous energy requirements. +To enable low power operation, BLE Mesh Profile v1.0 defines the concept of Friendship. +In a Mesh network, a Low Power feature-enabled Mesh node (LPN) offloads its packet receiving (scanning) duty to an adjacent +Friend feature-enabled Mesh node (FN). The LPN is not always scanning and remains inactive (or sleeps) for most of its life +cycle, significantly reducing its energy requirements. Nodes running on batteries or energy harvesting techniques usually +support the Low Power feature. +Once connected to each other, the FN and LPN are considered friends and their connection is known as a Friendship. At least +one FN must be in the direct radio range of an LPN to establish Friendship. + +@Configuration + +Low Power Node +Low Power feature support is defined in mesh_cfg_usr.h by the predefinition of ENABLE_LOW_POWER_FEATURE. +Note: A Low Power feature-enabled node does not support any other feature: all the other features should be +undefined. + +@Demo setup based on STM32WB15CC-Nucleo + +General default setting defined in mesh_cfg_usr.h: + ENABLE_GENERIC_MODEL_SERVER_ONOFF (1) /* GENERIC SERVER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_VENDOR_MODEL_SERVER (1) /* VENDOR SERVER MODEL ON FIRST ELEMENT */ + APPLICATION_NUMBER_OF_ELEMENTS 1 /* NUMBER OF ELEMENT SUPPORTED */ + APPLICATION_SIG_MODELS_MAX_COUNT 1 /* TOTAL NUMBER OF MODELS SUPPORTED */ + APPLICATION_VENDOR_MODELS_MAX_COUNT 1 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + ENABLE_RELAY_FEATURE /* RELAY SUPPORT */ + ENABLE_PROXY_FEATURE /* PROXY SUPPORT FOR GATT CONNECTION */ + ENABLE_FRIEND_FEATURE /* FRIEND SUPPORT FOR FRIENDSHIP WITH LOW POWER NODE */ + ENABLE_PB_ADV /* Provisioning Bearer over advertising channels support */ + ENABLE_PB_GATT /* Provisioning Bearer over GATT proxy support */ + +The following demo based on STM32WB15CC-Nucleo has been set up using one board as a Friend node and two +boards as Low Power nodes. + +Low Power Node setup (use the Low Power Node BLE_MeshLightingLPN project): +Step 1. Configure LPN parameters. + Change only if required otherwise skip this step (use example parameters defined in mesh_cfg_usr.h) + LPN_RSSI_FACTOR_LEVEL 1 + LPN_RECIVE_WINDOW_FACTOR_LEVEL 1 + LPN_MINIMUM_QUEUE_SIZE_LOG 2 + LPN_RECEIVE_DELAY 150 ms + LPN_POLL_TIMEOUT 2000 (*100 ms) + LPN_RECEIVE_WINDOW_SIZE 55 ms + LPN_SUBSCR_LIST_SIZE 2 + LPN_FRIEND_REQUEST_FREQUENCY 50 (*100 ms) + LPN_FRIEND_POLL_FREQUENCY 25 (*100 ms) + LPN_MINIMUM_RSSI -100 + LPN_NO_OF_RETRIES 10 +Step 2. Generate and flash binary in 2 boards (LPN1, LPN2) + +Friend Node setup: +Step 1. Generate and flash binary in a board (FN) +Step 2. Provision the 3 boards with the default parameters, using BLE-Mesh Android (https://play.google.com/store/apps/details?id=com.st.bluenrgmesh&hl=en) or + BLE-Mesh iOS (https://apps.apple.com/us/app/st-ble-mesh/id1348645067) smartphone application (subscribe and publish to default group) + +Demo operation +After provisioning, it might take a few seconds for Friendship to be established between FN and LPNs. +In this demo, the FN establishes Friendship with LPN1 and LPN2 +Any packet targeted to LPN1/LPN2 or to a group address subscribed by LPN1 or LPN2 is put in queue by the FN +that forwards packets to LPN1/LPN2 as soon as it receives a Friend Poll from the respective LPN. +The LPN is free to send packets (generate traffic) any time. + +By pressing [SW1] button on the Friend Node: +1. FN publishes a LED ON command to the default group and the FN blue LED immediately turns on (when the +FN belongs to the default group). +2. FN forwards a LED ON command to the LPNs subscribed to the default group. As soon as the FN receives +poll from an LPN, it sends LED ON to the respective LPN. + + FN LPN1 LPN2 + | | | + SW1 PUSH->| | | + Blue LED on->| | | + |<--Friend Poll--| | + | | | + |-----LED on---->|<-Blue LED on | + | | + |<----------Friend Poll----------| + | | + |-------------LED on------------>|<-Blue LED on + | | + +By pressing [SW1] button on the Low Power Node 1: +1. LPN1 publishes an LED OFF command to the default group. LPN1 blue LED tunrs off. + LPN1 immediately forwards LED OFF command to the default group. +2. FN receives an LED OFF command (as it is subscribed to the default group) and the FN blue LED turns off. +3. FN also sends an LED OFF command to LPN2 (subscribed to the default group) as soon as FN receives + poll from LPN2. + + FN LPN1 LPN2 + | | | + | SW1 PUSH->|<-Blue LED off | + Blue LED off->|<----LED off----| | + | | + |<----------Friend Poll----------| + | | + |------------LED off------------>|<-Blue LED off + | | + +*

                                                        © COPYRIGHT STMicroelectronics

                                                        + */ + \ No newline at end of file diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex index 3316829ba..d5eab4001 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex @@ -1,1037 +1,1071 @@ :020000040800F2 -:10000000081000207D3D0008193E00081B3E000836 -:100010004B3F00084F3F0008533F0008000000001E -:100020000000000000000000000000001D3E00086D -:100030001F3E000800000000213E0008233E00088B -:10004000573F00085B3F00085F3F0008393E00084B -:10005000633F0008673F0008273E00086B3F000829 -:100060006F3F0008733F0008293E0008773F0008F3 -:100070007B3F00087F3F0008333E0008833F0008B5 -:10008000873F00088B3F00088F3F000800000000FA -:1000900000000000933F0008973F00082B3E000837 -:1000A0009B3F00089F3F0008A33F0008A73F0008B0 -:1000B000AB3F0008AF3F0008B33F0008B73F000860 -:1000C0000000000000000000BB3F0008000000002E -:1000D0002D3E0008BF3F000800000000C33F00089D -:1000E000C73F0008CB3F000800000000CF3F0008DA -:1000F000413E00083D3E0008D33F0008D73F0008BE -:10010000DB3F0008000000000000000000000000CD -:10011000DF3F0008E33F0008E73F00080000000061 +:1000000008100020993F00083540000837400008DC +:10001000674100086B4100086F41000800000000C4 +:10002000000000000000000000000000394000084F +:100030003B400008000000003D4000083F40000831 +:1000400073410008774100087B41000855400008D3 +:100050007F410008834100084340000887410008B1 +:100060008B4100088F41000845400008934100087B +:10007000974100089B4100084F4000089F4100083D +:10008000A3410008A7410008AB41000800000000A0 +:1000900000000000AF410008B341000847400008DD +:1000A000B7410008BB410008BF410008C341000838 +:1000B000C7410008CB410008CF410008D3410008E8 +:1000C0000000000000000000D74100080000000010 +:1000D00049400008DB41000800000000DF41000843 +:1000E000E3410008E741000800000000EB41000880 +:1000F0005D40000859400008EF410008F341000846 +:10010000F7410008000000000000000000000000AF +:10011000FB410008FF410008034200080000000006 :1001200000000000000000000000000000000000CF -:100130000000000000000000EB3F000838B504009C +:1001300000000000000000000742000838B504007D :1001400009D004F18005686808B900F01EF800F0D5 :1001500021F8012801D1012032BDA06A08B100F0C8 :100160002AF800F00AF821F02A01FFE7816000F088 -:100170001BF8BDE8324000F0B6BA2068416821F4AF +:100170001BF8BDE8324000F0E8BA2068416821F47D :1001800090414160206881687047002129702046B5 -:1001900000F087BB24206860206801684908490096 -:1001A0000160204600F040B92068016841F001017B -:1001B000016020467047204600F032BA816821F085 -:1001C000400181607047206881684A067047206856 -:1001D000016821F0100101607047F8B5044640F64F -:1001E0000F002668F1693268B368084004F15C05C5 -:1001F0000ED1880602D5900602D4D80040F1808046 -:100200006969002900F00E812046BDE8F4400847E6 -:10021000DFF8E405034204BFDFF8E0753A426FD02F -:10022000CF0707D5D70505D5012737622E6B46F0D6 -:1002300001062E638E0708D5DE0706D5276802263D -:100240003E622E6B46F004062E634E0708D5DE078D -:1002500006D5276804263E622E6B46F002062E6302 -:100260000E070AD5960601D4034206D02668082058 -:100270003062286B40F008002863080509D550015A -:1002800007D526684FF400603062286B40F02000EC -:100290002863286B002832D0890607D5900601D440 -:1002A000D80003D5696909B120468847286B2168C1 -:1002B0008A68510602D410F0280F1BD0204600F0A7 -:1002C00080FAFFF780FF10D5FFF778FF286A60B14A -:1002D0000FF22D518163286A00F0EFFB00280ED049 -:1002E000286A816BBDE8F44008472046BDE8F2402B -:1002F00000F0AABC204600F0A7FC00202863F1BD56 -:100300002869012853D1CF0651D5D0064FD51020EA -:10031000306222689068410626D5296A08684068DC -:1003200080B20028EBD02B8898427BDA688008687E -:1003300001688B0614D4106820F480701060206867 -:1003400081684908490081602068FFF737FF202055 -:10035000E86200202861FFF73AFF286A00F077FB87 -:1003600029886888091A1CE028886988411A6888E1 -:1003700000281CBF88B2002854D01368DFF890040E -:1003800023F49073136022689368034093602020E5 -:10039000E8620020286168612068026822F010028B -:1003A00002602046BDE8F44089B200F04EBCC802AD -:1003B00009D5580207D54FF4801030622046BDE8B9 -:1003C000F24000F043BC080609D5100601D418021B -:1003D00005D5A96931B32046BDE8F4400847480671 -:1003E0000ED550060CD5306820F04000306020213A -:1003F000A9620020A8612046BDE8F24000F0B5BA2D -:10040000080206D5500004D52046BDE8F24000F0B1 -:100410001EBCC80148BF002A04D52046BDE8F240F2 -:1004200000F016BCF1BD0000F8B50446DFF8E403A7 -:100430002168DFF8E4C30A68DFF8E0730240A068CF -:1004400002432069024360690243E06902430A6093 -:1004500000254A68E06822F4405202434A60A369DA -:100460006E4A91421CBF206A03438E68DFF8B003D6 -:10047000064033438B600FF2B436CB6A606A1B09C7 -:1004800040EA0313CB626145DFF898034FF4004361 -:1004900039D13F6807F00307032F4DD8DFE807F095 -:1004A000024643494FF0010CE169B1F5004F4FF6A8 -:1004B000F07740F08080BCF1010F09D0BCF1020F51 -:1004C0000AD0BCF1040F71D0BCF1080F71D099E0D3 -:1004D00000F01BFC002815D0626A616836F8123003 -:1004E000B0FBF3F04A0802EB4002B2FBF1F080B23D -:1004F000A0F11001B942EAD20740C0F3420007431D -:100500002068C7607FE0914216D13F6817F44067CA -:1005100023D0B7F5806F09D0B7F5006F03D0B7F5DA -:10052000406F06D008E04FF0020C07E04FF0040CDB -:1005300004E04FF0080C01E04FF0100C9142B3D1F1 -:10054000BCF1000F09D0BCF1020F0AD0BCF1040FBE -:1005500015D0BCF1080F15D054E000F0CEFB0028F8 -:1005600051D0616A36F81120B0FBF2F6626802EBF6 -:1005700042018E4246D31103B14205D242E000F05F -:1005800072FBECE71846ECE75008002110EB062060 -:1005900051EB1661002300F0D5FBA0F54071DFF8A8 -:1005A000882291422ED22268D0602CE000F05BFBC2 -:1005B00090E7184690E7BCF1010F09D0BCF1020F9B -:1005C00009D0BCF1040F18D0BCF1080F18D019E005 -:1005D00000F09BFBB8B1626A36F812306168B0FB7C -:1005E000F3F000EB5100B0FBF1F080B2A0F110018C -:1005F000B94207D22168C86005E000F034FBE9E7A2 -:100600001846E8E7012504F16800012141800180D6 -:1006100000218160C1602846F2BD000000800040DA -:1006200090F82810CA0706D502685368C16A23F4F7 -:1006300000330B43536090F828108A0706D50268F0 -:100640005368016B23F480330B43536090F82810F8 -:100650004A0706D502685368416B23F480230B4395 -:10066000536090F828100A0706D502685368816B1A -:1006700023F400430B43536090F82810CA0606D5B4 -:1006800002689368C16B23F480530B43936090F826 -:1006900028108A0606D502689368016C23F400537B -:1006A0000B43936090F828104A0610D502685368EF -:1006B000416C23F480130B435360416CB1F5801FF0 -:1006C00005D15368816C23F4C0030B43536090F849 -:1006D00028100A0606D501684A68C06C22F4002278 -:1006E00002434A607047F8B5044604F180050020D3 -:1006F000E8606FF07E4700F03DFC06462068016828 -:100700000A0708D50097334600224FF4001120460F -:1007100000F017F860B9206801684A070AD5009709 -:10072000334600224FF48001204600F00AF808B159 -:100730000320F2BD20206860A8600020E0662870D9 -:10074000F2BD2DE9F041069C05460E4690461F4637 -:100750002868C1693140B1420CBF012000204045EA -:100760001CD114F1010FF3D000F004FCC01B844233 -:1007700000D314B900F015F80CE0286801684A07A6 -:10078000E6D5C1690A05E3D54FF40062026200F0C4 -:1007900008F8C16000210170032000E00020BDE8DE -:1007A000F0812868016821F4D071016028688168AF -:1007B00049084900816005F1800020214160816085 -:1007C000704701680A6822F490720A60DFF84010EE -:1007D000026893680B409360C16E012904D10168DF -:1007E0000A6822F010020A602021C0F88810002157 -:1007F000C16601677047000001000010200100047D -:10080000806A00F1560100220A810A8000F01CBAB9 -:10081000FEFFFFEFF369FFCF00380140880000586A -:10082000FFF4FF110024F40000FD0F00010002009E -:100830000400060008000A000C0010002000400020 -:10084000800000014E4900E04E4981B00A68024331 -:100850000A60096808400090009801B0704798B994 -:1008600049484A4901604FF4E1314160002181600B -:10087000C160016181610C2141614FF40041C1619E -:1008800000218162FFF75ABC7047002804BF3E4830 -:10089000FFF7A3BC704718B93B48806F00F043B91D -:1008A000704738B586B004466846142100F068FBEE -:1008B0002168364A914248D10120FFF7C5FF4FF425 -:1008C000007000F044F80120FFF7BEFF4FF4806095 -:1008D00000F03DF82F48304D816A8908890041F0C9 -:1008E000010181620022016841F4804101600F2111 -:1008F000006800F4804005900598242000F060FB1B -:10090000242000F07BFB0120FFF79CFF0420FFF771 -:1009100099FF224828600F2068601020A8600020FE -:10092000E8608020286100206861A861E861286291 -:10093000284600F035F8A567AC6200220F210E2092 -:1009400000F03EFB0E2000F059FB07B030BD0090D8 -:1009500002210020019102900321072003910490BD -:1009600069464FF0904000F09FBB006807498842FD -:1009700004D107490868002818BF004770470000E5 -:10098000480000584C000058E0200020003801408A -:100990001024002060000058802200204400024003 -:1009A00038B5040001D1012032BD2168DFF8800292 -:1009B0004018142204F12405B0FBF2F2DFF87402AF -:1009C000E86192002A62022068700A68A0686FF3EA -:1009D0000E120243E0680243206902436069024349 -:1009E000A0690243E0690243206A02430A6020468C -:1009F00000F0F9F8A068B0F5804F04BF00216160F5 -:100A00002079696A00F03F0000F014F838B1052839 -:100A100005D2204600F0FBF800F012F803E00020B9 -:100A200028636863A8630020A86101206870002023 -:100A3000287032BD0860A96AE86A4860606870473B -:100A4000296B00200860696BA86B4860704781B013 -:100A500040B100F124014A78022A05D004208861BF -:100A600000200870012026E00268136823F00E03BE -:100A700013604A6A136823F4807313600068026885 -:100A8000520852000260012091F82020CB6902F048 -:100A90001C02904058608A6AC86A5060086B30B186 -:100AA000026822F4807202604A6B886B50600120F9 -:100AB00048700020087001B0704738B500F124027A -:100AC00000245178022903D004209061012428E0F9 -:100AD00001680B6823F00E030B6001680D686D0858 -:100AE0006D000D60516A0B6823F480730B60012167 -:100AF00092F82030D56903F01C0399406960936A2D -:100B0000D16A5960116B31B10B6823F480730B60AB -:100B1000536B916B5960012151701470516901B18F -:100B20008847204632BDF8B500F124010423CA6984 -:100B300014680268156891F8206006F01C0603FA34 -:100B400006F73C4210D06F070ED51468A50603D4F3 -:100B5000156825F00405156000F03DF8C968002906 -:100B600038D0BDE8F4400847022303FA06F73C42B8 -:100B700013D0AF0711D51468A50605D4156825F064 -:100B80000A05156001224A7000F025F800220A705B -:100B90008968F9B1BDE8F4400847082303FA06F66E -:100BA000344217D02B0715D5136823F00E031360BA -:100BB000012291F82030CC6903F01C039A40626056 -:100BC00001228A614A7000220A70096911B1BDE8E8 -:100BD000F4400847F1BD91F82020CC6902F01C02D6 -:100BE000934063607047426C1349920801EB8201A5 -:100BF0008164142201780839B1FBF2F10F4AC26412 -:100C000001F01F01012202FA01F10165704701792B -:100C10000B4A01F03F0102EB81024265491E094A7D -:100C2000826501F0030101228A40C265704700001D -:100C3000F8FFFDBF000002400008024080080240AB -:100C4000FC080240400902407047704770477047F7 -:100C5000704700004FF0B040006800F0F000B0288E -:100C600088BFB020704738B54FF0B044304DA16810 -:100C700011F00C0106D1FFF7EDFFC0F3031055F89A -:100C8000200032BD04292B4A05D008292A4804D166 -:100C90002168C90222D5104632BDE16801F0030186 -:100CA000022904D0032904D12168C90207D51046BE -:100CB00005E0FFF7CFFFC0F3031055F82000E1680F -:100CC000E268E368C1F306214843C2F30211491CFC -:100CD0005B0FB0FBF1F05B1CB0FBF3F032BD80B5F5 -:100CE000FFF7C1FF1149FFE7144A0968C1F3031177 -:100CF00052F82110B0FBF1F002BD80B5FFF7EFFF15 -:100D000000F010F8C1F3022106E080B5FFF7E7FF1D -:100D100000F008F8C1F3C22112F8211001F01F0100 -:100D2000C84002BD0149064A0968704708000058DA -:100D3000843C00080024F4000048E801443C00081A -:100D4000F03E0008B3BBD9B1B2F5803F7DD2022A94 -:100D50001ED98C46B1FBF2F102FB11C31B0443EA1E -:100D60001043B3FBF2FC02FB1C3380B240EA0343A6 -:100D7000B3FBF2F002FB103240EA0C400023704754 -:100D8000022A05D98446B0FBF2F002FB10C270477C -:100D90004AB105D100F0010249085FEA300070470E -:100DA00000220023704700F04BBA0B000200002124 -:100DB00000207047904271EB030CF6D3B3F5803FEF -:100DC0002FD2F0B5B3FA83F7B1FA81F4A7F10F0E81 -:100DD0003D1B5340CEF1200602FA0EF2F341534080 -:100DE000B5F10F0746D80F3C2C444140C4F1200612 -:100DF000A040F1414140B1FBF3F603FB1611A2FB09 -:100E00000645001BA94102D2761E8018594180EA8E -:100E1000010221FA0EF362FA0EF200215A40304626 -:100E2000F0BD30B4B1FBF3FC03FB1C11A2FB0C457D -:100E3000001BA94103D2ACF1010C8018594130BC10 -:100E400002460B46604600217047B2F1807F65D3B1 -:100E5000F0B5B2FA82F7B1FA81F4C7F10F063D1B83 -:100E600022FA06F307F1110EF24120355A40B5F18E -:100E70000F07B8D94140C4F12006A040F1414140DC -:100E8000B1FBF3FC03FB1C11A2FB0C45001BA941A9 -:100E900003D2BCF1010C801859410F2F12D30F3F20 -:100EA000C90341EA5041B1FBF3F603FB1611A2FB63 -:100EB0000645D4EBC030A94102D2761E80185941B4 -:100EC00046EACC3C07B34140C7F12006B840F141A7 -:100ED0004140B1FBF3F603FB1611A2FB0645001BD4 -:100EE000A94102D2761E8018594180EA010221FAF6 -:100EF0000EF3C7F1200462FA0EF20CFA07F05A4022 -:100F00002CFA04F13043F0BD80EA010221FA0EF31D -:100F1000002162FA0EF260465A40F0BD8C46B1FBE9 -:100F2000F2F102FB11C31B0243EA1063B3FBF2FCB4 -:100F300002FB1C331B024CEA002043EA1063B3FBA4 -:100F4000F2FC02FB1C331B024CEA002043EA106354 -:100F5000B3FBF2FC02FB1C331B024CEA002043EA09 -:100F60001063B3FBF2FC02FB1C324CEA00200023AE -:100F70007047000001484068704700BFD020002043 -:100F8000002200F05FB900000901020081B002D424 -:100F90003C48815405E03C4802F00F02104400F840 -:100FA000041C01B07047394A13684FF6FF01000274 -:100FB0000B4000F4E0601843354908431060704767 -:100FC00038B5324B1C68C4F30223C3F10704052C67 -:100FD00028BF04241D1D072D34BF0023DB1E01255F -:100FE00005FA04F4641E2140994005FA03F35B1EE0 -:100FF0001A401143BDE83440C6E70000010007D4A1 -:10100000012200F01F01234B8A40400943F82020B1 -:10101000704701000BD4012200F01F011E4B8A40D3 -:10102000400943F82020BFF34F8FBFF36F8F704705 -:1010300010B5401EB0F1807F01D3012010BD174CC8 -:1010400060600F214FF0FF30FFF79EFF0022A2608B -:1010500007202060002010BD010007D4012200F00D -:101060001F010F4B8A40400943F8202070470100C0 -:1010700007D4012200F01F010A4B8A40400943F8BF -:101080002020704700E400E018ED00E00CED00E0E7 -:101090000000FA0500E100E080E100E010E000E07F -:1010A00000E200E080E200E02DE9F84F4FF0000997 -:1010B0005D4A5E4B4FF00F0805460E4633E05C4F2D -:1010C000BD4214BF072704278F4027434CF82E70DA -:1010D000C1431C6801EA040C7468E40348BF40EA99 -:1010E0000C0CC3F800C05C6801EA040C7468A4032B -:1010F00048BF40EA0C0CC3F804C0146801EA040CB1 -:101100007468E40248BF40EA0C0CC2F800C054689E -:1011100001EA040C7168890248BF40EA0C0CC2F86D -:1011200004C009F10109316831FA09F072D00124D3 -:1011300004FA09F414EA0100F3D04FEA490C032140 -:1011400001FA0CF16FEA010E7168012918BF02293A -:1011500003D0112918BF122911D1A968F7680EEA26 -:10116000010107FA0CF73943A960696821EA040410 -:101170007168C1F3001101FA09F10C436C60E96870 -:10118000B4680EEA010104FA0CF42143E9604FEA65 -:1011900089017468022C18BF122C12D14FEAD904AD -:1011A00005EB840401F01C07D4F820A008FA07FB23 -:1011B0002AEA0B0AD6F810B00BFA07F747EA0A0733 -:1011C00027622C680EEA0407347904F0030404FA59 -:1011D0000CF43C432C607468E400A2D5DFF854C0E2 -:1011E0004FEA990E5CF82E7001F00C0108FA01F438 -:1011F00027EA0404B5F1904F08BF002709D00E4F2D -:10120000BD4208BF012704D00C4FBD427FF457AF49 -:10121000022759E7BDE8F18F81B0002A14BF816130 -:10122000816201B070470000000800588008005833 -:101230000010004808000140000400480008004871 -:101240007047000000B500BF130096469446103961 -:1012500028BFA0E80C50FAD85FEA417C28BF0CC038 -:1012600048BF40F8042BC90728BF20F8022B48BF0D -:1012700000F8012B00BD0000DFF8F0140A6892B2FC -:1012800000E00246086880B28242FAD170472DE938 -:10129000FC4104461825DFF8D884DFF8D864684399 -:1012A00008EB00073078062808D131787170347067 -:1012B00078754FF0FF307060002039E000F077F86B -:1012C000B9680918B96008F10803B96832786A4347 -:1012D0009A589142327813D308F1150315FB02FC9A -:1012E00013F80C30062B25D008F108066B43F35891 -:1012F000994222BF08F115036A439A5CEED219E0C5 -:101300001146337869439A420BD008F1140308F16F -:10131000150C5B5C15FB03F50CF805407A753B7505 -:1013200000E07A7508F11402545431787170347009 -:10133000BDE8F6811146694308F115035B5C062B95 -:1013400004D008F1140615FB03F574557B753A7546 -:1013500008F115025454EBE7F8B5DFF81834DFF85C -:1013600010541E78182402466243B0422A4404D125 -:1013700018785870507D18700FE0167D507D92F8E7 -:1013800015C005F115076643062807F806C004D006 -:10139000167D143514FB00F42E55012010731878B7 -:1013A000062802BF00294FF0FF315960F1BD10B58A -:1013B000DFF8C043606810F1010F0FD0FFF75CFF4A -:1013C0006168DFF8B423814261683CBF5388C91863 -:1013D000081A517848431178C84000E0002080B2D4 -:1013E00010BD2DE9F84FDFF89053DFF890B3D5F832 -:1013F0000880D8F80000DBF800104A0500F06AF910 -:10140000DFF87063DFF868A321F4806181604FF03A -:10141000180934780AF1080019FB04F14758FFF75E -:10142000C6FF874217D200270121B170062C3DD09C -:1014300019FB04F40AF108010AF108020959814272 -:1014400023BF0AF108010959091A002111510AEBB9 -:1014500004014C7DEAE7A9884118B94202D2AF885D -:101460000021E2E73F1ADFE7022802DA28780128A4 -:1014700000D07F1ED8F80000C1684A07FAD500F0F6 -:101480002FF9DBF80C00000CBFB247EA0047CBF89D -:101490000C70FFF7F1FE7060A8680068816841F485 -:1014A00080618160AFF30080BDE8F18FB8B20028A1 -:1014B000DAD1FFF7E1FE70600320BDE8F24FFFF7DD -:1014C000CBBD2DE9F843EFF3108872B6AA4DA84BB7 -:1014D000A8680168CA224A6253204862A54A8868FF -:1014E00020F48060886018201678374647431F44F0 -:1014F000387B022826D13C68D7F810909078F0B15C -:101500007A7B012A0AD101213046FFF725FF88F3B3 -:1015100010887968304600F0F0F804E088F310880D -:10152000304600F09BF8A8680068CA214162224654 -:10153000532141624846314600F02AF90BE0FFF79B -:1015400050FF06E0C8684207FCD500F07EF88C49E1 -:10155000086088F31088FF21A86802685162BDE81E -:10156000F183F8B5844CA160CA2209684A6253220B -:101570004A62824A136843F020031360136803F041 -:101580000703C3F10403237095682D0C05F07F0554 -:101590006D1C6570EDB29268C2F30E02521C62803F -:1015A00092B2521E6A43A2F5A072DA404FF6FF7360 -:1015B0009A422CBFA380A280724A136843F400238E -:1015C0001360714B1D6845F400251D6048BB6948D8 -:1015D000674E0123837018254FF0FF3343600023CB -:1015E0005FFA83FC06F10C0715FB0CFC4FF0000EB4 -:1015F00007F80CE05B1CDFB2062FF1DB062303705B -:10160000886820F48060886000F01FF8D0600320B4 -:10161000FFF72DFDA1680868826842F4804282606D -:1016200005E0C868410544BF0320FFF715FDA16828 -:101630000A68FF205062002203210320FFF7C0FC4C -:10164000BDE8F2400320FFF7D9BCC86800F0800075 -:1016500060F49060C8604FF400207047F8B507460A -:10166000EFF3108472B60320FFF7D3FC424DAE684F -:101670003068CA2141623A465321416218204349E9 -:101680004243895C02291BD100213846FFF764FEE2 -:101690003848017806290ED1306838490A68530560 -:1016A00000F018F821F480618160C1684A07FCD518 -:1016B00000F016F804E04078884218BFFFF791FE6A -:1016C000A9680A68FF2050620320FFF797FC84F3A3 -:1016D0001088F1BD02D5C1684A07FCD48168704703 -:1016E000C16801F0800161F49061C1604FF4002095 -:1016F000234908600320FFF7BABC2DE9F04180467A -:101700000F46424618201A4942438C18207B022873 -:1017100004BF4046FFF7A2FFEFF3108572B6032027 -:10172000FFF777FC144EB0680068CA21416253216C -:10173000416202202073A76067604046FFF7A7FD63 -:101740000C490A784978914202D0FFF74AFE02E03C -:10175000A168081AA060FF20B1680A6850620320DF -:10176000FFF74CFC85F31088BDE8F0812828004085 -:101770007021002004240020742300200828004049 -:101780000C08005800080058800800587C210020F0 -:101790001047000018B595B009A80FF2C421894C74 -:1017A000302200F085F90FF26D2001900094694617 -:1017B0000FF2492000F0C0F90121022000F0A5FA43 -:1017C000814A0021012000F01CFB09A800F0BFFBAA -:1017D00008B100F083FC0020ADF81A0000F080FC96 -:1017E00000F0D3F802460621002000F09DFC4EF6E2 -:1017F0006E50089007AA75490868079006212E20A8 -:1018000000F092FC0FF230221021182000F08CFC26 -:101810000FF234221021082000F086FC182101204C -:1018200000F0A9FC00F0D2FC0DF1160006A9019011 -:10183000009105AB07220021012000F087FE0FF286 -:10184000E810BDF8181000900723BDF8140000221E -:1018500000F07CFD0DF11A0000900223BDF8161077 -:10186000BDF81400002200F071FD002000F022FEFF -:101870000020049010235649039108200022019370 -:101880000090029200230121012000F02CFE00F0C4 -:10189000F1FE50484FF4004101600221006F0191B8 -:1018A00000F0FF004FF000514A7802920D2A0ED24C -:1018B00000200870BFF34F8F474948480A6802F478 -:1018C000E06202430A60BFF34F8F00BFFDE78978F3 -:1018D0000391891888423CBF801A039000F05FFF93 -:1018E000694601A800F0B6FF00F067FF00F04DF870 -:1018F0003B4942790A7202794A72C2788A728278C6 -:10190000CA7242780A730278521C4A7306214279DD -:101910008DF8052002798DF80420C2788DF8032017 -:1019200082788DF8022042788DF801206A4600788E -:10193000401C8DF80000002000F0F6FB00F00AF8D3 -:1019400016B010BD80B54078052808BF00F002F839 -:10195000012002BD00B587B000200690059000224E -:101960000FF2F400049208210023029001910092EA -:101970000393A0228021002000F053FD07B05DF802 -:1019800004EB17490E2000F011BE80B50F490A681C -:1019900012F1010F0DD013484B6802701B0A120A96 -:1019A000427049688170C370190A01711B0C437140 -:1019B00002BD002000F0C8FF08B90FF2740002BD9C -:1019C00000000000A0080320771B00088075FF1F9F -:1019D00007B20100104000580CED00E00400FA05C9 -:1019E000C0200020DC2300200021012000F016BAD6 -:1019F000012000F039BA012000F03EBA10B50446CB -:101A0000616801F1080000F045FE00B1012020707E -:101A100010BD000010B1012803D07047012000F074 -:101A200011BA00F017BA0000424C45636F726500AE -:101A30000000000000000000123456789ABCDEF06E -:101A4000123456789ABCDEF0FEDCBA098765432171 -:101A5000FEDCBA09876543210953544D5F4F544159 -:101A60000000000000000000000000000000000076 -:101A7000000000001E0004000A05020112279C005D -:101A8000F4010000FFFF00004801010000200000F9 -:101A900062B38B0708D0521E11F8013B00F8013BDE -:101AA00000F024808B07F6D1830740F0208000BF30 -:101AB000103A07D330B4B1E83810103AA0E8381023 -:101AC000F9D230BC530724BFB1E80810A0E80810D1 -:101AD00044BF51F8043B40F8043BD20724BF31F81F -:101AE000022B20F8022B44BF0B7803707047121FA3 -:101AF00017D35B0009D151F8043B20F8023B1B0CC3 -:101B0000121F20F8023BF6D20BE051F8043B00F81C -:101B1000013B1B0A20F8023B1B0C121F00F8013B83 -:101B2000F3D238BF121D521E24BF11F8013B00F83A -:101B3000013BF8D8704700007FB50C466D4D6168D9 -:101B40006D4EE8612962284600F010FF246805F117 -:101B5000240000604060746006F10800006040608E -:101B600001203070296829B10FF2551000900294BD -:101B7000684688477FBD1FB55F4C04F1080000F040 -:101B800002FF00BB2178F1B1694604F1080000F0C2 -:101B900023FF5848C16949B10098029001228DF88D -:101BA000042001A888479DF8040000E0012020706F -:101BB000207818B1009800F0C4FF04E0009904F107 -:101BC000080000F0E9FE04F1080000F0DCFE28B98E -:101BD000207818B104F10800FFF706FF1FBD2DE9BA -:101BE000F8430646002000F05FF874883088B26839 -:101BF000DFF80081C4F3090444EA8024F068A4B249 -:101C0000C1B2204600F03CF8002748F2E8094846F7 -:101C1000FFF7F1FE08E06888A04202D13169287818 -:101C20000870687800B1012708F1240000F0ABFECD -:101C3000F0B9694608F1240000F0CEFE009800F1EA -:101C40000B05407A0F28E6D0B5F80110A1420DD15E -:101C50000098817AC81E7169C0B28842C8BF084620 -:101C6000706102463069E91CFFF712FF2878D9E756 -:101C70003800CCD0012000F017F80020BDE8F28336 -:101C800010B513461C4A5468A4F80900E1720A46CC -:101C9000194604F10C00FFF7FBFE164A1369BDE874 -:101CA00010400021002018471249096A82B008B983 -:101CB00021B101E011B1012002B0084702B0704724 -:101CC00010B50146487A0F2818BF0E2807D10B48D7 -:101CD00000F06CFEBDE810400020FFF789BE064C06 -:101CE00004F1080000F062FE04F10800BDE81040B5 -:101CF000FFF77ABEE0220020B0230020042300205A -:101D00000C48002101604160704710B500F00CF8EC -:101D10005C6819B1012904D1204301E024EA0000E4 -:101D2000586082F3108810BDEFF3108272B6014B39 -:101D300070470000E42300202DE9FC475B4CDFF8EE -:101D40007091A5692840A0614FF0FF3A4FF001085B -:101D500030E0491C54F831000642FAD004EBC106C9 -:101D6000184071681040014208BFC6F804A07768A7 -:101D7000384000F09FF8606208FA00F0874377600F -:101D8000EFF3108172B6626A206908FA02F2D24358 -:101D900010402061022004EBC00353F8086C164089 -:101DA000401E43F8086CF6D181F31088606A59F838 -:101DB0002010884763692069A2691840104207D043 -:101DC000E069216A084203D1002103EA0206C1E763 -:101DD000C4F824A0C046C046EFF3108972B621694A -:101DE00060690140A069014201BFE169206A0142C6 -:101DF00000F0A5FF89F31088C046C046A561BDE884 -:101E0000F38738B51446EFF3108572B600F052F838 -:101E1000274941F8204085F3108831BD10B500F006 -:101E20000BF804431C6153F83140204343F8310060 -:101E3000FFE782F3108810BDEFF3108272B61B4BE0 -:101E40001C697047EFF3108172B6184A536923EA90 -:101E5000000005E0EFF3108172B6144A536918438D -:101E6000506181F310887047EFF3108172B60F4A0A -:101E7000D3691843D061F4E7F8B50C4C656A276A5A -:101E80002E4615F1010F0EBF0025012101FA05F5BF -:101E9000206202E0284600F053FF216AE069084210 -:101EA000F8D088436662E0612762F1BD9820002087 -:101EB0000022002002460020110C090404BF10205B -:101EC000120412F07F4F04BF083012020FF2180103 -:101ED00012F0704F04BF001D1201120FC0F11F005D -:101EE000895C401AC0B2704704030202010101017B -:101EF00000000000000000001FB500F038F84FF6A9 -:101F0000524000F080FF14B19DF80F0020700EE0E9 -:101F10001FB5002408B10090042409B10191241DCB -:101F20006B466A46E1B24FF6544000F06CFF9DF8F4 -:101F30000E0004B010BD00F066FF9DF80E0005B065 -:101F400000BDF8B500F014F84FF65A40F3E7F8B5C5 -:101F500000F10C026B4624214FF66640EBE7F8B522 -:101F600000F10C026B460F214FF66840E3E7044690 -:101F70006B4600220021704710B55049504C4FF479 -:101F80000040086000F08EFF606840010ED5606878 -:101F9000C0000BD400F0B2FF00F0B0FF206840F4A6 -:101FA00080302060216821F48031216000F013F836 -:101FB00000F057F84348016800220260026902F00D -:101FC0005002026100F028F800F015FE4FF0FF30DB -:101FD000FFF7B2FEFAE73C4881B0016841F4801196 -:101FE00001603F21006800F480100090009837489D -:101FF00041604161016841F47C110160026942F471 -:102000007C120261016841F03F010160026942F007 -:102010003F02026101B0704710B500F06FFF00F0A1 -:102020006DFF27482A4C016821F4407141F480710A -:1020300001600F21026842F400420260254881607D -:1020400047F6FF71C160046000F082FFCA20606241 -:10205000FF2153206062A068C008C000A0606162D8 -:1020600010BD80B500F04AFF00F048FF1448016839 -:1020700041F00101016001688907FCD5416821F444 -:10208000404141F48041416001BD38B50446FEF74E -:1020900071FF14F1010F054609D000F017FF241855 -:1020A00005E00D48016821F00401016030BFFEF732 -:1020B00061FF401BA042F4D331BD00001040005826 -:1020C000900000588008005850000058040C005838 -:1020D000002800400C23002010ED00E072B6FEE75F -:1020E00000B587B000F010F8012003220690ADF88B -:1020F0000420ADF8062000F011F800284CBFFF20A6 -:102100009DF8000007B000BD00208DF800001822E7 -:10211000002101A800F0C6BF03900691CDF814D0AD -:10212000002101A8FFF75BBD18B50C46C7B01146EA -:1021300000228DF800208DF81C008DF81D402246ED -:102140000DF11E0000F0A8FF00F02AF83F200C213E -:10215000ADF80400ADF8061007A801210390069120 -:10216000A41C049400F02CF800284CBFFF209DF81C -:10217000000048B010BD00B5C7B000F00AF80F204D -:1021800000F013F800284CBFFF209DF8000047B076 -:1021900000BD00228DF800208DF81C008DF81D1068 -:1021A0001822002101A800F07DBFADF8060007A9A4 -:1021B000022004903F22012003910690ADF80420F4 -:1021C000CDF814D0002101A8FFF709BD00B587B0F4 -:1021D00000208DF8000000F0E0F840F20110ADF8AA -:1021E00006003F220120069000F013F900284CBFA2 -:1021F000FF209DF8000007B000BD2DE9F84107461B -:102200000128C7B0884615461E4608BF022003D0E5 -:1022100002280CBF102000200DF11D010C1800F049 -:1022200036F8012F8DF81C7002D0022F18D019E05B -:1022300002273A4641460DF11D0000F02DFF2570A2 -:10224000667000F0AAF83F204FF4817100F016F894 -:10225000FF1C049700F0DFF8002805D5FF2009E0F7 -:102260001027E6E7472005E09DF8000010B94E98DA -:1022700000F067F8FFE748B0BDE8F081ADF8040072 -:10228000ADF8061007A803210390069170470322BA -:102290000021684600F006BF2DE9F64F0C460546C2 -:1022A000012CC7B09B4608BF022003D0022C0CBFF4 -:1022B000102000200DF11F010E18FFF7E8FF012C80 -:1022C000ADF81C508DF81E4002D0022C2CD02DE011 -:1022D0000227569C559DDDF85091DDF84CA1DDF8A4 -:1022E000488148993A4600F054F8A6F800B086F8BC -:1022F000028086F803A086F804907571B47100F02E -:102300004CF83F20ADF804004FF4827107A8ADF8F7 -:102310000610039003210A370497069100F07BF81A -:10232000002805D5FF2009E01027D2E7472005E067 -:102330009DF8000010B9579800F003F849B0BDE8C7 -:10234000F08FBDF8011001800020704730B5C7B094 -:102350001C464A9B00F049F800258DF800508DF886 -:102360002140224619460DF1220000F095FE00F0B2 -:1023700014F83F204FF4837100F042F8A41D049438 -:1023800000F049F800284CBFFF209DF8000047B03E -:1023900030BD0DF11F0000F07FBE1822002101A802 -:1023A00000F080BE78B5C7B04C9C4D9D00F01DF884 -:1023B00000268DF821308DF800608DF822402246ED -:1023C000294600F019F8FFF7E8FF3F204FF493711A -:1023D00000F016F8E41D049400F01DF800284CBF2E -:1023E000FF209DF8000048B070BDADF81C00ADF8AE -:1023F0001E108DF8202070470DF1230000F04CBE18 -:10240000ADF80400ADF8061007A80121039006916D -:102410007047ADF80420CDF814D0002101A8FFF7D3 -:10242000DEBB2DE9F84DC7B09446DDF840E1519A86 -:10243000559D569EDDF84CA1ADF81D108DF81C0081 -:102440004FF0000BADF81FC08DF821308DF822E061 -:1024500000F024F800F017F824F8095F668000F017 -:10246000CCF83F20832100F0ECF8574406910D375B -:10247000049700F0CEF800284CBFFF209DF8000024 -:1024800048B0BDE8F08D88F800A007AC5499E41975 -:10249000524608F10100544400F0FEBD8DF823209F -:1024A000174652998DF800B00DF1240809A8B844D8 -:1024B00000F0F2BD00B5C7B000F00CF8852000F0C8 -:1024C00090F800F0A3F800284CBFFF209DF8000012 -:1024D00047B000BD00218DF81C008DF800101822B7 -:1024E00001A800F0DFBD2DE9F841C7B04FF00008AA -:1024F00000F026F80DF12300DDF844E14E9F4F9ED9 -:10250000509D529C8DF81F30C0F800E08DF800807F -:102510008DF820708DF821608DF822508DF82740BD -:1025200000F06BF88620ADF8060007A90C2000F03B -:1025300069F800284CBFFF209DF8000000F08DB81E -:102540008DF81C0007A8417082707047F8B5C8B0BC -:1025500005460E4617461C4600F023F808A84670AC -:1025600087708DF8205000F067F88A21ADF80A10C6 -:102570003F20032100F053F8002848BFFF200ED46D -:102580009DF8000058B94F994E98BDF8012022805F -:10259000BDF803200280BDF805000880002049B086 -:1025A000F0BD07220021684600F07CBD18B5C7B019 -:1025B000044600F01EF88DF81C40224600F049F851 -:1025C00000F01BF83F208E2100F04AF8641C0494B0 -:1025D00000F01FF800284CBFFF209DF8000048B015 -:1025E00010BDADF8060007A901203F220391049019 -:1025F000704700208DF8000070471822002101A8C4 -:1026000000F050BD04903F22012003910690ADF8E8 -:102610000420CDF814D0002101A8FFF7E0BAADF8EE -:102620000800059108A8072104900791CDF818D05B -:10263000002102A8FFF7D3BA1822002102A800F057 -:1026400031BDADF80400ADF8061007A801210390D4 -:1026500070470DF11D0000F01FBD48B0BDE8F081CE -:10266000ADF80400ADF8061007A80121039006910B -:10267000704700001C490020087700221B480270A8 -:1026800000F036B818490A7F41F82200087F401C44 -:102690000877704770B504466078FF2802BFB4F829 -:1026A000031001F47F41B1F5406F12D100260E4DA9 -:1026B00000E0761C297FF0B288420AD2F1B255F8C8 -:1026C0002110204688470100F3D002D0022805D00F -:1026D00006E02046BDE87040FFF734B9002070BD29 -:1026E000012070BD00000000542300201C240020A5 -:1026F00080B5C046C046C046C046C046C046C0467B -:10270000C046C046C046C046C046C046C046C04699 -:10271000C046C046C046C046C046C046C046C04689 -:10272000C046C046C04600F019FDC046C046C0467F -:10273000C046BDE8014000F089BD0000DFF800F0B0 -:10274000692000202DE9F0413C4F064638780128E9 -:10275000884614461D4608BF02201BD0012139704F -:102760000020786000F018F8010011D1012E2246F7 -:102770002B46404602D100F054F802E01146FFF724 -:10278000DDFF00F009F82E490A6822EA06060E600D -:1027900000213970BDE8F0814FF47A7018E02A49C1 -:1027A000CA680020002A07D5284B294A0B600A6016 -:1027B000C968002948BF0120704721490A6842F0D2 -:1027C00000420A6000200968002958BF01207047B4 -:1027D00070B50546FEF7CEFB06461A4C2068C103CD -:1027E00011D5FEF7C7FB801BA842F7D3032070BDAD -:1027F000124920604860012070BDFEF7BBFB801BC2 -:10280000A84209D3F2E72068C10744BF0121216033 -:102810004CF2FA310840EBD120684103EDD400209E -:1028200070BD10B506490C6844F001040C6040F816 -:10283000042BBFF36F8F036010BD000098230020AE -:1028400014400058104000580840005823016745C4 -:10285000AB89EFCD2DE9F04100F053F8884608BF71 -:1028600002204CD000F052F800F055F8010044D19D -:102870002968DFF8C470022919D14FF0FF32C8F877 -:1028800000206E6800E0761C6968AA6851188E42C4 -:1028900008D2304600F043F800F03DF80100F2D0D5 -:1028A000C8F800607A69DFF894100A407A613968E4 -:1028B0008A050FD53A6822F400723A60396841F40B -:1028C000006139603A6822F400623A60396841F484 -:1028D000007139603A6851050FD5396821F480617B -:1028E00039603A6842F480523A60396821F4805184 -:1028F00039603A6842F480623A6000212170BDE894 -:10290000F081104C054620780128704700200121F5 -:102910006060217070474FF47A70FFF759BF084923 -:102920000A6822F4FF6242EAC00242F4803242F0B6 -:1029300002020A60704700000040005805F8FFFFDF -:10294000144000589823002001460648064AC379DF -:102950008B4218BF904218BF0838F8D18B4218BF7D -:1029600000207047F873FF1F0070FF1F02490160CD -:1029700002490161704700BF3F2A0008652A00082C -:10298000006040607047EFF3108172B602688242C7 -:102990000CBF012000201CE0EFF3108272B6036828 -:1029A0000B60486001600868416023E0EFF310822B -:1029B00072B6086043684B6041604868016019E086 -:1029C000EFF3108172B642680368136002684368CF -:1029D000536081F31088704710B5EFF3108472B61E -:1029E00002680A600068FFE7FFF7EAFF84F31088D7 -:1029F00010BD0B6082F310887047000000F09CBC93 -:102A00006C486D49016001F12002426001F1300221 -:102A1000826001F13C02026201F14402426201F172 -:102A20004C02C26001F15402026101F17002426184 -:102A300001F1740282618031C16100F09BBC38B544 -:102A400004465E4D2846FFF79BFF5A484068A16840 -:102A50000160E168C16085605949416000F0A6FCF1 -:102A600058482AE080B5534842681368012119721A -:102A7000406800F0A1FC002002BD38B5514C4F4D1C -:102A800004E000F041F80098216888472846FFF7E5 -:102A90007AFF0028F5D031BD4A484168084738B56B -:102AA0000446494D2846006040604248C068A1681D -:102AB0000160456000F085FC444821680160616860 -:102AC0004160002032BD80B53A48C26813681021C9 -:102AD0001972C06800F07BFC002002BD35483B4AFB -:102AE000C168C16813680868184738B5374C364D57 -:102AF00004E000F009F80098616888472846FFF76D -:102B000042FF0028F5D031BD69462846FFF764BF73 -:102B100038B504462E4D2846FFF732FF2D48006099 -:102B2000406024480069A1688160E168C160056176 -:102B30002168016061684160216941616169816169 -:102B400031BD80B501462348FFF730FFBDE80240A4 -:102B50000FF2050000F04BBC38B5164C1D4D06E0D9 -:102B6000FFF7D2FF009920690069FFF71FFF284691 -:102B7000FFF709FF0028F3D031BD10B5164C2046F1 -:102B8000006040600B4841690C60BDE8104000F0F7 -:102B900042BC1CB5104C06E069462046FFF71CFFFE -:102BA0000098C046C0462046FFF7EDFE0028F3D04F -:102BB00013BD000000000320AC090320480A0320D5 -:102BC00090080320F4230020500A0320FC23002057 -:102BD000380A0320EC230020400A0320BFF34F8F64 -:102BE000264927480A6802F4E06202430A60BFF3FC -:102BF0004F8F00BFFDE710B52248234C88B0016815 -:102C000041F400410160FFF77BF820480168C908E2 -:102C1000C90041F00401016000F016FC1C490020CD -:102C2000FEF79FFC00F04DFC01210120FFF76DF83D -:102C300000F076F8FFF7E4FE164A00210220FFF7C5 -:102C4000E0F804F23C500FF2510100900191694606 -:102C50000FF2490000F082F804F25470029004F57B -:102C6000C96140F23C5005900391049402A8FFF71B -:102C70004FFFFFF7C3FE08B010BD00000CED00E0F1 -:102C80000400FA05080000583000032080040058B2 -:102C90000C2300209F2D00087047000038B5054622 -:102CA000686830F80B1FB1F5124F12D180784FF0E1 -:102CB000005478B92178022908BF20702DD000F087 -:102CC0000FFC00210120FFF720F8FEF763FD012033 -:102CD000287031BD0020FFF70FF9FF281DD042F208 -:102CE000107588B92078022808D100212170FFF7DB -:102CF00028F90121002000F007F9FAE702202070EE -:102D000000210020FFF704F92846FFF7BEF9002054 -:102D1000FFF7F2F810382028F6D3FFF75FFF00BF67 -:102D200080B50121002000F000FD0121012000F00C -:102D3000FCFCBDE804400121022000F0F6BC704715 -:102D40004FF0FF30FEF7F8BF00210220FFF766B812 -:102D50000220FFF789B80220FFF78EB87FB50C4636 -:102D60004D4D61684D4EE8612962284600F044FDF2 -:102D70002468746006F1080000604060012000F0E3 -:102D800068F801203070296841B10FF2E9000FF2B4 -:102D9000ED02009001920294684688477FBD1FB5FE -:102DA0003E4C04F10800FFF7EEFD00BB2178F1B1C5 -:102DB000694604F10800FFF70FFE3748C16949B1C1 -:102DC0000098029001228DF8042001A888479DF800 -:102DD000040000E001202070207818B10098FFF76F -:102DE000B0FE04E0009904F10800FFF7D5FD04F1FE -:102DF0000800FFF7C8FD28B9207818B104F10800D1 -:102E0000FFF7A2FF1FBD2DE9F04105460E46904693 -:102E10001C46002000F01DF8204F7868A0F80950EB -:102E2000C672324641460C30FEF732FE1A4A13692A -:102E300000210020984748F2E800FFF78CFF7968EE -:102E40008A78D21C04F10800FEF722FEBDE8F041AA -:102E500001201CB51049124C096A20B901B18847FC -:102E60000020207013BD0120207011B1BDE81C406E -:102E7000084713BD0020FFF76BBF000010B50146E7 -:102E8000064C04F10800FFF791FD04F10800BDE8CD -:102E90001040FFF759BF000030230020C02300205E -:102EA0001D240020114810B5016841F480710160B3 -:102EB0000320FEF778F8002000F0A8FC002400288A -:102EC00014BF012400F018F8204610BD084800780F -:102ED0007047084805E00748016841F002010160B9 -:102EE0007047016841F001010160704700400058DF -:102EF000D0200020042004E0704700001148016841 -:102F000041F480710160704710B50C460E490028ED -:102F1000086805D1810507D500F0A2FA20B110BDDF -:102F2000810558BF00F096FA0848016821F00401B5 -:102F3000012C016001D130BF10BD40BF20BF20BFB8 -:102F400010BD0000000400581404005810ED00E00B -:102F500038B5040044D094F8210028B9002184F841 -:102F600020102046C046C04600F049F8FF2510B1A9 -:102F700000F03FF834E02168DFF8B0008A680240D2 -:102F80008A6021688A68636820690343A0690343F3 -:102F90001A438A602168E068086120680169A268B4 -:102FA00041EA024101612068C16821F08001C160ED -:102FB0002068C16C21F00201C1642168CA6CE36918 -:102FC000606903431A43CA6420688168880609D48B -:102FD00000F020F830B120684562042100F01FF8AD -:102FE000012032BD20684562012184F821100020B3 -:102FF00032BD20684562042184F821107047022008 -:1030000084F82100CA202168486253202268506257 -:10301000204626E020460BE02068C0F8248084F893 -:103020002110002084F8200070470000BFFF8FFFB0 -:1030300070B5044640F2E9362068C16821F0A0016D -:10304000C160FDF797FF05462068C168880606D471 -:10305000FDF790FF401BB042F6D3032070BD002067 -:1030600070BD70B504462068C1684A0612D44FF09E -:10307000FF32C26040F2E936FDF77CFF054620686A -:10308000C168480606D4FDF775FF401BB042F6D371 -:10309000032070BD002070BD10B50446FEF7F8FC9B -:1030A000204610BD10B5044610460A46014620468B -:1030B00000F0CEFB204610BD1FB541780024FF294B -:1030C00049D1B0F803104F4A40F60143C91A04D061 -:1030D00012392ED0091F1AD03DE05388B0F80710DE -:1030E0005B1C99420BD100218DF80C1000F10D02F0 -:1030F00002920124B0F80B108DF80D1015E0D28863 -:10310000521C914227D101248DF80C4006E0117A1F -:1031100009B31472032101248DF80C1000F10D0283 -:103120000292B0F80B008DF80D0002A800F0D4FB5D -:1031300011E0D288B0F80710521C91420BD100F177 -:103140000A0301930023427A00920022B0F805009E -:10315000FFF728F90124204604B010BD10B586B051 -:103160002948284CFFF78EFA0094082301220FF219 -:103170009C010220FFF741F8002104910191A01C5D -:1031800005900A2201230421039202930091042353 -:1031900020880FF288020221FFF77EF800210491B7 -:1031A00002910191201D05900A2220210392009195 -:1031B000012320880FF274020221FFF76DF8A01D91 -:1031C00005900121049100200A220323019004218B -:1031D000039202930091142320880FF260020221CF -:1031E000FFF75AF80020207206B010BD80B500919C -:1031F0000122044881880272012300880022FFF71F -:10320000A5F802BDD0230020B93000088FE5B3D562 -:103210002E7F4A982A487ACC20FE000019ED82AE13 -:10322000ED214C9D4145228E22FE000019ED82AE1B -:10323000ED214C9D4145228E23FE000019ED82AE0A -:10324000ED214C9D4145228E24FE00007047000078 -:10325000C0680840884201D10120704700207047B3 -:10326000C0690840884201D10120704700207047A2 -:1032700010B56C4C02212046FFF7F2FF38B16068B0 -:10328000C043810703D5FFF730FC022018E001217D -:103290002046FFF7E5FF38B16068C043C10703D59A -:1032A000FFF7EBFB01200BE008212046FFF7D8FFDA -:1032B00038B16068C043010703D5FFF76AFC0820F6 -:1032C000A06010BD10B5574C00F033F818B9606815 -:1032D000C043810306D400F02CF830B96068C043C5 -:1032E000810302D5BDE810407AE0082100F022F801 -:1032F00070B96068C04301030AD560684A4940F468 -:1033000000206060086880474FF40020A06010BD76 -:10331000202100F00FF858B96068C043810207D53A -:10332000606840F400106060BDE81040FFF7B4BB77 -:1033300010BD022120468BE73C4881B0016841F472 -:1033400080110160006800F48010009000983848F7 -:10335000016841F4007101603648026842F400726D -:10336000026040BF20BF3448016841F40041016061 -:1033700001B0704780B53148016841F480110160A7 -:10338000006800F48010009000982648016841F021 -:1033900001010160026842F4803202602C20FDF7D6 -:1033A0002DFEBDE802402D20FDF728BE244801680F -:1033B000490849000160704722494FF48030086095 -:1033C00070471F48016821F00201016070471C48E6 -:1033D0004FF400314160016821F400310160704711 -:1033E0001748016841F400310160FFF777BB38B539 -:1033F00004460C4D08212846FFF72AFF30B10A4841 -:103400000460686820F40020686031BDA0474FF474 -:103410000021A96031BD0A48016821F0080101605E -:1034200070470000000C00580C2400205001005888 -:10343000D4080058200800580C04005850000058C8 -:10344000040C0058080C00581348016841F400713E -:10345000016070471148016841F480410160704784 -:1034600010B50E4A0E4B106820F4804010603221D7 -:103470001C680C48B4FBF0F0484351698B0506D535 -:10348000002818BF401EF8D101E0002010BD50698F -:103490008105FAD5032010BD080400580004005827 -:1034A000DC20002040420F00484900E0484981B03C -:1034B0000A6802430A60096808400090009801B059 -:1034C000704780B5FFF705FDFFF705FD414801682E -:1034D00041F48031016000F0DDFABDE801400EE00A -:1034E00000B587B068460FF210211C22FEF7E0FA03 -:1034F000FFF743FB6846FEF732FD07B000BDF0B5AD -:1035000085B068461421FDF73BFD00260025002408 -:1035100000210FF2D40000EBC102907988B113684A -:10352000B3F1904F08D02C4FBB4208D02B4FBB4279 -:1035300004BF9088044304E09088064301E090882B -:103540000543491C2229E4DB0020029001210320CD -:1035500003900191B0B288B100900120FFF7A4FF61 -:103560000120FFF7A3FF69464FF09040FDF79CFD57 -:103570000022B1B24FF09040FDF74EFEA8B280B1EC -:1035800000900220FFF790FF0220FFF78FFF124EFE -:1035900069463046FDF788FD0022A9B23046FDF7A6 -:1035A0003BFEA0B280B100900420FFF77DFF042015 -:1035B000FFF77CFF094D69462846FDF775FD00229F -:1035C000A1B22846FDF728FE05B0F0BD4C0000581A -:1035D0004C010058900800580004004800080048BA -:1035E0000020FDF73CB90000000000480100000089 -:1035F0000000004801000000000000480100000039 -:103600000000004801000000000000480100000028 -:103610000000004801000000000000480100000018 -:103620000000004801000000000000480100000008 -:1036300000000048010000000000004801000000F8 -:1036400000000048010000000000004801000000E8 -:1036500000000048010000000000004801000000D8 -:1036600000000048010000000000004801000000C8 -:1036700000000048010000000000004801000000B8 -:1036800000000048010000000000004801000000A8 -:103690000000004801000000000000480100000098 -:1036A0000000004801000000000000480100000088 -:1036B0000000004801000000000000480100000078 -:1036C0000000004801000000000000480100000068 -:1036D0000000004801000000000000480100000058 -:1036E0000000004801000000000000480100000048 -:1036F0000000004801000000000000000000000081 -:1037000000000000E8350008280003202C000320FA -:1037100022040400294981B00A6802430A6009684A -:1037200008400090009801B07047F0B585B005469C -:103730000C4668461421FDF723FC2DB1012D08BF6E -:10374000102002D0022D02D10120FFF7E3FF0FF27B -:103750008C001B4F30F815000090012102200390CF -:1037600007EB8506029130682CB90021019169466A -:10377000FDF79AFC1FE01349019107EBC504694668 -:10378000FDF792FC0FF2600050F8251004F12400C0 -:1037900000F099F9F268002104F1240000F08CF99E -:1037A0000FF240004457B16900222046FDF708FCA3 -:1037B0002046FDF723FC002005B0F0BD4C0000586A -:1037C0002C20002000002110002000F013B8012060 -:1037D00000F010B8022000F00DB800000100100049 -:1037E00040000000060A1700000000160400001642 -:1037F000060000167047000002490160024901619D -:10380000704700BF9F2A0008C72A000870B50F4EF6 -:10381000044630780025A8B1FDF761FA32784FF4FC -:103820007A71B1FBF2F1B0FBF1F0FDF701FC48B9A0 -:10383000102C07D2002221464FF0FF30FDF7C0FBCD -:10384000B46000E00125284670BD00BFD0200020F4 -:1038500062F30F2262F31F42401810F0030308D0F6 -:10386000C91A1FD3DB0748BF00F8012D28BF20F875 -:10387000022D130030B414461546103928BF20E934 -:103880003C00FAD8490728BF20E90C0048BF40F89F -:10389000042D890028BF20F8022D48BF00F8012D13 -:1038A00030BC7047C91818BF00F8012DCB0728BFDE -:1038B00000F8012D7047000000EB8100644AD0F849 -:1038C0008010914201D0012070470020704742F4DF -:1038D000806240F8212070472DE9F8430546DFF863 -:1038E00074912879DFF870815C4E20B1012825D0D1 -:1038F000032869D010E029680A78012A4FF0006097 -:1039000004D0022A0AD0072A10D005E00022306035 -:10391000727400F0B4F83274BDE8F18301213060B4 -:10392000717400F0ACF800203074F5E701228DF8D6 -:10393000002069460220FFF759FCEDE76C7900276B -:1039400002214046FFF7B8FF0028F9D1FEF727FF14 -:1039500022E0296806F1080339441844FEF798F874 -:1039600000F086F8D6E9022331680120FEF7EAFE6E -:10397000D6F800C0D6E90201DCE900238B4208BF7B -:10398000824209D10CF108003060307CC0F108009F -:10399000241AC71900203074307CC0F10802944208 -:1039A000D7D2FEF70AFF00F05FF8002CB4D02868E9 -:1039B000337CC11906F1080022461844FEF768F866 -:1039C000307C24183474A7E7307C10B3C0F10801B0 -:1039D00006F10803FF221844FFF73AFF0221404690 -:1039E000FFF76AFF0028F9D1FEF7D9FE04E000F0E6 -:1039F0003FF80120FEF7A6FE3168D6E90223D1E99F -:103A000000459D4208BF9442F1D1FEF7D6FE00F07A -:103A10002BF8707C90B10128D5D14FF000510020D7 -:103A20000870BFF34F8F0E490E480A6802F4E06237 -:103A300002430A60BFF34F8F00BFFDE7FEF75CFA59 -:103A40000020FEF759FA01210020FFF75DFAFAE79E -:103A5000000400801040005800140058802300200B -:103A60000CED00E00400FA050022022140462EE79A -:103A7000D9F80000C00C10F00100F9D17047286897 -:103A8000C178317029688878707028684178B17081 -:103A90007047000080B5FFF7A3FD022100910023CD -:103AA000044800F124014FF48052001D00F011F889 -:103AB00001BD0000081000200346002009B95A602B -:103AC00070470120704708B901207047016000204D -:103AD000704710B5029C016042600021C160016125 -:103AE000416181610381A107047704D5008910B188 -:103AF0004FF0FF3010BD002010BD00004748484A7D -:103B000001681268B1F1006F0AD3120302F47F2238 -:103B1000444882188A4203D308684349884201D046 -:103B2000002070470120704780B540494048086038 -:103B3000016881F308884068804730BF01BD10B537 -:103B4000FFF7DCFF4FF0005420B100202070BDE8EB -:103B50001040E9E7012020700E206070FF20A07067 -:103B600010BD38B5334C2068C00002D420688001F5 -:103B70001AD54FF00055287828B9FFF7BFFF10B1CC -:103B8000FFF7D2FF12E0287848B9FFF7B7FF30B946 -:103B9000012028700E206870FF20A87006E02878A9 -:103BA000012818BF022801D0FFF7C9FF2248016889 -:103BB00041F4700101600020FEF7C6FE40B180793B -:103BC0001E49A160A16821F47C5141EA0021A16055 -:103BD0004FF0B040016841F48031016018490A6833 -:103BE000D208D20042F001020A600A6802F007021D -:103BF000012AFAD101688903FCD581688908890006 -:103C000041F002018160816801F00C010829FAD1BC -:103C1000016849084900016031BD00004071000899 -:103C200080400058FCFFFF07298A449408ED00E01B -:103C3000007000089400005888ED00E0FECAFECA3B -:103C400000400058010000000300000005000000D3 -:103C50000100000001000000060000000A00000052 -:103C60002000000002000000040000000800000026 -:103C70001000000040000000800000000001000073 -:103C800000020000A0860100400D0300801A06001B -:103C900000350C0040420F0080841E0000093D00EA -:103CA00000127A000024F40000366E010048E8019A -:103CB000006CDC02000000000000000000000000BA -:103CC000000000002DE9FC4D016800F108054908DD -:103CD00005EBC102019200F10802406800F0010A00 -:103CE00002EBC108400808EBC00B00200021019A3C -:103CF00095422FD02A68AE186A683244009208357F -:103D0000009A9642F3D016F9014B009A964205D1DB -:103D10002A68AE186A6832440092083516F8017BAA -:103D2000884210D1D84508BF00F01AF8D8F8000032 -:103D3000D8F80410BAF1000F18BF48440144884273 -:103D400008F10808EED0002C00F8017B05D5641CB2 -:103D5000E6D1D5E75846BDE8F68D641ED5D5CFE748 -:103D6000012000F001B8000080B5AFF30080024AE6 -:103D700011001820ABBEFBE72600020000F024F87B -:103D8000012810D00D4880470D480047F0B5434644 -:103D90004C4655465E466746F8B40A4C6B4623606F -:103DA000BFF34F8F30BF074C2468A546F8BC984638 -:103DB000A146AA46B346BC46F0BD0000633B0008DE -:103DC0003F3F00081424002002490020086070478B -:103DD000000000001824002019E050F8042BD3073D -:103DE00044BFA9F101039A18091F0023042942F8CE -:103DF000043BF9D25FEA817C134604D54FF0000CF6 -:103E0000A2F800C09B1CC90744BF0021197050F8DC -:103E1000041B0029E1D170477047FEE770477047E7 -:103E2000704700F00FB87047704770470020FCF7EC -:103E30002CBD0020FCF72FBDFDF743BBFFF742BAB6 -:103E4000FFF716BA02484168027889184160704746 -:103E5000D020002010B5074979441831064C7C4425 -:103E6000163404E00A68081D114488470146A1423F -:103E7000F8D110BD2C000000780000004EF68851EB -:103E8000CEF20001086840F470000860BFF34F8F65 -:103E9000BFF36F8F4FF00070E1EE100A7047000023 -:103EA00039FFFFFF40030000E02000207008000001 -:103EB00030000320000000000DFEFFFF02000000A4 -:103EC000020000002A010000020000002800032078 -:103ED00008000000F1FDFFFF0200000002000000EA -:103EE00010010000AF00000008100020D8100000F2 -:103EF00000000000000000000000000000000000C2 -:103F000001000000020000000300000004000000A7 -:103F10000120C046002801D0FFF79CFFAFF30080CE -:103F20000020AFF30080FEF727F800F000F800F063 -:103F300001B8000007463846FFF716FFFBE7AFF36E -:103F40000080FFF79BFFFFF7E3FFFFF7FEBFFFF7E0 -:103F5000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF795 -:103F6000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF785 -:103F7000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF775 -:103F8000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF765 -:103F9000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF755 -:103FA000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF745 -:103FB000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF735 -:103FC000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF725 -:103FD000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF715 -:103FE000FEBFFFF7FEBFFFF7FEBFFFF7FEBFF80003 -:103FF0000001810081008100810081008100810039 -:1040000081008100810081008100810081008100A8 -:104010008100810081008100810081008100810098 -:104020008100810081008100810081008100810088 -:104030008100BA00044800100048FD000D48C9374F -:104040000008CF370008D53700080FFD00000FFD2E -:1040500000000FE5002F30B50A4B5A6842F4802269 -:104060005A60EFF3108472B6802251F8045B40F876 -:10407000045B521EF9D11868C103FCD484F3108884 -:1040800030BD10400058EC00F8FFF400030DFF01B4 -:0F40900086F4000001F9000010FC0002093D0059 -:0400000508003F3F71 +:1001900000F0D5BB24206860206801684908490048 +:1001A0000160204600F066B92068016841F0010155 +:1001B000016020467047204600F064BA216851E88B +:1001C000002F7047206800F1080151E8001F00F17E +:1001D000080221F0400142E8001000287047F8B5FD +:1001E000044640F60F002668F1693268B36808409B +:1001F00004F15C050ED1880602D5900602D4D80021 +:1002000040F181806969002900F029812046BDE81C +:10021000F4400847DFF89006034204BFDFF88C760D +:100220003A4270D0CF0707D5D70505D501273762E9 +:100230002E6B46F001062E638E0708D5DE0706D525 +:10024000276802263E622E6B46F004062E634E0798 +:1002500008D5DE0706D5276804263E622E6B46F0D9 +:1002600002062E630E070AD5960601D4034206D075 +:10027000266808203062286B40F0080028630805D3 +:1002800009D5500107D526684FF400603062286B0D +:1002900040F020002863286B002833D0890607D55A +:1002A000900601D4D80003D5696909B12046884772 +:1002B000286B21688A68510602D410F0280F1CD0E0 +:1002C000204600F0C7FA00F0D1F811D5FFF77AFF09 +:1002D000FCD1286A60B10FF2DD518163286A00F019 +:1002E0003AFC00280ED0286A816BBDE8F44008472C +:1002F0002046BDE8F24000F0F5BC204600F0F2FCDC +:1003000000202863F1BD286901286AD1CF0668D58D +:10031000D00666D51020306200F0A8F82DD5296AE5 +:100320000868406880B20028ECD02A889042E9DA58 +:100330006880086801688A061BD4FFF73FFF22F433 +:10034000807200F08FF8F8D1206800F077FAFBD1C6 +:10035000FFF738FFFCD12020E86200202861FFF77A +:100360002DFF22F0100200F07DF8F8D1286A00F08D +:10037000BCFB29886888091A2DE028886988411AF9 +:10038000688800281CBF88B2002868D0226852E81C +:10039000003F23F4907342E800300028F6D1206833 +:1003A00000F1080200F1080352E8002FDFF8B8025C +:1003B000024043E800200028F1D12020E86200201C +:1003C00028616861226852E8003F23F0100342E888 +:1003D00000300028F6D12046BDE8F44089B200F094 +:1003E00082BCC80209D5580207D54FF4801030628C +:1003F0002046BDE8F24000F077BC080609D510069B +:1004000001D4180205D5A96949B32046BDE8F440D6 +:100410000847480611D550060FD5FFF7CFFE22F04A +:10042000400200F01FF8F8D12020A8620020A86147 +:100430002046BDE8F24000F0E6BA080206D55000BA +:1004400004D52046BDE8F24000F04FBCC80148BFCB +:10045000002A04D52046BDE8F24000F047BCF1BDBB +:1004600022F4F07241E8002000287047206881687B +:1004700048067047F8B50446DFF848042168DFF8FD +:1004800048C40A68DFF844740240A0680243206947 +:10049000024360690243E06902430A6000254A683A +:1004A000E06822F4405202434A60A369DFF8202446 +:1004B00091421CBF206A03438E68DFF8180406408F +:1004C00033438B600FF2A416CB6A606A1B0940EAC3 +:1004D0000313CB626145DFF800044FF4004339D1C8 +:1004E0003F6807F00307032F4DD8DFE807F0024607 +:1004F00043494FF0010CE169B1F5004F4FF6F07739 +:1005000040F08080BCF1010F09D0BCF1020F0AD08D +:10051000BCF1040F71D0BCF1080F71D099E000F06C +:1005200042FC002815D0626A616836F81230B0FBD0 +:10053000F3F04A0802EB4002B2FBF1F080B2A0F106 +:100540001001B942EAD20740C0F3420007432068D5 +:10055000C7607FE0914216D13F6817F4406723D00F +:10056000B7F5806F09D0B7F5006F03D0B7F5406FCE +:1005700006D008E04FF0020C07E04FF0040C04E056 +:100580004FF0080C01E04FF0100C9142B3D1BCF1D8 +:10059000000F09D0BCF1020F0AD0BCF1040F15D036 +:1005A000BCF1080F15D054E000F0F5FB002851D045 +:1005B000616A36F81120B0FBF2F6626802EB420184 +:1005C0008E4246D31103B14205D242E000F099FBBE +:1005D000ECE71846ECE75008002110EB062051EB41 +:1005E0001661002300F0FCFBA0F54071DFF8EC225F +:1005F00091422ED22268D0602CE000F082FB90E77E +:10060000184690E7BCF1010F09D0BCF1020F09D0E8 +:10061000BCF1040F18D0BCF1080F18D019E000F09D +:10062000C2FBB8B1626A36F812306168B0FBF3F011 +:1006300000EB5100B0FBF1F080B2A0F11001B94223 +:1006400007D22168C86005E000F05BFBE9E71846C7 +:10065000E8E7012504F168000121418001800021C3 +:100660008160C1602846F2BDFEFFFFEF010002007D +:100670000400060008000A000C00100020004000E2 +:100680008000000190F82810CA0706D50268536858 +:10069000C16A23F400330B43536090F828108A0793 +:1006A00006D502685368016B23F480330B43536013 +:1006B00090F828104A0706D502685368416B23F466 +:1006C00080230B43536090F828100A0706D5026870 +:1006D0005368816B23F400430B43536090F8281058 +:1006E000CA0606D502689368C16B23F480530B4396 +:1006F000936090F828108A0606D502689368016C0A +:1007000023F400530B43936090F828104A0610D549 +:1007100002685368416C23F480130B435360416CAF +:10072000B1F5801F05D15368816C23F4C0030B43DE +:10073000536090F828100A0606D501684A68C06C14 +:1007400022F4002202434A607047F8B5044604F1DF +:1007500080050020E8606FF07E4700F059FC0646F7 +:10076000206801680A0708D50097334600224FF435 +:100770000011204600F017F860B9206801684A07A8 +:100780000AD50097334600224FF48001204600F03E +:100790000AF808B10320F2BD20206860A86000209C +:1007A000E0662870F2BD2DE9F041069C05460E4634 +:1007B00090461F462868C1693140B1420CBF0120F4 +:1007C0000020404526D114F1010FF3D000F020FCA9 +:1007D000C01B844200D33CB900F025F800F02DF88E +:1007E000FCD100F01AF811E0286801684A07E1D549 +:1007F000C1690A05DED54FF40062026200F013F809 +:1008000000F01BF8FCD100F008F8C1600021017075 +:10081000032000E00020BDE8F08105F180002021E8 +:10082000416081607047296851E8002F22F4D0723E +:1008300041E800200028F6D17047286800F108013F +:1008400051E8001F490800F10802490042E8001081 +:1008500000287047026852E8003F23F4907342E892 +:1008600000310029F6D1016801F1080201F1080305 +:1008700052E8002F0E490A4043E800210029F2D136 +:10088000C16E012908D1026852E8003F23F010032D +:1008900042E800310029F6D12021C0F8881000215B +:1008A000C1660167704700000100001020010004CC +:1008B000FEFFFFEF806A00F1560100220A810A80E4 +:1008C00000F010BAF369FFCF0038014088000058EB +:1008D00000800040FFF4FF110024F40000FD0F0031 +:1008E0004E4900E04E4981B00A6802430A60096837 +:1008F00008400090009801B0704798B949484A49AB +:1009000001604FF4E131416000218160C16001610B +:1009100081610C2141614FF40041C161002181627C +:10092000FFF70CBC7047002804BF3E48FFF757BCD8 +:10093000704718B93B48806F00F043B9704738B52D +:1009400086B004466846142100F068FB2168364AE8 +:10095000914248D10120FFF7C5FF4FF4007000F02D +:1009600044F80120FFF7BEFF4FF4806000F03DF82F +:100970002F48304D816A8908890041F00101816268 +:100980000022016841F4804101600F21006800F4F9 +:10099000804005900598242000F060FB242000F0A2 +:1009A0007BFB0120FFF79CFF0420FFF799FF224803 +:1009B00028600F2068601020A8600020E860802078 +:1009C000286100206861A861E8612862284600F07B +:1009D00035F8A567AC6200220F210E2000F03EFB27 +:1009E0000E2000F059FB07B030BD0090022100201E +:1009F00001910290032107200391049069464FF072 +:100A0000904000F09FBB00680749884204D1074925 +:100A10000868002818BF00477047000048000058C9 +:100A20004C000058E0200020003801401024002035 +:100A300060000058802200204400024038B50400C5 +:100A400001D1012032BD2168DFF880024018142254 +:100A500004F12405B0FBF2F2DFF87402E8619200C1 +:100A60002A62022068700A68A0686FF30E120243BF +:100A7000E06802432069024360690243A0690243BF +:100A8000E0690243206A02430A60204600F0F9F858 +:100A9000A068B0F5804F04BF002161602079696AC9 +:100AA00000F03F0000F014F838B1052805D22046C8 +:100AB00000F0FBF800F012F803E000202863686300 +:100AC000A8630020A861012068700020287032BD52 +:100AD0000860A96AE86A486060687047296B00206E +:100AE0000860696BA86B4860704781B040B100F145 +:100AF00024014A78022A05D0042088610020087069 +:100B0000012026E00268136823F00E0313604A6A8E +:100B1000136823F48073136000680268520852005F +:100B20000260012091F82020CB6902F01C02904065 +:100B300058608A6AC86A5060086B30B1026822F453 +:100B4000807202604A6B886B506001204870002000 +:100B5000087001B0704738B500F1240200245178C4 +:100B6000022903D004209061012428E001680B6869 +:100B700023F00E030B6001680D686D086D000D60B9 +:100B8000516A0B6823F480730B60012192F82030C6 +:100B9000D56903F01C0399406960936AD16A596072 +:100BA000116B31B10B6823F480730B60536B916B45 +:100BB0005960012151701470516901B18847204674 +:100BC00032BDF8B500F124010423CA691468026833 +:100BD000156891F8206006F01C0603FA06F73C42FF +:100BE00010D06F070ED51468A50603D4156825F03C +:100BF0000405156000F03DF8C968002938D0BDE84B +:100C0000F4400847022303FA06F73C4213D0AF072B +:100C100011D51468A50605D4156825F00A051560D8 +:100C200001224A7000F025F800220A708968F9B1A3 +:100C3000BDE8F4400847082303FA06F6344217D00B +:100C40002B0715D5136823F00E031360012291F8CA +:100C50002030CC6903F01C039A40626001228A6153 +:100C60004A7000220A70096911B1BDE8F4400847D2 +:100C7000F1BD91F82020CC6902F01C029340636022 +:100C80007047426C1349920801EB8201816414227F +:100C900001780839B1FBF2F10F4AC26401F01F017B +:100CA000012202FA01F10165704701790B4A01F056 +:100CB0003F0102EB81024265491E094A826501F04B +:100CC000030101228A40C26570470000F8FFFDBFA2 +:100CD000000002400008024080080240FC08024078 +:100CE00040090240704770477047704770470000E6 +:100CF0004FF0B040006800F0F000B02888BFB0208E +:100D0000704738B54FF0B044304DA16811F00C0178 +:100D100006D1FFF7EDFFC0F3031055F8200032BDF8 +:100D200004292B4A05D008292A4804D12168C90280 +:100D300022D5104632BDE16801F00301022904D03A +:100D4000032904D12168C90207D5104605E0FFF741 +:100D5000CFFFC0F3031055F82000E168E268E368B4 +:100D6000C1F306214843C2F30211491C5B0FB0FBDB +:100D7000F1F05B1CB0FBF3F032BD80B5FFF7C1FFB3 +:100D80001149FFE7144A0968C1F3031152F8211011 +:100D9000B0FBF1F002BD80B5FFF7EFFF00F010F8F7 +:100DA000C1F3022106E080B5FFF7E7FF00F008F885 +:100DB000C1F3C22112F8211001F01F01C84002BD89 +:100DC0000149064A0968704708000058A03E00081B +:100DD0000024F4000048E801603E00080C410008CF +:100DE000B3BBD9B1B2F5803F7DD2022A1ED98C4661 +:100DF000B1FBF2F102FB11C31B0443EA1043B3FB46 +:100E0000F2FC02FB1C3380B240EA0343B3FBF2F076 +:100E100002FB103240EA0C4000237047022A05D939 +:100E20008446B0FBF2F002FB10C270474AB105D114 +:100E300000F0010249085FEA3000704700220023F9 +:100E4000704700F051BA0B000200002100207047EB +:100E5000904271EB030CF6D3B3F5803F2FD2F0B57F +:100E6000B3FA83F7B1FA81F4A7F10F0E3D1B53409B +:100E7000CEF1200602FA0EF2F3415340B5F10F070E +:100E800046D80F3C2C444140C4F12006A040F1411B +:100E90004140B1FBF3F603FB1611A2FB0645001B14 +:100EA000A94102D2761E8018594180EA010221FA36 +:100EB0000EF362FA0EF200215A403046F0BD30B413 +:100EC000B1FBF3FC03FB1C11A2FB0C45001BA94169 +:100ED00003D2ACF1010C8018594130BC02460B46DC +:100EE000604600217047B2F1807F65D3F0B5B2FA59 +:100EF00082F7B1FA81F4C7F10F063D1B22FA06F31F +:100F000007F1110EF24120355A40B5F10F07B8D95B +:100F10004140C4F12006A040F1414140B1FBF3FC47 +:100F200003FB1C11A2FB0C45001BA94103D2BCF121 +:100F3000010C801859410F2F12D30F3FC90341EA0A +:100F40005041B1FBF3F603FB1611A2FB0645D4EBAF +:100F5000C030A94102D2761E8018594146EACC3CE5 +:100F600007B34140C7F12006B840F1414140B1FB11 +:100F7000F3F603FB1611A2FB0645001BA94102D2A2 +:100F8000761E8018594180EA010221FA0EF3C7F15A +:100F9000200462FA0EF20CFA07F05A402CFA04F11F +:100FA0003043F0BD80EA010221FA0EF3002162FA1B +:100FB0000EF260465A40F0BD8C46B1FBF2F102FBE6 +:100FC00011C31B0243EA1063B3FBF2FC02FB1C33A8 +:100FD0001B024CEA002043EA1063B3FBF2FC02FB65 +:100FE0001C331B024CEA002043EA1063B3FBF2FC03 +:100FF00002FB1C331B024CEA002043EA1063B3FBE4 +:10100000F2FC02FB1C324CEA002000237047000077 +:1010100001484068704700BFD0200020002200F047 +:1010200065B900000901020081B002D43C48815436 +:1010300005E03C4802F00F02104400F8041C01B027 +:101040007047394A13684FF6FF0100020B4000F465 +:10105000E0601843354908431060704738B5324B9B +:101060001C68C4F30223C3F10704052C28BF042421 +:101070001D1D072D34BF0023DB1E012505FA04F4D6 +:10108000641E2140994005FA03F35B1E1A40114388 +:10109000BDE83440C6E70000010007D4012200F09B +:1010A0001F01234B8A40400943F82020704701006C +:1010B0000BD4012200F01F011E4B8A40400943F867 +:1010C0002020BFF34F8FBFF36F8F704710B5401EC6 +:1010D000B0F1807F01D3012010BD174C60600F215B +:1010E0004FF0FF30FFF79EFF0022A2600720206034 +:1010F000002010BD010007D4012200F01F010F4B9A +:101100008A40400943F820207047010007D401229B +:1011100000F01F010A4B8A40400943F82020704725 +:1011200000E400E018ED00E00CED00E00000FA053E +:1011300000E100E080E100E010E000E000E200E01B +:1011400080E200E02DE9F84F4FF00009604A614B62 +:101150004FF00F0805460E4633E05F4FBD4214BF07 +:10116000072704278F4027434CF82E70C1431C6883 +:1011700001EA040C7468E40248BF40EA0C0CC3F8AE +:1011800000C05C6801EA040C7468A40248BF40EA2D +:101190000C0CC3F804C0146801EA040C7468E4037E +:1011A00048BF40EA0C0CC2F800C0546801EA040CC5 +:1011B0007168890348BF40EA0C0CC2F804C009F109 +:1011C0000109316831FA09F078D0012404FA09F4F0 +:1011D00014EA0100F3D04FEA490C032101FA0CF1A3 +:1011E0006FEA010E716801F00307012F1CBF01F0C7 +:1011F0000301022911D1A968F7680EEA010107FA73 +:101200000CF73943A960696821EA04047168C1F3E5 +:10121000001101FA09F10C436C604FEA890134793D +:1012200004F00304032C1FD0EC68B7680EEA040432 +:1012300007FA0CF73C43EC60347904F00304022C09 +:1012400012D14FEAD90705EB870401F01C07D4F847 +:1012500020A008FA07FB2AEA0B0AD6F810B00BFA0E +:1012600007F747EA0A0727622C680EEA0407347971 +:1012700004F0030404FA0CF43C432C60746814F486 +:10128000403F9CD0DFF854C04FEA990E5CF82E70B6 +:1012900001F00C0108FA01F427EA0404B5F1904FBB +:1012A00008BF002709D00E4FBD4208BF012704D058 +:1012B0000C4FBD427FF451AF022753E7BDE8F18FD9 +:1012C00081B0002A14BF8161816201B070470000C3 +:1012D000800800580008005800100048080001402D +:1012E00000040048000800487047000000B500BF37 +:1012F000130096469446103928BFA0E80C50FAD83F +:101300005FEA417C28BF0CC048BF40F8042BC907E6 +:1013100028BF20F8022B48BF00F8012B00BD0000B9 +:10132000DFF8F0140A6892B200E00246086880B262 +:101330008242FAD170472DE9FC4104461825DFF8B6 +:10134000D884DFF8D864684308EB000730780628B3 +:1013500008D131787170347078754FF0FF3070605B +:10136000002039E000F077F8B9680918B96008F191 +:101370000803B96832786A439A589142327813D395 +:1013800008F1150315FB02FC13F80C30062B25D0D1 +:1013900008F108066B43F358994222BF08F1150380 +:1013A0006A439A5CEED219E01146337869439A4257 +:1013B0000BD008F1140308F1150C5B5C15FB03F569 +:1013C0000CF805407A753B7500E07A7508F1140257 +:1013D0005454317871703470BDE8F6811146694318 +:1013E00008F115035B5C062B04D008F1140615FB0D +:1013F00003F574557B753A7508F115025454EBE703 +:10140000F8B5DFF81834DFF810541E7818240246B7 +:101410006243B0422A4404D118785870507D187045 +:101420000FE0167D507D92F815C005F11507664353 +:10143000062807F806C004D0167D143514FB00F406 +:101440002E55012010731878062802BF00294FF08E +:10145000FF315960F1BD10B5DFF8C043606810F18D +:10146000010F0FD0FFF75CFF6168DFF8B423814202 +:1014700061683CBF5388C918081A517848431178ED +:10148000C84000E0002080B210BD2DE9F84FDFF821 +:101490009053DFF890B3D5F80880D8F80000DBF857 +:1014A00000104A0500F06AF9DFF87063DFF868A3FE +:1014B00021F4806181604FF0180934780AF1080046 +:1014C00019FB04F14758FFF7C6FF874217D20027E0 +:1014D0000121B170062C3DD019FB04F40AF108017A +:1014E0000AF108020959814223BF0AF1080109598A +:1014F000091A002111510AEB04014C7DEAE7A98881 +:101500004118B94202D2AF880021E2E73F1ADFE773 +:10151000022802DA2878012800D07F1ED8F80000BF +:10152000C1684A07FAD500F02FF9DBF80C00000C6F +:10153000BFB247EA0047CBF80C70FFF7F1FE7060CE +:10154000A8680068816841F480618160AFF3008021 +:10155000BDE8F18FB8B20028DAD1FFF7E1FE706084 +:101560000320BDE8F24FFFF7C5BD2DE9F843EFF3C7 +:10157000108872B6AA4DA84BA8680168CA224A62B0 +:1015800053204862A54A886820F48060886018204B +:101590001678374647431F44387B022826D13C68DB +:1015A000D7F810909078F0B17A7B012A0AD1012106 +:1015B0003046FFF725FF88F310887968304600F041 +:1015C000F0F804E088F31088304600F09BF8A86833 +:1015D0000068CA2141622246532141624846314691 +:1015E00000F02AF90BE0FFF750FF06E0C868420759 +:1015F000FCD500F07EF88C49086088F31088FF2144 +:10160000A86802685162BDE8F183F8B5844CA16016 +:10161000CA2209684A6253224A62824A136843F026 +:1016200020031360136803F00703C3F1040323705E +:1016300095682D0C05F07F056D1C6570EDB2926804 +:10164000C2F30E02521C628092B2521E6A43A2F58D +:10165000A072DA404FF6FF739A422CBFA380A2809B +:10166000724A136843F400231360714B1D6845F4FC +:1016700000251D6048BB6948674E0123837018250B +:101680004FF0FF33436000235FFA83FC06F10C0741 +:1016900015FB0CFC4FF0000E07F80CE05B1CDFB2F2 +:1016A000062FF1DB06230370886820F480608860D1 +:1016B00000F01FF8D0600320FFF727FDA16808683D +:1016C000826842F48042826005E0C868410544BFF8 +:1016D0000320FFF70FFDA1680A68FF205062002277 +:1016E00003210320FFF7BAFCBDE8F2400320FFF717 +:1016F000D3BCC86800F0800060F49060C8604FF40C +:1017000000207047F8B50746EFF3108472B6032047 +:10171000FFF7CDFC424DAE683068CA2141623A46BF +:1017200053214162182043494243895C02291BD15D +:1017300000213846FFF764FE3848017806290ED1AB +:10174000306838490A68530500F018F821F48061C0 +:101750008160C1684A07FCD500F016F804E04078C3 +:10176000884218BFFFF791FEA9680A68FF205062FF +:101770000320FFF791FC84F31088F1BD02D5C16806 +:101780004A07FCD481687047C16801F0800161F4A8 +:101790009061C1604FF40020234908600320FFF7E7 +:1017A000B4BC2DE9F04180460F46424618201A4944 +:1017B00042438C18207B022804BF4046FFF7A2FF5B +:1017C000EFF3108572B60320FFF771FC144EB0687A +:1017D0000068CA2141625321416202202073A76040 +:1017E00067604046FFF7A7FD0C490A7849789142A7 +:1017F00002D0FFF74AFE02E0A168081AA060FF20AD +:10180000B1680A6850620320FFF746FC85F3108830 +:10181000BDE8F08128280040702100200424002029 +:1018200074230020082800400C08005800080058C5 +:10183000800800587C2100201047000010B596B0A9 +:1018400009A80FF2AC21834C342200F07BF90FF28F +:1018500055200190009469460FF2312000F0B6F94E +:101860000121022000F09BFA7B4A0021012000F0B8 +:1018700014FB09A800F0BFFB08B100F095FC0020A4 +:10188000ADF81A0000F092FC00F0C8F802460621FC +:10189000002000F0AFFC4EF66E50089007AA6F498A +:1018A0000868079006212E2000F0A4FC0FF21822F1 +:1018B0001021182000F09EFC0FF21C22102108209D +:1018C00000F098FC1821012000F0BBFC00F0E4FCC3 +:1018D0000DF1160006A90190009105AB0722002129 +:1018E000012000F099FE0FF2D010BDF81810009002 +:1018F0000723BDF81400002200F08EFD0DF11A0040 +:1019000000900223BDF81610BDF81400002200F06C +:1019100083FD002000F034FE002004901023504985 +:1019200003910820002201930090029200230121DC +:10193000012000F03EFE00F0FFFE4A484FF4004157 +:1019400001604FF00051026F48780C2802F0FF024E +:101950000EDC00200870BFF34F8F434943480A68EC +:1019600002F4E06202430A60BFF34F8F00BFFDE75D +:1019700089780B189A4238BF111A00F053FF00F013 +:101980004DF83B4942790A7202794A72C2788A72EA +:101990008278CA7242780A730278521C4A7306210E +:1019A00042798DF8052002798DF80420C2788DF8EF +:1019B000032082788DF8022042788DF801206A4653 +:1019C0000078401C8DF80000002000F013FC00F0AF +:1019D0000AF816B010BD80B54078052808BF00F0A1 +:1019E00002F8012002BD00B587B0002006900590E6 +:1019F00000220FF2F40004920821002302900191CA +:101A000000920393A0228021002000F070FD07B017 +:101A10005DF804EB16490E2000F02EBE80B50F498C +:101A20000A6812F1010F0DD012484B6802701B0AB0 +:101A3000120A427049688170C370190A01711B0C47 +:101A4000437102BD002000F0B1FF08B90FF2700031 +:101A500002BD0000A00803200B1C00088075FF1FBA +:101A600007B20100104000580CED00E00400FA0538 +:101A7000C0200020DC2300200021012000F01ABA41 +:101A8000012000F03DBA012000F042BA10B5044632 +:101A9000616801F1080000F05FFE00B101202070D4 +:101AA00010BD000010B1012803D07047012000F0E4 +:101AB00015BA00F01BBA0000424C45636F72650016 +:101AC0000000000000000000123456789ABCDEF0DE +:101AD000123456789ABCDEF0FEDCBA0987654321E1 +:101AE000FEDCBA09876543210953544D5F4F5441C9 +:101AF00000000000000000000000000000000000E6 +:101B0000000000001E0004000A0502011C3AFB0050 +:101B1000F4010000FFFFFFFF48010100002000006A +:101B20000000000062B38B0708D0521E11F8013B81 +:101B300000F8013B00F024808B07F6D1830740F0CA +:101B4000208000BF103A07D330B4B1E83810103A03 +:101B5000A0E83810F9D230BC530724BFB1E8081010 +:101B6000A0E8081044BF51F8043B40F8043BD207FA +:101B700024BF31F8022B20F8022B44BF0B780370EE +:101B80007047121F17D35B0009D151F8043B20F8AE +:101B9000023B1B0C121F20F8023BF6D20BE051F85F +:101BA000043B00F8013B1B0A20F8023B1B0C121FF0 +:101BB00000F8013BF3D238BF121D521E24BF11F8AA +:101BC000013B00F8013BF8D8704700007FB50C4698 +:101BD0006D4D61686D4EE8612962284600F0F8FE9F +:101BE000246805F1240000604060746006F108007C +:101BF0000060406001203070296829B10FF2551053 +:101C000000900294684688477FBD1FB55F4C04F181 +:101C1000080000F0EAFE00BB2178F1B1694604F14A +:101C2000080000F00BFF5848C16949B100980290C4 +:101C300001228DF8042001A888479DF8040000E0E7 +:101C400001202070207818B1009800F0ACFF04E06B +:101C5000009904F1080000F0D1FE04F1080000F042 +:101C6000C4FE28B9207818B104F10800FFF704FF7A +:101C70001FBD2DE9F8430646002000F05FF8748888 +:101C80003088B268DFF80081C4F3090444EA802494 +:101C9000F068A4B2C1B2204600F03CF8002748F238 +:101CA000E8094846FFF7EFFE08E06888A04202D145 +:101CB000316928780870687800B1012708F124009C +:101CC00000F093FEF0B9694608F1240000F0B6FE7A +:101CD000009800F10B05407A0F28E6D0B5F8011006 +:101CE000A1420DD10098817AC81E7169C0B28842A4 +:101CF000C8BF0846706102463069E91CFFF712FF51 +:101D00002878D9E73800CCD0012000F017F800205F +:101D1000BDE8F28310B513461C4A5468A4F80900C4 +:101D2000E1720A46194604F10C00FFF7FBFE164A61 +:101D30001369BDE810400021002018471249096AC4 +:101D400082B008B921B101E011B1012002B0084709 +:101D500002B0704710B50146487A0F2818BF0E2808 +:101D600007D10B4800F054FEBDE810400020FFF7FB +:101D700087BE064C04F1080000F04AFE04F108009A +:101D8000BDE81040FFF778BEE0220020B02300201D +:101D9000042300200C48002101604160704710B509 +:101DA00000F00CF85C6819B1012904D1204301E06E +:101DB00024EA0000586082F3108810BDEFF310820F +:101DC00072B6014B70470000E42300202DE9FC4768 +:101DD000604CDFF88491A5692840A0614FF0FF3A7C +:101DE00021694FF0010834E0521C54F83200616957 +:101DF00019400142F8D0616904EBC20608407168DD +:101E00001840014208BFC6F804A07768384000F0C7 +:101E1000A5F8606208FA00F087437760EFF310815D +:101E200072B6626A206908FA02F2D2431040206159 +:101E3000022004EBC00353F8086C1640401E43F820 +:101E4000086CF6D181F31088606A59F82010884731 +:101E50002169A36960690140194205D0E069216ADE +:101E6000084208BF0022C0D0C4F824A000F0E8FE59 +:101E7000EFF3108972B6216960690140A0690142DF +:101E800001BFE169206A014200F090FF89F31088E8 +:101E9000C046C046A561BDE8F38738B51446EFF3E8 +:101EA000108572B600F05AF82B4941F8204085F3AE +:101EB000108831BD10B500F00BF804431C6153F8D5 +:101EC0003140204343F83100FFE782F3108810BD12 +:101ED000EFF3108272B61F4B1C697047EFF310814D +:101EE00072B61C4A536923EA000005E0EFF3108143 +:101EF00072B6184A53691843506181F310887047CD +:101F0000EFF3108172B6134AD3691843D061F4E736 +:101F1000F8B5104C666A256A374616F1010F0EBFF8 +:101F20000026012101FA06F6206202E0304600F0A8 +:101F30003EFF216AE0690842F8D06762EFF3108142 +:101F400072B6E269206A8243E26181F310882562F9 +:101F5000F1BD000098200020002200200246002051 +:101F6000110C090404BF1020120412F07F4F04BFAB +:101F7000083012020FF2180112F0704F04BF001D5A +:101F80001201120FC0F11F00895C401AC0B27047E5 +:101F90000403020201010101000000000000000032 +:101FA0001FB500F044F84FF6524000F064FF14B142 +:101FB0009DF80F0020700EE01FB5002408B10090BE +:101FC000042409B10191241D6B466A46E1B24FF623 +:101FD000544000F050FF9DF80E0004B010BD00F01A +:101FE0004AFF9DF80E0005B000BDF8B500F020F8DE +:101FF0004FF65A40F3E7F8B500F10C026B46252185 +:102000004FF66640EBE7F8B500F10C026B460F2186 +:102010004FF66840E3E7F8B500F003F84FF6694083 +:10202000DDE78DF800006B466A46012170470446E3 +:102030006B46002200217047F8B5FFF7F2FF4FF61C +:102040007340CCE710B55049504C4FF40040086045 +:1020500000F060FF606840010ED56068C0000BD4DE +:1020600000F084FF00F082FF206840F480302060A0 +:10207000216821F48031216000F013F800F057F856 +:102080004348016800220260026902F050020261C6 +:1020900000F028F800F0E3FD4FF0FF30FFF796FE68 +:1020A000FAE73C4881B0016841F4801101603F21AA +:1020B000006800F48010009000983748416041614A +:1020C000016841F47C110160026942F47C120261F2 +:1020D000016841F03F010160026942F03F02026184 +:1020E00001B0704710B500F041FF00F03FFF2748F6 +:1020F0002A4C016821F4407141F4807101600F2184 +:10210000026842F4004202602548816047F6FF7190 +:10211000C160046000F054FFCA206062FF215320B8 +:102120006062A068C008C000A060616210BD80B598 +:1021300000F01CFF00F01AFF1448016841F0010193 +:10214000016001688907FCD5416821F4404141F4F0 +:102150008041416001BD38B50446FEF759FF14F1D6 +:10216000010F054609D000F0E9FE241805E00D48EE +:10217000016821F00401016030BFFEF749FF401BF8 +:10218000A042F4D331BD0000104000589000005828 +:102190008008005850000058040C005800280040E7 +:1021A0000C23002010ED00E072B6FEE700B587B00A +:1021B00000F010F8012003220690ADF80420ADF8DD +:1021C000062000F011F800284CBFFF209DF8000009 +:1021D00007B000BD00208DF800001822002101A8E2 +:1021E00000F098BF03900691CDF814D0002101A80B +:1021F000FFF73FBD18B50C46C7B0114600228DF859 +:1022000000208DF81C008DF81D4022460DF11E00A7 +:1022100000F07AFF00F02AF83F200C21ADF804000E +:10222000ADF8061007A8012103900691A41C0494A0 +:1022300000F02CF800284CBFFF209DF8000048B0AB +:1022400010BD00B5C7B000F00AF80F2000F013F879 +:1022500000284CBFFF209DF8000047B000BD0022C1 +:102260008DF800208DF81C008DF81D10182200211B +:1022700001A800F04FBFADF8060007A902200490A6 +:102280003F22012003910690ADF80420CDF814D030 +:10229000002101A8FFF7EDBC00B587B000208DF844 +:1022A000000000F0E0F840F20110ADF806003F2217 +:1022B0000120069000F013F900284CBFFF209DF884 +:1022C000000007B000BD2DE9F84107460128C7B05E +:1022D000884615461E4608BF022003D002280CBFC0 +:1022E000102000200DF11D010C1800F036F8012F10 +:1022F0008DF81C7002D0022F18D019E002273A4640 +:1023000041460DF11D0000F0FFFE2570667000F0E3 +:10231000AAF83F204FF4817100F016F8FF1C0497D3 +:1023200000F0DFF8002805D5FF2009E01027E6E7D8 +:10233000972005E09DF8000010B94E9800F067F86E +:10234000FFE748B0BDE8F081ADF80400ADF8061035 +:1023500007A80321039006917047032200216846D5 +:1023600000F0D8BE2DE9F64F0C460546012CC7B04B +:102370009B4608BF022003D0022C0CBF1020002077 +:102380000DF11F010E18FFF7E8FF012CADF81C50EE +:102390008DF81E4002D0022C2CD02DE00227569C36 +:1023A000559DDDF85091DDF84CA1DDF84881489944 +:1023B0003A4600F054F8A6F800B086F8028086F895 +:1023C00003A086F804907571B47100F04CF83F20BA +:1023D000ADF804004FF4827107A8ADF80610039021 +:1023E00003210A370497069100F07BF8002805D5F1 +:1023F000FF2009E01027D2E7972005E09DF80000B4 +:1024000010B9579800F003F849B0BDE8F08FBDF857 +:10241000011001800020704730B5C7B01C464A9BB0 +:1024200000F049F800258DF800508DF82140224633 +:1024300019460DF1220000F067FE00F014F83F206D +:102440004FF4837100F042F8A41D049400F049F8A1 +:1024500000284CBFFF209DF8000047B030BD0DF1B3 +:102460001F0000F051BE1822002101A800F052BE4A +:1024700078B5C7B04C9C4D9D00F01DF800268DF836 +:1024800021308DF800608DF822402246294600F068 +:1024900019F8FFF7E8FF3F204FF4937100F016F8AA +:1024A000E41D049400F01DF800284CBFFF209DF8A7 +:1024B000000048B070BDADF81C00ADF81E108DF8DE +:1024C000202070470DF1230000F01EBEADF804007F +:1024D000ADF8061007A80121039006917047ADF8EA +:1024E0000420CDF814D0002101A8FFF7C2BB2DE9CC +:1024F000F84DC7B09446DDF840E1519A559D569E7F +:10250000DDF84CA1ADF81D108DF81C004FF0000B4C +:10251000ADF81FC08DF821308DF822E000F024F8CE +:1025200000F017F824F8095F668000F0E7F83F2014 +:10253000832100F0DBF8574406910D37049700F033 +:10254000B5F800284CBFFF209DF8000048B0BDE85A +:10255000F08D88F800A007AC5499E419524608F1B0 +:102560000100544400F0D0BD8DF823201746529945 +:102570008DF800B00DF1240809A8B84400F0C4BDDE +:1025800000B5C7B000F00CF8852000F095F800F019 +:102590008AF800284CBFFF209DF8000047B000BD1E +:1025A00000218DF81C008DF80010182201A800F001 +:1025B000B1BD2DE9F841C7B04FF0000800F026F892 +:1025C0000DF12300DDF844E14E9F4F9E509D529C3B +:1025D0008DF81F30C0F800E08DF800808DF8207075 +:1025E0008DF821608DF822508DF8274000F086F894 +:1025F0008620ADF8060007A90C2000F050F800284E +:102600004CBFFF209DF8000000F07DB88DF81C0045 +:1026100007A8417082707047F8B5C8B005460E46ED +:1026200017461C4600F023F808A8467087708DF8FE +:10263000205000F056F88A21ADF80A103F200321FF +:1026400000F042F8002848BFFF200ED49DF800009B +:1026500058B94F994E98BDF801202280BDF803204B +:102660000280BDF805000880002049B0F0BD0722B7 +:102670000021684600F04EBD18B5C7B000F051F813 +:1026800000F03CF83F208E2100F040F800F00EF8FA +:1026900000284CBFFF209DF8000048B010BD0490FA +:1026A0003F22012003910690ADF80420CDF814D00C +:1026B000002101A8FFF7DDBAADF8060007A9012047 +:1026C0003F22039104907047ADF80800059108A8D7 +:1026D000072104900791CDF818D0002102A8FFF738 +:1026E000C8BA1822002102A800F014BDADF80400F9 +:1026F000ADF8061007A801210390704718220021A9 +:1027000001A800F007BD48B0BDE8F081ADF80400B5 +:10271000ADF8061007A8012103900691641C0494EB +:102720007047044600208DF800008DF81C402246BA +:102730000DF11D0000F0E8BC1C49002008770022C4 +:102740001B48027000F036B818490A7F41F8220091 +:10275000087F401C0877704770B504466078FF28F2 +:1027600002BFB4F8031001F47F41B1F5406F12D1FC +:1027700000260E4D00E0761C297FF0B288420AD276 +:10278000F1B255F82110204688470100F3D002D05D +:10279000022805D006E02046BDE87040FFF71BB9CF +:1027A000002070BD012070BD0000000054230020F7 +:1027B0001C24002080B5C046C046C046C046C04666 +:1027C000C046C046C046C046C046C046C046C046D9 +:1027D000C046C046C046C046C046C046C046C046C9 +:1027E000C046C046C046C046C046C046C04600F0CF +:1027F000EDFCC046C046C046C046BDE8014000F002 +:102800005DBD000000EB8100654AD0F88010914268 +:1028100001D0012070470020704742F4806240F8E8 +:10282000212070472DE9F04104460D460026DFF8CF +:10283000748102214046FFF7E5FF0028F9D100F03E +:1028400070FD0120FFF7E7FB0027AF4215D23000F3 +:1028500013D1381900F045F806467F1CF5E7002033 +:10286000FFF7D9FB00F06BFD002202214046FFF785 +:10287000D4FF00252846BDE8F081002EEFD0ED1BE7 +:102880006D1CF7E72DE9F84380460C4615460026F7 +:10289000DFF8109102214846FFF7B4FF0028F9D174 +:1028A00000F03FFD0027AF4216D2AEB904EBC700DF +:1028B000D0E9002308EBC70000F023F806467F1C90 +:1028C000F1E700F03CFD002202214846FFF7A5FF9A +:1028D00000252846BDE8F283002EF2D0ED1B6D1CCA +:1028E000F7E782B001460020009002E0009A521CF7 +:1028F000009200982328F9D300220023002002B080 +:1029000001E0014601202DE9F84F86B0022501269D +:102910000295049603918DF8000005919246DFF828 +:102920008480214F9B46EFF3108938680003FCD464 +:1029300072B6D8F8180008B1012519E00721404601 +:10294000FFF760FF0025C4B294B99DF8000020B9DC +:1029500001A902A800F048FD05E0059952465B4632 +:10296000012000F0B1FC002207214046FFF755FF8F +:1029700089F310880DB1002002E0002C03D0012063 +:102980000020C0460646254318BF002ECDD138682A +:102990004103FCD4701E8041C00F07B0BDE8F08F2A +:1029A00000040080001400581040005801460648FA +:1029B000064AC3798B4218BF904218BF0838F8D135 +:1029C0008B4218BF00207047F873FF1F0070FF1F75 +:1029D0000249016002490161704700BFA32A000853 +:1029E000C92A0008006040607047EFF3108172B69A +:1029F000026882420CBF012000201CE0EFF310822D +:102A000072B603680B60486001600868416023E0AB +:102A1000EFF3108272B6086043684B60416048680B +:102A2000016019E0EFF3108172B642680368136029 +:102A300002684368536081F31088704710B5EFF364 +:102A4000108472B602680A600068FFE7FFF7EAFFC9 +:102A500084F3108810BD0B6082F31088704700006B +:102A600000F0AFBD6C486D49016001F12002426089 +:102A700001F13002826001F13C02026201F1440284 +:102A8000426201F14C02C26001F15402026101F1A3 +:102A90007002426101F1740282618031C16100F013 +:102AA000AEBD38B504465E4D2846FFF79BFF5A4839 +:102AB0004068A1680160E168C16085605949416072 +:102AC00000F0B9FD58482AE080B5534842681368C1 +:102AD00001211972406800F0B4FD002002BD38B534 +:102AE000514C4F4D04E000F041F8009821688847B0 +:102AF0002846FFF77AFF0028F5D031BD4A484168E3 +:102B0000084738B50446494D2846006040604248B1 +:102B1000C068A1680160456000F098FD44482168E4 +:102B2000016061684160002032BD80B53A48C268EA +:102B3000136810211972C06800F08EFD002002BDDC +:102B400035483B4AC168C16813680868184738B5FA +:102B5000374C364D04E000F009F80098616888476A +:102B60002846FFF742FF0028F5D031BD69462846C8 +:102B7000FFF764BF38B504462E4D2846FFF732FFF5 +:102B80002D480060406024480069A1688160E168C8 +:102B9000C16005612168016061684160216941612E +:102BA0006169816131BD80B501462348FFF730FF7F +:102BB000BDE802400FF2050000F057BD38B5164CD5 +:102BC0001D4D06E0FFF7D2FF009920690069FFF76D +:102BD0001FFF2846FFF709FF0028F3D031BD10B5CD +:102BE000164C2046006040600B4841690C60BDE80F +:102BF000104000F04EBD1CB5104C06E06946204662 +:102C0000FFF71CFF0098C046C0462046FFF7EDFEC8 +:102C10000028F3D013BD000000000320AC090320FE +:102C2000480A032090080320F4230020500A0320C0 +:102C3000FC230020380A0320EC230020400A032054 +:102C400070470000BFF34F8F264927480A6802F4F7 +:102C5000E06202430A60BFF34F8F00BFFDE710B58B +:102C60002248234C88B0016841F400410160FFF71D +:102C700091F820480168C908C90041F004010160C9 +:102C800000F020FD1C490020FEF7BFFC00F057FDBE +:102C900001210120FFF783F800F079F8FFF7E2FE49 +:102CA000164A00210220FFF7F8F804F23C500FF218 +:102CB00051010090019169460FF2490000F086F839 +:102CC00004F25470029004F5C96140F23C50059042 +:102CD0000391049402A8FFF74DFFFFF7C1FE08B06F +:102CE00010BD00000CED00E00400FA0508000058DB +:102CF00030000320800400580C2300200F2E000811 +:102D00007047000038B50546686830F80B1FB1F50C +:102D1000124F15D180784FF0005490B921780229D4 +:102D200008BF207030D000F019FD0120FFF784F9B2 +:102D300000210120FFF733F8FEF780FD0120287005 +:102D400031BD0020FFF72CF9FF281DD042F210758D +:102D500088B92078022808D100212170FFF745F9B1 +:102D60000121002000F008F9FAE70220207000217C +:102D70000020FFF721F92846FFF7EDF90020FFF7C3 +:102D80000FF910382028F6D3FFF75CFF00BF80B59D +:102D90000121002000F017FE0121012000F013FEA8 +:102DA000BDE804400121022000F00DBE70474FF045 +:102DB000FF30FFF70BB800210220FFF77BB802209D +:102DC000FFF79EB80220FFF7A3B800007FB50C46BE +:102DD0004D4D61684D4EE8612962284600F05AFE6B +:102DE0002468746006F1080000604060012000F073 +:102DF00068F801203070296841B10FF2E9000FF244 +:102E0000ED02009001920294684688477FBD1FB58D +:102E10003E4C04F10800FFF7E8FD00BB2178F1B15A +:102E2000694604F10800FFF709FE3748C16949B156 +:102E30000098029001228DF8042001A888479DF88F +:102E4000040000E001202070207818B10098FFF7FE +:102E5000AAFE04E0009904F10800FFF7CFFD04F199 +:102E60000800FFF7C2FD28B9207818B104F1080066 +:102E7000FFF7A1FF1FBD2DE9F04105460E46904624 +:102E80001C46002000F01DF8204F7868A0F809507B +:102E9000C672324641460C30FEF744FE1A4A1369A8 +:102EA00000210020984748F2E800FFF78BFF79687F +:102EB0008A78D21C04F10800FEF734FEBDE8F04128 +:102EC00001201CB51049124C096A20B901B188478C +:102ED0000020207013BD0120207011B1BDE81C40FE +:102EE000084713BD0020FFF76ABF000010B5014678 +:102EF000064C04F10800FFF78BFD04F10800BDE863 +:102F00001040FFF758BF000030230020C0230020EE +:102F10001D240020114810B5016841F48071016042 +:102F20000320FEF78EF8002000F0BEFD00240028EC +:102F300014BF012400F018F8204610BD084800789E +:102F40007047084805E00748016841F00201016048 +:102F50007047016841F0010101607047004000586E +:102F6000D0200020042004E07047000011480168D0 +:102F700041F480710160704710B50C460E4900287D +:102F8000086805D1810507D500F0A8FB20B110BD68 +:102F9000810558BF00F09CFB0848016821F004013E +:102FA000012C016001D130BF10BD40BF20BF20BF48 +:102FB00010BD0000000400581404005810ED00E09B +:102FC00038B5040044D094F8210028B9002184F8D1 +:102FD00020102046C046C04600F049F8FF2510B139 +:102FE00000F03FF834E02168DFF8B0008A68024062 +:102FF0008A6021688A68636820690343A069034383 +:103000001A438A602168E068086120680169A26843 +:1030100041EA024101612068C16821F08001C1607C +:103020002068C16C21F00201C1642168CA6CE369A7 +:10303000606903431A43CA6420688168880609D41A +:1030400000F020F830B120684562042100F01FF83C +:10305000012032BD20684562012184F82110002042 +:1030600032BD20684562042184F821107047022097 +:1030700084F82100CA2021684862532022685062E7 +:10308000204626E020460BE02068C0F8248084F823 +:103090002110002084F8200070470000BFFF8FFF40 +:1030A00070B5044640F2E9362068C16821F0A001FD +:1030B000C160FDF7ADFF05462068C168880606D4EB +:1030C000FDF7A6FF401BB042F6D3032070BD0020E1 +:1030D00070BD70B504462068C1684A0612D44FF02E +:1030E000FF32C26040F2E936FDF792FF05462068E4 +:1030F000C168480606D4FDF78BFF401BB042F6D3EB +:10310000032070BD002070BD10B50446FEF70AFD17 +:10311000204610BD10B5044610460A46014620461A +:1031200000F0E4FC204610BD1FB541780024FF29C3 +:1031300049D1B0F803104F4A40F60143C91A04D0F0 +:1031400012392ED0091F1AD03DE05388B0F807106D +:103150005B1C99420BD100218DF80C1000F10D027F +:1031600002920124B0F80B108DF80D1015E0D288F2 +:10317000521C914227D101248DF80C4006E0117AAF +:1031800009B31472032101248DF80C1000F10D0213 +:103190000292B0F80B008DF80D0002A800F0DAFCE6 +:1031A00011E0D288B0F80710521C91420BD100F107 +:1031B0000A0301930023427A00920022B0F805002E +:1031C000FFF756F90124204604B010BD10B586B0B3 +:1031D0002948284CFFF7B8FA0094082301220FF27F +:1031E0009C010220FFF76FF8002104910191A01CBF +:1031F00005900A22012304210392029300910423E3 +:1032000020880FF288020221FFF7ACF80021049118 +:1032100002910191201D05900A2220210392009124 +:10322000012320880FF274020221FFF79BF8A01DF2 +:1032300005900121049100200A220323019004211A +:10324000039202930091F82320880FF2600202217A +:10325000FFF788F80020207206B010BD80B50091FD +:103260000122044881880272012300880022FFF7AE +:10327000D3F802BDD0230020293100088FE5B3D553 +:103280002E7F4A982A487ACC20FE000019ED82AEA3 +:10329000ED214C9D4145228E22FE000019ED82AEAB +:1032A000ED214C9D4145228E23FE000019ED82AE9A +:1032B000ED214C9D4145228E24FE00007047000008 +:1032C000DFF800F0692000202DE9F041404F06466C +:1032D00038780128884614461D4608BF02201BD0B6 +:1032E000012139700020786000F018F8010011D138 +:1032F000012E22462B46404602D100F05BF802E048 +:103300001146FFF7DDFF00F009F832490A6822EAAA +:1033100006060E6000213970BDE8F0814FF47A7026 +:1033200018E02E49CA680020002A07D52C4B2D4AE8 +:103330000B600A60C968002948BF01207047254911 +:103340000A6842F000420A6000200968002958BF5C +:103350000120704770B50546FDF75AFE06461E4C23 +:103360002068C10311D5FDF753FE801BA842F7D397 +:10337000032070BD164920604860012070BDFDF734 +:1033800047FE801BA84210D3F2E72068C10744BF64 +:1033900001212160010404D54FF40041216020F493 +:1033A00000404CF2FA310840E4D120684103E6D4F1 +:1033B000002070BD10B507490C6844F001040C6092 +:1033C00040F8042BBFF36F8F036010BD00000000B6 +:1033D000982300201440005810400058084000581E +:1033E00023016745AB89EFCD2DE9F04100F053F89B +:1033F000884608BF02204CD000F052F800F055F883 +:10340000010044D12968DFF8C470022919D14FF0B6 +:10341000FF32C8F800206E6800E0761C6968AA6870 +:1034200051188E4208D2304600F043F800F03DF8C3 +:103430000100F2D0C8F800607A69DFF894100A4001 +:103440007A6139688A050FD53A6822F400723A60C9 +:10345000396841F4006139603A6822F400623A60E8 +:10346000396841F4007139603A6851050FD53968FF +:1034700021F4806139603A6842F480523A603968D8 +:1034800021F4805139603A6842F480623A60002148 +:103490002170BDE8F081104C054620780128704766 +:1034A000002001216060217070474FF47A70FFF7AF +:1034B00051BF08490A6822F4FF6242EAC00242F49E +:1034C000803242F002020A6070470000004000585B +:1034D00005F8FFFF1440005898230020C0680840FA +:1034E000884201D10120704700207047C069084020 +:1034F000884201D1012070470020704710B5684C08 +:1035000002212046FFF7F2FF38B16068C04381070F +:1035100003D5FFF71CFB022018E001212046FFF72E +:10352000E5FF38B16068C043C10703D5FFF7D7FA9C +:1035300001200BE008212046FFF7D8FF38B1606872 +:10354000C043010703D5FFF756FB0820A06010BD5C +:1035500010B5534C02212046FFF7C0FF58B96068F0 +:10356000C043810307D5606840F400306060BDE867 +:103570001040FFF7E5BA08212046FFF7AFFF70B90A +:103580006068C04301030AD56068464940F40020E2 +:103590006060086880474FF40020A06010BD2021C3 +:1035A0002046FFF79BFF58B96068C043810207D5EA +:1035B000606840F400106060BDE81040FFF79EBAFC +:1035C00010BD394881B0016841F480110160006884 +:1035D00000F48010009000983448016841F40071B4 +:1035E00001603348026842F40072026040BF20BFAD +:1035F0003048016841F40041016001B0704780B576 +:103600002D48016841F480110160006800F48010C9 +:10361000009000982248016841F0010101600268B1 +:1036200042F4803202602C20FDF736FDBDE80240F6 +:103630002D20FDF731BD214801684908490001608E +:1036400070471F494FF48030086070471B4801687D +:1036500021F002010160704718484FF400314160C9 +:10366000016821F400310160704738B504460C4D03 +:1036700008212846FFF732FF30B10A480460686825 +:1036800020F40020686031BDA0474FF40021A960FC +:1036900031BD0A48016821F008010160704700004F +:1036A000000C00580C24002050010058D408005889 +:1036B000200800580C04005850000058040C005812 +:1036C000080C00581348016841F40071016070470C +:1036D0001148016841F480410160704710B50E4AFD +:1036E0000E4B106820F48040106032211C680C489A +:1036F000B4FBF0F0484351698B0506D5002818BF8C +:10370000401EF8D101E0002010BD50698105FAD5B6 +:10371000032010BD0804005800040058DC200020DD +:1037200040420F00484900E0484981B00A6802431E +:103730000A60096808400090009801B0704780B5A1 +:10374000FFF7FFFBFFF7FFFB4148016841F48031C1 +:10375000016000F0ADFABDE801400EE000B587B0B1 +:1037600068460FF230211C22FEF7ECF9FFF737FA1A +:103770006846FEF748FC07B000BDF0B585B0684666 +:103780001421FDF74BFC00260025002400210FF238 +:10379000D40000EBC102907988B11368B3F1904F67 +:1037A00008D02C4FBB4208D02B4FBB4204BF90889F +:1037B000044304E09088064301E090880543491CD7 +:1037C0002629E4DB002002900121032003900191CF +:1037D000B0B288B100900120FFF7A4FF0120FFF7ED +:1037E000A3FF69464FF09040FDF7ACFC0022B1B258 +:1037F0004FF09040FDF764FDA8B280B10090022028 +:10380000FFF790FF0220FFF78FFF124E6946304608 +:10381000FDF798FC0022A9B23046FDF751FDA0B299 +:1038200080B100900420FFF77DFF0420FFF77CFFAC +:10383000094D69462846FDF785FC0022A1B22846BD +:10384000FDF73EFD05B0F0BD4C0000584C0100589E +:103850009008005800040048000800480020FDF7C8 +:103860004CB80000000000480100000000000048C3 +:1038700001000000000000480100000000000048B6 +:1038800001000000000000480100000000000048A6 +:103890000100000000000048010000000000004896 +:1038A0000100000000000048010000000000004886 +:1038B0000100000000000048010000000000004876 +:1038C0000100000000000048010000000000004866 +:1038D0000100000000000048010000000000004856 +:1038E0000100000000000048010000000000004846 +:1038F0000100000000000048010000000000004836 +:103900000100000000000048010000000000004825 +:103910000100000000000048010000000000004815 +:103920000100000000000048010000000000004805 +:1039300001000000000000480100000000000048F5 +:1039400001000000000000480100000000000048E5 +:1039500001000000000000480100000000000048D5 +:1039600001000000000000480100000000000048C5 +:1039700001000000000000480100000000000048B5 +:1039800001000000000000480100000000000048A5 +:103990000100000000000000000000000000000026 +:1039A00064380008280003202C00032026040400AB +:1039B0002A4981B00A6802430A60096808400090F9 +:1039C000009801B07047F0B585B005460C466846D2 +:1039D0001421FDF723FB2DB1012D08BF102002D0CB +:1039E000022D02D10120FFF7E3FF0FF28C001C4FE4 +:1039F00030F81500009001210220039007EB8506A6 +:103A0000029130682CB9002101916946FDF79AFBBB +:103A100020E04FF40411019107EBC5046946FDF75E +:103A200091FB0FF2600050F8251004F1240000F023 +:103A300058F9F268002104F1240000F04BF90FF26C +:103A400040004457B16900222046FDF707FB20469D +:103A5000FDF722FB002005B0F0BD00004C0000582F +:103A60002C200020002000F013B8012000F010B836 +:103A7000022000F00DB8000001001000400000001E +:103A8000060A1700000000160400001606000016C3 +:103A9000704700000249016002490161704700BFA0 +:103AA000032B00082B2B000870B50F4E044630780E +:103AB0000025A8B1FDF761F932784FF47A71B1FBB6 +:103AC000F2F1B0FBF1F0FDF701FB48B9102C07D281 +:103AD000002221464FF0FF30FDF7C0FAB46000E04D +:103AE0000125284670BD00BFD020002062F30F22C0 +:103AF00062F31F42401810F0030308D0C91A1FD305 +:103B0000DB0748BF00F8012D28BF20F8022D130065 +:103B100030B414461546103928BF20E93C00FAD8C5 +:103B2000490728BF20E90C0048BF40F8042D890050 +:103B300028BF20F8022D48BF00F8012D30BC704787 +:103B4000C91818BF00F8012DCB0728BF00F8012DB8 +:103B500070470000F8B506464A4D307920B101287B +:103B600024D0032857D0F1BD31680A78012A4FF0DC +:103B7000006004D0022A09D0072A0FD0F1BD00222C +:103B800028606A7400F08AF82A74F1BD0121286067 +:103B9000697400F083F800202874F1BD01228DF8CB +:103BA000002069460220FFF759FBF1BD7479002718 +:103BB0001EE0316805F1080339441844FDF7B2FFEF +:103BC00000F066F80028FBD1D5F800C0D5E9022343 +:103BD000DCE90001994208BF904209D10CF10800CC +:103BE0002860287CC0F10800241AC7190020287416 +:103BF000287CC0F108029442DBD2002CC5D0316889 +:103C000005F10803224639441844FDF78BFF287C50 +:103C100024182C74F1BD287CA8B1C0F1080105F16D +:103C20000803FF221844FFF761FF03E000F030F8BB +:103C30000028FBD12868D5E90267D0E90023BB4200 +:103C400008BFB242F2D1687C90B101289DD14FF0FB +:103C5000005100200870BFF34F8F0B490B480A68D2 +:103C600002F4E06202430A60BFF34F8F00BFFDE73A +:103C7000FEF796F90020FEF793F901210020FFF7E7 +:103C80007BF9FAE7802300200CED00E00400FA0540 +:103C90002868012205F10801FEF7F4BD3068C178FB +:103CA000297031688878687030684178A9707047E9 +:103CB00080B5FFF7D3FD022100910023044800F1F5 +:103CC00024014FF48052001D00F011F801BD0000E6 +:103CD000081000200346002009B95A6070470120EF +:103CE000704708B90120704701600020704710B587 +:103CF000029C016042600021C160016141618161FB +:103D00000381A107047704D5008910B14FF0FF307B +:103D100010BD002010BD00004748484A01681268E5 +:103D2000B1F1006F0AD3120302F47F2244488218D3 +:103D30008A4203D308684349884201D00020704773 +:103D40000120704780B5404940480860016881F310 +:103D500008884068804730BF01BD10B5FFF7DCFF21 +:103D60004FF0005420B100202070BDE81040E9E77A +:103D7000012020700E206070FF20A07010BD38B5AB +:103D8000334C2068C00002D4206880011AD54FF05F +:103D90000055287828B9FFF7BFFF10B1FFF7D2FF11 +:103DA00012E0287848B9FFF7B7FF30B90120287032 +:103DB0000E206870FF20A87006E02878012818BF40 +:103DC000022801D0FFF7C9FF2248016841F47001C1 +:103DD00001600020FEF7EAFD40B180791E49A16034 +:103DE000A16821F47C5141EA0021A1604FF0B0406C +:103DF000016841F48031016018490A68D208D20094 +:103E000042F001020A600A6802F00702012AFAD1B0 +:103E100001688903FCD581688908890041F00201A5 +:103E20008160816801F00C010829FAD10168490814 +:103E30004900016031BD0000407100088040005819 +:103E4000FCFFFF07298A449408ED00E00070000899 +:103E50009400005888ED00E0FECAFECA00400058F9 +:103E60000100000003000000050000000100000048 +:103E700001000000060000000A0000002000000011 +:103E80000200000004000000080000001000000014 +:103E9000400000008000000000010000000200005F +:103EA000A0860100400D0300801A060000350C00BA +:103EB00040420F0080841E0000093D0000127A007D +:103EC0000024F40000366E010048E801006CDC02BA +:103ED00000000000000000000000000000000000E2 +:103EE0002DE9FC4D016800F10805490805EBC10208 +:103EF000019200F10802406800F0010A02EBC108DB +:103F0000400808EBC00B00200021019A95422FD0F9 +:103F10002A68AE186A68324400920835009A9642C0 +:103F2000F3D016F9014B009A964205D12A68AE18D3 +:103F30006A6832440092083516F8017B884210D135 +:103F4000D84508BF00F01AF8D8F80000D8F80410D7 +:103F5000BAF1000F18BF48440144884208F108082C +:103F6000EED0002C00F8017B05D5641CE6D1D5E726 +:103F70005846BDE8F68D641ED5D5CFE7012000F088 +:103F800001B8000080B5AFF30080024A110018208C +:103F9000ABBEFBE72600020000F024F8012810D099 +:103FA0000D4880470D480047F0B543464C465546FE +:103FB0005E466746F8B40A4C6B462360BFF34F8FEA +:103FC00030BF074C2468A546F8BC9846A146AA46CF +:103FD000B346BC46F0BD00007F3D00085B410008D1 +:103FE00014240020024900200860704700000000EF +:103FF0001824002019E050F8042BD30744BFA9F17E +:1040000001039A18091F0023042942F8043BF9D23E +:104010005FEA817C134604D54FF0000CA2F800C083 +:104020009B1CC90744BF0021197050F8041B0029CC +:10403000E1D170477047FEE770477047704700F066 +:104040000FB87047704770470020FCF76CBC002029 +:10405000FCF76FBCFDF789BAFFF77ABAFFF74EBAE3 +:10406000024841680278891841607047D0200020DA +:1040700010B5074979441831064C7C44163404E0E5 +:104080000A68081D114488470146A142F8D110BDB5 +:104090002C000000780000004EF68851CEF200019E +:1040A000086840F470000860BFF34F8FBFF36F8F54 +:1040B0004FF00070E1EE100A7047000039FFFFFF7B +:1040C00040030000E02000207008000030000320C2 +:1040D000000000000DFEFFFF0200000002000000D3 +:1040E0002A01000002000000280003200800000050 +:1040F000F1FDFFFF020000000200000010010000BF +:10410000AF00000008100020D810000000000000E0 +:10411000000000000000000000000000010000009E +:104120000200000003000000040000000120C0465F +:10413000002801D0FFF79CFFAFF300800020AFF311 +:104140000080FDF77FFF00F000F800F001B80000EC +:1041500007463846FFF716FFFBE7AFF30080FFF78F +:104160009BFFFFF7E3FFFFF7FEBFFFF7FEBFFFF781 +:10417000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF773 +:10418000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF763 +:10419000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF753 +:1041A000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF743 +:1041B000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF733 +:1041C000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF723 +:1041D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF713 +:1041E000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF703 +:1041F000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7F3 +:10420000FEBFFFF7FEBFFFF7FEBFF8000001810011 +:104210008100810081008100810081008100810096 +:104220008100810081008100810081008100810086 +:104230008100810081008100810081008100810076 +:104240008100810081008100810081008100BA002D +:10425000044800100048FD000D48653A00086B3A1C +:104260000008713A00080FFD00000FFD00000FE587 +:10427000002F30B50A4B5A6842F480225A60EFF39F +:10428000108472B6802251F8045B40F8045B521E21 +:10429000F9D11868C103FCD484F3108830BD1040F4 +:1042A0000058EC00F8FFF400030DFF0186F4000055 +:0B42B00001F9000010FC0002093D00B5 +:040000050800415B53 :00000001FF diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h index 7c95f77a2..7a92b8f09 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -96,6 +96,8 @@ * SMPS used when Set to 1 */ #define CFG_USE_SMPS 0 + + /* USER CODE END Generic_Parameters */ /**< specific parameters ********************************************************/ @@ -110,7 +112,7 @@ /** * AD Element - Group B Feature */ -/* LSB - Firt Byte */ +/* LSB - First Byte */ #define CFG_FEATURE_OTA_SW (0x08) @@ -169,7 +171,7 @@ * Maximum supported ATT_MTU size * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" */ -#define CFG_BLE_MAX_ATT_MTU (156) + #define CFG_BLE_MAX_ATT_MTU (251) /** * Size of the storage area for Attribute values @@ -250,6 +252,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -259,11 +265,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -271,6 +281,20 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -587,5 +611,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h index c95d8bea9..286cf657d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h index ad8a207e6..593788991 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,5 +174,3 @@ uint32_t FD_EraseSectors(uint32_t FirstSector, uint32_t NbrOfSectors); #endif #endif /*FLASH_DRIVER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h index 125865f0e..0888552f8 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -259,5 +259,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/main.h index a60f31d13..f044659fc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void SystemClock_Config( void ); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h index f20427b46..beff9bc3a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h @@ -5,17 +5,16 @@ * @brief OTP manager interface ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* This file brings SBSFU functions and constants that are needed by ble_ota project*/ @@ -46,5 +45,3 @@ extern "C" { #endif #endif /*__OTA_SBSFU_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h index 5bf219814..41922971b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h index 10237096f..64aaf86fe 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -75,5 +74,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_debug.c index 340409c37..9a6ec616e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -119,8 +119,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -388,5 +396,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_entry.c index 05122eca8..4d0b2124d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -476,4 +476,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c index dcd415b18..8279bf76d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** - * File Name : flash_driver.c - * Description : Dual core Flash driver - * - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : flash_driver.c + * Description : Dual core Flash driver + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -82,7 +81,8 @@ uint32_t FD_EraseSectors(uint32_t FirstSector, uint32_t NbrOfSectors) { /** * Notify the CPU2 there will be no request anymore to erase the flash - * On reception of this command, the CPU2 disables the BLE timing protection versus flash erase processing + * On reception of this command, the CPU2 will disables the BLE timing protection versus flash erase processing + * The protection is active until next end of radio event. */ SHCI_C2_FLASH_EraseActivity(ERASE_ACTIVITY_OFF); @@ -142,6 +142,9 @@ SingleFlashOperationStatus_t FD_EraseSingleSector(uint32_t SectorNumber) { SingleFlashOperationStatus_t return_value; + /* Add at least 5us (CPU1 up to 64MHz) to guarantee that CPU2 can take SEM7 to protect BLE timing */ + for (volatile uint32_t i = 0; i < 35; i++); + /* The last parameter is unused in that case and set to 0 */ return_value = ProcessSingleFlashOperation(FLASH_ERASE, SectorNumber, 0); @@ -308,10 +311,10 @@ __WEAK WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) { /** * The timing protection is enabled by either CPU1 or CPU2. It should be decided here if the driver shall - * keep trying to erase/write the flash until successful or if it shall exit ans report to the user that the action + * keep trying to erase/write the flash until successful or if it shall exit and report to the user that the action * has not been executed. * WAITED_SEM_BUSY returns to the user - * WAITED_SEM_FREE keep looping in the driver until the action is executed. This will result in the current tack looping + * WAITED_SEM_FREE keep looping in the driver until the action is executed. This will result in the current stack looping * until this is done. In a bare metal implementation, only the code within interrupt handler can be executed. With an OS, * only task with higher priority can be processed * @@ -319,4 +322,3 @@ __WEAK WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) return WAITED_SEM_BUSY; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c index 3b9a4e6f1..0046492c9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -456,5 +455,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/main.c index 5e0ce4d30..13ab439a1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -393,5 +393,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/standby_stm32wb15.c index 15bde0aaf..668547b6f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -160,4 +159,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c index 826f82d13..0ae2930cd 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -208,5 +207,3 @@ void IPCC_C1_RX_IRQHandler(void) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c index 402b82b9c..5af98784c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -176,10 +175,12 @@ const uint32_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4}; const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -const uint32_t SmpsPrescalerTable[4][6]={{1,3,2,2,1,2}, \ - {2,6,4,3,2,4}, \ - {4,12,8,6,4,8}, \ - {4,12,8,6,4,8}}; +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -570,5 +571,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/stm32wb15xx_flash_cm4.icf index d02741401..733dd9210 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/EWARM/stm32wb15xx_flash_cm4.icf @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb15xx_cm4.s index f7cdf820d..3b925699a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb15xx_flash_cm4.sct index cc5e36e89..f434782b6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x7000 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 44f82f6bd..5b0739c48 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c index 2d3b5ab2e..b11becdd4 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.c - * Description : Application file for BLE Middleware. - * - ***************************************************************************** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,7 +130,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -207,6 +207,7 @@ void APP_BLE_Init( void ) SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) { + hci_event_pckt *event_pckt; evt_le_meta_event *meta_evt; evt_blecore_aci *blecore_evt; @@ -229,7 +230,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) switch (meta_evt->subevent) { - case HCI_LE_CONNECTION_COMPLETE_SUBEVT_CODE: + case HCI_LE_CONNECTION_COMPLETE_SUBEVT_CODE: break; /* HCI_HCI_LE_CONNECTION_COMPLETE_SUBEVT_CODE */ default: @@ -589,4 +590,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h index a900670fd..f9915783e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h index c2cc0cf7f..012a76b60 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,11 +55,10 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_HR_SENSOR_APPEARANCE (832) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h index 1c1397ce9..ea7d6a4c9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,5 +202,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c index 2fbb5de4c..ee5ec0de0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file otas_app.c * @author MCD Application Team * @brief OTA Service Application - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -196,7 +195,7 @@ void OTAS_STM_Notification( OTA_STM_Notification_t *p_notification ) CFG_OTA_REBOOT_VAL_MSG = CFG_REBOOT_ON_FW_APP; #ifdef OTA_SBSFU - /* Comunication with SBSFU : FW application installation by SBSFU requested */ + /* Communication with SBSFU : FW application installation by SBSFU requested */ STANDALONE_LOADER_STATE = STANDALONE_LOADER_INSTALL_REQ; #endif /* OTA_SBSFU */ @@ -205,7 +204,7 @@ void OTAS_STM_Notification( OTA_STM_Notification_t *p_notification ) case Wireless_Fw: #ifdef OTA_SBSFU - /* Comunication with SBSFU : by-pass mode requested for Wireless stack installation by FUS */ + /* Communication with SBSFU : by-pass mode requested for Wireless stack installation by FUS */ STANDALONE_LOADER_STATE = STANDALONE_LOADER_BYPASS_REQ; NVIC_SystemReset(); /* it waits until reset */ @@ -235,5 +234,3 @@ void OTAS_STM_Notification( OTA_STM_Notification_t *p_notification ) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h index bd808a41b..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..4eecadfdd 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +701,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/readme.txt index 71d418015..d35639559 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_Ota/readme.txt @@ -8,12 +8,12 @@ * @brief OTA implementation ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -57,7 +57,7 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, Dual core - BLE/BLE_Ota/Core/Src/stm32_lpm_if.c Low Power Manager Interface - BLE/BLE_Ota/Core/Src/hw_timerserver.c Timer Server based on RTC - BLE/BLE_Ota/Core/Src/hw_uart.c UART Driver - - BLE/BLE_Ota/STM32_WPAN/App/otas_app.c The OTA service mangement + - BLE/BLE_Ota/STM32_WPAN/App/otas_app.c The OTA service management @par Hardware and Software environment diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc index 9ce29c3d0..cd29400a6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc @@ -56,8 +56,8 @@ Mcu.PinsNb=15 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -106,6 +106,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB15CCUx +ProjectManager.Example=BLE_TransparentMode +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -206,5 +208,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_TransparentMode -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex index 824c646ec..6b977de61 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex @@ -1,1104 +1,1160 @@ :020000040800F2 -:1000000008100020154100087141000873410008E4 -:1000100075410008774100087941000800000000A0 -:100020000000000000000000000000007B4100080C -:100030007D410008000000007F4100088141000868 -:10004000AD430008B1430008B5430008B7410008BC -:10005000B9430008BD430008A5410008C14300089A -:10006000C5430008C9430008AB410008CD43000860 -:10007000D1430008D543000885410008D943000852 -:10008000DD430008E1430008E543000800000000EC -:1000900000000000E9430008ED430008B1410008FA -:1000A000F1430008F5430008F9430008FD43000848 -:1000B0000144000805440008094400080D440008F4 -:1000C00000000000000000001144000800000000D3 -:1000D0008B41000815440008000000001944000886 -:1000E0001D440008214400080000000025440008C9 -:1000F000994100089D410008A141000829440008D9 -:100100002D44000800000000000000000000000076 -:10011000314400083544000839440008000000005C +:10000000081000208D440008E9440008EB44000873 +:10001000ED440008EF440008F1440008000000002F +:10002000000000000000000000000000F344000891 +:10003000F544000800000000F7440008F9440008F7 +:1000400025470008294700082D470008FD440008FF +:1000500031470008354700082145000839470008A6 +:100060003D4700084147000827450008454700086C +:10007000494700084D47000801450008514700085E +:1000800055470008594700085D4700080000000078 +:100090000000000061470008654700082D45000882 +:1000A000694700086D470008714700087547000858 +:1000B000794700087D470008814700088547000808 +:1000C0000000000000000000894700080000000058 +:1000D000074500088D470008000000009147000810 +:1000E0009547000899470008000000009D47000858 +:1000F00015450008194500081D450008A1470008DE +:10010000A5470008000000000000000000000000FB +:10011000A9470008AD470008B147000800000000EB :1001200000000000000000000000000000000000CF -:1001300000000000000000003D44000838B5040045 +:100130000000000000000000B547000838B50400CA :1001400009D004F18005686808B900F01EF800F0D5 :1001500021F8012801D1012032BDA06A08B100F0C8 :100160002AF800F00AF821F02A01FFE7816000F088 -:100170001BF8BDE8324000F02EBB2068416821F436 +:100170001BF8BDE8324000F074BB2068416821F4F0 :1001800090414160206881687047002129702046B5 -:1001900000F060BE242068602068016849084900BA -:1001A0000160204600F0B0B92068016841F001010B -:1001B000016020467047204600F0AABA30B500F131 -:1001C00080035C68202C41D109B1140001D10120C9 -:1001D00030BD1C78012C39D001251D7000F154046C -:1001E00001652280628000212162D960212159604D -:1001F00021698268B1F1005F13D1B2F5805F04BF5D -:100200000169002907BFDFF8F4242262DFF8F01447 -:100210002162002119700068816841F40001816049 -:1002200012E0B2F5805F04BF0169002907BFDFF863 -:10023000D4242262DFF8D0142162002119700068F2 -:10024000016841F080010160002030BD022030BD16 -:1002500038B500F180039C68202C0DD109B1140041 -:1002600001D1012032BD1C78012C05D000F006F828 -:10027000BDE8384000F01DBB022032BD01251D70D5 -:100280000023C366DFF884440368A34206D05C6899 -:10029000250203D51D6845F080651D6070478168A3 -:1002A00021F0400181607047206881684A067047EC -:1002B0002068016821F0100101607047F8B504461C -:1002C00040F60F002668F1693268B368084004F10F -:1002D0005C050ED1880602D5900602D4D80040F104 -:1002E00080806969002900F00E812046BDE8F44055 -:1002F0000847DFF8BC06034204BFDFF8B8763A428D -:100300006FD0CF0707D5D70505D5012737622E6BEC -:1003100046F001062E638E0708D5DE0706D527684E -:1003200002263E622E6B46F004062E634E0708D569 -:10033000DE0706D5276804263E622E6B46F00206CD -:100340002E630E070AD5960601D4034206D026680E -:1003500008203062286B40F008002863080509D5A2 -:10036000500107D526684FF400603062286B40F0DA -:1003700020002863286B002832D0890607D5900614 -:1003800001D4D80003D5696909B120468847286B94 -:1003900021688A68510602D410F0280F1BD020462D -:1003A00000F0EBFAFFF780FF10D5FFF778FF286A1F -:1003B00060B10FF219618163286A00F038FE0028ED -:1003C0000ED0286A816BBDE8F44008472046BDE89E -:1003D000F24000F0F3BE204600F0F0FE002028635B -:1003E000F1BD2869012853D1CF0651D5D0064FD58C -:1003F0001020306222689068410626D5296A086874 -:10040000406880B20028EBD02B8898427BDA688065 -:10041000086801688B0614D4106820F4807010609E -:10042000206881684908490081602068FFF737FF2C -:100430002020E86200202861FFF73AFF286A00F0D8 -:10044000C0FD29886888091A1CE028886988411A33 -:10045000688800281CBF88B2002854D01368DFF8D1 -:10046000440823F4907313602268936803409360F8 -:100470002020E8620020286168612068026822F07C -:10048000100202602046BDE8F44089B200F097BE39 -:10049000C80209D5580207D54FF4801030622046B3 -:1004A000BDE8F24000F006BF080609D5100601D4E9 -:1004B000180205D5A96931B32046BDE8F4400847C4 -:1004C00048060ED550060CD5306820F0400030604C -:1004D0002021A9620020A8612046BDE8F24000F07A -:1004E00007BF080206D5500004D52046BDE8F240FB -:1004F00000F010BFC80148BF002A04D52046BDE85F -:10050000F24000F008BFF1BDF8B50446DFF89807E7 -:100510002168DFF898C70A68DFF894770240A0687E -:1005200002432069024360690243E06902430A60B2 -:1005300000254A68E06822F4405202434A60A369F9 -:10054000724A91421CBF206A03438E68DFF8640739 -:10055000064033438B600FF63006CB6A606A1B0996 -:1005600040EA0313CB626145DFF84C074FF40043C8 -:1005700039D13F6807F00307032F4DD8DFE807F0B4 -:10058000024643494FF0010CE169B1F5004F4FF6C7 -:10059000F07740F08080BCF1010F09D0BCF1020F70 -:1005A0000AD0BCF1040F71D0BCF1080F71D099E0F2 -:1005B00001F06CFA002815D0626A616836F81230D2 -:1005C000B0FBF3F04A0802EB4002B2FBF1F080B25C -:1005D000A0F11001B942EAD20740C0F3420007433C -:1005E0002068C7607FE0914216D13F6817F44067EA -:1005F00023D0B7F5806F09D0B7F5006F03D0B7F5FA -:10060000406F06D008E04FF0020C07E04FF0040CFA -:1006100004E04FF0080C01E04FF0100C9142B3D110 -:10062000BCF1000F09D0BCF1020F0AD0BCF1040FDD -:1006300015D0BCF1080F15D054E001F01FFA0028C6 -:1006400051D0616A36F81120B0FBF2F6626802EB15 -:1006500042018E4246D31103B14205D242E001F07D -:10066000C3F9ECE71846ECE75008002110EB062030 -:1006700051EB1661002301F087FAA0F54071DFF815 -:100680003C2691422ED22268D0602CE001F0ACF9D9 -:1006900090E7184690E7BCF1010F09D0BCF1020FBA -:1006A00009D0BCF1040F18D0BCF1080F18D019E024 -:1006B00001F0ECF9B8B1626A36F812306168B0FB4B -:1006C000F3F000EB5100B0FBF1F080B2A0F11001AB -:1006D000B94207D22168C86005E001F085F9E9E771 -:1006E0001846E8E7012504F16800012141800180F6 -:1006F00000218160C1602846F2BD0000750A000833 -:10070000350A0008070A0008DD09000800800040DB -:1007100090F82810CA0706D502685368C16A23F406 -:1007200000330B43536090F828108A0706D50268FF -:100730005368016B23F480330B43536090F8281007 -:100740004A0706D502685368416B23F480230B43A4 -:10075000536090F828100A0706D502685368816B29 -:1007600023F400430B43536090F82810CA0606D5C3 -:1007700002689368C16B23F480530B43936090F835 -:1007800028108A0606D502689368016C23F400538A -:100790000B43936090F828104A0610D502685368FE -:1007A000416C23F480130B435360416CB1F5801FFF -:1007B00005D15368816C23F4C0030B43536090F858 -:1007C00028100A0606D501684A68C06C22F4002287 -:1007D00002434A607047F8B5044604F180050020E2 -:1007E000E8606FF07E4701F0E7FA0646206801688E -:1007F0000A0708D50097334600224FF4001120461F -:1008000000F017F860B9206801684A070AD5009718 -:10081000334600224FF48001204600F00AF808B168 -:100820000320F2BD20206860A8600020E0662870E8 -:10083000F2BD2DE9F041069C05460E4690461F4646 -:100840002868C1693140B1420CBF012000204045F9 -:100850001CD114F1010FF3D001F0AEFAC01B844299 -:1008600000D314B900F015F80CE0286801684A07B5 -:10087000E6D5C1690A05E3D54FF40062026200F0D3 -:1008800008F8C16000210170032000E00020BDE8ED -:10089000F0812868016821F4D071016028688168BE -:1008A00049084900816005F1800020214160816094 -:1008B000704730B500F15C0381651A805A800021D1 -:1008C0005961FF248168B1F5805F04D1016961B984 -:1008D00040F2FF1409E011B9016929B905E0B1F14D -:1008E000805F06D1016911B97F249C8003E03F211C -:1008F00000E00021998000F180040021E1602221C4 -:10090000A16001688D6845F001058D609968B1F1BD -:10091000005F1CD19D89AA4219D38268B2F5805F1D -:1009200004BF0169002907BF0FF2ED225A610FF2DF -:10093000512159610021217001680A6842F48072D6 -:100940000A600068816841F08051816013E082682C -:10095000B2F5805F04BF0169002907BF0FF295124D -:100960005A610FF269115961002121700068016814 -:1009700041F490710160002030BD01680A6822F4E2 -:1009800090720A60DFF81C13026893680B40936052 -:10099000C16E012904D101680A6822F010020A60C0 -:1009A0002021C0F888100021C1660167704700004F -:1009B0000100001020010004136823F0800313607D -:1009C0000068016841F0400101607047806A00F1F1 -:1009D000560100220A810A8000F0F0BBD0F8841092 -:1009E00021290FD10268B0F8561001B9E4E7036D70 -:1009F00019789162016D4A1C0265B0F856104A1EC2 -:100A0000A0F856207047D0F88410212911D102682F -:100A1000B0F8561001B9CFE7036D1988C1F308018A -:100A20009162016D8A1C0265B0F856104A1EA0F84A -:100A300056207047D0F88410212900D0704730B577 -:100A400000F15602938A0CE0E1690D0608D5016DAC -:100A50000D78A562016D4C1C04651488611E11801F -:100A60005B1E99B229B1046811880029ECD100F00D -:100A700023F830BDD0F88410212900D0704730B55C -:100A800000F15602938A0EE0E1690D060AD5016D68 -:100A90000D88C5F30805A562016D8C1C04651488DA -:100AA000611E11805B1E99B229B10468118800296A -:100AB000EAD100F001F830BDA26822F40002A26081 -:100AC0000068016841F04001016070471CB500F00A -:100AD00025F80AD14A6AA1880A40816D0A70816DA1 -:100AE0004A1C00F021F821B924E0886940F0080090 -:100AF000886113BD1CB500F011F80AD14A6AA188BB -:100B00000A40816D0A80816D8A1C00F00DF821B9C0 -:100B100010E0886940F00800886113BD00F15C04B2 -:100B20000168E26A222A7047826561884A1E6280F3 -:100B30006188704700F01DF801688A685208520009 -:100B40008A602021E162002161612169012905D1CA -:100B500000F009F8218800F032FB01E000F0BEFB54 -:100B60000020206113BD01680A6822F010020A60AB -:100B7000704701680A6822F490720A6070470000AA -:100B80002DE9F04700F0B3F83CD1A089DFF81481DB -:100B900080B96088002837D0A189884234DA00F013 -:100BA000A0F8474800F096F82EE0304600F096FB9B -:100BB00000202061A806ECD500F086F80870B06D22 -:100BC000411C00F0B6F814D0E90748BF5FEAC951EC -:100BD00001D500F0B7F8A80703D5F80701D500F054 -:100BE000A0F800F091F820B1304600F0E7FA0021BB -:100BF000216360880028DDD100F0B4F8D5D100F081 -:100C0000A8F8D5E700F002F8BDE8F087816941F067 -:100C100008018161704700002DE9F04700F067F896 -:100C20003CD1A089DFF87C8080B96088002837D06B -:100C3000A189884234DA00F054F8224800F04AF8DA -:100C40002EE0304600F04AFB00202061A806ECD5DB -:100C500000F03AF80880B06D811C00F06AF814D0FA -:100C6000E90748BF5FEAC95101D500F06BF8A80752 -:100C700003D5F80701D500F054F800F045F820B18D -:100C8000304600F09BFA0021216360880028DDD106 -:100C900000F068F8D5D100F05CF8D5E7FFF7B6FFB3 -:100CA000BDE8F087FEFFFFEFF369FFCF003801409A -:100CB00088000058FFF4FF110024F40000FD0F002D -:100CC000CD0A0008F50A00083068406AB16D0AEAEA -:100CD0000000704760613068016841F020010160E8 -:100CE00070473068816821F0805181607047064606 -:100CF00006F15C043068B4F804A0C569D0F800902F -:100D00008768E16A22297047680708D5F80706D581 -:100D1000316804200862206B40F002002063206BE1 -:100D20007047316802200862206B40F004002063A5 -:100D30007047B1656088411E61803068C56915F0F3 -:100D4000070F704701210162206B40F00100206312 -:100D500070473068016821F0100101603046218839 -:100D600000F02DBA3068016821F4807101603068AC -:100D7000816808EA010181602020E0620020606152 -:100D800020690128704700000100020004000600ED -:100D900008000A000C001000200040008000000144 -:100DA000544981B00A6802430A600968084000900B -:100DB000009801B0704780B54FF40020FFF7F0FFB6 -:100DC000002200212E2001F019F8BDE802402E205B -:100DD00001F032B800684849884200D0704780B5B9 -:100DE0004FF48010FFF7DCFF002200212C2001F0DF -:100DF00005F82C2001F020F8002200212D2000F021 -:100E0000FDFFBDE802402D2001F016B81CB50446D8 -:100E10003A49206888421CD101F064F801F062F878 -:100E20003748816B21F4407141F480718163816B9B -:100E300041F400418163026842F48062026000680C -:100E400000F48060009000982046BDE8164001F054 -:100E50005DB813BD38B586B0044601A8142101F071 -:100E60006DF82168274A914242D12748274D4169B0 -:100E700041F4804141610222416901F480410091C5 -:100E80000099016841F0010101604FF4C061006800 -:100E900000F00100009000980191012003900321CF -:100EA000072004910590029201A94FF0904001F0B3 -:100EB00049F8174828600F2068601020A8600020BB -:100EC000E8608020286100206861A861E8612862EC -:100ED000284600F01FF808B101F046FAA567AC6299 -:100EE00000220021242000F089FF242000F0A4FF2C -:100EF00007B030BD50000058000C005800280040DA -:100F000058000058003801404C0000583C130020A5 -:100F10004400024038B5040001D1012032BD2168EF -:100F2000DFF880024018142204F12405B0FBF2F22D -:100F3000DFF87402E86192002A62022068700A6891 -:100F4000A0686FF30E120243E06802432069024377 -:100F500060690243A0690243E0690243206A0243D8 -:100F60000A60204600F0F9F8A068B0F5804F04BF91 -:100F7000002161602079696A00F03F0000F014F8F8 -:100F800038B1052805D2204600F0FBF800F012F831 -:100F900003E0002028636863A8630020A8610120A3 -:100FA00068700020287032BD0860A96AE86A48604D -:100FB00060687047296B00200860696BA86B486007 -:100FC000704781B040B100F124014A78022A05D06F -:100FD0000420886100200870012026E00268136860 -:100FE00023F00E0313604A6A136823F480731360BE -:100FF00000680268520852000260012091F8202027 -:10100000CB6902F01C02904058608A6AC86A50603E -:10101000086B30B1026822F4807202604A6B886B00 -:101020005060012048700020087001B0704738B54A -:1010300000F1240200245178022903D00420906199 -:10104000012428E001680B6823F00E030B6001689F -:101050000D686D086D000D60516A0B6823F4807394 -:101060000B60012192F82030D56903F01C039940F0 -:101070006960936AD16A5960116B31B10B6823F4CE -:1010800080730B60536B916B596001215170147028 -:10109000516901B18847204632BDF8B500F12401FD -:1010A0000423CA6914680268156891F8206006F084 -:1010B0001C0603FA06F73C4210D06F070ED51468E1 -:1010C000A50603D4156825F00405156000F03DF869 -:1010D000C968002938D0BDE8F4400847022303FA64 -:1010E00006F73C4213D0AF0711D51468A50605D406 -:1010F000156825F00A05156001224A7000F025F8F0 -:1011000000220A708968F9B1BDE8F4400847082355 -:1011100003FA06F6344217D02B0715D5136823F0CF -:101120000E031360012291F82030CC6903F01C03F8 -:101130009A40626001228A614A7000220A7009693D -:1011400011B1BDE8F4400847F1BD91F82020CC6909 -:1011500002F01C02934063607047426C134992088E -:1011600001EB82018164142201780839B1FBF2F1AC -:101170000F4AC26401F01F01012202FA01F1016568 -:10118000704701790B4A01F03F0102EB8102426591 -:10119000491E094A826501F0030101228A40C265A5 -:1011A00070470000F8FFFDBF000002400008024049 -:1011B00080080240FC080240400902407047704726 -:1011C00010B500F180010A78012A01D1022010BD7A -:1011D00001230B7024224A600268136814686408B3 -:1011E000640014600022426623F00053006803602C -:1011F000202048600020087010BD70B500F01EF877 -:1012000001D1022070BD00F01FF822F0604209E019 -:1012100070B500F013F801D1022070BD00F014F891 -:1012200022F0606211438160204600F01AF82068C5 -:101230000660202068600020287070BD044604F11C -:10124000800528780128704701222A7024206860D0 -:1012500020680668026852085200026020688268AE -:10126000704730B5416E11B90121012214E00168C7 -:101270000FF230048A6889680FF23003520E02F0D0 -:101280000702490F655CA45C595C9A5CED00E400C0 -:1012900095FBF1F194FBF2F268304180028030BDA1 -:1012A000000000000101010307010000080402041E -:1012B000080101017047704730B9124803601248B5 -:1012C000124B0360FEF7C4BF704730B9104803608B -:1012D0000D480E4B0360FEF771BF704700680B4965 -:1012E000884204D107490868002818BF00477047A2 -:1012F00000680649884204D105490868002818BFDB -:10130000004770475C1400209C1100200038014009 -:1013100060140020704770474FF0B040006800F044 -:10132000F000B02888BFB02070472DE9F0410400DC -:1013300054D0207881064FF0B04538D5A868E968C8 -:1013400010F00C0001F0030103D00C2808BF0129A4 -:1013500046D12868800702D5E06900283ED0FFF713 -:10136000DBFF616A884207D2084600F0A0FB002834 -:1013700034D100F043FA0FE0286820F0F000014378 -:1013800029606968206A21F47F4141EA002169608F -:10139000606A00F08CFB08BB00F062FBDFF88C1782 -:1013A0000860DFF88C07006800F0E0FFB0B9207833 -:1013B000C1070DD5A868E96800F00C00082801F005 -:1013C000030103D00C2808BF03292CD1286880030F -:1013D00040F11D816068002840F01981012006E27B -:1013E000E06980B1296841F0010100F0F3FA064696 -:1013F0002868800700F1088100F0DEFC801B0328CC -:10140000F6D30320F3E128684008400000F0A8FB71 -:101410000646286800F0EEF9C9D000F0CDFC801B2C -:101420000328F6D3EDE76068B0F5803F04D1296862 -:1014300041F48031296003E02A6822F480322A6076 -:10144000606860B100F0B8FC06462868800300F1CF -:10145000DE8000F0B1FC801B6528F6D3D1E700F0F8 -:10146000ABFC06462868400C10F0010000F0CF806D -:1014700000F0A2FC801B6528F4D3C2E700F09CFCBE -:10148000C01B0328C0F0F780BBE7E06878B129688B -:1014900041F4807100F09EFA06462868400500F18C -:1014A000FD8000F089FC801B0328F6D3A9E728689B -:1014B00020F4807000F054FB06462868800A10F083 -:1014C000010000F0C28000F077FC801B0328F4D3F9 -:1014D00097E700F071FCC01B0328C0F0F18090E793 -:1014E00040F0010000F09BF907467068800700F1AA -:1014F000028100F061FCC01B0328F6D381E770680D -:1015000020F0040000F08BF907467068C00810F066 -:10151000010000F0FF8000F04FFCC01B0428F4D352 -:101520006FE70528306806D140F00400306031686C -:1015300041F0010105E0400840003060316821F0D1 -:1015400004013160A06841F2893768B100F034FCD1 -:1015500080463068800700F1F28000F02DFCA0EB9F -:101560000800B842F5D34CE700F026FC804630680E -:1015700000F040F900F0E38000F01EFCA0EB080052 -:10158000B842F4D33DE700F017FC801B0328C0F0FD -:10159000088136E700F010FC001B0328C0F0228110 -:1015A0002FE7286881010CD4296841F080712960F7 -:1015B000E86840F08050E86000F0FEFB04462868D0 -:1015C000810100F1138100F0F7FB001B0328F6D323 -:1015D00017E70C2930D0286820F080702860E9686F -:1015E00089088900E960E86820F08050E86000F030 -:1015F000E3FB04462868810140F1F88000F0DCFB41 -:10160000001B0328F6D3FCE600F0F8F8CFE62078BC -:1016100081071AD5A868E96800F00C00042801F0D9 -:10162000030104D00C2808BF02297FF42EAF2868DC -:10163000400503D5E06800283FF4D0AE6968206912 -:1016400021F0FE4141EA006169602168DFF8E4644D -:1016500011F0180F38D0606900283FF450AFC90668 -:1016600070687FF53DAF800709D4706840F00100D5 -:1016700000F0D5F80746706880077FF5FFAE706808 -:1016800040F0040000F0CBF80746706800070DD466 -:1016900000F092FBC01B0428F7D3B2E6686821690A -:1016A00020F0FE4040EA01606860CEE77068A16902 -:1016B00020F4706040EA0120706000F0ADF8074649 -:1016C00000F097F87FF405AF2078410737D5DFF8B1 -:1016D00068743868C10529D400F004FC00F06CFB84 -:1016E00080463868C10521D400F066FBA0EB0800F5 -:1016F0000328F6D385E6706820F0040070607068F7 -:10170000C00810F00100DFD000F056FBC01B042819 -:10171000F5D376E600F080F8074600F06AF8D3D0FB -:1017200000F04AFBC01B0328F7D36AE6A068012833 -:101730007FF4F7AE306840F00100306002E7A06A45 -:10174000002853D0A968EA68022801F00C017FF450 -:1017500040AFE36A02F00300984202BF02F070005B -:10176000236B984214D1636BC2F30620984202BFE8 -:1017700002F47810A36B98420AD1E36B02F0606028 -:10178000984202BF02F06042206C82423FF409AFEF -:101790000C293FF423AE286820F0807000F0E0F9B7 -:1017A0000646296888013FF5EEAEE968DFF88C034C -:1017B000626B0140E06A0143206B0143A06B41EA88 -:1017C00002210143E06B0143206C0143E96028687A -:1017D00040F080702860E96841F08051E96000F0D5 -:1017E000EBFA0446286881017FF5D4AE0020BDE8FD -:1017F000F0817068400810F0010070472968606A45 -:1018000021F0F001014329606868216A20F47F40DB -:1018100040EA0120686070477068400840007060CE -:1018200000F0CABA2DE9F8430400884644D0DFF836 -:10183000106300F0CAF847D200F0CFF8074600F076 -:10184000C4F841D000F0B8FAC01B0228F7D9032031 -:10185000B9E000F0B1FA401B022843D9F7E700F0E5 -:10186000ABFAA0EB090002284CD9F0E700F0A4FA8B -:10187000A0EB0900022854D9E9E700F09DFA401BCB -:1018800002285DD9E3E700F097FA401B022867D9E8 -:10189000DDE700F091FA401B484577D3D7E70328EE -:1018A00002D13968890103E00028396802D189072B -:1018B00062D401E049055FD4012084E000F07CFAA5 -:1018C000C01B022872D9C2E7207881074FF0B047C9 -:1018D0000BD5B968A06821F0F0010143B96000F0B0 -:1018E0006BFA0546B868C003B3D52078DFF83852E4 -:1018F00081060AD52968606921F0F001014300F0F2 -:1019000069F8814628688003A9D5207841060BD55F -:101910002968A0690909090141EA101100F05AF883 -:1019200081462868C003A1D5207841070BD5B96846 -:10193000E06821F4E0610143B96000F03DFA05463A -:10194000B868800399D5207801070CD5B86821695B -:1019500020F4605040EAC100B86000F02DFA05465E -:10196000B86840038FD52078C10717D56068022872 -:1019700095D1396889039FD5B968890840EA810003 -:10198000B86041F2893900F017FA0546B868616815 -:1019900000F00C00B0EB810F7FF47BAF306800F0FB -:1019A0000700804505D200F018F8074600F00DF852 -:1019B00084D100F055F85D49086000F00DFDBDE8E8 -:1019C000F24300F0D3BCBDE8F283306800F00700BA -:1019D00040457047296000F0EFB93168C90848EA0E -:1019E000C101316000F0E8B938B54FF0B044564D50 -:1019F000A16811F00C0106D1FFF78EFCC0F30310B3 -:101A000055F8200032BD0429504A05D00829504815 -:101A100004D12168C90222D5104632BDE16801F027 -:101A20000301022904D0032904D12168C90207D582 -:101A3000104605E0FFF770FCC0F3031055F82000D6 -:101A4000E168E268E368C1F306214843C2F302118A -:101A5000491C5B0FB0FBF1F05B1CB0FBF3F032BD37 -:101A600080B5FFF7C1FF3749FFE73A4A0968C1F37C -:101A7000031152F82110B0FBF1F002BD80B5FFF761 -:101A8000EFFF00F010F8C1F3022106E080B5FFF788 -:101A9000E7FF00F008F8C1F3C22112F8211001F0AD -:101AA0001F01C84002BD27492B4A0968704770B51D -:101AB0002549284AB1282EBFC86AC0F3031051F83F -:101AC00020001949096801F00F0152F82110234A3A -:101AD000B0FBF1F0B0FBF2F0002400210FF288021D -:101AE00052F8213083420AD2491C0329F8D90AE06E -:101AF00000F062F9801B03280DD3032070BD0FF2A4 -:101B0000780050F821400E4D2868C00844EAC00013 -:101B100000F026F80646296801F00701A142E7D146 -:101B2000002070BD00000000080100588C1000204B -:101B30008010002090000058000400588C80C111D3 -:101B40000040005808000058D44000080024F40069 -:101B50000048E801944000081843000840420F0084 -:101B6000286000F029B900001200000024000000E5 -:101B700036000000400000000000000001000000EE -:101B80000200000003000000B3BBD9B1B2F5803FF2 -:101B90007DD2022A1ED98C46B1FBF2F102FB11C3A1 -:101BA0001B0443EA1043B3FBF2FC02FB1C3380B27C -:101BB00040EA0343B3FBF2F002FB103240EA0C4070 -:101BC00000237047022A05D98446B0FBF2F002FBDD -:101BD00010C270474AB105D100F0010249085FEA1E -:101BE0003000704700220023704700F011BC0B004A -:101BF0000200002100207047904271EB030CF6D3E5 -:101C0000B3F5803F2FD2F0B5B3FA83F7B1FA81F480 -:101C1000A7F10F0E3D1B5340CEF1200602FA0EF243 -:101C2000F3415340B5F10F0746D80F3C2C444140D7 -:101C3000C4F12006A040F1414140B1FBF3F603FBA3 -:101C40001611A2FB0645001BA94102D2761E801880 -:101C5000594180EA010221FA0EF362FA0EF20021E4 -:101C60005A403046F0BD30B4B1FBF3FC03FB1C110D -:101C7000A2FB0C45001BA94103D2ACF1010C80185A -:101C8000594130BC02460B46604600217047B2F114 -:101C9000807F65D3F0B5B2FA82F7B1FA81F4C7F16B -:101CA0000F063D1B22FA06F307F1110EF241203513 -:101CB0005A40B5F10F07B8D94140C4F12006A04001 -:101CC000F1414140B1FBF3FC03FB1C11A2FB0C45AD -:101CD000001BA94103D2BCF1010C801859410F2F00 -:101CE00012D30F3FC90341EA5041B1FBF3F603FBA6 -:101CF0001611A2FB0645D4EBC030A94102D2761ED4 -:101D00008018594146EACC3C07B34140C7F1200650 -:101D1000B840F1414140B1FBF3F603FB1611A2FBC1 -:101D20000645001BA94102D2761E8018594180EA5F -:101D3000010221FA0EF3C7F1200462FA0EF20CFA46 -:101D400007F05A402CFA04F13043F0BD80EA01025A -:101D500021FA0EF3002162FA0EF260465A40F0BDFD -:101D60008C46B1FBF2F102FB11C31B0243EA106384 -:101D7000B3FBF2FC02FB1C331B024CEA002043EADB -:101D80001063B3FBF2FC02FB1C331B024CEA002085 -:101D900043EA1063B3FBF2FC02FB1C331B024CEA68 -:101DA000002043EA1063B3FBF2FC02FB1C324CEA56 -:101DB000002000237047704701484068704700BF0B -:101DC000781000200901020081B002D43C488154FF -:101DD00005E03C4802F00F02104400F8041C01B07A -:101DE0007047394A13684FF6FF0100020B4000F4B8 -:101DF000E0601843354908431060704738B5324BEE -:101E00001C68C4F30223C3F10704052C28BF042473 -:101E10001D1D072D34BF0023DB1E012505FA04F428 -:101E2000641E2140994005FA03F35B1E1A401143DA -:101E3000BDE83440C6E70000010007D4012200F0ED -:101E40001F01234B8A40400943F8202070470100BE -:101E50000BD4012200F01F011E4B8A40400943F8B9 -:101E60002020BFF34F8FBFF36F8F704710B5401E18 -:101E7000B0F1807F01D3012010BD174C60600F21AD -:101E80004FF0FF30FFF79EFF0022A2600720206086 -:101E9000002010BD010007D4012200F01F010F4BEC -:101EA0008A40400943F820207047010007D40122EE -:101EB00000F01F010A4B8A40400943F82020704778 -:101EC00000E400E018ED00E00CED00E00000FA0591 -:101ED00000E100E080E100E010E000E000E200E06E -:101EE00080E200E00248016841F4807101607047BF -:101EF000000400588A60FF2102685162012180F8C5 -:101F00002110002180F820100020704790F8201048 -:101F1000012901D102207047012280F820200221EE -:101F200080F82110CA210268516253210368596266 -:101F300001688A6842F02002DCE70000002200F01D -:101F400069BA00002DE9F84F4FF00009614A624B71 -:101F50004FF00F0805460E4633E0604FBD4214BFF8 -:101F6000072704278F4027434CF82E70C1431C6875 -:101F700001EA040C7468E40348BF40EA0C0CC3F89F -:101F800000C05C6801EA040C7468A40348BF40EA1E -:101F90000C0CC3F804C0146801EA040C7468E40271 -:101FA00048BF40EA0C0CC2F800C0546801EA040CB7 -:101FB0007168890248BF40EA0C0CC2F804C009F1FC -:101FC0000109316831FA09F072D0012404FA09F4E8 -:101FD00014EA0100F3D04FEA490C032101FA0CF195 -:101FE0006FEA010E7168012918BF022903D0112977 -:101FF00018BF122911D1A968F7680EEA010107FA82 -:102000000CF73943A960696821EA04047168C1F3D7 -:10201000001101FA09F10C436C60E968B4680EEA3A -:10202000010104FA0CF42143E9604FEA8901746864 -:10203000022C18BF122C12D14FEAD90405EB8404EC -:1020400001F01C07D4F820A008FA07FB2AEA0B0AC3 -:10205000D6F810B00BFA07F747EA0A0727622C6890 -:102060000EEA0407347904F0030404FA0CF43C4348 -:102070002C607468E400A2D5DFF864C04FEA990EC2 -:102080005CF82E7001F00C0108FA01F427EA040450 -:10209000B5F1904F08BF002709D0124FBD4208BFCD -:1020A000012704D0104FBD427FF457AF022759E7F4 -:1020B000BDE8F18F81B0002A14BF8161816201B057 -:1020C00070470A4A136803421CBF106000F052BAFE -:1020D00070470000000800588008005800100048B1 -:1020E0000800014000040048000800480C0800589F -:1020F0008E4900E08E4981B00A6802430A6009688F -:1021000008400090009801B0704780B589494FF4AD -:102110000040086000F04CF9002000F031FA48B1AE -:1021200080798549854A0A600A6822F47C5242EA2D -:1021300000220A6000F01DF800F08AF8804801686B -:1021400000220260026902F0500202610420FFF7DF -:10215000D1FF0120FFF7CEFF00F0D6F800F083F8A2 -:1021600000F0A0F800F070F94FF0FF3000F01AFA1C -:10217000FAE718B5A5B014A84421FFF7DFFE01A8BF -:102180001C21FFF7DBFE08A83021FFF7D7FEFFF781 -:10219000A9FE6C48016821F0180101600720149025 -:1021A0004FF48031012016901591402018900021A5 -:1021B0004FF480741E91179414A8FFF7B6F808B175 -:1021C00000F0D2F86F2001900221002002910390CC -:1021D0000490059006900790012101A8FFF722FBCB -:1021E00008B100F0C1F843F60100089000214FF457 -:1021F00080401190099110200221139012911094A7 -:1022000008A800F0ABFA08B100F0AEF84E49086833 -:1022100020F0700008604D480268C2F3032000906F -:10222000009830B90A681209120142F00A020A60E5 -:1022300008E000980A68001D80F30400120940EAD3 -:1022400002100860086840F40040086026B010BD25 -:1022500080B53F483F49016000F03CFB10B1BDE84C -:10226000014081E001BD002110B53B483B4C41607D -:1022700004600F21816047F6FF71C1600021016198 -:102280008161416100F05EFB08B100F06DF8CA2089 -:102290006062FF2153206062A068C008C000A06097 -:1022A000616210BD10B52E4C2E4820604FF4E13015 -:1022B00060600020A060E06020610C206061002070 -:1022C000A0614FF40040E061002020626062A062E3 -:1022D0002046FDF733FF08B100F046F80021204604 -:1022E000FEF78BFF08B100F03FF800212046FEF713 -:1022F0008FFF08B100F038F82046FEF761FF10B1FB -:10230000BDE8104030E010BD80B50420FFF7F0FEBE -:102310000120FFF7EDFE00220F210E20FFF76EFDDA -:10232000BDE802400E20FFF787BD000048000058BE -:102330004C000058104000589C000058FECAFECACD -:1023400080080058900000581C0400585875FF1F62 -:102350009C130020000C0058D813002000280040D7 -:102360009C1100200038014072B6FEE770B50F4E98 -:10237000044630780025A8B1FFF772FB32784FF49D -:102380007A71B1FBF2F1B0FBF1F0FFF76FFD48B9E4 -:10239000102C07D2002221464FF0FF30FFF72EFD10 -:1023A000B46000E00125284670BD00BF7810002011 -:1023B000144810B5016841F4807101600320FFF7F3 -:1023C00010FD0020FFF7D2FF0024002814BF0124D5 -:1023D000FEF7F1FC204610BD0B48806870470B48A3 -:1023E000016849084900016070470848016821F008 -:1023F0000201016070470548016821F00401016095 -:10240000704700000040005878100020042004E0CD -:102410007047000000B500BF13009646944610397F -:1024200028BFA0E80C50FAD85FEA417C28BF0CC056 -:1024300048BF40F8042BC90728BF20F8022B48BF2B -:1024400000F8012B00BD000018B53248324C89B0AD -:10245000016841F40041016000F018FB2F48016859 -:10246000C908C90041F00401016000F055FB2C4986 -:10247000002000F0CEFC00F0F2FD0121012000F070 -:1024800017FB00F053F800F060F800F02FFF25482C -:1024900001F025F80FF259020021202000F0E7F8A2 -:1024A00004F23C50029020490FF22D00019000915F -:1024B000684600F074FF04F25470039004F5C9619B -:1024C00040F23C5006900491059403A800F0A0FF50 -:1024D00000F00AFF0AB010BD80B50146114801F0B6 -:1024E0000AF8BDE804400021202000F0CDB800002B -:1024F00080B500F0E2FD0021012000F0D9FA694624 -:10250000084801F00EF8009800F09BFF01F01AF85F -:1025100001BD00000800005830000320800400586E -:10252000D8130020281400200F36000880B50020A2 -:1025300001F0EDF9012001F0EAF9022001F0E7F9DC -:10254000BDE80240012001F00BBA80B50121002056 -:1025500001F01BFA0121012001F017FABDE8044047 -:102560000121022001F011BA00F0B6BA4FF0FF309D -:1025700000F018B8012808BF01F058B870470000F3 -:1025800001460648064AC3798B4218BF904218BFDD -:102590000838F8D18B4218BF00207047F873FF1F2E -:1025A0000070FF1F2DE9FC47544CDFF85491A569DA -:1025B0002840A0614FF0FF3A4FF0010830E0491C7D -:1025C00054F831000642FAD004EBC1061840716895 -:1025D0001040014208BFC6F804A07768384000F0F8 -:1025E00091F8606208FA00F087437760EFF310819A -:1025F00072B6626A206908FA02F2D2431040206182 -:10260000022004EBC00353F8086C1640401E43F848 -:10261000086CF6D181F31088606A59F82010884759 -:1026200063692069A2691840104207D0E069216AF5 -:10263000084203D1002103EA0206C1E7C4F824A03E -:1026400001F00FFAEFF3108972B621696069014059 -:10265000A069014201BFE169206A0142FFF784FFDE -:1026600089F3108801F0FEF9A561BDE8F38738B55C -:102670001446EFF3108572B600F044F8204941F893 -:10268000204085F3108831BD10B500F00BF80443ED -:102690001C6153F83140204343F83100FFE782F3D7 -:1026A000108810BDEFF3108272B6144B1C6970478E -:1026B000506181F310887047EFF3108172B60F4AB2 -:1026C000D3691843D061F4E7F8B50C4C656A276A02 -:1026D0002E4615F1010F0EBF0025012101FA05F567 -:1026E000206202E02846FFF741FF216AE0690842C4 -:1026F000F8D088436662E0612762F1BD4410002093 -:10270000BC12002002460020110C090404BF102056 -:10271000120412F07F4F04BF083012020FF21801AA -:1027200012F0704F04BF001D1201120FC0F11F0004 -:10273000895C401AC0B27047040302020101010122 -:102740000000000000000000DFF87C211368010C8D -:1027500023EA014343EA0043136070472DE9F04147 -:10276000054600272868DFF864610105B8462FD5C3 -:102770003468286A04F44074844229D0FFF7B2FB1D -:10278000002C316805D1286A21F440710143316081 -:102790001DE0306840F48030306021F440713268D0 -:1027A00022F480323260286A014331603068C00709 -:1027B0000DD5FFF701FB044641F2893830688007E8 -:1027C00005D4FFF7F9FA001B4045F7D30327B846B5 -:1027D0002878DFF8FC40C10705D5E16F68688908F3 -:1027E00040EA8101E1672878810705D5E16FA86893 -:1027F00021F440610143E1672878C10644BF28699C -:10280000FFF7A2FF2878810644BF6869FFF79CFFA5 -:10281000287841070AD5E868E16F020902F47F22AF -:102820000001914300F47F200843E0672868810598 -:102830001ED5A869B0F1804F18BFB0F1004F00D08D -:1028400018B9E16F21F0404108E0E16F21F040410B -:10285000E16720F08050E16F21F040610843E067BC -:10286000A869B0F1C05F03D1216841F08071216097 -:10287000286841050DD5E16FE86921F04051014319 -:10288000E167E869B0F1005F03D1216841F480316C -:1028900021602868C10405D57168686A21F4404147 -:1028A00001437160286881040BD5A169E86A21F0B1 -:1028B00030010143A161A169A86A890840EA810148 -:1028C000A1614046BDE8F0818800005890000058A2 -:1028D0000C000058F8B504460025ACB104F13406EC -:1028E000307910B92046FEF775FA0F4F384600F0E0 -:1028F00021F8386840F001103860204600F007F8F1 -:1029000035600120307100E001252846F2BD10B588 -:102910000021064A064B00EB8104491C062963602E -:10292000E261F8D310BD0000000C0058B71D00088C -:10293000B7120008002101604FF03F1141603F21B4 -:102940008160704738B5040044D094F8210028B95C -:10295000002184F820102046FEF758FA00F049F8CC -:10296000FF2510B100F03FF834E02168DFF8B00037 -:102970008A6802408A6021688A6863682069034324 -:10298000A06903431A438A602168E06808612068EF -:102990000169A26841EA024101612068C16821F031 -:1029A0008001C1602068C16C21F00201C16421680E -:1029B000CA6CE369606903431A43CA64206881688A -:1029C000880609D400F020F830B12068456204215F -:1029D00000F01FF8012032BD20684562012184F813 -:1029E0002110002032BD20684562042184F82110A6 -:1029F0007047022084F82100CA20216848625320D1 -:102A000022685062204626E020460BE02068C0F88D -:102A1000248084F82110002084F8200070470000F2 -:102A2000BFFF8FFF70B5044640F2E9362068C168E9 -:102A300021F0A001C160FFF7BFF905462068C16819 -:102A4000880606D4FFF7B8F9401BB042F6D303203E -:102A500070BD002070BD70B504462068C1684A068C -:102A600012D44FF0FF32C26040F2E936FFF7A4F90A -:102A700005462068C168480606D4FFF79DF9401B4B -:102A8000B042F6D3032070BD002070BD2048002165 -:102A900001604160704710B500F019F81C6819B169 -:102AA000012904D1204301E024EA000018600BE072 -:102AB00010B500F00CF85C6819B1012904D120436D -:102AC00001E024EA0000586082F3108810BDEFF3A3 -:102AD000108272B60E4B704738B5EFF3108472B6A1 -:102AE0000B490C4D086820B1296888476868804701 -:102AF0000AE0486820B1A9688847E868804703E091 -:102B0000286980476869804784F3108831BD0000D8 -:102B100030140020804300080248016841F400712D -:102B20000160704708040058DFF8F0140A6892B298 -:102B300000E00246086880B28242FAD170472DE96F -:102B4000FC4104461825DFF8D884DFF8D8646843D0 -:102B500008EB00073078062808D13178717034709E -:102B600078754FF0FF307060002039E000F077F8A2 -:102B7000B9680918B96008F10803B96832786A437E -:102B80009A589142327813D308F1150315FB02FCD1 -:102B900013F80C30062B25D008F108066B43F358C8 -:102BA000994222BF08F115036A439A5CEED219E0FC -:102BB0001146337869439A420BD008F1140308F1A7 -:102BC000150C5B5C15FB03F50CF805407A753B753D -:102BD00000E07A7508F11402545431787170347041 -:102BE000BDE8F6811146694308F115035B5C062BCD -:102BF00004D008F1140615FB03F574557B753A757E -:102C000008F115025454EBE7F8B5DFF81834DFF893 -:102C100010541E78182402466243B0422A4404D15C -:102C200018785870507D18700FE0167D507D92F81E -:102C300015C005F115076643062807F806C004D03D -:102C4000167D143514FB00F42E55012010731878EE -:102C5000062802BF00294FF0FF315960F1BD10B5C1 -:102C6000DFF8C043606810F1010F0FD0FFF75CFF81 -:102C70006168DFF8B423814261683CBF5388C9189A -:102C8000081A517848431178C84000E0002080B20B -:102C900010BD2DE9F84FDFF89053DFF890B3D5F869 -:102CA0000880D8F80000DBF800104A0500F06AF947 -:102CB000DFF87063DFF868A321F4806181604FF072 -:102CC000180934780AF1080019FB04F14758FFF796 -:102CD000C6FF874217D200270121B170062C3DD0D4 -:102CE00019FB04F40AF108010AF1080209598142AA -:102CF00023BF0AF108010959091A002111510AEBF1 -:102D000004014C7DEAE7A9884118B94202D2AF8894 -:102D10000021E2E73F1ADFE7022802DA28780128DB -:102D200000D07F1ED8F80000C1684A07FAD500F02D -:102D30002FF9DBF80C00000CBFB247EA0047CBF8D4 -:102D40000C70FFF7F1FE7060A8680068816841F4BC -:102D500080618160AFF30080BDE8F18FB8B20028D8 -:102D6000DAD1FFF7E1FE70600320BDE8F24FFFF714 -:102D700091B82DE9F843EFF3108872B6AA4DA84B2D -:102D8000A8680168CA224A6253204862A54A886836 -:102D900020F48060886018201678374647431F4427 -:102DA000387B022826D13C68D7F810909078F0B193 -:102DB0007A7B012A0AD101213046FFF725FF88F3EB -:102DC00010887968304600F0F0F804E088F3108845 -:102DD000304600F09BF8A8680068CA21416222468C -:102DE000532141624846314600F02AF90BE0FFF7D3 -:102DF00050FF06E0C8684207FCD500F07EF88C4919 -:102E0000086088F31088FF21A86802685162BDE855 -:102E1000F183F8B5844CA160CA2209684A62532242 -:102E20004A62824A136843F020031360136803F078 -:102E30000703C3F10403237095682D0C05F07F058B -:102E40006D1C6570EDB29268C2F30E02521C628076 -:102E500092B2521E6A43A2F5A072DA404FF6FF7397 -:102E60009A422CBFA380A280724A136843F40023C5 -:102E70001360714B1D6845F400251D6048BB69480F -:102E8000674E0123837018254FF0FF334360002302 -:102E90005FFA83FC06F10C0715FB0CFC4FF0000EEB -:102EA00007F80CE05B1CDFB2062FF1DB0623037092 -:102EB000886820F48060886000F01FF8D0600320EC -:102EC000FEF7F3FFA1680868826842F480428260DE -:102ED00005E0C868410544BF0320FEF7DBFFA16899 -:102EE0000A68FF205062002203210320FEF786FFBC -:102EF000BDE8F2400320FEF79FBFC86800F08000E5 -:102F000060F49060C8604FF400207047F8B5074641 -:102F1000EFF3108472B60320FEF799FF424DAE68BE -:102F20003068CA2141623A46532141621820434920 -:102F30004243895C02291BD100213846FFF764FE19 -:102F40003848017806290ED1306838490A68530597 -:102F500000F018F821F480618160C1684A07FCD54F -:102F600000F016F804E04078884218BFFFF791FEA1 -:102F7000A9680A68FF2050620320FEF75DFF84F312 -:102F80001088F1BD02D5C1684A07FCD4816870473A -:102F9000C16801F0800161F49061C1604FF40020CC -:102FA000234908600320FEF780BF2DE9F0418046E9 -:102FB0000F46424618201A4942438C18207B0228AB -:102FC00004BF4046FFF7A2FFEFF3108572B603205F -:102FD000FEF73DFF144EB0680068CA2141625321DC -:102FE000416202202073A76067604046FFF7A7FD9B -:102FF0000C490A784978914202D0FFF74AFE02E074 -:10300000A168081AA060FF20B1680A685062032016 -:10301000FEF712FF85F31088BDE8F08128280040F4 -:103020002C120020501400201C14002008280040FE -:103030000C0800580008005880080058381200207A -:1030400010470000564900E0564981B00A68024323 -:103050000A60096808400090009801B0704718B5F0 -:1030600085B068461421FEF769FF032001904FF4F4 -:1030700060410024009102940120FFF7E3FF00F07B -:1030800097F8474C206840084000206018210091C4 -:103090000220FFF7D7FF69464348FEF753FF206839 -:1030A00020F002002060FFF79AF9FFF79EF9FFF782 -:1030B000A2F900F011F806B010BD00B587B068465F -:1030C0000FF208211C2200F0DFFC00F0D6F9684660 -:1030D00000F02CFD07B000BDF0B585B068461421A6 -:1030E000FEF72CFF00260025002400210FF2CC0063 -:1030F00000EBC102907988B11368B3F1904F08D00A -:10310000294FBB4208D0294FBB4204BF90880443DB -:1031100004E09088064301E090880543491C222979 -:10312000E4DB002002900121032003900191B0B262 -:1031300070B100900120FFF785FF0120FFF784FFA9 -:1031400000F036F80022B1B24FF09040FEF7B2FF27 -:10315000A8B280B100900220FFF774FF0220FFF7B1 -:1031600073FF114E69463046FEF7ECFE0022A9B20D -:103170003046FEF79FFFA0B280B100900420FFF719 -:1031800061FF0420FFF760FF084D69462846FEF7FF -:10319000D9FE0022A1B22846FEF78CFF05B0F0BD93 -:1031A0004C0000584C01005800040048000800483A -:1031B00069464FF09040FEF7C5BE00000000004891 -:1031C000010000000000004801000000000000486D -:1031D000010000000000004801000000000000485D -:1031E000010000000000004801000000000000484D -:1031F000010000000000004801000000000000483D -:10320000010000000000004801000000000000482C -:10321000010000000000004801000000000000481C -:10322000010000000000004801000000000000480C -:1032300001000000000000480100000000000048FC -:1032400001000000000000480100000000000048EC -:1032500001000000000000480100000000000048DC -:1032600001000000000000480100000000000048CC -:1032700001000000000000480100000000000048BC -:1032800001000000000000480100000000000048AC -:10329000010000000000004801000000000000489C -:1032A000010000000000004801000000000000488C -:1032B000010000000000004801000000000000487C -:1032C00001000000000000480100000000000000B4 -:1032D0000000000000000000BC31000828000320AE -:1032E0002C0003202204040000F09CBC71487249A9 -:1032F000016001F12002426001F13002826001F1BF -:103300003C02026201F14402426201F14C02C260DD -:1033100001F15402026101F17002426101F1740293 -:1033200082618031C16100F09BBC38B50446634DB9 -:10333000284600F0D4F85F484068A1680160E16861 -:10334000C16085605E49416000F0A6FC5D4834E0E4 -:1033500080B558484268136801211972406800F02E -:10336000A1FC002002BD38B5564C544D04E000F0DD -:103370004BF8009821688847284600F0B3F80028E9 -:10338000F5D031BD80B54B494A68D168022008723A -:1033900000F08DFC002002BD4A484168084738B55E -:1033A0000446494D284600F09AF84248C068A16892 -:1033B0000160456000F084FC444821680160616858 -:1033C0004160002032BD80B53A48C26813681021C0 -:1033D0001972C06800F07AFC002002BD35483B4AF3 -:1033E000C168C16813680868184738B5374C364D4E -:1033F00004E000F009F8009861688847284600F06A -:1034000071F80028F5D031BD6946284600F089B82A -:1034100038B504462E4D284600F061F82D4800F0DE -:103420005EF824480069A1688160E168C1600561B7 -:103430002168016061684160216941616169816160 -:1034400031BD80B50146234800F055F8BDE8024083 -:103450000FF2050000F04ABC38B5164C1D4D06E0D1 -:10346000FFF7D2FF00992069006900F044F8284670 -:1034700000F038F80028F3D031BD10B5164C2046C6 -:1034800000F02DF80B4841690C60BDE8104000F0D9 -:1034900041BC1CB5104C06E06946204600F041F8DE -:1034A000009800F01BF8204600F01CF80028F3D02C -:1034B00013BD000000000320B40A0320500B0320BA -:1034C000A40A032040140020580B032048140020B5 -:1034D000400B032038140020480B03207047006085 -:1034E00040607047EFF3108172B6026882420CBFF1 -:1034F0000120002012E0EFF3108272B608604368EA -:103500004B6041604868016019E0EFF3108172B6CA -:1035100042680368136002684368536081F310884F -:10352000704710B5EFF3108472B602680A60006845 -:10353000FFE7FFF7EAFF84F3108810BD0B6082F30A -:103540001088704710B590B004A80FF27C31DFF8F6 -:103550005043302200F098FA2068DFF848434FF6D5 -:10356000FC7101EA8001DFF840034118DFF83C03F9 -:103570000290E16000F5867003900FF2B9210FF21E -:10358000CD20019000916846FFF7CFFE0121022077 -:10359000FFF78EFA01210220FFF77DFA0020E0708C -:1035A000A07004A800F0BAFA0FF20112002108205E -:1035B000FFF75DF8BE4A00210120FFF758F80FF22F -:1035C000990200211020FFF752F8BA4A0021022088 -:1035D000FFF74DF8B84A00210420FFF748F8012012 -:1035E00060700020A06004F11800FFF778FFFEF77C -:1035F00059FE04F1100060600020207001220FF2DB -:10360000011304F11001FDF757FE10B010BD80B595 -:10361000A44A917831B1002090700120BDE80240A9 -:10362000FFF74AB8014602F1180007E110B59D4CBA -:10363000E07830B9012000F098F90121E170002113 -:1036400005E0012000F08CF90020E0700121BDE8C8 -:1036500010400220FFF71FBA38B5EFF31084914DE8 -:103660006878012821D10021697005F1180005F161 -:103670000801FFF756FFE878A0B9A8680FF2811398 -:10368000017A022972B607BFB0F80B20521D827A68 -:10369000D21C00F1080192B20020FDF716FE84F35F -:1036A000108831BDBDE83140AAE031BD10B5834C72 -:1036B000B4F809004FF66052811A04D0491E06D0B2 -:1036C000491E08D00BE0204600F03CFB11E02046EC -:1036D00000F073FB0DE0204600F095FB09E0A081AF -:1036E0000120A073E072212020720E20607204205D -:1036F000A07221467248FFF7FEFEBDE81040A1E02F -:10370000F8B5684D69682A78002400201AB1022AA9 -:1037100064D013D358E00978012905D0022907D0D5 -:10372000102918BF202907D10120287003244BE05D -:1037300001202870042447E0012445E00E78E86861 -:10374000022E11D0102E02D0202E03D01CE0CC78F7 -:10375000C0681BE0CC78594805F1100100F108075A -:103760000A6840F8082F18E04068CA780979C368E9 -:1037700002EB012403F10807052205F11001384688 -:1037800000F072F9052009E0CC784068016805F185 -:10379000100001F108070168396004206F60A1B2D0 -:1037A00011B1022129700FE0022E25D0102E1DD05C -:1037B000202E1ED000210120FEF766FF002005F11B -:1037C0001001287001246960A2B201B069683D4B04 -:1037D000BDE8F04001440020FDF76EBD08780228E6 -:1037E0000AD0102802D0202803D0E3E700210220CD -:1037F000E2E700210820DFE700210420DCE70000E9 -:103800001CB5284C01206070E0680169A0688A68D6 -:10381000904205D3C9681144884238BFFFF711FEB2 -:1038200004F11800FFF75EFE10B9BDE81C4009E086 -:1038300013BD000080B50146DFF88400FFF75BFE92 -:10384000BDE8044000211020FEF71EBF704770B590 -:103850001446134A134E12681D460123B3704FF6E7 -:10386000FC7303EA8203104AD3180A46DE683668FE -:10387000A6F80900F17206F10C00214600F0F4F8F8 -:1038800000210020FFF79FFD0120FEF71DFF3146BC -:1038900005F10800B278BDE87040D21C00F0E4B831 -:1038A0003C400058FC130020000003209008032037 -:1038B00051330008C73300088533000890100020FA -:1038C0001414002001370008000000000000000070 -:1038D0000000000000000000000000001E000400C6 -:1038E0000A05020112279C00F4010000FFFF0000FE -:1038F0004801010000200000484981B00A680243E5 -:103900000A60096808400090009801B0704778B5D7 -:1039100085B0044668461421FEF710FB0220FFF72D -:10392000EBFF00F011F8009501200190002102202A -:1039300003900291694656F82400FEF703FB00F05D -:1039400009F8002006B070BD0FF2F400344E30F8D4 -:103950001450704756F8240000222946FEF7AABBEF -:1039600080B500F00AF8012203E080B500F005F808 -:103970000022FEF79FFB002002BD0FF2C401284B7E -:1039800031F8101053F820007047F0B585B00546A7 -:103990000C4668461421FEF7D1FA2DB1012D08BF5F -:1039A000102002D0022D02D10120FFF7A5FF0FF257 -:1039B00098001C4F30F81500009001210220039060 -:1039C00007EB8506029130682CB900210191694608 -:1039D000FEF7B8FA1FE01449019107EBC5046946E8 -:1039E000FEF7B0FA0FF26C0050F8251004F1240035 -:1039F00000F06FFAF268002104F1240000F062FA8E -:103A00000FF24C004457B16900222046FEF7F6F948 -:103A10002046FEF711FA002005B0F0BD4C0000581A -:103A20006C1000200810002000002110002000F081 -:103A300017B8012000F014B8022000F011B80000FF -:103A40002000010002000000010010004000000002 -:103A5000060A1700000000160400001606000016F3 -:103A6000704770477047000062B38B0708D0521E42 -:103A700011F8013B00F8013B00F024808B07F6D1E0 -:103A8000830740F0208000BF103A07D330B4B1E87C -:103A90003810103AA0E83810F9D230BC530724BFD0 -:103AA000B1E80810A0E8081044BF51F8043B40F802 -:103AB000043BD20724BF31F8022B20F8022B44BF6D -:103AC0000B7803707047121F17D35B0009D151F8B0 -:103AD000043B20F8023B1B0C121F20F8023BF6D2DD -:103AE0000BE051F8043B00F8013B1B0A20F8023BB5 -:103AF0001B0C121F00F8013BF3D238BF121D521EDF -:103B000024BF11F8013B00F8013BF8D870470000D2 -:103B1000FFF79DFE9DF80E0005B000BDF8B500F161 -:103B20000C026B4624214FF66640F1E7F8B500F130 -:103B30000C026B460F214FF66840E9E7C068084069 -:103B4000884201D10120704700207047C0690840B9 -:103B5000884201D1012070470020704710B5704C99 -:103B600002212046FFF7F2FF38B16068C0438107A9 -:103B700003D5FFF73AFC022018E001212046FFF7A9 -:103B8000E5FF38B16068C043C10703D5FFF7EBFB21 -:103B900001200BE008212046FFF7D8FF38B160680C -:103BA000C043010703D5FFF774FC0820A06010BDD7 -:103BB00010B55B4C00F033F818B96068C04381035E -:103BC00006D400F02CF830B96068C043810302D5F8 -:103BD000BDE8104083E0082100F022F870B9606869 -:103BE000C04301030AD560684E4940F4002060607C -:103BF000086880474FF40020A06010BD202100F02D -:103C00000FF858B96068C043810207D5606840F476 -:103C100000106060BDE81040FFF7BEBB10BD022180 -:103C200020468BE7404881B0016841F48011016073 -:103C3000006800F48010009000983C48016841F44E -:103C4000007101603A48026842F40072026040BFAD -:103C500020BF3848016841F40041016001B070475D -:103C600080B53548016841F480110160006800F4B6 -:103C70008010009000982A48016841F0010101601D -:103C8000026842F4803202602C20FEF7D5F8BDE8CD -:103C900002402D20FEF7D0B82848016849084900A5 -:103CA0000160704726494FF4803008607047234810 -:103CB0004FF400114160016821F400110160704768 -:103CC0001E48016821F00201016070471B484FF453 -:103CD00000314160016821F40031016070471748EC -:103CE000016841F400310160FFF778BB38B5044644 -:103CF0000B4D08212846FFF721FF30B10948046029 -:103D0000686820F40020686031BDA0474FF40021AE -:103D1000A96031BD0948016821F0080101607047C0 -:103D2000000C00585814002050010058D4080058C6 -:103D3000200800580C04005850000058040C00588B -:103D4000080C005870B5EFF31081027B012A02D0F5 -:103D5000022A07D00DE000F028F8137800F01FF8D1 -:103D600014700CE000F021F8138800F018F81480AB -:103D700005E000F01AF8136800F011F8146081F300 -:103D80001088212101720E214172042181724FF6A7 -:103D900060518181002181730121C17270BD26466D -:103DA00023EA040435402C43704772B6D0F8112042 -:103DB000D0F80D40D0F81550704781B0017B012933 -:103DC00002D0022904D008E0D0F80D10097807E0ED -:103DD000D0F80D100A88009203E0D0F80D100968A1 -:103DE00000910E21417221220821817202724FF648 -:103DF000615181810121C17200218173009A40F8D3 -:103E00000F2F01B0704738B50446284800684FF6B8 -:103E1000FC7505EA800526484519212020720E20F0 -:103E200060724220A0724FF66250A0810120E072C1 -:103E30000020A0731F480168090CA4F80F10006847 -:103E4000C0F30B00A4F811001B4801781B4801F0D7 -:103E50001F01E174416821754168090AC4F8151011 -:103E60000268C4F819200169C4F81D104169C4F83A -:103E7000211004F129018069C4F82500286802682E -:103E80000A600C222B68191D04F12D00FFF7ECFDD0 -:103E9000286800F11001102204F13900FFF7E4FD59 -:103EA00007480168C4F8491031BD00003C40005883 -:103EB00000000320002004E00075FF1F8075FF1F35 -:103EC000404400080346002009B95A6070470120A9 -:103ED000704708B90120704701600020704700005A -:103EE00000EB8100374AD0F88010914201D00120C8 -:103EF00070470020704742F4806240F821207047EC -:103F00007047704710B500F083F82F4C00F049F867 -:103F10000028FBD1042100F045F828B92B4800689F -:103F2000010403D500F040F800F058F80022032106 -:103F300000F03CF826480168C908C90041F00101B9 -:103F400001602448016841F00401016030BF10BDE8 -:103F500010B51D4C00F028F800F023F80028FBD124 -:103F60004FF0B040816801F00C01042911D10168C3 -:103F700041F48031016001688903FCD581688908BA -:103F8000890041F002018160816801F00C0108297B -:103F9000FAD10022032100F009F8BDE8104000F03A -:103FA0003FB8032120469BE7002204212046A2E7D8 -:103FB00080B500F02DF80748016821F00401016088 -:103FC00030BF01BD00040080001400588804005870 -:103FD0000004005810ED00E000F022B84FF0B040AF -:103FE000016841F48071016001684905FCD5816870 -:103FF0008908890041F001018160416A89088900CE -:104000004162816801F00C010429FAD17047000077 -:104010000248016821F002010160704710E000E0F1 -:104020000248016841F002010160704710E000E0C1 -:104030001349002008604FF4E0221248016841F45F -:10404000700101604FF0B041086840F00100086065 -:104050008A600D480A6802400C480A60036823F031 -:10406000050303604268520852004260002208487B -:10407000C860086820F4802008608A6170470000EA -:1040800008ED00E088ED00E0FBFEF6FA9400005831 -:1040900000100422010000000300000005000000E1 -:1040A0000100000001000000060000000A000000FE -:1040B00020000000020000000400000008000000D2 -:1040C000100000004000000080000000000100001F -:1040D00000020000A0860100400D0300801A0600C7 -:1040E00000350C0040420F0080841E0000093D0096 -:1040F00000127A000024F40000366E010048E80146 -:10410000006CDC0200000000000000000000000065 -:104110000000000000F024F8012810D00D4880476E -:104120000D480047F0B543464C4655465E46674647 -:10413000F8B40A4C6B462360BFF34F8F30BF074C77 -:104140002468A546F8BC9846A146AA46B346BC4694 -:10415000F0BD0000314000089943000864140020BD -:104160000249002008607047000000006814002029 -:10417000FEE7FEE7FEE7FEE7FEE7704770477047A1 -:1041800000F01CB80248FCF788BF0248FCF796B85C -:104190003C1300209C110020FFF7E0BCFFF708BD96 -:1041A00000F014B80120FDF78CBF1020FDF789BF87 -:1041B0004020FDF786BFFEF7DCBD000002484168E5 -:1041C0000278891841607047781000200449C86857 -:1041D0000A6882430A60486000F004B800000000EA -:1041E00000150058704719E050F8042BD30744BF5E -:1041F000A9F101039A18091F0023042942F8043B7E -:10420000F9D25FEA817C134604D54FF0000CA2F886 -:1042100000C09B1CC90744BF0021197050F8041B43 -:104220000029E1D17047000010B500F013F802003A -:104230000023DB4300241068984203D011000220C1 -:10424000ABBE14605068984203D0111D0220ABBE73 -:10425000546010BD01487047000000008410002029 -:1042600010B450F8041B79B1026843680244083066 -:10427000DC0744BFA9F10104E31852F8044B43F8EA -:10428000044B091FF9D1ECE710BC704710B5074982 -:1042900079441831064C7C44163404E00A68081D41 -:1042A000114488470146A142F8D110BD2C000000FE -:1042B000680000004EF68851CEF20001086840F414 -:1042C00070000860BFF34F8FBFF36F8F4FF0007027 -:1042D000E1EE100A704700000FFFFFFFDC03000053 -:1042E00090100020840A000030000320000000002D -:1042F00071FFFFFF08000000AC0000002800032051 -:10430000000000005DFFFFFF880000003801000092 -:104310000810002000000000000000000000000065 -:10432000000000000000000001000000020000008A -:10433000030000000400000000F00DF8002801D088 -:10434000FFF7A4FFAFF300800020AFF30080FDF77C -:10435000DCFE00F002F80120704700F001B8000018 -:104360000746384600F002F8FBE7000080B5FFF78B -:104370005BFF024A11001820ABBEFBE726000200DB -:10438000B13F0008D93F0008053F0008513F000831 -:10439000013F0008033F0008AFF30080FFF78AFFEA -:1043A000FFF7CAFF0000000000000000FFF7FEBF9B -:1043B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF31 -:1043C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF21 -:1043D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF11 -:1043E000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF01 -:1043F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF1 -:10440000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFE0 -:10441000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFD0 -:10442000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC0 -:10443000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB0 -:104440000001000000000048001000480000004883 -:104450002D3A0008333A0008393A00080F000000EE -:104460000F0000000F00000000000000000000002E -:10447000000000000000000000000000000000003C -:10448000000000000000000000000000000000002C -:1044900000000000FFFFFFFFFFFFFFFF0000000024 -:1044A0000000000000000000000400480004004874 -:1044B000000400480100000000000000100000009F -:0C44C000FFFFFFFFFFFFFFFF00093D00B2 -:040000050800439913 +:1001900000F07ABF2420686020680168490849009F +:1001A0000160204600F0F2B92068016841F00101C9 +:1001B000016020467047204600F0F0BA30B5034693 +:1001C00003F180046068202846D109B1100001D1F4 +:1001D000012030BD207801283ED001252570196509 +:1001E000002003F154010A804A800862E060212067 +:1001F000606008699A68B0F1005F16D1B2F5805F5F +:1002000004BF1869002807BFDFF86C230A62DFF813 +:100210006C0308620020207000F01DFC41F4000116 +:1002200000F024FCF8D1002030BDB2F5805F04BF9F +:100230001869002807BFDFF848230A62DFF8440383 +:10024000086200202070196851E8002F42F08002F7 +:1002500000F089F9F7D1E6E7022030BD38B500F0AB +:1002600011F80DD109B1140001D1012032BD04787B +:10027000012C05D000F00CF8BDE8384000F076BB4A +:10028000022032BD034603F180008468202C7047B1 +:10029000012505700020D866DFF8EC421868A042FE +:1002A0000BD04068040208D51C6854E8005F45F094 +:1002B000806544E800500028F6D118467047216850 +:1002C00051E8002F7047206800F1080151E8001F35 +:1002D00000F1080221F0400142E8001000287047B8 +:1002E000F8B5044640F60F002668F1693268B36835 +:1002F000084004F15C050ED1880602D5900602D4B0 +:10030000D80040F181806969002900F029812046E8 +:10031000BDE8F4400847DFF8B407034204BFDFF844 +:10032000B0773A4270D0CF0707D5D70505D501275A +:1003300037622E6B46F001062E638E0708D5DE0766 +:1003400006D5276802263E622E6B46F004062E6311 +:100350004E0708D5DE0706D5276804263E622E6BB9 +:1003600046F002062E630E070AD5960601D4034214 +:1003700006D0266808203062286B40F00800286309 +:10038000080509D5500107D526684FF40060306292 +:10039000286B40F020002863286B002833D08906A2 +:1003A00007D5900601D4D80003D5696909B1204664 +:1003B0008847286B21688A68510602D410F0280FFC +:1003C0001CD0204600F057FB00F0D1F811D5FFF704 +:1003D0007AFFFCD1286A60B10FF2FD618163286A5F +:1003E00000F04DFF00280ED0286A816BBDE8F44074 +:1003F00008472046BDE8F24001F008B8204601F069 +:1004000005F800202863F1BD286901286AD1CF06CC +:1004100068D5D00666D51020306200F0A8F82DD53A +:10042000296A0868406880B20028ECD02A88904287 +:10043000E9DA6880086801688A061BD4FFF73FFF85 +:1004400022F4807200F08FF8F8D1206800F082FA70 +:10045000FBD1FFF738FFFCD12020E86200202861A3 +:10046000FFF72DFF22F0100200F07DF8F8D1286A86 +:1004700000F0CFFE29886888091A2DE0288869884D +:10048000411A688800281CBF88B2002868D02268FA +:1004900052E8003F23F4907342E800300028F6D180 +:1004A000206800F1080200F1080352E8002FDFF88D +:1004B000D002024043E800200028F1D12020E86269 +:1004C000002028616861226852E8003F23F0100391 +:1004D00042E800300028F6D12046BDE8F44089B259 +:1004E00000F095BFC80209D5580207D54FF4801017 +:1004F00030622046BDE8F24001F004B8080609D594 +:10050000100601D4180205D5A96949B32046BDE8F3 +:10051000F4400847480611D550060FD5FFF7CFFE27 +:1005200022F0400200F01FF8F8D12020A86200203D +:10053000A8612046BDE8F24001F002B8080206D5E5 +:10054000500004D52046BDE8F24001F00BB8C801C8 +:1005500048BF002A04D52046BDE8F24001F003B8A8 +:10056000F1BD22F4F07241E80020002870472068B5 +:100570008168480670470000C90B0008670B000837 +:10058000130B0008E90A000800800040F8B5044693 +:10059000DFF888092168DFF888C90A68DFF88479FC +:1005A0000240A06802432069024360690243E06997 +:1005B00002430A6000254A68E06822F44052024380 +:1005C0004A60A369DFF8602991421CBF206A034397 +:1005D0008E68DFF85809064033438B600FF2A4168B +:1005E000CB6A606A1B0940EA0313CB626145DFF8FE +:1005F00040094FF4004339D13F6807F00307032F48 +:100600004DD8DFE807F0024643494FF0010CE1699D +:10061000B1F5004F4FF6F07740F08080BCF1010F4C +:1006200009D0BCF1020F0AD0BCF1040F71D0BCF1AB +:10063000080F71D099E001F051FB002815D0626AD3 +:10064000616836F81230B0FBF3F04A0802EB400262 +:10065000B2FBF1F080B2A0F11001B942EAD207403A +:10066000C0F3420007432068C7607FE0914216D183 +:100670003F6817F4406723D0B7F5806F09D0B7F50E +:10068000006F03D0B7F5406F06D008E04FF0020CC2 +:1006900007E04FF0040C04E04FF0080C01E04FF0CD +:1006A000100C9142B3D1BCF1000F09D0BCF1020F84 +:1006B0000AD0BCF1040F15D0BCF1080F15D054E0DE +:1006C00001F004FB002851D0616A36F81120B0FB1C +:1006D000F2F6626802EB42018E4246D31103B14248 +:1006E00005D242E001F0A8FAECE71846ECE7500822 +:1006F000002110EB062051EB1661002301F06AFB8C +:10070000A0F54071DFF82C2891422ED22268D060EB +:100710002CE001F091FA90E7184690E7BCF1010F48 +:1007200009D0BCF1020F09D0BCF1040F18D0BCF104 +:10073000080F18D019E001F0D1FAB8B1626A36F8A2 +:1007400012306168B0FBF3F000EB5100B0FBF1F048 +:1007500080B2A0F11001B94207D22168C86005E05B +:1007600001F06AFAE9E71846E8E7012504F16800B4 +:1007700001214180018000218160C1602846F2BDD5 +:10078000FEFFFFEF010002000400060008000A005F +:100790000C001000200040008000000190F828109C +:1007A000CA0706D502685368C16A23F400330B43B5 +:1007B000536090F828108A0706D502685368016BC9 +:1007C00023F480330B43536090F828104A0706D572 +:1007D00002685368416B23F480230B43536090F805 +:1007E00028100A0706D502685368816B23F400437A +:1007F0000B43536090F82810CA0606D50268936828 +:10080000C16B23F480530B43936090F828108A0641 +:1008100006D502689368016C23F400530B43936080 +:1008200090F828104A0610D502685368416C23F4EA +:1008300080130B435360416CB1F5801F05D15368A1 +:10084000816C23F4C0030B43536090F828100A0610 +:1008500006D501684A68C06C22F4002202434A604F +:100860007047F8B5044604F180050020E8606FF099 +:100870007E4701F0C7FB0646206801680A0708D5D5 +:100880000097334600224FF40011204600F017F87D +:1008900060B9206801684A070AD5009733460022EC +:1008A0004FF48001204600F00AF808B10320F2BDA1 +:1008B00020206860A8600020E0662870F2BD2DE965 +:1008C000F041069C05460E4690461F462868C169C1 +:1008D0003140B1420CBF01200020404526D114F127 +:1008E000010FF3D001F08EFBC01B844200D33CB952 +:1008F00000F025F800F02DF8FCD100F01AF811E016 +:10090000286801684A07E1D5C1690A05DED54FF4B8 +:100910000062026200F013F800F01BF8FCD100F056 +:1009200008F8C16000210170032000E00020BDE84C +:10093000F08105F1800020214160816070472968C5 +:1009400051E8002F22F4D07241E800200028F6D1AF +:100950007047286800F1080151E8001F490800F1BC +:100960000802490042E800100028704770B50346AD +:1009700000209965FF2403F15C010A804A804861E8 +:100980009868B0F5805F04D1186960B940F2FF142F +:1009900009E010B9186928B905E0B0F1805F06D107 +:1009A000186910B97F248C8003E03F2000E000200C +:1009B000888003F180040020E0602220A060186895 +:1009C00000F1080555E8005F00F1080645F0010553 +:1009D00046E800500028F2D18868B0F1005F22D1CB +:1009E0008D89AA421FD39A68B2F5805F04BF186947 +:1009F000002807BF0FF2ED324A610FF23D30486127 +:100A000000202070196851E8002F42F48072FFF72F +:100A1000AAFDF7D100F01FF841F0805100F026F850 +:100A2000F8D1002070BD9A68B2F5805F04BF1869E4 +:100A3000002807BF0FF239224A610FF2ED1048611A +:100A400000202070196851E8002F42F49072FFF7DF +:100A50008AFDF7D1E5E7186800F1080151E8001FA9 +:100A600000F108027047DFF8D004014042E80010AE +:100A7000002870470000026852E8003F23F490739A +:100A800042E800310029F6D1016801F1080201F1C4 +:100A9000080352E8002F0F490A4043E800210029CB +:100AA000F2D1C16E012908D1026852E8003F23F05B +:100AB000100342E800310029F6D12021C0F8881047 +:100AC0000021C166016770470000000001000010AE +:100AD00020010004FEFFFFEF806A00F156010022B2 +:100AE0000A810A8000F092BCD0F88420212A0FD11C +:100AF000B0F8561001B923E0016D03680A789A62D4 +:100B0000016D4A1C0265B0F856104A1EA0F8562026 +:100B10007047D0F88420212A11D1B0F8561001B9BD +:100B20000EE0016D03680A88C2F308029A62016D43 +:100B30008A1C0265B0F856104A1EA0F8562070476D +:100B4000026852E8003F23F0800342E800310029A8 +:100B5000F6D1026852E8003F43F0400342E800311A +:100B60000029F6D17047D0F88410212900D07047B1 +:100B700030B500F15602938A0DE00168CC69250674 +:100B800008D5046D25788D62016D4C1C04651488B0 +:100B9000611E11805B1E99B241B111880029ECD110 +:100BA00000F005F8FCD100F035F8FCD130BD01684B +:100BB00001F1080252E8002F01F1080322F40002BB +:100BC00043E8002100297047D0F88410212900D083 +:100BD000704730B500F15602938A0FE00168CC6986 +:100BE00025060AD5046D2588C5F308058D62016DBB +:100BF0008C1C04651488611E11805B1E99B241B182 +:100C000011880029EAD1FFF7D2FFFCD100F002F8E9 +:100C1000FCD130BD026852E8003F43F0400342E897 +:100C2000003100297047000010B500F04BF81AD1D0 +:100C30004B6A91880B40816D0B70816D4B1C00F0ED +:100C40003BF8A1B900F044F800F060F8FCD100F0E6 +:100C500056F807D10023136100F044F844BF102474 +:100C60000C6260E064E0886940F00800886110BDB3 +:100C700010B500F027F81AD14B6A91880B40816DAE +:100C80000B80816D8B1C00F017F8A1B900F020F8E3 +:100C900000F03CF8FCD100F032F807D100231361DA +:100CA00000F020F844BF10240C623CE040E088696A +:100CB00040F00800886110BD836551884B1E538049 +:100CC0005188704700F15C020168D36A222B70479B +:100CD000036853E8004F24F4907443E8004100296E +:100CE000F6D17047036853E8004F24F0100443E83E +:100CF00000410029F6D10168CB69DC06704720214C +:100D0000D16200215161116901297047016801F127 +:100D1000080353E8003F5B0801F108045B0044E866 +:100D20000031002970471188BDE8104000F06FBB0A +:100D3000BDE8104000F0FABB2DE9F84300F0A9F837 +:100D400047D1A08978B96088002844D0A189884219 +:100D500041DA00F0ABF87948606100F0BDF83AE0A4 +:100D6000304600F0E3FBA806EDD500F08CF80870E3 +:100D7000B06D411C00F0F7F819D0E90748BF5FEAF1 +:100D8000C95101D500F0F8F8A80703D5F80701D537 +:100D900000F0DAF8680703D5F80701D500F094F8F9 +:100DA000206B20B1304600F031FB002121636088C8 +:100DB0000028D8D100F09AF800F0CEF8D0D100F099 +:100DC000E2F844BF102202622188304600F01FFB87 +:100DD000C9E700F002F8BDE8F183816941F008013C +:100DE000816170472DE9F84300F053F847D1A0899D +:100DF00078B96088002844D0A189884241DA00F09F +:100E000055F84F48606100F067F83AE0304600F06E +:100E10008DFBA806EDD500F036F80880B06D811C7A +:100E200000F0A1F819D0E90748BF5FEAC95101D520 +:100E300000F0A2F8A80703D5F80701D500F084F860 +:100E4000680703D5F80701D500F03EF8206B20B104 +:100E5000304600F0DBFA0021216360880028D8D1F9 +:100E600000F044F800F078F8D0D100F08CF844BFDE +:100E7000102202622188304600F0C9FAC9E7FFF764 +:100E8000ACFFBDE8F1833068406AB16D08EA00004C +:100E90007047064606F15C043068B4F80480C56902 +:100EA000D0F800908768E16A22297047306800F125 +:100EB000080151E8001F00F1080221F0805142E8CA +:100EC00000100028F2D17047316804200862206BBE +:100ED00040F0020020637047316851E8002F42F073 +:100EE000200241E800200028F6D17047316851E81F +:100EF000002F22F4807241E800200028F6D13068EB +:100F000000F1080100F1080251E8001F0D480140FE +:100F100042E800100028F2D170470000F369FFCFCB +:100F2000003801408800005800800040FFF4FF11A5 +:100F30000024F40000FD0F00FEFF7FEF290C0008E5 +:100F4000710C0008FEFFFFEF316802200862206B81 +:100F500040F00400206370472020E06200206061C0 +:100F6000206901287047B1656088411E6180306842 +:100F7000C56915F0070F704701210162206B40F031 +:100F800001002063704700212161316851E8002F82 +:100F900022F0100241E800200028F6D13068C16933 +:100FA000CA067047674981B00A6802430A60096847 +:100FB00008400090009801B0704780B54FF40020C1 +:100FC000FFF7F0FF002200212E2001F03DF8BDE8E0 +:100FD00002402E2001F056B800685B49884200D0DC +:100FE000704780B54FF48010FFF7DCFF002200212E +:100FF0002C2001F029F82C2001F044F800220021D7 +:101000002D2001F021F8BDE802402D2001F03AB872 +:1010100030B58DB0044601A8302101F089F821686F +:101020004A4A91422ED101F087F801F085F8484DE7 +:10103000A86B20F4407040F48070A8634FF4807176 +:101040004FF400600190099101A801F087F808B100 +:1010500001F017FAA86B40F40040A8630022296849 +:1010600041F4806129600021286800F480600090CC +:101070000098032000F0E8FF032001F003F8204669 +:1010800001F09CFA0DB030BD38B592B0044601A80D +:10109000142101F04DF806A8302101F049F820682C +:1010A0002C4988424CD1002001210790069106A8C6 +:1010B00001F054F808B101F0E4F92748274D4169DF +:1010C00041F4804141610222416901F48041009173 +:1010D0000099016841F0010101604FF4C0610068AE +:1010E00000F001000090009801910120039003217D +:1010F000072004910590029201A94FF0904001F061 +:1011000075FA174828600F2068601020A86000203A +:10111000E8608020286100206861A861E861286299 +:10112000284600F01FF808B101F0ABF9A567AC62E2 +:1011300000220021242000F087FF242000F0A2FFDD +:1011400013B030BD50000058000C0058002800407B +:1011500058000058003801404C0000583C13002053 +:101160004400024038B5040001D1012032BD21689D +:10117000DFF880024018142204F12405B0FBF2F2DB +:10118000DFF87402E86192002A62022068700A683F +:10119000A0686FF30E120243E06802432069024325 +:1011A00060690243A0690243E0690243206A024386 +:1011B0000A60204600F0F9F8A068B0F5804F04BF3F +:1011C000002161602079696A00F03F0000F014F8A6 +:1011D00038B1052805D2204600F0FBF800F012F8DF +:1011E00003E0002028636863A8630020A861012051 +:1011F00068700020287032BD0860A96AE86A4860FB +:1012000060687047296B00200860696BA86B4860B4 +:10121000704781B040B100F124014A78022A05D01C +:101220000420886100200870012026E0026813680D +:1012300023F00E0313604A6A136823F4807313606B +:1012400000680268520852000260012091F82020D4 +:10125000CB6902F01C02904058608A6AC86A5060EC +:10126000086B30B1026822F4807202604A6B886BAE +:101270005060012048700020087001B0704738B5F8 +:1012800000F1240200245178022903D00420906147 +:10129000012428E001680B6823F00E030B6001684D +:1012A0000D686D086D000D60516A0B6823F4807342 +:1012B0000B60012192F82030D56903F01C0399409E +:1012C0006960936AD16A5960116B31B10B6823F47C +:1012D00080730B60536B916B5960012151701470D6 +:1012E000516901B18847204632BDF8B500F12401AB +:1012F0000423CA6914680268156891F8206006F032 +:101300001C0603FA06F73C4210D06F070ED514688E +:10131000A50603D4156825F00405156000F03DF816 +:10132000C968002938D0BDE8F4400847022303FA11 +:1013300006F73C4213D0AF0711D51468A50605D4B3 +:10134000156825F00A05156001224A7000F025F89D +:1013500000220A708968F9B1BDE8F4400847082303 +:1013600003FA06F6344217D02B0715D5136823F07D +:101370000E031360012291F82030CC6903F01C03A6 +:101380009A40626001228A614A7000220A700969EB +:1013900011B1BDE8F4400847F1BD91F82020CC69B7 +:1013A00002F01C02934063607047426C134992083C +:1013B00001EB82018164142201780839B1FBF2F15A +:1013C0000F4AC26401F01F01012202FA01F1016516 +:1013D000704701790B4A01F03F0102EB810242653F +:1013E000491E094A826501F0030101228A40C26553 +:1013F00070470000F8FFFDBF0000024000080240F7 +:1014000080080240FC0802404009024070477047D3 +:1014100010B500F180010A78012A01D1022010BD27 +:1014200001230B7024224A60026813681468640860 +:10143000640014600022426623F0005300680360D9 +:10144000202048600020087010BD70B500F01EF824 +:1014500001D1022070BD00F01FF822F0604209E0C7 +:1014600070B500F013F801D1022070BD00F014F83F +:1014700022F0606211438160204600F01AF8206873 +:101480000660202068600020287070BD044604F1CA +:10149000800528780128704701222A70242068607E +:1014A000206806680268520852000260206882685C +:1014B000704730B5416E11B90121012214E0016875 +:1014C0000FF230048A6889680FF23003520E02F07E +:1014D0000702490F655CA45C595C9A5CED00E4006E +:1014E00095FBF1F194FBF2F268304180028030BD4F +:1014F00000000000010101030701000008040204CC +:10150000080101017047704730B912480360124862 +:10151000124B0360FEF7A2BE704730B9104803605B +:101520000D480E4B0360FEF749BE704700680B493B +:10153000884204D107490868002818BF004770474F +:1015400000680649884204D105490868002818BF88 +:10155000004770475C1400209C11002000380140B7 +:1015600060140020704770474FF0B040006800F0F2 +:10157000F000B02888BFB02070472DE9F04104008A +:1015800054D0207881064FF0B04538D5A868E96876 +:1015900010F00C0001F0030103D00C2808BF012952 +:1015A00046D12868800702D5E06900283ED0FFF7C1 +:1015B000DBFF616A884207D2084600F0A0FB0028E2 +:1015C00034D100F043FA0FE0286820F0F000014326 +:1015D00029606968206A21F47F4141EA002169603D +:1015E000606A00F08CFB08BB00F062FBDFF8881734 +:1015F0000860DFF88807006801F0D4F8B0B92078F7 +:10160000C1070DD5A868E96800F00C00082801F0B2 +:10161000030103D00C2808BF03292CD128688003BC +:1016200040F11D816068002840F01981012006E228 +:10163000E06980B1296841F0010100F0F3FA064643 +:101640002868800700F1088100F0DCFC801B03287B +:10165000F6D30320F3E128684008400000F0A6FB21 +:101660000646286800F0EEF9C9D000F0CBFC801BDC +:101670000328F6D3EDE76068B0F5803F04D1296810 +:1016800041F48031296003E02A6822F480322A6024 +:10169000606860B100F0B6FC06462868800300F17F +:1016A000DE8000F0AFFC801B6528F6D3D1E700F0A8 +:1016B000A9FC06462868400C10F0010000F0CF801D +:1016C00000F0A0FC801B6528F4D3C2E700F09AFC70 +:1016D000C01B0328C0F0F780BBE7E06878B1296839 +:1016E00041F4807100F09EFA06462868400500F13A +:1016F000FD8000F087FC801B0328F6D3A9E728684B +:1017000020F4807000F052FB06462868800A10F032 +:10171000010000F0C28000F075FC801B0328F4D3A8 +:1017200097E700F06FFCC01B0328C0F0F18090E742 +:1017300040F0010000F09BF907467068800700F157 +:10174000028100F05FFCC01B0328F6D381E77068BC +:1017500020F0040000F08BF907467068C00810F014 +:10176000010000F0FF8000F04DFCC01B0428F4D302 +:101770006FE70528306806D140F00400306031681A +:1017800041F0010105E0400840003060316821F07F +:1017900004013160A06841F2893768B100F032FC81 +:1017A00080463068800700F1F28000F02BFCA0EB4F +:1017B0000800B842F5D34CE700F024FC80463068BE +:1017C00000F040F900F0E38000F01CFCA0EB080002 +:1017D000B842F4D33DE700F015FC801B0328C0F0AD +:1017E000088136E700F00EFC001B0328C0F02281C0 +:1017F0002FE7286881010CD4296841F080712960A5 +:10180000E86840F08050E86000F0FCFB044628687F +:10181000810100F1138100F0F5FB001B0328F6D3D2 +:1018200017E70C2930D0286820F080702860E9681C +:1018300089088900E960E86820F08050E86000F0DD +:10184000E1FB04462868810140F1F88000F0DAFBF2 +:10185000001B0328F6D3FCE600F0F8F8CFE620786A +:1018600081071AD5A868E96800F00C00042801F087 +:10187000030104D00C2808BF02297FF42EAF28688A +:10188000400503D5E06800283FF4D0AE69682069C0 +:1018900021F0FE4141EA006169602168DFF8E064FF +:1018A00011F0180F38D0606900283FF450AFC90616 +:1018B00070687FF53DAF800709D4706840F0010083 +:1018C00000F0D5F80746706880077FF5FFAE7068B6 +:1018D00040F0040000F0CBF80746706800070DD414 +:1018E00000F090FBC01B0428F7D3B2E668682169BA +:1018F00020F0FE4040EA01606860CEE77068A169B0 +:1019000020F4706040EA0120706000F0ADF80746F6 +:1019100000F097F87FF405AF2078410737D5DFF85E +:1019200064743868C10529D400F006FC00F06AFB35 +:1019300080463868C10521D400F064FBA0EB0800A4 +:101940000328F6D385E6706820F0040070607068A4 +:10195000C00810F00100DFD000F054FBC01B0428C9 +:10196000F5D376E600F080F8074600F06AF8D3D0A9 +:1019700000F048FBC01B0328F7D36AE6A0680128E3 +:101980007FF4F7AE306840F00100306002E7A06AF3 +:10199000002853D0A968EA68022801F00C017FF4FE +:1019A00040AFE36A02F00300984202BF02F0700009 +:1019B000236B984214D1636BC2F30620984202BF96 +:1019C00002F47810A36B98420AD1E36B02F06060D6 +:1019D000984202BF02F06042206C82423FF409AF9D +:1019E0000C293FF423AE286820F0807000F0DEF967 +:1019F0000646296888013FF5EEAEE968DFF88803FE +:101A0000626B0140E06A0143206B0143A06B41EA35 +:101A100002210143E06B0143206C0143E960286827 +:101A200040F080702860E96841F08051E96000F082 +:101A3000E9FA0446286881017FF5D4AE0020BDE8AC +:101A4000F0817068400810F0010070472968606AF2 +:101A500021F0F001014329606868216A20F47F4089 +:101A600040EA01206860704770684008400070607C +:101A700000F0C8BA2DE9F8430400884644D0DFF8E6 +:101A80000C6300F0CAF847D200F0CFF8074600F028 +:101A9000C4F841D000F0B6FAC01B0228F7D90320E1 +:101AA000B9E000F0AFFA401B022843D9F7E700F095 +:101AB000A9FAA0EB090002284CD9F0E700F0A2FA3D +:101AC000A0EB0900022854D9E9E700F09BFA401B7B +:101AD00002285DD9E3E700F095FA401B022867D998 +:101AE000DDE700F08FFA401B484577D3D7E703289E +:101AF00002D13968890103E00028396802D18907D9 +:101B000062D401E049055FD4012084E000F07AFA54 +:101B1000C01B022872D9C2E7207881074FF0B04776 +:101B20000BD5B968A06821F0F0010143B96000F05D +:101B300069FA0546B868C003B3D52078DFF8345297 +:101B400081060AD52968606921F0F001014300F09F +:101B500069F8814628688003A9D5207841060BD50D +:101B60002968A0690909090141EA101100F05AF831 +:101B700081462868C003A1D5207841070BD5B968F4 +:101B8000E06821F4E0610143B96000F03BFA0546EA +:101B9000B868800399D5207801070CD5B868216909 +:101BA00020F4605040EAC100B86000F02BFA05460E +:101BB000B86840038FD52078C10717D56068022820 +:101BC00095D1396889039FD5B968890840EA8100B1 +:101BD000B86041F2893900F015FA0546B8686168C5 +:101BE00000F00C00B0EB810F7FF47BAF306800F0A9 +:101BF0000700804505D200F018F8074600F00DF800 +:101C000084D100F055F85C49086000F001FEBDE8A1 +:101C1000F24300F0C7BDBDE8F283306800F0070072 +:101C200040457047296000F0EDB93168C90848EABD +:101C3000C101316000F0E6B938B54FF0B044554D00 +:101C4000A16811F00C0106D1FFF78EFCC0F3031060 +:101C500055F8200032BD04294F4A05D008294F48C5 +:101C600004D12168C90222D5104632BDE16801F0D5 +:101C70000301022904D0032904D12168C90207D530 +:101C8000104605E0FFF770FCC0F3031055F8200084 +:101C9000E168E268E368C1F306214843C2F3021138 +:101CA000491C5B0FB0FBF1F05B1CB0FBF3F032BDE5 +:101CB00080B5FFF7C1FF3649FFE7394A0968C1F32C +:101CC000031152F82110B0FBF1F002BD80B5FFF70F +:101CD000EFFF00F010F8C1F3022106E080B5FFF736 +:101CE000E7FF00F008F8C1F3C22112F8211001F05B +:101CF0001F01C84002BD26492A4A0968704770B5CD +:101D00002449274AB1282EBFC86AC0F3031051F8EE +:101D100020001849096801F00F0152F82110224AE9 +:101D2000B0FBF1F0B0FBF2F0002400210FF28402CE +:101D300052F8213083420AD2491C0329F8D90AE01B +:101D400000F060F9801B03280DD3032070BD0FF253 +:101D5000740050F821400D4D2868C00844EAC000C6 +:101D600000F024F80646296801F00701A142E7D1F6 +:101D7000002070BD080100588C1000208010002049 +:101D800090000058000400588C80C1110040005899 +:101D9000080000584C4400080024F4000048E80102 +:101DA0000C4400089046000840420F00286000F0F4 +:101DB00029B90000120000002400000036000000D5 +:101DC00040000000000000000100000002000000D0 +:101DD00003000000B3BBD9B1B2F5803F7DD2022A27 +:101DE0001ED98C46B1FBF2F102FB11C31B0443EA7E +:101DF0001043B3FBF2FC02FB1C3380B240EA034306 +:101E0000B3FBF2F002FB103240EA0C4000237047B3 +:101E1000022A05D98446B0FBF2F002FB10C27047DB +:101E20004AB105D100F0010249085FEA300070476D +:101E300000220023704700F007BD0B0002000021C4 +:101E400000207047904271EB030CF6D3B3F5803F4E +:101E50002FD2F0B5B3FA83F7B1FA81F4A7F10F0EE0 +:101E60003D1B5340CEF1200602FA0EF2F3415340DF +:101E7000B5F10F0746D80F3C2C444140C4F1200671 +:101E8000A040F1414140B1FBF3F603FB1611A2FB68 +:101E90000645001BA94102D2761E8018594180EAEE +:101EA000010221FA0EF362FA0EF200215A40304686 +:101EB000F0BD30B4B1FBF3FC03FB1C11A2FB0C45DD +:101EC000001BA94103D2ACF1010C8018594130BC70 +:101ED00002460B46604600217047B2F1807F65D311 +:101EE000F0B5B2FA82F7B1FA81F4C7F10F063D1BE3 +:101EF00022FA06F307F1110EF24120355A40B5F1EE +:101F00000F07B8D94140C4F12006A040F14141403B +:101F1000B1FBF3FC03FB1C11A2FB0C45001BA94108 +:101F200003D2BCF1010C801859410F2F12D30F3F7F +:101F3000C90341EA5041B1FBF3F603FB1611A2FBC2 +:101F40000645D4EBC030A94102D2761E8018594113 +:101F500046EACC3C07B34140C7F12006B840F14106 +:101F60004140B1FBF3F603FB1611A2FB0645001B33 +:101F7000A94102D2761E8018594180EA010221FA55 +:101F80000EF3C7F1200462FA0EF20CFA07F05A4081 +:101F90002CFA04F13043F0BD80EA010221FA0EF37D +:101FA000002162FA0EF260465A40F0BD8C46B1FB49 +:101FB000F2F102FB11C31B0243EA1063B3FBF2FC14 +:101FC00002FB1C331B024CEA002043EA1063B3FB04 +:101FD000F2FC02FB1C331B024CEA002043EA1063B4 +:101FE000B3FBF2FC02FB1C331B024CEA002043EA69 +:101FF0001063B3FBF2FC02FB1C324CEA002000230E +:102000007047704701484068704700BF7810002053 +:102010000901020081B002D43C48815405E03C48EB +:1020200002F00F02104400F8041C01B07047394A56 +:1020300013684FF6FF0100020B4000F4E060184304 +:10204000354908431060704738B5324B1C68C4F3FB +:102050000223C3F10704052C28BF04241D1D072DEE +:1020600034BF0023DB1E012505FA04F4641E214061 +:10207000994005FA03F35B1E1A401143BDE8344052 +:10208000C6E70000010007D4012200F01F01234B26 +:102090008A40400943F82020704701000BD40122F8 +:1020A00000F01F011E4B8A40400943F82020BFF377 +:1020B0004F8FBFF36F8F704710B5401EB0F1807F18 +:1020C00001D3012010BD174C60600F214FF0FF308D +:1020D000FFF79EFF0022A26007202060002010BDB5 +:1020E000010007D4012200F01F010F4B8A40400974 +:1020F00043F820207047010007D4012200F01F019F +:102100000A4B8A40400943F82020704700E400E071 +:1021100018ED00E00CED00E00000FA0500E100E041 +:1021200080E100E010E000E000E200E080E200E09A +:10213000002200F08BBB00000248016841F480716E +:102140000160704700040058DFF87C211368010C1F +:1021500023EA014343EA0043136070472DE9F0414D +:10216000054600272868DFF864610105B8462FD5C9 +:102170003468286A04F44074844229D0FFF7DCFFF5 +:10218000002C316805D1286A21F440710143316087 +:102190001DE0306840F48030306021F440713268D6 +:1021A00022F480323260286A014331603068C0070F +:1021B0000DD5FFF727FF044641F2893830688007C4 +:1021C00005D4FFF71FFF001B4045F7D30327B84690 +:1021D0002878DFF8FC40C10705D5E16F68688908F9 +:1021E00040EA8101E1672878810705D5E16FA86899 +:1021F00021F440610143E1672878C10644BF2869A2 +:10220000FFF7A2FF2878810644BF6869FFF79CFFAB +:10221000287841070AD5E868E16F020902F47F22B5 +:102220000001914300F47F200843E067286881059E +:102230001ED5A869B0F1804F18BFB0F1004F00D093 +:1022400018B9E16F21F0404108E0E16F21F0404111 +:10225000E16720F08050E16F21F040610843E067C2 +:10226000A869B0F1C05F03D1216841F0807121609D +:10227000286841050DD5E16FE86921F0405101431F +:10228000E167E869B0F1005F03D1216841F4803172 +:1022900021602868C10405D57168686A21F440414D +:1022A00001437160286881040BD5A169E86A21F0B7 +:1022B00030010143A161A169A86A890840EA81014E +:1022C000A1614046BDE8F0818800005890000058A8 +:1022D0000C000058594900E0594981B00A6802438E +:1022E0000A60096808400090009801B0704780B506 +:1022F00000F07AFA00F0C4FA00F018F800F048F89C +:1023000050485149016000F085FB0420FFF7E4FFCD +:102310000120FFF7E1FF00F0A3F800F04EF800F015 +:1023200065F800F0C1FA00F067FBFCE780B598B0F3 +:1023300007A84421FFF7FCFE68461C21FFF7F8FEC2 +:10234000FFF7FAFE4148016821F0180101600720FB +:1023500007904FF480310891012009904FF480716B +:102360000A9140200B900021119107A8FFF705F971 +:102370006F200090022100200191029003900490B0 +:102380000590069001216846FFF774FB19B000BD67 +:1023900010B58CB068463021FFF7CAFE4FF480407C +:1023A0000990022110200B904FF440540A910094A0 +:1023B0006846FFF7D3FE0CB010BD10B5244C25487D +:1023C0002060002060600F20A06047F6FF70E06092 +:1023D00000202061A0616061204600F053FB204690 +:1023E000BDE810400022002100F058B810B51A4C8A +:1023F0001A4820604FF4E13060600020A060E06087 +:1024000020610C2060610020A0614FF40040E06179 +:10241000002020626062A0622046FDF78FFE00214E +:102420002046FFF712F800212046FFF719F8204652 +:10243000BDE81040FEF7ECBF000000004800005867 +:102440004C0000589C130020000C005890000058CD +:10245000D8130020002800409C11002000380140C3 +:1024600080B50420FFF736FF0120FFF733FF00227D +:102470000F210E20FFF7E8FDBDE802400E20FFF718 +:1024800001BE70478A60FF2102685162012180F815 +:102490002110002180F82010002070472DE9F8431A +:1024A00000F065F808BF022038D000F067F814D5B6 +:1024B000FFF7A8FD07462068C16848070DD5FFF75C +:1024C000A1FDC01B4845F6D300F039F826E0FFF720 +:1024D00099FDC01B484507D3F6E700F02AF800F045 +:1024E00065F8FFF78FFD07462068C1684A07EED5FB +:1024F000C0F81480206800F013F82A48016841F4FD +:10250000002101602848026842F40022026020682D +:10251000816841F48041816000F01BF8BDE8F283DE +:102520008168C908C9008160206881680D438560A1 +:1025300070472068816821F480618160704720685D +:102540004662032184F82110002084F82000032033 +:1025500070472068816841F48061816001212068B2 +:10256000466284F82110002084F820007047044659 +:10257000884694F82000012815467047012184F808 +:102580002010022084F82100CA20216848625320CC +:1025900022685062FF2620688168480540F2E939C8 +:1025A0007047000080080058000800582068C16883 +:1025B00001F0800161F49061C160704790F82010D3 +:1025C000012901D102207047012280F82020022138 +:1025D00080F82110CA2102685162532103685962B0 +:1025E00001688A6842F020024CE700002DE9F84FAC +:1025F0004FF00009644A654B4FF00F0805460E4640 +:1026000033E0634FBD4214BF072704278F402743A1 +:102610004CF82E70C1431C6801EA040C7468E40293 +:1026200048BF40EA0C0CC3F800C05C6801EA040C27 +:102630007468A40248BF40EA0C0CC3F804C01468D4 +:1026400001EA040C7468E40348BF40EA0C0CC2F8C9 +:1026500000C0546801EA040C7168890348BF40EA6D +:102660000C0CC2F804C009F10109316831FA09F013 +:1026700078D0012404FA09F414EA0100F3D04FEAF7 +:10268000490C032101FA0CF16FEA010E716801F0A7 +:102690000307012F1CBF01F00301022911D1A96812 +:1026A000F7680EEA010107FA0CF73943A960696877 +:1026B00021EA04047168C1F3001101FA09F10C4325 +:1026C0006C604FEA8901347904F00304032C1FD0B5 +:1026D000EC68B7680EEA040407FA0CF73C43EC60B8 +:1026E000347904F00304022C12D14FEAD90705EB28 +:1026F000870401F01C07D4F820A008FA07FB2AEA97 +:102700000B0AD6F810B00BFA07F747EA0A07276258 +:102710002C680EEA0407347904F0030404FA0CF47C +:102720003C432C60746814F4403F9CD0DFF864C0D4 +:102730004FEA990E5CF82E7001F00C0108FA01F4D2 +:1027400027EA0404B5F1904F08BF002709D0124FC3 +:10275000BD4208BF012704D0104FBD427FF451AFE6 +:10276000022753E7BDE8F18F81B0002A14BF8161D1 +:10277000816201B070470A4A136803421CBF1060AF +:1027800000F042B970470000800800580008005867 +:1027900000100048080001400004004800080048FC +:1027A0000C08005870B50F4E044630780025A8B1CB +:1027B000FFF77EFA32784FF47A71B1FBF2F1B0FB99 +:1027C000F1F0FFF779FC48B9102C07D2002221461E +:1027D0004FF0FF30FFF738FCB46000E001252846D9 +:1027E00070BD00BF78100020144810B5016841F496 +:1027F000807101600320FFF71AFC0020FFF7D2FF71 +:102800000024002814BF0124FEF7D7FB204610BD8A +:102810000B48806870470B4801684908490001600F +:1028200070470848016821F00201016070470548BF +:10283000016821F004010160704700000040005869 +:1028400078100020042004E07047000000B500BFAD +:10285000130096469446103928BFA0E80C50FAD8C9 +:102860005FEA417C28BF0CC048BF40F8042BC90771 +:1028700028BF20F8022B48BF00F8012B00BD000044 +:1028800080B552484FF400410160002000F09EF9ED +:1028900048B180794E494F4A0A600A6822F47C5256 +:1028A00042EA00220A6001BD18B54B484B4C89B082 +:1028B00001680160CA214A48C1615321C161FF22F8 +:1028C0000168C908C9000160C2614648016841F455 +:1028D0000041016000F08CF943480168C908C90053 +:1028E00041F00401016000F0C9F94049002000F006 +:1028F00042FB00F066FC0121012000F08BF900F0A2 +:1029000046F800F053F800F0B3FD394800F0A9FE96 +:102910000FF259020021202000F03DFF04F23C504C +:10292000029034490FF22D0001900091684600F0AA +:10293000F8FD04F25470039004F5C96140F23C5074 +:1029400006900491059403A800F024FE00F08EFD8B +:102950000AB010BD80B50146254800F08EFEBDE8E6 +:1029600004400021202000F023BF000080B500F0CB +:1029700056FC0021012000F04DF969461C4800F08A +:1029800092FE009800F01FFE00F07AFF01BD80B5B6 +:10299000002001F05CF9012001F059F9022001F05A +:1029A00056F9BDE80240012001F07AB980B5012155 +:1029B000002001F08AF90121012001F086F9BDE82B +:1029C00004400121022001F080B9000010400058AD +:1029D0009C000058FECAFECA900800583000032030 +:1029E000082800400800005880040058D813002030 +:1029F000281400204B39000802E000F01FB900BF86 +:102A00004FF0FF3000F060BE012808BF00F0ACBFFF +:102A100070470000F8B504460025ACB104F1340657 +:102A2000307910B92046FEF7D7FA0F4F384600F03C +:102A300021F8386840F001103860204600F007F8AF +:102A400035600120307100E001252846F2BD10B547 +:102A50000021064A064B00EB8104491C06296360ED +:102A6000E261F8D310BD0000000C005803200008FC +:102A700007150008002101604FF03F1141603F2120 +:102A80008160704738B5040044D094F8210028B91B +:102A9000002184F820102046FEF7BAFA00F049F829 +:102AA000FF2510B100F03FF834E02168DFF8B000F6 +:102AB0008A6802408A6021688A68636820690343E3 +:102AC000A06903431A438A602168E06808612068AE +:102AD0000169A26841EA024101612068C16821F0F0 +:102AE0008001C1602068C16C21F00201C1642168CD +:102AF000CA6CE369606903431A43CA642068816849 +:102B0000880609D400F020F830B12068456204211D +:102B100000F01FF8012032BD20684562012184F8D1 +:102B20002110002032BD20684562042184F8211064 +:102B30007047022084F82100CA202168486253208F +:102B400022685062204626E020460BE02068C0F84C +:102B5000248084F82110002084F8200070470000B1 +:102B6000BFFF8FFF70B5044640F2E9362068C168A8 +:102B700021F0A001C160FFF745FA05462068C16851 +:102B8000880606D4FFF73EFA401BB042F6D3032076 +:102B900070BD002070BD70B504462068C1684A064B +:102BA00012D44FF0FF32C26040F2E936FFF72AFA42 +:102BB00005462068C168480606D4FFF723FA401B83 +:102BC000B042F6D3032070BD002070BD0146064818 +:102BD000064AC3798B4218BF904218BF0838F8D113 +:102BE0008B4218BF00207047F873FF1F0070FF1F53 +:102BF0002048002101604160704710B500F019F8CD +:102C00001C6819B1012904D1204301E024EA000025 +:102C100018600BE010B500F00CF85C6819B10129E0 +:102C200004D1204301E024EA0000586082F31088B8 +:102C300010BDEFF3108272B60E4B704738B5EFF34C +:102C4000108472B60B490C4D086820B1296888477A +:102C5000686880470AE0486820B1A9688847E86842 +:102C6000804703E0286980476869804784F31088BB +:102C700031BD000030140020F84600080248016809 +:102C800041F400710160704708040058DFF8F01447 +:102C90000A6892B200E00246086880B28242FAD125 +:102CA00070472DE9FC4104461825DFF8D884DFF889 +:102CB000D864684308EB00073078062808D13178DB +:102CC0007170347078754FF0FF307060002039E01B +:102CD00000F077F8B9680918B96008F10803B96815 +:102CE00032786A439A589142327813D308F1150327 +:102CF00015FB02FC13F80C30062B25D008F1080652 +:102D00006B43F358994222BF08F115036A439A5C5A +:102D1000EED219E01146337869439A420BD008F19C +:102D2000140308F1150C5B5C15FB03F50CF805406A +:102D30007A753B7500E07A7508F1140254543178C5 +:102D400071703470BDE8F6811146694308F11503CE +:102D50005B5C062B04D008F1140615FB03F57455D3 +:102D60007B753A7508F115025454EBE7F8B5DFF8B6 +:102D70001834DFF810541E78182402466243B0421B +:102D80002A4404D118785870507D18700FE0167DD1 +:102D9000507D92F815C005F115076643062807F81F +:102DA00006C004D0167D143514FB00F42E55012006 +:102DB00010731878062802BF00294FF0FF315960C0 +:102DC000F1BD10B5DFF8C043606810F1010F0FD0FE +:102DD000FFF75CFF6168DFF8B423814261683CBFA4 +:102DE0005388C918081A517848431178C84000E040 +:102DF000002080B210BD2DE9F84FDFF89053DFF8C6 +:102E000090B3D5F80880D8F80000DBF800104A0528 +:102E100000F06AF9DFF87063DFF868A321F48061DD +:102E200081604FF0180934780AF1080019FB04F1A9 +:102E30004758FFF7C6FF874217D200270121B1701C +:102E4000062C3DD019FB04F40AF108010AF108022E +:102E50000959814223BF0AF108010959091A0021C1 +:102E600011510AEB04014C7DEAE7A9884118B942E7 +:102E700002D2AF880021E2E73F1ADFE7022802DA38 +:102E80002878012800D07F1ED8F80000C1684A07C2 +:102E9000FAD500F02FF9DBF80C00000CBFB247EABE +:102EA0000047CBF80C70FFF7F1FE7060A86800686F +:102EB000816841F480618160AFF30080BDE8F18FEB +:102EC000B8B20028DAD1FFF7E1FE70600320BDE858 +:102ED000F24FFFF705B92DE9F843EFF3108872B60A +:102EE000AA4DA84BA8680168CA224A6253204862CA +:102EF000A54A886820F480608860182016783746D4 +:102F000047431F44387B022826D13C68D7F81090ED +:102F10009078F0B17A7B012A0AD101213046FFF77F +:102F200025FF88F310887968304600F0F0F804E057 +:102F300088F31088304600F09BF8A8680068CA2122 +:102F400041622246532141624846314600F02AF947 +:102F50000BE0FFF750FF06E0C8684207FCD500F021 +:102F60007EF88C49086088F31088FF21A868026801 +:102F70005162BDE8F183F8B5844CA160CA220968AA +:102F80004A6253224A62824A136843F02003136064 +:102F9000136803F00703C3F10403237095682D0C35 +:102FA00005F07F056D1C6570EDB29268C2F30E02EC +:102FB000521C628092B2521E6A43A2F5A072DA409D +:102FC0004FF6FF739A422CBFA380A280724A136807 +:102FD00043F400231360714B1D6845F400251D6008 +:102FE00048BB6948674E0123837018254FF0FF33B3 +:102FF000436000235FFA83FC06F10C0715FB0CFC11 +:103000004FF0000E07F80CE05B1CDFB2062FF1DB7F +:1030100006230370886820F48060886000F01FF841 +:10302000D0600320FFF767F8A1680868826842F45F +:103030008042826005E0C868410544BF0320FFF775 +:103040004FF8A1680A68FF20506200220321032084 +:10305000FEF7FAFFBDE8F2400320FFF713B8C86897 +:1030600000F0800060F49060C8604FF4002070476A +:10307000F8B50746EFF3108472B60320FFF70DF89A +:10308000424DAE683068CA2141623A4653214162DE +:10309000182043494243895C02291BD1002138464C +:1030A000FFF764FE3848017806290ED130683849A8 +:1030B0000A68530500F018F821F480618160C16846 +:1030C0004A07FCD500F016F804E04078884218BFA3 +:1030D000FFF791FEA9680A68FF2050620320FEF7FF +:1030E000D1FF84F31088F1BD02D5C1684A07FCD432 +:1030F00081687047C16801F0800161F49061C1602E +:103100004FF40020234908600320FEF7F4BF2DE9A7 +:10311000F04180460F46424618201A4942438C1817 +:10312000207B022804BF4046FFF7A2FFEFF3108583 +:1031300072B60320FEF7B1FF144EB0680068CA21D2 +:1031400041625321416202202073A76067604046BC +:10315000FFF7A7FD0C490A784978914202D0FFF7A2 +:103160004AFE02E0A168081AA060FF20B1680A6860 +:1031700050620320FEF786FF85F31088BDE8F081DA +:10318000282800402C120020501400201C1400207D +:10319000082800400C080058000800588008005813 +:1031A0003812002010470000564900E0564981B00F +:1031B0000A6802430A60096808400090009801B05C +:1031C000704718B585B068461421FEF7B1FF03209B +:1031D00001904FF460410024009102940120FFF718 +:1031E000E3FF00F097F8474C20684008400020605B +:1031F000182100910220FFF7D7FF69464348FFF7E7 +:10320000F5F9206820F002002060FFF704FBFFF7CB +:1032100008FBFFF70CFB00F011F806B010BD00B57D +:1032200087B068460FF228211C2200F0CBFD00F089 +:10323000E6F9684600F018FE07B000BDF0B585B0AD +:1032400068461421FEF774FF0026002500240021A3 +:103250000FF2CC0000EBC102907988B11368B3F192 +:10326000904F08D0294FBB4208D0294FBB4204BF22 +:103270009088044304E09088064301E09088054369 +:10328000491C2629E4DB0020029001210320039041 +:103290000191B0B270B100900120FFF785FF0120CD +:1032A000FFF784FF00F036F80022B1B24FF09040F3 +:1032B000FFF75AFAA8B280B100900220FFF774FF1E +:1032C0000220FFF773FF114E69463046FFF78EF973 +:1032D0000022A9B23046FFF747FAA0B280B10090B1 +:1032E0000420FFF761FF0420FFF760FF084D6946E7 +:1032F0002846FFF77BF90022A1B22846FFF734FAEF +:1033000005B0F0BD4C0000584C01005800040048C6 +:103310000008004869464FF09040FFF767B9000089 +:10332000000000480100000000000048010000000B +:1033300000000048010000000000004801000000FB +:1033400000000048010000000000004801000000EB +:1033500000000048010000000000004801000000DB +:1033600000000048010000000000004801000000CB +:1033700000000048010000000000004801000000BB +:1033800000000048010000000000004801000000AB +:10339000000000480100000000000048010000009B +:1033A000000000480100000000000048010000008B +:1033B000000000480100000000000048010000007B +:1033C000000000480100000000000048010000006B +:1033D000000000480100000000000048010000005B +:1033E000000000480100000000000048010000004B +:1033F000000000480100000000000048010000003B +:10340000000000480100000000000048010000002A +:10341000000000480100000000000048010000001A +:10342000000000480100000000000048010000000A +:1034300000000048010000000000004801000000FA +:1034400000000048010000000000004801000000EA +:103450000000000000000000000000002033000811 +:10346000280003202C0003202604040000F077BD70 +:1034700071487249016001F12002426001F130029D +:10348000826001F13C02026201F14402426201F1F8 +:103490004C02C26001F15402026101F1700242610A +:1034A00001F1740282618031C16100F076BD38B5EE +:1034B0000446634D284600F0D4F85F484068A16890 +:1034C0000160E168C16085605E49416000F081FD96 +:1034D0005D4834E080B5584842681368012119728C +:1034E000406800F07CFD002002BD38B5564C544DBC +:1034F00004E000F04BF8009821688847284600F067 +:10350000B3F80028F5D031BD80B54B494A68D16881 +:103510000220087200F068FD002002BD4A484168A0 +:10352000084738B50446494D284600F09AF8424805 +:10353000C068A1680160456000F05FFD44482168F3 +:10354000016061684160002032BD80B53A48C268C0 +:10355000136810211972C06800F055FD002002BDEB +:1035600035483B4AC168C16813680868184738B5D0 +:10357000374C364D04E000F009F800986168884740 +:10358000284600F071F80028F5D031BD694628467C +:1035900000F089B838B504462E4D284600F061F891 +:1035A0002D4800F05EF824480069A1688160E16858 +:1035B000C160056121680160616841602169416104 +:1035C0006169816131BD80B50146234800F055F83D +:1035D000BDE802400FF2050000F01EBD38B5164CE4 +:1035E0001D4D06E0FFF7D2FF00992069006900F049 +:1035F00044F8284600F038F80028F3D031BD10B563 +:10360000164C204600F02DF80B4841690C60BDE8CF +:10361000104000F015BD1CB5104C06E06946204670 +:1036200000F041F8009800F01BF8204600F01CF86C +:103630000028F3D013BD000000000320B40A0320CB +:10364000500B0320A40A032040140020580B032031 +:1036500048140020400B032038140020480B03209E +:103660007047006040607047EFF3108172B60268E7 +:1036700082420CBF0120002012E0EFF3108272B6EC +:10368000086043684B6041604868016019E0EFF3EF +:10369000108172B642680368136002684368536021 +:1036A00081F31088704710B5EFF3108472B602688A +:1036B0000A600068FFE7FFF7EAFF84F3108810BD97 +:1036C0000B6082F3108870472DE9FC47594CDFF8F6 +:1036D0006891A5692840A0614FF0FF3A21694FF039 +:1036E000010834E0521C54F832006169194001426B +:1036F000F8D0616904EBC2060840716818400142C5 +:1037000008BFC6F804A07768384000F097F86062F8 +:1037100008FA00F087437760EFF3108172B6626AAF +:10372000206908FA02F2D24310402061022004EB23 +:10373000C00353F8086C1640401E43F8086CF6D1DD +:1037400081F31088606A59F8201088472169A369BD +:1037500060690140194205D0E069216A084208BF4A +:103760000022C0D0C4F824A000F082FCEFF310893E +:1037700072B6216960690140A069014201BFE16937 +:10378000206A0142FFF739F989F3108800F071FCD3 +:10379000A561BDE8F38738B51446EFF3108572B61E +:1037A00000F04CF8244941F8204085F3108831BDE1 +:1037B00010B500F00BF804431C6153F8314020436E +:1037C00043F83100FFE782F3108810BDEFF3108259 +:1037D00072B6184B1C697047506181F310887047AE +:1037E000EFF3108172B6134AD3691843D061F4E73E +:1037F000F8B5104C666A256A374616F1010F0EBF00 +:103800000026012101FA06F6206202E03046FFF7A9 +:10381000F6F8216AE0690842F8D06762EFF3108198 +:1038200072B6E269206A8243E26181F31088256200 +:10383000F1BD000044100020BC1200200246002010 +:10384000110C090404BF1020120412F07F4F04BFB2 +:10385000083012020FF2180112F0704F04BF001D61 +:103860001201120FC0F11F00895C401AC0B27047EC +:103870000403020201010101000000000000000039 +:1038800018B591B004A80FF27C31DFF85043342210 +:1038900000F098FA2068DFF848434FF6FC7101EA1F +:1038A0008001DFF840034118DFF83C030290E1603B +:1038B00000F5867003900FF2B9210FF2CD20019030 +:1038C00000916846FFF7F3FD01210220FFF7A2F9FE +:1038D00001210220FFF791F90020E070A07004A8F8 +:1038E00000F0BAFA0FF2011200210820FFF753FF8F +:1038F000BE4A00210120FFF74EFF0FF2990200217E +:103900001020FFF748FFBA4A00210220FFF743FFCB +:10391000B84A00210420FFF73EFF0120607000201C +:10392000A06004F11800FFF79CFEFEF75FFD04F1B4 +:10393000100060600020207001220FF2011304F1DA +:103940001001FDF7E1FD12B010BD80B5A44A9178D9 +:1039500031B1002090700120BDE80240FFF740BF68 +:10396000014602F1180007E110B59D4CE07830B92E +:10397000012000F09AF90121E170002105E0012009 +:1039800000F08EF90020E0700121BDE81040022017 +:10399000FFF733B938B5EFF31084914D68780128FB +:1039A00021D10021697005F1180005F10801FFF728 +:1039B0007AFEE878A0B9A8680FF28113017A02298B +:1039C00072B607BFB0F80B20521D827AD21C00F1EC +:1039D000080192B20020FDF7A0FD84F3108831BDEC +:1039E000BDE83140AAE031BD10B5834CB4F8090000 +:1039F0004FF66052811A04D0491E06D0491E08D0E5 +:103A00000BE0204600F036FB11E0204600F06DFB95 +:103A10000DE0204600F08FFB09E0A0810120A0739B +:103A2000E072212020720E2060720420A0722146D4 +:103A30007248FFF722FEBDE81040A1E0F8B5684DDE +:103A400069682A78002400201AB1022A64D013D3AE +:103A500058E00978012905D0022907D0102918BF9C +:103A6000202907D10120287003244BE00120287071 +:103A7000042447E0012445E00E78E868022E11D0C6 +:103A8000102E02D0202E03D01CE0CC78C0681BE0A2 +:103A9000CC78594805F1100100F108070A6840F890 +:103AA000082F18E04068CA780979C36802EB01243E +:103AB00003F10807052205F11001384600F072F9FC +:103AC000052009E0CC784068016805F1100001F19B +:103AD00008070168396004206F60A1B211B10221AA +:103AE00029700FE0022E25D0102E1DD0202E1ED0C2 +:103AF00000210120FFF75CFE002005F11001287075 +:103B000001246960A2B201B069683D4BBDE8F04094 +:103B100001440020FDF7F8BC087802280AD01028DC +:103B200002D0202803D0E3E700210220E2E70021B1 +:103B30000820DFE700210420DCE700001CB5284C4A +:103B400001206070E0680169A0688A68904205D32E +:103B5000C9681144884238BFFFF735FD04F11800E9 +:103B6000FFF782FD10B9BDE81C4009E013BD00005D +:103B700080B50146DFF88400FFF77FFDBDE8044013 +:103B800000211020FFF714BE704770B51446134A89 +:103B9000134E12681D460123B3704FF6FC7303EAFF +:103BA0008203104AD3180A46DE683668A6F8090070 +:103BB000F17206F10C00214600F0F4F8002100201B +:103BC000FFF7C3FC0120FFF713FE314605F10800A3 +:103BD000B278BDE87040D21C00F0E4B83C40005818 +:103BE000FC1300200000032090080320D5340008B7 +:103BF0004B350008093500089010002014140020EF +:103C00003D3A000800000000000000000000000035 +:103C100000000000000000001E0004000A05020170 +:103C200012279C00F4010000FFFFFFFF4801010084 +:103C30000020000000000000494981B00A680243EA +:103C40000A60096808400090009801B0704778B594 +:103C500085B0044668461421FEF76AFA0220FFF791 +:103C6000EBFF00F011F800950120019000210220E7 +:103C700003900291694656F82400FEF7B7FC00F065 +:103C800009F8002006B070BD0FF2F400354E30F890 +:103C90001450704756F8240000222946FEF764BDF0 +:103CA00080B500F00AF8012203E080B500F005F8C5 +:103CB0000022FEF759FD002002BD0FF2C401294B7E +:103CC00031F8101053F820007047F0B585B0054664 +:103CD0000C4668461421FEF72BFA2DB1012D08BFC2 +:103CE000102002D0022D02D10120FFF7A5FF0FF214 +:103CF00098001D4F30F8150000900121022003901C +:103D000007EB8506029130682CB9002101916946C4 +:103D1000FEF76CFC20E04FF40411019107EBC504A1 +:103D20006946FEF763FC0FF26C0050F8251004F1B1 +:103D3000240000F066FAF268002104F1240000F08B +:103D400059FA0FF24C004457B16900222046FEF7A1 +:103D50007BF92046FEF796F9002005B0F0BD000083 +:103D60004C0000586C10002008100020002000F0CB +:103D700017B8012000F014B8022000F011B80000BC +:103D800020000100020000000100100040000000BF +:103D9000060A1700000000160400001606000016B0 +:103DA0007047000062B38B0708D0521E11F8013B28 +:103DB00000F8013B00F024808B07F6D1830740F028 +:103DC000208000BF103A07D330B4B1E83810103A61 +:103DD000A0E83810F9D230BC530724BFB1E808106E +:103DE000A0E8081044BF51F8043B40F8043BD20758 +:103DF00024BF31F8022B20F8022B44BF0B7803704C +:103E00007047121F17D35B0009D151F8043B20F80B +:103E1000023B1B0C121F20F8023BF6D20BE051F8BC +:103E2000043B00F8013B1B0A20F8023B1B0C121F4D +:103E300000F8013BF3D238BF121D521E24BF11F807 +:103E4000013B00F8013BF8D870470000FFF79DFEEA +:103E50009DF80E0005B000BDF8B500F10C026B46F0 +:103E600025214FF66640F1E7F8B500F10C026B46EC +:103E70000F214FF66840E9E7C0680840884201D149 +:103E80000120704700207047C0690840884201D176 +:103E9000012070470020704710B56C4C022120466D +:103EA000FFF7F2FF38B16068C043810703D5FFF721 +:103EB0005EFB022018E001212046FFF7E5FF38B144 +:103EC0006068C043C10703D5FFF70FFB01200BE07B +:103ED00008212046FFF7D8FF38B16068C0430107CA +:103EE00003D5FFF798FB0820A06010BD10B5574C14 +:103EF00002212046FFF7C0FF58B96068C043810324 +:103F000007D5606840F400306060BDE81040FFF7FE +:103F100027BB08212046FFF7AFFF70B96068C04398 +:103F200001030AD560684A4940F4002060600868CF +:103F300080474FF40020A06010BD20212046FFF7ED +:103F40009BFF58B96068C043810207D5606840F4A0 +:103F500000106060BDE81040FFF7E0BA10BD3D48BA +:103F600081B0016841F480110160006800F48010A4 +:103F7000009000983848016841F4007101603748AA +:103F8000026842F40072026040BF20BF34480168FA +:103F900041F40041016001B0704780B531480168CB +:103FA00041F480110160006800F4801000900098D6 +:103FB0002648016841F001010160026842F4803244 +:103FC00002602C20FEF75EF8BDE802402D20FEF7CF +:103FD00059B82548016849084900016070472349DC +:103FE0004FF48030086070471F484FF40011416063 +:103FF000016821F40011016070471B48016821F03D +:1040000002010160704718484FF4003141600168B7 +:1040100021F400310160704738B504460B4D08218A +:104020002846FFF729FF30B109480460686820F48A +:104030000020686031BDA0474FF40021A96031BD68 +:104040000948016821F0080101607047000C005820 +:104050005814002050010058D40800582008005877 +:104060000C04005850000058040C0058080C00586C +:104070007047704770B5EFF31081027B012A02D0C0 +:10408000022A07D00DE000F028F8137800F01FF89E +:1040900014700CE000F021F8138800F018F8148078 +:1040A00005E000F01AF8136800F011F8146081F3CD +:1040B0001088212101720E214172042181724FF674 +:1040C00060518181002181730121C17270BD26463A +:1040D00023EA040435402C43704772B6D0F811200F +:1040E000D0F80D40D0F81550704781B0017B012900 +:1040F00002D0022904D008E0D0F80D10097807E0BA +:10410000D0F80D100A88009203E0D0F80D1009686D +:1041100000910E21417221220821817202724FF614 +:10412000615181810121C17200218173009A40F89F +:104130000F2F01B0704738B50446284800684FF685 +:10414000FC7505EA800526484519212020720E20BD +:1041500060724220A0724FF66250A0810120E0728E +:104160000020A0731F480168090CA4F80F10006814 +:10417000C0F30B00A4F811001B4801781B4801F0A4 +:104180001F01E174416821754168090AC4F81510DE +:104190000268C4F819200169C4F81D104169C4F807 +:1041A000211004F129018069C4F8250028680268FB +:1041B0000A600C222B68191D04F12D00FFF7F2FD97 +:1041C000286800F11001102204F13900FFF7EAFD20 +:1041D00007480168C4F8491031BD00003C40005850 +:1041E00000000320002004E00075FF1F8075FF1F02 +:1041F000B84700080346002009B95A6070470120FB +:10420000704708B901207047016000207047000026 +:1042100000EB8100474AD0F88010914201D0012084 +:1042200070470020704742F4806240F821207047B8 +:1042300080B500F0A9F800F061F83F4809218161DC +:104240000168C908C90041F0030100F011F80160DC +:1042500001BD704780B500F097F800F04FF8364880 +:104260000168C908C90041F0010100F001F840E00F +:1042700001603248016841F00401704710B5304CCC +:1042800000F064F800F02BF80028FBD14FF0B040AC +:10429000816801F00C01042918D1016841F48031D2 +:1042A000016028490A68D208D20042F001020A607F +:1042B00001688903FCD581688908890041F0020101 +:1042C0008160816801F00C010829FAD100220321E4 +:1042D0002046FFF7A8FFBDE8104000F05DB80321BD +:1042E000204695E780B500F04FF81448016821F0AA +:1042F0000401016030BF01BD00F04EB810B5104C94 +:10430000FFF7EDFF0028FBD10421FFF7E9FF40B9DB +:104310000D480168090402D40068400503D500F087 +:1043200015F800F017F82046BDE8104000220321E0 +:1043300079E70000000400800004005810ED00E060 +:10434000001400580040005888040058002204213E +:10435000204668E74FF0B040016841F48071016089 +:1043600001684905FCD581688908890041F001018F +:104370008160416A890889004162816801F00C010D +:104380000429FAD1704700000248016821F00201B7 +:104390000160704710E000E00248016841F002014E +:1043A0000160704710E000E01349002008604FF4FE +:1043B000E0221248016841F4700101604FF0B04101 +:1043C000086840F0010008608A600D480A680240F1 +:1043D0000C480A60036823F0050303604268520832 +:1043E0005200426000220848C860086820F480201B +:1043F00008608A617047000008ED00E088ED00E089 +:10440000FBFEF6FA940000580010042201000000A0 +:104410000300000005000000010000000100000092 +:10442000060000000A00000020000000020000005A +:104430000400000008000000100000004000000020 +:10444000800000000001000000020000A0860100C2 +:10445000400D0300801A060000350C0040420F009A +:1044600080841E0000093D0000127A000024F40040 +:1044700000366E010048E801006CDC02000000001C +:1044800000000000000000000000000000F024F820 +:10449000012810D00D4880470D480047F0B543462D +:1044A0004C4655465E466746F8B40A4C6B46236058 +:1044B000BFF34F8F30BF074C2468A546F8BC984621 +:1044C000A146AA46B346BC46F0BD0000A943000879 +:1044D000114700086414002002490020086070475A +:1044E0000000000068140020FEE7FEE7FEE7FEE79C +:1044F000FEE770477047704700F01CB8FEF7EBBC52 +:104500000248FCF7F2BE0248FBF7EABE3C1300206B +:104510009C110020FFF7C0BCFFF7E8BC00F012B808 +:104520000120FEF728B91020FEF725B94020FEF73C +:1045300022B900000248416802788918416070473A +:10454000781000200449C8680A6882430A604860FD +:1045500000F004B80000000000150058704719E092 +:1045600050F8042BD30744BFA9F101039A18091F7F +:104570000023042942F8043BF9D25FEA817C134608 +:1045800004D54FF0000CA2F800C09B1CC90744BF23 +:104590000021197050F8041B0029E1D17047000078 +:1045A00010B500F013F802000023DB43002410686C +:1045B000984203D011000220ABBE146050689842AC +:1045C00003D0111D0220ABBE546010BD01487047DE +:1045D000000000008410002010B450F8041B79B1D2 +:1045E0000268436802440830DC0744BFA9F10104B3 +:1045F000E31852F8044B43F8044B091FF9D1ECE7D8 +:1046000010BC704710B5074979441831064C7C44FA +:10461000163404E00A68081D114488470146A14287 +:10462000F8D110BD2C000000680000004EF6885143 +:10463000CEF20001086840F470000860BFF34F8FAD +:10464000BFF36F8F4FF00070E1EE100A704700006B +:104650000FFFFFFFDC03000090100020840A000021 +:10466000300003200000000071FFFFFF0800000081 +:10467000AC00000028000320000000005DFFFFFFE9 +:104680008800000038010000081000200000000031 +:10469000000000000000000000000000000000001A +:1046A0000100000002000000030000000400000000 +:1046B00000F00DF8002801D0FFF7A4FFAFF3008051 +:1046C0000020AFF30080FDF712FE00F002F8012099 +:1046D000704700F001B800000746384600F002F8C5 +:1046E000FBE7000080B5FFF75BFF024A11001820CE +:1046F000ABBEFBE726000200E5420008F9420008D5 +:10470000554200087D42000831420008534200082B +:10471000AFF30080FFF78AFFFFF7CAFF0000000039 +:1047200000000000FFF7FEBFFFF7FEBFFFF7FEBF70 +:10473000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAD +:10474000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9D +:10475000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8D +:10476000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7D +:10477000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF6D +:10478000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5D +:10479000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4D +:1047A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3D +:1047B000FFF7FEBFFFF7FEBF00010000000000484A +:1047C00000100048000000486D3D0008733D0008DF +:1047D000793D00080F0000000F0000000F000000EE +:1047E00000000000000000000000000000000000C9 +:1047F00000000000000000000000000000000000B9 +:10480000000000000000000000000000FFFFFFFFAC +:10481000FFFFFFFF0000000000000000000000009C +:1048200000040048000400480004004801000000A3 +:104830000000000010000000FFFFFFFFFFFFFFFF70 +:0448400000093D002E +:040000050800471197 :00000001FF diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h index 7b598396c..a926484f8 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,6 +215,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -224,11 +228,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -236,6 +244,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -392,8 +412,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -512,9 +533,9 @@ typedef enum CFG_TASK_HCI_ACL_DATA_ID, CFG_TASK_SYS_LOCAL_CMD_ID, CFG_TASK_TX_TO_HOST_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -523,11 +544,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -559,9 +581,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -572,5 +594,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h index 008724b5c..4f47130d3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +70,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h index 8d9ecd40f..9ab15a5c6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,5 +215,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h index 8dd24a564..20ea9d15a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h index 241a52197..4d222698e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h index 86521af11..c1e2f2a3b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -74,5 +73,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c index 562e3a22c..852be7f8e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -413,5 +421,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c index e89297858..ef7411d76 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -163,9 +163,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -374,6 +373,8 @@ static void shci_user_evt_proc ( void ) TL_MM_EvtDone( p_evt_rx ); TM_Init( ); + + return; } /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ @@ -473,6 +474,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ @@ -490,4 +493,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/main.c index b912f1bf3..fa5de8b57 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -72,6 +72,7 @@ DMA_HandleTypeDef hdma_usart1_tx; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -105,6 +106,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -143,7 +147,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -179,15 +182,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -374,5 +385,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/standby_stm32wb15.c index 9a99bfd96..35763e493 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -165,4 +164,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c index ae7e237cc..5ed0b2be9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -143,6 +142,7 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -156,6 +156,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -204,11 +213,21 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -289,5 +308,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c index 33d5a81b6..7dd965b4a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -321,4 +320,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c index c0af3469e..1394ae132 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp index e35cc2cd4..f70ab4773 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp @@ -1125,7 +1125,7 @@ STM32WBxx_HAL_Driver - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c @@ -1142,9 +1142,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c @@ -1166,6 +1163,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb15xx_flash_cm4.icf index 56d9d33c5..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb15xx_cm4.s index f7cdf820d..3b925699a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 72feb3a18..4e53aee02 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -45,7 +44,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 110K +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h index df9cd8ec0..10e38a30d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,4 +90,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h index 7e393c676..91f670e3c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h index bd808a41b..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c index 9be3fda24..2be740c36 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c @@ -1,22 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tm.c - * Description : Transparent mode - ****************************************************************************** - * * @attention + ****************************************************************************** + * File Name : App/tm.c + * Description : Transparent mode + ****************************************************************************** + * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -523,4 +521,3 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl /* USER CODE END FD_WRAP_FUNCTIONS*/ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h index 54ec1a975..ae3a144e8 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,4 +92,3 @@ extern "C" { #endif /*__TM_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..57294e04f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +700,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/readme.txt index ac24ae435..159befc19 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_TransparentMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_TransparentMode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc index 2d4b87d8e..b5a61ca05 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc @@ -56,8 +56,8 @@ Mcu.PinsNb=15 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -106,6 +106,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB15CCUx +ProjectManager.Example=BLE_p2pClient +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -207,5 +209,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_p2pClient -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex index 1241e1278..9dfda2db6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:1000000008100020A974000805750008077500088D -:10001000097500080B7500080D7500080000000048 -:100020000000000000000000000000000F75000844 -:100030001175000800000000137500081575000810 -:100040001F77000823770008277700084B75000802 -:100050002B7700082F7700083975000833770008E0 -:10006000377700083B7700083F7500083F770008A6 -:100070004377000847770008197500084B77000898 -:100080004F770008537700085777000800000000FA -:10009000000000005B7700085F77000845750008E6 -:1000A00063770008677700086B7700086F770008B0 -:1000B00073770008777700087B7700087F77000860 -:1000C000000000000000000083770008000000002E -:1000D0001F75000887770008000000008B77000874 -:1000E0008F770008937700080000000097770008DA -:1000F0002D75000831750008357500089B770008DC -:100100009F770008000000000000000000000000D1 -:10011000A3770008A7770008AB770008000000006D +:1000000008100020317B00088D7B00088F7B0008E2 +:10001000917B0008937B0008957B0008000000009E +:10002000000000000000000000000000977B0008B6 +:10003000997B0008000000009B7B00089D7B000866 +:10004000A77D0008AB7D0008AF7D0008A17B0008FC +:10005000B37D0008B77D0008C57B0008BB7D0008A4 +:10006000BF7D0008C37D0008CB7B0008C77D00086A +:10007000CB7D0008CF7D0008A57B0008D37D00085C +:10008000D77D0008DB7D0008DF7D00080000000050 +:1000900000000000E37D0008E77D0008D17B000838 +:1000A000EB7D0008EF7D0008F37D0008F77D000878 +:1000B000FB7D0008FF7D0008037E0008077E000826 +:1000C00000000000000000000B7E0008000000009F +:1000D000AB7B00080F7E000800000000137E0008C4 +:1000E000177E00081B7E0008000000001F7E00082D +:1000F000B97B0008BD7B0008C17B0008237E000897 +:10010000277E000800000000000000000000000042 +:100110002B7E00082F7E0008337E000800000000C0 :1001200000000000000000000000000000000000CF -:100130000000000000000000AF7700082DE9F84F34 +:100130000000000000000000377E00082DE9F84FA5 :100140000FF2D017A2B0D7E90045CDE900452C9EAB :10015000DFF82C7C04918DF8436000210FF2BC1471 :100160000D9112944FF0FF368246904699460FE06B @@ -482,1459 +482,1564 @@ :101E000004D80C0D661E342EB7DDEBE7801A99411D :101E100050EA410608BF0021E4E708BF1CEB430F6E :101E200028BF6FF00001DDE780B5AFF30080024A04 -:101E300011001820ABBEFBE7260002004FF0B040B7 -:101E4000006800F0F000B02888BFB02070472DE98E -:101E5000F041040054D0207881064FF0B04538D5C9 -:101E6000A868E96810F00C0001F0030103D00C2809 -:101E700008BF012946D12868800702D5E0690028FB -:101E80003ED0FFF7DBFF616A884207D2084600F0C8 -:101E9000A0FB002834D100F043FA0FE0286820F0BE -:101EA000F000014329606968206A21F47F4141EA1A -:101EB00000216960606A00F08CFB08BB00F062FBE7 -:101EC000DFF88C170860DFF88C07006800F0EEFB85 -:101ED000B0B92078C1070DD5A868E96800F00C00FA -:101EE000082801F0030103D00C2808BF03292CD1D6 -:101EF0002868800340F11D816068002840F0198146 -:101F0000012006E2E06980B1296841F0010100F09A -:101F1000F3FA06462868800700F1088100F0E8FB24 -:101F2000801B0328F6D30320F3E128684008400013 -:101F300000F0A8FB0646286800F0EEF9C9D000F0D2 -:101F4000D7FB801B0328F6D3EDE76068B0F5803F30 -:101F500004D1296841F48031296003E02A6822F421 -:101F600080322A60606860B100F0C2FB06462868D3 -:101F7000800300F1DE8000F0BBFB801B6528F6D3F8 -:101F8000D1E700F0B5FB06462868400C10F00100D0 -:101F900000F0CF8000F0ACFB801B6528F4D3C2E7D3 -:101FA00000F0A6FBC01B0328C0F0F780BBE7E06889 -:101FB00078B1296841F4807100F09EFA06462868DD -:101FC000400500F1FD8000F093FB801B0328F6D351 -:101FD000A9E7286820F4807000F054FB06462868C2 -:101FE000800A10F0010000F0C28000F081FB801B2D -:101FF0000328F4D397E700F07BFBC01B0328C0F055 -:10200000F18090E740F0010000F09BF9074670680E -:10201000800700F1028100F06BFBC01B0328F6D3A0 -:1020200081E7706820F0040000F08BF907467068C3 -:10203000C00810F0010000F0FF8000F059FBC01B49 -:102040000428F4D36FE70528306806D140F0040077 -:102050003060316841F0010105E040084000306027 -:10206000316821F004013160A06841F2893768B11C -:1020700000F03EFB80463068800700F1F28000F0FF -:1020800037FBA0EB0800B842F5D34CE700F030FB7B -:102090008046306800F040F900F0E38000F028FB53 -:1020A000A0EB0800B842F4D33DE700F021FB801B11 -:1020B0000328C0F0088136E700F01AFB001B032854 -:1020C000C0F022812FE7286881010CD4296841F0F3 -:1020D00080712960E86840F08050E86000F008FBFB -:1020E00004462868810100F1138100F001FB001B08 -:1020F0000328F6D317E70C2930D0286820F0807029 -:102100002860E96889088900E960E86820F0805063 -:10211000E86000F0EDFA04462868810140F1F8809B -:1021200000F0E6FA001B0328F6D3FCE600F0F8F80E -:10213000CFE6207881071AD5A868E96800F00C007E -:10214000042801F0030104D00C2808BF02297FF401 -:102150002EAF2868400503D5E06800283FF4D0AED4 -:102160006968206921F0FE4141EA006169602168E7 -:10217000DFF8E46411F0180F38D0606900283FF4EC -:1021800050AFC90670687FF53DAF800709D470680D -:1021900040F0010000F0D5F80746706880077FF531 -:1021A000FFAE706840F0040000F0CBF8074670689E -:1021B00000070DD400F09CFAC01B0428F7D3B2E648 -:1021C0006868216920F0FE4040EA01606860CEE75F -:1021D0007068A16920F4706040EA0120706000F02E -:1021E000ADF8074600F097F87FF405AF2078410777 -:1021F00037D5DFF868743868C10529D400F07EFA55 -:1022000000F076FA80463868C10521D400F070FAF3 -:10221000A0EB08000328F6D385E6706820F00400E0 -:1022200070607068C00810F00100DFD000F060FA44 -:10223000C01B0428F5D376E600F080F8074600F0CE -:102240006AF8D3D000F054FAC01B0328F7D36AE62B -:10225000A06801287FF4F7AE306840F001003060DC -:1022600002E7A06A002853D0A968EA68022801F0B2 -:102270000C017FF440AFE36A02F00300984202BF12 -:1022800002F07000236B984214D1636BC2F30620F6 -:10229000984202BF02F47810A36B98420AD1E36B14 -:1022A00002F06060984202BF02F06042206C8242FD -:1022B0003FF409AF0C293FF423AE286820F080706A -:1022C00000F0E0F90646296888013FF5EEAEE968BE -:1022D000DFF88C03626B0140E06A0143206B01432D -:1022E000A06B41EA02210143E06B0143206C0143F2 -:1022F000E960286840F080702860E96841F080510A -:10230000E96000F0F5F90446286881017FF5D4AE54 -:102310000020BDE8F0817068400810F001007047AF -:102320002968606A21F0F001014329606868216A28 -:1023300020F47F4040EA01206860704770684008E0 -:102340004000706000F0D4B92DE9F84304008846DD -:1023500044D0DFF8106300F0CAF847D200F0CFF89D -:10236000074600F0C4F841D000F0C2F9C01B0228B3 -:10237000F7D90320B9E000F0BBF9401B022843D98C -:10238000F7E700F0B5F9A0EB090002284CD9F0E717 -:1023900000F0AEF9A0EB0900022854D9E9E700F0FB -:1023A000A7F9401B02285DD9E3E700F0A1F9401B23 -:1023B000022867D9DDE700F09BF9401B484577D339 -:1023C000D7E7032802D13968890103E0002839687A -:1023D00002D1890762D401E049055FD4012084E07D -:1023E00000F086F9C01B022872D9C2E72078810765 -:1023F0004FF0B0470BD5B968A06821F0F001014358 -:10240000B96000F075F90546B868C003B3D5207807 -:10241000DFF8385281060AD52968606921F0F00199 -:10242000014300F069F8814628688003A9D5207827 -:1024300041060BD52968A0690909090141EA101173 -:1024400000F05AF881462868C003A1D520784107DA -:102450000BD5B968E06821F4E0610143B96000F090 -:1024600047F90546B868800399D5207801070CD54F -:10247000B868216920F4605040EAC100B86000F0FB -:1024800037F90546B86840038FD52078C10717D5BE -:102490006068022895D1396889039FD5B968890891 -:1024A00040EA8100B86041F2893900F021F905461F -:1024B000B868616800F00C00B0EB810F7FF47BAF6F -:1024C000306800F00700804505D200F018F8074694 -:1024D00000F00DF884D100F055F85D49086000F077 -:1024E00029F9BDE8F24300F0E1B8BDE8F2833068B5 -:1024F00000F0070040457047296000F0F9B83168E6 -:10250000C90848EAC101316000F0F2B838B54FF0AF -:10251000B044564DA16811F00C0106D1FFF78EFCB6 -:10252000C0F3031055F8200032BD0429504A05D0ED -:102530000829504804D12168C90222D5104632BD6D -:10254000E16801F00301022904D0032904D12168C4 -:10255000C90207D5104605E0FFF770FCC0F3031071 -:1025600055F82000E168E268E368C1F306214843BA -:10257000C2F30211491C5B0FB0FBF1F05B1CB0FB16 -:10258000F3F032BD80B5FFF7C1FF3749FFE73A4AA4 -:102590000968C1F3031152F82110B0FBF1F002BD3C -:1025A00080B5FFF7EFFF00F010F8C1F3022106E05D -:1025B00080B5FFF7E7FF00F008F8C1F3C22112F879 -:1025C000211001F01F01C84002BD27492B4A0968AC -:1025D000704770B52549284AB1282EBFC86AC0F394 -:1025E000031051F820001949096801F00F0152F851 -:1025F0002110234AB0FBF1F0B0FBF2F000240021DF -:102600000FF2880252F8213083420AD2491C032972 -:10261000F8D90AE000F06CF8801B03280DD30320E2 -:1026200070BD0FF2780050F821400E4D2868C008A8 -:1026300044EAC00000F026F80646296801F00701C8 -:10264000A142E7D1002070BD000000000801005841 -:10265000202600201C26002090000058000400586E -:102660008C80C1110040005808000058CC6E000852 -:102670000024F4000048E8018C6E000894760008FD -:1026800040420F00286000F033B800001200000044 -:1026900024000000360000004000000000000000A0 -:1026A00001000000020000000300000070B50F4EA2 -:1026B000044630780025A8B1FFF764FF32784FF464 -:1026C0007A71B1FBF2F1B0FBF1F000F09DF848B97E -:1026D000102C07D2002221464FF0FF3000F05CF8AA -:1026E000B46000E00125284670BD00BF142600201C -:1026F00001484068704700BF142600200248016866 -:1027000041F480710160704700040058114810B511 -:10271000016841F480710160032000F030F800206E -:10272000FFF7C4FF0024002814BF012400F0B3F811 -:10273000204610BD084880687047084805E00748F3 -:10274000016841F0020101607047016841F0010138 -:10275000016070470040005814260020042004E067 -:102760000901020081B002D43C48815405E03C4894 -:1027700002F00F02104400F8041C01B07047394AFF -:1027800013684FF6FF0100020B4000F4E0601843AD -:10279000354908431060704738B5324B1C68C4F3A4 -:1027A0000223C3F10704052C28BF04241D1D072D97 -:1027B00034BF0023DB1E012505FA04F4641E21400A -:1027C000994005FA03F35B1E1A401143BDE83440FB -:1027D000C6E70000010007D4012200F01F01234BCF -:1027E0008A40400943F82020704701000BD40122A1 -:1027F00000F01F011E4B8A40400943F82020BFF320 -:102800004F8FBFF36F8F704710B5401EB0F1807FC0 -:1028100001D3012010BD174C60600F214FF0FF3035 -:10282000FFF79EFF0022A26007202060002010BD5D -:10283000010007D4012200F01F010F4B8A4040091C -:1028400043F820207047010007D4012200F01F0147 -:102850000A4B8A40400943F82020704700E400E01A -:1028600018ED00E00CED00E00000FA0500E100E0EA -:1028700080E100E010E000E000E200E080E200E043 -:10288000544981B00A6802430A6009680840009010 -:10289000009801B0704780B54FF40020FFF7F0FFBB -:1028A000002200212E20FFF777FFBDE802402E20F6 -:1028B000FFF790BF00684849884200D0704780B554 -:1028C0004FF48010FFF7DCFF002200212C20FFF7DF -:1028D00063FF2C20FFF77EFF002200212D20FFF751 -:1028E0005BFFBDE802402D20FFF774BF1CB5044616 -:1028F0003A49206888421CD1FFF700FFFFF7FEFE2F -:102900003748816B21F4407141F480718163816BA0 -:1029100041F400418163026842F480620260006811 -:1029200000F48060009000982046BDE8164000F05A -:102930006DB813BD38B586B0044601A8142100F067 -:102940007DF82168274A914242D12748274D4169A5 -:1029500041F4804141610222416901F480410091CA -:102960000099016841F0010101604FF4C061006805 -:1029700000F00100009000980191012003900321D4 -:10298000072004910590029201A94FF0904000F0B9 -:1029900059F8174828600F2068601020A8600020B0 -:1029A000E8608020286100206861A861E8612862F1 -:1029B000284600F01DF908B100F00AFCA567AC62DA -:1029C000002200212420FFF7E7FE2420FFF702FF6A -:1029D00007B030BD50000058000C005800280040DF -:1029E00058000058003801404C000058C82800200A -:1029F000440002408A60FF2102685162012180F890 -:102A00002110002180F820100020704790F820103D -:102A1000012901D102207047012280F820200221E3 -:102A200080F82110CA21026851625321036859625B -:102A300001688A6842F02002DCE70000002200F012 -:102A4000C9BB00002DE9F84F4FF00009614A624B05 -:102A50004FF00F0805460E4633E0604FBD4214BFED -:102A6000072704278F4027434CF82E70C1431C686A -:102A700001EA040C7468E40348BF40EA0C0CC3F894 -:102A800000C05C6801EA040C7468A40348BF40EA13 -:102A90000C0CC3F804C0146801EA040C7468E40266 -:102AA00048BF40EA0C0CC2F800C0546801EA040CAC -:102AB0007168890248BF40EA0C0CC2F804C009F1F1 -:102AC0000109316831FA09F072D0012404FA09F4DD -:102AD00014EA0100F3D04FEA490C032101FA0CF18A -:102AE0006FEA010E7168012918BF022903D011296C -:102AF00018BF122911D1A968F7680EEA010107FA77 -:102B00000CF73943A960696821EA04047168C1F3CC -:102B1000001101FA09F10C436C60E968B4680EEA2F -:102B2000010104FA0CF42143E9604FEA8901746859 -:102B3000022C18BF122C12D14FEAD90405EB8404E1 -:102B400001F01C07D4F820A008FA07FB2AEA0B0AB8 -:102B5000D6F810B00BFA07F747EA0A0727622C6885 -:102B60000EEA0407347904F0030404FA0CF43C433D -:102B70002C607468E400A2D5DFF864C04FEA990EB7 -:102B80005CF82E7001F00C0108FA01F427EA040445 -:102B9000B5F1904F08BF002709D0124FBD4208BFC2 -:102BA000012704D0104FBD427FF457AF022759E7E9 -:102BB000BDE8F18F81B0002A14BF8161816201B04C -:102BC00070470A4A136803421CBF106000F0A4BBA0 -:102BD00070470000000800588008005800100048A6 -:102BE0000800014000040048000800480C08005894 -:102BF00038B5040001D1012032BD2168DFF840035F -:102C00004018142204F12405B0FBF2F2DFF834037B -:102C1000E86192002A62022068700A68A0686FF377 -:102C20000E120243E06802432069024360690243D6 -:102C3000A0690243E0690243206A02430A60204619 -:102C400000F058F9A068B0F5804F04BF0021616022 -:102C50002079696A00F03F0000F014F838B10528C7 -:102C600005D2204600F05AF900F012F803E00020E7 -:102C700028636863A8630020A861012068700020B1 -:102C8000287032BD0860A96AE86A486060687047C9 -:102C9000296B00200860696BA86B48607047F8B525 -:102CA000044604F1240600253078012801D10220D1 -:102CB000F2BD01273770707801282FD10227777075 -:102CC000B561206807687F087F000760204600F034 -:102CD000F5F82168F06820B10A6842F00E020A6037 -:102CE00008E0086820F0040008602068016841F0EE -:102CF0000A010160706A0168CA0303D5026842F4E0 -:102D000080720260306B18B1016841F4807101601B -:102D10002068026842F00102026001E0357002257D -:102D20002846F2BD81B040B100F124014A78022A60 -:102D300005D00420886100200870012026E0026888 -:102D4000136823F00E0313604A6A136823F4807338 -:102D5000136000680268520852000260012091F876 -:102D60002020CB6902F01C02904058608A6AC86A31 -:102D70005060086B30B1026822F4807202604A6BC6 -:102D8000886B5060012048700020087001B07047C7 -:102D900038B500F1240200245178022903D0042020 -:102DA0009061012428E001680B6823F00E030B609A -:102DB00001680D686D086D000D60516A0B6823F4A1 -:102DC00080730B60012192F82030D56903F01C0359 -:102DD00099406960936AD16A5960116B31B10B688F -:102DE00023F480730B60536B916B59600121517018 -:102DF0001470516901B18847204632BDF8B500F121 -:102E000024010423CA6914680268156891F82060D7 -:102E100006F01C0603FA06F73C4210D06F070ED5E9 -:102E20001468A50603D4156825F00405156000F0A4 -:102E30003DF8C968002938D0BDE8F44008470223AE -:102E400003FA06F73C4213D0AF0711D51468A50664 -:102E500005D4156825F00A05156001224A7000F0B6 -:102E600025F800220A708968F9B1BDE8F4400847E6 -:102E7000082303FA06F6344217D02B0715D513683A -:102E800023F00E031360012291F82030CC6903F087 -:102E90001C039A40626001228A614A7000220A7013 -:102EA000096911B1BDE8F4400847F1BD91F820204F -:102EB000CC6902F01C0293406360704778B5C56C22 -:102EC000046D6C60446D14B1846DC56D6560012541 -:102ED00090F84440066C04F01C04A540756004683A -:102EE00063608068102802D1A260E16071BDA160BA -:102EF000E26071BD426C1449920801EB8201816469 -:102F0000142201780839B1FBF2F1104AC26401F0D1 -:102F10001F01012202FA01F10165704701790C4A93 -:102F200001F03F0102EB81024265491E094A8265B8 -:102F300001F0030101228A40C265704700000000D1 -:102F4000F8FFFDBF00000240000802408008024078 -:102F5000FC080240400902408E4900E08E4981B0E1 -:102F60000A6802430A60096808400090009801B0AE -:102F7000704780B589494FF400400860FFF7C6FBF1 -:102F8000002000F0D7F948B180798549854A0A6068 -:102F90000A6822F47C5242EA00220A6000F01DF81E -:102FA00000F08AF88048016800220260026902F09D -:102FB000500202610420FFF7D1FF0120FFF7CEFF8E -:102FC00000F0D6F800F083F800F0A0F800F01CF94B -:102FD0004FF0FF3000F0C0F9FAE718B5A5B014A81B -:102FE0004421FFF72BFD01A81C21FFF727FD08A8AE -:102FF0003021FFF723FDFFF781FB6C48016821F0CA -:1030000018010160072014904FF4803101201690C0 -:1030100015914020189000214FF480741E91179450 -:1030200014A8FEF714FF08B100F0D2F86F20019049 -:1030300002210020029103900490059006900790D1 -:10304000012101A8FFF780F908B100F0C1F843F6AB -:103050000100089000214FF4804011900991102048 -:10306000022113901291109408A800F05FFA08B1A1 -:1030700000F0AEF84E49086820F0700008604D4836 -:103080000268C2F303200090009830B90A68120960 -:10309000120142F004020A6008E000980A68801EEB -:1030A00080F30400120940EA02100860086840F446 -:1030B0000040086026B010BD80B53F483F49016020 -:1030C00000F0F0FA10B1BDE8014081E001BD00213F -:1030D00010B53B483B4C416004600F21816047F6CE -:1030E000FF71C160002101618161416100F012FB4B -:1030F00008B100F06DF8CA206062FF2153206062C1 -:10310000A068C008C000A060616210BD10B52E4C60 -:103110002E4820604FF4E13060600020A060E06045 -:1031200020610C2060610020A0614FF40040E0614C -:10313000002020626062A062204600F08FFB08B190 -:1031400000F046F80021204600F0C7FF08B100F06B -:103150003FF80021204600F0CBFF08B100F038F81E -:10316000204600F09DFF10B1BDE8104030E010BDDA -:1031700080B50420FFF7F0FE0120FFF7EDFE0022EE -:103180000F210E20FFF708FBBDE802400E20FFF7DD -:1031900021BB0000480000584C0000581040005867 -:1031A0009C000058FECAFECA8008005890000058D3 -:1031B0001C0400585875FF1FC8290020000C005837 -:1031C000302A00200028004024260020003801403A -:1031D00072B6FEE700B500BF13009646944610395C -:1031E00028BFA0E80C50FAD85FEA417C28BF0CC089 -:1031F00048BF40F8042BC90728BF20F8022B48BF5E -:1032000000F8012B00BD000010B52148214C88B00A -:10321000016841F40041016000F0BEFF1E480168F2 -:10322000C908C90041F00401016000F0D1FF1B4949 -:10323000002001F04AF901F094FA0121012000F088 -:10324000B0FF00F03CF800F049F801F0B9FB144A77 -:103250000021402000F0E5F804F23C500FF2450157 -:103260000090019169460FF2410001F099FC04F2CF -:103270005470029004F5C96140F23C5005900391EE -:10328000049402A801F024FC01F098FB08B010BDE2 -:10329000080000583000032080040058302A002025 -:1032A000E34B00087047000080B501F069FA01F0B7 -:1032B0001BFDBDE804400021012000F072BF80B575 -:1032C000002002F07EF8012002F07BF8022002F0DC -:1032D00078F8BDE80240012002F09CB880B50121D9 -:1032E000002002F0ACF80121012002F0A8F8BDE8AE -:1032F00004400121022002F0A2B870474FF0FF30D5 -:1033000000F02AB80021402000F098B8022000F018 -:10331000BBB8022000F0C0B8012804D0102804D0A7 -:10332000402804D0704701F002BE01F00FBE01F04A -:103330000EBE000001460648064AC3798B4218BFFC -:10334000904218BF0838F8D18B4218BF0020704750 -:10335000F873FF1F0070FF1F2DE9FC475B4CDFF87F -:103360007091A5692840A0614FF0FF3A4FF0010825 -:1033700030E0491C54F831000642FAD004EBC10693 -:10338000184071681040014208BFC6F804A0776871 -:10339000384000F09FF8606208FA00F087437760D9 -:1033A000EFF3108172B6626A206908FA02F2D24322 -:1033B00010402061022004EBC00353F8086C164053 -:1033C000401E43F8086CF6D181F31088606A59F802 -:1033D0002010884763692069A2691840104207D00D -:1033E000E069216A084203D1002103EA0206C1E72D -:1033F000C4F824A002F08FF8EFF3108972B62169A7 -:1034000060690140A069014201BFE169206A01428F -:10341000FFF773FF89F3108802F07EF8A561BDE81D -:10342000F38738B51446EFF3108572B600F052F802 -:10343000274941F8204085F3108831BD10B500F0D0 -:103440000BF804431C6153F83140204343F831002A -:10345000FFE782F3108810BDEFF3108272B61B4BAA -:103460001C697047EFF3108172B6184A536923EA5A -:10347000000005E0EFF3108172B6144A5369184357 -:10348000506181F310887047EFF3108172B60F4AD4 -:10349000D3691843D061F4E7F8B50C4C656A276A24 -:1034A0002E4615F1010F0EBF0025012101FA05F589 -:1034B000206202E02846FFF721FF216AE069084206 -:1034C000F8D088436662E0612762F1BDC025002024 -:1034D000C827002002460020110C090404BF102058 -:1034E000120412F07F4F04BF083012020FF21801CD -:1034F00012F0704F04BF001D1201120FC0F11F0027 -:10350000895C401AC0B27047040302020101010144 -:103510000000000000000000DFF87C211368010CAF -:1035200023EA014343EA0043136070472DE9F04169 -:10353000054600272868DFF864610105B8462FD5E5 -:103540003468286A04F44074844229D0FFF7D6F81E -:10355000002C316805D1286A21F4407101433160A3 -:103560001DE0306840F48030306021F440713268F2 -:1035700022F480323260286A014331603068C0072B -:103580000DD5FFF7B5F8044641F289383068800759 -:1035900005D4FFF7ADF8001B4045F7D30327B84625 -:1035A0002878DFF8FC40C10705D5E16F6868890815 -:1035B00040EA8101E1672878810705D5E16FA868B5 -:1035C00021F440610143E1672878C10644BF2869BE -:1035D000FFF7A2FF2878810644BF6869FFF79CFFC8 -:1035E000287841070AD5E868E16F020902F47F22D2 -:1035F0000001914300F47F200843E06728688105BB -:103600001ED5A869B0F1804F18BFB0F1004F00D0AF -:1036100018B9E16F21F0404108E0E16F21F040412D -:10362000E16720F08050E16F21F040610843E067DE -:10363000A869B0F1C05F03D1216841F080712160B9 -:10364000286841050DD5E16FE86921F0405101433B -:10365000E167E869B0F1005F03D1216841F480318E -:1036600021602868C10405D57168686A21F4404169 -:1036700001437160286881040BD5A169E86A21F0D3 -:1036800030010143A161A169A86A890840EA81016A -:10369000A1614046BDE8F0818800005890000058C4 -:1036A0000C000058F8B504460025ACB104F134060E -:1036B000307910B92046FFF7FDF80F4F384600F07B -:1036C00021F8386840F001103860204600F007F813 -:1036D00035600120307100E001252846F2BD10B5AB -:1036E0000021064A064B00EB8104491C0629636051 -:1036F000E261F8D310BD0000000C0058FB11000877 -:103700007F110008002101604FF03F1141603F210F -:103710008160704738B5040044D094F8210028B97E -:10372000002184F820102046FFF7E0F800F049F867 -:10373000FF2510B100F03FF834E02168DFF8B00059 -:103740008A6802408A6021688A6863682069034346 -:10375000A06903431A438A602168E0680861206811 -:103760000169A26841EA024101612068C16821F053 -:103770008001C1602068C16C21F00201C164216830 -:10378000CA6CE369606903431A43CA6420688168AC -:10379000880609D400F020F830B120684562042181 -:1037A00000F01FF8012032BD20684562012184F835 -:1037B0002110002032BD20684562042184F82110C8 -:1037C0007047022084F82100CA20216848625320F3 -:1037D00022685062204626E020460BE02068C0F8B0 -:1037E000248084F82110002084F820007047000015 -:1037F000BFFF8FFF70B5044640F2E9362068C1680C -:1038000021F0A001C160FEF773FF05462068C16882 -:10381000880606D4FEF76CFF401BB042F6D30320A7 -:1038200070BD002070BD70B504462068C1684A06AE -:1038300012D44FF0FF32C26040F2E936FEF758FF73 -:1038400005462068C168480606D4FEF751FF401BB4 -:10385000B042F6D3032070BD002070BD38B504001F -:1038600009D004F18005686808B900F01EF800F07E -:1038700021F8012801D1012032BDA06A08B100F071 -:103880002AF800F00AF821F02A01FFE7816000F031 -:103890001BF8BDE8324000F002BB2068416821F40B -:1038A000904141602068816870470021297020465E -:1038B000FFF740B824206860206801684908490083 -:1038C0000160204600F086B92068016841F00101DE -:1038D000016020467047204600F07EBA70B504466D -:1038E00004F180051346686820283CD169B31800AC -:1038F0002BD02878012836D001222A7004F15406F2 -:103900002165338073800020E86021206860706A40 -:10391000E8B1DFF8B414C162DFF8B004716A08637B -:10392000716ADFF8AC0448630020716A886320681C -:10393000216D00F12802706AFFF7B1F938B110204B -:10394000E8600020287020206860012070BD216898 -:1039500040200862002028702068816841F08001C2 -:103960008160002070BD022070BD816821F040019F -:1039700081607047206881684A0670472068016846 -:1039800021F0100101607047F8B5044640F60F00C1 -:103990002668F1693268B368084004F15C050ED10D -:1039A000880602D5900602D4D80040F1808069696B -:1039B000002900F00E812046BDE8F4400847DFF8FA -:1039C0000C06034204BFDFF808763A426FD0CF07F7 -:1039D00007D5D70505D5012737622E6B46F00106BE -:1039E0002E638E0708D5DE0706D5276802263E62BD -:1039F0002E6B46F004062E634E0708D5DE0706D56B -:103A0000276804263E622E6B46F002062E630E07E0 -:103A10000AD5960601D4034206D0266808203062F3 -:103A2000286B40F008002863080509D5500107D528 -:103A300026684FF400603062286B40F02000286355 -:103A4000286B002832D0890607D5900601D4D8000B -:103A500003D5696909B120468847286B21688A68BF -:103A6000510602D410F0280F1BD0204600F093FA24 -:103A7000FFF780FF10D5FFF778FF286A60B10FF2DB -:103A8000DD518163286AFFF783F900280ED0286A88 -:103A9000816BBDE8F44008472046BDE8F24001F0E4 -:103AA0003CBD204601F039FD00202863F1BD2869A6 -:103AB000012853D1CF0651D5D0064FD51020306202 -:103AC00022689068410626D5296A0868406880B255 -:103AD0000028EBD02B8898427BDA68800868016860 -:103AE0008B0614D4106820F4807010602068816800 -:103AF0004908490081602068FFF737FF2020E8620D -:103B000000202861FFF73AFF286AFFF70BF92988A0 -:103B10006888091A1CE028886988411A6888002882 -:103B20001CBF88B2002854D01368DFF8400523F486 -:103B30009073136022689368034093602020E862CA -:103B40000020286168612068026822F0100202608B -:103B50002046BDE8F44089B201F0E0BCC80209D5B6 -:103B6000580207D54FF4801030622046BDE8F2407D -:103B700000F010BB080609D5100601D4180205D5BF -:103B8000A96931B32046BDE8F440084748060ED580 -:103B900050060CD5306820F0400030602021A9622A -:103BA0000020A8612046BDE8F24001F0D0BC080228 -:103BB00006D5500004D52046BDE8F24001F0D8BC3F -:103BC000C80148BF002A04D52046BDE8F24001F0F4 -:103BD000D0BCF1BDF8B50446DFF894042168DFF8E5 -:103BE00094C40A68DFF890740240A0680243206918 -:103BF000024360690243E06902430A6000254A68A3 -:103C0000E06822F4405202434A60A369714A91423B -:103C10001CBF206A03438E68DFF86004064033430C -:103C20008B600FF26446CB6A606A1B0940EA03139B -:103C3000CB626145DFF848044FF4004339D13F6857 -:103C400007F00307032F4DD8DFE807F0024643498A -:103C50004FF0010CE169B1F5004F4FF6F07740F0FD -:103C60008080BCF1010F09D0BCF1020F0AD0BCF179 -:103C7000040F71D0BCF1080F71D099E0FEF798FCE9 -:103C8000002815D0626A616836F81230B0FBF3F094 -:103C90004A0802EB4002B2FBF1F080B2A0F1100141 -:103CA000B942EAD20740C0F3420007432068C76028 -:103CB0007FE0914216D13F6817F4406723D0B7F5F3 -:103CC000806F09D0B7F5006F03D0B7F5406F06D00D -:103CD00008E04FF0020C07E04FF0040C04E04FF056 -:103CE000080C01E04FF0100C9142B3D1BCF1000F71 -:103CF00009D0BCF1020F0AD0BCF1040F15D0BCF101 -:103D0000080F15D054E0FEF74BFC002851D0616A33 -:103D100036F81120B0FBF2F6626802EB42018E42E7 -:103D200046D31103B14205D242E0FEF7EFFBECE7C8 -:103D30001846ECE75008002110EB062051EB166105 -:103D40000023FDF7E1FAA0F54071DFF83823914236 -:103D50002ED22268D0602CE0FEF7D8FB90E7184600 -:103D600090E7BCF1010F09D0BCF1020F09D0BCF102 -:103D7000040F18D0BCF1080F18D019E0FEF718FC9A -:103D8000B8B1626A36F812306168B0FBF3F000EB4C -:103D90005100B0FBF1F080B2A0F11001B94207D29E -:103DA0002168C86005E0FEF7B1FBE9E71846E8E7DF -:103DB000012504F16800012141800180002181601A -:103DC000C1602846F2BD0000D53F0008034000084E -:103DD0000D4000080080004090F82810CA0706D562 -:103DE00002685368C16A23F400330B43536090F8B0 -:103DF00028108A0706D502685368016B23F48033C4 -:103E00000B43536090F828104A0706D502685368A0 -:103E1000416B23F480230B43536090F828100A076A -:103E200006D502685368816B23F400430B4353604B -:103E300090F82810CA0606D502689368C16B23F46F -:103E400080530B43936090F828108A0606D50268C9 -:103E50009368016C23F400530B43936090F828108F -:103E60004A0610D502685368416C23F480130B4353 -:103E70005360416CB1F5801F05D15368816C23F408 -:103E8000C0030B43536090F828100A0606D501685A -:103E90004A68C06C22F4002202434A607047F8B5B9 -:103EA000044604F180050020E8606FF07E47FEF7CD -:103EB0001FFC0646206801680A0708D500973346AC -:103EC00000224FF40011204600F017F860B9206876 -:103ED00001684A070AD50097334600224FF4800153 -:103EE000204600F00AF808B10320F2BD20206860E7 -:103EF000A8600020E0662870F2BD2DE9F041069C24 -:103F000005460E4690461F462868C1693140B142B9 -:103F10000CBF0120002040451CD114F1010FF3D04B -:103F2000FEF7E6FBC01B844200D314B900F015F87D -:103F30000CE0286801684A07E6D5C1690A05E3D59F -:103F40004FF40062026200F008F8C16000210170C5 -:103F5000032000E00020BDE8F0812868016821F41A -:103F6000D07101602868816849084900816005F1C5 -:103F70008000202141608160704701680A6822F05A -:103F8000C0020A6001688A6822F400028A60202167 -:103F9000C0F88410704701680A6822F490720A60C1 -:103FA000DFF8C810026893680B409360C16E012966 -:103FB00004D101680A6822F010020A602021C0F8CA -:103FC00088100021C16601677047000001000010E1 -:103FD00020010004816A00680268930644BF084615 -:103FE00001F0B5BA0020A1F856000868826822F0F6 -:103FF000800282600868FFE7016841F040010160CB -:104000007047806A01F0B6BA00000000F8B5846A13 -:1040100004F1840504F1560728686E6821688A68EF -:10402000110606D5212804D1002038802046FFF74C -:10403000A4FF20688168480606D5222E04D10020FE -:1040400038812046FFF7A7FFA86840F01000A8605D -:104050002046BDE8F24001F060BA0000806A00F13D -:10406000560100220A810A8001F057BAFEFFFFEFD5 -:10407000F369FFCF0038014088000058FFF4FF11BA -:104080000024F40000FD0F000100020004000600FF -:1040900008000A000C001000200040008000000111 -:1040A00010B500F180010A78012A01D1022010BD6B -:1040B00001230B7024224A600268136814686408A4 -:1040C000640014600022426623F00053006803601D -:1040D000202048600020087010BD70B500F01EF868 -:1040E00001D1022070BD00F01FF822F0604209E00B -:1040F00070B500F013F801D1022070BD00F014F883 -:1041000022F0606211438160204600F01AF82068B6 -:104110000660202068600020287070BD044604F10D -:10412000800528780128704701222A7024206860C1 -:10413000206806680268520852000260206882689F -:10414000704730B5416E11B90121012214E00168B8 -:104150000FF230048A6889680FF23003520E02F0C1 -:104160000702490F655CA45C595C9A5CED00E400B1 -:1041700095FBF1F194FBF2F268304180028030BD92 -:10418000000000000101010307010000080402040F -:1041900008010101704700000C48002101604160E6 -:1041A000704710B500F00CF85C6819B1012904D112 -:1041B000204301E024EA0000586082F3108810BD1B -:1041C000EFF3108272B6014B70470000FC2A00200A -:1041D0000248016841F4007101607047080400580A -:1041E000DFF83C150A6892B200E00246086880B227 -:1041F0008242FAD170472DE9FC4104461825DFF8C8 -:104200002485DFF82465684308EB0007307806282A -:1042100008D131787170347078754FF0FF3070606C -:10422000002039E000F077F8B9680918B96008F1A2 -:104230000803B96832786A439A589142327813D3A6 -:1042400008F1150315FB02FC13F80C30062B25D0E2 -:1042500008F108066B43F358994222BF08F1150391 -:104260006A439A5CEED219E01146337869439A4268 -:104270000BD008F1140308F1150C5B5C15FB03F57A -:104280000CF805407A753B7500E07A7508F1140268 -:104290005454317871703470BDE8F6811146694329 -:1042A00008F115035B5C062B04D008F1140615FB1E -:1042B00003F574557B753A7508F115025454EBE714 -:1042C000F8B5DFF86434DFF85C541E781824024631 -:1042D0006243B0422A4404D118785870507D187057 -:1042E0000FE0167D507D92F815C005F11507664365 -:1042F000062807F806C004D0167D143514FB00F418 -:104300002E55012010731878062802BF00294FF09F -:10431000FF315960F1BD10B5DFF80C44606810F151 -:10432000010F0FD0FFF75CFF6168DFF800248142C6 -:1043300061683CBF5388C918081A517848431178FE -:10434000C84000E0002080B210BD2DE9F84FDFF832 -:10435000DC53DFF8DCB3D5F80880D8F80000DBF8D0 -:1043600000104A0500F090F9DFF8BC63DFF8B4A351 -:1043700021F4806181604FF0180934780AF1080057 -:1043800019FB04F14758FFF7C6FF874217D20027F1 -:104390000121B170062C3DD019FB04F40AF108018B -:1043A0000AF108020959814223BF0AF1080109599B -:1043B000091A002111510AEB04014C7DEAE7A98892 -:1043C0004118B94202D2AF880021E2E73F1ADFE785 -:1043D000022802DA2878012800D07F1ED8F80000D1 -:1043E000C1684A07FAD500F055F9DBF80C00000C5B -:1043F000BFB247EA0047CBF80C70FFF7F1FE7060E0 -:10440000A8680068816841F480618160AFF3008032 -:10441000BDE8F18FB8B20028DAD1FFF7E1FE706095 -:104420000320BDE8F24FFEF703BA2DE9F843EFF39E -:10443000108872B6BD4DBB4BA8680168CA224A629B -:1044400053204862B84A886820F480608860182049 -:104450001678374647431F44387B022826D13C68EC -:10446000D7F810909078F0B17A7B012A0AD1012117 -:104470003046FFF725FF88F310887968304600F052 -:1044800016F904E088F31088304600F0C1F8A868F7 -:104490000068CA21416222465321416248463146A2 -:1044A00000F050F90BE0FFF750FF06E0C868420744 -:1044B000FCD500F07EF89F49086088F31088FF2142 -:1044C000A86802685162BDE8F183F8B5974CA16015 -:1044D000CA2209684A6253224A62954A136843F025 -:1044E00020031360136803F00703C3F10403237070 -:1044F00095682D0C05F07F056D1C6570EDB2926816 -:10450000C2F30E02521C628092B2521E6A43A2F59E -:10451000A072DA404FF6FF739A422CBFA380A280AC -:10452000854A136843F400231360844B1D6845F4E7 -:1045300000251D6048BB7C487A4E012383701825F6 -:104540004FF0FF33436000235FFA83FC06F10C0752 -:1045500015FB0CFC4FF0000E07F80CE05B1CDFB203 -:10456000062FF1DB06230370886820F480608860E2 -:1045700000F01FF8D0600320FEF765F9A168086815 -:10458000826842F48042826005E0C868410544BF09 -:104590000320FEF74DF9A1680A68FF20506200224F -:1045A00003210320FEF7F8F8BDE8F2400320FEF7F0 -:1045B00011B9C86800F0800060F49060C8604FF4E2 -:1045C00000207047F0B504460025EFF3108672B660 -:1045D0001827DFF850C10CF10C0007FB05FE10F89E -:1045E0000E0010B16D1C062DF5DB062D0CD06F43AF -:1045F0000CEB07000127077386F3108804614273F0 -:1046000003600D700020F0BD86F310880120F0BD1E -:10461000F8B50746EFF3108472B60320FEF7E5F80D -:10462000424DAE683068CA2141623A465321416228 -:10463000182043494243895C02291BD10021384696 -:10464000FFF73EFE3848017806290ED13068384918 -:104650000A68530500F018F821F480618160C16890 -:104660004A07FCD500F016F804E04078884218BFED -:10467000FFF76BFEA9680A68FF2050620320FEF76F -:10468000A9F884F31088F1BD02D5C1684A07FCD4AB -:1046900081687047C16801F0800161F49061C16078 -:1046A0004FF40020234908600320FEF7CCB82DE921 -:1046B000F04180460F46424618201A4942438C1862 -:1046C000207B022804BF4046FFF7A2FFEFF31085CE -:1046D00072B60320FEF789F8144EB0680068CA214C -:1046E00041625321416202202073A7606760404607 -:1046F000FFF781FD0C490A784978914202D0FFF713 -:1047000024FE02E0A168081AA060FF20B1680A68D0 -:1047100050620320FEF75EF885F31088BDE8F08153 -:1047200028280040B42600202C2B0020E82A002056 -:10473000082800400C08005800080058800800585D -:10474000C026002010470000484900E0484981B0D9 -:104750000A6802430A60096808400090009801B0A6 -:10476000704780B5FDF7E9FFFDF7E9FF41480168B3 -:1047700041F48031016000F01AFFBDE801400EE015 -:1047800000B587B068460FF218211C22FCF778FDAF -:1047900000F0D3F9684600F057FF07B000BDF0B550 -:1047A00085B068461421FEF749F90026002500244B -:1047B00000210FF2DC0000EBC102907988B1136890 -:1047C000B3F1904F08D02C4FBB4208D02B4FBB42C7 -:1047D00004BF9088044304E09088064301E0908879 -:1047E0000543491C2229E4DB00200290012103201B -:1047F00003900191B0B288B100900120FFF7A4FFAF -:104800000120FFF7A3FF69464FF09040FEF71AF929 -:104810000022B1B24FF09040FEF7CCF9A8B280B1BF -:1048200000900220FFF790FF0220FFF78FFF124E4B -:1048300069463046FEF706F90022A9B23046FEF777 -:10484000B9F9A0B280B100900420FFF77DFF0420E9 -:10485000FFF77CFF094D69462846FEF7F3F8002272 -:10486000A1B22846FEF7A6F905B0F0BD4C000058ED -:104870004C01005890080058000400480008004807 -:10488000FEF744BC13460A460146002000F048BE2D -:104890000000004801000000000000480100000086 -:1048A0000000004801000000000000480100000076 -:1048B0000000004801000000000000480100000066 -:1048C0000000004801000000000000480100000056 -:1048D0000000004801000000000000480100000046 -:1048E0000000004801000000000000480100000036 -:1048F0000000004801000000000000480100000026 -:104900000000004801000000000000480100000015 -:104910000000004801000000000000480100000005 -:1049200000000048010000000000004801000000F5 -:1049300000000048010000000000004801000000E5 -:1049400000000048010000000000004801000000D5 -:1049500000000048010000000000004801000000C5 -:1049600000000048010000000000004801000000B5 -:1049700000000048010000000000004801000000A5 -:104980000000004801000000000000480100000095 -:104990000000004801000000000000480100000085 -:1049A0000000000000000000000000009048000827 -:1049B000280003202C0003202204040000F0C0BEC5 -:1049C0006C486D49016001F12002426001F1300242 -:1049D000826001F13C02026201F14402426201F193 -:1049E0004C02C26001F15402026101F170024261A5 -:1049F00001F1740282618031C16100F0BFBE38B53F -:104A000004465E4D284600F023FF5A484068A168DE -:104A10000160E168C16085605949416000F0CAFEEB -:104A200058482AE080B5534842681368012119723A -:104A3000406800F0C5FE002002BD38B5514C4F4D16 -:104A400004E000F041F8009821688847284600F00B -:104A500002FF0028F5D031BD4A484168084738B503 -:104A60000446494D284600F0F3FE4248C068A1685C -:104A70000160456000F0A9FE44482168016061685A -:104A80004160002032BD80B53A48C26813681021E9 -:104A90001972C06800F09FFE002002BD35483B4AF5 -:104AA000C168C16813680868184738B5374C364D77 -:104AB00004E000F009F8009861688847284600F093 -:104AC000CAFE0028F5D031BD6946284600F0ECBE8C -:104AD00038B504462E4D284600F0BAFE2D4800F0A9 -:104AE000B7FE24480069A1688160E168C160056182 -:104AF000216801606168416021694161616981618A -:104B000031BD80B50146234800F0B8FEBDE8024043 -:104B10000FF2050000F06FBE38B5164C1D4D06E0D3 -:104B2000FFF7D2FF00992069006900F0A7FE284630 -:104B300000F091FE0028F3D031BD10B5164C204690 -:104B400000F086FE0B4841690C60BDE8104000F0A3 -:104B500066BE1CB5104C06E06946204600F0A4FE77 -:104B6000009800F01BF8204600F075FE0028F3D0F6 -:104B700013BD000000000320AC090320480A0320F5 -:104B8000900803200C2B0020500A0320142B002037 -:104B9000380A0320042B0020400A0320704700003D -:104BA0007FB50C464D4D61684D4EE861296228463F -:104BB00000F08CFE2468746006F1080000F048FEE6 -:104BC000012000F068F801203070296841B10FF22F -:104BD000E9000FF2ED0200900192029468468847C6 -:104BE0007FBD1FB53E4C04F1080000F034FE00BB51 -:104BF0002178F1B1694604F1080000F055FE37480C -:104C0000C16949B10098029001228DF8042001A8E1 -:104C100088479DF8040000E001202070207818B13A -:104C20000098FFF76EFF04E0009904F1080000F01F -:104C30001BFE04F1080000F00EFE28B9207818B120 -:104C400004F10800FEF75EFB1FBD2DE9F0410546AB -:104C50000E4690461C46002000F01DF8204F786854 -:104C6000A0F80950C672324641460C30FCF7F8FAFB -:104C70001A4A136900210020984748F2E800FEF71D -:104C800048FB79688A78D21C04F10800FCF7E8FA3E -:104C9000BDE8F04101201CB51049124C096A20B949 -:104CA00001B188470020207013BD0120207011B190 -:104CB000BDE81C40084713BD0020FEF727BB0000DD -:104CC00010B50146064C04F1080000F0D7FD04F1D0 -:104CD0000800BDE81040FEF715BB0000542A002074 -:104CE000D82A00204C2B002010B58EB002A80FF25D -:104CF0008C61DFF800443022FCF7C2FA0FF2454025 -:104D00000190009469460FF2254000F0E9FD012171 -:104D10000220FFF746FADFF8E02300212020FEF70B -:104D200080FB02A800F088FC08B1FEF751FA00F001 -:104D30000FF900F0B9FE0FF2293200210120FEF731 -:104D400070FB0FF2593200210220FEF76AFBDFF8F8 -:104D5000AC43002084F88000202000F04BFF00F0DE -:104D60007DFF0FF2AD33002204F181010020FFF737 -:104D700029FC0EB010BD2DE9F043074685B07878C8 -:104D8000DFF87843DFF8786305284FF0000804F176 -:104D9000800554D03E2863D0FF280DD10120307209 -:104DA000B7F80300042842D040F20741884204D0FB -:104DB00040F60201884218D0A6E07879022804BFA4 -:104DC000B9790029F8D1002000F029FB0FF28830D2 -:104DD00001F088FAA878012806D12978062903D09D -:104DE00000210220FEF72AFB8EE0002000F002FFE7 -:104DF000F879307301253889F08179893182BA894F -:104E00007282FB89B382388A04950090F082357BE8 -:104E1000E08A039510260296019601F077FA10B108 -:104E2000022000F0F7FA202000F0E4FE6CE0012000 -:104E300000F0F0FA68780A21FFF739FC64E0B888DE -:104E4000E18A884260D1A4F8168085F800800FF2CC -:104E5000383001F047FA0120307200F059F853E081 -:104E6000F878012802D002281DD04DE0B7F80500DF -:104E7000E082062028700FF2383001F033FA86F80D -:104E8000088000F045F8E08A01F0CFFA30B90FF25F -:104E9000483001F027FA0FF2743001E00FF29C3035 -:104EA00001F020FA30E097F80D90787960BB29E0A6 -:104EB00007EB0800847BC07BFF2821D1072C1FDB78 -:104EC00007EB0800007C01281AD10FF2B03001F086 -:104ED00009FA07EB0800407C832811D10FF2BC309F -:104EE00001F000FA0120A870F8793070387A7070FB -:104EF000787AB070B87AF070F87A3071387B707167 -:104F0000641CA044C845D3DB012005B0BDE8F08394 -:104F1000E08A708106F1080000F0C1BE7749CA8AB4 -:104F2000824202D191F8800070470020704780B51E -:104F300000F0D5FF062805D0BDE80440002101207F -:104F4000FEF77CBABDE8014000F0BBBE7047704779 -:104F500018B589B00020ADF81A0001F024FB694CA7 -:104F6000216811F1010F0DD0674862680170120AC3 -:104F7000090A417061688170C270110A120C0171D6 -:104F8000427105E00020FEF7D5F908B90FF2C430F0 -:104F900002460621002000F0F8FD4EF66E50089003 -:104FA00007AA2068554C079006212E2000F0EDFD41 -:104FB0000FF2A8321021182000F0E7FD0FF2AC32FA -:104FC0001021082000F0E1FD1821012000F004FE6E -:104FD00001F0E4F90DF1160006A90190009105AB6E -:104FE00007220021042001F04EFB0FF2D420BDF86F -:104FF000181000900623BDF81400002201F0E5F916 -:105000000DF11A0000900223BDF81610BDF814002F -:10501000002201F0DAF90120207001F0E8FA012005 -:105020006070012108202071A170102060710021A2 -:105030000120E070049110213448A0600390082200 -:10504000012001910092029000230122012101F030 -:10505000E7FAA07808B101F04EFB0AB010BD0000DD -:10506000264890F88010062900D1704780B50020AE -:1050700000F0D0F94FF4487101230022084601F0F6 -:1050800055FB10B90FF2402004E0022000F0C2F9F5 -:105090000FF26420BDE8024001F024B918B587B0D2 -:1050A0000FF28420154C01F01DF994F880000628B9 -:1050B0001DD01021069105914FF4FA7004905021F3 -:1050C00000230291282200200393019200904FF4C4 -:1050D00048710B4B0022084601F04DFB08B9042033 -:1050E00003E0022000F096F9002084F8800008B068 -:1050F00010BD0000A00803201F590008442700200D -:10510000982A00208075FF1FF42A002007B20100B2 -:10511000012000F084B900212020FEF78FB9012082 -:10512000FEF7B2B90120FEF7B7B9000010B504468A -:10513000616801F1080000F0C7FC00B10120207097 -:1051400010BD000010B1012803D070473F20FEF7CA -:1051500089B93F20FEF78EB92D2D204741502047B9 -:10516000454E4552414C20444953434F56455259B0 -:105170002050524F4345445552455F434F4D504C8C -:10518000455445440A0000000D0A0D2A2A204449CE -:1051900053434F4E4E454354494F4E204556454E7E -:1051A00054205749544820534552564552200A002E -:1051B0000D0A0D2A2A20434F4E4E454354494F4E67 -:1051C000204556454E542057495448205345525681 -:1051D0004552200A000000000D0A0D2A2A204741EE -:1051E00054542053455256494345532026204348A2 -:1051F0004152414354455249535449435320444931 -:1052000053434F5645525920200A00002A20474157 -:105210005454203A20205374617274205365617293 -:105220006368696E67205072696D61727920536599 -:10523000727669636573200D0A0D0000424C455F6C -:105240004354524C5F4170705F4E6F74696669637E -:105250006174696F6E28292C20416C6C2073657213 -:10526000766963657320646973636F76657279200C -:105270004661696C6564200D0A0D00002D2D2D20FE -:105280005354204D414E55464143545552455220AA -:105290004944202D2D2D200A000000002D2D2053E3 -:1052A0004552564552204445544543544544202DCB -:1052B0002D20564941204D414E2049440A0000000E -:1052C000503250434C490000200D0A0D2A2A205329 -:1052D000544152542047454E4552414C2044495375 -:1052E000434F5645525920285343414E29202A2ADC -:1052F00020200D0A0D0000002D2D20424C455F415D -:1053000070705F53746172745F4C696D6974656429 -:105310005F446973635F5265712C204661696C65F7 -:1053200064200D0A0D0000000D0A0D2A2A204352A8 -:105330004541544520434F4E4E454354494F4E201E -:10534000544F20534552564552202A2A20200D0AF8 -:105350000D0000000000000000000000123456782C -:105360009ABCDEF0123456789ABCDEF0FEDCBA0944 -:1053700087654321FEDCBA098765432100000000F0 -:10538000000000000000000000000000000000001D -:105390001E0004000A05020112279C00F40100000F -:1053A000FFFF00004801010000200000484981B0D3 -:1053B0000A6802430A60096808400090009801B03A -:1053C000704778B585B0044668461421FDF736FB72 -:1053D0000220FFF7EBFF00F011F80095012001908B -:1053E0000021022003900291694656F82400FDF73F -:1053F00029FB00F009F8002006B070BD0FF2F400A0 -:10540000344E30F81450704756F8240000222946D4 -:10541000FDF7D0BB80B500F00AF8012203E080B5AB -:1054200000F005F80022FDF7C5FB002002BD0FF2D9 -:10543000C401284B31F8101053F820007047F0B524 -:1054400085B005460C4668461421FDF7F7FA2DB1E4 -:10545000012D08BF102002D0022D02D10120FFF73C -:10546000A5FF0FF298001C4F30F8150000900121A5 -:105470000220039007EB8506029130682CB90021C9 -:1054800001916946FDF7DEFA1FE01449019107EB2F -:10549000C5046946FDF7D6FA0FF26C0050F82510E6 -:1054A00004F1240001F0E5F9F268002104F1240080 -:1054B00001F0D8F90FF24C004457B16900222046A0 -:1054C000FDF76AF92046FDF785F9002005B0F0BD2B -:1054D0004C000058082600204C2500200000211018 -:1054E000002000F017B8012000F014B8022000F0EE -:1054F00011B80000200001000200000001001000AF -:1055000040000000060A1700000000160400001604 -:1055100006000016704770477047704770470000DC -:1055200010B5002488B9114803600E480E4B036083 -:10553000FEF7D4F9012805D007D3032804D038BFDB -:10554000022402E0012400E00324204610BD00688C -:105550000549884204D105490868002818BF00475A -:10556000704700002426002000380140382B00201E -:10557000704770477047000038B5EFF3108472B67B -:10558000284D6946281D01F093FA6946281D01F04F -:10559000ECFA38B184F31088BDF80010224AFFF706 -:1055A00071F931BD0120287084F3108831BD80B5B8 -:1055B000FFF766F90221009100231A4800F1240147 -:1055C0004FF48052001D01F05AF901BD00BFF8B53B -:1055D00014460026EFF3108510F1010F1ED00128AC -:1055E0001CBF02284FF0FF3618D1BCB1264672B658 -:1055F0000C4F012392B2381D01F055F900281CBF51 -:105600003978002908D000223A7085F31088A1B2B9 -:10561000054AFFF737F901E085F310883046F2BDFF -:10562000000000000814002079550008FFF70DFB6A -:105630009DF80E0005B000BDF8B500F10C026B46F8 -:1056400024214FF66640F1E7F8B500F10C026B46F5 -:105650000F214FF66840E9E7C0680840884201D151 -:105660000120704700207047C0690840884201D17E -:10567000012070470020704710B56C4C0221204675 -:10568000FFF7F2FF38B16068C043810703D5FFF729 -:105690000CFA022018E001212046FFF7E5FF38B19F -:1056A0006068C043C10703D5FFF7C7F901200BE0CD -:1056B00008212046FFF7D8FF38B16068C0430107D2 -:1056C00003D5FFF746FA0820A06010BD10B5574C6F -:1056D00000F033F818B96068C043810306D400F0C5 -:1056E0002CF830B96068C043810302D5BDE8104092 -:1056F0007AE0082100F022F870B96068C043010325 -:105700000AD560684A4940F4002060600868804714 -:105710004FF40020A06010BD202100F00FF858B910 -:105720006068C043810207D5606840F40010606083 -:10573000BDE81040FFF790B910BD022120468BE76D -:105740003C4881B0016841F480110160006800F4B8 -:105750008010009000983848016841F400710160A1 -:105760003648026842F40072026040BF20BF3448ED -:10577000016841F40041016001B0704780B53148D3 -:10578000016841F480110160006800F4801000900D -:1057900000982648016841F001010160026842F466 -:1057A000803202602C20FDF715F8BDE802402D2064 -:1057B000FDF710B8244801684908490001607047A6 -:1057C00022494FF48030086070471F48016821F07B -:1057D0000201016070471C484FF4003141600168CC -:1057E00021F40031016070471748016841F400312D -:1057F0000160FFF753B938B504460C4D082128461F -:10580000FFF72AFF30B10A480460686820F40020DE -:10581000686031BDA0474FF40021A96031BD0A483E -:10582000016821F00801016070470000000C005879 -:10583000342B002050010058D4080058200800588C -:105840000C04005850000058040C0058080C005874 -:10585000006040607047EFF3108172B602688242C8 -:105860000CBF012000201CE0EFF3108272B6036829 -:105870000B60486001600868416023E0EFF310822C -:1058800072B6086043684B6041604868016019E087 -:10589000EFF3108172B642680368136002684368D0 -:1058A000536081F31088704710B5EFF3108472B61F -:1058B00002680A600068FFE7FFF7EAFF84F31088D8 -:1058C00010BD0B6082F31088704700000249016030 -:1058D00002490161704700BF5F4A0008874A00081B -:1058E0007FB50C466D4D61686D4EE86129622846B2 -:1058F00001F084F9246805F12400FFF7A9FF746022 -:1059000006F10800FFF7A4FF01203070296829B1D3 -:105910000FF2551000900294684688477FBD1FB56E -:105920005F4C04F10800FFF796FF00BB2178F1B14E -:10593000694604F10800FFF7B7FF5848C16949B14B -:105940000098029001228DF8042001A888479DF854 -:10595000040000E001202070207818B10098FFF7C3 -:10596000D0F804E0009904F10800FFF77DFF04F18E -:105970000800FFF770FF28B9207818B104F108007B -:10598000FFF7C9FB1FBD2DE9F8430646002000F0D4 -:105990005FF874883088B268DFF80081C4F30904C6 -:1059A00044EA8024F068A4B2C1B2204600F03CF87A -:1059B000002748F2E8094846FFF7B4FB08E068888A -:1059C000A04202D1316928780870687800B10127B7 -:1059D00008F12400FFF73FFFF0B9694608F1240001 -:1059E000FFF762FF009800F10B05407A0F28E6D020 -:1059F000B5F80110A1420DD10098817AC81E7169D5 -:105A0000C0B28842C8BF0846706102463069E91CCE -:105A1000FBF726FC2878D9E73800CCD0012000F02D -:105A200017F80020BDE8F28310B513461C4A5468ED -:105A3000A4F80900E1720A46194604F10C00FBF7CC -:105A40000FFC164A1369BDE81040002100201847DA -:105A50001249096A82B008B921B101E011B10120EF -:105A600002B0084702B0704710B50146487A0F28C7 -:105A700018BF0E2807D10B48FFF700FFBDE8104004 -:105A80000020FFF74CBB064C04F10800FFF7F6FEC0 -:105A900004F10800BDE81040FFF73DBB042A0020D8 -:105AA000C82A0020282A0020234900200877002245 -:105AB0002248027100F044B820490A7941F82200D6 -:105AC0000879401C0871704770B504466078FF285B -:105AD00002BFB4F8031001F47F41B1F5406F1FD14C -:105AE0000025154E317FE8B2884222D2E9B256F83D -:105AF000211020468847002808BF6D1CF2D018E00E -:105B0000761C2979F0B288420AD2F1B255F82110F8 -:105B1000204688470100F3D002D0022805D006E0D5 -:105B20002046BDE87040FFF726B9002070BD012077 -:105B300070BD0026014DE4E7782A0020242B0020C8 -:105B400080B501F065F801F064F801F063F801F048 -:105B500062F801F061F801F060F801F05FF801F01F -:105B60005EF801F05DF801F05CF801F05BF801F01F -:105B70005AF801F059F801F058F801F057F801F01F -:105B800056F8BDE8014001F053B818B50C46C7B04F -:105B9000114600228DF800208DF81C008DF81D4064 -:105BA00022460DF11E0001F044F800F03BF83F20C2 -:105BB0000C21ADF80400ADF8061007A801210390F0 -:105BC0000691A41C049400F043F800284CBFFF2069 -:105BD0009DF8000048B010BD00B5C7B000F01BF83C -:105BE0000F2000F02AF800284CBFFF209DF800008D -:105BF00047B000BD00B5C7B00021ADF81C0000F0F3 -:105C000016F8182000F019F800284CBFFF209DF866 -:105C1000000047B000BD00228DF800208DF81C0068 -:105C20008DF81D101822002101A801F008B88DF888 -:105C30000010182201A801F002B8ADF8060007A96B -:105C4000022004903F22012003910690ADF8042029 -:105C5000CDF814D0002101A8FFF795BE80B50FF252 -:105C6000B92200210420FDF7DCFB0FF2792200218C -:105C70000820FDF7D6FBD34800210180C180817048 -:105C80000121C1700021017101720FF24100FFF783 -:105C900013FFBDE802400FF2303000F023BB027862 -:105CA000C84912B1012A03D070474088C8807047A4 -:105CB0000020C880087A08B100220A720020FFF78D -:105CC000AEBB00210820FDF7B9BB00002DE9F84F5D -:105CD00005466878FF2812D1BA4CB5F803006189EF -:105CE00040F60442801A00F08B80801E4DD0001FC9 -:105CF00006D0401F00F0B780401E00F0DD80EBE0D2 -:105D0000B5F80560207A58B10846FFF707F9217AFF -:105D1000062908BF0028F2D120724FF6FF7060817B -:105D20006681E879297A91FBF0F914285FFA89F9FC -:105D3000E5D14FF0100A00270FF2A8284FF6406671 -:105D4000F8B24845DBDA05EB0A0B9BF809009BF833 -:105D50000A1040EA0120B04211D16189404600F0AA -:105D6000C1FAABF107000178427841EA0221A18132 -:105D70008178C07841EA0021E181082121720AF18D -:105D800006005FFA80FA7F1CDAE7B5F80500814269 -:105D900002BF1126E87915283CD1297A0FF2B829DB -:105DA0000FF27C2B481E28724FF6426A4FF641686C -:105DB000287A0028A3D0A91905F10A02487A11F817 -:105DC000057D925D497840EA022047EA0127618912 -:105DD000404508D050450CD1484600F083FA0A20CF -:105DE0002072A78205E0584600F07CFA0920207254 -:105DF00027821536287AA0F115012972F6B2D7E765 -:105E0000B5F80500814201BF95F808B04FF00008D1 -:105E1000E879012860D100270FF2802942F6021AA2 -:105E2000F8B2B0EB9B0F57DA05EB080005F10A0159 -:105E3000C27A467A007B11F8081042EA00225245E5 -:105E400046EA012609D16189484600F04BFA207ADA -:105E50000A2802D1E6820B21217208F104005FFAC0 -:105E600080F87F1CDCE7B5F80500814202BFB5F879 -:105E70000700A18A88422FD1687A022802BFA87A37 -:105E80006070012828D1E87AA0704CA448B9FFF7C7 -:105E9000C6FA0FF2802000F025FA204600F022FA20 -:105EA0001AE00FF2B02000F01DFA204600F01AFAB6 -:105EB0000020FFF7AFFA0FE00FF2282000F012FAEF -:105EC0003FA000F00FFA6089B5F80510884203D1B1 -:105ED00000210420FDF7B2FA0020BDE8F28F394816 -:105EE000007A704710B50FF2AC20364C00F0FAF98A -:105EF00032A000F0F7F92079401E8041C00F2071D8 -:105F0000207A38B1218A6089E31CBDE81040022262 -:105F100000F0F9BA10BD00001CB50120ADF8020078 -:105F20000021284C207AADF80010002844D0C01F72 -:105F3000052841D8DFE800F00308121823340FF2D7 -:105F4000942000F0CFF913BD0FF2A02000F0CAF9A1 -:105F5000E289A189608900F082FA13BD0FF2B420B2 -:105F600000F0C0F9218A04E00FF2E42000F0BAF951 -:105F7000A18A60898A1C92B200F082FA13BD0FF2E6 -:105F8000143000F0AFF9E18A60890DF102030222BA -:105F900000F08CFA062020720220FFF740FA13BDB1 -:105FA0000FF2183000F09EF9E18A60896B460222F8 -:105FB00000F07CFA0620207213BD0000200A0D00BC -:105FC0000A000000B02A00202D2D2050325020431E -:105FD0004C49454E5420494E495449414C495A4533 -:105FE00044200A002D2D2047415454203A2050329D -:105FF000505F534552564943455F555549442046E5 -:106000004F554E44202D20636F6E6E656374696F2B -:106010006E2068616E646C652030782578200A00F7 -:106020002D2D2047415454203A2057524954455F62 -:106030005555494420464F554E44202D20636F6EE0 -:106040006E656374696F6E2068616E646C65203084 -:106050007825780A000000002D2D20474154542057 -:106060003A204E4F54494649434154494F4E5F43AD -:106070004841525F5555494420464F554E442020D3 -:106080002D20636F6E6E656374696F6E2068616E3C -:10609000646C6520307825780A0000002D2D20479B -:1060A000415454203A20434C49454E545F434841A3 -:1060B000525F434F4E4649475F4445534352495010 -:1060C000544F525F555549442D20636F6E6E656382 -:1060D00074696F6E2068616E646C65203078257815 -:1060E0000A0000002D2D2047415454203A204143FE -:1060F000495F474154545F50524F435F434F4D50A7 -:106100004C4554455F56534556545F434F444520D4 -:106110000A000000202D2D20503250204150504CBC -:1061200049434154494F4E20434C49454E54203A2F -:10613000204E4F54494649434154494F4E20524501 -:10614000434549564544202D204C4544204F464662 -:10615000200A0D00202D2D20503250204150504C4F -:1061600049434154494F4E20434C49454E54203AEF -:10617000204E4F54494649434154494F4E205245C1 -:10618000434549564544202D204C4544204F4E0A56 -:106190000D0000002D2D20503250204150504C4910 -:1061A000434154494F4E20434C49454E5420203AD8 -:1061B00020425554544F4E20505553484544202DAD -:1061C00020575249544520544F205345525645526A -:1061D000200A20005032505F444953434F564552E5 -:1061E0005F53455256494345530A00002A20474110 -:1061F0005454203A20446973636F7665722050329C -:106200005020436861726163746572697374696375 -:10621000730A00002A2047415454203A20446973ED -:10622000636F7665722044657363726970746F7210 -:10623000206F66205458202D2057726974652043C2 -:106240006861726163746572697469630A00000051 -:106250002A2047415454203A20446973636F76657D -:10626000722044657363726970746F72206F662068 -:106270005278202D204E6F74696669636174696F6E -:106280006E20436861726163746572697469630A40 -:10629000000000002A2047415454203A20456E61F6 -:1062A000626C6520536572766572204E6F74696604 -:1062B00069636174696F6E0A000000002A2047411B -:1062C0005454203A2044697361626C6520536572AE -:1062D000766572204E6F74696669636174696F6E6A -:1062E0000A0000000EB4C0B5024603A800210190C8 -:1062F000009101AB0121044878440C30F9F71EFFEE -:1063000006BC5DF810FB00BFE31300002DE9F84167 -:10631000C7B04FF00008ADF81C00DDF838C14F9E43 -:10632000509F519D529C8DF8008007A800F01AF8EC -:10633000A0F808C0ADF8266087818DF82A508DF846 -:106340002B4000F015F84FF4C17000F016F8102043 -:1063500000F017F800284CBFFF209DF8000048B05F -:10636000BDE8F0814180ADF82020ADF822307047C3 -:106370001822002101A800F062BCADF8060007A9B0 -:10638000704704903F22012003910690ADF804204D -:10639000CDF814D0002101A8FFF7F5BA00B587B0F9 -:1063A00000208DF8000000F07CF840F20110ADF8FC -:1063B00006003F220120069000F0EDF800284CBFB7 -:1063C000FF209DF8000007B000BD30B5C7B01C46E7 -:1063D0004A9B00F0C7F800258DF800508DF8214049 -:1063E000224619460DF1220000F023FC00F059F876 -:1063F0003F204FF4837100F0BCF8A41D049400F01A -:10640000CCF800284CBFFF209DF8000047B030BDFD -:106410000023ADF81C008DF8003007A84180828071 -:106420000021182201A800F00ABC00B5C7B000F096 -:1064300010F8FFF7F6FF0F2102914FF48970022147 -:1064400000F0A1F800284CBFFF209DF8000047B0E5 -:1064500000BD0021ADF81C008DF80010704700B59C -:10646000C7B0FFF7D5FF0F21029140F2151000F0E1 -:1064700089F800284CBFFF209DF8000047B000BD00 -:1064800000B5C7B0FFF7C4FF0F21029140F217100B -:1064900000F078F800284CBFFF209DF8000047B0BE -:1064A00000BD1822002101A800F0C9BB18B5C7B073 -:1064B00000F011F800F045F8FFF7F3FF40F221116A -:1064C00000F013F800F069F800284CBFFF209DF899 -:1064D000000048B010BD1446ADF81C00002207A80B -:1064E0008DF80020418004717047ADF806103F2000 -:1064F00007A9ADF8040003910F2001210290069135 -:10650000641D0494704718B5C7B000F010F8FFF789 -:10651000C8FF3F2040F2231100F019F800F03DF8C9 -:1065200000284CBFFF209DF8000048B010BD144665 -:1065300000228DF80020ADF81C00ADF81E108DF87B -:106540002040224619460DF1210000F072BBADF843 -:106550000400ADF8061007A8012103900691641D00 -:1065600004947047ADF81C00ADF81E108DF8202083 -:106570007047ADF80400ADF8061007A8012103909C -:10658000069170470621ADF80600049107A8012185 -:106590003F2203900691ADF80420CDF814D00021DD -:1065A00001A8FFF7F0B900B587B000F010F801209E -:1065B00003220690ADF80420ADF8062000F011F893 -:1065C00000284CBFFF209DF8000007B000BD002050 -:1065D0008DF800001822002101A800F030BB0390C4 -:1065E0000691CDF814D0002101A8FFF7CCB900B571 -:1065F000C7B000F00CF8852000F075F800F014F931 -:1066000000284CBFFF209DF8000047B000BD0021CE -:106610008DF81C008DF80010182201A800F00FBBA7 -:106620002DE9F841C7B04FF0000800F026F80DF151 -:106630002300DDF844E14E9F4F9E509D529C8DF803 -:106640001F30C0F800E08DF800808DF820708DF8C4 -:1066500021608DF822508DF8274000F087F88620C1 -:10666000ADF8060007A90C2000F0DAF800284CBFAE -:10667000FF209DF8000000F0F2B88DF81C0007A87C -:10668000417082707047F8B5C8B005460E4617468F -:106690001C4600F023F808A8467087708DF820503B -:1066A00000F0D8F88A21ADF80A103F20032100F04D -:1066B000C4F8002848BFFF200ED49DF8000058B948 -:1066C0004F994E98BDF801202280BDF8032002802A -:1066D000BDF805000880002049B0F0BD0722002168 -:1066E000684600F0ACBAADF8060007A901203F22C9 -:1066F00003910490704700B587B000F013F800F0E4 -:1067000035F8922000F009F800F08EF800284CBF10 -:10671000FF209DF8000007B000BDADF806003F2245 -:106720000120704700208DF80000704718B5C7B0F1 -:1067300000F011F800F01AF80F21029197200621BD -:1067400000F065F800F071F800284CBFFF209DF8BC -:10675000000048B010BD0024ADF81C008DF82130B9 -:1067600007A8418002718DF800407047182200216F -:1067700001A800F064BA2DE9F04F0646C7B000F05A -:1067800020F800F012F8FFF7F1FF3F20ADF8040009 -:106790009C2100F030F800F04AF800284CBFFF20A0 -:1067A0009DF8000047B0BDE8F08F8DF82790B581C7 -:1067B000ADF82AB03782ADF82E80B482ADF832A0A1 -:1067C000704708461946559CDDF84091519DDDF80B -:1067D00048B1539FDDF85081DDF858A1ADF81C6039 -:1067E000002307AE8DF80030708032710DF121006A -:1067F000062200F01EBA0F200290ADF806101820F5 -:10680000049007A901200391069070470321ADF879 -:106810000600049107A801213F22039006917047CA -:1068200004903F22012003910690ADF80420CDF89A -:1068300014D0002101A8FFF7A6B8ADF80800059113 -:1068400008A8072104900791CDF818D0002102A8CC -:10685000FFF799B81822002102A800F0F0B948B05B -:10686000BDE8F0810346002009B95A607047012055 -:10687000704708B90120704701600020704710B5CB -:10688000029C016042600021C1600161416181613F -:106890000381A107047704D5008910B14FF0FF30C0 -:1068A00010BD002010BD2DE9F04F064685B030899F -:1068B0000C460027BB4600287169DC460CBF4FF030 -:1068C0000208D84681B168B930697768451CBD4275 -:1068D00028BFED1B3768385C7D5D00EB0527BF1CCA -:1068E000BFB203E0074600E000B102463069F56838 -:1068F000A84223BF7568281AC01B0020154608EB64 -:10690000050903FB09FE864532BF0020B0FBF9FAFA -:1069100009FB1A00C0B2804509DA96F81C905FEABC -:10692000C97A48BF84465FEA897048BFC4461000F0 -:1069300000F0B4807068714461448842C0F0AE8059 -:1069400008EB020080B20390D946100AADF80200AD -:106950000294ADF80020049359E0800740D53089B7 -:10696000002840F09B803268D018A34600F8024C03 -:10697000200A32681A4402F8010C22463068184492 -:10698000FAF76EFC706920187061B069019C401CB8 -:10699000B061200A31680C70316848701CE08CB31B -:1069A000307FC207D9D5308940B931681944FF20FA -:1069B00001F8020C3168194401F8010C4FF0000B8A -:1069C0007069241874612C463089002340B93168FD -:1069D0000C70210A3068417002237069801C70615C -:1069E00008EB04070021BFB231615CB1DA440298C0 -:1069F00000EB0A01306822461844FAF731FC70694E -:106A00002418746109F10109B069401CB061049A4D -:106A100070683169914545D2791881422CBF081AB6 -:106A20000846306103463089A0B93068BDF80010CF -:106A3000C1545B1C70683168834228BF1B1ABDF8C3 -:106A40000200C8545B1C7068834228BF1B1A70691F -:106A5000801C706105FB09FA7468BDF80000E41A37 -:106A6000844288BF0446029800EB0A01281BAC420E -:106A7000019003D093D2307F002890D1376822460E -:106A8000F818FAF7EDFB706920187061A346019CB5 -:106A9000039F0023A9E73068404400E0002005B0D0 -:106AA000BDE8F08F88448045F5D3A8EB0008F2E7F5 -:106AB00078B5028900230B80002A44690CBF0225A7 -:106AC0000025002C4FD0028952B9C2684668531C79 -:106AD000B34228BF9B1B0668B25CF35C02EB032247 -:106AE0000A80027F02F00302012A25D10B884FF6AB -:106AF000FF72934204BF0289002A09D0C368026969 -:106B00009A4219D20289BAB14668F31A934213D253 -:106B10004368C268E41A14190022C2604461028901 -:106B20004AB902681478012B94BFC3F10103012311 -:106B3000D25C04EB02220A80C468426806682B1902 -:106B4000934228BF9B1A33440E884169891B491B15 -:106B5000416105D034192D19954228BFAD1AC56081 -:106B60008169491E8161184672BDF8B5028900230A -:106B70000B80002A42690CBF02240024002A3BD06B -:106B8000C56802892B464AB946686A1CB24228BFCA -:106B9000921B0668775DB25C07EB02220A80067FD3 -:106BA00006F00306012E20D10F884FF6FF729742A0 -:106BB00004BF0289002A07D142680023012A94BF3A -:106BC000C2F1010201220AE00269AA420DD2028941 -:106BD0005AB14668751B954207D2002304E0056848 -:106BE0002E78AA5C06EB02220A8041680068E4184D -:106BF0008C4228BF641A03191846F2BD024901608D -:106C000002490161704700BFFF490008254A00089A -:106C100070477047704770477047704770477047BC -:106C200070477047704770477047704770477047AC -:106C3000704710B50446FAF713FB204610BD10B597 -:106C4000044610460A460146204600F003F8204656 -:106C500010BD000062F30F2262F31F42401810F0D3 -:106C6000030308D0C91A1FD3DB0748BF00F8012D62 -:106C700028BF20F8022D130030B4144615461039F1 -:106C800028BF20E93C00FAD8490728BF20E90C00BA -:106C900048BF40F8042D890028BF20F8022D48BFC6 -:106CA00000F8012D30BC7047C91818BF00F8012D3D -:106CB000CB0728BF00F8012D7047000010B504462F -:106CC000AFF30080204600F005F80446AFF30080E3 -:106CD000204610BD7CB500F10F06F608F600B04264 -:106CE00040D2082E04D2082602E0083000F047F80F -:106CF000DFF804512C68210005D1002007E002686C -:106D0000B24221D2011D08680028F8D12068291D4F -:106D10000A68824222D01368B34238BF111DF7D3EC -:106D200012E093190B60801B54685C600B6818605C -:106D30001660096800291DBF48680028081D00204A -:106D4000286002F1080076BD61B10A681068A0F100 -:106D50000803B342E5D250680860EAE700F04EF855 -:106D60000028C2D1002076BD10B5040006D0AFF3D4 -:106D70000080204600F003F8AFF3008010BD00282B -:106D800000D1704750B4A0F108021368072B2BD92B -:106D900013F0070F28D1184C616809B18A4202D25A -:106DA0005160626013E0486800B3904238BF01460A -:106DB000F9D31BE0964203D11B180B600A4606E08C -:106DC000486810B1134498420ED350604A6050682E -:106DD00050B11368D118814206D1002121600168A9 -:106DE000CB1813604068506050BC704708680E189C -:106DF000B242DFD250BC70471C2B00200749086804 -:106E000008B1002070470648C008C0000860054966 -:106E1000C908C900091A0160704700BF482B00204B -:106E20000F100020081400201349002008604FF4C0 -:106E3000E0221248016841F4700101604FF0B04156 -:106E4000086840F0010008608A600D480A68024046 -:106E50000C480A60036823F0050303604268520887 -:106E60005200426000220848C860086820F4802070 -:106E700008608A617047000008ED00E088ED00E0DE -:106E8000FBFEF6FA940000580010042201000000F6 -:106E900003000000050000000100000001000000E8 -:106EA000060000000A0000002000000002000000B0 -:106EB0000400000008000000100000004000000076 -:106EC000800000000001000000020000A086010018 -:106ED000400D0300801A060000350C0040420F00F0 -:106EE00080841E0000093D0000127A000024F40096 -:106EF00000366E010048E801006CDC020000000072 -:106F00000000000000000000000000002DE9F0413A -:106F100007468846387810F0030F16461D4633D0D2 -:106F2000384600F099F878BBB8F1000F1CBFD8E9DB -:106F300000018619012D2ED13888C10415D5396A72 -:106F400007F14402384600F0A3F83A6B044602B950 -:106F50003A69F968384600F09BF8361B341A7A69AA -:106F6000F968384600F094F8261A1EB94DB916F1A2 -:106F7000010F09D097F903002A46314600F08EF838 -:106F8000064616F1010F09D12320AFF300804FF020 -:106F9000FF30BDE8F081022DE8D1EBE7388810F42E -:106FA000405F0ED07868F86038617861B8617868C1 -:106FB000F86107F14400386207F130007862002080 -:106FC0003863B8F1000F05D0D8E9020107F13402A7 -:106FD000C2E9000139884CF6FF6001403980002089 -:106FE000BDE8F08170B50546AFF3008028888104C4 -:106FF00015D56E680024EA6895F903003146914280 -:1070000012D2521AFEF7E2FA10F1010F1CBF00284B -:107010003618F0D10FE04DF6FF7001402980284668 -:10702000AFF30080002070BD00220021FEF7CEFAF1 -:1070300010F1010F00D101246868E860A861E861DF -:10704000002C2988E7D041F4007129802846AFF34D -:1070500000804FF0FF3070BDF8B5A0B9AFF30080ED -:1070600000250A4E08244FF0FF37306820B1FFF7A3 -:10707000B9FF002848BF3D46361D641EF5D1AFF369 -:1070800000802846F2BDBDE8F240ABE7E8250020CD -:10709000914234BF511A0021084670473EB50400A2 -:1070A0000D00012A02D100F063F807E0022A07D19F -:1070B00000940020019069460C20ABBE2D1801E021 -:1070C000002A0CD10094019569460A20ABBE002825 -:1070D00005D100222100280000F027F801E000205F -:1070E000C04303B030BD000010B4314A0021134644 -:1070F0001C6884421EBF491C9C6884421EBF491CF8 -:107100001C69844209D09C69491C844205D0491CF1 -:1071100020331029ECD310BC7047002342F83130E3 -:1071200002EBC1014B6010BC704778B4204C0023C7 -:1071300025462E688E421EBF5B1CAE688E421EBF67 -:107140005B1C2E698E4209D0AE695B1C8E4205D055 -:107150005B1C2035102BECD372BC7047054604EB4A -:10716000C303012A04BF59684D195D6072BC7047A2 -:1071700010B40F4A002113461C6884421EBF491CEC -:107180009C6884421EBF491C1C6984420AD09C69C9 -:10719000491C844206D0491C20331029ECD310BC72 -:1071A0000020704702EBC100406810BC704700002F -:1071B0004828002010B50446E068A169884251D3F0 -:1071C000218849F202030B40022B08D008044CBF6F -:1071D0004FF400704FF48440014321803BE001F400 -:1071E000C042B2F5C04F06D1A168884203D3204601 -:1071F000FFF732FF78BB208810F4406F02BF606851 -:1072000004F14401884217D14FF40070FFF756FD96 -:10721000606030B904F144006060E060401CA06030 -:107220000AE0218841F040012180E060606100F5C2 -:1072300000726068A260E06160682061A068A0617F -:10724000207841070AD502220021204600F00CF8E0 -:1072500010F1010F02D14FF0FF3010BD208840F433 -:10726000C0402080002010BD70B504460D46164673 -:10727000AFF3008033462A4600212046FFF746FE42 -:1072800005462046AFF30080284670BD2DE9FC4D31 -:10729000016800F10805490805EBC102019200F1FF -:1072A0000802406800F0010A02EBC108400808EB40 -:1072B000C00B00200021019A95422FD02A68AE18F9 -:1072C0006A68324400920835009A9642F3D016F963 -:1072D000014B009A964205D12A68AE186A6832447A -:1072E0000092083516F8017B884210D1D84508BFB6 -:1072F000FAF7E1FCD8F80000D8F80410BAF1000F52 -:1073000018BF48440144884208F10808EED0002C18 -:1073100000F8017B05D5641CE6D1D5E75846BDE8E9 -:10732000F68D641ED5D5CFE738B504000ED0207891 -:1073300010F0030F03D094F90300002809D5AFF330 -:107340000080204600F030F8AFF300804FF0FF30AF -:1073500032BD2046FFF780FE0546AFF3008020785F -:10736000410644BF606800F05DF80020606094F959 -:107370000300022804D900F057F808B14FF0FF3598 -:10738000E06B48B100F05CF808B14FF0FF35E06BFE -:1073900000F048F80020E063204600F005F8AFF365 -:1073A0000080284632BD000001780A0626D51C4A16 -:1073B00013680021834203D1002342F821301BE0EF -:1073C0005368012183421EBF022193688342F3D098 -:1073D000D368032183421EBF042113698342EBD08B -:1073E0005369052183421EBF0621936983421EBF54 -:1073F0000721D3698342DFD000F014B80021018057 -:107400004FF0FF31C17000F144014160C160016182 -:1074100041618161C161016200F1300141627047E7 -:10742000E8250020FFF7A0BC1CB5020000926946C9 -:107430000220ABBE04001000FFF756FE200016BD70 -:10744000E0B50090F9F7BEFE019069460E20ABBE94 -:1074500003B000BD38B50C46C5B22046AFF300807E -:10746000E068A169884204D32046FFF7A3FE002804 -:107470000FD4E068401CE06000F8015D2088010541 -:1074800003D440050BD50A2D09D12046FFF7E4FDB2 -:1074900028B12046AFF300804FF0FF3032BD2046C8 -:1074A000AFF30080284632BD00F024F8012810D048 -:1074B0000D4880470D480047F0B543464C465546B9 -:1074C0005E466746F8B40A4C6B462360BFF34F8FA5 -:1074D00030BF074C2468A546F8BC9846A146AA468A -:1074E000B346BC46F0BD0000296E00080D770008C9 -:1074F0003C2B00200249002008607047000000007B -:10750000402B0020FEE7FEE7FEE7FEE7FEE77047C0 -:107510007047704700F01CB80248FBF76FBC024888 -:10752000FCF732BAC828002024260020FEF7A4B8B1 -:10753000FEF7CCB800F014B80120FBF742BB1020D6 -:10754000FBF73FBB4020FBF73CBBFCF76EBF0000E6 -:10755000024841680278891841607047142600206B -:107560000449C8680A6882430A60486000F004B8A9 -:107570000000000000150058704719E050F8042B77 -:10758000D30744BFA9F101039A18091F0023042956 -:1075900042F8043BF9D25FEA817C134604D54FF0F0 -:1075A000000CA2F800C09B1CC90744BF0021197041 -:1075B00050F8041B0029E1D17047000038B50D4D8B -:1075C0000824286800281CBF017811F0030F05D09B -:1075D00090F90310002958BFFFF7A6FE2D1D641E69 -:1075E000EFD1BDE83840002200214FF0FF30FDF719 -:1075F000EDBF00BFE825002010B5074979441831D8 -:10760000064C7C44163404E00A68081D114488477F -:107610000146A142F8D110BD2C0000007800000006 -:107620004EF68851CEF20001086840F47000086000 -:10763000BFF34F8FBFF36F8F4FF00070E1EE100A72 -:107640007047000037FFFFFF2C05000024260020B4 -:1076500070080000300003200000000031FCFFFF34 -:1076600002000000020000004C01000002000000C7 -:10767000280003200800000015FCFFFF02000000A6 -:107680000200000032010000570100000814002031 -:107690001C120000000000000000000000000000BC -:1076A00000000000010000000200000003000000D4 -:1076B0000400000000F00DF8002801D0FFF79CFF47 -:1076C000AFF300800020AFF30080FBF752FC00F026 -:1076D00002F80120704700F001B800000746FFF7EC -:1076E0006DFF3846FAF7A0FBFBE738B504460D46B8 -:1076F000284600F005F8A84218BF0024204632BDF5 -:107700000149FFF7A7BE00BFBC240020AFF30080F3 -:10771000FFF786FFFFF7CEFF00002E004300FFF7C4 -:10772000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF78D -:10773000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF77D -:10774000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF76D -:10775000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF75D -:10776000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF74D -:10777000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF73D -:10778000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF72D -:10779000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF71D -:1077A000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF70D -:1077B000FEBF0000F800000181008100810081000F -:1077C00081008100810081008100810081008100B1 -:1077D00081008100810081008100810081008100A1 -:1077E0008100810081008100810081008100810091 -:1077F0008100810081008100BD00041C7700080128 -:10780000FD000388250020D80003E5100008FC00D7 -:1078100004D310000801F9001301040000B824008B -:1078200020B9240020B8240020B8240020FC000344 -:10783000B8240020FC0007B8240020A4240020E085 -:1078400000130204010178290020C82900207829AA -:10785000002078290020FC000378290020FB000686 -:10786000250020EC240020E0001302080202282951 -:107870000020782900202829002028290020FC0049 -:107880000328290020FC000748250020342500207B -:10789000DD00044800100048FD000D48E1540008D8 -:1078A000E7540008ED5400080FFD00000FFD000034 -:1078B0000FE5001B187700081877000818770008F4 -:1078C000187700081877000818770008187700085C -:1078D000F8FF0B1A7700081877000818770008FAE5 -:1078E000FFEA00F8FFF4000B74240020BC24002001 -:1078F00004250020EB000B040048000400480004AD -:0D790000004801F9000010FC0002093D00E4 -:040000050800770D6B +:101E300011001820ABBEFBE72600020038B50400F5 +:101E400009D004F18005686808B900F01EF800F0B8 +:101E500021F8012801D1012032BDA06A08B100F0AB +:101E60002AF800F00AF821F02A01FFE7816000F06B +:101E70001BF8BDE8324000F03EBB2068416821F409 +:101E80009041416020688168704700212970204698 +:101E900000F0E8BC24206860206801684908490017 +:101EA0000160204600F0BCB92068016841F00101E2 +:101EB000016020467047204600F0BABA70B504466B +:101EC00004F180051346686820283DD169B31800E5 +:101ED0002BD02878012837D001222A7004F154062B +:101EE0002165338073800020E86021206860706A7B +:101EF000E8B1DFF82013C162DFF81C03716A0863E0 +:101F0000716ADFF8180348630020716A88632068EB +:101F1000216D00F12802706A00F069FD38B11020CF +:101F2000E8600020287020206860012070BD2168D2 +:101F3000402008620020287000F008F841F080017D +:101F400000F061FBF8D170BD022070BD206800F187 +:101F5000080151E8001F00F108027047216851E8AC +:101F6000002F7047206800F1080151E8001F00F1C0 +:101F7000080221F0400142E8001000287047F8B53F +:101F8000044640F60F002668F1693268B3680840DD +:101F900004F15C050ED1880602D5900602D4D80063 +:101FA00040F181806969002900F029812046BDE85F +:101FB000F4400847DFF8E006034204BFDFF8DC76B0 +:101FC0003A4270D0CF0707D5D70505D5012737622C +:101FD0002E6B46F001062E638E0708D5DE0706D568 +:101FE000276802263E622E6B46F004062E634E07DB +:101FF00008D5DE0706D5276804263E622E6B46F01C +:1020000002062E630E070AD5960601D4034206D0B7 +:10201000266808203062286B40F008002863080515 +:1020200009D5500107D526684FF400603062286B4F +:1020300040F020002863286B002833D0890607D59C +:10204000900601D4D80003D5696909B120468847B4 +:10205000286B21688A68510602D410F0280F1CD022 +:10206000204600F0EFFA00F0D1F811D5FFF77AFF23 +:10207000FCD1286A60B10FF2B1618163286A00F077 +:102080002FFD00280ED0286A816BBDE8F440084778 +:102090002046BDE8F24000F007BE204600F004FEF6 +:1020A00000202863F1BD286901286AD1CF0668D5D0 +:1020B000D00666D51020306200F0A8F82DD5296A28 +:1020C0000868406880B20028ECD02A889042E9DA9B +:1020D0006880086801688A061BD4FFF73FFF22F476 +:1020E000807200F08FF8F8D1206800F07DFAFBD103 +:1020F000FFF738FFFCD12020E86200202861FFF7BD +:102100002DFF22F0100200F07DF8F8D1286A00F0CF +:10211000B1FC29886888091A2DE028886988411A45 +:10212000688800281CBF88B2002868D0226852E85E +:10213000003F23F4907342E800300028F6D1206875 +:1021400000F1080200F1080352E8002FDFF8C40292 +:10215000024043E800200028F1D12020E86200205E +:1021600028616861226852E8003F23F0100342E8CA +:1021700000300028F6D12046BDE8F44089B200F0D6 +:1021800094BDC80209D5580207D54FF480103062BB +:102190002046BDE8F24000F003BE080609D510064F +:1021A00001D4180205D5A96949B32046BDE8F44019 +:1021B0000847480611D550060FD5FFF7CFFE22F08D +:1021C000400200F01FF8F8D12020A8620020A8618A +:1021D0002046BDE8F24000F0FCBD080206D55000E4 +:1021E00004D52046BDE8F24000F004BEC80148BF57 +:1021F000002A04D52046BDE8F24000F0FCBDF1BD48 +:1022000022F4F07241E800200028704720688168BD +:1022100048067047A5260008D7260008DD260008D6 +:10222000F8B50446DFF838052168DFF838C50A68D4 +:10223000DFF834750240A0680243206902436069F8 +:102240000243E06902430A6000254A68E06822F41C +:10225000405202434A60A369DFF8102591421CBF37 +:10226000206A03438E68DFF80805064033438B601D +:102270000FF2A416CB6A606A1B0940EA0313CB6213 +:102280006145DFF8F0044FF4004339D13F6807F0AF +:102290000307032F4DD8DFE807F0024643494FF00C +:1022A000010CE169B1F5004F4FF6F07740F0808006 +:1022B000BCF1010F09D0BCF1020F0AD0BCF1040F30 +:1022C00071D0BCF1080F71D099E001F04FF90028EE +:1022D00015D0626A616836F81230B0FBF3F04A0834 +:1022E00002EB4002B2FBF1F080B2A0F11001B94262 +:1022F000EAD20740C0F3420007432068C7607FE08E +:10230000914216D13F6817F4406723D0B7F5806F2C +:1023100009D0B7F5006F03D0B7F5406F06D008E0DD +:102320004FF0020C07E04FF0040C04E04FF0080CF3 +:1023300001E04FF0100C9142B3D1BCF1000F09D075 +:10234000BCF1020F0AD0BCF1040F15D0BCF1080F8C +:1023500015D054E001F002F9002851D0616A36F836 +:102360001120B0FBF2F6626802EB42018E4246D3C6 +:102370001103B14205D242E001F0A6F8ECE718469D +:10238000ECE75008002110EB062051EB166100230A +:10239000FEF7BAFFA0F54071DFF8DC2391422ED2A0 +:1023A0002268D0602CE001F08FF890E7184690E7A3 +:1023B000BCF1010F09D0BCF1020F09D0BCF1040F30 +:1023C00018D0BCF1080F18D019E001F0CFF8B8B15F +:1023D000626A36F812306168B0FBF3F000EB51002E +:1023E000B0FBF1F080B2A0F11001B94207D2216830 +:1023F000C86005E001F068F8E9E71846E8E701255C +:1024000004F1680001214180018000218160C160E8 +:102410002846F2BDFEFFFFEF0100020004000600A7 +:1024200008000A000C00100020004000800000019D +:1024300090F82810CA0706D502685368C16A23F4C9 +:1024400000330B43536090F828108A0706D50268C2 +:102450005368016B23F480330B43536090F82810CA +:102460004A0706D502685368416B23F480230B4367 +:10247000536090F828100A0706D502685368816BEC +:1024800023F400430B43536090F82810CA0606D586 +:1024900002689368C16B23F480530B43936090F8F8 +:1024A00028108A0606D502689368016C23F400534D +:1024B0000B43936090F828104A0610D502685368C1 +:1024C000416C23F480130B435360416CB1F5801FC2 +:1024D00005D15368816C23F4C0030B43536090F81B +:1024E00028100A0606D501684A68C06C22F400224A +:1024F00002434A607047F8B5044604F180050020A5 +:10250000E8606FF07E4701F0ADF80646206801688C +:102510000A0708D50097334600224FF400112046E1 +:1025200000F017F860B9206801684A070AD50097DB +:10253000334600224FF48001204600F00AF808B12B +:102540000320F2BD20206860A8600020E0662870AB +:10255000F2BD2DE9F041069C05460E4690461F4609 +:102560002868C1693140B1420CBF012000204045BC +:1025700026D114F1010FF3D001F074F8C01B84428E +:1025800000D33CB900F025F800F02DF8FCD100F0A4 +:102590001AF811E0286801684A07E1D5C1690A05FF +:1025A000DED54FF40062026200F013F800F01BF871 +:1025B000FCD100F008F8C16000210170032000E0A8 +:1025C0000020BDE8F08105F180002021416081609C +:1025D0007047296851E8002F22F4D07241E80020AA +:1025E0000028F6D17047286800F1080151E8001F63 +:1025F000490800F10802490042E80010002870472D +:10260000DFF87801014042E8001000287047000020 +:10261000026852E8003F23F0C00342E8003100297D +:10262000F6D1016801F1080252E8002F01F1080318 +:1026300022F4000243E800210029F2D12021C0F851 +:1026400084107047026852E8003F23F4907342E818 +:1026500000310029F6D1016801F1080201F10803F7 +:1026600052E8002F0E490A4043E800210029F2D128 +:10267000C16E012908D1026852E8003F23F010031F +:1026800042E800310029F6D12021C0F8881000214D +:10269000C1660167704700000100001020010004BE +:1026A000FEFFFFEF0146886A09680A68930610D4A6 +:1026B0000021A0F85610016801F1080252E8002F2D +:1026C00001F1080322F0800243E800210029F2D141 +:1026D0003BE000F07EBB806A00F0CABFF8B5846AB8 +:1026E00004F1840504F1560728686E6821688A6839 +:1026F000110606D5212804D1002038802046FFF796 +:1027000087FFFFF783FD06D5222E04D100203881F4 +:102710002046FFF797FFA86840F01000A860204609 +:10272000BDE8F24000F0C0BA806A00F15601002214 +:102730000A810A8000F0B8BA026852E8003F23F02C +:10274000800342E800310029F6D1026852E8003FD8 +:1027500043F0400342E800310029F6D17047000001 +:10276000F369FFCF00380140880000580080004026 +:10277000FFF4FF110024F40000FD0F00FEFF7FEFC7 +:10278000674981B00A6802430A60096808400090FE +:10279000009801B0704780B54FF40020FFF7F0FFBC +:1027A000002200212E2000F081FFBDE802402E20F3 +:1027B00000F09ABF00685B49884200D0704780B53E +:1027C0004FF48010FFF7DCFF002200212C2000F0E6 +:1027D0006DFF2C2000F088FF002200212D2000F04A +:1027E00065FFBDE802402D2000F07EBF30B58DB002 +:1027F000044601A8302100F0CDFF21684A4A9142E9 +:102800002ED100F0CBFF00F0C9FF484DA86B20F49B +:10281000407040F48070A8634FF480714FF4006002 +:102820000190099101A800F0CBFF08B101F05BF91C +:10283000A86B40F40040A8630022296841F480613D +:1028400029600021286800F480600090009803202F +:1028500000F02CFF032000F047FF204601F0E0F9D4 +:102860000DB030BD38B592B0044601A8142100F077 +:1028700091FF06A8302100F08DFF20682C49884286 +:102880004CD1002001210790069106A800F098FF86 +:1028900008B101F028F92748274D416941F48041EA +:1028A00041610222416901F480410091009901686F +:1028B00041F0010101604FF4C061006800F00100C7 +:1028C00000900098019101200390032107200491BA +:1028D0000590029201A94FF0904001F0B9F9174814 +:1028E00028600F2068601020A8600020E860802029 +:1028F000286100206861A861E8612862284600F02C +:102900001FF808B101F0EFF8A567AC6200220021C2 +:10291000242000F0CBFE242000F0E6FE13B030BDF2 +:1029200050000058000C0058002800405800005883 +:10293000003801404C000058C828002044000240E4 +:1029400038B5040001D1012032BD2168DFF8400311 +:102950004018142204F12405B0FBF2F2DFF834032E +:10296000E86192002A62022068700A68A0686FF32A +:102970000E120243E0680243206902436069024389 +:10298000A0690243E0690243206A02430A602046CC +:1029900000F058F9A068B0F5804F04BF00216160D5 +:1029A0002079696A00F03F0000F014F838B105287A +:1029B00005D2204600F05AF900F012F803E000209A +:1029C00028636863A8630020A86101206870002064 +:1029D000287032BD0860A96AE86A4860606870477C +:1029E000296B00200860696BA86B48607047F8B5D8 +:1029F000044604F1240600253078012801D1022084 +:102A0000F2BD01273770707801282FD10227777027 +:102A1000B561206807687F087F000760204600F0E6 +:102A2000F5F82168F06820B10A6842F00E020A60E9 +:102A300008E0086820F0040008602068016841F0A0 +:102A40000A010160706A0168CA0303D5026842F492 +:102A500080720260306B18B1016841F480710160CE +:102A60002068026842F00102026001E03570022530 +:102A70002846F2BD81B040B100F124014A78022A13 +:102A800005D00420886100200870012026E002683B +:102A9000136823F00E0313604A6A136823F48073EB +:102AA000136000680268520852000260012091F829 +:102AB0002020CB6902F01C02904058608A6AC86AE4 +:102AC0005060086B30B1026822F4807202604A6B79 +:102AD000886B5060012048700020087001B070477A +:102AE00038B500F1240200245178022903D00420D3 +:102AF0009061012428E001680B6823F00E030B604D +:102B000001680D686D086D000D60516A0B6823F453 +:102B100080730B60012192F82030D56903F01C030B +:102B200099406960936AD16A5960116B31B10B6841 +:102B300023F480730B60536B916B596001215170CA +:102B40001470516901B18847204632BDF8B500F1D3 +:102B500024010423CA6914680268156891F820608A +:102B600006F01C0603FA06F73C4210D06F070ED59C +:102B70001468A50603D4156825F00405156000F057 +:102B80003DF8C968002938D0BDE8F4400847022361 +:102B900003FA06F73C4213D0AF0711D51468A50617 +:102BA00005D4156825F00A05156001224A7000F069 +:102BB00025F800220A708968F9B1BDE8F440084799 +:102BC000082303FA06F6344217D02B0715D51368ED +:102BD00023F00E031360012291F82030CC6903F03A +:102BE0001C039A40626001228A614A7000220A70C6 +:102BF000096911B1BDE8F4400847F1BD91F8202002 +:102C0000CC6902F01C0293406360704778B5C56CD4 +:102C1000046D6C60446D14B1846DC56D65600125F3 +:102C200090F84440066C04F01C04A54075600468EC +:102C300063608068102802D1A260E16071BDA1606C +:102C4000E26071BD426C1449920801EB820181641B +:102C5000142201780839B1FBF2F1104AC26401F084 +:102C60001F01012202FA01F10165704701790C4A46 +:102C700001F03F0102EB81024265491E094A82656B +:102C800001F0030101228A40C26570470000000084 +:102C9000F8FFFDBF0000024000080240800802402B +:102CA000FC080240400902407047704710B500F12F +:102CB00080010A78012A01D1022010BD01230B7086 +:102CC00024224A600268136814686408640014606F +:102CD0000022426623F00053006803602020486011 +:102CE0000020087010BD70B500F01EF801D1022060 +:102CF00070BD00F01FF822F0604209E070B500F0EE +:102D000013F801D1022070BD00F014F822F06062C7 +:102D100011438160204600F01AF8206806602020E8 +:102D200068600020287070BD044604F18005287892 +:102D30000128704701222A702420686020680668F4 +:102D4000026852085200026020688268704730B5FD +:102D5000416E11B90121012214E001680FF2300423 +:102D60008A6889680FF23003520E02F00702490F99 +:102D7000655CA45C595C9A5CED00E40095FBF1F1A4 +:102D800094FBF2F268304180028030BD0000000008 +:102D90000101010307010000080402040801010108 +:102DA0007047000010B5002488B9114803600E4830 +:102DB0000E4B0360FFF782F8012805D007D30328E4 +:102DC00004D038BF022402E0012400E0032420469E +:102DD00010BD00680549884204D1054908680028EB +:102DE00018BF00477047000024260020003801402B +:102DF000382B0020704770474FF0B040006800F05B +:102E0000F000B02888BFB02070472DE9F0410400E1 +:102E100054D0207881064FF0B04538D5A868E968CD +:102E200010F00C0001F0030103D00C2808BF0129A9 +:102E300046D12868800702D5E06900283ED0FFF718 +:102E4000DBFF616A884207D2084600F0A0FB002839 +:102E500034D100F043FA0FE0286820F0F00001437D +:102E600029606968206A21F47F4141EA0021696094 +:102E7000606A00F08CFB08BB00F062FBDFF888178B +:102E80000860DFF88807006800F0BEFFB0B920785E +:102E9000C1070DD5A868E96800F00C00082801F00A +:102EA000030103D00C2808BF03292CD12868800314 +:102EB00040F11D816068002840F01981012006E280 +:102EC000E06980B1296841F0010100F0F3FA06469B +:102ED0002868800700F1088100F0C4FB801B0328EC +:102EE000F6D30320F3E128684008400000F0A6FB79 +:102EF0000646286800F0EEF9C9D000F0B3FB801B4D +:102F00000328F6D3EDE76068B0F5803F04D1296867 +:102F100041F48031296003E02A6822F480322A607B +:102F2000606860B100F09EFB06462868800300F1EF +:102F3000DE8000F097FB801B6528F6D3D1E700F018 +:102F400091FB06462868400C10F0010000F0CF808D +:102F500000F088FB801B6528F4D3C2E700F082FBF9 +:102F6000C01B0328C0F0F780BBE7E06878B1296890 +:102F700041F4807100F09EFA06462868400500F191 +:102F8000FD8000F06FFB801B0328F6D3A9E72868BB +:102F900020F4807000F052FB06462868800A10F08A +:102FA000010000F0C28000F05DFB801B0328F4D319 +:102FB00097E700F057FBC01B0328C0F0F18090E7B3 +:102FC00040F0010000F09BF907467068800700F1AF +:102FD000028100F047FBC01B0328F6D381E770682D +:102FE00020F0040000F08BF907467068C00810F06C +:102FF000010000F0FF8000F035FBC01B0428F4D373 +:103000006FE70528306806D140F004003060316871 +:1030100041F0010105E0400840003060316821F0D6 +:1030200004013160A06841F2893768B100F01AFBF1 +:1030300080463068800700F1F28000F013FBA0EBBF +:103040000800B842F5D34CE700F00CFB804630682E +:1030500000F040F900F0E38000F004FBA0EB080072 +:10306000B842F4D33DE700F0FDFA801B0328C0F01E +:10307000088136E700F0F6FA001B0328C0F0228131 +:103080002FE7286881010CD4296841F080712960FC +:10309000E86840F08050E86000F0E4FA04462868F0 +:1030A000810100F1138100F0DDFA001B0328F6D343 +:1030B00017E70C2930D0286820F080702860E96874 +:1030C00089088900E960E86820F08050E86000F035 +:1030D000C9FA04462868810140F1F88000F0C2FA7C +:1030E000001B0328F6D3FCE600F0F8F8CFE62078C2 +:1030F00081071AD5A868E96800F00C00042801F0DF +:10310000030104D00C2808BF02297FF42EAF2868E1 +:10311000400503D5E06800283FF4D0AE6968206917 +:1031200021F0FE4141EA006169602168DFF8E06456 +:1031300011F0180F38D0606900283FF450AFC9066D +:1031400070687FF53DAF800709D4706840F00100DA +:1031500000F0D5F80746706880077FF5FFAE70680D +:1031600040F0040000F0CBF80746706800070DD46B +:1031700000F078FAC01B0428F7D3B2E6686821692A +:1031800020F0FE4040EA01606860CEE77068A16907 +:1031900020F4706040EA0120706000F0ADF807464E +:1031A00000F097F87FF405AF2078410737D5DFF8B6 +:1031B00064743868C10529D400F0F0FA00F052FABE +:1031C00080463868C10521D400F04CFAA0EB080015 +:1031D0000328F6D385E6706820F0040070607068FC +:1031E000C00810F00100DFD000F03CFAC01B04283A +:1031F000F5D376E600F080F8074600F06AF8D3D001 +:1032000000F030FAC01B0328F7D36AE6A068012853 +:103210007FF4F7AE306840F00100306002E7A06A4A +:10322000002853D0A968EA68022801F00C017FF455 +:1032300040AFE36A02F00300984202BF02F0700060 +:10324000236B984214D1636BC2F30620984202BFED +:1032500002F47810A36B98420AD1E36B02F060602D +:10326000984202BF02F06042206C82423FF409AFF4 +:103270000C293FF423AE286820F0807000F0DEF9BE +:103280000646296888013FF5EEAEE968DFF8880355 +:10329000626B0140E06A0143206B0143A06B41EA8D +:1032A00002210143E06B0143206C0143E96028687F +:1032B00040F080702860E96841F08051E96000F0DA +:1032C000D1F90446286881017FF5D4AE0020BDE81D +:1032D000F0817068400810F0010070472968606A4A +:1032E00021F0F001014329606868216A20F47F40E1 +:1032F00040EA0120686070477068400840007060D4 +:1033000000F0B0B92DE9F8430400884644D0DFF856 +:103310000C6300F0CAF847D200F0CFF8074600F07F +:10332000C4F841D000F09EF9C01B0228F7D9032051 +:10333000B9E000F097F9401B022843D9F7E700F005 +:1033400091F9A0EB090002284CD9F0E700F08AF9C6 +:10335000A0EB0900022854D9E9E700F083F9401BEB +:1033600002285DD9E3E700F07DF9401B022867D908 +:10337000DDE700F077F9401B484577D3D7E703280E +:1033800002D13968890103E00028396802D1890730 +:1033900062D401E049055FD4012084E000F062F9C5 +:1033A000C01B022872D9C2E7207881074FF0B047CE +:1033B0000BD5B968A06821F0F0010143B96000F0B5 +:1033C00051F90546B868C003B3D52078DFF8345208 +:1033D00081060AD52968606921F0F001014300F0F7 +:1033E00069F8814628688003A9D5207841060BD565 +:1033F0002968A0690909090141EA101100F05AF889 +:1034000081462868C003A1D5207841070BD5B9684B +:10341000E06821F4E0610143B96000F023F905465A +:10342000B868800399D5207801070CD5B868216960 +:1034300020F4605040EAC100B86000F013F905467E +:10344000B86840038FD52078C10717D56068022877 +:1034500095D1396889039FD5B968890840EA810008 +:10346000B86041F2893900F0FDF80546B868616836 +:1034700000F00C00B0EB810F7FF47BAF306800F000 +:103480000700804505D200F018F8074600F00DF857 +:1034900084D100F055F85C49086000F0EBFCBDE811 +:1034A000F24300F0B1BCBDE8F283306800F00700E1 +:1034B00040457047296000F0D5B83168C90848EA2E +:1034C000C101316000F0CEB838B54FF0B044554D71 +:1034D000A16811F00C0106D1FFF78EFCC0F30310B8 +:1034E00055F8200032BD04294F4A05D008294F481D +:1034F00004D12168C90222D5104632BDE16801F02D +:103500000301022904D0032904D12168C90207D587 +:10351000104605E0FFF770FCC0F3031055F82000DB +:10352000E168E268E368C1F306214843C2F302118F +:10353000491C5B0FB0FBF1F05B1CB0FBF3F032BD3C +:1035400080B5FFF7C1FF3649FFE7394A0968C1F383 +:10355000031152F82110B0FBF1F002BD80B5FFF766 +:10356000EFFF00F010F8C1F3022106E080B5FFF78D +:10357000E7FF00F008F8C1F3C22112F8211001F0B2 +:103580001F01C84002BD26492A4A0968704770B524 +:103590002449274AB1282EBFC86AC0F3031051F846 +:1035A00020001849096801F00F0152F82110224A41 +:1035B000B0FBF1F0B0FBF2F0002400210FF2840226 +:1035C00052F8213083420AD2491C0329F8D90AE073 +:1035D00000F048F8801B03280DD3032070BD0FF2C4 +:1035E000740050F821400D4D2868C00844EAC0001E +:1035F00000F024F80646296801F00701A142E7D14E +:10360000002070BD08010058202600201C26002044 +:1036100090000058000400588C80C11100400058F0 +:1036200008000058547500080024F4000048E80120 +:10363000147500081C7D000840420F00286000F04F +:1036400011B8000012000000240000003600000045 +:103650004000000000000000010000000200000027 +:103660000300000001484068704700BF1426002096 +:10367000704700000901020081B002D43C48815427 +:1036800005E03C4802F00F02104400F8041C01B0B1 +:103690007047394A13684FF6FF0100020B4000F4EF +:1036A000E0601843354908431060704738B5324B25 +:1036B0001C68C4F30223C3F10704052C28BF0424AB +:1036C0001D1D072D34BF0023DB1E012505FA04F460 +:1036D000641E2140994005FA03F35B1E1A40114312 +:1036E000BDE83440C6E70000010007D4012200F025 +:1036F0001F01234B8A40400943F8202070470100F6 +:103700000BD4012200F01F011E4B8A40400943F8F0 +:103710002020BFF34F8FBFF36F8F704710B5401E4F +:10372000B0F1807F01D3012010BD174C60600F21E4 +:103730004FF0FF30FFF79EFF0022A26007202060BD +:10374000002010BD010007D4012200F01F010F4B23 +:103750008A40400943F820207047010007D4012225 +:1037600000F01F010A4B8A40400943F820207047AF +:1037700000E400E018ED00E00CED00E00000FA05C8 +:1037800000E100E080E100E010E000E000E200E0A5 +:1037900080E200E0002200F083BB000002480168E4 +:1037A00041F480710160704700040058DFF87C210B +:1037B0001368010C23EA014343EA00431360704796 +:1037C0002DE9F041054600272868DFF8646101050E +:1037D000B8462FD53468286A04F44074844229D04E +:1037E000FFF7DCFF002C316805D1286A21F4407115 +:1037F000014331601DE0306840F48030306021F4D6 +:103800004071326822F480323260286A01433160AC +:103810003068C0070DD5FFF725FF044641F289380F +:103820003068800705D4FFF71DFF001B4045F7D324 +:103830000327B8462878DFF8FC40C10705D5E16FBB +:103840006868890840EA8101E1672878810705D521 +:10385000E16FA86821F440610143E1672878C1065F +:1038600044BF2869FFF7A2FF2878810644BF686932 +:10387000FFF79CFF287841070AD5E868E16F020945 +:1038800002F47F220001914300F47F200843E067A7 +:10389000286881051ED5A869B0F1804F18BFB0F126 +:1038A000004F00D018B9E16F21F0404108E0E16F0E +:1038B00021F04041E16720F08050E16F21F040614C +:1038C0000843E067A869B0F1C05F03D1216841F007 +:1038D00080712160286841050DD5E16FE86921F00C +:1038E00040510143E167E869B0F1005F03D121680D +:1038F00041F4803121602868C10405D57168686A87 +:1039000021F4404101437160286881040BD5A1690D +:10391000E86A21F030010143A161A169A86A890820 +:1039200040EA8101A1614046BDE8F081880000586D +:10393000900000580C000058594900E0594981B0E6 +:103940000A6802430A60096808400090009801B0C4 +:10395000704780B500F07AFA00F0BCFA00F018F871 +:1039600000F048F850485149016000F063FD042020 +:10397000FFF7E4FF0120FFF7E1FF00F0A3F800F0FC +:103980004EF800F065F800F0B9FA00F0DDFBFCE756 +:1039900080B598B007A84421FFF7FCFE68461C21BB +:1039A000FFF7F8FEFFF7FAFE4148016821F0180121 +:1039B0000160072007904FF48031089101200990A1 +:1039C0004FF480710A9140200B900021119107A8BB +:1039D000FFF71BFA6F200090022100200191029056 +:1039E000039004900590069001216846FFF78AFC39 +:1039F00019B000BD10B58CB068463021FFF7CAFE83 +:103A00004FF480400990022110200B904FF4405455 +:103A10000A9100946846FFF7D3FE0CB010BD10B5B4 +:103A2000244C25482060002060600F20A06047F6ED +:103A3000FF70E06000202061A0616061204600F01E +:103A400031FD2046BDE810400022002100F058B8AA +:103A500010B51A4C1A4820604FF4E1306060002025 +:103A6000A060E06020610C2060610020A0614FF444 +:103A70000040E061002020626062A0622046FEF704 +:103A8000DDF900212046FFF72EF900212046FFF73F +:103A900035F92046BDE81040FFF708B900000000E6 +:103AA000480000584C000058C8290020000C00585D +:103AB00090000058302A00200028004024260020D2 +:103AC0000038014080B50420FFF736FF0120FFF7E2 +:103AD00033FF00220F210E20FFF7E8FDBDE8024072 +:103AE0000E20FFF701BE70478A60FF210268516215 +:103AF000012180F82110002180F82010002070475B +:103B00002DE9F84300F065F808BF022038D000F036 +:103B100067F814D5FFF7A6FD07462068C168480777 +:103B20000DD5FFF79FFDC01B4845F6D300F039F8CF +:103B300026E0FFF797FDC01B484507D3F6E700F0E6 +:103B40002AF800F065F8FFF78DFD07462068C16888 +:103B50004A07EED5C0F81480206800F013F82A4810 +:103B6000016841F4002101602848026842F4002203 +:103B700002602068816841F48041816000F01BF898 +:103B8000BDE8F2838168C908C90081602068816846 +:103B90000D43856070472068816821F480618160F1 +:103BA000704720684662032184F82110002084F8C1 +:103BB0002000032070472068816841F480618160A3 +:103BC00001212068466284F82110002084F820003A +:103BD00070470446884694F820000128154670472F +:103BE000012184F82010022084F82100CA202168D5 +:103BF0004862532022685062FF2620688168480589 +:103C000040F2E93970470000800800580008005869 +:103C10002068C16801F0800161F49061C160704763 +:103C200090F82010012901D102207047012280F86C +:103C30002020022180F82110CA21026851625321FC +:103C40000368596201688A6842F020024CE700006C +:103C50002DE9F84F4FF00009644A654B4FF00F080B +:103C600005460E4633E0634FBD4214BF07270427C5 +:103C70008F4027434CF82E70C1431C6801EA040CA6 +:103C80007468E40248BF40EA0C0CC3F800C05C68EA +:103C900001EA040C7468A40248BF40EA0C0CC3F8A3 +:103CA00004C0146801EA040C7468E40348BF40EAE5 +:103CB0000C0CC2F800C0546801EA040C7168890356 +:103CC00048BF40EA0C0CC2F804C009F10109316890 +:103CD00031FA09F078D0012404FA09F414EA010059 +:103CE000F3D04FEA490C032101FA0CF16FEA010EFF +:103CF000716801F00307012F1CBF01F003010229C5 +:103D000011D1A968F7680EEA010107FA0CF73943E7 +:103D1000A960696821EA04047168C1F3001101FA1D +:103D200009F10C436C604FEA8901347904F0030413 +:103D3000032C1FD0EC68B7680EEA040407FA0CF7EE +:103D40003C43EC60347904F00304022C12D14FEAB6 +:103D5000D90705EB870401F01C07D4F820A008FA66 +:103D600007FB2AEA0B0AD6F810B00BFA07F747EA66 +:103D70000A0727622C680EEA0407347904F003046A +:103D800004FA0CF43C432C60746814F4403F9CD05B +:103D9000DFF864C04FEA990E5CF82E7001F00C0158 +:103DA00008FA01F427EA0404B5F1904F08BF002790 +:103DB00009D0124FBD4208BF012704D0104FBD42A9 +:103DC0007FF451AF022753E7BDE8F18F81B0002A9D +:103DD00014BF8161816201B070470A4A13680342CF +:103DE0001CBF106000F0C2B9704700008008005886 +:103DF0000008005800100048080001400004004876 +:103E0000000800480C08005870B50F4E0446307882 +:103E10000025A8B1FFF794FB32784FF47A71B1FB1B +:103E2000F2F1B0FBF1F0FFF779FC48B9102C07D2A2 +:103E3000002221464FF0FF30FFF738FCB46000E06D +:103E40000125284670BD00BF14260020114810B57A +:103E5000016841F4807101600320FFF71AFC002023 +:103E6000FFF7D2FF0024002814BF0124FEF793FCC3 +:103E7000204610BD084880687047084805E007489C +:103E8000016841F0020101607047016841F00101E1 +:103E9000016070470040005814260020042004E010 +:103EA00000B500BF130096469446103928BFA0E81D +:103EB0000C50FAD85FEA417C28BF0CC048BF40F8DC +:103EC000042BC90728BF20F8022B48BF00F8012B9C +:103ED00000BD000080B591484FF400410160002012 +:103EE00000F084FB48B180798D498E4A0A600A68E7 +:103EF00022F47C5242EA00220A6001BD10B58A48D1 +:103F00008A4C88B001680160CA218948C161532187 +:103F1000C161FF220168C908C9000160C26185480A +:103F2000016841F40041016000F072FB82480168C1 +:103F3000C908C90041F00401016000F085FB7F4918 +:103F4000002000F0FEFC00F048FE0121012000F0FE +:103F500064FB00F0C4F800F0D1F800F07DFF784A6F +:103F600000214FF4807001F0CEF804F23C500FF2C3 +:103F700035010090019169460FF22D0001F046F9DC +:103F800004F25470029004F5C96140F23C5005906F +:103F90000391049402A800F0E7FF00F05BFF08B073 +:103FA00010BD00007047000038B5044688B0616855 +:103FB00001F10B05684601F0EAF99DF802309DF821 +:103FC00001209DF800100FF2C01001F01FFA9DF8BB +:103FD00004100FF2D81001F019FA9DF80C309DF87A +:103FE0000B209DF80A100FF2E01001F00FFA28885C +:103FF0004FF41241401A0CD0401E3ED0401E4CD00F +:10400000801E57D0401E5AD0401E5BD0401E60D04C +:1040100063E004A81021FFF7BDFB60680D30007855 +:10402000F8B90FF2683001F0F1F900F0E5FD0D206C +:104030008DF810007F2143488DF8121004680FF2AC +:104040007C30240C214601F0E1F9ADF81C4004A8B5 +:1040500001F096F901F0EEF90021012000F0DDFAFF +:104060003BE0012806D10FF2743001F0CFF90020B7 +:10407000207032E00FF290302DE0606800F10D0406 +:104080000FF27020217801F0C1F92078002814BFC8 +:104090000FF2C4200FF288201DE00FF2441001F04F +:1040A000B5F9D5F80620D5F802100FF2601001F02E +:1040B000ADF912E0D5F802100FF2941006E00FF2FD +:1040C000C41008E0D5F802100FF2D41001F09EF9E8 +:1040D00003E00FF2042001F099F909B030BD80B57A +:1040E000002001F016FD012001F013FD022001F077 +:1040F00010FDBDE80240012001F034BD80B5012172 +:10410000002001F044FD0121012001F040FDBDE847 +:1041100004400121022001F03ABD00001040005887 +:104120009C000058FECAFECA9008005830000320C8 +:10413000082800400800005880040058302A002059 +:104140004F520008002004E001E0704700BF4FF02C +:10415000FF3000F071BF00214FF4807000F0E0BF2D +:10416000022001F003B8022001F008B8012804D0B1 +:10417000102804D0402804D0704701F07EBA01F026 +:104180008BBA01F08ABA0000576972656C65737367 +:10419000204669726D776172652076657273696F0A +:1041A0006E2025642E25642E25640A0057697265E9 +:1041B0006C657373204669726D77617265206275F4 +:1041C000696C642025640A00465553207665727335 +:1041D000696F6E2025642E25642E25640A0A00006E +:1041E0002D2D20424C45204E564D2052414D204809 +:1041F0004153204245454E205550444154454420AA +:10420000425920434D4F2B200A0000005348434998 +:104210005F5355425F4556545F424C455F4E564D85 +:104220005F52414D5F555044415445203A205374EC +:1042300061727441646472657373203D20256C78EB +:10424000202C2053697A65203D20256C640A0000EB +:10425000534843495F5355425F4556545F4E564D50 +:104260005F53544152545F5752495445203A204EAF +:10427000756D6265724F66576F726473203D2025BD +:104280006C640A00534843495F5355425F45565496 +:104290005F4E564D5F454E445F57524954450A00A4 +:1042A000534843495F5355425F4556545F4E564D00 +:1042B0005F53544152545F4552415345203A204E7A +:1042C000756D6265724F66536563746F7273203DDE +:1042D00020256C640A000000534843495F5355424F +:1042E0005F4556545F4E564D5F454E445F455241C3 +:1042F00053450A00534843495F5355425F4556545E +:104300005F4552524F525F4E4F54494620574954D1 +:104310004820524541534F4E202578200A00000086 +:10432000534843495F5355425F4556545F45525287 +:104330004F525F4E4F5449462057495448205245EA +:1043400041534F4E202D204552525F424C455F490C +:104350004E4954200A000000534843495F535542D8 +:104360005F4556545F4552524F525F4E4F54494637 +:10437000205749544820524541534F4E202D20424A +:104380004C45204552524F52200A000053484349A1 +:104390005F5355425F4556545F434F44455F524516 +:1043A000414459202D20574952454C4553535F46AF +:1043B000575F52554E4E494E47200A004442474DE2 +:1043C00043555F4765745265766973696F6E4944FA +:1043D0003D20256C78200A0A00000000534843491C +:1043E0005F5355425F4556545F434F44455F5245C6 +:1043F000414459202D204655535F46575F52554E34 +:104400004E494E47200A0000534843495F535542E6 +:104410005F4556545F434F44455F524541445920E0 +:104420002D20554E45585045435445442043415353 +:1044300045200A00F8B504460025ACB104F1340665 +:10444000307910B92046FEF7B5F90F4F384600F025 +:1044500021F8386840F001103860204600F007F875 +:1044600035600120307100E001252846F2BD10B50D +:104470000021064A064B00EB8104491C06296360B3 +:10448000E261F8D310BD0000000C0058FB110008D9 +:104490007F110008002101604FF03F1141603F2172 +:1044A0008160704738B5040044D094F8210028B9E1 +:1044B000002184F820102046FEF798F900F049F812 +:1044C000FF2510B100F03FF834E02168DFF8B000BC +:1044D0008A6802408A6021688A68636820690343A9 +:1044E000A06903431A438A602168E0680861206874 +:1044F0000169A26841EA024101612068C16821F0B6 +:104500008001C1602068C16C21F00201C164216892 +:10451000CA6CE369606903431A43CA64206881680E +:10452000880609D400F020F830B1206845620421E3 +:1045300000F01FF8012032BD20684562012184F897 +:104540002110002032BD20684562042184F821102A +:104550007047022084F82100CA2021684862532055 +:1045600022685062204626E020460BE02068C0F812 +:10457000248084F82110002084F820007047000077 +:10458000BFFF8FFF70B5044640F2E9362068C1686E +:1045900021F0A001C160FFF765F805462068C168F9 +:1045A000880606D4FFF75EF8401BB042F6D303201E +:1045B00070BD002070BD70B504462068C1684A0611 +:1045C00012D44FF0FF32C26040F2E936FFF74AF8EA +:1045D00005462068C168480606D4FFF743F8401B2B +:1045E000B042F6D3032070BD002070BD01460648DE +:1045F000064AC3798B4218BF904218BF0838F8D1D9 +:104600008B4218BF00207047F873FF1F0070FF1F18 +:104610000C48002101604160704710B500F00CF8B3 +:104620005C6819B1012904D1204301E024EA0000AB +:10463000586082F3108810BDEFF3108272B6014B00 +:1046400070470000FC2A00200248016841F4007114 +:104650000160704708040058DFF83C150A6892B200 +:1046600000E00246086880B28242FAD170472DE924 +:10467000FC4104461825DFF82485DFF824656843EB +:1046800008EB00073078062808D131787170347053 +:1046900078754FF0FF307060002039E000F077F857 +:1046A000B9680918B96008F10803B96832786A4333 +:1046B0009A589142327813D308F1150315FB02FC86 +:1046C00013F80C30062B25D008F108066B43F3587D +:1046D000994222BF08F115036A439A5CEED219E0B1 +:1046E0001146337869439A420BD008F1140308F15C +:1046F000150C5B5C15FB03F50CF805407A753B75F2 +:1047000000E07A7508F114025454317871703470F5 +:10471000BDE8F6811146694308F115035B5C062B81 +:1047200004D008F1140615FB03F574557B753A7532 +:1047300008F115025454EBE7F8B5DFF86434DFF8FC +:104740005C541E78182402466243B0422A4404D1C5 +:1047500018785870507D18700FE0167D507D92F8D3 +:1047600015C005F115076643062807F806C004D0F2 +:10477000167D143514FB00F42E55012010731878A3 +:10478000062802BF00294FF0FF315960F1BD10B576 +:10479000DFF80C44606810F1010F0FD0FFF75CFFE9 +:1047A0006168DFF80024814261683CBF5388C91802 +:1047B000081A517848431178C84000E0002080B2C0 +:1047C00010BD2DE9F84FDFF8DC53DFF8DCB3D5F886 +:1047D0000880D8F80000DBF800104A0500F090F9D6 +:1047E000DFF8BC63DFF8B4A321F4806181604FF08F +:1047F000180934780AF1080019FB04F14758FFF74B +:10480000C6FF874217D200270121B170062C3DD088 +:1048100019FB04F40AF108010AF10802095981425E +:1048200023BF0AF108010959091A002111510AEBA5 +:1048300004014C7DEAE7A9884118B94202D2AF8849 +:104840000021E2E73F1ADFE7022802DA2878012890 +:1048500000D07F1ED8F80000C1684A07FAD500F0E2 +:1048600055F9DBF80C00000CBFB247EA0047CBF863 +:104870000C70FFF7F1FE7060A8680068816841F471 +:1048800080618160AFF30080BDE8F18FB8B200288D +:10489000DAD1FFF7E1FE70600320BDE8F24FFEF7CA +:1048A00051BF2DE9F843EFF3108872B6BD4DBB4BF5 +:1048B000A8680168CA224A6253204862B84A8868D8 +:1048C00020F48060886018201678374647431F44DC +:1048D000387B022826D13C68D7F810909078F0B148 +:1048E0007A7B012A0AD101213046FFF725FF88F3A0 +:1048F00010887968304600F016F904E088F31088D3 +:10490000304600F0C1F8A8680068CA21416222461A +:10491000532141624846314600F050F90BE0FFF761 +:1049200050FF06E0C8684207FCD500F07EF89F49BA +:10493000086088F31088FF21A86802685162BDE80A +:10494000F183F8B5974CA160CA2209684A625322E4 +:104950004A62954A136843F020031360136803F01A +:104960000703C3F10403237095682D0C05F07F0540 +:104970006D1C6570EDB29268C2F30E02521C62802B +:1049800092B2521E6A43A2F5A072DA404FF6FF734C +:104990009A422CBFA380A280854A136843F4002367 +:1049A0001360844B1D6845F400251D6048BB7C489E +:1049B0007A4E0123837018254FF0FF3343600023A4 +:1049C0005FFA83FC06F10C0715FB0CFC4FF0000EA0 +:1049D00007F80CE05B1CDFB2062FF1DB0623037047 +:1049E000886820F48060886000F01FF8D0600320A1 +:1049F000FEF7B3FEA1680868826842F480428260D4 +:104A000005E0C868410544BF0320FEF79BFEA1688E +:104A10000A68FF205062002203210320FEF746FEB1 +:104A2000BDE8F2400320FEF75FBEC86800F08000DA +:104A300060F49060C8604FF400207047F0B5044601 +:104A40000025EFF3108672B61827DFF850C10CF17D +:104A50000C0007FB05FE10F80E0010B16D1C062DB2 +:104A6000F5DB062D0CD06F430CEB07000127077315 +:104A700086F310880461427303600D700020F0BD5E +:104A800086F310880120F0BDF8B50746EFF31084D7 +:104A900072B60320FEF733FE424DAE683068CA217D +:104AA00041623A4653214162182043494243895C9E +:104AB00002291BD100213846FFF73EFE3848017815 +:104AC00006290ED1306838490A68530500F018F8F5 +:104AD00021F480618160C1684A07FCD500F016F8B6 +:104AE00004E04078884218BFFFF76BFEA9680A68A7 +:104AF000FF2050620320FEF7F7FD84F31088F1BD1C +:104B000002D5C1684A07FCD481687047C16801F0CA +:104B1000800161F49061C1604FF400202349086076 +:104B20000320FEF71ABE2DE9F04180460F464246AB +:104B300018201A4942438C18207B022804BF4046A3 +:104B4000FFF7A2FFEFF3108572B60320FEF7D7FD43 +:104B5000144EB0680068CA214162532141620220AC +:104B60002073A76067604046FFF781FD0C490A7813 +:104B70004978914202D0FFF724FE02E0A168081AAA +:104B8000A060FF20B1680A6850620320FEF7ACFD08 +:104B900085F31088BDE8F08128280040B426002065 +:104BA0002C2B0020E82A0020082800400C08005880 +:104BB0000008005880080058C02600201047000058 +:104BC000484900E0484981B00A6802430A60096820 +:104BD00008400090009801B0704780B5FFF74DF98C +:104BE000FFF74DF94148016841F48031016001F05F +:104BF00056F8BDE801400EE000B587B068460FF2F8 +:104C000038211C22FCF73CFB00F0E3F9684600F079 +:104C1000AFFB07B000BDF0B585B068461421FEF7C4 +:104C2000B9FD00260025002400210FF2DC0000EB76 +:104C3000C102907988B11368B3F1904F08D02C4F1E +:104C4000BB4208D02B4FBB4204BF9088044304E012 +:104C50009088064301E090880543491C2629E4DB3F +:104C6000002002900121032003900191B0B288B18D +:104C700000900120FFF7A4FF0120FFF7A3FF694682 +:104C80004FF09040FEF7E4FF0022B1B24FF09040A9 +:104C9000FFF79CF8A8B280B100900220FFF790FFC8 +:104CA0000220FFF78FFF124E69463046FEF7D0FF15 +:104CB0000022A9B23046FFF789F8A0B280B1009077 +:104CC0000420FFF77DFF0420FFF77CFF094D6946B4 +:104CD0002846FEF7BDFF0022A1B22846FFF776F86E +:104CE00005B0F0BD4C0000584C0100589008005829 +:104CF0000004004800080048FEF7AABE13460A4612 +:104D000001460020FEF74EB80000004801000000F8 +:104D10000000004801000000000000480100000001 +:104D200000000048010000000000004801000000F1 +:104D300000000048010000000000004801000000E1 +:104D400000000048010000000000004801000000D1 +:104D500000000048010000000000004801000000C1 +:104D600000000048010000000000004801000000B1 +:104D700000000048010000000000004801000000A1 +:104D80000000004801000000000000480100000091 +:104D90000000004801000000000000480100000081 +:104DA0000000004801000000000000480100000071 +:104DB0000000004801000000000000480100000061 +:104DC0000000004801000000000000480100000051 +:104DD0000000004801000000000000480100000041 +:104DE0000000004801000000000000480100000031 +:104DF0000000004801000000000000480100000021 +:104E00000000004801000000000000480100000010 +:104E10000000004801000000000000480100000000 +:104E200000000048010000000000004801000000F0 +:104E30000000004801000000000000000000000029 +:104E400000000000084D0008280003202C0003206B +:104E50002604040000F0D5BF6C486D49016001F1E3 +:104E60002002426001F13002826001F13C020262E4 +:104E700001F14402426201F14C02C26001F15402AC +:104E8000026101F17002426101F1740282618031BC +:104E9000C16100F0D4BF38B504465E4D284601F02C +:104EA00031F85A484068A1680160E168C1608560D6 +:104EB0005949416000F0DFFF58482AE080B5534867 +:104EC0004268136801211972406800F0DAFF00207F +:104ED00002BD38B5514C4F4D04E000F041F8009848 +:104EE00021688847284601F010F80028F5D031BD28 +:104EF0004A484168084738B50446494D284601F0FC +:104F000001F84248C068A1680160456000F0BEFF3A +:104F100044482168016061684160002032BD80B56D +:104F20003A48C268136810211972C06800F0B4FFD3 +:104F3000002002BD35483B4AC168C1681368086853 +:104F4000184738B5374C364D04E000F009F80098A2 +:104F500061688847284600F0D8FF0028F5D031BDA9 +:104F60006946284600F0FABF38B504462E4D28465B +:104F700000F0C8FF2D4800F0C5FF24480069A16873 +:104F80008160E168C160056121680160616841601C +:104F9000216941616169816131BD80B50146234864 +:104FA00000F0C6FFBDE802400FF2050000F07DBF33 +:104FB00038B5164C1D4D06E0FFF7D2FF0099206969 +:104FC000006900F0B5FF284600F09FFF0028F3D0ED +:104FD00031BD10B5164C204600F094FF0B484169D6 +:104FE0000C60BDE8104000F074BF1CB5104C06E02A +:104FF0006946204600F0B2FF009800F01BF82046FA +:1050000000F083FF0028F3D013BD00000000032050 +:10501000AC090320480A0320900803200C2B002031 +:10502000500A0320142B0020380A0320042B0020F0 +:10503000400A0320704700002DE9FC47604CDFF870 +:105040008491A5692840A0614FF0FF3A21694FF093 +:10505000010834E0521C54F83200616919400142E1 +:10506000F8D0616904EBC20608407168184001423B +:1050700008BFC6F804A07768384000F0A5F8606261 +:1050800008FA00F087437760EFF3108172B6626A26 +:10509000206908FA02F2D24310402061022004EB9A +:1050A000C00353F8086C1640401E43F8086CF6D154 +:1050B00081F31088606A59F8201088472169A36934 +:1050C00060690140194205D0E069216A084208BFC1 +:1050D0000022C0D0C4F824A000F051FFEFF31089E3 +:1050E00072B6216960690140A069014201BFE169AE +:1050F000206A0142FFF729F889F3108800F040FF89 +:10510000A561BDE8F38738B51446EFF3108572B694 +:1051100000F05AF82B4941F8204085F3108831BD42 +:1051200010B500F00BF804431C6153F831402043E4 +:1051300043F83100FFE782F3108810BDEFF31082CF +:1051400072B61F4B1C697047EFF3108172B61C4A90 +:10515000536923EA000005E0EFF3108172B6184AA4 +:1051600053691843506181F310887047EFF3108141 +:1051700072B6134AD3691843D061F4E7F8B5104CFE +:10518000666A256A374616F1010F0EBF0026012117 +:1051900001FA06F6206202E03046FEF7D7FF216AE8 +:1051A000E0690842F8D06762EFF3108172B6E269F5 +:1051B000206A8243E26181F310882562F1BD00001C +:1051C000C0250020C827002002460020110C090439 +:1051D00004BF1020120412F07F4F04BF08301202E7 +:1051E0000FF2180112F0704F04BF001D1201120FD0 +:1051F000C0F11F00895C401AC0B27047040302026C +:105200000101010100000000000000007FB50C4614 +:105210004D4D61684D4EE8612962284600F0B2FEAE +:105220002468746006F1080000F06CFE012000F0B4 +:1052300068F801203070296841B10FF2E9000FF2DF +:10524000ED02009001920294684688477FBD1FB529 +:105250003E4C04F1080000F058FE00BB2178F1B18B +:10526000694604F1080000F079FE3748C16949B188 +:105270000098029001228DF8042001A888479DF82B +:10528000040000E001202070207818B10098FFF79A +:1052900084FE04E0009904F1080000F03FFE04F1F0 +:1052A000080000F032FE28B9207818B104F1080097 +:1052B000FEF751FF1FBD2DE9F04105460E46904611 +:1052C0001C46002000F01DF8204F7868A0F8095017 +:1052D000C672324641460C30FBF7C2FF1A4A1369C8 +:1052E00000210020984748F2E800FEF73CFF79686B +:1052F0008A78D21C04F10800FBF7B2FFBDE8F04148 +:1053000001201CB51049124C096A20B901B1884727 +:105310000020207013BD0120207011B1BDE81C4099 +:10532000084713BD0020FEF71BBF000010B5014663 +:10533000064C04F1080000F0FBFD04F10800BDE894 +:105340001040FEF708BF0000542A0020D82A002091 +:105350004C2B0020FFF7AFFF9DF80E0005B000BDFD +:10536000F8B500F10C026B4625214FF66640F1E7D7 +:10537000F8B500F10C026B460F214FF66840E9E7E3 +:10538000F8B502466B460E214FF67540E2E770B560 +:105390001B491C4B0A681C49C2F30D0201EB820138 +:1053A0000C6822689A4205D16569A169E269E368DF +:1053B000246904E025696169A2696368A4682E0E06 +:1053C000067001722E0C467042722E0A8670C473EB +:1053D000C5F3031605F00F050571C6700D0E457176 +:1053E0000D0C85710D0A190E8172C571190CC172EF +:1053F0001B0A210E41730373210C8173002070BDC1 +:105400003C400058B95646A9000003200EB4C0B570 +:10541000024603A800210190009101AB012104483C +:1054200078440C30FAF78AFE06BC5DF810FB00BF2A +:105430004329000018B58FB002A80FF28C61DFF885 +:1054400000443422FBF71CFF0FF24540019000940A +:1054500069460FF2254000F09FFD01210220FFF771 +:10546000DCF8DFF8E02300211020FFF74CFE02A853 +:10547000FFF776FF08B1FEF736FB00F00FF900F0FA +:105480006FFE0FF2293200210120FFF73CFE0FF2E0 +:10549000593200210220FFF736FEDFF8AC4300202E +:1054A00084F88000202000F003FF00F033FF0FF2AB +:1054B000AD33002204F181010020FFF7BFFA10B0E4 +:1054C00010BD2DE9F043074685B07878DFF87843C2 +:1054D000DFF8786305284FF0000804F1800554D008 +:1054E0003E2863D0FF280DD101203072B7F80300A9 +:1054F000042842D040F20741884204D040F602011D +:10550000884218D0A6E07879022804BFB97900292A +:10551000F8D1002000F02BFB0FF28830FFF776FF68 +:10552000A878012806D12978062903D00021022075 +:10553000FFF7F6FD8EE0002000F0BAFEF879307338 +:1055400001253889F08179893182BA897282FB8993 +:10555000B382388A04950090F082357BE08A039507 +:1055600010260296019601F019FA10B1022000F0FF +:10557000F9FA202000F09CFE6CE0012000F0F2FA25 +:1055800068780A21FFF7CFFA64E0B888E18A884298 +:1055900060D1A4F8168085F800800FF23830FFF74C +:1055A00035FF0120307200F059F853E0F8780128F7 +:1055B00002D002281DD04DE0B7F80500E082062099 +:1055C00028700FF23830FFF721FF86F8088000F0CE +:1055D00045F8E08A01F071FA30B90FF24830FFF770 +:1055E00015FF0FF2743001E00FF29C30FFF70EFF51 +:1055F00030E097F80D90787960BB29E007EB080060 +:10560000847BC07BFF2821D1072C1FDB07EB080020 +:10561000007C01281AD10FF2B030FFF7F7FE07EB3C +:105620000800407C832811D10FF2BC30FFF7EEFE5A +:105630000120A870F8793070387A7070787AB0707C +:10564000B87AF070F87A3071387B7071641CA044BD +:10565000C845D3DB012005B0BDE8F083E08A708146 +:1056600006F1080000F077BE7749CA8A824202D16B +:1056700091F8800070470020704780B500F08BFFE4 +:10568000062805D0BDE8044000210120FFF748BDF1 +:10569000BDE8014000F071BE7047704718B589B091 +:1056A0000020ADF81A0001F0C6FA694C216811F12A +:1056B000010F0DD0674862680170120A090A417033 +:1056C00061688170C270110A120C0171427105E0AB +:1056D0000020FEF78BFF08B90FF2C4300246062106 +:1056E000002000F0B0FD4EF66E50089007AA20682A +:1056F000554C079006212E2000F0A5FD0FF2A83290 +:105700001021182000F09FFD0FF2AC32102108206C +:1057100000F099FD1821012000F0BCFD01F086F990 +:105720000DF1160006A90190009105AB072200219A +:10573000042001F0F0FA0FF2D420BDF81810009008 +:105740000623BDF81400002201F087F90DF11A00BC +:1057500000900223BDF81610BDF81400002201F0DD +:105760007CF90120207001F08AFA0120607001218B +:1057700008202071A1701020607100210120E070CC +:10578000049110213448A060039008220120019167 +:105790000092029000230122012101F089FAA078F1 +:1057A00008B101F0E8FA0AB010BD0000264890F8F0 +:1057B0008010062900D1704780B5002000F0D2F992 +:1057C0004FF4487101230022084601F0EBFA10B9AA +:1057D0000FF2402004E0022000F0C4F90FF2642030 +:1057E000BDE80240FFF712BE18B587B00FF2842063 +:1057F000154CFFF70BFE94F8800006281DD01021F1 +:10580000069105914FF4FA70049050210023029103 +:10581000282200200393019200904FF448710B4B13 +:105820000022084601F0EBFA08B9042003E0022048 +:1058300000F098F9002084F8800008B010BD000046 +:10584000A0080320D75F000844270020982A0020E2 +:105850008075FF1FF42A002007B20100012000F02C +:1058600086B900211020FFF75BBC0120FFF77EBC4A +:105870000120FFF783BC000010B50446616801F108 +:10588000080000F07DFC00B10120207010BD000078 +:1058900010B1012803D07047FF20FFF755BCFF204F +:1058A000FFF75ABC2D2D204741502047454E455209 +:1058B000414C20444953434F564552592050524F72 +:1058C0004345445552455F434F4D504C4554454424 +:1058D0000A0000000D0A0D2A2A20444953434F4E66 +:1058E0004E454354494F4E204556454E5420574946 +:1058F000544820534552564552200A000D0A0D2A9D +:105900002A20434F4E4E454354494F4E204556455D +:105910004E54205749544820534552564552200A68 +:10592000000000000D0A0D2A2A204741545420533C +:10593000455256494345532026204348415241434E +:1059400054455249535449435320444953434F56B5 +:1059500045525920200A00002A2047415454203A39 +:105960002020537461727420536561726368696E9C +:1059700067205072696D6172792053657276696330 +:105980006573200D0A0D0000424C455F4354524C94 +:105990005F4170705F4E6F74696669636174696FAF +:1059A0006E28292C20416C6C2073657276696365C2 +:1059B0007320646973636F76657279204661696CE0 +:1059C0006564200D0A0D00002D2D2D205354204D0F +:1059D000414E554641435455524552204944202D8D +:1059E0002D2D200A000000002D2D20534552564534 +:1059F00052204445544543544544202D2D205649BA +:105A000041204D414E2049440A000000503250438D +:105A10004C490000200D0A0D2A2A205354415254AB +:105A20002047454E4552414C20444953434F56452B +:105A3000525920285343414E29202A2A20200D0A5A +:105A40000D0000002D2D20424C455F4170705F53CA +:105A5000746172745F4C696D697465645F446973E5 +:105A6000635F5265712C204661696C6564200D0A84 +:105A70000D0000000D0A0D2A2A20435245415445CD +:105A800020434F4E4E454354494F4E20544F2053D0 +:105A90004552564552202A2A20200D0A0D000000AA +:105AA0006C7AD8AC57720000123456789ABCDEF08B +:105AB000123456789ABCDEF0FEDCBA0987654321C1 +:105AC000FEDCBA09876543210000000000000000E9 +:105AD0000000000000000000000000001E000400A4 +:105AE0000A05020112279C00F4010000FFFFFFFFDE +:105AF000480101000020000000000000494981B079 +:105B00000A6802430A60096808400090009801B0E2 +:105B1000704778B585B0044668461421FDF73AFE13 +:105B20000220FFF7EBFF00F011F800950120019033 +:105B30000021022003900291694656F82400FEF7E6 +:105B400087F800F009F8002006B070BD0FF2F400ED +:105B5000354E30F81450704756F82400002229467C +:105B6000FEF734B980B500F00AF8012203E080B5F1 +:105B700000F005F80022FEF729F9002002BD0FF21F +:105B8000C401294B31F8101053F820007047F0B5CC +:105B900085B005460C4668461421FDF7FBFD2DB186 +:105BA000012D08BF102002D0022D02D10120FFF7E5 +:105BB000A5FF0FF298001D4F30F81500009001214D +:105BC0000220039007EB8506029130682CB9002172 +:105BD00001916946FEF73CF820E04FF40411019171 +:105BE00007EBC5046946FEF733F80FF26C0050F876 +:105BF000251004F1240001F07CF9F268002104F181 +:105C0000240001F06FF90FF24C004457B1690022F3 +:105C10002046FDF74BFD2046FDF766FD002005B050 +:105C2000F0BD00004C000058082600204C25002044 +:105C3000002000F017B8012000F014B8022000F096 +:105C400011B8000020000100020000000100100057 +:105C500040000000060A17000000001604000016AD +:105C6000060000167047000038B5EFF3108472B6D6 +:105C7000284D6946281D01F05BFA6946281D01F090 +:105C8000B5FA38B184F31088BDF80010224AFFF746 +:105C900035F831BD0120287084F3108831BD80B5FE +:105CA000FFF72AF80221009100231A4800F124018D +:105CB0004FF48052001D01F022F901BD00BFF8B57C +:105CC00014460026EFF3108510F1010F1ED00128B5 +:105CD0001CBF02284FF0FF3618D1BCB1264672B661 +:105CE0000C4F012392B2381D01F01DF900281CBF92 +:105CF0003978002908D000223A7085F31088A1B2C3 +:105D0000054AFEF7FBFF01E085F310883046F2BD3F +:105D10000000000008140020695C0008C06808400A +:105D2000884201D10120704700207047C0690840B7 +:105D3000884201D1012070470020704710B5684C9F +:105D400002212046FFF7F2FF38B16068C0438107A7 +:105D500003D5FFF7F6F8022018E001212046FFF7EF +:105D6000E5FF38B16068C043C10703D5FFF7B1F85C +:105D700001200BE008212046FFF7D8FF38B160680A +:105D8000C043010703D5FFF730F90820A06010BD1C +:105D900010B5534C02212046FFF7C0FF58B9606888 +:105DA000C043810307D5606840F400306060BDE8FF +:105DB0001040FFF7BFB808212046FFF7AFFF70B9CA +:105DC0006068C04301030AD56068464940F400207A +:105DD0006060086880474FF40020A06010BD20215B +:105DE0002046FFF79BFF58B96068C043810207D582 +:105DF000606840F400106060BDE81040FFF778B8BC +:105E000010BD394881B0016841F48011016000681B +:105E100000F48010009000983448016841F400714B +:105E200001603348026842F40072026040BF20BF44 +:105E30003048016841F40041016001B0704780B50D +:105E40002D48016841F480110160006800F4801061 +:105E5000009000982248016841F001010160026849 +:105E600042F4803202602C20FDF73EFCBDE8024087 +:105E70002D20FDF739BC214801684908490001601F +:105E800070471F494FF48030086070471B48016815 +:105E900021F002010160704718484FF40031416061 +:105EA000016821F400310160704738B504460C4D9B +:105EB00008212846FFF732FF30B10A4804606868BD +:105EC00020F40020686031BDA0474FF40021A96094 +:105ED00031BD0A48016821F00801016070470000E7 +:105EE000000C0058342B002050010058D4080058F2 +:105EF000200800580C04005850000058040C0058AA +:105F0000080C0058006040607047EFF3108172B6D3 +:105F1000026882420CBF012000201CE0EFF31082D7 +:105F200072B603680B60486001600868416023E056 +:105F3000EFF3108272B6086043684B6041604868B6 +:105F4000016019E0EFF3108172B6426803681360D4 +:105F500002684368536081F31088704710B5EFF30F +:105F6000108472B602680A600068FFE7FFF7EAFF74 +:105F700084F3108810BD0B6082F31088704770475F +:105F8000704700000249016002490161704700BF8B +:105F9000F74E00081F4F00087FB50C466D4D616835 +:105FA0006D4EE8612962284601F06CF9246805F11C +:105FB0002400FFF7A7FF746006F10800FFF7A2FFB7 +:105FC00001203070296829B10FF255100090029419 +:105FD000684688477FBD1FB55F4C04F10800FFF796 +:105FE00094FF00BB2178F1B1694604F10800FFF786 +:105FF000B5FF5848C16949B10098029001228DF857 +:10600000042001A888479DF8040000E001202070CA +:10601000207818B10098FEF7C0FF04E0009904F161 +:106020000800FFF77BFF04F10800FFF76EFF28B9B7 +:10603000207818B104F10800FFF713FC1FBD2DE90B +:10604000F8430646002000F05FF874883088B26894 +:10605000DFF80081C4F3090444EA8024F068A4B2A4 +:10606000C1B2204600F03CF8002748F2E809484653 +:10607000FFF7FEFB08E06888A04202D1316928786A +:106080000870687800B1012708F12400FFF73DFF90 +:10609000F0B9694608F12400FFF760FF009800F1AD +:1060A0000B05407A0F28E6D0B5F80110A1420DD1BA +:1060B0000098817AC81E7169C0B28842C8BF08467C +:1060C000706102463069E91CFBF7CAF82878D9E705 +:1060D0003800CCD0012000F017F80020BDE8F28392 +:1060E00010B513461C4A5468A4F80900E1720A4628 +:1060F000194604F10C00FBF7B3F8164A1369BDE822 +:1061000010400021002018471249096A82B008B9DE +:1061100021B101E011B1012002B0084702B070477F +:1061200010B50146487A0F2818BF0E2807D10B4832 +:10613000FFF7FEFEBDE810400020FFF796BB064CBF +:1061400004F10800FFF7F4FE04F10800BDE8104078 +:10615000FFF787BB042A0020C82A0020282A002035 +:1061600023490020087700222248027100F044B839 +:1061700020490A7941F822000879401C08717047CB +:1061800070B504466078FF2802BFB4F8031001F42C +:106190007F41B1F5406F1FD10025154E317FE8B228 +:1061A000884222D2E9B256F82110204688470028BA +:1061B00008BF6D1CF2D018E0761C2979F0B2884235 +:1061C0000AD2F1B255F82110204688470100F3D0D9 +:1061D00002D0022805D006E02046BDE87040FFF757 +:1061E00070B9002070BD012070BD0026014DE4E7AC +:1061F000782A0020242B002080B501F04DF801F012 +:106200004CF801F04BF801F04AF801F049F801F0C0 +:1062100048F801F047F801F046F801F045F801F0C0 +:1062200044F801F043F801F042F801F041F801F0C0 +:1062300040F801F03FF801F03EF801F03DF8BDE80C +:10624000014001F03AB818B50C46C7B0114600221B +:106250008DF800208DF81C008DF81D4022460DF1B0 +:106260001E0001F02BF800F03FF83F200C21ADF8A4 +:106270000400ADF8061007A8012103900691A41CA4 +:10628000049400F041F800284CBFFF209DF8000066 +:1062900048B010BD00B5C7B000F01FF80F2000F0E7 +:1062A00028F800284CBFFF209DF8000047B000BD33 +:1062B00000B5C7B00021ADF81C008DF80010182201 +:1062C00001A801F001F8182000F013F800284CBFD5 +:1062D000FF209DF8000047B000BD00228DF800208F +:1062E0008DF81C008DF81D101822002101A800F067 +:1062F000EBBFADF8060007A9022004903F22012061 +:1063000003910690ADF80420CDF814D0002101A827 +:10631000FFF795BE80B50FF2B92200210420FEF7E9 +:10632000F2FE0FF2792200212020FEF7ECFED34886 +:1063300000210180C18081700121C17000210171A3 +:1063400001720FF24100FFF713FFBDE802400FF2A8 +:106350003030FFF75BB80278C84912B1012A03D088 +:1063600070474088C88070470020C880087A08B10C +:1063700000220A720020FFF7FABB00212020FEF75E +:10638000CFBE00002DE9F84F05466878FF2812D1EE +:10639000BA4CB5F80300618940F60442801A00F057 +:1063A0008B80801E4DD0001F06D0401F00F0B780AC +:1063B000401E00F0DD80EBE0B5F80560207A58B1B2 +:1063C0000846FFF751F9217A062908BF0028F2D1C3 +:1063D00020724FF6FF7060816681E879297A91FB1F +:1063E000F0F914285FFA89F9E5D14FF0100A002777 +:1063F0000FF2A8284FF64066F8B24845DBDA05EB05 +:106400000A0B9BF809009BF80A1040EA0120B042F1 +:1064100011D161894046FEF7F9FFABF10700017821 +:10642000427841EA0221A1818178C07841EA0021C5 +:10643000E181082121720AF106005FFA80FA7F1CCF +:10644000DAE7B5F80500814202BF1126E879152880 +:106450003CD1297A0FF2B8290FF27C2B481E287202 +:106460004FF6426A4FF64168287A0028A3D0A9194E +:1064700005F10A02487A11F8057D925D497840EAF3 +:10648000022047EA01276189404508D050450CD1D8 +:106490004846FEF7BBFF0A202072A78205E0584657 +:1064A000FEF7B4FF0920207227821536287AA0F162 +:1064B00015012972F6B2D7E7B5F80500814201BF90 +:1064C00095F808B04FF00008E879012860D100275E +:1064D0000FF2802942F6021AF8B2B0EB9B0F57DA9E +:1064E00005EB080005F10A01C27A467A007B11F833 +:1064F000081042EA0022524546EA012609D1618984 +:106500004846FEF783FF207A0A2802D1E6820B2153 +:10651000217208F104005FFA80F87F1CDCE7B5F80F +:106520000500814202BFB5F80700A18A88422FD139 +:10653000687A022802BFA87A6070012828D1E87A18 +:10654000A0704CA448B9FFF712FB0FF28020FEF7B1 +:106550005DFF2046FEF75AFF1AE00FF2B020FEF76B +:1065600055FF2046FEF752FF0020FFF7FBFA0FE031 +:106570000FF22820FEF74AFF3FA0FEF747FF608991 +:10658000B5F80510884203D100210420FEF7C8FDAC +:106590000020BDE8F28F3948007A704710B50FF23D +:1065A000AC20364CFEF732FF32A0FEF72FFF2079E9 +:1065B000401E8041C00F2071207A38B1218A608945 +:1065C000E31CBDE81040022200F0E5BA10BD000057 +:1065D0001CB50120ADF802000021284C207AADF84E +:1065E0000010002844D0C01F052841D8DFE800F083 +:1065F0000308121823340FF29420FEF707FF13BD8F +:106600000FF2A020FEF702FFE289A189608900F065 +:106610006EFA13BD0FF2B420FEF7F8FE218A04E0F3 +:106620000FF2E420FEF7F2FEA18A60898A1C92B282 +:1066300000F06EFA13BD0FF21430FEF7E7FEE18AA8 +:1066400060890DF10203022200F078FA0620207220 +:106650000220FFF78CFA13BD0FF21830FEF7D6FEBA +:10666000E18A60896B46022200F068FA06202072F7 +:1066700013BD0000200A0D000A000000B02A00200F +:106680002D2D2050325020434C49454E5420494E28 +:10669000495449414C495A4544200A002D2D204770 +:1066A000415454203A205032505F5345525649438A +:1066B000455F5555494420464F554E44202D206393 +:1066C0006F6E6E656374696F6E2068616E646C6571 +:1066D0002030782578200A002D2D20474154542061 +:1066E0003A2057524954455F5555494420464F5525 +:1066F0004E44202D20636F6E6E656374696F6E204B +:1067000068616E646C6520307825780A00000000AE +:106710002D2D2047415454203A204E4F544946498C +:10672000434154494F4E5F434841525F5555494498 +:1067300020464F554E4420202D20636F6E6E6563BA +:1067400074696F6E2068616E646C6520307825789E +:106750000A0000002D2D2047415454203A20434C7C +:1067600049454E545F434841525F434F4E46494767 +:106770005F44455343524950544F525F5555494425 +:106780002D20636F6E6E656374696F6E2068616E35 +:10679000646C6520307825780A0000002D2D204794 +:1067A000415454203A204143495F474154545F507B +:1067B000524F435F434F4D504C4554455F565345F0 +:1067C00056545F434F4445200A000000202D2D20E1 +:1067D000503250204150504C49434154494F4E2073 +:1067E000434C49454E54203A204E4F544946494364 +:1067F0004154494F4E205245434549564544202D6A +:10680000204C4544204F4646200A0D00202D2D20C7 +:10681000503250204150504C49434154494F4E2032 +:10682000434C49454E54203A204E4F544946494323 +:106830004154494F4E205245434549564544202D29 +:10684000204C4544204F4E0A0D0000002D2D2050B5 +:106850003250204150504C49434154494F4E2043FF +:106860004C49454E5420203A20425554544F4E2016 +:10687000505553484544202D2057524954452054E3 +:106880004F20534552564552200A20005032505F47 +:10689000444953434F5645525F5345525649434529 +:1068A000530A00002A2047415454203A2044697377 +:1068B000636F766572205032502043686172616365 +:1068C0007465726973746963730A00002A20474112 +:1068D0005454203A20446973636F7665722044658E +:1068E0007363726970746F72206F66205458202D24 +:1068F00020577269746520436861726163746572C0 +:10690000697469630A0000002A2047415454203A00 +:1069100020446973636F766572204465736372699E +:1069200070746F72206F66205278202D204E6F7425 +:10693000696669636174696F6E204368617261633F +:10694000746572697469630A000000002A20474177 +:106950005454203A20456E61626C6520536572760E +:106960006572204E6F74696669636174696F6E0A3F +:10697000000000002A2047415454203A2044697303 +:1069800061626C6520536572766572204E6F746922 +:106990006669636174696F6E0A0000002DE9F84151 +:1069A000C7B04FF00008ADF81C00DDF838C14F9EAD +:1069B000509F519D529C8DF8008007A800F01AF856 +:1069C000A0F808C0ADF8266087818DF82A508DF8B0 +:1069D0002B4000F015F84FF4C17000F016F81020AD +:1069E00000F017F800284CBFFF209DF8000048B0C9 +:1069F000BDE8F0814180ADF82020ADF8223070472D +:106A00001822002101A800F05FBCADF8060007A91C +:106A1000704704903F22012003910690ADF80420B6 +:106A2000CDF814D0002101A8FFF709BB00B587B04D +:106A300000208DF8000000F07CF840F20110ADF865 +:106A400006003F220120069000F0EDF800284CBF20 +:106A5000FF209DF8000007B000BD30B5C7B01C4650 +:106A60004A9B00F0C7F800258DF800508DF82140B2 +:106A7000224619460DF1220000F020FC00F059F8E2 +:106A80003F204FF4837100F0BCF8A41D049400F083 +:106A9000CCF800284CBFFF209DF8000047B030BD67 +:106AA0000023ADF81C008DF8003007A841808280DB +:106AB0000021182201A800F007BC00B5C7B000F003 +:106AC00010F8FFF7F6FF0F2102914FF489700221B1 +:106AD00000F0A1F800284CBFFF209DF8000047B04F +:106AE00000BD0021ADF81C008DF80010704700B506 +:106AF000C7B0FFF7D5FF0F21029140F2151000F04B +:106B000089F800284CBFFF209DF8000047B000BD69 +:106B100000B5C7B0FFF7C4FF0F21029140F2171074 +:106B200000F078F800284CBFFF209DF8000047B027 +:106B300000BD1822002101A800F0C6BB18B5C7B0DF +:106B400000F011F800F045F8FFF7F3FF40F22111D3 +:106B500000F013F800F069F800284CBFFF209DF802 +:106B6000000048B010BD1446ADF81C00002207A874 +:106B70008DF80020418004717047ADF806103F2069 +:106B800007A9ADF8040003910F200121029006919E +:106B9000641D0494704718B5C7B000F010F8FFF7F3 +:106BA000C8FF3F2040F2231100F019F800F03DF833 +:106BB00000284CBFFF209DF8000048B010BD1446CF +:106BC00000228DF80020ADF81C00ADF81E108DF8E5 +:106BD0002040224619460DF1210000F06FBBADF8B0 +:106BE0000400ADF8061007A8012103900691641D6A +:106BF00004947047ADF81C00ADF81E108DF82020ED +:106C00007047ADF80400ADF8061007A80121039005 +:106C1000069170470621ADF80600049107A80121EE +:106C20003F2203900691ADF80420CDF814D0002146 +:106C300001A8FFF704BA00B587B000F010F80120F2 +:106C400003220690ADF80420ADF8062000F011F8FC +:106C500000284CBFFF209DF8000007B000BD0020B9 +:106C60008DF800001822002101A800F02DBB039030 +:106C70000691CDF814D0002101A8FFF7E0B900B5C6 +:106C8000C7B000F00CF8852000F0FCF800F0AEF87A +:106C900000284CBFFF209DF8000047B000BD002138 +:106CA0008DF81C008DF80010182201A800F00CBB14 +:106CB0002DE9F841C7B04FF0000800F026F80DF1BB +:106CC0002300DDF844E14E9F4F9E509D529C8DF86D +:106CD0001F30C0F800E08DF800808DF820708DF82E +:106CE00021608DF822508DF8274000F0EFF88620C3 +:106CF000ADF8060007A90C2000F074F800284CBF7E +:106D0000FF209DF8000000F0E6B88DF81C0007A8F1 +:106D1000417082707047F8B5C8B005460E461746F8 +:106D20001C4600F023F808A8467087708DF82050A4 +:106D300000F0C7F88A21ADF80A103F20032100F0C7 +:106D4000B3F8002848BFFF200ED49DF8000058B9C2 +:106D50004F994E98BDF801202280BDF80320028093 +:106D6000BDF805000880002049B0F0BD07220021D1 +:106D7000684600F0A9BA00B587B000F0AFF800F09F +:106D8000A5F8922000F009F800F030F800284CBF78 +:106D9000FF209DF8000007B000BDADF806003F22BF +:106DA0000120704718B5C7B000F011F800F08EF858 +:106DB0000F2102919720062100F06DF800F017F8DE +:106DC00000284CBFFF209DF8000048B010BD0024F3 +:106DD000ADF81C008DF8213007A8418002718DF8B4 +:106DE0000040704704903F22012003910690ADF8C7 +:106DF0000420CDF814D0002101A8FFF720B92DE917 +:106E0000F04F0646C7B008461946559CDDF840913C +:106E1000519DDDF848B1539FDDF85081DDF858A150 +:106E2000ADF81C60002307AE8DF800307080327121 +:106E30000DF12100062200F041FA8DF82790B5816E +:106E4000ADF82AB03782ADF82E80B482ADF832A00A +:106E500000F03CF83F20ADF804009C210F20029088 +:106E6000ADF806101820049007A9012003910690A0 +:106E7000FFF7BFFF00284CBFFF209DF8000047B080 +:106E8000BDE8F08FADF8060007A901203F2203916D +:106E9000049070470321ADF80600049107A8012172 +:106EA0003F22039006917047ADF80800059108A8AD +:106EB000072104900791CDF818D0002102A8FFF710 +:106EC000BEB81822002102A800F0FEB91822002145 +:106ED00001A800F0F9B948B0BDE8F08100208DF8B4 +:106EE000000070470346002009B95A60704701202E +:106EF000704708B90120704701600020704710B545 +:106F0000029C016042600021C160016141618161B8 +:106F10000381A107047704D5008910B14FF0FF3039 +:106F200010BD002010BD2DE9F04F064685B0308918 +:106F30000C460027BB4600287169DC460CBF4FF0A9 +:106F40000208D84681B168B930697768451CBD42EE +:106F500028BFED1B3768385C7D5D00EB0527BF1C43 +:106F6000BFB203E0074600E000B102463069F568B1 +:106F7000A84223BF7568281AC01B0020154608EBDD +:106F8000050903FB09FE864532BF0020B0FBF9FA74 +:106F900009FB1A00C0B2804509DA96F81C905FEA36 +:106FA000C97A48BF84465FEA897048BFC44610006A +:106FB00000F0B4807068714461448842C0F0AE80D3 +:106FC00008EB020080B20390D946100AADF8020027 +:106FD0000294ADF80020049359E0800740D5308931 +:106FE000002840F09B803268D018A34600F8024C7D +:106FF000200A32681A4402F8010C2246306818440C +:10700000FAF72EF9706920187061B069019C401C74 +:10701000B061200A31680C70316848701CE08CB394 +:10702000307FC207D9D5308940B931681944FF2073 +:1070300001F8020C3168194401F8010C4FF0000B03 +:107040007069241874612C463089002340B9316876 +:107050000C70210A3068417002237069801C7061D5 +:1070600008EB04070021BFB231615CB1DA44029839 +:1070700000EB0A01306822461844FAF7F1F870690B +:107080002418746109F10109B069401CB061049AC7 +:1070900070683169914545D2791881422CBF081A30 +:1070A0000846306103463089A0B93068BDF8001049 +:1070B000C1545B1C70683168834228BF1B1ABDF83D +:1070C0000200C8545B1C7068834228BF1B1A706999 +:1070D000801C706105FB09FA7468BDF80000E41AB1 +:1070E000844288BF0446029800EB0A01281BAC4288 +:1070F000019003D093D2307F002890D13768224688 +:10710000F818FAF7ADF8706920187061A346019C71 +:10711000039F0023A9E73068404400E0002005B049 +:10712000BDE8F08F88448045F5D3A8EB0008F2E76E +:10713000F8B5024600231089546900280CBF0225C7 +:1071400000250026002C4DD060B9D36857685E1C1E +:10715000BE4228BFF61B1768FB5CBE5D03EB06262C +:10716000B6B200E00646137F03F00303012B23D1E0 +:107170004FF6FF77BE4208BF002808D0D3681769D2 +:107180009F4219D2C0B15768FB1A834214D2566885 +:10719000D368A41B1C1900235461D36058B910682C +:1071A0000378012E94BFC6F101060126805D03EB32 +:1071B0000026B6B200E00646D76854681368E8199E +:1071C000A04228BF001B03445069801B401B506134 +:1071D00005D0F719ED19A54228BF2D1BD560906980 +:1071E000401E906101B10E801846F2BDF8B502460E +:1071F00000241089536900280CBF022500250026B1 +:10720000002B3AD0D468234658B95768661CBE4252 +:1072100028BFF61B176817F804C0BE5D0CEB0626E6 +:1072200000E00646177F07F00307012F1ED1B7B213 +:107230004FF6FF7C674508BF002807D15068002340 +:10724000012894BFC0F1010001200AE01769A7429C +:107250000CD258B157683C1B844207D20023064623 +:1072600004E014682678205C06EB00265068ED18D0 +:10727000854228BF2D1A1068441901B10E8020469E +:10728000F2BD00000249016002490161704700BF80 +:10729000974E0008BD4E0008704770477047704712 +:1072A0007047704770477047704770477047704726 +:1072B00070477047704770477047704710B5044675 +:1072C000F9F7CEFF204610BD10B5044610460A4619 +:1072D0000146204600F002F8204610BD62F30F225E +:1072E00062F31F42401810F0030308D0C91A1FD3DD +:1072F000DB0748BF00F8012D28BF20F8022D13003E +:1073000030B414461546103928BF20E93C00FAD89D +:10731000490728BF20E90C0048BF40F8042D890028 +:1073200028BF20F8022D48BF00F8012D30BC70475F +:10733000C91818BF00F8012DCB0728BF00F8012D90 +:107340007047000010B50446AFF30080204600F0FF +:1073500005F80446AFF30080204610BD7CB500F16F +:107360000F06F608F600B04240D2082E04D20826D6 +:1073700002E0083000F047F8DFF804512C682100E3 +:1073800005D1002007E00268B24221D2011D086841 +:107390000028F8D12068291D0A68824222D013688B +:1073A000B34238BF111DF7D312E093190B60801B55 +:1073B00054685C600B6818601660096800291DBF7E +:1073C00048680028081D0020286002F1080076BDEA +:1073D00061B10A681068A0F10803B342E5D25068B1 +:1073E0000860EAE700F04EF80028C2D1002076BD20 +:1073F00010B5040006D0AFF30080204600F003F87B +:10740000AFF3008010BD002800D1704750B4A0F148 +:1074100008021368072B2BD913F0070F28D1184C3B +:10742000616809B18A4202D25160626013E0486823 +:1074300000B3904238BF0146F9D31BE0964203D116 +:107440001B180B600A4606E0486810B113449842C6 +:107450000ED350604A60506850B11368D118814211 +:1074600006D1002121600168CB181360406850608C +:1074700050BC704708680E18B242DFD250BC70474B +:107480001C2B00200749086808B1002070470648F7 +:10749000C008C00008600549C908C900091A016090 +:1074A000704700BF482B00200F1000200814002058 +:1074B0001349002008604FF4E0221248016841F4AB +:1074C000700101604FF0B041086840F001000860B1 +:1074D0008A600D480A6802400C480A60036823F07D +:1074E00005030360426852085200426000220848C7 +:1074F000C860086820F4802008608A617047000036 +:1075000008ED00E088ED00E0FBFEF6FA940000587C +:10751000001004220100000003000000050000002C +:107520000100000001000000060000000A00000049 +:10753000200000000200000004000000080000001D +:10754000100000004000000080000000000100006A +:1075500000020000A0860100400D0300801A060012 +:1075600000350C0040420F0080841E0000093D00E1 +:1075700000127A000024F40000366E010048E80191 +:10758000006CDC02000000000000000000000000B1 +:10759000000000002DE9F04107468846387810F0D9 +:1075A000030F16461D4633D0384600F099F878BBD5 +:1075B000B8F1000F1CBFD8E900018619012D2ED1AA +:1075C0003888C10415D5396A07F14402384600F0FD +:1075D000A3F83A6B044602B93A69F968384600F0F4 +:1075E0009BF8361B341A7A69F968384600F094F82B +:1075F000261A1EB94DB916F1010F09D097F90300EB +:107600002A46314600F08EF8064616F1010F09D1E0 +:107610002320AFF300804FF0FF30BDE8F081022D52 +:10762000E8D1EBE7388810F4405F0ED07868F86056 +:1076300038617861B8617868F86107F144003862B0 +:1076400007F13000786200203863B8F1000F05D0F0 +:10765000D8E9020107F13402C2E9000139884CF689 +:10766000FF60014039800020BDE8F08170B505461B +:10767000AFF300802888810415D56E680024EA687D +:1076800095F903003146914212D2521AFEF716FBC9 +:1076900010F1010F1CBF00283618F0D10FE04DF695 +:1076A000FF70014029802846AFF30080002070BDA4 +:1076B00000220021FEF702FB10F1010F00D101248E +:1076C0006868E860A861E861002C2988E7D041F487 +:1076D000007129802846AFF300804FF0FF3070BD65 +:1076E000F8B5A0B9AFF3008000250A4E08244FF08A +:1076F000FF37306820B1FFF7B9FF002848BF3D468B +:10770000361D641EF5D1AFF300802846F2BDBDE8FA +:10771000F240ABE7E8250020914234BF511A002126 +:10772000084670473EB504000D00012A02D100F062 +:1077300063F807E0022A07D100940020019069460F +:107740000C20ABBE2D1801E0002A0CD1009401954D +:1077500069460A20ABBE002805D10022210028007E +:1077600000F027F801E00020C04303B030BD000066 +:1077700010B4314A002113461C6884421EBF491CC4 +:107780009C6884421EBF491C1C69844209D09C69C4 +:10779000491C844205D0491C20331029ECD310BC6D +:1077A0007047002342F8313002EBC1014B6010BC3E +:1077B000704778B4204C002325462E688E421EBFA9 +:1077C0005B1CAE688E421EBF5B1C2E698E4209D0C8 +:1077D000AE695B1C8E4205D05B1C2035102BECD3B0 +:1077E00072BC7047054604EBC303012A04BF596805 +:1077F0004D195D6072BC704710B40F4A00211346EA +:107800001C6884421EBF491C9C6884421EBF491CE0 +:107810001C6984420AD09C69491C844206D0491CD8 +:1078200020331029ECD310BC0020704702EBC100BC +:10783000406810BC704700004828002010B504467E +:10784000E068A169884251D3218849F202030B40C4 +:10785000022B08D008044CBF4FF400704FF4844052 +:10786000014321803BE001F4C042B2F5C04F06D194 +:10787000A168884203D32046FFF732FF78BB2088F7 +:1078800010F4406F02BF606804F14401884217D1D0 +:107890004FF40070FFF756FD606030B904F144000A +:1078A0006060E060401CA0600AE0218841F0400177 +:1078B0002180E060606100F500726068A260E061B4 +:1078C00060682061A068A061207841070AD5022283 +:1078D0000021204600F00CF810F1010F02D14FF00A +:1078E000FF3010BD208840F4C0402080002010BD33 +:1078F00070B504460D461646AFF3008033462A465F +:1079000000212046FFF746FE05462046AFF30080E3 +:10791000284670BD2DE9FC4D016800F108054908B5 +:1079200005EBC102019200F10802406800F0010A73 +:1079300002EBC108400808EBC00B00200021019AAF +:1079400095422FD02A68AE186A68324400920835F2 +:10795000009A9642F3D016F9014B009A964205D14F +:107960002A68AE186A6832440092083516F8017B1E +:10797000884210D1D84508BFFAF79DF9D8F8000021 +:10798000D8F80410BAF1000F18BF484401448842E7 +:1079900008F10808EED0002C00F8017B05D5641C26 +:1079A000E6D1D5E75846BDE8F68D641ED5D5CFE7BC +:1079B00038B504000ED0207810F0030F03D094F9EE +:1079C0000300002809D5AFF30080204600F030F80E +:1079D000AFF300804FF0FF3032BD2046FFF780FE4E +:1079E0000546AFF300802078410644BF606800F090 +:1079F0005DF80020606094F90300022804D900F0CB +:107A000057F808B14FF0FF35E06B48B100F05CF873 +:107A100008B14FF0FF35E06B00F048F80020E0635C +:107A2000204600F005F8AFF30080284632BD000084 +:107A300001780A0626D51C4A13680021834203D127 +:107A4000002342F821301BE05368012183421EBF0E +:107A5000022193688342F3D0D368032183421EBF7F +:107A6000042113698342EBD05369052183421EBF71 +:107A70000621936983421EBF0721D3698342DFD069 +:107A800000F014B8002101804FF0FF31C17000F107 +:107A900044014160C160016141618161C161016274 +:107AA00000F1300141627047E8250020FFF7A0BCDB +:107AB0001CB50200009269460220ABBE0400100013 +:107AC000FFF756FE200016BDE0B50090F9F77AFBEF +:107AD000019069460E20ABBE03B000BD38B50C4620 +:107AE000C5B22046AFF30080E068A169884204D3A4 +:107AF0002046FFF7A3FE00280FD4E068401CE0609A +:107B000000F8015D2088010503D440050BD50A2D3E +:107B100009D12046FFF7E4FD28B12046AFF30080ED +:107B20004FF0FF3032BD2046AFF30080284632BD13 +:107B300000F024F8012810D00D4880470D48004778 +:107B4000F0B543464C4655465E466746F8B40A4C87 +:107B50006B462360BFF34F8F30BF074C2468A546A8 +:107B6000F8BC9846A146AA46B346BC46F0BD000004 +:107B7000B1740008957D00083C2B002002490020CC +:107B80000860704700000000402B0020FEE7FEE781 +:107B9000FEE7FEE7FEE770477047704700F01CB84D +:107BA000FCF77FBE0248FAF7D1BF0248FAF7E7B9FF +:107BB000C828002024260020FEF7C0B8FEF7E8B849 +:107BC00000F012B80120FCF708B91020FCF705B945 +:107BD0004020FCF702B90000024841680278891889 +:107BE00041607047142600200449C8680A6882432F +:107BF0000A60486000F004B800000000001500585A +:107C0000704719E050F8042BD30744BFA9F10103D2 +:107C10009A18091F0023042942F8043BF9D25FEAAD +:107C2000817C134604D54FF0000CA2F800C09B1CC9 +:107C3000C90744BF0021197050F8041B0029E1D185 +:107C40007047000038B50D4D0824286800281CBF77 +:107C5000017811F0030F05D090F90310002958BFE7 +:107C6000FFF7A6FE2D1D641EEFD1BDE838400022AF +:107C700000214FF0FF30FEF721B800BFE8250020BB +:107C800010B5074979441831064C7C44163404E099 +:107C90000A68081D114488470146A142F8D110BD69 +:107CA0002C000000780000004EF68851CEF2000152 +:107CB000086840F470000860BFF34F8FBFF36F8F08 +:107CC0004FF00070E1EE100A7047000037FFFFFF31 +:107CD0002C0500002426002070080000300003203E +:107CE0000000000031FCFFFF020000000200000065 +:107CF0004C010000020000002800032008000000E2 +:107D000015FCFFFF0200000002000000320100002D +:107D100057010000081400201C12000000000000A1 +:107D20000000000000000000000000000100000052 +:107D300002000000030000000400000000F00DF845 +:107D4000002801D0FFF79CFFAFF300800020AFF3C5 +:107D50000080FBF7FEFD00F002F80120704700F004 +:107D600001B800000746FFF76DFF3846FAF75CF8E8 +:107D7000FBE738B504460D46284600F005F8A84252 +:107D800018BF0024204632BD0149FFF7A7BE00BF3F +:107D9000BC240020AFF30080FFF786FFFFF7CEFF83 +:107DA00000002E004300FFF7FEBFFFF7FEBFFFF706 +:107DB000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7F7 +:107DC000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7E7 +:107DD000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7D7 +:107DE000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7C7 +:107DF000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7B7 +:107E0000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7A6 +:107E1000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF796 +:107E2000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF786 +:107E3000FEBFFFF7FEBFFFF7FEBF0000F800000126 +:107E4000810081008100810081008100810081002A +:107E5000810081008100810081008100810081001A +:107E6000810081008100810081008100810081000A +:107E700081008100810081008100810081008100FA +:107E8000BD0004A47D000801FD000388250020D862 +:107E90000003E5100008FC0004D310000801F900FD +:107EA0001301040000B8240020B9240020B82400E5 +:107EB00020B8240020FC0003B8240020FC0007B8F0 +:107EC000240020A4240020E00013020401017829EA +:107ED0000020C82900207829002078290020FC00F3 +:107EE0000378290020FB0006250020EC240020E078 +:107EF00000130208020228290020782900202829DE +:107F0000002028290020FC000328290020FC00076D +:107F10004825002034250020DD00044800100048DA +:107F2000FD000D48315C0008375C00083D5C00082E +:107F30000FFD00000FFD00000FE5001BA07D0008F5 +:107F4000A07D0008A07D0008A07D0008A07D00089D +:107F5000A07D0008A07D0008F8FF0BA27D0008A00E +:107F60007D0008A07D0008FAFFEA00F8FFF4000B8E +:107F700074240020BC24002004250020EB000B0406 +:107F80000048000400480004004801F9000010FC0B +:057F90000002093D00A4 +:0400000508007D95DD :00000001FF diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h index 38696e563..493459cdb 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -252,6 +252,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -261,11 +265,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -273,6 +281,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -429,8 +449,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -549,11 +570,11 @@ typedef enum CFG_TASK_SEARCH_SERVICE_ID, CFG_TASK_CONN_UPDATE_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -562,11 +583,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -599,9 +621,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -612,5 +634,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h index 008724b5c..4f47130d3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +70,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h index 8d9ecd40f..9ab15a5c6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,5 +215,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/main.h index 8dd24a564..20ea9d15a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h index 241a52197..4d222698e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h index 86521af11..c1e2f2a3b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -74,5 +73,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c index 562e3a22c..852be7f8e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -413,5 +421,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c index b0658e5f2..ad9ff8cd1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -76,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -157,9 +161,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -358,12 +361,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -464,6 +606,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -508,4 +652,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/main.c index b912f1bf3..fa5de8b57 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -72,6 +72,7 @@ DMA_HandleTypeDef hdma_usart1_tx; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -105,6 +106,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -143,7 +147,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -179,15 +182,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -374,5 +385,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/standby_stm32wb15.c index 860d64190..8b7b942d6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,4 +163,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c index ae7e237cc..5ed0b2be9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -143,6 +142,7 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -156,6 +156,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -204,11 +213,21 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -289,5 +308,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c index 33d5a81b6..7dd965b4a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -321,4 +320,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c index c0af3469e..1394ae132 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp index 7f1b2449f..83f51c8df 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp @@ -1126,64 +1126,64 @@ STM32WBxx_HAL_Driver - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c                                                         @@ -1192,65 +1192,65 @@ STM32_WPAN - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c Utilities - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + $PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + $PROJ_DIR$/../../../../../../Utilities/sequencer/stm32_seq.c diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/stm32wb15xx_flash_cm4.icf index 56d9d33c5..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb15xx_cm4.s index f7cdf820d..3b925699a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 72feb3a18..4e53aee02 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -45,7 +44,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 110K +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c index 270de2bab..fffd65634 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.c - * Description : Application file for BLE Middleware. - * - ***************************************************************************** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -256,26 +255,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -984,13 +984,15 @@ static void BLE_UserEvtRx( void * pPayload ) svctl_return_status = SVCCTL_UserEvtRx((void *)&(pParam->pckt->evtserial)); if (svctl_return_status != SVCCTL_UserEvtFlowDisable) -{ + { pParam->status = HCI_TL_UserEventFlow_Enable; -} + } else -{ + { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1033,5 +1035,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h index 45b845035..ca8a43340 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,5 +90,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h index f664efd08..f4ea6dc59 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,4 +63,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h index 7e393c676..91f670e3c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c index 6457f692c..a61e7ce93 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_client_app.c - * Description : P2P Client Application - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_client_app.c + * Description : P2P Client Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -119,7 +118,7 @@ typedef struct{ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonStatus; @@ -689,7 +688,7 @@ void Update_Service() aP2PClientContext[index].P2PServiceHandle, aP2PClientContext[index].P2PServiceEndHandle); break; - case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No decriptor */ + case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No descriptor */ APP_DBG_MSG("* GATT : Discover Descriptor of TX - Write Characteritic\n"); aci_gatt_disc_all_char_desc(aP2PClientContext[index].connHandle, aP2PClientContext[index].P2PWriteToServerCharHdle, @@ -727,4 +726,3 @@ void Update_Service() } /* USER CODE END LF */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h index 4664ffb83..04a0b3819 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_client_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_client_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ void P2PC_APP_SW1_Button_Action(void); #endif /*__P2P_APPLICATION_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h index bd808a41b..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..57294e04f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +700,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/readme.txt index a7b094af4..0e404a828 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pClient/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pClient application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc index a77bc0728..36955e717 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc @@ -58,8 +58,8 @@ Mcu.PinsNb=16 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -108,6 +108,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB15CCUx +ProjectManager.Example=BLE_p2pServer +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -218,5 +220,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_p2pServer -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex index 061089b4d..d725d5699 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:1000000008100020DD770008397800083B780008E8 -:100010003D7800083F7800084178000800000000A3 -:10002000000000000000000000000000437800080D -:10003000457800080000000047780008497800086B -:10004000537A0008577A00085B7A00087F78000826 -:100050005F7A0008637A00086D780008677A000804 -:100060006B7A00086F7A000873780008737A0008CA -:10007000777A00087B7A00084D7800087F7A0008BC -:10008000837A0008877A00088B7A00080000000055 -:10009000000000008F7A0008937A00087978000841 -:1000A000977A00089B7A00089F7A0008A37A0008D4 -:1000B000A77A0008AB7A0008AF7A0008B37A000884 -:1000C0000000000000000000B77A000800000000F7 -:1000D00053780008BB7A000800000000BF7A0008CF -:1000E000C37A0008C77A000800000000CB7A000835 -:1000F000617800086578000869780008CF7A000800 -:10010000D37A00080000000000000000000000009A -:10011000D77A0008DB7A0008DF7A000800000000C8 +:100000000810002059800008B5800008B78000085B +:10001000B9800008BB800008BD8000080000000017 +:10002000000000000000000000000000BF80000889 +:10003000C180000800000000C3800008C5800008DF +:10004000CF820008D3820008D7820008C980000848 +:10005000DB820008DF820008ED800008E3820008F0 +:10006000E7820008EB820008F3800008EF820008B6 +:10007000F3820008F7820008CD800008FB820008A8 +:10008000FF820008038300080783000800000000C7 +:10009000000000000B8300080F830008F9800008AF +:1000A00013830008178300081B8300081F830008C0 +:1000B00023830008278300082B8300082F83000870 +:1000C0000000000000000000338300080000000072 +:1000D000D380000837830008000000003B8300083D +:1000E0003F830008438300080000000047830008A6 +:1000F000E1800008E5800008E98000084B830008E3 +:100100004F83000800000000000000000000000015 +:1001100053830008578300085B8300080000000039 :1001200000000000000000000000000000000000CF -:100130000000000000000000E37A00082DE9F84FFD +:1001300000000000000000005F8300082DE9F84F78 :100140000FF2D017A2B0D7E90045CDE900452C9EAB :10015000DFF82C7C04918DF8436000210FF2BC1471 :100160000D9112944FF0FF368246904699460FE06B @@ -281,7 +281,7 @@ :101170001CBF10F8012FF9E718BF00207047704717 :1011800080B508B90FF21C0005490B681BB122227B :101190000021984701E000F08EFD222002BD0000F2 -:1011A0001C2B0020636F6E73747261696E7420680B +:1011A0003C2B0020636F6E73747261696E742068EB :1011B000616E646C65723A20626164206D65737360 :1011C0006167650000F10103810704D010F8011B7D :1011D00089B18107FAD10268B2F10131914311F06E @@ -482,1511 +482,1647 @@ :101E000004D80C0D661E342EB7DDEBE7801A99411D :101E100050EA410608BF0021E4E708BF1CEB430F6E :101E200028BF6FF00001DDE780B5AFF30080024A04 -:101E300011001820ABBEFBE72600020010B58EB0E3 -:101E400002A80FF6B421DFF8A8443022FFF718FAF1 -:101E50000FF201500190009469460FF2E14000F04A -:101E600063FD0121022000F048FEDFF888240021F4 -:101E7000042000F0BEFE02A800F03CFF08B101F013 -:101E800085F800F012F901F083F8DFF86C440FF2E6 -:101E90002542002084F8800000214FF6FF70E08288 -:101EA000012000F0A6FE062001F006F901F099F9E4 -:101EB0000FF26543002204F18101002001F08EFC45 -:101EC0000FF25D43002204F18201002001F086FC44 -:101ED000002020838021DFF824040180A02141809C -:101EE000012000F07EF90EB010BDF8B50746DFF80E -:101EF00008447878DFF80854052804F1800604D0F7 -:101F00003E2812D0FF285FD0C9E0B888E18A884215 -:101F100006D10020E08230700FF24C4001F020FD2D -:101F2000012000F05EF9012047E0F87801282BD06D -:101F3000032802D00C2803D0B1E00FF25440A4E0F3 -:101F40000FF2784001F00CFD387900280CBF0FF239 -:101F500088400FF2AC4001F003FDE08A6A460DF1C3 -:101F6000010101F03BFD60B90FF2BC4001F0F8FC4B -:101F70009DF800209DF801100FF2C04001F0F0FC28 -:101F80008DE00FF2D44080E0707801F04DFCB7F89E -:101F900005100FF2E04001F0E3FC307804280CBF9C -:101FA0000620052030700021B7F80500E082688027 -:101FB0002970284601F00FF900202870E08A688017 -:101FC000284601F008F96AE0B7F80300001F5FD067 -:101FD0004FF47F71401A12D0401E47D0401E11D0DE -:101FE000401E1AD0401E1BD0401E1CD0801E4AD05E -:101FF000401E22D0401E26D0401E21D04FE00FF2BE -:10200000B84042E00FF2E04001F0AAFCE08ABD498E -:1020100001F0EEFD0FF2F84037E00FF2145034E01B -:102020000FF23C5031E00FF26C5001F099FCE08A65 -:1020300001F06EFE0FF2845027E00FF29C5024E076 -:102040000FF2C45021E0D7F807100FF2EC5001F066 -:1020500087FCD7F807100FF2F85001F081FCE08AF6 -:10206000012101F0A3FE0FF2FC500EE0F9790FF20E -:10207000346001F075FCF879002814BF0FF2986005 -:102080000FF2806001E00FF2A46001F069FC06E04D -:10209000012001F0D9FEB0780A2101F014FC0120E2 -:1020A000F2BD01F0B8B87047704778B589B000202C -:1020B000ADF81A0001F068FC934D944E286810F1B9 -:1020C000010F0ED069683074090A000A707406F1B5 -:1020D00010046868B074F174080A090C30757175E1 -:1020E00006E0002001F032FF040008BF0FF2D874B0 -:1020F00022460621002000F0AAFF6079307207AA6C -:10210000207970720621E078B072A078F072607861 -:1021100030732078784C70734EF66E5008902868B3 -:1021200007902E2000F093FF0FF2A47210211820C8 -:1021300000F08DFF0FF2A8721021082000F087FF39 -:102140001821012000F0AAFF01F012FF0DF1160086 -:1021500006A90190009105AB07220021012001F0A2 -:1021600064FD0FF2F450BDF8181000900723BDF87D -:102170001400002201F0BCFF0DF11A0000900223B0 -:10218000BDF81610BDF81400002201F0B1FF0222C4 -:102190000221002001F055FC0120207001F0DCFC40 -:1021A00001206070012108202071A1701020607151 -:1021B00000210020E070049110215548A060039098 -:1021C00008220020029001910092002301220121A7 -:1021D000012001F0DAFCA07808B101F07EFD0AB020 -:1021E00070BD2DE9F8410446012C87B003D1434866 -:1021F0000588478803E04FF4C8654FF47A67DFF835 -:10220000F88008F18006707801F00EFB31780FF24B -:10221000505001F0A5FB022C11D13078012818BFD5 -:1022200002280CD101F03DFC010004D10FF24C500A -:1022300001F096FB03E00FF2685001F091FB34705F -:1022400000200690059008F119010491082298F8E1 -:1022500018000FF29C6103900291019200230093F9 -:102260003A462946002001F02EFC28490E2001F0B4 -:102270000CFD010013D1012C0AD10FF24C5001F0DA -:102280006FFB7078234908B0BDE8F04101F01BBB3B -:1022900008B0BDE8F0410FF2585001F061BB08B042 -:1022A000012CBDE8F0410CBF0FF270500FF29C50B2 -:1022B00001F056BB10B5012001F0CBFD0E4C94F897 -:1022C0008000052812D001F0ECFB002184F880107A -:1022D00030B90FF2AC5001F043FB0FF2AC5001E00B -:1022E0000FF2C050BDE8104001F03ABB10BD000035 -:1022F000A0080320672900085C270020242B002069 -:10230000082B002040E201008075FF1F08260020F6 -:1023100007B2010046E001000021012000F076BC78 -:10232000012001F096BD0021042000F06FBC0120C7 -:1023300000F092BC012000F097BC000010B50446EC -:10234000616801F1080000F031FE00B10120207049 -:1023500010BD000010B1012803D07047072000F025 -:1023600069BC072000F06EBC0D0A0D2A2A204449E2 -:1023700053434F4E4E454354494F4E204556454ECC -:1023800054205749544820434C49454E54200A0094 -:102390000D0A0D2A2A20434F4E4E454354494F4EB5 -:1023A00020555044415445204556454E54205749E8 -:1023B000544820434C49454E54200A004556545F2A -:1023C0005550444154455F5048595F434F4D504C20 -:1023D000455445200A0000004556545F555044417D -:1023E00054455F5048595F434F4D504C4554452C20 -:1023F00020737461747573206F6B200A00000000F5 -:102400004556545F5550444154455F5048595F43C9 -:102410004F4D504C4554452C207374617475732096 -:102420006E6F6B200A000000526561645F5048596E -:102430002073756363657373200A00005048592048 -:10244000506172616D202054583D2025642C20522B -:10245000583D202564200A005265616420636F6E38 -:1024600066206E6F74207375636365657373200AED -:10247000000000004843495F4C455F434F4E4E45C6 -:102480004354494F4E5F434F4D504C4554455F5365 -:1024900055424556545F434F444520666F72206352 -:1024A0006F6E6E656374696F6E2068616E646C65D3 -:1024B00020307825780A00000D0A0D2A2A20414391 -:1024C000495F4741505F4C494D495445445F444939 -:1024D00053434F56455241424C455F56534556541F -:1024E0005F434F4445200A000D0A0D2A2A2041432C -:1024F000495F4741505F504153535F4B45595F52CD -:1025000045515F56534556545F434F4445200A009A -:102510000D0A0D2A2A206163695F6761705F70612F -:1025200073735F6B65795F72657370200A000000DA -:102530000D0A0D2A2A204143495F4741505F41550A -:1025400054484F52495A4154494F4E5F5245515F8A -:1025500056534556545F434F4445200A000000003F -:102560000D0A0D2A2A204143495F4741505F534CD1 -:102570004156455F53454355524954595F494E4969 -:102580005449415445445F56534556545F434F4464 -:1025900045200A000D0A0D2A2A204143495F474180 -:1025A000505F424F4E445F4C4F53545F5653455615 -:1025B000545F434F4445200A000000000D0A0D2AD5 -:1025C0002A2053656E6420616C6C6F77207265629F -:1025D0006F6E64200A0000000D0A0D2A2A20414374 -:1025E000495F4741505F414444525F4E4F545F52F0 -:1025F00045534F4C5645445F56534556545F434FE1 -:102600004445200A000000000D0A0D2A2A204143FB -:10261000495F4741505F4B455950524553535F4EB8 -:102620004F54494649434154494F4E5F56534556CE -:10263000545F434F44450A006E756D657269635F70 -:1026400076616C7565203D20256C640A00000000F1 -:102650004865785F76616C7565203D20256C780A49 -:10266000000000000D0A0D2A2A206163695F67617E -:10267000705F6E756D657269635F636F6D706172B7 -:1026800069736F6E5F76616C75655F636F6E6669A7 -:10269000726D5F7965736E6F2D2D3E594553200A1B -:1026A00000000000424C455F4354524C5F41707043 -:1026B0005F4E6F74696669636174696F6E3A204139 -:1026C00043495F4741505F50414952494E475F433C -:1026D0004F4D504C4554455F56534556545F434FFC -:1026E00044452C2070616972696E675F636F6D701D -:1026F0006C6574652D3E537461747573203D20259F -:10270000640A00000D0A0D2A2A2050616972696E60 -:1027100067204F4B200A00000D0A0D2A2A20506125 -:102720006972696E67204B4F200A00000D0A0D2A5E -:102730002A204143495F4741505F50524F435F4316 -:102740004F4D504C4554455F56534556545F434F8B -:102750004445200A000000005032505352563100C8 -:10276000466972737420696E64657820696E2025ED -:1027700064207374617465200A00000053756363FC -:1027800065737366756C6C792053746F70706564D3 -:10279000204164766572746973696E67200A00006F -:1027A00053746F70204164766572746973696E67E3 -:1027B000204661696C6564202C20726573756C74A9 -:1027C0003A202564200A00005375636365737366BD -:1027D000756C6C7920537461727420466173742037 -:1027E0004164766572746973696E67200A0000003F -:1027F0005375636365737366756C6C79205374618C -:102800007274204C6F7720506F7765722041647628 -:102810006572746973696E67200A0000537461728F -:1028200074204661737420416476657274697369BB -:102830006E67204661696C6564202C207265737533 -:102840006C743A202564200A000000005374617201 -:1028500074204C6F7720506F7765722041647665E5 -:1028600072746973696E67204661696C6564202CB7 -:1028700020726573756C743A202564200A0000008C -:1028800020200D0A0D0000002A2A2053544F50200A -:102890004144564552544953494E47202A2A202044 -:1028A0000D0A0D002A2A2053544F5020414456450A -:1028B00052544953494E47202A2A20204661696CC8 -:1028C0006564200D0A0D00000000000000000000FB -:1028D000123456789ABCDEF0123456789ABCDEF088 -:1028E000FEDCBA0987654321FEDCBA09876543210E -:1028F00009503250535256310000000000000000D1 -:102900000000000000000000000000001E000400A5 -:102910000A05020112279C00F4010000FFFF0000DD -:1029200048010100002000007FB50C466D4D616834 -:102930006D4EE8612962284601F01EFC246805F10D -:10294000240001F023FC746006F1080001F01EFC75 -:1029500001203070296829B10FF2551000900294BF -:10296000684688477FBD1FB55F4C04F1080001F041 -:1029700010FC00BB2178F1B1694604F1080001F0B8 -:1029800031FC5848C16949B10098029001228DF884 -:10299000042001A888479DF8040000E00120207071 -:1029A000207818B1009801F0D2FC04E0009904F1FD -:1029B000080001F0F7FB04F1080001F0EAFB28B978 -:1029C000207818B104F10800FFF7ADFC1FBD2DE918 -:1029D000F8430646002000F05FF874883088B2683B -:1029E000DFF80081C4F3090444EA8024F068A4B24B -:1029F000C1B2204600F03CF8002748F2E8094846FA -:102A0000FFF798FC08E06888A04202D13169287875 -:102A10000870687800B1012708F1240001F0B9FBC3 -:102A2000F0B9694608F1240001F0DCFB009800F1E0 -:102A30000B05407A0F28E6D0B5F80110A1420DD160 -:102A40000098817AC81E7169C0B28842C8BF084622 -:102A5000706102463069E91CFEF702FC2878D9E76C -:102A60003800CCD0012000F017F80020BDE8F28338 -:102A700010B513461C4A5468A4F80900E1720A46CE -:102A8000194604F10C00FEF7EBFB164A1369BDE88A -:102A900010400021002018471249096A82B008B985 -:102AA00021B101E011B1012002B0084702B0704726 -:102AB00010B50146487A0F2818BF0E2807D10B48D9 -:102AC00001F07AFBBDE810400020FFF730BC064C57 -:102AD00004F1080001F070FB04F10800BDE81040AB -:102AE000FFF721BC1C2A0020902A0020402A002049 -:102AF0000C48002101604160704710B500F00CF8EF -:102B00005C6819B1012904D1204301E024EA0000E6 -:102B1000586082F3108810BDEFF3108272B6014B3B -:102B200070470000C82A00202DE9FC475B4CDFF805 -:102B30007091A5692840A0614FF0FF3A4FF001085D -:102B400030E0491C54F831000642FAD004EBC106CB -:102B5000184071681040014208BFC6F804A07768A9 -:102B6000384000F09FF8606208FA00F08743776011 -:102B7000EFF3108172B6626A206908FA02F2D2435A -:102B800010402061022004EBC00353F8086C16408B -:102B9000401E43F8086CF6D181F31088606A59F83A -:102BA0002010884763692069A2691840104207D045 -:102BB000E069216A084203D1002103EA0206C1E765 -:102BC000C4F824A001F011FCEFF3108972B621695A -:102BD00060690140A069014201BFE169206A0142C8 -:102BE00001F07DFC89F3108801F095FCA561BDE83A -:102BF000F38738B51446EFF3108572B600F052F83B -:102C0000274941F8204085F3108831BD10B500F008 -:102C10000BF804431C6153F83140204343F8310062 -:102C2000FFE782F3108810BDEFF3108272B61B4BE2 -:102C30001C697047EFF3108172B6184A536923EA92 -:102C4000000005E0EFF3108172B6144A536918438F -:102C5000506181F310887047EFF3108172B60F4A0C -:102C6000D3691843D061F4E7F8B50C4C656A276A5C -:102C70002E4615F1010F0EBF0025012101FA05F5C1 -:102C8000206202E0284601F02BFC216AE06908423C -:102C9000F8D088436662E0612762F1BDC02500205C -:102CA000E027002002460020110C090404BF102078 -:102CB000120412F07F4F04BF083012020FF2180105 -:102CC00012F0704F04BF001D1201120FC0F11F005F -:102CD000895C401AC0B2704704030202010101017D -:102CE000000000000000000001F06BFC9DF80E00E9 -:102CF00005B000BDF8B500F10C026B4624214FF67B -:102D00006640F1E7F8B500F10C026B460F214FF673 -:102D10006840E9E78E4900E08E4981B00A680243C5 -:102D20000A60096808400090009801B0704780B5BB -:102D300089494FF40040086001F092FC002001F046 -:102D400005F948B180798549854A0A600A6822F404 -:102D50007C5242EA00220A6000F01DF800F08AF876 -:102D60008048016800220260026902F0500202619C -:102D70000420FFF7D1FF0120FFF7CEFF00F0D6F8C7 -:102D800000F083F800F0A0F801F030FB4FF0FF30C6 -:102D9000FFF7CAFEFAE718B5A5B014A8442101F060 -:102DA00089FC01A81C2101F085FC08A8302101F054 -:102DB00081FC01F083FC6C48016821F0180101607E -:102DC000072014904FF48031012016901591402077 -:102DD000189000214FF480741E91179414A801F0EC -:102DE0007EFC08B100F0D2F86F2001900221002093 -:102DF000029103900490059006900790012101A88C -:102E000001F0EAFE08B100F0C1F843F601000890B5 -:102E100000214FF48040119009911020022113905D -:102E20001291109408A802F093F808B100F0AEF8DF -:102E30004E49086820F0700008604D480268C2F3EF -:102E400003200090009830B90A681209120142F07C -:102E500004020A6008E000980A68801E80F30400FB -:102E6000120940EA02100860086840F40040086057 -:102E700026B010BD80B53F483F49016002F024F9FB -:102E800010B1BDE8014081E001BD002110B53B4813 -:102E90003B4C416004600F21816047F6FF71C160C7 -:102EA000002101618161416102F046F908B100F041 -:102EB0006DF8CA206062FF2153206062A068C008DC -:102EC000C000A060616210BD10B52E4C2E4820607D -:102ED0004FF4E13060600020A060E06020610C20D1 -:102EE00060610020A0614FF40040E061002020629A -:102EF0006062A062204602F0C3F908B100F046F813 -:102F00000021204602F0FBFD08B100F03FF800214F -:102F1000204602F0FFFD08B100F038F8204602F02C -:102F2000D1FD10B1BDE8104030E010BD80B50420E7 -:102F3000FFF7F0FE0120FFF7EDFE00220F210E202B -:102F400002F058FEBDE802400E2002F071BE000003 -:102F5000480000584C000058104000589C00005891 -:102F6000FECAFECA80080058900000581C04005891 -:102F70005875FF1FE0290020000C0058482A002047 -:102F8000002800403C2600200038014072B6FEE7D1 -:102F90001B4800210171017200F034B818490A7908 -:102FA00041F822000879401C0871704770B504464A -:102FB0006078FF2802BFB4F8031001F47F41B1F537 -:102FC000406F12D100260E4D00E0761C2979F0B238 -:102FD00088420AD2F1B255F82110204688470100F4 -:102FE000F3D002D0022805D006E02046BDE87040AC -:102FF000FEF77BBF002070BD012070BD0000000007 -:10300000BC2A002080B502F069FE02F068FE02F0E2 -:1030100067FE02F066FE02F065FE02F064FE02F05A -:1030200063FE02F062FE02F061FE02F060FE02F05A -:103030005FFE02F05EFE02F093FE02F04BFF02F034 -:103040004AFF02F049FFBDE8014002F046BF18B553 -:103050000C46C7B0114600228DF800208DF81C00E8 -:103060008DF81D4022460DF11E0002F037FF00F0E2 -:103070003BF83F200C21ADF80400ADF8061007A87E -:10308000012103900691A41C049400F043F8002849 -:103090004CBFFF209DF8000048B010BD00B5C7B080 -:1030A00000F01BF80F2000F02AF800284CBFFF208A -:1030B0009DF8000047B000BD00B5C7B00021ADF8D5 -:1030C0001C0000F016F8182000F019F800284CBF7A -:1030D000FF209DF8000047B000BD00228DF80020C1 -:1030E0008DF81C008DF81D101822002101A802F097 -:1030F000FBBE8DF80010182201A802F0F5BEADF855 -:10310000060007A9022004903F22012003910690A7 -:10311000ADF80420CDF814D0002101A8FFF757BC6A -:1031200070B506464E4C30784CA520B1012807D02A -:10313000032810D070BD012020700FF2281003E08A -:10314000002121700FF2501000F00AFC2846BDE863 -:10315000704000F005BC71680878C8B94978012949 -:1031600009D100F071FE0FF2641000F0F9FB00F0DD -:103170002FF80120A0707168487848B900F069FE06 -:103180000FF2701000F0ECFB00F022F80020A070AD -:103190007068017801291AD1407801280AD10020ED -:1031A00000F052FE0FF2741000F0DAFB00F010F89D -:1031B0000120A0707168487848B900F04AFE0FF20B -:1031C000841000F0CDFB00F003F80020A07070BD6B -:1031D000284600F0C5BB0078012808BF00F00DB8F4 -:1031E000704780B50FF2390200210220FFF701FD80 -:1031F0001B4900220A70BDE8014080B5002000F0A4 -:1032000028FE174801214170002181700121C17001 -:103210000021017101BD00210220FFF7F7BC000071 -:1032200010B50F4C2079401E8041C00F20712078CE -:1032300068B10FF2381000F093FB08A000F090FB8B -:10324000E11CBDE810404FF6426002F019BEBDE837 -:1032500010400FF2581000F083BB0000200A0D0050 -:10326000F02A00202D2D20503250204150504C4942 -:10327000434154494F4E20534552564552203A201F -:103280004E4F54494649434154494F4E20454E41C3 -:10329000424C45440A0000002D2D20503250204160 -:1032A00050504C49434154494F4E20534552564586 -:1032B00052203A204E4F54494649434154494F4EBB -:1032C0002044495341424C45440A00002D2D2050D2 -:1032D0003250204150504C49434154494F4E2053A5 -:1032E000455256455220203A204C454431204F4EFD -:1032F0000A0000002D2D20503250204150504C49E2 -:10330000434154494F4E2053455256455220203A8E -:10331000204C454431204F46460A00002D2D2050B8 -:103320003250204150504C49434154494F4E205354 -:1033300045525645522031203A204C454431204FC9 -:103340004E0A00002D2D20503250204150504C4943 -:10335000434154494F4E2053455256455220312047 -:103360003A204C454431204F46460A002D2D20502E -:103370003250204150504C49434154494F4E205304 -:10338000455256455220203A20494E464F524D2034 -:10339000434C49454E5420425554544F4E20312001 -:1033A000505553484544200A200000002D2D205040 -:1033B0003250204150504C49434154494F4E2053C4 -:1033C0004552564552203A2043414E275420494EFB -:1033D000464F524D20434C49454E54202D20204EFF -:1033E0004F54494649434154494F4E204449534163 -:1033F000424C45440A200000DFF83C150A6892B2AE -:1034000000E00246086880B28242FAD170472DE996 -:10341000FC4104461825DFF82485DFF8246568435D -:1034200008EB00073078062808D1317871703470C5 -:1034300078754FF0FF307060002039E000F077F8C9 -:10344000B9680918B96008F10803B96832786A43A5 -:103450009A589142327813D308F1150315FB02FCF8 -:1034600013F80C30062B25D008F108066B43F358EF -:10347000994222BF08F115036A439A5CEED219E023 -:103480001146337869439A420BD008F1140308F1CE -:10349000150C5B5C15FB03F50CF805407A753B7564 -:1034A00000E07A7508F11402545431787170347068 -:1034B000BDE8F6811146694308F115035B5C062BF4 -:1034C00004D008F1140615FB03F574557B753A75A5 -:1034D00008F115025454EBE7F8B5DFF86434DFF86F -:1034E0005C541E78182402466243B0422A4404D138 -:1034F00018785870507D18700FE0167D507D92F846 -:1035000015C005F115076643062807F806C004D064 -:10351000167D143514FB00F42E5501201073187815 -:10352000062802BF00294FF0FF315960F1BD10B5E8 -:10353000DFF80C44606810F1010F0FD0FFF75CFF5B -:103540006168DFF80024814261683CBF5388C91874 -:10355000081A517848431178C84000E0002080B232 -:1035600010BD2DE9F84FDFF8DC53DFF8DCB3D5F8F8 -:103570000880D8F80000DBF800104A0500F090F948 -:10358000DFF8BC63DFF8B4A321F4806181604FF001 -:10359000180934780AF1080019FB04F14758FFF7BD -:1035A000C6FF874217D200270121B170062C3DD0FB -:1035B00019FB04F40AF108010AF1080209598142D1 -:1035C00023BF0AF108010959091A002111510AEB18 -:1035D00004014C7DEAE7A9884118B94202D2AF88BC -:1035E0000021E2E73F1ADFE7022802DA2878012803 -:1035F00000D07F1ED8F80000C1684A07FAD500F055 -:1036000055F9DBF80C00000CBFB247EA0047CBF8D5 -:103610000C70FFF7F1FE7060A8680068816841F4E3 -:1036200080618160AFF30080BDE8F18FB8B20028FF -:10363000DAD1FFF7E1FE70600320BDE8F24F02F03F -:1036400025BB2DE9F843EFF3108872B6BD4DBB4B97 -:10365000A8680168CA224A6253204862B84A88684A -:1036600020F48060886018201678374647431F444E -:10367000387B022826D13C68D7F810909078F0B1BA -:103680007A7B012A0AD101213046FFF725FF88F312 -:1036900010887968304600F016F904E088F3108845 -:1036A000304600F0C1F8A8680068CA21416222468D -:1036B000532141624846314600F050F90BE0FFF7D4 -:1036C00050FF06E0C8684207FCD500F07EF89F492D -:1036D000086088F31088FF21A86802685162BDE87D -:1036E000F183F8B5974CA160CA2209684A62532257 -:1036F0004A62954A136843F020031360136803F08D -:103700000703C3F10403237095682D0C05F07F05B2 -:103710006D1C6570EDB29268C2F30E02521C62809D -:1037200092B2521E6A43A2F5A072DA404FF6FF73BE -:103730009A422CBFA380A280854A136843F40023D9 -:103740001360844B1D6845F400251D6048BB7C4810 -:103750007A4E0123837018254FF0FF334360002316 -:103760005FFA83FC06F10C0715FB0CFC4FF0000E12 -:1037700007F80CE05B1CDFB2062FF1DB06230370B9 -:10378000886820F48060886000F01FF8D060032013 -:1037900002F087FAA1680868826842F48042826079 -:1037A00005E0C868410544BF032002F06FFAA16834 -:1037B0000A68FF20506200220321032002F01AFA57 -:1037C000BDE8F240032002F033BAC86800F0800080 -:1037D00060F49060C8604FF400207047F0B5044674 -:1037E0000025EFF3108672B61827DFF850C10CF1F0 -:1037F0000C0007FB05FE10F80E0010B16D1C062D25 -:10380000F5DB062D0CD06F430CEB07000127077387 -:1038100086F310880461427303600D700020F0BDD0 -:1038200086F310880120F0BDF8B50746EFF3108449 -:1038300072B6032002F007FA424DAE683068CA2122 -:1038400041623A4653214162182043494243895C10 -:1038500002291BD100213846FFF73EFE3848017887 -:1038600006290ED1306838490A68530500F018F867 -:1038700021F480618160C1684A07FCD500F016F828 -:1038800004E04078884218BFFFF76BFEA9680A6819 -:10389000FF205062032002F0CBF984F31088F1BDC1 -:1038A00002D5C1684A07FCD481687047C16801F03D -:1038B000800161F49061C1604FF4002023490860E9 -:1038C000032002F0EEB92DE9F04180460F46424652 -:1038D00018201A4942438C18207B022804BF404616 -:1038E000FFF7A2FFEFF3108572B6032002F0ABF9E9 -:1038F000144EB0680068CA2141625321416202201F -:103900002073A76067604046FFF781FD0C490A7885 -:103910004978914202D0FFF724FE02E0A168081A1C -:10392000A060FF20B1680A685062032002F080F9AD -:1039300085F31088BDE8F08128280040CC260020BF -:10394000002B0020B02A0020082800400C08005856 -:103950000008005880080058D826002010470000B2 -:103960000EB4C0B5024603A800210190009101AB3E -:103970000121044878440C30FCF7E0FB06BC5DF8FC -:1039800010FB00BF9B40000000B587B000F010F8AE -:10399000012003220690ADF80420ADF8062000F0C7 -:1039A0007AF800284CBFFF209DF8000007B000BD4A -:1039B00000208DF800001822002101A802F094BA1E -:1039C00009220021684602F08FBA1822002102A8BD -:1039D00002F08ABA182201A802F086BA70B5C8B0FF -:1039E00006460C4615460522FFF7EBFFADF82060B2 -:1039F000FFF7EBFF302100F014F80521049000F0F0 -:103A000019F8002848BFFF2009D49DF8000030B9FC -:103A10009DF8030020709DF804002870002048B035 -:103A200070BDADF80A1008200221ADF8080005911C -:103A300008A870470791CDF818D0002102A8FEF71A -:103A4000C6BF00B5C7B000F00EF8FFF7C3FF3120C6 -:103A500000F013F800F01FF800284CBFFF209DF87D -:103A6000000047B000BD00238DF81C008DF8003029 -:103A700007A84170827000217047ADF8060007A9C1 -:103A8000032004900822012003910690ADF8042041 -:103A9000704703900691CDF814D0002101A8FEF7DD -:103AA00096BF00B587B000F02FF900F04BF98120E8 -:103AB00000F025F900F053F900284CBFFF209DF8D5 -:103AC000000007B000BD2DE9F84DC7B09446DDF801 -:103AD00040E1519A559D569EDDF84CA1ADF81D1060 -:103AE0008DF81C004FF0000BADF81FC08DF8213091 -:103AF0008DF822E000F024F800F017F824F8095FB0 -:103B0000668000F01FF93F20832100F043F95744FD -:103B100006910D37049700F025F900284CBFFF20CF -:103B20009DF8000048B0BDE8F08D88F800A007AC13 -:103B30005499E419524608F10100544402F0CEB9F8 -:103B40008DF82320174652998DF800B00DF1240806 -:103B500009A8B84402F0C2B900B5C7B000F00CF82B -:103B6000852000F0ADF800F0FAF800284CBFFF20E7 -:103B70009DF8000047B000BD00218DF81C008DF8B5 -:103B80000010182201A802F0AFB92DE9F841C7B022 -:103B90004FF0000800F026F80DF12300DDF844E1B5 -:103BA0004E9F4F9E509D529C8DF81F30C0F800E0F4 -:103BB0008DF800808DF820708DF821608DF82250EE -:103BC0008DF8274000F0BEF88620ADF8060007A962 -:103BD0000C2000F0C0F800284CBFFF209DF800002A -:103BE00000F0F2B88DF81C0007A841708270704791 -:103BF00000B5C7B00022ADF81C008DF800200DF113 -:103C00001E001822016001A8002102F06DF9882031 -:103C1000ADF8060007A9062000F09DF800284CBF6B -:103C2000FF209DF8000047B000BDF8B5C8B00546BC -:103C30000E4617461C4600F023F808A84670877009 -:103C40008DF8205000F0A1F88A21ADF80A103F202D -:103C5000032100F08DF8002848BFFF200ED49DF806 -:103C6000000058B94F994E98BDF801202280BDF848 -:103C700003200280BDF805000880002049B0F0BD97 -:103C800007220021684602F02FB918B5C7B00446D4 -:103C900000F03AF88DF81C40224600F083F800F05E -:103CA00051F83F208E2100F092F8641C049400F03B -:103CB00059F800284CBFFF209DF8000048B010BD07 -:103CC000ADF8060007A901203F2203910490704738 -:103CD000ADF8060007A90220704700B587B000F0D4 -:103CE00013F800F02FF8922000F009F800F037F8F0 -:103CF00000284CBFFF209DF8000007B000BDADF8C4 -:103D000006003F220120704700208DF80000704718 -:103D100000B5C7B00021ADF81C00FFF730FF9520BB -:103D2000FFF7D6FF00F017F800284CBFFF209DF8E2 -:103D3000000047B000BD00228DF80020ADF81C0047 -:103D40008DF81E101822002101A802F0CDB8ADF8A0 -:103D5000060007A9032004903F220120039106904A -:103D6000ADF80420CDF814D0002101A8FEF72FBE35 -:103D7000ADF80800059108A8072104900791CDF837 -:103D800018D0002102A8FEF722BE1822002102A8A6 -:103D900002F0AAB8ADF80400ADF8061007A801219A -:103DA000039070470DF11D0002F098B800B5C7B040 -:103DB000FFF7C1FFA520FFF7CAFF00284CBFFF2077 -:103DC0009DF8000047B000BD48B0BDE8F081ADF8F7 -:103DD0000400ADF8061007A8012103900691704772 -:103DE000484981B00A6802430A60096808400090A7 -:103DF000009801B0704778B585B004466846142134 -:103E000000F058FC0220FFF7EBFF00F011F80095DE -:103E1000012001900021022003900291694656F88A -:103E2000240002F06BF800F009F8002006B070BD25 -:103E30000FF2F400344E30F81450704756F8240056 -:103E40000022294602F012B980B500F00AF80122DA -:103E500003E080B500F005F8002202F007F9002029 -:103E600002BD0FF2C401284B31F8101053F82000A6 -:103E70007047F0B585B005460C466846142100F041 -:103E800019FC2DB1012D08BF102002D0022D02D146 -:103E90000120FFF7A5FF0FF298001C4F30F8150026 -:103EA000009001210220039007EB85060291306803 -:103EB0002CB900210191694602F020F81FE0144955 -:103EC000019107EBC504694602F018F80FF26C0087 -:103ED00050F8251004F1240002F0EDF8F2680021FA -:103EE00004F1240002F0E0F80FF24C004457B169ED -:103EF0000022204601F07EFE204601F099FE0020BF -:103F000005B0F0BD4C000058202600204C250020B4 -:103F100000002110002000F017B8012000F014B8B4 -:103F2000022000F011B80000200001000200000093 -:103F30000100100040000000060A170000000016F3 -:103F400004000016060000167047000001460648EF -:103F5000064AC3798B4218BF904218BF0838F8D17F -:103F60008B4218BF00207047F873FF1F0070FF1FBF -:103F700000B587B000208DF8000000F0E0F840F2B6 -:103F80000110ADF806003F220120069000F0ECF889 -:103F900000284CBFFF209DF8000007B000BD2DE9B0 -:103FA000F84107460128C7B0884615461E4608BF97 -:103FB000022003D002280CBF102000200DF11D01AB -:103FC0000C1800F036F8012F8DF81C7002D0022F6B -:103FD00018D019E002273A4641460DF11D0001F0C4 -:103FE0007DFF2570667000F0AAF83F204FF48171C4 -:103FF00000F016F8FF1C049700F0B8F8002805D56B -:10400000FF2009E01027E6E7472005E09DF80000C3 -:1040100010B94E9800F067F8FFE748B0BDE8F081AE -:10402000ADF80400ADF8061007A80321039006912F -:10403000704703220021684601F056BF2DE9F64F74 -:104040000C460546012CC7B09B4608BF022003D092 -:10405000022C0CBF102000200DF11F010E18FFF7DD -:10406000E8FF012CADF81C508DF81E4002D0022C48 -:104070002CD02DE00227569C559DDDF85091DDF89F -:104080004CA1DDF8488148993A4600F054F8A6F86A -:1040900000B086F8028086F803A086F80490757157 -:1040A000B47100F04CF83F20ADF804004FF4827179 -:1040B00007A8ADF80610039003210A37049706916C -:1040C00000F054F8002805D5FF2009E01027D2E7BA -:1040D000472005E09DF8000010B9579800F003F85C -:1040E00049B0BDE8F08FBDF8011001800020704795 -:1040F00030B5C7B01C464A9B00F026F800258DF865 -:1041000000508DF82140224619460DF1220001F0A1 -:10411000E5FE00F014F83F204FF4837100F01BF827 -:10412000A41D049400F022F800284CBFFF209DF845 -:10413000000047B030BD0DF11F0001F0CFBE1822C6 -:10414000002101A801F0D0BEADF81C00ADF81E1092 -:104150008DF820207047ADF80400ADF8061007A8D0 -:104160000121039006917047ADF80420CDF814D0DA -:10417000002101A8FEF72BBC024901600249016140 -:10418000704700BF4B420008714200080060406069 -:104190007047EFF3108172B6026882420CBF0120B3 -:1041A00000201CE0EFF3108272B603680B604860D9 -:1041B00001600868416023E0EFF3108272B6086086 -:1041C00043684B6041604868016019E0EFF310817B -:1041D00072B642680368136002684368536081F3F3 -:1041E0001088704710B5EFF3108472B602680A6049 -:1041F0000068FFE7FFF7EAFF84F3108810BD0B604B -:1042000082F310887047000001F0D0BF6C486D4900 -:10421000016001F12002426001F13002826001F18F -:104220003C02026201F14402426201F14C02C260AE -:1042300001F15402026101F17002426101F1740264 -:1042400082618031C16101F0CFBF38B504465E4D57 -:104250002846FFF79BFF5A484068A1680160E16863 -:10426000C16085605949416001F0DAFF58482AE091 -:1042700080B553484268136801211972406801F003 -:10428000D5FF002002BD38B5514C4F4D04E000F081 -:1042900041F80098216888472846FFF77AFF0028F0 -:1042A000F5D031BD4A484168084738B50446494D04 -:1042B0002846FFF76BFF4248C068A168016045606F -:1042C00001F0B9FF44482168016061684160002045 -:1042D00032BD80B53A48C268136810211972C068AF -:1042E00001F0AFFF002002BD35483B4AC168C168FC -:1042F00013680868184738B5374C364D04E000F0AD -:1043000009F80098616888472846FFF742FF0028AF -:10431000F5D031BD69462846FFF764BF38B504467D -:104320002E4D2846FFF732FF2D48FFF72FFF244878 -:104330000069A1688160E168C16005612168016070 -:1043400061684160216941616169816131BD80B508 -:1043500001462348FFF730FFBDE802400FF2050099 -:1043600001F07FBF38B5164C1D4D06E0FFF7D2FFB8 -:10437000009920690069FFF71FFF2846FFF709FF32 -:104380000028F3D031BD10B5164C2046FFF7FEFED5 -:104390000B4841690C60BDE8104001F076BF1CB5C8 -:1043A000104C06E069462046FFF71CFF009800F01D -:1043B0001BF82046FFF7EDFE0028F3D013BD0000E8 -:1043C00000000320AC090320480A032090080320C2 -:1043D000D82A0020500A0320E02A0020380A0320AF -:1043E000D02A0020400A03207047704710B52148AA -:1043F000214C88B0016841F400410160FEF778FB70 -:104400001E480168C908C90041F00401016001F0BB -:1044100055FF1B490020FFF764F901F064FF0121FB -:104420000120FEF76AFB00F03CF800F049F8FFF7C6 -:10443000EDFE144A00210820FEF7DBFB04F23C509D -:104440000FF245010090019169460FF2410000F022 -:1044500063F804F25470029004F5C96140F23C50D4 -:1044600005900391049402A8FFF758FFFFF7CCFED4 -:1044700008B010BD08000058300003208004005828 -:10448000482A00205B4500087047000080B501F015 -:1044900039FFFDF7D3FCBDE8044000210120FEF701 -:1044A0002CBB80B50020FFF7A6FC0120FFF7A3FC82 -:1044B0000220FFF7A0FCBDE802400120FFF7C4BCCA -:1044C00080B501210020FFF7D4FC01210120FFF776 -:1044D000D0FCBDE8044001210220FFF7CABC7047B0 -:1044E0004FF0FF30FEF720BB00210820FEF78EBB07 -:1044F0000220FEF7B1BB0220FEF7B6BB012804D0B4 -:10450000102804D0402804D07047FDF7CABDFDF73D -:10451000CABDFDF7C9BD70477FB50C464D4D6168FA -:104520004D4EE8612962284602F00AF8246874605A -:1045300006F10800FFF72AFE012000F068F80120CC -:104540003070296841B10FF2E9000FF2ED020090DE -:1045500001920294684688477FBD1FB53E4C04F126 -:104560000800FFF716FE00BB2178F1B1694604F19F -:104570000800FFF737FE3748C16949B1009802903B -:1045800001228DF8042001A888479DF8040000E06E -:1045900001202070207818B10098FFF7D8FE04E0C1 -:1045A000009904F10800FFF7FDFD04F10800FFF792 -:1045B000F0FD28B9207818B104F10800FFF794FF46 -:1045C0001FBD2DE9F04105460E4690461C460020D1 -:1045D00000F01DF8204F7868A0F80950C6723246E6 -:1045E00041460C30FCF73CFE1A4A136900210020BA -:1045F000984748F2E800FFF77EFF79688A78D21C76 -:1046000004F10800FCF72CFEBDE8F04101201CB5C8 -:104610001049124C096A20B901B188470020207066 -:1046200013BD0120207011B1BDE81C40084713BD27 -:104630000020FFF75DBF000010B50146064C04F1F5 -:104640000800FFF7B9FD04F10800BDE81040FFF7CE -:104650004BBF00006C2A0020A02A0020C52A0020A1 -:10466000114810B5016841F480710160032001F028 -:10467000B4FA002001F06EFF0024002814BF0124CA -:1046800001F095FF204610BD084880687047084833 -:1046900005E00748016841F00201016070470168C8 -:1046A00041F0010101607047004000582C260020B5 -:1046B000042004E0002202F029B80000024801684A -:1046C00041F4807101607047000400584FF0B04021 -:1046D000006800F0F000B02888BFB02070472DE9D6 -:1046E000F041040054D0207881064FF0B04538D511 -:1046F000A868E96810F00C0001F0030103D00C2851 -:1047000008BF012946D12868800702D5E069002842 -:104710003ED0FFF7DBFF616A884207D2084600F00F -:10472000A0FB002834D100F043FA0FE0286820F005 -:10473000F000014329606968206A21F47F4141EA61 -:1047400000216960606A00F08CFB08BB00F062FB2E -:10475000DFF88C170860DFF88C07006801F0FAFEBC -:10476000B0B92078C1070DD5A868E96800F00C0041 -:10477000082801F0030103D00C2808BF03292CD11D -:104780002868800340F11D816068002840F019818D -:10479000012006E2E06980B1296841F0010100F0E2 -:1047A000F3FA06462868800700F1088101F0C8FF87 -:1047B000801B0328F6D30320F3E12868400840005B -:1047C00000F0A8FB0646286800F0EEF9C9D001F019 -:1047D000B7FF801B0328F6D3EDE76068B0F5803F94 -:1047E00004D1296841F48031296003E02A6822F469 -:1047F00080322A60606860B101F0A2FF0646286836 -:10480000800300F1DE8001F09BFF801B6528F6D35A -:10481000D1E701F095FF06462868400C10F0010032 -:1048200000F0CF8001F08CFF801B6528F4D3C2E735 -:1048300001F086FFC01B0328C0F0F780BBE7E068EB -:1048400078B1296841F4807100F09EFA0646286824 -:10485000400500F1FD8001F073FF801B0328F6D3B3 -:10486000A9E7286820F4807000F054FB0646286809 -:10487000800A10F0010000F0C28001F061FF801B8F -:104880000328F4D397E701F05BFFC01B0328C0F0B7 -:10489000F18090E740F0010000F09BF90746706856 -:1048A000800700F1028101F04BFFC01B0328F6D303 -:1048B00081E7706820F0040000F08BF9074670680B -:1048C000C00810F0010000F0FF8001F039FFC01BAC -:1048D0000428F4D36FE70528306806D140F00400BF -:1048E0003060316841F0010105E04008400030606F -:1048F000316821F004013160A06841F2893768B164 -:1049000001F01EFF80463068800700F1F28001F060 -:1049100017FFA0EB0800B842F5D34CE701F010FFF9 -:104920008046306800F040F900F0E38001F008FFB5 -:10493000A0EB0800B842F4D33DE701F001FF801B73 -:104940000328C0F0088136E701F0FAFE001B0328B7 -:10495000C0F022812FE7286881010CD4296841F03A -:1049600080712960E86840F08050E86001F0E8FE5E -:1049700004462868810100F1138101F0E1FE001B6B -:104980000328F6D317E70C2930D0286820F0807070 -:104990002860E96889088900E960E86820F08050AB -:1049A000E86001F0CDFE04462868810140F1F880FE -:1049B00001F0C6FE001B0328F6D3FCE600F0F8F871 -:1049C000CFE6207881071AD5A868E96800F00C00C6 -:1049D000042801F0030104D00C2808BF02297FF449 -:1049E0002EAF2868400503D5E06800283FF4D0AE1C -:1049F0006968206921F0FE4141EA0061696021682F -:104A0000DFF8E46411F0180F38D0606900283FF433 -:104A100050AFC90670687FF53DAF800709D4706854 -:104A200040F0010000F0D5F80746706880077FF578 -:104A3000FFAE706840F0040000F0CBF807467068E5 -:104A400000070DD401F07CFEC01B0428F7D3B2E6AA -:104A50006868216920F0FE4040EA01606860CEE7A6 -:104A60007068A16920F4706040EA0120706000F075 -:104A7000ADF8074600F097F87FF405AF20784107BE -:104A800037D5DFF868743868C10529D4FFF716FEFA -:104A900001F056FE80463868C10521D401F050FE71 -:104AA000A0EB08000328F6D385E6706820F0040028 -:104AB00070607068C00810F00100DFD001F040FEA7 -:104AC000C01B0428F5D376E600F080F8074600F016 -:104AD0006AF8D3D001F034FEC01B0328F7D36AE68E -:104AE000A06801287FF4F7AE306840F00100306024 -:104AF00002E7A06A002853D0A968EA68022801F0FA -:104B00000C017FF440AFE36A02F00300984202BF59 -:104B100002F07000236B984214D1636BC2F306203D -:104B2000984202BF02F47810A36B98420AD1E36B5B -:104B300002F06060984202BF02F06042206C824244 -:104B40003FF409AF0C293FF423AE286820F08070B1 -:104B500000F0E0F90646296888013FF5EEAEE96805 -:104B6000DFF88C03626B0140E06A0143206B014374 -:104B7000A06B41EA02210143E06B0143206C014339 -:104B8000E960286840F080702860E96841F0805151 -:104B9000E96001F0D5FD0446286881017FF5D4AEB7 -:104BA0000020BDE8F0817068400810F001007047F7 -:104BB0002968606A21F0F001014329606868216A70 -:104BC00020F47F4040EA0120686070477068400828 -:104BD0004000706001F0B4BD2DE9F8430400884640 -:104BE00044D0DFF8106300F0CAF847D200F0CFF8E5 -:104BF000074600F0C4F841D001F0A2FDC01B022816 -:104C0000F7D90320B9E001F09BFD401B022843D9EE -:104C1000F7E701F095FDA0EB090002284CD9F0E779 -:104C200001F08EFDA0EB0900022854D9E9E701F05C -:104C300087FD401B02285DD9E3E701F081FD401BA1 -:104C4000022867D9DDE701F07BFD401B484577D39B -:104C5000D7E7032802D13968890103E000283968C1 -:104C600002D1890762D401E049055FD4012084E0C4 -:104C700001F066FDC01B022872D9C2E720788107C7 -:104C80004FF0B0470BD5B968A06821F0F00101439F -:104C9000B96001F055FD0546B868C003B3D520786A -:104CA000DFF8385281060AD52968606921F0F001E1 -:104CB000014300F069F8814628688003A9D520786F -:104CC00041060BD52968A0690909090141EA1011BB -:104CD00000F05AF881462868C003A1D52078410722 -:104CE0000BD5B968E06821F4E0610143B96001F0D7 -:104CF00027FD0546B868800399D5207801070CD5B3 -:104D0000B868216920F4605040EAC100B86001F041 -:104D100017FD0546B86840038FD52078C10717D521 -:104D20006068022895D1396889039FD5B9688908D8 -:104D300040EA8100B86041F2893901F001FD054681 -:104D4000B868616800F00C00B0EB810F7FF47BAFB6 -:104D5000306800F00700804505D200F018F80746DB -:104D600000F00DF884D100F055F85D490860FFF7B8 -:104D70008BFCBDE8F24301F0EDBBBDE8F283306887 -:104D800000F0070040457047296001F0D9BC316848 -:104D9000C90848EAC101316001F0D2BC38B54FF012 -:104DA000B044564DA16811F00C0106D1FFF78EFCFE -:104DB000C0F3031055F8200032BD0429504A05D035 -:104DC0000829504804D12168C90222D5104632BDB5 -:104DD000E16801F00301022904D0032904D121680C -:104DE000C90207D5104605E0FFF770FCC0F30310B9 -:104DF00055F82000E168E268E368C1F30621484302 -:104E0000C2F30211491C5B0FB0FBF1F05B1CB0FB5D -:104E1000F3F032BD80B5FFF7C1FF3749FFE73A4AEB -:104E20000968C1F3031152F82110B0FBF1F002BD83 -:104E300080B5FFF7EFFF00F010F8C1F3022106E0A4 -:104E400080B5FFF7E7FF00F008F8C1F3C22112F8C0 -:104E5000211001F01F01C84002BD27492B4A0968F3 -:104E6000704770B52549284AB1282EBFC86AC0F3DB -:104E7000031051F820001949096801F00F0152F898 -:104E80002110234AB0FBF1F0B0FBF2F00024002126 -:104E90000FF2880252F8213083420AD2491C0329BA -:104EA000F8D90AE001F04CFC801B03280DD3032045 -:104EB00070BD0FF2780050F821400E4D2868C008F0 -:104EC00044EAC00000F026F80646296801F0070110 -:104ED000A142E7D1002070BD000000000801005889 -:104EE0003826002034260020900000580004005886 -:104EF0008C80C11100400058080000580072000862 -:104F00000024F4000048E801C0710008C8790008D6 -:104F100040420F00286001F013BC000012000000A6 -:104F200024000000360000004000000000000000E7 -:104F3000010000000200000003000000DFF87C21F7 -:104F40001368010C23EA014343EA004313607047EE -:104F50002DE9F041054600272868DFF86461010566 -:104F6000B8462FD53468286A04F44074844229D0A6 -:104F7000FFF7A4FB002C316805D1286A21F44071A9 -:104F8000014331601DE0306840F48030306021F42E -:104F90004071326822F480323260286A0143316005 -:104FA0003068C0070DD501F0CBFB044641F28938CB -:104FB0003068800705D401F0C3FB001B4045F7D3E0 -:104FC0000327B8462878DFF8FC40C10705D5E16F14 -:104FD0006868890840EA8101E1672878810705D57A -:104FE000E16FA86821F440610143E1672878C106B8 -:104FF00044BF2869FFF7A2FF2878810644BF68698B -:10500000FFF79CFF287841070AD5E868E16F02099D -:1050100002F47F220001914300F47F200843E067FF -:10502000286881051ED5A869B0F1804F18BFB0F17E -:10503000004F00D018B9E16F21F0404108E0E16F66 -:1050400021F04041E16720F08050E16F21F04061A4 -:105050000843E067A869B0F1C05F03D1216841F05F -:1050600080712160286841050DD5E16FE86921F064 -:1050700040510143E167E869B0F1005F03D1216865 -:1050800041F4803121602868C10405D57168686ADF -:1050900021F4404101437160286881040BD5A16966 -:1050A000E86A21F030010143A161A169A86A890879 -:1050B00040EA8101A1614046BDE8F08188000058C6 -:1050C000900000580C000058F8B504460025ACB11B -:1050D00004F13406307910B9204601F077FA0F4F09 -:1050E000384600F021F8386840F00110386020465A -:1050F00000F007F835600120307100E001252846F6 -:10510000F2BD10B50021064A064B00EB8104491C94 -:1051100006296360E261F8D310BD0000000C00585E -:10512000FB1100087F110008002101604FF03F11C2 -:1051300041603F218160704738B5040044D094F845 -:10514000210028B9002184F82010204601F05AFAE5 -:1051500000F049F8FF2510B100F03FF834E0216875 -:10516000DFF8B0008A6802408A6021688A68636854 -:1051700020690343A06903431A438A602168E068F9 -:10518000086120680169A26841EA02410161206862 -:10519000C16821F08001C1602068C16C21F002016A -:1051A000C1642168CA6CE369606903431A43CA6435 -:1051B00020688168880609D400F020F830B12068A2 -:1051C0004562042100F01FF8012032BD20684562CD -:1051D000012184F82110002032BD2068456204219D -:1051E00084F821107047022084F82100CA20216829 -:1051F0004862532022685062204626E020460BE099 -:105200002068C0F8248084F82110002084F8200051 -:1052100070470000BFFF8FFF70B5044640F2E936CB -:105220002068C16821F0A001C16001F089FA05463B -:105230002068C168880606D401F082FA401BB0429B -:10524000F6D3032070BD002070BD70B50446206801 -:10525000C1684A0612D44FF0FF32C26040F2E9360C -:1052600001F06EFA05462068C168480606D401F0D0 -:1052700067FA401BB042F6D3032070BD002070BD1A -:1052800038B5040009D004F18005686808B900F059 -:105290001EF800F021F8012801D1012032BDA06ADA -:1052A00008B100F02AF800F00AF821F02A01FFE71F -:1052B000816000F01BF8BDE8324000F002BB2068BE -:1052C000416821F490414160206881687047002165 -:1052D0002970204601F0BAB924206860206801686E -:1052E000490849000160204600F086B9206801683D -:1052F00041F00101016020467047204600F07EBA6F -:1053000070B5044604F180051346686820283CD136 -:1053100069B318002BD02878012836D001222A70D2 -:1053200004F154062165338073800020E860212059 -:105330006860706AE8B1DFF8B414C162DFF8B004E5 -:10534000716A0863716ADFF8AC0448630020716A0F -:1053500088632068216D00F12802706A01F04DFA1F -:1053600038B11020E86000202870202068600120FB -:1053700070BD216840200862002028702068816884 -:1053800041F080018160002070BD022070BD816805 -:1053900021F0400181607047206881684A067047AB -:1053A0002068016821F0100101607047F8B50446DB -:1053B00040F60F002668F1693268B368084004F1CE -:1053C0005C050ED1880602D5900602D4D80040F1C3 -:1053D00080806969002900F00E812046BDE8F44014 -:1053E0000847DFF80C06034204BFDFF808763A42AC -:1053F0006FD0CF0707D5D70505D5012737622E6BAC -:1054000046F001062E638E0708D5DE0706D527680D -:1054100002263E622E6B46F004062E634E0708D528 -:10542000DE0706D5276804263E622E6B46F002068C -:105430002E630E070AD5960601D4034206D02668CD -:1054400008203062286B40F008002863080509D561 -:10545000500107D526684FF400603062286B40F099 -:1054600020002863286B002832D0890607D59006D3 -:1054700001D4D80003D5696909B120468847286B53 -:1054800021688A68510602D410F0280F1BD02046EC -:1054900000F093FAFFF780FF10D5FFF778FF286A36 -:1054A00060B10FF2DD518163286A01F01FFA002814 -:1054B0000ED0286A816BBDE8F44008472046BDE85D -:1054C000F24001F0F7BA204601F0F4FA0020286318 -:1054D000F1BD2869012853D1CF0651D5D0064FD54B -:1054E0001020306222689068410626D5296A086833 -:1054F000406880B20028EBD02B8898427BDA688025 -:10550000086801688B0614D4106820F4807010605D -:10551000206881684908490081602068FFF737FFEB -:105520002020E86200202861FFF73AFF286A01F096 -:10553000A7F929886888091A1CE028886988411A0F -:10554000688800281CBF88B2002854D01368DFF890 -:10555000400523F4907313602268936803409360BE -:105560002020E8620020286168612068026822F03B -:10557000100202602046BDE8F44089B201F09BBAF7 -:10558000C80209D5580207D54FF480103062204672 -:10559000BDE8F24000F010BB080609D5100601D4A2 -:1055A000180205D5A96931B32046BDE8F440084783 -:1055B00048060ED550060CD5306820F0400030600B -:1055C0002021A9620020A8612046BDE8F24001F038 -:1055D0008ABA080206D5500004D52046BDE8F2403C -:1055E00001F092BAC80148BF002A04D52046BDE8A0 -:1055F000F24001F08ABAF1BDF8B50446DFF8940430 -:105600002168DFF894C40A68DFF890740240A0684B -:1056100002432069024360690243E06902430A6071 -:1056200000254A68E06822F4405202434A60A369B8 -:10563000714A91421CBF206A03438E68DFF8600400 -:10564000064033438B600FF26446CB6A606A1B09E5 -:1056500040EA0313CB626145DFF848044FF400438E -:1056600039D13F6807F00307032F4DD8DFE807F073 -:10567000024643494FF0010CE169B1F5004F4FF686 -:10568000F07740F08080BCF1010F09D0BCF1020F2F -:105690000AD0BCF1040F71D0BCF1080F71D099E0B1 -:1056A000FFF7CEFB002815D0626A616836F8123029 -:1056B000B0FBF3F04A0802EB4002B2FBF1F080B21B -:1056C000A0F11001B942EAD20740C0F342000743FB -:1056D0002068C7607FE0914216D13F6817F44067A9 -:1056E00023D0B7F5806F09D0B7F5006F03D0B7F5B9 -:1056F000406F06D008E04FF0020C07E04FF0040CBA -:1057000004E04FF0080C01E04FF0100C9142B3D1CF -:10571000BCF1000F09D0BCF1020F0AD0BCF1040F9C -:1057200015D0BCF1080F15D054E0FFF781FB00281D -:1057300051D0616A36F81120B0FBF2F6626802EBD4 -:1057400042018E4246D31103B14205D242E0FFF737 -:1057500025FBECE71846ECE75008002110EB06208B -:1057600051EB16610023FBF7CFFDA0F54071DFF888 -:10577000382391422ED22268D0602CE0FFF70EFB36 -:1057800090E7184690E7BCF1010F09D0BCF1020F79 -:1057900009D0BCF1040F18D0BCF1080F18D019E0E3 -:1057A000FFF74EFBB8B1626A36F812306168B0FBA1 -:1057B000F3F000EB5100B0FBF1F080B2A0F110016A -:1057C000B94207D22168C86005E0FFF7E7FAE9E7C8 -:1057D0001846E8E7012504F16800012141800180B5 -:1057E00000218160C1602846F2BD0000F95900081F -:1057F000275A0008315A00080080004090F828100D -:10580000CA0706D502685368C16A23F400330B4304 -:10581000536090F828108A0706D502685368016B18 -:1058200023F480330B43536090F828104A0706D5C1 -:1058300002685368416B23F480230B43536090F854 -:1058400028100A0706D502685368816B23F40043C9 -:105850000B43536090F82810CA0606D50268936877 -:10586000C16B23F480530B43936090F828108A0691 -:1058700006D502689368016C23F400530B439360D0 -:1058800090F828104A0610D502685368416C23F43A -:1058900080130B435360416CB1F5801F05D15368F1 -:1058A000816C23F4C0030B43536090F828100A0660 -:1058B00006D501684A68C06C22F4002202434A609F -:1058C0007047F8B5044604F180050020E8606FF0E9 -:1058D0007E4700F035FF0646206801680A0708D5B4 -:1058E0000097334600224FF40011204600F017F8CD -:1058F00060B9206801684A070AD50097334600223C -:105900004FF48001204600F00AF808B10320F2BDF0 -:1059100020206860A8600020E0662870F2BD2DE9B4 -:10592000F041069C05460E4690461F462868C16910 -:105930003140B1420CBF0120002040451CD114F180 -:10594000010FF3D000F0FCFEC01B844200D314B959 -:1059500000F015F80CE0286801684A07E6D5C1692F -:105960000A05E3D54FF40062026200F008F8C16056 -:1059700000210170032000E00020BDE8F0812868CC -:10598000016821F4D07101602868816849084900E4 -:10599000816005F1800020214160816070470168CD -:1059A0000A6822F0C0020A6001688A6822F40002D4 -:1059B0008A602021C0F88410704701680A6822F4C8 -:1059C00090720A60DFF8C810026893680B40936019 -:1059D000C16E012904D101680A6822F010020A6030 -:1059E0002021C0F888100021C166016770470000BF -:1059F0000100001020010004816A0068026893061B -:105A000044BF084601F06FB80020A1F856000868AE -:105A1000826822F0800282600868FFE7016841F036 -:105A2000400101607047806A01F070B8000000001A -:105A3000F8B5846A04F1840504F1560728686E6895 -:105A400021688A68110606D5212804D100203880F3 -:105A50002046FFF7A4FF20688168480606D5222E5D -:105A600004D1002038812046FFF7A7FFA86840F046 -:105A70001000A8602046BDE8F24001F01BB800000D -:105A8000806A00F1560100220A810A8001F012B8F2 -:105A9000FEFFFFEFF369FFCF003801408800005898 -:105AA000FFF4FF110024F40000FD0F0001000200CC -:105AB0000400060008000A000C001000200040004E -:105AC0008000000110B500F180010A78012A01D19F -:105AD000022010BD01230B7024224A600268136863 -:105AE00014686408640014600022426623F00053C6 -:105AF00000680360202048600020087010BD70B569 -:105B000000F01EF801D1022070BD00F01FF822F055 -:105B1000604209E070B500F013F801D1022070BDB9 -:105B200000F014F822F0606211438160204600F01A -:105B30001AF820680660202068600020287070BD78 -:105B4000044604F1800528780128704701222A7054 -:105B500024206860206806680268520852000260CB -:105B600020688268704730B5416E11B90121012269 -:105B700014E001680FF230048A6889680FF230037C -:105B8000520E02F00702490F655CA45C595C9A5CF6 -:105B9000ED00E40095FBF1F194FBF2F268304180F6 -:105BA000028030BD00000000010101030701000078 -:105BB0000804020408010101704700000901020005 -:105BC00081B002D43C48815405E03C4802F00F0209 -:105BD000104400F8041C01B07047394A13684FF6AE -:105BE000FF0100020B4000F4E06018433549084310 -:105BF0001060704738B5324B1C68C4F30223C3F100 -:105C00000704052C28BF04241D1D072D34BF0023C5 -:105C1000DB1E012505FA04F4641E2140994005FAB3 -:105C200003F35B1E1A401143BDE83440C6E7000091 -:105C3000010007D4012200F01F01234B8A404009D4 -:105C400043F82020704701000BD4012200F01F010F -:105C50001E4B8A40400943F82020BFF34F8FBFF30B -:105C60006F8F704710B5401EB0F1807F01D30120C7 -:105C700010BD174C60600F214FF0FF30FFF79EFF03 -:105C80000022A26007202060002010BD010007D480 -:105C9000012200F01F010F4B8A40400943F82020E9 -:105CA0007047010007D4012200F01F010A4B8A400F -:105CB000400943F82020704700E400E018ED00E0C0 -:105CC0000CED00E00000FA0500E100E080E100E0FA -:105CD00010E000E000E200E080E200E07047704782 -:105CE00070477047704770477047704770477047FC -:105CF0007047704738B5054684B068780024FF289F -:105D000002BFB5F8031040F60140814225D1654934 -:105D10008A88B5F80700921C904209D1687B01245B -:105D2000C10752BF8DF8004000218DF8001011E02E -:105D30004988491C884210D10FF27010FDF710FEFF -:105D400003208DF8000005F10D00B5F80B108DF85B -:105D5000081001906846FDF7E3F9204605B030BD14 -:105D600010B58AB050484F4CFDF718F98F218DF8C7 -:105D70001810E520B3218DF819008DF81A10D520E0 -:105D80002E218DF81B008DF81C107F204A218DF8E4 -:105D90001D008DF81E1098202A218DF81F008DF807 -:105DA000201048207A218DF821008DF82210CC2077 -:105DB00040218DF823008DF82410FE2000218DF85D -:105DC0002500ADF8261000940823012206A9022020 -:105DD000FEF7E5F800F032F8412000F023F8A01CAF -:105DE00000F010F8062100F015F800F027F8422026 -:105DF00000F018F8201D00F005F8102100F00AF856 -:105E00000AB010BD059001210491029100200A22E0 -:105E100001907047039200910223208806AA022174 -:105E2000FEF70CB98E218DF824008DF82310002088 -:105E3000FE21ADF826008DF82510704719208DF849 -:105E40001800ED2182208DF81A008DF81910ED2030 -:105E5000AE218DF81C008DF81B104C2021218DF8EF -:105E60001E008DF81D1041209D218DF820008DF819 -:105E70001F10222045218DF822008DF82110704737 -:105E800080B542224FF64263984208D105480091FE -:105E90000223818800880022FEF72AF90246104674 -:105EA00002BD0000F82A0020F55C00082D2D2047D7 -:105EB000415454203A204C454420434F4E464947D4 -:105EC00055524154494F4E20524543454956454449 -:105ED0000A000000704770477047704710B50446CD -:105EE000FBF7BEF9204610BD10B5044610460A4621 -:105EF0000146204600F00CFE204610BD2DE9F84F6B -:105F00004FF00009614A624B4FF00F0805460E46FC -:105F100033E0604FBD4214BF072704278F4027435B -:105F20004CF82E70C1431C6801EA040C7468E40349 -:105F300048BF40EA0C0CC3F800C05C6801EA040CDE -:105F40007468A40348BF40EA0C0CC3F804C014688A -:105F500001EA040C7468E40248BF40EA0C0CC2F881 -:105F600000C0546801EA040C7168890248BF40EA25 -:105F70000C0CC2F804C009F10109316831FA09F0CA -:105F800072D0012404FA09F414EA0100F3D04FEAB4 -:105F9000490C032101FA0CF16FEA010E7168012925 -:105FA00018BF022903D0112918BF122911D1A968DD -:105FB000F7680EEA010107FA0CF73943A96069682E -:105FC00021EA04047168C1F3001101FA09F10C43DC -:105FD0006C60E968B4680EEA010104FA0CF421432C -:105FE000E9604FEA89017468022C18BF122C12D1A3 -:105FF0004FEAD90405EB840401F01C07D4F820A073 -:1060000008FA07FB2AEA0B0AD6F810B00BFA07F7D2 -:1060100047EA0A0727622C680EEA0407347904F07D -:10602000030404FA0CF43C432C607468E400A2D529 -:10603000DFF864C04FEA990E5CF82E7001F00C0195 -:1060400008FA01F427EA0404B5F1904F08BF0027CD -:1060500009D0124FBD4208BF012704D0104FBD42E6 -:106060007FF457AF022759E7BDE8F18F81B0002ACE -:1060700014BF8161816201B070470A4A136803420C -:106080001CBF1060FEF73ABA7047000000080058C5 -:106090008008005800100048080001400004004833 -:1060A000000800480C0800580346002009B95A604F -:1060B00070470120704708B9012070470160002037 -:1060C00070470000C0680840884201D10120704735 -:1060D00000207047C0690840884201D10120704704 -:1060E0000020704710B56C4C02212046FFF7F2FFEC -:1060F00038B16068C043810703D5FEF7FCF8022081 -:1061000018E001212046FFF7E5FF38B16068C04381 -:10611000C10703D5FEF7B7F801200BE008212046A0 -:10612000FFF7D8FF38B16068C043010703D5FEF719 -:1061300036F90820A06010BD10B5574C00F033F8B8 -:1061400018B96068C043810306D400F02CF830B958 -:106150006068C043810302D5BDE810407AE00821A1 -:1061600000F022F870B96068C04301030AD5606886 -:106170004A4940F400206060086880474FF40020DE -:10618000A06010BD202100F00FF858B96068C0432E -:10619000810207D5606840F400106060BDE81040DF -:1061A000FEF780B810BD022120468BE73C4881B045 -:1061B000016841F480110160006800F480100090D3 -:1061C00000983848016841F400710160364802685F -:1061D00042F40072026040BF20BF3448016841F4BD -:1061E0000041016001B0704780B53148016841F459 -:1061F00080110160006800F480100090009826482B -:10620000016841F001010160026842F480320260DD -:106210002C20FFF70DFDBDE802402D20FFF708BD43 -:1062200024480168490849000160704722494FF439 -:106230008030086070471F48016821F0020101604A -:1062400070471C484FF400314160016821F400316F -:10625000016070471748016841F400310160FEF7A2 -:1062600043B838B504460C4D08212846FFF72AFFED -:1062700030B10A480460686820F40020686031BDCD -:10628000A0474FF40021A96031BD0A48016821F000 -:106290000801016070470000000C00580C2B002022 -:1062A00050010058D4080058200800580C04005829 -:1062B00050000058040C0058080C005802480168AF -:1062C00041F400710160704708040058484900E03B -:1062D000484981B00A6802430A6009680840009092 -:1062E000009801B0704780B5FEF7D1F9FEF7D1F9FB -:1062F0004148016841F48031016000F058FCBDE87C -:1063000001400EE000B587B068460FF218211C224C -:10631000FAF7B6FFFEF737F86846FCF7F3FC07B06C -:1063200000BDF0B585B068461421FEF7C3F900261C -:106330000025002400210FF2DC0000EBC10290795F -:1063400088B11368B3F1904F08D02C4FBB4208D0EE -:106350002B4FBB4204BF9088044304E0908806435F -:1063600001E090880543491C2229E4DB00200290CB -:106370000121032003900191B0B288B10090012067 -:10638000FFF7A4FF0120FFF7A3FF69464FF09040FD -:10639000FFF7B4FD0022B1B24FF09040FFF766FE68 -:1063A000A8B280B100900220FFF790FF0220FFF713 -:1063B0008FFF124E69463046FFF7A0FD0022A9B2BA -:1063C0003046FFF753FEA0B280B100900420FFF7E3 -:1063D0007DFF0420FFF77CFF094D69462846FFF743 -:1063E0008DFD0022A1B22846FFF740FE05B0F0BDAA -:1063F0004C0000584C010058900800580004004818 -:1064000000080048FCF760BD13460A46014600201C -:1064100000F052BB000000480100000000000048EE -:1064200001000000000000480100000000000048DA -:1064300001000000000000480100000000000048CA -:1064400001000000000000480100000000000048BA -:1064500001000000000000480100000000000048AA -:10646000010000000000004801000000000000489A -:10647000010000000000004801000000000000488A -:10648000010000000000004801000000000000487A -:10649000010000000000004801000000000000486A -:1064A000010000000000004801000000000000485A -:1064B000010000000000004801000000000000484A -:1064C000010000000000004801000000000000483A -:1064D000010000000000004801000000000000482A -:1064E000010000000000004801000000000000481A -:1064F000010000000000004801000000000000480A -:1065000001000000000000480100000000000048F9 -:1065100001000000000000480100000000000048E9 -:10652000010000000000000000000000000000006A -:1065300014640008280003202C0003202204040017 -:106540000249016002490161704700BFAB42000887 -:10655000D342000870B50F4E044630780025A8B12C -:10656000FEF758FC32784FF47A71B1FBF2F1B0FBD0 -:10657000F1F0FFF777FB48B9102C07D20022214633 -:106580004FF0FF30FFF736FBB46000E001252846EE -:1065900070BD00BF2C260020544981B00A68024318 -:1065A0000A60096808400090009801B0704780B503 -:1065B0004FF40020FFF7F0FF002200212E20FFF70C -:1065C00019FBBDE802402E20FFF732BB00684849A6 -:1065D000884200D0704780B54FF48010FFF7DCFF91 -:1065E000002200212C20FFF705FB2C20FFF720FBC9 -:1065F000002200212D20FFF7FDFABDE802402D20EA -:10660000FFF716BB1CB504463A49206888421CD1E6 -:10661000FEF754F8FEF752F83748816B21F44071C9 -:1066200041F480718163816B41F4004181630268B0 -:1066300042F480620260006800F48060009000987C -:106640002046BDE8164000F0FDBA13BD38B586B04F -:10665000044601A81421FEF72DF82168274A91422B -:1066600042D12748274D416941F4804141610222CE -:10667000416901F4804100910099016841F00101F4 -:1066800001604FF4C061006800F0010000900098C4 -:1066900001910120039003210720049105900292AB -:1066A00001A94FF09040FFF729FC174828600F2000 -:1066B00068601020A8600020E86080202861002029 -:1066C0006861A861E8612862284600F03FF808B1D7 -:1066D000FCF75CFCA567AC62002200212420FFF7D8 -:1066E00089FA2420FFF7A4FA07B030BD5000005803 -:1066F000000C0058002800405800005800380140A5 -:106700004C000058E02800204400024000B500BFC3 -:10671000130096469446103928BFA0E80C50FAD8CA -:106720005FEA417C28BF0CC048BF40F8042BC90772 -:1067300028BF20F8022B48BF00F8012B00BD000045 -:1067400001484068704700BF2C26002038B504007F -:1067500001D1012032BD2168DFF840034018142226 -:1067600004F12405B0FBF2F2DFF83403E861920093 -:106770002A62022068700A68A0686FF30E12024352 -:10678000E06802432069024360690243A069024352 -:10679000E0690243206A02430A60204600F058F98B -:1067A000A068B0F5804F04BF002161602079696A5C -:1067B00000F03F0000F014F838B1052805D220465B -:1067C00000F05AF900F012F803E000202863686333 -:1067D000A8630020A861012068700020287032BDE5 -:1067E0000860A96AE86A486060687047296B002001 -:1067F0000860696BA86B48607047F8B5044604F1FF -:10680000240600253078012801D10220F2BD01279D -:106810003770707801282FD102277770B561206812 -:1068200007687F087F000760204600F0F5F82168C0 -:10683000F06820B10A6842F00E020A6008E00868B9 -:1068400020F0040008602068016841F00A0101603E -:10685000706A0168CA0303D5026842F4807202605C -:10686000306B18B1016841F48071016020680268E2 -:1068700042F00102026001E0357002252846F2BDB7 -:1068800081B040B100F124014A78022A05D00420E9 -:10689000886100200870012026E00268136823F058 -:1068A0000E0313604A6A136823F480731360006850 -:1068B0000268520852000260012091F82020CB6942 -:1068C00002F01C02904058608A6AC86A5060086BE7 -:1068D00030B1026822F4807202604A6B886B5060AB -:1068E000012048700020087001B0704738B500F1F1 -:1068F000240200245178022903D00420906101244D -:1069000028E001680B6823F00E030B6001680D6836 -:106910006D086D000D60516A0B6823F480730B6085 -:10692000012192F82030D56903F01C039940696079 -:10693000936AD16A5960116B31B10B6823F480738B -:106940000B60536B916B5960012151701470516948 -:1069500001B18847204632BDF8B500F12401042377 -:10696000CA6914680268156891F8206006F01C0670 -:1069700003FA06F73C4210D06F070ED51468A5063F -:1069800003D4156825F00405156000F03DF8C968CA -:10699000002938D0BDE8F4400847022303FA06F77F -:1069A0003C4213D0AF0711D51468A50605D415686D -:1069B00025F00A05156001224A7000F025F8002232 -:1069C0000A708968F9B1BDE8F4400847082303FA62 -:1069D00006F6344217D02B0715D5136823F00E03A3 -:1069E0001360012291F82030CC6903F01C039A4017 -:1069F000626001228A614A7000220A70096911B13D -:106A0000BDE8F4400847F1BD91F82020CC6902F0C0 -:106A10001C0293406360704778B5C56C046D6C6070 -:106A2000446D14B1846DC56D6560012590F84440D6 -:106A3000066C04F01C04A5407560046863608068FF -:106A4000102802D1A260E16071BDA160E26071BD59 -:106A5000426C1449920801EB82018164142201788E -:106A60000839B1FBF2F1104AC26401F01F010122A2 -:106A700002FA01F10165704701790C4A01F03F010A -:106A800002EB81024265491E094A826501F0030159 -:106A900001228A40C265704700000000F8FFFDBF78 -:106AA000000002400008024080080240FC0802404A -:106AB000400902407047704710B5002488B911485A -:106AC00003600E480E4B0360FEF71AFC012805D048 -:106AD00007D3032804D038BF022402E0012400E0D9 -:106AE0000324204610BD00680549884204D10549A9 -:106AF0000868002818BF0047704700003C260020A7 -:106B000000380140102B002070477047704700008C -:106B100062F30F2262F31F42401810F0030308D003 -:106B2000C91A1FD3DB0748BF00F8012D28BF20F882 -:106B3000022D130030B414461546103928BF20E941 -:106B40003C00FAD8490728BF20E90C0048BF40F8AC -:106B5000042D890028BF20F8022D48BF00F8012D20 -:106B600030BC7047C91818BF00F8012DCB0728BFEB -:106B700000F8012D7047000038B5EFF3108472B6AD -:106B8000284D6946281D00F08DF96946281D00F042 -:106B9000E6F938B184F31088BDF80010224AFFF7F7 -:106BA00033FC31BD0120287084F3108831BD80B5DD -:106BB000FFF728FC0221009100231A4800F124016C -:106BC0004FF48052001D00F054F801BD00BFF8B52D -:106BD00014460026EFF3108510F1010F1ED0012896 -:106BE0001CBF02284FF0FF3618D1BCB1264672B642 -:106BF0000C4F012392B2381D00F04FF800281CBF43 -:106C00003978002908D000223A7085F31088A1B2A3 -:106C1000054AFFF7F9FB01E085F310883046F2BD25 -:106C20000000000008140020796B00088A60FF2132 -:106C300002685162012180F82110002180F82010A3 -:106C40000020704790F82010012901D102207047E0 -:106C5000012280F82020022180F82110CA21026838 -:106C6000516253210368596201688A6842F0200228 -:106C7000DCE710B5029C016042600021C160016147 -:106C8000416181610381A107047704D5008910B1B6 -:106C90004FF0FF3010BD002010BD2DE9F04F06462B -:106CA00085B030890C460027BB4600287169DC4658 -:106CB0000CBF4FF00208D84681B168B930697768D7 -:106CC000451CBD4228BFED1B3768385C7D5D00EB7D -:106CD0000527BF1CBFB203E0074600E000B1024633 -:106CE0003069F568A84223BF7568281AC01B0020C8 -:106CF000154608EB050903FB09FE864532BF002057 -:106D0000B0FBF9FA09FB1A00C0B2804509DA96F81F -:106D10001C905FEAC97A48BF84465FEA897048BF21 -:106D2000C446100000F0B480706871446144884229 -:106D3000C0F0AE8008EB020080B20390D946100A82 -:106D4000ADF802000294ADF80020049359E08007EA -:106D500040D53089002840F09B803268D018A34687 -:106D600000F8024C200A32681A4402F8010C22464C -:106D700030681844FAF774FA706920187061B069C5 -:106D8000019C401CB061200A31680C703168487069 -:106D90001CE08CB3307FC207D9D5308940B9316847 -:106DA0001944FF2001F8020C3168194401F8010C64 -:106DB0004FF0000B7069241874612C463089002351 -:106DC00040B931680C70210A306841700223706943 -:106DD000801C706108EB04070021BFB231615CB117 -:106DE000DA44029800EB0A01306822461844FAF7A8 -:106DF00037FA70692418746109F10109B069401CFF -:106E0000B061049A70683169914545D27918814220 -:106E10002CBF081A0846306103463089A0B9306893 -:106E2000BDF80010C1545B1C70683168834228BFF4 -:106E30001B1ABDF80200C8545B1C7068834228BF4F -:106E40001B1A7069801C706105FB09FA7468BDF833 -:106E50000000E41A844288BF0446029800EB0A014D -:106E6000281BAC42019003D093D2307F002890D1F0 -:106E700037682246F818FAF7F3F97069201870613C -:106E8000A346019C039F0023A9E73068404400E02B -:106E9000002005B0BDE8F08F88448045F5D3A8EB0D -:106EA0000008F2E778B5028900230B80002A4469C4 -:106EB0000CBF02250025002C4FD0028952B9C268B0 -:106EC0004668531CB34228BF9B1B0668B25CF35C48 -:106ED00002EB03220A80027F02F00302012A25D17D -:106EE0000B884FF6FF72934204BF0289002A09D033 -:106EF000C36802699A4219D20289BAB14668F31A84 -:106F0000934213D24368C268E41A14190022C26083 -:106F1000446102894AB902681478012B94BFC3F115 -:106F200001030123D25C04EB02220A80C468426898 -:106F300006682B19934228BF9B1A33440E88416977 -:106F4000891B491B416105D034192D19954228BF71 -:106F5000AD1AC5608169491E8161184672BDF8B5D8 -:106F6000028900230B80002A42690CBF02240024FE -:106F7000002A3BD0C56802892B464AB946686A1C7C -:106F8000B24228BF921B0668775DB25C07EB022213 -:106F90000A80067F06F00306012E20D10F884FF6E7 -:106FA000FF72974204BF0289002A07D1426800237A -:106FB000012A94BFC2F1010201220AE00269AA4239 -:106FC0000DD202895AB14668751B954207D200233B -:106FD00004E005682E78AA5C06EB02220A8041686C -:106FE0000068E4188C4228BF641A03191846F2BDE1 -:106FF00010B50446AFF30080204600F005F80446C3 -:10700000AFF30080204610BD7CB500F10F06F608F6 -:10701000F600B04240D2082E04D2082602E0083022 -:1070200000F047F8DFF804512C68210005D100205A -:1070300007E00268B24221D2011D08680028F8D199 -:107040002068291D0A68824222D01368B34238BFE3 -:10705000111DF7D312E093190B60801B54685C601C -:107060000B6818601660096800291DBF4868002871 -:10707000081D0020286002F1080076BD61B10A6891 -:107080001068A0F10803B342E5D250680860EAE74F -:1070900000F04EF80028C2D1002076BD10B50400E3 -:1070A00006D0AFF30080204600F003F8AFF3008075 -:1070B00010BD002800D1704750B4A0F10802136839 -:1070C000072B2BD913F0070F28D1184C616809B191 -:1070D0008A4202D25160626013E0486800B3904275 -:1070E00038BF0146F9D31BE0964203D11B180B6051 -:1070F0000A4606E0486810B1134498420ED3506027 -:107100004A60506850B11368D118814206D10021FD -:1071100021600168CB1813604068506050BC704714 -:1071200008680E18B242DFD250BC7047E82A00202F -:107130000749086808B1002070470648C008C00029 -:1071400008600549C908C900091A0160704700BFF5 -:10715000202B00200F1000200814002013490020CD -:1071600008604FF4E0221248016841F470010160A8 -:107170004FF0B041086840F0010008608A600D4897 -:107180000A6802400C480A60036823F005030360A4 -:10719000426852085200426000220848C8600868ED -:1071A00020F4802008608A617047000008ED00E04C -:1071B00088ED00E0FBFEF6FA94000058001004226F -:1071C00001000000030000000500000001000000B5 -:1071D00001000000060000000A000000200000007E -:1071E0000200000004000000080000001000000081 -:1071F00040000000800000000001000000020000CC -:10720000A0860100400D0300801A060000350C0026 -:1072100040420F0080841E0000093D0000127A00E9 -:107220000024F40000366E010048E801006CDC0226 -:10723000000000000000000000000000000000004E -:107240002DE9F04107468846387810F0030F1646BE -:107250001D4633D0384600F099F878BBB8F1000FDE -:107260001CBFD8E900018619012D2ED13888C10430 -:1072700015D5396A07F14402384600F0A3F83A6B95 -:10728000044602B93A69F968384600F09BF8361BA3 -:10729000341A7A69F968384600F094F8261A1EB94B -:1072A0004DB916F1010F09D097F903002A4631466E -:1072B00000F08EF8064616F1010F09D12320AFF336 -:1072C00000804FF0FF30BDE8F081022DE8D1EBE700 -:1072D000388810F4405F0ED07868F86038617861C3 -:1072E000B8617868F86107F14400386207F130004E -:1072F000786200203863B8F1000F05D0D8E90201A8 -:1073000007F13402C2E9000139884CF6FF60014000 -:1073100039800020BDE8F08170B50546AFF30080EC -:107320002888810415D56E680024EA6895F9030061 -:107330003146914212D2521AFFF748FC10F1010F68 -:107340001CBF00283618F0D10FE04DF6FF70014049 -:1073500029802846AFF30080002070BD0022002164 -:10736000FFF734FC10F1010F00D101246868E860D8 -:10737000A861E861002C2988E7D041F400712980D8 -:107380002846AFF300804FF0FF3070BDF8B5A0B9CC -:10739000AFF3008000250A4E08244FF0FF37306815 -:1073A00020B1FFF7B9FF002848BF3D46361D641ED7 -:1073B000F5D1AFF300802846F2BDBDE8F240ABE75F -:1073C000E8250020914234BF511A00210846704739 -:1073D0003EB504000D00012A02D100F063F807E079 -:1073E000022A07D100940020019069460C20ABBE10 -:1073F0002D1801E0002A0CD10094019569460A205D -:10740000ABBE002805D100222100280000F027F89B -:1074100001E00020C04303B030BD000010B4314A89 -:10742000002113461C6884421EBF491C9C6884428C -:107430001EBF491C1C69844209D09C69491C8442B6 -:1074400005D0491C20331029ECD310BC7047002311 -:1074500042F8313002EBC1014B6010BC704778B488 -:10746000204C002325462E688E421EBF5B1CAE6852 -:107470008E421EBF5B1C2E698E4209D0AE695B1C1A -:107480008E4205D05B1C2035102BECD372BC7047AC -:10749000054604EBC303012A04BF59684D195D601A -:1074A00072BC704710B40F4A002113461C68844216 -:1074B0001EBF491C9C6884421EBF491C1C69844233 -:1074C0000AD09C69491C844206D0491C20331029EB -:1074D000ECD310BC0020704702EBC100406810BC28 -:1074E000704700006028002010B50446E068A169DC -:1074F000884251D3218849F202030B40022B08D065 -:1075000008044CBF4FF400704FF4844001432180C5 -:107510003BE001F4C042B2F5C04F06D1A1688842F9 -:1075200003D32046FFF732FF78BB208810F4406F6A -:1075300002BF606804F14401884217D14FF4007023 -:10754000FFF756FD606030B904F144006060E06010 -:10755000401CA0600AE0218841F040012180E060E9 -:10756000606100F500726068A260E061606820619F -:10757000A068A061207841070AD502220021204698 -:1075800000F00CF810F1010F02D14FF0FF3010BDE8 -:10759000208840F4C0402080002010BD70B5044613 -:1075A0000D461646AFF3008033462A46002120469A -:1075B000FFF746FE05462046AFF30080284670BD23 -:1075C0002DE9FC4D016800F10805490805EBC102F1 -:1075D000019200F10802406800F0010A02EBC108C4 -:1075E000400808EBC00B00200021019A95422FD0E3 -:1075F0002A68AE186A68324400920835009A9642AA -:10760000F3D016F9014B009A964205D12A68AE18BC -:107610006A6832440092083516F8017B884210D11E -:10762000D84508BFFAF747FBD8F80000D8F804108F -:10763000BAF1000F18BF48440144884208F1080815 -:10764000EED0002C00F8017B05D5641CE6D1D5E70F -:107650005846BDE8F68D641ED5D5CFE738B5040091 -:107660000ED0207810F0030F03D094F90300002807 -:1076700009D5AFF30080204600F030F8AFF300806A -:107680004FF0FF3032BD2046FFF780FE0546AFF3D6 -:1076900000802078410644BF606800F05DF800205B -:1076A000606094F90300022804D900F057F808B18B -:1076B0004FF0FF35E06B48B100F05CF808B14FF0D7 -:1076C000FF35E06B00F048F80020E063204600F052 -:1076D00005F8AFF30080284632BD000001780A06A5 -:1076E00026D51C4A13680021834203D1002342F8A7 -:1076F00021301BE05368012183421EBF02219368A1 -:107700008342F3D0D368032183421EBF042113694F -:107710008342EBD05369052183421EBF0621936942 -:1077200083421EBF0721D3698342DFD000F014B823 -:10773000002101804FF0FF31C17000F14401416030 -:10774000C160016141618161C161016200F130018B -:1077500041627047E8250020FFF7A0BC1CB502007D -:10776000009269460220ABBE04001000FFF756FEEF -:10777000200016BDE0B50090F9F724FD01906946A0 -:107780000E20ABBE03B000BD38B50C46C5B22046D6 -:10779000AFF30080E068A169884204D32046FFF778 -:1077A000A3FE00280FD4E068401CE06000F8015DF3 -:1077B0002088010503D440050BD50A2D09D12046A8 -:1077C000FFF7E4FD28B12046AFF300804FF0FF3013 -:1077D00032BD2046AFF30080284632BD00F024F8C9 -:1077E000012810D00D4880470D480047F0B54346AA -:1077F0004C4655465E466746F8B40A4C6B462360D5 -:10780000BFF34F8F30BF074C2468A546F8BC98469D -:10781000A146AA46B346BC46F0BD00005D71000813 -:10782000417A0008142B00200249002008607047AC -:1078300000000000182B0020FEE7FEE7FEE7FEE751 -:10784000FEE770477047704700F01CB80248FFF72A -:1078500083B80248FDF7AABDE02800203C2600209E -:10786000FEF740BCFEF768BC00F014B80120FEF73C -:1078700004BC1020FEF701BC4020FEF7FEBBFBF766 -:10788000E0BE0000024841680278891841607047F4 -:107890002C2600200449C8680A6882430A604860B0 -:1078A00000F004B80000000000150058704719E00F -:1078B00050F8042BD30744BFA9F101039A18091FFC -:1078C0000023042942F8043BF9D25FEA817C134685 -:1078D00004D54FF0000CA2F800C09B1CC90744BFA0 -:1078E0000021197050F8041B0029E1D170470000F5 -:1078F00038B50D4D0824286800281CBF017811F008 -:10790000030F05D090F90310002958BFFFF7A6FE1A -:107910002D1D641EEFD1BDE83840002200214FF03C -:10792000FF30FFF753B900BFE825002010B5074925 -:1079300079441831064C7C44163404E00A68081D6A -:10794000114488470146A142F8D110BD2C00000027 -:10795000780000004EF68851CEF20001086840F42D -:1079600070000860BFF34F8FBFF36F8F4FF0007050 -:10797000E1EE100A7047000037FFFFFFEC04000043 -:107980003C260020700800003000032000000000AA -:1079900031FCFFFF02000000020000004C0100006B -:1079A00002000000280003200800000015FCFFFF73 -:1079B0000200000002000000320100005E01000031 -:1079C0000814002034120000000000000000000035 -:1079D00000000000000000000100000002000000A4 -:1079E000030000000400000000F00DF8002801D0A2 -:1079F000FFF79CFFAFF300800020AFF30080FBF7A0 -:107A000096F900F002F80120704700F001B800007C -:107A10000746FFF76DFF3846FAF706FAFBE738B579 -:107A200004460D46284600F005F8A84218BF002479 -:107A3000204632BD0149FFF7A7BE00BFBC2400208D -:107A4000AFF30080FFF786FFFFF7CEFF00002E00A8 -:107A50004300FFF7FEBFFFF7FEBFFFF7FEBFFFF7D4 -:107A6000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF74A -:107A7000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF73A -:107A8000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF72A -:107A9000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF71A -:107AA000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF70A -:107AB000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7FA -:107AC000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7EA -:107AD000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7DA -:107AE000FEBFFFF7FEBF0000F8000001810081002B -:107AF000810081008100810081008100810081007E -:107B0000810081008100810081008100810081006D -:107B1000810081008100810081008100810081005D -:107B2000810081008100810081008100BD0004503E -:107B30007A000801FD000388250020D80003E51025 -:107B40000008FC0004D310000801F9001301040030 -:107B500000B8240020B9240020B8240020B8240054 -:107B600020FC0003B8240020FC0007B8240020A457 -:107B7000240020E000130204010190290020E029E4 -:107B800000209029002090290020FC00039029006B -:107B900020FB0006250020EC240020E00013020852 -:107BA000020240290020902900204029002040297D -:107BB0000020FC000340290020FC0007482500208D -:107BC00034250020DD00044800100048FD000D4869 -:107BD000153F00081B3F0008213F00080FFD000073 -:107BE0000FFD00000FE5001B4C7A00084C7A0008DE -:107BF0004C7A00084C7A00084C7A00084C7A00084D -:107C00004C7A0008F8FF0B4E7A00084C7A00084CBA -:107C10007A0008FAFFEA00F8FFF4000B7424002051 -:107C2000BC24002004250020EC00030DFF0183EBA1 -:107C3000000B040048000400480004004801F9005B -:087C40000010FC0002093D00E8 -:0400000508007A4134 +:101E300011001820ABBEFBE72600020018B58FB0DA +:101E400002A80FF68831DFF834453422FFF718FA7C +:101E50000FF27D500190009469460FF25D5000F042 +:101E6000CFFD0121022000F0B4FEDFF8142500218F +:101E7000042000F02CFF02A800F0B2FF08B101F02E +:101E8000EEF800F022F901F0EBF8DFF8F8440FF279 +:101E90003142002084F8800000214FF6FF70E0827C +:101EA000012000F014FF0FF265420021022000F033 +:101EB0000EFF062001F06AF9DFF8CC040021017062 +:101EC0000121417001F0F5F90FF23143002204F1D4 +:101ED0008101002001F0EAFC0FF22943002204F105 +:101EE0008201002001F0E2FC002020838021DFF845 +:101EF0009C040180A0214180012000F078F910B0FD +:101F000010BDF8B50746DFF87C447878DFF87854E0 +:101F1000052804F1800604D03E2814D0FF285AD0AA +:101F2000CAE0B888E18A884206D10020E082307099 +:101F30000FF2B04001F07CFD012000F058F90120C3 +:101F40002871E08A42E0F87801282BD0032802D0DB +:101F50000C2803D0B0E00FF2B440A3E00FF2D84059 +:101F600001F066FD387900280CBF0FF2E8400FF24F +:101F70000C5001F05DFDE08A6A460DF1010101F0AF +:101F800095FD60B90FF21C5001F052FD9DF8002044 +:101F90009DF801100FF2205001F04AFD8CE00FF285 +:101FA00034507FE0707801F0A7FCB7F805100FF20D +:101FB000405001F03DFD307804280CBF062005207C +:101FC00030700021B7F80500E0822971E880281DF3 +:101FD00001F069F970E0B7F80300001F65D04FF415 +:101FE0007F71401A18D0401E4DD0401E17D0401EA1 +:101FF00020D0401E21D0401E22D0801E50D0401E36 +:1020000028D0401E2CD0401E27D040F2F631401A76 +:1020100004BF012068704FE00FF2185042E00FF249 +:10202000445001F005FDE08AD94901F049FE0FF264 +:102030005C5037E00FF2745034E00FF2A05031E002 +:102040000FF2CC5001F0F4FCE08A01F0B5FE0FF283 +:10205000E85027E00FF2FC5024E00FF2286021E066 +:10206000D7F807100FF24C6001F0E2FCD7F8071028 +:102070000FF2586001F0DCFCE08A012101F0EEFE75 +:102080000FF25C600EE0F9790FF2946001F0D0FC81 +:10209000F879002814BF0FF2FC600FF2E46001E051 +:1020A0000FF2047001F0C4FC06E0012001F036FFDD +:1020B000B0780A2101F06FFC0120F2BD01F013B9E4 +:1020C0000021022000F010BE704730B587B000201C +:1020D000ADF81A0001F0C0FCAE48AF4D016811F137 +:1020E000010F0ED042682974120A090A697405F1B9 +:1020F00010044068A874EA74100A120C28756A75F6 +:1021000006E0002001F08CFF040008BF0FF68C04ED +:1021100022460621002001F004F860790FF68402BF +:102120002872102120796872E078A872A078E8728D +:10213000607828732078934C6873182000F0F1FFC2 +:102140000FF670021021082000F0EBFF182101208B +:1021500001F00EF801F076FF0DF1160006A90190CE +:10216000009105AB07220021012001F0C6FD0FF20E +:102170006460BDF8181000900723BDF81400002219 +:1021800002F020F80DF11A0000900223BDF816109D +:10219000BDF81400002202F015F8022202210020EE +:1021A00001F0B7FC0120207001F03EFD01206070BD +:1021B000012108202071A1701020607100210020F1 +:1021C000E070049110217548A0600390082200205F +:1021D000029001910092002301220121012001F0CF +:1021E0003CFDA07808B101F0D0FD07B030BD2DE96D +:1021F000F8410446012C87B003D16448058847881C +:1022000003E04FF4C8654FF47A67DFF8788108F18E +:102210008006707801F070FB31780FF2C05001F049 +:1022200007FC022C11D13078012818BF02280CD1EC +:1022300001F09FFC010004D10FF2BC5001F0F8FB4B +:1022400003E00FF2D85001F0F3FB34700020069049 +:10225000059008F119010491082298F818000FF26E +:102260006471039002910192002300933A4629463B +:10227000002001F090FC48490E2001F06EFD0100A5 +:1022800013D1012C0AD10FF2BC5001F0D1FB7078B0 +:10229000434908B0BDE8F04101F07DBB08B0BDE89E +:1022A000F0410FF2C85001F0C3BB08B0012CBDE8EB +:1022B000F0410CBF0FF2E0500FF20C6001F0B8BB20 +:1022C00010B5012001F02FFE2E4C94F88000052857 +:1022D00012D001F04EFC002184F8801030B90FF2CA +:1022E0001C6001F0A5FB0FF21C6001E00FF23060F2 +:1022F000BDE8104001F09CBB10BD00000021012092 +:1023000000F0F2BC012001F00EBE00001CB51D4C17 +:1023100094F88000012818BF00282DD01A48417871 +:10232000012929D1002201784270491C01EBD172A8 +:102330005210A1EB42010170F7EE040A017800EBA4 +:1023400081004FF4FA7190ED020AE08A0091C0EE2C +:10235000200AFDEEE00A10EE902A92B20023114608 +:1023600001F074FFBDE8164000280CBF0FF2D450F6 +:102370000FF2006001F05CBB13BD0000A008032059 +:102380003F2A00086C27002020260020442B002034 +:1023900040E201008075FF1F0826002007B20100FF +:1023A00046E001000021042000F09EBC012000F066 +:1023B000C1BC012000F0C6BC10B50446616801F143 +:1023C000080000F05BFE00B10120207010BD00008D +:1023D00010B1012803D070473F2000F099BC3F2086 +:1023E00000F09EBC0D0A0D2A2A20444953434F4E4B +:1023F0004E454354494F4E204556454E542057496B +:10240000544820434C49454E54200A000D0A0D2AD9 +:102410002A20434F4E4E454354494F4E2055504479 +:10242000415445204556454E542057495448204371 +:102430004C49454E54200A004556545F555044417E +:1024400054455F5048595F434F4D504C45544520CB +:102450000A0000004556545F5550444154455F50B2 +:1024600048595F434F4D504C4554452C207374617F +:10247000747573206F6B200A000000004556545F8E +:102480005550444154455F5048595F434F4D504C5F +:102490004554452C20737461747573206E6F6B20E6 +:1024A0000A000000526561645F50485920737563EB +:1024B00063657373200A00005048592050617261AF +:1024C0006D202054583D2025642C2052583D202555 +:1024D00064200A005265616420636F6E66206E6F2F +:1024E00074207375636365657373200A00000000D0 +:1024F0004843495F4C455F434F4E4E454354494F17 +:102500004E5F434F4D504C4554455F5355424556E1 +:10251000545F434F444520666F7220636F6E6E6553 +:102520006374696F6E2068616E646C652030782515 +:10253000780A00000D0A0D2A2A204143495F4741CD +:10254000505F4C494D495445445F444953434F56AD +:10255000455241424C455F56534556545F434F44A4 +:1025600045200A000D0A0D2A2A204143495F4741B0 +:10257000505F504153535F4B45595F5245515F5631 +:10258000534556545F434F4445200A000D0A0D2A17 +:102590002A206163695F6761705F706173735F6B4D +:1025A00065795F72657370200A0000000D0A0D2ABC +:1025B0002A204143495F4741505F415554484F529B +:1025C000495A4154494F4E5F5245515F5653455603 +:1025D000545F434F4445200A000000000D0A0D2AB5 +:1025E0002A204143495F4741505F534C4156455F64 +:1025F00053454355524954595F494E4954494154F2 +:1026000045445F56534556545F434F4445200A00A6 +:102610000D0A0D2A2A204143495F4741505F424F2E +:102620004E445F4C4F53545F56534556545F434F8F +:102630004445200A000000000D0A0D2A2A20536597 +:102640006E6420616C6C6F77207265626F6E6420BF +:102650000A0000000D0A0D2A2A204143495F474124 +:10266000505F414444525F4E4F545F5245534F4C6C +:102670005645445F56534556545F434F4445200AE0 +:10268000000000000D0A0D2A2A204143495F4741FE +:10269000505F4B455950524553535F4E4F54494636 +:1026A00049434154494F4E5F56534556545F434F3B +:1026B00044450A006E756D657269635F76616C757D +:1026C00065203D20256C640A000000004865785FA5 +:1026D00076616C7565203D20256C780A000000004D +:1026E0000D0A0D2A2A206163695F6761705F6E754C +:1026F0006D657269635F636F6D70617269736F6E30 +:102700005F76616C75655F636F6E6669726D5F7928 +:1027100065736E6F2D2D3E594553200A0000000051 +:10272000424C455F4354524C5F4170705F4E6F7432 +:10273000696669636174696F6E3A204143495F4716 +:1027400041505F50414952494E475F434F4D504CB5 +:102750004554455F56534556545F434F44452C20DE +:1027600070616972696E675F636F6D706C657465C7 +:102770002D3E537461747573203D2025640A00005A +:102780000D0A0D2A2A2050616972696E67204F4B2D +:10279000200A00000D0A0D2A2A2050616972696E14 +:1027A00067204B4F200A00000D0A0D2A2A204143C2 +:1027B000495F4741505F50524F435F434F4D504C2C +:1027C0004554455F56534556545F434F4445200A90 +:1027D0000000000050325053525631004669727367 +:1027E0007420696E64657820696E20256420737496 +:1027F000617465200A000000537563636573736636 +:10280000756C6C792053746F7070656420416476C8 +:102810006572746973696E67200A000053746F7083 +:10282000204164766572746973696E6720466169D8 +:102830006C6564202C20726573756C743A20256475 +:10284000200A00005375636365737366756C6C7959 +:1028500020537461727420466173742041647665FC +:1028600072746973696E67200A00000053756363B0 +:1028700065737366756C6C79205374617274204C47 +:102880006F7720506F776572204164766572746946 +:1028900073696E67200A0000537461727420466188 +:1028A0007374204164766572746973696E6720463B +:1028B00061696C6564202C20726573756C743A20B4 +:1028C0002564200A000000005374617274204C6F6C +:1028D0007720506F776572204164766572746973F2 +:1028E000696E67204661696C6564202C207265738F +:1028F000756C743A202564200A00000020200D0A1F +:102900000D0000002A2A2053544F502041445645C0 +:1029100052544953494E47202A2A20200D0A0D00BF +:102920002A2A2053544F502041445645525449536B +:10293000494E47202A2A20204661696C6564200D93 +:102940000A0D0000424C455F5356435F4C324341F1 +:10295000505F436F6E6E5F55706461746528292CFB +:10296000205375636365737366756C6C79200D0A0B +:102970000D000000424C455F5356435F4C324341CB +:10298000505F436F6E6E5F55706461746528292CCB +:10299000204661696C6564200D0A0D006C7AD8AC24 +:1029A00057720000123456789ABCDEF01234567812 +:1029B0009ABCDEF0FEDCBA0987654321FEDCBA0969 +:1029C00087654321095032505352563100000000B0 +:1029D00000000000000000000000000000000000F7 +:1029E0001E0004000A05020112279C00F4010000E9 +:1029F000FFFFFFFF48010100002000000000000071 +:102A00007FB50C466D4D61686D4EE86129622846C0 +:102A100001F050FC246805F1240001F055FC7460BD +:102A200006F1080001F050FC01203070296829B13E +:102A30000FF2551000900294684688477FBD1FB57D +:102A40005F4C04F1080001F042FC00BB2178F1B1B9 +:102A5000694604F1080001F063FC5848C16949B1B6 +:102A60000098029001228DF8042001A888479DF863 +:102A7000040000E001202070207818B1009801F0D7 +:102A800004FD04E0009904F1080001F029FC04F1C0 +:102A9000080001F01CFC28B9207818B104F10800E6 +:102AA000FFF780FC1FBD2DE9F8430646002000F02B +:102AB0005FF874883088B268DFF80081C4F30904D5 +:102AC00044EA8024F068A4B2C1B2204600F03CF889 +:102AD000002748F2E8094846FFF76BFC08E06888E1 +:102AE000A04202D1316928780870687800B10127C6 +:102AF00008F1240001F0EBFBF0B9694608F124006D +:102B000001F00EFC009800F10B05407A0F28E6D08A +:102B1000B5F80110A1420DD10098817AC81E7169E3 +:102B2000C0B28842C8BF0846706102463069E91CDD +:102B3000FEF796FB2878D9E73800CCD0012000F0CA +:102B400017F80020BDE8F28310B513461C4A5468FC +:102B5000A4F80900E1720A46194604F10C00FEF7D8 +:102B60007FFB164A1369BDE810400021002018477A +:102B70001249096A82B008B921B101E011B10120FE +:102B800002B0084702B0704710B50146487A0F28D6 +:102B900018BF0E2807D10B4801F0ACFBBDE8104070 +:102BA0000020FFF703BC064C04F1080001F0A2FB73 +:102BB00004F10800BDE81040FFF7F4BB402A0020F4 +:102BC000B42A0020642A00200C48002101604160E2 +:102BD000704710B500F00CF85C6819B1012904D1F8 +:102BE000204301E024EA0000586082F3108810BD01 +:102BF000EFF3108272B6014B70470000EC2A002000 +:102C00002DE9FC47604CDFF88491A5692840A0615C +:102C10004FF0FF3A21694FF0010834E0521C54F89C +:102C20003200616919400142F8D0616904EBC206C3 +:102C3000084071681840014208BFC6F804A07768D0 +:102C4000384000F0A5F8606208FA00F0874377602A +:102C5000EFF3108172B6626A206908FA02F2D24379 +:102C600010402061022004EBC00353F8086C1640AA +:102C7000401E43F8086CF6D181F31088606A59F859 +:102C8000201088472169A36960690140194205D075 +:102C9000E069216A084208BF0022C0D0C4F824A01D +:102CA00001F041FCEFF3108972B6216960690140BF +:102CB000A069014201BFE169206A014201F06DFD96 +:102CC00089F3108801F0DCFEA561BDE8F38738B513 +:102CD0001446EFF3108572B600F05AF82B4941F80C +:102CE000204085F3108831BD10B500F00BF8044387 +:102CF0001C6153F83140204343F83100FFE782F371 +:102D0000108810BDEFF3108272B61F4B1C6970471C +:102D1000EFF3108172B61C4A536923EA000005E004 +:102D2000EFF3108172B6184A53691843506181F36A +:102D300010887047EFF3108172B6134AD3691843B5 +:102D4000D061F4E7F8B5104C666A256A374616F18B +:102D5000010F0EBF0026012101FA06F6206202E0F3 +:102D6000304601F01BFD216AE0690842F8D0676235 +:102D7000EFF3108172B6E269206A8243E26181F367 +:102D800010882562F1BD0000C0250020F02700203A +:102D900002460020110C090404BF1020120412F096 +:102DA0007F4F04BF083012020FF2180112F0704F6B +:102DB00004BF001D1201120FC0F11F00895C401AF0 +:102DC000C0B27047040302020101010100000000CB +:102DD0000000000001F0ABFE9DF80E0005B000BD44 +:102DE000F8B500F10C026B4625214FF66640F1E77D +:102DF000F8B500F10C026B460F214FF66840E9E789 +:102E0000F8B502466B460E214FF67540E2E770B505 +:102E10001B491C4B0A681C49C2F30D0201EB8201DD +:102E20000C6822689A4205D16569A169E269E36884 +:102E3000246904E025696169A2696368A4682E0EAB +:102E4000067001722E0C467042722E0A8670C47390 +:102E5000C5F3031605F00F050571C6700D0E45711B +:102E60000D0C85710D0A190E8172C571190CC17294 +:102E70001B0A210E41730373210C8173002070BD66 +:102E80003C400058B95646A900000320614900E0C3 +:102E9000614981B00A6802430A60096808400090ED +:102EA000009801B0704710B501F090FE01F03CFBB6 +:102EB00000F021F800F051F8584C5948606104F1D5 +:102EC000140001F0ADFE0420FFF7E2FF0120FFF740 +:102ED000DFFF00F0B3F800F055F800F075F8514846 +:102EE000206000206060204601F0D2FE01F030FB3F +:102EF00001F052FCFCE780B598B007A8442101F02E +:102F0000E7FE68461C2101F0E3FE01F0E5FE4648BD +:102F1000016821F018010160072007904FF480310B +:102F20000891012009904FF480710A9140200B9084 +:102F30000021119107A801F0E0FE6F20009002210E +:102F400000200191029003900490059006900121C9 +:102F5000684602F04FF919B000BD10B58CB0684654 +:102F6000302101F0B5FE4FF480400990022110207D +:102F70000B904FF440540A910094684602F0F4FA22 +:102F80000CB010BD002038B5284D294C68602C606D +:102F90000F20A86047F6FF70E86000202861A86154 +:102FA0006861284602F09CFB00220021284602F0BE +:102FB00047FCCA206062FF2153206062A068C008FD +:102FC000C000A060616231BD10B51A4C1A48206083 +:102FD0004FF4E13060600020A060E06020610C20D0 +:102FE00060610020A0614FF40040E0610020206299 +:102FF0006062A062204602F0CBFC0021204603F074 +:1030000086F90021204603F08DF92046BDE81040E6 +:1030100003F060B9480000584C00005850290020C7 +:10302000000C005800100058900000586C2A002036 +:10303000002800404C2600200038014080B50420C4 +:10304000FFF724FF0120FFF721FF00220F210E20B0 +:1030500003F0D8F9BDE802400E2003F0F1B9704743 +:103060001B4800210171017200F034B818490A7937 +:1030700041F822000879401C0871704770B5044679 +:103080006078FF2802BFB4F8031001F47F41B1F566 +:10309000406F12D100260E4D00E0761C2979F0B267 +:1030A00088420AD2F1B255F8211020468847010023 +:1030B000F3D002D0022805D006E02046BDE87040DB +:1030C000FEF71FBF002070BD012070BD0000000092 +:1030D000E02A002080B503F009FA03F008FA03F0B3 +:1030E00007FA03F006FA03F005FA03F004FA03F016 +:1030F00003FA03F002FA03F001FA03F000FA03F016 +:10310000FFF903F0FEF903F033FA03F0EBFA03F0F2 +:10311000EAFA03F0E9FA03F0E8FABDE8014003F047 +:10312000E5BA18B50C46C7B0114600228DF800204C +:103130008DF81C008DF81D4022460DF11E0003F095 +:10314000D6FA00F03FF83F200C21ADF80400ADF8AE +:10315000061007A8012103900691A41C049400F016 +:1031600041F800284CBFFF209DF8000048B010BD7A +:1031700000B5C7B000F01FF80F2000F028F80028B5 +:103180004CBFFF209DF8000047B000BD00B5C7B0A0 +:103190000021ADF81C008DF80010182201A803F0E2 +:1031A000ACFA182000F013F800284CBFFF209DF85F +:1031B000000047B000BD00228DF800208DF81C00F3 +:1031C0008DF81D101822002101A803F096BAADF861 +:1031D000060007A9022004903F22012003910690D7 +:1031E000ADF80420CDF814D0002101A8FFF75BBC96 +:1031F00070B506464E4C30784CA520B1012807D05A +:10320000032810D070BD012020700FF2281003E0B9 +:10321000002121700FF2501000F00AFC2846BDE892 +:10322000704000F005BC71680878C8B94978012978 +:1032300009D100F073FE0FF2641000F0F9FB00F00A +:103240002FF80120A0707168487848B900F06BFE33 +:103250000FF2701000F0ECFB00F022F80020A070DC +:103260007068017801291AD1407801280AD100201C +:1032700000F054FE0FF2741000F0DAFB00F010F8CA +:103280000120A0707168487848B900F04CFE0FF238 +:10329000841000F0CDFB00F003F80020A07070BD9A +:1032A000284600F0C5BB0078012808BF00F00DB823 +:1032B000704780B50FF2390200210820FFF707FDA3 +:1032C0001B4900220A70BDE8014080B5002000F0D3 +:1032D0002AFE174801214170002181700121C1702F +:1032E0000021017101BD00210820FFF7FDBC000095 +:1032F00010B50F4C2079401E8041C00F20712078FE +:1033000068B10FF2381000F093FB08A000F090FBBA +:10331000E11CBDE810404FF6426003F0B9B9BDE8CA +:1033200010400FF2581000F083BB0000200A0D007F +:10333000142B00202D2D20503250204150504C494C +:10334000434154494F4E20534552564552203A204E +:103350004E4F54494649434154494F4E20454E41F2 +:10336000424C45440A0000002D2D2050325020418F +:1033700050504C49434154494F4E205345525645B5 +:1033800052203A204E4F54494649434154494F4EEA +:103390002044495341424C45440A00002D2D205001 +:1033A0003250204150504C49434154494F4E2053D4 +:1033B000455256455220203A204C454431204F4E2C +:1033C0000A0000002D2D20503250204150504C4911 +:1033D000434154494F4E2053455256455220203ABE +:1033E000204C454431204F46460A00002D2D2050E8 +:1033F0003250204150504C49434154494F4E205384 +:1034000045525645522031203A204C454431204FF8 +:103410004E0A00002D2D20503250204150504C4972 +:10342000434154494F4E2053455256455220312076 +:103430003A204C454431204F46460A002D2D20505D +:103440003250204150504C49434154494F4E205333 +:10345000455256455220203A20494E464F524D2063 +:10346000434C49454E5420425554544F4E20312030 +:10347000505553484544200A200000002D2D20506F +:103480003250204150504C49434154494F4E2053F3 +:103490004552564552203A2043414E275420494E2A +:1034A000464F524D20434C49454E54202D20204E2E +:1034B0004F54494649434154494F4E204449534192 +:1034C000424C45440A200000DFF83C150A6892B2DD +:1034D00000E00246086880B28242FAD170472DE9C6 +:1034E000FC4104461825DFF82485DFF8246568438D +:1034F00008EB00073078062808D1317871703470F5 +:1035000078754FF0FF307060002039E000F077F8F8 +:10351000B9680918B96008F10803B96832786A43D4 +:103520009A589142327813D308F1150315FB02FC27 +:1035300013F80C30062B25D008F108066B43F3581E +:10354000994222BF08F115036A439A5CEED219E052 +:103550001146337869439A420BD008F1140308F1FD +:10356000150C5B5C15FB03F50CF805407A753B7593 +:1035700000E07A7508F11402545431787170347097 +:10358000BDE8F6811146694308F115035B5C062B23 +:1035900004D008F1140615FB03F574557B753A75D4 +:1035A00008F115025454EBE7F8B5DFF86434DFF89E +:1035B0005C541E78182402466243B0422A4404D167 +:1035C00018785870507D18700FE0167D507D92F875 +:1035D00015C005F115076643062807F806C004D094 +:1035E000167D143514FB00F42E5501201073187845 +:1035F000062802BF00294FF0FF315960F1BD10B518 +:10360000DFF80C44606810F1010F0FD0FFF75CFF8A +:103610006168DFF80024814261683CBF5388C918A3 +:10362000081A517848431178C84000E0002080B261 +:1036300010BD2DE9F84FDFF8DC53DFF8DCB3D5F827 +:103640000880D8F80000DBF800104A0500F090F977 +:10365000DFF8BC63DFF8B4A321F4806181604FF030 +:10366000180934780AF1080019FB04F14758FFF7EC +:10367000C6FF874217D200270121B170062C3DD02A +:1036800019FB04F40AF108010AF108020959814200 +:1036900023BF0AF108010959091A002111510AEB47 +:1036A00004014C7DEAE7A9884118B94202D2AF88EB +:1036B0000021E2E73F1ADFE7022802DA2878012832 +:1036C00000D07F1ED8F80000C1684A07FAD500F084 +:1036D00055F9DBF80C00000CBFB247EA0047CBF805 +:1036E0000C70FFF7F1FE7060A8680068816841F413 +:1036F00080618160AFF30080BDE8F18FB8B200282F +:10370000DAD1FFF7E1FE70600320BDE8F24F02F06E +:10371000C5BE2DE9F843EFF3108872B6BD4DBB4B23 +:10372000A8680168CA224A6253204862B84A886879 +:1037300020F48060886018201678374647431F447D +:10374000387B022826D13C68D7F810909078F0B1E9 +:103750007A7B012A0AD101213046FFF725FF88F341 +:1037600010887968304600F016F904E088F3108874 +:10377000304600F0C1F8A8680068CA2141622246BC +:10378000532141624846314600F050F90BE0FFF703 +:1037900050FF06E0C8684207FCD500F07EF89F495C +:1037A000086088F31088FF21A86802685162BDE8AC +:1037B000F183F8B5974CA160CA2209684A62532286 +:1037C0004A62954A136843F020031360136803F0BC +:1037D0000703C3F10403237095682D0C05F07F05E2 +:1037E0006D1C6570EDB29268C2F30E02521C6280CD +:1037F00092B2521E6A43A2F5A072DA404FF6FF73EE +:103800009A422CBFA380A280854A136843F4002308 +:103810001360844B1D6845F400251D6048BB7C483F +:103820007A4E0123837018254FF0FF334360002345 +:103830005FFA83FC06F10C0715FB0CFC4FF0000E41 +:1038400007F80CE05B1CDFB2062FF1DB06230370E8 +:10385000886820F48060886000F01FF8D060032042 +:1038600002F027FEA1680868826842F48042826004 +:1038700005E0C868410544BF032002F00FFEA168BF +:103880000A68FF20506200220321032002F0BAFDE3 +:10389000BDE8F240032002F0D3BDC86800F080000C +:1038A00060F49060C8604FF400207047F0B50446A3 +:1038B0000025EFF3108672B61827DFF850C10CF11F +:1038C0000C0007FB05FE10F80E0010B16D1C062D54 +:1038D000F5DB062D0CD06F430CEB070001270773B7 +:1038E00086F310880461427303600D700020F0BD00 +:1038F00086F310880120F0BDF8B50746EFF3108479 +:1039000072B6032002F0A7FD424DAE683068CA21AE +:1039100041623A4653214162182043494243895C3F +:1039200002291BD100213846FFF73EFE38480178B6 +:1039300006290ED1306838490A68530500F018F896 +:1039400021F480618160C1684A07FCD500F016F857 +:1039500004E04078884218BFFFF76BFEA9680A6848 +:10396000FF205062032002F06BFD84F31088F1BD4C +:1039700002D5C1684A07FCD481687047C16801F06C +:10398000800161F49061C1604FF400202349086018 +:10399000032002F08EBD2DE9F04180460F464246DD +:1039A00018201A4942438C18207B022804BF404645 +:1039B000FFF7A2FFEFF3108572B6032002F04BFD74 +:1039C000144EB0680068CA2141625321416202204E +:1039D0002073A76067604046FFF781FD0C490A78B5 +:1039E0004978914202D0FFF724FE02E0A168081A4C +:1039F000A060FF20B1680A685062032002F020FD39 +:103A000085F31088BDE8F08128280040DC260020DE +:103A1000242B0020D42A0020082800400C0800583D +:103A20000008005880080058E826002010470000D1 +:103A30000EB4C0B5024603A800210190009101AB6D +:103A40000121044878440C30FCF778FB06BC5DF893 +:103A500010FB00BF4748000000B587B000F014F825 +:103A6000012003220690ADF80420ADF8062000F0F6 +:103A70007AF800284CBFFF209DF8000007B000BD79 +:103A8000182201A802F039BE00208DF8000018228B +:103A9000002101A802F031BE09220021684602F08F +:103AA0002CBE1822002102A802F027BE70B5C8B0B3 +:103AB00006460C4615460522FFF7EFFFADF82060DD +:103AC000FFF7EFFF302100F014F80521049000F01B +:103AD00019F8002848BFFF2009D49DF8000030B92C +:103AE0009DF8030020709DF804002870002048B065 +:103AF00070BDADF80A1008200221ADF8080005914C +:103B000008A870470791CDF818D0002102A8FEF749 +:103B1000CABF00B5C7B000F00EF8FFF7B1FF312003 +:103B200000F013F800F01FF800284CBFFF209DF8AC +:103B3000000047B000BD00238DF81C008DF8003058 +:103B400007A84170827000217047ADF8060007A9F0 +:103B5000032004900822012003910690ADF8042070 +:103B6000704703900691CDF814D0002101A8FEF70C +:103B70009ABF00B587B000F082F900F06AF98120A1 +:103B800000F015F900F033F900284CBFFF209DF834 +:103B9000000007B000BD2DE9F84DC7B09446DDF830 +:103BA00040E1519A559D569EDDF84CA1ADF81D108F +:103BB0008DF81C004FF0000BADF81FC08DF82130C0 +:103BC0008DF822E000F024F800F017F824F8095FDF +:103BD000668000F03EF93F20832100F02BF9574426 +:103BE00006910D37049700F005F900284CBFFF201F +:103BF0009DF8000048B0BDE8F08D88F800A007AC43 +:103C00005499E419524608F10100544402F06FBD82 +:103C10008DF82320174652998DF800B00DF1240835 +:103C200009A8B84402F063BD00B5C7B000F00CF8B5 +:103C3000852000F0E5F800F0DAF800284CBFFF20FE +:103C40009DF8000047B000BD00218DF81C008DF8E4 +:103C50000010182201A802F050BD2DE9F841C7B0AC +:103C60004FF0000800F026F80DF12300DDF844E1E4 +:103C70004E9F4F9E509D529C8DF81F30C0F800E023 +:103C80008DF800808DF820708DF821608DF822501D +:103C90008DF8274000F0DDF88620ADF8060007A972 +:103CA0000C2000F0A0F800284CBFFF209DF8000079 +:103CB00000F0E2B88DF81C0007A8417082707047D0 +:103CC00000B5C7B00022ADF81C008DF800200DF142 +:103CD0001E001822016001A8002102F00EFD8820BC +:103CE000ADF8060007A9062000F07DF800284CBFBB +:103CF000FF209DF8000047B000BDF8B5C8B00546EC +:103D00000E4617461C4600F023F808A84670877038 +:103D10008DF8205000F089F88A21ADF80A103F2074 +:103D2000032100F075F8002848BFFF200ED49DF84D +:103D3000000058B94F994E98BDF801202280BDF877 +:103D400003200280BDF805000880002049B0F0BDC6 +:103D500007220021684602F0D0BC18B5C7B000F0B9 +:103D60009DF800F076F83F208E2100F08CF800F0EE +:103D700041F800284CBFFF209DF8000048B010BD5E +:103D8000ADF8060007A90220704700B587B000F023 +:103D900076F800F05EF8922000F009F800F027F8BD +:103DA00000284CBFFF209DF8000007B000BDADF813 +:103DB00006003F220120704700B5C7B00021ADF8D2 +:103DC0001C00FFF744FF9520FFF7DAFF00F00BF827 +:103DD00000284CBFFF209DF8000047B000BDADF8A3 +:103DE000060007A9032004903F22012003910690BA +:103DF000ADF80420CDF814D0002101A8FEF753BE81 +:103E0000ADF8060007A901203F22039104907047F6 +:103E1000ADF80800059108A8072104900791CDF896 +:103E200018D0002102A8FEF73EBE1822002102A8E9 +:103E300002F063BCADF80400ADF8061007A801213C +:103E40000390704700228DF80020ADF81C008DF81B +:103E50001E101822002101A802F04FBC00B5C7B007 +:103E6000FFF7F0FFA520FFF7BAFF00284CBFFF20A7 +:103E70009DF8000047B000BD48B0BDE8F0810020CB +:103E80008DF800007047ADF80400ADF8061007A8E3 +:103E9000012103900691641C04947047044600209D +:103EA0008DF800008DF81C4022460DF11D0002F037 +:103EB0001EBC0000494981B00A6802430A600968D3 +:103EC00008400090009801B0704778B585B004466E +:103ED0006846142100F0FCFE0220FFF7EBFF00F023 +:103EE00011F8009501200190002102200390029119 +:103EF000694656F8240002F00BFC00F009F8002097 +:103F000006B070BD0FF2F400354E30F81450704713 +:103F100056F824000022294602F0B8BC80B500F013 +:103F20000AF8012203E080B500F005F8002202F053 +:103F3000ADFC002002BD0FF2C401294B31F8101076 +:103F400053F820007047F0B585B005460C4668462A +:103F5000142100F0BDFE2DB1012D08BF102002D0AC +:103F6000022D02D10120FFF7A5FF0FF298001D4F8F +:103F700030F81500009001210220039007EB850620 +:103F8000029130682CB900210191694602F0C0FB12 +:103F900020E04FF40411019107EBC504694602F0DB +:103FA000B7FB0FF26C0050F8251004F1240002F06A +:103FB00092FCF268002104F1240002F085FC0FF26B +:103FC0004C004457B1690022204602F01BFA2046FB +:103FD00002F036FA002005B0F0BD00004C00005899 +:103FE000302600204C250020002000F017B80120CA +:103FF00000F014B8022000F011B800002000010009 +:10400000020000000100100040000000060A170036 +:10401000000000160400001606000016704700009D +:1040200001460648064AC3798B4218BF904218BF22 +:104030000838F8D18B4218BF00207047F873FF1F73 +:104040000070FF1F00B587B000208DF8000000F061 +:10405000E0F840F20110ADF806003F220120069082 +:1040600000F0ECF800284CBFFF209DF8000007B0DE +:1040700000BD2DE9F84107460128C7B0884615461E +:104080001E4608BF022003D002280CBF10200020CB +:104090000DF11D010C1800F036F8012F8DF81C7081 +:1040A00002D0022F18D019E002273A4641460DF1FE +:1040B0001D0002F01CFB2570667000F0AAF83F207E +:1040C0004FF4817100F016F8FF1C049700F0B8F867 +:1040D000002805D5FF2009E01027E6E7972005E036 +:1040E0009DF8000010B94E9800F067F8FFE748B05F +:1040F000BDE8F081ADF80400ADF8061007A8032173 +:1041000003900691704703220021684602F0F5BA39 +:104110002DE9F64F0C460546012CC7B09B4608BF5B +:10412000022003D0022C0CBF102000200DF11F0133 +:104130000E18FFF7E8FF012CADF81C508DF81E405B +:1041400002D0022C2CD02DE00227569C559DDDF884 +:104150005091DDF84CA1DDF8488148993A4600F0CD +:1041600054F8A6F800B086F8028086F803A086F816 +:1041700004907571B47100F04CF83F20ADF8040064 +:104180004FF4827107A8ADF80610039003210A3797 +:104190000497069100F054F8002805D5FF2009E0A7 +:1041A0001027D2E7972005E09DF8000010B9579836 +:1041B00000F003F849B0BDE8F08FBDF801100180B0 +:1041C0000020704730B5C7B01C464A9B00F026F867 +:1041D00000258DF800508DF82140224619460DF13A +:1041E000220002F084FA00F014F83F204FF48371AB +:1041F00000F01BF8A41D049400F022F800284CBF26 +:10420000FF209DF8000047B030BD0DF11F0002F007 +:104210006EBA1822002101A802F06FBAADF81C0096 +:10422000ADF81E108DF820207047ADF80400ADF8F1 +:10423000061007A80121039006917047ADF80420ED +:10424000CDF814D0002101A8FEF72DBC30B5C7B0C1 +:104250000025ADF81C0007A84A9C41808280ADF87B +:10426000223004818DF8005000F01EF80F210291D9 +:1042700040F281100A21ADF80600049107A801213F +:104280003F220390069100F007F800284CBFFF2062 +:104290009DF8000047B030BDADF80420CDF814D033 +:1042A000002101A8FEF7FFBB1822002101A802F09F +:1042B00024BA00000249016002490161704700BF51 +:1042C00087430008AD430008006040607047EFF38B +:1042D000108172B6026882420CBF012000201CE0EF +:1042E000EFF3108272B603680B60486001600868E3 +:1042F000416023E0EFF3108272B6086043684B60C0 +:1043000041604868016019E0EFF3108172B64268BD +:104310000368136002684368536081F31088704734 +:1043200010B5EFF3108472B602680A600068FFE708 +:10433000FFF7EAFF84F3108810BD0B6082F310884A +:104340007047000002F041BB6C486D49016001F10B +:104350002002426001F13002826001F13C020262FF +:1043600001F14402426201F14C02C26001F15402C7 +:10437000026101F17002426101F1740282618031D7 +:10438000C16102F040BB38B504465E4D2846FFF7D8 +:104390009BFF5A484068A1680160E168C160856080 +:1043A0005949416002F04BFB58482AE080B5534818 +:1043B0004268136801211972406802F046FB002030 +:1043C00002BD38B5514C4F4D04E000F041F8009863 +:1043D000216888472846FFF77AFF0028F5D031BDCD +:1043E0004A484168084738B50446494D2846FFF712 +:1043F0006BFF4248C068A1680160456002F02AFB7B +:1044000044482168016061684160002032BD80B588 +:104410003A48C268136810211972C06802F020FB84 +:10442000002002BD35483B4AC168C168136808686E +:10443000184738B5374C364D04E000F009F80098BD +:10444000616888472846FFF742FF0028F5D031BD54 +:1044500069462846FFF764BF38B504462E4D284606 +:10446000FFF732FF2D48FFF72FFF24480069A168AE +:104470008160E168C1600561216801606168416037 +:10448000216941616169816131BD80B5014623487F +:10449000FFF730FFBDE802400FF2050002F0E9BA75 +:1044A00038B5164C1D4D06E0FFF7D2FF0099206984 +:1044B0000069FFF71FFF2846FFF709FF0028F3D028 +:1044C00031BD10B5164C2046FFF7FEFE0B48416982 +:1044D0000C60BDE8104002F0E0BA1CB5104C06E0DC +:1044E00069462046FFF71CFF009800F01BF82046A5 +:1044F000FFF7EDFE0028F3D013BD000000000320FD +:10450000AC090320480A032090080320FC2A00205D +:10451000500A0320042B0020380A0320F42A00202C +:10452000400A03207047704780B590484FF400411F +:1045300001600020FFF774FD48B180798C498D4AF5 +:104540000A600A6822F47C5242EA00220A6001BD35 +:1045500010B58948894C88B001680160CA21884833 +:10456000C1615321C161FF220168C908C90001600E +:10457000C2618448016841F400410160FEF724FBF8 +:1045800081480168C908C90041F00401016002F0D6 +:104590009DFA7E490020FFF70CF902F0ACFA0121E8 +:1045A0000120FEF716FB00F0C2F800F0CFF8FFF78D +:1045B000CBFE774A00214020FEF789FB04F23C50F5 +:1045C0000FF231010090019169460FF22D0000F0C9 +:1045D00059FA04F25470029004F5C96140F23C505B +:1045E00005900391049402A8FFF736FFFFF7AAFE97 +:1045F00008B010BD7047000038B5044688B0616847 +:1046000001F10B056846FEF702FC9DF802309DF8AB +:1046100001209DF800100FF2BC10FFF709FA9DF879 +:1046200004100FF2D410FFF703FA9DF80C309DF838 +:104630000B209DF80A100FF2DC10FFF7F9F928881B +:104640004FF41241401A0CD0401E3ED0401E4CD0B8 +:10465000801E57D0401E5AD0401E5BD0401E60D0F6 +:1046600063E004A8102100F033FB60680D3000788F +:10467000F8B90FF26430FFF7DBF902F04BFA0D20C6 +:104680008DF810007F2143488DF8121004680FF256 +:104690007830240C2146FFF7CBF9ADF81C4004A874 +:1046A000FEF7AEFBFDF7CAFB00210120FEF791FAF1 +:1046B0003BE0012806D10FF27030FFF7B9F9002076 +:1046C000207032E00FF28C302DE0606800F10D04B4 +:1046D0000FF26C202178FFF7ABF92078002814BF87 +:1046E0000FF2C0200FF284201DE00FF24010FFF700 +:1046F0009FF9D5F80620D5F802100FF25C10FFF7ED +:1047000097F912E0D5F802100FF2901006E00FF2C0 +:10471000C01008E0D5F802100FF2D010FFF788F9AA +:1047200003E00FF20020FFF783F909B030BD80B538 +:104730000020FFF7CAFB0120FFF7C7FB0220FFF7AD +:10474000C4FBBDE802400120FFF7E8BB80B50121B2 +:104750000020FFF7F8FB01210120FFF7F4FBBDE883 +:10476000044001210220FFF7EEBB0000104000587A +:104770009C000058FECAFECA900800583000032072 +:104780000828004008000058800400586C2A0020C7 +:10479000C74A0008002004E001E0704700BF4FF066 +:1047A000FF30FEF72DBA00214020FEF79DBA02200F +:1047B000FEF7C0BA0220FEF7C5BA012804D01028BF +:1047C00004D0402804D07047FDF778BCFDF778BCD2 +:1047D000FDF77ABC576972656C6573732046697220 +:1047E0006D776172652076657273696F6E202564DE +:1047F0002E25642E25640A00576972656C657373F3 +:10480000204669726D77617265206275696C6420FB +:1048100025640A004655532076657273696F6E20D1 +:1048200025642E25642E25640A0A00002D2D2042C1 +:104830004C45204E564D2052414D20484153204278 +:1048400045454E205550444154454420425920434B +:104850004D4F2B200A000000534843495F535542F7 +:104860005F4556545F424C455F4E564D5F52414D39 +:104870005F555044415445203A205374617274414D +:10488000646472657373203D20256C78202C20535E +:10489000697A65203D20256C640A0000534843492D +:1048A0005F5355425F4556545F4E564D5F535441DA +:1048B00052545F5752495445203A204E756D6265F7 +:1048C000724F66576F726473203D20256C640A0036 +:1048D000534843495F5355425F4556545F4E564DCA +:1048E0005F454E445F57524954450A005348434977 +:1048F0005F5355425F4556545F4E564D5F5354418A +:1049000052545F4552415345203A204E756D6265C1 +:10491000724F66536563746F7273203D20256C641B +:104920000A000000534843495F5355425F455654BF +:104930005F4E564D5F454E445F45524153450A0018 +:10494000534843495F5355425F4556545F45525261 +:104950004F525F4E4F5449462057495448205245C4 +:1049600041534F4E202578200A0000005348434908 +:104970005F5355425F4556545F4552524F525F4E0A +:104980004F544946205749544820524541534F4EB1 +:10499000202D204552525F424C455F494E495420DC +:1049A0000A000000534843495F5355425F4556543F +:1049B0005F4552524F525F4E4F544946205749541B +:1049C0004820524541534F4E202D20424C45204512 +:1049D00052524F52200A0000534843495F535542F8 +:1049E0005F4556545F434F44455F5245414459200B +:1049F0002D20574952454C4553535F46575F5255FA +:104A00004E4E494E47200A004442474D43555F47AA +:104A100065745265766973696F6E49443D20256CF3 +:104A200078200A0A00000000534843495F5355426A +:104A30005F4556545F434F44455F524541445920BA +:104A40002D204655535F46575F52554E4E494E47AF +:104A5000200A0000534843495F5355425F4556546E +:104A60005F434F44455F5245414459202D20554EE8 +:104A700045585045435445442043415345200A007E +:104A8000704700007FB50C464D4D61684D4EE861A2 +:104A90002962284602F06CF92468746006F1080067 +:104AA000FFF712FC012000F068F80120307029683F +:104AB00041B10FF2E9000FF2ED0200900192029471 +:104AC000684688477FBD1FB53E4C04F10800FFF7DC +:104AD000FEFB00BB2178F1B1694604F10800FFF745 +:104AE0001FFC3748C16949B10098029001228DF836 +:104AF000042001A888479DF8040000E001202070F0 +:104B0000207818B10098FFF7C0FC04E0009904F188 +:104B10000800FFF7E5FB04F10800FFF7D8FB28B910 +:104B2000207818B104F10800FFF73DFE1FBD2DE904 +:104B3000F04105460E4690461C46002000F01DF848 +:104B4000204F7868A0F80950C672324641460C30B2 +:104B5000FCF786FB1A4A136900210020984748F2A7 +:104B6000E800FFF727FE79688A78D21C04F1080074 +:104B7000FCF776FBBDE8F04101201CB51049124C52 +:104B8000096A20B901B188470020207013BD0120B7 +:104B9000207011B1BDE81C40084713BD0020FFF78D +:104BA00006BE000010B50146064C04F10800FFF7F0 +:104BB000A1FB04F10800BDE81040FFF7F4BD0000C0 +:104BC000902A0020C42A0020E92A0020114810B5AC +:104BD000016841F480710160032001F006FC0020AF +:104BE00002F0D0F80024002814BF012402F0F7F8E6 +:104BF000204610BD084880687047084805E007480F +:104C0000016841F0020101607047016841F0010153 +:104C100001607047004000583C260020042004E05A +:104C2000F8B504460025ACB104F13406307910B96A +:104C3000204602F0E3F80F4F384600F021F83868BC +:104C400040F001103860204600F007F83560012080 +:104C5000307100E001252846F2BD10B50021064A5A +:104C6000064B00EB8104491C06296360E261F8D31E +:104C700010BD0000000C0058FB1100087F11000857 +:104C8000002101604FF03F1141603F21816070477A +:104C900010B5040001D1012010BD607A20B90021B7 +:104CA0002172204602F0C6F80220607221680A686C +:104CB000606822F0200202430A602068016841F027 +:104CC00004010160012060720020E06010BD00005E +:104CD000002202F079B900000248016841F48071B5 +:104CE00001607047000400584FF0B040006800F0C9 +:104CF000F000B02888BFB02070472DE9F0410400D3 +:104D000054D0207881064FF0B04538D5A868E968BE +:104D100010F00C0001F0030103D00C2808BF01299A +:104D200046D12868800702D5E06900283ED0FFF709 +:104D3000DBFF616A884207D2084600F0A0FB00282A +:104D400034D100F043FA0FE0286820F0F00001436E +:104D500029606968206A21F47F4141EA0021696085 +:104D6000606A00F08CFB08BB00F062FBDFF888177C +:104D70000860DFF88807006802F004F8B0B920780E +:104D8000C1070DD5A868E96800F00C00082801F0FB +:104D9000030103D00C2808BF03292CD12868800305 +:104DA00040F11D816068002840F01981012006E271 +:104DB000E06980B1296841F0010100F0F3FA06468C +:104DC0002868800700F1088102F018F9801B032889 +:104DD000F6D30320F3E128684008400000F0A6FB6A +:104DE0000646286800F0EEF9C9D002F007F9801BEA +:104DF0000328F6D3EDE76068B0F5803F04D1296859 +:104E000041F48031296003E02A6822F480322A606C +:104E1000606860B102F0F2F806462868800300F18D +:104E2000DE8002F0EBF8801B6528F6D3D1E702F0B4 +:104E3000E5F806462868400C10F0010000F0CF802D +:104E400002F0DCF8801B6528F4D3C2E702F0D6F844 +:104E5000C01B0328C0F0F780BBE7E06878B1296881 +:104E600041F4807100F09EFA06462868400500F182 +:104E7000FD8002F0C3F8801B0328F6D3A9E7286859 +:104E800020F4807000F052FB06462868800A10F07B +:104E9000010000F0C28002F0B1F8801B0328F4D3B7 +:104EA00097E702F0ABF8C01B0328C0F0F18090E751 +:104EB00040F0010000F09BF907467068800700F1A0 +:104EC000028102F09BF8C01B0328F6D381E77068CB +:104ED00020F0040000F08BF907467068C00810F05D +:104EE000010000F0FF8002F089F8C01B0428F4D311 +:104EF0006FE70528306806D140F004003060316863 +:104F000041F0010105E0400840003060316821F0C7 +:104F100004013160A06841F2893768B102F06EF88F +:104F200080463068800700F1F28002F067F8A0EB5D +:104F30000800B842F5D34CE702F060F880463068CC +:104F400000F040F900F0E38002F058F8A0EB080010 +:104F5000B842F4D33DE702F051F8801B0328C0F0BB +:104F6000088136E702F04AF8001B0328C0F02281CE +:104F70002FE7286881010CD4296841F080712960ED +:104F8000E86840F08050E86002F038F8044628688D +:104F9000810100F1138102F031F8001B0328F6D3E0 +:104FA00017E70C2930D0286820F080702860E96865 +:104FB00089088900E960E86820F08050E86002F024 +:104FC0001DF804462868810140F1F88002F016F8C7 +:104FD000001B0328F6D3FCE600F0F8F8CFE62078B3 +:104FE00081071AD5A868E96800F00C00042801F0D0 +:104FF000030104D00C2808BF02297FF42EAF2868D3 +:10500000400503D5E06800283FF4D0AE6968206908 +:1050100021F0FE4141EA006169602168DFF8E06447 +:1050200011F0180F38D0606900283FF450AFC9065E +:1050300070687FF53DAF800709D4706840F00100CB +:1050400000F0D5F80746706880077FF5FFAE7068FE +:1050500040F0040000F0CBF80746706800070DD45C +:1050600001F0CCFFC01B0428F7D3B2E668682169C1 +:1050700020F0FE4040EA01606860CEE77068A169F8 +:1050800020F4706040EA0120706000F0ADF807463F +:1050900000F097F87FF405AF2078410737D5DFF8A7 +:1050A00064743868C10529D4FFF716FE01F0A6FF25 +:1050B00080463868C10521D401F0A0FFA0EB0800AC +:1050C0000328F6D385E6706820F0040070607068ED +:1050D000C00810F00100DFD001F090FFC01B0428D1 +:1050E000F5D376E600F080F8074600F06AF8D3D0F2 +:1050F00001F084FFC01B0328F7D36AE6A0680128EB +:105100007FF4F7AE306840F00100306002E7A06A3B +:10511000002853D0A968EA68022801F00C017FF446 +:1051200040AFE36A02F00300984202BF02F0700051 +:10513000236B984214D1636BC2F30620984202BFDE +:1051400002F47810A36B98420AD1E36B02F060601E +:10515000984202BF02F06042206C82423FF409AFE5 +:105160000C293FF423AE286820F0807000F0DEF9AF +:105170000646296888013FF5EEAEE968DFF8880346 +:10518000626B0140E06A0143206B0143A06B41EA7E +:1051900002210143E06B0143206C0143E960286870 +:1051A00040F080702860E96841F08051E96001F0CA +:1051B00025FF0446286881017FF5D4AE0020BDE8B4 +:1051C000F0817068400810F0010070472968606A3B +:1051D00021F0F001014329606868216A20F47F40D2 +:1051E00040EA0120686070477068400840007060C5 +:1051F00001F004BF2DE9F8430400884644D0DFF8ED +:105200000C6300F0CAF847D200F0CFF8074600F070 +:10521000C4F841D001F0F2FEC01B0228F7D90320E8 +:10522000B9E001F0EBFE401B022843D9F7E701F09B +:10523000E5FEA0EB090002284CD9F0E701F0DEFE04 +:10524000A0EB0900022854D9E9E701F0D7FE401B82 +:1052500002285DD9E3E701F0D1FE401B022867D99F +:10526000DDE701F0CBFE401B484577D3D7E70328A5 +:1052700002D13968890103E00028396802D1890721 +:1052800062D401E049055FD4012084E001F0B6FE5C +:10529000C01B022872D9C2E7207881074FF0B047BF +:1052A0000BD5B968A06821F0F0010143B96001F0A5 +:1052B000A5FE0546B868C003B3D52078DFF83452A0 +:1052C00081060AD52968606921F0F001014300F0E8 +:1052D00069F8814628688003A9D5207841060BD556 +:1052E0002968A0690909090141EA101100F05AF87A +:1052F00081462868C003A1D5207841070BD5B9683D +:10530000E06821F4E0610143B96001F077FE0546F1 +:10531000B868800399D5207801070CD5B868216951 +:1053200020F4605040EAC100B86001F067FE054615 +:10533000B86840038FD52078C10717D56068022868 +:1053400095D1396889039FD5B968890840EA8100F9 +:10535000B86041F2893901F051FE0546B8686168CC +:1053600000F00C00B0EB810F7FF47BAF306800F0F1 +:105370000700804505D200F018F8074600F00DF848 +:1053800084D100F055F85C490860FFF733FCBDE8B4 +:10539000F24301F0F7BCBDE8F283306800F007008B +:1053A00040457047296001F029BE3168C90848EAC4 +:1053B000C101316001F022BE38B54FF0B044554D07 +:1053C000A16811F00C0106D1FFF78EFCC0F30310A9 +:1053D00055F8200032BD04294F4A05D008294F480E +:1053E00004D12168C90222D5104632BDE16801F01E +:1053F0000301022904D0032904D12168C90207D579 +:10540000104605E0FFF770FCC0F3031055F82000CC +:10541000E168E268E368C1F306214843C2F3021180 +:10542000491C5B0FB0FBF1F05B1CB0FBF3F032BD2D +:1054300080B5FFF7C1FF3649FFE7394A0968C1F374 +:10544000031152F82110B0FBF1F002BD80B5FFF757 +:10545000EFFF00F010F8C1F3022106E080B5FFF77E +:10546000E7FF00F008F8C1F3C22112F8211001F0A3 +:105470001F01C84002BD26492A4A0968704770B515 +:105480002449274AB1282EBFC86AC0F3031051F837 +:1054900020001849096801F00F0152F82110224A32 +:1054A000B0FBF1F0B0FBF2F0002400210FF2840217 +:1054B00052F8213083420AD2491C0329F8D90AE064 +:1054C00001F09CFD801B03280DD3032070BD0FF25B +:1054D000740050F821400D4D2868C00844EAC0000F +:1054E00000F024F80646296801F00701A142E7D13F +:1054F000002070BD080100584826002044260020E6 +:1055000090000058000400588C80C11100400058E1 +:10551000080000587C7A00080024F4000048E801E4 +:105520003C7A00084482000840420F00286001F0E5 +:1055300065BD0000120000002400000036000000DD +:105540004000000000000000010000000200000018 +:1055500003000000DFF87C211368010C23EA0143FB +:1055600043EA0043136070472DE9F04105460027E8 +:105570002868DFF864610105B8462FD53468286AC9 +:1055800004F44074844229D0FFF7A6FB002C316854 +:1055900005D1286A21F44071014331601DE0306873 +:1055A00040F48030306021F44071326822F480325F +:1055B0003260286A014331603068C0070DD501F0C0 +:1055C0001DFD044641F289383068800705D401F09A +:1055D00015FD001B4045F7D30327B8462878DFF8B0 +:1055E000FC40C10705D5E16F6868890840EA810180 +:1055F000E1672878810705D5E16FA86821F440614B +:105600000143E1672878C10644BF2869FFF7A2FF7C +:105610002878810644BF6869FFF79CFF2878410716 +:105620000AD5E868E16F020902F47F220001914384 +:1056300000F47F200843E067286881051ED5A8692B +:10564000B0F1804F18BFB0F1004F00D018B9E16F32 +:1056500021F0404108E0E16F21F04041E16720F096 +:105660008050E16F21F040610843E067A869B0F124 +:10567000C05F03D1216841F0807121602868410535 +:105680000DD5E16FE86921F040510143E167E86918 +:10569000B0F1005F03D1216841F4803121602868B6 +:1056A000C10405D57168686A21F440410143716005 +:1056B000286881040BD5A169E86A21F03001014313 +:1056C000A161A169A86A890840EA8101A1614046F7 +:1056D000BDE8F08188000058900000580C00005888 +:1056E00038B5040044D094F8210028B9002184F88A +:1056F0002010204601F0BBFB00F049F8FF2510B157 +:1057000000F03FF834E02168DFF8B0008A6802401A +:105710008A6021688A68636820690343A06903433B +:105720001A438A602168E068086120680169A268FC +:1057300041EA024101612068C16821F08001C16035 +:105740002068C16C21F00201C1642168CA6CE36960 +:10575000606903431A43CA6420688168880609D4D3 +:1057600000F020F830B120684562042100F01FF8F5 +:10577000012032BD20684562012184F821100020FB +:1057800032BD20684562042184F821107047022050 +:1057900084F82100CA2021684862532022685062A0 +:1057A000204626E020460BE02068C0F8248084F8DC +:1057B0002110002084F8200070470000BFFF8FFFF9 +:1057C00070B5044640F2E9362068C16821F0A001B6 +:1057D000C16001F013FC05462068C168880606D444 +:1057E00001F00CFC401BB042F6D3032070BD00203A +:1057F00070BD70B504462068C1684A0612D44FF0E7 +:10580000FF32C26040F2E93601F0F8FB054620683D +:10581000C168480606D401F0F1FB401BB042F6D344 +:10582000032070BD002070BD8A60FF2102685162B4 +:10583000012180F82110002180F8201000207047FD +:105840002DE9F84300F065F808BF022038D000F0D9 +:1058500067F814D501F0D2FB07462068C1684807F5 +:105860000DD501F0CBFBC01B4845F6D300F039F84D +:1058700026E001F0C3FBC01B484507D3F6E700F064 +:105880002AF800F065F801F0B9FB07462068C16806 +:105890004A07EED5C0F81480206800F013F82A48B3 +:1058A000016841F4002101602848026842F40022A6 +:1058B00002602068816841F48041816000F01BF83B +:1058C000BDE8F2838168C908C900816020688168E9 +:1058D0000D43856070472068816821F48061816094 +:1058E000704720684662032184F82110002084F864 +:1058F0002000032070472068816841F48061816046 +:1059000001212068466284F82110002084F82000DC +:1059100070470446884694F82000012815467047D1 +:10592000012184F82010022084F82100CA20216877 +:105930004862532022685062FF262068816848052B +:1059400040F2E9397047000080080058000800580C +:105950002068C16801F0800161F49061C160704706 +:1059600090F82010012901D102207047012280F80F +:105970002020022180F82110CA210268516253219F +:105980000368596201688A6842F020024CE700000F +:1059900038B5040009D004F18005686808B900F042 +:1059A0001EF800F021F8012801D1012032BDA06AC3 +:1059B00008B100F02AF800F00AF821F02A01FFE708 +:1059C000816000F01BF8BDE8324000F03EBB20686B +:1059D000416821F49041416020688168704700214E +:1059E0002970204601F07FBA242068602068016891 +:1059F000490849000160204600F0BCB920680168F0 +:105A000041F00101016020467047204600F0BABA1B +:105A100070B5044604F180051346686820283DD11E +:105A200069B318002BD02878012837D001222A70BA +:105A300004F154062165338073800020E860212042 +:105A40006860706AE8B1DFF82013C162DFF81C03F8 +:105A5000716A0863716ADFF8180348630020716A8D +:105A600088632068216D00F12802706A01F023FB31 +:105A700038B11020E86000202870202068600120E4 +:105A800070BD2168402008620020287000F008F8EE +:105A900041F0800100F061FBF8D170BD022070BDC3 +:105AA000206800F1080151E8001F00F1080270476A +:105AB000216851E8002F7047206800F1080151E883 +:105AC000001F00F1080221F0400142E80010002808 +:105AD0007047F8B5044640F60F002668F169326851 +:105AE000B368084004F15C050ED1880602D5900623 +:105AF00002D4D80040F181806969002900F0298131 +:105B00002046BDE8F4400847DFF8E006034204BF42 +:105B1000DFF8DC763A4270D0CF0707D5D70505D538 +:105B2000012737622E6B46F001062E638E0708D5DB +:105B3000DE0706D5276802263E622E6B46F0040675 +:105B40002E634E0708D5DE0706D5276804263E6279 +:105B50002E6B46F002062E630E070AD5960601D478 +:105B6000034206D0266808203062286B40F0080007 +:105B70002863080509D5500107D526684FF4006051 +:105B80003062286B40F020002863286B002833D057 +:105B9000890607D5900601D4D80003D5696909B1F3 +:105BA00020468847286B21688A68510602D410F085 +:105BB000280F1CD0204600F0EFFA00F0D1F811D5E4 +:105BC000FFF77AFFFCD1286A60B10FF2B1618163FF +:105BD000286A01F0E9FA00280ED0286A816BBDE836 +:105BE000F44008472046BDE8F24001F0C1BB204622 +:105BF00001F0BEFB00202863F1BD286901286AD1AD +:105C0000CF0668D5D00666D51020306200F0A8F81F +:105C10002DD5296A0868406880B20028ECD02A880F +:105C20009042E9DA6880086801688A061BD4FFF7A9 +:105C30003FFF22F4807200F08FF8F8D1206800F066 +:105C40007DFAFBD1FFF738FFFCD12020E86200206D +:105C50002861FFF72DFF22F0100200F07DF8F8D147 +:105C6000286A01F06BFA29886888091A2DE02888CB +:105C70006988411A688800281CBF88B2002868D04B +:105C8000226852E8003F23F4907342E80030002875 +:105C9000F6D1206800F1080200F1080352E8002F55 +:105CA000DFF8C402024043E800200028F1D12020A0 +:105CB000E862002028616861226852E8003F23F012 +:105CC000100342E800300028F6D12046BDE8F44039 +:105CD00089B201F04EBBC80209D5580207D54FF46E +:105CE000801030622046BDE8F24000F06DBB08062F +:105CF00009D5100601D4180205D5A96949B3204673 +:105D0000BDE8F4400847480611D550060FD5FFF707 +:105D1000CFFE22F0400200F01FF8F8D12020A86248 +:105D20000020A8612046BDE8F24001F03ABB08021D +:105D300006D5500004D52046BDE8F24001F042BB34 +:105D4000C80148BF002A04D52046BDE8F24001F052 +:105D50003ABBF1BD22F4F07241E800200028704700 +:105D60002068816848067047F96100082B620008C6 +:105D700031620008F8B50446DFF838052168DFF81D +:105D800038C50A68DFF834750240A068024320690C +:105D9000024360690243E06902430A6000254A68E1 +:105DA000E06822F4405202434A60A369DFF81025FC +:105DB00091421CBF206A03438E68DFF80805064045 +:105DC00033438B600FF2A416CB6A606A1B0940EA6A +:105DD0000313CB626145DFF8F0044FF4004339D17F +:105DE0003F6807F00307032F4DD8DFE807F00246AE +:105DF00043494FF0010CE169B1F5004F4FF6F077E0 +:105E000040F08080BCF1010F09D0BCF1020F0AD034 +:105E1000BCF1040F71D0BCF1080F71D099E0FFF70D +:105E20001DFB002815D0626A616836F81230B0FB9D +:105E3000F3F04A0802EB4002B2FBF1F080B2A0F1AD +:105E40001001B942EAD20740C0F34200074320687C +:105E5000C7607FE0914216D13F6817F4406723D0B6 +:105E6000B7F5806F09D0B7F5006F03D0B7F5406F75 +:105E700006D008E04FF0020C07E04FF0040C04E0FD +:105E80004FF0080C01E04FF0100C9142B3D1BCF17F +:105E9000000F09D0BCF1020F0AD0BCF1040F15D0DD +:105EA000BCF1080F15D054E0FFF7D0FA002851D00C +:105EB000616A36F81120B0FBF2F6626802EB42012B +:105EC0008E4246D31103B14205D242E0FFF774FA85 +:105ED000ECE71846ECE75008002110EB062051EBE8 +:105EE00016610023FBF710FAA0F54071DFF8DC2300 +:105EF00091422ED22268D0602CE0FFF75DFA90E745 +:105F0000184690E7BCF1010F09D0BCF1020F09D08F +:105F1000BCF1040F18D0BCF1080F18D019E0FFF73E +:105F20009DFAB8B1626A36F812306168B0FBF3F0DE +:105F300000EB5100B0FBF1F080B2A0F11001B942CA +:105F400007D22168C86005E0FFF736FAE9E718468E +:105F5000E8E7012504F1680001214180018000216A +:105F60008160C1602846F2BDFEFFFFEF0100020024 +:105F70000400060008000A000C0010002000400089 +:105F80008000000190F82810CA0706D502685368FF +:105F9000C16A23F400330B43536090F828108A073A +:105FA00006D502685368016B23F480330B435360BA +:105FB00090F828104A0706D502685368416B23F40D +:105FC00080230B43536090F828100A0706D5026817 +:105FD0005368816B23F400430B43536090F82810FF +:105FE000CA0606D502689368C16B23F480530B433D +:105FF000936090F828108A0606D502689368016CB1 +:1060000023F400530B43936090F828104A0610D5F0 +:1060100002685368416C23F480130B435360416C56 +:10602000B1F5801F05D15368816C23F4C0030B4385 +:10603000536090F828100A0606D501684A68C06CBB +:1060400022F4002202434A607047F8B5044604F186 +:1060500080050020E8606FF07E4700F0CFFF064625 +:10606000206801680A0708D50097334600224FF4DC +:106070000011204600F017F860B9206801684A074F +:106080000AD50097334600224FF48001204600F0E5 +:106090000AF808B10320F2BD20206860A860002043 +:1060A000E0662870F2BD2DE9F041069C05460E46DB +:1060B00090461F462868C1693140B1420CBF01209B +:1060C0000020404526D114F1010FF3D000F096FFD7 +:1060D000C01B844200D33CB900F025F800F02DF835 +:1060E000FCD100F01AF811E0286801684A07E1D5F0 +:1060F000C1690A05DED54FF40062026200F013F8B0 +:1061000000F01BF8FCD100F008F8C160002101701C +:10611000032000E00020BDE8F08105F1800020218F +:10612000416081607047296851E8002F22F4D072E5 +:1061300041E800200028F6D17047286800F10801E6 +:1061400051E8001F490800F10802490042E8001028 +:1061500000287047DFF87801014042E8001000286D +:1061600070470000026852E8003F23F0C00342E895 +:1061700000310029F6D1016801F1080252E8002F30 +:1061800001F1080322F4000243E800210029F2D1C2 +:106190002021C0F884107047026852E8003F23F4C1 +:1061A000907342E800310029F6D1016801F108023C +:1061B00001F1080352E8002F0E490A4043E800218C +:1061C0000029F2D1C16E012908D1026852E8003FCE +:1061D00023F0100342E800310029F6D12021C0F855 +:1061E00088100021C166016770470000010000109F +:1061F00020010004FEFFFFEF0146886A09680A6873 +:10620000930610D40021A0F85610016801F108028D +:1062100052E8002F01F1080322F0800243E8002138 +:106220000029F2D13BE001F0BCB8806A01F0CCB8A3 +:10623000F8B5846A04F1840504F1560728686E688D +:1062400021688A68110606D5212804D100203880EB +:106250002046FFF787FFFFF783FD06D5222E04D1E6 +:10626000002038812046FFF797FFA86840F0100013 +:10627000A8602046BDE8F24001F07AB8806A00F1DB +:10628000560100220A810A8001F072B8026852E8C1 +:10629000003F23F0800342E800310029F6D1026874 +:1062A00052E8003F43F0400342E800310029F6D1B4 +:1062B00070470000F369FFCF0038014088000058A4 +:1062C00000800040FFF4FF110024F40000FD0F00E7 +:1062D000FEFF7FEF10B500F180010A78012A01D19D +:1062E000022010BD01230B7024224A60026813684B +:1062F00014686408640014600022426623F00053AE +:1063000000680360202048600020087010BD70B550 +:1063100000F01EF801D1022070BD00F01FF822F03D +:10632000604209E070B500F013F801D1022070BDA1 +:1063300000F014F822F0606211438160204600F002 +:106340001AF820680660202068600020287070BD60 +:10635000044604F1800528780128704701222A703C +:1063600024206860206806680268520852000260B3 +:1063700020688268704730B5416E11B90121012251 +:1063800014E001680FF230048A6889680FF2300364 +:10639000520E02F00702490F655CA45C595C9A5CDE +:1063A000ED00E40095FBF1F194FBF2F268304180DE +:1063B000028030BD00000000010101030701000060 +:1063C00008040204080101017047000009010200ED +:1063D00081B002D43C48815405E03C4802F00F02F1 +:1063E000104400F8041C01B07047394A13684FF696 +:1063F000FF0100020B4000F4E060184335490843F8 +:106400001060704738B5324B1C68C4F30223C3F1E7 +:106410000704052C28BF04241D1D072D34BF0023AD +:10642000DB1E012505FA04F4641E2140994005FA9B +:1064300003F35B1E1A401143BDE83440C6E7000079 +:10644000010007D4012200F01F01234B8A404009BC +:1064500043F82020704701000BD4012200F01F01F7 +:106460001E4B8A40400943F82020BFF34F8FBFF3F3 +:106470006F8F704710B5401EB0F1807F01D30120AF +:1064800010BD174C60600F214FF0FF30FFF79EFFEB +:106490000022A26007202060002010BD010007D468 +:1064A000012200F01F010F4B8A40400943F82020D1 +:1064B0007047010007D4012200F01F010A4B8A40F7 +:1064C000400943F82020704700E400E018ED00E0A8 +:1064D0000CED00E00000FA0500E100E080E100E0E2 +:1064E00010E000E000E200E080E200E0704770476A +:1064F00070477047704770477047704770477047E4 +:106500007047704738B5054684B068780024FF2886 +:1065100002BFB5F8031040F60140814225D165491C +:106520008A88B5F80700921C904209D1687B012443 +:10653000C10752BF8DF8004000218DF8001011E016 +:106540004988491C884210D10FF27010FDF770FA8B +:1065500003208DF8000005F10D00B5F80B108DF843 +:10656000081001906846FCF743FE204605B030BD98 +:1065700010B58AB050484F4CFCF778FD8F218DF84C +:106580001810E520B3218DF819008DF81A10D520C8 +:106590002E218DF81B008DF81C107F204A218DF8CC +:1065A0001D008DF81E1098202A218DF81F008DF8EF +:1065B000201048207A218DF821008DF82210CC205F +:1065C00040218DF823008DF82410FE2000218DF845 +:1065D0002500ADF8261000940823012206A9022008 +:1065E000FDF747FD00F032F8412000F023F8A01C31 +:1065F00000F010F8062100F015F800F027F842200E +:1066000000F018F8201D00F005F8102100F00AF83D +:106610000AB010BD059001210491029100200A22C8 +:1066200001907047039200910223208806AA02215C +:10663000FDF76EBD8E218DF824008DF8231000200B +:10664000FE21ADF826008DF82510704719208DF831 +:106650001800ED2182208DF81A008DF81910ED2018 +:10666000AE218DF81C008DF81B104C2021218DF8D7 +:106670001E008DF81D1041209D218DF820008DF801 +:106680001F10222045218DF822008DF8211070471F +:1066900080B592224FF64263984208D10548009196 +:1066A0000223818800880022FDF78CFD02461046F7 +:1066B00002BD00001C2B0020056500082D2D204781 +:1066C000415454203A204C454420434F4E464947BC +:1066D00055524154494F4E20524543454956454431 +:1066E0000A0000007047704770477047704710B548 +:1066F0000446FAF7B5FD204610BD10B50446104615 +:106700000A460146204600F061FE204610BD00000A +:106710002DE9F84F4FF00009644A654B4FF00F0820 +:1067200005460E4633E0634FBD4214BF07270427DA +:106730008F4027434CF82E70C1431C6801EA040CBB +:106740007468E40248BF40EA0C0CC3F800C05C68FF +:1067500001EA040C7468A40248BF40EA0C0CC3F8B8 +:1067600004C0146801EA040C7468E40348BF40EAFA +:106770000C0CC2F800C0546801EA040C716889036B +:1067800048BF40EA0C0CC2F804C009F101093168A5 +:1067900031FA09F078D0012404FA09F414EA01006E +:1067A000F3D04FEA490C032101FA0CF16FEA010E14 +:1067B000716801F00307012F1CBF01F003010229DA +:1067C00011D1A968F7680EEA010107FA0CF73943FD +:1067D000A960696821EA04047168C1F3001101FA33 +:1067E00009F10C436C604FEA8901347904F0030429 +:1067F000032C1FD0EC68B7680EEA040407FA0CF704 +:106800003C43EC60347904F00304022C12D14FEACB +:10681000D90705EB870401F01C07D4F820A008FA7B +:1068200007FB2AEA0B0AD6F810B00BFA07F747EA7B +:106830000A0727622C680EEA0407347904F003047F +:1068400004FA0CF43C432C60746814F4403F9CD070 +:10685000DFF864C04FEA990E5CF82E7001F00C016D +:1068600008FA01F427EA0404B5F1904F08BF0027A5 +:1068700009D0124FBD4208BF012704D0104FBD42BE +:106880007FF451AF022753E7BDE8F18F81B0002AB2 +:1068900014BF8161816201B070470A4A13680342E4 +:1068A0001CBF1060FDF789BF7047000080080058CA +:1068B000000800580010004808000140000400488B +:1068C000000800480C0800580346002009B95A6027 +:1068D00070470120704708B901207047016000200F +:1068E00070470000C0680840884201D1012070470D +:1068F00000207047C0690840884201D101207047DC +:106900000020704710B5684C02212046FFF7F2FFC7 +:1069100038B16068C043810703D5FDF78AFD0220C6 +:1069200018E001212046FFF7E5FF38B16068C04359 +:10693000C10703D5FDF745FD01200BE008212046E6 +:10694000FFF7D8FF38B16068C043010703D5FDF7F2 +:10695000C4FD0820A06010BD10B5534C0221204694 +:10696000FFF7C0FF58B96068C043810307D560686E +:1069700040F400306060BDE81040FDF753BD0821D1 +:106980002046FFF7AFFF70B96068C04301030AD526 +:106990006068464940F400206060086880474FF412 +:1069A0000020A06010BD20212046FFF79BFF58B9B2 +:1069B0006068C043810207D5606840F400106060E1 +:1069C000BDE81040FDF70CBD10BD394881B001682D +:1069D00041F480110160006800F48010009000987C +:1069E0003448016841F4007101603348026842F4A0 +:1069F0000072026040BF20BF3048016841F400418E +:106A0000016001B0704780B52D48016841F48011E4 +:106A10000160006800F4801000900098224801682E +:106A200041F001010160026842F4803202602C20D2 +:106A3000FFF706FDBDE802402D20FFF701BD21480C +:106A4000016849084900016070471F494FF48030D0 +:106A5000086070471B48016821F00201016070471F +:106A600018484FF400314160016821F400310160A1 +:106A7000704738B504460C4D08212846FFF732FF11 +:106A800030B10A480460686820F40020686031BDB5 +:106A9000A0474FF40021A96031BD0A48016821F0E8 +:106AA0000801016070470000000C00582C2B0020EA +:106AB00050010058D4080058200800580C04005811 +:106AC00050000058040C0058080C00580248016897 +:106AD00041F400710160704708040058484900E023 +:106AE000484981B00A6802430A600968084000907A +:106AF000009801B0704780B5FEF77FF8FEF77FF889 +:106B00004148016841F48031016000F0AEFCBDE80D +:106B100001400EE000B587B068460FF238211C2214 +:106B2000FAF7AEFBFDF7CDFC6846FCF761F907B05C +:106B300000BDF0B585B068461421FEF7C9F80026FF +:106B40000025002400210FF2DC0000EBC102907947 +:106B500088B11368B3F1904F08D02C4FBB4208D0D6 +:106B60002B4FBB4204BF9088044304E09088064347 +:106B700001E090880543491C2629E4DB00200290AF +:106B80000121032003900191B0B288B1009001204F +:106B9000FFF7A4FF0120FFF7A3FF69464FF09040E5 +:106BA000FFF7B6FD0022B1B24FF09040FFF76EFE46 +:106BB000A8B280B100900220FFF790FF0220FFF7FB +:106BC0008FFF124E69463046FFF7A2FD0022A9B2A0 +:106BD0003046FFF75BFEA0B280B100900420FFF7C3 +:106BE0007DFF0420FFF77CFF094D69462846FFF72B +:106BF0008FFD0022A1B22846FFF748FE05B0F0BD88 +:106C00004C0000584C0100589008005800040048FF +:106C100000080048FCF7D8B913460A460146002090 +:106C200000F0A8BB00000048010000000000004880 +:106C300001000000000000480100000000000048C2 +:106C400001000000000000480100000000000048B2 +:106C500001000000000000480100000000000048A2 +:106C60000100000000000048010000000000004892 +:106C70000100000000000048010000000000004882 +:106C80000100000000000048010000000000004872 +:106C90000100000000000048010000000000004862 +:106CA0000100000000000048010000000000004852 +:106CB0000100000000000048010000000000004842 +:106CC0000100000000000048010000000000004832 +:106CD0000100000000000048010000000000004822 +:106CE0000100000000000048010000000000004812 +:106CF0000100000000000048010000000000004802 +:106D000001000000000000480100000000000048F1 +:106D100001000000000000480100000000000048E1 +:106D200001000000000000480100000000000048D1 +:106D300001000000000000480100000000000048C1 +:106D400001000000000000480100000000000048B1 +:106D50000100000000000000000000000000000032 +:106D6000246C0008280003202C00032026040400C3 +:106D70000249016002490161704700BFE743000812 +:106D80000F44000870B50F4E044630780025A8B1B6 +:106D9000FEF74EFB32784FF47A71B1FBF2F1B0FBA3 +:106DA000F1F0FFF767FB48B9102C07D2002221460B +:106DB0004FF0FF30FFF726FBB46000E001252846C6 +:106DC00070BD00BF3C260020764981B00A680243AE +:106DD0000A60096808400090009801B0704780B5CB +:106DE0004FF40020FFF7F0FF002200212E20FFF7D4 +:106DF00009FBBDE802402E20FFF722BB00686A496C +:106E0000884200D0704780B54FF48010FFF7DCFF58 +:106E1000002200212C20FFF7F5FA2C20FFF710FBB1 +:106E2000002200212D20FFF7EDFABDE802402D20C1 +:106E3000FFF706BB10B58CB0044668463021FDF75D +:106E400047FF2168594A91420FD14FF400700090DA +:106E50004FF0004106916846FEF786FB08B1FCF74B +:106E6000FEF84FF48020FFF7AFFF0CB010BD30B537 +:106E70008DB0044601A83021FDF72AFF21684C4A55 +:106E800091422ED1FDF728FFFDF726FF494DA86B53 +:106E900020F4407040F48070A8634FF480714FF488 +:106EA00000600190099101A8FEF75EFB08B1FCF7B4 +:106EB000D6F8A86B40F40040A8630022296841F48A +:106EC000806129600021286800F4806000900098AB +:106ED0000320FFF797FA0320FFF7B2FA2046FEF7E8 +:106EE0003FFD0DB030BD38B592B0044601A8142165 +:106EF000FDF7EEFE06A83021FDF7EAFE20682E49D8 +:106F000088424CD1002001210790069106A8FEF787 +:106F10002BFB08B1FCF7A3F82848294D416941F43F +:106F2000804141610222416901F480410091009950 +:106F3000016841F0010101604FF4C061006800F098 +:106F40000100009000980191012003900321072087 +:106F500004910590029201A94FF09040FFF7D8FBF1 +:106F6000184828600F2068601020A8600020E860A2 +:106F70008020286100206861A861E86128622846B5 +:106F800000F042F808B1FCF76AF8A567AC6200228D +:106F900000212420FFF736FA2420FFF751FA13B01E +:106FA00030BD000050000058000C00580010005880 +:106FB0000028004058000058003801404C0000589C +:106FC000F02800204400024000B500BF13009646A0 +:106FD0009446103928BFA0E80C50FAD85FEA417CEB +:106FE00028BF0CC048BF40F8042BC90728BF20F8B1 +:106FF000022B48BF00F8012B00BD0000014840688B +:10700000704700BF3C26002038B5040001D10120A4 +:1070100032BD2168DFF840034018142204F1240532 +:10702000B0FBF2F2DFF83403E86192002A6202203A +:1070300068700A68A0686FF30E120243E0680243AA +:107040002069024360690243A0690243E069024388 +:10705000206A02430A60204600F058F9A068B0F5A3 +:10706000804F04BF002161602079696A00F03F0011 +:1070700000F014F838B1052805D2204600F05AF97E +:1070800000F012F803E0002028636863A863002082 +:10709000A861012068700020287032BD0860A96ACC +:1070A000E86A486060687047296B00200860696B77 +:1070B000A86B48607047F8B5044604F12406002523 +:1070C0003078012801D10220F2BD01273770707895 +:1070D00001282FD102277770B561206807687F08E3 +:1070E0007F000760204600F0F5F82168F06820B1C5 +:1070F0000A6842F00E020A6008E0086820F0040006 +:1071000008602068016841F00A010160706A016846 +:10711000CA0303D5026842F480720260306B18B172 +:10712000016841F4807101602068026842F0010248 +:10713000026001E0357002252846F2BD81B040B101 +:1071400000F124014A78022A05D004208861002039 +:107150000870012026E00268136823F00E03136014 +:107160004A6A136823F48073136000680268520847 +:1071700052000260012091F82020CB6902F01C022D +:10718000904058608A6AC86A5060086B30B10268E3 +:1071900022F4807202604A6B886B50600120487054 +:1071A0000020087001B0704738B500F124020024B7 +:1071B0005178022903D004209061012428E001685D +:1071C0000B6823F00E030B6001680D686D086D00FD +:1071D0000D60516A0B6823F480730B60012192F8F3 +:1071E0002030D56903F01C0399406960936AD16A25 +:1071F0005960116B31B10B6823F480730B60536BD2 +:10720000916B5960012151701470516901B1884727 +:10721000204632BDF8B500F124010423CA69146880 +:107220000268156891F8206006F01C0603FA06F75C +:107230003C4210D06F070ED51468A50603D415681C +:1072400025F00405156000F03DF8C968002938D024 +:10725000BDE8F4400847022303FA06F73C4213D086 +:10726000AF0711D51468A50605D4156825F00A05E1 +:10727000156001224A7000F025F800220A70896822 +:10728000F9B1BDE8F4400847082303FA06F6344292 +:1072900017D02B0715D5136823F00E0313600122B6 +:1072A00091F82030CC6903F01C039A4062600122FF +:1072B0008A614A7000220A70096911B1BDE8F44080 +:1072C0000847F1BD91F82020CC6902F01C029340E0 +:1072D0006360704778B5C56C046D6C60446D14B123 +:1072E000846DC56D6560012590F84440066C04F01E +:1072F0001C04A5407560046863608068102802D192 +:10730000A260E16071BDA160E26071BD426C144990 +:10731000920801EB82018164142201780839B1FBE3 +:10732000F2F1104AC26401F01F01012202FA01F1D8 +:107330000165704701790C4A01F03F0102EB8102BF +:107340004265491E094A826501F0030101228A4013 +:10735000C265704700000000F8FFFDBF000002405A +:107360000008024080080240FC0802404009024038 +:107370007047704710B5002488B9114803600E4863 +:107380000E4B0360FEF744FB012805D007D303280A +:1073900004D038BF022402E0012400E00324204688 +:1073A00010BD00680549884204D1054908680028D5 +:1073B00018BF0047704700004C26002000380140ED +:1073C000302B0020704770477047000062F30F2297 +:1073D00062F31F42401810F0030308D0C91A1FD3EC +:1073E000DB0748BF00F8012D28BF20F8022D13004D +:1073F00030B414461546103928BF20E93C00FAD8AD +:10740000490728BF20E90C0048BF40F8042D890037 +:1074100028BF20F8022D48BF00F8012D30BC70476E +:10742000C91818BF00F8012DCB0728BF00F8012D9F +:107430007047000038B5EFF3108472B6284D6946E6 +:10744000281D00F06AF96946281D00F0C4F938B11A +:1074500084F31088BDF80010224AFFF7DDFB31BD30 +:107460000120287084F3108831BD80B5FFF7D2FB6E +:107470000221009100231A4800F124014FF48052A8 +:10748000001D00F031F801BD00BFF8B5144600261C +:10749000EFF3108510F1010F1ED001281CBF022848 +:1074A0004FF0FF3618D1BCB1264672B60C4F0123FF +:1074B00092B2381D00F02CF800281CBF3978002942 +:1074C00008D000223A7085F31088A1B2054AFFF770 +:1074D000A3FB01E085F310883046F2BD00000000F8 +:1074E000081400203574000810B5029C0160426049 +:1074F0000021C1600161416181610381A1070477BD +:1075000004D5008910B14FF0FF3010BD002010BD30 +:107510002DE9F04F064685B030890C460027BB4662 +:1075200000287169DC460CBF4FF00208D84681B1D3 +:1075300068B930697768451CBD4228BFED1B3768C4 +:10754000385C7D5D00EB0527BF1CBFB203E007463A +:1075500000E000B102463069F568A84223BF7568B3 +:10756000281AC01B0020154608EB050903FB09FE7D +:10757000864532BF0020B0FBF9FA09FB1A00C0B201 +:10758000804509DA96F81C905FEAC97A48BF8446BC +:107590005FEA897048BFC446100000F0B48070688C +:1075A000714461448842C0F0AE8008EB020080B2B2 +:1075B0000390D946100AADF802000294ADF80020FD +:1075C000049359E0800740D53089002840F09B8023 +:1075D0003268D018A34600F8024C200A32681A44D8 +:1075E00002F8010C224630681844F9F739FE706938 +:1075F00020187061B069019C401CB061200A31689C +:107600000C70316848701CE08CB3307FC207D9D54C +:10761000308940B931681944FF2001F8020C316803 +:10762000194401F8010C4FF0000B706924187461C3 +:107630002C463089002340B931680C70210A30682B +:10764000417002237069801C706108EB04070021FF +:10765000BFB231615CB1DA44029800EB0A013068D4 +:1076600022461844F9F7FCFD70692418746109F189 +:107670000109B069401CB061049A70683169914594 +:1076800045D2791881422CBF081A0846306103465A +:107690003089A0B93068BDF80010C1545B1C706817 +:1076A0003168834228BF1B1ABDF80200C8545B1C16 +:1076B0007068834228BF1B1A7069801C706105FBCB +:1076C00009FA7468BDF80000E41A844288BF0446D1 +:1076D000029800EB0A01281BAC42019003D093D220 +:1076E000307F002890D137682246F818F9F7B8FDA6 +:1076F000706920187061A346019C039F0023A9E7CD +:107700003068404400E0002005B0BDE8F08F8844B8 +:107710008045F5D3A8EB0008F2E7F8B50246002350 +:107720001089546900280CBF022500250026002C72 +:107730004DD060B9D36857685E1CBE4228BFF61BA7 +:107740001768FB5CBE5D03EB0626B6B200E006469A +:10775000137F03F00303012B23D14FF6FF77BE42C3 +:1077600008BF002808D0D36817699F4219D2C0B15A +:107770005768FB1A834214D25668D368A41B1C199D +:1077800000235461D36058B910680378012E94BF68 +:10779000C6F101060126805D03EB0026B6B200E0CB +:1077A0000646D76854681368E819A04228BF001B32 +:1077B00003445069801B401B506105D0F719ED1937 +:1077C000A54228BF2D1BD5609069401E906101B174 +:1077D0000E801846F2BDF8B50246002410895369A0 +:1077E00000280CBF022500250026002B3AD0D468C3 +:1077F000234658B95768661CBE4228BFF61B176857 +:1078000017F804C0BE5D0CEB062600E00646177FA5 +:1078100007F00307012F1ED1B7B24FF6FF7C674573 +:1078200008BF002807D150680023012894BFC0F189 +:10783000010001200AE01769A7420CD258B157682D +:107840003C1B844207D20023064604E014682678D5 +:10785000205C06EB00265068ED18854228BF2D1AE3 +:107860001068441901B10E802046F2BD10B50446DF +:10787000AFF30080204600F005F80446AFF3008027 +:10788000204610BD7CB500F10F06F608F600B042A8 +:1078900040D2082E04D2082602E0083000F047F853 +:1078A000DFF804512C68210005D1002007E00268B0 +:1078B000B24221D2011D08680028F8D12068291D94 +:1078C0000A68824222D01368B34238BF111DF7D331 +:1078D00012E093190B60801B54685C600B681860A1 +:1078E0001660096800291DBF48680028081D00208F +:1078F000286002F1080076BD61B10A681068A0F145 +:107900000803B342E5D250680860EAE700F04EF899 +:107910000028C2D1002076BD10B5040006D0AFF318 +:107920000080204600F003F8AFF3008010BD00286F +:1079300000D1704750B4A0F108021368072B2BD96F +:1079400013F0070F28D1184C616809B18A4202D29E +:107950005160626013E0486800B3904238BF01464E +:10796000F9D31BE0964203D11B180B600A4606E0D0 +:10797000486810B1134498420ED350604A60506872 +:1079800050B11368D118814206D1002121600168ED +:10799000CB1813604068506050BC704708680E18E0 +:1079A000B242DFD250BC70470C2B00200749086858 +:1079B00008B1002070470648C008C00008600549AB +:1079C000C908C900091A0160704700BF402B002098 +:1079D0000F100020081400201349002008604FF405 +:1079E000E0221248016841F4700101604FF0B0419B +:1079F000086840F0010008608A600D480A6802408B +:107A00000C480A60036823F00503036042685208CB +:107A10005200426000220848C860086820F48020B4 +:107A200008608A617047000008ED00E088ED00E022 +:107A3000FBFEF6FA9400005800100422010000003A +:107A4000030000000500000001000000010000002C +:107A5000060000000A0000002000000002000000F4 +:107A600004000000080000001000000040000000BA +:107A7000800000000001000000020000A08601005C +:107A8000400D0300801A060000350C0040420F0034 +:107A900080841E0000093D0000127A000024F400DA +:107AA00000366E010048E801006CDC0200000000B6 +:107AB0000000000000000000000000002DE9F0417F +:107AC00007468846387810F0030F16461D4633D017 +:107AD000384600F099F878BBB8F1000F1CBFD8E920 +:107AE00000018619012D2ED13888C10415D5396AB7 +:107AF00007F14402384600F0A3F83A6B044602B995 +:107B00003A69F968384600F09BF8361B341A7A69EE +:107B1000F968384600F094F8261A1EB94DB916F1E6 +:107B2000010F09D097F903002A46314600F08EF87C +:107B3000064616F1010F09D12320AFF300804FF064 +:107B4000FF30BDE8F081022DE8D1EBE7388810F472 +:107B5000405F0ED07868F86038617861B861786805 +:107B6000F86107F14400386207F1300078620020C4 +:107B70003863B8F1000F05D0D8E9020107F13402EB +:107B8000C2E9000139884CF6FF60014039800020CD +:107B9000BDE8F08170B50546AFF300802888810408 +:107BA00015D56E680024EA6895F9030031469142C4 +:107BB00012D2521AFFF768FC10F1010F1CBF002807 +:107BC0003618F0D10FE04DF6FF70014029802846AD +:107BD000AFF30080002070BD00220021FFF754FCAD +:107BE00010F1010F00D101246868E860A861E86124 +:107BF000002C2988E7D041F4007129802846AFF392 +:107C000000804FF0FF3070BDF8B5A0B9AFF3008031 +:107C100000250A4E08244FF0FF37306820B1FFF7E7 +:107C2000B9FF002848BF3D46361D641EF5D1AFF3AD +:107C300000802846F2BDBDE8F240ABE7E825002011 +:107C4000914234BF511A0021084670473EB50400E6 +:107C50000D00012A02D100F063F807E0022A07D1E3 +:107C600000940020019069460C20ABBE2D1801E065 +:107C7000002A0CD10094019569460A20ABBE002869 +:107C800005D100222100280000F027F801E00020A3 +:107C9000C04303B030BD000010B4314A0021134688 +:107CA0001C6884421EBF491C9C6884421EBF491C3C +:107CB0001C69844209D09C69491C844205D0491C36 +:107CC00020331029ECD310BC7047002342F8313028 +:107CD00002EBC1014B6010BC704778B4204C00230C +:107CE00025462E688E421EBF5B1CAE688E421EBFAC +:107CF0005B1C2E698E4209D0AE695B1C8E4205D09A +:107D00005B1C2035102BECD372BC7047054604EB8E +:107D1000C303012A04BF59684D195D6072BC7047E6 +:107D200010B40F4A002113461C6884421EBF491C30 +:107D30009C6884421EBF491C1C6984420AD09C690D +:107D4000491C844206D0491C20331029ECD310BCB6 +:107D50000020704702EBC100406810BC7047000073 +:107D60007028002010B50446E068A169884251D30C +:107D7000218849F202030B40022B08D008044CBFB3 +:107D80004FF400704FF48440014321803BE001F444 +:107D9000C042B2F5C04F06D1A168884203D3204645 +:107DA000FFF732FF78BB208810F4406F02BF606895 +:107DB00004F14401884217D14FF40070FFF756FDDB +:107DC000606030B904F144006060E060401CA06075 +:107DD0000AE0218841F040012180E060606100F507 +:107DE00000726068A260E06160682061A068A061C4 +:107DF000207841070AD502220021204600F00CF825 +:107E000010F1010F02D14FF0FF3010BD208840F477 +:107E1000C0402080002010BD70B504460D461646B7 +:107E2000AFF3008033462A4600212046FFF746FE86 +:107E300005462046AFF30080284670BD2DE9FC4D75 +:107E4000016800F10805490805EBC102019200F143 +:107E50000802406800F0010A02EBC108400808EB84 +:107E6000C00B00200021019A95422FD02A68AE183D +:107E70006A68324400920835009A9642F3D016F9A7 +:107E8000014B009A964205D12A68AE186A683244BE +:107E90000092083516F8017B884210D1D84508BFFA +:107EA000F9F709FFD8F80000D8F80410BAF1000F6C +:107EB00018BF48440144884208F10808EED0002C5D +:107EC00000F8017B05D5641CE6D1D5E75846BDE82E +:107ED000F68D641ED5D5CFE738B504000ED02078D6 +:107EE00010F0030F03D094F90300002809D5AFF375 +:107EF0000080204600F030F8AFF300804FF0FF30F4 +:107F000032BD2046FFF780FE0546AFF300802078A3 +:107F1000410644BF606800F05DF80020606094F99D +:107F20000300022804D900F057F808B14FF0FF35DC +:107F3000E06B48B100F05CF808B14FF0FF35E06B42 +:107F400000F048F80020E063204600F005F8AFF3A9 +:107F50000080284632BD000001780A0626D51C4A5A +:107F600013680021834203D1002342F821301BE033 +:107F70005368012183421EBF022193688342F3D0DC +:107F8000D368032183421EBF042113698342EBD0CF +:107F90005369052183421EBF0621936983421EBF98 +:107FA0000721D3698342DFD000F014B8002101809B +:107FB0004FF0FF31C17000F144014160C1600161C7 +:107FC00041618161C161016200F13001416270472C +:107FD000E8250020FFF7A0BC1CB50200009269460E +:107FE0000220ABBE04001000FFF756FE200016BDB5 +:107FF000E0B50090F9F7E6F8019069460E20ABBEB7 +:1080000003B000BD38B50C46C5B22046AFF30080C2 +:10801000E068A169884204D32046FFF7A3FE002848 +:108020000FD4E068401CE06000F8015D2088010585 +:1080300003D440050BD50A2D09D12046FFF7E4FDF6 +:1080400028B12046AFF300804FF0FF3032BD20460C +:10805000AFF30080284632BD00F024F8012810D08C +:108060000D4880470D480047F0B543464C465546FD +:108070005E466746F8B40A4C6B462360BFF34F8FE9 +:1080800030BF074C2468A546F8BC9846A146AA46CE +:10809000B346BC46F0BD0000D9790008BD82000897 +:1080A000342B0020024900200860704700000000C7 +:1080B000382B0020FEE7FEE7FEE7FEE7FEE770470D +:1080C0007047704700F01CB8FBF723BB0248FFF76E +:1080D000A1B80248FDF7FDBCF02800204C26002086 +:1080E000FEF710BCFEF738BC00F012B80120FEF716 +:1080F000D4BB1020FEF7D1BB4020FEF7CEBB000062 +:108100000248416802788918416070473C26002087 +:108110000449C8680A6882430A60486000F004B8ED +:108120000000000000150058704719E050F8042BBB +:10813000D30744BFA9F101039A18091F002304299A +:1081400042F8043BF9D25FEA817C134604D54FF034 +:10815000000CA2F800C09B1CC90744BF0021197085 +:1081600050F8041B0029E1D17047000038B50D4DCF +:108170000824286800281CBF017811F0030F05D0DF +:1081800090F90310002958BFFFF7A6FE2D1D641EAD +:10819000EFD1BDE83840002200214FF0FF30FFF75B +:1081A00073B900BFE825002010B50749794418319C +:1081B000064C7C44163404E00A68081D11448847C4 +:1081C0000146A142F8D110BD2C000000780000004B +:1081D0004EF68851CEF20001086840F47000086045 +:1081E000BFF34F8FBFF36F8F4FF00070E1EE100AB7 +:1081F0007047000037FFFFFFFC0400004C26002002 +:1082000070080000300003200000000031FCFFFF78 +:1082100002000000020000004C010000020000000B +:10822000280003200800000015FCFFFF02000000EA +:108230000200000032010000650100000814002067 +:1082400044120000000000000000000000000000D8 +:108250000000000001000000020000000300000018 +:108260000400000000F00DF8002801D0FFF79CFF8B +:10827000AFF300800020AFF30080FAF714FE00F0A7 +:1082800002F80120704700F001B800000746FFF730 +:108290006DFF3846F9F7C8FDFBE738B504460D46D3 +:1082A000284600F005F8A84218BF0024204632BD39 +:1082B0000149FFF7A7BE00BFBC240020AFF3008038 +:1082C000FFF786FFFFF7CEFF00002E004300FFF709 +:1082D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7D2 +:1082E000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7C2 +:1082F000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7B2 +:10830000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7A1 +:10831000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF791 +:10832000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF781 +:10833000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF771 +:10834000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF761 +:10835000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF751 +:10836000FEBF0000F8000001810081008100810053 +:1083700081008100810081008100810081008100F5 +:1083800081008100810081008100810081008100E5 +:1083900081008100810081008100810081008100D5 +:1083A0008100810081008100BD0004CC82000801B1 +:1083B000FD000388250020D80003E5100008FC001C +:1083C00004D310000801F9001301040000B82400D0 +:1083D00020B9240020B8240020B8240020FC000389 +:1083E000B8240020FC0007B8240020A4240020E0CA +:1083F000001302040101F0290020402A0020F02986 +:108400000020F0290020FC0003F0290020FB0006DA +:10841000250020EC240020E0001302080202A0291D +:108420000020F0290020A0290020A0290020FC0025 +:1084300003A0290020FC0007482500203425002047 +:10844000DD00044800100048FD000D48E93F000829 +:10845000EF3F0008F53F00080FFD00000FFD000092 +:108460000FE5001BC8820008C8820008C882000807 +:10847000C8820008C8820008C8820008C8820008B4 +:10848000F8FF0BCA820008C8820008C8820008FAF8 +:10849000FFEA00F8FFF4000B74240020BC24002045 +:1084A00004250020EC00030DFF0183E20012484286 +:1084B00000007A440004004800040048000400481A +:0B84C00001F9000010FC0002093D0063 +:04000005080082BDB0 :00000001FF diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h index 1411b19f2..dd88d5aaa 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -292,6 +292,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -301,11 +305,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -313,6 +321,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -469,8 +489,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -589,11 +610,11 @@ typedef enum CFG_TASK_CONN_UPDATE_REG_ID, #endif CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -602,11 +623,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -639,9 +661,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -652,5 +674,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h index 008724b5c..4f47130d3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +70,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h index 8d9ecd40f..9ab15a5c6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,5 +215,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/main.h index 8dd24a564..20ea9d15a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h index e1aecd591..49bc3661f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* - *

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h index d832f678d..1c37faacb 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h index 86521af11..c1e2f2a3b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -74,5 +73,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c index 562e3a22c..852be7f8e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -413,5 +421,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c index b0658e5f2..ad9ff8cd1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -76,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -157,9 +161,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -358,12 +361,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -464,6 +606,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -508,4 +652,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/main.c index 387cea96e..e4ad5d82a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -74,6 +74,7 @@ DMA_HandleTypeDef hdma_usart1_tx; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_RNG_Init(void); /* USER CODE BEGIN PFP */ @@ -108,6 +109,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -147,7 +151,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -183,17 +186,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_LSE; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -413,5 +422,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/standby_stm32wb15.c index 6644473f3..10d50cbba 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,4 +163,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c index 904fb32eb..86091aee5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -143,11 +142,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -187,6 +196,7 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -200,6 +210,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -248,11 +267,21 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -333,5 +362,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c index 33d5a81b6..7dd965b4a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -321,4 +320,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c index c0af3469e..1394ae132 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp index 63ef081d2..c382fa272 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp @@ -1126,67 +1126,67 @@ STM32WBxx_HAL_Driver - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c @@ -1195,68 +1195,68 @@ STM32_WPAN - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\p2p_stm.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\p2p_stm.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c Utilities - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + $PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + $PROJ_DIR$/../../../../../../Utilities/sequencer/stm32_seq.c diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/stm32wb15xx_flash_cm4.icf index 56d9d33c5..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb15xx_cm4.s index f7cdf820d..3b925699a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 72feb3a18..4e53aee02 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -45,7 +44,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 110K +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c index de355d9ca..a81da9be9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.c - * Description : Application file for BLE Middleware. - * - ***************************************************************************** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -382,26 +381,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1268,6 +1268,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1310,4 +1312,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h index d2b6fc3d7..86f1d1046 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h index 59768aa0d..746ff3696 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,4 +68,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h index 1721138d4..e54a6cc09 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c index 2a10b93a8..c354e9e16 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.c - * Description : P2P Server Application - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.c + * Description : P2P Server Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -385,4 +384,3 @@ void P2PS_Send_Notification(void) /* USER CODE END FD_LOCAL_FUNCTIONS*/ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h index 234192bd6..8fd85526c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h index bd808a41b..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..57294e04f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +700,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/readme.txt index 40b6a8f0f..561a8a4d7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pServer application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin index 710f8286b..c709e8c4a 100644 Binary files a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin and b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin differ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h index 2e937fc4a..565efb136 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -290,6 +290,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -299,11 +303,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -311,6 +319,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -642,5 +663,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h index c95d8bea9..286cf657d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h index 8d9ecd40f..9ab15a5c6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,5 +215,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h index 1015e87fe..834c17171 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h index 0d3694d72..b8a514d28 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                        © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                        -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h index 241a52197..4d222698e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h index dfa04b06e..e10b246f4 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -73,5 +72,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c index 562e3a22c..852be7f8e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -413,5 +421,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c index 5e80e5506..3d215290f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +30,10 @@ #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" + + /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -68,6 +72,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ @@ -181,22 +187,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -302,4 +445,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c index d79c758d9..e5665d6d4 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -586,5 +586,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/standby_stm32wb15.c index d5b40e046..e3fd2fd44 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,4 +163,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c index c75f03aa7..169f4d3c5 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -346,19 +346,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -452,5 +444,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c index 9f1157cde..52630483c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -283,5 +282,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c index cbc072b39..45cbc8b18 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -311,4 +310,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c index 1b2e121cb..1d92460c6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -352,5 +351,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb15xx_cm4.s index 13a584f83..1a107ce9a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -84,7 +83,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -468,4 +467,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf index 8a6d86378..1c5dd3ab9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb15xx_flash_cm4_ota.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08007000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08007000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -34,13 +34,13 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; keep { section TAG_OTA_START}; keep { section TAG_OTA_END }; place in OTA_TAG_region { section TAG_OTA_START }; place in ROM_region { readonly, last section TAG_OTA_END }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/BLE_p2pServer_ota.uvprojx b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/BLE_p2pServer_ota.uvprojx index ca098f3d5..2fbaf3b52 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/BLE_p2pServer_ota.uvprojx +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/BLE_p2pServer_ota.uvprojx @@ -54,7 +54,7 @@ 0 0 1 - 1 + 0 1 0 diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb15xx_cm4.s index f7cdf820d..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -29,7 +29,7 @@ ; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Stack_Size EQU 0x1000 +Stack_Size EQU 0x400 AREA STACK, NOINIT, READWRITE, ALIGN=3 Stack_Mem SPACE Stack_Size @@ -40,7 +40,7 @@ __initial_sp ; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Heap_Size EQU 0x400 +Heap_Size EQU 0x200 AREA HEAP, NOINIT, READWRITE, ALIGN=3 __heap_base @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct index cac6c00bd..60ea7fdde 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -14,21 +14,23 @@ LR_IROM2 0x08007140 0x4{ ; load region size_region } } -LR_IROM3 0x08007144 0x146BC{ - ER_IROM1_HIGH 0x08007144 0x146BC { ; load address = execution address - *(InRoot$$Sections) - .ANY (+RO) - *.o (TAG_OTA_END) +LR_IROM3 0x08007144 0x116BC{ + ER_IROM1_HIGH 0x08007144 0x116BC { ; load address = execution address + *(InRoot$$Sections) + .ANY (+RO) + *.o (TAG_OTA_END) } - + RW_IRAM1 0x20000008 0x2FF8 { ; RW data - .ANY (+RW +ZI) + ANY (+RW +ZI) } - - RW_RAM2aRet_SHARED 0x20030000 0x2800 { ; RW data + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } } - \ No newline at end of file diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 7320fe370..407cd567c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -45,7 +44,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08007000, LENGTH = 82K +FLASH (rx) : ORIGIN = 0x08007000, LENGTH = 70K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -147,7 +146,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c index 276ce54c4..a376d7c51 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.c - * Description : Application file for BLE Middleware. - * - ***************************************************************************** + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -395,7 +394,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1251,4 +1251,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h index d2b6fc3d7..86f1d1046 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h index 33920653b..6837c3807 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,4 +68,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 1/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h index 1721138d4..e54a6cc09 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c index 2a10b93a8..c354e9e16 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.c - * Description : P2P Server Application - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.c + * Description : P2P Server Application + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -385,4 +384,3 @@ void P2PS_Send_Notification(void) /* USER CODE END FD_LOCAL_FUNCTIONS*/ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h index 234192bd6..8fd85526c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h index bd808a41b..04ed3d88d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c index aa440ff26..4eecadfdd 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,10 +172,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -705,4 +701,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/readme.txt index 861e1d538..e6f6ce6fe 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pServer_ota application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h index 5bb0f82f1..a49e4fde7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,4 +120,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h index 7002bdab9..20fba7353 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,8 +44,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -96,7 +96,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -300,7 +300,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -320,4 +320,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h index 855bf9e15..dacfcaea7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h - * Description : Hardware configuration file for the application. + * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -122,4 +121,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h index f318d3791..8f08c52f2 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,3 @@ void MX_UART_Deinit(hw_uart_id_t uart); #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h index 0c024028b..05a9002bb 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void SystemClock_Config_MSI(uint32_t usePLL); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h index dac7e2cbb..293e9912d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_LPM_IF_H @@ -75,5 +74,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h index 365809937..f7f0c092e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h index 485c7fc81..8710691e2 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h index 119d6e7a0..e60099e7c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c index 7e59c6279..84942ccd9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -415,4 +414,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c index 1ccb7b42f..2c64a7493 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2015 STMicroelectronics

                                                        + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +110,3 @@ void gpio_lld_lpuart_deInit(void) { } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c index 3c842b29a..a693ffc14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -439,4 +438,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c index 06aa251c7..efbb57dd1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief RF LLD tests application * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -601,5 +601,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END assert_failed */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/standby_stm32wb15.c index a0a8b4839..40bc409af 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,4 +155,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c index e4e8fd597..1431bc734 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c @@ -1,17 +1,17 @@ - /******************************************************************************* +/** + ****************************************************************************** * @file stm32_lpm_if.c * @author MCD Application Team * @brief Low layer function to enter/exit low power modes (stop, sleep) ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,19 +146,11 @@ void PWR_EnterStopMode( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -284,5 +276,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c index b783825ba..966f21306 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -282,5 +281,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c index 43697aaa7..a40a4c652 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -330,4 +329,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c index 791008e1d..1f4da1444 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -351,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb15xx_cm4.s index de618745d..fe8344a35 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb15xx_flash_cm4.icf index 9888197af..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B800; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 8f86b87c9..4e53aee02 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -39,13 +38,13 @@ ENTRY(Reset_Handler) /* Highest address of the user mode stack */ _estack = 0x20003000; /* end of RAM */ /* Generate a link error if heap and stack don't fit into RAM */ -_Min_Heap_Size = 0x200 ; /* required amount of heap */ -_Min_Stack_Size = 0x400 ; /* required amount of stack */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 110K +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -119,7 +118,7 @@ SECTIONS _sidata = LOADADDR(.data); /* Initialized data sections goes into RAM, load LMA copy after code */ - .data : + .data : { . = ALIGN(4); _sdata = .; /* create a global symbol at data start */ @@ -132,12 +131,11 @@ SECTIONS _edata = .; /* define a global symbol at data end */ } >RAM1 AT> FLASH - /* Uninitialized data section */ . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) @@ -160,8 +158,6 @@ SECTIONS . = ALIGN(8); } >RAM1 - - /* Remove information from the standard libraries */ /DISCARD/ : { diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c index ea1573ea1..438c73df3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -387,4 +386,3 @@ void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h index 3bd87e32c..21899be1e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_BLE_LLD_H #define APP_BLE_LLD_H @@ -68,4 +67,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c index 3dffc5b0f..c993c80c0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : chat_app.c * Description : CHAT LLD BLE Application. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -354,4 +353,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h index 4a79927a7..fd6ea0f9b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : chat_app.h * Description : Header for BLE LLD application. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef CHAT_APP_H @@ -47,4 +46,3 @@ void Appli_TIM_PeriodElapsedCallback(void); #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c index 7ce3de621..bed7dfbd3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,10 +162,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -673,4 +669,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt index 6258543b4..655525281 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE LLD BLE_LLD_Chat application ****************************************************************************** * - * Copyright (c) 2021 STMicroelectronics. All rights reserved. + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h index 5bb0f82f1..a49e4fde7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,4 +120,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h index b21ab05e2..70fd4ddf6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,8 +44,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -96,7 +96,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -314,7 +314,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -334,4 +334,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h index cec656da9..56e0228a8 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h - * Description : Hardware configuration file for the application. + * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -183,4 +182,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h index 3fd93b322..b69817ff7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -181,7 +180,7 @@ void MX_USART1_UART_DeInit(void); * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -283,5 +282,3 @@ void MX_UART_Deinit(hw_uart_id_t uart); #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h index 0c024028b..05a9002bb 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void SystemClock_Config_MSI(uint32_t usePLL); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h index dac7e2cbb..293e9912d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_LPM_IF_H @@ -75,5 +74,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h index 365809937..f7f0c092e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h index fd3ff7829..f2fcc305a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h index 119d6e7a0..e60099e7c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c index a377e0f8a..bbe5b1355 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -418,4 +417,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c index 1ccb7b42f..2c64a7493 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2015 STMicroelectronics

                                                        + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +110,3 @@ void gpio_lld_lpuart_deInit(void) { } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c index 3c842b29a..a693ffc14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -439,4 +438,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c index b1012309c..0a767b2d0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief RF LLD tests application * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -603,5 +603,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END assert_failed */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/standby_stm32wb15.c index a0a8b4839..40bc409af 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,4 +155,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c index e4e8fd597..1431bc734 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c @@ -1,17 +1,17 @@ - /******************************************************************************* +/** + ****************************************************************************** * @file stm32_lpm_if.c * @author MCD Application Team * @brief Low layer function to enter/exit low power modes (stop, sleep) ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,19 +146,11 @@ void PWR_EnterStopMode( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -284,5 +276,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c index c789f48a8..57bfb1d7c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -328,5 +327,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) } } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c index 09fb8f08f..556af7d2f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -320,4 +319,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c index 791008e1d..1f4da1444 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -351,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb15xx_cm4.s index de618745d..fe8344a35 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb15xx_flash_cm4.icf index 9888197af..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B800; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 8f86b87c9..4e53aee02 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -39,13 +38,13 @@ ENTRY(Reset_Handler) /* Highest address of the user mode stack */ _estack = 0x20003000; /* end of RAM */ /* Generate a link error if heap and stack don't fit into RAM */ -_Min_Heap_Size = 0x200 ; /* required amount of heap */ -_Min_Stack_Size = 0x400 ; /* required amount of stack */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 110K +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -119,7 +118,7 @@ SECTIONS _sidata = LOADADDR(.data); /* Initialized data sections goes into RAM, load LMA copy after code */ - .data : + .data : { . = ALIGN(4); _sdata = .; /* create a global symbol at data start */ @@ -132,12 +131,11 @@ SECTIONS _edata = .; /* define a global symbol at data end */ } >RAM1 AT> FLASH - /* Uninitialized data section */ . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) @@ -160,8 +158,6 @@ SECTIONS . = ALIGN(8); } >RAM1 - - /* Remove information from the standard libraries */ /DISCARD/ : { diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c index ea1573ea1..438c73df3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -387,4 +386,3 @@ void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h index 3bd87e32c..21899be1e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_BLE_LLD_H #define APP_BLE_LLD_H @@ -68,4 +67,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c index 4063e0755..484545618 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c @@ -1,17 +1,16 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : lowpower_app.c * Description : BLE LLD simple demo to control LEDs remotely ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,4 +163,3 @@ void Appli_TS_Callback(void) UTIL_SEQ_SetTask(1U << CFG_TASK_TIMER, CFG_SCH_PRIO_0); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h index 3024b6884..7f7ac8684 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : lowpower_app.h * Description : Header for BLE LLD application. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef LOWPOWER_APP_H @@ -47,4 +46,3 @@ void Appli_TS_Callback(void); #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c index 7ce3de621..bed7dfbd3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,10 +162,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -673,4 +669,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt index 7541ff8c4..5005d7c08 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE LLD BLE_LLD_Lowpower application ****************************************************************************** * - * Copyright (c) 2021 STMicroelectronics. All rights reserved. + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h index 5bb0f82f1..a49e4fde7 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,4 +120,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h index f24d94eb9..ae2abf61f 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,8 +44,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -96,7 +96,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -298,7 +298,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -318,4 +318,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h index 571f5d77a..de25f60a2 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h - * Description : Hardware configuration file for the application. + * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -183,4 +182,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h index 1499891d6..e23278583 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,7 +172,7 @@ void MX_USART1_UART_DeInit(void); * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -275,5 +274,3 @@ void MX_UART_Deinit(hw_uart_id_t uart); #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h index 0c024028b..05a9002bb 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void SystemClock_Config_MSI(uint32_t usePLL); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h index dac7e2cbb..293e9912d 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_LPM_IF_H @@ -75,5 +74,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h index 365809937..f7f0c092e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h index 485c7fc81..8710691e2 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h index 119d6e7a0..e60099e7c 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c index 4a8eab1cd..6ab0e3050 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -415,4 +414,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c index 1ccb7b42f..2c64a7493 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2015 STMicroelectronics

                                                        + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +110,3 @@ void gpio_lld_lpuart_deInit(void) { } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c index 3c842b29a..a693ffc14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -439,4 +438,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c index 03067aa28..a3a1c2bb3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief RF LLD tests application * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -550,5 +550,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END assert_failed */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/standby_stm32wb15.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/standby_stm32wb15.c index a0a8b4839..40bc409af 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/standby_stm32wb15.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/standby_stm32wb15.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,4 +155,3 @@ uint32_t standby_boot_mng(void) return boot_after_standby; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c index e4e8fd597..1431bc734 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c @@ -1,17 +1,17 @@ - /******************************************************************************* +/** + ****************************************************************************** * @file stm32_lpm_if.c * @author MCD Application Team * @brief Low layer function to enter/exit low power modes (stop, sleep) ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,19 +146,11 @@ void PWR_EnterStopMode( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -284,5 +276,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c index b783825ba..966f21306 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -282,5 +281,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c index 3b91552d1..1ac915757 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -323,4 +322,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c index 791008e1d..1f4da1444 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -351,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb15xx_cm4.s index de618745d..fe8344a35 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb15xx_flash_cm4.icf index 9888197af..a67befac1 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb15xx_flash_cm4.icf @@ -6,7 +6,7 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000; /*-Memory Regions-*/ /***** FLASH Part dedicated to M4 *****/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0801B800; +define symbol __ICFEDIT_region_ROM_end__ = 0x080187FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ @@ -33,10 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { block CSTACK, block HEAP }; -place in Total_RAM_region { readwrite }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/stm32wb15xx_flash_cm4.sct b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/stm32wb15xx_flash_cm4.sct index 28aca4068..c94aa2008 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/stm32wb15xx_flash_cm4.sct +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/stm32wb15xx_flash_cm4.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x0001B800 { ; load region size_region - ER_IROM1 0x08000000 0x0001B800 { ; load address = execution address +LR_IROM1 0x08000000 0x00018800 { ; load region size_region + ER_IROM1 0x08000000 0x00018800 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x0001B800 { ; load region size_region RW_IRAM1 0x20000008 0x2FF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index 8f86b87c9..4e53aee02 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -39,13 +38,13 @@ ENTRY(Reset_Handler) /* Highest address of the user mode stack */ _estack = 0x20003000; /* end of RAM */ /* Generate a link error if heap and stack don't fit into RAM */ -_Min_Heap_Size = 0x200 ; /* required amount of heap */ -_Min_Stack_Size = 0x400 ; /* required amount of stack */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ /* Specify the memory areas */ MEMORY { -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 110K +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 98K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FF8 RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K } @@ -119,7 +118,7 @@ SECTIONS _sidata = LOADADDR(.data); /* Initialized data sections goes into RAM, load LMA copy after code */ - .data : + .data : { . = ALIGN(4); _sdata = .; /* create a global symbol at data start */ @@ -132,12 +131,11 @@ SECTIONS _edata = .; /* define a global symbol at data end */ } >RAM1 AT> FLASH - /* Uninitialized data section */ . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) @@ -160,8 +158,6 @@ SECTIONS . = ALIGN(8); } >RAM1 - - /* Remove information from the standard libraries */ /DISCARD/ : { diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c index ea1573ea1..438c73df3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -387,4 +386,3 @@ void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h index 3bd87e32c..21899be1e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_BLE_LLD_H #define APP_BLE_LLD_H @@ -68,4 +67,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c index caa507a85..37a1be6fa 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c @@ -1,17 +1,16 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : pressbutton_app.c * Description : BLE LLD simple demo to control LEDs remotely ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,4 +157,3 @@ static inline uint32_t timeDifference(uint32_t old, uint32_t new){ } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h index 602d7c8c4..1d0de164b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : pressbutton_app.h * Description : Header for BLE LLD application. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef PRESSBUTTON_APP_H @@ -46,4 +45,3 @@ void PRESSBUTTON_APP_Init(void); #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c index 7ce3de621..bed7dfbd3 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,10 +162,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -673,4 +669,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt index 83d962024..3a1b7877e 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE LLD BLE_LLD_Pressbutton application ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc index de57b7f70..cc2d97d73 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc @@ -72,8 +72,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -91,6 +91,11 @@ NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true NVIC.TimeBase=TIM2_IRQn NVIC.TimeBaseIP=TIM2 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h index 4a8633c9a..9f12f3c17 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h index 037eb1704..740d9ac81 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h index baa6d17f9..00a760848 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c index 979763a6c..e0968c1c9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -58,5 +57,3 @@ /* USER CODE BEGIN Application */ /* USER CODE END Application */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c index 8f55b5a44..93810e6f9 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ __IO uint32_t HighPriorityThreadCycles = 0, MediumPriorityThreadCycles = 0, LowP /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); void MutexHighPriorityThreadr(void const * argument); void MutexMediumPriorityThread(void const * argument); void MutexLowPriorityThread(void const * argument); @@ -101,6 +101,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Initialize LEDs */ BSP_LED_Init(LED1); @@ -174,7 +177,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -212,11 +214,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -421,7 +434,7 @@ void MutexLowPriorityThread(void const * argument) /* USER CODE END MutexLowPriorityThread */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM2 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -474,5 +487,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c index 8c51e2b32..c5e70e398 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c index 77492fd60..f7fa29b01 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,20 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +37,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** */ /* USER CODE END Header */ @@ -72,6 +72,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM2 global Interrupt */ HAL_NVIC_EnableIRQ(TIM2_IRQn); + /* Enable TIM2 clock */ __HAL_RCC_TIM2_CLK_ENABLE(); @@ -96,6 +97,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim2.Init.Prescaler = uwPrescalerValue; htim2.Init.ClockDivision = 0; htim2.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim2) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -129,5 +131,3 @@ void HAL_ResumeTick(void) /* Enable TIM2 Update interrupt */ __HAL_TIM_ENABLE_IT(&htim2, TIM_IT_UPDATE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c index ed1fb0d55..93b9981a2 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -179,4 +178,3 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c index c0af3469e..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt index e73a201cf..c372e5f29 100644 --- a/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt +++ b/Projects/NUCLEO-WB15CC/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc index 1da3565c4..ca1416ceb 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc @@ -58,8 +58,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:1\:0\:true\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:2\:0\:true\:false\:true\:false\:true @@ -78,6 +78,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h index 43b85e9a9..74a19a54f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h index c839e59b8..3b733dc39 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h index 8680946b7..8f89c0b1e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c index bbe980a60..e5e2cb4c4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -86,6 +85,7 @@ uint32_t ubAdcGrpRegularSequenceConvCount = 0UL; /* Variable set into ADC interr /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_ADC1_Init(void); @@ -127,6 +127,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -244,7 +247,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -282,12 +284,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_ADC; - PeriphClkInitStruct.AdcClockSelection = RCC_ADCCLKSOURCE_HSI; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -485,5 +497,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c index e91fd7706..33412017d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,11 +83,21 @@ void HAL_MspInit(void) void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hadc->Instance==ADC1) { /* USER CODE BEGIN ADC1_MspInit 0 */ /* USER CODE END ADC1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_ADC; + PeriphClkInitStruct.AdcClockSelection = RCC_ADCCLKSOURCE_HSI; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_ADC_CLK_ENABLE(); @@ -165,5 +174,3 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c index 5825e919d..8455316f3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -233,4 +232,3 @@ void ADC1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt index 4bb1105a2..b7fb2db7a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_MultiChannelSingleConversion example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc index 11106b7eb..26ab3a1a5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc @@ -27,8 +27,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -46,6 +46,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h index 8d3343126..838d00c5e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h index c839e59b8..3b733dc39 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h index 52664d358..d49216f20 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c index 0a21b1415..53416523f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,6 +72,7 @@ __IO uint8_t ubAdcGrpRegularUnitaryConvStatus = 2; /* Variable set into ADC inte /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -106,6 +106,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -138,7 +141,7 @@ int main(void) Error_Handler(); } - /* For this example purpose, wait untill conversion is done */ + /* For this example purpose, wait until conversion is done */ while (ubAdcGrpRegularUnitaryConvStatus != 1); /* Reset status variable of ADC group regular unitary conversion */ @@ -175,7 +178,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -213,12 +215,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_ADC; - PeriphClkInitStruct.AdcClockSelection = RCC_ADCCLKSOURCE_HSI; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -389,5 +401,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c index 5982349da..ce1548b0c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,11 +82,21 @@ void HAL_MspInit(void) void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hadc->Instance==ADC1) { /* USER CODE BEGIN ADC1_MspInit 0 */ /* USER CODE END ADC1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_ADC; + PeriphClkInitStruct.AdcClockSelection = RCC_ADCCLKSOURCE_HSI; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_ADC_CLK_ENABLE(); @@ -143,5 +152,3 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c index 0d1b2822d..8d4402747 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -218,4 +217,3 @@ void ADC1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt index bea3cb91e..e163533b8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerSW_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc index 70534b22b..257c9db96 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc @@ -51,8 +51,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -71,6 +71,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h index 5d4b014bf..2fe8ef61b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h index 17894879e..bb414ffe9 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h index 3c080084a..5868569d5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c index eb311725d..66f187eb8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c @@ -12,13 +12,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -90,6 +89,7 @@ __IO uint8_t ubDmaTransferStatus = 2U; /* Variable set into DMA interruption cal /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_ADC1_Init(void); @@ -132,6 +132,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -211,7 +214,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -249,12 +251,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_ADC; - PeriphClkInitStruct.AdcClockSelection = RCC_ADCCLKSOURCE_HSI; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -439,7 +451,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc) /* Note: For debug purpose, if program is halted with a breakpoint then this error will be raised (due to ADC and DMA continuing to operate in background). - To not block debug of this exemple, replace error handler by + To not block debug of this example, replace error handler by dummy LED toggle. */ /* Error_Handler(); */ BSP_LED_Toggle(LED2); @@ -479,7 +491,7 @@ void HAL_ADC_ConvHalfCpltCallback(ADC_HandleTypeDef *hadc) /* Note: For debug purpose, if program is halted with a breakpoint then this error will be raised (due to ADC and DMA continuing to operate in background). - To not block debug of this exemple, replace error handler by + To not block debug of this example, replace error handler by dummy LED toggle. */ /* Error_Handler(); */ BSP_LED_Toggle(LED2); @@ -559,5 +571,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c index e869d9cb0..fda21f227 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,11 +83,21 @@ void HAL_MspInit(void) void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hadc->Instance==ADC1) { /* USER CODE BEGIN ADC1_MspInit 0 */ /* USER CODE END ADC1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_ADC; + PeriphClkInitStruct.AdcClockSelection = RCC_ADCCLKSOURCE_HSI; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_ADC_CLK_ENABLE(); @@ -209,5 +218,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c index d8da79e0d..c29dbd49b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -233,4 +232,3 @@ void ADC1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt index def7af2bc..ba2e9ca2e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerTimer_DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/BSP_Example.ioc b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/BSP_Example.ioc index fe80891cd..d21ee28ec 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/BSP_Example.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/BSP_Example.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/main.h index db9a924f9..99ad11ef2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h index b615faca6..8fb9522f1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void EXTI9_5_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/main.c index 569266798..34a357da0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,6 +48,7 @@ static uint32_t delay = 250; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -134,7 +137,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -172,11 +174,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -244,5 +257,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c index cb76a87ab..ea168da57 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,4 +227,3 @@ void EXTI9_5_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/readme.txt b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/readme.txt index 9d46f26e6..d94a42fee 100644 --- a/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/BSP/BSP_Example/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BSP example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc index 7592bda89..203869011 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc @@ -23,8 +23,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.COMP_IRQn=true\:3\:0\:true\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -39,6 +39,11 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false PA1.Mode=INP PA1.Signal=COMP1_INP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_sram_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_sram_cm4.icf index b4d87081e..9b2c8a377 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_sram_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb15xx_sram_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x2000AFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h index 905b85cdc..2aa9986eb 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h index 41e32d32e..673eed277 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h index 562d26c3c..a3169e096 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void COMP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c index e15b67856..8ac287020 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ COMP_HandleTypeDef hcomp1; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_COMP1_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -149,7 +152,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -187,11 +189,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -351,5 +364,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c index 8eb24e073..12246fbde 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -139,5 +138,3 @@ void HAL_COMP_MspDeInit(COMP_HandleTypeDef* hcomp) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c index 40fc587eb..41730ac20 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -205,4 +204,3 @@ void COMP_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt index 7e4df4852..5707ada55 100644 --- a/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the COMP_CompareGpioVsVrefInt_IT Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc index 7b1f613d9..9686afe3d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/main.h index d63920c4a..1ce19b9c1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_it.h index 9e0184c37..ea9677fa2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/main.c index 6ee833ae3..22cb1d7f9 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,6 +48,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -88,6 +88,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -159,7 +162,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -197,11 +199,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -248,5 +261,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c index 8efc7d79c..7984c9d47 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,5 +77,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_it.c index 04dd72fc0..c92e97004 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,4 +145,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/readme.txt b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/readme.txt index 7fb6af58d..a36954f76 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/CORTEX/CORTEXM_SysTick/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CortexM SysTick example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/CRC_Example.ioc b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/CRC_Example.ioc index d94a2ab36..566a2fe5a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/CRC_Example.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/CRC_Example.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -35,6 +35,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/main.h index da5147d12..864c97735 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h index 4ddfc4ca8..97d05904a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h index 71ec15999..d2665e35f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/main.c index 9146f417f..4c3c27807 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,6 +79,7 @@ uint32_t uwExpectedCRCValue = 0x379E9F06; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_CRC_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -120,6 +120,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -168,7 +171,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -206,11 +208,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -285,5 +298,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c index 276b7cfc9..bbd5e2bb0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,5 +120,3 @@ void HAL_CRC_MspDeInit(CRC_HandleTypeDef* hcrc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c index a5b2a62b5..f14050492 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -119,4 +118,3 @@ void SysTick_Handler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/readme.txt b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/readme.txt index e9e1ddab4..4e5c7772f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/CRC/CRC_Example/readme.txt @@ -8,12 +8,12 @@ * @brief Description of Cyclic Redundancy Check Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc index 71ee27b21..b34a12591 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc @@ -61,8 +61,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:false\:false\:false @@ -76,6 +76,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/main.h index b9e34e70e..0bec6dd4a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h index 2a545f561..d04217e4a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h index 1dbbecc8b..a0ad0a8d7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void DMA1_Channel2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 85adaf400..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/main.c index d2bccd5ba..e8bd646e0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,7 +153,7 @@ uint32_t aPlaintext[AES_TEXT_SIZE] = 0xF69F2445 ,0xDF4F9B17 ,0xAD2B417B ,0xE66C3710}; -/* Cyphertext */ +/* Ciphertext */ uint32_t aEncryptedtextExpected[AES_TEXT_SIZE] = {0x3AD77BB4 ,0x0D7A3660 ,0xA89ECAF3 ,0x2466EF97 , 0xF5D3D585 ,0x03B9699D ,0xE785895A ,0x96FDBAAF , @@ -171,6 +170,7 @@ uint32_t aDecryptedText[PLAINTEXT_SIZE] = {0}; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_DMA_Init(void); static void MX_AES2_Init(void); /* USER CODE BEGIN PFP */ @@ -226,6 +226,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -376,7 +379,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -414,11 +416,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -638,5 +651,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c index 4993138f1..fbabc4231 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,5 +163,3 @@ void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef* hcryp) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c index b18413bdc..ab415c50d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -231,4 +230,3 @@ void DMA1_Channel2_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/readme.txt b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/readme.txt index d75a010fb..23a8f8e46 100644 --- a/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/CRYP/CRYP_DMA/readme.txt @@ -9,12 +9,12 @@ * @brief Description of the CRYP AES Algorithm in ECB mode with DMA Example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -41,7 +41,7 @@ When resorting to STM32CubeIDE: Command Code is displayed on debugger as follows: Window--> Show View--> Console. In Debug configuration : - Window\Debugger, select the Debug probe : ST-LINK(OpenOCD) -- window\ Startup,add the command "monitor arm semihosting enable" +- Window\Startup, add the command "monitor arm semihosting enable" When all ciphering and deciphering operations are successful, LED2 is turned on. In case of ciphering or deciphering issue, LED3 toggle each 200ms. @@ -49,11 +49,6 @@ In case of ciphering or deciphering issue, LED3 toggle each 200ms. The Plain data, encrypted data and decrypted data can be displayed on a PC HyperTerminal using the UART. USE_VCP_CONNECTION=1 must be added in command line. -@par Keywords - -Security, Cryptography, CRYPT, AES, ECB, DMA, cipher, UART - - @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from a peripheral ISR process, then @@ -64,6 +59,10 @@ Security, Cryptography, CRYPT, AES, ECB, DMA, cipher, UART @note The application need to ensure that the SysTick time base is always set to 1 millisecond to have correct HAL operation. +@par Keywords + +Security, Cryptography, CRYPT, AES, ECB, DMA, cipher, UART + @par Directory contents - CRYP/CRYP_DMA/Inc/nucleo_wb15cc_conf.h BSP configuration file diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc index db0ba0d63..d1cff8af3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc @@ -34,8 +34,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -48,6 +48,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/main.h index 15c939744..d5c9b7479 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h index b80608160..d941efbf3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/main.c index a978092c0..c987e488e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,6 +66,7 @@ static __IO uint32_t transferCompleteDetected; /* Set to 1 if transfer is correc /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_DMA_Init(void); /* USER CODE BEGIN PFP */ /* Private function prototypes -----------------------------------------------*/ @@ -112,6 +112,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -174,7 +177,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -212,11 +214,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -321,5 +334,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c index f9463e6fe..a933382c8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c index abb2534e1..61a8809a0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,3 @@ void DMA1_Channel1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/readme.txt b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/readme.txt index 1d7ed38a0..9c97cfe98 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_FLASHToRAM/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA FLASH to RAM example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc index b125108b4..97f578bb9 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc @@ -43,8 +43,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMAMUX1_OVR_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -69,6 +69,11 @@ PB7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PB7.Locked=true PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/main.h index 5d425ade9..7616b3ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/main.h @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,5 +101,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h index 1482060e7..e9d703140 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h index 3ec3c3a0a..5bd1ec95e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void DMAMUX1_OVR_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/main.c index 80999f8da..be65b00c8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,6 +61,7 @@ uint8_t TxEndMessage[] = "\n\r\n\rExample Finished\n\r"; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_LPTIM1_Init(void); @@ -102,6 +102,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -177,7 +180,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -215,14 +217,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPTIM1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_PCLK1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -388,5 +398,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c index dd7750660..b8f862631 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,11 +82,21 @@ void HAL_MspInit(void) */ void HAL_LPTIM_MspInit(LPTIM_HandleTypeDef* hlptim) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hlptim->Instance==LPTIM1) { /* USER CODE BEGIN LPTIM1_MspInit 0 */ /* USER CODE END LPTIM1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPTIM1; + PeriphClkInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPTIM1_CLK_ENABLE(); /* USER CODE BEGIN LPTIM1_MspInit 1 */ @@ -129,11 +138,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -224,5 +243,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c index 1ec66ea0e..4f8b48d3d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -246,4 +245,3 @@ void DMAMUX1_OVR_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/readme.txt b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/readme.txt index f21ed7c8c..08ffc2a12 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUXSYNC/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA & DMAMUX Synchronization Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc index 0258f8e6b..fd476b166 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h index 07d1584e2..7044265c3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h index 1d8b1f501..f639e66fd 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void DMAMUX1_OVR_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/main.c index 82282ccc8..8261b9406 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/main.c @@ -8,16 +8,15 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -54,6 +53,7 @@ DMA_HandleTypeDef DMA_Handle; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ static void HAL_TransferError(DMA_HandleTypeDef *hdma); /* USER CODE END PFP */ @@ -84,6 +84,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -168,7 +171,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -206,11 +208,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -268,5 +281,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c index a44a9a3c6..d93dae433 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c index daa45e349..57bc5c128 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -210,4 +209,3 @@ void DMAMUX1_OVR_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/readme.txt b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/readme.txt index 4bf4c6fe8..a02331561 100644 --- a/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/DMA/DMA_MUX_RequestGen/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA & request generator Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc index 924ceab3e..9bbecefca 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/main.h index 50af193c1..0aeefcb85 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -229,5 +228,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h index 2f93cc2e1..574bc866b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/main.c index 4f7ee93cb..3de199b37 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,6 +61,7 @@ static FLASH_EraseInitTypeDef EraseInitStruct; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ static uint32_t GetPage(uint32_t Address); @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -233,7 +236,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -271,11 +273,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -337,5 +350,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c index bbd5520b1..43e345ae5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c index 56a9e76d9..efdbee9d0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/readme.txt b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/readme.txt index 716e58ec3..0cf38fe7f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_EraseProgram/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the FLASH Erase and Program example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc index c729b8e8e..edc70187a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/main.h index 067ef2f2a..94b1dbc81 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -230,5 +229,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h index 8daac8538..e3cba24f2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/main.c index 64c218fea..7c62c5daa 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,6 +75,7 @@ static FLASH_OBProgramInitTypeDef OptionsBytesStruct, OptionsBytesStruct2; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ static uint32_t GetPage(uint32_t Address); @@ -118,6 +118,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -492,7 +495,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -530,11 +532,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -606,5 +619,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c index 00262ec15..64e81dd7d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c index e63677736..36d00fbf4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/readme.txt b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/readme.txt index fe7aec5f1..cf98e764a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/FLASH/FLASH_WriteProtection/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the FLASH write protection example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc index 91c49b18b..242541c09 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:true\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/main.h index c804d01c6..8b69e043e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h index 5290aca7a..97ab9bd6b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/main.c index 762ddeea4..68ea545c3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -159,11 +158,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -245,5 +239,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c index fc9051292..a18a377d0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,5 +77,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c index 74da4abd9..4e26f2251 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -184,4 +183,3 @@ void EXTI0_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/readme.txt b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/readme.txt index 2f31b0971..32dd59c4f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_EXTI/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the GPIO EXTI example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc index 0e45a467d..16c0e4bef 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:true\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/main.h index 0ac4165ee..9a35030bd 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h index 98da6a49d..a816e5381 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/main.c index 4129b5feb..420fed657 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ static GPIO_InitTypeDef GPIO_InitStruct; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -91,6 +91,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -140,7 +143,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -178,11 +180,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -230,5 +243,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c index 1d6bb7052..eb5216308 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,5 +77,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c index e7191b6fc..1bc94d07d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,4 +172,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/readme.txt b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/readme.txt index 8f986e481..8450d8e6c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/GPIO/GPIO_IOToggle/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the GPIO IO Toggle example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc index f42a9176b..50b7c8163 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/main.h index 359d63588..b628a6106 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h index 037eb1704..740d9ac81 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h index c02ba766c..d47a43900 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/main.c index d5dd82348..ed772891c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/main.c @@ -8,29 +8,13 @@ ****************************************************************************** * @attention * - *

                                                        © COPYRIGHT(c) 2016 STMicroelectronics

                                                        + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -172,11 +156,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -353,5 +332,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c index e16fa9915..5a6bf1134 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c index 24aa74671..ef5e0453a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,4 +153,3 @@ void EXTI0_IRQHandler(void) }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/readme.txt b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/readme.txt index cd37d59a7..882bf0b70 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HAL time base example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc index 3357da1bf..369da5ae6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h index bedef28c0..5742666d7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h index 4908f17fc..28588fc88 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h index e14205c07..1ce6e294f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c index 97fe45d0d..768d505ca 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,11 +157,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -223,5 +217,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c index e16fa9915..5a6bf1134 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c index 705d1d32c..abe650e24 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c @@ -6,11 +6,22 @@ * * This file overrides the native HAL time base functions (defined as weak) * to use the RTC WAKEUP for the time base generation: - * + Intializes the RTC peripheral and configures the wakeup timer to be + * + Initializes the RTC peripheral and configures the wakeup timer to be * incremented each 1ms * + The wakeup feature is configured to assert an interrupt each 1ms * + HAL_IncTick is called inside the HAL_RTCEx_WakeUpTimerEventCallback * + HSE (default), LSE or LSI can be selected as RTC clock source + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -31,17 +42,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -275,5 +275,3 @@ void RTC_WKUP_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c index 68e625289..a1f268585 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,4 +133,3 @@ void EXTI0_IRQHandler(void) }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt index ee3c60b4c..4b62b855b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HAL TimeBase RTC WakeUp example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc index 115ed8dc4..4035f987c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,11 @@ NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.TimeBase=TIM2_IRQn NVIC.TimeBaseIP=TIM2 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h index 5a502d34f..ede4f5978 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h index 037eb1704..740d9ac81 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h index 57cf95874..579d693b8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/main.c index e7e3d633f..11a05e221 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -166,11 +165,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -205,7 +199,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) /* USER CODE END 4 */ - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM2 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -256,5 +250,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c index e16fa9915..5a6bf1134 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c index 517db51fd..a5d69f4c2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,6 +49,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM2 global Interrupt */ HAL_NVIC_EnableIRQ(TIM2_IRQn); + /* Enable TIM2 clock */ __HAL_RCC_TIM2_CLK_ENABLE(); @@ -74,6 +74,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim2.Init.Prescaler = uwPrescalerValue; htim2.Init.ClockDivision = 0; htim2.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim2) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -107,5 +108,3 @@ void HAL_ResumeTick(void) /* Enable TIM2 Update interrupt */ __HAL_TIM_ENABLE_IT(&htim2, TIM_IT_UPDATE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c index 674b0ddaa..0680ed9ef 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -155,4 +154,3 @@ void EXTI0_IRQHandler(void) { }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/readme.txt b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/readme.txt index fb7e82703..d63c20ef0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/HAL/HAL_TimeBase_TIM/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HAL time base example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc index 3b9ae7b18..0f566f57b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc @@ -70,8 +70,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x30F Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -87,10 +87,19 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h index db112b857..c6246e911 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h index 2324ed02b..fd85e83a7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h index 1de8a59ad..6d3048f81 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c index 125305938..2e4612c1e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -59,6 +58,7 @@ uint8_t aRxBuffer[RXBUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_I2C1_Init(void); @@ -103,6 +103,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -275,7 +278,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -313,12 +315,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_I2C1; - PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_PCLK1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -532,5 +544,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c index 3b0b5ec35..8e7017e38 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -86,6 +85,7 @@ void HAL_MspInit(void) void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hi2c->Instance==I2C1) { /* USER CODE BEGIN I2C1_MspInit 0 */ @@ -96,6 +96,14 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) RCC_PeriphCLKInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_SYSCLK; HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct); /* USER CODE END I2C1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_I2C1; + PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOB_CLK_ENABLE(); /**I2C1 GPIO Configuration @@ -200,5 +208,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c index e8ce49bd2..0688d673e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,4 +202,3 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt index 267aa15cf..e356ae092 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C Two Boards Communication DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc index efa57277d..10c661312 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc @@ -32,8 +32,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x30F Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -47,10 +47,19 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h index 06a0372bd..7db29d9e4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h index 2324ed02b..fd85e83a7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h index 5d5a2f997..53e07fd42 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c index 013c49ca6..1302d066c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ uint8_t aRxBuffer[RXBUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); /* USER CODE BEGIN PFP */ @@ -101,6 +101,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -272,7 +275,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -310,12 +312,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_I2C1; - PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_PCLK1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -509,5 +521,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c index b741515fd..3f24df0ea 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,6 +82,7 @@ void HAL_MspInit(void) void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hi2c->Instance==I2C1) { /* USER CODE BEGIN I2C1_MspInit 0 */ @@ -93,6 +93,14 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) RCC_PeriphCLKInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_SYSCLK; HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct); /* USER CODE END I2C1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_I2C1; + PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOB_CLK_ENABLE(); /**I2C1 GPIO Configuration @@ -157,5 +165,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c index e60ba26c0..8652235b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,4 +172,3 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt index 7db9d3367..6220f3f41 100644 --- a/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C Two Boards Communication IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc index f9bd1074b..120ecf5e5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -34,6 +34,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/main.h index c9576e944..1fe456228 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h index 7638a8771..7f17b0ab2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h index e4943cc41..0106719c4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/main.c index 7bde990a2..f64149d06 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -58,6 +57,7 @@ uint32_t WaitingDelay = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_IWDG_Init(void); /* USER CODE BEGIN PFP */ @@ -89,6 +89,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 and LED3 */ BSP_LED_Init(LED2); @@ -155,7 +158,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -195,11 +197,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -291,5 +304,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c index e16fa9915..5a6bf1134 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c index 2344d24d6..10f8b26b5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -212,4 +211,3 @@ void EXTI0_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/readme.txt b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/readme.txt index b31077707..2d9033997 100644 --- a/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/IWDG/IWDG_WindowMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the IWDG Reset with window mode. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h index 5866ba224..1efc450fc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h index 8a67fd5c2..6fc86867f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h index a4961e504..d70cc3fa6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc index 33c9ffbe6..713974f09 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc @@ -23,8 +23,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -44,6 +44,11 @@ PB2.Signal=LPTIM1_OUT PB5.Locked=true PB5.Mode=Counts_external_clock_standalone_1X_occur1 PB5.Signal=LPTIM1_IN1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c index 6872047a0..29064fbe2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ LPTIM_HandleTypeDef hlptim1; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LPTIM1_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED3 */ @@ -154,7 +157,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -192,12 +194,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_LPTIM1; - PeriphClkInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_PCLK1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -296,5 +308,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c index 29789d5fc..c770a21b9 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,11 +83,21 @@ void HAL_MspInit(void) void HAL_LPTIM_MspInit(LPTIM_HandleTypeDef* hlptim) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hlptim->Instance==LPTIM1) { /* USER CODE BEGIN LPTIM1_MspInit 0 */ /* USER CODE END LPTIM1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPTIM1; + PeriphClkInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPTIM1_CLK_ENABLE(); @@ -151,4 +160,3 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* hlptim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c index 2ed3fde7d..e5594af0a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,3 @@ void EXTI0_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt index ac6a086bc..09f958f0a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM PWM with an External clock example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h index c86f4b653..9a5ae11c2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h index 8a67fd5c2..6fc86867f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h index 2e7c1babc..e70c6d9ea 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void LPTIM1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc index 389340ba1..fbb5b1e6a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -38,6 +38,11 @@ NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false PB5.Locked=true PB5.Mode=Counts_external_clock_with_synchro_01_occur1 PB5.Signal=LPTIM1_IN1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c index 80b3ca8f5..a86530324 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ LPTIM_HandleTypeDef hlptim1; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LPTIM1_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 & LED3 */ @@ -143,7 +146,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -181,12 +183,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_LPTIM1; - PeriphClkInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_PCLK1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -297,4 +309,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c index edc9963ec..6b7e04694 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,6 +83,7 @@ void HAL_MspInit(void) void HAL_LPTIM_MspInit(LPTIM_HandleTypeDef* hlptim) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hlptim->Instance==LPTIM1) { /* USER CODE BEGIN LPTIM1_MspInit 0 */ @@ -112,6 +112,15 @@ void HAL_LPTIM_MspInit(LPTIM_HandleTypeDef* hlptim) __HAL_RCC_LPTIM1_RELEASE_RESET(); /* USER CODE END LPTIM1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPTIM1; + PeriphClkInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPTIM1_CLK_ENABLE(); @@ -193,4 +202,3 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* hlptim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c index c8811b104..ce4f64cb4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,4 @@ void LPTIM1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/readme.txt b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/readme.txt index 6bea2fce8..4e84ead0f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/LPTIM/LPTIM_PulseCounter/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM Pulse counter example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h index 8309ef30d..8df540ad6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,3 @@ extern const uint32_t SigGen_S_len; #endif #endif /* __SIGGEN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h index c049a577d..665b7e93e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h index de2fff994..68e2b9a4e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h index d8fec0cc2..4115d1eec 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h index 34ee8556a..8273ad59b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc index c1192f013..1006eda2e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c index 17e05c36c..48dadb33d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ const uint8_t SigGen_S[] = { 0xef, 0x97, 0xb2, 0x18, 0xe9, 0x6f, 0x17, 0x5a, 0x3c, 0xcd, 0xda, 0x2a, 0xcc, 0x05, 0x89, 0x03 }; const uint32_t SigGen_S_len = 32; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/main.c index e5abc86c1..20109be35 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,6 +52,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -178,7 +181,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -216,11 +218,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -299,5 +312,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c index ce2dc5e3c..c3c2dd671 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c index a87ebeab0..a333a5cae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,5 +123,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c index 17aac81a1..c06e07fdc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/readme.txt b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/readme.txt index 17e37d58e..75e980eef 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Sign/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECDSA signature example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,8 +28,8 @@ For this example, a test vector have been extracted from National Institute of S This reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (SigGen.txt)" -This test vector has been choosen to demonstrate how to sign a message. The inputs and outputs definitions are included -in SigGen.c. The output signature is composed of two parts called "R" and "S". You can refer to this file for more informations. +This test vector has been chosen to demonstrate how to sign a message. The inputs and outputs definitions are included +in SigGen.c. The output signature is composed of two parts called "R" and "S". You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h index c83985dd5..cebf00d75 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -45,5 +44,3 @@ extern const uint32_t SigVer_Result; #endif #endif /* __SIGVER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h index 6b3df6eca..dc0737a38 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h index 44394c803..ca1e1f507 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h index d8fec0cc2..4115d1eec 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h index bf9a57808..0129a7ed4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc index 0f06b8a8f..965e03580 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c index 0da224a1a..1b640e7dc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -90,5 +89,3 @@ const uint8_t SigVer_S[] = { const uint32_t SigVer_S_len = 32; const uint32_t SigVer_Result = SET; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c index 67c2ec964..de1e854d1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -187,7 +190,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -225,11 +227,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -326,5 +339,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c index 90f329ea7..5b92870a6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c index 144882c1f..d98e89b8a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c index 5f94f4f1b..1d4360e13 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void PKA_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt index 5158181e4..f1349edcb 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECDSA verification example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,10 +28,10 @@ For this example, a test vector have been extracted from National Institute of S This reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (ZIP SigGen.rsp)" -This test vector has been choosen to demonstrate the behavior in a case where the input signature +This test vector has been chosen to demonstrate the behavior in a case where the input signature is valid. A second input is provided where one element of the hash message has been modified to demonstrate the behavior in a case where the signature is invalid. Their definitions are included -in SigVer.c. You can refer to this file for more informations. +in SigVer.c. You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/main.h index 6ff18a7a2..1e025c677 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h index b2bd5454e..750dbb9da 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc index 5162b081e..19ce1a09d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/main.c index 183f5cb03..7cefbfc88 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ static uint32_t TimingDelay; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Decrease(void); @@ -85,6 +85,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -151,7 +154,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -189,11 +191,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -299,5 +312,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c index 9a8c656b2..438a52158 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c index 13b06458e..dd189fd2c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/readme.txt b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/readme.txt index 5fac97e02..5d5a69f22 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPRUN/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Low Power Run Mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/main.h index ec58fbb67..50752b6b1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h index 4715e7544..632505ede 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc index 27b776891..99b68aa9e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/main.c index a7e900ea4..ae4cf9e4d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ static uint32_t TimingDelay; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Decrease(void); @@ -83,6 +83,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -161,7 +164,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -199,11 +201,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -310,5 +323,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c index 02ae5b10a..5e580d215 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c @@ -3,19 +3,16 @@ ****************************************************************************** * @file PWR/PWR_LPSLEEPS/Src/stm32wbxx_hal_msp.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief HAL MSP module. ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c index 92a626bf3..7871959ea 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,3 @@ void EXTI0_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/readme.txt b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/readme.txt index 394d2a7a9..d4f684435 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_LPSLEEP/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Low Power Sleep Mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/main.h index 0c75708e2..c3f032691 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h index 4b6b81db9..577b23557 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void PVD_PVM_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/PWR_PVD.ioc b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/PWR_PVD.ioc index fa9c6c5ca..613398886 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/PWR_PVD.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/PWR_PVD.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/main.c index 3ffefe40c..b12cab5ea 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,6 +52,7 @@ __IO uint32_t uwToggleOn = 1; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* Private function prototypes -----------------------------------------------*/ static void PVD_Config(void); @@ -86,6 +86,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -125,7 +128,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -163,11 +165,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -186,7 +199,7 @@ void SystemClock_Config(void) static void PVD_Config(void) { /*##-1- Enable Power Clock #################################################*/ - /* Note: On this STM32 serie, Power Clock is enabled automatically */ + /* Note: On this STM32 series, Power Clock is enabled automatically */ /*##-2- Configure the NVIC for PVD #########################################*/ HAL_NVIC_SetPriority(PVD_PVM_IRQn, 0, 0); @@ -255,5 +268,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c index c9282fd07..626155869 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c index 2b7051f00..2550a39c7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -212,4 +211,3 @@ void PVD_PVM_IRQHandler(void) HAL_PWREx_PVD_PVM_IRQHandler(); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/readme.txt b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/readme.txt index 0cfdff521..823a0cde7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_PVD/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Programmable Voltage Detector (PVD) example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h index 86ad00e71..4ab3da6c6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h index 4908f17fc..28588fc88 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h index 5ef1cec09..461f9a6e9 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void RTC_WKUP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc index cff45f4f2..fbec69963 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -62,6 +67,7 @@ RCC.APB1TimFreq_Value=64000000 RCC.APB2Freq_Value=64000000 RCC.APB2TimFreq_Value=64000000 RCC.APB3Freq_Value=16000000 +RCC.CodegenConfigPeriph=false RCC.Cortex2Freq_Value=32000000 RCC.CortexFreq_Value=64000000 RCC.FCLK2Freq_Value=32000000 @@ -74,7 +80,7 @@ RCC.HCLKRFFreq_Value=16000000 RCC.HSE_VALUE=8000000 RCC.HSI_VALUE=16000000 RCC.I2C1Freq_Value=64000000 -RCC.IPParameters=AHB2CLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RFWKPFreq_Value,RNGFreq_Value,SMPS1Freq_Value,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value +RCC.IPParameters=AHB2CLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CodegenConfigPeriph,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RFWKPFreq_Value,RNGFreq_Value,SMPS1Freq_Value,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value RCC.LPTIM1Freq_Value=64000000 RCC.LPTIM2Freq_Value=64000000 RCC.LPUART1Freq_Value=64000000 diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c index ffea0148c..11c1603fe 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c @@ -1,7 +1,6 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * @file PWR/PWR_STANDBY_RTC/Src/main.c * @author MCD Application Team * @brief This sample code shows how to use STM32WBxx PWR HAL API to enter @@ -9,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,19 +202,14 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSI1 - |RCC_OSCILLATORTYPE_MSI; - RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_MSI; RCC_OscInitStruct.MSIState = RCC_MSI_ON; - RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT; RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_6; - RCC_OscInitStruct.LSIState = RCC_LSI_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_MSI; RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1; @@ -244,19 +237,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RTC; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; - PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; - PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; - if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) - { - Error_Handler(); - } - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -354,5 +334,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c index 1fce5a1c9..2f3e2762a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,5 +153,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c index f86b33710..d4fd29e41 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/readme.txt b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/readme.txt index 406c17281..ab83e2c44 100644 --- a/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/PWR/PWR_STANDBY_RTC/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Standby RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/main.h index 032a4114c..bdb25f7a2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h index 226077864..f1f6792bc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc index 38b7158e4..4014dcc80 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,11 @@ PA8.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA8.Locked=true PA8.Mode=Clock-out PA8.Signal=RCC_MCO +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/main.c index 38362d567..9cabfa9b8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ __IO uint32_t ClockSourceStatus = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ /* Private function prototypes -----------------------------------------------*/ @@ -87,6 +87,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -136,7 +139,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -174,11 +176,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks + HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_1); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -186,7 +200,6 @@ void SystemClock_Config(void) /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ - HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_1); } /** @@ -519,5 +532,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c index 26322c832..1dc8f62e2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c index 2250e767a..2eab6c9b9 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,4 +125,3 @@ void EXTI0_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/readme.txt b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/readme.txt index dc3d4ab51..afd3a3b59 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/RCC/RCC_ClockConfig/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC Clock Config example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/main.h index fc4caf823..08bbf07b0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h index 77871b154..98cf0f8b2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h index 86f592a75..573a0c591 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc index ad230aaaa..819ce5a36 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -62,6 +67,7 @@ RCC.APB1TimFreq_Value=64000000 RCC.APB2Freq_Value=64000000 RCC.APB2TimFreq_Value=64000000 RCC.APB3Freq_Value=16000000 +RCC.CodegenConfigPeriph=false RCC.Cortex2Freq_Value=32000000 RCC.CortexFreq_Value=64000000 RCC.FCLK2Freq_Value=32000000 @@ -74,7 +80,7 @@ RCC.HCLKRFFreq_Value=16000000 RCC.HSE_VALUE=8000000 RCC.HSI_VALUE=16000000 RCC.I2C1Freq_Value=64000000 -RCC.IPParameters=AHB2CLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RFWKPFreq_Value,RNGFreq_Value,SMPS1Freq_Value,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value +RCC.IPParameters=AHB2CLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CodegenConfigPeriph,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RFWKPFreq_Value,RNGFreq_Value,SMPS1Freq_Value,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value RCC.LPTIM1Freq_Value=64000000 RCC.LPTIM2Freq_Value=64000000 RCC.LPUART1Freq_Value=64000000 diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/main.c index e081e4656..aaf8574c0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -153,19 +152,14 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSI1 - |RCC_OSCILLATORTYPE_MSI; - RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_MSI; RCC_OscInitStruct.MSIState = RCC_MSI_ON; - RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT; RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_6; - RCC_OscInitStruct.LSIState = RCC_LSI_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_MSI; RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1; @@ -193,19 +187,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_LSI; - PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; - PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; - if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) - { - Error_Handler(); - } - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -286,5 +267,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c index 2801b8eee..47454b0b4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,5 +133,3 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c index 131859fd9..29851a34b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,4 +125,3 @@ void EXTI0_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/readme.txt b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/readme.txt index 1a0d5c098..57d24507f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/RNG/RNG_MultiRNG/readme.txt @@ -8,12 +8,12 @@ * @brief Description of multiple random numbers generation example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/main.h index 53d1f375d..e1b0d0508 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,5 +81,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h index 4908f17fc..28588fc88 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h index 2dc170054..abedd54fa 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void RTC_Alarm_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc index c567d6905..2eb9a16e6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -32,6 +32,11 @@ NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -65,6 +70,7 @@ RCC.APB1TimFreq_Value=64000000 RCC.APB2Freq_Value=64000000 RCC.APB2TimFreq_Value=64000000 RCC.APB3Freq_Value=16000000 +RCC.CodegenConfigPeriph=false RCC.Cortex2Freq_Value=32000000 RCC.CortexFreq_Value=64000000 RCC.FCLK2Freq_Value=32000000 @@ -77,7 +83,7 @@ RCC.HCLKRFFreq_Value=16000000 RCC.HSE_VALUE=8000000 RCC.HSI_VALUE=16000000 RCC.I2C1Freq_Value=64000000 -RCC.IPParameters=AHB2CLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RFWKPFreq_Value,RNGFreq_Value,SMPS1Freq_Value,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value +RCC.IPParameters=AHB2CLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CodegenConfigPeriph,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RFWKPFreq_Value,RNGFreq_Value,SMPS1Freq_Value,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value RCC.LPTIM1Freq_Value=64000000 RCC.LPTIM2Freq_Value=64000000 RCC.LPUART1Freq_Value=64000000 diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/main.c index 39389ea14..af45827f2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,19 +127,14 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSI1 - |RCC_OSCILLATORTYPE_MSI; - RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_MSI; RCC_OscInitStruct.MSIState = RCC_MSI_ON; - RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT; RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_6; - RCC_OscInitStruct.LSIState = RCC_LSI_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_MSI; RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1; @@ -168,19 +162,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RTC; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; - PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; - PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; - if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) - { - Error_Handler(); - } - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -332,5 +313,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c index 3ce6b81c7..f59ae3ada 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -192,5 +191,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c index be88d482f..30f7c8c13 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -218,4 +217,3 @@ void RTC_Alarm_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/readme.txt b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/readme.txt index ac764a1f9..b60a95dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Alarm/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC Alarm example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/main.h index d736b84ae..02f9441e4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h index 4908f17fc..28588fc88 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h index c1eeffa9b..9f6111610 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h @@ -7,15 +7,14 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -67,5 +66,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc index 1031deb32..2e7802be9 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,11 @@ PC14-OSC32_IN.Mode=LSE-External-Oscillator PC14-OSC32_IN.Signal=RCC_OSC32_IN PC15-OSC32_OUT.Mode=LSE-External-Oscillator PC15-OSC32_OUT.Signal=RCC_OSC32_OUT +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/main.c index b6fa76d8e..991b2d390 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ __IO FlagStatus TamperStatus; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RTC_Init(void); /* USER CODE BEGIN PFP */ @@ -98,6 +98,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -162,7 +165,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -206,12 +208,25 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks + /** Enable MSI Auto calibration + */ + HAL_RCCEx_EnableMSIPLLMode(); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RTC; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -219,9 +234,6 @@ void SystemClock_Config(void) /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ - /** Enable MSI Auto calibration - */ - HAL_RCCEx_EnableMSIPLLMode(); } /** @@ -344,5 +356,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c index 0a4978794..db006212a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,11 +81,21 @@ void HAL_MspInit(void) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -129,5 +138,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c index 7d61707be..bfb4555ac 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/readme.txt b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/readme.txt index d97c8f510..457e41a18 100644 --- a/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/RTC/RTC_Tamper/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC Tamper example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h index b73bdf654..ef8aea8e2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h index 2339f9595..396a1c948 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h index 9948ece14..549c2c5a3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void DMA1_Channel3_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc index 36fce6a07..fbfd2577d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc @@ -56,8 +56,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -79,6 +79,11 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Master PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c index c9903de20..a75e0b4eb 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,6 +67,7 @@ __IO uint32_t varState = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_SPI1_Init(void); @@ -111,6 +111,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -195,7 +198,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -233,11 +235,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -407,5 +420,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c index 85ef7844d..e1936e6b4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -195,5 +194,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c index a8b44cff6..ad9bb3295 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -174,4 +173,3 @@ void DMA1_Channel3_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt index 2ff7659c9..2ce4b5b48 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h index c06215c01..83fa3056a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h index 2339f9595..396a1c948 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h index 496ad1385..fc230d45f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void DMA1_Channel3_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc index 168389fff..2dbb51d71 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc @@ -56,8 +56,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -79,6 +79,11 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Slave PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c index 2c178af93..554065852 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,6 +66,7 @@ __IO uint32_t wTransferState = TRANSFER_WAIT; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_SPI1_Init(void); @@ -110,6 +110,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -181,7 +184,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -219,11 +221,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -392,5 +405,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c index 05b42a3a8..9885bbed0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -195,5 +194,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c index 26ce64721..cbc48801f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -174,4 +173,3 @@ void DMA1_Channel3_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt index 752536fff..11363fb52 100644 --- a/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/main.h index 385e3342c..c436276ca 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h index 037eb1704..740d9ac81 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h index 6d6a1f2da..ffb120259 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/main.c index 6e035af5d..8a09151be 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ TIM_HandleTypeDef htim2; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM2_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2, LED3 */ @@ -157,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -195,11 +197,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -327,5 +340,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c index 9a7f98d3d..6c4e931b1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,4 +153,3 @@ void HAL_TIM_OC_MspDeInit(TIM_HandleTypeDef* htim_oc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c index 77152999d..e214f7338 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_OCActive/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,4 +116,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc index 6d85c9898..9654727ac 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -48,6 +48,11 @@ PA3.GPIOParameters=GPIO_Speed,GPIO_PuPd PA3.GPIO_PuPd=GPIO_PULLUP PA3.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA3.Signal=S_TIM2_CH4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/readme.txt b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/readme.txt index 1ff930ab3..e5b547065 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_OCActive/readme.txt @@ -9,12 +9,12 @@ * delayed signals. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/main.h index b6be344f7..8c8bbb178 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h index 037eb1704..740d9ac81 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h index 2a01e7758..409329beb 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,5 +62,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/main.c index 233ec6a6f..9b1a3a73f 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,6 +55,7 @@ __IO uint32_t uwFrequency = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM2_Init(void); /* USER CODE BEGIN PFP */ @@ -98,6 +98,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED3 */ @@ -160,7 +163,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -198,11 +200,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -362,5 +375,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c index 022962439..9010e1d75 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,4 +146,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c index bcf3c81e4..a81c129c5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_PWMInput/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,4 +160,3 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc index 3eb0ac252..4a6493819 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -32,6 +32,11 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA1.Signal=S_TIM2_CH2 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/readme.txt b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/readme.txt index b0ce52b4b..41d7dcc4a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMInput/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM PWM_Input example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/main.h index bd0fca873..265ecbbbd 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,5 +115,3 @@ TIM2 Configuration: generate 4 PWM signals with 4 different duty cycles. #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h index 037eb1704..740d9ac81 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h index 451b794d6..cafdb5fac 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/main.c index c5208dba6..1817a8d7a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ TIM_HandleTypeDef htim2; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM2_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED3 */ @@ -154,7 +157,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -192,11 +194,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -323,5 +336,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c index c8ccadc59..a27c827b5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,4 +153,3 @@ void HAL_TIM_PWM_MspDeInit(TIM_HandleTypeDef* htim_pwm) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c index 122b8a1b2..ac4a9add4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_PWMOutput/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc index d70c00dfa..3f3d7ca7c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -48,6 +48,11 @@ PA3.GPIOParameters=GPIO_Speed,GPIO_PuPd PA3.GPIO_PuPd=GPIO_PULLUP PA3.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA3.Signal=S_TIM2_CH4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/readme.txt b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/readme.txt index 997af5d45..f85e367a5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/TIM/TIM_PWMOutput/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWM signals generation using TIM2 ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h index 2fb4cf670..eedde38d8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h index 86c72980d..c6760a8b3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h index 770422b0d..c2b33db53 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/main.c index 763b9b453..d39030405 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -59,6 +58,7 @@ uint8_t aRxBuffer[RXBUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_USART1_UART_Init(void); @@ -102,6 +102,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 and LED3 */ BSP_LED_Init(LED2); @@ -196,7 +199,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -234,12 +236,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -404,5 +416,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c index 126708d13..90a78a4e1 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -86,11 +85,21 @@ void HAL_MspInit(void) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -190,5 +199,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c index c3348a74b..3b2849496 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -190,4 +189,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc index 7a6572b6b..7bcdbfcf2 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc @@ -55,8 +55,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -79,6 +79,11 @@ PA9.GPIOParameters=GPIO_PuPd PA9.GPIO_PuPd=GPIO_PULLUP PA9.Mode=Asynchronous PA9.Signal=USART1_TX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/readme.txt b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/readme.txt index 2058ffa5e..70c29bfec 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_DMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Hyperterminal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/main.h index 5de029ac7..d8b163f12 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h index 86c72980d..c6760a8b3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h index ce95c0687..db3a90430 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/main.c index f0688b0b1..4c6157b9a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ uint8_t aRxBuffer[RXBUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -98,6 +98,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure leds */ /* Configure LED2 and LED3 */ @@ -194,7 +197,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -232,12 +234,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -384,5 +396,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c index ef6b9c66f..45d4ab97c 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,11 +82,21 @@ void HAL_MspInit(void) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -150,5 +159,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c index c1b6bc0ea..00de3c8c0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,4 +131,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc index 06614e96e..48851bb13 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,11 @@ PA9.GPIOParameters=GPIO_PuPd PA9.GPIO_PuPd=GPIO_PULLUP PA9.Mode=Asynchronous PA9.Signal=USART1_TX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/readme.txt b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/readme.txt index 646a30f61..98eb39c99 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_HyperTerminal_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Hyperterminal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/main.h index 3465d0033..1a3b9e05e 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h index 86c72980d..c6760a8b3 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h index 59c23db84..aea60a65a 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/main.c index a16e6d5cd..6657fac15 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,6 +48,7 @@ UART_HandleTypeDef huart1; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -98,6 +98,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Initialize BSP Led for LED3 */ BSP_LED_Init(LED3); @@ -133,7 +136,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -171,12 +173,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -299,5 +311,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c index 82dd053cb..684809742 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,11 +82,21 @@ void HAL_MspInit(void) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -143,5 +152,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_it.c index 217b9a730..92f7fe141 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,4 +145,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/UART_Printf.ioc b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/UART_Printf.ioc index 1dc5d9f78..e3b3f7a9b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/UART_Printf.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/UART_Printf.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -38,6 +38,11 @@ PA9.GPIOParameters=GPIO_PuPd PA9.GPIO_PuPd=GPIO_PULLUP PA9.Mode=Asynchronous PA9.Signal=USART1_TX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/readme.txt b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/readme.txt index 056c0a2f7..28d46051d 100644 --- a/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/UART/UART_Printf/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Printf example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/main.h index c7794f4e9..f15509dd4 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h index 004004144..1bfe9ca12 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h index 6fa6bfb01..a627c40d8 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/main.c b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/main.c index 1b3924c93..646423a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -55,6 +54,7 @@ uint32_t WwdgStatus = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_WWDG_Init(void); /* USER CODE BEGIN PFP */ static uint32_t TimeoutCalculation(uint32_t timevalue); @@ -98,6 +98,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 and LED1 */ BSP_LED_Init(LED2); @@ -164,7 +167,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -202,11 +204,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -319,5 +332,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c index a6955784e..2c09ff7b7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -97,5 +96,3 @@ void HAL_WWDG_MspInit(WWDG_HandleTypeDef* hwwdg) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c index f3a38591c..f836dfee7 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -219,4 +218,3 @@ void EXTI0_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc index 81fe65291..f82002b10 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/readme.txt b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/readme.txt index 32cb2030f..fc3e1c0e5 100644 --- a/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples/WWDG/WWDG_Example/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Window Watchdog example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/ADC_MultiChannelSingleConversion_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/ADC_MultiChannelSingleConversion_Init.ioc index 361930799..c0bf536ec 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/ADC_MultiChannelSingleConversion_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/ADC_MultiChannelSingleConversion_Init.ioc @@ -59,8 +59,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:1\:0\:true\:false\:false\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:2\:0\:true\:false\:false\:false\:true @@ -79,6 +79,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/main.h index 6fe93431e..6b19ecbe0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32wbxx_it.h index 2496f3a8c..6ca2a202d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/main.c index 61d3ab4d9..3f325729c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -119,6 +118,7 @@ uint32_t ubAdcGrpRegularSequenceConvCount = 0UL; /* Variable set into ADC interr /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_ADC1_Init(void); @@ -168,6 +168,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -340,7 +343,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_HSI); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -367,6 +377,8 @@ static void MX_ADC1_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_HSI); + /* Peripheral clock enable */ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_ADC); @@ -891,5 +903,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/stm32wbxx_it.c index b78a88248..f89f9929b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -266,4 +265,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/readme.txt index 76565d7ee..27689b469 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_MultiChannelSingleConversion_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_MultiChannelSingleConversion_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc index e8f5a5d4a..232502bde 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc @@ -27,8 +27,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:false\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -46,6 +46,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h index 689312a15..8a9ab8f56 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -109,5 +108,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h index 701394bf1..d58303e42 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c index 861afaeec..c5b80f3ac 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,6 +102,7 @@ __IO uint8_t ubAdcGrpRegularUnitaryConvStatus = 2; /* Variable set into ADC inte /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -144,6 +144,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -188,7 +191,7 @@ int main(void) Error_Handler(); } - /* For this example purpose, wait untill conversion is done */ + /* For this example purpose, wait until conversion is done */ while (ubAdcGrpRegularUnitaryConvStatus != 1); /* Reset status variable of ADC group regular unitary conversion */ @@ -273,7 +276,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_HSI); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -300,6 +310,8 @@ static void MX_ADC1_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_HSI); + /* Peripheral clock enable */ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_ADC); @@ -685,5 +697,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c index 4a925399e..b56d2e135 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -233,4 +232,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt index f56a369af..443ceee8c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerSW_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc index bc1c18585..2345e49b7 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc @@ -51,8 +51,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:false\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:true @@ -71,6 +71,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h index 63641788f..7c5fe1832 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h index 2bafe0807..a34f970dd 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c index e8b12908a..82b123794 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,6 +115,7 @@ __IO uint8_t ubDmaTransferStatus = 2U; /* Variable set into DMA interruption cal /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_ADC1_Init(void); @@ -166,6 +166,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -299,7 +302,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_HSI); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -326,6 +336,8 @@ static void MX_ADC1_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetADCClockSource(LL_RCC_ADC_CLKSOURCE_HSI); + /* Peripheral clock enable */ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_ADC); @@ -759,7 +771,7 @@ void AdcDmaTransferComplete_Callback() /* Note: For debug purpose, if program is halted with a breakpoint then this error will be raised (due to ADC and DMA continuing to operate in background). - To not block debug of this exemple, replace error handler by + To not block debug of this example, replace error handler by dummy LED toggle. */ /* Error_Handler(); */ LED_Toggle(); @@ -799,7 +811,7 @@ void AdcDmaTransferHalf_Callback() /* Note: For debug purpose, if program is halted with a breakpoint then this error will be raised (due to ADC and DMA continuing to operate in background). - To not block debug of this exemple, replace error handler by + To not block debug of this example, replace error handler by dummy LED toggle. */ /* Error_Handler(); */ LED_Toggle(); @@ -897,5 +909,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c index 114203f5b..d69c6d2e8 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -265,4 +264,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt index cce232214..8feda68b3 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerTimer_DMA_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc index 4f1136949..ee55bb3b7 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc @@ -23,8 +23,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -40,6 +40,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h index 0d447bf51..18dd4642c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -106,5 +105,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h index 18188579e..1c0da3418 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c index 53b596adc..c62c73d09 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,6 +65,7 @@ uint32_t uwExpectedCRCValue = 0xA9866043; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_CRC_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -188,6 +191,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -377,5 +388,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c index 969869e4e..b55ee9ba8 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt index e4dec49e8..c295e3514 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CRC_CalculateAndCheck example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc index f7bc1d71f..8f4e98e2a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc @@ -35,8 +35,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -53,6 +53,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h index 6eda44124..82d5fac63 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,5 +97,3 @@ void TransferError(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h index c9db63451..d635f3611 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c index 34bdef24b..fddcba4b5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ static uint32_t aDST_Buffer[BUFFER_SIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); /* USER CODE BEGIN PFP */ @@ -112,6 +112,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -209,6 +212,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -409,5 +420,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c index 8dae09652..4b6cc2d48 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -226,4 +225,3 @@ void DMA1_Channel1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt index 4ae7d7548..63fba62cf 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc index 369f12c89..e354221a5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -39,6 +39,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h index 9e658a512..c5d18d53d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -97,5 +96,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h index 889fad5fb..7e4dd79fc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c index e4d1cb08f..c5fd9b06c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -85,6 +85,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -162,6 +165,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -263,5 +274,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c index 5f25015ae..4629f4109 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -226,4 +225,3 @@ void EXTI0_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt index c0d87ce76..7379021d3 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the EXTI example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc index da30ab8d6..e51818201 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -32,6 +32,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h index 5aa29b35d..28d705a5d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,5 +97,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h index d7ce588ac..b5a4d539f 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c index 2315a9794..0be7d0969 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -86,6 +86,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -167,6 +170,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -238,5 +249,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c index f5a188088..787c8f74c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt index 30852f5a1..df90a5ec4 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the GPIO example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc index 170990430..898aee07a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -32,6 +32,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h index e05036a38..b6af6838a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h index 7c3c78ec8..e008c318f 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void HSEM_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c index 23974a528..6b4456366 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -199,6 +202,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -318,5 +329,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c index 05b85a41c..b94cd4e2b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -218,4 +217,3 @@ void HSEM_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt index a2e3562b6..d8c5f5c30 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HSEM_DualProcess_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -40,7 +40,7 @@ PROCESS_B releases the semaphore with success. After successful sequence, LED2 is turned On. In case of errors, LED2 is slowly blinking (1sec period). -Additionnaly, this example demonstrate how to: +Additionally, this example demonstrate how to: Retrieve the current process locking a semaphore. Retrieve the current core locking a semaphore. @@ -48,7 +48,7 @@ Remarks: As this example uses two processes to demonstrate the lock/unlock mechanism, it is not possible to use the function LL_HSEM_1StepLock which does not use process identifier. Those identifier are set to 0. This function is only interesting in the context of multicore where - the core identifers are used to determine the owner of the semaphore. + the core identifiers are used to determine the owner of the semaphore. @par Keywords diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc index 6be7f9efc..00010211c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc @@ -33,8 +33,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -57,14 +57,21 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h index e54bec254..74b6147d7 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -125,5 +124,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h index 08e8473f7..28bd0e7d0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c index 072e1cf0f..c21197ba5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ __IO uint8_t ubButtonPress = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); /* USER CODE BEGIN PFP */ @@ -117,6 +117,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -209,7 +212,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetI2CClockSource(LL_RCC_I2C1_CLKSOURCE_PCLK1); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -234,6 +244,8 @@ static void MX_I2C1_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetI2CClockSource(LL_RCC_I2C1_CLKSOURCE_PCLK1); + LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_GPIOB); /**I2C1 GPIO Configuration PB8 ------> I2C1_SCL @@ -577,5 +589,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c index 1b7f8817b..90a952e62 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -364,4 +363,3 @@ void I2C1_ER_IRQHandler(void) #endif /* SLAVE_BOARD */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt index 81361a5e6..94520a8f6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_MasterRx_SlaveTx_IT_Init I2C example (IT Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc index fddc44ca2..c9df8f1c1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc @@ -70,8 +70,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -89,14 +89,21 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h index a0283884f..68f008e7a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -138,5 +137,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h index 8f758399b..55206bf0d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void DMA1_Channel2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c index 9b415e7b2..cff1a8d9f 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,6 +91,7 @@ __IO uint8_t ubButtonPress = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_I2C1_Init(void); @@ -142,6 +142,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -237,7 +240,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetI2CClockSource(LL_RCC_I2C1_CLKSOURCE_PCLK1); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -262,6 +272,8 @@ static void MX_I2C1_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetI2CClockSource(LL_RCC_I2C1_CLKSOURCE_PCLK1); + LL_AHB2_GRP1_EnableClock(LL_AHB2_GRP1_PERIPH_GPIOB); /**I2C1 GPIO Configuration PB8 ------> I2C1_SCL @@ -825,5 +837,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c index e6be9c9bc..f1a8acb32 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,4 +270,3 @@ void USER_BUTTON_IRQHANDLER(void) } #endif /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt index c01d6eedf..6e7b5ca69 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init I2C example (DMA Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc index f3a64cca7..5da530fcb 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -42,6 +42,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h index 612819f4f..e71fa7e9a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h index f2e581ef9..1607df5d8 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void UserButton_Callback(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c index 0d397353d..8ddb0e632 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ static __IO uint8_t ubKeyPressed = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_IWDG_Init(void); /* USER CODE BEGIN PFP */ @@ -87,6 +87,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Check if the system has resumed from IWDG reset */ @@ -188,6 +191,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -359,5 +370,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c index 233f3f089..10bef218f 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI0_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt index c62b0d473..66add6f13 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the IWDG_RefreshUntilUserEvent_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h index 88941d4e0..46d400c05 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -96,5 +95,3 @@ void LPTimerAutoreloadMatch_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h index cbab43966..d43204176 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void LPTIM1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc index 7b3248440..94df48d3c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -46,6 +46,11 @@ PB5.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB5.Locked=true PB5.Mode=Counts_external_clock_with_synchro_01_occur1 PB5.Signal=LPTIM1_IN1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c index 01b2fc417..9b218e75e 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LPTIM1_Init(void); /* USER CODE BEGIN PFP */ @@ -88,6 +88,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Enable the LSI Clock */ @@ -179,7 +182,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetLPTIMClockSource(LL_RCC_LPTIM1_CLKSOURCE_LSI); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -202,6 +212,8 @@ static void MX_LPTIM1_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetLPTIMClockSource(LL_RCC_LPTIM1_CLKSOURCE_LSI); + /* Peripheral clock enable */ LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_LPTIM1); @@ -362,5 +374,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c index 8579abe1b..64af8b6b4 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void LPTIM1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt index 8e1e4896c..06950f0f9 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM_PulseCounter_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h index 97fc36e44..7cababffb 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h index 4f3d4a4f3..6ed5d87b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void LPUART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc index cc1231ac1..0b09b54dd 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc @@ -36,8 +36,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -64,6 +64,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c index 900aa8b94..feb95210d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,6 +60,7 @@ uint8_t aTextInfo[] = "\r\nLPUART Example : MCU will now enter in Stop 0 mode.\n /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LPUART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -187,7 +190,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); - LL_RCC_SetLPUARTClockSource(LL_RCC_LPUART1_CLKSOURCE_HSI); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -528,5 +538,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c index 692a5d03d..b4252eead 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -233,4 +232,3 @@ void LPUART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt index 2888aed9e..a3e039d21 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPUART_WakeUpFromStop_Init LPUART example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h index 8309ef30d..8df540ad6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,3 @@ extern const uint32_t SigGen_S_len; #endif #endif /* __SIGGEN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h index 61ad1aeb9..bc3fa1233 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -105,5 +104,3 @@ void PKA_PROCEND_callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h index de2fff994..68e2b9a4e 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h index 5c928b14d..299c3ee47 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc index 5d20d38bc..982639c82 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -34,6 +34,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c index 17e05c36c..48dadb33d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ const uint8_t SigGen_S[] = { 0xef, 0x97, 0xb2, 0x18, 0xe9, 0x6f, 0x17, 0x5a, 0x3c, 0xcd, 0xda, 0x2a, 0xcc, 0x05, 0x89, 0x03 }; const uint32_t SigGen_S_len = 32; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c index 795628612..da7bcfd96 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -55,6 +54,7 @@ uint8_t SBuffer[32] = {0}; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -99,6 +99,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -157,7 +160,7 @@ int main(void) /* Wait for the interrupt callback */ while(endOfProcess != 1); - /* Retreive the result and output buffer */ + /* Retrieve the result and output buffer */ result = PKA->RAM[PKA_ECDSA_SIGN_OUT_ERROR]; PKA_Memcpy_u32_to_u8(RBuffer, &PKA->RAM[PKA_ECDSA_SIGN_OUT_SIGNATURE_R], prime256v1_Prime_len / 4); PKA_Memcpy_u32_to_u8(SBuffer, &PKA->RAM[PKA_ECDSA_SIGN_OUT_SIGNATURE_S], prime256v1_Prime_len / 4); @@ -251,6 +254,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -455,5 +466,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c index ce2dc5e3c..c3c2dd671 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c index 231a39769..39d03ffc5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,4 +231,3 @@ void PKA_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt index 1c58f7d38..35989c2de 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PKA_ECDSA_Sign example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -37,7 +37,7 @@ The example: Loads the input buffers to PKA RAM. Launch the computation in interrupt mode. Wait for the interrupt callback. - Retreive the output buffer. + Retrieve the output buffer. Compare to expected results. After successful sequence, LED2 is turned On. diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb15xx_cm4.s index f072f4d2e..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h index ad999b884..a4f7697fa 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -120,5 +119,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h index aacde0e97..6bf7de9ca 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc index 4258195d2..7e1415fa7 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -32,6 +32,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c index 2645183d4..3de5dc660 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Initialize User push-button (SW1) in GPIO mode */ UserButton_Init(BUTTON_MODE_GPIO); @@ -181,6 +184,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -446,5 +457,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c index 52b119b9e..26f0bb18c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -219,4 +218,3 @@ void USER_BUTTON_IRQHANDLER(void) } } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c index 2d34e14f8..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt index 5101a1491..190655e1c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR STANDBY mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb15xx_cm4.s index f072f4d2e..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h index 4729ed29a..dd67d270a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -95,5 +94,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h index 292455e67..498989de3 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc index 2ca415ccd..8ac75c88a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -32,6 +32,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c index 52acaf771..3b89bd4fc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,6 +49,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -91,6 +91,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -183,6 +186,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -312,5 +323,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c index 35102f52d..63349834c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c index 2d34e14f8..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/readme.txt index 6cbc2c217..77f1767df 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_EnterStopMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Stop 1 mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb15xx_cm4.s index f072f4d2e..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h index d399ba49f..491858c48 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h index 1512c5301..bc870dde6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc index 2d30c5271..8ef79e875 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -40,6 +40,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c index 302e58381..16469508d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,6 +64,7 @@ __IO uint16_t uhLedBlinkSpeed = LED_BLINK_FAST; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -109,6 +109,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -192,6 +195,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(48000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -473,5 +484,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c index 03b271aca..9bf0f9bcb 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -218,4 +217,3 @@ void EXTI0_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c index 2d34e14f8..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt index 3554ddcb8..e67b5c258 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Optimized Run Mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h index e816c3c6f..1d449b6e1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h index 5b3d8d27b..6e17adadc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc index 026278aed..ffcf77780 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -39,6 +39,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c index f4537c344..3d8faf12d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -90,6 +89,7 @@ uint32_t Timeout = 0; /* Variable used for Timeout management */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -130,6 +130,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -236,6 +239,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -573,5 +584,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c index 2fddf8bad..f561b95dd 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,4 +227,3 @@ void EXTI0_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt index 54c03e328..f9a8d0830 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC_UseHSI_PLLasSystemClock example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h index 32bad7bb0..198c77059 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,5 +116,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h index 25e717a32..fda985bcc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void RNG_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc index 81f8c677b..3afcbb677 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -43,6 +43,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c index 735026751..8f84625af 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,6 +66,7 @@ __IO uint32_t aRandom32bit[NB_OF_GENERATED_RANDOM_NUMBERS]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RNG_Init(void); /* USER CODE BEGIN PFP */ @@ -108,6 +108,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -199,7 +202,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetRNGClockSource(LL_RCC_RNG_CLKSOURCE_LSI); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -220,6 +230,8 @@ static void MX_RNG_Init(void) /* USER CODE END RNG_Init 0 */ + LL_RCC_SetRNGClockSource(LL_RCC_RNG_CLKSOURCE_LSI); + /* Peripheral clock enable */ LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_RNG); @@ -467,5 +479,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c index 05dd8f691..e7533f956 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -248,4 +247,3 @@ void RNG_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt index d25f5fee8..69a4ae021 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RNG_GenerateRandomNumbers_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h index 6d7861b47..adab9e588 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -125,5 +124,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h index 96542a44e..3f0378d3e 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc index 6145a30a3..dd12e8f3b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc @@ -57,8 +57,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:false NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:false\:false\:false @@ -91,6 +91,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c index 5830491d6..0bdc74953 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ __IO uint8_t ubReceptionComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_SPI1_Init(void); @@ -109,6 +109,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -241,6 +244,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -640,5 +651,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c index 01d094c16..0b288ec70 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -260,4 +259,3 @@ void USER_BUTTON_IRQHANDLER(void) } } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt index acdb29362..d4b390662 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_TwoBoards_FullDuplex_DMA_Master_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,7 +46,7 @@ The communication is done with 2 boards through SPI. This example shows how to configure GPIO and SPI peripherals to use a Full-Duplex communication using DMA Transfer mode through the STM32WBxx SPI LL API. -This example is splitted in two projects, Master board and Slave board: +This example is split in two projects, Master board and Slave board: - Master Board SPI1 Peripheral is configured in Master mode. diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h index 832b35a21..3cd011da2 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h index b50e87719..607eb94ce 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc index 1b20e6cfc..528cc4b0f 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc @@ -57,8 +57,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:false NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:false\:false\:false @@ -91,6 +91,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c index 9d19c678a..11258f026 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ __IO uint8_t ubReceptionComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_SPI1_Init(void); @@ -106,6 +106,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -235,6 +238,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -578,5 +589,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c index 9d209a79c..60c292bf6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -245,4 +244,3 @@ void DMA1_Channel1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt index 1aaa94c3e..6bc204ca5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_TwoBoards_FullDuplex_DMA_Slave_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,7 +46,7 @@ The communication is done with 2 boards through SPI. This example shows how to configure GPIO and SPI peripherals to use a Full-Duplex communication using DMA Transfer mode through the STM32WBxx SPI LL API. -This example is splitted in two projects, Master board and Slave board: +This example is split in two projects, Master board and Slave board: - Master Board SPI1 Peripheral is configured in Master mode. diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h index 0d6f31d45..203c1ea95 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,5 +97,3 @@ void TimerUpdate_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h index a03901b40..ae79ca4b4 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void TIM1_UP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c index 9b8a0df5e..ee4d32f18 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ static uint8_t AutoreloadMult = 1; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM1_Init(void); /* USER CODE BEGIN PFP */ @@ -91,6 +91,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Set the pre-scaler value to have TIM1 counter clock equal to 10 kHz */ /* @@ -188,6 +191,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -357,5 +368,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c index 8cf4345f3..ed51060da 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -261,4 +260,3 @@ void TIM1_UP_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc index d5abe6225..73c54bbaa 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -43,6 +43,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt index 9a15f897f..eb19b7e16 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_TimeBase_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h index e1fa07e4f..9d348bcf5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -105,5 +104,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h index 15162d388..e6b87e230 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c index 13e3accd7..3a57afef4 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -89,6 +89,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -177,7 +180,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetUSARTClockSource(LL_RCC_USART1_CLKSOURCE_PCLK2); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -202,6 +212,8 @@ static void MX_USART1_UART_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetUSARTClockSource(LL_RCC_USART1_CLKSOURCE_PCLK2); + /* Peripheral clock enable */ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART1); @@ -444,5 +456,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c index 47291ab58..23d3fbb58 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -251,4 +250,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc index 44016c5d9..12ddb08f7 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -53,6 +53,11 @@ PB0.GPIO_Label=LED2 PB0.GPIO_PuPd=GPIO_NOPULL PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt index 4425864ab..4c8bccc7d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Rx_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h index 683bc8a52..97861a73d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -108,5 +107,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h index 9bae76a17..42169ccf3 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c index 20254d1b1..e5509872e 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ const uint8_t aStringToSend[] = "STM32WBxx USART LL API Example : TX in Polling /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -193,7 +196,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); - LL_RCC_SetUSARTClockSource(LL_RCC_USART1_CLKSOURCE_PCLK2); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -218,6 +228,8 @@ static void MX_USART1_UART_Init(void) LL_GPIO_InitTypeDef GPIO_InitStruct = {0}; + LL_RCC_SetUSARTClockSource(LL_RCC_USART1_CLKSOURCE_PCLK2); + /* Peripheral clock enable */ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART1); @@ -488,5 +500,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c index d14314f1c..0ab105f58 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI0_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc index e85957cfd..0fcbc2c8c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -52,6 +52,11 @@ PB0.GPIO_Label=LED2 PB0.GPIO_PuPd=GPIO_NOPULL PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt index ef22f0004..c4615ae8d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Tx_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h index a3c7b1574..8551ce2f9 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h index 75bbd9fb5..0fce6a845 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c index d8960db72..7c9c23325 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,6 +55,7 @@ uint8_t aShowLotNumber[30] = {0}; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ void GetMCUInfo(void); /* USER CODE END PFP */ @@ -90,6 +90,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -167,6 +170,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -234,5 +245,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c index 7b74f9c66..fbfb0738d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc index 401b57b80..d82523357 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt index 3b355d8e5..6d1669c78 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UTILS example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h index 91071b5fd..76353640c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h index 28165a78e..a105291f9 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void UserButton_Callback(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c index 86bdfaa85..59dc055fc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ static __IO uint8_t KeyPressed = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_WWDG_Init(void); /* USER CODE BEGIN PFP */ @@ -88,6 +88,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Check if the system has resumed from WWDG reset*/ @@ -177,6 +180,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); @@ -352,5 +363,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c index e5b4adeea..2086f868d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI0_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc index bf3f63698..2a31fa7d8 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -38,6 +38,11 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt index e977e13f6..c4abf95a2 100644 --- a/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the WWDG_RefreshUntilUserEvent_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc index 44e048b96..641a19068 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc @@ -34,8 +34,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -48,6 +48,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h index b4f7b2553..91b8e39d3 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void TransferError(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h index a5fe643dc..b8640e68e 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c index f3e599d97..1448293fb 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ static __IO uint32_t transferCompleteDetected; /* Set to 1 if transfer is correc /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_DMA_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -119,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Set to 1 if an transfer error is detected */ @@ -193,7 +196,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -231,11 +233,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -337,5 +350,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c index f9463e6fe..a933382c8 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HAL_MspInit(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c index b6b12448a..d63067dc2 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -235,4 +234,3 @@ void DMA1_Channel1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt index 571a0a4cb..740733610 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/main.h index 104889a33..8512e893a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h index 3e0b59c9c..626d7897b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc index 3f65234b2..f6398ed78 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/main.c index 3d3950705..bef45dda1 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ static __IO uint32_t TimingDelay; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ @@ -100,10 +100,13 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Set low-power mode of CPU2 */ - /* Note: Typically, action peformed by CPU2 on a dual core application. + /* Note: Typically, action performed by CPU2 on a dual core application. Since this example is single core, perform it by CPU1. */ /* Note: On STM32WB, both CPU1 and CPU2 must be in low-power mode to set the entire System in low-power mode, corresponding to @@ -162,7 +165,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -200,11 +202,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -317,5 +330,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c index e16fa9915..5a6bf1134 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c index 6c46bb6a3..0aa91214f 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,3 @@ void EXTI0_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/readme.txt b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/readme.txt index 81a3f558a..f3374fac6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/PWR/PWR_STOP1/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR_STOP1 example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h index eb85ca196..fa74b14b2 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h index 2339f9595..396a1c948 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h index d814ca29a..e72091e71 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc index 37c3ea32b..ee7176c5c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -41,6 +41,11 @@ PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA7.Mode=Simplex_Bidirectional_Master PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c index 518fe3725..604a7add4 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,6 +65,7 @@ __IO uint32_t wTransferState = TRANSFER_WAIT; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_SPI1_Init(void); /* USER CODE BEGIN PFP */ @@ -109,6 +109,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -184,7 +187,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -222,11 +224,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -323,5 +336,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c index 8fdc863ce..0578b7a02 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,5 +144,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c index 1315043a3..4972960c5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -202,4 +201,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt index 9c0e388dc..5ce77c3a3 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Half Duplex IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h index 096587c3a..e3697307a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h index 2339f9595..396a1c948 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h index b11c268d2..8c630643e 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void SPI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc index 9a79202dc..ff76980ea 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -43,6 +43,11 @@ PA6.GPIO_PuPd=GPIO_PULLDOWN PA6.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA6.Mode=Simplex_Bidirectional_Slave PA6.Signal=SPI1_MISO +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c index 25f7145ce..99c5ccd8c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,6 +63,7 @@ __IO uint32_t wTransferState = TRANSFER_WAIT; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_SPI1_Init(void); /* USER CODE BEGIN PFP */ @@ -108,6 +108,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -183,7 +186,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -221,11 +223,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -371,5 +384,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c index c9448229a..e0128a773 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -150,5 +149,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c index 186988cf1..12b90786d 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -216,4 +215,3 @@ void SPI1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt index 1751c82a5..44ea5aed2 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Half Duplex IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h index 9dc62fb8f..b1d2e6438 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h index 037eb1704..740d9ac81 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h index fc593c9dc..4eeaa81ec 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void EXTI0_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/main.c index bb416f04b..eb4502760 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,6 +81,7 @@ static uint32_t aDutyCycle[TIM_DUTYCYCLE_NB] = { /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM2_Init(void); static void MX_TIM1_Init(void); @@ -127,6 +127,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED3 */ @@ -184,7 +187,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -222,11 +224,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -470,5 +483,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c index 31dcf4344..d1c5deff5 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -219,5 +218,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c index 1f9ec09db..b0273155a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -212,4 +211,3 @@ void EXTI0_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c index c0af3469e..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc index e76c22b9a..3fb9e6ce7 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -34,6 +34,11 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false PA1.Signal=S_TIM2_CH2 PA8.Signal=S_TIM1_CH1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/readme.txt b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/readme.txt index 1536a171b..e1a352925 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/TIM/TIM_PWMInput/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM PWM_Input example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                        © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                        +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h index 5d1c72e0a..7ae671f9e 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,5 +83,3 @@ void UART_Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h index 45c29d955..0593858cc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/nucleo_wb15cc_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,7 +49,7 @@ #define USE_COM_LOG 0U /* IRQ priorities */ -#define BSP_BUTTON_SWx_IT_PRIORITY 15U +#define BSP_BUTTON_USER_IT_PRIORITY 15U /** * @} @@ -73,5 +72,3 @@ #endif #endif /* NUCLEO_WB15CC_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h index 86c72980d..c6760a8b3 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h index 5053e8434..d520a0fb6 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s index 7794948c3..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                        © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                        - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                        © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                        +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c index 0e4a6e28c..3f6d99d0a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,6 +68,7 @@ __IO uint32_t uwRxIndex = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -114,6 +114,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -193,7 +196,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -231,12 +233,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -431,5 +443,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c index 4dda749ca..42c23601c 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,11 +82,21 @@ void HAL_MspInit(void) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -147,5 +156,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c index 65dc435a7..f6b7e7a14 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                        © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                        + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc index 33192fa7e..3cd08563a 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,11 @@ PA9.GPIOParameters=GPIO_PuPd PA9.GPIO_PuPd=GPIO_PULLUP PA9.Mode=Asynchronous PA9.Signal=USART1_TX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt index 01b32d7db..d2fd47b50 100644 --- a/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt +++ b/Projects/NUCLEO-WB15CC/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART HAL/LL mixed Hyperterminal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/NUCLEO-WB15CC/Release_Notes.html b/Projects/NUCLEO-WB15CC/Release_Notes.html index dae9ac219..1c77ca64d 100644 --- a/Projects/NUCLEO-WB15CC/Release_Notes.html +++ b/Projects/NUCLEO-WB15CC/Release_Notes.html @@ -41,12 +41,33 @@

                                                        Update History

                                                        - +

                                                        Main Changes

                                                        Maintenance

                                                        • Update of FW projects following changes in latest version of HAL/LL and Middlewares
                                                          • +
                                                        • Add support of /NUCLEO-WB15CC/Templates_LL project (IAR only)
                                                          • +
                                                        • Add support of new applications: +
                                                            +
                                                          • /NUCLEO-WB15CC/Applications/BLE/BLE_HeartRate_ota
                                                            • +
                                                          • /NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingLPN
                                                            • +
                                                          • /NUCLEO-WB15CC/Applications/BLE/BLE_MeshLightingPRFNode
                                                            • +
                                                          • /NUCLEO-WB15CC/Applications/BLE/BLE_Ota
                                                            • +
                                                          • /NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer_ota
                                                            • +
                                                          • +
                                                        +


                                                        +

                                                        +
                                                        +
                                                        +
                                                        + +
                                                        +

                                                        Main Changes

                                                        +

                                                        Maintenance

                                                        +
                                                          +
                                                        • Update of FW projects following changes in latest version of HAL/LL and Middlewares
                                                        • Add support of new applications:
                                                          • /NUCLEO-WB15CC/Applications/BLE_LLD/BLE_LLD_Chat
                                                            • @@ -65,8 +86,8 @@
                                                            -

                                                            Main Changes

                                                            -

                                                            Maintenance

                                                            +

                                                            Main Changes

                                                            +

                                                            Maintenance

                                                            • Update BLE applications:
                                                                @@ -83,7 +104,7 @@
                                                                -

                                                                Main Changes

                                                                +

                                                                Main Changes

                                                                First release

                                                                First official release.

                                                                  diff --git a/Projects/NUCLEO-WB15CC/Templates/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Templates/EWARM/startup_stm32wb15xx_cm4.s index 5c3e61967..3124137b6 100644 --- a/Projects/NUCLEO-WB15CC/Templates/EWARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Templates/EWARM/startup_stm32wb15xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -429,4 +428,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Templates/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Templates/EWARM/stm32wb15xx_flash_cm4.icf index 727f99a07..89a097bc0 100644 --- a/Projects/NUCLEO-WB15CC/Templates/EWARM/stm32wb15xx_flash_cm4.icf +++ b/Projects/NUCLEO-WB15CC/Templates/EWARM/stm32wb15xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/NUCLEO-WB15CC/Templates/Inc/main.h b/Projects/NUCLEO-WB15CC/Templates/Inc/main.h index 4166788a0..138e647cd 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Inc/main.h +++ b/Projects/NUCLEO-WB15CC/Templates/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_hal_conf.h b/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_hal_conf.h index b56347854..fa4c52fa1 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_hal_conf.h +++ b/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_it.h index f8500220f..449fae0af 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_it.h +++ b/Projects/NUCLEO-WB15CC/Templates/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -65,5 +64,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/MDK-ARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Templates/MDK-ARM/startup_stm32wb15xx_cm4.s index b902001db..f32276ccc 100644 --- a/Projects/NUCLEO-WB15CC/Templates/MDK-ARM/startup_stm32wb15xx_cm4.s +++ b/Projects/NUCLEO-WB15CC/Templates/MDK-ARM/startup_stm32wb15xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -333,4 +333,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s index 58cc21a82..447865dae 100644 --- a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s +++ b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb15ccux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -391,4 +390,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/STM32WB15CCUX_FLASH.ld b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/STM32WB15CCUX_FLASH.ld index ae64a9f78..9ebe2842b 100644 --- a/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/STM32WB15CCUX_FLASH.ld +++ b/Projects/NUCLEO-WB15CC/Templates/STM32CubeIDE/STM32WB15CCUX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/NUCLEO-WB15CC/Templates/Src/main.c b/Projects/NUCLEO-WB15CC/Templates/Src/main.c index 960dbad33..e3b9925c0 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Src/main.c +++ b/Projects/NUCLEO-WB15CC/Templates/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,6 +46,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -78,6 +78,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -106,7 +109,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. @@ -144,11 +146,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -190,5 +203,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_hal_msp.c b/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_hal_msp.c index e16fa9915..5a6bf1134 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_hal_msp.c +++ b/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_it.c index f6a50aea4..b2e86047c 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_it.c +++ b/Projects/NUCLEO-WB15CC/Templates/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -200,4 +199,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Templates/Src/system_stm32wbxx.c index 455db8d7c..68ad72806 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Src/system_stm32wbxx.c +++ b/Projects/NUCLEO-WB15CC/Templates/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/NUCLEO-WB15CC/Templates/Templates.ioc b/Projects/NUCLEO-WB15CC/Templates/Templates.ioc index eb3e21289..d54c85cc6 100644 --- a/Projects/NUCLEO-WB15CC/Templates/Templates.ioc +++ b/Projects/NUCLEO-WB15CC/Templates/Templates.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB15CCUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -27,6 +27,11 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/NUCLEO-WB15CC/Templates/readme.txt b/Projects/NUCLEO-WB15CC/Templates/readme.txt new file mode 100644 index 000000000..db8048f35 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates/readme.txt @@ -0,0 +1,64 @@ +/** + @page Templates Description of the Templates example + + @verbatim + ****************************************************************************** + * @file Templates/readme.txt + * @author MCD Application Team + * @brief Description of the Templates example. + ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @endverbatim + +@par Example Description + +This projects provides a reference template that can be used to build any firmware application. + +This directory provides a reference template project that can be used to build any firmware application for +STM32WB15CC devices using STM32CubeWB HAL and running on NUCLEO-WB515CC board from STMicroelectronics. + +@note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) + based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from + a peripheral ISR process, then the SysTick interrupt must have higher priority (numerically lower) + than the peripheral interrupt. Otherwise the caller ISR process will be blocked. + To change the SysTick interrupt priority you have to use HAL_NVIC_SetPriority() function. + +@note The application needs to ensure that the SysTick time base is always set to 1 millisecond + to have correct HAL operation. + +@par Directory contents + + - Templates/Src/main.c Main program + - Templates/Src/system_stm32wbxx.c STM32WBxx system clock configuration file + - Templates/Src/stm32wbxx_it.c Interrupt handlers + - Templates/Src/stm32wbxx_hal_msp.c HAL MSP module + - Templates/Inc/main.h Main program header file + - Templates/Inc/stm32wbxx_hal_conf.h HAL Configuration file + - Templates/Inc/stm32wbxx_it.h Interrupt handlers header file + + +@par Hardware and Software environment + + - This example runs on STM32WB15CC devices. + + - This example has been tested with STMicroelectronics NUCLEO-WB15CC + boards and can be easily tailored to any other supported device + and development board. + +@par How to use it ? + +In order to make the program work, you must do the following : + - Open your preferred toolchain + - Rebuild all files and load your image into target memory + - Run the example + + *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  + */ diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/.extSettings b/Projects/NUCLEO-WB15CC/Templates_LL/.extSettings new file mode 100644 index 000000000..861dedcad --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/.extSettings @@ -0,0 +1,7 @@ +[ProjectFiles] +HeaderPath= +[Others] +Define= +HALModule= +[Groups] +Doc=../readme.txt; diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Project.eww b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Project.eww new file mode 100644 index 000000000..5a9b0a765 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Project.eww @@ -0,0 +1,7 @@ + + + + $WS_DIR$\Templates_LL.ewp + + + diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewd b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewd new file mode 100644 index 000000000..670b3d43f --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewd @@ -0,0 +1,1419 @@ + + + 3 + + Templates_LL + + ARM + + 1 + + C-SPY + 2 + + 29 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 1 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 1 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 1 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 1 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 1 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 1 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewp b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewp new file mode 100644 index 000000000..eb2de4b49 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/Templates_LL.ewp @@ -0,0 +1,1083 @@ + + + 3 + + Templates_LL + + ARM + + 1 + + General + 3 + + 29 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application + + EWARM + + $PROJ_DIR$/startup_stm32wb15xx_cm4.s + + + + User + + $PROJ_DIR$/../Src/main.c + + + $PROJ_DIR$/../Src/stm32wbxx_it.c + + + + + Doc + + $PROJ_DIR$/../readme.txt + + + + Drivers + + STM32WBxx_HAL_Driver + + $PROJ_DIR$/../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_utils.c + + + $PROJ_DIR$/../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_exti.c + + + $PROJ_DIR$/../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_pwr.c + + + $PROJ_DIR$/../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_ll_gpio.c + + + + CMSIS + + $PROJ_DIR$/../Src/system_stm32wbxx.c + + + + + diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/startup_stm32wb15xx_cm4.s b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/startup_stm32wb15xx_cm4.s new file mode 100644 index 000000000..f8b301368 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/startup_stm32wb15xx_cm4.s @@ -0,0 +1,430 @@ +;****************************************************************************** +;* File Name : startup_stm32wb15xx_cm4.s +;* Author : MCD Application Team +;* Description : M4 core vector table of the STM32WB15xx devices for the +;* IAR (EWARM) toolchain. +;* +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == _iar_program_start, +;* - Set the vector table entries with the exceptions ISR +;* address. +;* - Branches to main in the C library (which eventually +;* calls main()). +;* After Reset the Cortex-M4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019-2021 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +; +; +; The modules in this file are included in the libraries, and may be replaced +; by any user-defined modules that define the PUBLIC symbol _program_start or +; a user defined start symbol. +; To override the cstartup defined in the library, simply add your modified +; version to the workbench project. +; +; The vector table is normally located at address 0. +; When debugging in RAM, it can be located in RAM, aligned to at least 2^6. +; The name "__vector_table" has special meaning for C-SPY: +; it is where the SP start value is found, and the NVIC vector +; table register (VTOR) is initialized to this address if != 0. +; +; Cortex-M version +; + + MODULE ?cstartup + + ;; Forward declaration of sections. + SECTION CSTACK:DATA:NOROOT(3) + + SECTION .intvec:CODE:NOROOT(2) + + EXTERN __iar_program_start + EXTERN SystemInit + PUBLIC __vector_table + + DATA +__vector_table + DCD sfe(CSTACK) + DCD Reset_Handler ; Reset Handler + + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM Interrupt + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper, TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_IRQHandler ; TIM1 Update Interrupt + DCD TIM1_TRG_COM_IRQHandler ; TIM1 Trigger and Communication Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD 0 ; Reserved + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD 0 ; Reserved + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD 0 ; Reserved + DCD PWR_SOTF_BLEACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; Default interrupt handlers. +;; + THUMB + + PUBWEAK Reset_Handler + SECTION .text:CODE:NOROOT:REORDER(2) +Reset_Handler + LDR R0, =SystemInit + BLX R0 + LDR R0, =__iar_program_start + BX R0 + + PUBWEAK NMI_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +NMI_Handler + B NMI_Handler + + PUBWEAK HardFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +HardFault_Handler + B HardFault_Handler + + PUBWEAK MemManage_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +MemManage_Handler + B MemManage_Handler + + PUBWEAK BusFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +BusFault_Handler + B BusFault_Handler + + PUBWEAK UsageFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +UsageFault_Handler + B UsageFault_Handler + + PUBWEAK SVC_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SVC_Handler + B SVC_Handler + + PUBWEAK DebugMon_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +DebugMon_Handler + B DebugMon_Handler + + PUBWEAK PendSV_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +PendSV_Handler + B PendSV_Handler + + PUBWEAK SysTick_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SysTick_Handler + B SysTick_Handler + + PUBWEAK WWDG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +WWDG_IRQHandler + B WWDG_IRQHandler + + PUBWEAK PVD_PVM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PVD_PVM_IRQHandler + B PVD_PVM_IRQHandler + + PUBWEAK TAMP_STAMP_LSECSS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TAMP_STAMP_LSECSS_IRQHandler + B TAMP_STAMP_LSECSS_IRQHandler + + PUBWEAK RTC_WKUP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_WKUP_IRQHandler + B RTC_WKUP_IRQHandler + + PUBWEAK FLASH_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FLASH_IRQHandler + B FLASH_IRQHandler + + PUBWEAK RCC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RCC_IRQHandler + B RCC_IRQHandler + + PUBWEAK EXTI0_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI0_IRQHandler + B EXTI0_IRQHandler + + PUBWEAK EXTI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI1_IRQHandler + B EXTI1_IRQHandler + + PUBWEAK EXTI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI2_IRQHandler + B EXTI2_IRQHandler + + PUBWEAK EXTI3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI3_IRQHandler + B EXTI3_IRQHandler + + PUBWEAK EXTI4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI4_IRQHandler + B EXTI4_IRQHandler + + PUBWEAK DMA1_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel1_IRQHandler + B DMA1_Channel1_IRQHandler + + PUBWEAK DMA1_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel2_IRQHandler + B DMA1_Channel2_IRQHandler + + PUBWEAK DMA1_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel3_IRQHandler + B DMA1_Channel3_IRQHandler + + PUBWEAK DMA1_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel4_IRQHandler + B DMA1_Channel4_IRQHandler + + PUBWEAK DMA1_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel5_IRQHandler + B DMA1_Channel5_IRQHandler + + PUBWEAK DMA1_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel6_IRQHandler + B DMA1_Channel6_IRQHandler + + PUBWEAK DMA1_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel7_IRQHandler + B DMA1_Channel7_IRQHandler + + PUBWEAK ADC1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +ADC1_IRQHandler + B ADC1_IRQHandler + + PUBWEAK C2SEV_PWR_C2H_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +C2SEV_PWR_C2H_IRQHandler + B C2SEV_PWR_C2H_IRQHandler + + PUBWEAK COMP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +COMP_IRQHandler + B COMP_IRQHandler + + PUBWEAK EXTI9_5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI9_5_IRQHandler + B EXTI9_5_IRQHandler + + PUBWEAK TIM1_BRK_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_BRK_IRQHandler + B TIM1_BRK_IRQHandler + + PUBWEAK TIM1_UP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_UP_IRQHandler + B TIM1_UP_IRQHandler + + PUBWEAK TIM1_TRG_COM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_TRG_COM_IRQHandler + B TIM1_TRG_COM_IRQHandler + + PUBWEAK TIM1_CC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_CC_IRQHandler + B TIM1_CC_IRQHandler + + PUBWEAK TIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM2_IRQHandler + B TIM2_IRQHandler + + PUBWEAK PKA_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PKA_IRQHandler + B PKA_IRQHandler + + PUBWEAK I2C1_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_EV_IRQHandler + B I2C1_EV_IRQHandler + + PUBWEAK I2C1_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_ER_IRQHandler + B I2C1_ER_IRQHandler + + PUBWEAK SPI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI1_IRQHandler + B SPI1_IRQHandler + + PUBWEAK USART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USART1_IRQHandler + B USART1_IRQHandler + + PUBWEAK LPUART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPUART1_IRQHandler + B LPUART1_IRQHandler + + PUBWEAK TSC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TSC_IRQHandler + B TSC_IRQHandler + + PUBWEAK EXTI15_10_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI15_10_IRQHandler + B EXTI15_10_IRQHandler + + PUBWEAK RTC_Alarm_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_Alarm_IRQHandler + B RTC_Alarm_IRQHandler + + PUBWEAK PWR_SOTF_BLEACT_RFPHASE_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PWR_SOTF_BLEACT_RFPHASE_IRQHandler + B PWR_SOTF_BLEACT_RFPHASE_IRQHandler + + PUBWEAK IPCC_C1_RX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_RX_IRQHandler + B IPCC_C1_RX_IRQHandler + + PUBWEAK IPCC_C1_TX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_TX_IRQHandler + B IPCC_C1_TX_IRQHandler + + PUBWEAK HSEM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +HSEM_IRQHandler + B HSEM_IRQHandler + + PUBWEAK LPTIM1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM1_IRQHandler + B LPTIM1_IRQHandler + + PUBWEAK LPTIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM2_IRQHandler + B LPTIM2_IRQHandler + + PUBWEAK AES2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES2_IRQHandler + B AES2_IRQHandler + + PUBWEAK RNG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RNG_IRQHandler + B RNG_IRQHandler + + PUBWEAK FPU_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FPU_IRQHandler + B FPU_IRQHandler + + PUBWEAK DMAMUX1_OVR_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMAMUX1_OVR_IRQHandler + B DMAMUX1_OVR_IRQHandler + + END + diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/stm32wb15xx_flash_cm4.icf b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/stm32wb15xx_flash_cm4.icf new file mode 100644 index 000000000..a8ad1f356 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/EWARM/stm32wb15xx_flash_cm4.icf @@ -0,0 +1,40 @@ +/*###ICF### Section handled by ICF editor, don't touch! ****/ +/*-Editor annotation file-*/ +/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ +/*-Specials-*/ +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +/*-Memory Regions-*/ +/***** FLASH Part dedicated to M4 *****/ +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_end__ = 0x0801B7FF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; +define symbol __ICFEDIT_region_RAM_end__ = 0x20002FFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x200; +/**** End of ICF editor section. ###ICF###*/ + +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; + +/* MB_MEM1 and MB_MEM2 are sections reserved to mailbox communication. It is placed in the shared memory */ +initialize by copy { readwrite }; +do not initialize { section .noinit, + section MAPPING_TABLE, + section MB_MEM1 }; + +place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; + +place in ROM_region { readonly }; +place in RAM_region { readwrite, block CSTACK, block HEAP }; +place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/Inc/main.h b/Projects/NUCLEO-WB15CC/Templates_LL/Inc/main.h new file mode 100644 index 000000000..fd0891a74 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/Inc/main.h @@ -0,0 +1,93 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.h + * @brief : Header for main.c file. + * This file contains the common defines of the application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MAIN_H +#define __MAIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_ll_crs.h" +#include "stm32wbxx_ll_rcc.h" +#include "stm32wbxx_ll_bus.h" +#include "stm32wbxx_ll_system.h" +#include "stm32wbxx_ll_exti.h" +#include "stm32wbxx_ll_cortex.h" +#include "stm32wbxx_ll_utils.h" +#include "stm32wbxx_ll_pwr.h" +#include "stm32wbxx_ll_dma.h" +#include "stm32wbxx_ll_gpio.h" + +#if defined(USE_FULL_ASSERT) +#include "stm32_assert.h" +#endif /* USE_FULL_ASSERT */ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void Error_Handler(void); + +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +/* Private defines -----------------------------------------------------------*/ +#ifndef NVIC_PRIORITYGROUP_0 +#define NVIC_PRIORITYGROUP_0 ((uint32_t)0x00000007) /*!< 0 bit for pre-emption priority, + 4 bits for subpriority */ +#define NVIC_PRIORITYGROUP_1 ((uint32_t)0x00000006) /*!< 1 bit for pre-emption priority, + 3 bits for subpriority */ +#define NVIC_PRIORITYGROUP_2 ((uint32_t)0x00000005) /*!< 2 bits for pre-emption priority, + 2 bits for subpriority */ +#define NVIC_PRIORITYGROUP_3 ((uint32_t)0x00000004) /*!< 3 bits for pre-emption priority, + 1 bit for subpriority */ +#define NVIC_PRIORITYGROUP_4 ((uint32_t)0x00000003) /*!< 4 bits for pre-emption priority, + 0 bit for subpriority */ +#endif +/* USER CODE BEGIN Private defines */ + +/* USER CODE END Private defines */ + +#ifdef __cplusplus +} +#endif + +#endif /* __MAIN_H */ diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32_assert.h b/Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32_assert.h new file mode 100644 index 000000000..cfae07013 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32_assert.h @@ -0,0 +1,52 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32_assert.h + * @brief STM32 assert file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32_ASSERT_H +#define __STM32_ASSERT_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ +/* Includes ------------------------------------------------------------------*/ +/* Exported macro ------------------------------------------------------------*/ +#ifdef USE_FULL_ASSERT +/** + * @brief The assert_param macro is used for function's parameters check. + * @param expr: If expr is false, it calls assert_failed function + * which reports the name of the source file and the source + * line number of the call that failed. + * If expr is true, it returns no value. + * @retval None + */ + #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) +/* Exported functions ------------------------------------------------------- */ + void assert_failed(uint8_t* file, uint32_t line); +#else + #define assert_param(expr) ((void)0U) +#endif /* USE_FULL_ASSERT */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32_ASSERT_H */ diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32wbxx_it.h b/Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32wbxx_it.h new file mode 100644 index 000000000..449fae0af --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/Inc/stm32wbxx_it.h @@ -0,0 +1,66 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.h + * @brief This file contains the headers of the interrupt handlers. + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_IT_H +#define __STM32WBxx_IT_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void NMI_Handler(void); +void HardFault_Handler(void); +void MemManage_Handler(void); +void BusFault_Handler(void); +void UsageFault_Handler(void); +void SVC_Handler(void); +void DebugMon_Handler(void); +void PendSV_Handler(void); +void SysTick_Handler(void); +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_IT_H */ diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/LICENSE.md b/Projects/NUCLEO-WB15CC/Templates_LL/LICENSE.md new file mode 100644 index 000000000..06b212251 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/LICENSE.md @@ -0,0 +1,27 @@ +Copyright 2019-2021 STMicroelectronics. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/Src/main.c b/Projects/NUCLEO-WB15CC/Templates_LL/Src/main.c new file mode 100644 index 000000000..30ee82c44 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/Src/main.c @@ -0,0 +1,201 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file Templates_LL/Src/main.c + * @author MCD Application Team + * @brief Main program body + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +void SystemClock_Config(void); +void PeriphCommonClock_Config(void); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/** + * @brief The application entry point. + * @retval int + */ +int main(void) +{ + /* USER CODE BEGIN 1 */ + + /* USER CODE END 1 */ + + /* MCU Configuration--------------------------------------------------------*/ + + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + + NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4); + + /* System interrupt init*/ + + /* USER CODE BEGIN Init */ + + /* USER CODE END Init */ + + /* Configure the system clock */ + SystemClock_Config(); + +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + + /* USER CODE BEGIN SysInit */ + + /* USER CODE END SysInit */ + + /* Initialize all configured peripherals */ + /* USER CODE BEGIN 2 */ + + /* USER CODE END 2 */ + + /* Infinite loop */ + /* USER CODE BEGIN WHILE */ + while (1) + { + /* USER CODE END WHILE */ + + /* USER CODE BEGIN 3 */ + } + /* USER CODE END 3 */ +} + +/** + * @brief System Clock Configuration + * @retval None + */ +void SystemClock_Config(void) +{ + /* HSI configuration and activation */ + LL_RCC_HSI_Enable(); + while(LL_RCC_HSI_IsReady() != 1) + { + } + + /* Sysclk activation on the HSI */ + /* Set CPU1 prescaler*/ + LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1); + + /* Set CPU2 prescaler*/ + LL_C2_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_2); + + LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSI); + while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSI) + { + } + + /* Set AHB SHARED prescaler*/ + LL_RCC_SetAHB4Prescaler(LL_RCC_SYSCLK_DIV_1); + + /* Set APB1 prescaler*/ + LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1); + + /* Set APB2 prescaler*/ + LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1); + + LL_Init1msTick(16000000); + + /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ + LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); + LL_RCC_SetSMPSPrescaler(LL_RCC_SMPS_DIV_1); + LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_NONE); + /* USER CODE BEGIN Smps */ + + /* USER CODE END Smps */ +} + +/* USER CODE BEGIN 4 */ + +/* USER CODE END 4 */ + +/** + * @brief This function is executed in case of error occurrence. + * @retval None + */ +void Error_Handler(void) +{ + /* USER CODE BEGIN Error_Handler_Debug */ + /* User can add his own implementation to report the HAL error return state */ + while(1) + { + } + /* USER CODE END Error_Handler_Debug */ +} + +#ifdef USE_FULL_ASSERT +/** + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ +void assert_failed(uint8_t *file, uint32_t line) +{ + /* USER CODE BEGIN 6 */ + /* User can add his own implementation to report the file name and line number, + ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* Infinite loop */ + while (1) + { + } + + /* USER CODE END 6 */ +} +#endif /* USE_FULL_ASSERT */ diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/Src/stm32wbxx_it.c b/Projects/NUCLEO-WB15CC/Templates_LL/Src/stm32wbxx_it.c new file mode 100644 index 000000000..9f308fe0a --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/Src/stm32wbxx_it.c @@ -0,0 +1,204 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file Templates/Src/stm32wbxx_it.c + * @author MCD Application Team + * @brief Main Interrupt Service Routines. + * This file provides template for all exceptions handler and + * peripherals interrupt service routine. + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "stm32wbxx_it.h" +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/* External variables --------------------------------------------------------*/ + +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/******************************************************************************/ +/* Cortex Processor Interruption and Exception Handlers */ +/******************************************************************************/ +/** + * @brief This function handles Non maskable interrupt. + */ +void NMI_Handler(void) +{ + /* USER CODE BEGIN NonMaskableInt_IRQn 0 */ + + /* USER CODE END NonMaskableInt_IRQn 0 */ + /* USER CODE BEGIN NonMaskableInt_IRQn 1 */ + + /* USER CODE END NonMaskableInt_IRQn 1 */ +} + +/** + * @brief This function handles Hard fault interrupt. + */ +void HardFault_Handler(void) +{ + /* USER CODE BEGIN HardFault_IRQn 0 */ + + /* USER CODE END HardFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + /* USER CODE END W1_HardFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Memory management fault. + */ +void MemManage_Handler(void) +{ + /* USER CODE BEGIN MemoryManagement_IRQn 0 */ + + /* USER CODE END MemoryManagement_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */ + /* USER CODE END W1_MemoryManagement_IRQn 0 */ + } +} + +/** + * @brief This function handles Prefetch fault, memory access fault. + */ +void BusFault_Handler(void) +{ + /* USER CODE BEGIN BusFault_IRQn 0 */ + + /* USER CODE END BusFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_BusFault_IRQn 0 */ + /* USER CODE END W1_BusFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Undefined instruction or illegal state. + */ +void UsageFault_Handler(void) +{ + /* USER CODE BEGIN UsageFault_IRQn 0 */ + + /* USER CODE END UsageFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_UsageFault_IRQn 0 */ + /* USER CODE END W1_UsageFault_IRQn 0 */ + } +} + +/** + * @brief This function handles System service call via SWI instruction. + */ +void SVC_Handler(void) +{ + /* USER CODE BEGIN SVCall_IRQn 0 */ + + /* USER CODE END SVCall_IRQn 0 */ + /* USER CODE BEGIN SVCall_IRQn 1 */ + + /* USER CODE END SVCall_IRQn 1 */ +} + +/** + * @brief This function handles Debug monitor. + */ +void DebugMon_Handler(void) +{ + /* USER CODE BEGIN DebugMonitor_IRQn 0 */ + + /* USER CODE END DebugMonitor_IRQn 0 */ + /* USER CODE BEGIN DebugMonitor_IRQn 1 */ + + /* USER CODE END DebugMonitor_IRQn 1 */ +} + +/** + * @brief This function handles Pendable request for system service. + */ +void PendSV_Handler(void) +{ + /* USER CODE BEGIN PendSV_IRQn 0 */ + + /* USER CODE END PendSV_IRQn 0 */ + /* USER CODE BEGIN PendSV_IRQn 1 */ + + /* USER CODE END PendSV_IRQn 1 */ +} + +/** + * @brief This function handles System tick timer. + */ +void SysTick_Handler(void) +{ + /* USER CODE BEGIN SysTick_IRQn 0 */ + + /* USER CODE END SysTick_IRQn 0 */ + + /* USER CODE BEGIN SysTick_IRQn 1 */ + + /* USER CODE END SysTick_IRQn 1 */ +} + +/******************************************************************************/ +/* STM32WBxx Peripheral Interrupt Handlers */ +/* Add here the Interrupt Handlers for the used peripherals. */ +/* For the available peripheral interrupt handler names, */ +/* please refer to the startup file (startup_stm32wbxx.s). */ +/******************************************************************************/ + +/* USER CODE BEGIN 1 */ + +/* USER CODE END 1 */ diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/Src/system_stm32wbxx.c b/Projects/NUCLEO-WB15CC/Templates_LL/Src/system_stm32wbxx.c new file mode 100644 index 000000000..6121a3fff --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/Src/system_stm32wbxx.c @@ -0,0 +1,362 @@ +/** + ****************************************************************************** + * @file system_stm32wbxx.c + * @author MCD Application Team + * @brief CMSIS Cortex Device Peripheral Access Layer System Source File + * + * This file provides two functions and one global variable to be called from + * user application: + * - SystemInit(): This function is called at startup just after reset and + * before branch to main program. This call is made inside + * the "startup_stm32wbxx.s" file. + * + * - SystemCoreClock variable: Contains the core clock (HCLK), it can be used + * by the user application to setup the SysTick + * timer or configure other parameters. + * + * - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must + * be called whenever the core clock is changed + * during program execution. + * + * After each device reset the MSI (4 MHz) is used as system clock source. + * Then SystemInit() function is called, in "startup_stm32wbxx.s" file, to + * configure the system clock before to branch to main program. + * + * This file configures the system clock as follows: + *============================================================================= + *----------------------------------------------------------------------------- + * System Clock source | MSI + *----------------------------------------------------------------------------- + * SYSCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * HCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * AHB Prescaler | 1 + *----------------------------------------------------------------------------- + * APB1 Prescaler | 1 + *----------------------------------------------------------------------------- + * APB2 Prescaler | 1 + *----------------------------------------------------------------------------- + * PLL_M | 1 + *----------------------------------------------------------------------------- + * PLL_N | 8 + *----------------------------------------------------------------------------- + * PLL_P | 7 + *----------------------------------------------------------------------------- + * PLL_Q | 2 + *----------------------------------------------------------------------------- + * PLL_R | 2 + *----------------------------------------------------------------------------- + * PLLSAI1_P | NA + *----------------------------------------------------------------------------- + * PLLSAI1_Q | NA + *----------------------------------------------------------------------------- + * PLLSAI1_R | NA + *----------------------------------------------------------------------------- + * Require 48MHz for USB OTG FS, | Disabled + * SDIO and RNG clock | + *----------------------------------------------------------------------------- + *============================================================================= + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/** @addtogroup stm32WBxx_system + * @{ + */ + +/** @addtogroup stm32WBxx_System_Private_Includes + * @{ + */ + +#include "stm32wbxx.h" + +#if !defined (HSE_VALUE) + #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (MSI_VALUE) + #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +#if !defined (HSI_VALUE) + #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +#if !defined (LSI_VALUE) + #define LSI_VALUE (32000UL) /*!< Value of LSI in Hz*/ +#endif /* LSI_VALUE */ + +#if !defined (LSE_VALUE) + #define LSE_VALUE (32768UL) /*!< Value of LSE in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_TypesDefinitions + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Defines + * @{ + */ + +/* Note: Following vector table addresses must be defined in line with linker + configuration. */ +/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2 + CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept + at address 0x00 which correspond to automatic remap of boot address selected */ +/* #define USER_VECT_TAB_ADDRESS */ +#if defined(USER_VECT_TAB_ADDRESS) + /*!< Uncomment this line for user vector table remap in Sram else user remap + will be done in Flash. */ +/* #define VECT_TAB_SRAM */ +#if defined(VECT_TAB_SRAM) +#define VECT_TAB_BASE_ADDRESS SRAM1_BASE /*!< Vector Table base address field. + This value must be a multiple of 0x200. */ +#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +#else +#define VECT_TAB_BASE_ADDRESS FLASH_BASE /*!< Vector Table base address field. + This value must be a multiple of 0x200. */ +#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +#endif +#endif + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Macros + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Variables + * @{ + */ + /* The SystemCoreClock variable is updated in three ways: + 1) by calling CMSIS function SystemCoreClockUpdate() + 2) by calling HAL API function HAL_RCC_GetHCLKFreq() + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency + Note: If you use this function to configure the system clock; then there + is no need to call the 2 first functions listed above, since SystemCoreClock + variable is updated automatically. + */ + uint32_t SystemCoreClock = 4000000UL ; /*CPU1: M4 on MSI clock after startup (4MHz)*/ + + const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL}; + + const uint32_t APBPrescTable[8UL] = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL}; + + const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ + 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_FunctionPrototypes + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Functions + * @{ + */ + +/** + * @brief Setup the microcontroller system. + * @param None + * @retval None + */ +void SystemInit(void) +{ +#if defined(USER_VECT_TAB_ADDRESS) + /* Configure the Vector Table location add offset address ------------------*/ + SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; +#endif + + /* FPU settings ------------------------------------------------------------*/ + #if (__FPU_PRESENT == 1) && (__FPU_USED == 1) + SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL))); /* set CP10 and CP11 Full Access */ + #endif + + /* Reset the RCC clock configuration to the default reset state ------------*/ + /* Set MSION bit */ + RCC->CR |= RCC_CR_MSION; + + /* Reset CFGR register */ + RCC->CFGR = 0x00070000U; + + /* Reset PLLSAI1ON, PLLON, HSECSSON, HSEON, HSION, and MSIPLLON bits */ + RCC->CR &= (uint32_t)0xFAF6FEFBU; + + /*!< Reset LSI1 and LSI2 bits */ + RCC->CSR &= (uint32_t)0xFFFFFFFAU; + + /*!< Reset HSI48ON bit */ + RCC->CRRCR &= (uint32_t)0xFFFFFFFEU; + + /* Reset PLLCFGR register */ + RCC->PLLCFGR = 0x22041000U; + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) + /* Reset PLLSAI1CFGR register */ + RCC->PLLSAI1CFGR = 0x22041000U; +#endif + + /* Reset HSEBYP bit */ + RCC->CR &= 0xFFFBFFFFU; + + /* Disable all interrupts */ + RCC->CIER = 0x00000000; +} + +/** + * @brief Update SystemCoreClock variable according to Clock Register Values. + * The SystemCoreClock variable contains the core clock (HCLK), it can + * be used by the user application to setup the SysTick timer or configure + * other parameters. + * + * @note Each time the core clock (HCLK) changes, this function must be called + * to update SystemCoreClock variable value. Otherwise, any configuration + * based on this variable will be incorrect. + * + * @note - The system frequency computed by this function is not the real + * frequency in the chip. It is calculated based on the predefined + * constant and the selected clock source: + * + * - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*) + * + * - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**) + * + * - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***) + * + * - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***) + * or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors. + * + * (*) MSI_VALUE is a constant defined in stm32wbxx_hal.h file (default value + * 4 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (**) HSI_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 16 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (***) HSE_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 32 MHz), user has to ensure that HSE_VALUE is same as the real + * frequency of the crystal used. Otherwise, this function may + * have wrong result. + * + * - The result of this function could be not correct when using fractional + * value for HSE crystal. + * + * @param None + * @retval None + */ +void SystemCoreClockUpdate(void) +{ + uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm; + + /* Get MSI Range frequency--------------------------------------------------*/ + + /*MSI frequency range in Hz*/ + msirange = MSIRangeTable[(RCC->CR & RCC_CR_MSIRANGE) >> RCC_CR_MSIRANGE_Pos]; + + /* Get SYSCLK source -------------------------------------------------------*/ + switch (RCC->CFGR & RCC_CFGR_SWS) + { + case 0x00: /* MSI used as system clock source */ + SystemCoreClock = msirange; + break; + + case 0x04: /* HSI used as system clock source */ + /* HSI used as system clock source */ + SystemCoreClock = HSI_VALUE; + break; + + case 0x08: /* HSE used as system clock source */ + SystemCoreClock = HSE_VALUE; + break; + + case 0x0C: /* PLL used as system clock source */ + /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN + SYSCLK = PLL_VCO / PLLR + */ + pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC); + pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ; + + if(pllsource == 0x02UL) /* HSI used as PLL clock source */ + { + pllvco = (HSI_VALUE / pllm); + } + else if(pllsource == 0x03UL) /* HSE used as PLL clock source */ + { + pllvco = (HSE_VALUE / pllm); + } + else /* MSI used as PLL clock source */ + { + pllvco = (msirange / pllm); + } + + pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos); + pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL); + + SystemCoreClock = pllvco/pllr; + break; + + default: + SystemCoreClock = msirange; + break; + } + + /* Compute HCLK clock frequency --------------------------------------------*/ + /* Get HCLK1 prescaler */ + tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)]; + /* HCLK clock frequency */ + SystemCoreClock = SystemCoreClock / tmp; + +} + + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/Templates_LL.ioc b/Projects/NUCLEO-WB15CC/Templates_LL/Templates_LL.ioc new file mode 100644 index 000000000..3a02b8c39 --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/Templates_LL.ioc @@ -0,0 +1,106 @@ +#MicroXplorer Configuration settings - do not modify +File.Version=6 +GPIO.groupedBy= +KeepUserPlacement=false +Mcu.Family=STM32WB +Mcu.IP0=NVIC +Mcu.IP1=RCC +Mcu.IP2=SYS +Mcu.IPNb=3 +Mcu.Name=STM32WB15CCUx +Mcu.Package=UFQFPN48 +Mcu.Pin0=VP_SYS_VS_Systick +Mcu.PinsNb=1 +Mcu.ThirdPartyNb=0 +Mcu.UserConstants= +Mcu.UserName=STM32WB15CCUx +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 +NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.ForceEnableDMAVector=true +NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 +NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PinOutPanel.RotationAngle=0 +ProjectManager.AskForMigrate=true +ProjectManager.BackupPrevious=false +ProjectManager.CompilerOptimize=6 +ProjectManager.ComputerToolchain=false +ProjectManager.CoupleFile=false +ProjectManager.DeletePrevious=true +ProjectManager.DeviceId=STM32WB15CCUx +ProjectManager.FreePins=false +ProjectManager.HalAssertFull=false +ProjectManager.HeapSize=0x200 +ProjectManager.KeepUserCode=true +ProjectManager.LastFirmware=true +ProjectManager.LibraryCopy=2 +ProjectManager.MainLocation=Src +ProjectManager.NoMain=false +ProjectManager.PreviousToolchain= +ProjectManager.ProjectBuild=false +ProjectManager.ProjectFileName=Templates_LL.ioc +ProjectManager.ProjectName=Templates_LL +ProjectManager.RegisterCallBack= +ProjectManager.StackSize=0x400 +ProjectManager.TargetToolchain=EWARM V8 +ProjectManager.ToolChainLocation= +ProjectManager.UnderRoot=false +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-LL-false +RCC.AHB2CLKDivider=RCC_SYSCLK_DIV2 +RCC.AHBFreq_Value=16000000 +RCC.APB1Freq_Value=16000000 +RCC.APB1TimFreq_Value=16000000 +RCC.APB2Freq_Value=16000000 +RCC.APB2TimFreq_Value=16000000 +RCC.APB3Freq_Value=16000000 +RCC.Cortex2Freq_Value=8000000 +RCC.CortexFreq_Value=16000000 +RCC.FCLK2Freq_Value=8000000 +RCC.FCLKCortexFreq_Value=16000000 +RCC.FamilyName=M +RCC.HCLK2Freq_Value=8000000 +RCC.HCLK3Freq_Value=16000000 +RCC.HCLKFreq_Value=16000000 +RCC.HCLKRFFreq_Value=16000000 +RCC.HSE_VALUE=8000000 +RCC.HSI_VALUE=16000000 +RCC.I2C1Freq_Value=16000000 +RCC.IPParameters=AHB2CLKDivider,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RFWKPFreq_Value,RNGFreq_Value,SMPS1Freq_Value,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value +RCC.LPTIM1Freq_Value=16000000 +RCC.LPTIM2Freq_Value=16000000 +RCC.LPUART1Freq_Value=16000000 +RCC.LSCOPinFreq_Value=32000 +RCC.LSE_VALUE=32768 +RCC.LSI_VALUE=32000 +RCC.MCO1PinFreq_Value=16000000 +RCC.PLLN=32 +RCC.PLLPoutputFreq_Value=64000000 +RCC.PLLQoutputFreq_Value=64000000 +RCC.PLLRCLKFreq_Value=64000000 +RCC.PWRFreq_Value=16000000 +RCC.RFWKPFreq_Value=32768 +RCC.RNGFreq_Value=32000 +RCC.SMPS1Freq_Value=8000000 +RCC.SMPSFreq_Value=4000000 +RCC.SYSCLKFreq_VALUE=16000000 +RCC.SYSCLKSource=RCC_SYSCLKSOURCE_HSI +RCC.USART1Freq_Value=16000000 +RCC.VCOInputFreq_Value=4000000 +RCC.VCOOutputFreq_Value=128000000 +VP_SYS_VS_Systick.Mode=SysTick +VP_SYS_VS_Systick.Signal=SYS_VS_Systick +board=custom +ProjectManager.Example=Templates_LL +ProjectManager.ExampleSource=CubeFw diff --git a/Projects/NUCLEO-WB15CC/Templates_LL/readme.txt b/Projects/NUCLEO-WB15CC/Templates_LL/readme.txt new file mode 100644 index 000000000..989fff4ef --- /dev/null +++ b/Projects/NUCLEO-WB15CC/Templates_LL/readme.txt @@ -0,0 +1,88 @@ +/** + @page Templates_LL Description of the Templates_LL example + + @verbatim + ****************************************************************************** + * @file Templates_LL/readme.txt + * @author MCD Application Team + * @brief Description of the Templates_LL example. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @endverbatim + +@par Example Description + +This projects provides a reference template through the LL API that can be used to build any firmware application. + +This project LL template provides: + - Inclusion of all LL drivers (include files in "main.h" and LL sources files in IDE environment, with option "USE_FULL_LL_DRIVER" in IDE environment) + Note: If optimization is needed afterwards, user can perform a cleanup by removing unused drivers. + - Definition of LEDs and user button (file: main.h) + Note: User button name printed on board may differ from naming "user button" in code: "key button", ... + - Clock configuration (file: main.c) + +This project LL template does not provide: + - Functions to initialize and control LED and user button + - Functions to manage IRQ handler of user button + +To port a LL example to the targeted board: +1. Select the LL example to port. + To find the board on which LL examples are deployed, refer to LL examples list in "STM32CubeProjectsList.html", table section "Examples_LL" + or AN : STM32Cube firmware examples for stm32wbxx Series + +2. Replace source files of the LL template by the ones of the LL example, except code specific to board. + Note: Code specific to board is specified between tags: + /* ============== BOARD SPECIFIC CONFIGURATION CODE BEGIN ============== */ + /* ============== BOARD SPECIFIC CONFIGURATION CODE END ============== */ + + - Replace file main.h, with updates: + - Keep LED and user button definition of the LL template under tags + + - Replace file main.c, with updates: + - Keep clock configuration of the LL template: function "SystemClock_Config()" + - Depending of LED availability, replace LEDx_PIN by another LEDx (number) available in file main.h + + - Replace file stm32wbxx_it.h + - Replace file stm32wbxx_it.c + + +@par Keywords + +Template LL, + +@par Directory contents + + - Templates_LL/Inc/stm32wbxx_it.h Interrupt handlers header file + - Templates_LL/Inc/main.h Header for main.c module + - Templates_LL/Inc/stm32_assert.h Template file to include assert_failed function + - Templates_LL/Src/stm32wbxx_it.c Interrupt handlers + - Templates_LL/Src/main.c Main program + - Templates_LL/Src/system_stm32wbxx.c STM32WBxx system source file + + +@par Hardware and Software environment + + - This example runs on STM32WB15xx devices. + + - This example has been tested with NUCLEO-WB15CC board and can be + easily tailored to any other supported device and development board. + + +@par How to use it ? + +In order to make the program work, you must do the following : + - Open your preferred toolchain + - Rebuild all files and load your image into target memory + - Run the example + + *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  + */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Binary/BLE_AT_Server_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Binary/BLE_AT_Server_reference.hex new file mode 100644 index 000000000..4f316d009 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Binary/BLE_AT_Server_reference.hex @@ -0,0 +1,2637 @@ +:020000040800F2 +:1000000008100020EDA100082DA000082FA0000876 +:1000100031A0000833A0000835A00008000000004F +:1000200000000000000000000000000037A00008F1 +:1000300039A00008000000003BA000083DA0000817 +:100040000FA2000813A2000817A200086DA0000864 +:100050001BA200081FA2000867A0000823A2000836 +:1000600027A200082BA2000861A000082FA2000808 +:1000700033A2000837A200083BA200083FA20008F4 +:1000800043A2000847A200084BA200084FA20008A4 +:1000900053A2000857A200085BA200085FA2000854 +:1000A00063A2000867A200086BA200086FA2000804 +:1000B00073A2000877A200087BA200087FA20008B4 +:1000C00083A2000887A200088BA200088FA2000864 +:1000D00041A0000847A0000893A2000897A20008CA +:1000E0009BA200089FA20008A3A20008A7A20008E4 +:1000F00055A0000859A000085DA00008ABA20008A8 +:10010000AFA20008B3A20008B7A20008BBA2000873 +:10011000BFA20008C3A20008C7A20008CBA2000823 +:10012000CFA20008D3A20008D7A20008DBA20008D3 +:10013000DFA20008E3A20008E7A2000878B58FB0AC +:1001400002A80FF25411DFF8344A342201F006F805 +:100150000FF611200190009469460FF6F11001F09E +:100160004FF80121022001F034F9DFF8142A0021B0 +:10017000082001F0ACF902A801F032FA08B101F050 +:100180001AFC00240A25DFF8FC69002026F8140078 +:100190000A2105FB04F030440A3001F02DFC641CF8 +:1001A000042CF2DD0FF215620021202001F08FF9FE +:1001B0000FF211720021402001F089F90FF2C542BF +:1001C0000021802001F083F90FF2896200214FF4B1 +:1001D000807001F07CF90FF2097200214FF4007079 +:1001E00001F075F90FF2A57200214FF4806001F063 +:1001F0006EF90FF2B97200214FF4006001F067F957 +:100200000FF2CD7200214FF4805001F060F90FF22F +:10021000E57200214FF4005001F059F90FF2F57228 +:1002200000214FF4804001F052F90FF63102002115 +:100230004FF4004001F04BF90FF63D0200214FF45E +:10024000803001F044F90FF6350200214FF4003000 +:1002500001F03DF90FF6790200214FF4802001F002 +:1002600036F90FF6D10200214FF4002001F02FF9EA +:10027000DFF814490FF2FD33002204F18101002060 +:1002800001F0B4FD0FF2F533002204F182010020E9 +:1002900001F0ACFD10B070BD0000000000000000D7 +:1002A0000000000000000000000000004400080002 +:1002B000400502011C3AFB00F4010000FFFFFFFFB4 +:1002C0004801010000200000000000002DE9FF416E +:1002D0000446DFF8B4586078DFF8B078DFF8B0880B +:1002E000052805F1800605D03E2817D0FF2800F02C +:1002F0008480AFE0A088E98A8842FAD10020E882B1 +:100300003070C8F8000038600FF6341001F030FE8D +:1003100000218DF800100120694691E0E078012865 +:100320003ED0032802D00C281FD093E00FF63810DF +:1003300001F01EFEE07900EE900AB7EE040AF8EE36 +:10034000600A60EE800AC8ED000A0DF10201E07952 +:1003500000EE900A0120F8EE600A8DF8020020EE0F +:10036000800A87ED000A02206AE00FF6281001F0EB +:10037000FFFDE88A0DF1030201A901F060FE60B9FA +:100380000FF62C1001F0F4FD9DF803209DF80410E9 +:100390000FF6301001F0ECFD5CE00FF6441029E0A0 +:1003A00000F05CF888ED000A00F058F887ED000ACC +:1003B000707801F041FDB4F805100FF6401001F01F +:1003C000D7FD307804280CBF062005203070694620 +:1003D00001208DF8000002F03FFBB4F80500E88230 +:1003E000B4F8050002F0F3FC00280CBF0FF6501023 +:1003F0000FF6701001F0BCFD2CE0B4F80300001FF4 +:1004000021D040F2FD31401A11D0401E02D0C01F51 +:1004100007D01FE001208DF801000DF1010104203B +:100420000EE0D4F80700029002A9032008E0E0796A +:100430008DF806000520217A8DF807100DF10601D0 +:1004400002F00AFB06E0012002F030FDB0780A213C +:1004500001F041FD012004B0BDE8F081E07B00EE39 +:10046000100AB8EE400A70472DE9F8410FF6101057 +:10047000DFF820470088DFF82057DFF8206789B0D1 +:10048000ADF81A0001F088FD2078297850EA0102C1 +:1004900010D1DFF80C773A460621002002F020FD4B +:1004A00000F0BDF800F0C8F801460622384600F01A +:1004B00045FE2DE00129DFF8EC760BD1787940F08C +:1004C000C00078713A4606212E2002F009FD00F0A6 +:1004D000A6F81DE001281BD1DFF8CC0607904CF2EE +:1004E00022110891062207A9384600F027FEC120F4 +:1004F000307207AA222070720621AA20B072BB2097 +:10050000F072CC203073DD2070732E2002F0E8FCF6 +:100510000FF6084700F07EF80FF6104800F075F867 +:1005200000F078F800F071F8DFF88006017801201B +:1005300002F0FDFCDFF8781606F1110002F022FD52 +:1005400002F062FB0DF1160006A90190009105ABC7 +:1005500007220021012002F0FFFD06F1100002F049 +:10056000F1FE06F111010091431EBDF81810BDF80F +:100570001400DBB2002202F007FC0DF11A0000901B +:100580000223BDF81610BDF81400DFF8FC65002248 +:1005900002F0FAFB02220221002001F083FD02F0AA +:1005A000FCFFDFF810060078307002F06CFDDFF819 +:1005B000080601787170DFF804160878DFF8001675 +:1005C000F070082070711020B071DFF8F805027823 +:1005D000DFF8F4053271029208220B68B3600092D2 +:1005E000039300230078F278B0702D7821780D43C2 +:1005F000102101910495717802F05EFDB07808B188 +:1006000002F003FE0AB0BDE8F08142461021082046 +:1006100002F066BC3A461021182002F061BC7879DD +:10062000307238797072F878B072B878F072787881 +:10063000307338787073704780B5DFF890150A68AA +:1006400012F1010F0ED0DFF888054B6802701B0A0B +:10065000120A427049688170C370190A01711B0C3B +:10066000437102BD002003F029F808B90FF6A42059 +:1006700002BD00000021012000F036BF012002F081 +:100680001FBC00002DE9F841DFF84855DFF80C45A4 +:100690002878DFF81C75FF26012887B010D10FF2EB +:1006A000E460016839604168796000F080F80120F9 +:1006B000A0700D218320E07021706670002010E092 +:1006C000022811D106220FF2C461384600F036FD2F +:1006D00000F06DF80D20207066700120A0700020E1 +:1006E000E0706060A060A081FFF7BEFE2878DFF8B0 +:1006F000E864DFF89454012806D103F020F803F0F1 +:100700000AF90020288313E0022815D103F036F9F6 +:1007100003F0C0F903F02CFA022068760120287655 +:100720000D20A876022028761820E8760320287667 +:1007300080203080A020708005F18008378876887E +:1007400098F8010001F078FB012088F8000004F11E +:10075000100002F0F7FD002106910591C0B2297E3C +:10076000039105F1190204F1100101900492029124 +:1007700000200090DFF82014DFF818240B781078A0 +:10078000034332463946002002F034FC21460E2055 +:1007900002F028FD40B998F80100DFF8401408B0D5 +:1007A000BDE8F04101F097BB08B0BDE8F081092039 +:1007B0002074394604F1110002F0E4BB18B5DFF8EB +:1007C0002004007887B040B902F002FC002814BF72 +:1007D0000FF2E4500FF2BC502CE0012837D1DFF8C3 +:1007E000BC4304F1100002F0ADFD0022DFF89813C5 +:1007F00006920592009201F11903097EDFF8942315 +:100800000391C0B204F11001029104930190DFF84A +:10081000881310780B78DFF8CC13DFF8CC430A8804 +:1008200021880343DFF8C403007802F0E3FB30B90A +:100830000FF2A45008B0BDE8104001F099BB08B019 +:10084000BDE8104001460FF2B45001F091BB08B072 +:1008500010BD000030B585B001A80FF2C451DFF81B +:100860009053102200F07AFC28888DF81000000ABE +:100870008DF8110002F091FED649C2480A7800EBCB +:100880004203991FDB48DC4B00781B7801280246A5 +:1008900004D10091294602F0CEF906E0022805D1E4 +:1008A0000091012201A902F0C6F90446E4B2002C2D +:1008B0000CBF0FF27C500FF2985001F059FB05B0BD +:1008C00030BD0000B5480D210170FF2141700121AC +:1008D00081700021C170416081608181C4E50000A8 +:1008E000F8B58AB006A80FF28051C44D102200F06E +:1008F00035FCC34AA34910882E78DFF808E39EF838 +:1009000000E08DF824000A23000A8DF82500BE4877 +:10091000007813FB00F30B4401EB400003EB4607A8 +:10092000BA49BB4B0978BB4E1B883678A7F1160530 +:10093000B94F3F7801290DD1059501240A2504946A +:100940000395CDF808E00197009630F8060C02F008 +:10095000C1F90FE002290ED101220A240595049263 +:100960000394CDF808E00197009606AA30F8060C2B +:1009700002F0B0F90446E4B2002C0CBF0FF2F840CC +:100980000FF21C5001F0F4FA0BB0F0BD80B57E49B7 +:10099000C88A02F011FCBDE8024000280CBF0FF22B +:1009A00020500FF2445001F0E3BA000080B59B489C +:1009B000754A0178D08A02F09AFCBDE8024000280E +:1009C0000CBF0FF248500FF2705001F0D1BA000086 +:1009D00080B593486C4A0168D08A02F0A0FBBDE85C +:1009E000024000280CBF0FF278500FF2985001F02F +:1009F000BFBA000080B56F49087802F044FBBDE83B +:100A0000024000280CBF0FF298500FF2B85001F0CE +:100A1000AFBA000030B58348694A01786948136865 +:100A2000694D85B010220491072401786348019232 +:100A3000009402910278604C287821780393002377 +:100A400002F03AFB05B0BDE8304000280CBF0FF2C1 +:100A500090500FF2B85001F08BBA000080B502F050 +:100A6000E6FBBDE8024000280CBF0FF2C8500FF2B1 +:100A7000EC5001F07DBA000001F08EBA7CB5434E17 +:100A8000434D30684FF4FA74009403F0ABF800F073 +:100A90001BF803F0CBF884B2286803F0A3F800F049 +:100AA00013F803F0C3F881B23748C08A0023224606 +:100AB00003F0D9F8BDE8764000280CBF0FF2BC5017 +:100AC0000FF2E85001F054BA0022574B03F0FEB881 +:100AD00056495748574A80B5097800781278012955 +:100AE00007D1022808BF012A22D1BDE8014002F047 +:100AF00038BF022918D101284F4903D100204A806C +:100B0000888002E0032808BF8A80891C42F63720CB +:100B100003F00BF8BDE8024000280CBF0FF2B45000 +:100B20000FF2D45001F024BABDE8014003F028BA16 +:100B300001BD000003F03CBA0021082000F0D4BC45 +:100B4000012000F0F7BC012000F0FCBC10B5044609 +:100B5000616801F1080003F0B1FA00B101202070D2 +:100B600010BD0000354910B1012803D07047084678 +:100B700000F0CEBC084600F0D3BC0000A008032063 +:100B80003F120008B01700200C150020B4180020F8 +:100B9000B01800208617002085170020641300205D +:100BA0007017002078170020DDCCBBAA8717002023 +:100BB0009C17002021190020811700208217002097 +:100BC0008C17002083170020801700208075FF1FDE +:100BD000A8180020A21800201819002046E00100E3 +:100BE0002219002098170020941700208917002050 +:100BF000A6180020A3180020A4180020991800208F +:100C00009E1800209D180020981800209A18002097 +:100C1000A01800209B1800209C18002020190020FC +:100C200008190020841700200000F43FA8160020B7 +:100C3000A9160020AC1600205C180020FFFF0F0052 +:100C40000D0A0D2A2A20444953434F4E4E45435422 +:100C5000494F4E204556454E54205749544820434D +:100C60004C49454E54200A000D0A0D2A2A20434FB4 +:100C70004E4E454354494F4E205550444154452013 +:100C80004556454E54205749544820434C49454EFB +:100C900054200A004556545F5550444154455F5016 +:100CA00048595F434F4D504C455445200A000000C1 +:100CB000526561645F50485920737563636573734F +:100CC000200A000050485920506172616D20205464 +:100CD000583D2025642C2052583D202564200A00D0 +:100CE0005265616420636F6E66206E6F7420737549 +:100CF000636365657373200A000000004843495F21 +:100D00004C455F434F4E4E454354494F4E5F434F12 +:100D10004D504C4554455F5355424556545F434FE3 +:100D2000444520666F7220636F6E6E656374696FF1 +:100D30006E2068616E646C6520307825780A00004A +:100D400065786368616E67655F636F6E6669672C5F +:100D5000205375636365737366756C6C79200D0A37 +:100D60000D00000065786368616E67655F636F6E94 +:100D70006669672C204661696C6564200D0A0D0068 +:100D800040030000503250535256310048525354E1 +:100D90004D0000006E6F6E20646973636F7665723C +:100DA00061626C652C205375636365737366756C43 +:100DB0006C79200D0A0D00006E6F6E2064697363FC +:100DC0006F76657261626C652C204661696C656442 +:100DD000200D0A0D000000007365742064697363C0 +:100DE0006F76657261626C652C2053756363657301 +:100DF0007366756C6C79200D0A0D000073657420A4 +:100E0000646973636F76657261626C652C204661FC +:100E1000696C656420307825780D0A0D00000000AB +:100E20008FE5B3D52E7F4A982A487ACC000000007F +:100E300041646420736572766963652C2053756321 +:100E40006365737366756C6C79200D0A0D00000084 +:100E500041646420736572766963652C204661691C +:100E60006C6564200D0A0D0019ED82AEED214C9DDC +:100E70004145228E00000000416464206368617275 +:100E8000616374657269737469632C20537563635D +:100E900065737366756C6C79200D0A0D0000000097 +:100EA000416464206368617261637465726973741C +:100EB00069632C204661696C6564200D0A0D000091 +:100EC000536C6176655F73656375726974795F727F +:100ED000657128292C205375636365737366756C7F +:100EE0006C79200D0A0D0000536C6176655F7365A7 +:100EF0006375726974795F72657128292C20466167 +:100F0000696C6564200D0A0D000000005061697273 +:100F1000696E675F436F6E6669726D5F416E73776E +:100F2000657228292C205375636365737366756C2D +:100F30006C79200D0A0D000050616972696E675F5F +:100F4000436F6E6669726D5F416E737765722829B3 +:100F50002C204661696C6564200D0A0D00000000BC +:100F6000506173735F4B65795F5265737028292CEC +:100F7000205375636365737366756C6C79200D0A15 +:100F80000D000000506173735F4B65795F526573AC +:100F90007028292C204661696C6564200D0A0D00BB +:100FA000494F5F4361706162696C69747928292CCB +:100FB000205375636365737366756C6C79200D0AD5 +:100FC0000D000000494F5F4361706162696C697494 +:100FD0007928292C204661696C6564200D0A0D0072 +:100FE0007365745F61757468656E74696361746953 +:100FF0006F6E5F72657128292C205375636365736A +:101000007366756C6C79200D0A0D00007365745F52 +:1010100061757468656E7469636174696F6E5F721F +:10102000657128292C204661696C6564200D0A0DC4 +:1010300000000000436C6561725F736563757269DF +:1010400074795F646228292C205375636365737318 +:1010500066756C6C79200D0A0D000000436C6561AB +:10106000725F73656375726974795F646228292C95 +:10107000204661696C6564200D0A0D00424C455F95 +:101080005356435F4C324341505F436F6E6E5F5522 +:10109000706461746528292C2053756363657373CC +:1010A00066756C6C79200D0A0D000000424C455F9E +:1010B0005356435F4C324341505F436F6E6E5F55F2 +:1010C000706461746528292C204661696C65642010 +:1010D0000D0A0D004852535F557064617465436892 +:1010E00061722C205375636365737366756C6C79DC +:1010F000200D0A0D000000004852535F55706461D6 +:101100007465436861722C204661696C6564200DCA +:101110000A0D0000000000000000000012345678A4 +:101120009ABCDEF0123456789ABCDEF0FEDCBA09C6 +:1011300087654321FEDCBA098765432162B38B07CB +:1011400008D0521E11F8013B00F8013B00F024804A +:101150008B07F6D1830740F0208000BF103A07D3F9 +:1011600030B4B1E83810103AA0E83810F9D230BCE9 +:10117000530724BFB1E80810A0E8081044BF51F895 +:10118000043B40F8043BD20724BF31F8022B20F87F +:10119000022B44BF0B7803707047121F17D35B00FC +:1011A00009D151F8043B20F8023B1B0C121F20F818 +:1011B000023BF6D20BE051F8043B00F8013B1B0A5E +:1011C00020F8023B1B0C121F00F8013BF3D238BF82 +:1011D000121D521E24BF11F8013B00F8013BF8D844 +:1011E0007047B1F5807F02D34FF0FF307047017038 +:1011F000012070470078401E8041C043C00F7047F7 +:101200007FB50C466D4D61686D4EE86129622846D8 +:1012100002F080FF246805F1240002F085FF74606D +:1012200006F1080002F080FF01203070296829B122 +:101230000FF2551000900294684688477FBD1FB595 +:101240005F4C04F1080002F072FF00BB2178F1B19D +:10125000694604F1080002F093FF5848C16949B19A +:101260000098029001228DF8042001A888479DF87B +:10127000040000E001202070207818B1009803F0ED +:1012800034F804E0009904F1080002F059FF04F179 +:10129000080002F04CFF28B9207818B104F10800CA +:1012A000FFF74AFC1FBD2DE9F8430646002000F079 +:1012B0005FF874883088B268DFF80081C4F30904ED +:1012C00044EA8024F068A4B2C1B2204600F03CF8A1 +:1012D000002748F2E8094846FFF735FC08E068882F +:1012E000A04202D1316928780870687800B10127DE +:1012F00008F1240002F01BFFF0B9694608F1240050 +:1013000002F03EFF009800F10B05407A0F28E6D06E +:10131000B5F80110A1420DD10098817AC81E7169FB +:10132000C0B28842C8BF0846706102463069E91CF5 +:10133000FFF704FF2878D9E73800CCD0012000F06F +:1013400017F80020BDE8F28310B513461C4A546814 +:10135000A4F80900E1720A46194604F10C00FFF7EF +:10136000EDFE164A1369BDE8104000210020184721 +:101370001249096A82B008B921B101E011B1012016 +:1013800002B0084702B0704710B50146487A0F28EE +:1013900018BF0E2807D10B4802F0DCFEBDE8104054 +:1013A0000020FFF7CDBB064C04F1080002F0D2FE8E +:1013B00004F10800BDE81040FFF7BEBBEC170020A9 +:1013C0006C180020101800200C48002101604160BA +:1013D000704710B500F00CF85C6819B1012904D110 +:1013E000204301E024EA0000586082F3108810BD19 +:1013F000EFF3108272B6014B70470000C81800204E +:101400002DE9FC47604CDFF88491A5692840A06174 +:101410004FF0FF3A21694FF0010834E0521C54F8B4 +:101420003200616919400142F8D0616904EBC206DB +:10143000084071681840014208BFC6F804A07768E8 +:10144000384000F0A5F8606208FA00F08743776042 +:10145000EFF3108172B6626A206908FA02F2D24391 +:1014600010402061022004EBC00353F8086C1640C2 +:10147000401E43F8086CF6D181F31088606A59F871 +:10148000201088472169A36960690140194205D08D +:10149000E069216A084208BF0022C0D0C4F824A035 +:1014A00002F071FFEFF3108972B6216960690140A3 +:1014B000A069014201BFE169206A014203F06FF8AF +:1014C00089F3108803F07CF8A561BDE8F38738B58F +:1014D0001446EFF3108572B600F05AF82B4941F824 +:1014E000204085F3108831BD10B500F00BF804439F +:1014F0001C6153F83140204343F83100FFE782F389 +:10150000108810BDEFF3108272B61F4B1C69704734 +:10151000EFF3108172B61C4A536923EA000005E01C +:10152000EFF3108172B6184A53691843506181F382 +:1015300010887047EFF3108172B6134AD3691843CD +:10154000D061F4E7F8B5104C666A256A374616F1A3 +:10155000010F0EBF0026012101FA06F6206202E00B +:10156000304603F01DF8216AE0690842F8D067624E +:10157000EFF3108172B6E269206A8243E26181F37F +:1015800010882562F1BD00003C130020901500205A +:1015900002460020110C090404BF1020120412F0AE +:1015A0007F4F04BF083012020FF2180112F0704F83 +:1015B00004BF001D1201120FC0F11F00895C401A08 +:1015C000C0B27047040302020101010100000000E3 +:1015D0000000000003F04BF89DF80E0005B000BDC0 +:1015E000F8B500F10C026B4625214FF66640F1E795 +:1015F000F8B500F10C026B460F214FF66840E9E7A1 +:10160000F8B502466B460E214FF67540E2E770B51D +:101610001B491C4B0A681C49C2F30D0201EB8201F5 +:101620000C6822689A4205D16569A169E269E3689C +:10163000246904E025696169A2696368A4682E0EC3 +:10164000067001722E0C467042722E0A8670C473A8 +:10165000C5F3031605F00F050571C6700D0E457133 +:101660000D0C85710D0A190E8172C571190CC172AC +:101670001B0A210E41730373210C8173002070BD7E +:101680003C400058B95646A900000320F8B503F0C5 +:101690003DF802F079FE00F0C7F8AA4CAA4804F51C +:1016A000D075A86304F5EC7003F060F808B100F0A1 +:1016B00082F9A64820604FF4165060600020A060B8 +:1016C000E06020610C2060610020A0612062606207 +:1016D000A0626066204603F081F808B100F06BF963 +:1016E0000021204603F02DFF08B100F064F900212D +:1016F000204603F031FF08B100F05DF9204603F009 +:1017000003FF08B100F057F904F1F0069048306289 +:1017100004F588774FF4E13070620020B062F06227 +:1017200030630C2070630020B0634FF40040F0631E +:10173000002030647064B064384603F04FF808B19C +:1017400000F039F90021384603F0FBFE08B100F043 +:1017500032F90021384603F0FFFE08B100F02BF902 +:10176000384603F0D1FE08B100F025F97948286029 +:10177000002068600F20A86047F6FF70E860002036 +:101780002861A861E8616861284603F039FF08B163 +:1017900000F011F9704868620020A86204F5E27058 +:1017A00003F0D2FF08B100F006F902F015FE402167 +:1017B0006A4803F0E9FF0FF2042000F0D9FB00F0C3 +:1017C000A1FC0A220FF20C216548FFF7B7FCFEF7D7 +:1017D00033FF014606226348FFF7B0FC6249182038 +:1017E0000870624932680A6001206149614A0870E4 +:1017F000002111704FF084425F486049026001206F +:101800005F4A0A6000215F4A10705F4A10705F4AA9 +:1018100010705F4A5F48117001215F4A10605F4A93 +:10182000117002F0BBFEFCE710B5AEB01CA8482159 +:1018300004F022F801A81C2104F01EF808A8502189 +:1018400004F01AF804F01CF85548016821F018015A +:10185000016007215348026822F4C06242F400721A +:1018600002604FF48032006800F4C06000904FF4D2 +:10187000807400981C9101201E900021402020902F +:101880001D9227911F941CA804F00BF808B100F0DA +:1018900092F86F20019002210020029103900490A1 +:1018A000059006900790012101A804F0ACFA08B158 +:1018B00000F081F800210E910F9143F6032008906B +:1018C0004FF0805116914FF48040199000211A91E9 +:1018D0001B91189408A804F06FFC08B100F06BF895 +:1018E0002EB010BD01B54FF6FF73012269460020EE +:1018F00004F0F8FD009802BD38B504460A464FF6DC +:10190000FF732146022004F0EDFD054621460FF24B +:10191000D00000F02DFB284632BD80B520B10F4924 +:101920000FF2C80000F024FBBDE800500FF20D03D9 +:101930001D490122022004F0BDBD00001A480078B4 +:1019400003F035BF08100020000C00580080004054 +:1019500000380140002800400010005830170020D7 +:101960009C17002070170020871700209017002078 +:1019700022190020891700209417002098170020B2 +:10198000000040422119002081170020821700200A +:101990008317002007B201008C1700208017002059 +:1019A00090000058000400582419002080B500F071 +:1019B000BFFB002002BD72B6FEE70000415420428A +:1019C0004C4520736572766572207374617274730E +:1019D0000A000000415420736572766572000000B1 +:1019E000202054583A20257300000000202052582F +:1019F0003A2025730D0A0000002204F0C7BD0268DA +:101A0000531C036011707047DFF83C150A6892B2EE +:101A100000E00246086880B28242FAD170472DE9A0 +:101A2000FC4104461825DFF82485DFF82465684367 +:101A300008EB00073078062808D1317871703470CF +:101A400078754FF0FF307060002039E000F077F8D3 +:101A5000B9680918B96008F10803B96832786A43AF +:101A60009A589142327813D308F1150315FB02FC02 +:101A700013F80C30062B25D008F108066B43F358F9 +:101A8000994222BF08F115036A439A5CEED219E02D +:101A90001146337869439A420BD008F1140308F1D8 +:101AA000150C5B5C15FB03F50CF805407A753B756E +:101AB00000E07A7508F11402545431787170347072 +:101AC000BDE8F6811146694308F115035B5C062BFE +:101AD00004D008F1140615FB03F574557B753A75AF +:101AE00008F115025454EBE7F8B5DFF86434DFF879 +:101AF0005C541E78182402466243B0422A4404D142 +:101B000018785870507D18700FE0167D507D92F84F +:101B100015C005F115076643062807F806C004D06E +:101B2000167D143514FB00F42E550120107318781F +:101B3000062802BF00294FF0FF315960F1BD10B5F2 +:101B4000DFF80C44606810F1010F0FD0FFF75CFF65 +:101B50006168DFF80024814261683CBF5388C9187E +:101B6000081A517848431178C84000E0002080B23C +:101B700010BD2DE9F84FDFF8DC53DFF8DCB3D5F802 +:101B80000880D8F80000DBF800104A0500F090F952 +:101B9000DFF8BC63DFF8B4A321F4806181604FF00B +:101BA000180934780AF1080019FB04F14758FFF7C7 +:101BB000C6FF874217D200270121B170062C3DD005 +:101BC00019FB04F40AF108010AF1080209598142DB +:101BD00023BF0AF108010959091A002111510AEB22 +:101BE00004014C7DEAE7A9884118B94202D2AF88C6 +:101BF0000021E2E73F1ADFE7022802DA287801280D +:101C000000D07F1ED8F80000C1684A07FAD500F05E +:101C100055F9DBF80C00000CBFB247EA0047CBF8DF +:101C20000C70FFF7F1FE7060A8680068816841F4ED +:101C300080618160AFF30080BDE8F18FB8B2002809 +:101C4000DAD1FFF7E1FE70600320BDE8F24F04F047 +:101C500035BD2DE9F843EFF3108872B6BD4DBB4B8F +:101C6000A8680168CA224A6253204862B84A886854 +:101C700020F48060886018201678374647431F4458 +:101C8000387B022826D13C68D7F810909078F0B1C4 +:101C90007A7B012A0AD101213046FFF725FF88F31C +:101CA00010887968304600F016F904E088F310884F +:101CB000304600F0C1F8A8680068CA214162224697 +:101CC000532141624846314600F050F90BE0FFF7DE +:101CD00050FF06E0C8684207FCD500F07EF89F4937 +:101CE000086088F31088FF21A86802685162BDE887 +:101CF000F183F8B5974CA160CA2209684A62532261 +:101D00004A62954A136843F020031360136803F096 +:101D10000703C3F10403237095682D0C05F07F05BC +:101D20006D1C6570EDB29268C2F30E02521C6280A7 +:101D300092B2521E6A43A2F5A072DA404FF6FF73C8 +:101D40009A422CBFA380A280854A136843F40023E3 +:101D50001360844B1D6845F400251D6048BB7C481A +:101D60007A4E0123837018254FF0FF334360002320 +:101D70005FFA83FC06F10C0715FB0CFC4FF0000E1C +:101D800007F80CE05B1CDFB2062FF1DB06230370C3 +:101D9000886820F48060886000F01FF8D06003201D +:101DA00004F097FCA1680868826842F4804282606F +:101DB00005E0C868410544BF032004F07FFCA1682A +:101DC0000A68FF20506200220321032004F02AFC4D +:101DD000BDE8F240032004F043BCC86800F0800076 +:101DE00060F49060C8604FF400207047F0B504467E +:101DF0000025EFF3108672B61827DFF850C10CF1FA +:101E00000C0007FB05FE10F80E0010B16D1C062D2E +:101E1000F5DB062D0CD06F430CEB07000127077391 +:101E200086F310880461427303600D700020F0BDDA +:101E300086F310880120F0BDF8B50746EFF3108453 +:101E400072B6032004F017FC424DAE683068CA2118 +:101E500041623A4653214162182043494243895C1A +:101E600002291BD100213846FFF73EFE3848017891 +:101E700006290ED1306838490A68530500F018F871 +:101E800021F480618160C1684A07FCD500F016F832 +:101E900004E04078884218BFFFF76BFEA9680A6823 +:101EA000FF205062032004F0DBFB84F31088F1BDB7 +:101EB00002D5C1684A07FCD481687047C16801F047 +:101EC000800161F49061C1604FF4002023490860F3 +:101ED000032004F0FEBB2DE9F04180460F46424648 +:101EE00018201A4942438C18207B022804BF404620 +:101EF000FFF7A2FFEFF3108572B6032004F0BBFBDF +:101F0000144EB0680068CA21416253214162022028 +:101F10002073A76067604046FFF781FD0C490A788F +:101F20004978914202D0FFF724FE02E0A168081A26 +:101F3000A060FF20B1680A685062032004F090FBA3 +:101F400085F31088BDE8F081282800407C1400202B +:101F5000001900208C180020082800400C080058A8 +:101F60000008005880080058881400201047704767 +:101F70000EB4C0B5024603A800210190009101AB48 +:101F80000121044878440C3004F0C0FB06BC5DF825 +:101F900010FB00BF3782000000B587B000F03DF8AD +:101FA000012003220690ADF80420ADF8062000F0D1 +:101FB000A3F800284CBFFF209DF8000007B000BD2B +:101FC000182201A805F073BBADF806100820704771 +:101FD00078B5C7B004460D461646032200F026F831 +:101FE000ADF81C40ADF81E50ADF8206000F018F8B8 +:101FF0002221FFF7E9FF062100F009F800F07AF846 +:1020000000284CBFFF209DF8000048B070BDADF81F +:102010000400049107A80321704700208DF80000F8 +:102020001822002101A805F042BB092200216846C0 +:1020300005F03DBB1822002102A805F038BB70B5A1 +:10204000C8B006460C4615460522FFF7EFFFADF86F +:102050002060FFF7EFFF302100F014F80521049015 +:1020600000F019F8002848BFFF2009D49DF80000AF +:1020700030B99DF8030020709DF8040028700020FE +:1020800048B070BDADF80A1008200221ADF8080074 +:10209000059108A870470791CDF818D0002102A833 +:1020A000FFF701B900B5C7B000F00EF8FFF788FFE1 +:1020B000312000F013F800F01FF800284CBFFF207B +:1020C0009DF8000047B000BD00238DF81C008DF87E +:1020D000003007A84170827000217047ADF80600FB +:1020E00007A9032004900822012003910690ADF86F +:1020F0000420704703900691CDF814D0002101A868 +:10210000FFF7D1B810B5DFF8B04A4021201D03F029 +:10211000B3FB402104F1440003F0AEFB402104F185 +:10212000840003F0A9FB15202070002010BD0000E2 +:102130002DE9F0472DED048B94B0064602223AA11A +:1021400005F0BFFA01240028DFF86C5A11D130469F +:1021500001F0F8F8022803D1002028700024A4E040 +:10216000032232A100F06BFC002802BFF61C287885 +:10217000152840F00D840027DFF8409A59F827A071 +:10218000504601F0DFF80246514600F058FC78B1A5 +:102190007F1C152FF2DB95F80090B9F1150F00F0B8 +:1021A000F78300F04FFC22A700F047FC40B90CE099 +:1021B0002F70287859F8200001F0C4F80644EAE7A7 +:1021C0001CA700F03AFC00286FD139788DF8001078 +:1021D00006F1010A9DF80010002900F0CC83A9F156 +:1021E0000100132814A715A600F2C583DFE810F03C +:1021F0001400A3038002FB021903DB00F4000D01AD +:102200007D009B002901640078013B015A01970180 +:102210007203AF01F5013D023F2911D105F14400E0 +:1022200005F09EFB8DE300BF4154000041542B009C +:102230003F0000003D000000307800002C0000004E +:102240003D2932D100F0F5FB002420B100F0E3FB82 +:102250008DF8040000E001249DF80400C01E05284C +:102260001AD200F0F4FB20B100F0DAFB8DF8050083 +:1022700000E0012400F0EBFB20B100F0D1FBADF851 +:10228000060000E0012400F0E2FB20B100F0C8FBF2 +:102290008DF8080000E001249DF804000828A8BF7C +:1022A000012400F0D4FB08B1012471E3002CFCD11F +:1022B00001A805F01BFA5CE33F29F6D03D29F4D1D3 +:1022C00000F0B7FB002420B100F0AAFB8DF801005C +:1022D00000E0012400F0BBFB0028E5D1002CE4D194 +:1022E0000DF1010005F076FA43E33F2904D105F131 +:1022F000440005F0E4FB24E33D29D6D100F099FB2E +:10230000002420B100F08CFB8DF8010000E00124D6 +:1023100000F09DFB0028C7D1002CC6D10DF10100B3 +:1023200005F035FA25E33F2904D105F1440005F015 +:10233000C9FB06E33D29B8D100F07BFB002420B1A6 +:1023400000F069FB8DF8040000E0012400F07FFB41 +:1023500020B100F065FB8DF8050000E0012400F0DD +:1023600076FB20B100F05CFB8DF8060000E0012454 +:1023700000F06DFB20B100F053FB8DF8070000E08A +:10238000012400F064FB18B100F04AFB029000E069 +:10239000012400F05CFB0028BDD1002C6BD101A80A +:1023A00005F0FEF9E5E23F2952D03D2963D100F066 +:1023B00040FB002420B100F033FB8DF8010000E069 +:1023C000012400F044FB0028A5D1002C53D10DF1CD +:1023D000010005F0C5F9CCE23F2939D03D294AD1A9 +:1023E00000F027FB002420B100F01AFB8DF801005B +:1023F00000E0012400F02BFB00288CD1002C3AD106 +:102400000DF1010005F0B1F9B3E23F2904D105F166 +:10241000440005F037FC94E23D292CD100F009FB83 +:10242000002418B100F0FCFA019000E0012400F053 +:102430000EFB00286AD1002C1DD101A805F09EF9E1 +:1024400097E23F2904D03D2915D100F0F2FA002887 +:1024500000F09E8200F0E4FA8DF801000DF1010019 +:1024600005F0B3F985E23F2904D105F1440005F0F8 +:10247000EEFA66E23D2940F08B8200F0DAFA40B1D4 +:1024800000F0B9FA04469DF80100062818BF44F090 +:10249000010400F0DCFA00F0C7FAECD101A805F065 +:1024A0009EF966E23F2904D105F1440005F0E7FA00 +:1024B00047E23D29DFD100F0BCFA40B100F09BFAC1 +:1024C00004469DF80100062818BF44F0010400F0FE +:1024D000BEFA00F0A9FACED101A805F08BF948E2C6 +:1024E0003F2904D105F1440005F0E5FA29E23D2930 +:1024F000C1D100F09EFA002420B100F091FA8DF8CD +:10250000010000E0012400F0A2FA00287FF4CCAE24 +:10251000002CB0D10DF1010005F07EF929E23F2930 +:1025200004D105F1440005F0E2FA0AE23D29A2D106 +:10253000504600F007FF401C152880F029825146C4 +:1025400001A800F01FFD01A805F06CF911E23F2978 +:1025500044D03D298FD100F06CFA002420B100F066 +:102560005FFA8DF8080000E0012400F070FA20B155 +:1025700000F056FA8DF8090000E0012400F067FA37 +:102580005FEA00081FD00222394605F09AF858B9D0 +:1025900040208DF84A000DF14A020DF10A01404633 +:1025A00005F0D8FA04430FE000F030FAADF804006B +:1025B0000DF10A0102208DF84A0001A802780A7084 +:1025C00042784A7000E0012400F041FA00F02CFA51 +:1025D00053D102A805F036F9CBE13F2900F0D881AC +:1025E0003D294AD100F025FA002420B100F018FA64 +:1025F0008DF8040000E0012400F029FA20B100F079 +:102600000FFA8DF8050000E0012400F020FA5FEADF +:10261000000820D00222394605F053F858B940206E +:102620008DF846000DF146020DF10601404605F019 +:1026300091FA044310E000F0E9F9ADF802000DF161 +:10264000060102208DF846000DF1020002780A70A2 +:1026500042784A7000E0012400F0F9F900F0E4F952 +:102660000BD101A805F0FBF883E13F2904D105F166 +:10267000440005F04FFA64E13D2940F0898100F003 +:10268000D8F900249FEDA88AF1EE0E8A60B100F01F +:10269000BAF900F0ABF907DBB4EE480AF1EE10FA34 +:1026A00048BF8DED010A00D4012400F0D0F998B1A3 +:1026B00000F0A9F900F09AF90EDBB4EE480AF1EE49 +:1026C00010FA09D5DDED010AB4EE600AF1EE10FA58 +:1026D000A8BF8DED020A00DA012400F0B8F9002845 +:1026E0007FF4E2AD002CC8D101A805F0D1F840E19B +:1026F0003F2904D105F1440005F008F921E13D2905 +:10270000BBD100F096F9002420B100F089F98DF8D2 +:10271000040000E001249DF80400002836D1314671 +:1027200005F0B2FA20B100F07BF98DF8050000E069 +:10273000012400F08CF9DFEDAC8AB3EE049A80B18D +:1027400000F061F9B0EE408AB4EE498AF1EE10FA79 +:1027500007DBB4EE688AF1EE10FA48BF8DED028A0D +:1027600000D4012400F073F9B5EE408AF1EE10FABE +:102770002ED000F048F9B4EE490AF1EE10FA27DB4A +:1027800000F034F924D58DED030A22E0012808D1A8 +:1027900000208DF805004FF084400290DFF83C04E3 +:1027A00014E0022808D100208DF80500DFF830047D +:1027B0000290DFF8300409E0032809D100208DF8E9 +:1027C0000500DFF824040290DFF82004039000E005 +:1027D000012400F03CF9002874D1002C75D101A827 +:1027E00005F072F8C5E03F2904D105F1440005F079 +:1027F000A5F9A6E03D2968D100F01BF9002420B11D +:1028000000F00EF98DF8010000E0012400F01FF93E +:10281000002857D1002C58D10DF1010005F06FF8B8 +:10282000A7E03F2900F0B4803D294ED100F001F926 +:10283000002420B100F0F4F88DF8040000E0012439 +:1028400000F005F920B100F0EBF88DF8050000E08C +:10285000012400F0FCF820B100F0E2F88DF8060049 +:1028600000E0012400F0F3F820B100F0D9F8ADF851 +:10287000080000E0012400F0EAF820B100F0D0F8F0 +:10288000ADF80A0000E0012400F0E1F820B100F00A +:10289000C7F88DF80C0000E0012400F0D8F820B152 +:1028A00000F0BEF88DF80D0000E0012400F0CFF834 +:1028B00020B100F0B5F88DF80E0000E0012400F022 +:1028C000C6F800287FF4F0AC002C61D101A804F018 +:1028D0002DFF4EE03F2904D105F1440005F00BF92E +:1028E0002FE03D2954D100F0A4F8002488B100F075 +:1028F0008AF80020BE49C2B201EB8202D2ED000A82 +:10290000B4EE600AF1EE10FA10D0401CC2B2802A78 +:10291000F1D3012400F09BF80028D3D1002C37D14B +:1029200001A804F087FF24E001007A458DED010A3B +:102930008DF80800EEE73F2906D105F1440005F0C7 +:102940003DF88046002418E03D2921D100F071F8BF +:10295000002420B100F064F88DF8010000E00124AB +:1029600000F075F80028ADD194B90DF1010004F024 +:10297000D5FE04460CE03F290AD15FFA88F0002812 +:1029800006D105F14401484600F0E5F800F05AF898 +:102990002B78180086A687A10CD0152B0FF260208B +:1029A00007DA04B10146281D05F092F93146281DC9 +:1029B00004E00146281D05F08BF9314605F088F941 +:1029C000281D00F0BFFC81B2281DFEF795FF4021B5 +:1029D000281D02F051FF152014B028702046BDECD0 +:1029E000048BBDE8F087000001002046B4EE680AC1 +:1029F000F1EE10FA704706218DF801100DF1010279 +:102A000001A905F0A7B8002105F01CBB0022002198 +:102A1000404605F068BB00220021504605F063BB2C +:102A20000022002105F05FBB08B144F00104200042 +:102A300070473146504605F027B9012239463046E5 +:102A400004F03FBE402105F1440002F015BF3146BD +:102A5000002005F019B900002DE9FC4180465648D8 +:102A60000D46017801261529FDD14146062966DA71 +:102A700000F1840452A053A70278227052A6427833 +:102A80005C48627050F82110204605F021F94FA1F2 +:102A900005F01EF9B8F1050F42D8DFE808F003335E +:102AA0003331333500F052F800F04CF8394605F078 +:102AB0000FF96A7800F04BF800F044F8394605F059 +:102AC00007F995F8F7000228B8BFAA7824DB40A1DF +:102AD000684605F00BFB00F035F800260FF21817DA +:102AE00095F8F710F0B288421AD2A81CF1B2761C01 +:102AF000425C3946684605F0F9FA00F023F8EFE742 +:102B00002A6809E02A7807E000F020F800F01AF8B7 +:102B1000394605F0DDF86A7800F019F800F012F88F +:102B200023A1204605F0D4F800F00CFC81B2204629 +:102B3000FEF7E2FE06464021204602F09DFE3046AA +:102B4000BDE8F6816946204605F0C2B82A783146CC +:102B5000684605F0CBBA70B5044620000D4623D078 +:102B6000152C21DA144E1BA1301D05F0B1F81349C4 +:102B700051F8241005F0ACF817A1301D05F0A8F8A5 +:102B8000294605F0A5F80AA1301D05F0A1F8301D71 +:102B900000F0D8FB81B2301DFEF7AEFE04464021A6 +:102BA000301DFEF729FF00E00124204670BD000023 +:102BB0000D0A00004F4B0000B81300201C1200202B +:102BC0003C0000002C000000256400003D000000D7 +:102BD000307800002B0000003A0000000000404266 +:102BE000000090430000A0430000C84400007A4564 +:102BF000981000208013002025303278000000005B +:102C00004552524F5200000000B587B000208DF8A9 +:102C1000000000F0FEF840F20110ADF806003F227F +:102C20000120069000F03AF900284CBFFF209DF8E3 +:102C3000000007B000BD2DE9F84107460128C7B0E4 +:102C4000884615461E4608BF022003D002280CBF46 +:102C5000102000200DF11D010C1800F036F8012F96 +:102C60008DF81C7002D0022F18D019E002273A46C6 +:102C700041460DF11D0004F014FD2570667000F052 +:102C8000C8F83F204FF4817100F016F8FF1C04973C +:102C900000F006F9002805D5FF2009E01027E6E737 +:102CA000972005E09DF8000010B94E9800F067F8F5 +:102CB000FFE748B0BDE8F081ADF80400ADF80610BC +:102CC00007A803210390069170470322002168465C +:102CD00004F0EDBC2DE9F64F0C460546012CC7B0BB +:102CE0009B4608BF022003D0022C0CBF10200020FE +:102CF0000DF11F010E18FFF7E8FF012CADF81C5075 +:102D00008DF81E4002D0022C2CD02DE00227569CBC +:102D1000559DDDF85091DDF84CA1DDF848814899CA +:102D20003A4600F072F8A6F800B086F8028086F8FD +:102D300003A086F804907571B47100F06AF83F2022 +:102D4000ADF804004FF4827107A8ADF806100390A7 +:102D500003210A370497069100F0A2F8002805D550 +:102D6000FF2009E01027D2E7972005E09DF800003A +:102D700010B9579800F003F849B0BDE8F08FBDF8DE +:102D8000011001800020704730B5C7B01C464A9B37 +:102D900000F067F800258DF800508DF8214022469C +:102DA00019460DF1220004F07CFC00F032F83F20BF +:102DB0004FF4837100F060F8A41D049400F070F8E3 +:102DC00000284CBFFF209DF8000047B030BD00B583 +:102DD000C7B000F014F800F00EF80F21029140F295 +:102DE0000B10022100F052F800284CBFFF209DF884 +:102DF000000047B000BD182201A804F058BC002113 +:102E0000ADF81C008DF8001070470DF11F0004F0A4 +:102E100048BC1822002101A804F049BC78B5C7B00D +:102E20004C9C4D9D00F01DF800268DF821308DF84A +:102E300000608DF822402246294600F019F8FFF77D +:102E4000E8FF3F204FF4937100F016F8E41D04945E +:102E500000F026F800284CBFFF209DF8000048B085 +:102E600070BDADF81C00ADF81E108DF82020704725 +:102E70000DF1230004F015BCADF80400ADF8061008 +:102E800007A801210390069170470621ADF80600BE +:102E9000049107A801213F2203900691ADF8042078 +:102EA000CDF814D0002101A8FEF7FDB90FF22801DA +:102EB000084B31F8101053F82000012205F0FAB940 +:102EC0000FF21401034B31F8101053F820000022C8 +:102ED00005F0F0B9A8130020200001000200000056 +:102EE00018B50C46C7B0114600228DF800208DF8A9 +:102EF0001C008DF81D4022460DF11E0004F0D1FB90 +:102F000000F02AF83F200C21ADF80400ADF80610BF +:102F100007A8012103900691A41C049400F02CF84A +:102F200000284CBFFF209DF8000048B010BD00B540 +:102F3000C7B000F00AF80F2000F013F800284CBFCB +:102F4000FF209DF8000047B000BD00228DF8002052 +:102F50008DF81C008DF81D101822002101A804F026 +:102F6000A6BBADF8060007A9022004903F2201206D +:102F700003910690ADF80420CDF814D0002101A8EB +:102F8000FEF791B95FEA000C80EA01039B0715D1B7 +:102F9000830706D011F8013B00F8013BB3B183076A +:102FA000F8D10A68B2F1013323EA020313F0803F3B +:102FB00002BF40F8042B51F8042FF3E711F8013B4E +:102FC00000F8013B13B111F8013BF9E76046704787 +:102FD00000B587B000F09CF900F084F9812000F082 +:102FE00038F900F043F900284CBFFF209DF800009D +:102FF00007B000BD2DE9F84DC7B09446DDF840E1BB +:10300000519A559D569EDDF84CA1ADF81D108DF8D6 +:103010001C004FF0000BADF81FC08DF821308DF86B +:1030200022E000F024F800F017F824F8095F668029 +:1030300000F058F93F20832100F045F957440691EC +:103040000D37049700F015F900284CBFFF209DF8BC +:10305000000048B0BDE8F08D88F800A007AC549996 +:10306000E419524608F10100544404F01ABB8DF8EB +:103070002320174652998DF800B00DF1240809A8B5 +:10308000B84404F00EBB00B5C7B000F00CF88520C2 +:1030900000F0F5F800F0EAF800284CBFFF209DF89A +:1030A000000047B000BD00218DF81C008DF8001015 +:1030B000182201A804F0FBBA2DE9F841C7B04FF07F +:1030C000000800F026F80DF12300DDF844E14E9FE2 +:1030D0004F9E509D529C8DF81F30C0F800E08DF837 +:1030E00000808DF820708DF821608DF822508DF8C9 +:1030F000274000F0F7F88620ADF8060007A90C205D +:1031000000F0B0F800284CBFFF209DF8000000F050 +:10311000FCB88DF81C0007A841708270704700B59C +:10312000C7B00022ADF81C008DF800200DF11E0084 +:103130001822016001A8002104F0B9FA8820ADF836 +:10314000060007A9062000F08DF800284CBFFF20DC +:103150009DF8000047B000BDF8B5C8B005460E4662 +:1031600017461C4600F023F808A8467087708DF8B3 +:10317000205000F0A3F88A21ADF80A103F20032167 +:1031800000F08FF8002848BFFF200ED49DF8000003 +:1031900058B94F994E98BDF801202280BDF8032000 +:1031A0000280BDF805000880002049B0F0BD07226C +:1031B0000021684604F07BBA00B5C7B00021ADF825 +:1031C0001C00FFF773FF0F2102918D20022100F0F8 +:1031D0005FF800F04CF800284CBFFF209DF800007D +:1031E00047B000BD18B5C7B000F0A1F800F07AF8FC +:1031F0003F208E2100F090F800F03BF800284CBFF3 +:10320000FF209DF8000048B010BD00B587B000F069 +:103210007FF800F067F8922000F01BF800F026F825 +:1032200000284CBFFF209DF8000007B000BD00B58E +:1032300087B000F06DF800F055F8942000F009F820 +:1032400000F014F800284CBFFF209DF8000007B0E4 +:1032500000BDADF806003F2201207047ADF8060022 +:1032600007A9032004903F22012003910690ADF8A6 +:103270000420CDF814D0002101A8FEF714B8ADF851 +:10328000060007A901203F22039104907047032103 +:10329000ADF80600049107A801213F220390069192 +:1032A0007047ADF80800059108A807210490079120 +:1032B000CDF818D0002102A8FDF7F5BF1822002193 +:1032C00002A804F0F4B9ADF80400ADF8061007A8A0 +:1032D00001210390704700228DF80020ADF81C00FA +:1032E0008DF81E101822002101A804F0E0B900B5E5 +:1032F000C7B0FFF7F0FFA520FFF7B0FF00284CBFD5 +:10330000FF209DF8000047B000BD48B0BDE8F08147 +:1033100000208DF800007047ADF80400ADF80610ED +:1033200007A8012103900691641C04947047044689 +:1033300000208DF800008DF81C4022460DF11D0084 +:1033400004F0AFB900F10103810704D010F8011BAC +:1033500089B18107FAD10268B2F10131914311F0CC +:10336000803F04BF50F8042FF6E710F8011B11B19D +:1033700010F8011BFBE7C01A704770472DE9F84FA2 +:103380000446C4B06078FF284FF0000914D1B4F8A7 +:1033900003000FF2D82BDFF80C82834D001F0DF1D4 +:1033A000100A00F0D48040F6FD31401A21D0801E72 +:1033B00003D0103800F08180D1E00FF2F410FEF756 +:1033C000D7FDB4F807100FF20C20FEF7D1FDE88A04 +:1033D00040F64802FB21FEF7FBFD010004D00FF28E +:1033E0000420FEF7C5FDBAE00FF21C20FEF7C0FD79 +:1033F000B5E003260A25002705FB06F1414401EB51 +:10340000470131F8162CB4F80700921C90420CD1F9 +:10341000607BC1074FF0010948BF002003D480073B +:103420004CBF0220032000F0B3F87F1C042FE3DD23 +:10343000761C052EDFDD03250A2068434044002664 +:103440000090009900F09AF830D1B4F80B300FF2E8 +:10345000DC1032462946FEF78BFD0FF20020FEF706 +:1034600087FD4FF00109002705E004F10D0000F091 +:1034700080F87F1CFFB2B4F80B008742F5DB48A050 +:10348000FEF776FD8DF80D508DF80E60B4F80B0048 +:103490008DF80F00002003E004F10D0100F063F847 +:1034A000B4F80B108842F7DB00F071F8761C042E9C +:1034B000C7DD6D1C052D52DCBEE703250A206843DD +:1034C000404400260290029900F058F838D1637AFF +:1034D0000FF2AC1032462946FEF74AFD0FF27C107F +:1034E000FEF746FD4FF00109002705E004F10A0050 +:1034F00000F03FF87F1CFFB2607A8742F6DB28A01D +:10350000FEF736FD8DF80D508DF80E60607A8DF85F +:103510000F00002003E004F10A0100F024F8617AB2 +:103520008842F8DB04F10A00009101900023B4F80E +:103530000710B4F805000022FFF770FC00F027F830 +:10354000761C042EBFDD6D1C052D08DCB6E70120BE +:10355000FFF7ACFC95F882000A21FEF7BCFC484658 +:1035600045B0BDE8F08F095C0AF80010401CC0B2FD +:1035700070473946C25D5846FEF7FABCB4F80700FA +:1035800001EB460131F8162C521C90427047042082 +:103590008DF8050103A800F0BDBC044800F086BD0D +:1035A000200D0A00B01700200C1500207D33000804 +:1035B0004556545F424C55455F4154545F4558430E +:1035C00048414E47455F4D54555F52455350200A80 +:1035D000000000004D54555F73697A65203D202539 +:1035E00064200A007365742064617461206C656EE8 +:1035F00067746820636F6D6D616E64206572726FB1 +:1036000072202578200A000073657420646174615B +:10361000206C656E67746820636F6D6D616E6420E9 +:1036200073756363657373200A0000005752495431 +:103630004520434841524143207376633A20256434 +:1036400020636861723A202564202D204C454E4746 +:103650005448203D202564200A000000526563651F +:103660007074696F6E203A2000000000446174613C +:103670005B25785D203D2030782578200000000013 +:103680005752495445205045524D495420524551B6 +:1036900020434841524143207376633A20256420F9 +:1036A000636861723A202564202D204C454E4754B2 +:1036B00048203D202564200A0000000001460648FD +:1036C000064AC3798B4218BF904218BF0838F8D118 +:1036D0008B4218BF00207047F873FF1F0070FF1F58 +:1036E0001FB541780024FF2902BFB0F8032040F63F +:1036F00001418A4220D1624A9388B0F807109B1C8E +:10370000994209D1407B0124C10752BF8DF8004086 +:1037100000218DF800100CE05288521C91420BD110 +:1037200003218DF80010B0F80B208DF808200D3023 +:103730000190684600F0A8F8204604B010BD10B50E +:103740008AB050484E4C00F0B1FC8F218DF8181013 +:10375000E520B3218DF819008DF81A10D5202E21FF +:103760008DF81B008DF81C107F204A218DF81D005C +:103770008DF81E1098202A218DF81F008DF820103A +:1037800048207A218DF821008DF82210CC2040218C +:103790008DF823008DF82410FE2000218DF82500DF +:1037A000ADF8261000940823012206A90220FFF795 +:1037B00042FA00F032F8412000F023F8A01C00F09B +:1037C00010F8062100F015F800F027F8422000F06C +:1037D00018F8201D00F005F8102100F00AF80AB0D2 +:1037E00010BD059001210491029100200A22019050 +:1037F0007047039200910223208806AA0221FFF756 +:1038000069BA8E218DF824008DF823100020FE2146 +:10381000ADF826008DF82510704719208DF8180096 +:10382000ED2182208DF81A008DF81910ED20AE21BF +:103830008DF81C008DF81B104C2021218DF81E00E6 +:103840008DF81D1041209D218DF820008DF81F104E +:10385000222045218DF822008DF82110704780B577 +:1038600092224FF64263984208D105480091022304 +:10387000818800880022FFF787FA0246104602BDC1 +:10388000F8180020E136000838B50546BEB02878A3 +:10389000394C20B1012804D0032805D030E00120A4 +:1038A00000E0002020702BE068680178012919D120 +:1038B0004078012808D102208DF801008DF8001011 +:1038C00000F020F80122A2706968487850B90121FF +:1038D00002208DF800108DF80100002100F012F890 +:1038E0000020A07068680178032909D14078012878 +:1038F00004BF0121A1706968487808B90021A1704E +:103900003FB030BD01208DF802108DF8F7006946F8 +:103910000020FFF7A1B880B50FF23102002110207E +:10392000FDF7D5FD144900220A70BDE8014080B5BD +:103930000020FFF7C5FA1048012141700021817075 +:103940000121C1700021017101BD00000A490879FF +:10395000401E8041C00F0871087808B1C91C07E0FB +:10396000704705480179491E8941C90F0171C11C81 +:103970004FF64260FFF773BFE8180020E0B505A0DE +:10398000042100908DF8041042F62920694604F0C5 +:10399000B3FC07BD53544D0038B5024686B050788D +:1039A0000024FF2839D1B2F803106B4840F60143D8 +:1039B000C91A1FD0123901BFB2F80710C088401CC5 +:1039C00081422AD1957AB2F80500537A0124012D5B +:1039D00008D10A320192009300220023FFF71EFA59 +:1039E000002015E00A320192009301228023FFF7A4 +:1039F00015FA12E04088B2F80710801C81420CD101 +:103A0000507B0124C10748BF8DF8084002D4022032 +:103A10008DF8080002A800F0A3F8204607B030BDDA +:103A2000FEB5014601AA487A8DF804004B7A088851 +:103A30005070DC0704D50888000A9070032300E06A +:103A40000223487A040707D54888D0545B1C48886D +:103A5000DCB2000A10555B1C4C7AE00610D50D7ADA +:103A600000200BE001EB4004DFB2A688D6555B1CBA +:103A7000A488DEB2240A94555B1C401CA842F1DBEA +:103A800001A935480091DBB2418800880022FFF788 +:103A90007BF9FEBD18B587B030482F4C00F006FB0F +:103AA00041F60D01ADF8181000940823012206A973 +:103AB0000120FFF7C0F842F63720ADF818000122C8 +:103AC00004920A20A11C0390002310220591029366 +:103AD00001930092072300F023F842F63820ADF856 +:103AE000180000220492029201920A20211D0390E4 +:103AF0000222059100F012F842F63920ADF81800C4 +:103B00000022049201920A20A11D039002230822A0 +:103B10000591029300F002F808B010BD0092012355 +:103B2000208806AA0121FFF7D5B880B5002242F609 +:103B30003723C01A09D0401E0BD10748009101233A +:103B400081880088FFF720F902E00846FFF768FF48 +:103B50000246104602BD0000F01800209939000806 +:103B6000007820B91D480021818001210173704730 +:103B700010B50FF2350200210220FDF7A8FC174C0A +:103B80000021042021732070214642F63820FFF7DF +:103B9000CCFF1F20E0720A20A0800120A0724FF409 +:103BA0008060E08010BD00000D480C490068CA7AB2 +:103BB00000F00700413048801307087B04D518B98E +:103BC0008888401D888003E0012804BF0020087316 +:103BD000891C42F63720FFF7A8BF00005C180020C0 +:103BE00028280040C0F3C75181B1FF2906D0C11079 +:103BF000400721F0E04101F16051704741020CBFE4 +:103C000040F4E0016FF000410020704700F00041F7 +:103C100000020AD0B0FA80FC00FA0CF001F1605109 +:103C2000A1EB0C5101EBD02140057047C1F30A53C1 +:103C300040F2FE329B1A14DDD3F120034FEAE17209 +:103C400008DDC90241EA505141F00040D8408018D7 +:103C50005040704703F2E13010B1D24382F000408F +:103C600070470020704730B5C7B00025ADF81C0084 +:103C700007A84A9C41808280ADF8223004818DF8EB +:103C8000005000F01EF80F21029140F281100A212D +:103C9000ADF80600049107A801213F220390069188 +:103CA00000F007F800284CBFFF209DF8000047B047 +:103CB00030BDADF80420CDF814D0002101A8FDF7E7 +:103CC000F2BA1822002101A803F0F1BCF0B540F2CD +:103CD000FF7581EA030C0CF0004C15EA11541DBF6E +:103CE00015EA1357AC42AF42E5E0BC41C1F3130102 +:103CF000C3F31303801A994143F4801304D2641E62 +:103D00004000494180185941C90241EA5051B1FB74 +:103D1000F3F603FB1611A2FB0675D7EBC020A941F1 +:103D200002D2761E80185941C90241EA5051B1FBB6 +:103D3000F3FE03FB1E11A2FB0E75D7EBC020A941B9 +:103D400003D2AEF1010E80185941890241EA905127 +:103D5000760546EA8E2EB1FBF3F603FB1611A2FBA5 +:103D60000675D7EB8020A94102D2761E80185941F2 +:103D7000C90241EA50514EEA060EB1FBF3F603FBCD +:103D80001611A2FB0675D7EBC020A94102D2761E00 +:103D900080185941C90241EA5051B1FBF3F703FBC6 +:103DA0001711A2FB0735D3EBC020A94167F100072B +:103DB0000CBF004247F0010766F3D5274FEA1E31DA +:103DC000B80814F5806412DDBD0775F1004250EBB0 +:103DD0000E5051EB045111F5801F5CBF41EA0C01FC +:103DE000F0BD4CF07F6141F0E0410020F0BDBD0727 +:103DF0006D0840EA0E5041F48011D4F10104B4F191 +:103E000020060ADAC4F120060200E04001FA06F3B7 +:103E1000E1401843B24015430EE0342C13DCC6F1E8 +:103E2000200445EA40056D0820FA06F2154321FA00 +:103E300006F0A1400D43002175F1004250F1000051 +:103E400051EB0C01F0BD00205FEA0C01F0BDCFB9D1 +:103E500092185B41B3FA83F704BFB2FA82F6BF1936 +:103E60000B3FB7F120062FBF02FA06F3BB40C7F1A4 +:103E7000200622FA06F638BF3343BA401CB1E419D3 +:103E8000641E33E77F4231F00041B1FA81F404BF90 +:103E9000B0FA80F6A4190B3CB4F120062FBF00FA4B +:103EA00006F1A140C4F1200620FA06F638BF3143DE +:103EB000A0403C1B1AE7AC421ABF05EA1357AF42B9 +:103EC00012E050EA41061CBF52EA4306BFE750EA3F +:103ED0004107304661461CBF41EA0551F0BD52EA38 +:103EE000430C08BFC143F0BD00204FF4001616EB91 +:103EF000410F98BF16EB430F08BF16EB410F24BFCD +:103F0000C14305E016EB430F0CBF61464CEA055177 +:103F1000F0BD000090F8F910042900D9704780B571 +:103F2000BEB0DFE801F00306090C11000FF2DC005F +:103F300007E00FF2FC0004E00FF2181001E00FF2AE +:103F40003810FEF715F819E041788DF800108278E6 +:103F50008DF80120C1788DF8F710002106E0421895 +:103F60000DEB010312799A70491CC9B29DF8F72034 +:103F70009142F4DB69460020FEF76EFD3FB000BDC4 +:103F8000F8B5194D19481A492B780078194D1A4C73 +:103F90002E78009100220A2111FB00F1214401EB4F +:103FA000460704EB400037F8161C30F8060C17E003 +:103FB000F8B5124912480B78124D134E29780E4C61 +:103FC0003578009000220A204143601800EB450735 +:103FD0000648057837F8161C04EB450434F8060C3F +:103FE000FEF7D2FEF1BD0000AA160020A8160020A0 +:103FF000AC160020A9160020B0170020EE160020F5 +:10400000F0160020EC160020ED1600206375737486 +:104010006F6D5F617070206E6F7469666963617443 +:10402000696F6E20656E61626C6564200D0A000028 +:10403000637573746F6D5F617070206E6F74696605 +:1040400069636174696F6E2064697361626C656431 +:10405000200D0A00637573746F6D5F617070206965 +:104060006E6469636174696F6E20656E61626C6510 +:1040700064200D0A00000000637573746F6D5F614A +:10408000707020696E6469636174696F6E206F720D +:10409000206E6F74696669636174696F6E2064690C +:1040A0007361626C6564200D0A00000018490A7F84 +:1040B00041F82200087F401C0877704770B504461D +:1040C0006078FF2802BFB4F8031001F47F41B1F516 +:1040D000406F12D100260E4D00E0761C297FF0B211 +:1040E00088420AD2F1B255F82110204688470100D3 +:1040F000F3D002D0022805D006E02046BDE870408B +:10410000FCF7E4B8002070BD012070BD0000000085 +:104110003C1800200249016002490161704700BF5C +:10412000E74100080D420008006040607047EFF36F +:10413000108172B6026882420CBF012000201CE090 +:10414000EFF3108272B603680B6048600160086884 +:10415000416023E0EFF3108272B6086043684B6061 +:1041600041604868016019E0EFF3108172B642685F +:104170000368136002684368536081F310887047D6 +:1041800010B5EFF3108472B602680A600068FFE7AA +:10419000FFF7EAFF84F3108810BD0B6082F31088EC +:1041A0007047000004F030B96C486D49016001F1BE +:1041B0002002426001F13002826001F13C020262A1 +:1041C00001F14402426201F14C02C26001F1540269 +:1041D000026101F17002426101F174028261803179 +:1041E000C16104F02FB938B504465E4D2846FFF78B +:1041F0009BFF5A484068A1680160E168C160856022 +:104200005949416004F03AF958482AE080B55348CA +:104210004268136801211972406804F035F90020E2 +:1042200002BD38B5514C4F4D04E000F041F8009804 +:10423000216888472846FFF77AFF0028F5D031BD6E +:104240004A484168084738B50446494D2846FFF7B3 +:104250006BFF4248C068A1680160456004F019F92D +:1042600044482168016061684160002032BD80B52A +:104270003A48C268136810211972C06804F00FF937 +:10428000002002BD35483B4AC168C1681368086810 +:10429000184738B5374C364D04E000F009F800985F +:1042A000616888472846FFF742FF0028F5D031BDF6 +:1042B00069462846FFF764BF38B504462E4D2846A8 +:1042C000FFF732FF2D48FFF72FFF24480069A16850 +:1042D0008160E168C16005612168016061684160D9 +:1042E000216941616169816131BD80B50146234821 +:1042F000FFF730FFBDE802400FF2050004F0DFB821 +:1043000038B5164C1D4D06E0FFF7D2FF0099206925 +:104310000069FFF71FFF2846FFF709FF0028F3D0C9 +:1043200031BD10B5164C2046FFF7FEFE0B48416923 +:104330000C60BDE8104004F0D6B81CB5104C06E087 +:1043400069462046FFF71CFF009800F01BF8204646 +:10435000FFF7EDFE0028F3D013BD0000000003209E +:10436000AC090320480A032090080320D818002035 +:10437000500A0320E0180020380A0320D01800203B +:10438000400A03207047704710B57649764C4FF4C9 +:1043900000400860606840010ED56068C0000BD422 +:1043A00001F06EFA01F06CFA206840F48030206071 +:1043B000216821F48031216000F07FF80020FFF7B0 +:1043C0007DF940B180796949E160E16821F47C516F +:1043D00041EA0021E16010BD10B5654C88B020684D +:1043E00020F07000206063480168C1F30320009052 +:1043F000009830B921680909090141F004012160E0 +:1044000008E000982168801E80F30400090940EA52 +:10441000011020600022206840F4004020605648CF +:1044200001680260CA21026902F050020261FF22A3 +:104430005248C1615321C1610168C908C9000160C6 +:10444000C2614F48016841F400410160FCF7BCFFC4 +:10445000606E4C49C008C00040F004006066002057 +:10446000FDF747FC04F065F801210120FCF7B1FFDE +:10447000FFF79AFE444A00214FF48010FDF727F819 +:10448000424C0FF27901019104F23C5000906946D0 +:104490000FF26D0000F096F804F25470029004F5EB +:1044A000C96140F23C5005900391049402A8FFF7C3 +:1044B00003FFFFF777FE08B010BD354881B00168F3 +:1044C00041F4801101603F21006800F480100090E9 +:1044D0000098304841604161016841F47C110160FD +:1044E000026942F47C120261016841F03F010160FF +:1044F000026942F03F02026101B07047704700005C +:1045000038B5044688B0616801F10B0504A8FDF7D1 +:104510007EF82988B1F5124F22D16846102101F0AA +:10452000ABF960680D300078B0B904F030F80D20B8 +:104530008DF800007F218DF8021017480168090CE2 +:10454000ADF80C106846FDF75BF8FBF7F7FD0021AE +:104550000120FCF73EFF03E0012804BF002020708B +:1045600009B030BD1040005890000058FECAFECA85 +:104570001C0400585875FF1F800800580828004088 +:1045800008000058A811002007460008300003204A +:1045900050000058040C0058002004E001E070476F +:1045A00000BF4FF0FF30FCF72BBF00214FF480100D +:1045B000FCF79ABF0220FCF7BDBF0220FCF7C2BF88 +:1045C000704700007FB50C464D4D61684D4EE86167 +:1045D0002962284604F0F2F82468746006F10800A5 +:1045E000FFF7A2FD012000F068F801203070296873 +:1045F00041B10FF2E9000FF2ED0200900192029436 +:10460000684688477FBD1FB53E4C04F10800FFF7A0 +:104610008EFD00BB2178F1B1694604F10800FFF777 +:10462000AFFD3748C16949B10098029001228DF869 +:10463000042001A888479DF8040000E001202070B4 +:10464000207818B10098FFF750FE04E0009904F1BB +:104650000800FFF775FD04F10800FFF768FD28B9B1 +:10466000207818B104F10800FFF79FFF1FBD2DE966 +:10467000F04105460E4690461C46002000F01DF80D +:10468000204F7868A0F80950C672324641460C3077 +:10469000FCF754FD1A4A136900210020984748F29C +:1046A000E800FFF78AFF79688A78D21C04F10800D5 +:1046B000FCF744FDBDE8F04101201CB51049124C47 +:1046C000096A20B901B188470020207013BD01207C +:1046D000207011B1BDE81C40084713BD0020FFF752 +:1046E00069BF000010B50146064C04F10800FFF751 +:1046F00031FD04F10800BDE81040FFF756BF00008F +:10470000181800207C18002025190020144810B526 +:10471000016841F480710160032001F076FF002000 +:1047200004F056F80024002814BF012404F07FF898 +:10473000204610BD0B48806870470B480BE00A48C4 +:10474000016821F00201016070470748016821F00B +:104750000401016070470168490849000160704721 +:10476000004000589C130020042004E0F8B50446E3 +:104770000025ACB104F13406307910B9204604F0BC +:1047800065F80F4F384600F021F8386840F0011006 +:104790003860204600F007F835600120307100E0F5 +:1047A00001252846F2BD10B50021064A064B00EB54 +:1047B0008104491C06296360E261F8D310BD000042 +:1047C000000C00587B3300086F1F000800210160B7 +:1047D0004FF03F1141603F218160704738B50400C0 +:1047E00009D004F18005686808B900F01EF800F0EF +:1047F00021F8012801D1012032BDA06A08B100F0E2 +:104800002AF800F00AF821F02A01FFE7816000F0A1 +:104810001BF8BDE8324000F076BB2068416821F407 +:1048200090414160206881687047002129702046CE +:1048300004F028B82420686020680168490849000D +:104840000160204600F0F4B92068016841F00101E0 +:10485000016020467047204600F0F2BA2DE9FC477F +:10486000054605F180048846606820281746994669 +:1048700044D1B8F1000F14BF002F01203FD02078A1 +:1048800001283BD00121217005F154060021E1608F +:104890002120606004F080F8378077808246A96824 +:1048A000B1F5805F04BF286900280EBF4746404627 +:1048B00000270021217080460DE02868B8F1000F24 +:1048C00012BF18F8011B37F8021BC1F308018162FF +:1048D0007088411E718053467088CDF80090002882 +:1048E0000FD000228021284600F03BFB0028E4D0B6 +:1048F000032004E020206060002000E00220BDE8EA +:10490000F68700224021284600F02BFB0028F1D03A +:10491000EEE738B500F011F80DD109B1140001D15E +:10492000012032BD0478012C05D000F00CF8BDE860 +:10493000384000F06DBB022032BD034603F1800019 +:104940008468202C7047012505700020D866DFF8A8 +:10495000DC421868A0420BD04068040208D51C68ED +:1049600054E8005F45F0806544E800500028F6D127 +:1049700018467047216851E8002F7047206800F101 +:10498000080151E8001F00F1080221F0400142E84F +:10499000001000287047F8B5044640F60F0026685E +:1049A000F1693268B368084004F15C050ED18806ED +:1049B00002D5900602D4D80040F1818069690029AF +:1049C00000F029812046BDE8F4400847DFF8A00741 +:1049D000034204BFDFF89C773A4270D0CF0707D577 +:1049E000D70505D5012737622E6B46F001062E63E9 +:1049F0008E0708D5DE0706D5276802263E622E6B95 +:104A000046F004062E634E0708D5DE0706D5276854 +:104A100004263E622E6B46F002062E630E070AD570 +:104A2000960601D4034206D0266808203062286B1F +:104A300040F008002863080509D5500107D526680D +:104A40004FF400603062286B40F020002863286B30 +:104A5000002833D0890607D5900601D4D80003D5A5 +:104A6000696909B120468847286B21688A68510620 +:104A700002D410F0280F1CD0204600F04EFB00F0AE +:104A8000D1F811D5FFF77AFFFCD1286A60B10FF297 +:104A9000ED618163286A03F0BBFF00280ED0286A0D +:104AA000816BBDE8F44008472046BDE8F24003F0C2 +:104AB000E5BF204603F0E2FF00202863F1BD28692E +:104AC00001286AD1CF0668D5D00666D5102030629D +:104AD00000F0A8F82DD5296A0868406880B200283F +:104AE000ECD02A889042E9DA6880086801688A0672 +:104AF0001BD4FFF73FFF22F4807200F08FF8F8D14B +:104B0000206800F079FAFBD1FFF738FFFCD12020B4 +:104B1000E86200202861FFF72DFF22F0100200F06C +:104B20007DF8F8D1286A03F03DFF29886888091AC2 +:104B30002DE028886988411A688800281CBF88B23F +:104B4000002868D0226852E8003F23F4907342E8BE +:104B500000300028F6D1206800F1080200F10803B7 +:104B600052E8002FDFF8BC02024043E80020002892 +:104B7000F1D12020E862002028616861226852E8B3 +:104B8000003F23F0100342E800300028F6D1204611 +:104B9000BDE8F44089B203F072BFC80209D55802DB +:104BA00007D54FF4801030622046BDE8F24000F097 +:104BB00025BD080609D5100601D4180205D5A96936 +:104BC00049B32046BDE8F4400847480611D55006D1 +:104BD0000FD5FFF7CFFE22F0400200F01FF8F8D10A +:104BE0002020A8620020A8612046BDE8F24001F024 +:104BF000A9BC080206D5500004D52046BDE8F24005 +:104C000003F03EBFC80148BF002A04D52046BDE8D6 +:104C1000F24003F036BFF1BD22F4F07241E800200B +:104C2000002870472068816848067047008000406F +:104C3000F8B50446DFF848082168DFF848C80A6874 +:104C4000DFF844780240A0680243206902436069AB +:104C50000243E06902430A6000254A68E06822F4E2 +:104C6000405202434A60A369DFF8202891421CBFEA +:104C7000206A03438E68DFF81808064033438B60D0 +:104C80000FF2A416CB6A606A1B0940EA0313CB62D9 +:104C90006145DFF800084FF4004339D13F6807F061 +:104CA0000307032F4DD8DFE807F0024643494FF0D2 +:104CB000010CE169B1F5004F4FF6F07740F08080CC +:104CC000BCF1010F09D0BCF1020F0AD0BCF1040FF6 +:104CD00071D0BCF1080F71D099E001F0C6F900283D +:104CE00015D0626A616836F81230B0FBF3F04A08FA +:104CF00002EB4002B2FBF1F080B2A0F11001B94228 +:104D0000EAD20740C0F3420007432068C7607FE053 +:104D1000914216D13F6817F4406723D0B7F5806FF2 +:104D200009D0B7F5006F03D0B7F5406F06D008E0A3 +:104D30004FF0020C07E04FF0040C04E04FF0080CB9 +:104D400001E04FF0100C9142B3D1BCF1000F09D03B +:104D5000BCF1020F0AD0BCF1040F15D0BCF1080F52 +:104D600015D054E001F079F9002851D0616A36F885 +:104D70001120B0FBF2F6626802EB42018E4246D38C +:104D80001103B14205D242E001F01DF9ECE71846EB +:104D9000ECE75008002110EB062051EB16610023D0 +:104DA00003F070FEA0F54071DFF8EC2691422ED2A0 +:104DB0002268D0602CE001F006F990E7184690E7F1 +:104DC000BCF1010F09D0BCF1020F09D0BCF1040FF6 +:104DD00018D0BCF1080F18D019E001F046F9B8B1AD +:104DE000626A36F812306168B0FBF3F000EB5100F4 +:104DF000B0FBF1F080B2A0F11001B94207D22168F6 +:104E0000C86005E001F0DFF8E9E71846E8E70125AA +:104E100004F1680001214180018000218160C160AE +:104E20002846F2BDFEFFFFEF01000200040006006D +:104E300008000A000C001000200040008000000163 +:104E400090F82810CA0706D502685368C16A23F48F +:104E500000330B43536090F828108A0706D5026888 +:104E60005368016B23F480330B43536090F8281090 +:104E70004A0706D502685368416B23F480230B432D +:104E8000536090F828100A0706D502685368816BB2 +:104E900023F400430B43536090F82810CA0606D54C +:104EA00002689368C16B23F480530B43936090F8BE +:104EB00028108A0606D502689368016C23F4005313 +:104EC0000B43936090F828104A0610D50268536887 +:104ED000416C23F480130B435360416CB1F5801F88 +:104EE00005D15368816C23F4C0030B43536090F8E1 +:104EF00028100A0606D501684A68C06C22F4002210 +:104F000002434A607047F8B5044604F1800500206A +:104F1000E8606FF07E4703F03FFD064620680168B9 +:104F20000A0708D50097334600224FF400112046A7 +:104F300000F017F860B9206801684A070AD50097A1 +:104F4000334600224FF48001204600F00AF808B1F1 +:104F50000320F2BD20206860A8600020E066287071 +:104F6000F2BD2DE9F041069C05460E4690461F46CF +:104F70002868C1693140B1420CBF01200020404582 +:104F800026D114F1010FF3D003F006FDC01B8442BB +:104F900000D33CB900F025F800F02DF8FCD100F06A +:104FA0001AF811E0286801684A07E1D5C1690A05C5 +:104FB000DED54FF40062026200F013F800F01BF837 +:104FC000FCD100F008F8C16000210170032000E06E +:104FD0000020BDE8F08105F1800020214160816062 +:104FE0007047296851E8002F22F4D07241E8002070 +:104FF0000028F6D17047286800F1080151E8001F29 +:10500000490800F10802490042E8001000287047F2 +:1050100070B5034600209965FF2403F15C010A8006 +:105020004A8048619868B0F5805F04D1186960B91A +:1050300040F2FF1409E010B9186928B905E0B0F191 +:10504000805F06D1186910B97F248C8003E03F206F +:1050500000E00020888003F180040020E06022202E +:10506000A060186800F1080555E8005F00F1080627 +:1050700045F0010546E800500028F2D18868B0F1FB +:10508000005F22D18D89AA421FD39A68B2F5805F52 +:1050900004BF1869002807BF0FF2AD224A610FF262 +:1050A000FD10486100202070196851E8002F42F47B +:1050B0008072FFF7B3FDF7D100F01FF841F0805187 +:1050C00000F026F8F8D1002070BD9A68B2F5805F34 +:1050D00004BF1869002807BF0FF2F9024A610FF2F6 +:1050E000AD00486100202070196851E8002F42F49B +:1050F0009072FFF793FDF7D1E5E7186800F108011A +:1051000051E8001F00F108027047DFF890030140EA +:1051100042E80010002870470000026852E8003F93 +:1051200023F4907342E800310029F6D1016801F1BF +:10513000080201F1080352E8002F0F490A4043E832 +:1051400000210029F2D1C16E012908D1026852E87C +:10515000003F23F0100342E800310029F6D120215E +:10516000C0F888100021C166016770470000000088 +:105170000100001020010004FEFFFFEF806A00F133 +:10518000560100220A810A8003F078BC10B500F0B5 +:105190004BF81AD14B6A91880B40816D0B70816D71 +:1051A0004B1C00F03BF8A1B900F044F800F060F8A7 +:1051B000FCD100F056F807D10023136100F044F849 +:1051C00044BF10240C6260E064E0886940F008008D +:1051D000886110BD10B500F027F81AD14B6A91888C +:1051E0000B40816D0B80816D8B1C00F017F8A1B90D +:1051F00000F020F800F03CF8FCD100F032F807D1C4 +:105200000023136100F020F844BF10240C623CE03E +:1052100040E0886940F00800886110BD83655188CE +:105220004B1E53805188704700F15C020168D36ABD +:10523000222B7047036853E8004F24F4907443E82E +:1052400000410029F6D17047036853E8004F24F06D +:10525000100443E800410029F6D10168CB69DC065F +:1052600070472021D16200215161116901297047E5 +:10527000016801F1080353E8003F5B0801F10804ED +:105280005B0044E80031002970471188BDE81040F8 +:1052900003F0F5BBBDE8104001F041B92DE9F8433A +:1052A00000F0A9F847D1A08978B96088002844D0D7 +:1052B000A189884241DA00F0ABF87948606100F0DA +:1052C000BDF83AE0304601F02AF9A806EDD500F025 +:1052D0008CF80870B06D411C00F0F7F819D0E907A0 +:1052E00048BF5FEAC95101D500F0F8F8A80703D517 +:1052F000F80701D500F0DAF8680703D5F80701D5FB +:1053000000F094F8206B20B1304603F0B7FB002189 +:10531000216360880028D8D100F09AF800F0CEF818 +:10532000D0D100F0E2F844BF10220262218830465A +:1053300003F0A5FBC9E700F002F8BDE8F18381693D +:1053400041F00801816170472DE9F84300F053F8FE +:1053500047D1A08978B96088002844D0A1898842C3 +:1053600041DA00F055F84F48606100F067F83AE024 +:10537000304601F0D4F8A806EDD500F036F80880E4 +:10538000B06D811C00F0A1F819D0E90748BF5FEAB1 +:10539000C95101D500F0A2F8A80703D5F80701D537 +:1053A00000F084F8680703D5F80701D500F03EF84F +:1053B000206B20B1304603F061FB0021216360883F +:1053C0000028D8D100F044F800F078F8D0D100F0EF +:1053D0008CF844BF102202622188304603F04FFB54 +:1053E000C9E7FFF7ACFFBDE8F1833068406AB16DF3 +:1053F00008EA00007047064606F15C043068B4F81D +:105400000480C569D0F800908768E16A2229704756 +:10541000306800F1080151E8001F00F1080221F096 +:10542000805142E800100028F2D170473168042012 +:105430000862206B40F0020020637047316851E839 +:10544000002F42F0200241E800200028F6D17047EA +:10545000316851E8002F22F4807241E800200028D2 +:10546000F6D1306800F1080100F1080251E8001F90 +:105470000D48014042E800100028F2D170470000BA +:10548000F369FFCF003801408800005800800040D9 +:10549000FFF4FF110024F40000FD0F00FEFF7FEF7A +:1054A0008D510008D5510008FEFFFFEF3168022042 +:1054B0000862206B40F00400206370472020E06207 +:1054C00000206061206901287047B1656088411E35 +:1054D00061803068C56915F0070F704701210162CE +:1054E000206B40F00100206370470021216131688A +:1054F00051E8002F22F0100241E800200028F6D1E8 +:105500003068C169CA06704710B500F180010A7899 +:10551000012A01D1022010BD01230B7024224A6010 +:10552000026813681468640864001460002242660C +:1055300023F00053006803602020486000200870BA +:1055400010BD70B500F01EF801D1022070BD00F052 +:105550001FF822F0604209E070B500F013F801D1A5 +:10556000022070BD00F014F822F0606211438160E7 +:10557000204600F01AF820680660202068600020AD +:10558000287070BD044604F1800528780128704712 +:1055900001222A7024206860206806680268520888 +:1055A0005200026020688268704730B5416E11B9C0 +:1055B0000121012214E001680FF230048A68896831 +:1055C0000FF23003520E02F00702490F655CA45C33 +:1055D000595C9A5CED00E40095FBF1F194FBF2F26A +:1055E00068304180028030BD0000000001010103ED +:1055F00007010000080402040801010170470000CF +:1056000038B5040044D094F8210028B9002184F86A +:105610002010204603F08DF900F049F8FF2510B165 +:1056200000F03FF834E02168DFF8B0008A680240FB +:105630008A6021688A68636820690343A06903431C +:105640001A438A602168E068086120680169A268DD +:1056500041EA024101612068C16821F08001C16016 +:105660002068C16C89088900C1642168CA6CE3693B +:10567000606903431A43CA6420688168880609D4B4 +:1056800000F020F830B120684562042100F01FF8D6 +:10569000012032BD20684562012184F821100020DC +:1056A00032BD20684562042184F821107047022031 +:1056B00084F82100CA202168486253202268506281 +:1056C000204626E020460BE02068C0F8248084F8BD +:1056D0002110002084F8200070470000BFFF8FFFDA +:1056E00070B5044640F2E9362068C16821F0A00197 +:1056F000C16003F051F905462068C168880606D4E8 +:1057000003F04AF9401BB042F6D3032070BD0020DD +:1057100070BD70B504462068C1684A0612D44FF0C7 +:10572000FF32C26040F2E93603F036F905462068E0 +:10573000C168480606D403F02FF9401BB042F6D3E7 +:10574000032070BD002070BD10B5040001D1012000 +:1057500010BD607A20B900212172204603F0FEF8C6 +:105760000220607221680A68606822F02002024309 +:105770000A602068016841F0040101600120607244 +:105780000020E06010BD000010B540290DD3364C5C +:1057900021706060FCF730F90020607000F066F85E +:1057A0000020FCF7BAF8002010BD012010BD1CB588 +:1057B0002D4C61782278914254D2626850546178BD +:1057C000491C0A28617048D1C8B2022811D9606802 +:1057D000C9B2084410F8021D0D290AD100224270F6 +:1057E0006068617808440A2200F8022C6078411E43 +:1057F000617060686278411E002088546078411EA4 +:1058000061706168087848B9012101E0491CC9B29A +:105810006268505C521E00285054F7D1617860686D +:10582000012914D9014604F10800FDF7ABFB402023 +:10583000FCF773F821786068FCF7DEF800206070F0 +:1058400004F10800FCF7B2F800F010F808E0217845 +:10585000FCF7D2F80020607000E00020FCF75DF853 +:10586000002016BD012016BD60160020402104F165 +:10587000080000F001B80000002203F01BBA00008D +:105880000248016841F480710160704700040058CB +:105890004FF0B040006800F0F000B02888BFB020A2 +:1058A00070472DE9F041040054D0207881064FF074 +:1058B000B04538D5A868E96810F00C0001F0030184 +:1058C00003D00C2808BF012946D12868800702D5DB +:1058D000E06900283ED0FFF7DBFF616A884207D20B +:1058E000084600F0D3FB002834D100F075FA0FE031 +:1058F000286820F0F000014329606968206A21F4DB +:105900007F4141EA00216960606A00F0BFFB08BB8B +:1059100000F095FBDFF810180860DFF81008006849 +:1059200002F056FFB0B92078C1070DD5A868E96824 +:1059300000F00C00082801F0030103D00C2808BF78 +:1059400003292DD12868800340F13981606800283F +:1059500040F03581012038E2E06980B1296841F0EA +:10596000010100F047FA06462868800700F124810B +:1059700003F012F8801B0328F6D3032025E22868E1 +:1059800040084000286003F007F80646286800F049 +:105990001FFAC8D003F000F8801B0328F6D3ECE709 +:1059A0006068B0F5803F04D1296841F480312960F6 +:1059B00003E02A6822F480322A60606860B102F055 +:1059C000EBFF06462868800300F1F98002F0E4FF4F +:1059D000801B6528F6D3D0E702F0DEFF0646286874 +:1059E000400C10F0010000F0EA8002F0D5FF801BAF +:1059F0006528F4D3C1E702F0CFFFC01B0328C0F035 +:105A00001281BAE7E06878B1296841F4807100F04A +:105A1000F1F906462868400500F1188102F0BCFF44 +:105A2000801B0328F6D3A8E7286820F4807028603C +:105A300002F0B2FF06462868800A10F0010000F06C +:105A4000DC8002F0A9FF801B0328F4D395E702F065 +:105A5000A3FFC01B0328C0F00B818EE740F00100BC +:105A600000F0CEF907467068800700F11C8102F053 +:105A700093FFC01B0328F6D37FE7706820F0040073 +:105A800000F0BEF907467068C00810F0010000F091 +:105A9000198102F081FFC01B0428F4D36DE70528AB +:105AA000306806D140F004003060316841F00101F7 +:105AB00005E0400840003060316821F004013160A9 +:105AC000A06841F2893768B102F066FF804630680D +:105AD000800700F10C8102F05FFFA0EB0800B842E4 +:105AE000F5D34AE702F058FF8046306800F070F9BD +:105AF00000F0FD8002F050FFA0EB0800B842F4D3A4 +:105B00003BE702F049FFC01B0328C0F0FE8034E7EA +:105B1000B06840084000B06002F03EFF0746B06841 +:105B200000F056F900F0F58002F036FFC01B0328A4 +:105B3000F5D322E702F030FF801B0328C0F01F815D +:105B40001BE702F029FF001B0328C0F0398114E78E +:105B5000286881010CD4296841F080712960E868C7 +:105B600040F08050E86002F017FF04462868810189 +:105B700000F12A8102F010FF001B0328F6D3FCE697 +:105B80000C2931D0286820F080702860E968DFF89F +:105B9000A00589088900E960E9680140E96002F030 +:105BA000FBFE04462868810140F10E8102F0F4FEFC +:105BB000001B0328F6D3E0E600F00EF9B3E62078E8 +:105BC00081071AD5A868E96800F00C00042801F0E4 +:105BD000030104D00C2808BF02297FF413AF286802 +:105BE000400503D5E06800283FF4B4AE6968206939 +:105BF00021F0FE4141EA006169602168DFF8346507 +:105C000011F0180F38D0606900283FF436AFC9068C +:105C100070687FF523AF800709D4706840F00100F9 +:105C200000F0EEF80746706880077FF5E4AE706814 +:105C300040F0040000F0E4F80746706800070DD457 +:105C400002F0AAFEC01B0428F7D396E66868216913 +:105C500020F0FE4040EA01606860CEE77068A1690C +:105C600020F4706040EA0120706000F0C6F807463A +:105C700000F0ADF87FF4EBAE2078410737D5DFF8C0 +:105C8000B8743868C10529D4FFF7FAFD02F084FE24 +:105C900080463868C10521D402F07EFEA0EB0800E2 +:105CA0000328F6D369E6706820F00400706070681D +:105CB000C00810F00100DFD002F06EFEC01B042807 +:105CC000F5D35AE600F099F8074600F080F8D3D0F3 +:105CD00002F062FEC01B0328F7D34EE6A06801283D +:105CE0007FF4DDAE306840F001003060E8E62178F6 +:105CF00048060ED5A06A00283FF40AAFB16841F00B +:105D00000101B16002F048FE0746B06880077FF5E8 +:105D1000F8AEE06A002857D0A968EA68022801F0C6 +:105D20000C017FF42DAF236B02F00300984202BFF9 +:105D300002F07000636B984214D1A36BC2F306208B +:105D4000984202BF02F47810E36B98420AD1236CA8 +:105D500002F06060984202BF02F06042606C8242D2 +:105D60003FF4F6AE0C293FF4F5AD286841013FF54C +:105D7000F1AD296821F0807100F03CF806462868F2 +:105D800081013FF5D7AEE968DFF8B003A26B0140AF +:105D9000206B0143606B0143E06B41EA0221014348 +:105DA000206C0143606C0143E960286840F080701A +:105DB0002860E96841F08051E96002F0EDFD044699 +:105DC000286881017FF5BDAE0020BDE8F0817068D4 +:105DD000400810F0010070472968606A21F0F00166 +:105DE000014329606868216A20F47F4040EA01206D +:105DF00068607047296002F0CFBD706840084000BD +:105E0000706002F0C9BD2DE9F8430400884644D013 +:105E1000DFF82C6300F0CBF847D200F0CDF807464E +:105E200000F0C5F841D002F0B7FDC01B0228F7D939 +:105E30000320BAE002F0B0FD401B022843D9F7E787 +:105E400002F0AAFDA0EB090002284CD9F0E702F00D +:105E5000A3FDA0EB0900022854D9E9E702F09CFD5C +:105E6000401B02285DD9E3E702F096FD401B0228A3 +:105E700067D9DDE702F090FD401B484577D3D7E7AF +:105E8000032802D13968890103E00028396802D16A +:105E9000890762D401E049055FD4012085E002F062 +:105EA0007BFDC01B022872D9C2E7207881074FF022 +:105EB000B0470BD5B968A06821F0F0010143B96083 +:105EC00002F06AFD0546B868C003B3D52078DFF854 +:105ED000545281060AD52968606921F0F001014316 +:105EE000FFF788FF814628688003A9D520784106FE +:105EF0000BD52968A0690909090141EA1011FFF7CA +:105F000079FF81462868C003A1D5207841070BD5C9 +:105F1000B968E06821F4E0610143B96002F03CFD3A +:105F20000546B868800399D5207801070CD5B86874 +:105F3000216920F4605040EAC100B86002F02CFDF5 +:105F40000546B86840038FD52078C10717D560682B +:105F5000022895D1396889039FD5B968890840EA34 +:105F60008100B86041F2893902F016FD0546B86833 +:105F7000616800F00C00B0EB810F7FF47BAF3068FC +:105F800000F00700804505D200F016F8074600F043 +:105F90000EF884D100F053F8DFF88C110860FEF79A +:105FA000C9FBBDE8F24302F013BCBDE8F2833068E0 +:105FB00000F00700404570473168C90848EAC10150 +:105FC000316002F0E9BC38B54FF0B0445E4DA168D5 +:105FD00011F00C0106D1FFF75BFCC0F3031055F87C +:105FE000200032BD0429594A05D00829584804D157 +:105FF0002168C90222D5104632BDE16801F00301D3 +:10600000022904D0032904D12168C90207D510460A +:1060100005E0FFF73DFCC0F3031055F82000E168F0 +:10602000E268E368C1F306214843C2F30211491C48 +:106030005B0FB0FBF1F05B1CB0FBF3F032BD80B541 +:10604000FFF7C1FF3F49FFE7424A0968C1F3031167 +:1060500052F82110B0FBF1F002BD80B5FFF7EFFF61 +:1060600000F010F8C1F3022106E080B5FFF7E7FF6A +:1060700000F008F8C1F3C22112F8211001F01F014D +:10608000C84002BD2F49344A0968704770B52E498F +:10609000B1282EBFCC6AC0F3031051F8204021482C +:1060A000056802F021FE2B492C4A05F00F0551F836 +:1060B0002510B4FBF1F10024B1FBF2F1B0F5007F43 +:1060C0000FF2B802204609D10FF2940353F8205082 +:1060D0008D4214D2401C0328F8D912E00FF290032D +:1060E00053F820508D420AD2401C0328F8D308E010 +:1060F00002F052FC801B03280CD3032070BD52F821 +:1061000020400F4D2868C00844EAC000286002F013 +:1061100043FC0646296801F00701A142E8D10020AE +:1061200070BD000008010058B4130020A413002023 +:10613000FFFFFEEE90000058000400588C80C11153 +:106140000040005808000058509F00080024F40048 +:106150000048E801109F000878A1000840420F00A5 +:106160001200000024000000360000004000000083 +:10617000060000000C0000001000000000000000FD +:10618000010000000200000003000000DFF82013FF +:106190000A68030903F47F2300019A4300F47F2077 +:1061A00000F082B9DFF808231368010C23EA0143E9 +:1061B00043EA0043136070472DE9F8430546002485 +:1061C0002878DFF8EC624106A0464FF0B0472DD5A5 +:1061D000286B70B1B0F5800F06D0B0F5000F18BF76 +:1061E000B0F5400F17D01FE0F86840F48030F86039 +:1061F000EDE0386820F08060386002F0CDFB814629 +:106200003868000140F1D08002F0C6FBA0EB090025 +:106210000228F5D90324D7E002F0BEFBA0EB090069 +:10622000022840F2C980F5E70124A046286801054C +:1062300031D5B06800F44078286C80452AD0FFF74B +:106240001FFBB8F1000FB16805D1286C21F4407133 +:106250000143B1601EE0B06840F48030B06021F4CA +:106260004071B06820F48030B060286C0143B160A8 +:10627000B068C0070ED502F08FFB804641F2893925 +:10628000B068800706D402F087FBA0EB0800484501 +:10629000F6D30324A0462878C10705D53168A8693C +:1062A000890840EA810131602878810705D5316885 +:1062B000E86921F44061014331602878C10644BF98 +:1062C000A86AFFF76FFF2878810644BFE86AFFF7E6 +:1062D00069FF2878410744BF286AFFF757FF2878ED +:1062E000010744BF686AFFF751FF2868C1051BD545 +:1062F0003168686B21F0406101433160686BB0F137 +:10630000006F00F0BDF8686BB0F1806F75D100F0E0 +:10631000BDF804463868000160D502F03DFB001B63 +:106320000228F7D94FF0030867E002F035FB001BA5 +:1063300002285BD9F6E7316821F04041316020F056 +:106340008050326822F0406210433060A86BB0F198 +:10635000C05F00F095F8286841056DD53168E86B9D +:1063600021F0405101433160E86BB0F1005F03D18F +:10637000F96841F48031F960E86BB0F1805F5BD17E +:1063800000F084F804463868000146D502F004FBAA +:10639000001B0228F7D94FF003084DE002F0FCFA89 +:1063A000001B022841D9F6E700F061F8A86821F443 +:1063B000781100F071F88146386800017FF52CAF44 +:1063C0003969686901433961002C7FF42EAF316867 +:1063D000286B21F440010143316027E700F047F8C2 +:1063E000E86821F0606100F057F804463868000161 +:1063F0009BD5396968690143396128688105AAD547 +:10640000A86BB0F1804F1CBFB0F1004F002892D1B3 +:10641000316821F04041084397E700F028F82869E7 +:1064200021F0604100F038F8044638680001B5D525 +:1064300039696869014339612868C10405D5F16883 +:10644000686C21F440410143F160286881040BD558 +:10645000796AE86C21F0300101437962796AA86CAD +:10646000890840EA810179624046BDE8F2833869D3 +:10647000696820F4FE4040EA0120386139697047BC +:1064800003D1F96841F08071F9607047396821F0F3 +:106490008061396002F080BA01433961386840F0A8 +:1064A0008060386002F078BA1043086070470000DE +:1064B0008800005810B52D4C10B1022803D010BD33 +:1064C00000F00CF801E000F005F80360BDE81040B2 +:1064D000FEF71FBA63602648264B704723602648A4 +:1064E000264B704738B50024002510B1022803D090 +:1064F00008E02148214C01E01D481E4C0460FEF7D5 +:10650000ADF90446012C05D007D3032C04D038BFC5 +:10651000022502E0012500E00325284632BD82B0B5 +:106520000068144A1149904206D0144A904207D19B +:10653000086828B102B00047486808B102B00047B7 +:1065400002B0704782B000680A4A0D49904206D0F6 +:106550000A4A904207D1086828B102B0004748684B +:1065600008B102B0004702B070470000B818002020 +:106570000810002000800040181100200038014061 +:10658000C018002062F30F2262F31F42401810F07F +:10659000030308D0C91A1FD3DB0748BF00F8012D39 +:1065A00028BF20F8022D130030B4144615461039C8 +:1065B00028BF20E93C00FAD8490728BF20E90C0091 +:1065C00048BF40F8042D890028BF20F8022D48BF9D +:1065D00000F8012D30BC7047C91818BF00F8012D14 +:1065E000CB0728BF00F8012D704700000901020009 +:1065F00081B002D43C48815405E03C4802F00F02CF +:10660000104400F8041C01B07047394A13684FF673 +:10661000FF0100020B4000F4E060184335490843D5 +:106620001060704738B5324B1C68C4F30223C3F1C5 +:106630000704052C28BF04241D1D072D34BF00238B +:10664000DB1E012505FA04F4641E2140994005FA79 +:1066500003F35B1E1A401143BDE83440C6E7000057 +:10666000010007D4012200F01F01234B8A4040099A +:1066700043F82020704701000BD4012200F01F01D5 +:106680001E4B8A40400943F82020BFF34F8FBFF3D1 +:106690006F8F704710B5401EB0F1807F01D301208D +:1066A00010BD174C60600F214FF0FF30FFF79EFFC9 +:1066B0000022A26007202060002010BD010007D446 +:1066C000012200F01F010F4B8A40400943F82020AF +:1066D0007047010007D4012200F01F010A4B8A40D5 +:1066E000400943F82020704700E400E018ED00E086 +:1066F0000CED00E00000FA0500E100E080E100E0C0 +:1067000010E000E000E200E080E200E02DE9F84F58 +:106710000FF2D017A2B0D7E90045CDE900452C9E75 +:10672000DFF82C7C04918DF8436000210FF2BC143B +:106730000D9112944FF0FF368246904699460FE035 +:10674000C3462C461BF8011B0498D0470028049030 +:1067500000F0B2800D98401C641E0D90F2D1A84448 +:1067600098F80000252807D1002107910891099188 +:106770000A910B910C910DE06A463146404602F0B9 +:1067800009FB050001D10D98B4E0D9D50125E6E754 +:1067900041F0010118F8010F2028F9D023280CD06E +:1067A0002B2804D02D2805D0302809D086E041F0D0 +:1067B0000201EFE741F00401ECE741F00801E9E7ED +:1067C00041F01001E6E700200F900AE00F98B84270 +:1067D00005DA00EB800302EB4302303A0F9208F136 +:1067E000010898F80020A2F130000A28EED398F8AA +:1067F00000002E2818BF0E9629D118F8010F2A285C +:106800000BD1D9F80000C9F8000008F1010850F8D0 +:10681000042BC9F800000E9219E02D280CBF18F8BF +:10682000010B002000220E920BE040B90E9ABA42F2 +:1068300005DA02EB820403EB4403303B0E9308F1CC +:10684000010898F80030A3F130020A2AEDD3ADF820 +:106850004010129898F8001002F0A8FA08B118F841 +:10686000010B8DF842009DF84200682804BF98F89B +:106870000010682903D162208DF8420008E06C28DE +:1068800004BF98F800006C2804D171218DF84210E3 +:1068900008F1010813A806904A4618F8013B02A91E +:1068A000504600F067F838B913AA02A9504600F024 +:1068B000C9F900287FF554AF30461BE02A2882D161 +:1068C000D9F80020C9F8002052F8040BC9F80020BC +:1068D00000280F9003D540420F9041F0040108F1C9 +:1068E000010884E70000000000000000686A6C7482 +:1068F0007A4C000023B0BDE8F08F622820D06828D1 +:1069000011D06A2803D06C2827D0712825D10868B7 +:10691000C01D20F007000860D0E90023083008609F +:10692000194610467047002A0A680A60106803D0AA +:10693000121D0A6000B217E0121D0A6080B217E053 +:10694000002A0A680A60106803D0121D0A6040B26B +:106950000AE0121D0A60C0B20AE0002A0A680A6052 +:10696000106803D0121D0A60C1177047121D0A601B +:10697000002170477CB50D4611461C462E69B4F1C6 +:10698000250200F04D811C3A00F08680121F022A79 +:1069900040F282800E3A00F00781521F5AD0093A25 +:1069A0007AD0921E16D0521E35D0521E022A73D9AA +:1069B000121F30D0521F00F09A80521E4AD0521E31 +:1069C00000F0E480D21E00F0FD80921E42D0D21E64 +:1069D00040D02BE195F83A206C2A09D06869421C16 +:1069E0006A610A680A6052F8043B0A60335427E17E +:1069F0000A680A6052F8043B0A6000210093019182 +:106A00004FF0FF322A6329466A4600F096F90028C3 +:106A100040F1168101E195F83A000122FFF76DFF80 +:106A2000C5E900010023994204DA6869411C6961E3 +:106A30002D210DE0288F810704D56869411C69610B +:106A40002B2105E0C00722D56869411C696120211E +:106A500031541CE095F83A000022FFF74EFFC5E9DB +:106A6000000195F83800010711D5D5E90023002071 +:106A7000834208BF82420AD044F02000782806D121 +:106A8000686930213154401C411C696134542146ED +:106A900068693044E86083E00868C01D20F00700A2 +:106AA0000860D0E9002308300860C5E90023D5E973 +:106AB0000001C80F04D06869411C69612D210DE0F7 +:106AC000288F810704D56869411C69612B2105E085 +:106AD000C00704D56869411C696120213154686987 +:106AE0003044E8602146284600F032FAA8E005F17B +:106AF0003A02507820B14FF0FF340FF6243070E0A6 +:106B00001078622808D0682824D06A2812D06C280F +:106B10002ED071280ED02BE00A680A6052F8040BC0 +:106B20000A6020B94FF0FF340FF60C3059E0E96AE3 +:106B3000017085E00A680A6052F8040B0A6020B907 +:106B40004FF0FF340FF6F0204BE0EA6AD317C0E9AC +:106B5000002375E00A680A6052F8040B0A6020B945 +:106B60004FF0FF340FF6D0203BE0E96A018067E088 +:106B70000A680A6052F8040B0A6020B94FF0FF342B +:106B80000FF6B4202DE0E96A016059E00A680A6056 +:106B900052F8040B0A600021C5E90001EE6078217B +:106BA000284600F029F94BE06C2285F83A200B6862 +:106BB0000B6053F8042B0B6052BB4FF0FF340FF601 +:106BC000AC200EE095F83A206C2AF0D008680860F6 +:106BD00050F8044B0860EC603CB94FF0FF340FF6FE +:106BE000702002F0EFF8201A76BD2E6B002E04D52F +:106BF0002046FCF7A7FB044608E032460021204669 +:106C000002F002F9002814BF041B3446AC6117E0FF +:106C1000294600F092F8002812D54FF0FF3076BDDB +:106C20006869411C69612521315409E06969481C82 +:106C3000686125227254210002D0411C69613454DC +:106C4000002076BD2DE9F0410E460546716B706956 +:106C5000B46A091A306A091AB069091A706A091AFD +:106C6000F069091A96F838000C1B410790460DD4BC +:106C7000002C0BDD2746B0682021A8470028B06013 +:106C800057D0F06A401C7F1EF062F4D1736942460F +:106C90003146284600F0ACFC00284AD1376A002F64 +:106CA0000ADDB0683021A8470028B06041D0F06A02 +:106CB000401C7F1EF062F4D1B369F2683146284669 +:106CC00000F096FCA8BB776A002F09DDB068302180 +:106CD000A847B06068B3F06A401C7F1EF062F5D12F +:106CE000F068B169F36942183146284600F080FC2B +:106CF000F8B9B76A002F09DDB0683021A847B06045 +:106D0000B8B1F06A401C7F1EF062F5D196F83800E9 +:106D100041070BD5002C09DDB0682021A847B060E1 +:106D200038B1F06A401C641EF062F5D10020BDE865 +:106D3000F0814FF0FF30BDE8F0812DE9F8470D46B6 +:106D4000A3B02F6B002F8146904648BF6FF00047DD +:106D500002F086F8696B40180FF62C118128D1E9F2 +:106D60000023CDE9012328BF4FF0FF303ED200249D +:106D7000002F2FDDD8F8001001AA684602F00CF8A9 +:106D80000646002E35D4D8F8000008B9761E30D457 +:106D9000B7421FDB6869301881280AD30020686376 +:106DA00003AA29464846FFF74DFF040012D40020ED +:106DB000686103A8D5F814A0324669465044FAF732 +:106DC000BDF9B244C5F814A058F8040B002818BF48 +:106DD000BF1BCDD12CB903AA29464846FFF732FF85 +:106DE000044614B9002068616863204624B0BDE8F9 +:106DF000F0874FF0FF34F8E72DE9FC4707468A4655 +:106E00003E69BAF16F0F08BF082405D04AF020018F +:106E1000782914BF0A2410243C25D7E90023BAF1AD +:106E2000640F18BFBAF1690F9046994606D1002148 +:106E30008B4203DAD8F1000869EB4909002081454B +:106E400008BF80451FD1386BE8B9082C4CD197F8A2 +:106E50003800010748D530203B2586F83B0043E049 +:106E600000280ED597F8380000F01400102808D13B +:106E70007A6B7869121A386A121A511A0029C8BF37 +:106E80003962BDE8F3878DF800A0404649462246A6 +:106E9000E31701F0F7FD3032D0B26D1E3A280195AC +:106EA00004DB9DF80000A0F151018A18725540469C +:106EB00049462246E31701F0E5FD80468946002059 +:106EC000814508BF804503D0F86871198842DCD33A +:106ED000082C09D197F83800010705D5715D3029D4 +:106EE00002D06D1E30207055C5F13C01B96170199A +:106EF000F860386B8142B3DA411A39624FF6EF70AD +:106F0000398F01403987BDE8F3872DE9D043064624 +:106F10000F4614464FF00008DFF8389412E0E007FF +:106F200007D542464B463046394601F09FFF06469C +:106F30000F464046494642464B4601F097FF6410D3 +:106F400080468946002CEAD130463946BDE8D083D8 +:106F50002DE9F34F054641F020048DB0D5E90089B5 +:106F6000612C02AE09D0286B002848BF062003D44C +:106F700008BF672C01D101202863D5E90023580000 +:106F80004015401C0ED119030CD00320A8619DF8B8 +:106F9000380061381A2802D20FF2F46111E00FF2C2 +:106FA000F4610EE058004015401C0FD119030DD1BB +:106FB0000320A8619DF8380061381A2814D30FF215 +:106FC000DC61E8680322FAF7B9F8D3E1194621F049 +:106FD0000043B3F5801F10460DD20027BB4208BF07 +:106FE000BA42019703D111E00FF2AC61E9E701AABF +:106FF00002F00EF80AE0DFF8607307EB1352DFF8D7 +:107000005C3301921940DFF858331943C5E9000198 +:10701000612C0ED1E86830210170811CE9609DF877 +:10702000381061290CBF7821582141706869801C93 +:107030006861D5E900AB2BF0004300202AF0000284 +:10704000834204BF8242002300F05A81612C40F049 +:10705000A980286B00284CBF2120401C009040468E +:10706000009F7F1C49460022002302F009F8D94600 +:1070700001988DF8082038BF89F00049001F019061 +:10708000002FD0460DF1090040F3498140F2FF7115 +:10709000DFF8D0B20C910646404649460022002354 +:1070A00002F006F880F03A814800400D00F11C0221 +:1070B00010D0002A0EDD0C98824205DB09F000405A +:1070C00040EA0B01002013E0A448084040EA0251C6 +:1070D00040460DE029F00043002028F000028342E2 +:1070E00008BF82420FBF40461C22404601F0F8FF15 +:1070F00080468946FCF79AFDFF1F002F044609DDF4 +:1071000002F08CF802460B464046494602F098F8D9 +:1071100080468946F01D072104E004F00F0200F8C4 +:10712000012D2411002C01DD491EF6D5491E5CBF3E +:10713000002200F8012DF9D5ECE00020194602AA42 +:107140000A4400E05B1E12F80149491E8442F9D04E +:107150000F2804D10DF10900425C521C4254002951 +:1071600004D50198001D02AE5B1C0190591E12D47B +:107170009DF838007218147804F130085FFA88F42A +:10718000392CC4BFA0F13A04A044491E02F8018979 +:10719000F1D58DF83800286B002840F1B080591ED9 +:1071A0002963ACE0404649460022002301F068FF15 +:1071B000019938BF89F0004947F2975041436A4A24 +:1071C00091FBF2F20192D2F1070204DD40464946FA +:1071D000FFF79BFE0AE0524200206449FFF795FE4C +:1071E00002460B4640464946FCF770FD8046662C39 +:1071F000286BDFF87CB106BF019F0A3706273F18CE +:10720000142FC8BF142730208DF8080089460DF1CF +:10721000090000E03046002F34DD0646404649466E +:1072200002F080F801460A4606F1080304200A2607 +:10723000B2FBF6F606EB860EA2EB4E02303203F8F6 +:10724000012C0A22B6FBF2F202EB820EA6EB4E06EE +:107250003036401E03F8026DE9D1083F002F03F1DC +:107260000806D7DD084602F071F802460B46404694 +:10727000494601F0E5FF00225B4601F0F7FD80463C +:107280008946CBE70DF10901401A0DF1090604E02A +:107290000199491E401E0191761C31783029F7D0A2 +:1072A000662C02D10199491C03E0652C0CBF012119 +:1072B00000212B6BCB189842B8BF431E002B1ED465 +:1072C000834204DAF05C3528A8BF392000DA302088 +:1072D0001946721E02EB010800E05B1E18F80199C6 +:1072E000491E8145F9D0392802D1705C401C705488 +:1072F000002904D50198401C16465B1C019001989A +:1073000000B200901BB29DF838103246284600F0BB +:1073100034F82FE0C61D002F3FF7BEAE30460DF10A +:107320000901401A009903468842C8BF0B46002B4A +:107330000DF109063FF52FAF8342BFF6FEAE0DF10A +:107340000900C05C07287FF7F8AE0F20F6E60000C2 +:10735000CBCCCC0C0000244002FCFFFFFFFF0F80D1 +:107360000000E03F0000F07FA08601000000F03F39 +:1073700084D797410FB0BDE8F08F2DE9F84783B06F +:1073800006468A461746984601F008FDB8F1000FF8 +:10739000406A356B90F8009003DC4FF001080FF263 +:1073A0000037BDF930404AF02000662808BF641C51 +:1073B00015D0672840F0848014F1040FC0F2868055 +:1073C000AC4280F2838096F83800641C010702D436 +:1073D000A845B8BF454620B22D1A48BF00250FFA70 +:1073E00084FAF068B169BAF1000F25DC4A1C302339 +:1073F0004354002D03DC96F83800010703D5F068EC +:1074000000F80290521C15EB0A0FB8BF6C4220B274 +:10741000441941424445B8BFA046B26171620FFAB7 +:1074200088F5F561F068B3692A4639461844F9F7DA +:1074300085FE641BB462C4E022B29045084417DAAA +:1074400042463946F9F77AFEB0694044B061AAEB8A +:107450000801002D716203DC96F838100A0705D583 +:10746000F16801F80090F069401CF061B562A8E095 +:107470003946F9F763FEB069002D5044A8EB0408C3 +:1074800003DC96F838100A0703D5F16801F800907C +:10749000401CB0610FFA88F08542F068B369B8BF4C +:1074A000A8460FFA88F207EB0A011844F9F746FEDE +:1074B000B0690FFA88F10844B061681A706280E020 +:1074C000BAF1610F14D14FF0700A16E0A84504DA42 +:1074D00096F838100A0758BF45466D1E48BF00256C +:1074E000BAF1670F14BF4FF0450A4FF0650A04E088 +:1074F000BAF1410F08BF4FF0500AB169F368481C58 +:10750000B061002D17F8012B5A5403DC96F838109F +:107510000A071BD5F168431CB36101F80090002DE8 +:1075200014DDA8F101080FFA88F08542F068B8BFB1 +:10753000A8460FFA88F239461844F9F7FFFDB069FA +:107540000FFA88F108446D1AB0617562F068B1698C +:107550000844002C80F800A003D42B214170811C2A +:1075600003E02D2141706442811C00206A460AE03C +:1075700023460A2493FBF4F404EB8405A3EB4503B0 +:1075800002F8013B401C24B2002CF1DC012806DC8F +:107590004AF02002652A04BF302201F8012B48B9C5 +:1075A000302001F8010B07E0401E1DF800203032AA +:1075B00001F8012B0028F7DCF068B2691044091AC1 +:1075C000F16196F8380000F0140010280DD17169AF +:1075D000B0694118706A4118F0694118B06A4118E1 +:1075E000706B8142BCBF411A316204B0BDE8F087C4 +:1075F000F8B505460E4617461C46002074B117F82C +:10760000011BB068A847B06030B1F06A401CF0625E +:107610000020641EF3D1F2BD4FF0FF30F2BD000038 +:107620007072696E74665F733A20256E20646973A8 +:10763000616C6C6F776564007072696E74663A2075 +:1076400062616420256E20617267756D656E7400DD +:107650007072696E74665F733A206261642025738C +:1076600020617267756D656E740000007072696EDE +:1076700074665F733A2062616420256C73206172C6 +:1076800067756D656E74000000000000000000006A +:107690006E616E004E414E00696E6600494E4600B6 +:1076A000300010B50446F9F749FD204610BD10B56D +:1076B000044610460A4601462046FEF763FF204670 +:1076C00010BD04E010F8013B6BB1491C521E52B1D1 +:1076D0000B7890F800C09C45F4D002D24FF0FF30F8 +:1076E00070470120704700207047000080B5017886 +:1076F000DFF818250229117009DD417851704188A1 +:1077000091800021007990704FF4807002E019B1EF +:1077100000218020F9F7E8FE002002BD80B5007846 +:10772000DFF8EC1408700021402015E080B5DFF888 +:10773000E41402780A7042784A7082788A708288EB +:10774000CA80C2880A81027ACA70427A0A71807A33 +:10775000487100214FF40070F9F7C6FE002002BD09 +:1077600080B500214FF48060F6E780B50078DFF83F +:10777000A814087000214FF40060EDE780B50068A0 +:10778000DFF89814086000214FF48050E4E780B5DA +:107790000078DFF88C14087000214FF40050DBE70C +:1077A00080B5DFF8801402780A7442784A748278CF +:1077B0008A74C278CA7440684A7DC861887D024371 +:1077C0000A7500214FF48040C6E780B500214FF4D0 +:1077D0000040C1E780B500214FF48030BCE710B510 +:1077E000DFF8401400224A7500F010F86371FBD3F3 +:1077F000002010BD10B5DFF82C1401224A750022BC +:1078000000F004F86373FBD3002010BD5442835C86 +:107810000C44521C062A70470078DFF8081488755B +:107820000020704780B50146DFF8FC03FBF7AAFB98 +:10783000002002BDDFF8EC1302680A620079C87507 +:107840000020704738B50446DFF8E05300F017F821 +:1078500094F84200A87000214FF480200BE038B566 +:107860000446DFF8CC5300F00AF894F84200A87000 +:1078700000214FF40020F9F737FE002032BD2078B8 +:107880002870402260786870A11C281DF9F756BC4A +:1078900080B5DFF8A013D0ED000AC1ED000AF5EEC7 +:1078A000400AF1EE10FA90ED010A81ED010A1CBFC9 +:1078B000B5EE400AF1EE10FA04D000214FF400308A +:1078C000F9F712FE002002BD0178D64A11764378FE +:1078D000537690ED010A51B9F6EE040A80EE200AC3 +:1078E00082ED090A90ED020A80EE200A03E082EDA3 +:1078F000090A90ED020A82ED0A0A0020704780B55D +:107900000078CD4908700021202025E738B5C54D05 +:1079100004462DED028B697DA87D86B0014304915C +:107920009FED8A8BA86AFCF75DF953EC182B01F0E8 +:107930009DFACDE90201686AFCF754F953EC182B63 +:1079400001F094FACDE900016B7E2A7E0FF2F0215E +:10795000204600F0CBFB06B00020BDEC028B32BD10 +:107960002DE9F0438046A94802780025032A85B016 +:10797000A2A604DA3146404600F0B8FB16E0002724 +:107980009FA4DFF8B89239F8170060B11DB1214605 +:10799000404600F09DF9FA1C00F00CF8694640469C +:1079A00000F096F901257F1C052FECDB002005B0C7 +:1079B000BDE8F0833146684600F098BB2DE9F841F8 +:1079C000984F0FF290287A7D0446B87D024385B027 +:1079D0008BA58CA120460ED100F07AF9052670B255 +:1079E00041463A5CFFF7E7FF00F045F8761E70B2BB +:1079F0000028F4D50FE000F06BF9052607F1080028 +:107A000071B2761E425C4146FFF7D5FF00F033F8B5 +:107A100070B20028F2D500F016F807F12C0100F042 +:107A200013F800F010F8386AFCF7DCF802460B4651 +:107A30000FF22821684600F059FB00F01CF80020E6 +:107A400006B0BDE8F0812946204600F041B9F0B506 +:107A500085B004466BA100F03BF900F027F868B24E +:107A600031463A5CFFF7A7FF00F005F86D1E68B2DB +:107A70000028F4D517E06946204600F029B9F0B592 +:107A800085B004465FA100F023F900F00FF807F17C +:107A9000080069B26D1E425CFFF78CFFFFF7EBFF39 +:107AA00068B20028F3D5002005B0F0BD05250FF21F +:107AB000A4165C4F704780B55A498A7D41E080B575 +:107AC00057493DE0F8B5574A937D517D0B43D16945 +:107AD00002910393D17C537C0191917C127C0091A3 +:107AE0000FF2801100F002FB002005B000BD80B550 +:107AF0004D4A45A126E038B54A4D0446286AFCF7B0 +:107B000071F802460B460FF25411204600F0EEFACF +:107B1000002032BD3EB5474D04466868FCF762F868 +:107B2000CDE900012868FCF75DF802460B460FF22C +:107B30004811204600F0DAFA00203EBD80B53E49EB +:107B40000A782EA100F0D2FA002002BD0000000049 +:107B50000000E43F2DE9F8430C4617468146022217 +:107B600028A1FFF7AEFD0026002839D197F8008044 +:107B7000387041462046F9F73FFF09F10209002518 +:107B8000494608780346202B20D06A10A0F1300C1B +:107B9000BCF10A0F38BF303B0AD3A0F1610EBEF131 +:107BA000060F38BF573B03D3413806281CD2373B5A +:107BB00005EBD57014F802C04010B5EB400014BFBF +:107BC00063440CEB0313A3546D1CADB2491C454533 +:107BD000D7DB012D19BF6D103D700120387000E01A +:107BE00001263046BDE8F28305EBD5704010B5EBB9 +:107BF0004000EED0A15C0909A154EAE72564000029 +:107C00002C0000003078000025730000A21800202E +:107C1000231900209818002020190020081900209E +:107C200021190020701700209C170020A8160020A2 +:107C3000EC160020B018002022190020B0170020F8 +:107C400025642C25642C252E31662C252E31662C9E +:107C5000256400002530327800000000252E3266B1 +:107C60000000000025642C25642C25642C25642C40 +:107C7000307825782C256400252E32662C252E326E +:107C8000660000000120704738B504000D4609D099 +:107C9000204601F068FB0444207848B90B4A0021D3 +:107CA000116032BD09480468002CF1D1002032BDBA +:107CB0002946204601F068FB2118087810B10022FF +:107CC00001F8012B2046014A116032BD1019002035 +:107CD000034600E05B1C1A78002AFBD111F801CBA7 +:107CE00083F800C013F801CBBCF1000FF6D1704748 +:107CF00080B510EE101A21F000402DED028BB0F58A +:107D0000000F82B0B0EE608A06D20021009160B10F +:107D1000684601F04BFB08E0C00D21F0FF417E38C2 +:107D200041F07C51009000EE101A20EE080A10EE8F +:107D3000102A22F00041009BC80D1B1828B1002B0F +:107D400003DDFF2B00DB40E035E02CE080B510EEDA +:107D5000101A21F000402DED028BB0F5000F82B01B +:107D6000B0EE608A06D20021009160B1684601F051 +:107D70001DFB08E0C00D21F0FF417E3841F07C5131 +:107D8000009000EE101A80EE080A10EE102A22F081 +:107D90000041009BC80D1B1828B1002B03DDFF2BF1 +:107DA00000DB12E007E011B1009801F023FB02B004 +:107DB000BDEC028B01BD02B022F0FF4242EAC35289 +:107DC000BDEC028B00EE102A01BD10EE101A02B0BD +:107DD0004FF0FF4001F000410843BDEC028B00EE84 +:107DE000100A01BD38B504000D4600F0868010EE83 +:107DF000100A400000F081800016401C10EE101A9E +:107E000001D1490279D0002CF7EE000A11D5644265 +:107E10000FF238210520002C18BF00283CD0E207C3 +:107E200044BF91ED001A60EE810A6408091D401EEE +:107E3000F1E750DD0FF214210520E20744BF91ED78 +:107E4000001A60EE810A6410091D401E002C01DD3D +:107E50000028F2D1FFF74CFF10EE100A40003AD094 +:107E60000016401C10EE101A01D1490233D0002C2C +:107E700031DDDFED6D0AFFF73BFF10EE100A400029 +:107E800029D00016401C10EE101A01D1490222D050 +:107E9000641E002CEDDC1EE0FFF758FF10EE100A08 +:107EA000400018D00016401C10EE101A01D14902F3 +:107EB00011D084B1DFED5D0AFFF71AFF10EE100A52 +:107EC000400008D00016401C10EE101A01D14902E3 +:107ED00001D0641EEED110EE100A400006D000164C +:107EE000401C10EE101A08D1490206D1AFF30080F1 +:107EF0001DB1286840F00100286031BD2DE9F14135 +:107F000083B01D001CBF00202860039E0F469046D2 +:107F100003A801F0D1FAC41020F00800012804F0F1 +:107F2000010424D1009001AB03993A46304601F098 +:107F300055FB10B99FED3E0A15E09DED020A0128A0 +:107F4000B8EEC00A0FDD03A9401EDFED3A0A51F872 +:107F5000042BB0EE401A00EE102AB8EEC00A401E04 +:107F600001EE200AF3D101982946404447E0022857 +:107F700048D10120009001AB03993A46304601F008 +:107F800011FC10B99FED2A0A15E09DED020A0128A7 +:107F9000B8EEC00A0FDD03A9401EDFED270A51F835 +:107FA000042BB0EE401A00EE102AB8EEC00A401EB4 +:107FB00001EE200AF3D110EE103A019A23F00041AD +:107FC000C80D02EB000714D0002F12DDFF2F09DBD4 +:107FD00010EE101A4FF0FF4001F00041084300EE90 +:107FE000100A0AE023F0FF4343EAC75300EE103AB9 +:107FF00003E011B1104601F0FDF929464046FFF7B4 +:10800000F1FE0AE0032808BF9FED0C0A05D0042802 +:108010000CBF9FED0B0A9FED060A0CB1B1EE400AB2 +:1080200004B0BDE8F0810000AEC59D741EB14F0ADA +:1080300000000000286B6E4E0000804D0000807F25 +:10804000FFFFFF7F0023002258E7000000002041CF +:108050000000C84200401C4620BCBE4CCA1B0E5A41 +:10806000AEC59D742DE9F84380460C0091461D462F +:1080700008BF6C46474600E07F1C387801F0A0FC42 +:108080000028F9D138782D2816BF2B2817F8016B56 +:108090002B262B464A462146384601F09BFC216898 +:1080A0008F4204D1C4F800800020BDE8F2832B2E5B +:1080B00004D1B0F1004F06D2BDE8F2832D2EFBD1E2 +:1080C000B0F1004F0CD9AFF300800DB10120286052 +:1080D0002D2E14BF6FF000404FF00040BDE8F2833A +:1080E0004042BDE8F2830023BCE700000CB430B589 +:1080F00083B0044606A802900A4600250194009524 +:1081000002AB01A9084878441E30FEF7FFFA019936 +:108110000D7000284EBF04460198041B204603B092 +:1081200030BC5DF80CFB00BFD798FFFF2DE9F84F7E +:108130004FF00009674A684B4FF00F0805460E469E +:1081400033E0664FBD4214BF072704278F40274303 +:108150004CF82E70C1431C6801EA040C7468E402F8 +:1081600048BF40EA0C0CC3F800C05C6801EA040C8C +:108170007468A40248BF40EA0C0CC3F804C0146839 +:1081800001EA040C7468E40348BF40EA0C0CC2F82E +:1081900000C0546801EA040C7168890348BF40EAD2 +:1081A0000C0CC2F804C009F10109316831FA09F078 +:1081B00000F07E80012404FA09F414EA0100F2D0F0 +:1081C0004FEA490C032101FA0CF16FEA010E7168C4 +:1081D00001F00307012F1CBF01F00301022911D197 +:1081E000A968F7680EEA010107FA0CF73943A9609C +:1081F000696821EA04047168C1F3001101FA09F108 +:108200000C436C604FEA8901347904F00304032CB9 +:108210001FD0EC68B7680EEA040407FA0CF73C4379 +:10822000EC60347904F00304022C12D14FEAD90730 +:1082300005EB870401F01C07D4F820A008FA07FB1F +:108240002AEA0B0AD6F810B00BFA07F747EA0A0732 +:1082500027622C680EEA0407347904F0030404FA58 +:108260000CF43C432C60746814F4403F9BD0DFF85E +:1082700070C04FEA990E5CF82E7001F00C0108FAFC +:1082800001F427EA0404B5F1904F08BF00270ED08F +:10829000144FBD4208BF012709D0134FBD4208BF8C +:1082A000022704D0114FBD427FF44BAF03274DE7A7 +:1082B000BDE8F18F81B0002A14BF8161816201B0F5 +:1082C00070470B4A136803421CBF106000F012B8DD +:1082D000704700008008005800080058001000484F +:1082E000080001400004004800080048000C004855 +:1082F0000C0800587047000080B542F629229042D1 +:1083000009D10A680548009200220B79418800884B +:10831000FAF73AFD02BD002002BD00001C19002042 +:10832000C0680840884201D1012070470020704792 +:10833000C0690840884201D1012070470020704781 +:1083400010B56C4C02212046FFF7F2FF38B160688F +:10835000C043810703D5FBF79CFF022018E00121F1 +:108360002046FFF7E5FF38B16068C043C10703D579 +:10837000FBF757FF01200BE008212046FFF7D8FF4D +:1083800038B16068C043010703D5FBF7D6FF08206A +:10839000A06010BD10B5574C00F033F818B96068F4 +:1083A000C043810306D400F02CF830B96068C043A4 +:1083B000810302D5BDE810407AE0082100F022F8E0 +:1083C00070B96068C04301030AD560684A4940F447 +:1083D00000206060086880474FF40020A06010BD56 +:1083E000202100F00FF858B96068C043810207D51A +:1083F000606840F400106060BDE81040FBF720BFEB +:1084000010BD022120468BE73C4881B0016841F451 +:1084100080110160006800F48010009000983848D6 +:10842000016841F4007101603648026842F400724C +:10843000026040BF20BF3448016841F40041016040 +:1084400001B0704780B53148016841F48011016086 +:10845000006800F48010009000982648016841F000 +:1084600001010160026842F4803202602C20FEF7B4 +:10847000F7F8BDE802402D20FEF7F2B82448016865 +:10848000490849000160704722494FF48030086074 +:1084900070471F48016821F00201016070471C48C5 +:1084A0004FF400314160016821F4003101607047F0 +:1084B0001748016841F400310160FBF7E3BE38B5AD +:1084C00004460C4D08212846FFF72AFF30B10A4820 +:1084D0000460686820F40020686031BDA0474FF454 +:1084E0000021A96031BD0A48016821F0080101603E +:1084F00070470000000C00580C1900205001005873 +:10850000D4080058200800580C04005850000058A7 +:10851000040C0058080C0058564900E0564981B038 +:108520000A6802430A60096808400090009801B098 +:10853000704718B585B068461421FDF79DF90320F2 +:1085400001904FF460410024009102940120FFF754 +:10855000E3FF00F097F8474C206840084000206097 +:10856000182100910220FFF7D7FF69464348FFF723 +:10857000DDFD206820F002002060FCF7DEF8FCF74B +:10858000DEF8FCF7E2F800F011F806B010BD00B517 +:1085900087B068460FF208211C22F8F7DFFDFBF7D1 +:1085A000C0FE6846F9F724F807B000BDF0B585B005 +:1085B00068461421FDF760F90026002500240021FB +:1085C0000FF2CC0000EBC102907988B11368B3F1CF +:1085D000904F08D0294FBB4208D0294FBB4204BF5F +:1085E0009088044304E09088064301E090880543A6 +:1085F000491C2229E4DB0020029001210320039082 +:108600000191B0B270B100900120FFF785FF012009 +:10861000FFF784FF00F036F80022B1B24FF090402F +:10862000FFF748FEA8B280B100900220FFF774FF68 +:108630000220FFF773FF114E69463046FFF776FDC3 +:108640000022A9B23046FFF735FEA0B280B10090FB +:108650000420FFF761FF0420FFF760FF084D694623 +:108660002846FFF763FD0022A1B22846FFF722FE4D +:1086700005B0F0BD4C0000584C0100580004004803 +:108680000008004869464FF09040FFF74FBD0000DA +:108690000000004801000000000000480100000048 +:1086A0000000004801000000000000480100000038 +:1086B0000000004801000000000000480100000028 +:1086C0000000004801000000000000480100000018 +:1086D0000000004801000000000000480100000008 +:1086E00000000048010000000000004801000000F8 +:1086F00000000048010000000000004801000000E8 +:1087000000000048010000000000004801000000D7 +:1087100000000048010000000000004801000000C7 +:1087200000000048010000000000004801000000B7 +:1087300000000048010000000000004801000000A7 +:108740000000004801000000000000480100000097 +:108750000000004801000000000000480100000087 +:108760000000004801000000000000480100000077 +:108770000000004801000000000000480100000067 +:108780000000004801000000000000480100000057 +:108790000000004801000000000000480100000047 +:1087A00000000000000000000000000090860008AB +:1087B000280003202C000320220404000249016049 +:1087C00002490161704700BF474200086F4200083C +:1087D00070B50F4E044630780025A8B1FDF72FFC88 +:1087E00032784FF47A71B1FBF2F1B0FBF1F0FDF7A2 +:1087F00051FF48B9102C07D2002221464FF0FF301C +:10880000FDF710FFB46000E00125284670BD00BFF1 +:108810009C130020564900E0564981B00A68024383 +:108820000A60096808400090009801B0704780B560 +:108830004FF40020FFF7F0FF002200212E20FDF76B +:10884000F1FEBDE802402E20FDF70ABF00684A494C +:10885000884200D0704780B54FF48010FFF7DCFFEE +:10886000002200212C20FDF7DDFE2C20FDF7F8FE74 +:10887000002200212D20FDF7D5FEBDE802402D206D +:10888000FDF7EEBE10B586B0044668461421FCF72D +:10889000F3FF206800F049F820D1086840F001009B +:1088A0000860096801F00101059105980120FFF7B2 +:1088B000B1FF0C2000900221002002900390019152 +:1088C0000820049069464FF09040FFF72FFC0022EB +:1088D00000212520FDF7A6FE252022E0274A904210 +:1088E00021D1486840F480404860486800F48040E6 +:1088F000059005980220FFF78DFFC020009002210F +:108900000120019102900021072003910490694603 +:108910001B48FFF70BFC002200212420FDF782FEFC +:108920002420FDF79DFE06B010BD164A1649904260 +:10893000704781B00068154988420DD11448816B99 +:1089400041F400418163026842F480620260006881 +:1089500000F480600090009801B0704700680D49F5 +:10896000884204BF4FF48020FFF756BF70470000D5 +:108970004C00005850000058000C005800380140CE +:1089800000040048008000405C00005800280040BF +:10899000580000580010005801484068704700BF58 +:1089A0009C13002081B040B100F124014A78022AD2 +:1089B00005D00420886100200870012026E00268AC +:1089C000136823F00E0313604A6A136823F480735C +:1089D000136000680268520852000260012091F89A +:1089E0002020CB6902F01C02904058608A6AC86A55 +:1089F0005060086B30B1026822F4807202604A6BEA +:108A0000886B5060012048700020087001B07047EA +:108A100038B500F1240200245178022903D0042043 +:108A20009061012428E001680B6823F00E030B60BD +:108A300001680D686D086D000D60516A0B6823F4C4 +:108A400080730B60012192F82030D56903F01C037C +:108A500099406960936AD16A5960116B31B10B68B2 +:108A600023F480730B60536B916B5960012151703B +:108A70001470516901B18847204632BD7047704774 +:108A800070477047B3BBD9B1B2F5803F7DD2022A9F +:108A90001ED98C46B1FBF2F102FB11C31B0443EA61 +:108AA0001043B3FBF2FC02FB1C3380B240EA0343E9 +:108AB000B3FBF2F002FB103240EA0C400023704797 +:108AC000022A05D98446B0FBF2F002FB10C27047BF +:108AD0004AB105D100F0010249085FEA3000704751 +:108AE00000220023704701F02BB80B000200002188 +:108AF00000207047904271EB030CF6D3B3F5803F32 +:108B00002FD2F0B5B3FA83F7B1FA81F4A7F10F0EC3 +:108B10003D1B5340CEF1200602FA0EF2F3415340C2 +:108B2000B5F10F0746D80F3C2C444140C4F1200654 +:108B3000A040F1414140B1FBF3F603FB1611A2FB4B +:108B40000645001BA94102D2761E8018594180EAD1 +:108B5000010221FA0EF362FA0EF200215A40304669 +:108B6000F0BD30B4B1FBF3FC03FB1C11A2FB0C45C0 +:108B7000001BA94103D2ACF1010C8018594130BC53 +:108B800002460B46604600217047B2F1807F65D3F4 +:108B9000F0B5B2FA82F7B1FA81F4C7F10F063D1BC6 +:108BA00022FA06F307F1110EF24120355A40B5F1D1 +:108BB0000F07B8D94140C4F12006A040F14141401F +:108BC000B1FBF3FC03FB1C11A2FB0C45001BA941EC +:108BD00003D2BCF1010C801859410F2F12D30F3F63 +:108BE000C90341EA5041B1FBF3F603FB1611A2FBA6 +:108BF0000645D4EBC030A94102D2761E80185941F7 +:108C000046EACC3C07B34140C7F12006B840F141E9 +:108C10004140B1FBF3F603FB1611A2FB0645001B16 +:108C2000A94102D2761E8018594180EA010221FA38 +:108C30000EF3C7F1200462FA0EF20CFA07F05A4064 +:108C40002CFA04F13043F0BD80EA010221FA0EF360 +:108C5000002162FA0EF260465A40F0BD8C46B1FB2C +:108C6000F2F102FB11C31B0243EA1063B3FBF2FCF7 +:108C700002FB1C331B024CEA002043EA1063B3FBE7 +:108C8000F2FC02FB1C331B024CEA002043EA106397 +:108C9000B3FBF2FC02FB1C331B024CEA002043EA4C +:108CA0001063B3FBF2FC02FB1C324CEA00200023F1 +:108CB0007047000000B500BF130096469446103977 +:108CC00028BFA0E80C50FAD85FEA417C28BF0CC04E +:108CD00048BF40F8042BC90728BF20F8022B48BF23 +:108CE00000F8012B00BD0000DFF80800006800F468 +:108CF000C060704700040058613807E005E0A0F14B +:108D000061011A2901D20120704741381A28804197 +:108D1000C00F7047A0F10901052901D3202801D116 +:108D20000120704700207047A0F141011A2938BF87 +:108D3000203070471B48704730B45368D418042B58 +:108D400009DA41B1057804F8015B10F8015B15B14F +:108D50005B1C491EF3E7536030BC704738B51446BE +:108D60001D4661B1FFF7E8FF61686A6B20469047D6 +:108D70006FF00102811A02D0491E03D005E06FF0A6 +:108D8000010032BD4FF0FF3032BD0021616032BDC5 +:108D9000DA6B1047034BE1E7024BF9E702487047F3 +:108DA0000000000074120020041300200278C9B2F1 +:108DB0008A421AB11CBF10F8012FF9E718BF002032 +:108DC0007047000080B508B90FF21C0005490B6818 +:108DD0001BB122220021984701E000F0B2FE2220C0 +:108DE00002BD000014190020636F6E737472616914 +:108DF0006E742068616E646C65723A2062616420F2 +:108E00006D65737361676500C9B2830706D0521E32 +:108E100022D310F8013B9942F7D11FE0083A13D34F +:108E200002F1040241EA012141EA014150F8043B08 +:108E3000121F21BF4B40A3F1013C2CEA030C1CF094 +:108E4000803FF3D0C9B2001F083210F8013B521E18 +:108E500028BF91EA030FF8D818BF0120401E7047C1 +:108E600080B5FFF767FF006C02BD0000B0B581EA76 +:108E7000030C0CF0004C40F2FF7515EA11541DBFB5 +:108E800015EA1357AC42AF4239E0E41923EA4553DF +:108E900043F48013C90241F0004141EA505EC70229 +:108EA0001100A7FB020200284FF00000EEFB01209A +:108EB0004FF00001E3FB072118BF42F00102401808 +:108EC00000214941E3FB0E01A4F580640F0302D2A7 +:108ED00052004041494154F101046CDD470872F1F0 +:108EE000004250F1000051EB0451A1F580115CBF2C +:108EF00041EA0C01B0BD4CEA05510020B0BD05EAC5 +:108F00001357AC4214BFAF4241E050EA410E1CBFC0 +:108F100052EA430E02E061460020B0BD24423C44C8 +:108F20001BD15FEA070EF6D0090302BF01460020FD +:108F3000AEF1140EB1FA81F7AEEB070401FA07FEA9 +:108F40000C37C7F1200100FA07F7C8404EEA000EBF +:108F500023EA455343F48013A2E733F00043B3FA06 +:108F600083F704BFB2FA82FE77440B3FE41BB7F1EC +:108F7000200E2FBF02FA0EF3BB40C7F1200E22FADB +:108F80000EFE38BF43EA0E03BA40641C82E750EA83 +:108F9000410E14BF52EA430E6FF000014FF4001768 +:108FA00017EB430F8ABF194617EB410FB5E74CEAA1 +:108FB00005510020B0BDD4F10104B4F120070FDA4F +:108FC000C4F12007520828BF42F0010210FA07F549 +:108FD00001FA07F7E1BF2A43E0403843E1400FE0E0 +:108FE000352C98DCC7F1200452EA400220FA07F23F +:108FF00018BF42F0010231FA07F0A1400A430021F4 +:1090000072F1004250F1000051EB0C01B0BD0000C4 +:1090100010B5144600F002F8226010BDC1F30A53E7 +:1090200043B14A0012F5001F28D2A3F2FE32A1EB91 +:109030000251704750EA410C20D001F0004C31EA57 +:109040000C01B1FA81F204BFB0FA80F3D2180B3AE6 +:10905000B2F120032CBF00FA03F1914041EA0C0168 +:109060003EBFC2F1200C20FA0CF31943904052424B +:1090700040F2FD33D21A01EB0351704700227047D2 +:109080004FF4001C1CEB410F94BF1CEB430F09E095 +:1090900041EA030C50EA4C0C52EA0C0C03D2994200 +:1090A00008BF9042704714BF8B4282427047000055 +:1090B0004FF4001C1CEB410F94BF1CEB430F09E065 +:1090C00041EA030C50EA4C0C52EA0C0C03D28B42DE +:1090D00008BF8242704714BF994290427047000017 +:1090E000124254D440F2FF7C1CEA11530FD0634566 +:1090F00031D09B1863453CBF01EB0251704701F032 +:10910000004141EA0C510020AFF30080704750EA63 +:10911000410320D001F0004C91EA0C011CD0B1FABF +:1091200081F30B3B9A420DD9D21A994051EA0C01B6 +:10913000C3F1200C20FA0CFC61449840531C40F20F +:10914000FF7CD7E7914041EA0C01C2F1200C20FAE4 +:109150000CF3194390407047B0FA80F31533202B7D +:10916000E0D3202AEED3203A203B9A4209D9D21AE2 +:1091700000FA03F141EA0C010020531C40F2FF7C8D +:10918000B8E700FA02F141EA0C01002070475242B0 +:1091900040F2FF7C1CEA11530DD06345DBD0B2EBEB +:1091A000030C3CBFA1EB025170470CF1010221EA14 +:1091B000035141F4801150EA410CCCD001F0004C35 +:1091C000352A27DC30B481EA0C01B2F1200309DA38 +:1091D000C2F12003044601FA03F5D0402843D140F0 +:1091E0009C400CE0C3F12002450020FA03F418BFB4 +:1091F00044F0010421FA03F091400C43002174F182 +:10920000004550F1000051EB0C01244230BC7FF4CA +:109210007BAF70476146002076E70000C11768B158 +:109220004840401AB0FA80F29040D21CC907C2F5FB +:10923000846241EA025202EBD021400570470000EF +:1092400070B44FF0004591EA030F40F17D846B400C +:10925000841A71EB030603D2001BB141121973414A +:109260004FF4001C1CEB410F34BF7CEB430442E085 +:109270000C0DA4EB1356352E4FDC45EAC323DB0A55 +:1092800045EAC121C912B6F120050DDD63FA05F6E4 +:10929000EB4086EA0305124218BF45F00105C018ED +:1092A00051F100010CD213E062FA06F5F24055408C +:1092B000F3415A40B340F3405A408018594107D314 +:1092C00049085FEA30005FEA350528BF45F001052F +:1092D00001F58011420875F1004250F1000041EBA8 +:1092E00004514E0016F5001F70BC38BF70470020B7 +:1092F000090D090570471CEB410F10D252EA4306D5 +:109300000BD0BCEB410F05D80C0DAB43661E342EC1 +:10931000B6DD02E0AB438018594170BC704770BCA9 +:1093200070470000400D491840EA81200CD2490DD9 +:10933000A1F58061491C40F0004005DBD1F11F011F +:1093400054BFC840C017704700207047014648B15D +:10935000B0FA80F18840C91CC1F58461090501EBB0 +:10936000D0214005704770B4044604E015F8016B45 +:10937000B34203D1641C23781BB10D462A78002A1E +:10938000F4D1201A70BC704770B4044600E0641C2D +:1093900023783BB10D462A78002AF8D015F8016BE6 +:1093A000B342F8D1201A70BC70470000034610EE9B +:1093B000100AF44600F004F8196000EE100A604745 +:1093C000C0F3C75129B1FF2912D07E39A0EBC1509B +:1093D0007047C0420DD000F000424002B0FA80F168 +:1093E00088407E31494242EA102000F17A507047AD +:1093F00000217047010010EE100AC0F3C7520AD4D2 +:10940000D2B3FF2A37D05218FF2A4CD200EBC151F9 +:1094100000EE101A7047494232B3FF2A2BD0914216 +:1094200004D2A0EBC15100EE101A7047521E891AE7 +:10943000A0EBC25000EE100A192918D8C1F17F0123 +:10944000C90500EE901AF1EE101A21F01F0020F469 +:10945000F850E1EE100A20EE200AF1EE100AE1EEDB +:10946000101A000925D27047C042E5D1704700F0BC +:10947000004000EE100A7047C042FCD07F2906D899 +:109480007F31C90500EE901A20EE200A70474FF098 +:10949000FE4000EE900A20EE200A7F3910EE100AFE +:1094A000C0F3C752AFE7C10D41F0FF01C90500EE9F +:1094B000101AAFF3008070472DE9F84305460C46BB +:1094C0002E68002700E0761C307800F079FA00283A +:1094D000F9D130782D280CBF08272B2800D1761C15 +:1094E000307840F020016E2927D1707840F02000BC +:1094F000612802BFB07840F020006E2802D02E68AC +:10950000002746E0F61CB046042798F800002828FB +:109510003FD118F8019F484600F0CAFB0028F8D157 +:10952000A9F130000A28F4D398F800005F28F0D0A1 +:1095300029282ED108F101062BE069292CD1707859 +:1095400040F020006E2802BFB07840F0200066286E +:1095500002D02E6800271CE016F8030F40F0200010 +:10956000692802BF707840F020006E2847F003079A +:109570000FD1B07840F02000692802BFF07840F0A9 +:109580002000742805D1307940F02000792808BFE8 +:10959000761DF4B126601CE0302802BF707840F0E0 +:1095A0002000782813D1B01C01782E2908BF401C58 +:1095B0000078A0F16101062921BFA0F14102062A2D +:1095C00030380A2803D2B61C47F0020701E047F002 +:1095D00001072E603846BDE8F28300002DE9F14F07 +:1095E0008CB09246169A02EBC20200202D2AC8BF08 +:1095F0002D22186083465860002501E0491C012592 +:109600000C78302CFAD000241F460B78A3F13006DA +:109610000A2E80F09780944207DB3B685B1C3B601E +:109620000B78302B05D0012003E0303B0DF80430DF +:10963000641C491C0125E8E73868401E3860761C28 +:10964000012530783028F7D03078A0F130010A2990 +:1096500080F08780444507DA30380DF80400641C38 +:109660003968491E396003E0302818BF4FF00109FE +:10967000761C0125E8E70DF1FF31095D49B93A682B +:10968000521C3A60641E002CF5DC04BF8DF800B05B +:10969000012400284BD0092394FBF3F3C4F1090102 +:1096A00003EBC3035918092291FBF2F202EBC20249 +:1096B000DC468A1A18BF4FF0010B5A468B46A44568 +:1096C0005DDA09219BFBF1F11DF80C3001EBC101C2 +:1096D000BBEB01011DBF57F8221001EB810103EB29 +:1096E0004103521C47F822300BF1010B0CF1010C25 +:1096F000E5E700240025DFF8A8C0314608E065450D +:1097000004DA05EB850402EB4405303D491C0124D5 +:109710000A78A2F130060A2EF1D30E46BEF12D0FC3 +:10972000396808BF6D426D183D6004B91E46BAF134 +:10973000000F03D000B90C9ECAF8006058460DB067 +:10974000BDE8F08F0E4690468146FFF727FB406A42 +:1097500031780278914208BF761C002C7FF474AFF8 +:109760006FE75FEA090128468DD00DF1FF310DF159 +:10977000FF3211F80810491C02F8081083E731780D +:1097800041F0200165299346D1D1334616F8011FD7 +:109790002B2916BF2D2916F801EB4FF02B0EA8E749 +:1097A00000E1F5052DE9FD4E8BB00024DDF8589061 +:1097B0001C60C9EBC909B9F1230FC8BF4FF02309D9 +:1097C0005C60A24602E0491C4FF0010A087830288C +:1097D000F9D00FF2BC150FF2D010A3460A950990EC +:1097E0000F461E46397816222846FFF70DFB002843 +:1097F00000F09A80D94503DA3068401C306007E0F9 +:109800000A9A0999801A085C0DF80B000BF1010BFC +:109810007F1C4FF0010AE5E73068401E30607F1C76 +:109820004FF0010A38783028F6D0397816222846C9 +:10983000FFF7EAFA002800F08480D9450ADB0FF22E +:109840006811401B085C0DF80B000BF1010B31682F +:10985000491E31607F1C4FF0010AE6E70DF1FF322F +:10986000525C4AB933685B1C3360491E0029F5DC41 +:1098700004BF8DF80040012132689200BAF1000F58 +:10988000326046D04FF0070C91FBFCFCC1F107059C +:10989000CCEBCC0C6544072295FBF2F20023C2EB23 +:1098A000C202AA1A18BF0124A4468B425CDA07221E +:1098B00095FBF2F21DF80340C2EBC202AA1A1ABFCE +:1098C00056F82C2004EB02140CF1010C46F82C4045 +:1098D0006D1C5B1CE9E7002300252C48394608E095 +:1098E000854204DA05EB850307EB4305303D491C4F +:1098F00001230F78A7F13009B9F10A0FF0D30F4611 +:10990000BCF12D0F316808BF6D426D18356003B989 +:1099100017460C9921B1BAF1000F08BF0B9F0F60D9 +:1099200020460EB0BDE8F08EFFF738FA406A39786D +:109930000278914208BF7F1CBBF1000F7FF475AF26 +:1099400070E75946894591DA1DF80910072906DDA7 +:109950000DF1FF3212F80910491C02F809104946AE +:109960003268521C326081E7397841F02001702959 +:109970006446CED13A4617F8011F2B2916BF2D2970 +:1099800017F801CB4FF02B0CA5E7000000E1F5051F +:109990003031323334353637383961626364656665 +:1099A0004142434445460000000102030405060706 +:1099B00008090A0B0C0D0E0F0A0B0C0D0E0F000000 +:1099C00010B50446FFF7B6F901462046096ABDE81E +:1099D000104008472DE9FC4F83B00E4617460BB1E7 +:1099E00000221A608046444600E0641C2078FFF79D +:1099F000E7FF0028F9D120782D2816BF2B2814F86E +:109A000001BB4FF02B0B002F019603D4012F01D087 +:109A1000252F04DB002E48D0C6F8008045E0002F3B +:109A20000ADD102F04BF2078302802BF617841F092 +:109A3000200178290ED10AE02078302818BF0A27A3 +:109A400008D1607840F02000782802D11027A41CAB +:109A500000E00827029400E0641C20783028FBD046 +:109A60004FF000090FF288002646CA468DF8000024 +:109A700007E09DF80050451BCA46EDB207FB0959A7 +:109A8000641C207800F01EF90FF2640301463A4688 +:109A90001846FFF7B9F90028EBD10299A1424846D0 +:109AA00005D1019808B1C0F8008000201DE00FF238 +:109AB0006801A61BC95D761A002E0FD405DC451B74 +:109AC00003D3B5FBF7F1514508D0AFF300800498FC +:109AD00008B1012101604FF0FF3003E0BBF12D0F11 +:109AE00008BF4042019901B10C6005B0BDE8F08F9C +:109AF0003031323334353637383961626364656604 +:109B00006768696A6B6C6D6E6F707172737475766D +:109B10007778797A0000000000002115110E0D0CF5 +:109B20000B0B0A0A090909090908080808080808A6 +:109B300007070707070707070707070707000000CA +:109B40007047012000F0C8B8841A71EB030604D2F4 +:109B50006E40001BB141121973414FF4001C1CEB05 +:109B6000410F34BF7CEB430682E00C0DA4EB13568F +:109B7000362E7BDC012E45EAC32341DC43EA5253F7 +:109B800012BFD20292025B08240545EAC12141EAD4 +:109B90005051D2EBC020994125D407D1B0FA80F6BC +:109BA00010FA06F162D00020203608E0B1FA81F602 +:109BB000B140C6F1200220FA02F21143B0404FEA50 +:109BC000F474B4EB465434F001064FEA74040AD836 +:109BD000D6F50016760D04F00044F04061FA06F266 +:109BE0005040F1404840C00A40EA415021F0004155 +:109BF00028BF5FEA500550F1000044EBD12135E069 +:109C0000DB0A45EAC121C90AB6F120050EDD42EAA8 +:109C10000242120CC5F1200603FA06F6EB4042EAB6 +:109C200006056D42984161F100010DE062FA06F50A +:109C3000F240554063FA06FC82EA0C02F3405A40B7 +:109C40006D42904161EB030111F4801F05D1641E48 +:109C5000620502D06D004041494121F48011430862 +:109C600075F1004350F1000041EB045170BC7047A6 +:109C70001CEB410F15D223F0004352EA43060BD0F0 +:109C80004FEA4C0CBCEB410F04D80C0D661E342E71 +:109C9000B7DDEBE7801A994150EA410608BF002181 +:109CA000E4E708BF1CEB430F28BF6FF00001DDE7BE +:109CB00010B50446FFF73EF8014620460969BDE8A5 +:109CC0001040084710B50446FFF734F80146204617 +:109CD000896ABDE81040084780B5AFF30080024AAA +:109CE00011001820ABBEFBE726000200424C455F86 +:109CF0005445535400000000424C455F5356430006 +:109D0000424C455F494E495400000000424C455FBB +:109D10004144565F504152414D000000424C455F66 +:109D200041445600424C455F434841525F414444E0 +:109D300000000000424C455F5045524950485F5377 +:109D400045435F5245510000424C455F50414952E6 +:109D5000494E475F434F4E4649524D00424C455F86 +:109D6000504153534B45595F52455350000000003A +:109D7000424C455F494F5F4341504100424C455F73 +:109D80005345545F41555448454E5F52455100007C +:109D9000424C455F434C4541525F44420000000045 +:109DA000424C455F52535400424C455F4346475F27 +:109DB00052414E445F41444452000000424C455FD2 +:109DC0005055425F4144445200000000424C455F00 +:109DD00052414E445F41444452000000424C455FB2 +:109DE0004E414D4500000000424C455F52465F50D9 +:109DF0004F57455200000000424C455F4E4F5449BA +:109E0000465F56414C000000424C455F494E444974 +:109E1000435F56414C000000424C455F434F4E4E5D +:109E20005F494E5400000000424C455F4E4F4E4586 +:109E300000000000424C455F4556545F575249545C +:109E400045000000424C455F4556545F434F4E4E1F +:109E500000000000424C455F4556545F5550445F3A +:109E6000434F4E4E00000000424C455F4556545F44 +:109E700056414C55455F434F4E4649524D000000F8 +:109E8000424C455F4556545F504153534B45595FD3 +:109E900052455100424C455F4556545F504149522E +:109EA000494E4700424C455F4556545F4E4F4E4524 +:109EB000000000001248016841F4700101604FF495 +:109EC000E0224FF0B041086840F0010008608A606D +:109ED0000C480A6802400C480A60036823F0050336 +:109EE0000360426852085200426000220748C8607E +:109EF0000861086820F4802008608A6170470000CB +:109F000088ED00E0FBFEF6FA9400005800100422F1 +:109F10000100000003000000050000000100000037 +:109F200001000000060000000A0000002000000000 +:109F30000200000004000000080000001000000003 +:109F4000400000008000000000010000000200004E +:109F5000A0860100400D0300801A060000350C00A9 +:109F600040420F0080841E0000093D0000127A006C +:109F70000024F40000366E010048E801006CDC02A9 +:109F800000000000000000000000000000000000D1 +:109F90002DE9FC4D016800F10805490805EBC102F7 +:109FA000019200F10802406800F0010A02EBC108CA +:109FB000400808EBC00B00200021019A95422FD0E9 +:109FC0002A68AE186A68324400920835009A9642B0 +:109FD000F3D016F9014B009A964205D12A68AE18C3 +:109FE0006A6832440092083516F8017B884210D125 +:109FF000D84508BFFFF7A5FDD8F80000D8F8041031 +:10A00000BAF1000F18BF48440144884208F108081B +:10A01000EED0002C00F8017B05D5641CE6D1D5E715 +:10A020005846BDE8F68D641ED5D5CFE7FEE7FEE7BE +:10A03000FEE7FEE7FEE770477047704700F018B88C +:10A040000248FAF7A8BC0248FAF7A5BC181100208C +:10A0500008100020FEF774B9FEF79CB900F010B8A4 +:10A060001020FEF72EB90120FEF72BB9F7F7F1BD4E +:10A070000248416802788918416070479C130020AB +:10A080000449C8680A6882430A60486000F004B85E +:10A090000000000000150058704719E050F8042B2C +:10A0A000D30744BFA9F101039A18091F002304290B +:10A0B00042F8043BF9D25FEA817C134604D54FF0A5 +:10A0C000000CA2F800C09B1CC90744BF00211970F6 +:10A0D00050F8041B0029E1D17047000010B5074972 +:10A0E00079441831064C7C44163404E00A68081D93 +:10A0F000114488470146A142F8D110BD2C00000050 +:10A10000780000004EF68851CEF20001086840F455 +:10A1100070000860BFF34F8FBFF36F8F4FF0007078 +:10A12000E1EE100A7047000073FFFFFF70050000AA +:10A13000B813002070080000300003200000000069 +:10A1400051FEFFFF02000000020000009E0100001F +:10A1500002000000280003200800000035FEFFFF79 +:10A16000020000000200000084010000B4010000B1 +:10A1700008100020B00300000000000000000000F4 +:10A1800000000000000000000100000002000000CC +:10A19000030000000400000000F00DF8002801D0CA +:10A1A000FFF79CFFAFF300800020AFF30080F7F7CC +:10A1B0006DFA00F002F80120704700F001B80000CD +:10A1C00007463846FFF788FDFBE738B504460D46DD +:10A1D000284600F005F8A84218BF0024204632BDEA +:10A1E0000149F7F77FBB00BFBC1200200148804740 +:10A1F00001480047B59E0008FDA10008AFF30080AC +:10A20000FFF780FFFFF7C8FF00002E004300FFF7B5 +:10A21000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF772 +:10A22000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF762 +:10A23000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF752 +:10A24000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF742 +:10A25000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF732 +:10A26000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF722 +:10A27000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF712 +:10A28000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF702 +:10A29000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7F2 +:10A2A000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7E2 +:10A2B000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7D2 +:10A2C000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7C2 +:10A2D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7B2 +:10A2E000FEBFFFF7FEBFFFF7FEBFF8008100ED00E5 +:10A2F0005920C2CDCCA6C100009EC1CDCC96C1CD07 +:10A30000CC8CC1000084C1000074C19A9961C166FF +:10A310006652C1CDCC40C166662EC166661EC19A2A +:10A32000990DC19A99F9C0CDCCDCC0CDCCBCC0662A +:10A33000669EC0000080C09A9949C0CDCC1CC06602 +:10A3400066E6BF6666A6BF9A9959BFFD0004BF9A2C +:10A350009919BEFA0001803FFD0010400000404006 +:10A36000000080400000A0400000C040810081004B +:10A37000FA005CEC9C0008F89C0008009D00080CAA +:10A380009D00081C9D0008249D0008349D0008487D +:10A390009D00085C9D0008709D00087C9D00089051 +:10A3A0009D0008A09D0008A89D0008BC9D0008CC49 +:10A3B0009D0008DC9D0008E89D0008F89D00080845 +:10A3C0009E0008189E0008289E00080CA2000801A4 +:10A3D000FD000304130020FC0003FF8C0008FC00B8 +:10A3E00003F98C0008FC000B158D0008FD8C00089B +:10A3F000298D0008F80003F5110008FC0004E311A2 +:10A40000000801F900130204010110160020601673 +:10A4100000201016002010160020FC00031016006B +:10A4200020FB0006130020EC120020E0001B08A215 +:10A43000000808A2000808A2000808A2000808A254 +:10A44000000808A2000808A20008F8FF0B0AA200F2 +:10A450000808A2000808A20008FAFFEA00F8FFF4C2 +:10A4600000030DFF0183F4000009F5001C349E0079 +:10A4700008449E0008549E0008689E0008809E00C4 +:10A4800008949E0008A49E000801F9000010FC003A +:10A490000E040048000400480004004800093D0084 +:040000050800A1FD51 +:00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_common.h new file mode 100644 index 000000000..7197b3388 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_common.h @@ -0,0 +1,117 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_common.h + * Description : App Common application configuration file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_COMMON_H +#define APP_COMMON_H + +#ifdef __cplusplus +extern "C"{ +#endif + +#include +#include +#include +#include +#include + +#include "app_conf.h" + + /* -------------------------------- * + * Basic definitions * + * -------------------------------- */ + +#undef NULL +#define NULL 0 + +#undef FALSE +#define FALSE 0 + +#undef TRUE +#define TRUE (!0) + + /* -------------------------------- * + * Critical Section definition * + * -------------------------------- */ +#define BACKUP_PRIMASK() uint32_t primask_bit= __get_PRIMASK() +#define DISABLE_IRQ() __disable_irq() +#define RESTORE_PRIMASK() __set_PRIMASK(primask_bit) + + /* -------------------------------- * + * Macro delimiters * + * -------------------------------- */ + +#define M_BEGIN do { + +#define M_END } while(0) + + /* -------------------------------- * + * Some useful macro definitions * + * -------------------------------- */ + +#ifndef MAX +#define MAX( x, y ) (((x)>(y))?(x):(y)) +#endif + +#ifndef MIN +#define MIN( x, y ) (((x)<(y))?(x):(y)) +#endif + +#define MODINC( a, m ) M_BEGIN (a)++; if ((a)>=(m)) (a)=0; M_END + +#define MODDEC( a, m ) M_BEGIN if ((a)==0) (a)=(m); (a)--; M_END + +#define MODADD( a, b, m ) M_BEGIN (a)+=(b); if ((a)>=(m)) (a)-=(m); M_END + +#define MODSUB( a, b, m ) MODADD( a, (m)-(b), m ) + +#define PAUSE( t ) M_BEGIN \ + __IO int _i; \ + for ( _i = t; _i > 0; _i -- ); \ + M_END + +#define DIVF( x, y ) ((x)/(y)) + +#define DIVC( x, y ) (((x)+(y)-1)/(y)) + +#define DIVR( x, y ) (((x)+((y)/2))/(y)) + +#define SHRR( x, n ) ((((x)>>((n)-1))+1)>>1) + +#define BITN( w, n ) (((w)[(n)/32] >> ((n)%32)) & 1) + +#define BITNSET( w, n, b ) M_BEGIN (w)[(n)/32] |= ((U32)(b))<<((n)%32); M_END + + /* -------------------------------- * + * Compiler * + * -------------------------------- */ +#define PLACE_IN_SECTION( __x__ ) __attribute__((section (__x__))) + +#ifdef WIN32 +#define ALIGN(n) +#else +#define ALIGN(n) __attribute__((aligned(n))) +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_COMMON_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_conf.h new file mode 100644 index 000000000..88f4d3492 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_conf.h @@ -0,0 +1,702 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_conf.h + * Description : Application configuration file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_CONF_H +#define APP_CONF_H + +#include "hw.h" +#include "hw_conf.h" +#include "hw_if.h" +#include "ble_bufsize.h" + +/****************************************************************************** + * Application Config + ******************************************************************************/ + +/**< generic parameters ******************************************************/ + +/** + * Define Tx Power + */ +#define CFG_TX_POWER (0x18) /* -0.15dBm */ + +/** + * Define Advertising parameters + */ +#define CFG_ADV_BD_ADDRESS (0) +#define CFG_BLE_ADDRESS_TYPE RANDOM_ADDR /**< Bluetooth address types defined in ble_legacy.h */ +/*#define CFG_STATIC_RANDOM_ADDRESS (0xf257acd87a6c)*/ /**< Static Random Address fixed for lifetime of the device */ + +#define CFG_MINI_CONN_ADV_INTERVAL_MIN (0x20) /**< 20ms */ +#define CFG_MINI_CONN_ADV_INTERVAL_MAX (0x30) /**< 30ms */ +#define CFG_INTER_CONN_ADV_INTERVAL_MIN (0x120) /**< 180ms */ +#define CFG_INTER_CONN_ADV_INTERVAL_MAX (0x140) /**< 200ms */ +#define CFG_FAST_CONN_ADV_INTERVAL_MIN (0x80) /**< 80ms */ +#define CFG_FAST_CONN_ADV_INTERVAL_MAX (0xA0) /**< 100ms */ +#define CFG_LP_CONN_ADV_INTERVAL_MIN (0x640) /**< 1s */ +#define CFG_LP_CONN_ADV_INTERVAL_MAX (0xFA0) /**< 2.5s */ + +/** + * Define IO Authentication + */ +#define CFG_BONDING_MODE (1) +#define CFG_FIXED_PIN (111111) +#define CFG_USED_FIXED_PIN (0) +#define CFG_ENCRYPTION_KEY_SIZE_MAX (16) +#define CFG_ENCRYPTION_KEY_SIZE_MIN (8) + +/** + * Define IO capabilities + */ +#define CFG_IO_CAPABILITY_DISPLAY_ONLY (0x00) +#define CFG_IO_CAPABILITY_DISPLAY_YES_NO (0x01) +#define CFG_IO_CAPABILITY_KEYBOARD_ONLY (0x02) +#define CFG_IO_CAPABILITY_NO_INPUT_NO_OUTPUT (0x03) +#define CFG_IO_CAPABILITY_KEYBOARD_DISPLAY (0x04) + +#define CFG_IO_CAPABILITY CFG_IO_CAPABILITY_DISPLAY_YES_NO + +/** + * Define MITM modes + */ +#define CFG_MITM_PROTECTION_NOT_REQUIRED (0x00) +#define CFG_MITM_PROTECTION_REQUIRED (0x01) + +#define CFG_MITM_PROTECTION CFG_MITM_PROTECTION_REQUIRED + +/** + * Define Secure Connections Support + */ +#define CFG_SECURE_NOT_SUPPORTED (0x00) +#define CFG_SECURE_OPTIONAL (0x01) +#define CFG_SECURE_MANDATORY (0x02) + +#define CFG_SC_SUPPORT CFG_SECURE_OPTIONAL + +/** + * Define Keypress Notification Support + */ +#define CFG_KEYPRESS_NOT_SUPPORTED (0x00) +#define CFG_KEYPRESS_SUPPORTED (0x01) + +#define CFG_KEYPRESS_NOTIFICATION_SUPPORT CFG_KEYPRESS_NOT_SUPPORTED + +/** + * Numeric Comparison Answers + */ +#define YES (0x01) +#define NO (0x00) + +/** + * Device name configuration for Generic Access Service + */ +#define CFG_GAP_DEVICE_NAME "TEMPLATE" +#define CFG_GAP_DEVICE_NAME_LENGTH (8) + +/** + * Define PHY + */ +#define ALL_PHYS_PREFERENCE 0x00 +#define RX_2M_PREFERRED 0x02 +#define TX_2M_PREFERRED 0x02 +#define TX_1M 0x01 +#define TX_2M 0x02 +#define RX_1M 0x01 +#define RX_2M 0x02 + +/** + * Define random address + */ +#define CFG_STATIC_RANDOM_ADDRESS 0xc122AABBCCDD +#define PUBLIC_ADDR 0X00U +#define STATIC_RANDOM_ADDR 0X01U +/** +* Identity root key used to derive LTK and CSRK +*/ +#define CFG_BLE_IRK {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0} + +/** +* Encryption root key used to derive LTK and CSRK +*/ +#define CFG_BLE_ERK {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21} + +/** + * SMPS supply + * SMPS not used when Set to 0 + * SMPS used when Set to 1 + */ +#define CFG_USE_SMPS 1 + +/* USER CODE BEGIN Generic_Parameters */ + +/* USER CODE END Generic_Parameters */ + +/**< specific parameters */ +/*****************************************************/ + +/** +* AD Element - Group B Feature +*/ +/* LSB - Second Byte */ +#define CFG_FEATURE_OTA_REBOOT (0x20) +#define P2P_SERVER1 1 /*1 = Device is Peripherique*/ +#define P2P_SERVER2 0 +#define P2P_SERVER3 0 +#define P2P_SERVER4 0 +#define P2P_SERVER5 0 +#define P2P_SERVER6 0 + +#define CFG_DEV_ID_P2P_SERVER1 (0x83) +#define CFG_DEV_ID_P2P_SERVER2 (0x84) +#define CFG_DEV_ID_P2P_SERVER3 (0x87) +#define CFG_DEV_ID_P2P_SERVER4 (0x88) +#define CFG_DEV_ID_P2P_SERVER5 (0x89) +#define CFG_DEV_ID_P2P_SERVER6 (0x8A) +#define CFG_DEV_ID_P2P_ROUTER (0x85) + +#define RADIO_ACTIVITY_EVENT 1 /* 1 for OOB Demo */ + +/** +* AD Element - Group B Feature +*/ +/* LSB - First Byte */ +#define CFG_FEATURE_THREAD_SWITCH (0x40) + +/* LSB - Second Byte */ +#define CFG_FEATURE_OTA_REBOOT (0x20) + +#define CONN_L(x) ((int)((x)/0.625f)) +#define CONN_P(x) ((int)((x)/1.25f)) + + /* L2CAP Connection Update request parameters used for test only with smart Phone */ +#define L2CAP_REQUEST_NEW_CONN_PARAM 0 + +#define L2CAP_INTERVAL_MIN CONN_P(1000) /* 1s */ +#define L2CAP_INTERVAL_MAX CONN_P(1000) /* 1s */ +#define L2CAP_SLAVE_LATENCY 0x0000 +#define L2CAP_TIMEOUT_MULTIPLIER 0x1F4 + +/* USER CODE BEGIN Specific_Parameters */ +#define PUSH_BUTTON_SW1_EXTI_IRQHandler EXTI4_IRQHandler +#define PUSH_BUTTON_SW2_EXTI_IRQHandler EXTI0_IRQHandler + + +#define CFG_MINI_CONN_ADV_INTERVAL_MIN (0x20) /**< 20ms */ +#define CFG_MINI_CONN_ADV_INTERVAL_MAX (0x30) /**< 30ms */ +#define CFG_INTER_CONN_ADV_INTERVAL_MIN (0x120) /**< 180ms */ +#define CFG_INTER_CONN_ADV_INTERVAL_MAX (0x140) /**< 180ms */ + +/* USER CODE END Specific_Parameters */ + +/****************************************************************************** + * BLE Stack + ******************************************************************************/ +/** + * Maximum number of simultaneous connections that the device will support. + * Valid values are from 1 to 8 + */ +#define CFG_BLE_NUM_LINK 2 + +/** + * Maximum number of Services that can be stored in the GATT database. + * Note that the GAP and GATT services are automatically added so this parameter should be 2 plus the number of user services + */ +#define CFG_BLE_NUM_GATT_SERVICES 8 + +/** + * Maximum number of Attributes + * (i.e. the number of characteristic + the number of characteristic values + the number of descriptors, excluding the services) + * that can be stored in the GATT database. + * Note that certain characteristics and relative descriptors are added automatically during device initialization + * so this parameters should be 9 plus the number of user Attributes + */ +#define CFG_BLE_NUM_GATT_ATTRIBUTES 68 + +/** + * Maximum supported ATT_MTU size + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_MAX_ATT_MTU (251) + +/** + * Size of the storage area for Attribute values + * This value depends on the number of attributes used by application. In particular the sum of the following quantities (in octets) should be made for each attribute: + * - attribute value length + * - 5, if UUID is 16 bit; 19, if UUID is 128 bit + * - 2, if server configuration descriptor is used + * - 2*DTM_NUM_LINK, if client configuration descriptor is used + * - 2, if extended properties is used + * The total amount of memory needed is the sum of the above quantities for each attribute. + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1344) + +/** + * Prepare Write List size in terms of number of packet + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" + */ +#define CFG_BLE_PREPARE_WRITE_LIST_SIZE BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU) + +/** + * Number of allocated memory blocks + * This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter when CFG_BLE_OPTIONS is set to 1 + */ +#define CFG_BLE_MBLOCK_COUNT (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK)) + +/** + * Enable or disable the Extended Packet length feature. Valid values are 0 or 1. + */ +#define CFG_BLE_DATA_LENGTH_EXTENSION 1 + +/** + * Sleep clock accuracy in Slave mode (ppm value) + */ +#define CFG_BLE_SLAVE_SCA 500 + +/** + * Sleep clock accuracy in Master mode + * 0 : 251 ppm to 500 ppm + * 1 : 151 ppm to 250 ppm + * 2 : 101 ppm to 150 ppm + * 3 : 76 ppm to 100 ppm + * 4 : 51 ppm to 75 ppm + * 5 : 31 ppm to 50 ppm + * 6 : 21 ppm to 30 ppm + * 7 : 0 ppm to 20 ppm + */ +#define CFG_BLE_MASTER_SCA 0 + +/** + * Source for the low speed clock for RF wake-up + * 1 : external high speed crystal HSE/32/32 + * 0 : external low speed crystal ( no calibration ) + */ +#define CFG_BLE_LSE_SOURCE 0 + +/** + * Start up time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us) + */ +#define CFG_BLE_HSE_STARTUP_TIME 0x148 + +/** + * Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us) + */ +#define CFG_BLE_MAX_CONN_EVENT_LENGTH (0xFFFFFFFF) + +/** + * Viterbi Mode + * 1 : enabled + * 0 : disabled + */ +#define CFG_BLE_VITERBI_MODE 1 + +/** + * BLE stack Options flags to be configured with: + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only + * 0: LL + host + * (bit 1): 1: no service change desc. + * 0: with service change desc. + * (bit 2): 1: device name Read-Only + * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 + * other bits: reserved (shall be set to 0) + */ +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) + +#define CFG_BLE_MAX_COC_INITIATOR_NBR (32) + +#define CFG_BLE_MIN_TX_POWER (0) + +#define CFG_BLE_MAX_TX_POWER (0) + + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + +/****************************************************************************** + * Transport Layer + ******************************************************************************/ +/** + * Queue length of BLE Event + * This parameter defines the number of asynchronous events that can be stored in the HCI layer before + * being reported to the application. When a command is sent to the BLE core coprocessor, the HCI layer + * is waiting for the event with the Num_HCI_Command_Packets set to 1. The receive queue shall be large + * enough to store all asynchronous events received in between. + * When CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE is set to 27, this allow to store three 255 bytes long asynchronous events + * between the HCI command and its event. + * This parameter depends on the value given to CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE. When the queue size is to small, + * the system may hang if the queue is full with asynchronous events and the HCI layer is still waiting + * for a CC/CS event, In that case, the notification TL_BLE_HCI_ToNot() is called to indicate + * to the application a HCI command did not receive its command event within 30s (Default HCI Timeout). + */ +#define CFG_TLBLE_EVT_QUEUE_LENGTH 5 +/** + * This parameter should be set to fit most events received by the HCI layer. It defines the buffer size of each element + * allocated in the queue of received events and can be used to optimize the amount of RAM allocated by the Memory Manager. + * It should not exceed 255 which is the maximum HCI packet payload size (a greater value is a lost of memory as it will + * never be used) + * It shall be at least 4 to receive the command status event in one frame. + * The default value is set to 27 to allow receiving an event of MTU size in a single buffer. This value maybe reduced + * further depending on the application. + */ +#define CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE 255 /**< Set to 255 with the memory manager and the mailbox */ + +#define TL_BLE_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE ) +/****************************************************************************** + * UART interfaces + ******************************************************************************/ + +/** + * Select UART interfaces + */ +#define CFG_DEBUG_TRACE_UART 0 +#define CFG_CONSOLE_MENU hw_uart1 +/****************************************************************************** + * USB interface + ******************************************************************************/ + +/** + * Enable/Disable USB interface + */ +#define CFG_USB_INTERFACE_ENABLE 0 + +/****************************************************************************** + * IPCC interface + ******************************************************************************/ + +/** + * The IPCC is dedicated to the communication between the CPU2 and the CPU1 + * and shall not be modified by the application + * The two following definitions shall not be modified + */ +#define HAL_IPCC_TX_IRQHandler(...) HW_IPCC_Tx_Handler( ) +#define HAL_IPCC_RX_IRQHandler(...) HW_IPCC_Rx_Handler( ) + +/****************************************************************************** + * Low Power + ******************************************************************************/ +/** + * When set to 1, the low power mode is enable + * When set to 0, the device stays in RUN mode + */ +#define CFG_LPM_SUPPORTED 0 + +/****************************************************************************** + * RTC interface + ******************************************************************************/ +#define HAL_RTCEx_WakeUpTimerIRQHandler(...) HW_TS_RTC_Wakeup_Handler( ) + +/****************************************************************************** + * Timer Server + ******************************************************************************/ +/** + * CFG_RTC_WUCKSEL_DIVIDER: This sets the RTCCLK divider to the wakeup timer. + * The lower is the value, the better is the power consumption and the accuracy of the timerserver + * The higher is the value, the finest is the granularity + * + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output + * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding + * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. + * + * CFG_RTC_SYNCH_PRESCALER: This sets the synchronous prescaler of the RTC. + * When the 1Hz calendar clock is required, it shall be sets according to other settings + * When the 1Hz calendar clock is not needed, CFG_RTC_SYNCH_PRESCALER should be set to 0x7FFF (MAX VALUE) + * + * CFG_RTCCLK_DIVIDER_CONF: + * Shall be set to either 0,2,4,8,16 + * When set to either 2,4,8,16, the 1Hhz calendar is supported + * When set to 0, the user sets its own configuration + * + * The following settings are computed with LSI as input to the RTC + */ + +#define CFG_RTCCLK_DIVIDER_CONF 0 + +#if (CFG_RTCCLK_DIVIDER_CONF == 0) +/** + * Custom configuration + * It does not support 1Hz calendar + * It divides the RTC CLK by 16 + */ + +#define CFG_RTCCLK_DIV (16) +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#define CFG_RTC_ASYNCH_PRESCALER (0x0F) +#define CFG_RTC_SYNCH_PRESCALER (0x7FFF) + +#else + +#if (CFG_RTCCLK_DIVIDER_CONF == 2) +/** + * It divides the RTC CLK by 2 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (3) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 4) +/** + * It divides the RTC CLK by 4 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (2) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 8) +/** + * It divides the RTC CLK by 8 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (1) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 16) +/** + * It divides the RTC CLK by 16 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#endif + +#define CFG_RTCCLK_DIV CFG_RTCCLK_DIVIDER_CONF +#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) +#define CFG_RTC_SYNCH_PRESCALER (DIVR( LSE_VALUE, (CFG_RTC_ASYNCH_PRESCALER+1) ) - 1 ) + +#endif + +/** tick timer value in us */ +#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) + +typedef enum +{ + CFG_TIM_PROC_ID_ISR, + /* USER CODE BEGIN CFG_TimProcID_t */ + + /* USER CODE END CFG_TimProcID_t */ +} CFG_TimProcID_t; + +/****************************************************************************** + * Debug + ******************************************************************************/ +/** + * When set, this resets some hw resources to set the device in the same state than the power up + * The FW resets only register that may prevent the FW to run properly + * + * This shall be set to 0 in a final product + * + */ +#define CFG_HW_RESET_BY_FW 1 + +/** + * keep debugger enabled while in any low power mode when set to 1 + * should be set to 0 in production + */ +#define CFG_DEBUGGER_SUPPORTED 0 + +/** + * When set to 1, the traces are enabled in the BLE services + */ +#define CFG_DEBUG_BLE_TRACE 0 + +/** + * Enable or Disable traces in application + */ +#define CFG_DEBUG_APP_TRACE 0 + +#if (CFG_DEBUG_APP_TRACE != 0) +#define APP_DBG_MSG PRINT_MESG_DBG +#else +#define APP_DBG_MSG PRINT_NO_MESG +#endif + +#if ( (CFG_DEBUG_BLE_TRACE != 0) || (CFG_DEBUG_APP_TRACE != 0) ) +#define CFG_DEBUG_TRACE 1 +#endif + +#if (CFG_DEBUG_TRACE != 0) +#undef CFG_LPM_SUPPORTED +#undef CFG_DEBUGGER_SUPPORTED +#define CFG_LPM_SUPPORTED 0 +#define CFG_DEBUGGER_SUPPORTED 1 +#endif + +/** + * When CFG_DEBUG_TRACE_FULL is set to 1, the trace are output with the API name, the file name and the line number + * When CFG_DEBUG_TRACE_LIGHT is set to 1, only the debug message is output + * + * When both are set to 0, no trace are output + * When both are set to 1, CFG_DEBUG_TRACE_FULL is selected + */ +#define CFG_DEBUG_TRACE_LIGHT 0 +#define CFG_DEBUG_TRACE_FULL 0 + +#if (( CFG_DEBUG_TRACE != 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 ) && (CFG_DEBUG_TRACE_FULL == 0)) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 1 +#endif + +#if ( CFG_DEBUG_TRACE == 0 ) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 0 +#endif + +/** + * When not set, the traces is looping on sending the trace over UART + */ +#define DBG_TRACE_USE_CIRCULAR_QUEUE 1 + +/** + * max buffer Size to queue data traces and max data trace allowed. + * Only Used if DBG_TRACE_USE_CIRCULAR_QUEUE is defined + */ +#define DBG_TRACE_MSG_QUEUE_SIZE 4096 +#define MAX_DBG_TRACE_MSG_SIZE 1024 + +/* USER CODE BEGIN Defines */ +#define CFG_LED_SUPPORTED 0 +#define CFG_BUTTON_SUPPORTED 0 +/* USER CODE END Defines */ + +/****************************************************************************** + * Scheduler + ******************************************************************************/ + +/** + * These are the lists of task id registered to the scheduler + * Each task id shall be in the range [0:31] + * This mechanism allows to implement a generic code in the API TL_BLE_HCI_StatusNot() to comply with + * the requirement that a HCI/ACI command shall never be sent if there is already one pending + */ + +/**< Add in that list all tasks that may send a ACI/HCI command */ +typedef enum +{ + CFG_TASK_ADV_UPDATE_ID, + CFG_TASK_MEAS_REQ_ID, + CFG_TASK_ADV_CANCEL_ID, +#if (L2CAP_REQUEST_NEW_CONN_PARAM != 0 ) + CFG_TASK_CONN_UPDATE_REG_ID, +#endif + CFG_TASK_HCI_ASYNCH_EVT_ID, +/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + CFG_TASK_SW1_BUTTON_PUSHED_ID, + CFG_TASK_MANAGE_START_STOP_ADV_ID, + CFG_TASK_MANAGE_INIT_ID, + CFG_TASK_MANAGE_SERVICE_INIT_ID, + CFG_TASK_MANAGE_CUSTOM_SERVICE_INIT_ID, + CFG_TASK_MANAGE_CHARAC_INIT_ID, + CFG_TASK_MANAGE_SLAVE_SECUTITY_REQ_ID, + CFG_TASK_PAIRING_CONFIRM_ID, + CFG_TASK_PASS_KEY_RESP_ID, + CFG_TASK_IO_CAPA_ID, + CFG_TASK_SET_AUTHEN_REQ_ID, + CFG_TASK_CLEAR_DB_ID, + CFG_TASK_HCIRESET_ID, + CFG_TASK_MANAGE_CONN_PARAM_ID, + CFG_TASK_UPDATE_CHAR_ID, + CFG_TASK_INDICATION_UPDATE_CHAR_ID, +/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ +} CFG_Task_Id_With_HCI_Cmd_t; + +/**< Add in that list all tasks that never send a ACI/HCI command */ +typedef enum +{ + CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ + CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, +/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + +/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ +} CFG_Task_Id_With_NO_HCI_Cmd_t; +#define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD + +/** + * This is the list of priority required by the application + * Each Id shall be in the range 0..31 + */ +typedef enum +{ + CFG_SCH_PRIO_0, + CFG_PRIO_NBR, +} CFG_SCH_Prio_Id_t; + +/** + * This is a bit mapping over 32bits listing all events id supported in the application + */ +typedef enum +{ + CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID, + CFG_IDLEEVT_SYSTEM_HCI_CMD_EVT_RSP_ID, +} CFG_IdleEvt_Id_t; + +/****************************************************************************** + * LOW POWER + ******************************************************************************/ +/** + * Supported requester to the MCU Low Power Manager - can be increased up to 32 + * It list a bit mapping of all user of the Low Power Manager + */ +typedef enum +{ + CFG_LPM_APP, + CFG_LPM_APP_BLE, + /* USER CODE BEGIN CFG_LPM_Id_t */ + + /* USER CODE END CFG_LPM_Id_t */ +} CFG_LPM_Id_t; + +/****************************************************************************** + * OTP manager + ******************************************************************************/ +#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE + +#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR + +#endif /*APP_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_debug.h new file mode 100644 index 000000000..b7562390d --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_debug.h @@ -0,0 +1,67 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_debug.h + * Description : Header for app_debug.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __APP_DEBUG_H +#define __APP_DEBUG_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void APPD_Init( void ); + void APPD_EnableCPU2( void ); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__APP_DEBUG_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_entry.h new file mode 100644 index 000000000..30480b8c2 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/app_entry.h @@ -0,0 +1,68 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_entry.h + * Description : App entry configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_ENTRY_H +#define APP_ENTRY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void MX_APPE_Config( void ); + void MX_APPE_Init( void ); + void MX_APPE_Process( void ); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_ENTRY_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server.h new file mode 100644 index 000000000..c837f45de --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server.h @@ -0,0 +1,49 @@ +/** + ****************************************************************************** + * @file ble_at_server.h + * @author BLE Application Team + * @brief + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef BLE_AT_SERVER_H +#define BLE_AT_SERVER_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "stm32wb_at.h" + +/* Private includes ----------------------------------------------------------*/ + +/* Exported types ------------------------------------------------------------*/ + +/* Exported constants --------------------------------------------------------*/ + +/* Exported macros -----------------------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ +uint8_t ble_at_server_Init(void); +uint8_t ble_at_server_Process_rx_frame(char * str); +uint8_t ble_at_server_Send_evt(stm32wb_at_BLE_EVT_t cmd, void *param); +FOREACH_AT_BLE_CMD(GENERATE_AT_BLE_SERVER_CB_PROTO) + +#ifdef __cplusplus +} +#endif + +#endif /* AT_BLE_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server_cb.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server_cb.h new file mode 100644 index 000000000..004e62623 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/ble_at_server_cb.h @@ -0,0 +1,43 @@ +/** + ****************************************************************************** + * @file ble_at_server_cb.h + * @author BLE Application Team + * @brief + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef BLE_AT_SERVER_CB_H +#define BLE_AT_SERVER_CB_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ + +/* Exported types ------------------------------------------------------------*/ + +/* Exported constants --------------------------------------------------------*/ + +/* Exported macros -----------------------------------------------------------*/ + +/* Exported functions --------------------------------------------------------*/ + +#ifdef __cplusplus +} +#endif + +#endif /* BLE_AT_SERVER_CB_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_conf.h new file mode 100644 index 000000000..038e4d183 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_conf.h @@ -0,0 +1,236 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : hw_conf.h + * Description : Hardware configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_CONF_H +#define HW_CONF_H + +/****************************************************************************** + * Semaphores + * THIS SHALL NO BE CHANGED AS THESE SEMAPHORES ARE USED AS WELL ON THE CM0+ + *****************************************************************************/ +/** +* The CPU2 may be configured to store the Thread persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* CFG_HW_THREAD_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_THREAD_NVM_SRAM_SEMID 9 + +/** +* The CPU2 may be configured to store the BLE persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* CFG_HW_BLE_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_BLE_NVM_SRAM_SEMID 8 + +/** +* Index of the semaphore used by CPU2 to prevent the CPU1 to either write or erase data in flash +* The CPU1 shall not either write or erase in flash when this semaphore is taken by the CPU2 +* When the CPU1 needs to either write or erase in flash, it shall first get the semaphore and release it just +* after writing a raw (64bits data) or erasing one sector. +* Once the Semaphore has been released, there shall be at least 1us before it can be taken again. This is required +* to give the opportunity to CPU2 to take it. +* On v1.4.0 and older CPU2 wireless firmware, this semaphore is unused and CPU2 is using PES bit. +* By default, CPU2 is using the PES bit to protect its timing. The CPU1 may request the CPU2 to use the semaphore +* instead of the PES bit by sending the system command SHCI_C2_SetFlashActivityControl() +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID 7 + +/** +* Index of the semaphore used by CPU1 to prevent the CPU2 to either write or erase data in flash +* In order to protect its timing, the CPU1 may get this semaphore to prevent the CPU2 to either +* write or erase in flash (as this will stall both CPUs) +* The PES bit shall not be used as this may stall the CPU2 in some cases. +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID 6 + +/** +* Index of the semaphore used to manage the CLK48 clock configuration +* When the USB is required, this semaphore shall be taken before configuring te CLK48 for USB +* and should be released after the application switch OFF the clock when the USB is not used anymore +* When using the RNG, it is good enough to use CFG_HW_RNG_SEMID to control CLK48. +* More details in AN5289 +*/ +#define CFG_HW_CLK48_CONFIG_SEMID 5 + +/* Index of the semaphore used to manage the entry Stop Mode procedure */ +#define CFG_HW_ENTRY_STOP_MODE_SEMID 4 + +/* Index of the semaphore used to access the RCC */ +#define CFG_HW_RCC_SEMID 3 + +/* Index of the semaphore used to access the FLASH */ +#define CFG_HW_FLASH_SEMID 2 + +/* Index of the semaphore used to access the PKA */ +#define CFG_HW_PKA_SEMID 1 + +/* Index of the semaphore used to access the RNG */ +#define CFG_HW_RNG_SEMID 0 + +/****************************************************************************** + * HW TIMER SERVER + *****************************************************************************/ +/** + * The user may define the maximum number of virtual timers supported. + * It shall not exceed 255 + */ +#define CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER 6 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the preemptpriority part of the NVIC. + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO 3 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the subpriority part of the NVIC. It does not exist on all processors. When it is not supported + * on the CPU, the setting is ignored + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO 0 + +/** + * Define a critical section in the Timer server + * The Timer server does not support the API to be nested + * The Application shall either: + * a) Ensure this will never happen + * b) Define the critical section + * The default implementations is masking all interrupts using the PRIMASK bit + * The TimerServer driver uses critical sections to avoid context corruption. This is achieved with the macro + * TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION. When CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION is set + * to 1, all STM32 interrupts are masked with the PRIMASK bit of the CortexM CPU. It is possible to use the BASEPRI + * register of the CortexM CPU to keep allowed some interrupts with high priority. In that case, the user shall + * re-implement TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION and shall make sure that no TimerServer + * API are called when the TIMER critical section is entered + */ +#define CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION 1 + +/** + * This value shall reflect the maximum delay there could be in the application between the time the RTC interrupt + * is generated by the Hardware and the time when the RTC interrupt handler is called. This time is measured in + * number of RTCCLK ticks. + * A relaxed timing would be 10ms + * When the value is too short, the timerserver will not be able to count properly and all timeout may be random. + * When the value is too long, the device may wake up more often than the most optimal configuration. However, the + * impact on power consumption would be marginal (unless the value selected is extremely too long). It is strongly + * recommended to select a value large enough to make sure it is not too short to ensure reliability of the system + * as this will have marginal impact on low power mode + */ +#define CFG_HW_TS_RTC_HANDLER_MAX_DELAY ( 10 * (LSI_VALUE/1000) ) + + /** + * Interrupt ID in the NVIC of the RTC Wakeup interrupt handler + * It shall be type of IRQn_Type + */ +#define CFG_HW_TS_RTC_WAKEUP_HANDLER_ID RTC_WKUP_IRQn + +/****************************************************************************** + * HW UART + *****************************************************************************/ +#define CFG_HW_LPUART1_ENABLED 1 +#define CFG_HW_LPUART1_DMA_TX_SUPPORTED 0 + +#define CFG_HW_USART1_ENABLED 1 +#define CFG_HW_USART1_DMA_TX_SUPPORTED 0 + +/** + * LPUART1 + */ +#define CFG_HW_LPUART1_PREEMPTPRIORITY 0x0F +#define CFG_HW_LPUART1_SUBPRIORITY 0 + +/** < The application shall check the selected source clock is enable */ +#define CFG_HW_LPUART1_SOURCE_CLOCK RCC_LPUART1CLKSOURCE_SYSCLK + +#define CFG_HW_LPUART1_BAUDRATE 9600 +#define CFG_HW_LPUART1_WORDLENGTH UART_WORDLENGTH_8B +#define CFG_HW_LPUART1_STOPBITS UART_STOPBITS_1 +#define CFG_HW_LPUART1_PARITY UART_PARITY_NONE +#define CFG_HW_LPUART1_HWFLOWCTL UART_HWCONTROL_NONE +#define CFG_HW_LPUART1_MODE UART_MODE_TX_RX +#define CFG_HW_LPUART1_ADVFEATUREINIT UART_ADVFEATURE_NO_INIT +#define CFG_HW_LPUART1_OVERSAMPLING UART_OVERSAMPLING_8 + +#define CFG_HW_LPUART1_TX_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE +#define CFG_HW_LPUART1_TX_PORT GPIOA +#define CFG_HW_LPUART1_TX_PIN GPIO_PIN_2 +#define CFG_HW_LPUART1_TX_MODE GPIO_MODE_AF_PP +#define CFG_HW_LPUART1_TX_PULL GPIO_NOPULL +#define CFG_HW_LPUART1_TX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_LPUART1_TX_ALTERNATE GPIO_AF8_LPUART1 + +#define CFG_HW_LPUART1_RX_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE +#define CFG_HW_LPUART1_RX_PORT GPIOA +#define CFG_HW_LPUART1_RX_PIN GPIO_PIN_3 +#define CFG_HW_LPUART1_RX_MODE GPIO_MODE_AF_PP +#define CFG_HW_LPUART1_RX_PULL GPIO_NOPULL +#define CFG_HW_LPUART1_RX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_LPUART1_RX_ALTERNATE GPIO_AF8_LPUART1 + +/** + * UART1 + */ +#define CFG_HW_USART1_PREEMPTPRIORITY 0x0F +#define CFG_HW_USART1_SUBPRIORITY 0 + +/** < The application shall check the selected source clock is enable */ +#define CFG_HW_USART1_SOURCE_CLOCK RCC_USART1CLKSOURCE_SYSCLK + +#define CFG_HW_USART1_BAUDRATE 115200 +#define CFG_HW_USART1_WORDLENGTH UART_WORDLENGTH_8B +#define CFG_HW_USART1_STOPBITS UART_STOPBITS_1 +#define CFG_HW_USART1_PARITY UART_PARITY_NONE +#define CFG_HW_USART1_HWFLOWCTL UART_HWCONTROL_NONE +#define CFG_HW_USART1_MODE UART_MODE_TX_RX +#define CFG_HW_USART1_ADVFEATUREINIT UART_ADVFEATURE_NO_INIT +#define CFG_HW_USART1_OVERSAMPLING UART_OVERSAMPLING_8 + +#define CFG_HW_USART1_TX_PORT_CLK_ENABLE __HAL_RCC_GPIOB_CLK_ENABLE +#define CFG_HW_USART1_TX_PORT GPIOB +#define CFG_HW_USART1_TX_PIN GPIO_PIN_6 +#define CFG_HW_USART1_TX_MODE GPIO_MODE_AF_PP +#define CFG_HW_USART1_TX_PULL GPIO_NOPULL +#define CFG_HW_USART1_TX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_USART1_TX_ALTERNATE GPIO_AF7_USART1 + +#define CFG_HW_USART1_RX_PORT_CLK_ENABLE __HAL_RCC_GPIOB_CLK_ENABLE +#define CFG_HW_USART1_RX_PORT GPIOB +#define CFG_HW_USART1_RX_PIN GPIO_PIN_7 +#define CFG_HW_USART1_RX_MODE GPIO_MODE_AF_PP +#define CFG_HW_USART1_RX_PULL GPIO_NOPULL +#define CFG_HW_USART1_RX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_USART1_RX_ALTERNATE GPIO_AF7_USART1 + +#endif /*HW_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_if.h new file mode 100644 index 000000000..8394a102b --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/hw_if.h @@ -0,0 +1,247 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_if.h + * @author MCD Application Team + * @brief Hardware Interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_IF_H +#define HW_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + + /* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx.h" +#include "stm32wbxx_ll_exti.h" +#include "stm32wbxx_ll_system.h" +#include "stm32wbxx_ll_rcc.h" +#include "stm32wbxx_ll_ipcc.h" +#include "stm32wbxx_ll_bus.h" +#include "stm32wbxx_ll_pwr.h" +#include "stm32wbxx_ll_cortex.h" +#include "stm32wbxx_ll_utils.h" +#include "stm32wbxx_ll_hsem.h" +#include "stm32wbxx_ll_gpio.h" +#include "stm32wbxx_ll_rtc.h" + +#ifdef USE_STM32WBXX_USB_DONGLE +#include "stm32wbxx_usb_dongle.h" +#endif +#ifdef USE_STM32WBXX_NUCLEO +#include "stm32wbxx_nucleo.h" +#endif +#ifdef USE_X_NUCLEO_EPD +#include "x_nucleo_epd.h" +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /****************************************************************************** + * HW UART + ******************************************************************************/ + typedef enum + { + hw_uart1, + hw_uart2, + hw_lpuart1, + } hw_uart_id_t; + + typedef enum + { + hw_uart_ok, + hw_uart_error, + hw_uart_busy, + hw_uart_to, + } hw_status_t; + + void HW_UART_Init(hw_uart_id_t hw_uart_id); + void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout); + hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*Callback)(void)); + void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); + void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); + + /****************************************************************************** + * HW TimerServer + ******************************************************************************/ + /* Exported types ------------------------------------------------------------*/ + /** + * This setting is used when standby mode is supported. + * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does + * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured + * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. + */ + typedef enum + { + hw_ts_InitMode_Full, + hw_ts_InitMode_Limited, + } HW_TS_InitMode_t; + + /** + * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, + * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() + * + * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. + */ + typedef enum + { + hw_ts_SingleShot, + hw_ts_Repeated + } HW_TS_Mode_t; + + /** + * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed + * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a + * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased + */ + typedef enum + { + hw_ts_Successful, + hw_ts_Failed, + }HW_TS_ReturnStatus_t; + + typedef void (*HW_TS_pTimerCb_t)(void); + + /** + * @brief Initialize the timer server + * This API shall be called by the application before any timer is requested to the timer server. It + * configures the RTC module to be connected to the LSI input clock. + * + * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the + * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested + * @param hrtc: RTC Handle + * @retval None + */ + void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); + + /** + * @brief Interface to create a virtual timer + * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it + * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the + * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler + * which module is concerned. In return, the user gets a timer ID to handle it. + * + * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow + * identification of the requester + * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) + * @param TimerMode: Mode of the virtual timer (Single shot or repeated) + * @param pTimerCallBack: Callback when the virtual timer expires + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not + */ + HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Stop a virtual timer + * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. + * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. + * Nothing is done when it is called to stop a timer which has been already stopped + * + * @param TimerID: Id of the timer to stop + * @retval None + */ + void HW_TS_Stop(uint8_t TimerID); + + /** + * @brief Start a virtual timer + * This API shall be used to start a timer. The timeout value is specified and may be different each time. + * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may + * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always + * stay in the running state. When the timer expires, it will be restarted with the same timeout value. + * This API shall not be called on a running timer. + * + * @param TimerID: The ID Id of the timer to start + * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) + * @retval None + */ + void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); + + /** + * @brief Delete a virtual timer from the list + * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from + * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the + * creation of a new timer if required and may get a different timer id + * + * @param TimerID: The ID of the timer to remove from the list + * @retval None + */ + void HW_TS_Delete(uint8_t TimerID); + + /** + * @brief Schedule the timer list on the timer interrupt handler + * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes + * care of clearing all status flag required in the RTC and EXTI peripherals + * + * @param None + * @retval None + */ + void HW_TS_RTC_Wakeup_Handler(void); + + /** + * @brief Return the number of ticks to count before the interrupt + * This API returns the number of ticks left to be counted before an interrupt is generated by the + * Timer Server. This API may be used by the application for power management optimization. When the system + * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running + * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the + * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time + * versus time in low power mode is implementation specific + * When the timer is disabled (No timer in the list), it returns 0xFFFF + * + * @param None + * @retval The number of ticks left to count + */ + uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); + + /** + * @brief Notify the application that a registered timer has expired + * This API shall be implemented by the user application. + * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt + * context. The application may implement an Operating System to change the context priority where the timer + * callback may be handled. This API provides the module ID to identify which module is concerned and to allow + * sending the information to the correct task + * + * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created + * @param TimerID: The TimerID of the expired timer + * @param pTimerCallBack: The Callback associated with the timer when it has been created + * @retval None + */ + void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Notify the application that the wakeupcounter has been updated + * This API should be implemented by the user application + * This API notifies the application that the counter has been updated. This is expected to be used along + * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the + * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification + * provides a way to the application to solve that race condition to reevaluate the counter value before + * entering low power mode + * + * @param None + * @retval None + */ + void HW_TS_RTC_CountUpdated_AppNot(void); + +#ifdef __cplusplus +} +#endif + +#endif /*HW_IF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/main.h new file mode 100644 index 000000000..73ec8ea02 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/main.h @@ -0,0 +1,93 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.h + * @brief : Header for main.c file. + * This file contains the common defines of the application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MAIN_H +#define __MAIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" +#include "app_conf.h" +#include "app_entry.h" +#include "app_common.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void Error_Handler(void); + +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +/* Private defines -----------------------------------------------------------*/ +#define B1_Pin GPIO_PIN_4 +#define B1_GPIO_Port GPIOC +#define LD2_Pin GPIO_PIN_0 +#define LD2_GPIO_Port GPIOB +#define LD3_Pin GPIO_PIN_1 +#define LD3_GPIO_Port GPIOB +#define JTMS_Pin GPIO_PIN_13 +#define JTMS_GPIO_Port GPIOA +#define JTCK_Pin GPIO_PIN_14 +#define JTCK_GPIO_Port GPIOA +#define B2_Pin GPIO_PIN_0 +#define B2_GPIO_Port GPIOD +#define B3_Pin GPIO_PIN_1 +#define B3_GPIO_Port GPIOD +#define JTDO_Pin GPIO_PIN_3 +#define JTDO_GPIO_Port GPIOB +#define LD1_Pin GPIO_PIN_5 +#define LD1_GPIO_Port GPIOB +#define STLINK_RX_Pin GPIO_PIN_6 +#define STLINK_RX_GPIO_Port GPIOB +#define STLINK_TX_Pin GPIO_PIN_7 +#define STLINK_TX_GPIO_Port GPIOB +/* USER CODE BEGIN Private defines */ + +/* USER CODE END Private defines */ + +#ifdef __cplusplus +} +#endif + +#endif /* __MAIN_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32_lpm_if.h new file mode 100644 index 000000000..49bc3661f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32_lpm_if.h @@ -0,0 +1,78 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** +* @file stm32_lpm_if.h +* @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32_LPM_IF_H +#define __STM32_LPM_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ); +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ); + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ); +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ); + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ); + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ); + +#ifdef __cplusplus +} +#endif + +#endif /*__STM32_LPM_IF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_hal_conf.h new file mode 100644 index 000000000..60bbdd235 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_hal_conf.h @@ -0,0 +1,352 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_conf.h + * @author MCD Application Team + * @brief HAL configuration file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_HAL_CONF_H +#define __STM32WBxx_HAL_CONF_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ + +/* ########################## Module Selection ############################## */ +/** + * @brief This is the list of modules to be used in the HAL driver + */ +#define HAL_MODULE_ENABLED +/*#define HAL_ADC_MODULE_ENABLED */ +/*#define HAL_CRYP_MODULE_ENABLED */ +/*#define HAL_COMP_MODULE_ENABLED */ +/*#define HAL_CRC_MODULE_ENABLED */ +#define HAL_HSEM_MODULE_ENABLED +/*#define HAL_I2C_MODULE_ENABLED */ +#define HAL_IPCC_MODULE_ENABLED +/*#define HAL_IRDA_MODULE_ENABLED */ +/*#define HAL_IWDG_MODULE_ENABLED */ +/*#define HAL_LCD_MODULE_ENABLED */ +/*#define HAL_LPTIM_MODULE_ENABLED */ +/*#define HAL_PCD_MODULE_ENABLED */ +/*#define HAL_PKA_MODULE_ENABLED */ +/*#define HAL_QSPI_MODULE_ENABLED */ +#define HAL_RNG_MODULE_ENABLED +#define HAL_RTC_MODULE_ENABLED +/*#define HAL_SAI_MODULE_ENABLED */ +/*#define HAL_SMBUS_MODULE_ENABLED */ +/*#define HAL_SMARTCARD_MODULE_ENABLED */ +/*#define HAL_SPI_MODULE_ENABLED */ +/*#define HAL_TIM_MODULE_ENABLED */ +/*#define HAL_TSC_MODULE_ENABLED */ +#define HAL_UART_MODULE_ENABLED +/*#define HAL_USART_MODULE_ENABLED */ +/*#define HAL_WWDG_MODULE_ENABLED */ +#define HAL_EXTI_MODULE_ENABLED +#define HAL_CORTEX_MODULE_ENABLED +#define HAL_DMA_MODULE_ENABLED +#define HAL_FLASH_MODULE_ENABLED +#define HAL_GPIO_MODULE_ENABLED +#define HAL_PWR_MODULE_ENABLED +#define HAL_RCC_MODULE_ENABLED + +#define USE_HAL_ADC_REGISTER_CALLBACKS 0u +#define USE_HAL_COMP_REGISTER_CALLBACKS 0u +#define USE_HAL_CRYP_REGISTER_CALLBACKS 0u +#define USE_HAL_I2C_REGISTER_CALLBACKS 0u +#define USE_HAL_IRDA_REGISTER_CALLBACKS 0u +#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0u +#define USE_HAL_PCD_REGISTER_CALLBACKS 0u +#define USE_HAL_PKA_REGISTER_CALLBACKS 0u +#define USE_HAL_QSPI_REGISTER_CALLBACKS 0u +#define USE_HAL_RNG_REGISTER_CALLBACKS 0u +#define USE_HAL_RTC_REGISTER_CALLBACKS 0u +#define USE_HAL_SAI_REGISTER_CALLBACKS 0u +#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0u +#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0u +#define USE_HAL_SPI_REGISTER_CALLBACKS 0u +#define USE_HAL_TIM_REGISTER_CALLBACKS 0u +#define USE_HAL_TSC_REGISTER_CALLBACKS 0u +#define USE_HAL_UART_REGISTER_CALLBACKS 0u +#define USE_HAL_USART_REGISTER_CALLBACKS 0u +#define USE_HAL_WWDG_REGISTER_CALLBACKS 0u + +/* ########################## Oscillator Values adaptation ####################*/ +/** + * @brief Adjust the value of External High Speed oscillator (HSE) used in your application. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSE is used as system clock source, directly or through the PLL). + */ +#if !defined (HSE_VALUE) +#define HSE_VALUE 32000000U /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (HSE_STARTUP_TIMEOUT) + #define HSE_STARTUP_TIMEOUT ((uint32_t)100) /*!< Time out for HSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief Internal Multiple Speed oscillator (MSI) default value. + * This value is the default MSI range value after Reset. + */ +#if !defined (MSI_VALUE) + #define MSI_VALUE ((uint32_t)4000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +/** + * @brief Internal High Speed oscillator (HSI) value. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSI is used as system clock source, directly or through the PLL). + */ +#if !defined (HSI_VALUE) +#define HSI_VALUE 16000000U /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +/** + * @brief Internal Low Speed oscillator (LSI1) value. + */ +#if !defined (LSI1_VALUE) + #define LSI1_VALUE ((uint32_t)32000) /*!< LSI1 Typical Value in Hz*/ +#endif /* LSI1_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ +/** + * @brief Internal Low Speed oscillator (LSI2) value. + */ +#if !defined (LSI2_VALUE) + #define LSI2_VALUE ((uint32_t)32000) /*!< LSI2 Typical Value in Hz*/ +#endif /* LSI2_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ + +/** + * @brief External Low Speed oscillator (LSE) value. + * This value is used by the UART, RTC HAL module to compute the system frequency + */ +#if !defined (LSE_VALUE) +#define LSE_VALUE 32768U /*!< Value of the External oscillator in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @brief Internal Multiple Speed oscillator (HSI48) default value. + * This value is the default HSI48 range value after Reset. + */ +#if !defined (HSI48_VALUE) + #define HSI48_VALUE ((uint32_t)48000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI48_VALUE */ + +#if !defined (LSE_STARTUP_TIMEOUT) +#define LSE_STARTUP_TIMEOUT 5000U /*!< Time out for LSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief External clock source for SAI1 peripheral + * This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source + * frequency. + */ +#if !defined (EXTERNAL_SAI1_CLOCK_VALUE) + #define EXTERNAL_SAI1_CLOCK_VALUE ((uint32_t)2097000) /*!< Value of the SAI1 External clock source in Hz*/ +#endif /* EXTERNAL_SAI1_CLOCK_VALUE */ + +/* Tip: To avoid modifying this file each time you need to use different HSE, + === you can define the HSE value in your toolchain compiler preprocessor. */ + +/* ########################### System Configuration ######################### */ +/** + * @brief This is the HAL system configuration section + */ + +#define VDD_VALUE 3300U /*!< Value of VDD in mv */ +#define TICK_INT_PRIORITY 0U /*!< tick interrupt priority */ +#define USE_RTOS 0U +#define PREFETCH_ENABLE 1U +#define INSTRUCTION_CACHE_ENABLE 1U +#define DATA_CACHE_ENABLE 1U + +/* ########################## Assert Selection ############################## */ +/** + * @brief Uncomment the line below to expanse the "assert_param" macro in the + * HAL drivers code + */ +/* #define USE_FULL_ASSERT 1U */ + +/* ################## SPI peripheral configuration ########################## */ + +/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver + * Activated: CRC code is present inside driver + * Deactivated: CRC code cleaned from driver + */ + +#define USE_SPI_CRC 0U + +/* Includes ------------------------------------------------------------------*/ +/** + * @brief Include module's header file + */ +#ifdef HAL_DMA_MODULE_ENABLED + #include "stm32wbxx_hal_dma.h" +#endif /* HAL_DMA_MODULE_ENABLED */ + +#ifdef HAL_ADC_MODULE_ENABLED + #include "stm32wbxx_hal_adc.h" +#endif /* HAL_ADC_MODULE_ENABLED */ + +#ifdef HAL_COMP_MODULE_ENABLED + #include "stm32wbxx_hal_comp.h" +#endif /* HAL_COMP_MODULE_ENABLED */ + +#ifdef HAL_CORTEX_MODULE_ENABLED + #include "stm32wbxx_hal_cortex.h" +#endif /* HAL_CORTEX_MODULE_ENABLED */ + +#ifdef HAL_CRC_MODULE_ENABLED + #include "stm32wbxx_hal_crc.h" +#endif /* HAL_CRC_MODULE_ENABLED */ + +#ifdef HAL_CRYP_MODULE_ENABLED + #include "stm32wbxx_hal_cryp.h" +#endif /* HAL_CRYP_MODULE_ENABLED */ + +#ifdef HAL_EXTI_MODULE_ENABLED + #include "stm32wbxx_hal_exti.h" +#endif /* HAL_EXTI_MODULE_ENABLED */ + +#ifdef HAL_FLASH_MODULE_ENABLED + #include "stm32wbxx_hal_flash.h" +#endif /* HAL_FLASH_MODULE_ENABLED */ + +#ifdef HAL_GPIO_MODULE_ENABLED + #include "stm32wbxx_hal_gpio.h" +#endif /* HAL_GPIO_MODULE_ENABLED */ + +#ifdef HAL_HSEM_MODULE_ENABLED + #include "stm32wbxx_hal_hsem.h" +#endif /* HAL_HSEM_MODULE_ENABLED */ + +#ifdef HAL_I2C_MODULE_ENABLED + #include "stm32wbxx_hal_i2c.h" +#endif /* HAL_I2C_MODULE_ENABLED */ + +#ifdef HAL_IPCC_MODULE_ENABLED + #include "stm32wbxx_hal_ipcc.h" +#endif /* HAL_IPCC_MODULE_ENABLED */ + +#ifdef HAL_IRDA_MODULE_ENABLED + #include "stm32wbxx_hal_irda.h" +#endif /* HAL_IRDA_MODULE_ENABLED */ + +#ifdef HAL_IWDG_MODULE_ENABLED + #include "stm32wbxx_hal_iwdg.h" +#endif /* HAL_IWDG_MODULE_ENABLED */ + +#ifdef HAL_LCD_MODULE_ENABLED + #include "stm32wbxx_hal_lcd.h" +#endif /* HAL_LCD_MODULE_ENABLED */ + +#ifdef HAL_LPTIM_MODULE_ENABLED + #include "stm32wbxx_hal_lptim.h" +#endif /* HAL_LPTIM_MODULE_ENABLED */ + +#ifdef HAL_PCD_MODULE_ENABLED + #include "stm32wbxx_hal_pcd.h" +#endif /* HAL_PCD_MODULE_ENABLED */ + +#ifdef HAL_PKA_MODULE_ENABLED + #include "stm32wbxx_hal_pka.h" +#endif /* HAL_PKA_MODULE_ENABLED */ + +#ifdef HAL_PWR_MODULE_ENABLED + #include "stm32wbxx_hal_pwr.h" +#endif /* HAL_PWR_MODULE_ENABLED */ + +#ifdef HAL_QSPI_MODULE_ENABLED + #include "stm32wbxx_hal_qspi.h" +#endif /* HAL_QSPI_MODULE_ENABLED */ + +#ifdef HAL_RCC_MODULE_ENABLED + #include "stm32wbxx_hal_rcc.h" +#endif /* HAL_RCC_MODULE_ENABLED */ + +#ifdef HAL_RNG_MODULE_ENABLED + #include "stm32wbxx_hal_rng.h" +#endif /* HAL_RNG_MODULE_ENABLED */ + +#ifdef HAL_RTC_MODULE_ENABLED + #include "stm32wbxx_hal_rtc.h" +#endif /* HAL_RTC_MODULE_ENABLED */ + +#ifdef HAL_SAI_MODULE_ENABLED + #include "stm32wbxx_hal_sai.h" +#endif /* HAL_SAI_MODULE_ENABLED */ + +#ifdef HAL_SMARTCARD_MODULE_ENABLED + #include "stm32wbxx_hal_smartcard.h" +#endif /* HAL_SMARTCARD_MODULE_ENABLED */ + +#ifdef HAL_SMBUS_MODULE_ENABLED + #include "stm32wbxx_hal_smbus.h" +#endif /* HAL_SMBUS_MODULE_ENABLED */ + +#ifdef HAL_SPI_MODULE_ENABLED + #include "stm32wbxx_hal_spi.h" +#endif /* HAL_SPI_MODULE_ENABLED */ + +#ifdef HAL_TIM_MODULE_ENABLED + #include "stm32wbxx_hal_tim.h" +#endif /* HAL_TIM_MODULE_ENABLED */ + +#ifdef HAL_TSC_MODULE_ENABLED + #include "stm32wbxx_hal_tsc.h" +#endif /* HAL_TSC_MODULE_ENABLED */ + +#ifdef HAL_UART_MODULE_ENABLED + #include "stm32wbxx_hal_uart.h" +#endif /* HAL_UART_MODULE_ENABLED */ + +#ifdef HAL_USART_MODULE_ENABLED + #include "stm32wbxx_hal_usart.h" +#endif /* HAL_USART_MODULE_ENABLED */ + +#ifdef HAL_WWDG_MODULE_ENABLED + #include "stm32wbxx_hal_wwdg.h" +#endif /* HAL_WWDG_MODULE_ENABLED */ + +/* Exported macro ------------------------------------------------------------*/ +#ifdef USE_FULL_ASSERT +/** + * @brief The assert_param macro is used for function's parameters check. + * @param expr If expr is false, it calls assert_failed function + * which reports the name of the source file and the source + * line number of the call that failed. + * If expr is true, it returns no value. + * @retval None + */ + #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) +/* Exported functions ------------------------------------------------------- */ + void assert_failed(uint8_t* file, uint32_t line); +#else + #define assert_param(expr) ((void)0U) +#endif /* USE_FULL_ASSERT */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_HAL_CONF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_it.h new file mode 100644 index 000000000..c5c359d74 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/stm32wbxx_it.h @@ -0,0 +1,71 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.h + * @brief This file contains the headers of the interrupt handlers. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_IT_H +#define __STM32WBxx_IT_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void NMI_Handler(void); +void HardFault_Handler(void); +void MemManage_Handler(void); +void BusFault_Handler(void); +void UsageFault_Handler(void); +void SVC_Handler(void); +void DebugMon_Handler(void); +void PendSV_Handler(void); +void SysTick_Handler(void); +void USART1_IRQHandler(void); +void LPUART1_IRQHandler(void); +void IPCC_C1_RX_IRQHandler(void); +void IPCC_C1_TX_IRQHandler(void); +void HSEM_IRQHandler(void); +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_IT_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/utilities_conf.h new file mode 100644 index 000000000..8aacfd97f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Inc/utilities_conf.h @@ -0,0 +1,66 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : utilities_conf.h + * Description : Configuration file for STM32 Utilities. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef UTILITIES_CONF_H +#define UTILITIES_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "cmsis_compiler.h" +#include "string.h" + +/****************************************************************************** + * common + ******************************************************************************/ +#define UTILS_ENTER_CRITICAL_SECTION( ) uint32_t primask_bit = __get_PRIMASK( );\ + __disable_irq( ) + +#define UTILS_EXIT_CRITICAL_SECTION( ) __set_PRIMASK( primask_bit ) + +#define UTILS_MEMSET8( dest, value, size ) memset( dest, value, size); + +/****************************************************************************** + * tiny low power manager + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_LPM_INIT_CRITICAL_SECTION( ) +#define UTIL_LPM_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_LPM_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) + +/****************************************************************************** + * sequencer + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_SEQ_INIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_SEQ_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_CONF_TASK_NBR (32) +#define UTIL_SEQ_CONF_PRIO_NBR (2) +#define UTIL_SEQ_MEMSET8( dest, value, size ) UTILS_MEMSET8( dest, value, size ) + +#ifdef __cplusplus +} +#endif + +#endif /*UTILITIES_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_debug.c new file mode 100644 index 000000000..fec0b134f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_debug.c @@ -0,0 +1,397 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_debug.c + * Description : Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "app_common.h" + +#include "app_debug.h" +#include "utilities_common.h" +#include "shci.h" +#include "tl.h" +#include "dbg_trace.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ +typedef PACKED_STRUCT +{ + GPIO_TypeDef* port; + uint16_t pin; + uint8_t enable; + uint8_t reserved; +} APPD_GpioConfig_t; +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +/* USER CODE BEGIN PD */ +#define GPIO_NBR_OF_RF_SIGNALS 9 +#define GPIO_CFG_NBR_OF_FEATURES 34 +#define NBR_OF_TRACES_CONFIG_PARAMETERS 4 +#define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 + +/** + * THIS SHALL BE SET TO A VALUE DIFFERENT FROM 0 ONLY ON REQUEST FROM ST SUPPORT + */ +#define BLE_DTB_CFG 0 +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static SHCI_C2_DEBUG_TracesConfig_t APPD_TracesConfig={0, 0, 0, 0}; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static SHCI_C2_DEBUG_GeneralConfig_t APPD_GeneralConfig={BLE_DTB_CFG, 0, {0, 0}}; + +#ifdef CFG_DEBUG_TRACE_UART +#if(CFG_HW_LPUART1_ENABLED == 1) +extern void MX_LPUART1_UART_Init(void); +#endif +#if(CFG_HW_USART1_ENABLED == 1) +extern void MX_USART1_UART_Init(void); +#endif +#endif + +/** + * THE DEBUG ON GPIO FOR CPU2 IS INTENDED TO BE USED ONLY ON REQUEST FROM ST SUPPORT + * It provides timing information on the CPU2 activity. + * All configuration of (port, pin) is supported for each features and can be selected by the user + * depending on the availability + */ +static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = +{ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ISR - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_STACK_TICK - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_CMD_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ACL_DATA_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* SYS_CMD_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* RNG_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVM_PROCESS - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_GENERAL - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_EVT_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_ACL_DATA_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_SYS_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_SYS_EVT_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_CLI_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_OT_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_OT_ACK_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_CLI_ACK_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_MEM_MANAGER_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_TRACES_TX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* HARD_FAULT - Set on Entry / Reset on Exit */ +/* From v1.1.1 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IP_CORE_LP_STATUS - Set on Entry / Reset on Exit */ +/* From v1.2.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* END_OF_CONNECTION_EVENT - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* TIMER_SERVER_CALLBACK - Toggle on Entry */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* PES_ACTIVITY - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* MB_BLE_SEND_EVT - Set on Entry / Reset on Exit */ +/* From v1.3.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_NO_DELAY - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_STACK_STORE_NVM_CB - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_WRITE_ONGOING - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_WRITE_COMPLETE - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_CLEANUP - Set on Entry / Reset on Exit */ +/* From v1.4.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +}; + +/** + * THE DEBUG ON GPIO FOR CPU2 IS INTENDED TO BE USED ONLY ON REQUEST FROM ST SUPPORT + * This table is relevant only for BLE + * It provides timing information on BLE RF activity. + * New signals may be allocated at any location when requested by ST + * The GPIO allocated to each signal depend on the BLE_DTB_CFG value and cannot be changed + */ +#if( BLE_DTB_CFG == 7) +static const APPD_GpioConfig_t aRfConfigList[GPIO_NBR_OF_RF_SIGNALS] = +{ + { GPIOB, LL_GPIO_PIN_2, 0, 0}, /* DTB10 - Tx/Rx SPI */ + { GPIOB, LL_GPIO_PIN_7, 0, 0}, /* DTB11 - Tx/Tx SPI Clk */ + { GPIOA, LL_GPIO_PIN_8, 0, 0}, /* DTB12 - Tx/Rx Ready & SPI Select */ + { GPIOA, LL_GPIO_PIN_9, 0, 0}, /* DTB13 - Tx/Rx Start */ + { GPIOA, LL_GPIO_PIN_10, 0, 0}, /* DTB14 - FSM0 */ + { GPIOA, LL_GPIO_PIN_11, 0, 0}, /* DTB15 - FSM1 */ + { GPIOB, LL_GPIO_PIN_8, 0, 0}, /* DTB16 - FSM2 */ + { GPIOB, LL_GPIO_PIN_11, 0, 0}, /* DTB17 - FSM3 */ + { GPIOB, LL_GPIO_PIN_10, 0, 0}, /* DTB18 - FSM4 */ +}; +#endif +/* USER CODE END PV */ + +/* Global variables ----------------------------------------------------------*/ +/* USER CODE BEGIN GV */ +/* USER CODE END GV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ +static void APPD_SetCPU2GpioConfig( void ); +static void APPD_BleDtbCfg( void ); +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void APPD_Init( void ) +{ +/* USER CODE BEGIN APPD_Init */ +#if (CFG_DEBUGGER_SUPPORTED == 1) + /** + * Keep debugger enabled while in any low power mode + */ + HAL_DBGMCU_EnableDBGSleepMode(); + HAL_DBGMCU_EnableDBGStopMode(); + + /***************** ENABLE DEBUGGER *************************************/ + LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); + +#else + GPIO_InitTypeDef gpio_config = {0}; + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_ANALOG; + + gpio_config.Pin = GPIO_PIN_15 | GPIO_PIN_14 | GPIO_PIN_13; + __HAL_RCC_GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + __HAL_RCC_GPIOA_CLK_DISABLE(); + + gpio_config.Pin = GPIO_PIN_4 | GPIO_PIN_3; + __HAL_RCC_GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + __HAL_RCC_GPIOB_CLK_DISABLE(); + + HAL_DBGMCU_DisableDBGSleepMode(); + HAL_DBGMCU_DisableDBGStopMode(); + HAL_DBGMCU_DisableDBGStandbyMode(); + +#endif /* (CFG_DEBUGGER_SUPPORTED == 1) */ + +#if(CFG_DEBUG_TRACE != 0) + DbgTraceInit(); +#endif + + APPD_SetCPU2GpioConfig( ); + APPD_BleDtbCfg( ); + +/* USER CODE END APPD_Init */ + return; +} + +void APPD_EnableCPU2( void ) +{ +/* USER CODE BEGIN APPD_EnableCPU2 */ + SHCI_C2_DEBUG_Init_Cmd_Packet_t DebugCmdPacket = + { + {{0,0,0}}, /**< Does not need to be initialized */ + {(uint8_t *)aGpioConfigList, + (uint8_t *)&APPD_TracesConfig, + (uint8_t *)&APPD_GeneralConfig, + GPIO_CFG_NBR_OF_FEATURES, + NBR_OF_TRACES_CONFIG_PARAMETERS, + NBR_OF_GENERAL_CONFIG_PARAMETERS} + }; + + /**< Traces channel initialization */ + TL_TRACES_Init( ); + + /** GPIO DEBUG Initialization */ + SHCI_C2_DEBUG_Init( &DebugCmdPacket ); + +/* USER CODE END APPD_EnableCPU2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void APPD_SetCPU2GpioConfig( void ) +{ +/* USER CODE BEGIN APPD_SetCPU2GpioConfig */ + GPIO_InitTypeDef gpio_config = {0}; + uint8_t local_loop; + uint16_t gpioa_pin_list; + uint16_t gpiob_pin_list; + uint16_t gpioc_pin_list; + + gpioa_pin_list = 0; + gpiob_pin_list = 0; + gpioc_pin_list = 0; + + for(local_loop = 0 ; local_loop < GPIO_CFG_NBR_OF_FEATURES; local_loop++) + { + if( aGpioConfigList[local_loop].enable != 0) + { + switch((uint32_t)aGpioConfigList[local_loop].port) + { + case (uint32_t)GPIOA: + gpioa_pin_list |= aGpioConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOB: + gpiob_pin_list |= aGpioConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOC: + gpioc_pin_list |= aGpioConfigList[local_loop].pin; + break; + + default: + break; + } + } + } + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_OUTPUT_PP; + gpio_config.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + + if(gpioa_pin_list != 0) + { + gpio_config.Pin = gpioa_pin_list; + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_C2GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + HAL_GPIO_WritePin(GPIOA, gpioa_pin_list, GPIO_PIN_RESET); + } + + if(gpiob_pin_list != 0) + { + gpio_config.Pin = gpiob_pin_list; + __HAL_RCC_GPIOB_CLK_ENABLE(); + __HAL_RCC_C2GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + HAL_GPIO_WritePin(GPIOB, gpiob_pin_list, GPIO_PIN_RESET); + } + + if(gpioc_pin_list != 0) + { + gpio_config.Pin = gpioc_pin_list; + __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_C2GPIOC_CLK_ENABLE(); + HAL_GPIO_Init(GPIOC, &gpio_config); + HAL_GPIO_WritePin(GPIOC, gpioc_pin_list, GPIO_PIN_RESET); + } + +/* USER CODE END APPD_SetCPU2GpioConfig */ + return; +} + +static void APPD_BleDtbCfg( void ) +{ +/* USER CODE BEGIN APPD_BleDtbCfg */ +#if (BLE_DTB_CFG != 0) + GPIO_InitTypeDef gpio_config = {0}; + uint8_t local_loop; + uint16_t gpioa_pin_list; + uint16_t gpiob_pin_list; + + gpioa_pin_list = 0; + gpiob_pin_list = 0; + + for(local_loop = 0 ; local_loop < GPIO_NBR_OF_RF_SIGNALS; local_loop++) + { + if( aRfConfigList[local_loop].enable != 0) + { + switch((uint32_t)aRfConfigList[local_loop].port) + { + case (uint32_t)GPIOA: + gpioa_pin_list |= aRfConfigList[local_loop].pin; + break; + + case (uint32_t)GPIOB: + gpiob_pin_list |= aRfConfigList[local_loop].pin; + break; + + default: + break; + } + } + } + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_AF_PP; + gpio_config.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + gpio_config.Alternate = GPIO_AF6_RF_DTB7; + + if(gpioa_pin_list != 0) + { + gpio_config.Pin = gpioa_pin_list; + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_C2GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + } + + if(gpiob_pin_list != 0) + { + gpio_config.Pin = gpiob_pin_list; + __HAL_RCC_GPIOB_CLK_ENABLE(); + __HAL_RCC_C2GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + } +#endif + +/* USER CODE END APPD_BleDtbCfg */ + return; +} + +/************************************************************* + * + * WRAP FUNCTIONS + * +*************************************************************/ +#if(CFG_DEBUG_TRACE != 0) +void DbgOutputInit( void ) +{ +/* USER CODE BEGIN DbgOutputInit */ +#ifdef CFG_DEBUG_TRACE_UART +if (CFG_DEBUG_TRACE_UART == hw_lpuart1) +{ +#if(CFG_HW_LPUART1_ENABLED == 1) + MX_LPUART1_UART_Init(); +#endif +} +else if (CFG_DEBUG_TRACE_UART == hw_uart1) +{ +#if(CFG_HW_USART1_ENABLED == 1) + MX_USART1_UART_Init(); +#endif +} +#endif + +/* USER CODE END DbgOutputInit */ + return; +} + +void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) +{ +/* USER CODE END DbgOutputTraces */ + HW_UART_Transmit_DMA(CFG_DEBUG_TRACE_UART, p_data, size, cb); + +/* USER CODE END DbgOutputTraces */ + return; +} +#endif + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_entry.c new file mode 100644 index 000000000..53b5bfd2a --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/app_entry.c @@ -0,0 +1,647 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_entry.c + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "main.h" +#include "app_entry.h" +#include "app_ble.h" +#include "ble.h" +#include "tl.h" +#include "stm32_seq.h" +#include "shci_tl.h" +#include "stm32_lpm.h" +#include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" +#include "otp.h" + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +extern RTC_HandleTypeDef hrtc; +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define POOL_SIZE (CFG_TLBLE_EVT_QUEUE_LENGTH*4U*DIVC(( sizeof(TL_PacketHeader_t) + TL_BLE_EVENT_FRAME_SIZE ), 4U)) + +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t BleSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255]; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private functions prototypes-----------------------------------------------*/ +static void Config_HSE(void); +static void Reset_Device( void ); +static void Reset_IPCC( void ); +static void Reset_BackupDomain( void ); +static void System_Init( void ); +static void SystemPower_Config( void ); +static void appe_Tl_Init( void ); +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); +static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); +static void Init_Exti( void ); +static void Init_Rtc( void ); +static void Init_Smps( void ); +/* USER CODE BEGIN PFP */ +static void Led_Init( void ); +static void Button_Init( void ); +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void MX_APPE_Config( void ) +{ + /** + * The OPTVERR flag is wrongly set at power on + * It shall be cleared before using any HAL_FLASH_xxx() api + */ + __HAL_FLASH_CLEAR_FLAG( FLASH_FLAG_OPTVERR ); + + /** + * Reset some configurations so that the system behave in the same way + * when either out of nReset or Power On + */ + Reset_Device( ); + + /* Tune the HSE internal load capacitors - P-NUCLEO-WB55.Nucleo board */ + Config_HSE(); + + return; +} + +void MX_APPE_Init( void ) +{ + System_Init( ); /**< System initialization */ + + SystemPower_Config(); /**< Configure the system Power Mode */ + + HW_TS_Init(hw_ts_InitMode_Full, &hrtc); /**< Initialize the TimerServer */ + +/* USER CODE BEGIN APPE_Init_1 */ +/* Configure the debug support if needed */ + APPD_Init(); + + /** + * The Standby mode should not be entered before the initialization is over + * The default state of the Low Power Manager is to allow the Standby Mode so an request is needed here + */ + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_DISABLE); + + Led_Init(); + Button_Init(); +/* USER CODE END APPE_Init_1 */ + appe_Tl_Init(); /* Initialize all transport layers */ + + /** + * From now, the application is waiting for the ready event ( VS_HCI_C2_Ready ) + * received on the system channel before starting the Stack + * This system event is received with APPE_SysUserEvtRx() + */ +/* USER CODE BEGIN APPE_Init_2 */ + +/* USER CODE END APPE_Init_2 */ + return; +} +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void Reset_Device( void ) +{ +#if ( CFG_HW_RESET_BY_FW == 1 ) + Reset_BackupDomain(); + + Reset_IPCC(); +#endif + + return; +} + +static void Reset_BackupDomain( void ) +{ + if ((LL_RCC_IsActiveFlag_PINRST() != FALSE) && (LL_RCC_IsActiveFlag_SFTRST() == FALSE)) + { + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_BACKUPRESET_FORCE(); + __HAL_RCC_BACKUPRESET_RELEASE(); + } + + return; +} + +static void Reset_IPCC( void ) +{ + LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_IPCC); + + LL_C1_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + return; +} + +static void Config_HSE(void) +{ +/* !!! WARNING !!! Following code is valid only for P-NUCLEO-WB55 boards. +Code must be reviewed and optionally reimplemented depending on the target HW +and HSE capacitor tuning value storage location. +Please read AN5042 - HSE trimming for RF applications using the STM32WB series. */ + OTP_ID0_t * p_otp; + + /** + * Read HSE_Tuning from OTP + */ + p_otp = (OTP_ID0_t *) OTP_Read(0); + if (p_otp) + { + LL_RCC_HSE_SetCapacitorTuning(p_otp->hse_tuning); + } + + return; +} + +static void System_Init( void ) +{ + Init_Smps( ); + + Init_Exti( ); + + Init_Rtc( ); + + return; +} + +static void Init_Smps( void ) +{ +#if (CFG_USE_SMPS != 0) + /** + * Configure and enable SMPS + * + * The SMPS configuration is not yet supported by CubeMx + * when SMPS output voltage is set to 1.4V, the RF output power is limited to 3.7dBm + * the SMPS output voltage shall be increased for higher RF output power + */ + LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA); + LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40); + LL_PWR_SMPS_Enable(); +#endif + + return; +} + +static void Init_Exti( void ) +{ + /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ + LL_EXTI_DisableIT_0_31(~0); + LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + + return; +} + +static void Init_Rtc( void ) +{ + /* Disable RTC registers write protection */ + LL_RTC_DisableWriteProtection(RTC); + + LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); + + /* Enable RTC registers write protection */ + LL_RTC_EnableWriteProtection(RTC); + + return; +} + +/** + * @brief Configure the system for power optimization + * + * @note This API configures the system to be ready for low power mode + * + * @param None + * @retval None + */ +static void SystemPower_Config(void) +{ + /** + * Select HSI as system clock source after Wake Up from Stop mode + */ + LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); + + /* Initialize low power manager */ + UTIL_LPM_Init(); + /* Initialize the CPU2 reset value before starting CPU2 with C2BOOT */ + LL_C2_PWR_SetPowerMode(LL_PWR_MODE_SHUTDOWN); + +#if (CFG_USB_INTERFACE_ENABLE != 0) + /** + * Enable USB power + */ + HAL_PWREx_EnableVddUSB(); +#endif + + return; +} + +static void appe_Tl_Init( void ) +{ + TL_MM_Config_t tl_mm_config; + SHCI_TL_HciInitConf_t SHci_Tl_Init_Conf; + /**< Reference table initialization */ + TL_Init(); + + /**< System channel initialization */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, UTIL_SEQ_RFU, shci_user_evt_proc ); + SHci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&SystemCmdBuffer; + SHci_Tl_Init_Conf.StatusNotCallBack = APPE_SysStatusNot; + shci_init(APPE_SysUserEvtRx, (void*) &SHci_Tl_Init_Conf); + + /**< Memory Manager channel initialization */ + tl_mm_config.p_BleSpareEvtBuffer = BleSpareEvtBuffer; + tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer; + tl_mm_config.p_AsynchEvtPool = EvtPool; + tl_mm_config.AsynchEvtPoolSize = POOL_SIZE; + TL_MM_Init( &tl_mm_config ); + + TL_Enable(); + + return; +} + +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) +{ + UNUSED(status); + return; +} + +/** +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ +static void APPE_SysUserEvtRx( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} +/* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ +static void Led_Init( void ) +{ +#if (CFG_LED_SUPPORTED == 1) + /** + * Leds Initialization + */ + + BSP_LED_Init(LED_BLUE); + BSP_LED_Init(LED_GREEN); + BSP_LED_Init(LED_RED); + + BSP_LED_On(LED_GREEN); +#endif + + return; +} + +static void Button_Init( void ) +{ +#if (CFG_BUTTON_SUPPORTED == 1) + /** + * Button Initialization + */ + + BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW3, BUTTON_MODE_EXTI); +#endif + + return; +} +/* USER CODE END FD_LOCAL_FUNCTIONS */ + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void HAL_Delay(uint32_t Delay) +{ + uint32_t tickstart = HAL_GetTick(); + uint32_t wait = Delay; + + /* Add a freq to guarantee minimum wait */ + if (wait < HAL_MAX_DELAY) + { + wait += HAL_GetTickFreq(); + } + + while ((HAL_GetTick() - tickstart) < wait) + { + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ + #if defined ( __CC_ARM) + __force_stores(); + #endif + + __WFI( ); + } +} + +void MX_APPE_Process(void) +{ + /* USER CODE BEGIN MX_APPE_Process_1 */ + + /* USER CODE END MX_APPE_Process_1 */ + UTIL_SEQ_Run(UTIL_SEQ_DEFAULT); + /* USER CODE BEGIN MX_APPE_Process_2 */ + + /* USER CODE END MX_APPE_Process_2 */ +} + +void UTIL_SEQ_Idle( void ) +{ +#if ( CFG_LPM_SUPPORTED == 1) + UTIL_LPM_EnterLowPower( ); +#endif + return; +} + +/** + * @brief This function is called by the scheduler each time an event + * is pending. + * + * @param evt_waited_bm : Event pending. + * @retval None + */ +void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) +{ + UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); +} + +void shci_notify_asynch_evt(void* pdata) +{ + UTIL_SEQ_SetTask( 1<= CUSTOM_APP_SVC_OFFSET) && + (param.index < (CUSTOM_APP_SVC_OFFSET + CUSTOM_APP_SVC_COUNT)) ) + { + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.svc_uuid_type = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.svc_uuid = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.max_attr_record = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + } + + if( param.index >= (CUSTOM_APP_SVC_OFFSET + CUSTOM_APP_SVC_COUNT) ) + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_SVC_cb(¶m); + } + } + break; + } + case BLE_RST: + { + if(op == AT_GET[0]) + { + get_status = 1; + status = 1; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_RST_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.reset = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_RST_cb(¶m); + } + } + break; + } + case BLE_IO_CAPA: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_IO_CAPA_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_IO_CAPA_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.io_capability = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_IO_CAPA_cb(¶m); + } + } + break; + } + case BLE_SET_AUTHEN_REQ: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_SET_AUTHEN_REQ_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_SET_AUTHEN_REQ_t param; + char * token; + + /* all the fields are mandatory using this method */ + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.bonding_mode = (uint8_t)strtol(str, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.mitm = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.sc_support = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.use_fixed_pin = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.fixed_pin = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_SET_AUTHEN_REQ_cb(¶m); + } + } + break; + } + case BLE_PERIPH_SEC_REQ: + { + if(op == AT_GET[0]) + { + get_status = 1; + status = 1; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_PERIPH_SEC_REQ_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.enable = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + if(status == 0) + { + status = stm32wb_at_BLE_PERIPH_SEC_REQ_cb(¶m); + } + } + break; + } + case BLE_PAIRING_CONFIRM: + { + if(op == AT_GET[0]) + { + get_status = 1; + status = 1; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_PAIRING_CONFIRM_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.confirm_yes_no = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + if(status == 0) + { + status = stm32wb_at_BLE_PAIRING_CONFIRM_cb(¶m); + } + } + break; + } + case BLE_PASSKEY_RESP: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_PASSKEY_RESP_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_PASSKEY_RESP_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.pass_key_resp = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_PASSKEY_RESP_cb(¶m); + } + } + break; + } + case BLE_CLEAR_DB: + { + if(op == AT_GET[0]) + { + get_status = 1; + status = 1; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_CLEAR_DB_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.dummy = (uint32_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + if(status == 0) + { + status = stm32wb_at_BLE_CLEAR_DB_cb(¶m); + } + } + break; + } + case BLE_PUB_ADDR: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_PUB_ADDR_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_PUB_ADDR_t param; + char * token; + uint8_t tab_len; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + tab_len = sizeof(param.BD_address); + status |= str_to_byte_tab(token, ¶m.BD_address[0], &tab_len); + if(tab_len != 6) + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_PUB_ADDR_cb(¶m); + } + } + break; + } + case BLE_RAND_ADDR: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_RAND_ADDR_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_RAND_ADDR_t param; + char * token; + uint8_t tab_len; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + tab_len = sizeof(param.BD_address); + status |= str_to_byte_tab(token, ¶m.BD_address[0], &tab_len); + if(tab_len != 6) + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_RAND_ADDR_cb(¶m); + } + } + break; + } + case BLE_CFG_RAND_ADDR: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_CFG_RAND_ADDR_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_CFG_RAND_ADDR_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.cfg_rand_addr = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_CFG_RAND_ADDR_cb(¶m); + } + } + break; + } + case BLE_NAME: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_NAME_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_NAME_t param; + status = 0; + + if( (strlen(str) + 1) <= sizeof(param.name) ) + { + strcpy(¶m.name[0], str); + } + else + { + status = 1; + } + /* do not check separator as it can be in the name itself */ + if(status == 0) + { + status = stm32wb_at_BLE_NAME_cb(¶m); + } + } + break; + } + case BLE_NOTIF_VAL: + { + if(op == AT_GET[0]) + { + get_status = 1; + status = 1; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_NOTIF_VAL_t param; + char * token; + uint16_t data; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.svc_index = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.char_index = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + if( strncmp(token, "0x", 2) == 0 ) + { + param.val_tab_len = sizeof(param.val_tab); + status |= str_to_byte_tab(token, ¶m.val_tab[0], ¶m.val_tab_len); + } + else + { + data = (uint16_t)strtol(token, NULL, 0); + param.val_tab_len = sizeof(uint16_t); + memcpy(¶m.val_tab[0], &data, sizeof(uint16_t)); + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_NOTIF_VAL_cb(¶m); + } + } + break; + } + case BLE_INDIC_VAL: + { + if(op == AT_GET[0]) + { + get_status = 1; + status = 1; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_INDIC_VAL_t param; + char * token; + uint16_t data; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.svc_index = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.char_index = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + if( strncmp(token, "0x", 2) == 0 ) + { + param.val_tab_len = sizeof(param.val_tab); + status |= str_to_byte_tab(token, ¶m.val_tab[0], ¶m.val_tab_len); + } + else + { + data = (uint16_t)strtol(token, NULL, 0); + param.val_tab_len = sizeof(uint16_t); + memcpy(¶m.val_tab[0], &data, sizeof(uint16_t)); + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_INDIC_VAL_cb(¶m); + } + } + break; + } + case BLE_CONN_INT: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_CONN_INT_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_CONN_INT_t param; + char * token; + float value; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + if ((value >= 7.5f) && (value <= 4000.0f)) + { + param.min = value; + } + else + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + if ((value >= 7.5f) && (value <= 4000.f) && (value >= param.min)) + { + param.max = value; + } + else + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_CONN_INT_cb(¶m); + } + } + break; + } + case BLE_ADV_PARAM: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_ADV_PARAM_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_ADV_PARAM_t param; + char * token; + float value; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.entry_number = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + if(param.entry_number == 0) + { + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.adv_type = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + if ((value >= 20) && (value <= 10240)) + { + param.adv_int_min = value; + } + else + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + if ((value >= 20) && (value <= 10240)) + { + param.adv_int_max = value; + } + else + { + status |= 1; + } + } + else + { + status |= 1; + } + } + else if(param.entry_number == 1) + { + param.adv_type = 0; + param.adv_int_min = CFG_MINI_CONN_ADV_INTERVAL_MIN; /* 20ms */ + param.adv_int_max = CFG_MINI_CONN_ADV_INTERVAL_MAX; /* 30ms */ + } + else if(param.entry_number == 2) + { + param.adv_type = 0; + param.adv_int_min = CFG_INTER_CONN_ADV_INTERVAL_MIN; /* 180 ms */ + param.adv_int_max = CFG_INTER_CONN_ADV_INTERVAL_MAX; /* 200 ms */ + } + else if(param.entry_number == 3) + { + param.adv_type = 0; + param.adv_int_min = CFG_LP_CONN_ADV_INTERVAL_MIN; /* 1000 ms */ + param.adv_int_max = CFG_LP_CONN_ADV_INTERVAL_MAX; /* 2500 ms */ + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_ADV_PARAM_cb(¶m); + } + } + break; + } + case BLE_ADV: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_ADV_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_ADV_t param; + + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.enable = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_ADV_cb(¶m); + } + } + break; + } + case BLE_CHAR_ADD: + { + if(op == AT_GET[0]) + { + get_status = 1; + status = 1; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_CHAR_ADD_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.svc_id = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.char_id = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.char_uuid_type = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.char_uuid = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.char_value_len = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.char_properties = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.sec_permission = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + param.gatt_evt_mask = (uint16_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_CHAR_ADD_cb(¶m); + } + } + break; + } + case BLE_RF_POWER: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_RF_POWER_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_RF_POWER_t param; + char * token; + float value; + uint8_t value_flag = 0; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + value = strtof(token, NULL); + for (j = 0 ; j < sizeof(tab_conv_tx_power) ; j++) + { + if (value == tab_conv_tx_power[j]) + { + value_flag = 1; + param.tx_power = value; + param.tx_power_code = j; + break; + } + } + if (value_flag != 1) + { + status |= 1; + } + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_RF_POWER_cb(¶m); + } + } + break; + } + case BLE_INIT: + { + if(op == AT_GET[0]) + { + get_status = stm32wb_at_BLE_INIT_server_cb(&AT_server_buffer_reply[0]); + status = 0; + } + else if(op == AT_SET[0]) + { + stm32wb_at_BLE_INIT_t param; + char * token; + status = 0; + + token = strtok(str, AT_SEPARATOR); + if(token != 0) + { + param.init_set = (uint8_t)strtol(token, NULL, 0); + } + else + { + status |= 1; + } + + token = strtok(NULL, AT_SEPARATOR); + if(token != 0) + { + status |= 1; + } + + if(status == 0) + { + status = stm32wb_at_BLE_INIT_cb(¶m); + } + } + break; + } + default: + + break; + } + } + if((op == AT_GET[0]) && (get_status == 0)) + { + ble_at_server_Reply_get(AT_server_current_cmd, &AT_server_buffer_reply[0]); + memset(&AT_server_buffer_reply[0], '\0', sizeof(AT_server_buffer_reply)); + } + } + } + } + } + } + + ble_at_server_Reply_status(AT_server_current_cmd, status); + AT_server_current_cmd = BLE_NONE; + + return status; +} + +uint8_t ble_at_server_Send_evt(stm32wb_at_BLE_EVT_t evt, void *param) +{ + uint8_t status; + + status = 1; + while (AT_server_current_cmd != BLE_NONE) + { + /* a command is not yet completed */ + } + + if(evt < BLE_EVT_NONE) + { + + strcpy(AT_server_buffer_event, AT_EVENT); + strcat(AT_server_buffer_event, AT_BLE_EVT_STRING[evt]); + strcat(AT_server_buffer_event, AT_SET); + + switch (evt) { + case BLE_EVT_WRITE: + { + stm32wb_at_BLE_EVT_WRITE_t *p = param; + char str_tmp[8]; + uint8_t i; + + sprintf(str_tmp, "%d", p->svc_index); + strcat(AT_server_buffer_event, str_tmp); + strcat(AT_server_buffer_event, AT_SEPARATOR); + + sprintf(str_tmp, "%d", p->char_index); + strcat(AT_server_buffer_event, str_tmp); + strcat(AT_server_buffer_event, AT_SEPARATOR); + + if(p->val_tab_len <= 1) + { + sprintf(str_tmp, "%d", (uint16_t)p->val_tab[0]); + strcat(AT_server_buffer_event, str_tmp); + } + else + { + sprintf(str_tmp, "0x"); + strcat(AT_server_buffer_event, str_tmp); + for (i = 0 ; i < p->val_tab_len ; i++) + { + sprintf(str_tmp, "%02x", p->val_tab[i]); + strcat(AT_server_buffer_event, str_tmp); + } + } + break; + } + case BLE_EVT_CONN: + { + stm32wb_at_BLE_EVT_CONN_t *p = param; + char str_tmp[8]; + + sprintf(str_tmp, "%d", p->status); + strcat(AT_server_buffer_event, str_tmp); + + break; + } + case BLE_EVT_UPD_CONN: + { + stm32wb_at_BLE_EVT_UPD_CONN_t *p = param; + char str_tmp[8]; + + sprintf(str_tmp, "%d", p->status); + strcat(AT_server_buffer_event, str_tmp); + + break; + } + case BLE_EVT_VALUE_CONFIRM: + { + stm32wb_at_BLE_EVT_VALUE_CONFIRM_t *p = param; + char str_tmp[8]; + + sprintf(str_tmp, "%ld", p->numeric_value); + strcat(AT_server_buffer_event, str_tmp); + + break; + } + case BLE_EVT_PASSKEY_REQ: + { + stm32wb_at_BLE_EVT_PASSKEY_REQ_t *p = param; + char str_tmp[8]; + + sprintf(str_tmp, "%d", p->dummy); + strcat(AT_server_buffer_event, str_tmp); + + break; + } + case BLE_EVT_PAIRING: + { + stm32wb_at_BLE_EVT_PAIRING_t *p = param; + char str_tmp[8]; + + sprintf(str_tmp, "%d", p->status); + strcat(AT_server_buffer_event, str_tmp); + strcat(AT_server_buffer_event, AT_SEPARATOR); + + sprintf(str_tmp, "%d", p->reason); + strcat(AT_server_buffer_event, str_tmp); + + break; + } + default: + break; + } + strcat(AT_server_buffer_event, AT_EOL); + + status = stm32wb_at_ll_Transmit((uint8_t *)&AT_server_buffer_event[0], strlen(AT_server_buffer_event)); + memset(&AT_server_buffer_event[0], '\0', sizeof(AT_server_buffer_event)); + } + + return status; +} + +/* Private function definition -----------------------------------------------*/ + +static uint8_t ble_at_server_Reply_status(stm32wb_at_BLE_CMD_t cmd, uint8_t stat) +{ + uint8_t status = 0; + + if (cmd == BLE_TEST) + { + strcat(AT_server_buffer_tx, AT_CMD_STATUS_OK); + strcat(AT_server_buffer_tx, AT_EOL); + } + else if(cmd < BLE_NONE) + { + if(stat == 0) + { + strcat(AT_server_buffer_tx, AT_CMD_STATUS_OK); + } + else + { + strcat(AT_server_buffer_tx, AT_CMD_STATUS_ERROR); + } + strcat(AT_server_buffer_tx, AT_EOL); + } + else + { + strcat(AT_server_buffer_tx, AT_CMD_STATUS_ERROR); + strcat(AT_server_buffer_tx, AT_EOL); + } + + if(status == 0) + { + status = stm32wb_at_ll_Transmit((uint8_t *)&AT_server_buffer_tx[0], strlen(AT_server_buffer_tx)); + memset(&AT_server_buffer_tx[0], '\0', sizeof(AT_server_buffer_tx)); + } + + return status; +} + + +static uint8_t ble_at_server_Reply_get(stm32wb_at_BLE_CMD_t cmd, char *data_str) +{ + uint8_t status = 0; + + if (cmd == BLE_TEST) + { + status = 1; + } + else if(cmd < BLE_NONE) + { + status = 0; + strcat(AT_server_buffer_tx, AT_REPLY); + strcat(AT_server_buffer_tx, AT_BLE_CMD_STRING[cmd]); + strcat(AT_server_buffer_tx, AT_READ); + strcat(AT_server_buffer_tx, data_str); + strcat(AT_server_buffer_tx, AT_EOL); + } + else + { + status = 1; + } + + if(status == 0) + { + status = stm32wb_at_ll_Transmit((uint8_t *)&AT_server_buffer_tx[0], strlen(AT_server_buffer_tx)); + memset(&AT_server_buffer_tx[0], '\0', sizeof(AT_server_buffer_tx)); + } + + return status; +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/ble_at_server_cb.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/ble_at_server_cb.c new file mode 100644 index 000000000..c26967498 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/ble_at_server_cb.c @@ -0,0 +1,572 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file ble_at_server_cb.c + * @author BLE Application Team + * @brief + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "stm32wb_at.h" +#include "stm32wb_at_ble.h" +#include "stm32_seq.h" +#include "ble_defs.h" +#include "custom_app.h" +#include "ble_at_server_cb.h" + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ + +/* USER CODE BEGIN PV */ +extern Custom_Context_t Custom_Context; + +/* USER CODE END PV */ + +uint8_t str_to_byte_tab(char *str_in, uint8_t *tab, uint8_t *tab_len); + +/* Private function prototypes -----------------------------------------------*/ + +/* USER CODE BEGIN PFP */ + +#if defined ( __GNUC__) && !defined(__clang__) +/* With GCC, small printf (option LD Linker->Libraries->Small printf + set to 'Yes') calls __io_putchar() */ +#define PUTCHAR_PROTOTYPE int __io_putchar(int ch) +#else +#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f) +#endif /* __GNUC__ */ +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +uint8_t global_svc_index = 0; +uint8_t global_svc_uuid_type; +uint16_t global_svc_uuid; +uint8_t global_max_attr; +uint8_t global_svc_id; +uint8_t global_char_id; +uint8_t global_char_uuid_type; +uint16_t global_char_uuid; +uint16_t global_char_value_len; +uint8_t global_char_properties; +uint8_t global_char_sec_permission; +uint8_t global_gatt_event_mask; +uint8_t global_pairing_confirm; +uint32_t global_pass_key_resp; +uint8_t global_io_capability; +uint8_t global_bonding; +uint8_t global_mitm; +uint8_t global_scsupport; +uint8_t global_usefixedpin; +uint32_t global_fixedpin; +uint8_t global_addrtype; +char global_name[20]; +uint8_t global_bdaddress[6]; +uint8_t global_rand_bdaddress[6]; +uint8_t global_ble_addr_type = 0; +uint8_t global_ble_cfg_addr_type = 0; +float global_tx_power; +uint8_t global_tx_power_code; +float global_conn_int_min = 0; +float global_conn_int_max = 0; +uint8_t global_notif_serv_index = 0; +uint8_t global_notif_char_index = 0; +uint8_t global_notif_val_tab[64]; +uint8_t global_notif_val_tab_len = 0; +uint8_t global_indic_serv_index = 0; +uint8_t global_indic_char_index = 0; +uint8_t global_indic_val_tab[64]; +uint8_t global_indic_val_tab_len = 0; +uint8_t global_entry_number; +uint8_t global_adv_type; +float global_adv_int_min; +float global_adv_int_max; +uint8_t global_adv_enable; +uint8_t global_init_set; + +/******************************************************************************/ + +uint8_t stm32wb_at_BLE_SVC_cb(stm32wb_at_BLE_SVC_t *param) +{ + global_svc_index = param->index; + + if (global_svc_index >= CUSTOM_APP_SVC_OFFSET) + { + global_svc_uuid_type = param->svc_uuid_type; + global_svc_uuid = param->svc_uuid; + global_max_attr = param->max_attr_record; + + UTIL_SEQ_SetTask( 1<init_set; + + UTIL_SEQ_SetTask( 1<svc_id; + global_char_id = param->char_id; + global_char_uuid_type = param->char_uuid_type; + global_char_uuid = param->char_uuid; + global_char_value_len = param->char_value_len; + global_char_properties = param->char_properties; + global_char_sec_permission = param->sec_permission; + global_gatt_event_mask = param->gatt_evt_mask; + + UTIL_SEQ_SetTask( 1<confirm_yes_no; + + UTIL_SEQ_SetTask( 1<pass_key_resp; + + UTIL_SEQ_SetTask( 1<io_capability; + + UTIL_SEQ_SetTask( 1<bonding_mode; + global_mitm = param->mitm; + global_scsupport = param->sc_support; + global_usefixedpin = param->use_fixed_pin; + global_fixedpin = param->fixed_pin; + global_addrtype = global_ble_addr_type | global_ble_cfg_addr_type; + + UTIL_SEQ_SetTask( 1<BD_address) ; i++) + { + global_bdaddress[sizeof(param->BD_address) - 1 - i] = param->BD_address[i]; + } + + return 0; +} + +uint8_t stm32wb_at_BLE_RAND_ADDR_cb(stm32wb_at_BLE_RAND_ADDR_t *param) +{ + uint8_t i; + + global_ble_addr_type = STATIC_RANDOM_ADDR; + for (i = 0 ; i < sizeof(param->BD_address) ; i++) + { + global_rand_bdaddress[sizeof(param->BD_address) - 1 - i] = param->BD_address[i]; + } + + return 0; +} + +uint8_t stm32wb_at_BLE_CFG_RAND_ADDR_cb(stm32wb_at_BLE_CFG_RAND_ADDR_t *param) +{ + global_ble_cfg_addr_type = param->cfg_rand_addr; + + return 0; +} + +uint8_t stm32wb_at_BLE_NAME_cb(stm32wb_at_BLE_NAME_t *param) +{ + strcpy(global_name, param->name); + + return 0; +} + +uint8_t stm32wb_at_BLE_RF_POWER_cb(stm32wb_at_BLE_RF_POWER_t *param) +{ + global_tx_power = param->tx_power; + global_tx_power_code = param->tx_power_code; + + return 0; +} + +uint8_t stm32wb_at_BLE_NOTIF_VAL_cb(stm32wb_at_BLE_NOTIF_VAL_t *param) +{ + global_notif_serv_index = param->svc_index; + global_notif_char_index = param->char_index; + memcpy(&global_notif_val_tab[0], ¶m->val_tab[0], sizeof(global_notif_val_tab) ); + global_notif_val_tab_len = param->val_tab_len; + + UTIL_SEQ_SetTask( 1<svc_index; + global_indic_char_index = param->char_index; + memcpy(&global_indic_val_tab[0], ¶m->val_tab[0], sizeof(global_indic_val_tab) ); + global_indic_val_tab_len = param->val_tab_len; + + UTIL_SEQ_SetTask( 1<min; + global_conn_int_max = param->max; + + if ((global_conn_int_min != 0) && (global_conn_int_max != 0)) + { + UTIL_SEQ_SetTask( 1<entry_number; + global_adv_type = param->adv_type; + if (global_entry_number == 0) + { + global_adv_int_min = (param->adv_int_min) / 0.625f; + global_adv_int_max = (param->adv_int_max) / 0.625f; + } + else + { + global_adv_int_min = param->adv_int_min; + global_adv_int_max = param->adv_int_max; + } + + return 0; +} + +uint8_t stm32wb_at_BLE_ADV_cb(stm32wb_at_BLE_ADV_t *param) +{ + global_adv_enable = param->enable; + + UTIL_SEQ_SetTask( 1<= 0 ; i--) + { + (void)sprintf(str_tmp, "%02x", global_bdaddress[i]); + (void)strcat(buff, str_tmp); + } + (void)strcat(buff, AT_SEPARATOR); + } + else + { + (void)strcat(buff, "0x"); + for(i = sizeof(global_rand_bdaddress) - 1 ; i >= 0 ; i--) + { + (void)sprintf(str_tmp, "%02x", global_rand_bdaddress[i]); + (void)strcat(buff, str_tmp); + } + (void)strcat(buff, AT_SEPARATOR); + } + + (void)strcat(buff, global_name); + (void)strcat(buff, AT_SEPARATOR); + + (void)sprintf(str_tmp, "%.2f", global_tx_power); + (void)strcat(buff, str_tmp); + + return 0; +} + +uint8_t stm32wb_at_BLE_PUB_ADDR_server_cb(char *buff) +{ + int8_t i; + char str_tmp[20]; + + (void)strcat(buff, "0x"); + for(i = sizeof(global_bdaddress) - 1 ; i >= 0 ; i--) + { + (void)sprintf(str_tmp, "%02x", global_bdaddress[i]); + (void)strcat(buff, str_tmp); + } + + return 0; +} + +uint8_t stm32wb_at_BLE_RAND_ADDR_server_cb(char *buff) +{ + int8_t i; + char str_tmp[20]; + + (void)strcat(buff, "0x"); + for(i = sizeof(global_rand_bdaddress) - 1 ; i >= 0 ; i--) + { + (void)sprintf(str_tmp, "%02x", global_rand_bdaddress[i]); + (void)strcat(buff, str_tmp); + } + + return 0; +} + +uint8_t stm32wb_at_BLE_CFG_RAND_ADDR_server_cb(char *buff) +{ + sprintf(buff, "%d", global_ble_cfg_addr_type); + return 0; +} + +uint8_t stm32wb_at_BLE_IO_CAPA_server_cb(char *buff) +{ + sprintf(buff, "%d", global_io_capability); + return 0; +} + +uint8_t stm32wb_at_BLE_SET_AUTHEN_REQ_server_cb(char *buff) +{ + sprintf(buff, "%d,%d,%d,%d,0x%lx,%d", global_bonding, global_mitm, global_scsupport, global_usefixedpin, global_fixedpin, + global_ble_cfg_addr_type | global_ble_addr_type); + return 0; +} + +uint8_t stm32wb_at_BLE_NAME_server_cb(char *buff) +{ + sprintf(buff, "%s", &global_name[0]); + + return 0; +} + +uint8_t stm32wb_at_BLE_RF_POWER_server_cb(char *buff) +{ + sprintf(buff, "%.2f", global_tx_power); + + return 0; +} + +uint8_t stm32wb_at_BLE_CONN_INT_server_cb(char *buff) +{ + sprintf(buff, "%.2f,%.2f", global_conn_int_min, global_conn_int_max); + + return 0; +} + +uint8_t stm32wb_at_BLE_ADV_server_cb(char *buff) +{ + sprintf(buff, "%d", global_adv_enable); + + return 0; +} + +uint8_t str_to_byte_tab(char *str_in, uint8_t *tab, uint8_t* tab_len) +{ + uint8_t status = 0; + uint16_t tab_limit, cpt, val; + + if( strncmp(str_in, "0x", 2) == 0 ) + { + cpt = 0; + val = 0; + tab_limit = *tab_len; + *tab_len = 0; + str_in++; + str_in++; + + memset(tab, 0, tab_limit); + + do + { + if(*str_in == ' ') + { + str_in++; + continue; + } + else if( (*str_in >= '0') && (*str_in <= '9') ) + { + val = *str_in - '0'; + } + else if( (*str_in >= 'a') && (*str_in <= 'f') ) + { + val = *str_in - 'a' + 10; + } + else if( (*str_in >= 'A') && (*str_in <= 'F') ) + { + val = *str_in - 'A' + 10; + } + else + { + if( (cpt % 2) != 0) + { + tab[cpt >> 1] /= 16; + } + status = 0; + break; + } + + if( (cpt % 2) == 0) + { + tab[cpt >> 1] += val * 16; + } + else + { + tab[cpt >> 1] += val; + } + cpt++; + str_in++; + }while( cpt < tab_limit ); + + if(cpt == 1) + { + *tab_len = 1; + } + else + { + *tab_len = cpt >> 1; + } + } + else + { + status = 1; + } + + return status; +} + +/* USER CODE END 4 */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_timerserver.c new file mode 100644 index 000000000..3d44a3caf --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_timerserver.c @@ -0,0 +1,893 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : hw_timerserver.c + * Description : Hardware timerserver source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "hw_conf.h" + +/* Private typedef -----------------------------------------------------------*/ +typedef enum +{ + TimerID_Free, + TimerID_Created, + TimerID_Running +}TimerIDStatus_t; + +typedef enum +{ + SSR_Read_Requested, + SSR_Read_Not_Requested +}RequestReadSSR_t; + +typedef enum +{ + WakeupTimerValue_Overpassed, + WakeupTimerValue_LargeEnough +}WakeupTimerLimitation_Status_t; + +typedef struct +{ + HW_TS_pTimerCb_t pTimerCallBack; + uint32_t CounterInit; + uint32_t CountLeft; + TimerIDStatus_t TimerIDStatus; + HW_TS_Mode_t TimerMode; + uint32_t TimerProcessID; + uint8_t PreviousID; + uint8_t NextID; +}TimerContext_t; + +/* Private defines -----------------------------------------------------------*/ +#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF +#define TIMER_LIST_EMPTY 0xFFFF + +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +/** + * START of Section TIMERSERVER_CONTEXT + */ + +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; + +/** + * END of Section TIMERSERVER_CONTEXT + */ + +static RTC_HandleTypeDef *phrtc; /**< RTC handle */ +static uint8_t WakeupTimerDivider; +static uint8_t AsynchPrescalerUserConfig; +static uint16_t SynchPrescalerUserConfig; +static volatile uint16_t MaxWakeupTimerSetup; + +/* Global variables ----------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +static void RestartWakeupCounter(uint16_t Value); +static uint16_t ReturnTimeElapsed(void); +static void RescheduleTimerList(void); +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); +static uint16_t linkTimer(uint8_t TimerID); +static uint32_t ReadRtcSsrValue(void); + +__weak void HW_TS_RTC_CountUpdated_AppNot(void); + +/* Functions Definition ------------------------------------------------------*/ + +/** + * @brief Read the RTC_SSR value + * As described in the reference manual, the RTC_SSR shall be read twice to ensure + * reliability of the value + * @param None + * @retval SSR value read + */ +static uint32_t ReadRtcSsrValue(void) +{ + uint32_t first_read; + uint32_t second_read; + + first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + while(first_read != second_read) + { + first_read = second_read; + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + } + + return second_read; +} + +/** + * @brief Insert a Timer in the list after the Timer ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked after + * @retval None + */ +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t next_id; + + next_id = aTimerContext[RefTimerID].NextID; + + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = TimerID; + } + aTimerContext[TimerID].NextID = next_id; + aTimerContext[TimerID].PreviousID = RefTimerID ; + aTimerContext[RefTimerID].NextID = TimerID; + + return; +} + +/** + * @brief Insert a Timer in the list before the ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked before + * @retval None + */ +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t previous_id; + + if(RefTimerID != CurrentRunningTimerID) + { + previous_id = aTimerContext[RefTimerID].PreviousID; + + aTimerContext[previous_id].NextID = TimerID; + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[TimerID].PreviousID = previous_id ; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + else + { + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + + return; +} + +/** + * @brief Insert a Timer in the list + * @param TimerID: The ID of the Timer + * @retval None + */ +static uint16_t linkTimer(uint8_t TimerID) +{ + uint32_t time_left; + uint16_t time_elapsed; + uint8_t timer_id_lookup; + uint8_t next_id; + + if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * No timer in the list + */ + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; + + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + time_elapsed = 0; + } + else + { + time_elapsed = ReturnTimeElapsed(); + + /** + * update count of the timer to be linked + */ + aTimerContext[TimerID].CountLeft += time_elapsed; + time_left = aTimerContext[TimerID].CountLeft; + + /** + * Search for index where the new timer shall be linked + */ + if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) + { + /** + * Search for the ID after the first one + */ + timer_id_lookup = CurrentRunningTimerID; + next_id = aTimerContext[timer_id_lookup].NextID; + while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) + { + timer_id_lookup = aTimerContext[timer_id_lookup].NextID; + next_id = aTimerContext[timer_id_lookup].NextID; + } + + /** + * Link after the ID + */ + LinkTimerAfter(TimerID, timer_id_lookup); + } + else + { + /** + * Link before the first ID + */ + LinkTimerBefore(TimerID, CurrentRunningTimerID); + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + } + } + + return time_elapsed; +} + +/** + * @brief Remove a Timer from the list + * @param TimerID: The ID of the Timer + * @param RequestReadSSR: Request to read the SSR register or not + * @retval None + */ +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) +{ + uint8_t previous_id; + uint8_t next_id; + + if(TimerID == CurrentRunningTimerID) + { + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = aTimerContext[TimerID].NextID; + } + else + { + previous_id = aTimerContext[TimerID].PreviousID; + next_id = aTimerContext[TimerID].NextID; + + aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; + } + } + + /** + * Timer is out of the list + */ + aTimerContext[TimerID].TimerIDStatus = TimerID_Created; + + if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) + { + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + } + + return; +} + +/** + * @brief Return the number of ticks counted by the wakeuptimer since it has been started + * @note The API is reading the SSR register to get how many ticks have been counted + * since the time the timer has been started + * @param None + * @retval Time expired in Ticks + */ +static uint16_t ReturnTimeElapsed(void) +{ + uint32_t return_value; + uint32_t wrap_counter; + + if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) + { + return_value = ReadRtcSsrValue(); /**< Read SSR register first */ + + if (SSRValueOnLastSetup >= return_value) + { + return_value = SSRValueOnLastSetup - return_value; + } + else + { + wrap_counter = SynchPrescalerUserConfig - return_value; + return_value = SSRValueOnLastSetup + wrap_counter; + } + + /** + * At this stage, ReturnValue holds the number of ticks counted by SSR + * Need to translate in number of ticks counted by the Wakeuptimer + */ + return_value = return_value*AsynchPrescalerUserConfig; + return_value = return_value >> WakeupTimerDivider; + } + else + { + return_value = 0; + } + + return (uint16_t)return_value; +} + +/** + * @brief Set the wakeup counter + * @note The API is writing the counter value so that the value is decreased by one to cope with the fact + * the interrupt is generated with 1 extra clock cycle (See RefManuel) + * It assumes all condition are met to be allowed to write the wakeup counter + * @param Value: Value to be written in the counter + * @retval None + */ +static void RestartWakeupCounter(uint16_t Value) +{ + /** + * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + */ + + if(Value == 0) + { + SSRValueOnLastSetup = ReadRtcSsrValue(); + + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + else + { + if((Value > 1) ||(WakeupTimerDivider != 1)) + { + Value -= 1; + } + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + + MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); + + /** + * Update the value here after the WUTWF polling that may take some time + */ + SSRValueOnLastSetup = ReadRtcSsrValue(); + + __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ + + HW_TS_RTC_CountUpdated_AppNot(); + } + + return ; +} + +/** + * @brief Reschedule the list of timer + * @note 1) Update the count left for each timer in the list + * 2) Setup the wakeuptimer + * @param None + * @retval None + */ +static void RescheduleTimerList(void) +{ + uint8_t localTimerID; + uint32_t timecountleft; + uint16_t wakeup_timer_value; + uint16_t time_elapsed; + + /** + * The wakeuptimer is disabled now to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + localTimerID = CurrentRunningTimerID; + + /** + * Calculate what will be the value to write in the wakeuptimer + */ + timecountleft = aTimerContext[localTimerID].CountLeft; + + /** + * Read how much has been counted + */ + time_elapsed = ReturnTimeElapsed(); + + if(timecountleft < time_elapsed ) + { + /** + * There is no tick left to count + */ + wakeup_timer_value = 0; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + else + { + if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) + { + /** + * The number of tick left is greater than the Wakeuptimer maximum value + */ + wakeup_timer_value = MaxWakeupTimerSetup; + + WakeupTimerLimitation = WakeupTimerValue_Overpassed; + } + else + { + wakeup_timer_value = timecountleft - time_elapsed; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + + } + + /** + * update ticks left to be counted for each timer + */ + while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + if (aTimerContext[localTimerID].CountLeft < time_elapsed) + { + aTimerContext[localTimerID].CountLeft = 0; + } + else + { + aTimerContext[localTimerID].CountLeft -= time_elapsed; + } + localTimerID = aTimerContext[localTimerID].NextID; + } + + /** + * Write next count + */ + RestartWakeupCounter(wakeup_timer_value); + + return ; +} + +/* Public functions ----------------------------------------------------------*/ + +/** + * For all public interface except that may need write access to the RTC, the RTC + * shall be unlock at the beginning and locked at the output + * In order to ease maintainability, the unlock is done at the top and the lock at then end + * in case some new implementation is coming in the future + */ + +void HW_TS_RTC_Wakeup_Handler(void) +{ + HW_TS_pTimerCb_t ptimer_callback; + uint32_t timer_process_id; + uint8_t local_current_running_timer_id; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + +/* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + /** + * Disable the Wakeup Timer + * This may speed up a bit the processing to wait the timer to be disabled + * The timer is still counting 2 RTCCLK + */ + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + + local_current_running_timer_id = CurrentRunningTimerID; + + if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) + { + ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; + timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; + + /** + * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted + * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick + * to be left whereas the count is over + * A more secure implementation has been done with a flag to state whereas the full count has been written + * in the wakeuptimer or not + */ + if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) + { + if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) + { + UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Stop(local_current_running_timer_id); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + + HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); + } + else + { + RescheduleTimerList(); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + } + else + { + /** + * We should never end up in this case + * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. + * We could just clean the interrupt flag and get out from this unexpected interrupt + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + return; +} + +void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) +{ + uint8_t loop; + uint32_t localmaxwakeuptimersetup; + + /** + * Get RTC handler + */ + phrtc = hrtc; + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + SET_BIT(RTC->CR, RTC_CR_BYPSHAD); + + /** + * Readout the user config + */ + WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); + + AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; + + SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; + + /** + * Margin is taken to avoid wrong calculation when the wrap around is there and some + * application interrupts may have delayed the reading + */ + localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); + + if(localmaxwakeuptimersetup >= 0xFFFF) + { + MaxWakeupTimerSetup = 0xFFFF; + } + else + { + MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; + } + + /** + * Configure EXTI module + */ + LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + + if(TimerInitMode == hw_ts_InitMode_Full) + { + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + + /** + * Initialize the timer server + */ + for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) + { + aTimerContext[loop].TimerIDStatus = TimerID_Free; + } + + CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ + + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ + } + else + { + if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) + { + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + + return; +} + +HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) +{ + HW_TS_ReturnStatus_t localreturnstatus; + uint8_t loop = 0; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) + { + loop++; + } + + if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[loop].TimerIDStatus = TimerID_Created; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + aTimerContext[loop].TimerProcessID = TimerProcessID; + aTimerContext[loop].TimerMode = TimerMode; + aTimerContext[loop].pTimerCallBack = pftimeout_handler; + *pTimerId = loop; + + localreturnstatus = hw_ts_Successful; + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + localreturnstatus = hw_ts_Failed; + } + + return(localreturnstatus); +} + +void HW_TS_Delete(uint8_t timer_id) +{ + HW_TS_Stop(timer_id); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ + + return; +} + +void HW_TS_Stop(uint8_t timer_id) +{ + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + UnlinkTimer(timer_id, SSR_Read_Requested); + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * List is empty + */ + + /** + * Disable the timer + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + } + else if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) +{ + uint16_t time_elapsed; + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + HW_TS_Stop( timer_id ); + } + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Running; + + aTimerContext[timer_id].CountLeft = timeout_ticks; + aTimerContext[timer_id].CounterInit = timeout_ticks; + + time_elapsed = linkTimer(timer_id); + + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + else + { + aTimerContext[timer_id].CountLeft -= time_elapsed; + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) +{ + uint32_t primask_bit; + uint16_t return_value, auro_reload_value, elapsed_time_value; + + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ + + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); + + elapsed_time_value = ReturnTimeElapsed(); + + if(auro_reload_value > elapsed_time_value) + { + return_value = auro_reload_value - elapsed_time_value; + } + else + { + return_value = 0; + } + } + else + { + return_value = TIMER_LIST_EMPTY; + } + + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + + return (return_value); +} + +__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) +{ + pTimerCallBack(); + + return; +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_uart.c new file mode 100644 index 000000000..166acccd5 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/hw_uart.c @@ -0,0 +1,318 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : Src/hw_uart.c + * Description : HW UART source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "hw_conf.h" +#if (CFG_HW_LPUART1_ENABLED == 1) +extern UART_HandleTypeDef hlpuart1; +#endif +#if (CFG_HW_USART1_ENABLED == 1) +extern UART_HandleTypeDef huart1; +#endif + +/* Macros --------------------------------------------------------------------*/ +#define HW_UART_RX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##RxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Receive_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##TxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Transmit_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX(__HANDLE__, __USART_BASE__) \ + do{ \ + (__HANDLE__).Instance = (__USART_BASE__); \ + hal_status = HAL_UART_Transmit(&(__HANDLE__), p_data, size, timeout); \ + } while(0) + +/* Variables -----------------------------------------------------------------*/ +#if (CFG_HW_USART1_ENABLED == 1) +#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) + DMA_HandleTypeDef HW_hdma_huart1_tx ={0}; +#endif + void (*HW_huart1RxCb)(void); + void (*HW_huart1TxCb)(void); +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) +#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) + DMA_HandleTypeDef HW_hdma_hlpuart1_tx ={0}; +#endif + void (*HW_hlpuart1RxCb)(void); + void (*HW_hlpuart1TxCb)(void); +#endif + +void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_RX_IT(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_RX_IT(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + return; +} + +void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_TX_IT(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_TX_IT(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + return; +} + +hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_TX(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_TX(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_huart1TxCb = cb; + huart1.Instance = USART1; + hal_status = HAL_UART_Transmit_DMA(&huart1, p_data, size); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_hlpuart1TxCb = cb; + hlpuart1.Instance = LPUART1; + hal_status = HAL_UART_Transmit_DMA(&hlpuart1, p_data, size); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HAL_UART_IRQHandler(&huart1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HAL_UART_IRQHandler(&hlpuart1); + break; +#endif + + default: + break; + } + + return; +} + +void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) + case hw_uart1: + HAL_DMA_IRQHandler(huart1.hdmatx); + break; +#endif + +#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) + case hw_lpuart1: + HAL_DMA_IRQHandler(hlpuart1.hdmatx); + break; +#endif + + default: + break; + } + + return; +} + +void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { +#if (CFG_HW_USART1_ENABLED == 1) + case (uint32_t)USART1: + if(HW_huart1RxCb) + { + HW_huart1RxCb(); + } + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case (uint32_t)LPUART1: + if(HW_hlpuart1RxCb) + { + HW_hlpuart1RxCb(); + } + break; +#endif + + default: + break; + } + + return; +} + +void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { +#if (CFG_HW_USART1_ENABLED == 1) + case (uint32_t)USART1: + if(HW_huart1TxCb) + { + HW_huart1TxCb(); + } + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case (uint32_t)LPUART1: + if(HW_hlpuart1TxCb) + { + HW_hlpuart1TxCb(); + } + break; +#endif + + default: + break; + } + + return; +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/main.c new file mode 100644 index 000000000..4e0e5e334 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/main.c @@ -0,0 +1,629 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.c + * @brief : Main program body + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "stm32wb_at.h" +#include "stm32wb_at_ble.h" +#include "stm32_seq.h" +#include "ble_defs.h" +#include "custom_app.h" + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +#include "ble_at_server.h" +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +IPCC_HandleTypeDef hipcc; + +UART_HandleTypeDef hlpuart1; +UART_HandleTypeDef huart1; + +RTC_HandleTypeDef hrtc; +RNG_HandleTypeDef hrng; + +float tab_conv_tx_power[32] = {-40.00f, -20.85f, -19.75f, -18.85f, + -17.60f, -16.50f, -15.25f, -14.10f, + -13.15f, -12.05f, -10.90f, -9.90f, + -8.85f, -7.80f, -6.90f, -5.90f, + -4.95f, -4.00f, -3.15f, -2.45f, + -1.80f, -1.30f, -0.85f, -0.50f, + -0.15f, 0.00f, 1.00f, 2.00f, + 3.00f, 4.00f, 5.00f, 6.00f}; +extern uint8_t global_io_capability; +extern uint8_t global_bonding; +extern uint8_t global_mitm; +extern uint8_t global_scsupport; +extern uint8_t global_usefixedpin; +extern uint32_t global_fixedpin; +extern char global_name[20]; +extern uint8_t global_bdaddress[6]; +extern float global_tx_power; +extern uint8_t global_tx_power_code; +extern uint8_t global_adv_type; +extern float global_adv_int_min; +extern float global_adv_int_max; +extern uint8_t global_adv_enable; + +/* USER CODE BEGIN PV */ +uint8_t AT_received_byte; +extern uint8_t at_buffer[64]; +extern Custom_Context_t Custom_Context; +extern const uint8_t* BleGetBdAddress( void ); + +/* USER CODE END PV */ + +uint8_t str_to_byte_tab(char *str_in, uint8_t *tab, uint8_t *tab_len); + +/* Private function prototypes -----------------------------------------------*/ +void SystemClock_Config(void); +#if ((CFG_LED_SUPPORTED == 1)||(CFG_BUTTON_SUPPORTED == 1)) +static void MX_GPIO_Init(void); +#endif +static void MX_IPCC_Init(void); +static void MX_LPUART1_UART_Init(void); +static void MX_USART1_UART_Init(void); +static void MX_RF_Init(void); +static void MX_RTC_Init(void); +static void MX_RNG_Init(void); + +void lpuart_Receive_IT_cb(void); +/* USER CODE BEGIN PFP */ +#if defined ( __GNUC__) && !defined(__clang__) +/* With GCC, small printf (option LD Linker->Libraries->Small printf + set to 'Yes') calls __io_putchar() */ +#define PUTCHAR_PROTOTYPE int __io_putchar(int ch) +#else +#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f) +#endif /* __GNUC__ */ +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/** + * @brief The application entry point. + * @retval int + */ +int main(void) +{ + /* USER CODE BEGIN 1 */ + + /* USER CODE END 1 */ + + /* MCU Configuration--------------------------------------------------------*/ + + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + HAL_Init(); + + /* Config code for STM32_WPAN (HSE Tuning must be done before system clock configuration) */ + MX_APPE_Config(); + + /* USER CODE BEGIN Init */ + + /* Configure the system clock */ + SystemClock_Config(); + + /* USER CODE BEGIN SysInit */ + /* USER CODE END SysInit */ + + /* USER CODE END Init */ + + /* IPCC initialisation */ + MX_IPCC_Init(); + + + /* Initialize all configured peripherals */ +#if ((CFG_LED_SUPPORTED == 1)||(CFG_BUTTON_SUPPORTED == 1)) + MX_GPIO_Init(); +#endif + MX_LPUART1_UART_Init(); + MX_USART1_UART_Init(); + MX_RF_Init(); + MX_RTC_Init(); + MX_RNG_Init(); + /* USER CODE BEGIN 2 */ + + /* USER CODE END 2 */ + + /* Init code for STM32_WPAN */ + MX_APPE_Init(); + + /* Init the at module */ + stm32wb_at_Init(&at_buffer[0], sizeof(at_buffer)); + + printf("AT BLE server starts\n"); + + /* Init buffer for AT module */ + ble_at_server_Init(); + + + + strcpy(global_name, "AT server"); + + memcpy(&global_bdaddress[0], BleGetBdAddress(), sizeof(global_bdaddress)); + + global_tx_power_code = CFG_TX_POWER; + global_tx_power = tab_conv_tx_power[global_tx_power_code]; + + global_adv_enable = 1; + global_adv_type = 0; + global_adv_int_min = CFG_MINI_CONN_ADV_INTERVAL_MIN; + global_adv_int_max = CFG_MINI_CONN_ADV_INTERVAL_MAX; + + global_io_capability = CFG_IO_CAPABILITY; + + global_mitm = CFG_MITM_PROTECTION; + global_scsupport = CFG_SC_SUPPORT; + global_usefixedpin = CFG_USED_FIXED_PIN; + global_fixedpin = CFG_FIXED_PIN; + global_bonding = CFG_BONDING_MODE; + + /* Infinite loop */ + /* USER CODE BEGIN WHILE */ + while (1) + { + /* USER CODE END WHILE */ + MX_APPE_Process(); + + /* USER CODE BEGIN 3 */ + } + /* USER CODE END 3 */ +} + +/** + * @brief System Clock Configuration + * @retval None + */ +void SystemClock_Config(void) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Configure LSE Drive Capability + */ + HAL_PWR_EnableBkUpAccess(); + __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW); + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); + /** Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE + |RCC_OSCILLATORTYPE_LSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.LSEState = RCC_LSE_ON; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } + /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK4|RCC_CLOCKTYPE_HCLK2 + |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK + |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSE; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.AHBCLK4Divider = RCC_SYSCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + Error_Handler(); + } + /** Initializes the peripherals clocks + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP + |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 + |RCC_PERIPHCLK_LPUART1 + |RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; + PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; + PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN Smps */ + + /* USER CODE END Smps */ +} + +/** + * @brief IPCC Initialization Function + * @param None + * @retval None + */ +static void MX_IPCC_Init(void) +{ + + /* USER CODE BEGIN IPCC_Init 0 */ + + /* USER CODE END IPCC_Init 0 */ + + /* USER CODE BEGIN IPCC_Init 1 */ + + /* USER CODE END IPCC_Init 1 */ + hipcc.Instance = IPCC; + if (HAL_IPCC_Init(&hipcc) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN IPCC_Init 2 */ + + /* USER CODE END IPCC_Init 2 */ + +} + +/** + * @brief LPUART1 Initialization Function + * @param None + * @retval None + */ +static void MX_LPUART1_UART_Init(void) +{ + + /* USER CODE BEGIN LPUART1_Init 0 */ + + /* USER CODE END LPUART1_Init 0 */ + + /* USER CODE BEGIN LPUART1_Init 1 */ + + /* USER CODE END LPUART1_Init 1 */ + hlpuart1.Instance = LPUART1; + hlpuart1.Init.BaudRate = 9600; + hlpuart1.Init.WordLength = UART_WORDLENGTH_8B; + hlpuart1.Init.StopBits = UART_STOPBITS_1; + hlpuart1.Init.Parity = UART_PARITY_NONE; + hlpuart1.Init.Mode = UART_MODE_TX_RX; + hlpuart1.Init.HwFlowCtl = UART_HWCONTROL_NONE; + hlpuart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; + hlpuart1.Init.ClockPrescaler = UART_PRESCALER_DIV1; + hlpuart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; + hlpuart1.FifoMode = UART_FIFOMODE_DISABLE; + if (HAL_UART_Init(&hlpuart1) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetTxFifoThreshold(&hlpuart1, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetRxFifoThreshold(&hlpuart1, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_DisableFifoMode(&hlpuart1) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN LPUART1_Init 2 */ + + /* USER CODE END LPUART1_Init 2 */ + +} + +/** + * @brief USART1 Initialization Function + * @param None + * @retval None + */ +static void MX_USART1_UART_Init(void) +{ + + /* USER CODE BEGIN USART1_Init 0 */ + + /* USER CODE END USART1_Init 0 */ + + /* USER CODE BEGIN USART1_Init 1 */ + + /* USER CODE END USART1_Init 1 */ + huart1.Instance = USART1; + huart1.Init.BaudRate = 115200; + huart1.Init.WordLength = UART_WORDLENGTH_8B; + huart1.Init.StopBits = UART_STOPBITS_1; + huart1.Init.Parity = UART_PARITY_NONE; + huart1.Init.Mode = UART_MODE_TX_RX; + huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE; + huart1.Init.OverSampling = UART_OVERSAMPLING_8; + huart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; + huart1.Init.ClockPrescaler = UART_PRESCALER_DIV1; + huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; + if (HAL_UART_Init(&huart1) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetTxFifoThreshold(&huart1, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetRxFifoThreshold(&huart1, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_DisableFifoMode(&huart1) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN USART1_Init 2 */ + + /* USER CODE END USART1_Init 2 */ + +} + +/** + * @brief RF Initialization Function + * @param None + * @retval None + */ +static void MX_RF_Init(void) +{ + + /* USER CODE BEGIN RF_Init 0 */ + + /* USER CODE END RF_Init 0 */ + + /* USER CODE BEGIN RF_Init 1 */ + + /* USER CODE END RF_Init 1 */ + /* USER CODE BEGIN RF_Init 2 */ + + /* USER CODE END RF_Init 2 */ + +} + +/** + * @brief RNG Initialization Function + * @param None + * @retval None + */ +static void MX_RNG_Init(void) +{ + + /* USER CODE BEGIN RNG_Init 0 */ + + /* USER CODE END RNG_Init 0 */ + + /* USER CODE BEGIN RNG_Init 1 */ + + /* USER CODE END RNG_Init 1 */ + hrng.Instance = RNG; + hrng.Init.ClockErrorDetection = RNG_CED_ENABLE; + if (HAL_RNG_Init(&hrng) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN RNG_Init 2 */ + + /* USER CODE END RNG_Init 2 */ + +} + +/** + * @brief RTC Initialization Function + * @param None + * @retval None + */ +static void MX_RTC_Init(void) +{ + + /* USER CODE BEGIN RTC_Init 0 */ + + /* USER CODE END RTC_Init 0 */ + + /* USER CODE BEGIN RTC_Init 1 */ + + /* USER CODE END RTC_Init 1 */ + /** Initialize RTC Only + */ + hrtc.Instance = RTC; + hrtc.Init.HourFormat = RTC_HOURFORMAT_24; + hrtc.Init.AsynchPrediv = CFG_RTC_ASYNCH_PRESCALER; + hrtc.Init.SynchPrediv = CFG_RTC_SYNCH_PRESCALER; + hrtc.Init.OutPut = RTC_OUTPUT_DISABLE; + hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH; + hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN; + hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE; + if (HAL_RTC_Init(&hrtc) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN RTC_Init 2 */ + + /* USER CODE END RTC_Init 2 */ + +} + +#if ((CFG_LED_SUPPORTED == 1)||(CFG_BUTTON_SUPPORTED == 1)) +/** + * @brief GPIO Initialization Function + * @param None + * @retval None + */ +static void MX_GPIO_Init(void) +{ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + + /* GPIO Ports Clock Enable */ + __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); + __HAL_RCC_GPIOD_CLK_ENABLE(); + + /*Configure GPIO pin Output Level */ + HAL_GPIO_WritePin(GPIOB, LD2_Pin|LD3_Pin|LD1_Pin, GPIO_PIN_RESET); + + /*Configure GPIO pin : B1_Pin */ + GPIO_InitStruct.Pin = B1_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(B1_GPIO_Port, &GPIO_InitStruct); + + /*Configure GPIO pins : LD2_Pin LD3_Pin LD1_Pin */ + GPIO_InitStruct.Pin = LD2_Pin|LD3_Pin|LD1_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + + /*Configure GPIO pins : PA11 PA12 */ + GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF10_USB; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + + /*Configure GPIO pins : B2_Pin B3_Pin */ + GPIO_InitStruct.Pin = B2_Pin|B3_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + +} +#endif + +/* USER CODE BEGIN 4 */ +/** + * @brief Retargets the C library printf function to the USART. + * @param None + * @retval None + */ +PUTCHAR_PROTOTYPE +{ + /* Place your implementation of fputc here */ + /* e.g. write a character to the USART1 and Loop until the end of transmission */ + HW_UART_Transmit(hw_uart1, (uint8_t *)&ch, 1, 0xFFFF); + return ch; +} + +/** + * @brief Triggers the reception of a byte + * @param pBuff pointer to the first byte to transmit + * @param Size byte count to transfer + * @retval 0 in case of success, an error code otherwise + */ +uint8_t stm32wb_at_ll_Transmit(uint8_t *pBuff, uint16_t Size) +{ + uint8_t status; + + status = HW_UART_Transmit(hw_lpuart1, pBuff, Size, 0xFFFF); + printf(" TX: %s",pBuff); + + return status; +} + +/** + * @brief Triggers the reception of a byte + * @param new_frame contains the length of a new frame received in rx buffer, else 0 + * @retval None + */ +void stm32wb_at_ll_Async_receive(uint8_t new_frame) +{ + if(new_frame != 0) + { + printf(" RX: %s\r\n",at_buffer); + } + HW_UART_Receive_IT(hw_lpuart1, &AT_received_byte, 1, &lpuart_Receive_IT_cb ); + + return; +} + +void lpuart_Receive_IT_cb(void) +{ + stm32wb_at_Received(AT_received_byte); + + return; +} +uint8_t stm32wb_at_Process_rx_frame(char * str) +{ + ble_at_server_Process_rx_frame(str); + + return 0; +} + +/* Dummy function to be compliant over different IDEs */ +uint8_t stm32wb_at_client_Process_rx_frame(char * str) +{ + return 0; +} + +/* USER CODE END 4 */ + +/** + * @brief This function is executed in case of error occurrence. + * @retval None + */ +void Error_Handler(void) +{ + /* USER CODE BEGIN Error_Handler_Debug */ + /* User can add his own implementation to report the HAL error return state */ + __disable_irq(); + while (1) + { + } + /* USER CODE END Error_Handler_Debug */ +} + +#ifdef USE_FULL_ASSERT +/** + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ +void assert_failed(uint8_t *file, uint32_t line) +{ + /* USER CODE BEGIN 6 */ + /* User can add his own implementation to report the file name and line number, + ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* USER CODE END 6 */ +} +#endif /* USE_FULL_ASSERT */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32_lpm_if.c new file mode 100644 index 000000000..72331be84 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32_lpm_if.c @@ -0,0 +1,347 @@ +/* USER CODE BEGIN Header */ +/** + *************************************************************************************** + * File Name : stm32_lpm_if.c + * Description : Low layer function to enter/exit low power modes (stop, sleep). + *************************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32_lpm_if.h" +#include "stm32_lpm.h" +#include "app_conf.h" +/* USER CODE BEGIN include */ + +/* USER CODE END include */ + +/* Exported variables --------------------------------------------------------*/ +const struct UTIL_LPM_Driver_s UTIL_PowerDriver = +{ + PWR_EnterSleepMode, + PWR_ExitSleepMode, + + PWR_EnterStopMode, + PWR_ExitStopMode, + + PWR_EnterOffMode, + PWR_ExitOffMode, +}; + +/* Private function prototypes -----------------------------------------------*/ +static void Switch_On_HSI( void ); +static void EnterLowPower( void ); +static void ExitLowPower( void ); +/* USER CODE BEGIN Private_Function_Prototypes */ + +/* USER CODE END Private_Function_Prototypes */ +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN Private_Typedef */ + +/* USER CODE END Private_Typedef */ +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Define */ + +/* USER CODE END Private_Define */ +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Macro */ + +/* USER CODE END Private_Macro */ +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN Private_Variables */ + +/* USER CODE END Private_Variables */ + +/* Functions Definition ------------------------------------------------------*/ +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ) +{ +/* USER CODE BEGIN PWR_EnterOffMode_1 */ + +/* USER CODE END PWR_EnterOffMode_1 */ + /** + * The systick should be disabled for the same reason than when the device enters stop mode because + * at this time, the device may enter either OffMode or StopMode. + */ + HAL_SuspendTick(); + + EnterLowPower(); + + /************************************************************************************ + * ENTER OFF MODE + ***********************************************************************************/ + /* + * There is no risk to clear all the WUF here because in the current implementation, this API is called + * in critical section. If an interrupt occurs while in that critical section before that point, + * the flag is set and will be cleared here but the system will not enter Off Mode + * because an interrupt is pending in the NVIC. The ISR will be executed when moving out + * of this critical section + */ + LL_PWR_ClearFlag_WU( ); + + LL_PWR_SetPowerMode( LL_PWR_MODE_STANDBY ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterOffMode_2 */ + +/* USER CODE END PWR_EnterOffMode_2 */ + return; +} + +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ) +{ +/* USER CODE BEGIN PWR_ExitOffMode_1 */ + +/* USER CODE END PWR_ExitOffMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitOffMode_2 */ + +/* USER CODE END PWR_ExitOffMode_2 */ + return; +} + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ) +{ +/* USER CODE BEGIN PWR_EnterStopMode_1 */ + +/* USER CODE END PWR_EnterStopMode_1 */ + /** + * When HAL_DBGMCU_EnableDBGStopMode() is called to keep the debugger active in Stop Mode, + * the systick shall be disabled otherwise the cpu may crash when moving out from stop mode + * + * When in production, the HAL_DBGMCU_EnableDBGStopMode() is not called so that the device can reach best power consumption + * However, the systick should be disabled anyway to avoid the case when it is about to expire at the same time the device enters + * stop mode ( this will abort the Stop Mode entry ). + */ + HAL_SuspendTick(); + + /** + * This function is called from CRITICAL SECTION + */ + EnterLowPower(); + + /************************************************************************************ + * ENTER STOP MODE + ***********************************************************************************/ + LL_PWR_SetPowerMode( LL_PWR_MODE_STOP2 ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterStopMode_2 */ + +/* USER CODE END PWR_EnterStopMode_2 */ + return; +} + +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ) +{ +/* USER CODE BEGIN PWR_ExitStopMode_1 */ + +/* USER CODE END PWR_ExitStopMode_1 */ + /** + * This function is called from CRITICAL SECTION + */ + ExitLowPower(); + + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitStopMode_2 */ + +/* USER CODE END PWR_ExitStopMode_2 */ + return; +} + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ) +{ +/* USER CODE BEGIN PWR_EnterSleepMode_1 */ + +/* USER CODE END PWR_EnterSleepMode_1 */ + + HAL_SuspendTick(); + + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores(); +#endif + + __WFI( ); +/* USER CODE BEGIN PWR_EnterSleepMode_2 */ + +/* USER CODE END PWR_EnterSleepMode_2 */ + return; +} + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ) +{ +/* USER CODE BEGIN PWR_ExitSleepMode_1 */ + +/* USER CODE END PWR_ExitSleepMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitSleepMode_2 */ + +/* USER CODE END PWR_ExitSleepMode_2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief Setup the system to enter either stop or off mode + * @param none + * @retval none + */ +static void EnterLowPower( void ) +{ + /** + * This function is called from CRITICAL SECTION + */ + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if ( ! LL_HSEM_1StepLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID ) ) + { + if( LL_PWR_IsActiveFlag_C2DS() || LL_PWR_IsActiveFlag_C2SB() ) + { + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + Switch_On_HSI( ); + __HAL_FLASH_SET_LATENCY(FLASH_LATENCY_0); + } + } + else + { + Switch_On_HSI( ); + __HAL_FLASH_SET_LATENCY(FLASH_LATENCY_0); + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Restore the system to exit stop mode + * @param none + * @retval none + */ +static void ExitLowPower( void ) +{ + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if(LL_RCC_GetSysClkSource( ) == LL_RCC_SYS_CLKSOURCE_STATUS_HSI) + { +/* Restore the clock configuration of the application in this user section */ +/* USER CODE BEGIN ExitLowPower_1 */ + +/* USER CODE END ExitLowPower_1 */ + } + else + { +/* If the application is not running on HSE restore the clock configuration in this user section */ +/* USER CODE BEGIN ExitLowPower_2 */ + +/* USER CODE END ExitLowPower_2 */ + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Switch the system clock on HSI + * @param none + * @retval none + */ +static void Switch_On_HSI( void ) +{ + LL_RCC_HSI_Enable( ); + while(!LL_RCC_HSI_IsReady( )); + LL_RCC_SetSysClkSource( LL_RCC_SYS_CLKSOURCE_HSI ); + LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSI); + return; +} + +/* USER CODE BEGIN Private_Functions */ + +/* USER CODE END Private_Functions */ + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_hal_msp.c new file mode 100644 index 000000000..2c66648a9 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_hal_msp.c @@ -0,0 +1,323 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_msp.c + * @brief This file provides code for the MSP Initialization + * and de-Initialization codes. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Define */ + +/* USER CODE END Define */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Macro */ + +/* USER CODE END Macro */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* External functions --------------------------------------------------------*/ +/* USER CODE BEGIN ExternalFunctions */ + +/* USER CODE END ExternalFunctions */ + +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ +/** + * Initializes the Global MSP. + */ +void HAL_MspInit(void) +{ + /* USER CODE BEGIN MspInit 0 */ + + /* USER CODE END MspInit 0 */ + + __HAL_RCC_HSEM_CLK_ENABLE(); + + /* System interrupt init*/ + + /* Peripheral interrupt init */ + /* HSEM_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(HSEM_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(HSEM_IRQn); + + /* USER CODE BEGIN MspInit 1 */ + + /* USER CODE END MspInit 1 */ +} + +/** +* @brief IPCC MSP Initialization +* This function configures the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspInit 0 */ + + /* USER CODE END IPCC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_IPCC_CLK_ENABLE(); + /* IPCC interrupt Init */ + HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspInit 1 */ + + /* USER CODE END IPCC_MspInit 1 */ + } + +} + +/** +* @brief IPCC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspDeInit 0 */ + + /* USER CODE END IPCC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_IPCC_CLK_DISABLE(); + + /* IPCC interrupt DeInit */ + HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspDeInit 1 */ + + /* USER CODE END IPCC_MspDeInit 1 */ + } + +} + +/** +* @brief UART MSP Initialization +* This function configures the hardware resources used in this example +* @param huart: UART handle pointer +* @retval None +*/ +void HAL_UART_MspInit(UART_HandleTypeDef* huart) +{ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + if(huart->Instance==LPUART1) + { + /* USER CODE BEGIN LPUART1_MspInit 0 */ + + /* USER CODE END LPUART1_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_LPUART1_CLK_ENABLE(); + + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**LPUART1 GPIO Configuration + PA2 ------> LPUART1_TX + PA3 ------> LPUART1_RX + */ + GPIO_InitStruct.Pin = GPIO_PIN_2|GPIO_PIN_3; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF8_LPUART1; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + + /* LPUART1 interrupt Init */ + HAL_NVIC_SetPriority(LPUART1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(LPUART1_IRQn); + /* USER CODE BEGIN LPUART1_MspInit 1 */ + + /* USER CODE END LPUART1_MspInit 1 */ + } + else if(huart->Instance==USART1) + { + /* USER CODE BEGIN USART1_MspInit 0 */ + + /* USER CODE END USART1_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_USART1_CLK_ENABLE(); + + __HAL_RCC_GPIOB_CLK_ENABLE(); + /**USART1 GPIO Configuration + PB6 ------> USART1_TX + PB7 ------> USART1_RX + */ + GPIO_InitStruct.Pin = STLINK_RX_Pin|STLINK_TX_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_PULLUP; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF7_USART1; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + + /* USART1 interrupt Init */ + HAL_NVIC_SetPriority(USART1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(USART1_IRQn); + /* USER CODE BEGIN USART1_MspInit 1 */ + + /* USER CODE END USART1_MspInit 1 */ + } + +} + +/** +* @brief UART MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param huart: UART handle pointer +* @retval None +*/ +void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) +{ + if(huart->Instance==LPUART1) + { + /* USER CODE BEGIN LPUART1_MspDeInit 0 */ + + /* USER CODE END LPUART1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_LPUART1_CLK_DISABLE(); + + /**LPUART1 GPIO Configuration + PA2 ------> LPUART1_TX + PA3 ------> LPUART1_RX + */ + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3); + + /* LPUART1 interrupt DeInit */ + HAL_NVIC_DisableIRQ(LPUART1_IRQn); + /* USER CODE BEGIN LPUART1_MspDeInit 1 */ + + /* USER CODE END LPUART1_MspDeInit 1 */ + } + else if(huart->Instance==USART1) + { + /* USER CODE BEGIN USART1_MspDeInit 0 */ + + /* USER CODE END USART1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_USART1_CLK_DISABLE(); + + /**USART1 GPIO Configuration + PB6 ------> USART1_TX + PB7 ------> USART1_RX + */ + HAL_GPIO_DeInit(GPIOB, STLINK_RX_Pin|STLINK_TX_Pin); + + /* USART1 interrupt DeInit */ + HAL_NVIC_DisableIRQ(USART1_IRQn); + /* USER CODE BEGIN USART1_MspDeInit 1 */ + + /* USER CODE END USART1_MspDeInit 1 */ + } + +} + +/** +* @brief RTC MSP Initialization +* This function configures the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspInit 0 */ + + /* USER CODE END RTC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_RTC_ENABLE(); + __HAL_RCC_RTCAPB_CLK_ENABLE(); + /* USER CODE BEGIN RTC_MspInit 1 */ + + /* USER CODE END RTC_MspInit 1 */ + } + +} + +/** +* @brief RNG MSP Initialization +* This function configures the hardware resources used in this example +* @param hrng: RNG handle pointer +* @retval None +*/ +void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) +{ + if(hrng->Instance==RNG) + { + /* USER CODE BEGIN RNG_MspInit 0 */ + + /* USER CODE END RNG_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_RNG_CLK_ENABLE(); + /* USER CODE BEGIN RNG_MspInit 1 */ + + /* USER CODE END RNG_MspInit 1 */ + } + +} + +/** +* @brief RTC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspDeInit 0 */ + + /* USER CODE END RTC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_RTC_DISABLE(); + __HAL_RCC_RTCAPB_CLK_DISABLE(); + /* USER CODE BEGIN RTC_MspDeInit 1 */ + + /* USER CODE END RTC_MspDeInit 1 */ + } + +} + +/* USER CODE BEGIN 1 */ + +/* USER CODE END 1 */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_it.c new file mode 100644 index 000000000..6975f7eb7 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/stm32wbxx_it.c @@ -0,0 +1,301 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.c + * @brief Interrupt Service Routines. + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "stm32wbxx_it.h" +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/* External variables --------------------------------------------------------*/ +extern IPCC_HandleTypeDef hipcc; +extern UART_HandleTypeDef hlpuart1; +extern UART_HandleTypeDef huart1; +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/******************************************************************************/ +/* Cortex Processor Interruption and Exception Handlers */ +/******************************************************************************/ +/** + * @brief This function handles Non maskable interrupt. + */ +void NMI_Handler(void) +{ + /* USER CODE BEGIN NonMaskableInt_IRQn 0 */ + + /* USER CODE END NonMaskableInt_IRQn 0 */ + /* USER CODE BEGIN NonMaskableInt_IRQn 1 */ + while (1) + { + } + /* USER CODE END NonMaskableInt_IRQn 1 */ +} + +/** + * @brief This function handles Hard fault interrupt. + */ +void HardFault_Handler(void) +{ + /* USER CODE BEGIN HardFault_IRQn 0 */ + + /* USER CODE END HardFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + /* USER CODE END W1_HardFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Memory management fault. + */ +void MemManage_Handler(void) +{ + /* USER CODE BEGIN MemoryManagement_IRQn 0 */ + + /* USER CODE END MemoryManagement_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */ + /* USER CODE END W1_MemoryManagement_IRQn 0 */ + } +} + +/** + * @brief This function handles Prefetch fault, memory access fault. + */ +void BusFault_Handler(void) +{ + /* USER CODE BEGIN BusFault_IRQn 0 */ + + /* USER CODE END BusFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_BusFault_IRQn 0 */ + /* USER CODE END W1_BusFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Undefined instruction or illegal state. + */ +void UsageFault_Handler(void) +{ + /* USER CODE BEGIN UsageFault_IRQn 0 */ + + /* USER CODE END UsageFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_UsageFault_IRQn 0 */ + /* USER CODE END W1_UsageFault_IRQn 0 */ + } +} + +/** + * @brief This function handles System service call via SWI instruction. + */ +void SVC_Handler(void) +{ + /* USER CODE BEGIN SVCall_IRQn 0 */ + + /* USER CODE END SVCall_IRQn 0 */ + /* USER CODE BEGIN SVCall_IRQn 1 */ + + /* USER CODE END SVCall_IRQn 1 */ +} + +/** + * @brief This function handles Debug monitor. + */ +void DebugMon_Handler(void) +{ + /* USER CODE BEGIN DebugMonitor_IRQn 0 */ + + /* USER CODE END DebugMonitor_IRQn 0 */ + /* USER CODE BEGIN DebugMonitor_IRQn 1 */ + + /* USER CODE END DebugMonitor_IRQn 1 */ +} + +/** + * @brief This function handles Pendable request for system service. + */ +void PendSV_Handler(void) +{ + /* USER CODE BEGIN PendSV_IRQn 0 */ + + /* USER CODE END PendSV_IRQn 0 */ + /* USER CODE BEGIN PendSV_IRQn 1 */ + + /* USER CODE END PendSV_IRQn 1 */ +} + +/** + * @brief This function handles System tick timer. + */ +void SysTick_Handler(void) +{ + /* USER CODE BEGIN SysTick_IRQn 0 */ + + /* USER CODE END SysTick_IRQn 0 */ + HAL_IncTick(); + /* USER CODE BEGIN SysTick_IRQn 1 */ + + /* USER CODE END SysTick_IRQn 1 */ +} + +/******************************************************************************/ +/* STM32WBxx Peripheral Interrupt Handlers */ +/* Add here the Interrupt Handlers for the used peripherals. */ +/* For the available peripheral interrupt handler names, */ +/* please refer to the startup file (startup_stm32wbxx.s). */ +/******************************************************************************/ + +/** + * @brief This function handles USART1 global interrupt. + */ +void USART1_IRQHandler(void) +{ + /* USER CODE BEGIN USART1_IRQn 0 */ + + /* USER CODE END USART1_IRQn 0 */ + HAL_UART_IRQHandler(&huart1); + /* USER CODE BEGIN USART1_IRQn 1 */ + + /* USER CODE END USART1_IRQn 1 */ +} + +/** + * @brief This function handles LPUART1 global interrupt. + */ +void LPUART1_IRQHandler(void) +{ + /* USER CODE BEGIN LPUART1_IRQn 0 */ + + /* USER CODE END LPUART1_IRQn 0 */ + HAL_UART_IRQHandler(&hlpuart1); + /* USER CODE BEGIN LPUART1_IRQn 1 */ + + /* USER CODE END LPUART1_IRQn 1 */ +} + +/** + * @brief This function handles IPCC RX occupied interrupt. + */ +void IPCC_C1_RX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */ + + /* USER CODE END IPCC_C1_RX_IRQn 0 */ + HAL_IPCC_RX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */ + + /* USER CODE END IPCC_C1_RX_IRQn 1 */ +} + +/** + * @brief This function handles IPCC TX free interrupt. + */ +void IPCC_C1_TX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */ + + /* USER CODE END IPCC_C1_TX_IRQn 0 */ + HAL_IPCC_TX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */ + + /* USER CODE END IPCC_C1_TX_IRQn 1 */ +} + +/** + * @brief This function handles HSEM global interrupt. + */ +void HSEM_IRQHandler(void) +{ + /* USER CODE BEGIN HSEM_IRQn 0 */ + + /* USER CODE END HSEM_IRQn 0 */ + HAL_HSEM_IRQHandler(); + /* USER CODE BEGIN HSEM_IRQn 1 */ + + /* USER CODE END HSEM_IRQn 1 */ +} + +/* USER CODE BEGIN 1 */ +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW1_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); +} + +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void PUSH_BUTTON_SW2_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW2_PIN); +} + +void RTC_WKUP_IRQHandler(void) +{ + HW_TS_RTC_Wakeup_Handler(); +} + +/* USER CODE END 1 */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/system_stm32wbxx.c new file mode 100644 index 000000000..734856a7b --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/Core/Src/system_stm32wbxx.c @@ -0,0 +1,366 @@ +/** + ****************************************************************************** + * @file system_stm32wbxx.c + * @author MCD Application Team + * @brief CMSIS Cortex Device Peripheral Access Layer System Source File + * + * This file provides two functions and one global variable to be called from + * user application: + * - SystemInit(): This function is called at startup just after reset and + * before branch to main program. This call is made inside + * the "startup_stm32wbxx.s" file. + * + * - SystemCoreClock variable: Contains the core clock (HCLK), it can be used + * by the user application to setup the SysTick + * timer or configure other parameters. + * + * - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must + * be called whenever the core clock is changed + * during program execution. + * + * After each device reset the MSI (4 MHz) is used as system clock source. + * Then SystemInit() function is called, in "startup_stm32wbxx.s" file, to + * configure the system clock before to branch to main program. + * + * This file configures the system clock as follows: + *============================================================================= + *----------------------------------------------------------------------------- + * System Clock source | MSI + *----------------------------------------------------------------------------- + * SYSCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * HCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * AHB Prescaler | 1 + *----------------------------------------------------------------------------- + * APB1 Prescaler | 1 + *----------------------------------------------------------------------------- + * APB2 Prescaler | 1 + *----------------------------------------------------------------------------- + * PLL_M | 1 + *----------------------------------------------------------------------------- + * PLL_N | 8 + *----------------------------------------------------------------------------- + * PLL_P | 7 + *----------------------------------------------------------------------------- + * PLL_Q | 2 + *----------------------------------------------------------------------------- + * PLL_R | 2 + *----------------------------------------------------------------------------- + * PLLSAI1_P | NA + *----------------------------------------------------------------------------- + * PLLSAI1_Q | NA + *----------------------------------------------------------------------------- + * PLLSAI1_R | NA + *----------------------------------------------------------------------------- + * Require 48MHz for USB OTG FS, | Disabled + * SDIO and RNG clock | + *----------------------------------------------------------------------------- + *============================================================================= + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/** @addtogroup CMSIS + * @{ + */ + +/** @addtogroup stm32WBxx_system + * @{ + */ + +/** @addtogroup stm32WBxx_System_Private_Includes + * @{ + */ + +#include "stm32wbxx.h" + +#if !defined (HSE_VALUE) + #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (MSI_VALUE) + #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +#if !defined (HSI_VALUE) + #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +#if !defined (LSI_VALUE) + #define LSI_VALUE (32000UL) /*!< Value of LSI in Hz*/ +#endif /* LSI_VALUE */ + +#if !defined (LSE_VALUE) + #define LSE_VALUE (32768UL) /*!< Value of LSE in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_TypesDefinitions + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Defines + * @{ + */ + +/* Note: Following vector table addresses must be defined in line with linker + configuration. */ +/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2 + CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept + at address 0x00 which correspond to automatic remap of boot address selected */ +/* #define USER_VECT_TAB_ADDRESS */ +#if defined(USER_VECT_TAB_ADDRESS) + /*!< Uncomment this line for user vector table remap in Sram else user remap + will be done in Flash. */ +/* #define VECT_TAB_SRAM */ +#if defined(VECT_TAB_SRAM) +#define VECT_TAB_BASE_ADDRESS SRAM1_BASE /*!< Vector Table base address field. + This value must be a multiple of 0x200. */ +#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +#else +#define VECT_TAB_BASE_ADDRESS FLASH_BASE /*!< Vector Table base address field. + This value must be a multiple of 0x200. */ +#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +#endif +#endif + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Macros + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Variables + * @{ + */ + /* The SystemCoreClock variable is updated in three ways: + 1) by calling CMSIS function SystemCoreClockUpdate() + 2) by calling HAL API function HAL_RCC_GetHCLKFreq() + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency + Note: If you use this function to configure the system clock; then there + is no need to call the 2 first functions listed above, since SystemCoreClock + variable is updated automatically. + */ + uint32_t SystemCoreClock = 4000000UL ; /*CPU1: M4 on MSI clock after startup (4MHz)*/ + + const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL}; + + const uint32_t APBPrescTable[8UL] = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL}; + + const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ + 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_FunctionPrototypes + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Functions + * @{ + */ + +/** + * @brief Setup the microcontroller system. + * @param None + * @retval None + */ +void SystemInit(void) +{ +#if defined(USER_VECT_TAB_ADDRESS) + /* Configure the Vector Table location add offset address ------------------*/ + SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; +#endif + + /* FPU settings ------------------------------------------------------------*/ + #if (__FPU_PRESENT == 1) && (__FPU_USED == 1) + SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL))); /* set CP10 and CP11 Full Access */ + #endif + + /* Reset the RCC clock configuration to the default reset state ------------*/ + /* Set MSION bit */ + RCC->CR |= RCC_CR_MSION; + + /* Reset CFGR register */ + RCC->CFGR = 0x00070000U; + + /* Reset PLLSAI1ON, PLLON, HSECSSON, HSEON, HSION, and MSIPLLON bits */ + RCC->CR &= (uint32_t)0xFAF6FEFBU; + + /*!< Reset LSI1 and LSI2 bits */ + RCC->CSR &= (uint32_t)0xFFFFFFFAU; + + /*!< Reset HSI48ON bit */ + RCC->CRRCR &= (uint32_t)0xFFFFFFFEU; + + /* Reset PLLCFGR register */ + RCC->PLLCFGR = 0x22041000U; + +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) + /* Reset PLLSAI1CFGR register */ + RCC->PLLSAI1CFGR = 0x22041000U; +#endif + + /* Reset HSEBYP bit */ + RCC->CR &= 0xFFFBFFFFU; + + /* Disable all interrupts */ + RCC->CIER = 0x00000000; +} + +/** + * @brief Update SystemCoreClock variable according to Clock Register Values. + * The SystemCoreClock variable contains the core clock (HCLK), it can + * be used by the user application to setup the SysTick timer or configure + * other parameters. + * + * @note Each time the core clock (HCLK) changes, this function must be called + * to update SystemCoreClock variable value. Otherwise, any configuration + * based on this variable will be incorrect. + * + * @note - The system frequency computed by this function is not the real + * frequency in the chip. It is calculated based on the predefined + * constant and the selected clock source: + * + * - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*) + * + * - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**) + * + * - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***) + * + * - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***) + * or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors. + * + * (*) MSI_VALUE is a constant defined in stm32wbxx_hal.h file (default value + * 4 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (**) HSI_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 16 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (***) HSE_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 32 MHz), user has to ensure that HSE_VALUE is same as the real + * frequency of the crystal used. Otherwise, this function may + * have wrong result. + * + * - The result of this function could be not correct when using fractional + * value for HSE crystal. + * + * @param None + * @retval None + */ +void SystemCoreClockUpdate(void) +{ + uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm; + + /* Get MSI Range frequency--------------------------------------------------*/ + + /*MSI frequency range in Hz*/ + msirange = MSIRangeTable[(RCC->CR & RCC_CR_MSIRANGE) >> RCC_CR_MSIRANGE_Pos]; + + /* Get SYSCLK source -------------------------------------------------------*/ + switch (RCC->CFGR & RCC_CFGR_SWS) + { + case 0x00: /* MSI used as system clock source */ + SystemCoreClock = msirange; + break; + + case 0x04: /* HSI used as system clock source */ + /* HSI used as system clock source */ + SystemCoreClock = HSI_VALUE; + break; + + case 0x08: /* HSE used as system clock source */ + SystemCoreClock = HSE_VALUE; + break; + + case 0x0C: /* PLL used as system clock source */ + /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN + SYSCLK = PLL_VCO / PLLR + */ + pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC); + pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ; + + if(pllsource == 0x02UL) /* HSI used as PLL clock source */ + { + pllvco = (HSI_VALUE / pllm); + } + else if(pllsource == 0x03UL) /* HSE used as PLL clock source */ + { + pllvco = (HSE_VALUE / pllm); + } + else /* MSI used as PLL clock source */ + { + pllvco = (msirange / pllm); + } + + pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos); + pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL); + + SystemCoreClock = pllvco/pllr; + break; + + default: + SystemCoreClock = msirange; + break; + } + + /* Compute HCLK clock frequency --------------------------------------------*/ + /* Get HCLK1 prescaler */ + tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)]; + /* HCLK clock frequency */ + SystemCoreClock = SystemCoreClock / tmp; + +} + + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewd b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewd new file mode 100644 index 000000000..a0091cd64 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewd @@ -0,0 +1,1419 @@ + + + 3 + + BLE_AT_Server + + ARM + + 1 + + C-SPY + 2 + + 29 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 1 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 1 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 1 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 1 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 1 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 1 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewp new file mode 100644 index 000000000..f05b80840 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/BLE_AT_Server.ewp @@ -0,0 +1,1303 @@ + + + 3 + + BLE_AT_Server + + ARM + + 1 + + General + 3 + + 30 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application + + EWARM + + $PROJ_DIR$\startup_stm32wb55xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\ble_at_server.c + + + $PROJ_DIR$\..\Core\Src\ble_at_server_cb.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + + STM32_WPAN + + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\App\custom.c + + + $PROJ_DIR$\..\STM32_WPAN\App\custom_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\p2p_server_app.c + + + + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers + + BSP + + Components + + stm32wb_at + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\Components\stm32wb_at\stm32wb_at.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\Components\stm32wb_at\stm32wb_at_ble.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\Components\stm32wb_at\stm32wb_at_ll.c + + + + + P-NUCLEO-WB55.Nucleo + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c + + + + + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + + + + STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Inc\stm32wbxx_hal_rng.h + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + + + + + Middlewares + + STM32_WPAN + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\p2p_stm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + + + + + Utilities + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/Project.eww b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/Project.eww new file mode 100644 index 000000000..550d84239 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/Project.eww @@ -0,0 +1,7 @@ + + + + $WS_DIR$\BLE_AT_Server.ewp + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/startup_stm32wb55xx_cm4.s new file mode 100644 index 000000000..911641737 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/startup_stm32wb55xx_cm4.s @@ -0,0 +1,515 @@ +;****************************************************************************** +;* File Name : startup_stm32wb55xx_cm4.s +;* Author : MCD Application Team +;* Description : M4 core vector table of the STM32WB55xx devices for the +;* IAR (EWARM) toolchain. +;* +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == _iar_program_start, +;* - Set the vector table entries with the exceptions ISR +;* address. +;* - Branches to main in the C library (which eventually +;* calls main()). +;* After Reset the Cortex-M4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +; +; +; The modules in this file are included in the libraries, and may be replaced +; by any user-defined modules that define the PUBLIC symbol _program_start or +; a user defined start symbol. +; To override the cstartup defined in the library, simply add your modified +; version to the workbench project. +; +; The vector table is normally located at address 0. +; When debugging in RAM, it can be located in RAM, aligned to at least 2^6. +; The name "__vector_table" has special meaning for C-SPY: +; it is where the SP start value is found, and the NVIC vector +; table register (VTOR) is initialized to this address if != 0. +; +; Cortex-M version +; + + MODULE ?cstartup + + ;; Forward declaration of sections. + SECTION CSTACK:DATA:NOROOT(3) + + SECTION .intvec:CODE:NOROOT(2) + + EXTERN __iar_program_start + EXTERN SystemInit + PUBLIC __vector_table + + DATA +__vector_table + DCD sfe(CSTACK) + DCD Reset_Handler ; Reset Handler + + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM Interrupt + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper, TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD USB_HP_IRQHandler ; USB High Priority Interrupt + DCD USB_LP_IRQHandler ; USB Low Priority Interrupt + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts + DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt + DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD SPI2_IRQHandler ; SPI2 Interrupt + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD SAI1_IRQHandler ; SAI Interrupt + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD CRS_IRQHandler ; CRS interrupt + DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD LCD_IRQHandler ; LCD Interrupt + DCD QUADSPI_IRQHandler ; QUADSPI Interrupt + DCD AES1_IRQHandler ; AES1 Interrupt + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt + DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt + DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt + DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt + DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt + DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt + DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; Default interrupt handlers. +;; + THUMB + + PUBWEAK Reset_Handler + SECTION .text:CODE:NOROOT:REORDER(2) +Reset_Handler + LDR R0, =SystemInit + BLX R0 + LDR R0, =__iar_program_start + BX R0 + + PUBWEAK NMI_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +NMI_Handler + B NMI_Handler + + PUBWEAK HardFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +HardFault_Handler + B HardFault_Handler + + PUBWEAK MemManage_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +MemManage_Handler + B MemManage_Handler + + PUBWEAK BusFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +BusFault_Handler + B BusFault_Handler + + PUBWEAK UsageFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +UsageFault_Handler + B UsageFault_Handler + + PUBWEAK SVC_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SVC_Handler + B SVC_Handler + + PUBWEAK DebugMon_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +DebugMon_Handler + B DebugMon_Handler + + PUBWEAK PendSV_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +PendSV_Handler + B PendSV_Handler + + PUBWEAK SysTick_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SysTick_Handler + B SysTick_Handler + + PUBWEAK WWDG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +WWDG_IRQHandler + B WWDG_IRQHandler + + PUBWEAK PVD_PVM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PVD_PVM_IRQHandler + B PVD_PVM_IRQHandler + + PUBWEAK TAMP_STAMP_LSECSS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TAMP_STAMP_LSECSS_IRQHandler + B TAMP_STAMP_LSECSS_IRQHandler + + PUBWEAK RTC_WKUP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_WKUP_IRQHandler + B RTC_WKUP_IRQHandler + + PUBWEAK FLASH_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FLASH_IRQHandler + B FLASH_IRQHandler + + PUBWEAK RCC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RCC_IRQHandler + B RCC_IRQHandler + + PUBWEAK EXTI0_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI0_IRQHandler + B EXTI0_IRQHandler + + PUBWEAK EXTI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI1_IRQHandler + B EXTI1_IRQHandler + + PUBWEAK EXTI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI2_IRQHandler + B EXTI2_IRQHandler + + PUBWEAK EXTI3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI3_IRQHandler + B EXTI3_IRQHandler + + PUBWEAK EXTI4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI4_IRQHandler + B EXTI4_IRQHandler + + PUBWEAK DMA1_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel1_IRQHandler + B DMA1_Channel1_IRQHandler + + PUBWEAK DMA1_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel2_IRQHandler + B DMA1_Channel2_IRQHandler + + PUBWEAK DMA1_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel3_IRQHandler + B DMA1_Channel3_IRQHandler + + PUBWEAK DMA1_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel4_IRQHandler + B DMA1_Channel4_IRQHandler + + PUBWEAK DMA1_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel5_IRQHandler + B DMA1_Channel5_IRQHandler + + PUBWEAK DMA1_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel6_IRQHandler + B DMA1_Channel6_IRQHandler + + PUBWEAK DMA1_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel7_IRQHandler + B DMA1_Channel7_IRQHandler + + PUBWEAK ADC1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +ADC1_IRQHandler + B ADC1_IRQHandler + + PUBWEAK USB_HP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USB_HP_IRQHandler + B USB_HP_IRQHandler + + PUBWEAK USB_LP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USB_LP_IRQHandler + B USB_LP_IRQHandler + + PUBWEAK C2SEV_PWR_C2H_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +C2SEV_PWR_C2H_IRQHandler + B C2SEV_PWR_C2H_IRQHandler + + PUBWEAK COMP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +COMP_IRQHandler + B COMP_IRQHandler + + PUBWEAK EXTI9_5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI9_5_IRQHandler + B EXTI9_5_IRQHandler + + PUBWEAK TIM1_BRK_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_BRK_IRQHandler + B TIM1_BRK_IRQHandler + + PUBWEAK TIM1_UP_TIM16_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_UP_TIM16_IRQHandler + B TIM1_UP_TIM16_IRQHandler + + PUBWEAK TIM1_TRG_COM_TIM17_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_TRG_COM_TIM17_IRQHandler + B TIM1_TRG_COM_TIM17_IRQHandler + + PUBWEAK TIM1_CC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_CC_IRQHandler + B TIM1_CC_IRQHandler + + PUBWEAK TIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM2_IRQHandler + B TIM2_IRQHandler + + PUBWEAK PKA_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PKA_IRQHandler + B PKA_IRQHandler + + PUBWEAK I2C1_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_EV_IRQHandler + B I2C1_EV_IRQHandler + + PUBWEAK I2C1_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_ER_IRQHandler + B I2C1_ER_IRQHandler + + PUBWEAK I2C3_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C3_EV_IRQHandler + B I2C3_EV_IRQHandler + + PUBWEAK I2C3_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C3_ER_IRQHandler + B I2C3_ER_IRQHandler + + PUBWEAK SPI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI1_IRQHandler + B SPI1_IRQHandler + + PUBWEAK SPI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI2_IRQHandler + B SPI2_IRQHandler + + PUBWEAK USART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USART1_IRQHandler + B USART1_IRQHandler + + PUBWEAK LPUART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPUART1_IRQHandler + B LPUART1_IRQHandler + + PUBWEAK SAI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SAI1_IRQHandler + B SAI1_IRQHandler + + PUBWEAK TSC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TSC_IRQHandler + B TSC_IRQHandler + + PUBWEAK EXTI15_10_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI15_10_IRQHandler + B EXTI15_10_IRQHandler + + PUBWEAK RTC_Alarm_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_Alarm_IRQHandler + B RTC_Alarm_IRQHandler + + PUBWEAK CRS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +CRS_IRQHandler + B CRS_IRQHandler + + PUBWEAK PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + B PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + + PUBWEAK IPCC_C1_RX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_RX_IRQHandler + B IPCC_C1_RX_IRQHandler + + PUBWEAK IPCC_C1_TX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_TX_IRQHandler + B IPCC_C1_TX_IRQHandler + + PUBWEAK HSEM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +HSEM_IRQHandler + B HSEM_IRQHandler + + PUBWEAK LPTIM1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM1_IRQHandler + B LPTIM1_IRQHandler + + PUBWEAK LPTIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM2_IRQHandler + B LPTIM2_IRQHandler + + PUBWEAK LCD_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LCD_IRQHandler + B LCD_IRQHandler + + PUBWEAK QUADSPI_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +QUADSPI_IRQHandler + B QUADSPI_IRQHandler + + PUBWEAK AES1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES1_IRQHandler + B AES1_IRQHandler + + PUBWEAK AES2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES2_IRQHandler + B AES2_IRQHandler + + PUBWEAK RNG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RNG_IRQHandler + B RNG_IRQHandler + + PUBWEAK FPU_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FPU_IRQHandler + B FPU_IRQHandler + + PUBWEAK DMA2_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel1_IRQHandler + B DMA2_Channel1_IRQHandler + + PUBWEAK DMA2_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel2_IRQHandler + B DMA2_Channel2_IRQHandler + + PUBWEAK DMA2_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel3_IRQHandler + B DMA2_Channel3_IRQHandler + + PUBWEAK DMA2_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel4_IRQHandler + B DMA2_Channel4_IRQHandler + + PUBWEAK DMA2_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel5_IRQHandler + B DMA2_Channel5_IRQHandler + + PUBWEAK DMA2_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel6_IRQHandler + B DMA2_Channel6_IRQHandler + + PUBWEAK DMA2_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel7_IRQHandler + B DMA2_Channel7_IRQHandler + + PUBWEAK DMAMUX1_OVR_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMAMUX1_OVR_IRQHandler + B DMAMUX1_OVR_IRQHandler + + END + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/stm32wb55xx_flash_cm4.icf new file mode 100644 index 000000000..f13848f65 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/EWARM/stm32wb55xx_flash_cm4.icf @@ -0,0 +1,42 @@ +/*###ICF### Section handled by ICF editor, don't touch! ****/ +/*-Editor annotation file-*/ +/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ +/*-Specials-*/ +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +/*-Memory Regions-*/ +/***** FLASH Part dedicated to M4 *****/ +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x400; +/**** End of ICF editor section. ###ICF###*/ + +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; + +/* MB_MEM1 and MB_MEM2 are sections reserved to mailbox communication. It is placed in the shared memory */ +initialize by copy { readwrite }; +do not initialize { section .noinit, + section MAPPING_TABLE, + section MB_MEM1 }; + +place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; + +place in ROM_region { readonly }; +place in RAM_region { block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvoptx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvoptx new file mode 100644 index 000000000..3f00364c0 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvoptx @@ -0,0 +1,1069 @@ + + + + 1.0 + +
                                                                  ### uVision Project, (C) Keil Software
                                                                  + + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc; *.md + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + BLE_AT_Server + 0x4 + ARM-ADS + + 12000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 18 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 6 + + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll + + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4 -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM)) + + + 0 + ST-LINKIII-KEIL_SWO + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4 -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM)) + + + + + 0 + + + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + + + Application/MDK-ARM + 0 + 0 + 0 + 0 + + 1 + 1 + 2 + 0 + 0 + 0 + startup_stm32wb55xx_cm4.s + startup_stm32wb55xx_cm4.s + 0 + 0 + + + + + Application/User/Core + 0 + 0 + 0 + 0 + + 2 + 2 + 1 + 0 + 0 + 0 + ../Core/Src/app_debug.c + app_debug.c + 0 + 0 + + + 2 + 3 + 1 + 0 + 0 + 0 + ../Core/Src/app_entry.c + app_entry.c + 0 + 0 + + + 2 + 4 + 1 + 0 + 0 + 0 + ../Core/Src/ble_at_server.c + ble_at_server.c + 0 + 0 + + + 2 + 5 + 1 + 0 + 0 + 0 + ../Core/Src/ble_at_server_cb.c + ble_at_server_cb.c + 0 + 0 + + + 2 + 6 + 1 + 0 + 0 + 0 + ../Core/Src/hw_timerserver.c + hw_timerserver.c + 0 + 0 + + + 2 + 7 + 1 + 0 + 0 + 0 + ../Core/Src/hw_uart.c + hw_uart.c + 0 + 0 + + + 2 + 8 + 1 + 0 + 0 + 0 + ../Core/Src/main.c + main.c + 0 + 0 + + + 2 + 9 + 1 + 0 + 0 + 0 + ../Core/Src/stm32_lpm_if.c + stm32_lpm_if.c + 0 + 0 + + + 2 + 10 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_hal_msp.c + stm32wbxx_hal_msp.c + 0 + 0 + + + 2 + 11 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_it.c + stm32wbxx_it.c + 0 + 0 + + + + + Application/User/STM32_WPAN/App + 0 + 0 + 0 + 0 + + 3 + 12 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/app_ble.c + app_ble.c + 0 + 0 + + + 3 + 13 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/custom.c + custom.c + 0 + 0 + + + 3 + 14 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/custom_app.c + custom_app.c + 0 + 0 + + + 3 + 15 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/dis_app.c + dis_app.c + 0 + 0 + + + 3 + 16 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/hrs_app.c + hrs_app.c + 0 + 0 + + + 3 + 17 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/p2p_server_app.c + p2p_server_app.c + 0 + 0 + + + + + Application/User/STM32_WPAN/Target + 0 + 0 + 0 + 0 + + 4 + 18 + 1 + 0 + 0 + 0 + ../STM32_WPAN/Target/hw_ipcc.c + hw_ipcc.c + 0 + 0 + + + + + Doc + 0 + 0 + 0 + 0 + + 5 + 19 + 5 + 0 + 0 + 0 + ../readme.txt + readme.txt + 0 + 0 + + + + + Drivers/BSP/Components/stm32wb_at + 0 + 0 + 0 + 0 + + 6 + 20 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/BSP/Components/stm32wb_at/stm32wb_at.c + stm32wb_at.c + 0 + 0 + + + 6 + 21 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c + stm32wb_at_ble.c + 0 + 0 + + + 6 + 22 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c + stm32wb_at_ll.c + 0 + 0 + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + 0 + 0 + 0 + 0 + + 7 + 23 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + stm32wbxx_nucleo.c + 0 + 0 + + + + + Drivers/CMSIS + 0 + 0 + 0 + 0 + + 8 + 24 + 1 + 0 + 0 + 0 + ../Core/Src/system_stm32wbxx.c + system_stm32wbxx.c + 0 + 0 + + + + + Drivers/STM32WBxx_HAL_Driver + 0 + 0 + 0 + 0 + + 9 + 25 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + stm32wbxx_hal.c + 0 + 0 + + + 9 + 26 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + stm32wbxx_hal_cortex.c + 0 + 0 + + + 9 + 27 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + stm32wbxx_hal_dma.c + 0 + 0 + + + 9 + 28 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + stm32wbxx_hal_dma_ex.c + 0 + 0 + + + 9 + 29 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + stm32wbxx_hal_exti.c + 0 + 0 + + + 9 + 30 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + stm32wbxx_hal_flash.c + 0 + 0 + + + 9 + 31 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + stm32wbxx_hal_flash_ex.c + 0 + 0 + + + 9 + 32 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + stm32wbxx_hal_gpio.c + 0 + 0 + + + 9 + 33 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + stm32wbxx_hal_hsem.c + 0 + 0 + + + 9 + 34 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + stm32wbxx_hal_ipcc.c + 0 + 0 + + + 9 + 35 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + stm32wbxx_hal_pwr.c + 0 + 0 + + + 9 + 36 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + stm32wbxx_hal_pwr_ex.c + 0 + 0 + + + 9 + 37 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + stm32wbxx_hal_rcc.c + 0 + 0 + + + 9 + 38 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + stm32wbxx_hal_rcc_ex.c + 0 + 0 + + + 9 + 39 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + stm32wbxx_hal_rng.c + 0 + 0 + + + 9 + 40 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + stm32wbxx_hal_rtc.c + 0 + 0 + + + 9 + 41 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + stm32wbxx_hal_rtc_ex.c + 0 + 0 + + + 9 + 42 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + stm32wbxx_hal_tim.c + 0 + 0 + + + 9 + 43 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + stm32wbxx_hal_tim_ex.c + 0 + 0 + + + 9 + 44 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + stm32wbxx_hal_uart.c + 0 + 0 + + + 9 + 45 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + stm32wbxx_hal_uart_ex.c + 0 + 0 + + + + + Middlewares/STM32_WPAN + 0 + 0 + 0 + 0 + + 10 + 46 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + ble_gap_aci.c + 0 + 0 + + + 10 + 47 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + ble_gatt_aci.c + 0 + 0 + + + 10 + 48 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + ble_hal_aci.c + 0 + 0 + + + 10 + 49 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + ble_hci_le.c + 0 + 0 + + + 10 + 50 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + ble_l2cap_aci.c + 0 + 0 + + + 10 + 51 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + dbg_trace.c + 0 + 0 + + + 10 + 52 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c + dis.c + 0 + 0 + + + 10 + 53 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + hci_tl.c + 0 + 0 + + + 10 + 54 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + hci_tl_if.c + 0 + 0 + + + 10 + 55 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c + hrs.c + 0 + 0 + + + 10 + 56 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + osal.c + 0 + 0 + + + 10 + 57 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + otp.c + 0 + 0 + + + 10 + 58 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c + p2p_stm.c + 0 + 0 + + + 10 + 59 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + shci.c + 0 + 0 + + + 10 + 60 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + shci_tl.c + 0 + 0 + + + 10 + 61 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + shci_tl_if.c + 0 + 0 + + + 10 + 62 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + stm_list.c + 0 + 0 + + + 10 + 63 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + stm_queue.c + 0 + 0 + + + 10 + 64 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + svc_ctl.c + 0 + 0 + + + 10 + 65 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + tl_mbox.c + 0 + 0 + + + + + Utilities + 0 + 0 + 0 + 0 + + 11 + 66 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + stm32_lpm.c + 0 + 0 + + + 11 + 67 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/sequencer/stm32_seq.c + stm32_seq.c + 0 + 0 + + + +                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvprojx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvprojx new file mode 100644 index 000000000..337f86924 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/BLE_AT_Server.uvprojx @@ -0,0 +1,780 @@ + + + + 2.1 + +
                                                                  ### uVision Project, (C) Keil Software
                                                                  + + + + BLE_AT_Server + 0x4 + ARM-ADS + 5060960::V5.06 update 7 (build 960)::.\ARMCC + 0 + + + STM32WB55RGVx + STMicroelectronics + Keil.STM32WBxx_DFP.1.2.0 + http://www.keil.com/pack/ + IRAM(0x20000000,0x00040000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE + + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4 -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM)) + 0 + $$Device:STM32WB55RGVx$Drivers\CMSIS\Device\ST\STM32WBxx\Include\stm32wbxx.h + + + + + + + + + + $$Device:STM32WB55RGVx$CMSIS\SVD\STM32WBxx_CM4.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + BLE_AT_Server\Exe\ + BLE_AT_Server + 1 + 0 + 1 + 1 + 1 + + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + SARMCM3.DLL + -REMAP -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 1 + 1 + 4096 + + 1 + BIN\UL2CM3.DLL + "" () + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 8 + 1 + 1 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x40000 + + + 1 + 0x8000000 + 0x100000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8000000 + 0x80000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000008 + 0x2fff8 + + + 0 + 0x0 + 0x0 + + + + + + 1 + 4 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 1 + 0 + 0 + + --diag_suppress 1296 + USE_HAL_DRIVER,STM32WB55xx,USE_STM32WBXX_NUCLEO + + ../Core/Inc;../STM32_WPAN/App;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci;../../../../../../Middlewares/ST/STM32_WPAN/utilities;../../../../../../Middlewares/ST/STM32_WPAN/ble/core;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template;../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Inc;../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src;../../../../../../Drivers/CMSIS/Device/ST/STM32WBxx/Include;../../../../../../Utilities/sequencer;../../../../../../Middlewares/ST/STM32_WPAN/ble;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo;../../../../../../Drivers/BSP/Components/stm32wb_at + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + + + + + + + + 0 + 0 + 0 + 0 + 1 + 0 + + + + stm32wb55xx_flash_cm4.sct + + + --diag_suppress=L6329 +--diag_suppress L6314W +--diag_suppress 1296 +--keep *.o(TAG_OTA_START) +--keep *.o(TAG_OTA_END) + + + + + + + + Application/MDK-ARM + + + startup_stm32wb55xx_cm4.s + 2 + startup_stm32wb55xx_cm4.s + + + + + Application/User/Core + + + app_debug.c + 1 + ../Core/Src/app_debug.c + + + app_entry.c + 1 + ../Core/Src/app_entry.c + + + ble_at_server.c + 1 + ../Core/Src/ble_at_server.c + + + ble_at_server_cb.c + 1 + ../Core/Src/ble_at_server_cb.c + + + hw_timerserver.c + 1 + ../Core/Src/hw_timerserver.c + + + hw_uart.c + 1 + ../Core/Src/hw_uart.c + + + main.c + 1 + ../Core/Src/main.c + + + stm32_lpm_if.c + 1 + ../Core/Src/stm32_lpm_if.c + + + stm32wbxx_hal_msp.c + 1 + ../Core/Src/stm32wbxx_hal_msp.c + + + stm32wbxx_it.c + 1 + ../Core/Src/stm32wbxx_it.c + + + + + Application/User/STM32_WPAN/App + + + app_ble.c + 1 + ../STM32_WPAN/App/app_ble.c + + + custom.c + 1 + ../STM32_WPAN/App/custom.c + + + custom_app.c + 1 + ../STM32_WPAN/App/custom_app.c + + + dis_app.c + 1 + ../STM32_WPAN/App/dis_app.c + + + hrs_app.c + 1 + ../STM32_WPAN/App/hrs_app.c + + + p2p_server_app.c + 1 + ../STM32_WPAN/App/p2p_server_app.c + + + + + Application/User/STM32_WPAN/Target + + + hw_ipcc.c + 1 + ../STM32_WPAN/Target/hw_ipcc.c + + + + + Doc + + + readme.txt + 5 + ../readme.txt + + + + + Drivers/BSP/Components/stm32wb_at + + + stm32wb_at.c + 1 + ../../../../../../Drivers/BSP/Components/stm32wb_at/stm32wb_at.c + + + stm32wb_at_ble.c + 1 + ../../../../../../Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c + + + stm32wb_at_ll.c + 1 + ../../../../../../Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + + + stm32wbxx_nucleo.c + 1 + ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + + + + + Drivers/CMSIS + + + system_stm32wbxx.c + 1 + ../Core/Src/system_stm32wbxx.c + + + + + Drivers/STM32WBxx_HAL_Driver + + + stm32wbxx_hal.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + stm32wbxx_hal_cortex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + stm32wbxx_hal_dma.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + stm32wbxx_hal_dma_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + stm32wbxx_hal_exti.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + stm32wbxx_hal_flash.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + stm32wbxx_hal_flash_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + stm32wbxx_hal_gpio.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + stm32wbxx_hal_hsem.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + stm32wbxx_hal_ipcc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + stm32wbxx_hal_pwr.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + stm32wbxx_hal_pwr_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + stm32wbxx_hal_rcc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + stm32wbxx_hal_rcc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + stm32wbxx_hal_rng.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + + + stm32wbxx_hal_rtc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + stm32wbxx_hal_rtc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + stm32wbxx_hal_tim.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + stm32wbxx_hal_tim_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + stm32wbxx_hal_uart.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + stm32wbxx_hal_uart_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + + + Middlewares/STM32_WPAN + + + ble_gap_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + ble_gatt_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + ble_hal_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + ble_hci_le.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + ble_l2cap_aci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + dbg_trace.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + dis.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c + + + hci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + hci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + hrs.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c + + + osal.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + otp.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + p2p_stm.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c + + + shci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + shci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + shci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + stm_list.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + stm_queue.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + svc_ctl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + tl_mbox.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + + + Utilities + + + stm32_lpm.c + 1 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + stm32_seq.c + 1 + ../../../../../../Utilities/sequencer/stm32_seq.c + + + + + + + + + + + + + +                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/startup_stm32wb55xx_cm4.s new file mode 100644 index 000000000..024ff03d3 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -0,0 +1,367 @@ +;****************************************************************************** +;* File Name : startup_stm32wb55xx_cm4.s +;* Author : MCD Application Team +;* Description : STM32WB55xx devices vector table for MDK-ARM toolchain. +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == Reset_Handler +;* - Set the vector table entries with the exceptions ISR address +;* - Branches to __main in the C library (which eventually +;* calls main()). +;* After Reset the CortexM4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;* <<< Use Configuration Wizard in Context Menu >>> +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019-2021 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** + +; Amount of memory (in bytes) allocated for Stack +; Tailor this value to your application needs +; Stack Configuration +; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Stack_Size EQU 0x400 + + AREA STACK, NOINIT, READWRITE, ALIGN=3 +Stack_Mem SPACE Stack_Size +__initial_sp + + +; Heap Configuration +; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Heap_Size EQU 0x200 + + AREA HEAP, NOINIT, READWRITE, ALIGN=3 +__heap_base +Heap_Mem SPACE Heap_Size +__heap_limit + + PRESERVE8 + THUMB + + +; Vector Table Mapped to Address 0 at Reset + AREA RESET, DATA, READONLY + EXPORT __Vectors + EXPORT __Vectors_End + EXPORT __Vectors_Size + +__Vectors DCD __initial_sp ; Top of Stack + DCD Reset_Handler ; Reset Handler + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM detector + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper and TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD USB_HP_IRQHandler ; USB High Priority Interrupt + DCD USB_LP_IRQHandler ; USB Low Priority Interrupt + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts + DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt + DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD SPI2_IRQHandler ; SPI2 Interrupt + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD SAI1_IRQHandler ; SAI Interrupt + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD CRS_IRQHandler ; CRS interrupt + DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD LCD_IRQHandler ; LCD Interrupt + DCD QUADSPI_IRQHandler ; QUADSPI Interrupt + DCD AES1_IRQHandler ; AES1 Interrupt + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt + DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt + DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt + DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt + DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt + DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt + DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +__Vectors_End + +__Vectors_Size EQU __Vectors_End - __Vectors + + AREA |.text|, CODE, READONLY + +; Reset handler +Reset_Handler PROC + EXPORT Reset_Handler [WEAK] + IMPORT SystemInit + IMPORT __main + + LDR R0, =SystemInit + BLX R0 + LDR R0, =__main + BX R0 + ENDP + +; Dummy Exception Handlers (infinite loops which can be modified) + +NMI_Handler PROC + EXPORT NMI_Handler [WEAK] + B . + ENDP +HardFault_Handler\ + PROC + EXPORT HardFault_Handler [WEAK] + B . + ENDP +MemManage_Handler\ + PROC + EXPORT MemManage_Handler [WEAK] + B . + ENDP +BusFault_Handler\ + PROC + EXPORT BusFault_Handler [WEAK] + B . + ENDP +UsageFault_Handler\ + PROC + EXPORT UsageFault_Handler [WEAK] + B . + ENDP +SVC_Handler PROC + EXPORT SVC_Handler [WEAK] + B . + ENDP +DebugMon_Handler\ + PROC + EXPORT DebugMon_Handler [WEAK] + B . + ENDP +PendSV_Handler PROC + EXPORT PendSV_Handler [WEAK] + B . + ENDP +SysTick_Handler PROC + EXPORT SysTick_Handler [WEAK] + B . + ENDP + +Default_Handler PROC + + EXPORT WWDG_IRQHandler [WEAK] + EXPORT PVD_PVM_IRQHandler [WEAK] + EXPORT TAMP_STAMP_LSECSS_IRQHandler [WEAK] + EXPORT RTC_WKUP_IRQHandler [WEAK] + EXPORT FLASH_IRQHandler [WEAK] + EXPORT RCC_IRQHandler [WEAK] + EXPORT EXTI0_IRQHandler [WEAK] + EXPORT EXTI1_IRQHandler [WEAK] + EXPORT EXTI2_IRQHandler [WEAK] + EXPORT EXTI3_IRQHandler [WEAK] + EXPORT EXTI4_IRQHandler [WEAK] + EXPORT DMA1_Channel1_IRQHandler [WEAK] + EXPORT DMA1_Channel2_IRQHandler [WEAK] + EXPORT DMA1_Channel3_IRQHandler [WEAK] + EXPORT DMA1_Channel4_IRQHandler [WEAK] + EXPORT DMA1_Channel5_IRQHandler [WEAK] + EXPORT DMA1_Channel6_IRQHandler [WEAK] + EXPORT DMA1_Channel7_IRQHandler [WEAK] + EXPORT ADC1_IRQHandler [WEAK] + EXPORT USB_HP_IRQHandler [WEAK] + EXPORT USB_LP_IRQHandler [WEAK] + EXPORT C2SEV_PWR_C2H_IRQHandler [WEAK] + EXPORT COMP_IRQHandler [WEAK] + EXPORT EXTI9_5_IRQHandler [WEAK] + EXPORT TIM1_BRK_IRQHandler [WEAK] + EXPORT TIM1_UP_TIM16_IRQHandler [WEAK] + EXPORT TIM1_TRG_COM_TIM17_IRQHandler [WEAK] + EXPORT TIM1_CC_IRQHandler [WEAK] + EXPORT TIM2_IRQHandler [WEAK] + EXPORT PKA_IRQHandler [WEAK] + EXPORT I2C1_EV_IRQHandler [WEAK] + EXPORT I2C1_ER_IRQHandler [WEAK] + EXPORT I2C3_EV_IRQHandler [WEAK] + EXPORT I2C3_ER_IRQHandler [WEAK] + EXPORT SPI1_IRQHandler [WEAK] + EXPORT SPI2_IRQHandler [WEAK] + EXPORT USART1_IRQHandler [WEAK] + EXPORT LPUART1_IRQHandler [WEAK] + EXPORT SAI1_IRQHandler [WEAK] + EXPORT TSC_IRQHandler [WEAK] + EXPORT EXTI15_10_IRQHandler [WEAK] + EXPORT RTC_Alarm_IRQHandler [WEAK] + EXPORT CRS_IRQHandler [WEAK] + EXPORT PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler [WEAK] + EXPORT IPCC_C1_RX_IRQHandler [WEAK] + EXPORT IPCC_C1_TX_IRQHandler [WEAK] + EXPORT HSEM_IRQHandler [WEAK] + EXPORT LPTIM1_IRQHandler [WEAK] + EXPORT LPTIM2_IRQHandler [WEAK] + EXPORT LCD_IRQHandler [WEAK] + EXPORT QUADSPI_IRQHandler [WEAK] + EXPORT AES1_IRQHandler [WEAK] + EXPORT AES2_IRQHandler [WEAK] + EXPORT RNG_IRQHandler [WEAK] + EXPORT FPU_IRQHandler [WEAK] + EXPORT DMA2_Channel1_IRQHandler [WEAK] + EXPORT DMA2_Channel2_IRQHandler [WEAK] + EXPORT DMA2_Channel3_IRQHandler [WEAK] + EXPORT DMA2_Channel4_IRQHandler [WEAK] + EXPORT DMA2_Channel5_IRQHandler [WEAK] + EXPORT DMA2_Channel6_IRQHandler [WEAK] + EXPORT DMA2_Channel7_IRQHandler [WEAK] + EXPORT DMAMUX1_OVR_IRQHandler [WEAK] + +WWDG_IRQHandler +PVD_PVM_IRQHandler +TAMP_STAMP_LSECSS_IRQHandler +RTC_WKUP_IRQHandler +FLASH_IRQHandler +RCC_IRQHandler +EXTI0_IRQHandler +EXTI1_IRQHandler +EXTI2_IRQHandler +EXTI3_IRQHandler +EXTI4_IRQHandler +DMA1_Channel1_IRQHandler +DMA1_Channel2_IRQHandler +DMA1_Channel3_IRQHandler +DMA1_Channel4_IRQHandler +DMA1_Channel5_IRQHandler +DMA1_Channel6_IRQHandler +DMA1_Channel7_IRQHandler +ADC1_IRQHandler +USB_HP_IRQHandler +USB_LP_IRQHandler +C2SEV_PWR_C2H_IRQHandler +COMP_IRQHandler +EXTI9_5_IRQHandler +TIM1_BRK_IRQHandler +TIM1_UP_TIM16_IRQHandler +TIM1_TRG_COM_TIM17_IRQHandler +TIM1_CC_IRQHandler +TIM2_IRQHandler +PKA_IRQHandler +I2C1_EV_IRQHandler +I2C1_ER_IRQHandler +I2C3_EV_IRQHandler +I2C3_ER_IRQHandler +SPI1_IRQHandler +SPI2_IRQHandler +USART1_IRQHandler +LPUART1_IRQHandler +SAI1_IRQHandler +TSC_IRQHandler +EXTI15_10_IRQHandler +RTC_Alarm_IRQHandler +CRS_IRQHandler +PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler +IPCC_C1_RX_IRQHandler +IPCC_C1_TX_IRQHandler +HSEM_IRQHandler +LPTIM1_IRQHandler +LPTIM2_IRQHandler +LCD_IRQHandler +QUADSPI_IRQHandler +AES1_IRQHandler +AES2_IRQHandler +RNG_IRQHandler +FPU_IRQHandler +DMA2_Channel1_IRQHandler +DMA2_Channel2_IRQHandler +DMA2_Channel3_IRQHandler +DMA2_Channel4_IRQHandler +DMA2_Channel5_IRQHandler +DMA2_Channel6_IRQHandler +DMA2_Channel7_IRQHandler +DMAMUX1_OVR_IRQHandler + + B . + + ENDP + + ALIGN + +;******************************************************************************* +; User Stack and Heap initialization +;******************************************************************************* + IF :DEF:__MICROLIB + + EXPORT __initial_sp + EXPORT __heap_base + EXPORT __heap_limit + + ELSE + + IMPORT __use_two_region_memory + EXPORT __user_initial_stackheap + +__user_initial_stackheap + + LDR R0, = Heap_Mem + LDR R1, =(Stack_Mem + Stack_Size) + LDR R2, = (Heap_Mem + Heap_Size) + LDR R3, = Stack_Mem + BX LR + + ALIGN + + ENDIF + + END + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/stm32wb55xx_flash_cm4.sct new file mode 100644 index 000000000..938d9f592 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -0,0 +1,26 @@ +; ************************************************************* +; *** Scatter-Loading Description File generated by uVision *** +; ************************************************************* + +LR_IROM1 0x08000000 0x00080000 { ; load region size_region + ER_IROM1 0x08000000 0x00080000 { ; load address = execution address + *.o (RESET, +First) + *(InRoot$$Sections) + .ANY (+RO) + } + RW_IRAM1 0x20000008 0x2FFF8 { ; RW data + .ANY (+RW +ZI) + } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + + } + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.cproject b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.cproject new file mode 100644 index 000000000..14bcd2087 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.cproject @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.project b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.project new file mode 100644 index 000000000..d9707dad4 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/.project @@ -0,0 +1,369 @@ + + + BLE_AT_Server + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.st.stm32cube.ide.mcu.MCUProjectNature + org.eclipse.cdt.core.cnature + com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature + com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature + com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature + com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature + com.st.stm32cube.ide.mcu.MCURootProjectNature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + Doc/readme.txt + 1 + PARENT-1-PROJECT_LOC/readme.txt + + + Utilities/stm32_lpm.c + 1 + PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c + + + Utilities/stm32_seq.c + 1 + PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c + + + Drivers/CMSIS/system_stm32wbxx.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/system_stm32wbxx.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_cortex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_exti.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_gpio.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_hsem.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_ipcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rng.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rng.h + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_rng.h + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + Middlewares/STM32_WPAN/ble_gap_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + Middlewares/STM32_WPAN/ble_gatt_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + Middlewares/STM32_WPAN/ble_hal_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + Middlewares/STM32_WPAN/ble_hci_le.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + Middlewares/STM32_WPAN/ble_l2cap_aci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + Middlewares/STM32_WPAN/dbg_trace.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + Middlewares/STM32_WPAN/dis.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/svc/Src/dis.c + + + Middlewares/STM32_WPAN/hci_tl.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + Middlewares/STM32_WPAN/hci_tl_if.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + Middlewares/STM32_WPAN/hrs.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/svc/Src/hrs.c + + + Middlewares/STM32_WPAN/osal.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + Middlewares/STM32_WPAN/otp.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/otp.c + + + Middlewares/STM32_WPAN/p2p_stm.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c + + + Middlewares/STM32_WPAN/shci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + Middlewares/STM32_WPAN/shci_tl.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + Middlewares/STM32_WPAN/shci_tl_if.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + Middlewares/STM32_WPAN/stm_list.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + Middlewares/STM32_WPAN/stm_queue.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + Middlewares/STM32_WPAN/svc_ctl.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + Middlewares/STM32_WPAN/tl_mbox.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + Application/User/Core/app_debug.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/app_debug.c + + + Application/User/Core/app_entry.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/app_entry.c + + + Application/User/Core/ble_at_server.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/ble_at_server.c + + + Application/User/Core/ble_at_server_cb.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/ble_at_server_cb.c + + + Application/User/Core/hw_timerserver.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/hw_timerserver.c + + + Application/User/Core/hw_uart.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/hw_uart.c + + + Application/User/Core/main.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/main.c + + + Application/User/Core/stm32_lpm_if.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c + + + Application/User/Core/stm32wbxx_hal_msp.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32wbxx_hal_msp.c + + + Application/User/Core/stm32wbxx_it.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32wbxx_it.c + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + + + Application/User/STM32_WPAN/App/app_ble.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/app_ble.c + + + Application/User/STM32_WPAN/App/custom.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/custom.c + + + Application/User/STM32_WPAN/App/custom_app.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/custom_app.c + + + Application/User/STM32_WPAN/App/dis_app.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/dis_app.c + + + Application/User/STM32_WPAN/App/hrs_app.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/hrs_app.c + + + Application/User/STM32_WPAN/App/p2p_server_app.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/p2p_server_app.c + + + Application/User/STM32_WPAN/Target/hw_ipcc.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/Target/hw_ipcc.c + + + Drivers/BSP/Components/stm32wb_at/stm32wb_at.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/Components/stm32wb_at/stm32wb_at.c + + + Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ble.c + + + Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/Components/stm32wb_at/stm32wb_at_ll.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/syscalls.c new file mode 100644 index 000000000..53563319a --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/syscalls.c @@ -0,0 +1,155 @@ +/** + ****************************************************************************** + * @file syscalls.c + * @author Auto-generated by STM32CubeIDE + * @brief STM32CubeIDE Minimal System calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include +#include +#include +#include +#include +#include +#include + + +/* Variables */ +extern int __io_putchar(int ch) __attribute__((weak)); +extern int __io_getchar(void) __attribute__((weak)); + + +char *__env[1] = { 0 }; +char **environ = __env; + + +/* Functions */ +void initialise_monitor_handles() +{ +} + +int _getpid(void) +{ + return 1; +} + +int _kill(int pid, int sig) +{ + errno = EINVAL; + return -1; +} + +void _exit (int status) +{ + _kill(status, -1); + while (1) {} /* Make sure we hang here */ +} + +__attribute__((weak)) int _read(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + *ptr++ = __io_getchar(); + } + +return len; +} + +__attribute__((weak)) int _write(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + __io_putchar(*ptr++); + } + return len; +} + +int _close(int file) +{ + return -1; +} + + +int _fstat(int file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _isatty(int file) +{ + return 1; +} + +int _lseek(int file, int ptr, int dir) +{ + return 0; +} + +int _open(char *path, int flags, ...) +{ + /* Pretend like we always fail */ + return -1; +} + +int _wait(int *status) +{ + errno = ECHILD; + return -1; +} + +int _unlink(char *name) +{ + errno = ENOENT; + return -1; +} + +int _times(struct tms *buf) +{ + return -1; +} + +int _stat(char *file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _link(char *old, char *new) +{ + errno = EMLINK; + return -1; +} + +int _fork(void) +{ + errno = EAGAIN; + return -1; +} + +int _execve(char *name, char **argv, char **env) +{ + errno = ENOMEM; + return -1; +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/sysmem.c new file mode 100644 index 000000000..c6a21d1a5 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Core/sysmem.c @@ -0,0 +1,79 @@ +/** + ****************************************************************************** + * @file sysmem.c + * @author Generated by STM32CubeIDE + * @brief STM32CubeIDE System Memory calls file + * + * For more information about which C functions + * need which of these lowlevel functions + * please consult the newlib libc manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include + +/** + * Pointer to the current high watermark of the heap usage + */ +static uint8_t *__sbrk_heap_end = NULL; + +/** + * @brief _sbrk() allocates memory to the newlib heap and is used by malloc + * and others from the C library + * + * @verbatim + * ############################################################################ + * # .data # .bss # newlib heap # MSP stack # + * # # # # Reserved by _Min_Stack_Size # + * ############################################################################ + * ^-- RAM start ^-- _end _estack, RAM end --^ + * @endverbatim + * + * This implementation starts allocating at the '_end' linker symbol + * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack + * The implementation considers '_estack' linker symbol to be RAM end + * NOTE: If the MSP stack, at any point during execution, grows larger than the + * reserved size, please increase the '_Min_Stack_Size'. + * + * @param incr Memory size + * @return Pointer to allocated memory + */ +void *_sbrk(ptrdiff_t incr) +{ + extern uint8_t _end; /* Symbol defined in the linker script */ + extern uint8_t _estack; /* Symbol defined in the linker script */ + extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */ + const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size; + const uint8_t *max_heap = (uint8_t *)stack_limit; + uint8_t *prev_heap_end; + + /* Initialize heap end at first call */ + if (NULL == __sbrk_heap_end) + { + __sbrk_heap_end = &_end; + } + + /* Protect heap from growing into the reserved MSP stack */ + if (__sbrk_heap_end + incr > max_heap) + { + errno = ENOMEM; + return (void *)-1; + } + + prev_heap_end = __sbrk_heap_end; + __sbrk_heap_end += incr; + + return (void *)prev_heap_end; +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s new file mode 100644 index 000000000..77c2e0551 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -0,0 +1,443 @@ +/** + ****************************************************************************** + * @file startup_stm32wb55xx_cm4.s + * @author MCD Application Team + * @brief STM32WB55xx devices vector table GCC toolchain. + * This module performs: + * - Set the initial SP + * - Set the initial PC == Reset_Handler, + * - Set the vector table entries with the exceptions ISR address + * - Branches to main in the C library (which eventually + * calls main()). + * After Reset the Cortex-M4 processor is in Thread mode, + * priority is Privileged, and the Stack is set to Main. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + + .syntax unified + .cpu cortex-m4 + .fpu softvfp + .thumb + +.global g_pfnVectors +.global Default_Handler + +/* start address for the initialization values of the .data section. +defined in linker script */ +.word _sidata +/* start address for the .data section. defined in linker script */ +.word _sdata +/* end address for the .data section. defined in linker script */ +.word _edata +/* start address for the .bss section. defined in linker script */ +.word _sbss +/* end address for the .bss section. defined in linker script */ +.word _ebss +/* start address for the .MB_MEM2 section. defined in linker script */ +.word _sMB_MEM2 +/* end address for the .MB_MEM2 section. defined in linker script */ +.word _eMB_MEM2 + +/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */ +.macro INIT_BSS start, end + ldr r0, =\start + ldr r1, =\end + movs r3, #0 + bl LoopFillZerobss +.endm + +/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */ +.macro INIT_DATA start, end, src + ldr r0, =\start + ldr r1, =\end + ldr r2, =\src + movs r3, #0 + bl LoopCopyDataInit +.endm + +.section .text.data_initializers +CopyDataInit: + ldr r4, [r2, r3] + str r4, [r0, r3] + adds r3, r3, #4 + +LoopCopyDataInit: + adds r4, r0, r3 + cmp r4, r1 + bcc CopyDataInit + bx lr + +FillZerobss: + str r3, [r0] + adds r0, r0, #4 + +LoopFillZerobss: + cmp r0, r1 + bcc FillZerobss + bx lr + + .section .text.Reset_Handler + .weak Reset_Handler + .type Reset_Handler, %function +Reset_Handler: + ldr r0, =_estack + mov sp, r0 /* set stack pointer */ +/* Call the clock system initialization function.*/ + bl SystemInit + +/* Copy the data segment initializers from flash to SRAM */ + INIT_DATA _sdata, _edata, _sidata + +/* Zero fill the bss segments. */ + INIT_BSS _sbss, _ebss + INIT_BSS _sMB_MEM2, _eMB_MEM2 + +/* Call static constructors */ + bl __libc_init_array +/* Call the application s entry point.*/ + bl main + +LoopForever: + b LoopForever + +.size Reset_Handler, .-Reset_Handler + +/** + * @brief This is the code that gets called when the processor receives an + * unexpected interrupt. This simply enters an infinite loop, preserving + * the system state for examination by a debugger. + * + * @param None + * @retval None +*/ + .section .text.Default_Handler,"ax",%progbits +Default_Handler: +Infinite_Loop: + b Infinite_Loop + .size Default_Handler, .-Default_Handler +/****************************************************************************** +* +* The minimal vector table for a Cortex-M4. Note that the proper constructs +* must be placed on this to ensure that it ends up at physical address +* 0x0000.0000. +* +******************************************************************************/ + .section .isr_vector,"a",%progbits + .type g_pfnVectors, %object + .size g_pfnVectors, .-g_pfnVectors + + +g_pfnVectors: + .word _estack + .word Reset_Handler + .word NMI_Handler + .word HardFault_Handler + .word MemManage_Handler + .word BusFault_Handler + .word UsageFault_Handler + .word 0 + .word 0 + .word 0 + .word 0 + .word SVC_Handler + .word DebugMon_Handler + .word 0 + .word PendSV_Handler + .word SysTick_Handler + .word WWDG_IRQHandler + .word PVD_PVM_IRQHandler + .word TAMP_STAMP_LSECSS_IRQHandler + .word RTC_WKUP_IRQHandler + .word FLASH_IRQHandler + .word RCC_IRQHandler + .word EXTI0_IRQHandler + .word EXTI1_IRQHandler + .word EXTI2_IRQHandler + .word EXTI3_IRQHandler + .word EXTI4_IRQHandler + .word DMA1_Channel1_IRQHandler + .word DMA1_Channel2_IRQHandler + .word DMA1_Channel3_IRQHandler + .word DMA1_Channel4_IRQHandler + .word DMA1_Channel5_IRQHandler + .word DMA1_Channel6_IRQHandler + .word DMA1_Channel7_IRQHandler + .word ADC1_IRQHandler + .word USB_HP_IRQHandler + .word USB_LP_IRQHandler + .word C2SEV_PWR_C2H_IRQHandler + .word COMP_IRQHandler + .word EXTI9_5_IRQHandler + .word TIM1_BRK_IRQHandler + .word TIM1_UP_TIM16_IRQHandler + .word TIM1_TRG_COM_TIM17_IRQHandler + .word TIM1_CC_IRQHandler + .word TIM2_IRQHandler + .word PKA_IRQHandler + .word I2C1_EV_IRQHandler + .word I2C1_ER_IRQHandler + .word I2C3_EV_IRQHandler + .word I2C3_ER_IRQHandler + .word SPI1_IRQHandler + .word SPI2_IRQHandler + .word USART1_IRQHandler + .word LPUART1_IRQHandler + .word SAI1_IRQHandler + .word TSC_IRQHandler + .word EXTI15_10_IRQHandler + .word RTC_Alarm_IRQHandler + .word CRS_IRQHandler + .word PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + .word IPCC_C1_RX_IRQHandler + .word IPCC_C1_TX_IRQHandler + .word HSEM_IRQHandler + .word LPTIM1_IRQHandler + .word LPTIM2_IRQHandler + .word LCD_IRQHandler + .word QUADSPI_IRQHandler + .word AES1_IRQHandler + .word AES2_IRQHandler + .word RNG_IRQHandler + .word FPU_IRQHandler + .word DMA2_Channel1_IRQHandler + .word DMA2_Channel2_IRQHandler + .word DMA2_Channel3_IRQHandler + .word DMA2_Channel4_IRQHandler + .word DMA2_Channel5_IRQHandler + .word DMA2_Channel6_IRQHandler + .word DMA2_Channel7_IRQHandler + .word DMAMUX1_OVR_IRQHandler + +/******************************************************************************* +* +* Provide weak aliases for each Exception handler to the Default_Handler. +* As they are weak aliases, any function with the same name will override +* this definition. +* +*******************************************************************************/ + .weak NMI_Handler + .thumb_set NMI_Handler,Default_Handler + + .weak HardFault_Handler + .thumb_set HardFault_Handler,Default_Handler + + .weak MemManage_Handler + .thumb_set MemManage_Handler,Default_Handler + + .weak BusFault_Handler + .thumb_set BusFault_Handler,Default_Handler + + .weak UsageFault_Handler + .thumb_set UsageFault_Handler,Default_Handler + + .weak SVC_Handler + .thumb_set SVC_Handler,Default_Handler + + .weak DebugMon_Handler + .thumb_set DebugMon_Handler,Default_Handler + + .weak PendSV_Handler + .thumb_set PendSV_Handler,Default_Handler + + .weak SysTick_Handler + .thumb_set SysTick_Handler,Default_Handler + + .weak WWDG_IRQHandler + .thumb_set WWDG_IRQHandler,Default_Handler + + .weak PVD_PVM_IRQHandler + .thumb_set PVD_PVM_IRQHandler,Default_Handler + + .weak TAMP_STAMP_LSECSS_IRQHandler + .thumb_set TAMP_STAMP_LSECSS_IRQHandler,Default_Handler + + .weak RTC_WKUP_IRQHandler + .thumb_set RTC_WKUP_IRQHandler,Default_Handler + + .weak FLASH_IRQHandler + .thumb_set FLASH_IRQHandler,Default_Handler + + .weak RCC_IRQHandler + .thumb_set RCC_IRQHandler,Default_Handler + + .weak EXTI0_IRQHandler + .thumb_set EXTI0_IRQHandler,Default_Handler + + .weak EXTI1_IRQHandler + .thumb_set EXTI1_IRQHandler,Default_Handler + + .weak EXTI2_IRQHandler + .thumb_set EXTI2_IRQHandler,Default_Handler + + .weak EXTI3_IRQHandler + .thumb_set EXTI3_IRQHandler,Default_Handler + + .weak EXTI4_IRQHandler + .thumb_set EXTI4_IRQHandler,Default_Handler + + .weak DMA1_Channel1_IRQHandler + .thumb_set DMA1_Channel1_IRQHandler,Default_Handler + + .weak DMA1_Channel2_IRQHandler + .thumb_set DMA1_Channel2_IRQHandler,Default_Handler + + .weak DMA1_Channel3_IRQHandler + .thumb_set DMA1_Channel3_IRQHandler,Default_Handler + + .weak DMA1_Channel4_IRQHandler + .thumb_set DMA1_Channel4_IRQHandler,Default_Handler + + .weak DMA1_Channel5_IRQHandler + .thumb_set DMA1_Channel5_IRQHandler,Default_Handler + + .weak DMA1_Channel6_IRQHandler + .thumb_set DMA1_Channel6_IRQHandler,Default_Handler + + .weak DMA1_Channel7_IRQHandler + .thumb_set DMA1_Channel7_IRQHandler,Default_Handler + + .weak ADC1_IRQHandler + .thumb_set ADC1_IRQHandler,Default_Handler + + .weak USB_HP_IRQHandler + .thumb_set USB_HP_IRQHandler,Default_Handler + + .weak USB_LP_IRQHandler + .thumb_set USB_LP_IRQHandler,Default_Handler + + .weak C2SEV_PWR_C2H_IRQHandler + .thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler + + .weak COMP_IRQHandler + .thumb_set COMP_IRQHandler,Default_Handler + + .weak EXTI9_5_IRQHandler + .thumb_set EXTI9_5_IRQHandler,Default_Handler + + .weak TIM1_BRK_IRQHandler + .thumb_set TIM1_BRK_IRQHandler,Default_Handler + + .weak TIM1_UP_TIM16_IRQHandler + .thumb_set TIM1_UP_TIM16_IRQHandler,Default_Handler + + .weak TIM1_TRG_COM_TIM17_IRQHandler + .thumb_set TIM1_TRG_COM_TIM17_IRQHandler,Default_Handler + + .weak TIM1_CC_IRQHandler + .thumb_set TIM1_CC_IRQHandler,Default_Handler + + .weak TIM2_IRQHandler + .thumb_set TIM2_IRQHandler,Default_Handler + + .weak PKA_IRQHandler + .thumb_set PKA_IRQHandler,Default_Handler + + .weak I2C1_EV_IRQHandler + .thumb_set I2C1_EV_IRQHandler,Default_Handler + + .weak I2C1_ER_IRQHandler + .thumb_set I2C1_ER_IRQHandler,Default_Handler + + .weak I2C3_EV_IRQHandler + .thumb_set I2C3_EV_IRQHandler,Default_Handler + + .weak I2C3_ER_IRQHandler + .thumb_set I2C3_ER_IRQHandler,Default_Handler + + .weak SPI1_IRQHandler + .thumb_set SPI1_IRQHandler,Default_Handler + + .weak SPI2_IRQHandler + .thumb_set SPI2_IRQHandler,Default_Handler + + .weak USART1_IRQHandler + .thumb_set USART1_IRQHandler,Default_Handler + + .weak LPUART1_IRQHandler + .thumb_set LPUART1_IRQHandler,Default_Handler + + .weak SAI1_IRQHandler + .thumb_set SAI1_IRQHandler,Default_Handler + + .weak TSC_IRQHandler + .thumb_set TSC_IRQHandler,Default_Handler + + .weak EXTI15_10_IRQHandler + .thumb_set EXTI15_10_IRQHandler,Default_Handler + + .weak RTC_Alarm_IRQHandler + .thumb_set RTC_Alarm_IRQHandler,Default_Handler + + .weak CRS_IRQHandler + .thumb_set CRS_IRQHandler,Default_Handler + + .weak PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + .thumb_set PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler,Default_Handler + + .weak IPCC_C1_RX_IRQHandler + .thumb_set IPCC_C1_RX_IRQHandler,Default_Handler + + .weak IPCC_C1_TX_IRQHandler + .thumb_set IPCC_C1_TX_IRQHandler,Default_Handler + + .weak HSEM_IRQHandler + .thumb_set HSEM_IRQHandler,Default_Handler + + .weak LPTIM1_IRQHandler + .thumb_set LPTIM1_IRQHandler,Default_Handler + + .weak LPTIM2_IRQHandler + .thumb_set LPTIM2_IRQHandler,Default_Handler + + .weak LCD_IRQHandler + .thumb_set LCD_IRQHandler,Default_Handler + + .weak QUADSPI_IRQHandler + .thumb_set QUADSPI_IRQHandler,Default_Handler + + .weak AES1_IRQHandler + .thumb_set AES1_IRQHandler,Default_Handler + + .weak AES2_IRQHandler + .thumb_set AES2_IRQHandler,Default_Handler + + .weak RNG_IRQHandler + .thumb_set RNG_IRQHandler,Default_Handler + + .weak FPU_IRQHandler + .thumb_set FPU_IRQHandler,Default_Handler + + .weak DMA2_Channel1_IRQHandler + .thumb_set DMA2_Channel1_IRQHandler,Default_Handler + + .weak DMA2_Channel2_IRQHandler + .thumb_set DMA2_Channel2_IRQHandler,Default_Handler + + .weak DMA2_Channel3_IRQHandler + .thumb_set DMA2_Channel3_IRQHandler,Default_Handler + + .weak DMA2_Channel4_IRQHandler + .thumb_set DMA2_Channel4_IRQHandler,Default_Handler + + .weak DMA2_Channel5_IRQHandler + .thumb_set DMA2_Channel5_IRQHandler,Default_Handler + + .weak DMA2_Channel6_IRQHandler + .thumb_set DMA2_Channel6_IRQHandler,Default_Handler + + .weak DMA2_Channel7_IRQHandler + .thumb_set DMA2_Channel7_IRQHandler,Default_Handler + + .weak DMAMUX1_OVR_IRQHandler + .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld new file mode 100644 index 000000000..001a31233 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -0,0 +1,171 @@ +/** +***************************************************************************** +** +** File : stm32wb55xx_flash_cm4.ld +** +** Abstract : STM32CubeIDE Minimal System calls file +** +** For more information about which c-functions +** need which of these lowlevel functions +** please consult the Newlib libc-manual +** +** Environment : STM32CubeIDE for MCU +** +** Distribution: The file is distributed as is, without any warranty +** of any kind. +** +***************************************************************************** +** @attention +** +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. +** +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x20030000; /* end of RAM */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K +RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FFF8 +RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM1 AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss section */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(.bss*) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM1 + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM1 + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } + MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED + MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED + MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED +} + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.c new file mode 100644 index 000000000..f0a20ed8f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.c @@ -0,0 +1,1681 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/app_ble.c + * Description : Application file for BLE Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +#include "app_common.h" + +#include "dbg_trace.h" +#include "ble.h" +#include "tl.h" +#include "app_ble.h" + +#include "stm32_seq.h" +#include "shci.h" +#include "stm32_lpm.h" +#include "otp.h" +#include "dis_app.h" +#include "hrs_app.h" +#include "p2p_server_app.h" +#include "stm32wb_at_ble.h" +#include "ble_at_server.h" +#include "custom_app.h" +#include "custom.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ + +/* USER CODE BEGIN PTD */ +typedef enum +{ + CUSTOMS_NOTIFICATION_MASK = (1 << 0), + CUSTOMS_INDICATION_MASK = (1 << 1), +} ClientCharConfMask_t; + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define APPBLE_GAP_DEVICE_NAME_LENGTH 7 +#define FAST_ADV_TIMEOUT (30*1000*1000/CFG_TS_TICK_VAL) /**< 30s */ +#define INITIAL_ADV_TIMEOUT (60*1000*1000/CFG_TS_TICK_VAL) /**< 60s */ + +#define BD_ADDR_SIZE_LOCAL 6 + +/* USER CODE BEGIN PD */ +#define LED_ON_TIMEOUT (0.005*1000*1000/CFG_TS_TICK_VAL) /**< 5ms */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer; + +static const uint8_t M_bd_addr[BD_ADDR_SIZE_LOCAL] = + { + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), + (uint8_t)((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) + }; + +static uint8_t bd_addr_udn[BD_ADDR_SIZE_LOCAL]; + +/** +* Identity root key used to derive LTK and CSRK +*/ +static const uint8_t BLE_CFG_IR_VALUE[16] = CFG_BLE_IRK; + +/** +* Encryption root key used to derive LTK and CSRK +*/ +static const uint8_t BLE_CFG_ER_VALUE[16] = CFG_BLE_ERK; + +/** + * These are the two tags used to manage a power failure during OTA + * The MagicKeywordAdress shall be mapped @0x140 from start of the binary image + * The MagicKeywordvalue is checked in the ble_ota application + */ +PLACE_IN_SECTION("TAG_OTA_END") const uint32_t MagicKeywordValue = 0x94448A29 ; +PLACE_IN_SECTION("TAG_OTA_START") const uint32_t MagicKeywordAddress = (uint32_t)&MagicKeywordValue; + +BleApplicationContext_t BleApplicationContext; +PLACE_IN_SECTION("BLE_APP_CONTEXT") static uint16_t AdvIntervalMin, AdvIntervalMax; + +P2PS_APP_ConnHandle_Not_evt_t handleNotification; +Custom_Context_t Custom_Context; +extern RNG_HandleTypeDef hrng; + +#if L2CAP_REQUEST_NEW_CONN_PARAM != 0 +#define SIZE_TAB_CONN_INT 2 +float tab_conn_interval[SIZE_TAB_CONN_INT] = {50, 1000} ; /* ms */ +uint8_t index_con_int, mutex; +#endif + +/** + * Advertising Data + */ +#if (P2P_SERVER1 != 0) +uint8_t manuf_data[14] = { + sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, + 0x01/*SKD version */, + CFG_DEV_ID_P2P_SERVER1 /* STM32WB - P2P Server 1*/, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP B Feature */, + 0x00 /* GROUP B Feature */, + 0x00, /* BLE MAC start -MSB */ + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, /* BLE MAC stop */ +}; +#endif +/** + * Advertising Data + */ +#if (P2P_SERVER2 != 0) +static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '2'}; +uint8_t manuf_data[14] = { + sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, + 0x01/*SKD version */, + CFG_DEV_ID_P2P_SERVER2 /* STM32WB - P2P Server 2*/, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP B Feature */, + 0x00 /* GROUP B Feature */, + 0x00, /* BLE MAC start -MSB */ + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, /* BLE MAC stop */ +}; + +#endif + +#if (P2P_SERVER3 != 0) +static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '3'}; +uint8_t manuf_data[14] = { + sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, + 0x01/*SKD version */, + CFG_DEV_ID_P2P_SERVER3 /* STM32WB - P2P Server 3*/, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP B Feature */, + 0x00 /* GROUP B Feature */, + 0x00, /* BLE MAC start -MSB */ + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, /* BLE MAC stop */ +}; +#endif + +#if (P2P_SERVER4 != 0) +static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '4'}; +uint8_t manuf_data[14] = { + sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, + 0x01/*SKD version */, + CFG_DEV_ID_P2P_SERVER4 /* STM32WB - P2P Server 4*/, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP B Feature */, + 0x00 /* GROUP B Feature */, + 0x00, /* BLE MAC start -MSB */ + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, /* BLE MAC stop */ +}; +#endif + +#if (P2P_SERVER5 != 0) +static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '5'}; +uint8_t manuf_data[14] = { + sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, + 0x01/*SKD version */, + CFG_DEV_ID_P2P_SERVER5 /* STM32WB - P2P Server 5*/, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP B Feature */, + 0x00 /* GROUP B Feature */, + 0x00, /* BLE MAC start -MSB */ + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, /* BLE MAC stop */ +}; +#endif + +#if (P2P_SERVER6 != 0) +static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '6'}; +uint8_t manuf_data[14] = { + sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, + 0x01/*SKD version */, + CFG_DEV_ID_P2P_SERVER6 /* STM32WB - P2P Server 1*/, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP A Feature */, + 0x00 /* GROUP B Feature */, + 0x00 /* GROUP B Feature */, + 0x00, /* BLE MAC start -MSB */ + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, /* BLE MAC stop */ +}; +#endif + +/* USER CODE BEGIN PV */ +char local_name_var[] = { AD_TYPE_COMPLETE_LOCAL_NAME , 0, 0, 0, 0, 0, 0, 0, 0}; + +extern uint8_t global_svc_index; +extern float global_conn_int_min; +extern float global_conn_int_max; +extern uint8_t global_notif_serv_index; +extern uint8_t global_notif_char_index; +extern uint8_t global_notif_val_tab[64]; +extern uint8_t global_notif_val_len; +extern uint8_t global_indic_serv_index; +extern uint8_t global_indic_char_index; +extern uint8_t global_indic_val_tab[64]; +extern uint8_t global_indic_val_len; +extern uint8_t global_svc_uuid_type; +extern uint16_t global_svc_uuid; +extern uint8_t global_max_attr; +extern uint8_t global_svc_id; +extern uint8_t global_char_id; +extern uint8_t global_char_uuid_type; +extern uint16_t global_char_uuid; +extern uint16_t global_char_value_len; +extern uint8_t global_char_properties; +extern uint8_t global_char_sec_permission; +extern uint8_t global_gatt_event_mask; +extern uint8_t global_pairing_confirm; +extern uint32_t global_pass_key_resp; +extern uint8_t global_io_capability; +extern uint8_t global_bonding; +extern uint8_t global_mitm; +extern uint8_t global_scsupport; +extern uint8_t global_usefixedpin; +extern uint32_t global_fixedpin; +extern uint8_t global_addrtype; +extern uint8_t global_bdaddress[6]; +extern uint8_t global_rand_bdaddress[6]; +extern uint8_t global_ble_addr_type; +extern uint8_t global_ble_cfg_addr_type; +extern char global_name[]; +extern uint8_t global_tx_power_code; +extern uint8_t global_entry_number; +extern uint8_t global_adv_type; +extern uint16_t global_adv_int_min; +extern uint16_t global_adv_int_max; +extern uint8_t global_adv_enable; + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +static void BLE_UserEvtRx( void * pPayload ); +static void BLE_StatusNot( HCI_TL_CmdStatus_t status ); +static void Ble_Tl_Init( void ); +static void Ble_Hci_Gap_Gatt_Init(void); +const uint8_t* BleGetBdAddress( void ); +static void Adv_Request( APP_BLE_ConnStatus_t New_Status ); +static void Add_Advertisment_Service_UUID( uint16_t servUUID ); +static void Adv_Mgr( void ); +static void Switch_OFF_GPIO( void ); + +#if(L2CAP_REQUEST_NEW_CONN_PARAM != 0) +static void BLE_SVC_L2CAP_Conn_Update(uint16_t Connection_Handle); +static void Connection_Interval_Update_Req( void ); +#endif + +/* USER CODE BEGIN PFP */ + +extern HRSAPP_Context_t HRSAPP_Context; + +static void Manage_Start_Stop_Adv_Init(void); +static void Manage_Service_Init(void); +static void Manage_Update_Connection(void); +static void Manage_Update_Charac(void); +static void Manage_Indication_Update_Charac(void); +static void Manage_Custom_Service_Init(void); +static void Manage_Charac_Init(void); +static void Manage_Slave_Security_Request(void); +static void Manage_Pairing_Confirm_Answer(void); +static void Manage_Pass_Key_Resp(void); +static void Manage_IO_Capability(void); +static void Manage_set_authen_req(void); +static void Manage_clear_db(void); +static void Manage_hci_reset(void); +static void Manage_Ble_Init(void); + +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void APP_BLE_Init( void ) +{ + uint8_t i,j; +/* USER CODE BEGIN APP_BLE_Init_1 */ + +/* USER CODE END APP_BLE_Init_1 */ + SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = + { + {{0,0,0}}, /**< Header unused */ + {0, /** pBleBufferAddress not used */ + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} + }; + + /** + * Initialize Ble Transport Layer + */ + Ble_Tl_Init( ); + + /** + * Do not allow standby in the application + */ + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP_BLE, UTIL_LPM_DISABLE); + + /** + * Register the hci transport layer to handle BLE User Asynchronous Events + */ + UTIL_SEQ_RegTask( 1<data; + + /* USER CODE BEGIN SVCCTL_App_Notification */ + + /* USER CODE END SVCCTL_App_Notification */ + + switch (event_pckt->evt) + { + case HCI_DISCONNECTION_COMPLETE_EVT_CODE: + { + hci_disconnection_complete_event_rp0 *disconnection_complete_event; + disconnection_complete_event = (hci_disconnection_complete_event_rp0 *) event_pckt->data; + + if (disconnection_complete_event->Connection_Handle == BleApplicationContext.BleApplicationContext_legacy.connectionHandle) + { + BleApplicationContext.BleApplicationContext_legacy.connectionHandle = 0; + BleApplicationContext.Device_Connection_Status = APP_BLE_IDLE; + global_conn_int_min = 0; + global_conn_int_max = 0; + + printf("\r\n\r** DISCONNECTION EVENT WITH CLIENT \n"); + param_BLE_EVT_CONN.status = 0; + ble_at_server_Send_evt(BLE_EVT_CONN, ¶m_BLE_EVT_CONN); + } + + /* USER CODE BEGIN EVT_DISCONN_COMPLETE */ + + /* USER CODE END EVT_DISCONN_COMPLETE */ + } + + break; /* HCI_DISCONNECTION_COMPLETE_EVT_CODE */ + + case HCI_LE_META_EVT_CODE: + { + meta_evt = (evt_le_meta_event*) event_pckt->data; + + /* USER CODE BEGIN EVT_LE_META_EVENT */ + + /* USER CODE END EVT_LE_META_EVENT */ + switch (meta_evt->subevent) + { + case HCI_LE_CONNECTION_UPDATE_COMPLETE_SUBEVT_CODE: + printf("\r\n\r** CONNECTION UPDATE EVENT WITH CLIENT \n"); + connection_update_complete_event = (hci_le_connection_update_complete_event_rp0*) meta_evt->data; + global_conn_int_min = (uint8_t)(connection_update_complete_event->Conn_Interval)*1.25; + global_conn_int_max = (uint8_t)(connection_update_complete_event->Conn_Interval)*1.25; + + param_BLE_EVT_UPD_CONN.status = 1; + ble_at_server_Send_evt(BLE_EVT_UPD_CONN, ¶m_BLE_EVT_UPD_CONN); + + /* USER CODE BEGIN EVT_LE_CONN_UPDATE_COMPLETE */ + + /* USER CODE END EVT_LE_CONN_UPDATE_COMPLETE */ + break; + case HCI_LE_PHY_UPDATE_COMPLETE_SUBEVT_CODE: + printf("EVT_UPDATE_PHY_COMPLETE \n"); + evt_le_phy_update_complete = (hci_le_phy_update_complete_event_rp0*)meta_evt->data; + if (evt_le_phy_update_complete->Status == 0) + { + APP_DBG_MSG("EVT_UPDATE_PHY_COMPLETE, status ok \n"); + } + else + { + APP_DBG_MSG("EVT_UPDATE_PHY_COMPLETE, status nok \n"); + } + + ret = hci_le_read_phy(BleApplicationContext.BleApplicationContext_legacy.connectionHandle,&TX_PHY,&RX_PHY); + if (ret == BLE_STATUS_SUCCESS) + { + printf("Read_PHY success \n"); + + if ((TX_PHY == TX_2M) && (RX_PHY == RX_2M)) + { + printf("PHY Param TX= %d, RX= %d \n", TX_PHY, RX_PHY); + } + else + { + printf("PHY Param TX= %d, RX= %d \n", TX_PHY, RX_PHY); + } + } + else + { + printf("Read conf not succeess \n"); + } + /* USER CODE BEGIN EVT_LE_PHY_UPDATE_COMPLETE */ + + /* USER CODE END EVT_LE_PHY_UPDATE_COMPLETE */ + break; + case HCI_LE_CONNECTION_COMPLETE_SUBEVT_CODE: + { + hci_le_connection_complete_event_rp0 *connection_complete_event; + + /** + * The connection is done, there is no need anymore to schedule the LP ADV + */ + connection_complete_event = (hci_le_connection_complete_event_rp0 *) meta_evt->data; + global_conn_int_min = (uint8_t)(connection_complete_event->Conn_Interval); + global_conn_int_max = (uint8_t)(connection_complete_event->Conn_Interval); + + HW_TS_Stop(BleApplicationContext.Advertising_mgr_timer_Id); + + printf("HCI_LE_CONNECTION_COMPLETE_SUBEVT_CODE for connection handle 0x%x\n", connection_complete_event->Connection_Handle); + if (BleApplicationContext.Device_Connection_Status == APP_BLE_LP_CONNECTING) + { + /* Connection as client */ + BleApplicationContext.Device_Connection_Status = APP_BLE_CONNECTED_CLIENT; + } + else + { + /* Connection as server */ + BleApplicationContext.Device_Connection_Status = APP_BLE_CONNECTED_SERVER; + } + + param_BLE_EVT_CONN.status = 1; + ble_at_server_Send_evt(BLE_EVT_CONN, ¶m_BLE_EVT_CONN); + + BleApplicationContext.BleApplicationContext_legacy.connectionHandle = connection_complete_event->Connection_Handle; + ret = aci_gatt_exchange_config(connection_complete_event->Connection_Handle); + if (ret == BLE_STATUS_SUCCESS) + { + printf("exchange_config, Successfully \r\n\r"); + } + else + { + printf("exchange_config, Failed \r\n\r"); + } + /* USER CODE BEGIN HCI_EVT_LE_CONN_COMPLETE */ + + /* USER CODE END HCI_EVT_LE_CONN_COMPLETE */ + } + break; /* HCI_LE_CONNECTION_COMPLETE_SUBEVT_CODE */ + + /* USER CODE BEGIN META_EVT */ + + /* USER CODE END META_EVT */ + + default: + /* USER CODE BEGIN SUBEVENT_DEFAULT */ + + /* USER CODE END SUBEVENT_DEFAULT */ + break; + } + } + break; /* HCI_LE_META_EVT_CODE */ + + case HCI_VENDOR_SPECIFIC_DEBUG_EVT_CODE: + blecore_evt = (evt_blecore_aci*) event_pckt->data; + /* USER CODE BEGIN EVT_VENDOR */ + + /* USER CODE END EVT_VENDOR */ + switch (blecore_evt->ecode) + { + /* USER CODE BEGIN ecode */ + aci_gap_pairing_complete_event_rp0 *pairing_complete; + + case ACI_GAP_LIMITED_DISCOVERABLE_VSEVT_CODE: + APP_DBG_MSG("\r\n\r** ACI_GAP_LIMITED_DISCOVERABLE_VSEVT_CODE \n"); + break; /* ACI_GAP_LIMITED_DISCOVERABLE_VSEVT_CODE */ + case ACI_GAP_PASS_KEY_REQ_VSEVT_CODE: + param_BLE_EVT_PASSKEY_REQ.dummy = 1; + ble_at_server_Send_evt(BLE_EVT_PASSKEY_REQ, ¶m_BLE_EVT_PASSKEY_REQ); + break; /* ACI_GAP_PASS_KEY_REQ_VSEVT_CODE */ + case ACI_GAP_AUTHORIZATION_REQ_VSEVT_CODE: + break; /* ACI_GAP_AUTHORIZATION_REQ_VSEVT_CODE */ + case ACI_GAP_SLAVE_SECURITY_INITIATED_VSEVT_CODE: + break; /* ACI_GAP_SLAVE_SECURITY_INITIATED_VSEVT_CODE */ + case ACI_GAP_BOND_LOST_VSEVT_CODE: + break; /* ACI_GAP_BOND_LOST_VSEVT_CODE */ + case ACI_GAP_ADDR_NOT_RESOLVED_VSEVT_CODE: + break; /* ACI_GAP_ADDR_NOT_RESOLVED_VSEVT_CODE */ + case (ACI_GAP_KEYPRESS_NOTIFICATION_VSEVT_CODE): + break; /* ACI_GAP_KEYPRESS_NOTIFICATION_VSEVT_CODE */ + case (ACI_GAP_NUMERIC_COMPARISON_VALUE_VSEVT_CODE): + param_BLE_EVT_NUMERIC_VALUE.numeric_value = ((aci_gap_numeric_comparison_value_event_rp0 *)(blecore_evt->data))->Numeric_Value; + + ble_at_server_Send_evt(BLE_EVT_VALUE_CONFIRM, ¶m_BLE_EVT_NUMERIC_VALUE); + break; + case (ACI_GAP_PAIRING_COMPLETE_VSEVT_CODE): + { + pairing_complete = (aci_gap_pairing_complete_event_rp0*)blecore_evt->data; + param_BLE_EVT_PAIRING.status = pairing_complete->Status; + param_BLE_EVT_PAIRING.reason = pairing_complete->Reason; + + ble_at_server_Send_evt(BLE_EVT_PAIRING, ¶m_BLE_EVT_PAIRING); + } + break; + + /* USER CODE END ecode */ + /** + * SPECIFIC to P2P Server APP + */ + case ACI_L2CAP_CONNECTION_UPDATE_RESP_VSEVT_CODE: +#if (L2CAP_REQUEST_NEW_CONN_PARAM != 0 ) + mutex = 1; +#endif + /* USER CODE BEGIN EVT_BLUE_L2CAP_CONNECTION_UPDATE_RESP */ + + /* USER CODE END EVT_BLUE_L2CAP_CONNECTION_UPDATE_RESP */ + break; + case ACI_GAP_PROC_COMPLETE_VSEVT_CODE: + APP_DBG_MSG("\r\n\r** ACI_GAP_PROC_COMPLETE_VSEVT_CODE \n"); + /* USER CODE BEGIN EVT_BLUE_GAP_PROCEDURE_COMPLETE */ + + /* USER CODE END EVT_BLUE_GAP_PROCEDURE_COMPLETE */ + break; /* ACI_GAP_PROC_COMPLETE_VSEVT_CODE */ +#if(RADIO_ACTIVITY_EVENT != 0) + case ACI_HAL_END_OF_RADIO_ACTIVITY_VSEVT_CODE: + /* USER CODE BEGIN RADIO_ACTIVITY_EVENT*/ + BSP_LED_On(LED_GREEN); + HW_TS_Start(BleApplicationContext.SwitchOffGPIO_timer_Id, (uint32_t)LED_ON_TIMEOUT); + /* USER CODE END RADIO_ACTIVITY_EVENT*/ + break; /* ACI_HAL_END_OF_RADIO_ACTIVITY_VSEVT_CODE */ +#endif + + /* USER CODE BEGIN BLUE_EVT */ + + /* USER CODE END BLUE_EVT */ + } + break; /* HCI_VENDOR_SPECIFIC_DEBUG_EVT_CODE */ + + /* USER CODE BEGIN EVENT_PCKT */ + + /* USER CODE END EVENT_PCKT */ + + default: + /* USER CODE BEGIN ECODE_DEFAULT*/ + + /* USER CODE END ECODE_DEFAULT*/ + break; + } + return (SVCCTL_UserEvtFlowEnable); +} + +APP_BLE_ConnStatus_t APP_BLE_Get_Server_Connection_Status(void) +{ + return BleApplicationContext.Device_Connection_Status; +} + +#if (CFG_BUTTON_SUPPORTED == 1) +/* USER CODE BEGIN FD*/ +void APP_BLE_Key_Button1_Action(void) +{ + P2PS_APP_SW1_Button_Action(); +} + +void APP_BLE_Key_Button2_Action(void) +{ +#if (L2CAP_REQUEST_NEW_CONN_PARAM != 0 ) + UTIL_SEQ_SetTask( 1<> 32); + srd_bd_addr[1] |= 0xC000; /* The two upper bits shall be set to 1 */ +#else + /* Get RNG semaphore */ + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RNG_SEMID ) ); + + /* Enable RNG */ + __HAL_RNG_ENABLE(&hrng); + + /* Enable HSI48 oscillator */ + LL_RCC_HSI48_Enable(); + /* Wait until HSI48 is ready */ + while( ! LL_RCC_HSI48_IsReady( ) ); + + if (HAL_RNG_GenerateRandomNumber(&hrng, &srd_bd_addr[1]) != HAL_OK) + { + /* Random number generation error */ + Error_Handler(); + } + if (HAL_RNG_GenerateRandomNumber(&hrng, &srd_bd_addr[0]) != HAL_OK) + { + /* Random number generation error */ + Error_Handler(); + } + srd_bd_addr[1] |= 0xC000; /* The two upper bits shall be set to 1 */ + + /* Disable HSI48 oscillator */ + LL_RCC_HSI48_Disable(); + + /* Disable RNG */ + __HAL_RNG_DISABLE(&hrng); + + /* Release RNG semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RNG_SEMID, 0 ); +#endif + + memcpy(&global_rand_bdaddress[0], srd_bd_addr, sizeof(global_rand_bdaddress)); + /* BLE MAC in ADV Packet */ + manuf_data[ sizeof(manuf_data)-6] = srd_bd_addr[1] >> 8 ; + manuf_data[ sizeof(manuf_data)-5] = srd_bd_addr[1]; + manuf_data[ sizeof(manuf_data)-4] = srd_bd_addr[0] >> 24; + manuf_data[ sizeof(manuf_data)-3] = srd_bd_addr[0] >> 16; + manuf_data[ sizeof(manuf_data)-2] = srd_bd_addr[0] >> 8; + manuf_data[ sizeof(manuf_data)-1] = srd_bd_addr[0]; + + aci_hal_write_config_data( CONFIG_DATA_RANDOM_ADDRESS_OFFSET, CONFIG_DATA_RANDOM_ADDRESS_LEN, (uint8_t*)srd_bd_addr ); + } + + /** + * Write Identity root key used to derive LTK and CSRK + */ + aci_hal_write_config_data(CONFIG_DATA_IR_OFFSET, + CONFIG_DATA_IR_LEN, + (uint8_t*) BLE_CFG_IR_VALUE); + + /** + * Write Encryption root key used to derive LTK and CSRK + */ + aci_hal_write_config_data(CONFIG_DATA_ER_OFFSET, + CONFIG_DATA_ER_LEN, + (uint8_t*) BLE_CFG_ER_VALUE); + + + /** + * Write Identity root key used to derive LTK and CSRK + */ + aci_hal_write_config_data( CONFIG_DATA_IR_OFFSET, CONFIG_DATA_IR_LEN, (uint8_t*)BLE_CFG_IR_VALUE ); + + /** + * Write Encryption root key used to derive LTK and CSRK + */ + aci_hal_write_config_data( CONFIG_DATA_ER_OFFSET, CONFIG_DATA_ER_LEN, (uint8_t*)BLE_CFG_ER_VALUE ); + + /** + * Set TX Power. + */ + aci_hal_set_tx_power_level(1, global_tx_power_code); + + /** + * Set adv name. + */ + strcpy(local_name_var + 1, global_name); + + /** + * Initialize GATT interface + */ + aci_gatt_init(); + + /** + * Initialize GAP interface + */ + role = 0; + +#if (BLE_CFG_PERIPHERAL == 1) + role |= GAP_PERIPHERAL_ROLE; +#endif + +#if (BLE_CFG_CENTRAL == 1) + role |= GAP_CENTRAL_ROLE; +#endif + + if (role > 0) + { + aci_gap_init(role, 0, + APPBLE_GAP_DEVICE_NAME_LENGTH, + &gap_service_handle, &gap_dev_name_char_handle, &gap_appearance_char_handle); + + if (aci_gatt_update_char_value(gap_service_handle, gap_dev_name_char_handle, 0, strlen(local_name_var)-1, (uint8_t *) &(local_name_var[1]))) + { + BLE_DBG_SVCCTL_MSG("Device Name aci_gatt_update_char_value failed.\n"); + } + } + + if(aci_gatt_update_char_value(gap_service_handle, + gap_appearance_char_handle, + 0, + 2, + (uint8_t *)&appearance)) + { + BLE_DBG_SVCCTL_MSG("Appearance aci_gatt_update_char_value failed.\n"); + } + /** + * Initialize Default PHY + */ + hci_le_set_default_phy(ALL_PHYS_PREFERENCE,TX_2M_PREFERRED,RX_2M_PREFERRED); + + Custom_SVC_Init(); + /** + * Initialize IO capability + */ + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.ioCapability = global_io_capability; + + aci_gap_set_io_capability(BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.ioCapability); + + /** + * Initialize authentication + */ + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.mitm_mode = global_mitm; + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.sc_support = global_scsupport; + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMin = CFG_ENCRYPTION_KEY_SIZE_MIN; + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMax = CFG_ENCRYPTION_KEY_SIZE_MAX; + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Use_Fixed_Pin = global_usefixedpin; + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Fixed_Pin = global_fixedpin; + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.bonding_mode = global_bonding; + + aci_gap_set_authentication_requirement(BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.bonding_mode, + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.mitm_mode, + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.sc_support, + CFG_KEYPRESS_NOTIFICATION_SUPPORT, + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMin, + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMax, + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Use_Fixed_Pin, + BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Fixed_Pin, + global_ble_addr_type | global_ble_cfg_addr_type + ); + + /** + * Initialize whitelist + */ + if (BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.bonding_mode) + { + aci_gap_configure_whitelist(); + } +} + +static void Adv_Request(APP_BLE_ConnStatus_t New_Status) +{ + tBleStatus ret = BLE_STATUS_INVALID_PARAMS; + uint16_t Min_Inter, Max_Inter; + + if (New_Status == APP_BLE_FAST_ADV) + { + Min_Inter = AdvIntervalMin; + Max_Inter = AdvIntervalMax; + } + else + { + Min_Inter = CFG_LP_CONN_ADV_INTERVAL_MIN; + Max_Inter = CFG_LP_CONN_ADV_INTERVAL_MAX; + } + + /** + * Stop the timer, it will be restarted for a new shot + * It does not hurt if the timer was not running + */ + HW_TS_Stop(BleApplicationContext.Advertising_mgr_timer_Id); + + APP_DBG_MSG("First index in %d state \n", BleApplicationContext.Device_Connection_Status); + + if ((New_Status == APP_BLE_LP_ADV) + && ((BleApplicationContext.Device_Connection_Status == APP_BLE_FAST_ADV) + || (BleApplicationContext.Device_Connection_Status == APP_BLE_LP_ADV))) + { + /* Connection in ADVERTISE mode have to stop the current advertising */ + ret = aci_gap_set_non_discoverable(); + if (ret == BLE_STATUS_SUCCESS) + { + APP_DBG_MSG("Successfully Stopped Advertising \n"); + } + else + { + APP_DBG_MSG("Stop Advertising Failed , result: %d \n", ret); + } + } + + BleApplicationContext.Device_Connection_Status = New_Status; + /* Start Fast or Low Power Advertising */ + ret = aci_gap_set_discoverable( + ADV_IND, + Min_Inter, + Max_Inter, + global_ble_addr_type | global_ble_cfg_addr_type, + NO_WHITE_LIST_USE, /* use white list */ + strlen(local_name_var), + (uint8_t*) &local_name_var, + BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen, + BleApplicationContext.BleApplicationContext_legacy.advtServUUID, + 0, + 0); + + /* Update Advertising data */ + ret = aci_gap_update_adv_data(sizeof(manuf_data), (uint8_t*) manuf_data); + if (ret == BLE_STATUS_SUCCESS) + { + if (New_Status == APP_BLE_FAST_ADV) + { + APP_DBG_MSG("Successfully Start Fast Advertising \n" ); + /* Start Timer to STOP ADV - TIMEOUT */ + HW_TS_Start(BleApplicationContext.Advertising_mgr_timer_Id, INITIAL_ADV_TIMEOUT); + } + else + { + APP_DBG_MSG("Successfully Start Low Power Advertising \n"); + } + } + else + { + if (New_Status == APP_BLE_FAST_ADV) + { + APP_DBG_MSG("Start Fast Advertising Failed , result: %d \n", ret); + } + else + { + APP_DBG_MSG("Start Low Power Advertising Failed , result: %d \n", ret); + } + } + + return; +} + +const uint8_t* BleGetBdAddress( void ) +{ + uint8_t *otp_addr; + const uint8_t *bd_addr; + uint32_t udn; + uint32_t company_id; + uint32_t device_id; + + udn = LL_FLASH_GetUDN(); + + if(udn != 0xFFFFFFFF) + { + company_id = LL_FLASH_GetSTCompanyID(); + device_id = LL_FLASH_GetDeviceID(); + +/** + * Public Address with the ST company ID + * bit[47:24] : 24bits (OUI) equal to the company ID + * bit[23:16] : Device ID. + * bit[15:0] : The last 16bits from the UDN + * Note: In order to use the Public Address in a final product, a dedicated + * 24bits company ID (OUI) shall be bought. + */ + bd_addr_udn[0] = (uint8_t)(udn & 0x000000FF); + bd_addr_udn[1] = (uint8_t)( (udn & 0x0000FF00) >> 8 ); + bd_addr_udn[2] = (uint8_t)device_id; + bd_addr_udn[3] = (uint8_t)(company_id & 0x000000FF); + bd_addr_udn[4] = (uint8_t)( (company_id & 0x0000FF00) >> 8 ); + bd_addr_udn[5] = (uint8_t)( (company_id & 0x00FF0000) >> 16 ); + + bd_addr = (const uint8_t *)bd_addr_udn; + } + else + { + otp_addr = OTP_Read(0); + if(otp_addr) + { + bd_addr = ((OTP_ID0_t*)otp_addr)->bd_address; + } + else + { + bd_addr = M_bd_addr; + } + } + + return bd_addr; +} + +/* USER CODE BEGIN FD_LOCAL_FUNCTION */ + +/* USER CODE END FD_LOCAL_FUNCTION */ + +/************************************************************* + * + *SPECIFIC FUNCTIONS + * + *************************************************************/ +static void Add_Advertisment_Service_UUID( uint16_t servUUID ) +{ + BleApplicationContext.BleApplicationContext_legacy.advtServUUID[BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen] = + (uint8_t) (servUUID & 0xFF); + BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen++; + BleApplicationContext.BleApplicationContext_legacy.advtServUUID[BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen] = + (uint8_t) (servUUID >> 8) & 0xFF; + BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen++; + + return; +} + +static void Adv_Mgr( void ) +{ + /** + * The code shall be executed in the background as an aci command may be sent + * The background is the only place where the application can make sure a new aci command + * is not sent if there is a pending one + */ + UTIL_SEQ_SetTask(1 << CFG_TASK_ADV_UPDATE_ID, CFG_SCH_PRIO_0); + + return; +} + +/************************************************************* + * + *SPECIFIC FUNCTIONS FOR P2P SERVER + * + *************************************************************/ +static void Switch_OFF_GPIO(){ +/* USER CODE BEGIN Switch_OFF_GPIO */ + BSP_LED_Off(LED_GREEN); +/* USER CODE END Switch_OFF_GPIO */ +} + +#if(L2CAP_REQUEST_NEW_CONN_PARAM != 0) +void BLE_SVC_L2CAP_Conn_Update(uint16_t Connection_Handle) +{ +/* USER CODE BEGIN BLE_SVC_L2CAP_Conn_Update_1 */ + +/* USER CODE END BLE_SVC_L2CAP_Conn_Update_1 */ + if(mutex == 1) { + mutex = 0; + index_con_int = (index_con_int + 1)%SIZE_TAB_CONN_INT; + uint16_t interval_min = CONN_P(tab_conn_interval[index_con_int]); + uint16_t interval_max = CONN_P(tab_conn_interval[index_con_int]); + uint16_t slave_latency = L2CAP_SLAVE_LATENCY; + uint16_t timeout_multiplier = L2CAP_TIMEOUT_MULTIPLIER; + tBleStatus result; + + result = aci_l2cap_connection_parameter_update_req(BleApplicationContext.BleApplicationContext_legacy.connectionHandle, + interval_min, interval_max, + slave_latency, timeout_multiplier); + if( result == BLE_STATUS_SUCCESS ) + { + APP_DBG_MSG("BLE_SVC_L2CAP_Conn_Update(), Successfully \r\n\r"); + } + else + { + APP_DBG_MSG("BLE_SVC_L2CAP_Conn_Update(), Failed \r\n\r"); + } + } +/* USER CODE BEGIN BLE_SVC_L2CAP_Conn_Update_2 */ + +/* USER CODE END BLE_SVC_L2CAP_Conn_Update_2 */ + return; +} +#endif + +#if (L2CAP_REQUEST_NEW_CONN_PARAM != 0 ) +static void Connection_Interval_Update_Req( void ) +{ + if (BleApplicationContext.Device_Connection_Status != APP_BLE_FAST_ADV && BleApplicationContext.Device_Connection_Status != APP_BLE_IDLE) + { + BLE_SVC_L2CAP_Conn_Update(BleApplicationContext.BleApplicationContext_legacy.connectionHandle); + } + + return; +} +#endif + +/* USER CODE BEGIN FD_SPECIFIC_FUNCTIONS */ + +static void Manage_Service_Init(void) +{ + /* if P2P_server */ + if (global_svc_index == 1) + { + strcpy(global_name, "P2PSRV1"); + local_name_var[0] = AD_TYPE_COMPLETE_LOCAL_NAME; + strcpy(&local_name_var[1], global_name); + + manuf_data[0] = sizeof(manuf_data)-1; + manuf_data[1] = AD_TYPE_MANUFACTURER_SPECIFIC_DATA; + manuf_data[2] = 0x01; + manuf_data[3] = CFG_DEV_ID_P2P_SERVER1; + manuf_data[4] = 0x00; + manuf_data[5] = 0x00; + manuf_data[6] = 0x00; + manuf_data[7] = 0x00; + manuf_data[8] = 0x00; + manuf_data[9] = 0x00; + manuf_data[10] = 0x00; + manuf_data[11] = 0x00; + manuf_data[12] = 0x00; + manuf_data[13] = 0x00; + } + /* if Heart rate */ + else if (global_svc_index == 2) + { + strcpy(global_name, "HRSTM"); + local_name_var[0] = AD_TYPE_COMPLETE_LOCAL_NAME; + strcpy(&local_name_var[1], global_name); + + manuf_data[0] = sizeof(manuf_data)-1; + manuf_data[1] = AD_TYPE_MANUFACTURER_SPECIFIC_DATA; + manuf_data[2] = 0x01; + manuf_data[3] = 0x00; + manuf_data[4] = 0x00; + manuf_data[5] = 0x00; + manuf_data[6] = 0x00; + manuf_data[7] = 0x00; + manuf_data[8] = 0x00; + manuf_data[9] = 0x00; + manuf_data[10] = 0x00; + manuf_data[11] = 0x00; + manuf_data[12] = 0x00; + manuf_data[13] = 0x00; + } + + SVCCTL_Init(); + + Ble_Hci_Gap_Gatt_Init(); + + if (global_svc_index == 1) + { + /** + * Initialize P2P Server Application + */ + P2PS_STM_Init(); + P2PS_APP_Init(); + /** + * Make device discoverable + */ + BleApplicationContext.BleApplicationContext_legacy.advtServUUID[0] = NULL; + BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen = 0; + + /* Initialize intervals for reconnexion without intervals update */ + AdvIntervalMin = CFG_FAST_CONN_ADV_INTERVAL_MIN; + AdvIntervalMax = CFG_FAST_CONN_ADV_INTERVAL_MAX; + } + else if (global_svc_index == 2) + { + /** + * Initialize DIS Application + */ + DISAPP_Init(); + /** + * Initialize HRS Application + */ + HRS_Init(); + HRSAPP_Init(); + /** + * Make device discoverable + */ + BleApplicationContext.BleApplicationContext_legacy.advtServUUID[0] = AD_TYPE_16_BIT_SERV_UUID; + BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen = 1; + Add_Advertisment_Service_UUID(HEART_RATE_SERVICE_UUID); + + /* Initialize intervals for reconnexion without intervals update */ + AdvIntervalMin = CFG_FAST_CONN_ADV_INTERVAL_MIN; + AdvIntervalMax = CFG_FAST_CONN_ADV_INTERVAL_MAX; + } + + Adv_Request(APP_BLE_FAST_ADV); + + return; +} + +static void Manage_Start_Stop_Adv_Init(void) +{ + tBleStatus result; + + /* stop advertising */ + if (global_adv_enable == 0) + { + result = aci_gap_set_non_discoverable(); + if (result == BLE_STATUS_SUCCESS) + { + printf("non discoverable, Successfully \r\n\r"); + } + else + { + printf("non discoverable, Failed \r\n\r"); + } + } + /* start advertising */ + else if (global_adv_enable == 1) + { + result = aci_gap_set_discoverable(global_adv_type, + global_adv_int_min, + global_adv_int_max, + global_ble_addr_type | global_ble_cfg_addr_type, + 0x00, + strlen(local_name_var), + (uint8_t*) &local_name_var, + BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen, + BleApplicationContext.BleApplicationContext_legacy.advtServUUID, 0x0000, 0x0000); + if (result == BLE_STATUS_SUCCESS) + { + printf("set discoverable, Successfully \r\n\r"); + } + else + { + printf("set discoverable, Failed 0x%x\r\n\r", result); + } + } + + return; +} + +static void Manage_Custom_Service_Init(void) +{ + tBleStatus result = BLE_STATUS_INVALID_PARAMS; + uint8_t service_uuid[16] = {0x8f, 0xe5, 0xb3, 0xd5, 0x2e, 0x7f, 0x4a, 0x98, 0x2a, 0x48, 0x7a, 0xcc, 0x00, 0x00, 0x00, 0x00}; + + service_uuid[12] = (uint8_t)(global_svc_uuid); + service_uuid[13] = (uint8_t)(global_svc_uuid >> 8); + + Custom_SVC_Init(); + + if (global_svc_uuid_type == UUID_TYPE_16) + { + result = aci_gatt_add_service(global_svc_uuid_type, (Service_UUID_t *)&global_svc_uuid, + PRIMARY_SERVICE, global_max_attr, &(Custom_Context.SvcHdle[global_svc_index - CUSTOM_APP_SVC_OFFSET])); + } + else if (global_svc_uuid_type == UUID_TYPE_128) + { + /* convert uuid_16b into uuid_128b */ + result = aci_gatt_add_service(global_svc_uuid_type, (Service_UUID_t *)service_uuid, + PRIMARY_SERVICE, global_max_attr, &(Custom_Context.SvcHdle[global_svc_index - CUSTOM_APP_SVC_OFFSET])); + } + if (result == BLE_STATUS_SUCCESS) + { + printf("Add service, Successfully \r\n\r"); + } + else + { + printf("Add service, Failed \r\n\r"); + } + + return; +} + +static void Manage_Ble_Init(void) +{ + manuf_data[0] = sizeof(manuf_data)-1; + manuf_data[1] = AD_TYPE_MANUFACTURER_SPECIFIC_DATA; + manuf_data[2] = 0x01; + manuf_data[3] = 0x00; + manuf_data[4] = 0x00; + manuf_data[5] = 0x00; + manuf_data[6] = 0x00; + manuf_data[7] = 0x00; + manuf_data[8] = 0x00; + manuf_data[9] = 0x00; + manuf_data[10] = 0x00; + manuf_data[11] = 0x00; + manuf_data[12] = 0x00; + manuf_data[13] = 0x00; + + Ble_Hci_Gap_Gatt_Init(); + + return; +} + +static void Manage_Charac_Init(void) +{ + tBleStatus result = BLE_STATUS_INVALID_PARAMS; + uint8_t char_uuid[16] = {0x19, 0xed, 0x82, 0xae, 0xed, 0x21, 0x4c, 0x9d, 0x41, 0x45, 0x22, 0x8e, 0x00, 0x00, 0x00, 0x00}; + + char_uuid[12] = (uint8_t)(global_char_uuid); + char_uuid[13] = (uint8_t)(global_char_uuid >> 8); + + if (global_char_uuid_type == UUID_TYPE_16) + { + result = aci_gatt_add_char( Custom_Context.SvcHdle[global_svc_id - CUSTOM_APP_SVC_OFFSET], global_char_uuid_type, (Char_UUID_t *)&global_char_uuid, global_char_value_len, + global_char_properties, global_char_sec_permission, global_gatt_event_mask, + 10, 1, &(Custom_Context.CharHdle[global_svc_id - CUSTOM_APP_SVC_OFFSET][global_char_id - 1])); + } + else if (global_char_uuid_type == UUID_TYPE_128) + { + /* convert uuid_16b into uuid_128b */ + result = aci_gatt_add_char( Custom_Context.SvcHdle[global_svc_id - CUSTOM_APP_SVC_OFFSET], global_char_uuid_type, (Char_UUID_t *)char_uuid, global_char_value_len, + global_char_properties, global_char_sec_permission, global_gatt_event_mask, + 10, 1, &(Custom_Context.CharHdle[global_svc_id - CUSTOM_APP_SVC_OFFSET][global_char_id - 1])); + } + if (result == BLE_STATUS_SUCCESS) + { + printf("Add characteristic, Successfully \r\n\r"); + } + else + { + printf("Add characteristic, Failed \r\n\r"); + } + + return; +} + +static void Manage_Slave_Security_Request(void) +{ + tBleStatus result; + + result = aci_gap_slave_security_req(BleApplicationContext.BleApplicationContext_legacy.connectionHandle); + if( result == BLE_STATUS_SUCCESS ) + { + printf("Slave_security_req(), Successfully \r\n\r"); + } + else + { + printf("Slave_security_req(), Failed \r\n\r"); + } + + return; +} + +static void Manage_Pairing_Confirm_Answer(void) +{ + tBleStatus result; + + result = aci_gap_numeric_comparison_value_confirm_yesno(BleApplicationContext.BleApplicationContext_legacy.connectionHandle, + global_pairing_confirm); + if( result == BLE_STATUS_SUCCESS ) + { + printf("Pairing_Confirm_Answer(), Successfully \r\n\r"); + } + else + { + printf("Pairing_Confirm_Answer(), Failed \r\n\r"); + } + + return; +} + +static void Manage_Pass_Key_Resp(void) +{ + tBleStatus result; + + result = aci_gap_pass_key_resp(BleApplicationContext.BleApplicationContext_legacy.connectionHandle, + global_pass_key_resp); + + if( result == BLE_STATUS_SUCCESS ) + { + printf("Pass_Key_Resp(), Successfully \r\n\r"); + } + else + { + printf("Pass_Key_Resp(), Failed \r\n\r"); + } + + return; +} + +static void Manage_IO_Capability(void) +{ + tBleStatus result; + + result = aci_gap_set_io_capability(global_io_capability); + if( result == BLE_STATUS_SUCCESS ) + { + printf("IO_Capability(), Successfully \r\n\r"); + } + else + { + printf("IO_Capability(), Failed \r\n\r"); + } + + return; +} + +static void Manage_set_authen_req(void) +{ + tBleStatus result; + + result = aci_gap_set_authentication_requirement(global_bonding,global_mitm,global_scsupport,0x00,0x07,0x10, + global_usefixedpin,global_fixedpin,global_addrtype); + if( result == BLE_STATUS_SUCCESS ) + { + printf("set_authentication_req(), Successfully \r\n\r"); + } + else + { + printf("set_authentication_req(), Failed \r\n\r"); + } + + return; +} + +static void Manage_clear_db(void) +{ + tBleStatus result; + + result = aci_gap_clear_security_db(); + if( result == BLE_STATUS_SUCCESS ) + { + printf("Clear_security_db(), Successfully \r\n\r"); + } + else + { + printf("Clear_security_db(), Failed \r\n\r"); + } + + return; +} + +static void Manage_hci_reset(void) +{ + hci_reset(); + + return; +} + +static void Manage_Update_Connection(void) +{ + tBleStatus result; + + result = aci_l2cap_connection_parameter_update_req(BleApplicationContext.BleApplicationContext_legacy.connectionHandle, + (uint16_t)(global_conn_int_min / 1.25f), + (uint16_t)(global_conn_int_max / 1.25f), + L2CAP_SLAVE_LATENCY, L2CAP_TIMEOUT_MULTIPLIER); + if( result == BLE_STATUS_SUCCESS ) + { + printf("BLE_SVC_L2CAP_Conn_Update(), Successfully \r\n\r"); + } + else + { + printf("BLE_SVC_L2CAP_Conn_Update(), Failed \r\n\r"); + } + + return; +} + +static void Manage_Update_Charac(void) +{ + tBleStatus result; + + if (global_notif_serv_index == 1) + { + if (global_notif_char_index == 2) + { + if (global_notif_val_tab[0] == 1) + { + P2PS_Send_Notification_ATcommand(); + } + } + } + else if (global_notif_serv_index == 2) + { + if (global_notif_char_index == 1) + { + HRSAPP_Context.MeasurementvalueChar.MeasurementValue = global_notif_val_tab[0]; + HRSAPP_Context.MeasurementvalueChar.EnergyExpended = 0; + } + else if (global_notif_char_index == 3) + { + HRSAPP_Context.MeasurementvalueChar.EnergyExpended = global_notif_val_tab[0]; + } + result = HRS_UpdateChar(HEART_RATE_MEASURMENT_UUID, (uint8_t*)&HRSAPP_Context.MeasurementvalueChar); + if (result == BLE_STATUS_SUCCESS) + { + printf("HRS_UpdateChar, Successfully \r\n\r"); + } + else + { + printf("HRS_UpdateChar, Failed \r\n\r"); + } + } + else + { + Custom_Send_Notification_ATcommand(); + } + + return; +} + +static void Manage_Indication_Update_Charac(void) +{ + Custom_Send_Indication_ATcommand(); + + return; +} +//#endif +/* USER CODE END FD_SPECIFIC_FUNCTIONS */ +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void hci_notify_asynch_evt(void* pdata) +{ + UTIL_SEQ_SetTask(1 << CFG_TASK_HCI_ASYNCH_EVT_ID, CFG_SCH_PRIO_0); + + return; +} + +void hci_cmd_resp_release(uint32_t flag) +{ + UTIL_SEQ_SetEvt(1 << CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID); + + return; +} + +void hci_cmd_resp_wait(uint32_t timeout) +{ + UTIL_SEQ_WaitEvt(1 << CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID); + + return; +} + +static void BLE_UserEvtRx( void * pPayload ) +{ + SVCCTL_UserEvtFlowStatus_t svctl_return_status; + tHCI_UserEvtRxParam *pParam; + + pParam = (tHCI_UserEvtRxParam *)pPayload; + + svctl_return_status = SVCCTL_UserEvtRx((void *)&(pParam->pckt->evtserial)); + if (svctl_return_status != SVCCTL_UserEvtFlowDisable) + { + pParam->status = HCI_TL_UserEventFlow_Enable; + } + else + { + pParam->status = HCI_TL_UserEventFlow_Disable; + } + + return; +} + +static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) +{ + uint32_t task_id_list; + + switch (status) + { + case HCI_TL_CmdBusy: + /** + * All tasks that may send an aci/hci commands shall be listed here + * This is to prevent a new command is sent while one is already pending + */ + task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; + UTIL_SEQ_PauseTask(task_id_list); + + break; + + case HCI_TL_CmdAvailable: + /** + * All tasks that may send an aci/hci commands shall be listed here + * This is to prevent a new command is sent while one is already pending + */ + task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; + UTIL_SEQ_ResumeTask(task_id_list); + + break; + + default: + break; + } + + return; +} + +void SVCCTL_ResumeUserEventFlow( void ) +{ + hci_resume_flow(); + + return; +} + +void SVCCTL_SvcInit(void) +{ + return; +} + +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ + +/* USER CODE END FD_WRAP_FUNCTIONS */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.h new file mode 100644 index 000000000..cccb9a652 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.h @@ -0,0 +1,235 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/app_ble.h + * Description : Application configuration file for BLE Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_BLE_H +#define APP_BLE_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "hci_tl.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ + + typedef enum + { + APP_BLE_IDLE, + APP_BLE_FAST_ADV, + APP_BLE_LP_ADV, + APP_BLE_SCAN, + APP_BLE_LP_CONNECTING, + APP_BLE_CONNECTED_SERVER, + APP_BLE_CONNECTED_CLIENT + } APP_BLE_ConnStatus_t; + + typedef struct + { + uint8_t *pPayload; + uint8_t Length; + } CUSTOMS_Payload_t; + + typedef enum + { + CUSTOM_NOTIFICATION_ENABLED, + CUSTOM_NOTIFICATION_DISABLED, + CUSTOM_INDICATION_ENABLED, + CUSTOM_INDICATION_DISABLED, + CUSTOM_WRITE_EVT, + CUSTOMS_STM_GATT_TX_POOL_AVAILABLE, + CUSTOMS_STM_DATA_RECEIVED, + CUSTOMS_MTU_EXCHANGED, + } CUSTOMS_NotCode_t; + + typedef struct + { + uint8_t ATT_MTU_exchanged; + uint8_t service_index; + uint8_t charac_index; + uint8_t length; + uint8_t charac_value[245]; + CUSTOMS_NotCode_t Evt_Opcode; + CUSTOMS_Payload_t DataTransfered; + } CUSTOMS_App_Notification_evt_t; + + /** + * security parameters structure + */ +typedef struct _tSecurityParams +{ + /** + * IO capability of the device + */ + uint8_t ioCapability; + + /** + * Authentication requirement of the device + * Man In the Middle protection required? + */ + uint8_t mitm_mode; + + /** + * bonding mode of the device + */ + uint8_t bonding_mode; + + uint8_t sc_support; + + /** + * this variable indicates whether to use a fixed pin + * during the pairing process or a passkey has to be + * requested to the application during the pairing process + * 0 implies use fixed pin and 1 implies request for passkey + */ + uint8_t Use_Fixed_Pin; + + /** + * minimum encryption key size requirement + */ + uint8_t encryptionKeySizeMin; + + /** + * maximum encryption key size requirement + */ + uint8_t encryptionKeySizeMax; + + /** + * fixed pin to be used in the pairing process if + * Use_Fixed_Pin is set to 1 + */ + uint32_t Fixed_Pin; + + /** + * this flag indicates whether the host has to initiate + * the security, wait for pairing or does not have any security + * requirements.\n + * 0x00 : no security required + * 0x01 : host should initiate security by sending the slave security + * request command + * 0x02 : host need not send the clave security request but it + * has to wait for paiirng to complete before doing any other + * processing + */ + uint8_t initiateSecurity; +}tSecurityParams; + + /** + * global context + * contains the variables common to all + * services + */ +typedef struct _tBLEProfileGlobalContext +{ + + /** + * security requirements of the host + */ + tSecurityParams bleSecurityParam; + + /** + * gap service handle + */ + uint16_t gapServiceHandle; + + /** + * device name characteristic handle + */ + uint16_t devNameCharHandle; + + /** + * appearance characteristic handle + */ + uint16_t appearanceCharHandle; + + /** + * connection handle of the current active connection + * When not in connection, the handle is set to 0xFFFF + */ + uint16_t connectionHandle; + + /** + * length of the UUID list to be used while advertising + */ + uint8_t advtServUUIDlen; + + /** + * the UUID list to be used while advertising + */ + uint8_t advtServUUID[100]; + +}BleGlobalContext_t; + + typedef struct + { + BleGlobalContext_t BleApplicationContext_legacy; + APP_BLE_ConnStatus_t Device_Connection_Status; + + /** + * ID of the Advertising Timeout + */ + uint8_t Advertising_mgr_timer_Id; + + uint8_t SwitchOffGPIO_timer_Id; + }BleApplicationContext_t; +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void APP_BLE_Init( void ); + + APP_BLE_ConnStatus_t APP_BLE_Get_Server_Connection_Status(void); + void CUSTOMS_Notification( CUSTOMS_App_Notification_evt_t *pNotification ); + +/* USER CODE BEGIN EF */ +void APP_BLE_Key_Button1_Action(void); +void APP_BLE_Key_Button2_Action(void); +void APP_BLE_Key_Button3_Action(void); + +/* USER CODE END EF */ + +#ifdef __cplusplus +} +#endif + +#endif /*APP_BLE_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_conf.h new file mode 100644 index 000000000..de2a98ad3 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_conf.h @@ -0,0 +1,104 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/ble_conf.h + * Description : Configuration file for BLE Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef BLE_CONF_H +#define BLE_CONF_H + +#include "app_conf.h" + +/****************************************************************************** + * + * BLE SERVICES CONFIGURATION + * blesvc + * + ******************************************************************************/ + + /** + * This setting shall be set to '1' if the device needs to support the Peripheral Role + * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' + */ +#define BLE_CFG_PERIPHERAL 1 + +/** + * This setting shall be set to '1' if the device needs to support the Central Role + * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' + */ +#define BLE_CFG_CENTRAL 0 + +/** + * There is one handler per service enabled + * Note: There is no handler for the Device Information Service + * + * This shall take into account all registered handlers + * (from either the provided services or the custom services) + */ +#define BLE_CFG_SVC_MAX_NBR_CB 7 + +#define BLE_CFG_CLT_MAX_NBR_CB 0 + +/****************************************************************************** + * Device Information Service (DIS) + ******************************************************************************/ +/**< Options: Supported(1) or Not Supported(0) */ +#define BLE_CFG_DIS_MANUFACTURER_NAME_STRING 1 +#define BLE_CFG_DIS_MODEL_NUMBER_STRING 0 +#define BLE_CFG_DIS_SERIAL_NUMBER_STRING 0 +#define BLE_CFG_DIS_HARDWARE_REVISION_STRING 0 +#define BLE_CFG_DIS_FIRMWARE_REVISION_STRING 0 +#define BLE_CFG_DIS_SOFTWARE_REVISION_STRING 0 +#define BLE_CFG_DIS_SYSTEM_ID 0 +#define BLE_CFG_DIS_IEEE_CERTIFICATION 0 +#define BLE_CFG_DIS_PNP_ID 0 + +/** + * device information service characteristic lengths + */ +#define BLE_CFG_DIS_SYSTEM_ID_LEN_MAX (8) +#define BLE_CFG_DIS_MODEL_NUMBER_STRING_LEN_MAX (32) +#define BLE_CFG_DIS_SERIAL_NUMBER_STRING_LEN_MAX (32) +#define BLE_CFG_DIS_FIRMWARE_REVISION_STRING_LEN_MAX (32) +#define BLE_CFG_DIS_HARDWARE_REVISION_STRING_LEN_MAX (32) +#define BLE_CFG_DIS_SOFTWARE_REVISION_STRING_LEN_MAX (32) +#define BLE_CFG_DIS_MANUFACTURER_NAME_STRING_LEN_MAX (32) +#define BLE_CFG_DIS_IEEE_CERTIFICATION_LEN_MAX (32) +#define BLE_CFG_DIS_PNP_ID_LEN_MAX (7) + +/****************************************************************************** + * Heart Rate Service (HRS) + ******************************************************************************/ +#define BLE_CFG_HRS_BODY_SENSOR_LOCATION_CHAR 1/**< BODY SENSOR LOCATION CHARACTERISTIC */ +#define BLE_CFG_HRS_ENERGY_EXPENDED_INFO_FLAG 1/**< ENERGY EXTENDED INFO FLAG */ +#define BLE_CFG_HRS_ENERGY_RR_INTERVAL_FLAG 1/**< Max number of RR interval values - Shall not be greater than 9 */ + +/****************************************************************************** + * GAP Service - Appearance + ******************************************************************************/ + +#define BLE_CFG_UNKNOWN_APPEARANCE (0) +#define BLE_CFG_HR_SENSOR_APPEARANCE (832) +#define BLE_CFG_GAP_APPEARANCE (BLE_CFG_HR_SENSOR_APPEARANCE) + +/****************************************************************************** + * Over The Air Feature (OTA) - STM Proprietary + ******************************************************************************/ +#define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ + +#endif /*BLE_CONF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_dbg_conf.h new file mode 100644 index 000000000..fad0eaf47 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/ble_dbg_conf.h @@ -0,0 +1,199 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/ble_dbg_conf.h + * Description : Debug configuration file for BLE Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __BLE_DBG_CONF_H +#define __BLE_DBG_CONF_H + +/** + * Enable or Disable traces from BLE + */ + +#define BLE_DBG_APP_EN 0 +#define BLE_DBG_DIS_EN 0 +#define BLE_DBG_HRS_EN 0 +#define BLE_DBG_SVCCTL_EN 0 +#define BLE_DBG_BLS_EN 0 +#define BLE_DBG_HTS_EN 0 +#define BLE_DBG_P2P_STM_EN 0 + +/** + * Macro definition + */ +#if ( BLE_DBG_APP_EN != 0 ) +#define BLE_DBG_APP_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_APP_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_DIS_EN != 0 ) +#define BLE_DBG_DIS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_DIS_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_HRS_EN != 0 ) +#define BLE_DBG_HRS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HRS_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_P2P_STM_EN != 0 ) +#define BLE_DBG_P2P_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_P2P_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_TEMPLATE_STM_EN != 0 ) +#define BLE_DBG_TEMPLATE_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_TEMPLATE_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_EDS_STM_EN != 0 ) +#define BLE_DBG_EDS_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_EDS_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_LBS_STM_EN != 0 ) +#define BLE_DBG_LBS_STM_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LBS_STM_MSG PRINT_NO_MESG +#endif + +#if ( BLE_DBG_SVCCTL_EN != 0 ) +#define BLE_DBG_SVCCTL_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_SVCCTL_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_CTS_EN != 0) +#define BLE_DBG_CTS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_CTS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HIDS_EN != 0) +#define BLE_DBG_HIDS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HIDS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_PASS_EN != 0) +#define BLE_DBG_PASS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_PASS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_BLS_EN != 0) +#define BLE_DBG_BLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_BLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HTS_EN != 0) +#define BLE_DBG_HTS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HTS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_ANS_EN != 0) +#define BLE_DBG_ANS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_ANS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_ESS_EN != 0) +#define BLE_DBG_ESS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_ESS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_GLS_EN != 0) +#define BLE_DBG_GLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_GLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_BAS_EN != 0) +#define BLE_DBG_BAS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_BAS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_RTUS_EN != 0) +#define BLE_DBG_RTUS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_RTUS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_HPS_EN != 0) +#define BLE_DBG_HPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_HPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_TPS_EN != 0) +#define BLE_DBG_TPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_TPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_LLS_EN != 0) +#define BLE_DBG_LLS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LLS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_IAS_EN != 0) +#define BLE_DBG_IAS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_IAS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_WSS_EN != 0) +#define BLE_DBG_WSS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_WSS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_LNS_EN != 0) +#define BLE_DBG_LNS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_LNS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_SCPS_EN != 0) +#define BLE_DBG_SCPS_MSG PRINT_MESG_DBG +#else +#define BLE_DBG_SCPS_MSG PRINT_NO_MESG +#endif + +#if (BLE_DBG_DTS_EN != 0) +#define BLE_DBG_DTS_MSG PRINT_MESG_DBG +#define BLE_DBG_DTS_BUF PRINT_LOG_BUFF_DBG +#else +#define BLE_DBG_DTS_MSG PRINT_NO_MESG +#define BLE_DBG_DTS_BUF PRINT_NO_MESG +#endif + +#endif /*__BLE_DBG_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.c new file mode 100644 index 000000000..63fee2ee9 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.c @@ -0,0 +1,296 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/custom.c + * Description : Application file for BLE Middleware. + * + ***************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +#include "app_common.h" + +#include "dbg_trace.h" +#include "ble.h" +#include "tl.h" +#include "app_ble.h" + +#include "stm32_seq.h" +#include "shci.h" +#include "stm32_lpm.h" +#include "otp.h" +#include "p2p_server_app.h" +#include "stm32wb_at_ble.h" +#include "ble_at_server.h" +#include "custom_app.h" +#include "custom.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ + +/* USER CODE BEGIN PTD */ +typedef enum +{ + CUSTOMS_NOTIFICATION_MASK = (1 << 0), + CUSTOMS_INDICATION_MASK = (1 << 1), +} ClientCharConfMask_t; + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define APPBLE_GAP_DEVICE_NAME_LENGTH 7 +#define FAST_ADV_TIMEOUT (30*1000*1000/CFG_TS_TICK_VAL) /**< 30s */ +#define INITIAL_ADV_TIMEOUT (60*1000*1000/CFG_TS_TICK_VAL) /**< 60s */ + +#define BD_ADDR_SIZE_LOCAL 6 + +/* USER CODE BEGIN PD */ +#define LED_ON_TIMEOUT (0.005*1000*1000/CFG_TS_TICK_VAL) /**< 5ms */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ +extern BleApplicationContext_t BleApplicationContext; +extern Custom_Context_t Custom_Context; +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +static SVCCTL_EvtAckStatus_t Custom_Event_Handler(void *pckt); + +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ + +static SVCCTL_EvtAckStatus_t Custom_Event_Handler(void *Event) +{ + hci_event_pckt *event_pckt; + evt_blecore_aci *blecore_evt; + aci_att_exchange_mtu_resp_event_rp0 *exchange_mtu_resp; + aci_gatt_attribute_modified_event_rp0 *attribute_modified; + tBleStatus result; + SVCCTL_EvtAckStatus_t return_value; + + CUSTOMS_App_Notification_evt_t Notification; + + return_value = SVCCTL_EvtNotAck; + event_pckt = (hci_event_pckt *)(((hci_uart_pckt*)Event)->data); + + /* USER CODE BEGIN Custom_Event_Handler */ + + /* USER CODE END Custom_Event_Handler */ + + switch (event_pckt->evt) + { + case HCI_VENDOR_SPECIFIC_DEBUG_EVT_CODE: + blecore_evt = (evt_blecore_aci*) event_pckt->data; + /* USER CODE BEGIN EVT_VENDOR */ + + /* USER CODE END EVT_VENDOR */ + switch (blecore_evt->ecode) + { + /* USER CODE BEGIN ecode */ + + case EVT_BLUE_ATT_EXCHANGE_MTU_RESP: + { + printf("EVT_BLUE_ATT_EXCHANGE_MTU_RESP \n"); + exchange_mtu_resp = (aci_att_exchange_mtu_resp_event_rp0 *)blecore_evt->data; + printf("MTU_size = %d \n",exchange_mtu_resp->Server_RX_MTU ); + result = hci_le_set_data_length(BleApplicationContext.BleApplicationContext_legacy.connectionHandle,251,2120); + if (result != BLE_STATUS_SUCCESS) + { + printf("set data length command error %x \n", result); + } + else + { + printf("set data length command success \n"); + } + } + break; + case EVT_BLUE_GATT_ATTRIBUTE_MODIFIED: + { + uint8_t i; + uint8_t id_svc; + uint8_t id_char; + + attribute_modified = (aci_gatt_attribute_modified_event_rp0*) blecore_evt->data; + + for (id_svc=3;id_svc<6;id_svc++) + { + for (id_char=0;id_char<5;id_char++) + { + if (attribute_modified->Attr_Handle == (Custom_Context.CharHdle[id_svc-3][id_char-1] + 2)) + { + return_value = SVCCTL_EvtAckFlowEnable; + /** + * Notify to application to start measurement + */ + if (attribute_modified->Attr_Data[0] & CUSTOMS_NOTIFICATION_MASK) + { + APP_DBG_MSG("svc: %d char:%d NOTIFICATION ENABLED \n", id_svc, id_char); + Notification.Evt_Opcode = CUSTOM_NOTIFICATION_ENABLED; + CUSTOMS_Notification(&Notification); + } + else if (attribute_modified->Attr_Data[0] & CUSTOMS_INDICATION_MASK) + { + APP_DBG_MSG("svc: %d char:%d INDICATION ENABLED \n", id_svc, id_char); + Notification.Evt_Opcode = CUSTOM_INDICATION_ENABLED; + CUSTOMS_Notification(&Notification); + } + else + { + Notification.Evt_Opcode = CUSTOM_INDICATION_DISABLED; + CUSTOMS_Notification(&Notification); + } + } + } + } + + for (id_svc=3;id_svc<6;id_svc++) + { + for (id_char=0;id_char<5;id_char++) + { + if(attribute_modified->Attr_Handle == (Custom_Context.CharHdle[id_svc-3][id_char-1] + 1)) + { + return_value = SVCCTL_EvtAckFlowEnable; + printf("WRITE CHARAC svc: %d char: %d - LENGTH = %d \n", id_svc, id_char, attribute_modified->Attr_Data_Length); + printf("Reception : "); + for (i = 0; i < attribute_modified->Attr_Data_Length; i++) + { + printf("Data[%x] = 0x%x ", i, attribute_modified->Attr_Data[i]); + } + printf(" \r\n"); + Notification.service_index = id_svc; + Notification.charac_index = id_char; + Notification.length = attribute_modified->Attr_Data_Length; + for (i = 0; i < attribute_modified->Attr_Data_Length; i++) + { + Notification.charac_value[i] = attribute_modified->Attr_Data[i]; + } + Notification.Evt_Opcode = CUSTOM_WRITE_EVT; + CUSTOMS_Notification(&Notification); + } + } + } + } + break; + case ACI_GATT_WRITE_PERMIT_REQ_VSEVT_CODE: + { + uint8_t i; + uint8_t id_svc; + uint8_t id_char; + + aci_gatt_write_permit_req_event_rp0 * write_perm_req; + write_perm_req = (aci_gatt_write_permit_req_event_rp0*)blecore_evt->data; + for (id_svc=3;id_svc<6;id_svc++) + { + for (id_char=0;id_char<5;id_char++) + { + if(write_perm_req->Attribute_Handle == (Custom_Context.CharHdle[id_svc-3][id_char-1] + 1)) + { + return_value = SVCCTL_EvtAckFlowEnable; + printf("WRITE PERMIT REQ CHARAC svc: %d char: %d - LENGTH = %d \n", id_svc, id_char, write_perm_req->Data_Length); + printf("Reception : "); + for (i = 0; i < write_perm_req->Data_Length; i++) + { + printf("Data[%x] = 0x%x ", i, write_perm_req->Data[i]); + } + printf(" \r\n"); + Notification.service_index = id_svc; + Notification.charac_index = id_char; + Notification.length = write_perm_req->Data_Length; + for (i = 0; i < write_perm_req->Data_Length; i++) + { + Notification.charac_value[i] = write_perm_req->Data[i]; + } + return_value = SVCCTL_EvtAckFlowEnable; + aci_gatt_write_resp(write_perm_req->Connection_Handle, + write_perm_req->Attribute_Handle, + 0x00, /* write_status = 0 (no error))*/ + 0x00, /* err_code */ + write_perm_req->Data_Length, + (uint8_t *)&(write_perm_req->Data[0])); + Notification.Evt_Opcode = CUSTOM_WRITE_EVT; + CUSTOMS_Notification(&Notification); + } + } + } + } + break; + + /* USER CODE END ecode */ +#if(RADIO_ACTIVITY_EVENT != 0) + case ACI_HAL_END_OF_RADIO_ACTIVITY_VSEVT_CODE: + /* USER CODE BEGIN RADIO_ACTIVITY_EVENT*/ + BSP_LED_On(LED_GREEN); + HW_TS_Start(BleApplicationContext.SwitchOffGPIO_timer_Id, (uint32_t)LED_ON_TIMEOUT); + /* USER CODE END RADIO_ACTIVITY_EVENT*/ + break; /* ACI_HAL_END_OF_RADIO_ACTIVITY_VSEVT_CODE */ +#endif + + /* USER CODE BEGIN BLUE_EVT */ + + /* USER CODE END BLUE_EVT */ + } + break; /* HCI_VENDOR_SPECIFIC_DEBUG_EVT_CODE */ + + /* USER CODE BEGIN EVENT_PCKT */ + + /* USER CODE END EVENT_PCKT */ + + default: + /* USER CODE BEGIN ECODE_DEFAULT*/ + + /* USER CODE END ECODE_DEFAULT*/ + break; + } + + return(return_value); +} + +/** + * @brief Service initialization + * @param None + * @retval None + */ +void Custom_SVC_Init(void) +{ + /** + * Register the event handler to the BLE controller + */ + SVCCTL_RegisterSvcHandler(Custom_Event_Handler); + + return; +} +/* USER CODE END FD*/ + +/* USER CODE END FD_SPECIFIC_FUNCTIONS */ + +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ + +/* USER CODE END FD_WRAP_FUNCTIONS */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.h new file mode 100644 index 000000000..afc207b1f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom.h @@ -0,0 +1,68 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/custom_app.h + * Description : Header for custom_app.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __CUSTOM_H +#define __CUSTOM_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +void Custom_SVC_Init(void); + +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} +#endif + +#endif /*__CUSTOM_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.c new file mode 100644 index 000000000..d7415c075 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.c @@ -0,0 +1,150 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/custon_app.c + * Description : Custom Service Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" + +#include "ble.h" +#include "hrs_app.h" +#include "stm32_seq.h" +#include "app_ble.h" +#include "stm32wb_at_ble.h" +#include "custom_app.h" +#include "ble_at_server.h" + +extern Custom_Context_t Custom_Context; +extern uint8_t global_notif_serv_index; +extern uint8_t global_notif_char_index; +extern uint8_t global_notif_val_tab[64]; +extern uint8_t global_notif_val_tab_len; +extern uint8_t global_indic_serv_index; +extern uint8_t global_indic_char_index; +extern uint8_t global_indic_val_tab[64]; +extern uint8_t global_indic_val_tab_len; +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ + +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ + +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/** + * START of Section BLE_APP_CONTEXT + */ + +//PLACE_IN_SECTION("BLE_APP_CONTEXT") HRSAPP_Context_t HRSAPP_Context; + +/** + * END of Section BLE_APP_CONTEXT + */ + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private functions prototypes-----------------------------------------------*/ + +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void CUSTOMS_Notification( CUSTOMS_App_Notification_evt_t *pNotification ) +{ + stm32wb_at_BLE_EVT_WRITE_t param_BLE_EVT_WRITE; + uint8_t i; + + switch (pNotification->Evt_Opcode) + { + case CUSTOM_NOTIFICATION_ENABLED: + printf("custom_app notification enabled \r\n"); + break; + + case CUSTOM_NOTIFICATION_DISABLED: + printf("custom_app notification disabled \r\n"); + break; + + case CUSTOM_INDICATION_ENABLED: + printf("custom_app indication enabled \r\n"); + break; + + case CUSTOM_INDICATION_DISABLED: + printf("custom_app indication or notification disabled \r\n"); + break; + + case CUSTOM_WRITE_EVT: + param_BLE_EVT_WRITE.svc_index = pNotification->service_index; + param_BLE_EVT_WRITE.char_index = pNotification->charac_index; + param_BLE_EVT_WRITE.val_tab_len = pNotification->length; + for (i = 0; i < param_BLE_EVT_WRITE.val_tab_len; i++) + { + param_BLE_EVT_WRITE.val_tab[i] = pNotification->charac_value[i]; + } + ble_at_server_Send_evt(BLE_EVT_WRITE, ¶m_BLE_EVT_WRITE); + break; + + default: + break; + } + + return; +} + +void Custom_Send_Notification_ATcommand(void) +{ + aci_gatt_update_char_value(Custom_Context.SvcHdle[global_notif_serv_index - CUSTOM_APP_SVC_OFFSET], + Custom_Context.CharHdle[global_notif_serv_index - CUSTOM_APP_SVC_OFFSET][global_notif_char_index - 1], + 0, /* charValOffset */ + global_notif_val_tab_len, /* charValueLen */ + &global_notif_val_tab[0]); + + return; +} + +void Custom_Send_Indication_ATcommand(void) +{ + aci_gatt_update_char_value(Custom_Context.SvcHdle[global_notif_serv_index - CUSTOM_APP_SVC_OFFSET], + Custom_Context.CharHdle[global_indic_serv_index - CUSTOM_APP_SVC_OFFSET][global_indic_char_index - 1], + 0, /* charValOffset */ + global_indic_val_tab_len, /* charValueLen */ + &global_indic_val_tab[0]); + + return; +} + +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.h new file mode 100644 index 000000000..3f40a2734 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.h @@ -0,0 +1,78 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/custom_app.h + * Description : Header for custom_app.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __CUSTOM_APP_H +#define __CUSTOM_APP_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define CUSTOM_APP_SVC_OFFSET 3 +#define CUSTOM_APP_SVC_COUNT 5 +#define CUSTOM_APP_CHAR_COUNT 5 + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ + +/* USER CODE BEGIN ET */ +typedef struct +{ + uint16_t SvcHdle[CUSTOM_APP_SVC_COUNT]; + uint16_t CharHdle[CUSTOM_APP_SVC_COUNT][CUSTOM_APP_CHAR_COUNT]; +} Custom_Context_t; + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + +/* USER CODE BEGIN EF */ + void Custom_Send_Notification_ATcommand(void); + void Custom_Send_Indication_ATcommand(void); + +/* USER CODE END EF */ + +#ifdef __cplusplus +} +#endif + +#endif /*__CUSTOM_APP_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.c new file mode 100644 index 000000000..c7c8e1f2f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.c @@ -0,0 +1,218 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/dis_app.c + * Description : Device Information Service Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "ble.h" +#include "dis_app.h" + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +#if ((BLE_CFG_DIS_SYSTEM_ID != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) +static const uint8_t system_id[BLE_CFG_DIS_SYSTEM_ID_LEN_MAX] = +{ + (uint8_t)((DISAPP_MANUFACTURER_ID & 0xFF0000) >> 16), + (uint8_t)((DISAPP_MANUFACTURER_ID & 0x00FF00) >> 8), + (uint8_t)(DISAPP_MANUFACTURER_ID & 0x0000FF), + 0xFE, + 0xFF, + (uint8_t)((DISAPP_OUI & 0xFF0000) >> 16), + (uint8_t)((DISAPP_OUI & 0x00FF00) >> 8), + (uint8_t)(DISAPP_OUI & 0x0000FF) +}; +#endif + +#if ((BLE_CFG_DIS_IEEE_CERTIFICATION != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) +static const uint8_t ieee_id[BLE_CFG_DIS_IEEE_CERTIFICATION_LEN_MAX] = +{ + 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, + 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, + 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, + 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, +}; +#endif +#if ((BLE_CFG_DIS_PNP_ID != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) +static const uint8_t pnp_id[BLE_CFG_DIS_PNP_ID_LEN_MAX] = +{ + 0x1, + 0xAD, 0xDE, + 0xDE, 0xDA, + 0x01, 0x00 +}; +#endif +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void DISAPP_Init(void) +{ +/* USER CODE BEGIN DISAPP_Init */ + DIS_Data_t dis_information_data; + +#if ((BLE_CFG_DIS_MANUFACTURER_NAME_STRING != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + /** + * Update MANUFACTURER NAME Information + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t*)DISAPP_MANUFACTURER_NAME; + dis_information_data.Length = sizeof(DISAPP_MANUFACTURER_NAME); + DIS_UpdateChar(MANUFACTURER_NAME_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_MODEL_NUMBER_STRING != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + /** + * Update MODEL NUMBERInformation + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t*)DISAPP_MODEL_NUMBER; + dis_information_data.Length = sizeof(DISAPP_MODEL_NUMBER); + DIS_UpdateChar(MODEL_NUMBER_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_SERIAL_NUMBER_STRING != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + /** + * Update SERIAL NUMBERInformation + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t*)DISAPP_SERIAL_NUMBER; + dis_information_data.Length = sizeof(DISAPP_SERIAL_NUMBER); + DIS_UpdateChar(SERIAL_NUMBER_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_HARDWARE_REVISION_STRING != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + /** + * Update HARDWARE REVISION NUMBERInformation + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t*)DISAPP_HARDWARE_REVISION_NUMBER; + dis_information_data.Length = sizeof(DISAPP_HARDWARE_REVISION_NUMBER); + DIS_UpdateChar(HARDWARE_REVISION_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_FIRMWARE_REVISION_STRING != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + /** + * Update FIRMWARE REVISION NUMBERInformation + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t*)DISAPP_FIRMWARE_REVISION_NUMBER; + dis_information_data.Length = sizeof(DISAPP_FIRMWARE_REVISION_NUMBER); + DIS_UpdateChar(FIRMWARE_REVISION_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_SOFTWARE_REVISION_STRING != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + /** + * Update SOFTWARE REVISION NUMBERInformation + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t*)DISAPP_SOFTWARE_REVISION_NUMBER; + dis_information_data.Length = sizeof(DISAPP_SOFTWARE_REVISION_NUMBER); + DIS_UpdateChar(SOFTWARE_REVISION_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_SYSTEM_ID != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + + /** + * Update SYSTEM ID Information + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t *)system_id; + dis_information_data.Length = BLE_CFG_DIS_SYSTEM_ID_LEN_MAX; + DIS_UpdateChar(SYSTEM_ID_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_IEEE_CERTIFICATION != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + + /** + * Update IEEE CERTIFICATION ID Information + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t *)ieee_id; + dis_information_data.Length = BLE_CFG_DIS_IEEE_CERTIFICATION_LEN_MAX; + DIS_UpdateChar(IEEE_CERTIFICATION_UUID, &dis_information_data); +#endif + +#if ((BLE_CFG_DIS_PNP_ID != 0) || (CFG_MENU_DEVICE_INFORMATION != 0)) + + /** + * Update PNP ID Information + * + * @param UUID + * @param pPData + * @return + */ + dis_information_data.pPayload = (uint8_t *)pnp_id; + dis_information_data.Length = BLE_CFG_DIS_PNP_ID_LEN_MAX; + DIS_UpdateChar(PNP_ID_UUID, &dis_information_data); +#endif +/* USER CODE END DISAPP_Init */ +} + +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.h new file mode 100644 index 000000000..138e1c0bc --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.h @@ -0,0 +1,75 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/dis_app.h + * Description : Entry application source file for BLE Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __DIS_APP_H +#define __DIS_APP_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros -----------------------------------------------------------*/ +#define DISAPP_MANUFACTURER_NAME "STM" +#define DISAPP_MODEL_NUMBER "4502-1.0" +#define DISAPP_SERIAL_NUMBER "1.0" +#define DISAPP_HARDWARE_REVISION_NUMBER "1.0" +#define DISAPP_FIRMWARE_REVISION_NUMBER "1.0" +#define DISAPP_SOFTWARE_REVISION_NUMBER "1.0" +#define DISAPP_OUI 0x123456 +#define DISAPP_MANUFACTURER_ID 0x9ABCDE +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ------------------------------------------------------- */ +void DISAPP_Init(void); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} +#endif + +#endif /*__DIS_APP_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.c new file mode 100644 index 000000000..facf67782 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.c @@ -0,0 +1,213 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/hrs_app.c + * Description : Heart Rate Service Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" + +#include "ble.h" +#include "hrs_app.h" +#include "stm32_seq.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +//typedef struct +//{ +// HRS_BodySensorLocation_t BodySensorLocationChar; +// HRS_MeasVal_t MeasurementvalueChar; +// uint8_t ResetEnergyExpended; +// uint8_t TimerMeasurement_Id; +// +//} HRSAPP_Context_t; +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +#define HRSAPP_MEASUREMENT_INTERVAL (1000000/CFG_TS_TICK_VAL) /**< 1s */ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/** + * START of Section BLE_APP_CONTEXT + */ + +PLACE_IN_SECTION("BLE_APP_CONTEXT") HRSAPP_Context_t HRSAPP_Context; + +/** + * END of Section BLE_APP_CONTEXT + */ + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private functions prototypes-----------------------------------------------*/ +//static void HrMeas( void ); +static void HRSAPP_Measurement(void); +static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void HRS_Notification(HRS_App_Notification_evt_t *pNotification) +{ +/* USER CODE BEGIN HRS_Notification_1 */ + +/* USER CODE END HRS_Notification_1 */ + switch(pNotification->HRS_Evt_Opcode) + { +/* USER CODE BEGIN HRS_Notification_HRS_Evt_Opcode */ + +/* USER CODE END HRS_Notification_HRS_Evt_Opcode */ +#if (BLE_CFG_HRS_ENERGY_EXPENDED_INFO_FLAG != 0) + case HRS_RESET_ENERGY_EXPENDED_EVT: +/* USER CODE BEGIN HRS_RESET_ENERGY_EXPENDED_EVT */ + HRSAPP_Context.MeasurementvalueChar.EnergyExpended = 0; + HRSAPP_Context.ResetEnergyExpended = 1; +/* USER CODE END HRS_RESET_ENERGY_EXPENDED_EVT */ + break; +#endif + + case HRS_NOTIFICATION_ENABLED: +/* USER CODE BEGIN HRS_NOTIFICATION_ENABLED */ + /** + * It could be the enable notification is received twice without the disable notification in between + */ +// HW_TS_Stop(HRSAPP_Context.TimerMeasurement_Id); +// HW_TS_Start(HRSAPP_Context.TimerMeasurement_Id, HRSAPP_MEASUREMENT_INTERVAL); +/* USER CODE END HRS_NOTIFICATION_ENABLED */ + break; + + case HRS_NOTIFICATION_DISABLED: +/* USER CODE BEGIN HRS_NOTIFICATION_DISABLED */ +// HW_TS_Stop(HRSAPP_Context.TimerMeasurement_Id); +/* USER CODE END HRS_NOTIFICATION_DISABLED */ + break; + +#if (BLE_CFG_OTA_REBOOT_CHAR != 0) + case HRS_STM_BOOT_REQUEST_EVT: +/* USER CODE BEGIN HRS_STM_BOOT_REQUEST_EVT */ + *(uint32_t*)SRAM1_BASE = *(uint32_t*)pNotification->DataTransfered.pPayload; + NVIC_SystemReset(); +/* USER CODE END HRS_STM_BOOT_REQUEST_EVT */ + break; +#endif + + default: +/* USER CODE BEGIN HRS_Notification_Default */ + +/* USER CODE END HRS_Notification_Default */ + break; + } +/* USER CODE BEGIN HRS_Notification_2 */ + +/* USER CODE END HRS_Notification_2 */ + return; +} + +void HRSAPP_Init(void) +{ + UTIL_SEQ_RegTask( 1<< CFG_TASK_MEAS_REQ_ID, UTIL_SEQ_RFU, HRSAPP_Measurement ); +/* USER CODE BEGIN HRSAPP_Init */ + /** + * Set Body Sensor Location + */ + HRSAPP_Context.ResetEnergyExpended = 0; + HRSAPP_Context.BodySensorLocationChar = HRS_BODY_SENSOR_LOCATION_HAND; + HRS_UpdateChar(SENSOR_LOCATION_UUID, (uint8_t *)&HRSAPP_Context.BodySensorLocationChar); + + + /** + * Set Flags for measurement value + */ + + HRSAPP_Context.MeasurementvalueChar.Flags = ( HRS_HRM_VALUE_FORMAT_UINT16 | + HRS_HRM_SENSOR_CONTACTS_PRESENT | + HRS_HRM_SENSOR_CONTACTS_SUPPORTED | + HRS_HRM_ENERGY_EXPENDED_PRESENT | + HRS_HRM_RR_INTERVAL_PRESENT ); + +#if (BLE_CFG_HRS_ENERGY_EXPENDED_INFO_FLAG != 0) + if(HRSAPP_Context.MeasurementvalueChar.Flags & HRS_HRM_ENERGY_EXPENDED_PRESENT) + HRSAPP_Context.MeasurementvalueChar.EnergyExpended = 10; +#endif + +#if (BLE_CFG_HRS_ENERGY_RR_INTERVAL_FLAG != 0) + if(HRSAPP_Context.MeasurementvalueChar.Flags & HRS_HRM_RR_INTERVAL_PRESENT) + { + uint8_t i; + + HRSAPP_Context.MeasurementvalueChar.NbreOfValidRRIntervalValues = BLE_CFG_HRS_ENERGY_RR_INTERVAL_FLAG; + for(i = 0; i < BLE_CFG_HRS_ENERGY_RR_INTERVAL_FLAG; i++) + HRSAPP_Context.MeasurementvalueChar.aRRIntervalValues[i] = 1024; + } +#endif + + /** + * Create timer for Heart Rate Measurement + */ +// HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(HRSAPP_Context.TimerMeasurement_Id), hw_ts_Repeated, HrMeas); + +/* USER CODE END HRSAPP_Init */ + return; +} + +static void HRSAPP_Measurement(void) +{ +/* USER CODE BEGIN HRSAPP_Measurement */ + uint32_t measurement; + + measurement = ((HRSAPP_Read_RTC_SSR_SS()) & 0x07) + 65; + + HRSAPP_Context.MeasurementvalueChar.MeasurementValue = measurement; +#if (BLE_CFG_HRS_ENERGY_EXPENDED_INFO_FLAG != 0) + if((HRSAPP_Context.MeasurementvalueChar.Flags & HRS_HRM_ENERGY_EXPENDED_PRESENT) && + (HRSAPP_Context.ResetEnergyExpended == 0)) + HRSAPP_Context.MeasurementvalueChar.EnergyExpended += 5; + else if(HRSAPP_Context.ResetEnergyExpended == 1) + HRSAPP_Context.ResetEnergyExpended = 0; +#endif + + HRS_UpdateChar(HEART_RATE_MEASURMENT_UUID, (uint8_t *)&HRSAPP_Context.MeasurementvalueChar); + +/* USER CODE END HRSAPP_Measurement */ + return; +} + +static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) +{ + return ((uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS))); +} + +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.h new file mode 100644 index 000000000..ec2dd8f2d --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.h @@ -0,0 +1,74 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/hrs_app.h + * Description : Header for hrs_application.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __HRS_APP_H +#define __HRS_APP_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ +typedef struct +{ + HRS_BodySensorLocation_t BodySensorLocationChar; + HRS_MeasVal_t MeasurementvalueChar; + uint8_t ResetEnergyExpended; + uint8_t TimerMeasurement_Id; + +} HRSAPP_Context_t; + +/* Exported functions ---------------------------------------------*/ +void HRSAPP_Init( void ); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} +#endif + +#endif /*__HRS_APP_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/p2p_server_app.c new file mode 100644 index 000000000..89556ac69 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/STM32_WPAN/App/p2p_server_app.c @@ -0,0 +1,420 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/p2p_server_app.c + * Description : P2P Server Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "app_common.h" +#include "dbg_trace.h" +#include "ble.h" +#include "p2p_server_app.h" +#include "stm32_seq.h" +#include "stm32wb_at_ble.h" +#include "ble_at_server.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + typedef struct{ + uint8_t Device_Led_Selection; + uint8_t Led1; + }P2P_LedCharValue_t; + + typedef struct{ + uint8_t Device_Button_Selection; + uint8_t ButtonStatus; + }P2P_ButtonCharValue_t; + +typedef struct +{ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ + P2P_LedCharValue_t LedControl; + P2P_ButtonCharValue_t ButtonControl; + uint16_t ConnectionHandle; +} P2P_Server_App_Context_t; +/* USER CODE END PTD */ + +/* Private defines ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ +/** + * START of Section BLE_APP_CONTEXT + */ + +PLACE_IN_SECTION("BLE_APP_CONTEXT") static P2P_Server_App_Context_t P2P_Server_App_Context; + +/** + * END of Section BLE_APP_CONTEXT + */ +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ +static void P2PS_Send_Notification(void); +static void P2PS_APP_LED_BUTTON_context_Init(void); +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void P2PS_STM_App_Notification(P2PS_STM_App_Notification_evt_t *pNotification) +{ + stm32wb_at_BLE_EVT_WRITE_t param_BLE_EVT_WRITE; +/* USER CODE BEGIN P2PS_STM_App_Notification_1 */ + +/* USER CODE END P2PS_STM_App_Notification_1 */ + switch(pNotification->P2P_Evt_Opcode) + { +/* USER CODE BEGIN P2PS_STM_App_Notification_P2P_Evt_Opcode */ +#if(BLE_CFG_OTA_REBOOT_CHAR != 0) + case P2PS_STM_BOOT_REQUEST_EVT: + APP_DBG_MSG("-- P2P APPLICATION SERVER : BOOT REQUESTED\n"); + APP_DBG_MSG(" \n\r"); + + *(uint32_t*)SRAM1_BASE = *(uint32_t*)pNotification->DataTransfered.pPayload; + NVIC_SystemReset(); + break; +#endif +/* USER CODE END P2PS_STM_App_Notification_P2P_Evt_Opcode */ + + case P2PS_STM__NOTIFY_ENABLED_EVT: +/* USER CODE BEGIN P2PS_STM__NOTIFY_ENABLED_EVT */ + P2P_Server_App_Context.Notification_Status = 1; + APP_DBG_MSG("-- P2P APPLICATION SERVER : NOTIFICATION ENABLED\n"); + APP_DBG_MSG(" \n\r"); +/* USER CODE END P2PS_STM__NOTIFY_ENABLED_EVT */ + break; + + case P2PS_STM_NOTIFY_DISABLED_EVT: +/* USER CODE BEGIN P2PS_STM_NOTIFY_DISABLED_EVT */ + P2P_Server_App_Context.Notification_Status = 0; + APP_DBG_MSG("-- P2P APPLICATION SERVER : NOTIFICATION DISABLED\n"); + APP_DBG_MSG(" \n\r"); +/* USER CODE END P2PS_STM_NOTIFY_DISABLED_EVT */ + break; + + case P2PS_STM_WRITE_EVT: +/* USER CODE BEGIN P2PS_STM_WRITE_EVT */ + +#if(P2P_SERVER1 != 0) + if(pNotification->DataTransfered.pPayload[0] == 0x01){ /* end device 1 selected - may be necessary as LB Routeur informs all connection */ + if(pNotification->DataTransfered.pPayload[1] == 0x01) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_On(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 1 : LED1 ON\n"); + APP_DBG_MSG(" \n\r"); +#endif + param_BLE_EVT_WRITE.svc_index = 1; + param_BLE_EVT_WRITE.char_index = 2; + param_BLE_EVT_WRITE.val_tab[0] = 1; + param_BLE_EVT_WRITE.val_tab_len = 1; + + ble_at_server_Send_evt(BLE_EVT_WRITE, ¶m_BLE_EVT_WRITE); + P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ + } + if(pNotification->DataTransfered.pPayload[1] == 0x00) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_Off(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 1 : LED1 OFF\n"); + APP_DBG_MSG(" \n\r"); +#endif + param_BLE_EVT_WRITE.svc_index = 1; + param_BLE_EVT_WRITE.char_index = 2; + param_BLE_EVT_WRITE.val_tab[0] = 0; + param_BLE_EVT_WRITE.val_tab_len = 1; + + ble_at_server_Send_evt(BLE_EVT_WRITE, ¶m_BLE_EVT_WRITE); + P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ + } + } +#endif +#if(P2P_SERVER2 != 0) + if(pNotification->DataTransfered.pPayload[0] == 0x02){ /* end device 2 selected */ + if(pNotification->DataTransfered.pPayload[1] == 0x01) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_On(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 ON\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ + } + if(pNotification->DataTransfered.pPayload[1] == 0x00) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_Off(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 OFF\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ + } + } +#endif + + if(pNotification->DataTransfered.pPayload[0] == 0x03){ /* end device 3 selected - may be necessary as LB Routeur informs all connection */ + if(pNotification->DataTransfered.pPayload[1] == 0x01) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_On(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 3 : LED1 ON\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ + } + if(pNotification->DataTransfered.pPayload[1] == 0x00) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_Off(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 3 : LED1 OFF\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ + } + } + +#if(P2P_SERVER4 != 0) + if(pNotification->DataTransfered.pPayload[0] == 0x04){ /* end device 4 selected */ + if(pNotification->DataTransfered.pPayload[1] == 0x01) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_On(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 ON\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ + } + if(pNotification->DataTransfered.pPayload[1] == 0x00) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_Off(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 OFF\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ + } + } +#endif +#if(P2P_SERVER5 != 0) + if(pNotification->DataTransfered.pPayload[0] == 0x05){ /* end device 5 selected - may be necessary as LB Routeur informs all connection */ + if(pNotification->DataTransfered.pPayload[1] == 0x01) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_On(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 5 : LED1 ON\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ + } + if(pNotification->DataTransfered.pPayload[1] == 0x00) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_Off(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 5 : LED1 OFF\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ + } + } +#endif +#if(P2P_SERVER6 != 0) + if(pNotification->DataTransfered.pPayload[0] == 0x06){ /* end device 6 selected */ + if(pNotification->DataTransfered.pPayload[1] == 0x01) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_On(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 6 : LED1 ON\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ + } + if(pNotification->DataTransfered.pPayload[1] == 0x00) + { +#if (CFG_LED_SUPPORTED == 1) + BSP_LED_Off(LED_BLUE); + APP_DBG_MSG("-- P2P APPLICATION SERVER 6 : LED1 OFF\n"); + APP_DBG_MSG(" \n\r"); +#endif + P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ + } + } +#endif +/* USER CODE END P2PS_STM_WRITE_EVT */ + break; + + default: +/* USER CODE BEGIN P2PS_STM_App_Notification_default */ + +/* USER CODE END P2PS_STM_App_Notification_default */ + break; + } +/* USER CODE BEGIN P2PS_STM_App_Notification_2 */ + +/* USER CODE END P2PS_STM_App_Notification_2 */ + return; +} + +void P2PS_APP_Notification(P2PS_APP_ConnHandle_Not_evt_t *pNotification) +{ +/* USER CODE BEGIN P2PS_APP_Notification_1 */ + +/* USER CODE END P2PS_APP_Notification_1 */ + switch(pNotification->P2P_Evt_Opcode) + { +/* USER CODE BEGIN P2PS_APP_Notification_P2P_Evt_Opcode */ + +/* USER CODE END P2PS_APP_Notification_P2P_Evt_Opcode */ + case PEER_CONN_HANDLE_EVT : +/* USER CODE BEGIN PEER_CONN_HANDLE_EVT */ + +/* USER CODE END PEER_CONN_HANDLE_EVT */ + break; + + case PEER_DISCON_HANDLE_EVT : +/* USER CODE BEGIN PEER_DISCON_HANDLE_EVT */ + P2PS_APP_LED_BUTTON_context_Init(); +/* USER CODE END PEER_DISCON_HANDLE_EVT */ + break; + + default: +/* USER CODE BEGIN P2PS_APP_Notification_default */ + +/* USER CODE END P2PS_APP_Notification_default */ + break; + } +/* USER CODE BEGIN P2PS_APP_Notification_2 */ + +/* USER CODE END P2PS_APP_Notification_2 */ + return; +} + +void P2PS_APP_Init(void) +{ +/* USER CODE BEGIN P2PS_APP_Init */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_SW1_BUTTON_PUSHED_ID, UTIL_SEQ_RFU, P2PS_Send_Notification ); + + /** + * Initialize LedButton Service + */ + P2P_Server_App_Context.Notification_Status=0; + P2PS_APP_LED_BUTTON_context_Init(); +/* USER CODE END P2PS_APP_Init */ + return; +} + +/* USER CODE BEGIN FD */ +void P2PS_APP_LED_BUTTON_context_Init(void){ + + BSP_LED_Off(LED_BLUE); + + #if(P2P_SERVER1 != 0) + P2P_Server_App_Context.LedControl.Device_Led_Selection=0x01; /* Device1 */ + P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ + P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x01;/* Device1 */ + P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; +#endif +#if(P2P_SERVER2 != 0) + P2P_Server_App_Context.LedControl.Device_Led_Selection=0x02; /* Device2 */ + P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ + P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x02;/* Device2 */ + P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; +#endif +#if(P2P_SERVER3 != 0) + P2P_Server_App_Context.LedControl.Device_Led_Selection=0x03; /* Device3 */ + P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ + P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x03; /* Device3 */ + P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; +#endif +#if(P2P_SERVER4 != 0) + P2P_Server_App_Context.LedControl.Device_Led_Selection=0x04; /* Device4 */ + P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ + P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x04; /* Device4 */ + P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; +#endif + #if(P2P_SERVER5 != 0) + P2P_Server_App_Context.LedControl.Device_Led_Selection=0x05; /* Device5 */ + P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ + P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x05; /* Device5 */ + P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; +#endif +#if(P2P_SERVER6 != 0) + P2P_Server_App_Context.LedControl.Device_Led_Selection=0x06; /* device6 */ + P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ + P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x06; /* Device6 */ + P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; +#endif +} + +void P2PS_APP_SW1_Button_Action(void) +{ + UTIL_SEQ_SetTask( 1<C1MR)) & (channel << 16U))) +#define HW_IPCC_RX_PENDING( channel ) (LL_C2_IPCC_IsActiveFlag_CHx( IPCC, channel )) && (((~(IPCC->C1MR)) & (channel << 0U))) + +/* Private macros ------------------------------------------------------------*/ +/* Private typedef -----------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static void (*FreeBufCb)( void ); + +/* Private function prototypes -----------------------------------------------*/ +static void HW_IPCC_BLE_EvtHandler( void ); +static void HW_IPCC_BLE_AclDataEvtHandler( void ); +static void HW_IPCC_MM_FreeBufHandler( void ); +static void HW_IPCC_SYS_CmdEvtHandler( void ); +static void HW_IPCC_SYS_EvtHandler( void ); +static void HW_IPCC_TRACES_EvtHandler( void ); + +#ifdef THREAD_WB +static void HW_IPCC_OT_CmdEvtHandler( void ); +static void HW_IPCC_THREAD_NotEvtHandler( void ); +static void HW_IPCC_THREAD_CliNotEvtHandler( void ); +#endif + +#ifdef LLD_TESTS_WB +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ); +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ); +#endif +#ifdef LLD_BLE_WB +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void );*/ +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ); +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ); +#endif + +#ifdef MAC_802_15_4_WB +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ); +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ); +#endif + +#ifdef ZIGBEE_WB +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ); +#endif + +/* Public function definition -----------------------------------------------*/ + +/****************************************************************************** + * INTERRUPT HANDLER + ******************************************************************************/ +void HW_IPCC_Rx_Handler( void ) +{ + if (HW_IPCC_RX_PENDING( HW_IPCC_SYSTEM_EVENT_CHANNEL )) + { + HW_IPCC_SYS_EvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_NotEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_NotEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_CliNotEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveCliRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_M0_CMD_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef LLD_BLE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_RSP_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_M0_CMD_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackNotifEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackM0RequestHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL )) + { + HW_IPCC_BLE_EvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_TRACES_CHANNEL )) + { + HW_IPCC_TRACES_EvtHandler(); + } + + return; +} + +void HW_IPCC_Tx_Handler( void ) +{ + if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_CmdEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL )) + { + HW_IPCC_OT_CmdEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB +// No TX handler for LLD tests +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL )) + { + HW_IPCC_ZIGBEE_CmdEvtHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) + { + HW_IPCC_MM_FreeBufHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_HCI_ACL_DATA_CHANNEL )) + { + HW_IPCC_BLE_AclDataEvtHandler(); + } + + return; +} +/****************************************************************************** + * GENERAL + ******************************************************************************/ +void HW_IPCC_Enable( void ) +{ + /** + * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running + when FUS is running on CPU2 and CPU1 enters deep sleep mode + */ + LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC); + + /** + * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 + */ + LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); + + /** + * In case the SBSFU is implemented, it may have already set the C2BOOT bit to startup the CPU2. + * In that case, to keep the mechanism transparent to the user application, it shall call the system command + * SHCI_C2_Reinit( ) before jumping to the application. + * When the CPU2 receives that command, it waits for its event input to be set to restart the CPU2 firmware. + * This is required because once C2BOOT has been set once, a clear/set on C2BOOT has no effect. + * When SHCI_C2_Reinit( ) is not called, generating an event to the CPU2 does not have any effect + * So, by default, the application shall both set the event flag and set the C2BOOT bit. + */ + __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ + __WFE( ); /* Clear the internal event flag */ + LL_PWR_EnableBootC2( ); + + return; +} + +void HW_IPCC_Init( void ) +{ + LL_AHB3_GRP1_EnableClock( LL_AHB3_GRP1_PERIPH_IPCC ); + + LL_C1_IPCC_EnableIT_RXO( IPCC ); + LL_C1_IPCC_EnableIT_TXF( IPCC ); + + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + + return; +} + +/****************************************************************************** + * BLE + ******************************************************************************/ +void HW_IPCC_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_BLE_CMD_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_EvtHandler( void ) +{ + HW_IPCC_BLE_RxEvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendAclData( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_AclDataEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + HW_IPCC_BLE_AclDataAckNot(); + + return; +} + +__weak void HW_IPCC_BLE_AclDataAckNot( void ){}; +__weak void HW_IPCC_BLE_RxEvtNot( void ){}; + +/****************************************************************************** + * SYSTEM + ******************************************************************************/ +void HW_IPCC_SYS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_SYS_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + return; +} + +static void HW_IPCC_SYS_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + HW_IPCC_SYS_CmdEvtNot(); + + return; +} + +static void HW_IPCC_SYS_EvtHandler( void ) +{ + HW_IPCC_SYS_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +__weak void HW_IPCC_SYS_CmdEvtNot( void ){}; +__weak void HW_IPCC_SYS_EvtNot( void ){}; + +/****************************************************************************** + * MAC 802.15.4 + ******************************************************************************/ +#ifdef MAC_802_15_4_WB +void HW_IPCC_MAC_802_15_4_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + HW_IPCC_MAC_802_15_4_CmdEvtNot(); + + return; +} + +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_MAC_802_15_4_EvtNot(); + + return; +} +__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; +__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; +#endif + +/****************************************************************************** + * THREAD + ******************************************************************************/ +#ifdef THREAD_WB +void HW_IPCC_THREAD_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_OT_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_CLI_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_CMD_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_CliSendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_OT_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + HW_IPCC_OT_CmdEvtNot(); + + return; +} + +static void HW_IPCC_THREAD_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_EvtNot(); + + return; +} + +static void HW_IPCC_THREAD_CliNotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_CliEvtNot(); + + return; +} + +__weak void HW_IPCC_OT_CmdEvtNot( void ){}; +__weak void HW_IPCC_CLI_CmdEvtNot( void ){}; +__weak void HW_IPCC_THREAD_EvtNot( void ){}; + +#endif /* THREAD_WB */ + +/****************************************************************************** + * LLD TESTS + ******************************************************************************/ +#ifdef LLD_TESTS_WB +void HW_IPCC_LLDTESTS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLDTESTS_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveCliRsp(); + return; +} + +void HW_IPCC_LLDTESTS_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLDTESTS_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLDTESTS_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void ){}; +#endif /* LLD_TESTS_WB */ + +/****************************************************************************** + * LLD BLE + ******************************************************************************/ +#ifdef LLD_BLE_WB +void HW_IPCC_LLD_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLD_BLE_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_CMD_CHANNEL ); + return; +} + +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveCliRsp(); + return; +}*/ + +void HW_IPCC_LLD_BLE_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ) +{ + //LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLD_BLE_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + //LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLD_BLE_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLD_BLE_ReceiveM0Cmd( void ){}; + +/* Transparent Mode */ +void HW_IPCC_LLD_BLE_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveRsp(); + return; +} + +void HW_IPCC_LLD_BLE_SendRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + return; +} + +#endif /* LLD_BLE_WB */ + +/****************************************************************************** + * ZIGBEE + ******************************************************************************/ +#ifdef ZIGBEE_WB +void HW_IPCC_ZIGBEE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4RequestToM0( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvAppliAckFromM0(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0NotifyToM4(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0RequestToM4(); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){}; +#endif /* ZIGBEE_WB */ + +/****************************************************************************** + * MEMORY MANAGER + ******************************************************************************/ +void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) ) +{ + if ( LL_C1_IPCC_IsActiveFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ) ) + { + FreeBufCb = cb; + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + else + { + cb(); + + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + + return; +} + +static void HW_IPCC_MM_FreeBufHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + FreeBufCb(); + + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + return; +} + +/****************************************************************************** + * TRACES + ******************************************************************************/ +void HW_IPCC_TRACES_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +static void HW_IPCC_TRACES_EvtHandler( void ) +{ + HW_IPCC_TRACES_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +__weak void HW_IPCC_TRACES_EvtNot( void ){}; + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/readme.txt new file mode 100644 index 000000000..ff86f8760 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server/readme.txt @@ -0,0 +1,147 @@ +/** + @page BLE_AT_Server Application + + @verbatim + ****************************************************************************** + * @file BLE/BLE_AT_Server/readme.txt + * @author MCD Application Team + * @brief Description of the BLE_AT_Server application + ****************************************************************************** + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @endverbatim + +@par Application Description + +How to demonstrate Point-to-Point communication using BLE component (as GATT server). + +One STM32WB55xx board is used, acting as GATT server. +For example, BLE_AT_Server application is downloaded in a Nucleo board (MB1355C). +The client could be located in a smartphone also, using ST BLE Sensor or ST BLE ToolBox applications. + + +@par Keywords + +Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE profile, Dual core + +@par Directory contents + +- BLE/BLE_AT_Server/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file +- BLE/BLE_AT_Server/Core/Inc/app_common.h Header for all modules with common definition +- BLE/BLE_AT_Server/Core/Inc/app_conf.h Parameters configuration file of the application +- BLE/BLE_AT_Server/Core/Inc/hw_conf.h Configuration file of the HW +- BLE/BLE_AT_Server/Core/Inc/hw_if.h Configuration file of the Hardware Interface +- BLE/BLE_AT_Server/Core/Inc/utilities_conf.h Configuration file of the utilities +- BLE/BLE_AT_Server/Core/Inc/stm32_lpm_if.h Low layer function to enter/exit low power modes +- BLE/BLE_AT_Server/Core/Src/stm32wbxx_it.c Interrupt handlers +- BLE/BLE_AT_Server/Core/Inc/stm32wbxx_it.h Interrupt handlers header file +- BLE/BLE_AT_Server/Core/Src/main.c Main program +- BLE/BLE_AT_Server/Core/Inc/main.h Header for main.c module +- BLE/BLE_AT_Server/Core/Src/system_stm32wbxx.c stm32wbxx system source file +- BLE/BLE_AT_Server/Core/Src/stm32_lpm_if.c Low Power Manager Interface +- BLE/BLE_AT_Server/Core/Src/hw_timerserver.c Timer Server based on RTC +- BLE/BLE_AT_Server/Core/Src/hw_uart.c UART Driver +- BLE/BLE_AT_Server/Core/Src/app_entry.c Initialization of the application +- BLE/BLE_AT_Server/Core/Inc/app_entry.h Parameters configuration file of the application +- BLE/BLE_AT_Server/Core/Src/app_debug.c Interface to support debug in the application +- BLE/BLE_AT_Server/Core/Inc/app_debug.h Header of application debug +- BLE/BLE_AT_Server/Core/Src/ble_at_server.c AT server application +- BLE/BLE_AT_Server/Core/Inc/ble_at_server.h Header for ble_at_server.c module +- BLE/BLE_AT_Server/Core/Src/ble_at_server_cb.c AT server callback functions +- BLE/BLE_AT_Server/Core/Inc/ble_at_server_cb.h Header for ble_at_server_cb.c module +- BLE/BLE_AT_Server/Core/Src/stm32wbxx_hal_msp.c MSP Initialization and deinitialisation +- BLE/BLE_AT_Server/STM32_WPAN/App/ble_conf.h BLE Services configuration +- BLE/BLE_AT_Server/STM32_WPAN/App/ble_dbg_conf.h BLE Traces configuration of the BLE services +- BLE/BLE_AT_Server/STM32_WPAN/App/tl_dbg_conf.h Debug configuration file for stm32wpan transport layer interface. +- BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.c BLE Profile implementation +- BLE/BLE_AT_Server/STM32_WPAN/App/app_ble.h Header for app_ble.c module +- BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.c Custom service application +- BLE/BLE_AT_Server/STM32_WPAN/App/custom_app.h Header for custom_app.c module +- BLE/BLE_AT_Server/STM32_WPAN/App/custom.c Custom service +- BLE/BLE_AT_Server/STM32_WPAN/App/custom.h Header for custom.c module +- BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.c Device Information Service application +- BLE/BLE_AT_Server/STM32_WPAN/App/dis_app.h Header for dis_app.c module +- BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.c Heart Rate Service application +- BLE/BLE_AT_Server/STM32_WPAN/App/hrs_app.h Header for hrs_app.c module +- BLE/BLE_AT_Server/STM32_WPAN/App/p2p_server_app.c P2P Server application +- BLE/BLE_AT_Server/STM32_WPAN/App/p2p_server_app.h Header for p2p_server_app.c module +- BLE/BLE_AT_Server/STM32_WPAN/Target/hw_ipcc.c IPCC Driver + + +@par Hardware and Software environment + + - This application runs on STM32WB5x and STM32WB5MM module devices. + + - Commands are received over LPUART interface with 9600 8N1 configuration. + On a P-NUCLEO-WB55.Nucleo board use PA2 (CN10.35) LPUART TX and PA3 (CN10.37) LPUART RX. + + - You can use an USB to UART cable to send AT commands from a PC. + +@par How to use it ? + +This application requires having the stm32wb5x_BLE_Stack_full_fw.bin binary flashed on the Wireless Coprocessor. +If it is not the case, you need to use STM32CubeProgrammer to load the appropriate binary. +All available binaries are located under /Projects/STM32_Copro_Wireless_Binaries directory. +Refer to UM2237 to learn how to use/install STM32CubeProgrammer. +Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the +Wireless Coprocessor binary. + +In order to build the application code, open IDE project, build it and then load the image into target memory. + +You can perform one of the following demonstrations. + +First demonstration using predefined applications + On an android/ios smartphone, enable the Bluetooth communications, and if not done before, + - Install the ST BLE Profile application + https://play.google.com/store/apps/details?id=com.stm.bluetoothlevalidation&hl=en + https://itunes.apple.com/fr/App/st-ble-profile/id1081331769?mt=8 + + - Install the ST BLE Sensor application + https://play.google.com/store/apps/details?id=com.st.bluems + https://itunes.apple.com/us/App/st-bluems/id993670214?mt=8 + + - Power on your board running BLE_AT_Server application. + - Open a terminal emulator to send data to STM32WB LPUART interface( @9600 bauds 8N1, append CR LF) + - Send AT, OK must be received + - Send AT+BLE_SVC=1, creates P2P_server service and starts advertising. OK is received + - Then, open ST BLE Sensor (smartphone) and connect to P2PSRV1 device. + - Events are received over LPUART : BLE_EVT_CONN=1, BLE_EVT_UPD_CONN=1 + - Play with the Light on the smartphone, events are received over LPUART : BLE_EVT_WRITE=1,2,x + - Send over the LPUART AT+BLE_NOTIF_VAL=1,2,1 – toggles button characteristic status, (AT+BLE_NOTIF_VAL=1,2,0 has no effect) + - Disconnect on the smartphone, an event is received : BLE_EVT_CONN=0 + - Send over LPUART AT+BLE_SVC=2, creates Heart Rate service and starts advertising. OK is received + - Connect to the device HRSTM: events received BLE_EVT_CONN=1, BLE_EVT_UPD_CONN=1 + - Send AT+BLE_NOTIF_VAL=2,1,70 – sets HeartRate characteristic value to 70 + - Disconnect the smartphone: event received BLE_EVT_CONN=0 + +Second demonstration is creating a custom service + - Install the ST BLE Toolbox application on the android/ios device + https://play.google.com/store/apps/details?id=com.st.dit.stbletoolbox + https://apps.apple.com/bz/app/st-ble-toolbox/id1531295550 + - Power on your board running BLE_AT_Server application. + - Open a terminal emulator to send data to STM32WB LPUART interface( @9600 bauds 8N1, append CR LF) + - Send AT, OK must be received + - Send AT+BLE_INIT=1, initialization + - Send AT+BLE_SVC=3,2,0xaabb,10 creation of a custom service + - Send AT+BLE_CHAR_ADD=3,1,1,0x3344,2,26,0,1 creation of a characteristic with properties: read, write, notify + - Send AT+BLE_CHAR_ADD=3,2,1,0x5566,2,40,0,1 creation of a second characteristic with properties: write, indicate + - Send AT+BLE_ADV=1, starts advertising + - Then, open ST BLE toolbox (smartphone) and connect to AT_SERVER device, discover service and characteristics. + - Send from the smartphone on characteristic 1: write 0x1122, event received on terminal: BLE_EVT_WRITE=3,1,0x1122 (service 3, characteristic 1) + - Send from the smartphone on characteristic 2:a write 0x3344, event received on terminal: BLE_EVT_WRITE=3,2,0x3344 (service 3, characteristic 2) + - From the smartphone, enable notification and indication + - Send AT+BLE_NOTIF_VAL=3,1,1, notification received on the smartphone + - Send AT+BLE_INDIC_VAL=3,2,1, indication received on the smartphone + +For more details refer to the Wiki to come: + https://wiki.st.com/stm32mcu/wiki/STM32WB_-_BLE_AT_Server + + *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  + */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/BLE_Beacon.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/BLE_Beacon.ioc index d1e0eb850..1c0e0e5c6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/BLE_Beacon.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/BLE_Beacon.ioc @@ -97,8 +97,8 @@ Mcu.PinsNb=19 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -179,6 +179,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_Beacon +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -341,5 +343,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_Beacon -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_conf.h index 862c53fc1..950191b18 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -256,6 +256,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -265,11 +269,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -277,6 +285,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -424,8 +444,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -541,11 +562,11 @@ typedef enum { CFG_TASK_BEACON_UPDATE_REQ_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -554,11 +575,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -591,9 +613,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -604,5 +626,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_entry.h index ff084c8f2..c1ccd8d90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_conf.h index 7290a09a4..f5d6dac71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_it.h index 2268a38f9..1ea7a0a20 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_debug.c index b6097bb64..945d4a7fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_entry.c index 94d498fd3..e1ad5f57d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -159,9 +162,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -356,12 +358,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -462,6 +603,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -506,4 +649,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/main.c index a10b4fd6c..7fe6ea7f4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,5 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_hal_msp.c index 5321113d5..901abf2cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -363,4 +392,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_it.c index a261d3dea..731cab145 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/ble_beacon.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/ble_beacon.ewp index 67b99256a..b61d7e15d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/ble_beacon.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/ble_beacon.ewp @@ -1120,6 +1120,12 @@ + + CMSIS + + $PROJ_DIR$/../Core/Src/system_stm32wbxx.c + + STM32WBxx_HAL_Driver @@ -1183,12 +1189,6 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - - CMSIS - - $PROJ_DIR$/../Core/Src/system_stm32wbxx.c - - Middlewares @@ -1215,9 +1215,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c @@ -1245,6 +1242,9 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.c index 324edea43..ef971e421 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -139,26 +138,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -548,6 +548,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -590,4 +592,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.h index b2b469bce..0be8102fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/app_ble.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_conf.h index c0789a1d6..ca54e6b2d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,4 +63,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_dbg_conf.h index fc7eef5b5..494892fcc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_beacon.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_beacon.h index 6f79422c0..37eb5a58f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_beacon.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_beacon.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/eddystone_beacon.h - * Description : + * @file eddystone_beacon.h + * @author MCD Application Team + * @brief ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +94,3 @@ enum #endif #endif /* EDDYSTONE_BEACON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.c index c4282775a..049c76d5f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/eddystone_tlm_service.c - * Description : - ****************************************************************************** + ****************************************************************************** + * @file eddystone_tlm_service.c + * @author MCD Application Team + * @brief + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -423,5 +423,3 @@ void EddystoneTLM_Process(void) HW_TS_Start(TimerTLM_Id, DEFAULT_BEACON_SEC * 10); } } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.h index 432c928a1..9bb4a2e54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_tlm_service.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/eddystone_tlm_service.h - * Description : - ****************************************************************************** + ****************************************************************************** + * @file eddystone_tlm_service.h + * @author MCD Application Team + * @brief + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -39,5 +39,3 @@ void EddystoneTLM_Process(void); #endif #endif /* EDDYSTONE_TLM_SERVICE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.c index e826eb921..4079a4427 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/eddystone_uid_service.c - * Description : - ****************************************************************************** + ****************************************************************************** + * @file eddystone_uid_service.c + * @author MCD Application Team + * @brief + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -189,5 +189,3 @@ void EddystoneUID_Process(void) #endif } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.h index 9d41bc19c..d70f8e769 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_uid_service.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/eddystone_uid_service.h - * Description : - ****************************************************************************** + ****************************************************************************** + * @file eddystone_uid_service.h + * @author MCD Application Team + * @brief + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -48,5 +48,3 @@ void EddystoneUID_Process(void); #endif #endif /* EDDYSTONE_UID_SERVICE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.c index f6e1c34b1..ad3e7726a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/eddystone_url_service.c - * Description : - ****************************************************************************** + ****************************************************************************** + * @file eddystone_url_service.c + * @author MCD Application Team + * @brief + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -193,5 +193,3 @@ void EddystoneURL_Process(void) EddystoneURL_Init(&EddystoneURL_InitStruct); #endif } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.h index f85321b6c..7c617e661 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/eddystone_url_service.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/eddystone_url_service.h - * Description : - ****************************************************************************** + ****************************************************************************** + * @file eddystone_url_service.h + * @author MCD Application Team + * @brief + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -69,5 +69,3 @@ void EddystoneURL_Process(void); #endif #endif /* EDDYSTONE_URL_SERVICE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon.h index 11f50772b..01be3d38d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/ibeacon.h - * Description : Header for ibeacon_application.c module + * @file ibeacon.h + * @author MCD Application Team + * @brief Header for ibeacon_application.c module ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" #endif #endif /* IBEACON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.c index 969334d89..f5bb0163e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -202,5 +201,3 @@ void IBeacon_Process(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.h index de950513c..fa20643b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/ibeacon_service.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void IBeacon_Process(void); #endif #endif /* IBEACON_SERVICE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/readme.txt index 773d472b4..f75fb8b52 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Beacon/readme.txt @@ -8,19 +8,19 @@ * @brief Description of the BLE_Beacon application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Example Description -How to advertize 3 types of beacon ( tlm, uuid, url ). +How to advertise 3 types of beacon ( tlm, uuid, url ). @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/BLE_BloodPressure.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/BLE_BloodPressure.ioc index 58f87f00a..04d1087db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/BLE_BloodPressure.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/BLE_BloodPressure.ioc @@ -99,8 +99,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -181,6 +181,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_BloodPressure +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -353,5 +355,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_BloodPressure -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_conf.h index 021f07184..170cb456f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -255,6 +255,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -264,11 +268,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -276,6 +284,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -423,8 +443,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -542,11 +563,11 @@ typedef enum CFG_TASK_BLS_MEAS_REQ_ID, CFG_TASK_BLS_INT_CUFF_PRESSURE_REQ_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -555,11 +576,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -592,9 +614,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -605,5 +627,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_entry.h index ff084c8f2..c1ccd8d90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_conf.h index fa15e73b5..4e33c550a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -255,5 +254,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_hal_conf.h index aca81fcf3..60bbdd235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_it.h index dea48166c..890fff04c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_debug.c index 7d5b1a103..5dbb7468e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -129,8 +129,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -409,5 +417,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_entry.c index 94d498fd3..e1ad5f57d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -159,9 +162,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -356,12 +358,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -462,6 +603,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -506,4 +649,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/main.c index 7af84a4ee..f7de13711 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -78,6 +78,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -117,6 +118,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -196,19 +199,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1|RCC_PERIPHCLK_CLK48SEL - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -497,5 +504,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_hal_msp.c index 8e15ddbeb..62dafcf45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -359,11 +388,21 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -407,4 +446,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_it.c index a261d3dea..731cab145 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/BLE_BloodPressure.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/BLE_BloodPressure.ewp index 1b9d2d68b..43be08a66 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/BLE_BloodPressure.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/BLE_BloodPressure.ewp @@ -1162,13 +1162,13 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c - $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c @@ -1209,9 +1209,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c @@ -1242,6 +1239,9 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c +                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.c index 348803b5d..6f23bffb8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -259,26 +258,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1024,6 +1024,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1066,4 +1068,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.h index b66c47e09..cea5dd6e0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -83,5 +82,3 @@ extern "C" { #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_conf.h index 460914cb8..9c21205b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,4 +81,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_dbg_conf.h index 807191c3a..3878a8092 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.c index deb98a62c..428505f40 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.c @@ -6,17 +6,16 @@ * @brief Blood Pressure Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -468,5 +467,3 @@ void BLSAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.h index 14f927ec4..3fc735fa9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/bls_app.h @@ -6,17 +6,16 @@ * @brief Header for bls_app.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -66,6 +65,4 @@ void BLSAPP_IntCuffPressure(void); #endif #endif /*__BLS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ /* USER CODE END */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/readme.txt index 1cf35b1d5..eeba9a8f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_BloodPressure/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_BloodPressure example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_common.h index 7e66ee35a..8d15b5c11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_conf.h index 143a1b2ee..cd560929a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_conf.h @@ -1,22 +1,22 @@ -/** - ****************************************************************************** - * @file app_conf.h - * @author MCD Application Team - * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APP_CONFIG_H @@ -190,7 +190,8 @@ #define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1344) /** - * Prepare Write List size in terms of number of packet with ATT_MTU=23 bytes + * Prepare Write List size in terms of number of packet + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" */ #define CFG_BLE_PREPARE_WRITE_LIST_SIZE BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU) @@ -249,26 +250,34 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -277,6 +286,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -570,7 +591,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -586,5 +607,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_entry.h index 89d350648..bdd1fe558 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +39,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_conf.h index b311e6acc..a0e057a65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/main.h index d104dcb7e..8e5a4fd81 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -35,5 +34,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ void Error_Handler(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_hal_conf.h index 3f313a2f5..8d5527ca3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_it.h index c950de04a..21ee16df9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -59,5 +58,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_entry.c index 60dd4f05e..2a7d17963 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -34,6 +33,9 @@ #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" +#include "otp.h" /* Private typedef -----------------------------------------------------------*/ @@ -55,6 +57,8 @@ static void Led_Init( void ); static void Button_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* Functions Definition ------------------------------------------------------*/ void APPE_Init( void ) @@ -148,6 +152,168 @@ static void appe_Tl_Init( void ) return; } +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) +{ + UNUSED(status); + return; +} + +/** +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ +static void APPE_SysUserEvtRx( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} static void Led_Init( void ) { #if (CFG_LED_SUPPORTED == 1) @@ -181,32 +347,6 @@ static void Button_Init( void ) -static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) -{ - return; -} - -/** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ -static void APPE_SysUserEvtRx( void * pPayload ) -{ - /**< Traces channel initialization */ - APPD_EnableCPU2(); - - UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_ENABLE); - - APP_BLE_Init( ); - return; -} - - /************************************************************* * * WRAP FUNCTIONS @@ -221,6 +361,13 @@ void UTIL_SEQ_Idle( void ) return; } +/** + * @brief This function is called by the scheduler each time an event + * is pending. + * + * @param evt_waited_bm : Event pending. + * @retval None + */ void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); @@ -267,5 +414,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/main.c index 4ff67c490..35a6fd0ae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -331,4 +331,3 @@ void Error_Handler(void) /* USER CODE END Error_Handler_Debug */ } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32wbxx_it.c index 3bbaf2b1e..665b30196 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -180,5 +179,3 @@ void IPCC_C1_RX_IRQHandler(void) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.c index 5b2f8f68b..44d73a16d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -239,7 +238,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; @@ -1224,5 +1224,3 @@ void SVCCTL_ResumeUserEventFlow( void ) hci_resume_flow(); return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.h index 6e47cd2fc..1a3ea9a9d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -59,5 +58,3 @@ extern "C" { #endif #endif /*__APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_conf.h index 376a9faaa..1e16b42ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ble_conf.h * @author MCD Application Team * @brief BLE configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -74,5 +73,3 @@ #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_dbg_conf.h index 35659ec4d..c16a55243 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/ble_dbg_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ble_dbg_conf.h * @author MCD Application Team * @brief BLE Debug configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -210,5 +209,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.c index 589874ea0..96f33238c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.c @@ -1,23 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file crc_app.c * @author MCD Application Team - * @version V1.0.0 - * @date 04-September-2018 * @brief Cable Replacement Client Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -1110,5 +1107,3 @@ void CRCAPP_Update_Service() } } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.h index 81691876e..df430c02f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crc_app.h @@ -1,24 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file crc_app.h * @author MCD Application Team - * @version V1.0.0 - * @date 04-September-2018 * @brief Header for crc_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -45,5 +42,3 @@ void CRCAPP_Update_Service(void); #endif #endif /*__CRC_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.c index 68c52e05d..d4c0c37a6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.c @@ -5,17 +5,16 @@ * @brief Cable Replacement Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -214,5 +213,3 @@ void CRSAPP_Init(void) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.h index 5e867c39b..13c7b5b15 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/crs_app.h @@ -6,17 +6,16 @@ * @brief Header for crs_app.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -42,5 +41,3 @@ void CRSAPP_Init( void ); #endif #endif /*__CRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/readme.txt index de98d81f5..99d4c5a39 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_CableReplacement/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE Cable Replacement example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/BLE_Custom.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/BLE_Custom.ioc index eb16ca8f8..df1ac07b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/BLE_Custom.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/BLE_Custom.ioc @@ -99,8 +99,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -181,6 +181,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_Custom +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -391,5 +393,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_Custom -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_conf.h index 3475509c7..e4fcbb80d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -280,6 +280,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -289,11 +293,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -301,6 +309,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -448,8 +468,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -563,11 +584,11 @@ typedef enum CFG_TASK_CONN_UPDATE_REG_ID, #endif CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -576,11 +597,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -613,9 +635,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -626,5 +648,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_entry.h index 9b7d1dd18..67b35887b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/app_entry.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_conf.h index fa15e73b5..4e33c550a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -255,5 +254,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/main.h index 9db6fecd2..d0f7b04d5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32_lpm_if.h index 70abecaa9..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_hal_conf.h index aca81fcf3..60bbdd235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_it.h index 5db2cf7a4..f09862717 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/stm32wbxx_it.h @@ -7,15 +7,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -74,5 +73,3 @@ void DMA2_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_entry.c index b0b68fe1d..291fa2df1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -155,9 +158,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -352,12 +354,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -428,6 +569,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -451,4 +594,3 @@ void shci_cmd_resp_wait(uint32_t timeout) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/main.c index e079663d0..bac8e6103 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -78,6 +78,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -117,6 +118,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -196,19 +199,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1|RCC_PERIPHCLK_CLK48SEL - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -497,5 +504,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_hal_msp.c index ac576e4cb..471ecc628 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -359,11 +388,21 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -407,4 +446,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_it.c index e25eeaf6a..0b9de2a85 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -320,4 +319,3 @@ void DMA2_Channel4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/system_stm32wbxx.c index 0f17a8f94..1394ae132 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/BLE_Custom.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/BLE_Custom.ewp index 8644485f4..8d204396d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/BLE_Custom.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/BLE_Custom.ewp @@ -1114,6 +1114,12 @@                                                                   + + CMSIS + + $PROJ_DIR$/../Core/Src/system_stm32wbxx.c + + STM32WBxx_HAL_Driver @@ -1165,7 +1171,7 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c @@ -1180,12 +1186,6 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - - CMSIS - - $PROJ_DIR$/../Core/Src/system_stm32wbxx.c - - Middlewares @@ -1212,9 +1212,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c @@ -1227,6 +1224,9 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c @@ -1239,6 +1239,9 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 687874786..b9dd680b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c index a616b9e01..b87150393 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_ble.c * Description : Application file for BLE Middleware. - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -262,26 +261,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -956,6 +956,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -998,4 +1000,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.h index 082c73a17..a4d0b6b44 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ extern "C" { #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_conf.h index c0789a1d6..ca54e6b2d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,4 +63,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_dbg_conf.h index 845d0f00d..85558e1b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.c index 333adeafd..c29eee35f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/custom_app.c - * Description : Custom Example Application (Server) - ****************************************************************************** + ****************************************************************************** + * @file custom_app.c + * @author MCD Application Team + * @brief Custom Example Application (Server) + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -151,7 +151,7 @@ void Custom_STM_App_Notification(Custom_STM_App_Notification_evt_t *pNotificatio Custom_App_Context.Hrs_m_Notification_Status = 1; /* Hrs_m notification status has been enabled */ - /* Set Heart Rate Measurment value */ + /* Set Heart Rate Measurement value */ if ((hr_value >= CUSTOM_STM_HRS_VALUE_MIN) && (hr_value <= CUSTOM_STM_HRS_VALUE_MAX)) { hr_value += 1; @@ -336,5 +336,3 @@ void Custom_Hrs_m_Send_Notification(void) /* Property Notification */ /* USER CODE BEGIN FD_LOCAL_FUNCTIONS*/ /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.h index c2ee651df..9f1cd3159 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_app.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/custom_app.h - * Description : Header for custom_app.c module - ****************************************************************************** + ****************************************************************************** + * @file custom_app.h + * @author MCD Application Team + * @brief Header for custom_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +76,3 @@ typedef struct #endif #endif /*__CUSTOM_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.c index 530ad1a2c..656449a6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/custom_stm.c - * Description : Custom Example Service. - * + * @file custom_stm.c + * @author MCD Application Team + * @brief ustom Example Service. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -574,5 +573,3 @@ tBleStatus Custom_STM_App_Update_Char(Custom_STM_Char_Opcode_t CharOpcode, uint8 return result; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.h index 094e90715..73aeee4fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/custom_stm.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/custom_stm.h - * Description : Header for custom_stm.c module. - * + * @file custom_stm.h + * @author MCD Application Team + * @brief Header for custom_stm.c module. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -128,5 +127,3 @@ tBleStatus Custom_STM_App_Update_Char(Custom_STM_Char_Opcode_t CharOpcode, uint #endif #endif /*__CUSTOM_STM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/template_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/template_server_app.h index a76fadb57..de20dc884 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/template_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/template_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/template_server_app.h - * Description : P2P Server Application - ****************************************************************************** + ****************************************************************************** + * File Name : App/template_server_app.h + * Description : P2P Server Application + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -40,5 +39,4 @@ extern "C" { #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ /* USER CODE END UserCode*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/readme.txt index 2c1c84164..51be2bce2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_Custom application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -22,7 +22,7 @@ This example is to demonstrate that a BLE_Custom application can be created using CubeMX. This application includes two BLE services, the first one is a BLE_P2P_Server like, including two characteristics; the second one is a BLE_Heart_Rate like with three characteristics. -All the application behavior must be developped by the user. +All the application behavior must be developed by the user. A display terminal can be used to display application messages. This application is able to advertise, to be connected by a Smart phone (ST BLE Sensor application) and to manage the BLE events according to each characteristic. This example is done to be used with a Nucleo board (MB1355C) only. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h index 1c7b357fe..2a6ea2c75 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -155,7 +155,7 @@ /** * Encryption enable when set to 1 - * Encryption disabe when set to 0 + * Encryption disable when set to 0 */ #define CFG_ENCRYPTION_ENABLE 0 @@ -334,6 +334,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -343,11 +347,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -355,6 +363,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -688,5 +709,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h index c95d8bea9..286cf657d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h index 76fb9c3e6..dc5eb1f33 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -254,5 +254,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h index 8d481bc18..8394a102b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h index 5c12c3a4a..15b8c5919 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,5 +77,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h index 4dc4ac5ce..d053a4d1e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h index 9857e7152..b47224ea2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -81,5 +80,3 @@ void DMA2_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c index 7b2d278a5..ebdc12e32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c index 502ccdf01..d29f3c2d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +29,9 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" +#include "otp.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -68,6 +71,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ @@ -177,25 +182,161 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } return; } +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ void APPE_Led_Init( void ) { @@ -299,4 +440,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/main.c index ef47960e4..2a02c3f84 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -669,5 +669,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c index dcf12d0e9..055da3905 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -364,5 +363,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c index c8d35a1d9..520047140 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -343,4 +342,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c index f8e07023a..93e8678b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -346,5 +347,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject index 87f97486d..b90516515 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/.cproject @@ -1,99 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -197,9 +104,6 @@ - - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c index d4cd11253..a9e093244 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_ble.c * Description : Application file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -231,7 +230,7 @@ static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'D', 'T', '_', ' uint8_t index_con_int, mutex; -uint8_t const manuf_data[22] = { 2, AD_TYPE_TX_POWER_LEVEL, 0x00 /* 0 dBm */, /* Trasmission Power */ +uint8_t const manuf_data[22] = { 2, AD_TYPE_TX_POWER_LEVEL, 0x00 /* 0 dBm */, /* Transmission Power */ 10, AD_TYPE_COMPLETE_LOCAL_NAME, 'D', 'T', '_', 'S', 'E', 'R', 'V', 'E', 'R', /* Complete Name */ 7, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, 0x01/*SKD version */, CFG_DEV_ID_PERIPH_SERVER, /* NUCLEO-Board WB - DT Periph Server*/ @@ -307,7 +306,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1217,4 +1217,3 @@ void SVCCTL_InitCustomSvc( void ) } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h index 559808169..5e6be9dc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/app_ble.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_ble.h - * Description : Application configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_ble.h + * @author MCD Application Team + * @brief Header for ble application + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h index e9e85881b..7937863b0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -86,4 +85,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_HR_SENSOR_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h index c3304bccc..51bec2537 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,5 +227,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c index 20b2549cf..df7a62b0e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_client_app.c * @author MCD Application Team * @brief data throughput client Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -476,5 +475,3 @@ static SVCCTL_EvtAckStatus_t DTC_Event_Handler( void *Event ) return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h index 372a3246a..92facc094 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_client_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_client_app.h * @author MCD Application Team * @brief Header for dt_client_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +40,3 @@ void DTC_App_LinkReadyNotification(uint16_t ConnectionHandle); #endif #endif /*__DTC_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c index 055abc94d..2386feacc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_server_app.c * @author MCD Application Team * @brief data throughput server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -292,4 +291,3 @@ static void BLE_App_Delay_DataThroughput(void) DTS_STM_UpdateCharThroughput( (DTS_STM_Payload_t*) &ThroughputToSend); DataReceived = 0; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h index b40127259..a5c23835b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dt_server_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dt_server_app.h * @author MCD Application Team * @brief Header for dt_server_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -51,5 +50,3 @@ typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t #endif #endif /*__DTS_SERVER_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c index 4d6d37f0f..85f3e044b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dts.c * @author MCD Application Team * @brief Data Transfer Service (Custom) - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -353,5 +352,3 @@ tBleStatus DTS_STM_UpdateCharThroughput(DTS_STM_Payload_t *pDataValue ) (uint8_t *) pDataValue->pPayload); return result; }/* end DTS_STM_UpdateChar() */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h index a4afee9ba..bf30a32c8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/dts.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file dts.h * @author MCD Application Team * @brief Header for ble_application.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -79,5 +78,3 @@ tBleStatus DTS_STM_UpdateCharThroughput(DTS_STM_Payload_t *pDataValue ); #endif #endif /*__DTS_STM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h index fc8f3cbca..04ed3d88d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c index afa62b179..9d5496996 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/readme.txt index b5976d357..4e609e863 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_DataThroughput/readme.txt @@ -8,12 +8,12 @@ * @brief Data transfer via notification from server to client with a timer that enables to calculate the throughput at application level. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/BLE_HealthThermometer.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/BLE_HealthThermometer.ioc index 889fbd9f9..94d47b642 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/BLE_HealthThermometer.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/BLE_HealthThermometer.ioc @@ -99,8 +99,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -181,6 +181,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_HealthThermometer +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -358,5 +360,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_HealthThermometer -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_conf.h index 31dae47c6..a9c97a937 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -254,6 +254,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -263,11 +267,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -275,6 +283,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -422,8 +442,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -543,11 +564,11 @@ typedef enum CFG_TASK_HTS_MEAS_INTERVAL_REQ_ID, CFG_TASK_HTS_DISCONNECTION_REQ_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -556,11 +577,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -593,9 +615,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -606,5 +628,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_entry.h index ff084c8f2..c1ccd8d90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_conf.h index 7290a09a4..f5d6dac71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_hal_conf.h index aca81fcf3..60bbdd235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_it.h index dea48166c..890fff04c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_debug.c index b6097bb64..945d4a7fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_entry.c index 94d498fd3..e1ad5f57d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -159,9 +162,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -356,12 +358,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -462,6 +603,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -506,4 +649,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/main.c index 7a73b7f68..212a35ac2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -78,6 +78,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -117,6 +118,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -196,19 +199,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1|RCC_PERIPHCLK_CLK48SEL - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -497,5 +504,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_hal_msp.c index a86de2302..29e626def 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -359,11 +388,21 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -407,4 +446,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_it.c index a261d3dea..731cab145 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/BLE_HealthThermometer.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/BLE_HealthThermometer.ewp index 8ba29a0c8..d14cc04a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/BLE_HealthThermometer.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/BLE_HealthThermometer.ewp @@ -1,1265 +1,1266 @@ - 3 - - BLE_HealthThermometer - - ARM - + 3 + + BLE_HealthThermometer + + ARM + + 1 + + General + 3 + + 30 + 1 1 - - General - 3 - - 30 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 34 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 20 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application - Application + EWARM + + $PROJ_DIR$\startup_stm32wb55xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + + STM32_WPAN - EWARM - - $PROJ_DIR$\startup_stm32wb55xx_cm4.s - + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\hts_app.c + - User - - Core - - $PROJ_DIR$\..\Core\Src\app_debug.c - - - $PROJ_DIR$\..\Core\Src\app_entry.c - - - $PROJ_DIR$\..\Core\Src\hw_timerserver.c - - - $PROJ_DIR$\..\Core\Src\hw_uart.c - - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c - - - - STM32_WPAN - - App - - $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c - - - $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c - - - $PROJ_DIR$\..\STM32_WPAN\App\hts_app.c - - - - Target - - $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c - - - + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers - Doc + BSP + + P-NUCLEO-WB55.Nucleo - $PROJ_DIR$\..\readme.txt + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c + - Drivers - - BSP - - P-NUCLEO-WB55.Nucleo - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c - - - - - CMSIS - - $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c - - - - STM32WBxx_HAL_Driver - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c - - + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + - Middlewares - - STM32_WPAN - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hts.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c - - + STM32WBxx_HAL_Driver + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + + Middlewares - Utilities - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c - - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c - + STM32_WPAN + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hts.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + + Utilities + + $PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + $PROJ_DIR$/../../../../../../Utilities/sequencer/stm32_seq.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.c index 25f86b7c0..b228d9243 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -260,26 +259,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1030,6 +1030,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1072,4 +1074,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.h index 2b742007f..ab883018e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_conf.h index 8f5b2e366..060b11f0e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,4 +109,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_dbg_conf.h index 12bc7344e..8f90344bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.c index 3240fbf9d..290aea233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.c index 188d57cee..6c5fa178a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.c @@ -6,17 +6,16 @@ * @brief Health Thermometer Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -578,5 +577,3 @@ void HTSAPP_Profile_UpdateChar(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.h index aeb99520f..31c69cd08 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/hts_app.h @@ -6,17 +6,16 @@ * @brief Header for hts_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ void HTSAPP_Profile_UpdateChar(void); #endif #endif /*__HTS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/readme.txt index c8dcf2be7..ea560e0fd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HealthThermometer/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HealthThermometer example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc index 501d1d205..4bede4d02 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc @@ -97,8 +97,8 @@ Mcu.PinsNb=18 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -175,6 +175,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_HeartRate +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -352,5 +354,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_HeartRate -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex index 56532f038..e7df1c0b0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Binary/BLE_HeartRate_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:1000000030150020C9440008A9420008AB4200088E -:10001000AD420008AF420008B142000800000000F5 -:10002000000000000000000000000000B3420008D3 -:10003000B542000800000000B7420008B9420008BD -:10004000E5440008E9440008ED44000803430008C3 -:10005000F1440008F5440008F7420008FD4200089A -:10006000F9440008FD440008F14200080145000879 -:100070000545000809450008BD4200080D45000877 -:100080001145000815450008194500081D450008E0 -:100090002145000825450008294500082D45000890 -:1000A0003145000835450008394500083D45000840 -:1000B0004145000845450008494500084D450008F0 -:1000C0005145000855450008594500085D450008A0 -:1000D000C3420008C94200086145000865450008A0 -:1000E000694500086D450008714500087545000820 -:1000F000CF420008D3420008D742000879450008E3 -:100100007D450008814500088545000889450008AF -:100110008D4500089145000895450008994500085F -:100120009D450008A1450008DB420008A5450008E0 -:10013000A9450008AD450008B14500084FF0B040A2 +:1000000008100020C9470008AD450008AF450008AA +:10001000B1450008B3450008B545000800000000E0 +:10002000000000000000000000000000B7450008CC +:10003000B945000800000000BB450008BD450008A8 +:10004000ED470008F1470008F5470008C1450008E2 +:10005000F9470008FD470008FF450008054600086D +:100060000148000805480008F9450008094800084B +:100070000D48000811480008C5450008154800084B +:10008000194800081D4800082148000825480008B4 +:10009000294800082D480008314800083548000864 +:1000A000394800083D480008414800084548000814 +:1000B000494800084D4800085148000855480008C4 +:1000C000594800085D480008614800086548000874 +:1000D000CB450008D1450008694800086D48000874 +:1000E0007148000875480008794800087D480008F4 +:1000F000D7450008DB450008DF45000881480008B7 +:1001000085480008894800088D4800089148000883 +:1001100095480008994800089D480008A148000833 +:10012000A5480008A9480008E3450008AD480008B4 +:10013000B1480008B5480008B94800084FF0B04081 :10014000006800F0F000B02888BFB02070472DE9AB :10015000F041040054D0207881064FF0B04538D5E6 :10016000A868E96810F00C0001F0030103D00C2826 @@ -27,70 +27,70 @@ :10019000BAFB002834D100F075FA0FE0286820F08F :1001A000F000014329606968206A21F47F4141EA37 :1001B00000216960606A00F0A6FB08BB00F095FBB7 -:1001C000DFF8DC170860DFF8DC07006800F018FCD7 +:1001C000DFF8E0170860DFF8E007006800F01AFCCD :1001D000B0B92078C1070DD5A868E96800F00C0017 :1001E000082801F0030103D00C2808BF03292DD1F2 :1001F0002868800340F139816068002840F035812B :10020000012038E2E06980B1296841F0010100F085 -:1002100047FA06462868800700F1248100F012FCA6 +:1002100047FA06462868800700F1248100F014FCA4 :10022000801B0328F6D3032025E2286840084000FD -:10023000286000F007FC0646286800F01FFAC8D0C6 -:1002400000F000FC801B0328F6D3ECE76068B0F5F3 +:10023000286000F009FC0646286800F01FFAC8D0C4 +:1002400000F002FC801B0328F6D3ECE76068B0F5F1 :10025000803F04D1296841F48031296003E02A6895 -:1002600022F480322A60606860B100F0EBFB064641 -:100270002868800300F1F98000F0E4FB801B65280A -:10028000F6D3D0E700F0DEFB06462868400C10F0FD -:10029000010000F0EA8000F0D5FB801B6528F4D354 -:1002A000C1E700F0CFFBC01B0328C0F01281BAE702 +:1002600022F480322A60606860B100F0EDFB06463F +:100270002868800300F1F98000F0E6FB801B652808 +:10028000F6D3D0E700F0E0FB06462868400C10F0FB +:10029000010000F0EA8000F0D7FB801B6528F4D352 +:1002A000C1E700F0D1FBC01B0328C0F01281BAE700 :1002B000E06878B1296841F4807100F0F1F90646F0 -:1002C0002868400500F1188100F0BCFB801B032862 -:1002D000F6D3A8E7286820F48070286000F0B2FB0D +:1002C0002868400500F1188100F0BEFB801B032860 +:1002D000F6D3A8E7286820F48070286000F0B4FB0B :1002E00006462868800A10F0010000F0DC8000F06B -:1002F000A9FB801B0328F4D395E700F0A3FBC01BE8 +:1002F000ABFB801B0328F4D395E700F0A5FBC01BE4 :100300000328C0F00B818EE740F0010000F0CEF929 -:1003100007467068800700F11C8100F093FBC01B4A +:1003100007467068800700F11C8100F095FBC01B48 :100320000328F6D37FE7706820F0040000F0BEF9E0 :1003300007467068C00810F0010000F0198100F055 -:1003400081FBC01B0428F4D36DE70528306806D173 +:1003400083FBC01B0428F4D36DE70528306806D171 :1003500040F004003060316841F0010105E04008E0 :1003600040003060316821F004013160A06841F242 -:10037000893768B100F066FB80463068800700F17D -:100380000C8100F05FFBA0EB0800B842F5D34AE710 -:1003900000F058FB8046306800F070F900F0FD80F6 -:1003A00000F050FBA0EB0800B842F4D33BE700F0AC -:1003B00049FBC01B0328C0F0FE8034E7B06840084A -:1003C0004000B06000F03EFB0746B06800F056F910 -:1003D00000F0F58000F036FBC01B0328F5D322E7C0 -:1003E00000F030FB801B0328C0F01F811BE700F0EA -:1003F00029FB001B0328C0F0398114E7286881011C +:10037000893768B100F068FB80463068800700F17B +:100380000C8100F061FBA0EB0800B842F5D34AE70E +:1003900000F05AFB8046306800F070F900F0FD80F4 +:1003A00000F052FBA0EB0800B842F4D33BE700F0AA +:1003B0004BFBC01B0328C0F0FE8034E7B068400848 +:1003C0004000B06000F040FB0746B06800F056F90E +:1003D00000F0F58000F038FBC01B0328F5D322E7BE +:1003E00000F032FB801B0328C0F01F811BE700F0E8 +:1003F0002BFB001B0328C0F0398114E7286881011A :100400000CD4296841F080712960E86840F0805080 -:10041000E86000F017FB04462868810100F12A819A -:1004200000F010FB001B0328F6D3FCE60C2931D0AA -:10043000286820F080702860E968DFF86C0589087A -:100440008900E960E9680140E96000F0FBFA0446D0 -:100450002868810140F10E8100F0F4FA001B0328A6 +:10041000E86000F019FB04462868810100F12A8198 +:1004200000F012FB001B0328F6D3FCE60C2931D0A8 +:10043000286820F080702860E968DFF87005890876 +:100440008900E960E9680140E96000F0FDFA0446CE +:100450002868810140F10E8100F0F6FA001B0328A4 :10046000F6D3E0E600F00EF9B3E6207881071AD55E :10047000A868E96800F00C00042801F0030104D02A :100480000C2808BF02297FF413AF2868400503D564 :10049000E06800283FF4B4AE6968206921F0FE41AD -:1004A00041EA006169602168DFF8006511F0180F0A +:1004A00041EA006169602168DFF8046511F0180F06 :1004B00038D0606900283FF436AFC90670687FF510 :1004C00023AF800709D4706840F0010000F0EEF817 :1004D0000746706880077FF5E4AE706840F004005E -:1004E00000F0E4F80746706800070DD400F0AAFA9F +:1004E00000F0E4F80746706800070DD400F0ACFA9D :1004F000C01B0428F7D396E66868216920F0FE4007 :1005000040EA01606860CEE77068A16920F470601D :1005100040EA0120706000F0C6F8074600F0ADF830 -:100520007FF4EBAE2078410737D5DFF88474386864 -:10053000C10529D400F08CFA00F084FA80463868AE -:10054000C10521D400F07EFAA0EB08000328F6D301 +:100520007FF4EBAE2078410737D5DFF88874386860 +:10053000C10529D400F08EFA00F086FA80463868AA +:10054000C10521D400F080FAA0EB08000328F6D3FF :1005500069E6706820F0040070607068C00810F0F0 -:100560000100DFD000F06EFAC01B0428F5D35AE674 -:1005700000F099F8074600F080F8D3D000F062FA56 +:100560000100DFD000F070FAC01B0428F5D35AE672 +:1005700000F099F8074600F080F8D3D000F064FA54 :10058000C01B0328F7D34EE6A06801287FF4DDAE38 :10059000306840F001003060E8E6217848060ED56A :1005A000A06A00283FF40AAFB16841F00101B160D0 -:1005B00000F048FA0746B06880077FF5F8AEE06AB9 +:1005B00000F04AFA0746B06880077FF5F8AEE06AB7 :1005C000002857D0A968EA68022801F00C017FF4DE :1005D0002DAF236B02F00300984202BF02F07000BF :1005E000636B984214D1A36BC2F30620984202BFFA @@ -98,1024 +98,1076 @@ :10060000984202BF02F06042606C82423FF4F6AE54 :100610000C293FF4F5AD286841013FF5F1AD29689B :1006200021F0807100F03CF80646286881013FF512 -:10063000D7AEE968DFF87C03A26B0140206B014371 +:10063000D7AEE968DFF88003A26B0140206B01436D :10064000606B0143E06B41EA02210143206C0143EE :10065000606C0143E960286840F080702860E968B8 -:1006600041F08051E96000F0EDF90446286881010D +:1006600041F08051E96000F0EFF90446286881010B :100670007FF5BDAE0020BDE8F0817068400810F045 :10068000010070472968606A21F0F0010143296088 :100690006868216A20F47F4040EA01206860704762 -:1006A000296000F0CFB9706840084000706000F029 -:1006B000C9B92DE9F8430400884644D0DFF8F86250 +:1006A000296000F0D1B9706840084000706000F027 +:1006B000CBB92DE9F8430400884644D0DFF8FC624A :1006C00000F0CBF847D200F0CDF8074600F0C5F8AF -:1006D00041D000F0B7F9C01B0228F7D90320BAE0D7 -:1006E00000F0B0F9401B022843D9F7E700F0AAF95F -:1006F000A0EB090002284CD9F0E700F0A3F9A0EB29 -:100700000900022854D9E9E700F09CF9401B0228AF -:100710005DD9E3E700F096F9401B022867D9DDE7D1 -:1007200000F090F9401B484577D3D7E7032802D162 +:1006D00041D000F0B9F9C01B0228F7D90320BAE0D5 +:1006E00000F0B2F9401B022843D9F7E700F0ACF95B +:1006F000A0EB090002284CD9F0E700F0A5F9A0EB27 +:100700000900022854D9E9E700F09EF9401B0228AD +:100710005DD9E3E700F098F9401B022867D9DDE7CF +:1007200000F092F9401B484577D3D7E7032802D160 :100730003968890103E00028396802D1890762D449 -:1007400001E049055FD4012085E000F07BF9C01B82 +:1007400001E049055FD4012085E000F07DF9C01B80 :10075000022872D9C2E7207881074FF0B0470BD545 -:10076000B968A06821F0F0010143B96000F06AF9AE -:100770000546B868C003B3D52078DFF8205281065B +:10076000B968A06821F0F0010143B96000F06CF9AC +:100770000546B868C003B3D52078DFF82452810657 :100780000AD52968606921F0F0010143FFF788FF6D :10079000814628688003A9D5207841060BD52968B1 :1007A000A0690909090141EA1011FFF779FF8146A3 :1007B0002868C003A1D5207841070BD5B968E06847 -:1007C00021F4E0610143B96000F03CF90546B868E6 +:1007C00021F4E0610143B96000F03EF90546B868E4 :1007D000800399D5207801070CD5B868216920F4E9 -:1007E000605040EAC100B86000F02CF90546B868D6 +:1007E000605040EAC100B86000F02EF90546B868D4 :1007F00040038FD52078C10717D56068022895D1AE :10080000396889039FD5B968890840EA8100B860D2 -:1008100041F2893900F016F90546B868616800F0C0 +:1008100041F2893900F018F90546B868616800F0BE :100820000C00B0EB810F7FF47BAF306800F0070065 :10083000804505D200F016F8074600F00EF884D186 -:1008400000F053F8DFF85811086000F01DF9BDE81A -:10085000F24300F0D5B8BDE8F283306800F007003D +:1008400000F053F8DFF85C11086000F01FF9BDE814 +:10085000F24300F0D7B8BDE8F283306800F007003B :10086000404570473168C90848EAC101316000F06D -:10087000E9B838B54FF0B044514DA16811F00C0102 +:10087000EBB838B54FF0B044524DA16811F00C01FF :1008800006D1FFF75BFCC0F3031055F8200032BD22 -:1008900004294C4A05D008294B4804D12168C902D3 +:1008900004294D4A05D008294C4804D12168C902D1 :1008A00022D5104632BDE16801F00301022904D0CF :1008B000032904D12168C90207D5104605E0FFF7D6 :1008C0003DFCC0F3031055F82000E168E268E368DE :1008D000C1F306214843C2F30211491C5B0FB0FB70 :1008E000F1F05B1CB0FBF3F032BD80B5FFF7C1FF48 -:1008F0003249FFE7354A0968C1F3031152F8211064 -:10090000B0FBF1F002BD70B52D49B1282EBFCC6A05 -:10091000C0F3031051F820402048056800F0D4F8D7 -:100920002A492B4A05F00F0551F82510B4FBF1F1C7 -:100930000024B1FBF2F1B0F5007F0FF2B4022046C3 -:1009400009D10FF2900353F820508D4214D2401C6D -:100950000328F8D912E00FF28C0353F820508D428F -:100960000AD2401C0328F8D308E000F06BF8801B83 -:1009700003280CD3032070BD52F820400E4D286888 -:10098000C00844EAC000286000F05CF80646296808 -:1009900001F00701A142E8D1002070BD0801005814 -:1009A0005C0000204C000020FFFFFEEE900000588D -:1009B000000400588C80C111004000580800005805 -:1009C000684200080024F4000048E80128420008BA -:1009D00040420F001200000024000000360000001A -:1009E00040000000060000000C00000010000000A5 -:1009F00000000000010000000200000003000000F1 -:100A000070B50F4E044630780025A8B1FFF76DFF92 -:100A100032784FF47A71B1FBF2F1B0FBF1F000F0F3 -:100A2000AFF848B9102C07D2002221464FF0FF3012 -:100A300000F06EF8B46000E00125284670BD00BFEC -:100A40004400002001484068704700BF4400002077 -:100A50000248016841F48071016070470004005849 -:100A6000164810B5016841F480710160032000F060 -:100A700042F80020FFF7C4FF0024002814BF01241F -:100A800000F0C5F8204610BD0D48806870470C483E -:100A9000007870470B480BE00A48016821F002011A -:100AA000016070470748016821F004010160704748 -:100AB0000168490849000160704700000040005883 -:100AC00044000020042004E0DFF80800006800F47F -:100AD000C0607047000400580901020081B002D4D0 -:100AE0003C48815405E03C4802F00F02104400F8F5 -:100AF000041C01B07047394A13684FF6FF01000229 -:100B00000B4000F4E060184335490843106070471B -:100B100038B5324B1C68C4F30223C3F10704052C1B -:100B200028BF04241D1D072D34BF0023DB1E012513 -:100B300005FA04F4641E2140994005FA03F35B1E94 -:100B40001A401143BDE83440C6E70000010007D455 -:100B5000012200F01F01234B8A40400943F8202066 -:100B6000704701000BD4012200F01F011E4B8A4088 -:100B7000400943F82020BFF34F8FBFF36F8F7047BA -:100B800010B5401EB0F1807F01D3012010BD174C7D -:100B900060600F214FF0FF30FFF79EFF0022A26040 -:100BA00007202060002010BD010007D4012200F0C2 -:100BB0001F010F4B8A40400943F820207047010075 -:100BC00007D4012200F01F010A4B8A40400943F874 -:100BD0002020704700E400E018ED00E00CED00E09C -:100BE0000000FA0500E100E080E100E010E000E034 -:100BF00000E200E080E200E02C4981B00A68024394 -:100C00000A60096808400090009801B0704780B5FC -:100C10004FF40020FFF7F0FF002200212E20FFF705 -:100C200077FFBDE802402E20FFF790BF0068204903 -:100C3000884200D0704780B54FF48010FFF7DCFF8A -:100C4000002200212C20FFF763FF2C20FFF77EFFFE -:100C5000002200212D20FFF75BFFBDE802402D2080 -:100C6000FFF774BF1CB504461249206888421CD1A6 -:100C7000FFF7EEFEFFF7ECFE0F48816B21F44071A9 -:100C800041F480718163816B41F4004181630268AA -:100C900042F480620260006800F480600090009876 -:100CA0002046BDE8164000F015B813BD50000058AE -:100CB000000C005800280040580000588A60FF21AE -:100CC00002685162012180F82110002180F8201073 -:100CD0000020704790F82010012901D102207047B0 -:100CE000012280F82020022180F82110CA21026808 -:100CF000516253210368596201688A6842F02002F8 -:100D0000FFF7DCBFDFF83C150A6892B200E002464C -:100D1000086880B28242FAD170472DE9FC4104464E -:100D20001825DFF82485DFF82465684308EB000701 -:100D30003078062808D131787170347078754FF0AA -:100D4000FF307060002039E000F077F8B9680918CA -:100D5000B96008F10803B96832786A439A58914239 -:100D6000327813D308F1150315FB02FC13F80C308D -:100D7000062B25D008F108066B43F358994222BF91 -:100D800008F115036A439A5CEED219E011463378F4 -:100D900069439A420BD008F1140308F1150C5B5C0F -:100DA00015FB03F50CF805407A753B7500E07A7584 -:100DB00008F114025454317871703470BDE8F68132 -:100DC0001146694308F115035B5C062B04D008F15A -:100DD000140615FB03F574557B753A7508F1150279 -:100DE0005454EBE7F8B5DFF86434DFF85C541E7850 -:100DF000182402466243B0422A4404D1187858703D -:100E0000507D18700FE0167D507D92F815C005F1E9 -:100E100015076643062807F806C004D0167D14356A -:100E200014FB00F42E55012010731878062802BF19 -:100E300000294FF0FF315960F1BD10B5DFF80C44C7 -:100E4000606810F1010F0FD0FFF75CFF6168DFF8F9 -:100E50000024814261683CBF5388C918081A517840 -:100E600048431178C84000E0002080B210BD2DE951 -:100E7000F84FDFF8DC53DFF8DCB3D5F80880D8F89A -:100E80000000DBF800104A0500F090F9DFF8BC63C1 -:100E9000DFF8B4A321F4806181604FF01809347841 -:100EA0000AF1080019FB04F14758FFF7C6FF874213 -:100EB00017D200270121B170062C3DD019FB04F494 -:100EC0000AF108010AF108020959814223BF0AF117 -:100ED00008010959091A002111510AEB04014C7D3E -:100EE000EAE7A9884118B94202D2AF880021E2E7B7 -:100EF0003F1ADFE7022802DA2878012800D07F1E97 -:100F0000D8F80000C1684A07FAD500F055F9DBF8B7 -:100F10000C00000CBFB247EA0047CBF80C70FFF79B -:100F2000F1FE7060A8680068816841F480618160AA -:100F3000AFF30080BDE8F18FB8B20028DAD1FFF737 -:100F4000E1FE70600320BDE8F24FFFF72DBE2DE9F2 -:100F5000F843EFF3108872B6BD4DBB4BA86801682B -:100F6000CA224A6253204862B84A886820F48060E6 -:100F7000886018201678374647431F44387B02287C -:100F800026D13C68D7F810909078F0B17A7B012A8E -:100F90000AD101213046FFF725FF88F310887968D0 -:100FA000304600F016F904E088F31088304600F06F -:100FB000C1F8A8680068CA214162224653214162F3 -:100FC0004846314600F050F90BE0FFF750FF06E0CD -:100FD000C8684207FCD500F07EF89F49086088F396 -:100FE0001088FF21A86802685162BDE8F183F8B556 -:100FF000974CA160CA2209684A6253224A62954A04 -:10100000136843F020031360136803F00703C3F170 -:101010000403237095682D0C05F07F056D1C657029 -:10102000EDB29268C2F30E02521C628092B2521E5E -:101030006A43A2F5A072DA404FF6FF739A422CBFC2 -:10104000A380A280854A136843F400231360844B75 -:101050001D6845F400251D6048BB7C487A4E01237D -:10106000837018254FF0FF33436000235FFA83FC41 -:1010700006F10C0715FB0CFC4FF0000E07F80CE016 -:101080005B1CDFB2062FF1DB06230370886820F4B7 -:101090008060886000F01FF8D0600320FFF78FFDAC -:1010A000A1680868826842F48042826005E0C868EE -:1010B000410544BF0320FFF777FDA1680A68FF20C0 -:1010C0005062002203210320FFF722FDBDE8F24019 -:1010D0000320FFF73BBDC86800F0800060F490601B -:1010E000C8604FF400207047F0B504460025EFF3C8 -:1010F000108672B61827DFF850C10CF10C0007FB00 -:1011000005FE10F80E0010B16D1C062DF5DB062D46 -:101110000CD06F430CEB07000127077386F3108890 -:101120000461427303600D700020F0BD86F31088E7 -:101130000120F0BDF8B50746EFF3108472B6032026 -:10114000FFF70FFD424DAE683068CA2141623A4652 -:1011500053214162182043494243895C02291BD133 -:1011600000213846FFF73EFE3848017806290ED1A7 -:10117000306838490A68530500F018F821F4806196 -:101180008160C1684A07FCD500F016F804E0407899 -:10119000884218BFFFF76BFEA9680A68FF205062FB -:1011A0000320FFF7D3FC84F31088F1BD02D5C1689A -:1011B0004A07FCD481687047C16801F0800161F47E -:1011C0009061C1604FF40020234908600320FFF7BD -:1011D000F6BC2DE9F04180460F46424618201A49D8 -:1011E00042438C18207B022804BF4046FFF7A2FF31 -:1011F000EFF3108572B60320FFF7B3FC144EB0680E -:101200000068CA2141625321416202202073A76015 -:1012100067604046FFF781FD0C490A7849789142A2 -:1012200002D0FFF724FE02E0A168081AA060FF20A8 -:10123000B1680A6850620320FFF788FC85F31088C4 -:10124000BDE8F0812828004088010020100500201A -:10125000DC040020082800400C0800580008005852 -:1012600080080058940100201047704710B58EB0D8 -:1012700002A80FF20441D54C302200F025FA0FF2FB -:10128000A9300190009469460FF2853000F060FAB1 -:101290000121022000F045FBCD4A0021042000F08E -:1012A000D8FB02A800F056FC08B100F0B5FD00F034 -:1012B0009FF800F0B3FDC74C0FF23D32002084F8D8 -:1012C000800000214FF6FF70E082012000F0C1FB9A -:1012D00000F008FE00F02FFE0FF21533002204F19B -:1012E00081010020FFF700FF0220607680210120AD -:1012F00020760D20A076022020761820E0760320AC -:101300002076B5480180A0214180012000F019F924 -:101310000EB010BD7CB50646AE4D7078052805F1BF -:10132000800404D03E280DD0FF2824D03AE0B088B5 -:10133000E98A884202D10020E8822070012000F072 -:1013400000F92FE0F178012908D00C292AD1E88A88 -:101350006A460DF1010100F06AFE23E06078FFF7B4 -:10136000E9FE207804280CBF062005202070B6F87E -:101370000500E88216E0B6F8030040F20241401A88 -:1013800008D0C01E0BD0001F02BF0121E88A01F067 -:1013900088F807E0E88A914900F073FF02E0E88AE4 -:1013A00001F027F8012076BD01F011B88948C08A04 -:1013B00000F0B4BF1CB5874CE08A01AA0DF105010D -:1013C00000F035FE98B99DF80500022804BF9DF88D -:1013D0000410022903D100200090012302E0002024 -:1013E00000900223E08A1A46002100F07BFE13BD24 -:1013F00078B50FF248207A4D00887A4E89B0ADF862 -:101400001A0000F0DFFD286810F1010F0ED06968A6 -:101410003074090A000A707406F110046868B07428 -:10142000F174080A090C3075717506E0002001F0AE -:1014300053F8040008BF0FF21024224606210020B2 -:1014400001F05CF860793072102120797072E078D8 -:10145000B072A078F0726078307320780FF2F014D8 -:1014600070732246182001F049F80FF2F41600F0CC -:1014700063F84EF66E50089007AA28680790062178 -:101480002E2001F03BF822461021182001F036F8FA -:1014900000F052F81821012001F057F801F080F80F -:1014A0000DF1160006A90190009105AB072200215D -:1014B000012000F003FF0FF28810BDF81810454C12 -:1014C00000900523BDF81400002201F029F90DF168 -:1014D0001A0000900223BDF81610BDF81400002277 -:1014E00001F01EF902220221002000F0D3FD0120AC -:1014F000207000F07AFE0120607001210820207128 -:10150000A1701020607100210020E0700491102172 -:101510003548A060039008220020029001910092BB -:10152000002301220121012000F078FEA07808B1FB -:1015300000F032FF0AB070BD32461021082000F0E2 -:10154000DDBF2DE9F8420746012F87B003D12248BD -:101550000588468803E04FF4C8654FF47A66DFF8E3 -:10156000749009F180046078FFF7E4FD022F05D143 -:101570002078012814BF022800F0DCFD277000202D -:101580000690059009F119010491062299F81800B6 -:101590000FF2DC0103900291019200230093324686 -:1015A0002946002000F0D8FD0E490E2000F0CCFEA8 -:1015B000002808BF012F06D160780C4908B0BDE8AB -:1015C000F042FFF706BE08B0BDE8F082A008032095 -:1015D0008F170008180200202005002040E20100BB -:1015E0008075FF1F0400002007B2010046E00100E3 -:1015F0000021012000F03ABA0220A2E700210420D5 -:1016000000F034BA012000F057BA012000F05CBAB3 -:1016100010B50446616801F1080000F00FFC00B14C -:101620000120207010BD000010B1012803D07047C8 -:10163000072000F02FBA072000F034BA4003000062 -:10164000485253544D0000006C7AD8AC57720000D9 -:10165000123456789ABCDEF0123456789ABCDEF01A -:10166000FEDCBA0987654321FEDCBA0987654321A0 -:1016700009485253544D00000000000000000000D3 -:10168000000000000000000000000000440008000E -:101690004005020112279C00F4010000FFFF00003A -:1016A000480101000020000062B38B0708D0521EE1 -:1016B00011F8013B00F8013B00F024808B07F6D1C4 -:1016C000830740F0208000BF103A07D330B4B1E860 -:1016D0003810103AA0E83810F9D230BC530724BFB4 -:1016E000B1E80810A0E8081044BF51F8043B40F8E6 -:1016F000043BD20724BF31F8022B20F8022B44BF51 -:101700000B7803707047121F17D35B0009D151F893 -:10171000043B20F8023B1B0C121F20F8023BF6D2C0 -:101720000BE051F8043B00F8013B1B0A20F8023B98 -:101730001B0C121F00F8013BF3D238BF121D521EC2 -:1017400024BF11F8013B00F8013BF8D870477047FF -:101750007FB50C466D4D61686D4EE8612962284683 -:1017600001F04AF8246805F1240001F04FF8746094 -:1017700006F1080001F04AF801203070296829B10B -:101780000FF2551000900294684688477FBD1FB540 -:101790005F4C04F1080001F03CF800BB2178F1B186 -:1017A000694604F1080001F05DF85848C16949B183 -:1017B0000098029001228DF8042001A888479DF826 -:1017C000040000E001202070207818B1009801F09A -:1017D000FEF804E0009904F1080001F023F804F198 -:1017E000080001F016F828B9207818B104F10800B3 -:1017F000FFF704FF1FBD2DE9F8430646002000F067 -:101800005FF874883088B268DFF80081C4F3090497 -:1018100044EA8024F068A4B2C1B2204600F03CF84B -:10182000002748F2E8094846FFF7EFFE08E068881D -:10183000A04202D1316928780870687800B1012788 -:1018400008F1240000F0E5FFF0B9694608F1240032 -:1018500001F008F8009800F10B05407A0F28E6D057 -:10186000B5F80110A1420DD10098817AC81E7169A6 -:10187000C0B28842C8BF0846706102463069E91CA0 -:10188000FFF712FF2878D9E73800CCD0012000F00C -:1018900017F80020BDE8F28310B513461C4A5468BF -:1018A000A4F80900E1720A46194604F10C00FFF79A -:1018B000FBFE164A1369BDE81040002100201847BE -:1018C0001249096A82B008B921B101E011B10120C1 -:1018D00002B0084702B0704710B50146487A0F2899 -:1018E00018BF0E2807D10B4800F0A6FFBDE8104036 -:1018F0000020FFF787BE064C04F1080000F09CFFB3 -:1019000004F10800BDE81040FFF778BE3C04002059 -:10191000BC040020600400201948002101604160DF -:10192000704710B500F00CF85C6819B1012904D1BA -:10193000204301E024EA0000586082F3108810BDC3 -:10194000EFF3108272B60E4B704738B5EFF3108488 -:1019500072B60B490B4D086820B129688847686842 -:1019600080470AE0486820B1A9688847E86880474E -:1019700003E0286980476869804784F3108831BD97 -:10198000E8040020B04400082DE9FC475B4CDFF878 -:101990007091A5692840A0614FF0FF3A4FF001080F -:1019A00030E0491C54F831000642FAD004EBC1067D -:1019B000184071681040014208BFC6F804A077685B -:1019C000384000F09FF8606208FA00F087437760C3 -:1019D000EFF3108172B6626A206908FA02F2D2430C -:1019E00010402061022004EBC00353F8086C16403D -:1019F000401E43F8086CF6D181F31088606A59F8EC -:101A00002010884763692069A2691840104207D0F6 -:101A1000E069216A084203D1002103EA0206C1E716 -:101A2000C4F824A001F021F8EFF3108972B62169FF -:101A300060690140A069014201BFE169206A014279 -:101A400001F075F889F3108801F08EF8A561BDE802 -:101A5000F38738B51446EFF3108572B600F052F8EC -:101A6000274941F8204085F3108831BD10B500F0BA -:101A70000BF804431C6153F83140204343F8310014 -:101A8000FFE782F3108810BDEFF3108272B61B4B94 -:101A90001C697047EFF3108172B6184A536923EA44 -:101AA000000005E0EFF3108172B6144A5369184341 -:101AB000506181F310887047EFF3108172B60F4ABE -:101AC000D3691843D061F4E7F8B50C4C656A276A0E -:101AD0002E4615F1010F0EBF0025012101FA05F573 -:101AE000206202E0284601F024F8216AE0690842F9 -:101AF000F8D088436662E0612762F1BD1C000020D7 -:101B00009C02002002460020110C090404BF102092 -:101B1000120412F07F4F04BF083012020FF21801B6 -:101B200012F0704F04BF001D1201120FC0F11F0010 -:101B3000895C401AC0B2704704030202010101012E -:101B4000000000000000000001F065F89DF80E00A4 -:101B500005B000BDF8B500F10C026B4624214FF62C -:101B60006640F1E7F8B500F10C026B460F214FF625 -:101B70006840E9E79A4900E09A4981B00A6802435F -:101B80000A60096808400090009801B0704738B5B5 -:101B90009549964C4FF400400860FEF761FF60687D -:101BA00040010ED56068C0000BD4FEF751FFFEF770 -:101BB0004FFF206840F480302060216821F480319C -:101BC000216000F0D4F8002000F086FC40B180795C -:101BD0008749E160E16821F47C5141EA0021E1603C -:101BE00000F053F8834C8448844D606204F1240073 -:101BF00001F060F88248016800220260026902F088 -:101C0000500202610420FFF7B7FF0120FFF7B4FF85 -:101C10000220FFF7B1FF0420FFF7ACFF0120FFF720 -:101C2000A9FF0220FFF7A6FF00220F210E20FEF7DA -:101C30006FFF0E20FEF78AFF00220F213A20FEF7E9 -:101C400067FF3A20FEF782FF0020606025600F20CA -:101C5000A06047F6FF70E06000202061A061E061B5 -:101C60006061204601F05EF8CA206862FF215320BF -:101C70006862A868C008C000A860696200F0F6FE4B -:101C80004FF0FF30FFF780FEFAE738B5AEB01CA882 -:101C9000482101F0EBF801A81C2101F0E7F808A8A1 -:101CA000502101F0E3F8FEF7D3FE5048554C01688F -:101CB00021F0180101604FF48032206820F4C060E8 -:101CC00040F4007020604FF48075216801F4C06119 -:101CD0000091072100981C9101201E9000214020B6 -:101CE00020901D9227911F951CA8FEF730FA6F20B7 -:101CF000019002210020029103900490059006902B -:101D00000790012101A8FEF7D4FC43F603000890D8 -:101D100000214FF4804019900E910F911020022164 -:101D20001B901A91189508A801F0BAF8E06920F004 -:101D30007000E06134480168C1F30320009000980E -:101D400030B9E1690909090141F00401E16108E0E4 -:101D50000098E169801E80F30400090940EA01103F -:101D6000E061E06940F40040E0612FB030BD2748F9 -:101D700081B0016841F4801101603F21006800F4E6 -:101D8000801000900098224841604161016841F450 -:101D90007C110160026942F47C120261016841F029 -:101DA0003F010160026942F03F02026101B07047E9 -:101DB00038B50446FEF746FE14F1010F054609D07A -:101DC000FEF765FE241805E01248016821F00401C1 -:101DD000016030BFFEF736FE401BA042F4D331BD98 -:101DE000480000584C00005810400058900000581F -:101DF000FECAFECA1C030020000C00580028004048 -:101E000080080058000400585875FF1F5000005803 -:101E1000040C005810ED00E0704700001C49002041 -:101E2000087700221B48027000F036B818490A7F74 -:101E300041F82200087F401C0877704770B50446BF -:101E40006078FF2802BFB4F8031001F47F41B1F5B8 -:101E5000406F12D100260E4D00E0761C297FF0B2B3 -:101E600088420AD2F1B255F8211020468847010075 -:101E7000F3D002D0022805D006E02046BDE870402D -:101E8000FFF748BA002070BD012070BD00000000BF -:101E90008C0400202805002080B501F07FF901F0B6 -:101EA0007EF901F07DF901F07DF901F0B5F901F05D -:101EB000B4F901F031FA01F095FA01F094FA01F069 -:101EC00093FA01F092FA01F091FA01F090FA01F020 -:101ED0008FFA01F08EFA01F08DFABDE8014001F0B1 -:101EE0008ABA0000E0B505A0042100908DF8041026 -:101EF00042F62920694601F07CF907BD53544D0094 -:101F000010B500782B4C18B102280FD004D310BDA7 -:101F1000A0800120207310BD607BFFF70BF9607B70 -:101F2000BDE8104040F60101FFF753B9607BBDE802 -:101F30001040FFF7FFB810B50FF245020021022054 -:101F4000FFF787FD1B4C00210420217320702146E0 -:101F500042F6382001F02BFA1F20E07204F10D0147 -:101F60000A20A0800120A0724FF48060E08001224E -:101F7000BDE810400FF245030020FFF7B5B80000A0 -:101F80000D480C490068CA7A00F0070041304880CB -:101F90001307087B04D518B98888401D888003E0A2 -:101FA000012804BF00200873891C42F6372001F085 -:101FB000FEB90000AC0400202828004000210220C7 -:101FC000FFF754BD00B587B000F010F801200322E0 -:101FD0000690ADF80420ADF8062000F0A5F8002822 -:101FE0004CBFFF209DF8000007B000BD00208DF819 -:101FF00000001822002101A801F004BAADF8060083 -:10200000049107A80121082203900691ADF804204D -:10201000704709220021684601F0F4B91822002116 -:1020200002A801F0EFB9182201A801F0EBB970B5D0 -:10203000C8B006460C4615460522FFF7EBFFADF883 -:102040002060FFF7EBFF302100F014F80521049029 -:1020500000F019F8002848BFFF2009D49DF80000BF -:1020600030B99DF8030020709DF80400287000200E -:1020700048B070BDADF80A1008200221ADF8080084 -:10208000059108A870470791CDF818D0002102A843 -:10209000FFF7B1BB00B5C7B000F00EF8FFF7C3FF04 -:1020A000312000F013F800F03FF800284CBFFF206B -:1020B0009DF8000047B000BD00238DF81C008DF88E -:1020C000003007A84170827000217047ADF806000B -:1020D00007A9032004900822012003910690ADF87F -:1020E0000420704730B5C7B00025ADF81C008DF84E -:1020F0001F2007A84A9C817003718DF80050ADF82D -:102100002140FFF776FF0F21029132200721FFF7D0 -:1021100075FF00F009F800284CBFFF209DF8000073 -:1021200047B030BD03900691CDF814D0002101A82E -:10213000FFF761BB00B587B000F045F900F073F917 -:10214000812000F03BF900F085F900284CBFFF200A -:102150009DF8000007B000BD2DE9F84DC7B09446CA -:10216000DDF840E1519A559D569EDDF84CA1ADF841 -:102170001D108DF81C004FF0000BADF81FC08DF83E -:1021800021308DF822E000F024F800F017F824F850 -:10219000095F668000F047F93F20832100F075F960 -:1021A000574406910D37049700F057F900284CBFAB -:1021B000FF209DF8000048B0BDE8F08D88F800A031 -:1021C00007AC5499E419524608F10100544401F057 -:1021D00013B98DF82320174652998DF800B00DF1F0 -:1021E000240809A8B84401F007B900B5C7B000F049 -:1021F0000CF8852000F0C3F800F02CF900284CBF43 -:10220000FF209DF8000047B000BD00218DF81C00A4 -:102210008DF80010182201A801F0F4B82DE9F8415A -:10222000C7B04FF0000800F026F80DF12300DDF8EC -:1022300044E14E9F4F9E509D529C8DF81F30C0F838 -:1022400000E08DF800808DF820708DF821608DF809 -:1022500022508DF8274000F0E6F88620ADF8060001 -:1022600007A90C2000F0F2F800284CBFFF209DF8D1 -:10227000000000F024B98DF81C0007A8417082709E -:10228000704700B5C7B00022ADF81C008DF80020E3 -:102290000DF11E001822016001A8002101F0B2F822 -:1022A0008820ADF8060007A9062000F0CFF8002826 -:1022B0004CBFFF209DF8000047B000BDF8B5C8B086 -:1022C00005460E4617461C4600F023F808A846703F -:1022D00087708DF8205000F0D3F88A21ADF80A10ED -:1022E0003F20032100F0BFF8002848BFFF200ED494 -:1022F0009DF8000058B94F994E98BDF801202280F2 -:10230000BDF803200280BDF805000880002049B018 -:10231000F0BD07220021684601F074B800B5C7B0CF -:102320000021ADF81C00FFF773FF0F2102918D20F3 -:10233000022100F07EF800F08EF800284CBFFF204C -:102340009DF8000047B000BD18B5C7B0044600F0C6 -:102350003AF88DF81C40224600F09FF800F063F830 -:102360003F208E2100F0AEF8641C049400F075F854 -:1023700000284CBFFF209DF8000048B010BDADF80C -:10238000060007A901203F22039104907047ADF891 -:10239000060007A90220704700B587B000F013F8C7 -:1023A00000F041F8922000F009F800F053F80028FE -:1023B0004CBFFF209DF8000007B000BDADF806003F -:1023C0003F220120704700208DF80000704700B5C3 -:1023D00087B0FFF7F8FF00F026F89420FFF7EEFF34 -:1023E00000F038F800284CBFFF209DF8000007B02F -:1023F00000BD00B5C7B00021ADF81C00FFF708FF15 -:102400009520FFF7C4FF00F021F800284CBFFF2003 -:102410009DF8000047B000BD00228DF80020ADF807 -:102420001C008DF81E101822002101A800F0EABF40 -:102430000321ADF80600049107A801213F22039073 -:1024400006917047ADF8060007A9032004903F22CB -:10245000012003910690ADF80420CDF814D000219E -:1024600001A8FFF7C8B9ADF80800059108A8072131 -:1024700004900791CDF818D0002102A8FFF7BBB94E -:102480001822002102A800F0BDBFADF80400ADF88D -:10249000061007A80121039070470DF11D0000F000 -:1024A000ABBF00B5C7B0FFF7B7FFA520FFF7CAFF66 -:1024B00000284CBFFF209DF8000047B000BD48B089 -:1024C000BDE8F081ADF80400ADF8061007A80121C1 -:1024D000039006917047000001460648064AC379FA -:1024E0008B4218BF904218BF0838F8D18B4218BFF2 -:1024F00000207047F873FF1F0070FF1F18B50C46CF -:10250000C7B0114600228DF800208DF81C008DF810 -:102510001D4022460DF11E0000F06EFF00F02AF86B -:102520003F200C21ADF80400ADF8061007A80121EA -:1025300003900691A41C049400F02CF800284CBFD2 -:10254000FF209DF8000048B010BD00B5C7B000F0F6 -:102550000AF80F2000F013F800284CBFFF209DF868 -:10256000000047B000BD00228DF800208DF81C004F -:102570008DF81D101822002101A800F043BFADF80E -:10258000060007A9022004903F2201200391069033 -:10259000ADF80420CDF814D0002101A8FFF72BB925 -:1025A00000B587B000208DF8000000F0E0F840F2A0 -:1025B0000110ADF806003F220120069000F013F94B -:1025C00000284CBFFF209DF8000007B000BD2DE99A -:1025D000F84107460128C7B0884615461E4608BF81 -:1025E000022003D002280CBF102000200DF11D0195 -:1025F0000C1800F036F8012F8DF81C7002D0022F55 -:1026000018D019E002273A4641460DF11D0000F0AE -:10261000F3FE2570667000F0AAF83F204FF4817138 -:1026200000F016F8FF1C049700F0DFF8002805D52D -:10263000FF2009E01027E6E7472005E09DF80000AD -:1026400010B94E9800F067F8FFE748B0BDE8F08198 -:10265000ADF80400ADF8061007A803210390069119 -:10266000704703220021684600F0CCBE2DE9F64FEA -:102670000C460546012CC7B09B4608BF022003D07C -:10268000022C0CBF102000200DF11F010E18FFF7C7 -:10269000E8FF012CADF81C508DF81E4002D0022C32 -:1026A0002CD02DE00227569C559DDDF85091DDF889 -:1026B0004CA1DDF8488148993A4600F054F8A6F854 -:1026C00000B086F8028086F803A086F80490757141 -:1026D000B47100F04CF83F20ADF804004FF4827163 -:1026E00007A8ADF80610039003210A370497069156 -:1026F00000F07BF8002805D5FF2009E01027D2E77D -:10270000472005E09DF8000010B9579800F003F845 -:1027100049B0BDE8F08FBDF801100180002070477E -:1027200030B5C7B01C464A9B00F049F800258DF82B -:1027300000508DF82140224619460DF1220000F08C -:102740005BFE00F014F83F204FF4837100F042F874 -:10275000A41D049400F049F800284CBFFF209DF808 -:10276000000047B030BD0DF11F0000F045BE18223B -:10277000002101A800F046BE78B5C7B04C9C4D9D25 -:1027800000F01DF800268DF821308DF800608DF8DE -:1027900022402246294600F019F8FFF7E8FF3F20C3 -:1027A0004FF4937100F016F8E41D049400F01DF846 -:1027B00000284CBFFF209DF8000048B070BDADF868 -:1027C0001C00ADF81E108DF8202070470DF123007D -:1027D00000F012BEADF80400ADF8061007A8012104 -:1027E000039006917047ADF80420CDF814D0002175 -:1027F00001A8FFF700B80000024901600249016129 -:10280000704700BFCB280008F12800080060406036 -:102810007047EFF3108172B6026882420CBF01204C -:1028200000201CE0EFF3108272B603680B60486072 -:1028300001600868416023E0EFF3108272B608601F -:1028400043684B6041604868016019E0EFF3108114 -:1028500072B642680368136002684368536081F38C -:102860001088704710B5EFF3108472B602680A60E2 -:102870000068FFE7FFF7EAFF84F3108810BD0B60E4 -:1028800082F310887047000000F03ABE6C486D4932 -:10289000016001F12002426001F13002826001F129 -:1028A0003C02026201F14402426201F14C02C26048 -:1028B00001F15402026101F17002426101F17402FE -:1028C00082618031C16100F039BE38B504465E4D89 -:1028D0002846FFF79BFF5A484068A1680160E168FD -:1028E000C16085605949416000F044FE58482AE0C3 -:1028F00080B553484268136801211972406800F09E -:102900003FFE002002BD38B5514C4F4D04E000F0B1 -:1029100041F80098216888472846FFF77AFF002889 -:10292000F5D031BD4A484168084738B50446494D9D -:102930002846FFF76BFF4248C068A1680160456008 -:1029400000F023FE44482168016061684160002076 -:1029500032BD80B53A48C268136810211972C06848 -:1029600000F019FE002002BD35483B4AC168C1682D -:1029700013680868184738B5374C364D04E000F046 -:1029800009F80098616888472846FFF742FF002849 -:10299000F5D031BD69462846FFF764BF38B5044617 -:1029A0002E4D2846FFF732FF2D48FFF72FFF244812 -:1029B0000069A1688160E168C1600561216801600A -:1029C00061684160216941616169816131BD80B5A2 -:1029D00001462348FFF730FFBDE802400FF2050033 -:1029E00000F0E9BD38B5164C1D4D06E0FFF7D2FFEB -:1029F000009920690069FFF71FFF2846FFF709FFCC -:102A00000028F3D031BD10B5164C2046FFF7FEFE6E -:102A10000B4841690C60BDE8104000F0E0BD1CB5FA -:102A2000104C06E069462046FFF71CFF009800F0B6 -:102A30001BF82046FFF7EDFE0028F3D013BD000081 -:102A400000000320AC090320480A0320900803205B -:102A5000F8040020500A032000050020380A032053 -:102A6000F0040020400A03207047704710B5244846 -:102A7000244C88B0016841F400410160FEF74CFF2E -:102A800021480168C908C90041F004010160002023 -:102A90001E49FEF7ACFA00F0C8FD01210120FEF747 -:102AA00040FF0121002000F010FF0121012000F073 -:102AB0000CFF0121022000F008FFFFF7E7FE144A97 -:102AC00000210820FEF7C5FF04F23C500FF245013B -:102AD0000090019169460FF2410000F047F804F2BE -:102AE0005470029004F5C96140F23C500590039186 -:102AF000049402A8FFF752FFFFF7C6FE08B010BD0E -:102B00000800005830000320800400581C030020F7 -:102B1000AF2B00087047000080B500F0B4FDFEF751 -:102B2000A5FBBDE8044000210120FEF7FABEFEF738 -:102B30000CBF4FF0FF30FEF727BF00210820FEF743 -:102B400095BF0220FEF7B8BF0220FEF7BDBF0128E7 -:102B500005D0022805D0102805D1FEF725BCFEF7C8 -:102B600025BCFEF727BC7047704700007FB50C46B8 -:102B70004D4D61684D4EE8612962284600F0F4FE33 -:102B80002468746006F10800FFF740FE012000F0A1 -:102B900068F801203070296841B10FF2E9000FF2A6 -:102BA000ED02009001920294684688477FBD1FB5F0 -:102BB0003E4C04F10800FFF72CFE00BB2178F1B178 -:102BC000694604F10800FFF74DFE3748C16949B175 -:102BD0000098029001228DF8042001A888479DF8F2 -:102BE000040000E001202070207818B10098FFF761 -:102BF000EEFE04E0009904F10800FFF713FE04F173 -:102C00000800FFF706FE28B9207818B104F1080083 -:102C1000FFF793FF1FBD2DE9F04105460E46904694 -:102C20001C46002000F01DF8204F7868A0F80950DD -:102C3000C672324641460C30FEF736FD1A4A136919 -:102C400000210020984748F2E800FFF77DFF7968EF -:102C50008A78D21C04F10800FEF726FDBDE8F04199 -:102C600001201CB51049124C096A20B901B18847EE -:102C70000020207013BD0120207011B1BDE81C4060 -:102C8000084713BD0020FFF75CBF000010B50146E8 -:102C9000064C04F10800FFF7CFFD04F10800BDE881 -:102CA0001040FFF74ABF000068040020CC04002059 -:102CB00029050020F8B504460025ACB104F134061E -:102CC000307910B92046FDF7B1FF0F4F384600F0BC -:102CD00021F8386840F001103860204600F007F80D -:102CE00035600120307100E001252846F2BD10B5A5 -:102CF0000021064A064B00EB8104491C062963604B -:102D0000E261F8D310BD0000000C00584F17000816 -:102D10006B120008002101604FF03F1141603F211C -:102D20008160704738B5040044D094F8210028B978 -:102D3000002184F820102046FDF794FF00F049F8A8 -:102D4000FF2510B100F03FF834E02168DFF8B00053 -:102D50008A6802408A6021688A6863682069034340 -:102D6000A06903431A438A602168E068086120680B -:102D70000169A26841EA024101612068C16821F04D -:102D80008001C1602068C16C89088900C164216824 -:102D9000CA6CE369606903431A43CA6420688168A6 -:102DA000880609D400F020F830B12068456204217B -:102DB00000F01FF8012032BD20684562012184F82F -:102DC0002110002032BD20684562042184F82110C2 -:102DD0007047022084F82100CA20216848625320ED -:102DE00022685062204626E020460BE02068C0F8AA -:102DF000248084F82110002084F82000704700000F -:102E0000BFFF8FFF70B5044640F2E9362068C16805 -:102E100021F0A001C160FDF715FE05462068C168DC -:102E2000880606D4FDF70EFE401BB042F6D3032001 -:102E300070BD002070BD70B504462068C1684A06A8 -:102E400012D44FF0FF32C26040F2E936FDF7FAFDCE -:102E500005462068C168480606D4FDF7F3FD401B0F -:102E6000B042F6D3032070BD002070BD002200F0F8 -:102E700085BD0000DFF820130A68030903F47F23EF -:102E800000019A4300F47F2000F082B9DFF80823A4 -:102E90001368010C23EA014343EA004313607047BF -:102EA0002DE9F843054600242878DFF8EC62410656 -:102EB000A0464FF0B0472DD5286B70B1B0F5800F0C -:102EC00006D0B0F5000F18BFB0F5400F17D01FE0C7 -:102ED000F86840F48030F860EDE0386820F08060F9 -:102EE0003860FDF7AFFD81463868000140F1D080C1 -:102EF000FDF7A8FDA0EB09000228F5D90324D7E0CF -:102F0000FDF7A0FDA0EB0900022840F2C980F5E71B -:102F10000124A0462868010531D5B06800F4407846 -:102F2000286C80452AD0FDF793FDB8F1000FB168F9 -:102F300005D1286C21F440710143B1601EE0B068F6 -:102F400040F48030B06021F44071B06820F48030EB -:102F5000B060286C0143B160B068C0070ED5FDF7C2 -:102F600071FD804641F28939B068800706D4FDF7CB -:102F700069FDA0EB08004845F6D30324A046287855 -:102F8000C10705D53168A869890840EA8101316027 -:102F90002878810705D53168E86921F4406101434B -:102FA00031602878C10644BFA86AFFF76FFF287810 -:102FB000810644BFE86AFFF769FF2878410744BFEC -:102FC000286AFFF757FF2878010744BF686AFFF7B0 -:102FD00051FF2868C1051BD53168686B21F040613D -:102FE00001433160686BB0F1006F00F0BDF8686BB1 -:102FF000B0F1806F75D100F0BDF80446386800016B -:1030000060D5FDF71FFD001B0228F7D94FF003081C -:1030100067E0FDF717FD001B02285BD9F6E7316872 -:1030200021F04041316020F08050326822F040624F -:1030300010433060A86BB0F1C05F00F095F82868CD -:1030400041056DD53168E86B21F040510143316095 -:10305000E86BB0F1005F03D1F96841F48031F960A9 -:10306000E86BB0F1805F5BD100F084F8044638680B -:10307000000146D5FDF7E6FC001B0228F7D94FF00A -:1030800003084DE0FDF7DEFC001B022841D9F6E7FE -:1030900000F061F8A86821F4781100F071F8814619 -:1030A000386800017FF52CAF3969686901433961DF -:1030B000002C7FF42EAF3168286B21F440010143CE -:1030C000316027E700F047F8E86821F0606100F020 -:1030D00057F80446386800019BD53969686901438F -:1030E000396128688105AAD5A86BB0F1804F1CBF53 -:1030F000B0F1004F002892D1316821F040410843DF -:1031000097E700F028F8286921F0604100F038F8CE -:10311000044638680001B5D53969686901433961E9 -:103120002868C10405D5F168686C21F44041014369 -:10313000F160286881040BD5796AE86C21F03001D0 -:1031400001437962796AA86C890840EA8101796251 -:103150004046BDE8F2833869696820F4FE4040EAE1 -:10316000012038613969704703D1F96841F08071F5 -:10317000F9607047396821F080613960FDF762BC01 -:1031800001433961386840F080603860FDF75ABC0F -:10319000104308607047000088000058704770476F -:1031A0007047000018B51B4C0020206087B041F626 -:1031B0000A00ADF8180000940323012206A901209B -:1031C000FFF705FA42F629220121ADF818200491F3 -:1031D000A01C05900A22002302210392029301936E -:1031E00000912023208806AA0121FFF73FFA08B0AA -:1031F00010BD80B542F62922904209D10A680548DF -:10320000009200220B7941880088FFF789FA02BDFD -:10321000002002BD240500207047704738B50246E3 -:1032200086B050780024FF2839D1B2F803106B48DB -:1032300040F60143C91A1FD0123901BFB2F8071076 -:10324000C088401C81422AD1957AB2F80500537A91 -:103250000124012D08D10A3201920093002200239B -:10326000FFF78AFA002015E00A320192009301224A -:103270008023FFF781FA12E04088B2F80710801C23 -:1032800081420CD1507B0124C10748BF8DF8084012 -:1032900002D402208DF8080002A8FEF731FE204675 -:1032A00007B030BDFEB5014601AA487A8DF804008A -:1032B0004B7A08885070DC0704D50888000A9070A3 -:1032C000032300E00223487A040707D54888D05436 -:1032D0005B1C4888DCB2000A10555B1C4C7AE00687 -:1032E00010D50D7A00200BE001EB4004DFB2A68878 -:1032F000D6555B1CA488DEB2240A94555B1C401C86 -:10330000A842F1DB01A935480091DBB24188008871 -:103310000022FFF705FAFEBD18B587B030482F4CE4 -:10332000FEF784FD41F60D01ADF818100094082356 -:10333000012206A90120FFF74AF942F63720ADF82D -:103340001800012204920A20A11C039000231022DD -:103350000591029301930092072300F023F842F6AF -:103360003820ADF8180000220492029201920A203F -:10337000211D03900222059100F012F842F6392037 -:10338000ADF818000022049201920A20A11D0390BA -:10339000022308220591029300F002F808B010BD44 -:1033A00000920123208806AA0121FFF75FB980B5AA -:1033B000002242F63723C01A09D0401E0BD107481D -:1033C0000091012381880088FFF7AAF902E00846EE -:1033D000FFF768FF0246104602BD00000805002006 -:1033E0001D3200087047704770477047704770473C -:1033F000704770477047704710B50446FEF754F9A0 -:10340000204610BD10B5044610460A460146204627 -:1034100000F0CEFA204610BDC0680840884201D1B5 -:103420000120704700207047C0690840884201D1E0 -:10343000012070470020704710B56C4C02212046D7 -:10344000FFF7F2FF38B16068C043810703D5FFF78B -:1034500092FA022018E001212046FFF7E5FF38B17B -:103460006068C043C10703D5FFF74DFA01200BE0A8 -:1034700008212046FFF7D8FF38B16068C043010734 -:1034800003D5FFF7CCFA0820A06010BD10B5574C4B -:1034900000F033F818B96068C043810306D400F027 -:1034A0002CF830B96068C043810302D5BDE81040F4 -:1034B0007AE0082100F022F870B96068C043010387 -:1034C0000AD560684A4940F4002060600868804777 -:1034D0004FF40020A06010BD202100F00FF858B973 -:1034E0006068C043810207D5606840F400106060E6 -:1034F000BDE81040FFF716BA10BD022120468BE749 -:103500003C4881B0016841F480110160006800F41A -:103510008010009000983848016841F40071016003 -:103520003648026842F40072026040BF20BF34484F -:10353000016841F40041016001B0704780B5314835 -:10354000016841F480110160006800F4801000906F -:1035500000982648016841F001010160026842F4C8 -:10356000803202602C20FDF7F1FABDE802402D20E8 -:10357000FDF7ECBA2448016849084900016070472A -:1035800022494FF48030086070471F48016821F0DD -:103590000201016070471C484FF40031416001682E -:1035A00021F40031016070471748016841F400318F -:1035B0000160FFF7D9B938B504460C4D08212846FB -:1035C000FFF72AFF30B10A480460686820F4002041 -:1035D000686031BDA0474FF40021A96031BD0A48A1 -:1035E000016821F00801016070470000000C0058DC -:1035F0001805002050010058D40800582008005831 -:103600000C04005850000058040C0058080C0058D6 -:10361000564900E0564981B00A6802430A600968C9 -:1036200008400090009801B0704718B585B0684612 -:103630001421FFF71BFC032001904FF4604100248C -:10364000009102940120FFF7E3FF00F097F8474C48 -:103650002068400840002060182100910220FFF7F8 -:10366000D7FF6946434800F0D7F9206820F00200F0 -:103670002060FDF70FFAFDF70FFAFDF713FA00F0DF -:1036800011F806B010BD00B587B068460FF20821EA -:103690001C22FEF719F8FFF7B6F96846FEF762FA42 -:1036A00007B000BDF0B585B068461421FFF7DEFB1A -:1036B00000260025002400210FF2CC0000EBC102FF -:1036C000907988B11368B3F1904F08D0294FBB426D -:1036D00008D0294FBB4204BF9088044304E090887F -:1036E000064301E090880543491C2229E4DB0020C1 -:1036F00002900121032003900191B0B270B10090BB -:103700000120FFF785FF0120FFF784FF00F036F866 -:103710000022B1B24FF0904000F03BFAA8B280B165 -:1037200000900220FFF774FF0220FFF773FF114E95 -:103730006946304600F070F90022A9B2304600F028 -:1037400028FAA0B280B100900420FFF761FF0420A6 -:10375000FFF760FF084D6946284600F05DF900223A -:10376000A1B2284600F015FA05B0F0BD4C00005893 -:103770004C010058000400480008004869464FF01A -:10378000904000F049B9000000000048010000002E -:103790000000004801000000000000480100000097 -:1037A0000000004801000000000000480100000087 -:1037B0000000004801000000000000480100000077 -:1037C0000000004801000000000000480100000067 -:1037D0000000004801000000000000480100000057 -:1037E0000000004801000000000000480100000047 -:1037F0000000004801000000000000480100000037 -:103800000000004801000000000000480100000026 -:103810000000004801000000000000480100000016 -:103820000000004801000000000000480100000006 -:1038300000000048010000000000004801000000F6 -:1038400000000048010000000000004801000000E6 -:1038500000000048010000000000004801000000D6 -:1038600000000048010000000000004801000000C6 -:1038700000000048010000000000004801000000B6 -:1038800000000048010000000000004801000000A6 -:1038900000000048010000000000000000000000DF -:1038A0000000000088370008280003202C000320B7 -:1038B00022040400264981B00A6802430A600968AC -:1038C00008400090009801B07047F0B585B00546FB -:1038D0000C4668461421FFF7C9FA0DB9042004E02C -:1038E000012D18BF022D02D10820FFF7E3FF2000B1 -:1038F000184E0FF268070DD137F81500009000211F -:103900000191012002900221039100F01BF8012097 -:10391000FEF74EFA012C13D137F815000090012163 -:103920000D480190029100F00DF80FF23800445D4F -:1039300000220F2160B2FDF7EBF860B2FDF706F947 -:1039400005B0F0BD694656F8250000F065B80000E6 -:103950004C00005850000020000021101000010011 -:10396000020000000A0607000249016002490161E5 -:10397000704700BF2B2900085329000800B500BF7D -:10398000130096469446103928BFA0E80C50FAD888 -:103990005FEA417C28BF0CC048BF40F8042BC90730 -:1039A00028BF20F8022B48BF00F8012B00BD000003 -:1039B00062F30F2262F31F42401810F0030308D095 -:1039C000C91A1FD3DB0748BF00F8012D28BF20F814 -:1039D000022D130030B414461546103928BF20E9D3 -:1039E0003C00FAD8490728BF20E90C0048BF40F83E -:1039F000042D890028BF20F8022D48BF00F8012DB2 -:103A000030BC7047C91818BF00F8012DCB0728BF7C -:103A100000F8012D704700002DE9F84F4FF0000924 -:103A2000644A654B4FF00F0805460E4633E0634F7E -:103A3000BD4214BF072704278F4027434CF82E7040 -:103A4000C1431C6801EA040C7468E40348BF40EAFF -:103A50000C0CC3F800C05C6801EA040C7468A40391 -:103A600048BF40EA0C0CC3F804C0146801EA040C17 -:103A70007468E40248BF40EA0C0CC2F800C0546805 -:103A800001EA040C7168890248BF40EA0C0CC2F8D4 -:103A900004C009F10109316831FA09F077D0012435 -:103AA00004FA09F414EA0100F3D04FEA490C0321A7 -:103AB00001FA0CF16FEA010E7168012918BF0229A1 -:103AC00003D0112918BF122911D1A968F7680EEA8D -:103AD000010107FA0CF73943A960696821EA040477 -:103AE0007168C1F3001101FA09F10C436C60E968D7 -:103AF000B4680EEA010104FA0CF42143E9604FEACC -:103B000089017468022C18BF122C12D14FEAD90413 -:103B100005EB840401F01C07D4F820A008FA07FB89 -:103B20002AEA0B0AD6F810B00BFA07F747EA0A0799 -:103B300027622C680EEA0407347904F0030404FABF -:103B40000CF43C432C607468E400A2D5DFF870C02C -:103B50004FEA990E5CF82E7001F00C0108FA01F49E -:103B600027EA0404B5F1904F08BF00270ED0154F87 -:103B7000BD4208BF012709D0134FBD4208BF02272D -:103B800004D0124FBD427FF452AF032754E7BDE883 -:103B9000F18F81B0002A14BF8161816201B070474A -:103BA0000B4A136803421CBF1060FEF7D0BF70477A -:103BB000000000000008005880080058001000486D -:103BC000080001400004004800080048000C0048BC -:103BD0000C080058816821F040018160704720681E -:103BE00081684A0670472068016821F01001016071 -:103BF0007047F8B5044640F60F002668F169326850 -:103C0000B368084004F15C050ED1880602D5900621 -:103C100002D4D80040F180806969002900F00E814B -:103C20002046BDE8F4400847DFF84802034204BFDD -:103C3000DFF844723A426FD0CF0707D5D70505D5D4 -:103C4000012737622E6B46F001062E638E0708D5DA -:103C5000DE0706D5276802263E622E6B46F0040674 -:103C60002E634E0708D5DE0706D5276804263E6278 -:103C70002E6B46F002062E630E070AD5960601D477 -:103C8000034206D0266808203062286B40F0080006 -:103C90002863080509D5500107D526684FF4006050 -:103CA0003062286B40F020002863286B002832D057 -:103CB000890607D5900601D4D80003D5696909B1F2 -:103CC00020468847286B21688A68510602D410F084 -:103CD000280F1BD0204600F0B2F8FFF780FF10D568 -:103CE000FFF778FF286A60B10FF291118163286AAB -:103CF00000F004F900280ED0286A816BBDE8F4407A -:103D000008472046BDE8F24000F08EB9204600F09A -:103D10008BF900202863F1BD2869012853D1CF0613 -:103D200051D5D0064FD510203062226890684106E8 -:103D300026D5296A0868406880B20028EBD02B8815 -:103D400098427BDA6880086801688B0614D4106892 -:103D500020F4807010602068816849084900816003 -:103D60002068FFF737FF2020E86200202861FFF776 -:103D70003AFF286A00F08CF829886888091A1CE044 -:103D800028886988411A688800281CBF88B20028E2 -:103D900054D01368DFF8F40023F4907313602268A2 -:103DA0009368034093602020E862002028616861E6 -:103DB0002068026822F0100202602046BDE8F4404C -:103DC00089B200F032B9C80209D5580207D54FF4BC -:103DD000801030622046BDE8F24000F027B90806A6 -:103DE00009D5100601D4180205D5A96931B32046BA -:103DF000BDE8F440084748060ED550060CD530689B -:103E000020F0400030602021A9620020A8612046F7 -:103E1000BDE8F24000F00CB9080206D5500004D508 -:103E20002046BDE8F24000F011B9C80148BF002AA1 -:103E300004D52046BDE8F24000F009B9F1BD0168A3 -:103E40000A6822F490720A60DFF8401002689368F2 -:103E50000B409360C16E012904D101680A6822F009 -:103E600010020A602021C0F888100021C166016795 -:103E7000704700000100001020010004806A00F17A -:103E8000560100220A810A8000F0CEB8FEFFFFEF43 -:103E900081B040B100F124014A78022A05D0042003 -:103EA000886100200870012026E00268136823F072 -:103EB0000E0313604A6A136823F48073136000686A -:103EC0000268520852000260012091F82020CB695C -:103ED00002F01C02904058608A6AC86A5060086B01 -:103EE00030B1026822F4807202604A6B886B5060C5 -:103EF000012048700020087001B0704738B500F10B -:103F0000240200245178022903D004209061012466 -:103F100028E001680B6823F00E030B6001680D6850 -:103F20006D086D000D60516A0B6823F480730B609F -:103F3000012192F82030D56903F01C039940696093 -:103F4000936AD16A5960116B31B10B6823F48073A5 -:103F50000B60536B916B5960012151701470516962 -:103F600001B18847204632BDF8B500F12401042391 -:103F7000CA6914680268156891F8206006F01C068A -:103F800003FA06F73C4210D06F070ED51468A50659 -:103F900003D4156825F00405156000F03DF8C968E4 -:103FA000002938D0BDE8F4400847022303FA06F799 -:103FB0003C4213D0AF0711D51468A50605D4156887 -:103FC00025F00A05156001224A7000F025F800224C -:103FD0000A708968F9B1BDE8F4400847082303FA7C -:103FE00006F6344217D02B0715D5136823F00E03BD -:103FF0001360012291F82030CC6903F01C039A4031 -:10400000626001228A614A7000220A70096911B156 -:10401000BDE8F4400847F1BD91F82020CC6902F0DA -:104020001C02934063607047704770477047000000 -:1040300000680449884204D103490868002818BF71 -:1040400000477047003801401C050020704770474A -:1040500000EB8100404AD0F88010914201D001204D -:1040600070470020704742F4806240F8212070477A -:1040700080B500F097F839481F2181610168C908AF -:10408000C90041F0030100F026F861E000F092B8A9 -:1040900010B500F087F8324C00F04CF80028FBD146 -:1040A000042100F048F828B92E480068010403D51F -:1040B00000F043F800F05CF80022032100F03FF824 -:1040C00026480168C908C90041F0020100F003F860 -:1040D000016030BF10BD01602348016841F0040158 -:1040E000704710B51E4C00F028F800F023F80028A7 -:1040F000FBD14FF0B040816801F00C01042911D1CF -:10410000016841F48031016001688903FCD5816850 -:104110008908890041F002018160816801F00C0189 -:104120000829FAD10022032100F009F8BDE8104067 -:1041300000F040B8032120468AE7002204212046EF -:1041400091E780B500F02EF80748016821F00401DE -:10415000016030BF01BD0000000400800004005871 -:10416000001400588804005810ED00E000F022B858 -:104170004FF0B040016841F4807101600168490569 -:10418000FCD581688908890041F001018160416A9C -:10419000890889004162816801F00C010429FAD183 -:1041A000704700000248016821F002010160704779 -:1041B00010E000E00248016841F002010160704730 -:1041C00010E000E01349002008604FF4E02212489C -:1041D000016841F4700101604FF0B041086840F09F -:1041E000010008608A600D480A6802400C480A60B5 -:1041F000036823F0050303604268520852004260DE -:1042000000220848C8600861086820F4802008601F -:104210008A61704708ED00E088ED00E0FBFEF6FAE9 -:104220009400005800100422010000000300000068 -:104230000500000001000000010000000600000071 -:104240000A0000002000000002000000040000003E -:104250000800000010000000400000008000000086 -:104260000001000000020000A0860100400D0300D4 -:10427000801A060000350C0040420F0080841E00AA -:1042800000093D0000127A000024F40000366E019F -:104290000048E801006CDC020000000000000000A3 -:1042A00000000000000000007047FEE7FEE7FEE7A8 -:1042B000FEE770477047704700F026B80848FFF7E0 -:1042C00053BE0848FFF795BC0748FFF792BCFFF7BD -:1042D000B3B8FFF7DBB800F01FB80448FFF744BEDF -:1042E0007C030020F800002068000020DC03002090 -:1042F0001020FFF755BC0120FFF752BC0220FFF74A -:104300004FBCFCF724BE00000248416802788918BF -:1043100041607047440000200449C8680A6882432D -:104320000A60486000F004B8000000000015005862 -:10433000704719E050F8042BD30744BFA9F10103DB -:104340009A18091F0023042942F8043BF9D25FEAB6 -:10435000817C134604D54FF0000CA2F800C09B1CD2 -:10436000C90744BF0021197050F8041B0029E1D18E -:10437000704730B5016884684218416802EB510308 -:10438000C9070BD54C4409E012F9011B12F8015B77 -:10439000002904F8015B05D5491CF9D19A42F3D1F3 -:1043A0000C3030BD491EF1D5F8E7000010B500F023 -:1043B00013F802000023DB4300241068984203D066 -:1043C00011000220ABBE14605068984203D0111D4A -:1043D0000220ABBE546010BD0148704700000000D1 -:1043E0006000002010B5074979441831064C7C4420 -:1043F000163404E00A68081D114488470146A142AA -:10440000F8D110BD2C000000600000004EF688516D -:10441000CEF20001086840F470000860BFF34F8FCF -:10442000BFF36F8F4FF00070E1EE100A704700008D -:1044300003FFFFFFC40400006800002070080000B4 -:1044400030000320000000002BFFFFFF6801000088 -:1044500048000000040000201BFFFFFF7C0100005B -:10446000040000002800032000F00DF8002801D00F -:10447000FFF7B8FFAFF300800020AFF30080FDF737 -:1044800086FB00F002F80120704700F001B8000040 -:104490000746384600F002F8FBE7000080B5FFF75A -:1044A00085FF024A11001820ABBEFBE72600020080 -:1044B000434100086D41000891400008E3400008B6 -:1044C000714000088D4000080148804701480047BE -:1044D000C5410008D9440008AFF30080FFF796FFFC -:1044E000FFF7C2FFFFF7FEBFFFF7FEBFFFF7FEBFFC -:1044F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF0 -:10450000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFDF -:10451000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFCF -:10452000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFBF -:10453000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAF -:10454000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9F -:10455000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8F -:10456000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7F -:10457000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF6F -:10458000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5F -:10459000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4F -:1045A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3F -:1045B000FFF7FEBF020DFF01D700F8FFF400000176 -:1045C000F9000010FC000E080048000C0048000C28 -:0A45D000004800093D00F8FFF80064 -:04000005080044D9D2 +:1008F0003349FFE7364A0968C1F3031152F8211062 +:10090000B0FBF1F002BD70B52E49B1282EBFCC6A04 +:10091000C0F3031051F820402148056800F0D6F8D4 +:100920002B492C4A05F00F0551F82510B4FBF1F1C5 +:100930000024B1FBF2F1B0F5007F0FF2B8022046BF +:1009400009D10FF2940353F820508D4214D2401C69 +:100950000328F8D912E00FF2900353F820508D428B +:100960000AD2401C0328F8D308E000F06DF8801B81 +:1009700003280CD3032070BD52F820400F4D286887 +:10098000C00844EAC000286000F05EF80646296806 +:1009900001F00701A142E8D1002070BD0000000075 +:1009A000080100586810002050100020FFFFFEEEE4 +:1009B00090000058000400588C80C111004000587D +:1009C000080000586C4500080024F4000048E801C5 +:1009D0002C45000840420F001200000024000000D7 +:1009E0003600000040000000060000000C0000007F +:1009F00010000000000000000100000002000000E4 +:100A00000300000070B50F4E044630780025A8B1F1 +:100A1000FFF76BFF32784FF47A71B1FBF2F1B0FB64 +:100A2000F1F000F0AFF848B9102C07D200222146AF +:100A30004FF0FF3000F06EF8B46000E0012528466A +:100A400070BD00BF4810002001484068704700BFDB +:100A5000481000200248016841F48071016070472D +:100A600000040058164810B5016841F48071016017 +:100A7000032000F042F80020FFF7C4FF0024002804 +:100A800014BF012400F0C5F8204610BD0D48806851 +:100A900070470C48007870470B480BE00A48016823 +:100AA00021F00201016070470748016821F004014C +:100AB0000160704701684908490001607047000003 +:100AC0000040005848100020042004E0DFF808002F +:100AD000006800F4C060704700040058090102007B +:100AE00081B002D43C48815405E03C4802F00F023A +:100AF000104400F8041C01B07047394A13684FF6DF +:100B0000FF0100020B4000F4E06018433549084340 +:100B10001060704738B5324B1C68C4F30223C3F130 +:100B20000704052C28BF04241D1D072D34BF0023F6 +:100B3000DB1E012505FA04F4641E2140994005FAE4 +:100B400003F35B1E1A401143BDE83440C6E70000C2 +:100B5000010007D4012200F01F01234B8A40400905 +:100B600043F82020704701000BD4012200F01F0140 +:100B70001E4B8A40400943F82020BFF34F8FBFF33C +:100B80006F8F704710B5401EB0F1807F01D30120F8 +:100B900010BD174C60600F214FF0FF30FFF79EFF34 +:100BA0000022A26007202060002010BD010007D4B1 +:100BB000012200F01F010F4B8A40400943F820201A +:100BC0007047010007D4012200F01F010A4B8A4040 +:100BD000400943F82020704700E400E018ED00E0F1 +:100BE0000CED00E00000FA0500E100E080E100E02B +:100BF00010E000E000E200E080E200E0404981B067 +:100C00000A6802430A60096808400090009801B031 +:100C1000704780B54FF40020FFF7F0FF002200215D +:100C20002E20FFF777FFBDE802402E20FFF790BF90 +:100C300000683449884200D0704780B54FF4801076 +:100C4000FFF7DCFF002200212C20FFF763FF2C20A0 +:100C5000FFF77EFF002200212D20FFF75BFFBDE89C +:100C600002402D20FFF774BF10B594B004466846CB +:100C7000502100F04FF82168234A91420FD14FF4E0 +:100C8000007000904FF080510E91684600F05CF8C3 +:100C900008B100F09DFA4FF48020FFF7AFFF14B0C9 +:100CA00010BD18B595B0044601A8502100F032F8E7 +:100CB0002168164A914221D14FF4006001904FF40F +:100CC0008071119101A800F03FF808B100F080FA9E +:100CD0000F48816B41F4004181630021026842F4B6 +:100CE000806202600022006800F48060009000983A +:100CF0000320FFF70FFF0320FFF72AFF16B010BDF8 +:100D000050000058000C0058001000580028004007 +:100D100058000058002200F05DBA7047DFF8201339 +:100D20000A68030903F47F2300019A4300F47F203B +:100D300000F082B9DFF808231368010C23EA0143AD +:100D400043EA0043136070472DE9F8430546002449 +:100D50002878DFF8EC624106A0464FF0B0472DD569 +:100D6000286B70B1B0F5800F06D0B0F5000F18BF3A +:100D7000B0F5400F17D01FE0F86840F48030F860FD +:100D8000EDE0386820F080603860FFF75DFE814656 +:100D90003868000140F1D080FFF756FEA0EB090053 +:100DA0000228F5D90324D7E0FFF74EFEA0EB090097 +:100DB000022840F2C980F5E70124A0462868010511 +:100DC00031D5B06800F44078286C80452AD0FFF710 +:100DD00041FEB8F1000FB16805D1286C21F44071D3 +:100DE0000143B1601EE0B06840F48030B06021F48F +:100DF0004071B06820F48030B060286C0143B1606D +:100E0000B068C0070ED5FFF71FFE804641F2893952 +:100E1000B068800706D4FFF717FEA0EB080048452E +:100E2000F6D30324A0462878C10705D53168A86900 +:100E3000890840EA810131602878810705D5316849 +:100E4000E86921F44061014331602878C10644BF5C +:100E5000A86AFFF76FFF2878810644BFE86AFFF7AA +:100E600069FF2878410744BF286AFFF757FF2878B1 +:100E7000010744BF686AFFF751FF2868C1051BD509 +:100E80003168686B21F0406101433160686BB0F1FB +:100E9000006F00F0BDF8686BB0F1806F75D100F0A5 +:100EA000BDF804463868000160D5FFF7CDFD001B92 +:100EB0000228F7D94FF0030867E0FFF7C5FD001BD4 +:100EC00002285BD9F6E7316821F04041316020F01B +:100ED0008050326822F0406210433060A86BB0F15D +:100EE000C05F00F095F8286841056DD53168E86B62 +:100EF00021F0405101433160E86BB0F1005F03D154 +:100F0000F96841F48031F960E86BB0F1805F5BD142 +:100F100000F084F804463868000146D5FFF794FDD8 +:100F2000001B0228F7D94FF003084DE0FFF78CFDB6 +:100F3000001B022841D9F6E700F061F8A86821F407 +:100F4000781100F071F88146386800017FF52CAF08 +:100F50003969686901433961002C7FF42EAF31682B +:100F6000286B21F440010143316027E700F047F886 +:100F7000E86821F0606100F057F804463868000125 +:100F80009BD5396968690143396128688105AAD50B +:100F9000A86BB0F1804F1CBFB0F1004F002892D178 +:100FA000316821F04041084397E700F028F82869AC +:100FB00021F0604100F038F8044638680001B5D5EA +:100FC00039696869014339612868C10405D5F16848 +:100FD000686C21F440410143F160286881040BD51D +:100FE000796AE86C21F0300101437962796AA86C72 +:100FF000890840EA810179624046BDE8F283386998 +:10100000696820F4FE4040EA012038613969704780 +:1010100003D1F96841F08071F9607047396821F0B7 +:1010200080613960FFF710BD01433961386840F0D5 +:1010300080603860FFF708BD10430860704700000B +:10104000880000585A4900E05A4981B00A680243B2 +:101050000A60096808400090009801B0704710B518 +:10106000FFF700FD00F0D0F800F04EF800F08BF82C +:10107000514C5248A06304F1380000F0EFF904200D +:10108000FFF7E2FF0120FFF7DFFF0220FFF7DCFFA1 +:101090000420FFF7D7FF0120FFF7D4FF0220FFF75E +:1010A000D1FF00220F210E20FFF734FD0E20FFF7A5 +:1010B0004FFD00220F213A20FFF72CFD3A20FFF7C9 +:1010C00047FD3F482060002060600F20A06047F689 +:1010D000FF70E06000202061A061E0616061204657 +:1010E00000F0F4F900220021204600F093FA354880 +:1010F00060620020A06204F1240000F01BFB00F0FD +:10110000ABF800F08BF9FCE780B59AB008A848214D +:10111000FFF700FE01A81C21FFF7FCFDFFF79AFC7A +:101120002948016821F01801016047212748026819 +:1011300022F4C06242F4007202604FF48032006810 +:1011400000F4C06000900098089101200A904FF4CC +:10115000807112900B9100204021139009920C9104 +:1011600008A8FEF7F4FF6F200190022100200291F1 +:1011700003900490059006900790012101A8FFF7C5 +:1011800098FA1BB000BD10B594B068465021FFF727 +:10119000C1FD4FF4804011900221102013904FF4B4 +:1011A0004054129100946846FFF7CEFD14B010BD74 +:1011B000480000584C00005820130020000C005834 +:1011C000002800400010005890000058000400580B +:1011D0007047704700B500BF13009646944610391B +:1011E00028BFA0E80C50FAD85FEA417C28BF0CC0A9 +:1011F00048BF40F8042BC90728BF20F8022B48BF7E +:1012000000F8012B00BD000010B57649764C4FF474 +:1012100000400860606840010ED56068C0000BD4D3 +:10122000FFF718FCFFF716FC206840F480302060C0 +:10123000216821F48031216000F066F8002000F080 +:1012400099FA40B180796949E160E16821F47C5103 +:1012500041EA0021E16010BD10B56548654C88B0D9 +:1012600001680160CA216448C1615321C161FF2244 +:101270000168C908C9000160C2616048016841F4A1 +:101280000041016000F088FA5D480168C908C900A2 +:1012900041F00401016000205A4900F02AFC00F0EE +:1012A00074FD0121012000F07CFA0121002000F0F2 +:1012B000CCFE0121012000F0C8FE0121022000F037 +:1012C000C4FE00F011FF504A0021402001F063F8F5 +:1012D00004F23C500FF275010090019169460FF243 +:1012E000710001F0DBF804F25470029004F5C9615A +:1012F00040F23C5005900391049402A800F07CFF5A +:1013000000F0F0FE08B010BD404881B0016841F423 +:10131000801101603F21006800F480100090009867 +:101320003B4841604161016841F47C110160026900 +:1013300042F47C120261016841F03F0101600269E0 +:1013400042F03F02026101B07047000070470000A8 +:1013500038B5044688B0616801F10B0504A801F0B6 +:101360005EF92988B1F5124F22D168461021FFF7A6 +:10137000D1FC60680D300078B0B900F034FD0D206C +:101380008DF800007F218DF8021022480168090CB9 +:10139000ADF80C10684601F03BF901F07FF900212F +:1013A000012000F0FEF903E0012804BF00202070B6 +:1013B00009B030BD38B50446FFF746FB14F1010F04 +:1013C000054609D0FFF765FB241805E012480168BF +:1013D00021F00401016030BFFFF736FB401BA04243 +:1013E000F4D331BD1040005890000058FECAFECA28 +:1013F00090080058300003200828004008000058DA +:101400008004005820130020DF24000850000058FA +:10141000040C0058002004E010ED00E002E000F0B1 +:10142000D4B900BF4FF0FF3000F04EBF0021402084 +:1014300000F0BEBF022000F0E1BF022000F0E6BFD6 +:10144000012805D0022805D0102805D101F0C4B923 +:1014500001F0C4B901F0C6B970470000F8B5044600 +:101460000025ACB104F13406307910B92046FFF7FD +:10147000DFFB0F4F384600F021F8386840F00110CC +:101480003860204600F007F835600120307100E038 +:1014900001252846F2BD10B50021064A064B00EB97 +:1014A0008104491C06296360E261F8D310BD000085 +:1014B000000C0058D31100081B0D0008002101602A +:1014C0004FF03F1141603F218160704738B5040003 +:1014D00044D094F8210028B9002184F82010204637 +:1014E000FFF7DFFB00F049F8FF2510B100F03FF8EF +:1014F00034E02168DFF8B0008A6802408A60216821 +:101500008A68636820690343A06903431A438A60B9 +:101510002168E068086120680169A26841EA024127 +:1015200001612068C16821F08001C1602068C16C40 +:1015300089088900C1642168CA6CE3696069034352 +:101540001A43CA6420688168880609D400F020F82C +:1015500030B120684562042100F01FF8012032BD3F +:1015600020684562012184F82110002032BD2068E6 +:101570004562042184F821107047022084F821007C +:10158000CA2021684862532022685062204626E023 +:1015900020460BE02068C0F8248084F82110002049 +:1015A00084F8200070470000BFFF8FFF70B504462D +:1015B00040F2E9362068C16821F0A001C160FFF760 +:1015C00043FA05462068C168880606D4FFF73CFA4E +:1015D000401BB042F6D3032070BD002070BD70B533 +:1015E00004462068C1684A0612D44FF0FF32C26038 +:1015F00040F2E936FFF728FA05462068C168480638 +:1016000006D4FFF721FA401BB042F6D3032070BD89 +:10161000002070BD2DE9F84300F065F808BF0220F6 +:1016200038D000F067F814D5FFF70EFA07462068A7 +:10163000C16848070DD5FFF707FAC01B4845F6D328 +:1016400000F039F826E0FFF7FFF9C01B484507D343 +:10165000F6E700F02AF800F065F8FFF7F5F907461D +:101660002068C1684A07EED5C0F81480206800F0F1 +:1016700013F82A48016841F40021016028480268F3 +:1016800042F4002202602068816841F48041816058 +:1016900000F01BF8BDE8F2838168C908C9008160C9 +:1016A000206881680D43856070472068816821F457 +:1016B00080618160704720684662032184F82110B0 +:1016C000002084F82000032070472068816841F4DE +:1016D0008061816001212068466284F82110002029 +:1016E00084F8200070470446884694F820000128BA +:1016F00015467047012184F82010022084F821004B +:10170000CA2021684862532022685062FF26206860 +:101710008168480540F2E9397047000080080058A8 +:10172000000800582068C16801F0800161F49061F0 +:10173000C160704710B5040001D1012010BD607A6E +:1017400020B9002121722046FFF78EFA0220607234 +:1017500021680A68606822F0200202430A6020685B +:10176000016841F004010160012060720020E06026 +:1017700010BD000001460648064AC3798B4218BFD7 +:10178000904218BF0838F8D18B4218BF002070472C +:10179000F873FF1F0070FF1F1948002101604160AE +:1017A000704710B500F00CF85C6819B1012904D13C +:1017B000204301E024EA0000586082F3108810BD45 +:1017C000EFF3108272B60E4B704738B5EFF310840A +:1017D00072B60B490B4D086820B1296888476868C4 +:1017E00080470AE0486820B1A9688847E8688047D0 +:1017F00003E0286980476869804784F3108831BD19 +:1018000000150020B0470008DFF83C150A6892B2C6 +:1018100000E00246086880B28242FAD170472DE9A2 +:10182000FC4104461825DFF82485DFF82465684369 +:1018300008EB00073078062808D1317871703470D1 +:1018400078754FF0FF307060002039E000F077F8D5 +:10185000B9680918B96008F10803B96832786A43B1 +:101860009A589142327813D308F1150315FB02FC04 +:1018700013F80C30062B25D008F108066B43F358FB +:10188000994222BF08F115036A439A5CEED219E02F +:101890001146337869439A420BD008F1140308F1DA +:1018A000150C5B5C15FB03F50CF805407A753B7570 +:1018B00000E07A7508F11402545431787170347074 +:1018C000BDE8F6811146694308F115035B5C062B00 +:1018D00004D008F1140615FB03F574557B753A75B1 +:1018E00008F115025454EBE7F8B5DFF86434DFF87B +:1018F0005C541E78182402466243B0422A4404D144 +:1019000018785870507D18700FE0167D507D92F851 +:1019100015C005F115076643062807F806C004D070 +:10192000167D143514FB00F42E5501201073187821 +:10193000062802BF00294FF0FF315960F1BD10B5F4 +:10194000DFF80C44606810F1010F0FD0FFF75CFF67 +:101950006168DFF80024814261683CBF5388C91880 +:10196000081A517848431178C84000E0002080B23E +:1019700010BD2DE9F84FDFF8DC53DFF8DCB3D5F804 +:101980000880D8F80000DBF800104A0500F090F954 +:10199000DFF8BC63DFF8B4A321F4806181604FF00D +:1019A000180934780AF1080019FB04F14758FFF7C9 +:1019B000C6FF874217D200270121B170062C3DD007 +:1019C00019FB04F40AF108010AF1080209598142DD +:1019D00023BF0AF108010959091A002111510AEB24 +:1019E00004014C7DEAE7A9884118B94202D2AF88C8 +:1019F0000021E2E73F1ADFE7022802DA287801280F +:101A000000D07F1ED8F80000C1684A07FAD500F060 +:101A100055F9DBF80C00000CBFB247EA0047CBF8E1 +:101A20000C70FFF7F1FE7060A8680068816841F4EF +:101A300080618160AFF30080BDE8F18FB8B200280B +:101A4000DAD1FFF7E1FE70600320BDE8F24FFFF747 +:101A5000ADB82DE9F843EFF3108872B6BD4DBB4B1E +:101A6000A8680168CA224A6253204862B84A886856 +:101A700020F48060886018201678374647431F445A +:101A8000387B022826D13C68D7F810909078F0B1C6 +:101A90007A7B012A0AD101213046FFF725FF88F31E +:101AA00010887968304600F016F904E088F3108851 +:101AB000304600F0C1F8A8680068CA214162224699 +:101AC000532141624846314600F050F90BE0FFF7E0 +:101AD00050FF06E0C8684207FCD500F07EF89F4939 +:101AE000086088F31088FF21A86802685162BDE889 +:101AF000F183F8B5974CA160CA2209684A62532263 +:101B00004A62954A136843F020031360136803F098 +:101B10000703C3F10403237095682D0C05F07F05BE +:101B20006D1C6570EDB29268C2F30E02521C6280A9 +:101B300092B2521E6A43A2F5A072DA404FF6FF73CA +:101B40009A422CBFA380A280854A136843F40023E5 +:101B50001360844B1D6845F400251D6048BB7C481C +:101B60007A4E0123837018254FF0FF334360002322 +:101B70005FFA83FC06F10C0715FB0CFC4FF0000E1E +:101B800007F80CE05B1CDFB2062FF1DB06230370C5 +:101B9000886820F48060886000F01FF8D06003201F +:101BA000FFF70FF8A1680868826842F480428260FB +:101BB00005E0C868410544BF0320FEF7F7FFA168B0 +:101BC0000A68FF205062002203210320FEF7A2FFD3 +:101BD000BDE8F2400320FEF7BBBFC86800F08000FC +:101BE00060F49060C8604FF400207047F0B5044680 +:101BF0000025EFF3108672B61827DFF850C10CF1FC +:101C00000C0007FB05FE10F80E0010B16D1C062D30 +:101C1000F5DB062D0CD06F430CEB07000127077393 +:101C200086F310880461427303600D700020F0BDDC +:101C300086F310880120F0BDF8B50746EFF3108455 +:101C400072B60320FEF78FFF424DAE683068CA219E +:101C500041623A4653214162182043494243895C1C +:101C600002291BD100213846FFF73EFE3848017893 +:101C700006290ED1306838490A68530500F018F873 +:101C800021F480618160C1684A07FCD500F016F834 +:101C900004E04078884218BFFFF76BFEA9680A6825 +:101CA000FF2050620320FEF753FF84F31088F1BD3C +:101CB00002D5C1684A07FCD481687047C16801F049 +:101CC000800161F49061C1604FF4002023490860F5 +:101CD0000320FEF776BF2DE9F04180460F464246CD +:101CE00018201A4942438C18207B022804BF404622 +:101CF000FFF7A2FFEFF3108572B60320FEF733FF64 +:101D0000144EB0680068CA2141625321416202202A +:101D10002073A76067604046FFF781FD0C490A7891 +:101D20004978914202D0FFF724FE02E0A168081A28 +:101D3000A060FF20B1680A6850620320FEF708FF28 +:101D400085F31088BDE8F081282800408C11002020 +:101D500028150020F4140020082800400C08005822 +:101D60000008005880080058981100201047000013 +:101D7000564900E0564981B00A6802430A60096882 +:101D800008400090009801B0704718B585B06846CB +:101D90001421FEF7BFFF032001904FF4604100249F +:101DA000009102940120FFF7E3FF00F097F8474C01 +:101DB0002068400840002060182100910220FFF7B1 +:101DC000D7FF6946434800F07FFE206820F00200FC +:101DD0002060FEF761FEFEF761FEFEF765FE00F093 +:101DE00011F806B010BD00B587B068460FF2282183 +:101DF0001C2200F05DFF00F034FA684600F000FCA1 +:101E000007B000BDF0B585B068461421FEF782FF2B +:101E100000260025002400210FF2CC0000EBC102B7 +:101E2000907988B11368B3F1904F08D0294FBB4225 +:101E300008D0294FBB4204BF9088044304E0908837 +:101E4000064301E090880543491C2629E4DB002075 +:101E500002900121032003900191B0B270B1009073 +:101E60000120FFF785FF0120FFF784FF00F036F81F +:101E70000022B1B24FF0904000F0EAFEA8B280B16B +:101E800000900220FFF774FF0220FFF773FF114E4E +:101E90006946304600F018FE0022A9B2304600F034 +:101EA000D7FEA0B280B100900420FFF761FF0420AC +:101EB000FFF760FF084D6946284600F005FE002246 +:101EC000A1B2284600F0C4FE05B0F0BD4C00005899 +:101ED0004C010058000400480008004869464FF0D3 +:101EE000904000F0F1BD000000000048010000003B +:101EF0000000004801000000000000480100000050 +:101F0000000000480100000000000048010000003F +:101F1000000000480100000000000048010000002F +:101F2000000000480100000000000048010000001F +:101F3000000000480100000000000048010000000F +:101F400000000048010000000000004801000000FF +:101F500000000048010000000000004801000000EF +:101F600000000048010000000000004801000000DF +:101F700000000048010000000000004801000000CF +:101F800000000048010000000000004801000000BF +:101F900000000048010000000000004801000000AF +:101FA000000000480100000000000048010000009F +:101FB000000000480100000000000048010000008F +:101FC000000000480100000000000048010000007F +:101FD000000000480100000000000048010000006F +:101FE000000000480100000000000048010000005F +:101FF000000000480100000000000048010000004F +:10200000000000480100000000000048010000003E +:102010000000004801000000000000000000000077 +:1020200000000000E81E0008280003202C00032008 +:1020300026040400264981B00A6802430A60096840 +:1020400008400090009801B07047F0B585B0054693 +:102050000C4668461421FEF75DFE0DB9042004E02D +:10206000012D18BF022D02D10820FFF7E3FF200049 +:10207000184E0FF264070DD137F8150000900021BB +:102080000191012002900221039100F01CF801202F +:10209000FFF790F9012C14D137F8150000900121B9 +:1020A0004FF404100190029100F00DF80FF230008F +:1020B000445D00220F2160B2FEF72CFD60B2FEF7F6 +:1020C00047FD05B0F0BD694656F8250000F0FCBCA0 +:1020D0004C000058541000201000010002000000C5 +:1020E0000A06070000F09BBE6C486D49016001F1D3 +:1020F0002002426001F13002826001F13C02026282 +:1021000001F14402426201F14C02C26001F1540249 +:10211000026101F17002426101F174028261803159 +:10212000C16100F09ABE38B504465E4D284600F005 +:10213000F7FE5A484068A1680160E168C1608560A7 +:102140005949416000F0A5FE58482AE080B553483F +:102150004268136801211972406800F0A0FE002057 +:1021600002BD38B5514C4F4D04E000F041F80098E5 +:1021700021688847284600F0D6FE0028F5D031BDFA +:102180004A484168084738B50446494D284600F09A +:10219000C7FE4248C068A1680160456000F084FE47 +:1021A00044482168016061684160002032BD80B50B +:1021B0003A48C268136810211972C06800F07AFEAC +:1021C000002002BD35483B4AC168C16813680868F1 +:1021D000184738B5374C364D04E000F009F8009840 +:1021E00061688847284600F09EFE0028F5D031BD82 +:1021F0006946284600F0C0BE38B504462E4D284634 +:1022000000F08EFE2D4800F08BFE24480069A16886 +:102210008160E168C16005612168016061684160B9 +:10222000216941616169816131BD80B50146234801 +:1022300000F08CFEBDE802400FF2050000F043BE46 +:1022400038B5164C1D4D06E0FFF7D2FF0099206906 +:10225000006900F07BFE284600F065FE0028F3D000 +:1022600031BD10B5164C204600F05AFE0B484169AE +:102270000C60BDE8104000F03ABE1CB5104C06E002 +:102280006946204600F078FE009800F01BF82046D2 +:1022900000F049FE0028F3D013BD00000000032029 +:1022A000AC090320480A03209008032010150020E1 +:1022B000500A032018150020380A032008150020B2 +:1022C000400A0320704700002DE9FC47604CDFF80E +:1022D0008491A5692840A0614FF0FF3A21694FF031 +:1022E000010834E0521C54F832006169194001427F +:1022F000F8D0616904EBC2060840716818400142D9 +:1023000008BFC6F804A07768384000F0A5F86062FE +:1023100008FA00F087437760EFF3108172B6626AC3 +:10232000206908FA02F2D24310402061022004EB37 +:10233000C00353F8086C1640401E43F8086CF6D1F1 +:1023400081F31088606A59F8201088472169A369D1 +:1023500060690140194205D0E069216A084208BF5E +:102360000022C0D0C4F824A000F017FEEFF31089BB +:1023700072B6216960690140A069014201BFE1694B +:10238000206A0142FFF74BF889F3108800F006FE3F +:10239000A561BDE8F38738B51446EFF3108572B632 +:1023A00000F05AF82B4941F8204085F3108831BDE0 +:1023B00010B500F00BF804431C6153F83140204382 +:1023C00043F83100FFE782F3108810BDEFF310826D +:1023D00072B61F4B1C697047EFF3108172B61C4A2E +:1023E000536923EA000005E0EFF3108172B6184A42 +:1023F00053691843506181F310887047EFF31081DF +:1024000072B6134AD3691843D061F4E7F8B5104C9B +:10241000666A256A374616F1010F0EBF00260121B4 +:1024200001FA06F6206202E03046FEF7FAFF216A62 +:10243000E0690842F8D06762EFF3108172B6E26992 +:10244000206A8243E26181F310882562F1BD0000B9 +:1024500008100020A012002002460020110C0904E0 +:1024600004BF1020120412F07F4F04BF0830120284 +:102470000FF2180112F0704F04BF001D1201120F6D +:10248000C0F11F00895C401AC0B270470403020209 +:102490000101010100000000000000007FB50C46B2 +:1024A0004D4D61684D4EE8612962284600F078FD87 +:1024B0002468746006F1080000F032FD012000F08D +:1024C00068F801203070296841B10FF2E9000FF27D +:1024D000ED02009001920294684688477FBD1FB5C7 +:1024E0003E4C04F1080000F01EFD00BB2178F1B164 +:1024F000694604F1080000F03FFD3748C16949B161 +:102500000098029001228DF8042001A888479DF8C8 +:10251000040000E001202070207818B10098FFF737 +:1025200084FE04E0009904F1080000F005FD04F1C8 +:10253000080000F0F8FC28B9207818B104F1080070 +:10254000FEF774FF1FBD2DE9F04105460E4690468B +:102550001C46002000F01DF8204F7868A0F80950B4 +:10256000C672324641460C3000F092FB1A4A13699B +:1025700000210020984748F2E800FEF75EFF7968E6 +:102580008A78D21C04F1080000F082FBBDE8F0411B +:1025900001201CB51049124C096A20B901B18847C5 +:1025A0000020207013BD0120207011B1BDE81C4037 +:1025B000084713BD0020FEF73DBF000010B50146DF +:1025C000064C04F1080000F0C1FC04F10800BDE86D +:1025D0001040FEF72BBF000080140020E414002000 +:1025E00041150020FFF7AFFF9DF80E0005B000BDBC +:1025F000F8B500F10C026B4625214FF66640F1E775 +:10260000F8B500F10C026B460F214FF66840E9E780 +:10261000F8B502466B460E214FF67540E2E770B5FD +:102620001B491C4B0A681C49C2F30D0201EB8201D5 +:102630000C6822689A4205D16569A169E269E3687C +:10264000246904E025696169A2696368A4682E0EA3 +:10265000067001722E0C467042722E0A8670C47388 +:10266000C5F3031605F00F050571C6700D0E457113 +:102670000D0C85710D0A190E8172C571190CC1728C +:102680001B0A210E41730373210C8173002070BD5E +:102690003C400058B95646A90000032018B58FB039 +:1026A00002A80FF2F031D04C342200F001FB0FF2FF +:1026B00095300190009469460FF2713000F07AFC79 +:1026C00001210220FFF76DF8C84A00210420FFF71E +:1026D00062FE02A8FFF78CFF08B1FEF779FD00F05B +:1026E0009FF800F04BFDC24C0FF22932002084F815 +:1026F000800000214FF6FF70E0820120FFF74BFEC3 +:1027000000F0A2FD00F0C9FD0FF20133002204F138 +:1027100081010020FFF76AFA022060768021012003 +:1027200020760D20A076022020761820E076032067 +:102730002076B0480180A0214180012000F00FF9EF +:1027400010B010BD7CB50646A94D7078052805F17E +:10275000800404D03E280DD0FF2824D03AE0B08871 +:10276000E98A884202D10020E8822070012000F02E +:10277000F6F82FE0F178012908D00C292AD1E88A4F +:102780006A460DF1010100F004FE23E06078FFF7D6 +:1027900053FA207804280CBF062005202070B6F8D4 +:1027A0000500E88216E0B6F8030040F20241401A44 +:1027B00008D0C01E0BD0001F02BF0121E88A01F023 +:1027C00012F807E0E88A8C4900F00DFF02E0E88A81 +:1027D00000F0ADFF012076BD00F092BF8448C08AB2 +:1027E00000F04EBF1CB5824CE08A01AA0DF1050134 +:1027F00000F0CFFD98B99DF80500022804BF9DF8B0 +:102800000410022903D100200090012302E00020DF +:1028100000900223E08A1A46002100F015FE13BD45 +:1028200030B50FF23420754D008887B0ADF81A002E +:1028300000F07AFD7248016811F1010F0ED0426874 +:102840002974120A090A697405F110044068A87411 +:10285000EA74100A120C28756A7506E00020FEF76B +:1028600089FF040008BF0FF2FC1422460621002055 +:1028700000F0E4FF60792872102120796872E07816 +:10288000A872A078E8726078287320780FF2DC14C0 +:1028900068732246182000F0D1FF0FF2E01500F017 +:1028A00059F822461021182000F0C8FF00F052F815 +:1028B0001821012000F0E9FF01F012F80DF11600D7 +:1028C00006A90190009105AB07220021012000F02C +:1028D000A7FE0FF28810BDF81810454C0090052394 +:1028E000BDF81400002201F0BBF80DF11A000090B1 +:1028F0000223BDF81610BDF81400002201F0B0F854 +:1029000002220221002000F077FD0120207000F05B +:102910001EFE01206070012108202071A17010208E +:10292000607100210020E070049110213548A06002 +:1029300003900822002002900191009200230122BE +:102940000121012000F01CFEA07808B100F0C6FEB5 +:1029500007B030BD2A461021082000F06FBF2DE9D6 +:10296000F8420746012F87B003D1224805884688E0 +:1029700003E04FF4C8654FF47A66DFF8749009F10C +:1029800080046078FFF758F9022F05D120780128DC +:1029900014BF022800F080FD2770002006900590EB +:1029A00009F119010491062299F818000FF2DC01CF +:1029B00003900291019200230093324629460020A1 +:1029C00000F07CFD0D490E2000F070FE002808BFCD +:1029D000012F06D160780C4908B0BDE8F042FFF73E +:1029E0007AB908B0BDE8F082A0080320F32F0008F0 +:1029F0001C1200203815002040E201003010002099 +:102A00008075FF1F07B2010046E001000021012090 +:102A1000FFF7CEBC0220A2E700210420FFF7C8BCCC +:102A20000120FFF7EBBC0120FFF7F0BC10B5044616 +:102A3000616801F1080000F0B1FB00B101202070D5 +:102A400010BD000010B1012803D070473F20FFF7F0 +:102A5000C3BC3F20FFF7C8BC40030000485253549A +:102A60004D0000006C7AD8AC5772000012345678D2 +:102A70009ABCDEF0123456789ABCDEF0FEDCBA095D +:102A800087654321FEDCBA09876543210948525313 +:102A9000544D000000000000000000000000000095 +:102AA0000000000000000000440008004005020192 +:102AB00012279C00F4010000FFFFFFFF4801010006 +:102AC00000200000000000002DE9F84F4FF0000941 +:102AD000674A684B4FF00F0805460E4633E0664FD5 +:102AE000BD4214BF072704278F4027434CF82E70A0 +:102AF000C1431C6801EA040C7468E40248BF40EA60 +:102B00000C0CC3F800C05C6801EA040C7468A402F1 +:102B100048BF40EA0C0CC3F804C0146801EA040C76 +:102B20007468E40348BF40EA0C0CC2F800C0546863 +:102B300001EA040C7168890348BF40EA0C0CC2F832 +:102B400004C009F10109316831FA09F000F07E8012 +:102B5000012404FA09F414EA0100F2D04FEA490C06 +:102B6000032101FA0CF16FEA010E716801F003070D +:102B7000012F1CBF01F00301022911D1A968F768D8 +:102B80000EEA010107FA0CF73943A960696821EAE6 +:102B900004047168C1F3001101FA09F10C436C607F +:102BA0004FEA8901347904F00304032C1FD0EC6848 +:102BB000B7680EEA040407FA0CF73C43EC6034797A +:102BC00004F00304022C12D14FEAD90705EB870465 +:102BD00001F01C07D4F820A008FA07FB2AEA0B0A28 +:102BE000D6F810B00BFA07F747EA0A0727622C68F5 +:102BF0000EEA0407347904F0030404FA0CF43C43AD +:102C00002C60746814F4403F9BD0DFF870C04FEA2A +:102C1000990E5CF82E7001F00C0108FA01F427EA15 +:102C20000404B5F1904F08BF00270ED0144FBD42E9 +:102C300008BF012709D0134FBD4208BF022704D0A7 +:102C4000114FBD427FF44BAF03274DE7BDE8F18F35 +:102C500081B0002A14BF8161816201B070470B4AC4 +:102C6000136803421CBF1060FEF7EABB7047000008 +:102C70008008005800080058001000480800014073 +:102C80000004004800080048000C00480C080058E8 +:102C900062B38B0708D0521E11F8013B00F8013BCC +:102CA00000F024808B07F6D1830740F0208000BF1E +:102CB000103A07D330B4B1E83810103AA0E8381011 +:102CC000F9D230BC530724BFB1E80810A0E80810BF +:102CD00044BF51F8043B40F8043BD20724BF31F80D +:102CE000022B20F8022B44BF0B7803707047121F91 +:102CF00017D35B0009D151F8043B20F8023B1B0CB1 +:102D0000121F20F8023BF6D20BE051F8043B00F80A +:102D1000013B1B0A20F8023B1B0C121F00F8013B71 +:102D2000F3D238BF121D521E24BF11F8013B00F828 +:102D3000013BF8D870470000C0680840884201D1C4 +:102D40000120704700207047C0690840884201D1C7 +:102D5000012070470020704710B5684C02212046C2 +:102D6000FFF7F2FF38B16068C043810703D5FFF772 +:102D700030FA022018E001212046FFF7E5FF38B1C4 +:102D80006068C043C10703D5FFF7EBF901200BE0F2 +:102D900008212046FFF7D8FF38B16068C04301071B +:102DA00003D5FFF76AFA0820A06010BD10B5534C98 +:102DB00002212046FFF7C0FF58B96068C043810375 +:102DC00007D5606840F400306060BDE81040FFF750 +:102DD000F9B908212046FFF7AFFF70B96068C0431A +:102DE00001030AD56068464940F400206060086825 +:102DF00080474FF40020A06010BD20212046FFF73F +:102E00009BFF58B96068C043810207D5606840F4F1 +:102E100000106060BDE81040FFF7B2B910BD39483E +:102E200081B0016841F480110160006800F48010F5 +:102E3000009000983448016841F400710160334803 +:102E4000026842F40072026040BF20BF304801684F +:102E500041F40041016001B0704780B52D48016820 +:102E600041F480110160006800F480100090009827 +:102E70002248016841F001010160026842F4803299 +:102E800002602C20FDF764FEBDE802402D20FDF716 +:102E90005FBE2148016849084900016070471F4929 +:102EA0004FF48030086070471B48016821F0020130 +:102EB0000160704718484FF400314160016821F407 +:102EC00000310160704738B504460C4D0821284692 +:102ED000FFF732FF30B10A480460686820F4002030 +:102EE000686031BDA0474FF40021A96031BD0A4898 +:102EF000016821F00801016070470000000C0058D3 +:102F00003015002050010058D408005820080058FF +:102F10000C04005850000058040C0058080C0058CD +:102F2000006040607047EFF3108172B60268824221 +:102F30000CBF012000201CE0EFF3108272B6036882 +:102F40000B60486001600868416023E0EFF3108285 +:102F500072B6086043684B6041604868016019E0E0 +:102F6000EFF3108172B64268036813600268436829 +:102F7000536081F31088704710B5EFF3108472B678 +:102F800002680A600068FFE7FFF7EAFF84F3108831 +:102F900010BD0B6082F310887047704770470000C7 +:102FA0000249016002490161704700BF87210008A2 +:102FB000AF2100087FB50C466D4D61686D4EE8612C +:102FC0002962284600F0B8FD246805F12400FFF7C7 +:102FD000A7FF746006F10800FFF7A2FF0120307020 +:102FE000296829B10FF2551000900294684688476D +:102FF0007FBD1FB55F4C04F10800FFF794FF00BBD5 +:103000002178F1B1694604F10800FFF7B5FF58488F +:10301000C16949B10098029001228DF8042001A8ED +:1030200088479DF8040000E001202070207818B146 +:103030000098FFF7FAF804E0009904F10800FFF7A0 +:103040007BFF04F10800FFF76EFF28B9207818B164 +:1030500004F10800FFF7E0FC1FBD2DE9F843064628 +:10306000002000F05FF874883088B268DFF80081D3 +:10307000C4F3090444EA8024F068A4B2C1B2204633 +:1030800000F03CF8002748F2E8094846FFF7CBFC7F +:1030900008E06888A04202D1316928780870687811 +:1030A00000B1012708F12400FFF73DFFF0B96946A0 +:1030B00008F12400FFF760FF009800F10B05407A4B +:1030C0000F28E6D0B5F80110A1420DD10098817A01 +:1030D000C81E7169C0B28842C8BF08467061024606 +:1030E0003069E91CFFF7D4FD2878D9E73800CCD047 +:1030F000012000F017F80020BDE8F28310B5134658 +:103100001C4A5468A4F80900E1720A46194604F101 +:103110000C00FFF7BDFD164A1369BDE81040002101 +:10312000002018471249096A82B008B921B101E0AC +:1031300011B1012002B0084702B0704710B5014636 +:10314000487A0F2818BF0E2807D10B48FFF7FEFE5C +:10315000BDE810400020FFF763BC064C04F10800F6 +:10316000FFF7F4FE04F10800BDE81040FFF754BC7F +:1031700054140020D4140020781400201C4900208E +:10318000087700221B48027000F036B818490A7F01 +:1031900041F82200087F401C0877704770B504464C +:1031A0006078FF2802BFB4F8031001F47F41B1F545 +:1031B000406F12D100260E4D00E0761C297FF0B240 +:1031C00088420AD2F1B255F8211020468847010002 +:1031D000F3D002D0022805D006E02046BDE87040BA +:1031E000FFF7B0BA002070BD012070BD00000000E4 +:1031F000A41400204015002080B500F0A7FC00F0CA +:10320000A6FC00F0A5FC00F0A5FC00F0DDFC00F041 +:10321000DCFC00F059FD00F0BDFD00F0BCFD00F04D +:10322000BBFD00F0BAFD00F0B9FD00F0B8FD00F004 +:10323000B7FD00F0B6FD00F0B5FD00F0B4FDBDE84F +:10324000014000F0B1BD0000E0B505A004210090F0 +:103250008DF8041042F62920694600F0A2FC07BD53 +:1032600053544D0010B500782B4C18B102280FD0E4 +:1032700004D310BDA0800120207310BD607BFEF739 +:10328000DBFC607BBDE8104040F60101FEF723BD8A +:10329000607BBDE81040FEF7CFBC10B50FF24502D1 +:1032A00000210220FFF777F81B4C00210420217336 +:1032B0002070214642F6382000F051FD1F20E072B8 +:1032C00004F10D010A20A0800120A0724FF480605B +:1032D000E0800122BDE810400FF245030020FEF718 +:1032E00085BC00000D480C490068CA7A00F0070050 +:1032F000413048801307087B04D518B98888401DE1 +:10330000888003E0012804BF00200873891C42F66E +:10331000372000F024BD0000C414002028280040FD +:1033200000210220FFF744B800B587B000F01FF875 +:10333000012003220690ADF80420ADF8062000F02D +:10334000A5F800284CBFFF209DF8000007B000BD85 +:10335000182201A800F02FBDADF80600049107A8BF +:103360000121082203900691ADF804207047002047 +:103370008DF800001822002101A800F01CBD0922D0 +:103380000021684600F017BD1822002102A800F0B5 +:1033900012BD70B5C8B006460C4615460522FFF7AB +:1033A000EFFFADF82060FFF7EFFF302100F014F8D9 +:1033B0000521049000F019F8002848BFFF2009D427 +:1033C0009DF8000030B99DF8030020709DF80400BE +:1033D0002870002048B070BDADF80A100820022106 +:1033E000ADF80800059108A870470791CDF818D0EE +:1033F000002102A8FFF731BE00B5C7B000F00EF8FB +:10340000FFF7A6FF312000F013F800F03FF8002886 +:103410004CBFFF209DF8000047B000BD00238DF891 +:103420001C008DF8003007A84170827000217047A1 +:10343000ADF8060007A9032004900822012003919B +:103440000690ADF80420704730B5C7B00025ADF840 +:103450001C008DF81F2007A84A9C817003718DF80D +:103460000050ADF82140FFF785FF0F210291322077 +:103470000721FFF771FF00F009F800284CBFFF207B +:103480009DF8000047B030BD03900691CDF814D0F0 +:10349000002101A8FFF7E1BD00B587B000F0B4F945 +:1034A00000F09CF9812000F03DF900F05BF9002864 +:1034B0004CBFFF209DF8000007B000BD2DE9F84D7E +:1034C000C7B09446DDF840E1519A559D569EDDF80F +:1034D0004CA1ADF81D108DF81C004FF0000BADF89D +:1034E0001FC08DF821308DF822E000F024F800F0A4 +:1034F00017F824F8095F668000F070F93F208321F7 +:1035000000F05DF9574406910D37049700F02DF94E +:1035100000284CBFFF209DF8000048B0BDE8F08DAA +:1035200088F800A007AC5499E419524608F101004C +:10353000544400F03ABC8DF82320174652998DF878 +:1035400000B00DF1240809A8B84400F02EBC00B565 +:10355000C7B000F00CF8852000F00DF900F002F97A +:1035600000284CBFFF209DF8000047B000BD00219F +:103570008DF81C008DF80010182201A800F01BBC6B +:103580002DE9F841C7B04FF0000800F026F80DF122 +:103590002300DDF844E14E9F4F9E509D529C8DF8D4 +:1035A0001F30C0F800E08DF800808DF820708DF895 +:1035B00021608DF822508DF8274000F00FF9862009 +:1035C000ADF8060007A90C2000F0C8F800284CBF91 +:1035D000FF209DF8000000F014B98DF81C0007A82A +:1035E00041708270704700B5C7B00022ADF81C0072 +:1035F0008DF800200DF11E001822016001A80021A5 +:1036000000F0D9FB8820ADF8060007A9062000F0DD +:10361000A5F800284CBFFF209DF8000047B000BD72 +:10362000F8B5C8B005460E4617461C4600F023F80C +:1036300008A8467087708DF8205000F0BBF88A21EA +:10364000ADF80A103F20032100F0A7F8002848BF7A +:10365000FF200ED49DF8000058B94F994E98BDF840 +:1036600001202280BDF803200280BDF805000880FB +:10367000002049B0F0BD07220021684600F09BBB46 +:1036800000B5C7B00021ADF81C00FFF773FF0F2194 +:1036900002918D20022100F077F800F064F80028F4 +:1036A0004CBFFF209DF8000047B000BD18B5C7B063 +:1036B00000F0B9F800F092F83F208E2100F0A8F851 +:1036C00000F053F800284CBFFF209DF8000048B0E0 +:1036D00010BDADF8060007A90220704700B587B0FD +:1036E00000F092F800F07AF8922000F01BF800F059 +:1036F00039F800284CBFFF209DF8000007B000BD3E +:1037000000B587B000F080F800F068F8942000F071 +:1037100009F800F027F800284CBFFF209DF80000B2 +:1037200007B000BDADF806003F220120704700B58C +:10373000C7B00021ADF81C00FFF71CFF9520FFF774 +:10374000C8FF00F00BF800284CBFFF209DF80000D8 +:1037500047B000BDADF8060007A9032004903F2242 +:10376000012003910690ADF80420CDF814D000217B +:1037700001A8FFF772BCADF8060007A901203F229F +:103780000391049070470321ADF80600049107A847 +:1037900001213F22039006917047ADF80800059182 +:1037A00008A8072104900791CDF818D0002102A89D +:1037B000FFF753BC1822002102A800F0FCBAADF8B4 +:1037C0000400ADF8061007A80121039070470022FD +:1037D0008DF80020ADF81C008DF81E101822002175 +:1037E00001A800F0E8BA00B5C7B0FFF7F0FFA520C8 +:1037F000FFF7B0FF00284CBFFF209DF8000047B046 +:1038000000BD48B0BDE8F08100208DF80000704791 +:10381000ADF80400ADF8061007A801210390069149 +:10382000641C04947047044600208DF800008DF855 +:103830001C4022460DF11D0000F0B7BA18B50C4629 +:10384000C7B0114600228DF800208DF81C008DF8BD +:103850001D4022460DF11E0000F0A7FA00F02AF8E4 +:103860003F200C21ADF80400ADF8061007A8012197 +:1038700003900691A41C049400F02CF800284CBF7F +:10388000FF209DF8000048B010BD00B5C7B000F0A3 +:103890000AF80F2000F013F800284CBFFF209DF815 +:1038A000000047B000BD00228DF800208DF81C00FC +:1038B0008DF81D101822002101A800F07CBAADF887 +:1038C000060007A9022004903F22012003910690E0 +:1038D000ADF80420CDF814D0002101A8FFF7BDBB3E +:1038E00000B587B000208DF8000000F0E0F840F24D +:1038F0000110ADF806003F220120069000F013F9F8 +:1039000000284CBFFF209DF8000007B000BD2DE946 +:10391000F84107460128C7B0884615461E4608BF2D +:10392000022003D002280CBF102000200DF11D0141 +:103930000C1800F036F8012F8DF81C7002D0022F01 +:1039400018D019E002273A4641460DF11D0000F05B +:103950002CFA2570667000F0AAF83F204FF48171B0 +:1039600000F016F8FF1C049700F0DFF8002805D5DA +:10397000FF2009E01027E6E7972005E09DF800000A +:1039800010B94E9800F067F8FFE748B0BDE8F08145 +:10399000ADF80400ADF8061007A8032103900691C6 +:1039A000704703220021684600F005BA2DE9F64F62 +:1039B0000C460546012CC7B09B4608BF022003D029 +:1039C000022C0CBF102000200DF11F010E18FFF774 +:1039D000E8FF012CADF81C508DF81E4002D0022CDF +:1039E0002CD02DE00227569C559DDDF85091DDF836 +:1039F0004CA1DDF8488148993A4600F054F8A6F801 +:103A000000B086F8028086F803A086F804907571ED +:103A1000B47100F04CF83F20ADF804004FF482710F +:103A200007A8ADF80610039003210A370497069102 +:103A300000F07BF8002805D5FF2009E01027D2E729 +:103A4000972005E09DF8000010B9579800F003F8A2 +:103A500049B0BDE8F08FBDF801100180002070472B +:103A600030B5C7B01C464A9B00F049F800258DF8D8 +:103A700000508DF82140224619460DF1220000F039 +:103A800094F900F014F83F204FF4837100F042F8ED +:103A9000A41D049400F049F800284CBFFF209DF8B5 +:103AA000000047B030BD0DF11F0000F07EB91822B4 +:103AB000002101A800F07FB978B5C7B04C9C4D9D9E +:103AC00000F01DF800268DF821308DF800608DF88B +:103AD00022402246294600F019F8FFF7E8FF3F2070 +:103AE0004FF4937100F016F8E41D049400F01DF8F3 +:103AF00000284CBFFF209DF8000048B070BDADF815 +:103B00001C00ADF81E108DF8202070470DF1230029 +:103B100000F04BB9ADF80400ADF8061007A801217C +:103B2000039006917047ADF80420CDF814D0002121 +:103B300001A8FFF792BA0000024901600249016141 +:103B4000704700BF272100084D21000870477047CB +:103B50007047000018B51B4C0020206087B041F66C +:103B60000A00ADF8180000940323012206A90120E1 +:103B7000FFF7CDFE42F629220121ADF8182004916D +:103B8000A01C05900A2200230221039202930193B4 +:103B900000912023208806AA0121FFF707FF08B023 +:103BA00010BD80B542F62922904209D10A68054825 +:103BB000009200220B7941880088FFF751FF02BD77 +:103BC000002002BD3C1500207047704738B5024602 +:103BD00086B050780024FF2839D1B2F803106B4822 +:103BE00040F60143C91A1FD0123901BFB2F80710BD +:103BF000C088401C81422AD1957AB2F80500537AD8 +:103C00000124012D08D10A320192009300220023E1 +:103C1000FFF752FF002015E00A32019200930122C3 +:103C20008023FFF749FF12E04088B2F80710801C9C +:103C300081420CD1507B0124C10748BF8DF8084058 +:103C400002D402208DF8080002A8FFF70BFB2046E3 +:103C500007B030BDFEB5014601AA487A8DF80400D0 +:103C60004B7A08885070DC0704D50888000A9070E9 +:103C7000032300E00223487A040707D54888D0547C +:103C80005B1C4888DCB2000A10555B1C4C7AE006CD +:103C900010D50D7A00200BE001EB4004DFB2A688BE +:103CA000D6555B1CA488DEB2240A94555B1C401CCC +:103CB000A842F1DB01A935480091DBB241880088B8 +:103CC0000022FFF7CDFEFEBD18B587B030482F4C5F +:103CD000FFF75CFA41F60D01ADF8181000940823C7 +:103CE000012206A90120FFF712FE42F63720ADF8A7 +:103CF0001800012204920A20A11C03900023102224 +:103D00000591029301930092072300F023F842F6F5 +:103D10003820ADF8180000220492029201920A2085 +:103D2000211D03900222059100F012F842F639207D +:103D3000ADF818000022049201920A20A11D039000 +:103D4000022308220591029300F002F808B010BD8A +:103D500000920123208806AA0121FFF727BE80B523 +:103D6000002242F63723C01A09D0401E0BD1074863 +:103D70000091012381880088FFF772FE02E0084667 +:103D8000FFF768FF0246104602BD00002015002024 +:103D9000CD3B0008704770477047704770477047C9 +:103DA0007047704770477047704710B50446FEF77C +:103DB0006FFF204610BD10B5044610460A46014666 +:103DC000204600F003F8204610BD000062F30F22E9 +:103DD00062F31F42401810F0030308D0C91A1FD322 +:103DE000DB0748BF00F8012D28BF20F8022D130083 +:103DF00030B414461546103928BF20E93C00FAD8E3 +:103E0000490728BF20E90C0048BF40F8042D89006D +:103E100028BF20F8022D48BF00F8012D30BC7047A4 +:103E2000C91818BF00F8012DCB0728BF00F8012DD5 +:103E300070470000216851E8002F7047206800F1AA +:103E4000080151E8001F00F1080221F0400142E89A +:103E5000001000287047F8B5044640F60F002668A9 +:103E6000F1693268B368084004F15C050ED1880638 +:103E700002D5900602D4D80040F1818069690029FA +:103E800000F029812046BDE8F4400847DFF8D00261 +:103E9000034204BFDFF8CC723A4270D0CF0707D597 +:103EA000D70505D5012737622E6B46F001062E6334 +:103EB0008E0708D5DE0706D5276802263E622E6BE0 +:103EC00046F004062E634E0708D5DE0706D52768A0 +:103ED00004263E622E6B46F002062E630E070AD5BC +:103EE000960601D4034206D0266808203062286B6B +:103EF00040F008002863080509D5500107D5266859 +:103F00004FF400603062286B40F020002863286B7B +:103F1000002833D0890607D5900601D4D80003D5F0 +:103F2000696909B120468847286B21688A6851066B +:103F300002D410F0280F1CD0204600F0E6F800F064 +:103F4000D1F811D5FFF77AFFFCD1286A60B10FF2E2 +:103F50001D218163286A00F047F900280ED0286AE5 +:103F6000816BBDE8F44008472046BDE8F24000F010 +:103F7000D1B9204600F0CEF900202863F1BD2869B0 +:103F800001286AD1CF0668D5D00666D510203062E8 +:103F900000F0A8F82DD5296A0868406880B200288A +:103FA000ECD02A889042E9DA6880086801688A06BD +:103FB0001BD4FFF73FFF22F4807200F08FF8F8D196 +:103FC000206800F096F8FBD1FFF738FFFCD12020E5 +:103FD000E86200202861FFF72DFF22F0100200F0B8 +:103FE0007DF8F8D1286A00F0C9F829886888091A8C +:103FF0002DE028886988411A688800281CBF88B28B +:10400000002868D0226852E8003F23F4907342E809 +:1040100000300028F6D1206800F1080200F1080302 +:1040200052E8002FDFF8C400024043E800200028D7 +:10403000F1D12020E862002028616861226852E8FE +:10404000003F23F0100342E800300028F6D120465C +:10405000BDE8F44089B200F05EB9C80209D5580243 +:1040600007D54FF4801030622046BDE8F24000F0E2 +:1040700053B9080609D5100601D4180205D5A96957 +:1040800049B32046BDE8F4400847480611D550061C +:104090000FD5FFF7CFFE22F0400200F01FF8F8D155 +:1040A0002020A8620020A8612046BDE8F24000F070 +:1040B00035B9080206D5500004D52046BDE8F240C7 +:1040C00000F03AB9C80148BF002A04D52046BDE82F +:1040D000F24000F032B9F1BD22F4F07241E8002064 +:1040E000002870472068816848067047FEFFFFEF90 +:1040F000286800F1080151E8001F490800F1080292 +:10410000490042E8001000287047026852E8003F6A +:1041100023F4907342E800310029F6D1016801F1DF +:10412000080201F1080352E8002F0F490A4043E852 +:1041300000210029F2D1C16E012908D1026852E89C +:10414000003F23F0100342E800310029F6D120217E +:10415000C0F888100021C1660167704700000000A8 +:104160000100001020010004FEFFFFEF806A00F153 +:10417000560100220A810A8000F0CCB881B040B11B +:1041800000F124014A78022A05D004208861002029 +:104190000870012026E00268136823F00E03136004 +:1041A0004A6A136823F48073136000680268520837 +:1041B00052000260012091F82020CB6902F01C021D +:1041C000904058608A6AC86A5060086B30B10268D3 +:1041D00022F4807202604A6B886B50600120487044 +:1041E0000020087001B0704738B500F124020024A7 +:1041F0005178022903D004209061012428E001684D +:104200000B6823F00E030B6001680D686D086D00EC +:104210000D60516A0B6823F480730B60012192F8E2 +:104220002030D56903F01C0399406960936AD16A14 +:104230005960116B31B10B6823F480730B60536BC1 +:10424000916B5960012151701470516901B1884717 +:10425000204632BDF8B500F124010423CA69146870 +:104260000268156891F8206006F01C0603FA06F74C +:104270003C4210D06F070ED51468A50603D415680C +:1042800025F00405156000F03DF8C968002938D014 +:10429000BDE8F4400847022303FA06F73C4213D076 +:1042A000AF0711D51468A50605D4156825F00A05D1 +:1042B000156001224A7000F025F800220A70896812 +:1042C000F9B1BDE8F4400847082303FA06F6344282 +:1042D00017D02B0715D5136823F00E0313600122A6 +:1042E00091F82030CC6903F01C039A4062600122EF +:1042F0008A614A7000220A70096911B1BDE8F44070 +:104300000847F1BD91F82020CC6902F01C029340CF +:104310006360704770477047704700000068044949 +:10432000884204D103490868002818BF0047704735 +:1043300000380140341500207047704700EB8100C1 +:10434000444AD0F88010914201D0012070470020EB +:10435000704742F4806240F82120704780B500F039 +:10436000A3F800F05CF83C481F2181610168C9088E +:10437000C90041F003010CE000F09EB880B500F0E8 +:1043800093F800F04CF834480168C908C90041F0BE +:10439000020101603148016841F00401016030BF51 +:1043A00001BD10B52E4C00F061F800F02BF800288C +:1043B000FBD14FF0B040816801F00C01042918D105 +:1043C000016841F48031016026490A68D208D200B0 +:1043D00042F001020A6001688903FCD581688908FE +:1043E000890041F002018160816801F00C01082917 +:1043F000FAD1002203212046FFF7ABFFBDE81040B1 +:1044000000F05AB80321204698E780B500F04CF838 +:104410001248016821F00401C0E700F04DB810B562 +:104420000F4CFFF7EFFF0028FBD10421FFF7EBFF54 +:1044300040B90D480168090402D40068400503D55D +:1044400000F014F800F016F82046BDE810400022F5 +:1044500003217EE7000400800004005810ED00E016 +:10446000001400580040005888040058002204211D +:1044700020466EE74FF0B040016841F48071016062 +:1044800001684905FCD581688908890041F001016E +:104490008160416A890889004162816801F00C01EC +:1044A0000429FAD1704700000248016821F0020196 +:1044B0000160704710E000E00248016841F002012D +:1044C0000160704710E000E01349002008604FF4DD +:1044D000E0221248016841F4700101604FF0B041E0 +:1044E000086840F0010008608A600D480A680240D0 +:1044F0000C480A60036823F0050303604268520811 +:104500005200426000220848C8600861086820F430 +:10451000802008608A61704708ED00E088ED00E0C7 +:10452000FBFEF6FA9400005800100422010000007F +:104530000300000005000000010000000100000071 +:10454000060000000A000000200000000200000039 +:1045500004000000080000001000000040000000FF +:10456000800000000001000000020000A0860100A1 +:10457000400D0300801A060000350C0040420F0079 +:1045800080841E0000093D0000127A000024F4001F +:1045900000366E010048E801006CDC0200000000FB +:1045A0000000000000000000000000007047FEE76F +:1045B000FEE7FEE7FEE770477047704700F026B859 +:1045C000FDF747BA0848FFF745BE0848FFF743BC68 +:1045D0000748FFF740BCFEF7BFBBFEF7E7BB00F0A4 +:1045E0001DB80448FFF736BE94130020FC100020CD +:1045F0006C100020F41300201020FEF730BB0120C7 +:10460000FEF72DBB0220FEF72ABB000002484168DE +:104610000278891841607047481000200449C86832 +:104620000A6882430A60486000F004B80000000095 +:1046300000150058704719E050F8042BD30744BF09 +:10464000A9F101039A18091F0023042942F8043B29 +:10465000F9D25FEA817C134604D54FF0000CA2F832 +:1046600000C09B1CC90744BF0021197050F8041BEF +:104670000029E1D17047000010B500F013F80200E6 +:104680000023DB4300241068984203D0110002206D +:10469000ABBE14605068984203D0111D0220ABBE1F +:1046A000546010BD014870470000000060100020F9 +:1046B00010B450F8041B79B1026843680244083012 +:1046C000DC0744BFA9F10104E31852F8044B43F896 +:1046D000044B091FF9D1ECE710BC704710B507492E +:1046E00079441831064C7C44163404E00A68081DED +:1046F000114488470146A142F8D110BD2C000000AA +:10470000680000004EF68851CEF20001086840F4BF +:1047100070000860BFF34F8FBFF36F8F4FF00070D2 +:10472000E1EE100A704700000FFFFFFFD804000001 +:104730006C10002070080000300003200000000012 +:1047400071FFFFFF080000009C000000280003200C +:10475000000000005DFFFFFF64000000600100003A +:10476000081000200000000000F00DF8002801D023 +:10477000FFF7B4FFAFF300800020AFF30080FCF739 +:104780006EFC00F002F80120704700F001B8000054 +:104790000746384600F002F8FBE7000080B5FFF757 +:1047A0006BFF024A11001820ABBEFBE72600020097 +:1047B0000B4400081B4400087D430008A343000885 +:1047C0005D430008794300080148804701480047DD +:1047D000C9440008D9470008AFF30080FFF792FFF3 +:1047E000FFF7C2FF0000000000000000FFF7FEBF5F +:1047F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFED +:10480000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFDC +:10481000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFCC +:10482000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFBC +:10483000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAC +:10484000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9C +:10485000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8C +:10486000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7C +:10487000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF6C +:10488000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5C +:10489000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4C +:1048A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3C +:1048B000FFF7FEBFFFF7FEBFFFF7FEBF00000000DF +:1048C00000000000000000000000000000000000E8 +:1048D000FFFFFFFFFFFFFFFF0000000000000000E0 +:1048E000000000000DFF01000000000000000000BB +:1048F00000000000000000000000000001000000B7 +:10490000000000001000000000080048000C0048F3 +:10491000000C0048FFFFFFFFFFFFFFFF00093D0005 +:04000005080047D9CF :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h index 06a0140a4..06b13f4ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -259,6 +259,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -268,11 +272,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -280,6 +288,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -427,8 +447,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -545,11 +566,11 @@ typedef enum CFG_TASK_ADV_UPDATE_ID, CFG_TASK_MEAS_REQ_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -558,11 +579,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -595,9 +617,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -608,5 +630,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h index ff084c8f2..c1ccd8d90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h index 7290a09a4..f5d6dac71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h index aca81fcf3..60bbdd235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h index 68522f408..ddffbe133 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c index 94d498fd3..e1ad5f57d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -159,9 +162,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -356,12 +358,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -462,6 +603,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -506,4 +649,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/main.c index 7af84a4ee..f7de13711 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -78,6 +78,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -117,6 +118,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -196,19 +199,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1|RCC_PERIPHCLK_CLK48SEL - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -497,5 +504,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c index a7a6e9b3e..471ecc628 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -359,11 +388,21 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -407,4 +446,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c index a261d3dea..731cab145 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp index 01ef01215..18d0941e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp @@ -1,1265 +1,1266 @@ - 3 - - BLE_HeartRate - - ARM - + 3 + + BLE_HeartRate + + ARM + + 1 + + General + 3 + + 30 + 1 1 - - General - 3 - - 30 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 34 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 20 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application - Application + EWARM + + $PROJ_DIR$\startup_stm32wb55xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + + STM32_WPAN - EWARM - - $PROJ_DIR$\startup_stm32wb55xx_cm4.s - + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c + - User - - Core - - $PROJ_DIR$\..\Core\Src\app_debug.c - - - $PROJ_DIR$\..\Core\Src\app_entry.c - - - $PROJ_DIR$\..\Core\Src\hw_timerserver.c - - - $PROJ_DIR$\..\Core\Src\hw_uart.c - - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c - - - - STM32_WPAN - - App - - $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c - - - $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c - - - $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c - - - - Target - - $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c - - - + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers - Doc + BSP + + P-NUCLEO-WB55.Nucleo - $PROJ_DIR$\..\readme.txt + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c + - Drivers - - BSP - - P-NUCLEO-WB55.Nucleo - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c - - - - - CMSIS - - $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c - - - - STM32WBxx_HAL_Driver - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c - - + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + - Middlewares - - STM32_WPAN - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c - - + STM32WBxx_HAL_Driver + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + + Middlewares - Utilities - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c - - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c - + STM32_WPAN + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + + Utilities + + $PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + $PROJ_DIR$/../../../../../../Utilities/sequencer/stm32_seq.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c index b747168ac..00aa51379 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -268,26 +267,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1113,6 +1113,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1155,4 +1157,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h index 2b742007f..ab883018e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h index b51aa7b87..cd8a42274 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h index df9e12c2f..3b2f4c718 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c index 3240fbf9d..290aea233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c index ec6f828e6..7c121e375 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,5 +226,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h index 0246d2811..89b91bab3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void HRSAPP_Init( void ); #endif #endif /*__HRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/readme.txt index 6d04c2543..e789cdeb6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRate example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/BLE_HeartRateFreeRTOS.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/BLE_HeartRateFreeRTOS.ioc index 1dc89b54b..395455124 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/BLE_HeartRateFreeRTOS.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/BLE_HeartRateFreeRTOS.ioc @@ -104,8 +104,8 @@ Mcu.PinsNb=18 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:false\:true @@ -188,6 +188,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_HeartRateFreeRTOS +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -355,5 +357,3 @@ VP_SYS_VS_tim17.Signal=SYS_VS_tim17 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_HeartRateFreeRTOS -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_conf.h index ce1e69e9d..a3346a95f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -259,6 +259,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -268,11 +272,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -280,6 +288,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -427,8 +447,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -576,9 +597,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -589,5 +610,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_entry.h index 2ea1d06c0..1f45c7151 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_conf.h index e14c6bf08..18080f202 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,5 +212,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/main.h index 92bdf910e..ea85a1235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_hal_conf.h index 49e5c3957..9b267f062 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_it.h index 4f1bcb993..e27d85bd9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/vcp_conf.h index 7280c33b9..511b47342 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** - * @file vcp_conf.h - * @author MCD Application Team - * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file vcp_conf.h + * @author MCD Application Team + * @brief Configuration of the vcp interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_entry.c index f487c9702..5aa7bc6ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +28,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -92,6 +93,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -174,9 +177,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -388,12 +390,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -532,4 +673,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_freertos.c index 68fda81f5..f7bbac97b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/app_freertos.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,4 +66,3 @@ __weak void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime ) /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/freertos_port.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/freertos_port.c index 2a6bf7141..0da00c2f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/freertos_port.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/freertos_port.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : freertos_port.c - * Description : Custom porting of FreeRTOS functionalities - * - ****************************************************************************** + ****************************************************************************** + * @file freertos_port.c + * @author MCD Application Team + * @brief Custom porting of FreeRTOS functionalities + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -25,11 +24,11 @@ #include "FreeRTOS.h" #include "task.h" #include "stm32_lpm.h" +#include /* Private typedef -----------------------------------------------------------*/ typedef struct { - uint64_t LpTimeDiffVal; uint32_t LpTimeLeftOnEntry; uint8_t LpTimerFreeRTOS_Id; } LpTimerContext_t; @@ -201,7 +200,6 @@ void vPortSetupTimerInterrupt( void ) static void LpTimerInit( void ) { ( void ) HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(LpTimerContext.LpTimerFreeRTOS_Id), hw_ts_SingleShot, LpTimerCb); - LpTimerContext.LpTimeDiffVal = 0; return; } @@ -236,13 +234,15 @@ static void LpTimerStart( uint32_t time_to_sleep ) uint64_t time; /* Converts the number of FreeRTOS ticks into hw timer tick */ - - time = (time_to_sleep * 1000LL * 1000LL ); - time = time / ( CFG_TS_TICK_VAL * configTICK_RATE_HZ ); - - if(time > 0xFFFF0000) + if (time_to_sleep > (ULLONG_MAX / 1e12)) /* Prevent overflow in else statement */ { - time = 0xFFFF0000; /* maximum value */ + time = 0xFFFF0000; /* Maximum value equal to 24 days */ + } + else + { + /* The result always fits in uint32_t and is always less than 0xFFFF0000 */ + time = time_to_sleep * 1000000000000ULL; + time = (uint64_t)( time / ( CFG_TS_TICK_VAL_PS * configTICK_RATE_HZ )); } HW_TS_Start(LpTimerContext.LpTimerFreeRTOS_Id, (uint32_t)time); @@ -284,31 +284,30 @@ static void LpEnter( void ) #if ( CFG_LPM_SUPPORTED != 0) static uint32_t LpGetElapsedTime( void ) { - uint64_t val_ticks, time_us, diff_ps; - uint32_t LpTimeLeftOnExit, time2_us; + uint64_t val_ticks, time_ps; + uint32_t LpTimeLeftOnExit; LpTimeLeftOnExit = HW_TS_RTC_ReadLeftTicksToCount(); - time_us = (CFG_TS_TICK_VAL) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Corrects the time precision lost in CFG_TS_TICK_VAL computation */ - - /* Compute the amount of pico seconds lost at each TS ticks */ - diff_ps = DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1000000 * 1000000), (uint64_t)LSE_VALUE ); - diff_ps -= DIVF( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) * 1000000; - /* Compute the total amount of time shift */ - diff_ps *= (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Save the time shift for next time */ - LpTimerContext.LpTimeDiffVal += diff_ps; - - /* Reports the time difference into returned time elapsed value */ - time2_us = LpTimerContext.LpTimeDiffVal / (1000ULL * 1000ULL); - LpTimerContext.LpTimeDiffVal = LpTimerContext.LpTimeDiffVal - time2_us * (1000ULL * 1000ULL); - time_us += time2_us; - - /* Convert uS time into OS ticks */ - val_ticks = time_us * configTICK_RATE_HZ; - val_ticks = val_ticks / (1000 * 1000); + /* This cannot overflow. Max result is ~ 1.6e13 */ + time_ps = (uint64_t)((CFG_TS_TICK_VAL_PS) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit)); + + /* time_ps can be less than 1 RTOS tick in following situations + * a) MCU didn't go to STOP2 due to wake-up unrelated to Timer Server or woke up from STOP2 very shortly after. + * Advancing RTOS clock by 1 FreeRTOS tick doesn't hurt in this case. + * b) vPortSuppressTicksAndSleep(xExpectedIdleTime) was called with xExpectedIdleTime = 2 which is minimum value defined by configEXPECTED_IDLE_TIME_BEFORE_SLEEP. + * The xExpectedIdleTime is decremented by one RTOS tick to wake-up in advance. + * Ex: RTOS tick is 1ms, the timer Server wakes the MCU in ~977 us. RTOS clock should be advanced by 1 ms. + * */ + if(time_ps <= (1e12 / configTICK_RATE_HZ)) /* time_ps < RTOS tick */ + { + val_ticks = 1; + } + else + { + /* Convert pS time into OS ticks */ + val_ticks = time_ps * configTICK_RATE_HZ; /* This cannot overflow. Max result is ~ 1.6e16 */ + val_ticks = (uint64_t)(val_ticks / (1e12)); /* The result always fits in uint32_t */ + } /** * The system may have been out from another reason than the timer @@ -321,5 +320,3 @@ static uint32_t LpGetElapsedTime( void ) return (uint32_t)val_ticks; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/main.c index 9bae7ef89..9f1b91311 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -86,6 +86,7 @@ const osThreadAttr_t defaultTask_attributes = { /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -127,6 +128,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -200,7 +204,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -240,19 +243,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1|RCC_PERIPHCLK_CLK48SEL - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -580,5 +587,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_msp.c index 6a45c0296..3cf897c1a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -149,11 +148,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -209,6 +218,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -317,11 +336,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -361,11 +390,21 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -409,4 +448,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c index b15349521..9b1ea4ea1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -147,5 +148,3 @@ void HAL_ResumeTick(void) /* Enable TIM17 Update interrupt */ __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_it.c index 7d5a3a2c4..84c343457 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -333,4 +332,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/BLE_HeartRateFreeRTOS.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/BLE_HeartRateFreeRTOS.ewp index 447f0ca84..646325c65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/BLE_HeartRateFreeRTOS.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/BLE_HeartRateFreeRTOS.ewp @@ -1,1309 +1,1310 @@ - 3 - - BLE_HeartRateFreeRTOS - - ARM - + 3 + + BLE_HeartRateFreeRTOS + + ARM + + 1 + + General + 3 + + 30 + 1 1 - - General - 3 - - 30 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 34 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 20 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application - Application + EWARM + + $PROJ_DIR$\startup_stm32wb55xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\app_freertos.c + + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\freertos_port.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_timebase_tim.c + + + + STM32_WPAN - EWARM - - $PROJ_DIR$\startup_stm32wb55xx_cm4.s - + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c + - User - - Core - - $PROJ_DIR$\..\Core\Src\app_debug.c - - - $PROJ_DIR$\..\Core\Src\app_entry.c - - - $PROJ_DIR$\..\Core\Src\app_freertos.c - - - $PROJ_DIR$\..\Core\Src\freertos_port.c - - - $PROJ_DIR$\..\Core\Src\hw_timerserver.c - - - $PROJ_DIR$\..\Core\Src\hw_uart.c - - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_timebase_tim.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c - - - - STM32_WPAN - - App - - $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c - - - $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c - - - $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c - - - - Target - - $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c - - - + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers - Doc + BSP + + P-NUCLEO-WB55.Nucleo - $PROJ_DIR$\..\readme.txt + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c + - Drivers - - BSP - - P-NUCLEO-WB55.Nucleo - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c - - - - - CMSIS - - $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c - - - - STM32WBxx_HAL_Driver - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c - - + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + - Middlewares - - FreeRTOS - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM4F\port.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM4F\portasm.s - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c - - - - STM32_WPAN - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c - - + STM32WBxx_HAL_Driver + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + + Middlewares - Utilities - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c - + FreeRTOS + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM4F\port.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM4F\portasm.s + + + + STM32_WPAN + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + + Utilities + + $PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.c index 09390b3c7..e31070703 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -296,26 +295,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1169,6 +1169,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1198,4 +1200,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.h index 2b742007f..ab883018e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_conf.h index b51aa7b87..cd8a42274 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_dbg_conf.h index df9e12c2f..3b2f4c718 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.c index 3240fbf9d..290aea233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.c index 08cff5588..d1aefc194 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.c @@ -6,17 +6,16 @@ * @brief Heart Rate Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -252,5 +251,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.h index 0246d2811..89b91bab3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/hrs_app.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void HRSAPP_Init( void ); #endif #endif /*__HRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/readme.txt index 058808c82..baeeecaaa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRateFreeRTOS example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Binary/BLE_HeartRateFreeRTOS_ANCS_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Binary/BLE_HeartRateFreeRTOS_ANCS_reference.hex index 2679776af..1351324e5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Binary/BLE_HeartRateFreeRTOS_ANCS_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Binary/BLE_HeartRateFreeRTOS_ANCS_reference.hex @@ -1,26 +1,26 @@ :020000040800F2 -:10000000086D0020CDFF000889FD00088BFD000869 -:100010008DFD00088FFD000891FD00080000000024 -:10002000000000000000000000000000B1C800084F -:1000300093FD00080000000059C80008814F000827 -:1000400005000108090001080D000108DBFD00089A -:100050001100010815000108CFFD0008D5FD0008BA -:10006000190001081D000108C9FD00082100010850 -:10007000250001082900010895FD00082D00010850 -:100080003100010835000108390001083D00010870 -:100090004100010845000108490001084D00010820 -:1000A00051000108550001089BFD00085900010896 -:1000B0005D00010861000108650001086900010890 -:1000C0006D00010871000108750001087900010840 -:1000D000A1FD0008A7FD00087D00010881000108BE -:1000E00085000108890001088D00010891000108C0 -:1000F000E3FD0008DFFD00089500010899000108F4 -:100100009D000108A1000108A5000108A90001083F -:10011000AD000108B1000108B5000108B9000108EF -:10012000BD000108C1000108ADFD0008C5000108BF -:10013000C9000108CD000108D100010818B102284A +:1000000008100020FD07010881050108830501088B +:100010008505010887050108890501080000000021 +:100020000000000000000000000000009DC8000863 +:100030008B0501080000000045C80008014F0008BA +:1000400035080108390801083D080108DF050108E5 +:100050004108010845080108D3050108D905010830 +:10006000490801084D080108CD050108510801089B +:1000700055080108590801088D0501085D080108A7 +:100080006108010865080108690801086D08010890 +:100090007108010875080108790801087D08010840 +:1000A00081080108850801089305010889080108ED +:1000B0008D080108910801089508010899080108B0 +:1000C0009D080108A1080108A5080108A908010860 +:1000D000990501089F050108AD080108B10801084C +:1000E000B5080108B9080108BD080108C1080108E0 +:1000F000A5050108A9050108AD050108C508010805 +:10010000C9080108CD080108D1080108D50801086F +:10011000D9080108DD080108E1080108E50801081F +:10012000E9080108ED080108B1050108F108010816 +:10013000F5080108F9080108FD08010818B10228AE :1001400007D003D370470FF2140004E00FF2200031 -:1001500001E00FF2340004F0DFBB00002A2A204542 +:1001500001E00FF2340004F0DBBB00002A2A204546 :1001600076656E7449443A2041646465640D0A0002 :100170002A2A204576656E7449443A204D6F646999 :10018000666965640D0A00002A2A204576656E744A @@ -28,12 +28,12 @@ :1001A00010B50128044608D0022809D004280AD036 :1001B00008280BD010280CD00FE00FF270000AE0D6 :1001C0000FF2800007E00FF2980004E00FF2B00099 -:1001D00001E00FF2CC0004F09FFB0FF2E40004F00A -:1001E0009BFBE00744BF0FF2E80004F095FBA0077B -:1001F00044BF0FF2E40004F08FFB600744BF0FF22E -:10020000E40004F089FB200744BF0FF2E80004F08B -:1002100083FBE00644BF0FF2EC0004F07DFBBDE879 -:10022000104001A004F078BB0A0D00002A2A2045E6 +:1001D00001E00FF2CC0004F09BFB0FF2E40004F00E +:1001E00097FBE00744BF0FF2E80004F091FBA00783 +:1001F00044BF0FF2E40004F08BFB600744BF0FF232 +:10020000E40004F085FB200744BF0FF2E80004F08F +:100210007FFBE00644BF0FF2EC0004F079FBBDE881 +:10022000104001A004F074BB0A0D00002A2A2045EA :1002300076656E74466C61673A2053696C656E74BE :100240000D0A00002A2A204576656E74466C6167A7 :100250003A20496D706F7274616E740D0A0000006F @@ -54,7 +54,7 @@ :100340000FF2A40013E00FF2B80010E00FF2CC009F :100350000DE00FF2E0000AE00FF2F00007E00FF20C :10036000101004E00FF2301001E00FF2481004F01A -:10037000D3BA70472A2A2043617465676F7279493E +:10037000CFBA70472A2A2043617465676F72794942 :10038000443A204F746865720D0A00002A2A2043FF :10039000617465676F727949443A20496E636F6D85 :1003A000696E672043616C6C0D0A00002A2A2043A5 @@ -77,7 +77,7 @@ :1004B0000A0000002A2A2043617465676F72794937 :1004C000443A20456E7465727461696E6D656E7430 :1004D0000D0A00000FB418B585B068460FF2FC0194 -:1004E000142204F03DFA08988DF8010000240898C1 +:1004E000142204F039FA08988DF8010000240898C5 :1004F0008DF80040000A8DF8020005220898000CD3 :100500008DF803000898000E8DF804009DF8240073 :10051000012804BF8DF8054006229DF8250001281A @@ -89,10 +89,10 @@ :100570003100012803D1D0B2052300F049F89DF8DD :100580003200012803D1D0B2062300F041F89DF8D3 :100590003300012803D1D0B2072300F039F8DFF887 -:1005A000200DB0F83A1840886B46D2B204F094FBA4 -:1005B000044647F2305000F030FE54B100F04CFDDC -:1005C000014640F2A9130FF2280200F011FE03F0D9 -:1005D00011FF06B010BC5DF814FB00000000000025 +:1005A000240DB0F83A1840886B46D2B204F090FBA4 +:1005B000044647F2305000F032FE54B100F04EFDD8 +:1005C000014640F2A9130FF2280200F013FE03F0D7 +:1005D00013FF06B010BC5DF814FB00000000000023 :1005E000000001FFFF02FFFF03FFFF0405060700F5 :1005F000414E43535F436D645F4765744E6F74694A :100600006669636174696F6E417474720000000002 @@ -100,44 +100,44 @@ :10062000521C0DF80300D3B2000A0DF80300521C4F :10063000704700002DE9F04F00260024002885B007 :10064000A04640F0E080ADF80C1001928DF8024019 -:10065000DFF8709C0FF2D41ADFF8645CDFF868BC36 +:10065000DFF8749C0FF2D41ADFF8685CDFF86CBC2A :1006600001E0F61CB6B2BDF80C00864280F2CE80E6 -:100670000198801900F060FBBDF800100029F0D04F +:100670000198801900F062FBBDF800100029F0D04D :1006800005F6080002900146887810BB0F880FF22B -:10069000C01004F041F90C204743E819049000F21F +:10069000C01004F03DF90C204743E819049000F223 :1006A00009273878FFF74AFD7878FFF779FDB878A1 -:1006B000FFF730FEF9780FF2EC1004F02DF90498F2 -:1006C000D0F810120FF2F41004F026F9029901206C +:1006B000FFF730FEF9780FF2EC1004F029F90498F6 +:1006C000D0F810120FF2F41004F022F90299012070 :1006D00088700198805D07281ED8DFE800F01916A1 :1006E00013100D0A07040FF2F41013E00FF20820A4 :1006F00010E00FF220200DE00FF224200AE00FF2AC :10070000342007E00FF23C2004E00FF2482001E023 -:100710000FF24C2004F000F90198805D08B9012423 +:100710000FF24C2004F0FCF80198805D08B9012428 :1007200009E0062803D101208DF8020003E0072824 :1007300008BF4FF00108761CB6B2029605F5837724 :100740000198BDF800208619FF2A08D8B11C384648 -:1007500004F057FBBDF800100020785410E000F0C2 -:10076000F1FA014640F2212301F026FA00F0B8FA2E -:10077000FE22B11C384604F044FB002085F8040238 +:1007500004F053FBBDF800100020785410E000F0C6 +:10076000F3FA014640F2212301F028FA00F0BAFA28 +:10077000FE22B11C384604F040FB002085F804023C :10078000029EBDF800008619B61C2000B6B217D034 :10079000BDF80020521C812A05F1860006DA394690 -:1007A00004F02FFBBDF80000401C04E08022394615 -:1007B00004F027FB802085F8850000240F20287096 -:1007C000BDF80000002804D039460FF2904004F034 -:1007D000A3F848E758EA00000AD0102000F0B1FA68 -:1007E000014640F2452301F0E7F90FF2881008E0D6 -:1007F00000F0A7FA014640F24A2301F0DDF90FF2BA -:10080000BC1004F089F805B0BDE8F08F29789DF898 -:1008100002000F29DED100F095FA014640F23D2397 -:1008200001F0CAF90FF2E810EBE70000414E435324 +:1007A00004F02BFBBDF80000401C04E08022394619 +:1007B00004F023FB802085F8850000240F2028709A +:1007C000BDF80000002804D039460FF2944004F030 +:1007D0009FF848E758EA00000AD0102000F0B3FA6A +:1007E000014640F2452301F0E9F90FF2881008E0D4 +:1007F00000F0A9FA014640F24A2301F0DFF90FF2B6 +:10080000BC1004F085F805B0BDE8F08F29789DF89C +:1008100002000F29DED100F097FA014640F23D2395 +:1008200001F0CCF90FF2E810EBE70000414E435322 :100830005F50617273655F4765744E6F7469666976 :10084000636174696F6E417474725F526573700096 :100850000D0A2A2A2A2A2A2A2A2A2A2A2A2A2A2A35 :100860002A204461746120536F757263652044656A -:100870007461696C20496E666F6D6174696F6E207A -:100880005265636569766564202A2A2A2A2A2A2AFB -:100890002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A0DD5 -:1008A0000A0000002A2A2043617465676F72794349 +:100870007461696C20496E666F726D6174696F6E28 +:10088000205265636569766564202A2A2A2A2A2A05 +:100890002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2AB8 +:1008A0000D0A00002A2A2043617465676F7279433C :1008B0006F756E743A2025640D0A00002A2A204EB6 :1008C0006F74696669636174696F6E5549443A2053 :1008D0003078253038780D0A000000002A2A204E92 @@ -162,1959 +162,1959 @@ :100A0000414E43535F49444C45200A0D000000000D :100A100020332E3220476574204150502041747499 :100A200072696275746573202844657461696C200D -:100A3000496E666F6D6174696F6E2061626F757467 -:100A400020746865204170702C204E6F77206F6E87 -:100A50006C7920737570706F727420746F204765A5 -:100A600074204E616D65206F662041707029203DB5 -:100A70003E20414E43535F4745545F4150505F41D4 -:100A80005454524942555445200A0D002DE9FE4F59 -:100A90000027012840F08380DFF82468DFF82488ED -:100AA0000FF23819DFF820B8ADF80210154606F538 -:100AB000837A01E0FF1CBFB2BDF80200874270DA02 -:100AC000E81900F039F9BDF800100029F2D0EC5D0A -:100AD0000FF2241003F020FF1CB90FF26C1003F08A -:100AE0001BFFE85D441EA4417F1CBFB20197E40FC9 -:100AF000BDF80020EF19FF2A09D8B91C504604F0B0 -:100B000080F9BDF8001000200AF8010010E000F0A4 -:100B100019F9014640F27B2301F02CFC00F0E0F8CB -:100B2000FE22B91C504604F06CF9002086F804023D -:100B3000019FBDF80000C719BF1CBFB28CB1421C99 -:100B4000812A07DA5146701D04F05BF9BDF80000F8 -:100B5000401C05E080225146701D04F052F98020AF -:100B60003071BDF800000028A6D051460FF2EC000D -:100B700003F0D2FEA0E700F0E5F8014640F29B2327 -:100B800001F0F8FB29880FF2DC0003F0C5FE28888D -:100B900044433019002180F8081211203070BDE85C -:100BA000F78F06F608050C2428886043301890F863 -:100BB0000B02012818BF0528DDD101202872102062 -:100BC000307000F0BFF8014640F2992301F0D2FBEB -:100BD0000FF2C40003F0A0FEE1E70000414E4353D2 -:100BE0005F50617273655F476574417070417474E2 -:100BF000725F5265737000000D0A2A2A2A2A2A2A77 -:100C00002A2A2A2A2A2A2A2A2A2041707020417454 -:100C10007472696275746520496E666F6D6174697E -:100C20006F6E205265636569766564202A2A2A2AD8 -:100C30002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A14 -:100C40002A2A0D0A000000002A2A20446973706CC9 -:100C500061794E616D653A20000000002025730D1A -:100C60000A000000436F6D6D616E6449444765740E -:100C700041707041747472696275746573206E6F2F -:100C800074696679456E7472793D25642052656D8C -:100C90006F7665640A0D000020332E342050657293 -:100CA000666F726D204E6F74696669636174696FF7 -:100CB0006E20416374696F6E203D3E20414E435368 -:100CC0005F504552464F524D5F4E4F54494649433F -:100CD0004154494F4E5F414354494F4E200A0D0045 -:100CE000BDF800100FF20800FF2203F015BE00004F -:100CF00063757420746865204174747269627574D8 -:100D000065494420782056616C7565206C656E3DA0 -:100D10002564203C3D2073697A656F6628616E63A7 -:100D2000735F636F6E746578742E6C697374293D9C -:100D30002564200A0D000000411C0222684604F0D0 -:100D400060B82870584604F0A9B82DE9FC41054662 -:100D5000089C0FF2A4000E461746984603F0DCFDEF -:100D60002846FFF7EBF93046FFF71AFA3846FFF747 -:100D7000D1FA41460FF2D80003F0CEFD21460FF222 -:100D8000E80003F0C9FD0C22022DDFF8343511D143 -:100D9000002102FB01F0184400F502708568A542AD -:100DA00003D0491C8029F4DB24E0002202700FF2FA -:100DB000D8001BE0002102FB01F0184400F5027C82 -:100DC0009CF8000018B1491C8029F4DB12E00120D6 -:100DD0008CF800008CF801508CF802608CF80370DD -:100DE0008CF80480CCF808400FF2BC00BDE8FC4150 -:100DF00003F092BDBDE8F3812A2A2A2A2A2A2A2A48 -:100E00002A2A2A2A2A2A2A204E6F7469666963616F -:100E100074696F6E20536F757263652042617369E8 -:100E20006320496E666F6D6174696F6E20526563F1 -:100E30006569766564202A2A2A2A2A2A2A2A2A2AE1 -:100E40002A2A2A2A2A2A2A2A2A2A2A2A0D0A000093 -:100E50002A2A2043617465676F7279436F756E74D7 -:100E60003A202564200D0A002A2A204E6F746966F4 -:100E700069636174696F6E5549443A203078253052 -:100E8000386C78200D0A00002A2A206E6F7469667B -:100E900079456E7472793A2025642052656D6F76BB -:100EA00065640D0A000000002A2A206E6F746966CE -:100EB00079456E7472793A202564204164646564D2 -:100EC0000D0A00007CB5DFF88C4804F608054FF6E3 -:100ED000FF7601462E8000220C235343234403F562 -:100EE0000273187818B19B780B408B4213D0521CB8 -:100EF000802AF1DB2888B0420CD100F0ADF8014621 -:100F000040F2EE2300F072F90FF2300003F004FD1E -:100F10000020207073BD0020A870D2B20E20207077 -:100F20002A8000F099F8014640F2E72300F05EF9CC -:100F300029880FF24C0003F0EFFCDBE720616E63C1 -:100F4000735F636F6E746578742E6E6F7469667903 -:100F5000456E747279203D3D20494E56414C4944BE -:100F60005F4E4F544946595F454E545259203D3EBD -:100F700020414E43535F49444C45200A0D00000078 -:100F8000322E20476574204D6F7265204465746170 -:100F9000696C20496E666F6D6174696F6E73202095 -:100FA0006E6F74696679456E7472793D2564203D73 -:100FB0003D3E20414E43535F4745545F4E4F544999 -:100FC0004649434154494F4E5F415454524942555A -:100FD0005445200A0D00000010B5DFF8784740F6B0 -:100FE0004401204603F0C8FF00200C210023C2B2B8 -:100FF0004A432244401C82F80832C2B2802AF6DBFF -:101000004FF6FF706080A4F80808237000F024F801 -:10101000014640F20E330FF2140200F0E9F8BDE889 -:1010200010400FF21C0003F077BC0000414E435308 -:101030005F436C69656E745F526573657400000090 -:10104000414E435320434C49454E5420524553454D -:1010500054200A0D000000009B4803F01FBF2DE93B -:10106000F047974C0FF29406964F0FF2B408DFF852 -:1010700058A204F62E0540F23E6902E0022003F079 -:10108000A0F84FF0FF320021012004F02DF8207865 -:10109000052823D008280AD00E2806D00F2802D011 -:1010A0001028EBD01CE00120E9E70020E7E7012051 -:1010B00002F0CEF9022002F0CBF9032002F0C8F9C9 -:1010C000042002F0C5F9298800291EBF688800287D -:1010D00004F075FE052002F0BBF9D2E70020FAE724 -:1010E00001F04CF901464B464246384603F014FCE9 -:1010F0002178304603F010FCC3E70000696E76618A -:101100006C696420616E63735F636F6E746578747D -:101110002E73746174653D2564200A0D0000000083 -:10112000414E43535F4170705F5570646174655FF9 -:101130005365727669636500DFF8940D406801219C -:1011400003F0A0BF10B5DFF88C0DDFF8844D05F07B -:101150009DFD0FF23C02DFF8800D002103F046FFF9 -:10116000606000220021012004F079F82060FFF780 -:1011700033FFFFF771FF014640F246330FF23402AE -:1011800000F036F8BDE810400FF2400003F0C4BB99 -:1011900014F400080000000000000000000000003F -:1011A000000000000005000000000000000000003A -:1011B00000000000414E43535F436C69656E745FED -:1011C0004170705F496E6974000000002D2D204150 -:1011D0004E435320434C49454E5420494E495449AF -:1011E000414C495A4544200A0D0000000FF2080204 -:1011F000344803F091BB0000414E43535F4E6F747F -:10120000696669636174696F6E5F436865636B00EB -:10121000DFF8BC0C006804F08EB8DFF8B40C00688E -:101220004FF0FF3104F062B82DE9F0470746DFF8D0 -:1012300098A0244C0FF294080FF2A80501F09EF834 -:1012400001464FF4587300F0EDF8BA7839880FF280 -:10125000041003F061FB002640F2663910E001F053 -:101260008DF801464B4600F0DDF807EB8600B0F83C -:101270000530B0F80320314603F05FF9761CF6B272 -:10128000B8788642EBDB0E480178082916D100F6C3 -:101290002E05B7F803002880B7F80500688001F034 -:1012A0006DF8014640F26F3300F0BCF86A88298877 -:1012B0000FF20010BDE8F04703F02EBBBDE8F08749 -:1012C000B841002040450008544500084761747447 -:1012D00050617273655365727669636573427955BF -:1012E000554944004143495F4154545F46494E4487 -:1012F0005F42595F545950455F56414C55455F52C6 -:101300004553505F56534556545F434F4445202D37 -:10131000204E756D506169723D256420466F756E73 -:10132000645F4174747269627574655F48616E646C -:101330006C653D3078253034582C47726F75705F7E -:10134000456E645F48616E646C653D30782530346D -:10135000580A0D004143495F4154545F46494E4489 -:101360005F42595F545950455F56414C55455F5255 -:101370004553505F56534556545F434F4445202DC7 -:1013800020436F6E6E656374696F6E5F48616E6453 -:101390006C653D3078253034582C4E756D5F6F6626 -:1013A0005F48616E646C655F506169723D25640AD7 -:1013B0000D0000004143495F4154545F46494E448B -:1013C0005F42595F545950455F56414C55455F52F5 -:1013D0004553505F56534556545F434F4445202D67 -:1013E00020466F756E6420414E4353536572766993 -:1013F0006365537461727448616E646C653D3078E6 -:10140000253034582C414E435353657276696365D9 -:10141000456E6448616E646C653D307825303458A3 -:101420000A0D00004246204603F076BA2DE9F04F3F -:101430000546DFF8A88A87B001F0EDFFDFF8A09A33 -:101440000FF2143A01464FF4607300F0B5FBEB78ED -:10145000AA7829880FF2143003F05EFA00F07CFFBE -:1014600040F06781A878E978142802F6120204BFD8 -:1014700004270C24039291FBF0F106280495C9B2CD -:1014800004BF0427002406940020059120E003F007 -:1014900005FD014640F2E53300F08EFB0FF24030CF -:1014A0002B46324659460FE045F22B008345404615 -:1014B000EDD103F0F3FC40F2E333014600F07CFB96 -:1014C0002B4632465946204603F026FA00F04AFFE2 -:1014D0008DF808009DF808400598844280F2378115 -:1014E00004983844857806784178C07845EA002524 -:1014F00046EA012606980499C01908440179407902 -:1015000041EA002B01F087FF014640F2A53300F0CD -:1015100053FB019500965B46059A0FF2EC2021469D -:1015200003F0FAF90398008808B1864201DA0398BB -:1015300006800398408808B1A84201DA03984580E4 -:10154000BBF5C05F12D10398868040460399CD80D9 -:1015500003F0A4FC014640F2B73300F02DFB0FF27C -:10156000EC202B4632464FF4C051ADE741F6010066 -:1015700083450ED103980682404603994D8203F0BD -:101580008DFC014640F2BD3300F016FB0FF2E8205F -:1015900086E741F6020083450FF2183404D101F0CA -:1015A0003AFF4FF4707388E741F60300834509D191 -:1015B00001F031FF014640F2C23300F0FDFA0FF2B4 -:1015C00020306DE741F60400834509D101F023FF87 -:1015D00001464FF4717300F0EFFA0FF238305FE715 -:1015E00041F60500834509D101F015FF014640F29F -:1015F000C63300F0E1FA0FF2503051E741F6060031 -:10160000834509D101F007FF01464FF4727300F0E2 -:10161000D3FA0FF26C3043E741F60700834509D156 -:1016200001F0F9FE014640F2CA3300F0C5FA0FF2AC -:10163000903035E741F60800834509D101F0EBFE13 -:1016400001464FF4737300F0B7FA0FF2AC3027E79E -:1016500041F60900834509D101F0DDFE014640F263 -:10166000CE3300F0A9FA0FF2C03019E741F60A00B4 -:10167000834509D101F0CFFE01464FF4747300F0A9 -:101680009BFA0FF2E0300BE741F60B00834509D1DE -:1016900001F0C1FE014640F2D23300F08DFA0FF2A4 -:1016A0000040FDE641F60C00834509D101F0B3FE90 -:1016B00001464FF4757300F07FFA0FF2E430EFE665 -:1016C00041F60D00834504D101F0A5FE40F2D6336A -:1016D000F3E641F60E00834509D101F09CFE014678 -:1016E0004FF4767300F068FA0FF2DC30D8E641F67A -:1016F0000F00834509D101F08EFE014640F2DA3336 -:1017000000F05AFA0FF2F430CAE64FF23140834546 -:101710007FF4CAAE0398868340460399CD8303F0D5 -:10172000BDFB014640F2E13300F046FA0FF2FC3017 -:10173000B6E601F070FE014640F2ED3300F03CFAEF -:1017400007B0BDE8F04F0FF2144003F0E5B800F029 -:10175000DCBF0000B84100204761747450617273AF -:101760006553657276696365730000004143495FA4 -:101770004154545F524541445F42595F47524F556F -:10178000505F545950455F524553505F565345562C -:10179000545F434F4445202D20436F6E6E65637444 -:1017A000696F6E5F48616E646C653D3078253034DA -:1017B000582C4174747269627574655F4461746118 -:1017C0005F4C656E6774683D25642C446174615F8D -:1017D0004C656E6774683D256420210A0000000096 -:1017E000696E76616C696420555549443D307825B1 -:1017F00030345820666F756E64205B253034582075 -:10180000253034585D210A006E756D536572763D42 -:1018100025642F25642C73686F72742055554944D4 -:101820003D307825303458205365727669636548B9 -:10183000616E646C65205B307825303458202D2033 -:101840003078253034585D200A0D00004741505F44 -:10185000534552564943455F555549443D307825D7 -:1018600030345820666F756E64205B253034582004 -:10187000253034585D210A0047454E455249435FA3 -:101880004154545249425554455F53455256494379 -:10189000455F555549443D30782530345820666FB2 -:1018A000756E64205B2530345820253034585D2116 -:1018B0000A000000414D535F534552564943455F6E -:1018C000555549443D30782530345820666F756E43 -:1018D00064205B2530345820253034585D210A00BF -:1018E0004C494E4B5F4C4F53535F534552564943FF -:1018F000455F555549443D30782530345820666F52 -:10190000756E64205B2530345820253034585D21B5 -:101910000A00000054585F504F5745525F534552DC -:10192000564943455F555549443D30782530345834 -:1019300020666F756E64205B253034582025303466 -:10194000585D210A0000000043555252454E545F35 -:1019500054494D455F534552564943455F55554996 -:10196000443D30782530345820666F756E64205BB6 -:101970002530345820253034585D210A00000000FD -:101980005245464552454E43455F555044415445A6 -:101990005F54494D455F534552564943455F555540 -:1019A00049443D30782530345820666F756E642088 -:1019B0005B2530345820253034585D210A00000062 -:1019C0004E4558545F4453545F4348414E47455F2A -:1019D000534552564943455F555549443D30782556 -:1019E00030345820666F756E64205B253034582083 -:1019F000253034585D210A00474C55434F53455F0D -:101A0000534552564943455F555549443D30782525 -:101A100030345820666F756E64205B253034582052 -:101A2000253034585D210A004845414C54485F54E4 -:101A30004845524D4F4D455445525F5345525649C6 -:101A400043455F555549443D30782530345820662C -:101A50006F756E64205B2530345820253034585D16 -:101A6000210A00004445564943455F494E464F52BE -:101A70004D4154494F4E5F534552564943455F557A -:101A80005549443D30782530345820666F756E6472 -:101A9000205B2530345820253034585D210A000061 -:101AA000556E6B6F776E20555549443D3078253023 -:101AB000345820666F756E64205B253034582025BD -:101AC0003034585D210A000050484F4E455F414C6C -:101AD0004552545F534552564943455F5555494415 -:101AE0003D30782530345820666F756E64205B2554 -:101AF00030345820253034585D210A004241545476 -:101B00004552595F534552564943455F55554944DF -:101B10003D30782530345820666F756E64205B2523 -:101B200030345820253034585D210A00414E43534B -:101B30005F534552564943455F555549443D3078BA -:101B40002530345820666F756E64205B253034581C -:101B500020253034585D210A000000004143495FD0 -:101B60004154545F524541445F42595F47524F557B -:101B7000505F545950455F524553505F5653455638 -:101B8000545F434F44452C206661696C6564206E48 -:101B90006F206672656520696E64657820696E20C5 -:101BA000636F6E6E656374696F6E207461626C65DD -:101BB00020210A0D000000005246484602F0ACBE4B -:101BC0002DE9F84F0546DFF814A388B000F0D6FBE6 -:101BD000DFF80C830FF20C39014640F2FE3300F0BF -:101BE000C9FBEB78AA7829880FF2083002F094FE3E -:101BF00000F0B2FB40F05B81EB78A878152804BFB9 -:101C000005270C24072804BF05270024194691FB4B -:101C1000F0F1581EE870C9B202F61A0200200392D1 -:101C200004950794069124E000F0A8FB014640F2D9 -:101C3000654300F09FFB0FF228302B4622463146C9 -:101C400013E042F6A62B5E45EED10398048003987C -:101C5000458000F093FB014640F2634300F08AFBAD -:101C60000FF22C302B462246594602F055FE00F06A -:101C700079FB8DF808009DF808B00698834580F23E -:101C800024810498C01910F8014C017844EA012419 -:101C9000417805918578C078049945EA0025079830 -:101CA000C01908440679407956EA00261CBF0598F9 -:101CB0000028DCD0002C18BF002DD8D000F05EFB2F -:101CC000014640F22A4300F055FB059B0FF2FC2031 -:101CD000019500943246594602F01EFEB6F5285F83 -:101CE0000DD100F04BFB014640F22E4300F042FBC9 -:101CF0000FF244302B4622464FF42851B5E742F606 -:101D0000012086420FF2603B0CD100F037FB014608 -:101D10004FF4866300F02EFB2B46224642F601214B -:101D20005846A2E742F6022086420DD100F026FB7B -:101D3000014640F2324300F01DFB0FF25C302B46AF -:101D4000224642F6022190E742F6032086420BD15A -:101D500000F014FB014640F2344300F00BFB2B462D -:101D6000224642F60321DBE742F6042086420BD1ED -:101D700000F004FB014640F2364300F0FBFA2B462C -:101D8000224642F60421CBE742F6052086420ED1D8 -:101D90000398848150460399CD8103F07FF8014672 -:101DA00040F23C4300F0E6FA0FF2283045E742F6F5 -:101DB0001920864209D100F0E1FA014640F23F4382 -:101DC00000F0D8FA0FF2503037E742F62B20864267 -:101DD00009D100F0D3FA014640F2424300F0CAFABA -:101DE0000FF2683029E742F60F20864209D100F051 -:101DF000C5FA014640F2444300F0BCFA0FF28030CD -:101E00001BE742F62920864209D100F0B7FA0146C5 -:101E100040F2474300F0AEFA0FF2A0300DE742F671 -:101E20002420864209D100F0A9FA014640F2494334 -:101E300000F0A0FA0FF2D030FFE641F20D2086420A -:101E40000ED10398048350460399CD8303F026F8FE -:101E500001464FF48A6300F08DFA0FF2F430ECE69D -:101E60004DF6F30086420ED1039844835046039901 -:101E70000D8403F013F8014640F2564300F07AFA5D -:101E80000FF20C40D9E64CF2E96086427FF4D9AEFD -:101E900003988483504603994D8402F0FFFF014666 -:101EA00040F25C4300F066FA0FF21C40C5E600F019 -:101EB00065FA014640F26D4300F05CFA09B0BDE8F6 -:101EC000F04F0FF23C4002F027BD09B0BDE8F08FA3 -:101ED000A45C0020CD2E00085F10000854450008C7 -:101EE00040450008476174745061727365436861CE -:101EF000727300004143495F4154545F524541446D -:101F00005F42595F545950455F524553505F565395 -:101F10004556545F434F4445202D20436F6E6E65F8 -:101F20006374696F6E5F48616E646C653D307825DF -:101F3000782C48616E646C655F56616C75655F50A6 -:101F40006169725F4C656E6774683D25642C4461FD -:101F500074615F4C656E6774683D25640A0D00000E -:101F6000556E6B6E6F776E5F636861722055554971 -:101F7000443D30782530345820666F756E64205BA0 -:101F80002530345820253034585D210A00000000E7 -:101F900043454E5452414C5F414444524553535F74 -:101FA0005245534F4C5554494F4E5F555549443D4A -:101FB00030782530345820666F756E64205B25308C -:101FC000345820253034585D210A00002D2D20473B -:101FD000415454203A206E756D48646C6556616CAE -:101FE0007565506169723D25642C73686F72742049 -:101FF000555549443D30782530345820464F554E8C -:1020000044204368617250726F70657274696573C1 -:102010003D307825303458204368617248616E64E1 -:102020006C65205B307825303458202D20307825A1 -:102030003034585D0A00000047415020444556495D -:1020400043455F4E414D455F555549443D307825E8 -:1020500030345820666F756E64205B25303458200C -:10206000253034585D210A004741502041505045E9 -:102070004152414E43455F555549443D30782530E6 -:10208000345820666F756E64205B253034582025E7 -:102090003034585D210A00004741502050455249D4 -:1020A00050484552414C5F505249564143595F4652 -:1020B0004C41475F555549443D30782530345820D0 -:1020C000666F756E64205B25303458202530345897 -:1020D0005D210A0047415454205345525649434517 -:1020E0005F4348414E4745445F4348415241435452 -:1020F000455249535449435F555549443D3078252D -:1021000030345820666F756E64205B25303458205B -:10211000253034585D210A00424154544552595FDC -:102120004C4556454C5F434841525F555549443DE7 -:1021300030782530345820666F756E64205B25300A -:10214000345820253034585D210A0000435552523E -:10215000454E545F54494D455F434841525F555584 -:1021600049443D30782530345820666F756E6420C0 -:102170005B2530345820253034585D210A0000009A -:102180004C4F43414C5F54494D455F494E464F5279 -:102190004D4154494F4E5F434841525F5555494464 -:1021A0003D30782530345820666F756E64205B258D -:1021B00030345820253034585D210A004465766952 -:1021C0006365496E666F726D6174696F6E53657297 -:1021D00076696365204D414E5546414354555245FD -:1021E000525F4E414D455F555549443D307825304D -:1021F000345820666F756E64205B25303458202576 -:102200003034585D210A0000446576696365496E83 -:10221000666F726D6174696F6E536572766963651E -:10222000204D4F44454C5F4E554D4245525F5555EC -:1022300049443D30782530345820666F756E6420EF -:102240005B2530345820253034585D210A000000C9 -:10225000414E43535F4E4F54494649434154494FC1 -:102260004E5F534F555243455F434841525F55556A -:1022700049443D30782530345820666F756E6420AF -:102280005B2530345820253034585D210A00000089 -:10229000414E43535F434F4E54524F4C5F504F4952 -:1022A0004E545F434841525F555549443D3078256F -:1022B00030345820666F756E64205B2530345820AA -:1022C000253034585D210A00414E43535F44415448 -:1022D000415F534F555243455F434841525F555507 -:1022E00049443D30782530345820666F756E64203F -:1022F0005B2530345820253034585D210A00000019 -:102300004143495F4154545F524541445F42595FE4 -:10231000545950455F524553505F56534556545F8C -:10232000434F44452C206661696C65642068616E8A -:10233000646C65206E6F7420666F756E6420696EC4 -:1023400020636F6E6E656374696F6E207461626C7A -:102350006520210A0D000000DFF8542D29885088DF -:1023600088427047049881789DF80800CF19FFB221 -:10237000401C70474A46404602F0CEBA504602F032 -:102380008DBD2DE9F04F0646DFF8288D87B001F0AE -:1023900042F8DFF824AD0FF2783B014640F27B4370 -:1023A00000F01CFCF378B27831880FF2743002F040 -:1023B000B3FADFF8FC2C31885088884240F09781CE -:1023C000B078012803D102244FF000090425022827 -:1023D00003D102244FF00C09122502F62802F078EE -:1023E000DFF8D87C0292E9B2039690FBF1F1CDF8C8 -:1023F0001890C9B205950020049123E002F04EFD2B -:10240000014640F2F14300F0E9FB0FF270302A463A -:1024100031460FE042F6A6294E454046EED102F085 -:102420003DFD014640F2EF4300F0D8FB0FF288304B -:102430002A46494602F070FA059804199DF80400EE -:10244000E4B2401C8DF804009DF804100498814209 -:1024500080F25B810398811C00190D5DC07803999F -:1024600045EA0025069800190A1D165C08444079C3 -:1024700046EA0026B6F5205F0CD100F0CCFF0146FD -:1024800040F29E4300F0AAFB0FF270302A464FF450 -:102490002051CFE742F603094E450ED10020388087 -:1024A000B880F8807D8000F0B6FF014640F2AB4373 -:1024B00000F094FB0FF27030BAE7B6F5245F1CBF52 -:1024C00042F60210864240D1FD800299B8880A88FF -:1024D0000FF2903990420FD14D8000F09CFF40F2F6 -:1024E000B643014600F07AFB0095BB887A883146F6 -:1024F000484602F011FA9FE70A8A904205D1CD8240 -:1025000000F089FF40F2BA43EBE78A8A904205D196 -:102510004D8300F080FF40F2BE43E2E74A8A9042DA -:1025200005D10D8300F077FF40F2C243D9E700F0F8 -:1025300072FF014640F2C44300F050FB0095BB8897 -:102540007A880FF24C303146D3E73E80B6F5285FEB -:10255000BD800CD100F05FFF014640F2CE4300F099 -:102560003DFB0FF26C302A464FF4285162E742F6E9 -:10257000012086420FF284390BD100F04CFF014656 -:102580004FF49A6300F02AFB2A4642F6012148469E -:1025900050E742F6022086420CD100F03CFF014693 -:1025A00040F2D24300F01AFB0FF27C302A4642F68A -:1025B00002213FE742F6032086420AD100F02BFFBA -:1025C000014640F2D44300F009FB2A4642F60321BB -:1025D000DDE742F6042086420AD100F01CFF0146E6 -:1025E00040F2D64300F0FAFA2A4642F60421CEE73A -:1025F00042F60520864209D100F00DFF014640F267 -:10260000D94300F0EBFA0FF2583000E742F61920F8 -:10261000864209D100F0FFFE014640F2DC4300F0A3 -:10262000DDFA0FF28030F2E642F62B20864209D125 -:1026300000F0F1FE014640F2DF4300F0CFFA0FF266 -:102640009430E4E642F60F20864209D100F0E3FE22 -:10265000014640F2E14300F0C1FA0FF2A830D6E69D -:1026600042F62920864209D100F0D5FE014640F20B -:10267000E44300F0B3FA0FF2C430C8E642F6242077 -:10268000864209D100F0C7FE014640F2E64300F061 -:10269000A5FA0FF2F030BAE641F20D20864209D1D8 -:1026A00000F0B9FE014640F2E94300F097FA0FF25C -:1026B0001840ACE64DF6F300864209D100F0ABFEBF -:1026C000014640F2EB4300F089FA0FF240409EE6EB -:1026D0004CF2E96086427FF49DAE00F09CFE01461C -:1026E00040F2ED4300F07AFA0FF260408FE600F01E -:1026F00092FE014640F2F94300F070FA07B0BDE8DF -:10270000F04F0FF2844002F007B907B0BDE8F08F38 -:10271000476174745061727365446573637300003C -:102720004143495F4154545F46494E445F494E46D8 -:102730004F5F524553505F56534556545F434F4485 -:1027400045202D20436F6E6E656374696F6E5F4820 -:10275000616E646C653D307825782C466F726D61D2 -:10276000743D25642C4576656E745F446174615FC9 -:102770004C656E6774683D25640A0D0020696E76AD -:10278000616C696420636861722076616C75652094 -:10279000555549443D30782530345820436861729E -:1027A00056616C756548616E646C65205B253034DC -:1027B000585D210A00000000202043454E5452413C -:1027C0004C5F414444524553535F5245534F4C551F -:1027D00054494F4E5F555549443D30782530345863 -:1027E000204368617256616C756548616E646C6502 -:1027F000205B253034585D210A0000005052494DBD -:102800004152595F534552564943455F55554944D6 -:102810003D3078253034582068616E646C653D30F9 -:1028200078253034580A0D0072657365742043486A -:102830004152414354455249535449435F555549C8 -:10284000443D3078253034582043686172537461B8 -:10285000727448616E646C653D3078253034580A76 -:102860000D000000757569643D30782530345820BE -:1028700068616E646C653D3078253034582D307851 -:10288000253034582D3078253034580A0D0A0D0083 -:1028900020756E6B6F776E5F636861725F646573DE -:1028A0006320555549443D307825303458206861BF -:1028B0006E646C653D3078253034582D3078253085 -:1028C00034582D307825303458200A0D000000008F -:1028D000474150204445564943455F4E414D455F71 -:1028E000555549443D30782530345820666F756E13 -:1028F00064205B253034585D210A00004741502098 -:10290000415050454152414E43455F555549443D24 -:1029100030782530345820666F756E64205B253022 -:1029200034585D210A00000047415020504552496B -:1029300050484552414C5F505249564143595F46B9 -:102940004C41475F555549443D3078253034582037 -:10295000666F756E64205B253034585D210A000077 -:1029600020534552564943455F4348414E474544ED -:102970005F43484152414354455249535449435F90 -:10298000555549443D3078253034582043686172AC -:1029900056616C756548616E646C65205B253034EA -:1029A000585D0A00424154544552595F4C455645C2 -:1029B0004C5F434841525F555549443D307825307E -:1029C000345820666F756E64205B253034585D2165 -:1029D0000A00000043555252454E545F54494D453C -:1029E0005F434841525F555549443D307825303466 -:1029F0005820666F756E64205B253034585D210A5F -:102A0000000000004C4F43414C5F54494D455F4925 -:102A10004E464F524D4154494F4E5F434841525FDD -:102A2000555549443D30782530345820666F756ED1 -:102A300064205B253034585D210A000044657669C6 -:102A40006365496E666F726D6174696F6E5365720E -:102A500076696365204D414E554641435455524574 -:102A6000525F4E414D455F555549443D30782530C4 -:102A7000345820666F756E64205B253034585D21B4 -:102A80000A000000446576696365496E666F726D81 -:102A90006174696F6E53657276696365204D4F444A -:102AA000454C5F4E554D4245525F555549443D306A -:102AB000782530345820666F756E64205B2530347D -:102AC000585D210A0000000020414E43535F4E4FE5 -:102AD00054494649434154494F4E5F534F55524321 -:102AE000455F434841525F555549443D3078253054 -:102AF0003458204368617256616C756548616E6434 -:102B00006C65205B253034585D210A002020414E41 -:102B100043535F434F4E54524F4C5F504F494E54B6 -:102B20005F434841525F555549443D307825303424 -:102B300058204368617256616C756548616E646CBB -:102B400065205B253034585D210A000020414E434A -:102B5000535F444154415F534F555243455F43488F -:102B600041525F555549443D307825303458204313 -:102B700068617256616C756548616E646C65205B56 -:102B8000253034585D210A004143495F4154545F68 -:102B900046494E445F494E464F5F524553505F563B -:102BA000534556545F434F44452C206661696C651C -:102BB000642068616E646C65206E6F7420666F754A -:102BC0006E6420696E20636F6E6E656374696F6EEC -:102BD000207461626C6520210A0D00005A4650463F -:102BE00001F09ABE2DE9FC470446DFF8C8A4DFF8DF -:102BF000C8840FF20019FFF7C1FB014640F20153F0 -:102C0000FFF7B8FB2379628821880FF2001001F0EA -:102C100083FEDFF89C042288418891425AD100F655 -:102C200038056088298888421DD1FFF7A7FB014637 -:102C30004FF4A163FFF79EFB0FF2401001F06CFE12 -:102C40006779A679D4F809000090237AE2793146B1 -:102C50003846FEF77AF837B9F00704D43046FEF765 -:102C600031F9FEF769FA6088A98888423FD1657911 -:102C700095B9FFF783FB014640F22A53FFF77AFB31 -:102C80000FF2341001F048FE2079411F04F10A02CE -:102C900089B20020FDF7CEFC012D17D1FFF76EFBA6 -:102CA000014640F23653FFF765FB0FF2741001F056 -:102CB00033FEA01D04F054F8E11D82B20A442179CC -:102CC000081A811E89B20120FDF7E0FEBDE8F34736 -:102CD000FEF732BAFFF752FB014640F24553FFF7C9 -:102CE00049FBBDE8F6470FF2901001F015BEBDE8B4 -:102CF000F38700004761747450617273654E6F749E -:102D0000696669636174696F6E0000004143495FE1 -:102D1000474154545F4E4F54494649434154494FEB -:102D20004E5F56534556545F434F4445202D204334 -:102D30006F6E6E656374696F6E5F48616E646C651B -:102D40003D307825782C4174747269627574655FC2 -:102D500048616E646C653D3078253034582C417480 -:102D6000747269627574655F56616C75655F4C65F8 -:102D70006E6774683D25640A0D000000312E2049FD -:102D80006E636F6D6D696E67204E6F66696669630D -:102D90006174696F6E20726563656976656420424F -:102DA0004153494320696E666F726D6174696F6E3D -:102DB000203A200A0D000000332E3120506172733A -:102DC000652044657461696C20496E666F6D61743D -:102DD000696F6E206F66204E6F74696669636174F7 -:102DE000696F6E204174747269627574652C20433A -:102DF0006F6D6D616E6449444765744E6F746966AA -:102E000069636174696F6E41747472696275746527 -:102E10007320526573706F6E73653A200A0D00005F -:102E2000332E332050617273652044657461696C80 -:102E300020496E666F6D6174696F6E206F66204108 -:102E40005050204174747269627574652C20436F10 -:102E50006D6D616E6449444765744170704174746E -:102E60007269627574657320526573706F6E7365F5 -:102E70003A200A0D000000004143495F4741545485 -:102E80005F4E4F54494649434154494F4E5F565354 -:102E90004556545F434F44452C206661696C656418 -:102EA0002068616E646C65206E6F7420666F756E4D -:102EB0006420696E20636F6E6E656374696F6E2047 -:102EC0007461626C6520210A0D0000002DE9FC414F -:102ED000054601246878FF2840F0E680B5F8030035 -:102EE000754E0FF2DC17DFF8CC8140F60141401A35 -:102EF00063D0801E74D0401E30D0401E49D0401E8A -:102F00001CD0001F0AD0401F53D0401E00F0838009 -:102F1000401E00F0A880401E30D0B7E000F07BFAE1 -:102F2000014640F262533A4601F044F90FF2AC1008 -:102F300001F0F2FC681DFEF779FAB6E000F06BFADA -:102F4000014640F269533A4601F034F90FF2BC10E1 -:102F500001F0E2FC681DFEF733FEA6E000F05BFA2C -:102F600001464FF4AE633A4601F024F90FF2C41063 -:102F700001F0D2FC681DFFF704FA96E000F04BFA6E -:102F8000014640F277533A4601F014F90FF2C810A7 -:102F900066E000F040FA014640F27E533A4601F006 -:102FA00009F90FF2E81001F0B7FC681DFEF73CF9D3 -:102FB0007BE0681DFFF716FE77E000F02CFA014673 -:102FC0004FF4B2633A4601F0F5F8B5F80B30B5F8B6 -:102FD0000920B5F807100FF2E41001F09DFC64E041 -:102FE00000F019FA014640F29A533A4601F0E2F82D -:102FF000B5F80720B5F805100FF2242001F08CFC7D -:1030000006208DF8040001A8B5F80510ADF80610EB -:1030100001F0F8F949E0E87970B100F0FCF90146F7 -:1030200040F2A7533A4601F0C5F8EA79B5F8051021 -:103030000FF2602001F070FC1D484188B5F80500D2 -:10304000814203D10020FEF7E3F82EE000F0E3F91F -:10305000014640F2AF533A4601F0ACF80FF294202B -:1030600001F05AFC21E000F0D6F9014640F2B653D7 -:103070003A4601F09FF8A87A00902B89EA79B5F8D2 -:1030800005100FF2C42001F047FC0EE000F0C3F978 -:10309000014640F2BB533A4601F08CF8B5F80310F4 -:1030A0000FF2583001F038FC00242046BDE8F681CC -:1030B000B841002054450008404500089C5C0020B1 -:1030C000414E43535F436C69656E745F4576656E30 -:1030D000745F48616E646C65720000002041434972 -:1030E0005F4154545F524541445F42595F47524FDC -:1030F00055505F545950455F524553505F565345A4 -:1031000056545F434F44450A0000000020414349A4 -:103110005F4154545F524541445F42595F54595096 -:10312000455F524553505F56534556545F434F4495 -:10313000450A0000204143495F4154545F46494ECF -:10314000445F494E464F5F524553505F5653455674 -:10315000545F434F44450A00204143495F4741546F -:10316000545F444953435F524541445F4348415291 -:103170005F42595F555549445F524553505F56531E -:103180004556545F434F44450A00000020414349DF -:103190005F4154545F46494E445F42595F54595011 -:1031A000455F56414C55455F524553505F56534518 -:1031B00056545F434F44450A000000004143495FB5 -:1031C000474154545F4154545249425554455F4D10 -:1031D0004F4449464945445F56534556545F434F13 -:1031E000444520417474725F48616E646C653D3083 -:1031F0007825303458204F66667365743D307825E5 -:1032000030345820417474725F446174615F4C655E -:103210006E6774683D307825303458200A0D000000 -:103220004143495F4154545F45584348414E4745E7 -:103230005F4D54555F524553505F56534556545F4A -:10324000434F444520436F6E6E656374696F6E5FD4 -:1032500048616E646C653D30782530345820536584 -:10326000727665725F52585F4D5455203D2025643B -:10327000203D3D3E20414E43535F4D54555F4558E0 -:103280004348414E47455F434F4D504C45544520C0 -:103290000A0000004143495F474154545F50524F78 -:1032A000435F434F4D504C4554455F56534556542C -:1032B0005F434F4445202D20436F6E6E65637469F4 -:1032C0006F6E5F48616E646C653D30782530347890 -:1032D0002C4572726F725F436F64653D30782530A4 -:1032E00032582028307834313A204661696C656460 -:1032F000290A0D004143495F474154545F50524FE2 -:10330000435F434F4D504C4554455F5653455654CB -:103310005F434F44452C206661696C656420686199 -:103320006E646C65206E6F7420666F756E642069C4 -:103330006E20636F6E6E656374696F6E2074616278 -:103340006C6520210A0D00004143495F47415454F8 -:103350005F4552524F525F524553505F5653455648 -:10336000545F434F444520436F6E6E656374696FCD -:103370006E5F48616E646C653D307825303458204E -:103380005265715F4F70636F64653D3078253032F0 -:1033900058204174747269627574655F48616E6427 -:1033A0006C653D307825303458204572726F725FFD -:1033B000436F64653D3078253032582028307830AE -:1033C000353A20496E73756666696369656E742067 -:1033D00061757468656E7469636174696F6E2C30B1 -:1033E0007830413A20417474726962757465206E58 -:1033F0006F7420666F756E64290A0000696E7661CD -:103400006C69642065636F646520307825303458BA -:103410000A0000003870404601F040BD80B5FDF75D -:103420001BFE01464FF4BA63DFF83425FDF7E0FEDA -:10343000DFF8300501F070FA11208DF80000DFF898 -:1034400028154888ADF80200684600F0DBFF01BD92 -:103450002DE9FF47DFF81075DFF81065DFF81095EC -:10346000DFF81085052807F6120547F2305A10D804 -:10347000DFE810F006003E00B000FE007C01E10134 -:10348000042038704FF404627888FA2103F0A3FC1A -:10349000002840F06282FFF7BEFF01464FF4CA6386 -:1034A00000F087FE4FF40462FA21DFF8CC0401F04B -:1034B00033FA05203870788801F078FB00F07DFE43 -:1034C000002C404609D101F0E9FC014640F2566368 -:1034D00000F06FFEDFF8A40430E201F0DFFC0146EB -:1034E00040F25A6300F065FE2146DFF8940432E2B0 -:1034F000082038700021D0208DF800008DF80110D0 -:103500002D208DF8020012218DF803101E208DF859 -:1035100004004B218DF805100F208DF80600A42122 -:103520008DF8071099208DF808004E218DF80910AC -:10353000CE208DF80A00B5218DF80B1031208DF8C2 -:103540000C00F4218DF80D1005208DF80E00792166 -:103550008DF80F106A467888022101F06AFB04009A -:1035600040460BD101F09AFC014640F2696300F03D -:1035700020FEDFF8700E01F0CFF90BE001F08EFCB9 -:10358000014640F26D6300F014FE2146DFF8580E4C -:1035900001F0C2F95046FDF740FEE88BA98B59B9FE -:1035A00000283DD1FFF737FF014640F2736300F07A -:1035B00000FEDFF8380EC1E100283ED0FFF72BFFF8 -:1035C000014640F2776300F0F4FDEA8BA98BDFF847 -:1035D000200EC8E007203870788801F010FB00F05A -:1035E000ECFD002C40460BD101F058FC014640F2A6 -:1035F000846300F0DEFD0FF28C3001F08DF90BE0FA -:1036000001F04CFC01464FF4D16300F0D2FD21469D -:103610000FF2BC3001F080F9E88BA98B61B900286A -:1036200040F09B81FFF7F7FE014640F28D6300F00A -:10363000C0FD0FF2FC3081E1002800F08E81FFF721 -:10364000EAFE014640F2916300F0B3FDEA8BA98BDC -:103650000FF2244001F060F9FFF7DDFE014640F271 -:10366000926300F0A6FD6A8A298A0FF260407AE030 -:103670000920FFF7CFFE014640F29D6300F099FD5F -:10368000A88B019000906B882A8879880FF290406F -:1036900001F042F96A882988788801F0EDFA00F093 -:1036A0008CFD002C404609D101F0F8FB014640F2A8 -:1036B000A66300F07EFD0FF2D84008E001F0EEFBBB -:1036C000014640F2AA6300F074FD0FF2F44001F0ED -:1036D00023F9298C00291CBFE88C00280CD0FFF7A7 -:1036E0009AFE014640F2AF6300F063FDEA8C298C3C -:1036F0000FF2F44001F010F9A98C00291CBF688D6D -:1037000000280CD0FFF787FE014640F2B36300F0BB -:1037100050FD6A8DA98C0FF2445001F0FDF8698CC0 -:1037200000291CBF288D00280CD0FFF774FE01462D -:1037300040F2B76300F03DFD2A8D698C0FF2805096 -:1037400001F0EAF8A98A00291CBFE88A00280CD0F9 -:10375000FFF761FE014640F2BB6300F02AFDEA8AF2 -:10376000A98A0FF2C45001F0D7F8F6E00A20FFF75B -:1037700051FE014640F2C56300F01BFD6A882988AE -:103780000FF2086001F0C8F86A882988788801F08B -:1037900084FA00F012FD002C404609D101F07EFBB6 -:1037A000014640F2CD6300F004FD0FF20C6008E02A -:1037B00001F074FB014640F2D16300F0FAFC0FF215 -:1037C000346001F0A9F8A88D58B1FFF724FE014636 -:1037D00040F2D66300F0EDFCA98D0FF24C6001F0D1 -:1037E0009BF8E88D58B1FFF716FE014640F2DA6308 -:1037F00000F0DFFCE98D0FF2786001F08DF8288E83 -:1038000058B1FFF708FE014640F2DE6300F0D1FC3C -:10381000298E0FF29C6001F07FF8288B0028A4D03D -:10382000FFF7F9FD014640F2E26300F0C2FC298B8C -:103830000FF2BC608FE00120298BADF8000031B39E -:103840000D2038706B467888022201F05FFA00F094 -:10385000B4FC002C40460CD101F020FB014640F2A4 -:10386000F66300F0A6FC298B0FF2C46001F054F857 -:103870000DE001F013FB014640F2FB6300F099FC00 -:10388000298B0FF2F4602346462201F045F8288E7A -:10389000002830D00C213970FFF7BDFD014640F201 -:1038A000047300F086FC2A8E79880FF2387001F0DC -:1038B00033F8298E00F078FC00F07FFC002C4046A5 -:1038C0000BD101F0EBFA014640F20D7300F071FCF0 -:1038D0000FF24C7001F020F80DE001F0DFFA014624 -:1038E00040F2127300F065FC298E0FF274702346CB -:1038F000462201F011F8A88D00282ED00B21397036 -:10390000FFF789FD014640F21B7300F052FCAA8DBF -:1039100079880FF2B87000F0FFFFA98D00F044FC29 -:1039200000F04BFC002C40460BD101F0B7FA0146E9 -:1039300040F2247300F03DFC0FF2D47000F0ECFF75 -:103940000BE001F0ABFA01464FF4E56300F031FC07 -:1039500021460FF6040000F0DFFFBDE8FF870000FE -:1039600024F4000840F40008B84100204045000855 -:1039700068F400085445000874F40008C0F4000816 -:10398000E4F40008474154545F50524F435F4449A8 -:1039900053435F414C4C5F5052494D4152595F5324 -:1039A0004552564943455320414C4C20736572762D -:1039B0006963657320646973636F766572656420FB -:1039C0005375636365737366756C6C79200A0000C8 -:1039D000474154545F50524F435F444953435F4102 -:1039E0004C4C5F5052494D4152595F5345525649D4 -:1039F000434553206163695F676174745F646973F1 -:103A0000635F616C6C5F7072696D6172795F736521 -:103A100072766963657320636D64204E4F4B20732B -:103A20007461747573203D307825303258200A0057 -:103A3000474154545F50524F435F444953435F41A1 -:103A40004C4C5F5052494D4152595F534552564973 -:103A500043455320414E4353205365727669636555 -:103A6000206973204E4F5420666F756E64202121AB -:103A700021200A0D00000000474154545F50524F6E -:103A8000435F444953435F414C4C5F5052494D4161 -:103A900052595F534552564943455320414E435373 -:103AA0002053657276696365205B30782530345821 -:103AB000202D203078253034585D20697320666FC2 -:103AC000756E6420212121200A0D000047415454C5 -:103AD0005F50524F435F444953435F414C4C5F50EA -:103AE00052494D4152595F5345525649434553201F -:103AF000474154542053657276696365205B307882 -:103B000025303458202D203078253034585D2069F8 -:103B10007320666F756E6420212121200A0D00003C -:103B2000414E43535F444953434F5645525F414CC6 -:103B30004C5F434841525320636F6E6E65637469F6 -:103B40006F6E5F68616E646C653D30782530345807 -:103B500020414C4C5365727669636548616E646CB4 -:103B6000655B25303458202D20253034585D2041A8 -:103B70004E43535365727669636548616E646C6544 -:103B80005B25303458202D20253034585D0A000044 -:103B9000414C4C206368617261637465726973742F -:103BA00069637320646973636F766572656420531B -:103BB00075636365737366756C6C79200A0D00001C -:103BC000414C4C20636861726163746572697374FF -:103BD00069637320646973636F76657279204661E7 -:103BE000696C6564200A0D00474154545F50524F80 -:103BF000435F444953435F414C4C5F4348415253F8 -:103C000020414E43534E6F74696669636174696FF6 -:103C10006E536F7572636543686172537461727439 -:103C200048646C653D3078253034582020414E433F -:103C3000534E6F74696669636174696F6E536F7513 -:103C40007263654368617256616C756548646C6542 -:103C50003D307825303458200A0D00004741545437 -:103C60005F50524F435F444953435F414C4C5F4365 -:103C70004841525320414E435344617461536F7520 -:103C800072636543686172537461727448646C65F1 -:103C90003D3078253034582020414E4353446174E0 -:103CA00061536F757263654368617256616C7565C7 -:103CB00048646C653D307825303458200A0D00008A -:103CC000474154545F50524F435F444953435F410F -:103CD0004C4C5F434841525320414E4353436F6E17 -:103CE00074726F6C506F696E744368617253746163 -:103CF000727448646C653D3078253034582020411A -:103D00004E4353436F6E74726F6C506F696E7443A1 -:103D100068617256616C756548646C653D307825E4 -:103D2000303458200A0D0000474154545F50524F20 -:103D3000435F444953435F414C4C5F4348415253B6 -:103D400020536572766963654368616E6765644395 -:103D5000686172537461727448646C653D30782593 -:103D60003034582020536572766963654368616E0C -:103D70006765644368617256616C756548646C651B -:103D80003D307825303458200A0D0000414E435311 -:103D90005F444953434F5645525F414C4C5F434843 -:103DA00041525F4445534353205B25303458202D06 -:103DB00020253034585D0A00416C6C2063686172C4 -:103DC0006163746572697374696320646573637297 -:103DD0006970746F727320646973636F766572655E -:103DE00064205375636365737366756C6C79200A20 -:103DF0000D000000416C6C20636861726163746542 -:103E00007269737469632064657363726970746F37 -:103E1000727320646973636F766572792046616995 -:103E20006C6564200A0D0000474154545F50524FA6 -:103E3000435F444953435F414C4C5F4445534353B4 -:103E400020414E43534E6F74696669636174696FB4 -:103E50006E536F757263654368617244657363483E -:103E6000646C653D307825303458200A0D00000020 -:103E7000474154545F50524F435F444953435F415D -:103E80004C4C5F444553435320414E4353436F6E64 -:103E900074726F6C506F696E7443686172446573BD -:103EA0006348646C653D307825303458200A0D0035 -:103EB000474154545F50524F435F444953435F411D -:103EC0004C4C5F444553435320414E43534461742B -:103ED00061536F75726365436861724465736348CB -:103EE000646C653D307825303458200A0D000000A0 -:103EF000474154545F50524F435F444953435F41DD -:103F00004C4C5F4445534353205365727669636557 -:103F10004368616E676564436861724465736348B2 -:103F2000646C653D307825303458200A0D0000005F -:103F3000536572766963654368616E67656443685B -:103F400061724465736348646C653D307825303434 -:103F500058206E6F74696669636174696F6E20655D -:103F60006E61626C65642053756363657373667517 -:103F70006C6C79200A0D00005365727669636543A5 -:103F800068616E6765644368617244657363486421 -:103F90006C653D307825303458206E6F74696669E1 -:103FA000636174696F6E20656E61626C6564204642 -:103FB00061696C656420424C455F535441545553CC -:103FC0005F4E4F545F414C4C4F5745443D30782530 -:103FD00030327820726573756C743D3078253032DC -:103FE000580A0000414E43535F454E41424C455FE5 -:103FF0004E4F54494649434154494F4E5F44415402 -:10400000415F534F555243455F44455343203078F9 -:104010002530345820307825303458200A000000EC -:10402000414E435344617461536F757263654368D5 -:1040300061724465736348646C65206E6F74696671 -:1040400069636174696F6E20656E61626C6564207E -:104050005375636365737366756C6C79200A0D0024 -:10406000414E435344617461536F75726365436895 -:1040700061724465736348646C653D307825303403 -:1040800058206E6F74696669636174696F6E20652C -:104090006E61626C6564204661696C656420424CA7 -:1040A000455F5354415455535F4E4F545F414C4C00 -:1040B0004F5745443D30782530327820726573750E -:1040C0006C743D3078253032580A0000414E43531D -:1040D0005F454E41424C455F4E4F5449464943412E -:1040E00054494F4E5F4E4F54494649434154494FFE -:1040F0004E5F534F555243455F44455343203078FC -:104100002530345820307825303458200A000000FB -:10411000414E43534E6F74696669636174696F6E93 -:10412000536F757263654368617244657363486475 -:104130006C65206E6F74696669636174696F6E2067 -:10414000656E61626C656420537563636573736645 -:10415000756C6C79200A0D00414E43534E6F7469A3 -:104160006669636174696F6E536F757263654368E6 -:1041700061724465736348646C65206E6F74696630 -:1041800069636174696F6E20656E61626C6564203D -:104190004661696C656420726573756C743D307836 -:1041A000253032580A00000078886B46022200F061 -:1041B000ADBD4A46304600F0AFBB04465046FDF761 -:1041C0002CB82DE9F84FDB4D0FF274380FF2944BF9 -:1041D0000FF28039A0B005F5047405F6080647F221 -:1041E000305A0C274FF6FF7120B1022800F08E8064 -:1041F00049D3F4E00E2028703088884201D080280E -:104200000BDB00F0FCF8014640F23D735A46FEF726 -:10421000B2F831880FF258408AE000F0F0F8014619 -:1042200040F243735A46FEF7A6F830887843215887 -:104230000FF2784000F070FB308847430121E059CD -:1042400001908DF808108DF809108DF80C108DF87C -:1042500010108DF814108DF815108DF816108DF8BB -:1042600017104FF49470ADF80A00ADF80E00ADF8D9 -:10427000120001A984B06846142200F071FB0FBC43 -:10428000FCF728F9ABE00F242C7000F0B8F80146D9 -:1042900040F25C735A46FEF76EF805F1860495F815 -:1042A00085100FF27040224600F036FB95F88570BD -:1042B0006846802100F060FE01208DF8000000219A -:1042C0006B4605E014F801C003F800C01046491C15 -:1042D000421CB942C0B2F5DB00211954D2B2718E32 -:1042E000688800F0F9FC04465046FCF796FF002C65 -:1042F00075D000F084F801464FF4F2730FF250329B -:10430000FEF739F821460FF2E82011E0102028705E -:104310003088884201D080280DDB00F070F801461B -:1043200040F267735A46FEF726F831880FF22840AC -:1043300000F0F2FA53E000F062F8014640F26D73CB -:104340005A46FEF718F8318807FB01F0002322587F -:104350000FF2404000F0E0FA31880FF2EC2279438E -:104360006058D2E90034CDE900348DF80100020A2A -:104370008DF8022002218DF80010020C000E8DF83D -:1043800004008DF8032000208DF805006B46718E27 -:104390006888062200F0A0FC04465046FCF73DFF6A -:1043A00054B100F02CF801464FF4E4730FF274227C -:1043B000FDF7E1FF00F01EF800F021F8014640F2A1 -:1043C00074735A46FDF7D7FF31880FF21C4000F096 -:1043D000A3FA30884743E819002180F8081221B079 -:1043E000BDE8F08F18F5000864F50008C0F5000876 -:1043F00020F6000821460FF2F81000F08DBA48466A -:1044000000F04CBD70B501460FF234150A780FF27A -:1044100014460FF24010474C012A0CD0022A1AD041 -:10442000032A25D0052A34D0062A3FD0082A51D0A5 -:10443000112A5DD070BD498861800821217000F08B -:104440002DFD014640F2867300F076F80FF2EC3055 -:1044500000F062FA6AE000F021FD014640F28E733E -:1044600000F06AF80FF2084000F056FA02200BE064 -:1044700000F014FD014640F2967300F05DF80FF273 -:10448000084000F049FA03202070BDE87040FCF7B6 -:10449000A3BD00F003FD014640F29E7300F04CF80E -:1044A0000FF2004000F038FA05201FE000F0F6FCA3 -:1044B000014640F2A67300F03FF80FF2FC3000F026 -:1044C0002BFA2078052804BF0020FCF7A1FE062067 -:1044D000207070BD00F0E2FC01464FF4F66300F07E -:1044E0002BF80FF2F43000F017FA082020701DE0CE -:1044F0001121217000F0D2FC014640F2B97300F0A6 -:104500001BF80FF2F43000F007FA0021C8B20C22B9 -:104510005043221802F50272107820B9491CC8B223 -:104520008028F3DB70BD9078FCF7CCFCBDE87040D0 -:10453000FCF702BEB84100203246284600F0ECB934 -:104540000D0A205B25735D5B25735D5B25645D2033 -:1045500000000000433A5C424C455F444F52595FB3 -:104560005061636B616765735C53544D33324375BF -:1045700062655F46575F57425F56312E31312E30AC -:104580005243345C50726F6A656374735C502D4E95 -:1045900055434C454F2D574235352E4E75636C654E -:1045A0006F5C4170706C69636174696F6E735C42BB -:1045B0004C455C424C455F4865617274526174655C -:1045C0004672656552544F535F414E43535C53549A -:1045D0004D33325F5750414E5C4170705C616E6389 -:1045E000735F636C69656E745F6170702E63000049 -:1045F000206163695F676174745F77726974655F76 -:10460000636861725F76616C756520636D64204ECE -:104610004F4B20737461747573203D3078253032B0 -:1046200058200A00414E43535F436D645F506572EA -:10463000666F726D4E6F74696669636174696F6EDF -:10464000416374696F6E000002000000000000000A -:10465000414E43535F436D645F47657441707041E1 -:1046600074747200416E637350726F6352657100AF -:10467000414E43535F4745545F4E4F54494649436B -:104680004154494F4E5F415454524942555445207C -:10469000494E56414C49445F4E4F544946595F4537 -:1046A0004E545259202564200A0D0000414E4353B8 -:1046B0005F4745545F4E4F54494649434154494F23 -:1046C0004E5F41545452494255544520696E7465B9 -:1046D00072616374207769746820694F53204E6F4C -:1046E00074696669636174696F6E49442030782526 -:1046F00030386C782C207265747269657665206D2F -:104700006F726520696E666F726D6174696F6E0A93 -:104710000D000000414E43535F4745545F415050E8 -:104720005F41545452494255544520417070496488 -:10473000656E7469666965724C656E6774683D255F -:1047400064204170704964656E7469666965723A87 -:104750002573200A0D000000414E43535F5045521F -:10476000464F524D5F4E4F54494649434154494F7D -:104770004E5F414354494F4E20494E56414C4944A7 -:104780005F4E4F544946595F454E54525920256457 -:10479000200A0D00414E43535F504552464F524D43 -:1047A0005F4E4F54494649434154494F4E5F414340 -:1047B00054494F4E206E6F74696679456E747279F4 -:1047C0003D2564204E6F74696669636174696F6E1C -:1047D00049442030782530386C782061637449442E -:1047E0003D2564200A0D0000414E43535F50455261 -:1047F000464F524D5F4E4F54494649434154494FED -:104800004E5F414354494F4E206E6F74696679453F -:104810006E7472793D25642052656D6F7665640A09 -:104820000D000000414E43535F4170705F4E6F7446 -:10483000696669636174696F6E000000414E43539D -:104840005F434F4E4E4543544544203D3D3E20413D -:104850004E43535F444953434F5645525F414E4385 -:10486000535F53455256494345200A0D000000004E -:10487000414E43535F444953434F4E4E4543544981 -:104880004E47200A0D000000414E43535F444953F8 -:10489000434F4E4E5F434F4D504C455445200A0DFB -:1048A00000000000414E43535F4D54555F55504446 -:1048B000415445200A0D0000414E43535F4D54556D -:1048C0005F45584348414E47455F434F4D504C4527 -:1048D0005445200A0D000000414E43535F444953A4 -:1048E000434F5645525F414E43535F5345525649DD -:1048F0004345200A0D000000203D3D3E20414E432F -:10490000535F434845434B5F4E4F544946494341EB -:1049100054494F4E200A0D000EB4C0B5024603A8FC -:1049200000210190009101AB0121044878440C3032 -:1049300002F0E8FA06BC5DF810FB00BF6DB600009F -:1049400062B38B0708D0521E11F8013B00F8013BFF -:1049500000F024808B07F6D1830740F0208000BF51 -:10496000103A07D330B4B1E83810103AA0E8381044 -:10497000F9D230BC530724BFB1E80810A0E80810F2 -:1049800044BF51F8043B40F8043BD20724BF31F840 -:10499000022B20F8022B44BF0B7803707047121FC4 -:1049A00017D35B0009D151F8043B20F8023B1B0CE4 -:1049B000121F20F8023BF6D20BE051F8043B00F83E -:1049C000013B1B0A20F8023B1B0C121F00F8013BA5 -:1049D000F3D238BF121D521E24BF11F8013B00F85C -:1049E000013BF8D8704700B587B000208DF8000073 -:1049F00000F087F940F20110ADF806003F220120D7 -:104A0000069000F0F6F900284CBFFF209DF800004A -:104A100007B000BD2DE9F84107460128C7B0884618 -:104A200015461E4608BF022003D002280CBF1020E6 -:104A300000200DF11D010C1800F036F8012F8DF843 -:104A40001C7002D0022F18D019E002273A464146C6 -:104A50000DF11D0000F0D5F92570667000F051F9D8 -:104A60003F204FF4817100F016F8FF1C049700F00E -:104A7000C2F9002805D5FF2009E01027E6E7472006 -:104A800005E09DF8000010B94E9800F067F8FFE7C8 -:104A900048B0BDE8F081ADF80400ADF8061007A8F5 -:104AA000032103900691704703220021684600F01D -:104AB000AEB92DE9F64F0C460546012CC7B09B4612 -:104AC00008BF022003D0022C0CBF102000200DF1E3 -:104AD0001F010E18FFF7E8FF012CADF81C508DF8F0 -:104AE0001E4002D0022C2CD02DE00227569C559D52 -:104AF000DDF85091DDF84CA1DDF8488148993A463F -:104B000000F0B6F8A6F800B086F8028086F803A098 -:104B100086F804907571B47100F0F3F83F20ADF899 -:104B200004004FF4827107A8ADF80610039003212A -:104B30000A370497069100F05EF9002805D5FF209A -:104B400009E01027D2E7472005E09DF8000010B9E2 -:104B5000579800F003F849B0BDE8F08FBDF8011098 -:104B600001800020704730B5C7B01C464A9B00F05A -:104B700023F900258DF800508DF821402246194672 -:104B80000DF1220000F03DF900F0BBF83F204FF49A -:104B9000837100F01CF9A41D049400F02CF9002886 -:104BA0004CBFFF209DF8000047B030BD00B5C7B036 -:104BB00000F039F800F017F80F21029140F20B10C5 -:104BC000022100F00EF900284CBFFF209DF80000E4 -:104BD00047B000BD0023ADF81C008DF8003007A8D9 -:104BE000418082800021182201A800F010B9002223 -:104BF0008DF80020ADF81C008DF81E10704700B530 -:104C0000C7B000F010F8FFF7EEFF0F2102914FF44C -:104C10008970022100F0E5F800284CBFFF209DF8C4 -:104C2000000047B000BD0021ADF81C008DF8001059 -:104C3000704718B5C7B0134600228DF8002002292E -:104C4000FFF7D8FF0CBF102402242246194600F0BB -:104C50000FF800F056F840F2131100F02FF800F0B2 -:104C6000CAF800284CBFFF209DF8000048B010BDD6 -:104C70000DF11F0000F0C5B800B5C7B0FFF7AAFFDF -:104C80000F21029140F2151000F0AAF800284CBF45 -:104C9000FF209DF8000047B000BD00B5C7B0FFF78A -:104CA00099FF0F21029140F2171000F099F80028A7 -:104CB0004CBFFF209DF8000047B000BDADF80610C6 -:104CC0003F2007A9ADF8040003910F2001210290B5 -:104CD0000691E41C0494704718B5C7B000F02BF897 -:104CE00000F041F800F00DF84FF48E7100F02DF84F -:104CF00000F081F800284CBFFF209DF8000048B06C -:104D000010BD1822002101A800F081B818B5C7B065 -:104D100000F011F800F027F8FFF7F3FF40F221113F -:104D200000F013F800F067F800284CBFFF209DF852 -:104D3000000048B010BD1446ADF81C00002207A8C2 -:104D40008DF80020418004717047ADF806103F20B7 -:104D500007A9ADF8040003910F20012102900691EC -:104D6000641D04947047224619460DF1210000F09D -:104D700048B878B5C7B04C9C4D9D00F01DF8002692 -:104D80008DF821308DF800608DF8224022462946AA -:104D900000F019F8FFF7B5FF3F204FF4937100F0D2 -:104DA00016F8E41D049400F026F800284CBFFF20FC -:104DB0009DF8000048B070BDADF81C00ADF81E10A5 -:104DC0008DF8202070470DF1230000F01AB8ADF8DF -:104DD0000400ADF8061007A8012103900691704762 -:104DE0000621ADF80600049107A801213F22039097 -:104DF0000691ADF80420CDF814D0002101A802F0EE -:104E0000E6BF10B50446FFF79BFD204610BD10B568 -:104E1000044610460A460146204603F069F820463B -:104E200010BDF0B40246106895681318506803EB83 -:104E30005004C00721D54D441FE0F0BC02F10C0026 -:104E4000704713F8017B05F8017B491EF9D1A0B129 -:104E5000B60813F8011B06F00306032E08BF13F86B -:104E6000016B01EB06214942801C294405D011F851 -:104E7000016B05F8016B401EF9D1A342DDD013F898 -:104E8000016B16F0030104BF13F8011BC91C3009A4 -:104E90000F28DAD113F8010B0F30D6E738B55C21B3 -:104EA000044603F058F8254608B15C2105E02F219F -:104EB000204603F050F820B12F21204603F04BF894 -:104EC000451C284632BD38B5EFF3108472B6284D24 -:104ED0006946281D03F064F96946281D03F0BDF9F1 -:104EE00038B184F31088BDF80010224A03F09CFA10 -:104EF00031BD0120287084F3108831BD80B503F0E6 -:104F000091FA022100910023194800F124014FF485 -:104F10008052001D03F02BF801BD00BFF8B5144608 -:104F20000026EFF3108510F1010F1ED001281CBFE1 -:104F300002284FF0FF3618D1BCB1264672B60C4F8E -:104F4000012392B2381D03F026F800281CBF3978DF -:104F5000002908D000223A7085F31088A1B2054AD2 -:104F600003F062FA01E085F310883046F2BD0000DC -:104F70001C000020C74E0008002203F0F5BA000014 -:104F800080B5DFF80404016803F03FFE012803D078 -:104F9000BDE8014004F0DCB801BDEFF3058000B1CD -:104FA0006DE0DFF8E813086810B901220A60704765 -:104FB0004FF0FF30704780B5EFF3058000B10FE090 -:104FC000DFF8C8030168012909D1DFF8C4330022E2 -:104FD0001A700221016003F0E7FB002002BD02E02D -:104FE0006FF0050002BD4FF0FF3002BDF8B584B090 -:104FF00000230393EFF30583002B3DD103003BD047 -:105000008025182600245AB3136803B11C469369FF -:105010001BB11E0004D0392E02D21379DF0701D54F -:1050200000202AE0536903B19D08D2F80CC09768AC -:1050300087B1BCF15C0F1FD31269002A18BF002B87 -:105040001AD001920B46029700962A46214603F099 -:10505000A5FA10E0BCF1000F04BF1269002A0BD1C1 -:1050600003AB019300960B46AAB2214603F0C5FAA2 -:10507000012801D000200390039805B0F0BD6FF027 -:10508000050070473EB5040001D0002903D56FF03C -:105090000300019026E04FF0FF320192EFF305800C -:1050A000A8B10020029002AD009500230122204605 -:1050B00003F010FF0020009001AB002200212046E9 -:1050C00003F008FF029868B100F054F90AE00023E9 -:1050D0000122204603F0A0FE01AB00220021204661 -:1050E00003F09AFE01983EBD2DE9FE4F8346EFF393 -:1050F000058018B16FF00500BDE8FE8FBBF1000F11 -:1051000048BF6FF00300F7D4144601940E46B00771 -:105110004CBF4FF00009D94603F0F2FB0296002580 -:10512000019F6FF001086FF0020A064606E003F0E7 -:10513000E7FB801B87422CBF3F1A00273B466A468D -:105140004946002003F028FE012810D1009802995A -:105150000BEA05050543CA0705EA0B0002D55845C9 -:1051600001D10AE048B9002CE1D15046C4E7002C37 -:105170000CBF554645460028E0D12846BCE770B52F -:10518000054600F00FF925D105B1686800F001046B -:1051900000071FD455B1E868A96831B1502819D368 -:1051A0008CB1042004F0D9F806E098B9002C14BFA3 -:1051B0000420012004F0C6F806000BD0002D14BF17 -:1051C0002968002101E00120ECE704F068FC0CB143 -:1051D00046F00106304670BDF8B5024650080C4650 -:1051E00040000025EFF3058111B16FF0050515E0D2 -:1051F00010B96FF0030511E0D1076FF002066FF0F0 -:105200000107214602D504F0CEF801E004F0C1FA0E -:10521000012803D0002C14BF3D4635462846F2BD78 -:1052200038B50146480840000024EFF3058212B16A -:105230006FF0050411E010B96FF003040DE0C90729 -:105240006FF0020502D504F095F803E00023002179 -:1052500004F0FCF8012818BF2C46204632BD7CB56E -:105260000E4614460025EFF3058100293CD10028A5 -:105270003AD0B04238D344B1E268A16819B1502A9B -:1052800032D3012101E0002A2ED1012819D10129B0 -:1052900008D1032000900022A3680021012003F020 -:1052A000EEFF02E0032204F019F805001CD0A6B1BD -:1052B00000F071F8012810D0284604F05AFB0025B0 -:1052C00012E0012904D1A268314604F08EF802E010 -:1052D000314604F0A4F8050006D0002C14BF216864 -:1052E0000021284604F0DBFB284676BD7CB50C4641 -:1052F000002528B16FF00206EFF3058179B114B1F2 -:105300006FF0030515E000956A46002104F0F0FAFD -:1053100001280DD1009860B100F02CF809E0214679 -:1053200004F037FA012804D014B16FF0010500E051 -:105330003546284676BD38B5002410B96FF0030411 -:1053400016E06FF00205EFF3058151B10094694654 -:1053500004F05AF901280AD1009848B100F00AF87F -:1053600006E00023002204F071F8012800D02C464A -:10537000204632BDDFF828204FF080511160BFF386 -:105380004F8FBFF36F8F704710E000E0E45C0020A8 -:105390001FED00E0606800230022002104F056B8F1 -:1053A00004ED00E00026EFF30580002870470000C0 -:1053B000034B036003F15C000860802010607047BD -:1053C000B852002070B58EB002A80FF61441DFF875 -:1053D000C04B3022FFF7C4FA0020FFF7D0FE206058 -:1053E00000F05CF8606000F059F8A0600FF68531BD -:1053F000DFF8A00B0090019169460FF6613002F0D2 -:1054000093FC0121022004F09AFB0FF604420FF6F0 -:10541000F5000021FFF7EAFD206102A804F0ACFBD3 -:1054200008B1C046C04600F0D0FA01F01FFCDFF81A -:10543000686B0FF60042002086F8900006F1260502 -:105440004FF6FF70288000210FF6A900FFF7CEFD70 -:10545000E06004F0A1FB04F0C8FBFBF773FE0FF65D -:105460008D03002206F19F01002004F019FE0220A6 -:10547000E87080210120A8700D2028710220A870FA -:10548000182068710320A870DFF8100B0180A0219C -:105490004180012000F077FB0EB070BD002200219A -:1054A0000120FFF7DCBE2DE9F047044688B06078A4 -:1054B000DFF8E46ADFF8E89ADFF8E8AADFF8E88ABC -:1054C000052806F1900505D03E2852D0FF2800F0AF -:1054D000208141E2A088F18C884246D10020F084EE -:1054E0002870A07950B900F020FD014640F2D91390 -:1054F00000F036FAA179DFF8B40A28E016280AD1BC -:1055000000F013FD014640F2DB1300F029FAA17907 -:10551000DFF89C0A1BE03D2840460ED1FFF7BEFC99 -:10552000014640F2DD1300F01BFAA179DFF8840A8E -:10553000FFF7F2F900F02AFC0BE0FFF7AFFC0146A1 -:105540004FF4F07300F00CFAA1790FF60C30FFF76E -:10555000E3F903208DF81C0007A8A188ADF81E1000 -:10556000FEF750FF002000F0E3FC012000F00BFBF1 -:10557000F2E1E078012800F08780032802D00C28AF -:1055800022D0E9E100F0D1FC01464FF4FE7300F0B7 -:10559000E7F90FF60C30FFF7BFF900F0C6FC014643 -:1055A00040F2012300F0DCF9B4F80B000190B4F8EC -:1055B00009000090B4F80730B4F8052021790FF6FF -:1055C0000C30FFF7A9F9C7E100F0AFFC014640F24B -:1055D000062300F0C5F90FF69030FFF79DF920790A -:1055E0000028404609D1FFF759FC014640F20A2342 -:1055F00000F0B6F90FF68C3008E0FFF74FFC0146DB -:1056000040F20E2300F0ACF90FF6A030FFF784F95A -:10561000F08C06AA0DF1190101F010FC002840469B -:1056200028D1FFF73BFC01464FF4057300F098F9D1 -:105630000FF6A0300FF6B034FFF76EF99DF81900A1 -:10564000022804BF9DF81810022904D100F06DFC57 -:105650004FF4067303E000F068FC4FF40773014653 -:1056600000F07EF99DF818209DF819102046FFF7EC -:1056700053F971E1FFF712FC014640F2212300F0DB -:105680006FF90FF6803065E1E87B04F02FFD287894 -:1056900004280CBF062005202870B4F80500F0840B -:1056A00000F043FC014640F2472300F059F9607ACC -:1056B0000590A07A0490E07A0390207B0290607BB2 -:1056C0000190A07B0090237AE279B4F805100FF6E0 -:1056D0005030FFF721F9B4F805006880207A68712E -:1056E000A07BE872607BA872207B6872E07A2872E7 -:1056F000A07AE871607AA87100F010FB01208DF8A3 -:105700001C0007A8B4F80510ADF81E10FEF77AFECD -:1057100022E1B4F803004FF48061401A19D0401E12 -:1057200000F08E80401E1ED0401E2BD0401E33D075 -:10573000401E3BD0801E00F00481401E43D0401E1E -:1057400055D0401E49D040F60601401A00F0EF80C7 -:1057500002E100F0EAFB014640F26F2300F000F99D -:105760000FF64830F6E000F0E0FB014640F275230A -:1057700000F0F6F8B4F805100FF66030FFF7CCF83B -:1057800002205AE000F0D1FB014640F27B2300F0FA -:10579000E7F80FF6A430DDE000F0C7FB01464FF458 -:1057A000207300F0DDF80FF6C030D3E000F0BDFB51 -:1057B000014640F2872300F0D3F80FF61440FFF7BC -:1057C000ABF8042039E000F0B0FB014640F28F2333 -:1057D00000F0C6F80FF63440BCE000F0A6FB01462E -:1057E00040F2932300F0BCF80FF65040B2E000F016 -:1057F0009CFB01464FF4267300F0B2F8D4F8071072 -:105800000FF66840FFF788F800F08FFB014640F282 -:10581000992300F0A5F8D4F807100FF66840FFF7B9 -:105820007BF800F082FB014640F29A2300F098F8E2 -:105830000FF66440FFF770F8032000F0D3FA8BE016 -:1058400000F073FB014640F2A32300F089F8237AAD -:10585000E279B4F805100FF6A040FFF75DF8E079A3 -:1058600001280BD100F061FB014640F2A52300F0B6 -:1058700077F8227AE1790FF6D8400CE002280FD1B0 -:1058800000F053FB01464FF42A7300F069F8227AC6 -:10589000E1790FF66050FFF73FF800F077FA3FE04C -:1058A00000283DD12C796E7BAF7B00F037FA00F0F9 -:1058B0003CFB014640F2B22300F052F8A87B029074 -:1058C00001973346687B2A7900902146DFF8E80685 -:1058D000FFF722F824BB00F028FB014640F2B62374 -:1058E00000F03EF8DFF8D406DFF8D466FFF714F8CE -:1058F0000A240FF2842931460846411E0028FBD1B4 -:105900004846FFF709F8641EF5D16888132104F0B2 -:1059100002FE28B902208DF81C0007A8FEF772FDD0 -:10592000287B012818D1002000F002FB14E000F0D1 -:10593000FCFA014640F2D22300F012F80FF6545060 -:1059400008E000F0F2FA014640F2D92300F008F82E -:105950000FF66850FEF7E0FF012008B0BDE8F087C1 -:1059600052464846FEF7D8BF80B500F00BFA014614 -:105970004FF43D730FF6705200F000FA0FF68450AA -:10598000FEF7CAFFDFF81006B0F89200BDE8044049 -:1059900018E0FDF743BD10B500F0F4F901464FF4EF -:1059A00040730FF6805200F0E9F9DFF81806FEF7B1 -:1059B000B3FF00F0DCF904F05CFE04F0BEFD2088CB -:1059C000BDE81040132104F0A6BD78B50FF6705065 -:1059D000DFF8F4550088DFF8F46589B0ADF81A00F7 -:1059E00001F0D9F9286810F1010F0ED06968307400 -:1059F000090A000A707406F110046868B074F17442 -:105A0000080A090C3075717506E0002004F050FE9C -:105A1000040008BF0FF62C5422460621002004F093 -:105A200059FE60793072102120797072E078B0727E -:105A3000A078F0726078307320780FF6105470738D -:105A40002246182004F046FE0FF6105600F096F895 -:105A50004EF66E50089007AA28680FF6105507906A -:105A600006212E2004F036FE22461021182004F0D4 -:105A700031FE00F083F81821012004F052FEFEF7F9 -:105A8000B2FF0DF1160006A90190009105AB0722A7 -:105A90000021012004F089FC0FF6E840BDF8181041 -:105AA000DFF8FC44DFF8006500900523BDF8140022 -:105AB0000022FFF758F868B13046FFF7EFF90146CA -:105AC00040F286332A462046FEF726FF0FF6BC40FA -:105AD000FEF722FF0DF11A0000900223BDF8161008 -:105AE000BDF814000022FFF73EF868B13046FFF71A -:105AF000D5F901464FF464732A462046FEF70CFFA1 -:105B00000FF6B840FEF708FF02220221002001F044 -:105B1000C8F9DFF884440320207004F0DDFB002086 -:105B20006070E070082060751020A075002020755E -:105B3000DFF89C04A0610120A0700020C1B22144C4 -:105B40000871401CC1B21029F8DB0020049000232A -:105B5000A069617803900122207D0290A07D0190D0 -:105B6000607D0090A07804F0D0FBA07808B104F02C -:105B7000B7FC0AB070BD00002E0A0D00324610219D -:105B8000082004F0A7BD2DE9F84F04462546012D55 -:105B900088B004D1DFF804040688408803E04FF49D -:105BA000C8664FF47A60DFF8F083ADF81C0008F1A6 -:105BB0009007DFF8F493F87BDFF8E4A30FF62C4BA3 -:105BC00004F094FA4846FFF769F9014640F2D633EB -:105BD00000F088F839780FF62040FEF79DFE022D80 -:105BE00022D13878012818BF02281DD104F019FBF2 -:105BF0000090002848460BD1FFF750F901464FF4BA -:105C0000787300F06FF80FF60C40FEF785FE0BE09E -:105C1000FFF744F901464FF4797300F063F80099F7 -:105C20000FF61440FEF778FE3C70002006900590B9 -:105C300008F129010491062298F828000FF6204166 -:105C4000019203900291002300933146BDF81C207D -:105C5000002004F0F8FADFF874130E2004F0EBFBD8 -:105C6000040022D1012D484611D1FFF717F9014652 -:105C700040F2FF3300F036F80FF6EC30FEF74CFE42 -:105C8000F87BD44909B0BDE8F04F04F07EBAFFF7C5 -:105C900005F9014640F2054300F024F809B0BDE8DB -:105CA000F04F0FF6EC30FEF737BE012D48460AD113 -:105CB000FFF7F4F8014640F20C4300F013F82146D8 -:105CC0000FF6F83009E0FFF7E9F801464FF4826378 -:105CD00000F008F821460FF6144009B0BDE8F04F77 -:105CE000FEF71ABE5A465046FEF716BEA848C068D0 -:105CF00027E1000080B500F00BF80220FFF743FF1A -:105D0000F9E7000080B500F003F802F02CF8FAE79C -:105D10004FF0FF3200210120FFF7E6B91CB500F07B -:105D200026F804F070FC401E8041C00FA0706A4647 -:105D300020880DF1010104F0A1FB9DF80110E17232 -:105D40009DF80010217388B900F01CF8014640F25C -:105D50009C430FF6D03200F011F89DF800309DF80A -:105D60000120A1780FF6D830FEF7D6FD13BD8A4882 -:105D700000F1920400F19601E07870470FF644605C -:105D8000FEF7CABD0FF65060FFF788B880B5FFF781 -:105D9000F9FF014640F2A4430FF6DC32FFF7EEFFB5 -:105DA0000FF6F030FEF7B8FD7B4800F1960190F851 -:105DB000950004F05EFCBDE8014004F0BEBB80B578 -:105DC000FFF7ACFF8449087830B1012801BF487A59 -:105DD0000128897A012903D1BDE80240012001E0B0 -:105DE00001BD00002DE9F84304287C4F0FF6D4567E -:105DF0000FF6E0390FF6E05847F2305500F28F8089 -:105E0000DFE800F06003305241000120B8723888AA -:105E100004F0FBFA04000BD000F087F8014640F2D2 -:105E2000C44300F07EF821460FF6B430FEF774FD4F -:105E300000F07BF8014640F2CB4300F072F80FF619 -:105E4000EC30FEF769FD284600F076F80020B872C5 -:105E500000F06BF8014640F2CE4300F062F80FF616 -:105E6000004058E000F061F8014640F2D44300F0F1 -:105E700058F80FF62040FEF74FFD38885449BDE82A -:105E8000F44304F075BA00F050F8014640F2DB43E9 -:105E900000F047F839880FF61C40FEF73DFD3888C2 -:105EA000BDE8F24304F05BBB3888012104F0C7FB76 -:105EB00000F03BF8014640F2E44300F032F80FF600 -:105EC0002C4028E000F031F8014640F2EA4300F0AF -:105ED00028F80FF67C40FEF71FFD3888132104F0E8 -:105EE0001AFB04000BD000F020F8014640F2EE430C -:105EF00000F017F821460FF67040FEF70DFD28461A -:105F000000F01AF800F011F8014640F2F24300F0F8 -:105F100008F80FF67840BDE8F243FEF7FDBCBDE897 -:105F2000F1834A463046FEF7F7BC4046FEF7B6BF5F -:105F300017488068FFF7FFB9154880680AE01448E1 -:105F400000690121FFF79EB811484068FFF7F3B9D7 -:105F50000F4840684FF0FF31FFF7C8B910B504464D -:105F6000616801F1080000F099FE00B10120207085 -:105F700010BD0000064A126810B1012805D0704714 -:105F80004FF0FF311046FFF727B91046FFF748B929 -:105F9000305C0020A008032040560020FC5C00205C -:105FA000C46B0008BCF10008D86B0008D4F10008ED -:105FB00020F200088CF20008FCF200086CF30008E4 -:105FC00040420F00C0F300088075FF1F040000204E -:105FD00007B2010046E00100D4560020D25600204E -:105FE00000000000000000000000000000000000B1 -:105FF0000000000044000800400502011C3AFA00BD -:10600000F4010000FFFF0000480101000020000033 -:10601000A4F10008000000000000000000000000E3 -:10602000000000000006000000000000000000006A -:106030000000000090F100080000000000000000D7 -:10604000000000000000000000030000000000004D -:1060500000000000000000000D0A0D2A2A2044491B -:1060600053434F4E4E454354494F4E204556454E9F -:1060700054205749544820434C49454E54206469A4 -:1060800073636F6E6E656374696F6E2052656173C2 -:106090006F6E3D307825303258200A0D0000000028 -:1060A0000D0A0D2A2A20434F4E4E454354494F4E68 -:1060B00020555044415445204556454E542057499B -:1060C000544820434C49454E54200A004843495FF8 -:1060D0004C455F434F4E4E454354494F4E5F5550DC -:1060E000444154455F434F4D504C4554455F5355D3 -:1060F000424556545F434F44452053746174757351 -:106100003D30782530325820436F6E6E6563746978 -:106110006F6E5F48616E646C653D30782530345831 -:1061200020436F6E6E5F496E74657276616C3D30B0 -:10613000782530345820436F6E6E5F4C6174656E05 -:1061400063793D3078253034582053757065727608 -:106150006973696F6E5F54696D656F75743D3078F2 -:1061600025303458200A0D004556545F555044419F -:1061700054455F5048595F434F4D504C455445205E -:106180000A0000004556545F5550444154455F5045 -:1061900048595F434F4D504C4554452C2073746112 -:1061A000747573206F6B200A000000004556545F21 -:1061B0005550444154455F5048595F434F4D504CF2 -:1061C0004554452C20737461747573206E6F6B2079 -:1061D0000A000000526561645F504859207375637E -:1061E00063657373200A0000504859205061726142 -:1061F0006D202054583D2025642C2052583D2025E8 -:1062000064200A005265616420636F6E66206E6FC1 -:1062100074207375636365657373200A0000000062 -:106220004843495F4C455F434F4E4E454354494FA9 -:106230004E5F434F4D504C4554455F535542455674 -:10624000545F434F444520436F6E6E656374696FBE -:106250006E5F48616E646C653D307825303458203F -:10626000526F6C653D256420506565725F416464C2 -:10627000726573735F547970653D25642050656560 -:10628000725F416464726573733A25303258202519 -:1062900030325820253032582025303258202530D1 -:1062A00032582025303258200A0D00000D0A0D2AE0 -:1062B0002A204143495F4741505F4C494D4954456D -:1062C000445F444953434F56455241424C455F5603 -:1062D000534556545F434F4445200A004143495FAC -:1062E0004741505F504153535F4B45595F524551B1 -:1062F0005F56534556545F434F4445203D3D3E2035 -:106300004741505F50524F435F504153535F4B459D -:10631000595F524553504F4E534520436F6E6E6543 -:106320006374696F6E5F48616E646C653D3078259B -:10633000303458200A0D00000D0A0D2A2A2041434E -:10634000495F4741505F415554484F52495A415463 -:10635000494F4E5F5245515F56534556545F434F28 -:106360004445200A000000004143495F4741505F17 -:10637000534C4156455F53454355524954595F4923 -:106380004E495449415445445F56534556545F4322 -:106390004F444520736C617665207365637572693F -:1063A00074792072657175657374206973207375D3 -:1063B000636365737366756C6C792073656E7420A6 -:1063C000746F20746865206D6173746572200A00B3 -:1063D0004143495F4741505F424F4E445F4C4F53EA -:1063E000545F56534556545F434F4445203D3D3E10 -:1063F000204741505F50524F435F414C4C4F575FD5 -:106400005245424F4E44200A0D0000000D0A0D2A4D -:106410002A204143495F4741505F414444525F4E07 -:106420004F545F5245534F4C5645445F5653455663 -:10643000545F434F4445200A000000000D0A0D2A16 -:106440002A204143495F4741505F4B4559505245CF -:1064500053535F4E4F54494649434154494F4E5F51 -:1064600056534556545F434F44450A00206E756DA0 -:10647000657269635F76616C7565203D20256C648B -:106480000A000000204865785F76616C7565203DE4 -:1064900020256C780A0000004143495F4741505F66 -:1064A0004E554D455249435F434F4D50415249531C -:1064B0004F4E5F56414C55455F56534556545F43CA -:1064C0004F4445203D3D3E204741505F50524F4391 -:1064D0005F4E554D455249435F434F4D50415249E0 -:1064E000534F4E5F56414C55455F434F4E464952C0 -:1064F0004D200A0D000000004143495F4741505FB5 -:1065000050414952494E475F434F4D504C455445C9 -:106510005F56534556545F434F44452C20436F6E9E -:106520006E656374696F6E5F48616E646C653D3063 -:106530007825303458205374617475733D25642078 -:10654000526561736F6E3D307825303278200A00D5 -:10655000202A2A2050616972696E672054696D652E -:106560006F7574205374617475733D256420526592 -:1065700061736F6E3D307825303278202C200A0D03 -:106580002021212120506C656173652069676E6F41 -:106590007265207468697320424C452044657669B1 -:1065A0006365206F6E2074686520694F532F416EBC -:1065B00064726F696420446576696365205365740D -:1065C00074696E673D3E426C7565746F6F74683DAB -:1065D0003E4D7920446576696365206F7220506175 -:1065E00069726564204465766963652021212120F4 -:1065F0000A0D0000202A2A2050616972696E672006 -:106600004B4F205374617475733D2564205265614E -:10661000736F6E3D307825303278202C200A0D20A3 -:1066200021212120506C656173652069676E6F724E -:1066300065207468697320424C452044657669631F -:1066400065206F6E2074686520694F532F416E641A -:10665000726F69642044657669636520536574745C -:10666000696E673D3E426C7565746F6F74683D3E40 -:106670004D7920446576696365206F7220506169A9 -:106680007265642044657669636520212121200AB2 -:106690000D000000202A2A204143495F47415454FD -:1066A0005F50524F435F434F4D504C4554455F56EA -:1066B000534556545F434F4445200A000D0A0D2AA6 -:1066C0002A204143495F4741505F50524F435F4347 -:1066D0004F4D504C4554455F56534556545F434FBC -:1066E0004445200A000000004150505F424C455F85 -:1066F0004B65795F427574746F6E315F4163746985 -:106700006F6E00000A0D202A2A205465726D204306 -:106710004F4E4E454354494F4E202A2A20200A0D01 -:10672000000000004150505F424C455F4B65795F6F -:10673000427574746F6E335F416374696F6E0000ED -:10674000400300006C7AD8AC5772000012345678BF -:106750009ABCDEF0123456789ABCDEF0FEDCBA0940 -:1067600087654321FEDCBA0987654321426C655F7A -:106770004863695F4761705F476174745F496E6920 -:10678000740000004852616E630000004465766941 -:106790006365204E616D65206163695F6761747434 -:1067A0005F7570646174655F636861725F76616C68 -:1067B0007565206661696C65642E0A0041707065BC -:1067C0006172616E6365206163695F676174745FA4 -:1067D0007570646174655F636861725F76616C7522 -:1067E00065206661696C65642E0A00004164765F0D -:1067F0005265717565737400466972737420696EB1 -:1068000064657820696E2025642073746174652046 -:106810000A0000005375636365737366756C6C7969 -:106820002053746F7070656420416476657274697A -:1068300073696E67200A000053746F70204164769C -:106840006572746973696E67204661696C6564205E -:106850002C20726573756C743A202564200A000040 -:10686000094852616E630000537563636573736614 -:10687000756C6C7920537461727420466173742056 -:106880004164766572746973696E67200A0000005E -:106890005375636365737366756C6C7920537461AB -:1068A0007274204C6F7720506F7765722041647648 -:1068B0006572746973696E67200A000053746172AF -:1068C00074204661737420416476657274697369DB -:1068D0006E67204661696C6564202C207265737553 -:1068E0006C743A307825303278200A005374617223 -:1068F00074204C6F7720506F776572204164766505 -:1069000072746973696E67204661696C6564202CD6 -:1069100020726573756C743A203078253032782097 -:106920000A0000004150505F424C455F506565725F -:106930005F426F6E6465645F436865636B0000006F -:10694000506565725F426F6E6465643D25642053D7 -:10695000656375726974795F4D6F64653D20256468 -:106960002C2053656375726974795F4C6576656C2C -:106970003D202564200A0D004150505F424C455F88 -:1069800052656D6F76655F426F6E64696E675F49D1 -:106990006E666F00206163695F6761705F636C653D -:1069A00061725F73656375726974795F64622026D2 -:1069B000206163695F6761705F72656D6F76655FA7 -:1069C000626F6E6465645F646576696365200A0D55 -:1069D0000000000047617050726F635265710000E3 -:1069E0004741505F50524F435F534C4156455F53B0 -:1069F000454355524954595F524551206163695F7F -:106A00006761705F736C6176655F736563757269EA -:106A100074795F72657120207374617475733D3091 -:106A20007825303278200A0D000000007761697403 -:106A3000696E6720666F7220204143495F4741506D -:106A40005F50414952494E475F434F4D504C45546A -:106A5000455F56534556545F434F4445200A0D0049 -:106A600077616974656420666F7220204143495FD5 -:106A70004741505F50414952494E475F434F4D5047 -:106A80004C4554455F56534556545F434F4445204B -:106A90000A0D00004741505F50524F435F50415331 -:106AA000535F4B45595F524553504F4E5345200A53 -:106AB0000D0000004741505F50524F435F414C4C26 -:106AC0004F575F5245424F4E44206163695F676193 -:106AD000705F616C6C6F775F7265626F6E64283097 -:106AE0007825303458290A0D000000004741505FD6 -:106AF00050524F435F4E554D455249435F434F4DB2 -:106B000050415249534F4E5F56414C55455F434F9C -:106B10004E4649524D202A2A206163695F676170A1 -:106B20005F6E756D657269635F636F6D70617269C9 -:106B3000736F6E5F76616C75655F636F6E666972A9 -:106B40006D5F7965736E6F2D2D3E594553200A0098 -:106B50007465726D696E61746520636F6E6E6563D6 -:106B600074696F6E200A00005465726D20436F6E69 -:106B70006E656374696F6E20636D64206661696C15 -:106B80007572653A20307825780A00004741505FD9 -:106B900050524F435F5445524D494E4154455F4317 -:106BA0004F4E4E454354494F4E20636F6D706C6598 -:106BB0007465206576656E742072656365697665B7 -:106BC000640A00000D0A205B25735D5B25735D5B25 -:106BD00025645D2000000000433A5C424C455F4460 -:106BE0004F52595F5061636B616765735C53544DDD -:106BF0003332437562655F46575F57425F56312EA9 -:106C000031312E305243345C50726F6A6563747355 -:106C10005C502D4E55434C454F2D574235352E4E29 -:106C200075636C656F5C4170706C69636174696FEA -:106C30006E735C424C455C424C455F4865617274C2 -:106C4000526174654672656552544F535F414E43BD -:106C5000535C53544D33325F5750414E5C4170701A -:106C60005C6170705F626C652E63000027490020D4 -:106C7000087700222648027300F04CB823490A7FA7 -:106C800041F82200087F401C0877704720490A7BA2 -:106C900041F82200087B401C0873704770B5044619 -:106CA0006078FF2802BFB4F8031001F47F41B1F50A -:106CB000406F1FD10025154E317FE8B2884222D2A5 -:106CC000E9B256F8211020468847002808BF6D1CFD -:106CD000F2D018E0761C297BF0B288420AD2F1B2D9 -:106CE00055F82110204688470100F3D002D0022831 -:106CF00005D006E02046BDE87040FEF7D4BB00207A -:106D000070BD012070BD0026014DE4E7105C00203D -:106D1000645C002080B5C046C046C046C046C04640 -:106D2000C04603F029FDC046C046C046C04603F039 -:106D3000FDFEC046C046C046C046C046C046C0462E -:106D4000C046C046C046C046C046C046C046C04613 -:106D5000C046C046C046BDE8014004F05BB9000033 -:106D600000F10103810704D010F8011B89B18107EC -:106D7000FAD10268B2F10131914311F0803F04BFB2 -:106D800050F8042FF6E710F8011B11B110F8011BA1 -:106D9000FBE7C01A704700B587B000F014F8012077 -:106DA00003220690ADF80420ADF8062000F0A3F809 -:106DB00000284CBFFF209DF8000007B000BDADF8D3 -:106DC00006100820704700208DF8000018220021CE -:106DD00001A8FEF71CB878B5C7B004460D461646A4 -:106DE000032200F01EF8ADF81C40ADF81E50ADF8BF -:106DF0002060FFF7EBFF2221FFF7E1FF062100F003 -:106E000009F800F076F800284CBFFF209DF800003C -:106E100048B070BDADF80400049107A80321704785 -:106E2000092200216846FDF7F2BF1822002102A8BE -:106E3000FDF7EDBF182201A8FDF7E9BF70B5C8B096 -:106E400006460C4615460522FFF7EBFFADF820601D -:106E5000FFF7EBFF302100F014F80521049000F05B -:106E600019F8002848BFFF2009D49DF8000030B968 -:106E70009DF8030020709DF804002870002048B0A1 -:106E800070BDADF80A1008200221ADF80800059188 -:106E900008A870470791CDF818D0002102A800F08B -:106EA00096BF00B5C7B000F00EF8FFF7C3FF312062 -:106EB00000F013F800F01FF800284CBFFF209DF8E9 -:106EC000000047B000BD00238DF81C008DF8003095 -:106ED00007A84170827000217047ADF8060007A92D -:106EE000032004900822012003910690ADF80420AD -:106EF000704703900691CDF814D0002101A800F04E -:106F000066BF00002DE9F0439FB00FF29C16269C4F -:106F1000DFF8E48A02918DF83B4000210B914FF09D -:106F2000FF37044691461D460AE019F8011B0298F6 -:106F3000A0470028029000F0A4800B98401C0B9002 -:106F400099F8000050B12528EFD1002000210590CC -:106F500006910790089109900A9103E00B98A7E029 -:106F600041F0010119F8010F2028F9D023280CD095 -:106F70002B2804D02D2805D0302809D083E041F0FB -:106F80000201EFE741F00401ECE741F00801E9E715 -:106F900041F01001E6E700200D900AE00D98404511 -:106FA00005DA00EB800302EB4302303A0D9209F15F -:106FB000010999F80020A2F130000A28EED399F8CF -:106FC00000002E2818BF0C9726D119F8010F2A2887 -:106FD00008D12868286009F1010950F8042B2860BD -:106FE0000C9219E02D280CBF19F8010B002000228B -:106FF0000C920BE040B90C9A424505DA02EB820292 -:1070000003EB4203303B0C9309F1010999F800307E -:10701000A3F130020A2AEDD3ADF83810304699F8C2 -:10702000001003F0F9FF08B119F8010B8DF83A00D0 -:107030009DF83A00682804BF99F80010682903D128 -:1070400062208DF83A0008E06C2804BF99F800002F -:107050006C2804D171218DF83A1009F1010910A8AA -:1070600004902A4619F8013B6946204600F060F872 -:1070700038B910AA6946204600F08CF900287FF53F -:107080005FAF384614E02A2885D12A682A6052F872 -:10709000040B2A6000280D9003D540420D9041F06A -:1070A000040109F101098AE7686A6C747A4C0000EE -:1070B0001FB0BDE8F083622820D0682811D06A286C -:1070C00003D06C2827D0712825D10868C01D20F076 -:1070D00007000860D0E90023083008601946104610 -:1070E0007047002A0A680A60106803D0121D0A60FF -:1070F00000B217E0121D0A6080B217E0002A0A6889 -:107100000A60106803D0121D0A6040B20AE0121D26 -:107110000A60C0B20AE0002A0A680A60106803D058 -:10712000121D0A60C1177047121D0A6000217047C6 -:1071300070B51C460D46B4F125002E69114600F0CD -:1071400017811C386AD0001F022867D9133843D032 -:10715000093863D0801E16D0401E1ED0401E022863 -:107160005CD9001F19D0401F00F08380401E33D02F -:10717000401E00F0CD80C01E00F0D880801E2BD0B5 -:10718000C01E29D0FAE06869421C6A610A680A6078 -:1071900052F8043B0A603354FAE095F83A000122B1 -:1071A000FFF789FFC5E900010023994204DA686905 -:1071B000411C69612D210DE0288F810704D5686984 -:1071C000411C69612B2105E0C00722D56869411C7B -:1071D0006961202131541CE095F83A000022FFF744 -:1071E0006AFFC5E9000195F83800010711D5D5E916 -:1071F00000230020834208BF82420AD044F02000CE -:10720000782806D1686930213154401C411C6961DD -:107210003454214668693044E86083E00868C01D42 -:1072200020F007000860D0E9002308300860C5E9B5 -:107230000023D5E90001C80F04D06869411C6961C9 -:107240002D210DE0288F810704D56869411C6961F3 -:107250002B2105E0C00704D56869411C6961202124 -:10726000315468693044E8602146284600F0C4F98A -:107270008EE005F13A02507820B14FF0FF340FF65E -:1072800048205EE01078622808D0682824D06A2858 -:1072900012D06C282ED071280ED02BE00A680A601C -:1072A00052F8040B0A6020B94FF0FF340FF630207B -:1072B00047E0E96A01706BE00A680A6052F8040B63 -:1072C0000A6020B94FF0FF340FF6142039E0EA6A63 -:1072D000D317C0E900235BE00A680A6052F8040B88 -:1072E0000A6020B94FF0FF340FF6F41029E0E96A84 -:1072F00001804DE00A680A6052F8040B0A6020B968 -:107300004FF0FF340FF6D8101BE0E96A01603FE050 -:107310000A680A6052F8040B0A600021C5E90001FE -:10732000EE607821284600F0BBF831E0086808607C -:1073300050F8044B0860EC603CB94FF0FF340FF696 -:10734000B81003F075FE201A70BD2E6B002E04D508 -:107350002046FFF705FD044608E03246002120469E -:1073600003F088FE002814BF041B3446AC610FE014 -:107370006869411C69612521315409E06969481C2B -:10738000686125227254210002D0411C6961345485 -:10739000002070BD2DE9FC410F460646796B7869E7 -:1073A000BC6A091A386A091AB869091A786A091A86 -:1073B000F869091A97F838000C1B410790460FD45A -:1073C0002021002C8DF800100ADD254601236A4695 -:1073D0003946304600F060FC00285DD16D1EF5D1C5 -:1073E0007B6942463946304600F056FC002853D1AE -:1073F00030208DF800003D6A002D09DD01236A462A -:107400003946304600F048FC002845D16D1EF5D1C4 -:10741000BB69FA683946304600F03EFC00283BD193 -:1074200030208DF800007D6A002D08DD01236A46BA -:107430003946304600F030FC70BB6D1EF6D1F8685E -:10744000B969FB6942183946304600F025FC18BB83 -:1074500030208DF80000BD6A002D08DD01236A464A -:107460003946304600F018FCB0B96D1EF6D197F8D9 -:10747000380041070DD52021002C8DF8001008DDC3 -:1074800001236A463946304600F006FC20B9641EE6 -:10749000F6D10020BDE8F6814FF0FF30BDE8F6815F -:1074A0002DE9FC4707468A463E69BAF16F0F08BFCF -:1074B000082405D04AF02001782914BF0A2410249A -:1074C0003C25D7E90023BAF1640F18BFBAF1690F60 -:1074D0009046994606D100218B4203DAD8F1000884 -:1074E00069EB49090020814508BF80451FD1386BF1 -:1074F000E8B9082C4CD197F83800010748D530205E -:107500003B2586F83B0043E000280ED597F838006D -:1075100000F01400102808D17A6B7869121A386AC2 -:10752000121A511A0029C8BF3962BDE8F3878DF8D5 -:1075300000A0404649462246E31703F0C7FD30321B -:10754000D0B26D1E3A28019504DB9DF80000A0F131 -:1075500051018A187255404649462246E31703F006 -:10756000B5FD804689460020814508BF804503D08F -:10757000F86871198842DCD3082C09D197F83800D3 -:10758000010705D5715D302902D06D1E3020705580 -:10759000C5F13C01B9617019F860386B8142B3DA0A -:1075A000411A39624FF6EF70398F01403987BDE8D3 -:1075B000F3872DE9D04306460F4614464FF00008E6 -:1075C000DFF8389412E0E00707D542464B463046D4 -:1075D000394603F093FE06460F464046494642466A -:1075E0004B4603F08BFE641080468946002CEAD19E -:1075F00030463946BDE8D0832DE9F34F054641F0CA -:1076000020048DB0D5E90089612C02AE09D0286B29 -:10761000002848BF062003D408BF672C01D10120F1 -:107620002863D5E9002358004015401C0ED11903EA -:107630000CD00320A8619DF8380061381A2802D2C6 -:107640000FF2D06111E00FF2D0610EE0580040154A -:10765000401C0FD119030DD10320A8619DF83800FB -:1076600061381A2814D30FF2B861E8680322FDF7D5 -:1076700067F9D3E1194621F00043B3F5801F1046A6 -:107680000DD20027BB4208BFBA42019703D111E0D7 -:107690000FF28861E9E701AA03F002FF0AE0DFF8D0 -:1076A000607307EB1352DFF85C3301921940DFF887 -:1076B00058331943C5E90001612C0ED1E868302127 -:1076C0000170811CE9609DF8381061290CBF782198 -:1076D000582141706869801C6861D5E900AB2BF0C6 -:1076E000004300202AF00002834204BF82420023AC -:1076F00000F05A81612C40F0A980286B00284CBF13 -:107700002120401C00904046009F7F1C49460022DB -:10771000002303F0FDFED94601988DF8082038BFFC -:1077200089F00049001F0190002FD0460DF109009B -:1077300040F3498140F2FF71DFF8D0B20C91064668 -:10774000404649460022002303F0FAFE80F03A81C9 -:107750004800400D00F11C0210D0002A0EDD0C98EC -:10776000824205DB09F0004040EA0B01002013E0F3 -:10777000A448084040EA025140460DE029F0004389 -:10778000002028F00002834208BF82420FBF40461B -:107790001C22404603F0ECFE8046894603F086FF3B -:1077A000FF1F002F044609DD03F09EFF02460B4633 -:1077B0004046494603F0AAFF80468946F01D07214E -:1077C00004E004F00F0200F8012D2411002C01DD6B -:1077D000491EF6D5491E5CBF002200F8012DF9D5DF -:1077E000ECE00020194602AA0A4400E05B1E12F8F1 -:1077F0000149491E8442F9D00F2804D10DF1090036 -:10780000425C521C4254002904D50198001D02AE6E -:107810005B1C0190591E12D49DF838007218147820 -:1078200004F130085FFA88F4392CC4BFA0F13A049F -:10783000A044491E02F80189F1D58DF83800286B63 -:10784000002840F1B080591E2963ACE0404649460B -:107850000022002303F05CFE019938BF89F0004943 -:1078600047F2975041436A4A91FBF2F20192D2F1FA -:10787000070204DD40464946FFF79BFE0AE05242FC -:1078800000206449FFF795FE02460B4640464946F4 -:1078900003F0AEFF8046662C286BDFF87CB106BF94 -:1078A000019F0A3706273F18142FC8BF142730201E -:1078B0008DF8080089460DF1090000E03046002FE0 -:1078C00034DD06464046494604F0B6F801460A460D -:1078D00006F1080304200A26B2FBF6F606EB860E34 -:1078E000A2EB4E02303203F8012C0A22B6FBF2F270 -:1078F00002EB820EA6EB4E063036401E03F8026DF8 -:10790000E9D1083F002F03F10806D7DD084604F04F -:10791000A7F802460B464046494603F0F7FE002210 -:107920005B4603F0EBFC80468946CBE70DF109018D -:10793000401A0DF1090604E00199491E401E01910B -:10794000761C31783029F7D0662C02D10199491C78 -:1079500003E0652C0CBF012100212B6BCB18984252 -:10796000B8BF431E002B1ED4834204DAF05C3528D6 -:10797000A8BF392000DA30201946721E02EB010838 -:1079800000E05B1E18F80199491E8145F9D039289D -:1079900002D1705C401C7054002904D50198401C31 -:1079A00016465B1C0190019800B200901BB29DF836 -:1079B00038103246284600F034F82FE0C61D002F5C -:1079C0003FF7BEAE30460DF10901401A009903465B -:1079D0008842C8BF0B46002B0DF109063FF52FAFBB -:1079E0008342BFF6FEAE0DF10900C05C07287FF7A9 -:1079F000F8AE0F20F6E60000CBCCCC0C0000244003 -:107A000002FCFFFFFFFF0F800000E03F0000F07F5F -:107A1000A08601000000F03F84D797410FB0BDE879 -:107A2000F08F2DE9F84783B006468A4617469846F8 -:107A300004F024F8B8F1000F406A356B90F800901C -:107A400003DC4FF001080FF2DC27BDF930404AF0AB -:107A50002000662808BF641C15D0672840F0848089 -:107A600014F1040FC0F28680AC4280F2838096F855 -:107A70003800641C010702D4A845B8BF454620B2AF -:107A80002D1A48BF00250FFA84FAF068B169BAF1DF -:107A9000000F25DC4A1C30234354002D03DC96F8EC -:107AA0003800010703D5F06800F80290521C15EB6E -:107AB0000A0FB8BF6C4220B2441941424445B8BFD6 -:107AC000A046B26171620FFA88F5F561F068B3699A -:107AD0002A4639461844FCF733FF641BB462C4E0FD -:107AE00022B29045084417DA42463946FCF728FF8F -:107AF000B0694044B061AAEB0801002D716203DC5B -:107B000096F838100A0705D5F16801F80090F06979 -:107B1000401CF061B562A8E03946FCF711FFB0697E -:107B2000002D5044A8EB040803DC96F838100A072F -:107B300003D5F16801F80090401CB0610FFA88F09D -:107B40008542F068B369B8BFA8460FFA88F207EB20 -:107B50000A011844FCF7F4FEB0690FFA88F10844F2 -:107B6000B061681A706280E0BAF1610F14D14FF011 -:107B7000700A16E0A84504DA96F838100A0758BFCC -:107B800045466D1E48BF0025BAF1670F14BF4FF080 -:107B9000450A4FF0650A04E0BAF1410F08BF4FF003 -:107BA000500AB169F368481CB061002D17F8012B29 -:107BB0005A5403DC96F838100A071BD5F168431CA9 -:107BC000B36101F80090002D14DDA8F101080FFA4F -:107BD00088F08542F068B8BFA8460FFA88F23946A7 -:107BE0001844FCF7ADFEB0690FFA88F108446D1A2D -:107BF000B0617562F068B1690844002C80F800A09B -:107C000003D42B214170811C03E02D21417064427B -:107C1000811C00206A460AE023460A2493FBF4F400 -:107C200004EB8405A3EB450302F8013B401C24B29E -:107C3000002CF1DC012806DC4AF02002652A04BF92 -:107C4000302201F8012B48B9302001F8010B07E080 -:107C5000401E1DF80020303201F8012B0028F7DC0F -:107C6000F068B2691044091AF16196F8380000F022 -:107C7000140010280DD17169B0694118706A41185B -:107C8000F0694118B06A4118706B8142BCBF411A5B -:107C9000316204B0BDE8F087F8B505460E461746D8 -:107CA0001C46002074B117F8011BB068A847B060EB -:107CB00030B1F06A401CF0620020641EF3D1F2BDC6 -:107CC0004FF0FF30F2BD00007072696E74665F7332 -:107CD0003A20256E20646973616C6C6F776564006F -:107CE0007072696E74663A2062616420256E20614C -:107CF0007267756D656E74007072696E74665F731D -:107D00003A2062616420257320617267756D656E2B -:107D1000740000006E616E004E414E00696E660098 -:107D2000494E4600300000007FB50C466D4D61683D -:107D30006D4EE8612962284603F0A6FE246805F12D -:107D4000240000604060746006F10800006040603C -:107D500001203070296829B10FF25510009002946B -:107D6000684688477FBD1FB55F4C04F1080003F0EB -:107D700098FE00BB2178F1B1694604F1080003F0D8 -:107D8000B9FE5848C16949B10098029001228DF8A6 -:107D9000042001A888479DF8040000E0012020701D -:107DA000207818B1009803F05AFF04E0009904F11C -:107DB000080003F07FFE04F1080003F072FE28B90A -:107DC000207818B104F10800FEF7B9F81FBD2DE9BD -:107DD000F8430646002000F05FF874883088B268E7 -:107DE000DFF80081C4F3090444EA8024F068A4B2F7 -:107DF000C1B2204600F03CF8002748F2E8094846A6 -:107E0000FEF7A6F808E06888A04202D13169287818 -:107E10000870687800B1012708F1240003F041FEE2 -:107E2000F0B9694608F1240003F064FE009800F1FF -:107E30000B05407A0F28E6D0B5F80110A1420DD10C -:107E40000098817AC81E7169C0B28842C8BF0846CE -:107E5000706102463069E91CFCF772FD2878D9E7A9 -:107E60003800CCD0012000F017F80020BDE8F283E4 -:107E700010B513461C4A5468A4F80900E1720A467A -:107E8000194604F10C00FCF75BFD164A1369BDE8C6 -:107E900010400021002018471249096A82B008B931 -:107EA00021B101E011B1012002B0084702B07047D2 -:107EB00010B50146487A0F2818BF0E2807D10B4885 -:107EC00003F002FEBDE810400020FEF73DB8064C6E -:107ED00004F1080003F0F8FD04F10800BDE81040CB -:107EE000FEF72DB8985B0020545C0020BC5B00209E -:107EF00062F30F2262F31F42401810F0030308D010 -:107F0000C91A1FD3DB0748BF00F8012D28BF20F88E -:107F1000022D130030B414461546103928BF20E94D -:107F20003C00FAD8490728BF20E90C0048BF40F8B8 -:107F3000042D890028BF20F8022D48BF00F8012D2C -:107F400030BC7047C91818BF00F8012DCB0728BFF7 -:107F500000F8012D70470246C9B2002013788B4209 -:107F600008BF104612F8013B002BF7D1704710B53F -:107F7000029C016042600021C16001614161816138 -:107F80000381A107047704D5008910B14FF0FF30B9 -:107F900010BD002010BD2DE9F04F064685B0308998 -:107FA0000C460027BB4600287169DC460CBF4FF029 -:107FB0000208D84681B168B930697768451CBD426E -:107FC00028BFED1B3768385C7D5D00EB0527BF1CC3 -:107FD000BFB203E0074600E000B102463069F56831 -:107FE000A84223BF7568281AC01B0020154608EB5D -:107FF000050903FB09FE864532BF0020B0FBF9FAF4 -:1080000009FB1A00C0B2804509DA96F81C905FEAB5 -:10801000C97A48BF84465FEA897048BFC4461000E9 -:1080200000F0B4807068714461448842C0F0AE8052 -:1080300008EB020080B20390D946100AADF80200A6 -:108040000294ADF80020049359E0800740D53089B0 -:10805000002840F09B803268D018A34600F8024CFC -:10806000200A32681A4402F8010C2246306818448B -:10807000FCF766FC706920187061B069019C401CB7 -:10808000B061200A31680C70316848701CE08CB314 -:10809000307FC207D9D5308940B931681944FF20F3 -:1080A00001F8020C3168194401F8010C4FF0000B83 -:1080B0007069241874612C463089002340B93168F6 -:1080C0000C70210A3068417002237069801C706155 -:1080D00008EB04070021BFB231615CB1DA440298B9 -:1080E00000EB0A01306822461844FCF729FC70694D -:1080F0002418746109F10109B069401CB061049A47 -:1081000070683169914545D2791881422CBF081AAF -:108110000846306103463089A0B93068BDF80010C8 -:10812000C1545B1C70683168834228BF1B1ABDF8BC -:108130000200C8545B1C7068834228BF1B1A706918 -:10814000801C706105FB09FA7468BDF80000E41A30 -:10815000844288BF0446029800EB0A01281BAC4207 -:10816000019003D093D2307F002890D13768224607 -:10817000F818FCF7E5FB706920187061A346019CB4 -:10818000039F0023A9E73068404400E0002005B0C9 -:10819000BDE8F08F88448045F5D3A8EB0008F2E7EE -:1081A00078B5028900230B80002A44690CBF0225A0 -:1081B0000025002C4FD0028952B9C2684668531C72 -:1081C000B34228BF9B1B0668B25CF35C02EB032240 -:1081D0000A80027F02F00302012A25D10B884FF6A4 -:1081E000FF72934204BF0289002A09D0C368026962 -:1081F0009A4219D20289BAB14668F31A934213D24D -:108200004368C268E41A14190022C26044610289FA -:108210004AB902681478012B94BFC3F1010301230A -:10822000D25C04EB02220A80C468426806682B19FB -:10823000934228BF9B1A33440E884169891B491B0E -:10824000416105D034192D19954228BFAD1AC5607A -:108250008169491E8161184672BDF8B50289002303 -:108260000B80002A42690CBF02240024002A3BD064 -:10827000C56802892B464AB946686A1CB24228BFC3 -:10828000921B0668775DB25C07EB02220A80067FCC -:1082900006F00306012E20D10F884FF6FF72974299 -:1082A00004BF0289002A07D142680023012A94BF33 -:1082B000C2F1010201220AE00269AA420DD202893A -:1082C0005AB14668751B954207D2002304E0056841 -:1082D0002E78AA5C06EB02220A8041680068E41846 -:1082E0008C4228BF641A03191846F2BD484900E0C1 -:1082F000484981B00A6802430A6009680840009052 -:10830000009801B0704780B503F010FD03F010FD38 -:108310004148016841F480310160FCF7EFFDBDE8A0 -:1083200001400EE000B587B068460FF218211C220C -:10833000FCF716FB03F0AFFC684601F025FC07B024 -:1083400000BDF0B585B068461421FCF715FE002687 -:108350000025002400210FF2DC0000EBC10290791F -:1083600088B11368B3F1904F08D02C4FBB4208D0AE -:108370002B4FBB4204BF9088044304E0908806431F -:1083800001E090880543491C2229E4DB002002908B -:108390000121032003900191B0B288B10090012027 -:1083A000FFF7A4FF0120FFF7A3FF69464FF09040BD -:1083B00003F0D0FC0022B1B24FF0904003F087FDF3 -:1083C000A8B280B100900220FFF790FF0220FFF7D3 -:1083D0008FFF124E6946304603F0BCFC0022A9B262 -:1083E000304603F074FDA0B280B100900420FFF786 -:1083F0007DFF0420FFF77CFF094D6946284603F006 -:10840000A9FC0022A1B2284603F061FD05B0F0BD31 -:108410004C0000584C0100589008005800040048D7 -:108420000008004803F06EBE13460A4601460020CD -:1084300003F00EBF000000480100000000000048EB +:100A3000496E666F726D6174696F6E2061626F7569 +:100A40007420746865204170702C204E6F77206F81 +:100A50006E6C7920737570706F727420746F20479C +:100A60006574204E616D65206F662041707029208D +:100A70003D3E20414E43535F4745545F4150505FD8 +:100A8000415454524942555445200A0D000000007B +:100A90002DE9FE4F0027012840F08380DFF824680D +:100AA000DFF824880FF23819DFF820B8ADF802100B +:100AB000154606F5837A01E0FF1CBFB2BDF80200BF +:100AC000874270DAE81900F039F9BDF80010002902 +:100AD000F2D0EC5D0FF2241003F01AFF1CB90FF2F4 +:100AE0006C1003F015FFE85D441EA4417F1CBFB2EB +:100AF0000197E40FBDF80020EF19FF2A09D8B91CAF +:100B0000504604F07AF9BDF8001000200AF8010000 +:100B100010E000F019F9014640F27B2301F02CFCB3 +:100B200000F0E0F8FE22B91C504604F066F90020FF +:100B300086F80402019FBDF80000C719BF1CBFB2B0 +:100B40008CB1421C812A07DA5146701D04F055F918 +:100B5000BDF80000401C05E080225146701D04F0E5 +:100B60004CF980203071BDF800000028A6D0514615 +:100B70000FF2EC0003F0CCFEA0E700F0E5F8014630 +:100B800040F29B2301F0F8FB29880FF2DC0003F010 +:100B9000BFFE288844433019002180F80812112034 +:100BA0003070BDE8F78F06F608050C2428886043EE +:100BB000301890F80B02012818BF0528DDD101205C +:100BC00028721020307000F0BFF8014640F29923DF +:100BD00001F0D2FB0FF2C40003F09AFEE1E700003F +:100BE000414E43535F50617273655F476574417056 +:100BF00070417474725F5265737000000D0A2A2A86 +:100C00002A2A2A2A2A2A2A2A2A2A2A2A2A204170F1 +:100C1000702041747472696275746520496E666FE4 +:100C2000726D6174696F6E20526563656976656483 +:100C3000202A2A2A2A2A2A2A2A2A2A2A2A2A2A2A1E +:100C40002A2A2A2A2A2A2A0D0A0000002A2A2044AF +:100C50006973706C61794E616D653A200000000027 +:100C60002025730D0A000000436F6D6D616E6449AD +:100C7000444765744170704174747269627574653B +:100C800073206E6F74696679456E7472793D256460 +:100C90002052656D6F7665640A0D000020332E3496 +:100CA00020506572666F726D204E6F74696669635D +:100CB0006174696F6E20416374696F6E203D3E20E0 +:100CC000414E43535F504552464F524D5F4E4F5435 +:100CD000494649434154494F4E5F414354494F4E61 +:100CE000200A0D00BDF800100FF20800FF2203F0EB +:100CF0000FBE0000637574207468652041747472BF +:100D00006962757465494420782056616C75652068 +:100D10006C656E3D2564203C3D2073697A656F6685 +:100D200028616E63735F636F6E746578742E6C698F +:100D30007374293D2564200A0D000000411C022225 +:100D4000684604F05AB82870584604F067B82DE990 +:100D5000FC410546089C0FF2A4000E461746984633 +:100D600003F0D6FD2846FFF7E9F93046FFF718FAF9 +:100D70003846FFF7CFFA41460FF2D80003F0C8FD1E +:100D800021460FF2E80003F0C3FD0C22022DDFF82C +:100D9000343511D1002102FB01F0184400F5027036 +:100DA0008568A54203D0491C8029F4DB24E0002299 +:100DB00002700FF2D8001BE0002102FB01F0184482 +:100DC00000F5027C9CF8000018B1491C8029F4DB76 +:100DD00012E001208CF800008CF801508CF80260C1 +:100DE0008CF803708CF80480CCF808400FF2BC003B +:100DF000BDE8FC4103F08CBDBDE8F3812A2A2A2A14 +:100E00002A2A2A2A2A2A2A2A2A2A2A204E6F74695A +:100E10006669636174696F6E20536F7572636520D4 +:100E2000426173696320496E666F726D6174696FA8 +:100E30006E205265636569766564202A2A2A2A2A0B +:100E40002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A02 +:100E50002A0D0A002A2A2043617465676F7279435C +:100E60006F756E743A202564200D0A002A2A204EE0 +:100E70006F74696669636174696F6E5549443A209D +:100E800030782530386C78200D0A00002A2A206E30 +:100E90006F74696679456E7472793A2025642052C0 +:100EA000656D6F7665640D0A000000002A2A206EC9 +:100EB0006F74696679456E7472793A2025642041B1 +:100EC000646465640D0A00007CB5DFF88C4804F6A4 +:100ED00008054FF6FF7601462E8000220C2353436F +:100EE000234403F50273187818B19B780B408B42AA +:100EF00013D0521C802AF1DB2888B0420CD100F0BC +:100F0000ADF8014640F2EE2300F072F90FF2300026 +:100F100003F0FEFC0020207073BD0020A870D2B248 +:100F20000E2020702A8000F099F8014640F2E72355 +:100F300000F05EF929880FF24C0003F0E9FCDBE7D2 +:100F400020616E63735F636F6E746578742E6E6F6D +:100F500074696679456E747279203D3D20494E561C +:100F6000414C49445F4E4F544946595F454E545297 +:100F700059203D3E20414E43535F49444C45200A91 +:100F80000D000000322E20476574204D6F726520E1 +:100F900044657461696C20496E666F726D61746935 +:100FA0006F6E20206E6F74696679456E7472793D3C +:100FB0002564203D3D3E20414E43535F4745545FED +:100FC0004E4F54494649434154494F4E5F41545452 +:100FD000524942555445200A0D00000010B5DFF873 +:100FE000784740F64401204603F086FF00200C219C +:100FF0000023C2B24A432244401C82F80832C2B2E3 +:10100000802AF6DB4FF6FF706080A4F80808237092 +:1010100000F024F8014640F20E330FF2140200F003 +:10102000E9F8BDE810400FF21C0003F071BC0000AD +:10103000414E43535F436C69656E745F52657365DF +:1010400074000000414E435320434C49454E542008 +:101050005245534554200A0D000000009B4803F000 +:10106000DDBE2DE9F047974C0FF29406964F0FF234 +:10107000B408DFF858A204F62E0540F23E6902E0FB +:10108000022003F0A0F84FF0FF320021012003F00E +:10109000EBFF2078052823D008280AD00E2806D098 +:1010A0000F2802D01028EBD01CE00120E9E7002037 +:1010B000E7E7012002F0CEF9022002F0CBF903208D +:1010C00002F0C8F9042002F0C5F9298800291EBFE2 +:1010D0006888002804F041FE052002F0BBF9D2E741 +:1010E0000020FAE701F04CF901464B4642463846EB +:1010F00003F00EFC2178304603F00AFCC3E7000041 +:10110000696E76616C696420616E63735F636F6E94 +:10111000746578742E73746174653D2564200A0DBE +:1011200000000000414E43535F4170705F55706492 +:101130006174655F5365727669636500DFF8940DCD +:101140004068012103F05EBF10B5DFF88C0DDFF8B9 +:10115000844D05F05FFD0FF23C02DFF8800D0021A9 +:1011600003F004FF606000220021012004F037F842 +:101170002060FFF733FFFFF771FF014640F246336F +:101180000FF2340200F036F8BDE810400FF24000D4 +:1011900003F0BEBB70FB0008000000000000000070 +:1011A000000000000000000000050000000000003A +:1011B0000000000000000000414E43535F436C6993 +:1011C000656E745F4170705F496E69740000000065 +:1011D0002D2D20414E435320434C49454E54204928 +:1011E0004E495449414C495A4544200A0D000000DB +:1011F0000FF20802344803F08BBB0000414E43530A +:101200005F4E6F74696669636174696F6E5F43688E +:1012100065636B00DFF8BC0C006804F04CB8DFF8C5 +:10122000B40C00684FF0FF3104F020B82DE9F0470E +:101230000746DFF898A0244C0FF294080FF2A80597 +:1012400001F09EF801464FF4587300F0EDF8BA78BB +:1012500039880FF2041003F05BFB002640F2663978 +:1012600010E001F08DF801464B4600F0DDF807EB89 +:101270008600B0F80530B0F80320314603F05FF97E +:10128000761CF6B2B8788642EBDB0E480178082966 +:1012900016D100F62E05B7F803002880B7F8050030 +:1012A000688001F06DF8014640F26F3300F0BCF841 +:1012B0006A8829880FF20010BDE8F04703F028BBC8 +:1012C000BDE8F087BC75002044450008584500087B +:1012D00047617474506172736553657276696365B2 +:1012E00073427955554944004143495F4154545F25 +:1012F00046494E445F42595F545950455F56414CF0 +:1013000055455F524553505F56534556545F434FC2 +:101310004445202D204E756D506169723D25642035 +:10132000466F756E645F4174747269627574655F4F +:1013300048616E646C653D3078253034582C4772B6 +:101340006F75705F456E645F48616E646C653D30BB +:1013500078253034580A0D004143495F4154545FA9 +:1013600046494E445F42595F545950455F56414C7F +:1013700055455F524553505F56534556545F434F52 +:101380004445202D20436F6E6E656374696F6E5FF8 +:1013900048616E646C653D3078253034582C4E754C +:1013A0006D5F6F665F48616E646C655F5061697206 +:1013B0003D25640A0D0000004143495F4154545FDC +:1013C00046494E445F42595F545950455F56414C1F +:1013D00055455F524553505F56534556545F434FF2 +:1013E0004445202D20466F756E6420414E43535373 +:1013F000657276696365537461727448616E646C7A +:10140000653D3078253034582C414E435353657236 +:1014100076696365456E6448616E646C653D3078DD +:10142000253034580A0D00004246204603F070BAB9 +:101430002DE9F04F0546DFF8A88A87B001F0EDFFEF +:10144000DFF8A09A0FF2143A01464FF4607300F0EF +:10145000B5FBEB78AA7829880FF2143003F058FA1C +:1014600000F07CFF40F06781A878E978142802F644 +:10147000120204BF04270C24039291FBF0F106280A +:101480000495C9B204BF04270024069400200591E6 +:1014900020E003F0C3FC014640F2E53300F08EFB90 +:1014A0000FF240302B46324659460FE045F22B00F2 +:1014B00083454046EDD103F0B1FC40F2E3330146F1 +:1014C00000F07CFB2B4632465946204603F020FABA +:1014D00000F04AFF8DF808009DF808400598844206 +:1014E00080F2378104983844857806784178C0784E +:1014F00045EA002546EA012606980499C0190844E1 +:101500000179407941EA002B01F087FF014640F262 +:10151000A53300F053FB019500965B46059A0FF248 +:10152000EC20214603F0F4F90398008808B18642C4 +:1015300001DA039806800398408808B1A84201DACE +:1015400003984580BBF5C05F12D103988680404662 +:101550000399CD8003F062FC014640F2B73300F0FE +:101560002DFB0FF2EC202B4632464FF4C051ADE775 +:1015700041F6010083450ED1039806824046039947 +:101580004D8203F04BFC014640F2BD3300F016FBE8 +:101590000FF2E82086E741F6020083450FF2183487 +:1015A00004D101F03AFF4FF4707388E741F603006D +:1015B000834509D101F031FF014640F2C23300F00A +:1015C000FDFA0FF220306DE741F60400834509D1A2 +:1015D00001F023FF01464FF4717300F0EFFA0FF2B0 +:1015E00038305FE741F60500834509D101F015FF6A +:1015F000014640F2C63300F0E1FA0FF2503051E7F5 +:1016000041F60600834509D101F007FF01464FF47A +:10161000727300F0D3FA0FF26C3043E741F6070023 +:10162000834509D101F0F9FE014640F2CA3300F0CA +:10163000C5FA0FF2903035E741F60800834509D12D +:1016400001F0EBFE01464FF4737300F0B7FA0FF2AE +:10165000AC3027E741F60900834509D101F0DDFEF2 +:10166000014640F2CE3300F0A9FA0FF2C03019E77C +:1016700041F60A00834509D101F0CFFE01464FF43F +:10168000747300F09BFA0FF2E0300BE741F60B00A9 +:10169000834509D101F0C1FE014640F2D23300F08A +:1016A0008DFA0FF20040FDE641F60C00834509D1AA +:1016B00001F0B3FE01464FF4757300F07FFA0FF2AC +:1016C000E430EFE641F60D00834504D101F0A5FEBC +:1016D00040F2D633F3E641F60E00834509D101F01E +:1016E0009CFE01464FF4767300F068FA0FF2DC308E +:1016F000D8E641F60F00834509D101F08EFE014680 +:1017000040F2DA3300F05AFA0FF2F430CAE64FF240 +:10171000314083457FF4CAAE0398868340460399DF +:10172000CD8303F07BFB014640F2E13300F046FA43 +:101730000FF2FC30B6E601F070FE014640F2ED33E8 +:1017400000F03CFA07B0BDE8F04F0FF2144003F090 +:10175000DFB800F0DCBF0000BC7500204761747486 +:10176000506172736553657276696365730000003A +:101770004143495F4154545F524541445F42595F80 +:1017800047524F55505F545950455F524553505F33 +:1017900056534556545F434F4445202D20436F6EAA +:1017A0006E656374696F6E5F48616E646C653D3031 +:1017B00078253034582C4174747269627574655F91 +:1017C000446174615F4C656E6774683D25642C44A8 +:1017D0006174615F4C656E6774683D256420210A01 +:1017E00000000000696E76616C69642055554944BB +:1017F0003D30782530345820666F756E64205B2547 +:1018000030345820253034585D210A006E756D53F0 +:101810006572763D25642F25642C73686F72742081 +:10182000555549443D3078253034582053657276FB +:1018300069636548616E646C65205B30782530347F +:1018400058202D203078253034585D200A0D0000B6 +:101850004741505F534552564943455F55554944AA +:101860003D30782530345820666F756E64205B25D6 +:1018700030345820253034585D210A0047454E4504 +:101880005249435F4154545249425554455F534570 +:1018900052564943455F555549443D3078253034CB +:1018A0005820666F756E64205B25303458202530D3 +:1018B00034585D210A000000414D535F5345525694 +:1018C0004943455F555549443D30782530345820CB +:1018D000666F756E64205B2530345820253034588F +:1018E0005D210A004C494E4B5F4C4F53535F5345AB +:1018F00052564943455F555549443D30782530346B +:101900005820666F756E64205B2530345820253072 +:1019100034585D210A00000054585F504F5745521B +:101920005F534552564943455F555549443D3078CC +:101930002530345820666F756E64205B253034582E +:1019400020253034585D210A0000000043555252D2 +:10195000454E545F54494D455F53455256494345A2 +:101960005F555549443D30782530345820666F75B1 +:101970006E64205B2530345820253034585D210AB0 +:10198000000000005245464552454E43455F5550C4 +:10199000444154455F54494D455F53455256494370 +:1019A000455F555549443D30782530345820666FA1 +:1019B000756E64205B2530345820253034585D2105 +:1019C0000A0000004E4558545F4453545F43484159 +:1019D0004E47455F534552564943455F5555494427 +:1019E0003D30782530345820666F756E64205B2555 +:1019F00030345820253034585D210A00474C554377 +:101A00004F53455F534552564943455F55554944E9 +:101A10003D30782530345820666F756E64205B2524 +:101A200030345820253034585D210A004845414C57 +:101A300054485F544845524D4F4D455445525F53AD +:101A40004552564943455F555549443D3078253008 +:101A5000345820666F756E64205B2530345820251D +:101A60003034585D210A00004445564943455F49DA +:101A70004E464F524D4154494F4E5F534552564981 +:101A800043455F555549443D3078253034582066EC +:101A90006F756E64205B2530345820253034585DD6 +:101AA000210A0000556E6B6E6F776E2055554944C4 +:101AB0003D30782530345820666F756E64205B2584 +:101AC00030345820253034585D210A0050484F4E9C +:101AD000455F414C4552545F534552564943455F1B +:101AE000555549443D30782530345820666F756E21 +:101AF00064205B2530345820253034585D210A009D +:101B0000424154544552595F534552564943455FEB +:101B1000555549443D30782530345820666F756EF0 +:101B200064205B2530345820253034585D210A006C +:101B3000414E43535F534552564943455F555549BE +:101B4000443D30782530345820666F756E64205BD4 +:101B50002530345820253034585D210A000000001B +:101B60004143495F4154545F524541445F42595F8C +:101B700047524F55505F545950455F524553505F3F +:101B800056534556545F434F44452C206661696C5B +:101B90006564206E6F206672656520696E64657885 +:101BA00020696E20636F6E6E656374696F6E20745A +:101BB00061626C6520210A0D000000005246484613 +:101BC00002F0A6BE2DE9F84F0546DFF814A388B051 +:101BD00000F0D6FBDFF80C830FF20C39014640F21F +:101BE000FE3300F0C9FBEB78AA7829880FF20830A1 +:101BF00002F08EFE00F0B2FB40F05B81EB78A8783B +:101C0000152804BF05270C24072804BF0527002436 +:101C1000194691FBF0F1581EE870C9B202F61A029B +:101C20000020039204950794069124E000F0A8FB9D +:101C3000014640F2654300F09FFB0FF228302B462F +:101C40002246314613E042F6A62B5E45EED10398BC +:101C500004800398458000F093FB014640F2634303 +:101C600000F08AFB0FF22C302B462246594602F038 +:101C70004FFE00F079FB8DF808009DF808B006983B +:101C8000834580F224810498C01910F8014C017832 +:101C900044EA0124417805918578C078049945EAA1 +:101CA00000250798C01908440679407956EA0026AD +:101CB0001CBF05980028DCD0002C18BF002DD8D000 +:101CC00000F05EFB014640F22A4300F055FB059B05 +:101CD0000FF2FC20019500943246594602F018FE9E +:101CE000B6F5285F0DD100F04BFB014640F22E43C4 +:101CF00000F042FB0FF244302B4622464FF42851AD +:101D0000B5E742F6012086420FF2603B0CD100F0AD +:101D100037FB01464FF4866300F02EFB2B4622462C +:101D200042F601215846A2E742F6022086420DD132 +:101D300000F026FB014640F2324300F01DFB0FF29B +:101D40005C302B46224642F6022190E742F6032001 +:101D500086420BD100F014FB014640F2344300F000 +:101D60000BFB2B46224642F60321DBE742F604201A +:101D700086420BD100F004FB014640F2364300F0EE +:101D8000FBFA2B46224642F60421CBE742F6052019 +:101D900086420ED10398848150460399CD8103F089 +:101DA0003DF8014640F23C4300F0E6FA0FF22830DD +:101DB00045E742F61920864209D100F0E1FA0146D2 +:101DC00040F23F4300F0D8FA0FF2503037E742F6C6 +:101DD0002B20864209D100F0D3FA014640F242435B +:101DE00000F0CAFA0FF2683029E742F60F20864267 +:101DF00009D100F0C5FA014640F2444300F0BCFAB4 +:101E00000FF280301BE742F62920864209D100F00C +:101E1000B7FA014640F2474300F0AEFA0FF2A030A5 +:101E20000DE742F62420864209D100F0A9FA0146C6 +:101E300040F2494300F0A0FA0FF2D030FFE641F241 +:101E40000D2086420ED10398048350460399CD831A +:101E500002F0E4FF01464FF48A6300F08DFA0FF2BE +:101E6000F430ECE64DF6F30086420ED1039844833D +:101E7000504603990D8402F0D1FF014640F25643CB +:101E800000F07AFA0FF20C40D9E64CF2E960864293 +:101E90007FF4D9AE03988483504603994D8402F0B1 +:101EA000BDFF014640F25C4300F066FA0FF21C40B1 +:101EB000C5E600F065FA014640F26D4300F05CFAB9 +:101EC00009B0BDE8F04F0FF23C4002F021BD09B06F +:101ED000BDE8F08FD4900020D12E000863100008D8 +:101EE0005845000844450008476174745061727396 +:101EF00065436861727300004143495F4154545F18 +:101F0000524541445F42595F545950455F524553D1 +:101F1000505F56534556545F434F4445202D204350 +:101F20006F6E6E656374696F6E5F48616E646C6539 +:101F30003D307825782C48616E646C655F56616C25 +:101F400075655F506169725F4C656E6774683D25A9 +:101F5000642C446174615F4C656E6774683D2564F0 +:101F60000A0D0000556E6B6E6F776E5F636861726D +:101F700020555549443D30782530345820666F75DA +:101F80006E64205B2530345820253034585D210A9A +:101F90000000000043454E5452414C5F41444452BE +:101FA0004553535F5245534F4C5554494F4E5F551F +:101FB0005549443D30782530345820666F756E643D +:101FC000205B2530345820253034585D210A00002C +:101FD0002D2D2047415454203A206E756D48646C75 +:101FE0006556616C7565506169723D25642C736836 +:101FF0006F727420555549443D307825303458204F +:10200000464F554E44204368617250726F7065723E +:10201000746965733D3078253034582043686172A7 +:1020200048616E646C65205B307825303458202D13 +:10203000203078253034585D0A0000004741502098 +:102040004445564943455F4E414D455F55554944CA +:102050003D30782530345820666F756E64205B25DE +:1020600030345820253034585D210A004741502033 +:10207000415050454152414E43455F555549443DBD +:1020800030782530345820666F756E64205B2530BB +:10209000345820253034585D210A00004741502033 +:1020A0005045524950484552414C5F505249564163 +:1020B00043595F464C41475F555549443D3078256B +:1020C00030345820666F756E64205B25303458209C +:1020D000253034585D210A0047415454205345525D +:1020E000564943455F4348414E4745445F43484155 +:1020F00052414354455249535449435F555549440D +:102100003D30782530345820666F756E64205B252D +:1021100030345820253034585D210A00424154544F +:102120004552595F4C4556454C5F434841525F55B7 +:102130005549443D30782530345820666F756E64BB +:10214000205B2530345820253034585D210A0000AA +:1021500043555252454E545F54494D455F434841A3 +:10216000525F555549443D30782530345820666FCC +:10217000756E64205B2530345820253034585D213D +:102180000A0000004C4F43414C5F54494D455F49A4 +:102190004E464F524D4154494F4E5F434841525F66 +:1021A000555549443D30782530345820666F756E5A +:1021B00064205B2530345820253034585D210A00D6 +:1021C000446576696365496E666F726D6174696FA7 +:1021D0006E53657276696365204D414E55464143A5 +:1021E00054555245525F4E414D455F555549443D0A +:1021F00030782530345820666F756E64205B25304A +:10220000345820253034585D210A00004465766931 +:102210006365496E666F726D6174696F6E53657246 +:1022200076696365204D4F44454C5F4E554D4245A0 +:10223000525F555549443D30782530345820666FFB +:10224000756E64205B2530345820253034585D216C +:102250000A000000414E43535F4E4F5449464943E4 +:102260004154494F4E5F534F555243455F43484198 +:10227000525F555549443D30782530345820666FBB +:10228000756E64205B2530345820253034585D212C +:102290000A000000414E43535F434F4E54524F4C8F +:1022A0005F504F494E545F434841525F5555494432 +:1022B0003D30782530345820666F756E64205B257C +:1022C00030345820253034585D210A00414E4353A4 +:1022D0005F444154415F534F555243455F4348412A +:1022E000525F555549443D30782530345820666F4B +:1022F000756E64205B2530345820253034585D21BC +:102300000A0000004143495F4154545F5245414433 +:102310005F42595F545950455F524553505F565381 +:102320004556545F434F44452C206661696C656493 +:102330002068616E646C65206E6F7420666F756EC8 +:102340006420696E20636F6E6E656374696F6E20C2 +:102350007461626C6520210A0D000000DFF8542DC5 +:102360002988508888427047049881789DF8080031 +:10237000CF19FFB2401C70474A46404602F0C8BA27 +:10238000504602F04BBD2DE9F04F0646DFF8288D90 +:1023900087B001F042F8DFF824AD0FF2783B014638 +:1023A00040F27B4300F01CFCF378B27831880FF2E6 +:1023B000743002F0ADFADFF8FC2C31885088884286 +:1023C00040F09781B078012803D102244FF0000932 +:1023D0000425022803D102244FF00C09122502F62D +:1023E0002802F078DFF8D87C0292E9B2039690FBDD +:1023F000F1F1CDF81890C9B205950020049123E0C1 +:1024000002F00CFD014640F2F14300F0E9FB0FF24F +:1024100070302A4631460FE042F6A6294E45404626 +:10242000EED102F0FBFC014640F2EF4300F0D8FB96 +:102430000FF288302A46494602F06AFA05980419D4 +:102440009DF80400E4B2401C8DF804009DF80410CF +:102450000498814280F25B810398811C00190D5D14 +:10246000C078039945EA0025069800190A1D165CF4 +:102470000844407946EA0026B6F5205F0CD100F00A +:10248000CCFF014640F29E4300F0AAFB0FF27030F1 +:102490002A464FF42051CFE742F603094E450ED1AC +:1024A00000203880B880F8807D8000F0B6FF0146BB +:1024B00040F2AB4300F094FB0FF27030BAE7B6F590 +:1024C000245F1CBF42F60210864240D1FD80029973 +:1024D000B8880A880FF2903990420FD14D8000F0F1 +:1024E0009CFF40F2B643014600F07AFB0095BB88A2 +:1024F0007A883146484602F00BFA9FE70A8A9042F2 +:1025000005D1CD8200F089FF40F2BA43EBE78A8A19 +:10251000904205D14D8300F080FF40F2BE43E2E7D8 +:102520004A8A904205D10D8300F077FF40F2C24302 +:10253000D9E700F072FF014640F2C44300F050FBBF +:102540000095BB887A880FF24C303146D3E73E8045 +:10255000B6F5285FBD800CD100F05FFF014640F268 +:10256000CE4300F03DFB0FF26C302A464FF4285169 +:1025700062E742F6012086420FF284390BD100F067 +:102580004CFF01464FF49A6300F02AFB2A4642F6BC +:102590000121484650E742F6022086420CD100F065 +:1025A0003CFF014640F2D24300F01AFB0FF27C30B0 +:1025B0002A4642F602213FE742F6032086420AD12C +:1025C00000F02BFF014640F2D44300F009FB2A46FD +:1025D00042F60321DDE742F6042086420AD100F0EC +:1025E0001CFF014640F2D64300F0FAFA2A4642F6B2 +:1025F0000421CEE742F60520864209D100F00DFF06 +:10260000014640F2D94300F0EBFA0FF2583000E7F0 +:1026100042F61920864209D100F0FFFE014640F241 +:10262000DC4300F0DDFA0FF28030F2E642F62B20B8 +:10263000864209D100F0F1FE014640F2DF4300F08E +:10264000CFFA0FF29430E4E642F60F20864209D129 +:1026500000F0E3FE014640F2E14300F0C1FA0FF260 +:10266000A830D6E642F62920864209D100F0D5FEF0 +:10267000014640F2E44300F0B3FA0FF2C430C8E67A +:1026800042F62420864209D100F0C7FE014640F2FE +:10269000E64300F0A5FA0FF2F030BAE641F20D2061 +:1026A000864209D100F0B9FE014640F2E94300F04C +:1026B00097FA0FF21840ACE64DF6F300864209D1C6 +:1026C00000F0ABFE014640F2EB4300F089FA0FF256 +:1026D00040409EE64CF2E96086427FF49DAE00F0F9 +:1026E0009CFE014640F2ED4300F07AFA0FF26040A2 +:1026F0008FE600F092FE014640F2F94300F070FAD6 +:1027000007B0BDE8F04F0FF2844002F001B907B006 +:10271000BDE8F08F476174745061727365446573EE +:10272000637300004143495F4154545F46494E443E +:102730005F494E464F5F524553505F56534556547E +:102740005F434F4445202D20436F6E6E656374696F +:102750006F6E5F48616E646C653D307825782C46FD +:102760006F726D61743D25642C4576656E745F44AF +:102770006174615F4C656E6774683D25640A0D0085 +:1027800020696E76616C696420636861722076618D +:102790006C756520555549443D30782530345820B6 +:1027A0004368617256616C756548616E646C652042 +:1027B0005B253034585D210A00000000202043458D +:1027C0004E5452414C5F414444524553535F52452D +:1027D000534F4C5554494F4E5F555549443D307801 +:1027E00025303458204368617256616C75654861C4 +:1027F0006E646C65205B253034585D210A00000052 +:102800005052494D4152595F534552564943455FD5 +:10281000555549443D3078253034582068616E6400 +:102820006C653D3078253034580A0D00726573654B +:1028300074204348415241435445524953544943FB +:102840005F555549443D3078253034582043686100 +:1028500072537461727448616E646C653D307825A2 +:102860003034580A0D000000757569643D307825D4 +:102870003034582068616E646C653D3078253034A2 +:10288000582D3078253034582D3078253034580A7A +:102890000D0A0D0020756E6B6F776E5F6368617255 +:1028A0005F6465736320555549443D307825303465 +:1028B000582068616E646C653D3078253034582D41 +:1028C0003078253034582D307825303458200A0D92 +:1028D00000000000474150204445564943455F4EA3 +:1028E000414D455F555549443D3078253034582099 +:1028F000666F756E64205B253034585D210A0000D8 +:1029000047415020415050454152414E43455F554B +:102910005549443D30782530345820666F756E64D3 +:10292000205B253034585D210A00000047415020CB +:102930005045524950484552414C5F5052495641CA +:1029400043595F464C41475F555549443D307825D2 +:1029500030345820666F756E64205B253034585DC6 +:10296000210A000020534552564943455F434841E0 +:102970004E4745445F4348415241435445524953B1 +:102980005449435F555549443D30782530345820EB +:102990004368617256616C756548616E646C652050 +:1029A0005B253034585D0A00424154544552595F0A +:1029B0004C4556454C5F434841525F555549443D4F +:1029C00030782530345820666F756E64205B253072 +:1029D00034585D210A00000043555252454E545F61 +:1029E00054494D455F434841525F555549443D3038 +:1029F000782530345820666F756E64205B2530343E +:102A0000585D210A000000004C4F43414C5F54497F +:102A10004D455F494E464F524D4154494F4E5F43DD +:102A20004841525F555549443D307825303458204F +:102A3000666F756E64205B253034585D210A000096 +:102A4000446576696365496E666F726D6174696F1E +:102A50006E53657276696365204D414E554641431C +:102A600054555245525F4E414D455F555549443D81 +:102A700030782530345820666F756E64205B2530C1 +:102A800034585D210A000000446576696365496E2B +:102A9000666F726D6174696F6E5365727669636596 +:102AA000204D4F44454C5F4E554D4245525F555564 +:102AB00049443D30782530345820666F756E642067 +:102AC0005B253034585D210A0000000020414E4350 +:102AD000535F4E4F54494649434154494F4E5F530B +:102AE0004F555243455F434841525F555549443D18 +:102AF000307825303458204368617256616C7565B2 +:102B000048616E646C65205B253034585D210A0095 +:102B10002020414E43535F434F4E54524F4C5F5021 +:102B20004F494E545F434841525F555549443D30EB +:102B30007825303458204368617256616C75654859 +:102B4000616E646C65205B253034585D210A00009D +:102B500020414E43535F444154415F534F555243CC +:102B6000455F434841525F555549443D30782530D3 +:102B70003458204368617256616C756548616E64B3 +:102B80006C65205B253034585D210A004143495F64 +:102B90004154545F46494E445F494E464F5F52454B +:102BA00053505F56534556545F434F44452C20665F +:102BB00061696C65642068616E646C65206E6F7419 +:102BC00020666F756E6420696E20636F6E6E65633C +:102BD00074696F6E207461626C6520210A0D0000BB +:102BE0005A46504601F094BE2DE9FC470446DFF8F2 +:102BF000C8A4DFF8C8840FF20019FFF7C1FB014633 +:102C000040F20153FFF7B8FB2379628821880FF265 +:102C1000001001F07DFEDFF89C042288418891427B +:102C20005AD100F638056088298888421DD1FFF7FF +:102C3000A7FB01464FF4A163FFF79EFB0FF2401084 +:102C400001F066FE6779A679D4F809000090237A2E +:102C5000E27931463846FEF77AF837B9F00704D4FE +:102C60003046FEF731F9FEF769FA6088A988884294 +:102C70003FD1657995B9FFF783FB014640F22A53AE +:102C8000FFF77AFB0FF2341001F042FE2079411F6A +:102C900004F10A0289B20020FDF7CCFC012D17D106 +:102CA000FFF76EFB014640F23653FFF765FB0FF26C +:102CB000741001F02DFEA01D04F002F8E11D82B297 +:102CC0000A442179081A811E89B20120FDF7E0FE2D +:102CD000BDE8F347FEF732BAFFF752FB014640F278 +:102CE0004553FFF749FBBDE8F6470FF2901001F09E +:102CF0000FBEBDE8F38700004761747450617273C2 +:102D0000654E6F74696669636174696F6E00000077 +:102D10004143495F474154545F4E4F5449464943EC +:102D20004154494F4E5F56534556545F434F4445B7 +:102D3000202D20436F6E6E656374696F6E5F48610E +:102D40006E646C653D307825782C417474726962CC +:102D50007574655F48616E646C653D30782530340C +:102D6000582C4174747269627574655F56616C7534 +:102D7000655F4C656E6774683D25640A0D00000050 +:102D8000312E20496E636F6D696E67204E6F6669E4 +:102D90006669636174696F6E2072656365697665E3 +:102DA0006420424153494320696E666F726D6174BD +:102DB000696F6E203A200A0D00000000332E31208A +:102DC00050617273652044657461696C20496E6658 +:102DD0006F726D6174696F6E206F66204E6F7469DB +:102DE0006669636174696F6E20417474726962759B +:102DF00074652C20436F6D6D616E64494447657442 +:102E00004E6F74696669636174696F6E4174747240 +:102E100069627574657320526573706F6E73653A7D +:102E2000200A0D00332E33205061727365204465F3 +:102E30007461696C20496E666F726D6174696F6E42 +:102E4000206F66204150502041747472696275741D +:102E5000652C20436F6D6D616E6449444765744114 +:102E60007070417474726962757465732052657311 +:102E7000706F6E73653A200A0D0000004143495F90 +:102E8000474154545F4E4F54494649434154494F7A +:102E90004E5F56534556545F434F44452C20666160 +:102EA000696C65642068616E646C65206E6F742067 +:102EB000666F756E6420696E20636F6E6E656374F5 +:102EC000696F6E207461626C6520210A0D0000003C +:102ED0002DE9FC41054601246878FF2840F0E68092 +:102EE000B5F80300754E0FF2DC17DFF8CC8140F621 +:102EF0000141401A63D0801E74D0401E30D0401E65 +:102F000049D0401E1CD0001F0AD0401F53D0401E85 +:102F100000F08380401E00F0A880401E30D0B7E053 +:102F200000F07BFA014640F262533A4601F044F960 +:102F30000FF2AC1001F0ECFC681DFEF779FAB6E078 +:102F400000F06BFA014640F269533A4601F034F959 +:102F50000FF2BC1001F0DCFC681DFEF733FEA6E0AA +:102F600000F05BFA01464FF4AE633A4601F024F9F3 +:102F70000FF2C41001F0CCFC681DFFF704FA96E0D4 +:102F800000F04BFA014640F277533A4601F014F94B +:102F90000FF2C81066E000F040FA014640F27E539E +:102FA0003A4601F009F90FF2E81001F0B1FC681D92 +:102FB000FEF73CF97BE0681DFFF716FE77E000F0B6 +:102FC0002CFA01464FF4B2633A4601F0F5F8B5F831 +:102FD0000B30B5F80920B5F807100FF2E41001F036 +:102FE00097FC64E000F019FA014640F29A533A4621 +:102FF00001F0E2F8B5F80720B5F805100FF224202B +:1030000001F086FC06208DF8040001A8B5F8051033 +:10301000ADF8061001F0F8F949E0E87970B100F078 +:10302000FCF9014640F2A7533A4601F0C5F8EA79A7 +:10303000B5F805100FF2602001F06AFC1D484188C8 +:10304000B5F80500814203D10020FEF7E3F82EE039 +:1030500000F0E3F9014640F2AF533A4601F0ACF814 +:103060000FF2942001F054FC21E000F0D6F9014663 +:1030700040F2B6533A4601F09FF8A87A00902B89A7 +:10308000EA79B5F805100FF2C42001F041FC0EE01A +:1030900000F0C3F9014640F2BB533A4601F08CF808 +:1030A000B5F803100FF2583001F032FC002420462E +:1030B000BDE8F681BC75002058450008444500086D +:1030C000CC900020414E43535F436C69656E745F42 +:1030D0004576656E745F48616E646C6572000000D1 +:1030E000204143495F4154545F524541445F425936 +:1030F0005F47524F55505F545950455F52455350AA +:103100005F56534556545F434F44450A0000000044 +:10311000204143495F4154545F524541445F425905 +:103120005F545950455F524553505F56534556546E +:103130005F434F44450A0000204143495F415454D6 +:103140005F46494E445F494E464F5F524553505F7C +:1031500056534556545F434F44450A002041434966 +:103160005F474154545F444953435F524541445F74 +:10317000434841525F42595F555549445F52455358 +:10318000505F56534556545F434F44450A00000074 +:10319000204143495F4154545F46494E445F425980 +:1031A0005F545950455F56414C55455F5245535009 +:1031B0005F56534556545F434F44450A0000000094 +:1031C0004143495F474154545F4154545249425529 +:1031D00054455F4D4F4449464945445F5653455613 +:1031E000545F434F444520417474725F48616E647C +:1031F0006C653D307825303458204F6666736574B1 +:103200003D30782530345820417474725F446174C5 +:10321000615F4C656E6774683D30782530345820A6 +:103220000A0D00004143495F4154545F45584348EB +:10323000414E47455F4D54555F524553505F56537D +:103240004556545F434F444520436F6E6E6563742B +:10325000696F6E5F48616E646C653D30782530340F +:1032600058205365727665725F52585F4D545520F1 +:103270003D202564203D3D3E20414E43535F4D544B +:10328000555F45584348414E47455F434F4D504C6D +:10329000455445200A0000004143495F47415454CA +:1032A0005F50524F435F434F4D504C4554455F561E +:1032B000534556545F434F4445202D20436F6E6E57 +:1032C000656374696F6E5F48616E646C653D3078EC +:1032D000253034782C4572726F725F436F64653DA0 +:1032E0003078253032582028307834313A20466101 +:1032F000696C6564290A0D004143495F4741545494 +:103300005F50524F435F434F4D504C4554455F56BD +:10331000534556545F434F44452C206661696C65A4 +:10332000642068616E646C65206E6F7420666F75D2 +:103330006E6420696E20636F6E6E656374696F6E74 +:10334000207461626C6520210A0D00004143495FD1 +:10335000474154545F4552524F525F524553505F5C +:1033600056534556545F434F444520436F6E6E6538 +:103370006374696F6E5F48616E646C653D3078257B +:10338000303458205265715F4F70636F64653D3013 +:103390007825303258204174747269627574655FA3 +:1033A00048616E646C653D30782530345820457234 +:1033B000726F725F436F64653D30782530325820FC +:1033C00028307830353A20496E73756666696369CE +:1033D000656E742061757468656E74696361746983 +:1033E0006F6E2C307830413A204174747269627586 +:1033F0007465206E6F7420666F756E64290A000014 +:10340000696E76616C69642065636F6465203078ED +:10341000253034580A0000003870404601F0FEBCE8 +:1034200080B5FDF71BFE01464FF4BA63DFF8342583 +:10343000FDF7E0FEDFF8300501F06AFA11208DF8A3 +:103440000000DFF828154888ADF80200684600F053 +:10345000DBFF01BD2DE9FF47DFF81075DFF81065D0 +:10346000DFF81095DFF81085052807F6120547F2FA +:10347000305A10D8DFE810F006003E00B000FE0021 +:103480007C01E101042038704FF404627888FA214D +:1034900003F04DFC002840F06282FFF7BEFF0146BA +:1034A0004FF4CA6300F087FE4FF40462FA21DFF89C +:1034B000CC0401F02DFA05203870788801F072FBF9 +:1034C00000F07DFE002C404609D101F0A7FC01462A +:1034D00040F2566300F06FFEDFF8A40430E201F022 +:1034E0009DFC014640F25A6300F065FE2146DFF87C +:1034F000940432E2082038700021D0208DF80000BA +:103500008DF801102D208DF8020012218DF8031086 +:103510001E208DF804004B218DF805100F208DF82A +:103520000600A4218DF8071099208DF808004E217F +:103530008DF80910CE208DF80A00B5218DF80B10FA +:1035400031208DF80C00F4218DF80D1005208DF838 +:103550000E0079218DF80F106A467888022101F05B +:1035600064FB040040460BD101F058FC014640F2D8 +:10357000696300F020FEDFF8700E01F0C9F90BE07E +:1035800001F04CFC014640F26D6300F014FE214650 +:10359000DFF8580E01F0BCF95046FDF740FEE88B0D +:1035A000A98B59B900283DD1FFF737FF014640F2FA +:1035B000736300F000FEDFF8380EC1E100283ED052 +:1035C000FFF72BFF014640F2776300F0F4FDEA8B32 +:1035D000A98BDFF8200EC8E007203870788801F04A +:1035E0000AFB00F0ECFD002C40460BD101F016FC6C +:1035F000014640F2846300F0DEFD0FF28C3001F0F2 +:1036000087F90BE001F00AFC01464FF4D16300F0AA +:10361000D2FD21460FF2BC3001F07AF9E88BA98B7C +:1036200061B9002840F09B81FFF7F7FE014640F2A8 +:103630008D6300F0C0FD0FF2FC3081E1002800F046 +:103640008E81FFF7EAFE014640F2916300F0B3FD80 +:10365000EA8BA98B0FF2244001F05AF9FFF7DDFE47 +:10366000014640F2926300F0A6FD6A8A298A0FF2B1 +:1036700060407AE00920FFF7CFFE014640F29D63EB +:1036800000F099FDA88B019000906B882A887988BA +:103690000FF2904001F03CF96A882988788801F09F +:1036A000E7FA00F08CFD002C404609D101F0B6FB92 +:1036B000014640F2A66300F07EFD0FF2D84008E01C +:1036C00001F0ACFB014640F2AA6300F074FD0FF27A +:1036D000F44001F01DF9298C00291CBFE88C00285A +:1036E0000CD0FFF79AFE014640F2AF6300F063FD95 +:1036F000EA8C298C0FF2F44001F00AF9A98C002918 +:103700001CBF688D00280CD0FFF787FE014640F2F1 +:10371000B36300F050FD6A8DA98C0FF2445001F0A4 +:10372000F7F8698C00291CBF288D00280CD0FFF702 +:1037300074FE014640F2B76300F03DFD2A8D698CAE +:103740000FF2805001F0E4F8A98A00291CBFE88A32 +:1037500000280CD0FFF761FE014640F2BB6300F089 +:103760002AFDEA8AA98A0FF2C45001F0D1F8F6E0E6 +:103770000A20FFF751FE014640F2C56300F01BFD31 +:103780006A8829880FF2086001F0C2F86A882988DF +:10379000788801F07EFA00F012FD002C404609D135 +:1037A00001F03CFB014640F2CD6300F004FD0FF256 +:1037B0000C6008E001F032FB014640F2D16300F0FA +:1037C000FAFC0FF2346001F0A3F8A88D58B1FFF7AE +:1037D00024FE014640F2D66300F0EDFCA98D0FF205 +:1037E0004C6001F095F8E88D58B1FFF716FE0146E0 +:1037F00040F2DA6300F0DFFCE98D0FF2786001F04F +:1038000087F8288E58B1FFF708FE014640F2DE63C4 +:1038100000F0D1FC298E0FF29C6001F079F8288B22 +:103820000028A4D0FFF7F9FD014640F2E26300F062 +:10383000C2FC298B0FF2BC608FE00120298BADF810 +:10384000000031B30D2038706B467888022201F0F9 +:1038500059FA00F0B4FC002C40460CD101F0DEFA1D +:10386000014640F2F66300F0A6FC298B0FF2C4601B +:1038700001F04EF80DE001F0D1FA014640F2FB6391 +:1038800000F099FC298B0FF2F46023460C2201F022 +:103890003FF8288E002830D00C213970FFF7BDFD8D +:1038A000014640F2047300F086FC2A8E79880FF2FC +:1038B000387001F02DF8298E00F078FC00F07FFCC4 +:1038C000002C40460BD101F0A9FA014640F20D73DD +:1038D00000F071FC0FF24C7001F01AF80DE001F0ED +:1038E0009DFA014640F2127300F065FC298E0FF23A +:1038F000747023460C2201F00BF8A88D00282ED0FE +:103900000B213970FFF789FD014640F21B7300F06F +:1039100052FCAA8D79880FF2B87000F0F9FFA98DDA +:1039200000F044FC00F04BFC002C40460BD101F0B1 +:1039300075FA014640F2247300F03DFC0FF2D4709A +:1039400000F0E6FF0BE001F069FA01464FF4E56391 +:1039500000F031FC21460FF6040000F0D9FFBDE86D +:10396000FF87000080FB00089CFB0008BC7500205E +:1039700044450008C4FB000858450008D0FB000877 +:103980001CFC000840FC0008474154545F50524F53 +:10399000435F444953435F414C4C5F5052494D4152 +:1039A00052595F534552564943455320414C4C2090 +:1039B000736572766963657320646973636F766596 +:1039C000726564205375636365737366756C6C7997 +:1039D000200A0000474154545F50524F435F44490E +:1039E00053435F414C4C5F5052494D4152595F53D4 +:1039F00045525649434553206163695F676174745A +:103A00005F646973635F616C6C5F7072696D617232 +:103A1000795F736572766963657320636D64204EA8 +:103A20004F4B20737461747573203D3078253032AC +:103A300058200A00474154545F50524F435F444955 +:103A400053435F414C4C5F5052494D4152595F5373 +:103A50004552564943455320414E435320536572C6 +:103A600076696365206973204E4F5420666F756ECA +:103A70006420212121200A0D0000000047415454F8 +:103A80005F50524F435F444953435F414C4C5F503A +:103A900052494D4152595F5345525649434553206F +:103AA000414E43532053657276696365205B3078DD +:103AB00025303458202D203078253034585D206949 +:103AC0007320666F756E6420212121200A0D00008D +:103AD000474154545F50524F435F444953435F4101 +:103AE0004C4C5F5052494D4152595F5345525649D3 +:103AF00043455320474154542053657276696365AA +:103B0000205B307825303458202D20307825303413 +:103B1000585D20697320666F756E64202121212015 +:103B20000A0D0000414E43535F444953434F5645ED +:103B3000525F414C4C5F434841525320636F6E6E5D +:103B4000656374696F6E5F68616E646C653D307843 +:103B50002530345820414C4C536572766963654872 +:103B6000616E646C655B25303458202D202530341F +:103B7000585D20414E4353536572766963654861D1 +:103B80006E646C655B25303458202D202530345808 +:103B90005D0A0000414C4C2063686172616374658A +:103BA0007269737469637320646973636F76657295 +:103BB0006564205375636365737366756C6C7920F7 +:103BC0000A0D0000414C4C206368617261637465AA +:103BD0007269737469637320646973636F76657265 +:103BE00079204661696C6564200A0D004741545490 +:103BF0005F50524F435F444953435F414C4C5F43D6 +:103C00004841525320414E43534E6F746966696375 +:103C10006174696F6E536F75726365436861725347 +:103C20007461727448646C653D3078253034582076 +:103C300020414E43534E6F74696669636174696FC6 +:103C40006E536F757263654368617256616C75651A +:103C500048646C653D307825303458200A0D0000EA +:103C6000474154545F50524F435F444953435F416F +:103C70004C4C5F434841525320414E43534461747E +:103C800061536F75726365436861725374617274D6 +:103C900048646C653D3078253034582020414E43CF +:103CA0005344617461536F75726365436861725602 +:103CB000616C756548646C653D30782530345820FA +:103CC0000A0D0000474154545F50524F435F44492E +:103CD00053435F414C4C5F434841525320414E4354 +:103CE00053436F6E74726F6C506F696E744368618A +:103CF00072537461727448646C653D307825303459 +:103D0000582020414E4353436F6E74726F6C506F56 +:103D1000696E744368617256616C756548646C6560 +:103D20003D307825303458200A0D00004741545466 +:103D30005F50524F435F444953435F414C4C5F4394 +:103D40004841525320536572766963654368616EDA +:103D500067656443686172537461727448646C652A +:103D60003D3078253034582020536572766963657C +:103D70004368616E6765644368617256616C75651E +:103D800048646C653D307825303458200A0D0000B9 +:103D9000414E43535F444953434F5645525F414C54 +:103DA0004C5F434841525F4445534353205B2530A9 +:103DB0003458202D20253034585D0A00416C6C2089 +:103DC00063686172616374657269737469632064A6 +:103DD000657363726970746F727320646973636F63 +:103DE0007665726564205375636365737366756C7D +:103DF0006C79200A0D000000416C6C2063686172D0 +:103E00006163746572697374696320646573637256 +:103E10006970746F727320646973636F7665727909 +:103E2000204661696C6564200A0D000047415454C6 +:103E30005F50524F435F444953435F414C4C5F4492 +:103E40004553435320414E43534E6F746966696333 +:103E50006174696F6E536F75726365436861724414 +:103E600065736348646C653D307825303458200AAA +:103E70000D000000474154545F50524F435F444986 +:103E800053435F414C4C5F444553435320414E43A1 +:103E900053436F6E74726F6C506F696E74436861D8 +:103EA000724465736348646C653D307825303458DE +:103EB000200A0D00474154545F50524F435F44491C +:103EC00053435F414C4C5F444553435320414E4361 +:103ED0005344617461536F757263654368617244E2 +:103EE00065736348646C653D307825303458200A2A +:103EF0000D000000474154545F50524F435F444906 +:103F000053435F414C4C5F444553435320536572C8 +:103F1000766963654368616E67656443686172448E +:103F200065736348646C653D307825303458200AE9 +:103F30000D000000536572766963654368616E67C2 +:103F40006564436861724465736348646C653D30C1 +:103F50007825303458206E6F7469666963617469BE +:103F60006F6E20656E61626C656420537563636576 +:103F7000737366756C6C79200A0D00005365727658 +:103F80006963654368616E6765644368617244652F +:103F9000736348646C653D307825303458206E6F0B +:103FA00074696669636174696F6E20656E61626CC5 +:103FB0006564204661696C656420424C455F5354DA +:103FC000415455535F4E4F545F414C4C4F574544FD +:103FD0003D30782530327820726573756C743D30D1 +:103FE00078253032580A0000414E43535F454E4118 +:103FF000424C455F4E4F54494649434154494F4E08 +:104000005F444154415F534F555243455F444553CC +:1040100043203078253034582030782530345820EB +:104020000A000000414E435344617461536F75723E +:104030006365436861724465736348646C65206EB0 +:104040006F74696669636174696F6E20656E616221 +:104050006C6564205375636365737366756C6C7906 +:10406000200A0D00414E435344617461536F7572D1 +:104070006365436861724465736348646C653D3091 +:104080007825303458206E6F74696669636174698D +:104090006F6E20656E61626C6564204661696C6557 +:1040A0006420424C455F5354415455535F4E4F5426 +:1040B0005F414C4C4F5745443D3078253032782095 +:1040C000726573756C743D3078253032580A000083 +:1040D000414E43535F454E41424C455F4E4F54491C +:1040E0004649434154494F4E5F4E4F544946494318 +:1040F0004154494F4E5F534F555243455F444553DA +:1041000043203078253034582030782530345820FA +:104110000A000000414E43534E6F74696669636143 +:1041200074696F6E536F757263654368617244653D +:10413000736348646C65206E6F746966696361744B +:10414000696F6E20656E61626C6564205375636390 +:1041500065737366756C6C79200A0D00414E43538C +:104160004E6F74696669636174696F6E536F7572BF +:104170006365436861724465736348646C65206E6F +:104180006F74696669636174696F6E20656E6162E0 +:104190006C6564204661696C656420726573756C3A +:1041A000743D3078253032580A00000078886B461C +:1041B000022200F0A7BD4A46304600F0A9BB0446E3 +:1041C0005046FDF72CB82DE9F84FDB4D0FF274384F +:1041D0000FF2884B0FF28039A0B005F5047405F694 +:1041E000080647F2305A0C274FF6FF7120B102281B +:1041F00000F08E8049D3F4E00E2028703088884289 +:1042000001D080280BDB00F0FCF8014640F23D7342 +:104210005A46FEF7B2F831880FF24C408AE000F0BF +:10422000F0F8014640F243735A46FEF7A6F830888C +:10423000784321580FF26C4000F06AFB3088474306 +:104240000121E05901908DF808108DF809108DF8C2 +:104250000C108DF810108DF814108DF815108DF8C5 +:1042600016108DF817104FF49470ADF80A00ADF8E1 +:104270000E00ADF8120001A984B06846142200F0C7 +:104280006BFB0FBCFCF726F9ABE00F242C7000F0A1 +:10429000B8F8014640F25C735A46FEF76EF805F135 +:1042A000860495F885100FF26440224600F030FB3A +:1042B00095F885706846802100F01EFE01208DF87B +:1042C000000000216B4605E014F801C003F800C0AF +:1042D0001046491C421CB942C0B2F5DB00211954FA +:1042E000D2B2718E688800F0F3FC04465046FCF7A9 +:1042F00096FF002C75D000F084F801464FF4F2735D +:104300000FF24432FEF739F821460FF2DC2011E0BB +:10431000102028703088884201D080280DDB00F002 +:1043200070F8014640F267735A46FEF726F8318866 +:104330000FF21C4000F0ECFA53E000F062F8014686 +:1043400040F26D735A46FEF718F8318807FB01F00A +:10435000002322580FF2344000F0DAFA31880FF2CD +:10436000E02279436058D2E90034CDE900348DF879 +:104370000100020A8DF8022002218DF80010020CC3 +:10438000000E8DF804008DF8032000208DF8050044 +:104390006B46718E6888062200F09AFC04465046EF +:1043A000FCF73DFF54B100F02CF801464FF4E473E4 +:1043B0000FF26822FDF7E1FF00F01EF800F021F88F +:1043C000014640F274735A46FDF7D7FF31880FF269 +:1043D000104000F09DFA30884743E819002180F82A +:1043E000081221B0BDE8F08F74FC0008C0FC000882 +:1043F0001CFD00087CFD000821460FF2EC1000F0C7 +:1044000087BA484600F00ABD70B501460FF2341570 +:104410000A780FF208460FF24010474C012A0CD0E0 +:10442000022A1AD0032A25D0052A34D0062A3FD0E2 +:10443000082A51D0112A5DD070BD498861800821B9 +:10444000217000F0EBFC014640F2867300F076F834 +:104450000FF2E03000F05CFA6AE000F0DFFC0146A9 +:1044600040F28E7300F06AF80FF2FC3000F050FA60 +:1044700002200BE000F0D2FC014640F2967300F0FF +:104480005DF80FF2FC3000F043FA03202070BDE825 +:104490007040FCF7A3BD00F0C1FC014640F29E73E2 +:1044A00000F04CF80FF2F43000F032FA05201FE073 +:1044B00000F0B4FC014640F2A67300F03FF80FF2A2 +:1044C000F03000F025FA2078052804BF0020FCF722 +:1044D000A1FE0620207070BD00F0A0FC01464FF444 +:1044E000F66300F02BF80FF2E83000F011FA082024 +:1044F00020701DE01121217000F090FC014640F277 +:10450000B97300F01BF80FF2E83000F001FA002157 +:10451000C8B20C225043221802F50272107820B95A +:10452000491CC8B28028F3DB70BD9078FCF7CCFC46 +:10453000BDE87040FCF702BEBC750020324628463C +:1045400000F0E6B90D0A205B25735D5B25735D5BAA +:1045500025645D2000000000433A5C776F726B7346 +:10456000706163655C46575F57425F414C4C5F49E1 +:1045700044455C4669726D776172655C50726F6A22 +:10458000656374735C502D4E55434C454F2D574217 +:1045900035352E4E75636C656F5C4170706C696368 +:1045A0006174696F6E735C424C455C424C455F4878 +:1045B00065617274526174654672656552544F53F9 +:1045C0005F414E43535C53544D33325F5750414E1D +:1045D0005C4170705C616E63735F636C69656E747F +:1045E0005F6170702E630000206163695F676174B2 +:1045F000745F77726974655F636861725F76616C1E +:10460000756520636D64204E4F4B20737461747523 +:1046100073203D307825303258200A00414E4353F4 +:104620005F436D645F506572666F726D4E6F746943 +:104630006669636174696F6E416374696F6E0000CF +:104640000200000000000000414E43535F436D64D0 +:104650005F4765744170704174747200416E63739A +:1046600050726F6352657100414E43535F4745542A +:104670005F4E4F54494649434154494F4E5F415460 +:104680005452494255544520494E56414C49445F85 +:104690004E4F544946595F454E5452592025642087 +:1046A0000A0D0000414E43535F4745545F4E4F543F +:1046B000494649434154494F4E5F4154545249423F +:1046C00055544520696E746572616374207769740E +:1046D0006820694F53204E6F74696669636174691D +:1046E0006F6E49442030782530386C782C20726504 +:1046F000747269657665206D6F726520696E666F8C +:10470000726D6174696F6E0A0D000000414E435373 +:104710005F4745545F4150505F41545452494255A0 +:104720005445204170704964656E746966696572AC +:104730004C656E6774683D256420417070496465FE +:104740006E7469666965723A2573200A0D0000006F +:10475000414E43535F504552464F524D5F4E4F546A +:10476000494649434154494F4E5F414354494F4E96 +:1047700020494E56414C49445F4E4F544946595F7B +:10478000454E545259202564200A0D00414E435392 +:104790005F504552464F524D5F4E4F544946494334 +:1047A0004154494F4E5F414354494F4E206E6F7400 +:1047B000696679456E7472793D2564204E6F74691F +:1047C0006669636174696F6E4944203078253038BA +:1047D0006C782061637449443D2564200A0D000013 +:1047E000414E43535F504552464F524D5F4E4F54DA +:1047F000494649434154494F4E5F414354494F4E06 +:10480000206E6F74696679456E7472793D256420F7 +:1048100052656D6F7665640A0D000000414E43538A +:104820005F4170705F4E6F74696669636174696F30 +:104830006E000000414E43535F434F4E4E4543547C +:104840004544203D3D3E20414E43535F4449534340 +:104850004F5645525F414E43535F5345525649436D +:1048600045200A0D00000000414E43535F44495368 +:10487000434F4E4E454354494E47200A0D00000019 +:10488000414E43535F444953434F4E4E5F434F4D58 +:10489000504C455445200A0D00000000414E435342 +:1048A0005F4D54555F555044415445200A0D00005A +:1048B000414E43535F4D54555F45584348414E4721 +:1048C000455F434F4D504C455445200A0D000000B4 +:1048D000414E43535F444953434F5645525F414E07 +:1048E00043535F53455256494345200A0D0000008B +:1048F000203D3D3E20414E43535F434845434B5F7F +:104900004E4F54494649434154494F4E200A0D00E9 +:104910000EB4C0B5024603A800210190009101AB7E +:104920000121044878440C3002F09CFA06BC5DF882 +:1049300010FB00BFA5BE000062B38B0708D0521E5B +:1049400011F8013B00F8013B00F024808B07F6D101 +:10495000830740F0208000BF103A07D330B4B1E89D +:104960003810103AA0E83810F9D230BC530724BFF1 +:10497000B1E80810A0E8081044BF51F8043B40F823 +:10498000043BD20724BF31F8022B20F8022B44BF8E +:104990000B7803707047121F17D35B0009D151F8D1 +:1049A000043B20F8023B1B0C121F20F8023BF6D2FE +:1049B0000BE051F8043B00F8013B1B0A20F8023BD6 +:1049C0001B0C121F00F8013BF3D238BF121D521E00 +:1049D00024BF11F8013B00F8013BF8D8704700B53F +:1049E00087B000208DF8000000F087F940F2011038 +:1049F000ADF806003F220120069000F0F6F90028ED +:104A00004CBFFF209DF8000007B000BD2DE9F84124 +:104A100007460128C7B0884615461E4608BF022033 +:104A200003D002280CBF102000200DF11D010C182E +:104A300000F036F8012F8DF81C7002D0022F18D02C +:104A400019E002273A4641460DF11D0000F0D5F964 +:104A50002570667000F051F93F204FF4817100F02D +:104A600016F8FF1C049700F0C2F9002805D5FF20B6 +:104A700009E01027E6E7972005E09DF8000010B94F +:104A80004E9800F067F8FFE748B0BDE8F081ADF858 +:104A90000400ADF8061007A80321039006917047A3 +:104AA00003220021684600F0AEB92DE9F64F0C460E +:104AB0000546012CC7B09B4608BF022003D0022C3C +:104AC0000CBF102000200DF11F010E18FFF7E8FFAA +:104AD000012CADF81C508DF81E4002D0022C2CD0B9 +:104AE0002DE00227569C559DDDF85091DDF84CA134 +:104AF000DDF8488148993A4600F0B6F8A6F800B0CB +:104B000086F8028086F803A086F804907571B47167 +:104B100000F0F3F83F20ADF804004FF4827107A8CD +:104B2000ADF80610039003210A370497069100F0B0 +:104B30005EF9002805D5FF2009E01027D2E797206D +:104B400005E09DF8000010B9579800F003F849B04F +:104B5000BDE8F08FBDF8011001800020704730B52E +:104B6000C7B01C464A9B00F023F900258DF8005081 +:104B70008DF82140224619460DF1220000F03DF942 +:104B800000F0BBF83F204FF4837100F01CF9A41D26 +:104B9000049400F02CF900284CBFFF209DF8000081 +:104BA00047B030BD00B5C7B000F039F800F017F8D5 +:104BB0000F21029140F20B10022100F00EF90028A3 +:104BC0004CBFFF209DF8000047B000BD0023ADF8AA +:104BD0001C008DF8003007A8418082800021182237 +:104BE00001A800F010B900228DF80020ADF81C00DB +:104BF0008DF81E10704700B5C7B000F010F8FFF731 +:104C0000EEFF0F2102914FF48970022100F0E5F8C8 +:104C100000284CBFFF209DF8000047B000BD0021D8 +:104C2000ADF81C008DF80010704718B5C7B01346DA +:104C300000228DF800200229FFF7D8FF0CBF1024B6 +:104C400002242246194600F00FF800F056F840F210 +:104C5000131100F02FF800F0CAF800284CBFFF2015 +:104C60009DF8000048B010BD0DF11F0000F0C5B860 +:104C700000B5C7B0FFF7AAFF0F21029140F215104F +:104C800000F0AAF800284CBFFF209DF8000047B0B4 +:104C900000BD00B5C7B0FFF799FF0F21029140F2A8 +:104CA000171000F099F800284CBFFF209DF8000075 +:104CB00047B000BDADF806103F2007A9ADF80400CD +:104CC00003910F20012102900691E41C0494704787 +:104CD00018B5C7B000F02BF800F041F800F00DF85F +:104CE0004FF48E7100F02DF800F081F800284CBFD1 +:104CF000FF209DF8000048B010BD1822002101A837 +:104D000000F081B818B5C7B000F011F800F027F82E +:104D1000FFF7F3FF40F2211100F013F800F067F8FD +:104D200000284CBFFF209DF8000048B010BD14467D +:104D3000ADF81C00002207A88DF800204180047106 +:104D40007047ADF806103F2007A9ADF804000391A5 +:104D50000F20012102900691641D049470472246A1 +:104D600019460DF1210000F048B878B5C7B04C9C49 +:104D70004D9D00F01DF800268DF821308DF8006063 +:104D80008DF822402246294600F019F8FFF7B5FFBA +:104D90003F204FF4937100F016F8E41D049400F0E6 +:104DA00026F800284CBFFF209DF8000048B070BDD9 +:104DB000ADF81C00ADF81E108DF8202070470DF1E5 +:104DC000230000F01AB8ADF80400ADF8061007A8EB +:104DD00001210390069170470621ADF80600049169 +:104DE00007A801213F2203900691ADF80420CDF8D9 +:104DF00014D0002101A802F09ABF10B50446FFF7B5 +:104E00009BFD204610BD10B5044610460A460146DB +:104E1000204603F01DF8204610BD704738B55C21D0 +:104E2000044603F048F8254608B15C2105E02F212F +:104E3000204603F040F820B12F21204603F03BF834 +:104E4000451C284632BD38B5EFF3108472B6284DA4 +:104E50006946281D03F054F96946281D03F0AEF990 +:104E600038B184F31088BDF80010224A03F090FA9C +:104E700031BD0120287084F3108831BD80B503F066 +:104E800085FA022100910023194800F124014FF412 +:104E90008052001D03F01BF801BD00BFF8B5144699 +:104EA0000026EFF3108510F1010F1ED001281CBF62 +:104EB00002284FF0FF3618D1BCB1264672B60C4F0F +:104EC000012392B2381D03F016F800281CBF397870 +:104ED000002908D000223A7085F31088A1B2054A53 +:104EE00003F056FA01E085F310883046F2BD000069 +:104EF00008140020474E0008002203F0F9BA70475A +:104F000080B5DFF80404016803F043FE012803D0F4 +:104F1000BDE8014004F0E0B801BDEFF3058000B149 +:104F20006DE0DFF8E813086810B901220A607047E5 +:104F30004FF0FF30704780B5EFF3058000B10FE010 +:104F4000DFF8C8030168012909D1DFF8C433002262 +:104F50001A700221016003F0EBFB002002BD02E0A9 +:104F60006FF0050002BD4FF0FF3002BDF8B584B010 +:104F700000230393EFF30583002B3DD103003BD0C7 +:104F80008025182600245AB3136803B11C46936980 +:104F90001BB11E0004D0392E02D21379DF0701D5D0 +:104FA00000202AE0536903B19D08D2F80CC097682D +:104FB00087B1BCF15C0F1FD31269002A18BF002B08 +:104FC0001AD001920B46029700962A46214603F01A +:104FD000A9FA10E0BCF1000F04BF1269002A0BD13E +:104FE00003AB019300960B46AAB2214603F0C9FA1F +:104FF000012801D000200390039805B0F0BD6FF0A8 +:10500000050070473EB5040001D0002903D56FF0BC +:105010000300019026E04FF0FF320192EFF305808C +:10502000A8B10020029002AD009500230122204685 +:1050300003F014FF0020009001AB00220021204665 +:1050400003F00CFF029868B100F054F90AE0002365 +:105050000122204603F0A4FE01AB002200212046DD +:1050600003F09EFE01983EBD2DE9FE4F8346EFF30F +:10507000058018B16FF00500BDE8FE8FBBF1000F91 +:1050800048BF6FF00300F7D4144601940E46B007F2 +:105090004CBF4FF00009D94603F0F6FB02960025FD +:1050A000019F6FF001086FF0020A064606E003F068 +:1050B000EBFB801B87422CBF3F1A00273B466A460A +:1050C0004946002003F02CFE012810D100980299D7 +:1050D0000BEA05050543CA0705EA0B0002D558454A +:1050E00001D10AE048B9002CE1D15046C4E7002CB8 +:1050F0000CBF554645460028E0D12846BCE770B5B0 +:10510000054600F00FF925D105B1686800F00104EB +:1051100000071FD455B1E868A96831B1502819D3E8 +:105120008CB1042004F0DDF806E098B9002C14BF1F +:105130000420012004F0CAF806000BD0002D14BF93 +:105140002968002101E00120ECE704F06CFC0CB1BF +:1051500046F00106304670BDF8B5024650080C46D0 +:1051600040000025EFF3058111B16FF0050515E052 +:1051700010B96FF0030511E0D1076FF002066FF070 +:105180000107214602D504F0D2F801E004F0C5FA87 +:10519000012803D0002C14BF3D4635462846F2BDF9 +:1051A00038B50146480840000024EFF3058212B1EB +:1051B0006FF0050411E010B96FF003040DE0C907AA +:1051C0006FF0020502D504F099F803E000230021F6 +:1051D00004F000F9012818BF2C46204632BD7CB5EA +:1051E0000E4614460025EFF3058100293CD1002826 +:1051F0003AD0B04238D344B1E268A16819B1502A1C +:1052000032D3012101E0002A2ED1012819D1012930 +:1052100008D1032000900022A3680021012003F0A0 +:10522000F2FF02E0032204F01DF805001CD0A6B135 +:1052300000F071F8012810D0284604F05EFB00252C +:1052400012E0012904D1A268314604F092F802E08C +:10525000314604F0A8F8050006D0002C14BF2168E0 +:105260000021284604F0DFFB284676BD7CB50C46BD +:10527000002528B16FF00206EFF3058179B114B172 +:105280006FF0030515E000956A46002104F0F4FA7A +:1052900001280DD1009860B100F02CF809E02146FA +:1052A00004F03BFA012804D014B16FF0010500E0CE +:1052B0003546284676BD38B5002410B96FF0030492 +:1052C00016E06FF00205EFF3058151B100946946D5 +:1052D00004F05EF901280AD1009848B100F00AF8FC +:1052E00006E00023002204F075F8012800D02C46C7 +:1052F000204632BDDFF828204FF080511160BFF307 +:105300004F8FBFF36F8F704710E000E014910020C3 +:105310001FED00E0606800230022002104F05AB86D +:1053200004ED00E00026EFF3058000287047000040 +:10533000034B036003F15C0008608020106070473D +:10534000BC86002078B58FB002A80FF63041DFF898 +:10535000DC4B3422FFF700FB0020FFF7D0FE20607B +:1053600000F05CF8606000F059F8A0600FF6A13121 +:10537000DFF8BC0B0090019169460FF67D3002F01A +:1053800083FC0121022004F09EFB0FF624420FF65D +:1053900011100021FFF7EAFD206102A804F0B0FB24 +:1053A00008B1C046C04600F0DDFA01F023FCDFF88A +:1053B000846B0FF62042002086F8900006F1260547 +:1053C0004FF6FF70288000210FF6C500FFF7CEFDD5 +:1053D000E06004F0EBFB04F012FCFBF7B5FE0FF607 +:1053E000A903002206F19F01002004F063FE0220C1 +:1053F000E87080210120A8700D2028710220A8707B +:10540000182068710320A870DFF82C0B0180A02100 +:105410004180012000F085FB10B070BD002200210A +:105420000120FFF7DCBE2DE9F047044688B0607824 +:10543000DFF8006BDFF8049BDFF804ABDFF8048BC8 +:10544000052806F1900505D03E2852D0FF2800F02F +:105450002D814EE2A088F18C884246D10020F08454 +:105460002870A07950B900F02EFD01464FF4EC737E +:1054700000F043FAA179DFF8D00A28E016280AD113 +:1054800000F021FD01464FF4ED7300F036FAA179EA +:10549000DFF8B80A1BE03D2840460ED1FFF7BEFCFE +:1054A00001464FF4EE7300F028FAA179DFF8A00A64 +:1054B000FFF72EFA00F038FC0BE0FFF7AFFC0146D7 +:1054C00040F2DF1300F019FAA1790FF62C30FFF744 +:1054D0001FFA03208DF81C0007A8A188ADF81E1044 +:1054E000FEF792FF002000F0F1FC012000F019FB14 +:1054F000FFE1E078012800F08780032802D00C2823 +:1055000022D0F6E100F0DFFC01464FF4FE7300F01C +:10551000F4F90FF62C30FFF7FBF900F0D4FC01464C +:1055200040F2012300F0E9F9B4F80B000190B4F85F +:1055300009000090B4F80730B4F8052021790FF67F +:105540002C30FFF7E5F9D4E100F0BDFC014640F254 +:10555000062300F0D2F90FF6B030FFF7D9F9207921 +:105560000028404609D1FFF759FC014640F20A23C2 +:1055700000F0C3F90FF6AC3008E0FFF74FFC01462E +:1055800040F20E2300F0B9F90FF6C030FFF7C0F972 +:10559000F08C06AA0DF1190101F000FC002840462C +:1055A00028D1FFF73BFC01464FF4057300F0A5F945 +:1055B0000FF6C0300FF6D034FFF7AAF99DF81900A6 +:1055C000022804BF9DF81810022904D100F07BFCCA +:1055D0004FF4067303E000F076FC4FF407730146C6 +:1055E00000F08BF99DF818209DF819102046FFF760 +:1055F0008FF97EE1FFF712FC014640F2212300F013 +:105600007CF90FF6A03072E1E87B04F079FD00F040 +:105610005AFC014640F2322300F06FF9B4F805104D +:105620000FF69C30FFF774F9287804280CBF062089 +:1056300005202870B4F80500F08400F044FC014611 +:105640004FF4127300F059F9607A0590A07A049033 +:10565000E07A0390207B0290607B0190A07B009019 +:10566000237AE279B4F805100FF69830FFF750F975 +:10567000B4F805006880207A6871A07BE872607BCE +:10568000A872207B6872E07A2872A07AE871607A4A +:10569000A87100F011FB01208DF81C0007A8B4F8D8 +:1056A0000510ADF81E10FEF7AFFE22E1B4F80300BE +:1056B0004FF48061401A19D0401E00F08E80401EC9 +:1056C0001ED0401E2BD0401E33D0401E3BD0801E2B +:1056D00000F00481401E43D0401E55D0401E49D0EA +:1056E00040F60601401A00F0EF8002E100F0EBFB0B +:1056F00001464FF41D7300F000F90FF69430F6E008 +:1057000000F0E1FB014640F27A2300F0F6F8B4F82D +:1057100005100FF6AC30FFF7FBF802205AE000F05E +:10572000D2FB01464FF4207300F0E7F80FF6EC309F +:10573000DDE000F0C8FB01464FF4217300F0DDF816 +:105740000FF60840D3E000F0BEFB014640F28A238A +:1057500000F0D3F80FF65C40FFF7DAF8042039E0E8 +:1057600000F0B1FB01464FF4247300F0C6F80FF6C9 +:105770008040BCE000F0A7FB01464FF4257300F029 +:10578000BCF80FF69C40B2E000F09DFB01464FF4E0 +:10579000267300F0B2F8D4F807100FF6B440FFF704 +:1057A000B7F800F090FB014640F2992300F0A5F80D +:1057B000D4F807100FF6B040FFF7AAF800F083FB0B +:1057C000014640F29A2300F098F80FF6B040FFF738 +:1057D0009FF8032000F0D4FA8BE000F074FB014640 +:1057E00040F2A22300F089F8237AE279B4F8051098 +:1057F0000FF6E840FFF78CF8E07901280BD100F0B4 +:1058000062FB01464FF4297300F077F8227AE179C0 +:105810000FF620500CE002280FD100F054FB014697 +:1058200040F2A72300F069F8227AE179DFF8240733 +:10583000FFF76EF800F078FA3FE000283DD12C79B0 +:105840006E7BAF7B00F038FA00F03DFB014640F282 +:10585000B12300F052F8A87B029001973346687B91 +:105860002A7900902146DFF8F006FFF751F824BBB3 +:1058700000F029FB014640F2B52300F03EF80FF698 +:105880005850DFF8D866FFF743F80A240FF284294E +:1058900031460846411E0028FBD14846FFF738F83C +:1058A000641EF5D16888132104F022FE28B9022075 +:1058B0008DF81C0007A8FEF7A7FD287B012818D14A +:1058C000002000F003FB14E000F0FDFA014640F276 +:1058D000D12300F012F80FF6545008E000F0F3FA6C +:1058E00001464FF4367300F008F80FF66850FFF7E2 +:1058F0000FF8012008B0BDE8F08752464846FFF790 +:1059000007B880B500F00CFA014640F2FB230FF611 +:10591000705200F001FA0FF68450FEF7F9FFDFF83D +:105920001406B0F89200BDE8044018E0FDF778BD19 +:1059300010B500F0F5F9014640F207330FF67C523E +:1059400000F0EAF9DFF81806FEF7E2FF00F0DDF9F3 +:1059500004F087FE04F0DEFD2088BDE8104013212E +:1059600004F0C6BD78B50FF67050DFF8F855008822 +:10597000DFF8F46589B0ADF81A0001F0BCF92868C9 +:1059800010F1010F0ED069683074090A000A7074B2 +:1059900006F110046868B074F174080A090C3075D7 +:1059A000717506E0002004F093FE040008BF0FF6B6 +:1059B0002C5422460621002004F09CFE60793072AF +:1059C000102120797072E078B072A078F07260785F +:1059D000307320780FF60C5470732246182004F0B0 +:1059E00089FE0FF6105600F097F84EF66E500890AC +:1059F00007AA28680FF60C55079006212E2004F000 +:105A000079FE22461021182004F074FE00F084F87C +:105A10001821012004F095FEFEF7E1FF0DF11600BC +:105A200006A90190009105AB07220021012004F096 +:105A3000C6FC0FF6E840BDF81810DFF80045DFF8A7 +:105A4000046500900523BDF814000022FFF787F8D5 +:105A500068B13046FFF7E2F9014640F28D332A463D +:105A60002046FEF755FF0FF6BC40FEF751FF0DF143 +:105A70001A0000900223BDF81610BDF81400002291 +:105A8000FFF76DF868B13046FFF7C8F9014640F2FC +:105A900097332A462046FEF73BFF0FF6B840FEF745 +:105AA00037FF02220221002001F0ABF9DFF8844425 +:105AB0000320207004F01AFC00206070E0700820C1 +:105AC00060751020A07500202075DFF8A004A0618B +:105AD0000120A0700020C1B221440871401CC1B255 +:105AE0001029F8DB002004900023A069617803905E +:105AF0000122207D0290A07D0190607D0090A07821 +:105B000004F00DFCA07808B104F0E0FC0AB070BD10 +:105B1000000000002E0A0D0032461021082004F07B +:105B2000E9BD2DE9F84F04462546012D88B004D182 +:105B3000DFF804040688408803E04FF4C8664FF499 +:105B40007A60DFF8F083ADF81C0008F19007DFF809 +:105B5000F493F87BDFF8E4A30FF6284B04F0D0FAB7 +:105B60004846FFF75BF9014640F2DD3300F088F864 +:105B700039780FF61C40FEF7CBFE022D22D1387883 +:105B8000012818BF02281DD104F055FB0090002801 +:105B900048460BD1FFF742F9014640F2E73300F0E7 +:105BA0006FF80FF60840FEF7B3FE0BE0FFF736F98B +:105BB000014640F2EB3300F063F800990FF6104015 +:105BC000FEF7A6FE3C7000200690059008F1290122 +:105BD0000491062298F828000FF61C4101920390C8 +:105BE0000291002300933146BDF81C20002004F0F0 +:105BF00034FBDFF874130E2004F027FC040022D1DC +:105C0000012D484611D1FFF709F9014640F204433E +:105C100000F036F80FF6E830FEF77AFEF87BD4494C +:105C200009B0BDE8F04F04F0BABAFFF7F7F8014643 +:105C300040F20A4300F024F809B0BDE8F04F0FF637 +:105C4000E830FEF765BE012D48460AD1FFF7E6F8B9 +:105C5000014640F2114300F013F821460FF6F430EC +:105C600009E0FFF7DBF8014640F2154300F008F8C1 +:105C700021460FF6104009B0BDE8F04FFEF748BED0 +:105C80005A465046FEF744BEA848C06827E10000C7 +:105C900080B500F00BF80220FFF743FFF9E70000A2 +:105CA00080B500F003F802F00EF8FAE74FF0FF328B +:105CB00000210120FFF7D8B91CB500F026F804F048 +:105CC0009CFC401E8041C00FA0706A4620880DF1E8 +:105CD000010104F0CDFB9DF80110E1729DF8001068 +:105CE000217388B900F01CF801464FF494630FF655 +:105CF000C83200F011F89DF800309DF80120A1781D +:105D00000FF6D030FEF704FE13BD8A4800F192046E +:105D100000F19601E07870470FF63C60FEF7F8BDA1 +:105D20000FF64860FFF77AB880B5FFF7F9FF014634 +:105D30004FF495630FF6D432FFF7EEFF0FF6E8301D +:105D4000FEF7E6FD7B4800F1960190F8950004F01F +:105D500088FCBDE8014004F0DDBB80B5FFF7ACFF77 +:105D60008449087830B1012801BF487A0128897A2E +:105D7000012903D1BDE80240012001E001BD00007E +:105D80002DE9F84304287C4F0FF6CC560FF6D8398E +:105D90000FF6D85847F2305500F28F80DFE800F058 +:105DA0006003305241000120B872388804F037FB9C +:105DB00004000BD000F087F801464FF4996300F01F +:105DC0007EF821460FF6AC30FEF7A2FD00F07BF81E +:105DD000014640F2CF4300F072F80FF6E430FEF7D0 +:105DE00097FD284600F076F80020B87200F06BF8B6 +:105DF000014640F2D24300F062F80FF6F83058E066 +:105E000000F061F801464FF49B6300F058F80FF67C +:105E10001840FEF77DFD38885449BDE8F44304F08E +:105E2000B1BA00F050F8014640F2DF4300F047F805 +:105E300039880FF61440FEF76BFD3888BDE8F24351 +:105E400004F07FBB3888012104F0F6FB00F03BF83A +:105E500001464FF49D6300F032F80FF6244028E02D +:105E600000F031F8014640F2EE4300F028F80FF65A +:105E70007440FEF74DFD3888132104F039FB04000F +:105E80000BD000F020F8014640F2F24300F017F882 +:105E900021460FF66840FEF73BFD284600F01AF851 +:105EA00000F011F8014640F2F64300F008F80FF652 +:105EB0007040BDE8F243FEF72BBDBDE8F1834A46D2 +:105EC0003046FEF725BD4046FEF7A8BF174880685C +:105ED000FFF7F1B9154880680AE01448006901210C +:105EE000FFF790B811484068FFF7E5B90F484068E0 +:105EF0004FF0FF31FFF7BAB910B50446616801F100 +:105F0000080000F088FE00B10120207010BD0000E4 +:105F1000064A126810B1012805D070474FF0FF31D2 +:105F20001046FFF719B91046FFF73AB970900020F4 +:105F3000A0080320448A00202C910020586B000800 +:105F4000C8F800086C6B0008E0F8000830F9000899 +:105F50009CF900080CFA0008ACFA000840420F0057 +:105F60001CFB00088075FF1F5C25002007B20100A4 +:105F700046E00100D88A0020D68A002000000000F8 +:105F80000000000000000000000000000000000011 +:105F900044000800400502011C3AFA00F401000028 +:105FA000FFFFFFFF4801010000200000000000008B +:105FB000B0F8000800000000000000000000000031 +:105FC00000000000001400000000000000000000BD +:105FD000000000009CF80008000000000000000025 +:105FE0000000000000000000000A000000000000A7 +:105FF00000000000000000000D0A0D2A2A2044497C +:1060000053434F4E4E454354494F4E204556454EFF +:1060100054205749544820434C49454E5420646904 +:1060200073636F6E6E656374696F6E205265617322 +:106030006F6E3D307825303258200A0D0000000088 +:106040000D0A0D2A2A20434F4E4E454354494F4EC8 +:1060500020555044415445204556454E54205749FB +:10606000544820434C49454E54200A004843495F58 +:106070004C455F434F4E4E454354494F4E5F55503C +:10608000444154455F434F4D504C4554455F535533 +:10609000424556545F434F444520537461747573B1 +:1060A0003D30782530325820436F6E6E65637469D9 +:1060B0006F6E5F48616E646C653D30782530345892 +:1060C00020436F6E6E5F496E74657276616C3D3011 +:1060D000782530345820436F6E6E5F4C6174656E66 +:1060E00063793D3078253034582053757065727669 +:1060F0006973696F6E5F54696D656F75743D307853 +:1061000025303458200A0D004556545F55504441FF +:1061100054455F5048595F434F4D504C45544520BE +:106120000A0000004556545F5550444154455F50A5 +:1061300048595F434F4D504C4554452C2073746172 +:10614000747573206F6B200A000000004556545F81 +:106150005550444154455F5048595F434F4D504C52 +:106160004554452C20737461747573206E6F6B20D9 +:106170000A000000526561645F50485920737563DE +:1061800063657373200A00005048592050617261A2 +:106190006D202054583D2025642C2052583D202548 +:1061A00064200A005265616420636F6E66206E6F22 +:1061B00074207375636365657373200A00000000C3 +:1061C0004843495F4C455F434F4E4E454354494F0A +:1061D0004E5F434F4D504C4554455F5355424556D5 +:1061E000545F434F444520666F7220636F6E6E6547 +:1061F0006374696F6E2068616E646C652030782509 +:10620000780A00004843495F4C455F434F4E4E4576 +:106210004354494F4E5F434F4D504C4554455F5397 +:1062200055424556545F434F444520436F6E6E655B +:106230006374696F6E5F48616E646C653D3078258C +:1062400030345820526F6C653D256420506565726E +:106250005F416464726573735F547970653D256452 +:1062600020506565725F416464726573733A2530CE +:1062700032582025303258202530325820253032EF +:106280005820253032582025303258200A0D000081 +:106290000D0A0D2A2A204143495F4741505F4C496E +:1062A0004D495445445F444953434F56455241423A +:1062B0004C455F56534556545F434F4445200A00B2 +:1062C0004143495F4741505F504153535F4B4559EC +:1062D0005F5245515F56534556545F434F444520E6 +:1062E0003D3D3E204741505F50524F435F50415328 +:1062F000535F4B45595F524553504F4E53452043D2 +:106300006F6E6E656374696F6E5F48616E646C6515 +:106310003D307825303458200A0D00000D0A0D2A32 +:106320002A204143495F4741505F415554484F52ED +:10633000495A4154494F4E5F5245515F5653455655 +:10634000545F434F4445200A000000004143495F29 +:106350004741505F534C4156455F53454355524961 +:1063600054595F494E495449415445445F56534539 +:1063700056545F434F444520736C617665207365C6 +:1063800063757269747920726571756573742069BB +:1063900073207375636365737366756C6C792073B2 +:1063A000656E7420746F20746865206D6173746508 +:1063B00072200A004143495F4741505F424F4E44BB +:1063C0005F4C4F53545F56534556545F434F4445BB +:1063D000203D3D3E204741505F50524F435F414C6E +:1063E0004C4F575F5245424F4E44200A0D0000006B +:1063F0000D0A0D2A2A204143495F4741505F41441D +:1064000044525F4E4F545F5245534F4C5645445F84 +:1064100056534556545F434F4445200A0000000040 +:106420000D0A0D2A2A204143495F4741505F4B45E1 +:106430005950524553535F4E4F5449464943415476 +:10644000494F4E5F56534556545F434F44450A00EB +:10645000206E756D657269635F76616C7565203D50 +:1064600020256C640A000000204865785F76616C26 +:106470007565203D20256C780A0000004143495F86 +:106480004741505F4E554D455249435F434F4D5034 +:10649000415249534F4E5F56414C55455F56534507 +:1064A00056545F434F4445203D3D3E204741505F99 +:1064B00050524F435F4E554D455249435F434F4DF8 +:1064C00050415249534F4E5F56414C55455F434FE3 +:1064D0004E4649524D200A0D000000004143495FDD +:1064E0004741505F50414952494E475F434F4D50DD +:1064F0004C4554455F56534556545F434F44452CD5 +:1065000020436F6E6E656374696F6E5F48616E6481 +:106510006C653D3078253034582053746174757340 +:106520003D256420526561736F6E3D3078253032B1 +:1065300078200A00202A2A2050616972696E67203B +:1065400054696D656F7574205374617475733D255E +:106550006420526561736F6E3D307825303278204B +:106560002C200A0D2021212120506C6561736520AB +:1065700069676E6F7265207468697320424C4520AC +:10658000446576696365206F6E2074686520694F85 +:10659000532F416E64726F69642044657669636548 +:1065A0002053657474696E673D3E426C7565746F07 +:1065B0006F74683D3E4D7920446576696365206F50 +:1065C0007220506169726564204465766963652054 +:1065D000212121200A0D00005465726D20436F6E49 +:1065E0006E656374696F6E20666F722074686520D3 +:1065F00066697273742070616972696E6720636F77 +:106600006D706C65746520746F20736176652062AF +:106610006F6E64696E6720696E666F726D61746912 +:106620006F6E20212121200A0D000000202A2A203F +:106630004143495F474154545F50524F435F434F7A +:106640004D504C4554455F56534556545F434F4457 +:1066500045200A000D0A0D2A2A204143495F47417F +:10666000505F50524F435F434F4D504C4554455F30 +:1066700056534556545F434F4445200A00000000DE +:106680004150505F424C455F4B65795F4275747471 +:106690006F6E315F416374696F6E00000A0D202ACE +:1066A0002A205465726D20434F4E4E454354494F46 +:1066B0004E202A2A20200A0D000000004150505F81 +:1066C000424C455F4B65795F427574746F6E335F02 +:1066D000416374696F6E0000400300006C7AD8ACAF +:1066E00057720000123456789ABCDEF01234567895 +:1066F0009ABCDEF0FEDCBA0987654321FEDCBA09EC +:1067000087654321426C655F4863695F4761705FDD +:10671000476174745F496E69740000004852616E8D +:1067200063000000446576696365204E616D6520F5 +:106730006163695F676174745F7570646174655FDC +:10674000636861725F76616C7565206661696C650E +:10675000642E0A00417070656172616E636520612C +:1067600063695F676174745F7570646174655F63AA +:106770006861725F76616C7565206661696C6564DD +:106780002E0A00004164765F52657175657374006E +:10679000466972737420696E64657820696E20257D +:1067A00064207374617465200A000000537563638C +:1067B00065737366756C6C792053746F7070656463 +:1067C000204164766572746973696E67200A0000FF +:1067D00053746F70204164766572746973696E6773 +:1067E000204661696C6564202C20726573756C7439 +:1067F0003A202564200A0000094852616E630000B7 +:106800005375636365737366756C6C79205374613B +:106810007274204661737420416476657274697382 +:10682000696E67200A0000005375636365737366C1 +:10683000756C6C79205374617274204C6F772050A2 +:106840006F776572204164766572746973696E67EB +:10685000200A0000537461727420466173742041F1 +:1068600064766572746973696E67204661696C65E8 +:1068700064202C20726573756C743A202564200A9C +:10688000000000005374617274204C6F7720506FC9 +:10689000776572204164766572746973696E6720EA +:1068A0004661696C6564202C20726573756C743A5E +:1068B000202564200A0000004150505F424C455F93 +:1068C000506565725F426F6E6465645F43686563BF +:1068D0006B000000506565725F426F6E6465643DD9 +:1068E00025642053656375726974795F4D6F6465C3 +:1068F0003D2025642C2053656375726974795F4C63 +:106900006576656C3D202564200A0D004150505F7E +:10691000424C455F52656D6F76655F426F6E64698C +:106920006E675F496E666F00206163695F676170C3 +:106930005F636C6561725F73656375726974795FBB +:1069400064622026206163695F6761705F72656DB4 +:106950006F76655F626F6E6465645F6465766963B8 +:1069600065200A0D0000000047617050726F63528D +:10697000657100004741505F50524F435F534C4197 +:1069800056455F53454355524954595F524551202E +:106990006163695F6761705F736C6176655F736582 +:1069A0006375726974795F726571202073746174A4 +:1069B00075733D307825303278200A0D00000000D4 +:1069C00077616974696E6720666F72202041434960 +:1069D0005F4741505F50414952494E475F434F4DD9 +:1069E000504C4554455F56534556545F434F4445BC +:1069F000200A0D0077616974656420666F7220203B +:106A00004143495F4741505F50414952494E475FBA +:106A1000434F4D504C4554455F56534556545F4384 +:106A20004F4445200A0D00004741505F50524F43EC +:106A30005F504153535F4B45595F524553504F4E42 +:106A40005345200A0D0000004741505F50524F430C +:106A50005F414C4C4F575F5245424F4E442061635B +:106A6000695F6761705F616C6C6F775F7265626FA1 +:106A70006E6428307825303458290A0D0000000053 +:106A80004741505F50524F435F4E554D4552494329 +:106A90005F434F4D50415249534F4E5F56414C5505 +:106AA000455F434F4E4649524D202A2A2061636973 +:106AB0005F6761705F6E756D657269635F636F6D4F +:106AC00070617269736F6E5F76616C75655F636F1D +:106AD0006E6669726D5F7965736E6F2D2D3E5945D7 +:106AE00053200A007465726D696E61746520636F6E +:106AF0006E6E656374696F6E200A00005465726D76 +:106B000020436F6E6E656374696F6E20636D6420E1 +:106B10006661696C7572653A20307825780A0000E4 +:106B20004741505F50524F435F5445524D494E418B +:106B300054455F434F4E4E454354494F4E20636F7B +:106B40006D706C657465206576656E742072656322 +:106B500065697665640A00000D0A205B25735D5B3C +:106B600025735D5B25645D2000000000433A5C777F +:106B70006F726B73706163655C46575F57425F412C +:106B80004C4C5F4944455C4669726D776172655C47 +:106B900050726F6A656374735C502D4E55434C455B +:106BA0004F2D574235352E4E75636C656F5C4170C5 +:106BB000706C69636174696F6E735C424C455C42D2 +:106BC0004C455F48656172745261746546726565D3 +:106BD00052544F535F414E43535C53544D33325FD5 +:106BE0005750414E5C4170705C6170705F626C65C3 +:106BF0002E6300001C490020087700221B48027009 +:106C000000F036B818490A7F41F82200087F401C7E +:106C100008777047704770B504466078FF2802BF58 +:106C2000B4F8031001F47F41B1F5406F12D1002692 +:106C30000D4D00E0761C297FF0B288420AD2F1B2F5 +:106C400055F82110204688470100F3D002D00228D1 +:106C500005D006E02046BDE87040FEF7E4BB00200A +:106C600070BD012070BD00005090002034910020C4 +:106C700080B5C046C046C046C046C046C04603F0C8 +:106C80008BFDC046C046C046C04603F059FFC04613 +:106C9000C046C046C046C046C046C046C046C046C4 +:106CA000C046C046C046C046C046C046C046C046B4 +:106CB000C046C046C046BDE8014004F0AFB9000080 +:106CC00000F10103810704D010F8011B89B181078D +:106CD000FAD10268B2F10131914311F0803F04BF53 +:106CE00050F8042FF6E710F8011B11B110F8011B42 +:106CF000FBE7C01A704700B587B000F03DF80120EF +:106D000003220690ADF80420ADF8062000F0A3F8A9 +:106D100000284CBFFF209DF8000007B000BD1822DE +:106D200001A8FEF770B8ADF806100820704778B5D6 +:106D3000C7B004460D461646032200F026F8ADF80B +:106D40001C40ADF81E50ADF8206000F018F822216C +:106D5000FFF7E9FF062100F009F800F07AF80028B3 +:106D60004CBFFF209DF8000048B070BDADF8040096 +:106D7000049107A80321704700208DF80000182215 +:106D8000002101A8FEF73FB8092200216846FEF75E +:106D90003AB81822002102A8FEF735B870B5C8B07D +:106DA00006460C4615460522FFF7EFFFADF82060BA +:106DB000FFF7EFFF302100F014F80521049000F0F8 +:106DC00019F8002848BFFF2009D49DF8000030B909 +:106DD0009DF8030020709DF804002870002048B042 +:106DE00070BDADF80A1008200221ADF80800059129 +:106DF00008A870470791CDF818D0002102A800F02C +:106E000096BF00B5C7B000F00EF8FFF788FF31203D +:106E100000F013F800F01FF800284CBFFF209DF889 +:106E2000000047B000BD00238DF81C008DF8003035 +:106E300007A84170827000217047ADF8060007A9CD +:106E4000032004900822012003910690ADF804204D +:106E5000704703900691CDF814D0002101A800F0EE +:106E600066BF00002DE9F0439FB00FF29C16269CF0 +:106E7000DFF8E48A02918DF83B4000210B914FF03E +:106E8000FF37044691461D460AE019F8011B029897 +:106E9000A0470028029000F0A4800B98401C0B90A3 +:106EA00099F8000050B12528EFD10020002105906D +:106EB00006910790089109900A9103E00B98A7E0CA +:106EC00041F0010119F8010F2028F9D023280CD036 +:106ED0002B2804D02D2805D0302809D083E041F09C +:106EE0000201EFE741F00401ECE741F00801E9E7B6 +:106EF00041F01001E6E700200D900AE00D984045B2 +:106F000005DA00EB800302EB4302303A0D9209F1FF +:106F1000010999F80020A2F130000A28EED399F86F +:106F200000002E2818BF0C9726D119F8010F2A2827 +:106F300008D12868286009F1010950F8042B28605D +:106F40000C9219E02D280CBF19F8010B002000222B +:106F50000C920BE040B90C9A424505DA02EB820232 +:106F600003EB4203303B0C9309F1010999F800301F +:106F7000A3F130020A2AEDD3ADF83810304699F863 +:106F8000001004F04DF808B119F8010B8DF83A0023 +:106F90009DF83A00682804BF99F80010682903D1C9 +:106FA00062208DF83A0008E06C2804BF99F80000D0 +:106FB0006C2804D171218DF83A1009F1010910A84B +:106FC00004902A4619F8013B6946204600F060F813 +:106FD00038B910AA6946204600F08CF900287FF5E0 +:106FE0005FAF384614E02A2885D12A682A6052F813 +:106FF000040B2A6000280D9003D540420D9041F00B +:10700000040109F101098AE7686A6C747A4C00008E +:107010001FB0BDE8F083622820D0682811D06A280C +:1070200003D06C2827D0712825D10868C01D20F016 +:1070300007000860D0E900230830086019461046B0 +:107040007047002A0A680A60106803D0121D0A609F +:1070500000B217E0121D0A6080B217E0002A0A6829 +:107060000A60106803D0121D0A6040B20AE0121DC7 +:107070000A60C0B20AE0002A0A680A60106803D0F9 +:10708000121D0A60C1177047121D0A600021704767 +:1070900070B51C460D46B4F125002E69114600F06E +:1070A00017811C386AD0001F022867D9133843D0D3 +:1070B000093863D0801E16D0401E1ED0401E022804 +:1070C0005CD9001F19D0401F00F08380401E33D0D0 +:1070D000401E00F0CD80C01E00F0D880801E2BD056 +:1070E000C01E29D0FAE06869421C6A610A680A6019 +:1070F00052F8043B0A603354FAE095F83A00012252 +:10710000FFF789FFC5E900010023994204DA6869A5 +:10711000411C69612D210DE0288F810704D5686924 +:10712000411C69612B2105E0C00722D56869411C1B +:107130006961202131541CE095F83A000022FFF7E4 +:107140006AFFC5E9000195F83800010711D5D5E9B6 +:1071500000230020834208BF82420AD044F020006E +:10716000782806D1686930213154401C411C69617E +:107170003454214668693044E86083E00868C01DE3 +:1071800020F007000860D0E9002308300860C5E956 +:107190000023D5E90001C80F04D06869411C69616A +:1071A0002D210DE0288F810704D56869411C696194 +:1071B0002B2105E0C00704D56869411C69612021C5 +:1071C000315468693044E8602146284600F0C4F92B +:1071D0008EE005F13A02507820B14FF0FF340FF6FF +:1071E00048205EE01078622808D0682824D06A28F9 +:1071F00012D06C282ED071280ED02BE00A680A60BD +:1072000052F8040B0A6020B94FF0FF340FF630201B +:1072100047E0E96A01706BE00A680A6052F8040B03 +:107220000A6020B94FF0FF340FF6142039E0EA6A03 +:10723000D317C0E900235BE00A680A6052F8040B28 +:107240000A6020B94FF0FF340FF6F41029E0E96A24 +:1072500001804DE00A680A6052F8040B0A6020B908 +:107260004FF0FF340FF6D8101BE0E96A01603FE0F1 +:107270000A680A6052F8040B0A600021C5E900019F +:10728000EE607821284600F0BBF831E0086808601D +:1072900050F8044B0860EC603CB94FF0FF340FF637 +:1072A000B81003F0C9FE201A70BD2E6B002E04D555 +:1072B0002046FFF705FD044608E03246002120463F +:1072C00003F0DCFE002814BF041B3446AC610FE061 +:1072D0006869411C69612521315409E06969481CCC +:1072E000686125227254210002D0411C6961345426 +:1072F000002070BD2DE9FC410F460646796B786988 +:10730000BC6A091A386A091AB869091A786A091A26 +:10731000F869091A97F838000C1B410790460FD4FA +:107320002021002C8DF800100ADD254601236A4635 +:107330003946304600F060FC00285DD16D1EF5D165 +:107340007B6942463946304600F056FC002853D14E +:1073500030208DF800003D6A002D09DD01236A46CA +:107360003946304600F048FC002845D16D1EF5D165 +:10737000BB69FA683946304600F03EFC00283BD134 +:1073800030208DF800007D6A002D08DD01236A465B +:107390003946304600F030FC70BB6D1EF6D1F868FF +:1073A000B969FB6942183946304600F025FC18BB24 +:1073B00030208DF80000BD6A002D08DD01236A46EB +:1073C0003946304600F018FCB0B96D1EF6D197F87A +:1073D000380041070DD52021002C8DF8001008DD64 +:1073E00001236A463946304600F006FC20B9641E87 +:1073F000F6D10020BDE8F6814FF0FF30BDE8F68100 +:107400002DE9FC4707468A463E69BAF16F0F08BF6F +:10741000082405D04AF02001782914BF0A2410243A +:107420003C25D7E90023BAF1640F18BFBAF1690F00 +:107430009046994606D100218B4203DAD8F1000824 +:1074400069EB49090020814508BF80451FD1386B91 +:10745000E8B9082C4CD197F83800010748D53020FE +:107460003B2586F83B0043E000280ED597F838000E +:1074700000F01400102808D17A6B7869121A386A63 +:10748000121A511A0029C8BF3962BDE8F3878DF876 +:1074900000A0404649462246E31703F01BFE303267 +:1074A000D0B26D1E3A28019504DB9DF80000A0F1D2 +:1074B00051018A187255404649462246E31703F0A7 +:1074C00009FE804689460020814508BF804503D0DB +:1074D000F86871198842DCD3082C09D197F8380074 +:1074E000010705D5715D302902D06D1E3020705521 +:1074F000C5F13C01B9617019F860386B8142B3DAAB +:10750000411A39624FF6EF70398F01403987BDE873 +:10751000F3872DE9D04306460F4614464FF0000886 +:10752000DFF8389412E0E00707D542464B46304674 +:10753000394603F0E7FE06460F46404649464246B6 +:107540004B4603F0DFFE641080468946002CEAD1EA +:1075500030463946BDE8D0832DE9F34F054641F06A +:1075600020048DB0D5E90089612C02AE09D0286BCA +:10757000002848BF062003D408BF672C01D1012092 +:107580002863D5E9002358004015401C0ED119038B +:107590000CD00320A8619DF8380061381A2802D267 +:1075A0000FF2D06111E00FF2D0610EE058004015EB +:1075B000401C0FD119030DD10320A8619DF838009C +:1075C00061381A2814D30FF2B861E8680322FDF776 +:1075D000B3F9D3E1194621F00043B3F5801F1046FB +:1075E0000DD20027BB4208BFBA42019703D111E078 +:1075F0000FF28861E9E701AA03F056FF0AE0DFF81D +:10760000607307EB1352DFF85C3301921940DFF827 +:1076100058331943C5E90001612C0ED1E8683021C7 +:107620000170811CE9609DF8381061290CBF782138 +:10763000582141706869801C6861D5E900AB2BF066 +:10764000004300202AF00002834204BF824200234C +:1076500000F05A81612C40F0A980286B00284CBFB3 +:107660002120401C00904046009F7F1C494600227C +:10767000002303F051FFD94601988DF8082038BF48 +:1076800089F00049001F0190002FD0460DF109003C +:1076900040F3498140F2FF71DFF8D0B20C91064609 +:1076A000404649460022002303F04EFF80F03A8115 +:1076B0004800400D00F11C0210D0002A0EDD0C988D +:1076C000824205DB09F0004040EA0B01002013E094 +:1076D000A448084040EA025140460DE029F000432A +:1076E000002028F00002834208BF82420FBF4046BC +:1076F0001C22404603F040FF8046894603F0DAFF33 +:10770000FF1F002F044609DD03F0F2FF02460B467F +:107710004046494603F0FEFF80468946F01D07219A +:1077200004E004F00F0200F8012D2411002C01DD0B +:10773000491EF6D5491E5CBF002200F8012DF9D57F +:10774000ECE00020194602AA0A4400E05B1E12F891 +:107750000149491E8442F9D00F2804D10DF10900D6 +:10776000425C521C4254002904D50198001D02AE0F +:107770005B1C0190591E12D49DF8380072181478C1 +:1077800004F130085FFA88F4392CC4BFA0F13A0440 +:10779000A044491E02F80189F1D58DF83800286B04 +:1077A000002840F1B080591E2963ACE040464946AC +:1077B0000022002303F0B0FE019938BF89F0004990 +:1077C00047F2975041436A4A91FBF2F20192D2F19B +:1077D000070204DD40464946FFF79BFE0AE052429D +:1077E00000206449FFF795FE02460B464046494695 +:1077F00004F002F88046662C286BDFF87CB106BFE7 +:10780000019F0A3706273F18142FC8BF14273020BE +:107810008DF8080089460DF1090000E03046002F80 +:1078200034DD06464046494604F00AF901460A4658 +:1078300006F1080304200A26B2FBF6F606EB860ED4 +:10784000A2EB4E02303203F8012C0A22B6FBF2F210 +:1078500002EB820EA6EB4E063036401E03F8026D98 +:10786000E9D1083F002F03F10806D7DD084604F0F0 +:10787000FBF802460B464046494603F04BFF002208 +:107880005B4603F03FFD80468946CBE70DF10901D9 +:10789000401A0DF1090604E00199491E401E0191AC +:1078A000761C31783029F7D0662C02D10199491C19 +:1078B00003E0652C0CBF012100212B6BCB189842F3 +:1078C000B8BF431E002B1ED4834204DAF05C352877 +:1078D000A8BF392000DA30201946721E02EB0108D9 +:1078E00000E05B1E18F80199491E8145F9D039283E +:1078F00002D1705C401C7054002904D50198401CD2 +:1079000016465B1C0190019800B200901BB29DF8D6 +:1079100038103246284600F034F82FE0C61D002FFC +:107920003FF7BEAE30460DF10901401A00990346FB +:107930008842C8BF0B46002B0DF109063FF52FAF5B +:107940008342BFF6FEAE0DF10900C05C07287FF749 +:10795000F8AE0F20F6E60000CBCCCC0C00002440A3 +:1079600002FCFFFFFFFF0F800000E03F0000F07F00 +:10797000A08601000000F03F84D797410FB0BDE81A +:10798000F08F2DE9F84783B006468A461746984699 +:1079900004F078F8B8F1000F406A356B90F8009069 +:1079A00003DC4FF001080FF2DC27BDF930404AF04C +:1079B0002000662808BF641C15D0672840F084802A +:1079C00014F1040FC0F28680AC4280F2838096F8F6 +:1079D0003800641C010702D4A845B8BF454620B250 +:1079E0002D1A48BF00250FFA84FAF068B169BAF180 +:1079F000000F25DC4A1C30234354002D03DC96F88D +:107A00003800010703D5F06800F80290521C15EB0E +:107A10000A0FB8BF6C4220B2441941424445B8BF76 +:107A2000A046B26171620FFA88F5F561F068B3693A +:107A30002A4639461844FCF77FFF641BB462C4E051 +:107A400022B29045084417DA42463946FCF774FFE3 +:107A5000B0694044B061AAEB0801002D716203DCFB +:107A600096F838100A0705D5F16801F80090F0691A +:107A7000401CF061B562A8E03946FCF75DFFB069D3 +:107A8000002D5044A8EB040803DC96F838100A07D0 +:107A900003D5F16801F80090401CB0610FFA88F03E +:107AA0008542F068B369B8BFA8460FFA88F207EBC1 +:107AB0000A011844FCF740FFB0690FFA88F1084446 +:107AC000B061681A706280E0BAF1610F14D14FF0B2 +:107AD000700A16E0A84504DA96F838100A0758BF6D +:107AE00045466D1E48BF0025BAF1670F14BF4FF021 +:107AF000450A4FF0650A04E0BAF1410F08BF4FF0A4 +:107B0000500AB169F368481CB061002D17F8012BC9 +:107B10005A5403DC96F838100A071BD5F168431C49 +:107B2000B36101F80090002D14DDA8F101080FFAEF +:107B300088F08542F068B8BFA8460FFA88F2394647 +:107B40001844FCF7F9FEB0690FFA88F108446D1A81 +:107B5000B0617562F068B1690844002C80F800A03B +:107B600003D42B214170811C03E02D21417064421C +:107B7000811C00206A460AE023460A2493FBF4F4A1 +:107B800004EB8405A3EB450302F8013B401C24B23F +:107B9000002CF1DC012806DC4AF02002652A04BF33 +:107BA000302201F8012B48B9302001F8010B07E021 +:107BB000401E1DF80020303201F8012B0028F7DCB0 +:107BC000F068B2691044091AF16196F8380000F0C3 +:107BD000140010280DD17169B0694118706A4118FC +:107BE000F0694118B06A4118706B8142BCBF411AFC +:107BF000316204B0BDE8F087F8B505460E46174679 +:107C00001C46002074B117F8011BB068A847B0608B +:107C100030B1F06A401CF0620020641EF3D1F2BD66 +:107C20004FF0FF30F2BD00007072696E74665F73D2 +:107C30003A20256E20646973616C6C6F776564000F +:107C40007072696E74663A2062616420256E2061EC +:107C50007267756D656E74007072696E74665F73BD +:107C60003A2062616420257320617267756D656ECC +:107C7000740000006E616E004E414E00696E660039 +:107C8000494E4600300000007FB50C466D4D6168DE +:107C90006D4EE8612962284603F0FAFE246805F17A +:107CA000240000604060746006F1080000604060DD +:107CB00001203070296829B10FF25510009002940C +:107CC000684688477FBD1FB55F4C04F1080003F08C +:107CD000ECFE00BB2178F1B1694604F1080003F025 +:107CE0000DFF5848C16949B10098029001228DF8F2 +:107CF000042001A888479DF8040000E001202070BE +:107D0000207818B1009803F0AEFF04E0009904F168 +:107D1000080003F0D3FE04F1080003F0C6FE28B902 +:107D2000207818B104F10800FEF7D7F81FBD2DE93F +:107D3000F8430646002000F05FF874883088B26887 +:107D4000DFF80081C4F3090444EA8024F068A4B297 +:107D5000C1B2204600F03CF8002748F2E809484646 +:107D6000FEF7C4F808E06888A04202D1316928789B +:107D70000870687800B1012708F1240003F095FE2F +:107D8000F0B9694608F1240003F0B8FE009800F14C +:107D90000B05407A0F28E6D0B5F80110A1420DD1AD +:107DA0000098817AC81E7169C0B28842C8BF08466F +:107DB000706102463069E91CFCF7BEFD2878D9E7FE +:107DC0003800CCD0012000F017F80020BDE8F28385 +:107DD00010B513461C4A5468A4F80900E1720A461B +:107DE000194604F10C00FCF7A7FD164A1369BDE81B +:107DF00010400021002018471249096A82B008B9D2 +:107E000021B101E011B1012002B0084702B0704772 +:107E100010B50146487A0F2818BF0E2807D10B4825 +:107E200003F056FEBDE810400020FEF75BB8064C9C +:107E300004F1080003F04CFE04F10800BDE8104016 +:107E4000FEF74BB800900020949000202490002072 +:107E500062F30F2262F31F42401810F0030308D0B0 +:107E6000C91A1FD3DB0748BF00F8012D28BF20F82F +:107E7000022D130030B414461546103928BF20E9EE +:107E80003C00FAD8490728BF20E90C0048BF40F859 +:107E9000042D890028BF20F8022D48BF00F8012DCD +:107EA00030BC7047C91818BF00F8012DCB0728BF98 +:107EB00000F8012D70470246C9B2002013788B42AA +:107EC00008BF104612F8013B002BF7D1704710B5E0 +:107ED000029C016042600021C160016141618161D9 +:107EE0000381A107047704D5008910B14FF0FF305A +:107EF00010BD002010BD2DE9F04F064685B0308939 +:107F00000C460027BB4600287169DC460CBF4FF0C9 +:107F10000208D84681B168B930697768451CBD420E +:107F200028BFED1B3768385C7D5D00EB0527BF1C63 +:107F3000BFB203E0074600E000B102463069F568D1 +:107F4000A84223BF7568281AC01B0020154608EBFD +:107F5000050903FB09FE864532BF0020B0FBF9FA94 +:107F600009FB1A00C0B2804509DA96F81C905FEA56 +:107F7000C97A48BF84465FEA897048BFC44610008A +:107F800000F0B4807068714461448842C0F0AE80F3 +:107F900008EB020080B20390D946100AADF8020047 +:107FA0000294ADF80020049359E0800740D5308951 +:107FB000002840F09B803268D018A34600F8024C9D +:107FC000200A32681A4402F8010C2246306818442C +:107FD000FCF7B2FC706920187061B069019C401C0C +:107FE000B061200A31680C70316848701CE08CB3B5 +:107FF000307FC207D9D5308940B931681944FF2094 +:1080000001F8020C3168194401F8010C4FF0000B23 +:108010007069241874612C463089002340B9316896 +:108020000C70210A3068417002237069801C7061F5 +:1080300008EB04070021BFB231615CB1DA44029859 +:1080400000EB0A01306822461844FCF775FC7069A1 +:108050002418746109F10109B069401CB061049AE7 +:1080600070683169914545D2791881422CBF081A50 +:108070000846306103463089A0B93068BDF8001069 +:10808000C1545B1C70683168834228BF1B1ABDF85D +:108090000200C8545B1C7068834228BF1B1A7069B9 +:1080A000801C706105FB09FA7468BDF80000E41AD1 +:1080B000844288BF0446029800EB0A01281BAC42A8 +:1080C000019003D093D2307F002890D137682246A8 +:1080D000F818FCF731FC706920187061A346019C08 +:1080E000039F0023A9E73068404400E0002005B06A +:1080F000BDE8F08F88448045F5D3A8EB0008F2E78F +:10810000F8B5024600231089546900280CBF0225E7 +:1081100000250026002C4DD060B9D36857685E1C3E +:10812000BE4228BFF61B1768FB5CBE5D03EB06264C +:10813000B6B200E00646137F03F00303012B23D100 +:108140004FF6FF77BE4208BF002808D0D3681769F2 +:108150009F4219D2C0B15768FB1A834214D25668A5 +:10816000D368A41B1C1900235461D36058B910684C +:108170000378012E94BFC6F101060126805D03EB52 +:108180000026B6B200E00646D76854681368E819BE +:10819000A04228BF001B03445069801B401B506154 +:1081A00005D0F719ED19A54228BF2D1BD5609069A0 +:1081B000401E906101B10E801846F2BDF8B502462E +:1081C00000241089536900280CBF022500250026D1 +:1081D000002B3AD0D468234658B95768661CBE4273 +:1081E00028BFF61B176817F804C0BE5D0CEB062607 +:1081F00000E00646177F07F00307012F1ED1B7B234 +:108200004FF6FF7C674508BF002807D15068002360 +:10821000012894BFC0F1010001200AE01769A742BC +:108220000CD258B157683C1B844207D20023064643 +:1082300004E014682678205C06EB00265068ED18F0 +:10824000854228BF2D1A1068441901B10E802046BE +:10825000F2BD0000484900E0484981B00A68024385 +:108260000A60096808400090009801B0704780B526 +:1082700003F060FD03F060FD4148016841F4803186 +:108280000160FCF7FBFDBDE801400EE000B587B0E2 +:1082900068460FF238211C22FCF75EFB03F0FFFC5E +:1082A000684601F035FC07B000BDF0B585B0684602 +:1082B0001421FCF721FE00260025002400210FF2E6 +:1082C000DC0000EBC102907988B11368B3F1904FE4 +:1082D00008D02C4FBB4208D02B4FBB4204BF908824 +:1082E000044304E09088064301E090880543491C5C +:1082F0002629E4DB00200290012103200390019154 +:10830000B0B288B100900120FFF7A4FF0120FFF771 +:10831000A3FF69464FF0904003F020FD0022B1B268 +:108320004FF0904003F0DEFDA8B280B10090022033 +:10833000FFF790FF0220FFF78FFF124E694630468D +:1083400003F00CFD0022A9B2304603F0CBFDA0B231 +:1083500080B100900420FFF77DFF0420FFF77CFF31 +:10836000094D6946284603F0F9FC0022A1B22846CF +:1083700003F0B8FD05B0F0BD4C0000584C010058AA +:1083800090080058000400480008004803F0B0BE00 +:1083900013460A460146002003F050BF0000004883 +:1083A000010000000000004801000000000000483B +:1083B000010000000000004801000000000000482B +:1083C000010000000000004801000000000000481B +:1083D000010000000000004801000000000000480B +:1083E00001000000000000480100000000000048FB +:1083F00001000000000000480100000000000048EB +:1084000001000000000000480100000000000048DA +:1084100001000000000000480100000000000048CA +:1084200001000000000000480100000000000048BA +:1084300001000000000000480100000000000048AA :10844000010000000000004801000000000000489A :10845000010000000000004801000000000000488A :10846000010000000000004801000000000000487A @@ -2123,2003 +2123,2141 @@ :10849000010000000000004801000000000000484A :1084A000010000000000004801000000000000483A :1084B000010000000000004801000000000000482A -:1084C000010000000000004801000000000000481A -:1084D000010000000000004801000000000000480A -:1084E00001000000000000480100000000000048FA -:1084F00001000000000000480100000000000048EA -:1085000001000000000000480100000000000048D9 -:1085100001000000000000480100000000000048C9 -:1085200001000000000000480100000000000048B9 -:1085300001000000000000480100000000000048A9 -:10854000010000000000000000000000000000002A -:1085500034840008280003202C0003202204040097 -:1085600062F30F2262F31F4200B500BF130096466C -:108570009446103928BFA0E80C50FAD85FEA417C35 -:1085800028BF0CC048BF40F8042BC90728BF20F8FB -:10859000022B48BF00F8012B00BD0000F0B585B0EC -:1085A00050260B9D25B986F3118800F0A9FBFEE744 -:1085B0000C9C24B986F3118800F0A2FBFEE75C272F -:1085C0000097009F5C2F04D086F3118800F098FB81 -:1085D000FEE70A9E009F2563022584F85950029405 -:1085E00000250395009604AD019500F034F820466F -:1085F00000F077F8049805B0F0BD2DE9F843064681 -:10860000174684B088469946B80003F049FE050035 -:108610001CD05C2003F044FE040014D00D990C988B -:108620002563002284F8592003920191009002945E -:108630004B463A464146304600F00DF8204600F0E1 -:1086400050F8012004E0284603F0B6FE4FF0FF305A -:1086500005B0BDE8F0832DE9F0470A9F81460C463E -:108660001546386B9A46A522A900FFF779FF386BAB -:1086700000EB8501081FC0084FEAC00808F007009A -:1086800007F1340554B10021605C6854605C10B19E -:10869000491C1029F8D30020E87300E02870089ED8 -:1086A000099C372E88BF3726FE62AE61E861C6F1AD -:1086B0003806381D0021016107F118000021016111 -:1086C0003F61BE617F620020286287F858005246F1 -:1086D0004946404600F098FC386004B12760BDE888 -:1086E000F0872DE9F04100F056F8DFF83855DFF853 -:1086F0003885E86C401CE8641426A86A28BBAC6284 -:10870000E86C012829D1002706FB07F0404403F05C -:10871000A5FE7F1C382FF7D305F1740003F09EFEF1 -:1087200005F18807384603F099FE284603F096FEC7 -:1087300005F1140003F092FE05F1380003F08EFEFF -:1087400005F17400E8622F6307E0A86D28B9E16ABB -:10875000A86AC26A914228BFAC62A86E401CA86693 -:108760006064E06A696D814238BF68654643211DD7 -:1087700008EB060003F07FFE00F0D9FCA86D40B1C5 -:10878000A96AC86AE16A884203D200F007F800F0DB -:10879000B7FABDE8F081044600F0B0BCDFF824175A -:1087A0004FF080500860704780B586B0002005907B -:1087B000049003AA04A905A8FCF7FAFD05990498FA -:1087C00002910022009201900023039A0FF24801C7 -:1087D0000FF27130FFF7E2FE98B103F085FE5021F1 -:1087E000012810D181F3118800F08AFADFF83404EF -:1087F0004FF0FF31C166012181650021016500F064 -:108800002BFC07B000BD10F1010FFAD181F31188E4 -:1088100000F076FAFEE7000049444C4500000000F5 -:10882000DFF8D007016F491C01677047DFF8F423B8 -:10883000506D002100B10121936AD86A28B9DFF890 -:10884000B8371868012800D809B100207047D16EE8 -:10885000106D081A704770B5DFF8C863306F0024D8 -:10886000002520B900F044F800F04AFAFEE700F0D5 -:1088700045FC306F401E3067316F002936D1F06CF7 -:10888000D0B933E0F168CC6800F036F800F003FAB4 -:10889000E06A716DDFF86027814238BF706514238C -:1088A0005843211D104403F0E6FDE06AB16ACA6A2C -:1088B000904224BF0120306630680028E2D10CB11C -:1088C00000F092F9F46D3CB100F01EF808B10120FF -:1088D0003066641EF8D1F565306E38B1DFF81C07DC -:1088E0004FF080510125016000F00AFA00F050BA03 -:1088F000502181F31188704704F1180003F0E0BDA6 -:10890000DFF8F006006D70472DE9F843DFF81473C7 -:10891000386F0026002851D13C6D641C3C6510D195 -:10892000F86A006820B1FFF7E3FF00F0E9F9FEE71D -:10893000F86A396BF9623863786E401C786600F02B -:1089400053F9F86EDFF8B09684424FF0140824D340 -:1089500019E0281D03F0B4FDA86A18B105F118004C -:1089600003F0AEFDE86A796D814238BF786508FB97 -:1089700000F0291D484403F07EFDE86AB96ACA6A1E -:10898000904228BF0126F86A006898B1F96AC86861 -:10899000C56868688442DCD2F866B86AC06A08FBB9 -:1089A00000F159F801000228386E28BF012640B1B5 -:1089B000012606E04FF0FF31F966EEE7F86D401C46 -:1089C000F8657BE218B5DFF85C22106F10B1012169 -:1089D000116611BD1066516DDFF81C3600E0491EAE -:1089E00014244C43185930B90029F8D1FFF780FFFF -:1089F00000F086F9FEE7181900F1080443685B6887 -:108A00004360A34204BF5B6843604068C3689362ED -:108A1000516511BD10B50C4610B900F06EF9FEE7B6 -:108A200000F01DF803F033FD2046BDE81040FFE7DD -:108A3000012100F0B8BA38B50D46144610B900F05F -:108A40005CF9FEE700F00BF803F015FD0CB14FF0F8 -:108A5000FF3521462846BDE8344000F0A4BADFF8CF -:108A60009425936A03F11801704738B5C068C4684B -:108A700014B900F042F9FEE7FFF73EFFDFF8A4511A -:108A8000286F50B900F007F900F014F838BF6A6594 -:108A900000F016F800F0A8F804E004F118012846E8 -:108AA00003F0E9FC00F010FA02D20120286632BD82 -:108AB000002032BDE26A686DDFF83C3590427047B5 -:108AC00014204243211D981803F0D5BCDFF824156B -:108AD0004A6E0260096D41607047F8B504460D4664 -:108AE000502014B900F00AF9FEE715B900F006F9B4 -:108AF000FEE700F003FBDFF8FC04016D62682E68FE -:108B00008B1A16F1010F0ED0476ED4F800C06745DE -:108B100001D091420BD2B34207D2F31A2B60416EBF -:108B20002160006D6060002402E0002028600124C4 -:108B300000F0FDFA2046F2BDDFF8B8140120086607 -:108B4000704700002DE9F041DFF87843DFF8D88066 -:108B5000344F4FF0805511E000F0D0FA386AC66803 -:108B6000301D03F0ADFCF86C401EF864786B401EBD -:108B7000786300F0DCFA304600F021F8786B0028CA -:108B8000EAD1D8F80010012902D9256000F0B8F820 -:108B9000FFF74CFE0128F1D9386F401C3867F86E9A -:108BA000396D884208D3FFF741FE012888BF03F0E2 -:108BB00051FEFFF750FEE1E700F09FF8FEE710B529 -:108BC000044694F8590040B9206B03F0F5FB2046A9 -:108BD000BDE8104003F0F0BB10BD0128F7D002281B -:108BE000FAD000F08AF8FEE70E49C86A006810B9AA -:108BF0004FF0FF3203E0C86AC268D0684268CA66B4 -:108C00007047DFF8F003806A7047DFF8E813886D7B -:108C100008B901207047086F08B90220704700208A -:108C200070470000E0560020FC490020F8B50446DB -:108C300000207CB3E16ADFF8BC53AA6AD36A994288 -:108C400022D2A069002804D4A86AC26AC2F13802FC -:108C5000A2611427DFF8A063606979433144884238 -:108C60000ED100F018F8A96AC86AE062696D814205 -:108C700038BF68654743211DF01903F0FCFB08E08D -:108C8000A86AC16AE16204E0E16CAA6AD36A994207 -:108C900000D20120F2BD201D03F012BC38B50446FD -:108CA000002144B3DFF84C53A86A5022844204D018 -:108CB00082F3118800F024F8FEE7206D20B982F3DA -:108CC000118800F01DF8FEE7E26AE36C401E9A424C -:108CD000206510D078B9FFF7DEFFE26CDFF81833BB -:108CE000E262C2F13800A061686D904238BF6A65E7 -:108CF000FFF7E6FE0121084632BD502080F31188BF -:108D0000BFF34F8FBFF36F8F7047F8B5040034D0B7 -:108D1000206D502220B982F31188FFF7F1FFFEE7A2 -:108D2000E36C994238BF1946E36A8B4225D001288B -:108D300023D1DFF8C052A86A844204D182F311889B -:108D4000FFF7DEFFFEE7A069DFF8AC62E162002812 -:108D50005CBFC1F13801A161142760697B43F11840 -:108D600088420AD1FFF797FFE06A696D814238BFF8 -:108D700068654743211DF01942E1F1BDDFF8741227 -:108D8000886A18B1886A026D521C0265886A704749 -:108D900000F0CDF9284670BD2DE9F04180460F4620 -:108DA00014461D4600F0AAF9DFF84862B06A90F850 -:108DB0005800022811D0B06A416D21EA08014165CE -:108DC0000120B16A81F858003DB10121284600F028 -:108DD000EAF8FFF7E3FCFFF793FF00F0A8F900F0D3 -:108DE0008DF914B1B06A406D2060B06A90F85800F7 -:108DF000022818BF002405D1B06A416D21EA070797 -:108E000047650124B16A002081F8580000F08FF90D -:108E10002046BDE8F08100002DE9F84304460F46E6 -:108E200091461D4601264FF0500824B988F3118859 -:108E3000FFF766FFFEE700F061F900F0A6F8B9F170 -:108E4000040F27D8DFE809F006031E052200616D34 -:108E50000F43676501282FD1FFF71DFFE06A654DBD -:108E6000654B696D814238BF686514225043211DEE -:108E7000184403F000FBA06AA8B188F31188FFF73B -:108E80003FFFFEE7616D491C6165E3E70228E0D121 -:108E9000002611E0616D11F1010FDBD088F311881C -:108EA000FFF72EFFFEE7FFF79FFE00F00DF803D25D -:108EB000FFF774FCFFF724FF00F039F93046BDE8F6 -:108EC000F283000004ED00E0A86AC16AE06A814212 -:108ED000704700002DE9F04704460F4692461D46B4 -:108EE00001264FF0500824B988F31188FFF708FFD6 -:108EF000FEE700F043F9EFF3118988F31188FFF7DB -:108F0000FFFE00F042F8BAF1040F18D8DFE80AF0CB -:108F100006030F051300616D0F43676501282FD10C -:108F2000A06AA8B188F31188FFF7EAFEFEE7616D39 -:108F3000491C6165F2E70228EFD1002620E0616D4F -:108F400011F1010FEAD088F31188FFF7D9FEFEE78F -:108F5000284D286F40B9FFF79EFEFFF7ABFD38BFE5 -:108F60006A6500F01BF802E004F11801284603F0DE -:108F700082FAFFF7A9FF03D2089800B106602E66B7 -:108F800089F311883046BDE8F0870DB1606D286027 -:108F9000022194F8580084F8581070471420424376 -:108FA000211D98187047F8B5124D2F6D0C46A96A0F -:108FB0000646081D03F084FA16F1010F05D124B10D -:108FC000A86A011D05F138001AE0A86AF619466082 -:108FD000BE42A86A05D2011D286BBDE8F44003F02B -:108FE00056BA011DE86A03F052FAE86E864238BFAD -:108FF000EE66F1BDE0560020FC49002004ED00E0E3 -:10900000BDE8F44003F037BA4908490010B5A0F1B3 -:1090100020034FF080749961DC611A600FF2110136 -:1090200059616FF0020140F8241D203810BD000086 -:1090300063494A68502012F1010F06D080F311886D -:10904000BFF34F8FBFF36F8FFEE780F31188BFF33D -:109050004F8FBFF36F8FFEE77CB55A495A4B0A68B2 -:1090600050209A4202D100F082F8FEE70B68574C7C -:10907000A34202D100F07BF8FEE7554A1478019430 -:10908000FF231370072513784D4C8DF800309DF8A1 -:109090000030A56003F05003237006E05B1EA36060 -:1090A0009DF800305B008DF80030A3689DF80050FB -:1090B0002E06F3D4C3F10705042D02D000F057F8B3 -:1090C000FEE71B0203F4E063A36001981070086AD6 -:1090D00040F470000862086A40F07040086200F0D6 -:1090E00081F80020606003F001FC3A48016841F01B -:1090F0004041016003F0EAFB002076BD502080F380 -:109100001188BFF34F8FBFF36F8F2D494A68521CF0 -:10911000012A4A600AD130490A68130606D080F352 -:109120001188BFF34F8FBFF36F8FFEE7704724495D -:10913000486838B9502080F31188BFF34F8FBFF3D0 -:109140006F8FFEE7401E486008BF80F311887047AC -:1091500080B5502000F00BF8FFF7D6FB18B11E4980 -:109160004FF080500860002181F3118801BD80F329 -:109170001188BFF34F8FBFF36F8F7047EFF30580F8 -:10918000502110280E4A0BD3144B185C13789842C8 -:1091900006D281F31188BFF34F8FBFF36F8FFEE7C5 -:1091A00090680F4A136803F4E063984206D281F393 -:1091B0001188BFF34F8FBFF36F8FFEE7704700003A -:1091C0004010002000ED00E071C20F4170C20F415D -:1091D00000E400E034EF00E004ED00E0F0E300E044 -:1091E0000CED00E007480021016081604FF47A73C4 -:1091F00005490A68B2FBF3F35B1E43600721016077 -:10920000704700BF10E000E06410002038B5040093 -:109210000D4602D100F0E1F8FEE7FFF76FFF206C8A -:10922000E16B226800FB01F3491E13444843A3602D -:1092300010440023A363E060626004F144004FF037 -:10924000FF310170417075B92069A0B104F11000BF -:10925000FFF70BFC78B1DFF88C184FF080500860F6 -:1092600000F041FB07E004F1100003F0F7F804F10F -:10927000240003F0F3F8FFF75AFF012032BD7CB55C -:109280001C46502320B983F3118800F02CFBFEE725 -:1092900024B983F3118800F026FBFEE72AB129B92F -:1092A00083F3118800F01FFBFEE769B90093009E6D -:1092B000502E0ED1069B009D012684F84660009436 -:1092C00000F028F8204676BD83F3118800F00BFBF0 -:1092D000FEE783F3118800F006FBFEE7F8B5050012 -:1092E0000E46174602D100F078F8FEE706FB05F0BF -:1092F000503002F0D5FF04000AD0002184F8461057 -:1093000000943B4604F150023146284600F002F832 -:109310002046F2BD38B5049D1C4601B92A462A6094 -:10932000E863296428460121FFF770FF85F84C4067 -:1093300031BD30B1002181600160C1600023002295 -:1093400084E0704710B5024600210120FFF7C6FFF8 -:109350000446FFF7EEFF204610BD1CB500900B46FB -:10936000002200210120FFF78AFF0446FFF7E1FFFA -:10937000204616BD10B5040002D100F02EF8FEE71D -:10938000FFF73FFCA16881420BD1E068401EE0601E -:1093900005D1002300220021204600F057F80120CB -:1093A00010BD002010BD38B504000D4602D100F0FC -:1093B00014F8FEE7FFF725FCA168814204D1E068BC -:1093C000401CE060012032BD2946204600F0E1F952 -:1093D00010B1E168491CE16032BD502080F3118872 -:1093E000BFF34F8FBFF36F8F70471CB50C4613460A -:1093F000502120B981F3118800F075FAFEE7A042F0 -:1094000004D281F3118800F06EFAFEE70221009188 -:1094100000220021FFF733FF00B1846316BD10B5B1 -:109420000C46502120B981F3118800F05CFAFEE768 -:10943000A04204D281F3118800F055FAFEE702221F -:109440000021FFF74BFF00B1846310BD2DE9F64703 -:1094500082B004461E46502714B900F042FAFEE7D7 -:109460005FEA010A01D1206C70B9022E02D1E06BD3 -:1094700001280CD1FFF7C9FB00285ED10398002812 -:109480005BD000F02EFAFEE700F02BFAFEE700F0CA -:1094900028FAFEE7039907F11000FFF7BBFA3846F8 -:1094A00000F0C0FAFFF7D7F918B9C8F8009000F03B -:1094B0001AFAFFF723FEB86BF96B884242D3022EEB -:1094C00040D00398002835D014B900F0F6F90124F3 -:1094D000FFF72DFEFFF7A4F9FFF710FE07F1440098 -:1094E00000F0EEF904BF0022027000F0EEF904BFB4 -:1094F00000224270FFF71BFE00F03CF888BBFFF72C -:10950000FDFDB86BF96B884214BF00250125FFF7FC -:109510000EFE002DBED1384600F084FAFFF79BF90D -:10952000C7E718B1C8F8009000F0DDF9FFF7FFFDBC -:1095300001201CE0FFF7FBFD18E02746002400F0A7 -:1095400023F9B6E732465146384600F023FA796AE5 -:109550000029E6D007F12400FFF787FA0028E1D1BF -:10956000E4E7384600F05EFAFFF775F9002004B032 -:10957000BDE8F08703A96846FFF7AFBA2DE9F843C5 -:109580000446884615461E46502714B900F0A9F92E -:10959000FEE7B8F1000F01D1206C28BB022E02D1EA -:1095A000E06B012823D1FFF7E9FDEFF3118900F00B -:1095B00063F801D3022E22D194F94570A06B324694 -:1095C0004146204600F0E6F917F1010F12D1606A1A -:1095D00098B104F12400FFF748FA002818BF002DC5 -:1095E0000BD00120286008E000F07BF9FEE700F0D6 -:1095F00078F9FEE77F1C84F84570012000E0002028 -:1096000089F31188BDE8F283F8B504460D4650276A -:1096100014B900F066F9FEE7206C10B100F061F9B2 -:10962000FEE7216809B9A068D0B9FFF7A7FDEFF3FD -:10963000118600F021F81BD294F94510401C11F15D -:10964000010FA0630FD1606A80B104F12400FFF71D -:109650000CFA002818BF002D08D00120286005E072 -:1096600000F03FF9FEE7491C84F84510012000E0B6 -:10967000002086F31188F2BD87F31188BFF34F8F66 -:10968000BFF36F8FA06BE16B884270472DE9F74302 -:1096900006460F460024502526B985F3118800F0B0 -:1096A00022F9FEE70FB9306C48B9FFF7AEFA78B986 -:1096B000029868B185F3118800F015F9FEE785F38B -:1096C000118800F010F9FEE700F004F9FFF7C3F885 -:1096D000FFF714FDB56B00F057F825B90298B8B93B -:1096E000FFF725FD4DE03946304600F087F96D1E45 -:1096F000B563306940B106F11000FFF7B6F918B153 -:10970000C8F8009000F0EFF8FFF711FD012039E0F4 -:1097100014B900F0D2F80124FFF709FDFFF780F833 -:10972000FFF7ECFC06F14400415711F1010F04BFB3 -:109730000022027000F0C9F804BF00224270FFF757 -:10974000F6FC02A9FFF717FF0028304610D100F001 -:109750009BF90028B8D000F0BFF800F0BBF8FFF785 -:109760007AF80028B4D1C8F8009000F0BCF8AFE750 -:1097700000F058F9FFF76FF8304600F085F900283F -:10978000A6D00020BDE8FE83DFF858834FF0805953 -:1097900070472DE9F24382B0064600240025502789 -:1097A00016B900F09EF8FEE7306C10B100F099F8A1 -:1097B000FEE7FFF72AFA40B9029830B100F091F8BD -:1097C000FEE700F087F8FFF746F8FFF797FCB06B6D -:1097D000FFF7DAFF28B90298D0B9C5B100F081F8D7 -:1097E000FEE7401EB063306810B9FFF7C7FAB060FB -:1097F000306940B106F11000FFF737F918B1C8F829 -:10980000009000F070F8FFF792FC012053E04FE069 -:1098100014B900F052F80124FFF789FCFFF700F8B3 -:10982000FFF76CFC06F1440000F04AF804BF002288 -:10983000027000F04AF804BF00224270FFF777FC84 -:1098400002A9FFF798FE002830461AD100F01CF953 -:109850000028B6D0306838B9FFF750FCB068FFF781 -:10986000E5F90546FFF763FC00F036F800F032F842 -:10987000FEF7F1FF0028A8D1C8F8009000F033F8F7 -:10988000A3E700F0CFF8FEF7E6FF304600F0FCF863 -:1098900000289AD075B1FFF731FC706A00281DBF0F -:1098A000306B0168C1F138010021B068FFF72DFA73 -:1098B000FFF73DFC0020BDE8FE836846FFF706B9D0 -:1098C00090F9001011F1010F704790F9011011F19A -:1098D000010F70473046A5E0029906F12400FFF71A -:1098E00099B887F31188BFF34F8FBFF36F8F70471D -:1098F0002DE9F84304460F461546502624B986F351 -:109900001188FFF7F0FFFEE70FB9206C70B9FFF781 -:1099100035FCEFF3118886F31188FFF7E4FFA66B9F -:109920004EB9002088F31188BDE8F28386F31188D0 -:10993000FFF7D9FFFEE794F944903946204600F03E -:109940005DF8761E19F1010FA6630CD1206970B184 -:1099500004F11000FFF789F8002818BF002D06D089 -:109960000120286003E009F1010084F8440001208F -:10997000D8E710B5040002D1FFF72FFDFEE700F095 -:109980009EF894F8460020B92046BDE8104002F049 -:1099900013BD10BDF8B506461546B46B326C0027F2 -:1099A00042B9316831BBB068FFF778F9002107464A -:1099B000B1601FE065B97068FAF7C2FF7068316C7A -:1099C0000844B1687060884214D33068706011E058 -:1099D000F068FAF7B5FF306CF16840420144F1607D -:1099E0003268914202D2B1680844F060022D01D180 -:1099F00004B1641E641CB4633846F2BD026C002AD4 -:109A00000B4600D1704710B5C16884681144C1602D -:109A1000A14224BF0168C160C168BDE8104018467A -:109A2000FAF78EBFF8B50546FFF768FB05F1440469 -:109A300094F9016070B2012815DB686A98B105F1EC -:109A40002400FFF712F808B1FFF776F8761EF1E769 -:109A50002869A0B105F11000FFF707F808B1FFF77A -:109A60006BF87F1E08E04FF0FF366670FFF75FFB74 -:109A7000FFF744FB94F9007078B20128E8DA267009 -:109A8000BDE8F140FFF753BB10B50446FFF736FBC6 -:109A9000A06B441EA441FFF74AFBE00F10BD10B5B8 -:109AA0000023114C54F833201AB15B1C082BF9D356 -:109AB00010BD44F8331004EBC301486010BD10B56D -:109AC0000021094A02EBC1035C68844203D0491CAF -:109AD0000829F7D310BD002042F83100586010BDAE -:109AE0000000000004ED00E0585B0020F8B50446DB -:109AF0000D461646FFF702FB04F1380797F90C00F4 -:109B000010F1010F04BF0021397397F90D0010F116 -:109B1000010F04BF00217973FFF709FB386828B9EA -:109B20003246294604F12400FEF785FF2046BDE8B1 -:109B3000F24077E70C48002101604160704710B5A2 -:109B400000F00CF85C6819B1012904D1204301E050 -:109B500024EA0000586082F3108810BDEFF31082F1 -:109B600072B6014B70470000AC5C002002F021FF90 -:109B70009DF80E0005B000BDF8B500F10C026B4673 -:109B800024214FF66640F1E7F8B500F10C026B4670 -:109B90000F214FF66840E9E7E0B505A004210090E9 -:109BA0008DF8041042F62920694600F048FE07BDF2 -:109BB00053544D0010B50078344C18B102280FD022 -:109BC00004D310BDA0800120207310BD607B00F085 -:109BD0008DFA607BBDE8104040F6010100F0D5BA77 -:109BE000607BBDE8104000F081BA10B50FF2A8020A -:109BF0000FF24500254C0021FBF7F8F9244A1060CC -:109C00000020207321460420207042F6382001F005 -:109C10004FF81F20E07204F10D010A20A0800120FE -:109C2000A0724FF48060E0800122BDE810400FF286 -:109C30005103002000F034BA70B542F63724134DBA -:109C4000144E4FF0FF3200210120FBF74DFA30682F -:109C5000E97A00F00700413068800A07287B04D4C5 -:109C6000012807D10020287304E00028F8D1A88833 -:109C7000401DA880A91C204601F01AF8E1E7000069 -:109C8000034800680121FBF7FDB90000445C002097 -:109C9000E85C002028280040DCFF000800000000ED -:109CA0000000000000000000000000008002000032 -:109CB000000000000000000000000000DFF83C157C -:109CC0000A6892B200E00246086880B28242FAD185 -:109CD00070472DE9FC4104461825DFF82485DFF89C -:109CE0002465684308EB00073078062808D13178EE -:109CF0007170347078754FF0FF307060002039E07B -:109D000000F077F8B9680918B96008F10803B96874 -:109D100032786A439A589142327813D308F1150386 -:109D200015FB02FC13F80C30062B25D008F10806B1 -:109D30006B43F358994222BF08F115036A439A5CBA -:109D4000EED219E01146337869439A420BD008F1FC -:109D5000140308F1150C5B5C15FB03F50CF80540CA -:109D60007A753B7500E07A7508F114025454317825 -:109D700071703470BDE8F6811146694308F115032E -:109D80005B5C062B04D008F1140615FB03F5745533 -:109D90007B753A7508F115025454EBE7F8B5DFF816 -:109DA0006434DFF85C541E78182402466243B042E3 -:109DB0002A4404D118785870507D18700FE0167D31 -:109DC000507D92F815C005F115076643062807F87F -:109DD00006C004D0167D143514FB00F42E55012066 -:109DE00010731878062802BF00294FF0FF31596020 -:109DF000F1BD10B5DFF80C44606810F1010F0FD011 -:109E0000FFF75CFF6168DFF80024814261683CBFB6 -:109E10005388C918081A517848431178C84000E09F -:109E2000002080B210BD2DE9F84FDFF8DC53DFF8D9 -:109E3000DCB3D5F80880D8F80000DBF800104A053C -:109E400000F090F9DFF8BC63DFF8B4A321F480617F -:109E500081604FF0180934780AF1080019FB04F109 -:109E60004758FFF7C6FF874217D200270121B1707C -:109E7000062C3DD019FB04F40AF108010AF108028E -:109E80000959814223BF0AF108010959091A002121 -:109E900011510AEB04014C7DEAE7A9884118B94247 -:109EA00002D2AF880021E2E73F1ADFE7022802DA98 -:109EB0002878012800D07F1ED8F80000C1684A0722 -:109EC000FAD500F055F9DBF80C00000CBFB247EAF8 -:109ED0000047CBF80C70FFF7F1FE7060A8680068CF -:109EE000816841F480618160AFF30080BDE8F18F4B -:109EF000B8B20028DAD1FFF7E1FE70600320BDE8B8 -:109F0000F24F02F0F9BD2DE9F843EFF3108872B675 -:109F1000BD4DBB4BA8680168CA224A625320486203 -:109F2000B84A886820F48060886018201678374620 -:109F300047431F44387B022826D13C68D7F810904D -:109F40009078F0B17A7B012A0AD101213046FFF7DF -:109F500025FF88F310887968304600F016F904E090 -:109F600088F31088304600F0C1F8A8680068CA215C -:109F700041622246532141624846314600F050F981 -:109F80000BE0FFF750FF06E0C8684207FCD500F081 -:109F90007EF89F49086088F31088FF21A86802684E -:109FA0005162BDE8F183F8B5974CA160CA220968F7 -:109FB0004A6253224A62954A136843F020031360B1 -:109FC000136803F00703C3F10403237095682D0C95 -:109FD00005F07F056D1C6570EDB29268C2F30E024C -:109FE000521C628092B2521E6A43A2F5A072DA40FD -:109FF0004FF6FF739A422CBFA380A280854A136854 -:10A0000043F400231360844B1D6845F400251D6054 -:10A0100048BB7C487A4E0123837018254FF0FF33EC -:10A02000436000235FFA83FC06F10C0715FB0CFC70 -:10A030004FF0000E07F80CE05B1CDFB2062FF1DBDF -:10A0400006230370886820F48060886000F01FF8A1 -:10A05000D060032002F05BFDA1680868826842F4CA -:10A060008042826005E0C868410544BF032002F0D9 -:10A0700043FDA1680A68FF205062002206210320E8 -:10A0800002F002FDBDE8F240032002F01BBDC868EB -:10A0900000F0800060F49060C8604FF400207047CA -:10A0A000F0B504460025EFF3108672B61827DFF8E6 -:10A0B00050C10CF10C0007FB05FE10F80E0010B1AA -:10A0C0006D1C062DF5DB062D0CD06F430CEB070045 -:10A0D0000127077386F310880461427303600D70D3 -:10A0E0000020F0BD86F310880120F0BDF8B50746CA -:10A0F000EFF3108472B6032002F0EFFC424DAE681D -:10A100003068CA2141623A465321416218204349CE -:10A110004243895C02291BD100213846FFF73EFEED -:10A120003848017806290ED1306838490A68530545 -:10A1300000F018F821F480618160C1684A07FCD5FD -:10A1400000F016F804E04078884218BFFFF76BFE75 -:10A15000A9680A68FF205062032002F0B3FC84F370 -:10A160001088F1BD02D5C1684A07FCD481687047E8 -:10A17000C16801F0800161F49061C1604FF400207A -:10A1800023490860032002F0C2BC2DE9F04180465B -:10A190000F46424618201A4942438C18207B022859 -:10A1A00004BF4046FFF7A2FFEFF3108572B603200D -:10A1B00002F093FC144EB0680068CA21416253213A -:10A1C000416202202073A76067604046FFF781FD6F -:10A1D0000C490A784978914202D0FFF724FE02E048 -:10A1E000A168081AA060FF20B1680A6850620320C5 -:10A1F00002F068FC85F31088BDE8F0812828004053 -:10A200009C580020DC5C0020905C00200828004066 -:10A210000C0800580008005880080058A858002072 -:10A22000104700B587B000F072F900F0B2F9812054 -:10A2300000F068F900F0C4F900284CBFFF209DF839 -:10A24000000007B000BD2DE9F84DC7B09446DDF819 -:10A2500040E1519A559D569EDDF84CA1ADF81D1078 -:10A260008DF81C004FF0000BADF81FC08DF82130A9 -:10A270008DF822E000F024F800F017F824F8095FC8 -:10A28000668000F086F93F20832100F0B4F957443E -:10A2900006910D37049700F096F900284CBFFF2077 -:10A2A0009DF8000048B0BDE8F08D88F800A007AC2C -:10A2B0005499E419524608F101005444FAF7A1BD3B -:10A2C0008DF82320174652998DF800B00DF124081F -:10A2D00009A8B844FAF795BD00B5C7B000F00CF86E -:10A2E000852000F0C3F800F06BF900284CBFFF2078 -:10A2F0009DF8000047B000BD00218DF81C008DF8CE -:10A300000010182201A8FAF782BD2DE9F841C7B064 -:10A310004FF0000800F026F80DF12300DDF844E1CD -:10A320004E9F4F9E509D529C8DF81F30C0F800E00C -:10A330008DF800808DF820708DF821608DF8225006 -:10A340008DF8274000F025F98620ADF8060007A912 -:10A350000C2000F031F900284CBFFF209DF80000D0 -:10A3600000F07BB98DF81C0007A84170827070471F -:10A3700000B5C7B00022ADF81C008DF800200DF12B -:10A380001E001822016001A80021FAF740FD882074 -:10A39000ADF8060007A9062000F00EF900284CBF12 -:10A3A000FF209DF8000047B000BDF8B5C8B00546D5 -:10A3B0000E4617461C4600F023F808A84670877022 -:10A3C0008DF8205000F012F98A21ADF80A103F20D4 -:10A3D000032100F0FEF8002848BFFF200ED49DF8AE -:10A3E000000058B94F994E98BDF801202280BDF861 -:10A3F00003200280BDF805000880002049B0F0BDB0 -:10A40000072200216846FAF702BD00B5C7B0002157 -:10A41000ADF81C00FFF773FF0F2102918D20022180 -:10A4200000F0BDF800F0CDF800284CBFFF209DF8EB -:10A43000000047B000BD18B5C7B0044600F067F88B -:10A440008DF81C40224600F0F6F800F0A2F83F20FC -:10A450008E2100F005F9641C049400F0B4F8002883 -:10A460004CBFFF209DF8000048B010BDADF80600BD -:10A4700007A901203F2203910490704778B5C7B027 -:10A4800006460C4615460322FFF7BBFFADF81C60DD -:10A4900000F07FF8902100F01AF80221ADF80400D6 -:10A4A000049107A803210390069100F08CF800287E -:10A4B00048BFFF2009D49DF8000030B99DF8010085 -:10A4C00020709DF802002870002048B070BDADF8E3 -:10A4D00006103F207047ADF8060007A9022070471C -:10A4E00000B587B000F013F800F053F8922000F0A8 -:10A4F00009F800F065F800284CBFFF209DF8000027 -:10A5000007B000BDADF806003F22012070470020D3 -:10A510008DF80000704700B5C7B000F033F80F2188 -:10A520000291932000F03AF800F04BF800284CBF5D -:10A53000FF209DF8000047B000BD00B587B0FFF7D1 -:10A54000E6FF00F026F89420FFF7DCFF00F038F873 -:10A5500000284CBFFF209DF8000007B000BD00B5EB -:10A56000C7B00021ADF81C00FFF7C9FE9520FFF72A -:10A57000B2FF00F021F800284CBFFF209DF800003A -:10A5800047B000BD00228DF80020ADF81C008DF80A -:10A590001E101822002101A8FAF739BC0321ADF8DA -:10A5A0000600049107A801213F22039006917047FD -:10A5B000ADF8060007A9032004903F220120039173 -:10A5C0000690ADF80420CDF814D0002101A8FDF7C5 -:10A5D000FEBBADF80800059108A80721049007917B -:10A5E000CDF818D0002102A8FDF7F1BB18220021F8 -:10A5F00002A8FAF70CBCADF80400ADF8061007A8E5 -:10A6000001210390704700B5C7B000F00EF8FFF7C6 -:10A61000C0FFA42100F03FF8FFF7D5FF00284CBF92 -:10A62000FF209DF8000047B000BD00228DF80020FB -:10A630008DF81C0006220DF11D00FAF7E2BB00B5F3 -:10A64000C7B0FFF79FFFA520FFF7B2FF00284CBF60 -:10A65000FF209DF8000047B000BD48B0BDE8F08184 -:10A66000ADF80400ADF8061007A80121039006918B -:10A67000704700B5C7B0FFF7D8FFFFF78AFFAA21E0 -:10A6800000F009F8FFF79FFF00284CBFFF209DF85E -:10A69000000047B000BDADF806103F200721ADF81F -:10A6A0000400049107A8012103900691704700005F -:10A6B00001460648064AC3798B4218BF904218BF2C -:10A6C0000838F8D18B4218BF00207047F873FF1F7D -:10A6D0000070FF1F18B50C46C7B0114600228DF858 -:10A6E00000208DF81C008DF81D4022460DF11E0043 -:10A6F000FAF787FB00F02AF83F200C21ADF80400A0 -:10A70000ADF8061007A8012103900691A41C04943B -:10A7100000F02CF800284CBFFF209DF8000048B046 -:10A7200010BD00B5C7B000F00AF80F2000F013F814 -:10A7300000284CBFFF209DF8000047B000BD00225C -:10A740008DF800208DF81C008DF81D1018220021B6 -:10A7500001A8FAF75CBBADF8060007A90220049037 -:10A760003F22012003910690ADF80420CDF814D0CB -:10A77000002101A8FDF72BBB2DE9F841384D0FF260 -:10A7800004180FF2EC060FF2DC070020286087B0F7 -:10A7900041F60A00ADF8180000950323012206A92E -:10A7A0000120FAF737F90400404609D1FAF776FBA1 -:10A7B0000146872300F03FF829880FF2241008E0B3 -:10A7C000FAF76CFB01468C2300F035F821460FF2B6 -:10A7D0005010FAF7A1F842F62920ADF8180001222E -:10A7E00004920A20A91C03900023022205910293DF -:10A7F000019300922023288806AA0121FAF759F92B -:10A800000400404609D1FAF749FB0146A22300F0B3 -:10A8100012F869880FF2481008E0FAF73FFB01468A -:10A82000A72300F008F821460FF27010FAF774F829 -:10A8300008B0BDE8F0813A463046FAF76DB880B509 -:10A8400042F62922904209D10A6805480092002266 -:10A850000B7941880088FAF786F902BD002002BD15 -:10A86000005D00204449535F496E69740000000098 -:10A870000D0A205B25735D5B25735D5B25645D20A0 -:10A8800000000000433A5C424C455F444F52595F20 -:10A890005061636B616765735C53544D333243752C -:10A8A00062655F46575F57425F56312E31312E3019 -:10A8B0005243345C4D6964646C6577617265735CA6 -:10A8C00053545C53544D33325F5750414E5C626C6D -:10A8D000655C7376635C5372635C6469732E6300BA -:10A8E00044657669636520496E666F726D6174694F -:10A8F0006F6E205365727669636520284449532939 -:10A9000020697320616464656420537563636573B3 -:10A910007366756C6C7920253034580A000000008D -:10A920004641494C454420746F206164642044656D -:10A930007669636520496E666F726D6174696F6ECA -:10A9400020536572766963652028444953292C2079 -:10A950004572726F723A20253032582021210A0048 -:10A960004D616E756661637475726572204E616DBE -:10A9700065204368617261637465726973746963A9 -:10A980002041646465642053756363657373667501 -:10A990006C6C79202025303458200A004641494CFF -:10A9A000454420746F20616464204D616E7566615A -:10A9B000637475726572204E616D652043686172C3 -:10A9C000616374657269737469632C204572726F78 -:10A9D000723A20253032582021210A002DE9F04119 -:10A9E000054686B068780024FF2861D1B5F80310C9 -:10A9F0000FF208360FF2EC280FF21430B74F40F682 -:10AA00000142891A2BD0123952D1FAF747FA01467E -:10AA10007123424600F049F90FF25030F9F77CFFFC -:10AA2000FA88B5F80710521C914241D1AB7AB5F8BB -:10AA300005006A7A0124012B08D100920A3501959C -:10AA400000230022FAF795F900202CE005F10A0313 -:10AA50000193009280230122FAF78BF928E07A888B -:10AA6000B5F80710921C914222D1697B0124CA07D4 -:10AA70000DD5FAF713FA0146A323424600F015F963 -:10AA80000FF21030F9F748FF8DF808400DE0FAF7A3 -:10AA900005FA0146A923424600F007F90FF23830C3 -:10AAA000F9F73AFF02208DF8080002A8FFF782F8B4 -:10AAB000204606B0BDE8F081FEB5014601AA487AFD -:10AAC0008DF804004B7A08885070DC0704D508889C -:10AAD000000A9070032300E00223487A040707D598 -:10AAE0004888D0545B1C4888DCB2000A10555B1CB7 -:10AAF0004C7AE00610D50D7A00200BE001EB400403 -:10AB0000DFB2A688D6555B1CA488DEB2240A945511 -:10AB10005B1C401CA842F1DB01A970480091DBB22C -:10AB2000418800880022FAF71EF8FEBD2DE9F841A1 -:10AB300087B06B48694D0FF2D8180FF2C0160FF2AC -:10AB4000DC27FCF79BF841F60D01ADF818100095D5 -:10AB50000823012206A90120F9F75CFF0400404602 -:10AB60000AD1FAF79BF9014640F2B31300F09CF8C2 -:10AB700029880FF2B42009E0FAF790F901464FF462 -:10AB8000DC7300F091F821460FF2D420F9F7C4FEEF -:10AB900042F63720ADF81800012204920A20A91CC1 -:10ABA0000390002310220591029301930092072342 -:10ABB000288806AA0121F9F77CFF040040460AD143 -:10ABC000FAF76CF901464FF4EA7300F06DF8698802 -:10ABD0000FF2C42009E0FAF761F9014640F2D913F7 -:10ABE00000F062F821460FF2F420F9F795FE42F6E4 -:10ABF0003820ADF8180000220492029201920A2037 -:10AC0000291D03900222059100F047F804004046F8 -:10AC10000AD1FAF743F9014640F2EF1300F044F885 -:10AC2000A9880FF2003009E0FAF738F901464FF42D -:10AC3000FA7300F039F821460FF22430F9F76CFE70 -:10AC400042F63920ADF818000022049201920A2041 -:10AC5000A91D0390022308220591029300F01DF81C -:10AC6000040040460AD1FAF719F9014640F20923D7 -:10AC700000F01AF8E9880FF2283009E0FAF70EF927 -:10AC8000014640F20E2300F00FF821460FF2483043 -:10AC9000F9F742FE08B0BDE8F08100920123288850 -:10ACA00006AA0121F9F705BF3A463046F9F734BE46 -:10ACB00080B5002242F63723C01A09D0401E0BD1BE -:10ACC00006480091012381880088F9F74CFF02E0D3 -:10ACD0000846FFF7F1FE0246104602BDD45C002094 -:10ACE000DDA9000848656172526174655F4576654B -:10ACF0006E745F48616E646C657200000D0A205BC3 -:10AD000025735D5B25735D5B25645D20000000009D -:10AD1000433A5C424C455F444F52595F5061636B0C -:10AD2000616765735C53544D3332437562655F46AA -:10AD3000575F57425F56312E31312E305243345CCB -:10AD40004D6964646C6577617265735C53545C53E0 -:10AD5000544D33325F5750414E5C626C655C737684 -:10AD6000635C5372635C6872732E63004143495F96 -:10AD7000474154545F57524954455F5045524D49DD -:10AD8000545F5245515F56534556545F434F4445B7 -:10AD90000A0000004143495F474154545F41545405 -:10ADA0005249425554455F4D4F4449464945445FD9 -:10ADB00056534556545F434F4445204852535F4EC7 -:10ADC0004F54494649434154494F4E5F454E4142D5 -:10ADD0004C45440A000000004143495F4741545438 -:10ADE0005F4154545249425554455F4D4F44494682 -:10ADF0004945445F56534556545F434F44452048A8 -:10AE000052535F4E4F54494649434154494F4E5F58 -:10AE100044495341424C45440A0000004852535FA4 -:10AE2000496E6974000000004865617274205261C7 -:10AE300074652053657276696365202848525329EA -:10AE4000206973206164646564205375636365736E -:10AE50007366756C6C7920253034580A0000000048 -:10AE60004641494C454420746F2061646420486524 -:10AE700061727420526174652053657276696365EE -:10AE80002028485253292C204572726F723A20258F -:10AE90003032582021210A004865617274205261C5 -:10AEA0007465204D6561737572656D656E742043C0 -:10AEB0006861726163746572697374696320416467 -:10AEC000646564205375636365737366756C6C7930 -:10AED000202025303458200A000000004641494C0B -:10AEE000454420746F206164642048656172742059 -:10AEF00052617465204D6561737572656D656E7420 -:10AF00002043686172616374657269737469632C4C -:10AF1000204572726F723A20253032582021210A62 -:10AF20000000000053656E736F72204C6F63617494 -:10AF3000696F6E20436861726163746572697374CE -:10AF4000696320416464656420537563636573734A -:10AF500066756C6C79202025303458200A0000007A -:10AF60004641494C454420746F2061646420536518 -:10AF70006E736F72204C6F636174696F6E204368EB -:10AF80006172616374657269737469632C204572C0 -:10AF9000726F723A20253032582021210A000000B9 -:10AFA000436F6E74726F6C20506F696E74204368CB -:10AFB000617261637465726973746963204164646A -:10AFC0006564205375636365737366756C6C792073 -:10AFD0002025303458200A004641494C454420740D -:10AFE0006F2061646420436F6E74726F6C20506FC9 -:10AFF000696E742043686172616374657269737409 -:10B0000069632C204572726F723A202530325820C5 -:10B0100021210A00704700000278C9B28A421AB1A1 -:10B020001CBF10F8012FF9E718BF0020704700007F -:10B0300080B508B90FF21C0005490B681BB122222C -:10B040000021984701E001F07DFD222002BD0000B3 -:10B05000F85C0020636F6E73747261696E742068AF -:10B06000616E646C65723A20626164206D65737311 -:10B0700061676500C9B2830706D0521E22D310F85B -:10B08000013B9942F7D11FE0083A13D302F10402C1 -:10B0900041EA012141EA014150F8043B121F21BF5E -:10B0A0004B40A3F1013C2CEA030C1CF0803FF3D091 -:10B0B000C9B2001F083210F8013B521E28BF91EAA6 -:10B0C000030FF8D818BF0120401E7047B3BBD9B199 -:10B0D000B2F5803F7DD2022A1ED98C46B1FBF2F137 -:10B0E00002FB11C31B0443EA1043B3FBF2FC02FB57 -:10B0F0001C3380B240EA0343B3FBF2F002FB103290 -:10B1000040EA0C4000237047022A05D98446B0FB70 -:10B11000F2F002FB10C270474AB105D100F0010203 -:10B1200049085FEA3000704700220023704701F0B1 -:10B130000DBD0B000200002100207047904271EB12 -:10B14000030CF6D3B3F5803F2FD2F0B5B3FA83F7F3 -:10B15000B1FA81F4A7F10F0E3D1B5340CEF120064A -:10B1600002FA0EF2F3415340B5F10F0746D80F3CF7 -:10B170002C444140C4F12006A040F1414140B1FBC4 -:10B18000F3F603FB1611A2FB0645001BA94102D2F0 -:10B19000761E8018594180EA010221FA0EF362FA04 -:10B1A0000EF200215A403046F0BD30B4B1FBF3FC42 -:10B1B00003FB1C11A2FB0C45001BA94103D2ACF1FF -:10B1C000010C8018594130BC02460B4660460021F4 -:10B1D0007047B2F1807F65D3F0B5B2FA82F7B1FA69 -:10B1E00081F4C7F10F063D1B22FA06F307F1110E99 -:10B1F000F24120355A40B5F10F07B8D94140C4F1AA -:10B200002006A040F1414140B1FBF3FC03FB1C11BF -:10B21000A2FB0C45001BA94103D2BCF1010C801814 -:10B2200059410F2F12D30F3FC90341EA5041B1FBDF -:10B23000F3F603FB1611A2FB0645D4EBC030A9417F -:10B2400002D2761E8018594146EACC3C07B34140F1 -:10B25000C7F12006B840F1414140B1FBF3F603FBD2 -:10B260001611A2FB0645001BA94102D2761E8018CA -:10B27000594180EA010221FA0EF3C7F1200462FA73 -:10B280000EF20CFA07F05A402CFA04F13043F0BDEC -:10B2900080EA010221FA0EF3002162FA0EF2604602 -:10B2A0005A40F0BD8C46B1FBF2F102FB11C31B0208 -:10B2B00043EA1063B3FBF2FC02FB1C331B024CEAB3 -:10B2C000002043EA1063B3FBF2FC02FB1C331B02B9 -:10B2D0004CEA002043EA1063B3FBF2FC02FB1C3390 -:10B2E0001B024CEA002043EA1063B3FBF2FC02FBB2 -:10B2F0001C324CEA0020002370470000B0B581EA00 -:10B30000030C0CF0004C40F2FF7515EA11541DBF00 -:10B3100015EA1357AC42AF4239E0E41923EA45532A -:10B3200043F48013C90241F0004141EA505EC70274 -:10B330001100A7FB020200284FF00000EEFB0120E5 -:10B340004FF00001E3FB072118BF42F00102401853 -:10B3500000214941E3FB0E01A4F580640F0302D2F2 -:10B3600052004041494154F101046CDD470872F13B -:10B37000004250F1000051EB0451A1F580115CBF77 -:10B3800041EA0C01B0BD4CEA05510020B0BD05EA10 -:10B390001357AC4214BFAF4241E050EA410E1CBF0C -:10B3A00052EA430E02E061460020B0BD24423C4414 -:10B3B0001BD15FEA070EF6D0090302BF0146002049 -:10B3C000AEF1140EB1FA81F7AEEB070401FA07FEF5 -:10B3D0000C37C7F1200100FA07F7C8404EEA000E0B -:10B3E00023EA455343F48013A2E733F00043B3FA52 -:10B3F00083F704BFB2FA82FE77440B3FE41BB7F138 -:10B40000200E2FBF02FA0EF3BB40C7F1200E22FA26 -:10B410000EFE38BF43EA0E03BA40641C82E750EACE -:10B42000410E14BF52EA430E6FF000014FF40017B3 -:10B4300017EB430F8ABF194617EB410FB5E74CEAEC -:10B4400005510020B0BDD4F10104B4F120070FDA9A -:10B45000C4F12007520828BF42F0010210FA07F594 -:10B4600001FA07F7E1BF2A43E0403843E1400FE02B -:10B47000352C98DCC7F1200452EA400220FA07F28A -:10B4800018BF42F0010231FA07F0A1400A4300213F -:10B4900072F1004250F1000051EB0C01B0BD000010 -:10B4A00010B5144600F002F8226010BDC1F30A5333 -:10B4B00043B14A0012F5001F28D2A3F2FE32A1EBDD -:10B4C0000251704750EA410C20D001F0004C31EAA3 -:10B4D0000C01B1FA81F204BFB0FA80F3D2180B3A32 -:10B4E000B2F120032CBF00FA03F1914041EA0C01B4 -:10B4F0003EBFC2F1200C20FA0CF319439040524297 -:10B5000040F2FD33D21A01EB03517047002270471D -:10B510004FF4001C1CEB410F94BF1CEB430F09E0E0 -:10B5200041EA030C50EA4C0C52EA0C0C03D299424B -:10B5300008BF9042704714BF8B42824270470000A0 -:10B540004FF4001C1CEB410F94BF1CEB430F09E0B0 -:10B5500041EA030C50EA4C0C52EA0C0C03D28B4229 -:10B5600008BF8242704714BF994290427047000062 -:10B57000124254D440F2FF7C1CEA11530FD06345B1 -:10B5800031D09B1863453CBF01EB0251704701F07D -:10B59000004141EA0C510020AFF30080704750EAAF -:10B5A000410320D001F0004C91EA0C011CD0B1FA0B -:10B5B00081F30B3B9A420DD9D21A994051EA0C0102 -:10B5C000C3F1200C20FA0CFC61449840531C40F25B -:10B5D000FF7CD7E7914041EA0C01C2F1200C20FA30 -:10B5E0000CF3194390407047B0FA80F31533202BC9 -:10B5F000E0D3202AEED3203A203B9A4209D9D21A2E -:10B6000000FA03F141EA0C010020531C40F2FF7CD8 -:10B61000B8E700FA02F141EA0C01002070475242FB -:10B6200040F2FF7C1CEA11530DD06345DBD0B2EB36 -:10B63000030C3CBFA1EB025170470CF1010221EA5F -:10B64000035141F4801150EA410CCCD001F0004C80 -:10B65000352A27DC30B481EA0C01B2F1200309DA83 -:10B66000C2F12003044601FA03F5D0402843D1403B -:10B670009C400CE0C3F12002450020FA03F418BFFF -:10B6800044F0010421FA03F091400C43002174F1CD -:10B69000004550F1000051EB0C01244230BC7FF416 -:10B6A0007BAF70476146002076E70000C1F30A5384 -:10B6B00040F2FE329B1A14DDD3F120034FEAE1720F -:10B6C00008DDC90241EA505141F00040D8408018DD -:10B6D0005040704703F2E13010B1D24382F0004095 -:10B6E0007047002070470000C11768B14840401AF9 -:10B6F000B0FA80F29040D21CC907C2F5846241EAD8 -:10B70000025202EBD02140057047000070B44FF0A8 -:10B71000004591EA030F41F11B826B40841A71EBE3 -:10B72000030603D2001BB141121973414FF4001CF0 -:10B730001CEB410F34BF7CEB430442E00C0DA4EB47 -:10B740001356352E4FDC45EAC323DB0A45EAC121F7 -:10B75000C912B6F120050DDD63FA05F6EB4086EA65 -:10B760000305124218BF45F00105C01851F1000150 -:10B770000CD213E062FA06F5F2405540F3415A400C -:10B78000B340F3405A408018594107D349085FEA53 -:10B7900030005FEA350528BF45F0010501F580114D -:10B7A000420875F1004250F1000041EB04514E0097 -:10B7B00016F5001F70BC38BF70470020090D090541 -:10B7C00070471CEB410F10D252EA43060BD0BCEB82 -:10B7D000410F05D80C0DAB43661E342EB6DD02E0DA -:10B7E000AB438018594170BC704770BC7047000073 -:10B7F000F0B540F2FF7581EA030C0CF0004C15EA3D -:10B8000011541DBF15EA1357AC42AF42E5E0BC41ED -:10B81000C1F31301C3F31303801A994143F4801356 -:10B8200004D2641E4000494180185941C90241EACE -:10B830005051B1FBF3F603FB1611A2FB0675D7EBD3 -:10B84000C020A94102D2761E80185941C90241EA9E -:10B850005051B1FBF3FE03FB1E11A2FB0E75D7EB9B -:10B86000C020A94103D2AEF1010E801859418902CE -:10B8700041EA9051760546EA8E2EB1FBF3F603FBC2 -:10B880001611A2FB0675D7EB8020A94102D2761EC5 -:10B8900080185941C90241EA50514EEA060EB1FBE7 -:10B8A000F3F603FB1611A2FB0675D7EBC020A941E6 -:10B8B00002D2761E80185941C90241EA5051B1FBAB -:10B8C000F3F703FB1711A2FB0735D3EBC020A94107 -:10B8D00067F100070CBF004247F0010766F3D52768 -:10B8E0004FEA1E31B80814F5806412DDBD0775F10A -:10B8F000004250EB0E5051EB045111F5801F5CBF1C -:10B9000041EA0C01F0BD4CF07F6141F0E0410020C4 -:10B91000F0BDBD076D0840EA0E5041F48011D4F12E -:10B920000104B4F120060ADAC4F120060200E04066 -:10B9300001FA06F3E1401843B24015430EE0342CFF -:10B9400013DCC6F1200445EA40056D0820FA06F232 -:10B95000154321FA06F0A1400D43002175F1004284 -:10B9600050F1000051EB0C01F0BD00205FEA0C012A -:10B97000F0BDCFB992185B41B3FA83F704BFB2FAB6 -:10B9800082F6BF190B3FB7F120062FBF02FA06F36C -:10B99000BB40C7F1200622FA06F638BF3343BA404F -:10B9A0001CB1E419641E33E77F4231F00041B1FA63 -:10B9B00081F404BFB0FA80F6A4190B3CB4F1200660 -:10B9C0002FBF00FA06F1A140C4F1200620FA06F6C6 -:10B9D00038BF3143A0403C1B1AE7AC421ABF05EA0E -:10B9E0001357AF4212E050EA41061CBF52EA430629 -:10B9F000BFE750EA4107304661461CBF41EA0551A6 -:10BA0000F0BD52EA430C08BFC143F0BD00204FF423 -:10BA1000001616EB410F98BF16EB430F08BF16EB4D -:10BA2000410F24BFC14305E016EB430F0CBF614635 -:10BA30004CEA0551F0BD0000400D491840EA812054 -:10BA40000CD2490DA1F58061491C40F0004005DB96 -:10BA5000D1F11F0154BFC840C01770470020704784 -:10BA6000014648B1B0FA80F18840C91CC1F5846133 -:10BA7000090501EBD02140057047000001487047DF -:10BA800000000000601100200249016002490161CC -:10BA9000704700BF5BBB000881BB000800604060CE -:10BAA0007047EFF3108172B6026882420CBF01202A -:10BAB00000201CE0EFF3108272B603680B60486050 -:10BAC00001600868416023E0EFF3108272B60860FD -:10BAD00043684B6041604868016019E0EFF31081F2 -:10BAE00072B642680368136002684368536081F36A -:10BAF0001088704710B5EFF3108472B602680A60C0 -:10BB00000068FFE7FFF7EAFF84F3108810BD0B60C1 -:10BB100082F310887047000001F042B96C486D490B -:10BB2000016001F12002426001F13002826001F106 -:10BB30003C02026201F14402426201F14C02C26025 -:10BB400001F15402026101F17002426101F17402DB -:10BB500082618031C16101F041B938B504465E4D62 -:10BB60002846FFF79BFF5A484068A1680160E168DA -:10BB7000C16085605949416001F04CF958482AE09C -:10BB800080B553484268136801211972406801F07A -:10BB900047F9002002BD38B5514C4F4D04E000F08C -:10BBA00041F80098216888472846FFF77AFF002867 -:10BBB000F5D031BD4A484168084738B50446494D7B -:10BBC0002846006040604248C068A1680160456046 -:10BBD00001F02BF944482168016061684160002050 -:10BBE00032BD80B53A48C268136810211972C06826 -:10BBF00001F021F9002002BD35483B4AC168C16807 -:10BC000013680868184738B5374C364D04E000F023 -:10BC100009F80098616888472846FFF742FF002826 -:10BC2000F5D031BD69462846FFF764BF38B50446F4 -:10BC30002E4D2846FFF732FF2D4800604060244813 -:10BC40000069A1688160E168C160056121680160E7 -:10BC500061684160216941616169816131BD80B57F -:10BC600001462348FFF730FFBDE802400FF2050010 -:10BC700001F0F1B838B5164C1D4D06E0FFF7D2FFC4 -:10BC8000009920690069FFF71FFF2846FFF709FFA9 -:10BC90000028F3D031BD10B5164C2046006040603E -:10BCA0000B4841690C60BDE8104001F0E8B81CB5D4 -:10BCB000104C06E069462046FFF71CFF0098C0467E -:10BCC000C0462046FFF7EDFE0028F3D013BD00006C -:10BCD00000000320AC090320480A03209008032039 -:10BCE000BC5C0020500A0320C45C0020380A0320FA -:10BCF000B45C0020400A0320134810B5016841F4E9 -:10BD000080710160032000F0B2FE002001F0D0F845 -:10BD10000024002814BF012401F011F9204610BDB1 -:10BD20000A4880687047094800787047084805E06D -:10BD30000748016841F0020101607047016841F065 -:10BD40000101016070470000004000584C100020C5 -:10BD5000042004E02DE9F84F4FF00009644A654BD8 -:10BD60004FF00F0805460E4633E0634FBD4214BF47 -:10BD7000072704278F4027434CF82E70C1431C68C7 -:10BD800001EA040C7468E40348BF40EA0C0CC3F8F1 -:10BD900000C05C6801EA040C7468A40348BF40EA70 -:10BDA0000C0CC3F804C0146801EA040C7468E402C3 -:10BDB00048BF40EA0C0CC2F800C0546801EA040C09 -:10BDC0007168890248BF40EA0C0CC2F804C009F14E -:10BDD0000109316831FA09F077D0012404FA09F435 -:10BDE00014EA0100F3D04FEA490C032101FA0CF1E7 -:10BDF0006FEA010E7168012918BF022903D01129C9 -:10BE000018BF122911D1A968F7680EEA010107FAD3 -:10BE10000CF73943A960696821EA04047168C1F329 -:10BE2000001101FA09F10C436C60E968B4680EEA8C -:10BE3000010104FA0CF42143E9604FEA89017468B6 -:10BE4000022C18BF122C12D14FEAD90405EB84043E -:10BE500001F01C07D4F820A008FA07FB2AEA0B0A15 -:10BE6000D6F810B00BFA07F747EA0A0727622C68E2 -:10BE70000EEA0407347904F0030404FA0CF43C439A -:10BE80002C607468E400A2D5DFF870C04FEA990E08 -:10BE90005CF82E7001F00C0108FA01F427EA0404A2 -:10BEA000B5F1904F08BF00270ED0154FBD4208BF17 -:10BEB000012709D0134FBD4208BF022704D0124FFB -:10BEC000BD427FF452AF032754E7BDE8F18F81B044 -:10BED000002A14BF8161816201B070470B4A136868 -:10BEE00003421CBF106001F0BDB9704700000000A4 -:10BEF0000008005880080058001000480800014061 -:10BF00000004004800080048000C00480C080058D5 -:10BF1000B64900E0B64981B00A6802430A60096880 -:10BF200008400090009801B0704738B5B149B24C54 -:10BF30004FF400400860FFF7DFFE606840010ED557 -:10BF40006068C0000BD401F0ADF901F0ABF92068D6 -:10BF500040F480302060216821F48031216000F0BD -:10BF6000FAF80020FEF7A4FB40B18079A349E16014 -:10BF7000E16821F47C5141EA0021E16000F050F8D1 -:10BF80009F48A04C0168A04D00220260026902F0A7 -:10BF9000500202610420FFF7BDFF0120FFF7BAFF46 -:10BFA0000220FFF7B7FF0420FFF7B2FF0120FFF7E1 -:10BFB000AFFF0220FFF7ACFF00220F210E2000F0A0 -:10BFC00063FD0E2000F07EFD00220F213A2000F0DC -:10BFD0005BFD3A2000F076FD0020606025600F20B8 -:10BFE000A06047F6FF70E060204601F063F9CA20C8 -:10BFF0006862FF2153206862A868C008C000A8607A -:10C000006962F8F7CAFF0FF224220FF2C110002173 -:10C01000F8F7ECFF606201F08FF8F8F7CCFFFEE76D -:10C0200038B5AEB01CA84821F8F7A6FF01A81C211E -:10C03000F8F7A2FF08A85021F8F79EFF01F032F9A7 -:10C040006D48724C016821F0180101604FF4803294 -:10C05000206820F4C06040F4007020604FF48075C8 -:10C06000216801F4C0610091072100981C91012012 -:10C070001E900021402020901D9227911F951CA802 -:10C0800001F0C5F96F200190022100200291039078 -:10C090000490059006900790012101A801F069FC29 -:10C0A00043F60300089000214FF4804019900E9150 -:10C0B0000F91102002211B901A91189508A801F0E9 -:10C0C00053FEE06920F07000E06151480168C1F35F -:10C0D00003200090009830B9E1690909090141F095 -:10C0E0000401E16108E00098E169801E80F304002A -:10C0F000090940EA0110E061E06940F40040E061B4 -:10C100002FB030BD10B5434C434800F017F84FF442 -:10C110000040E061002020626062A062204601F0E1 -:10C12000A1FF0021204602F0DCFB0021204602F0A6 -:10C13000E3FB2046BDE8104002F0B6BB20604FF4A0 -:10C14000E13060600020A060E06020610C20606150 -:10C150000020A0617047314881B0016841F480112E -:10C1600001603F21006800F48010009000982C4886 -:10C1700041604161016841F47C110160026942F44F -:10C180007C120261016841F03F010160026942F0E6 -:10C190003F02026101B0704738B5044602F000FC6E -:10C1A00014F1010F054609D0FFF7BDFD241805E085 -:10C1B0001C48016821F00401016030BF02F0F0FB6F -:10C1C000401BA042F4D331BD0000000080B54FF009 -:10C1D000FF3201210120F8F787FFF8E700681249D4 -:10C1E000884208BF02F0E2BB7047000048000058D8 -:10C1F0004C0000581040005890000058FECAFECA7B -:10C2000080080058C45B002000280040000400584B -:10C210005875FF1F0C58002000380140500000588E -:10C22000040C005810ED00E000480140E8FF000851 -:10C2300000000000000000000000000000000000FE -:10C2400000040000180000000000000000000000D2 -:10C2500010B5002488B9114803600E480E4B0360E6 -:10C2600001F040FF012805D007D3032804D038BFD0 -:10C27000022402E0012400E00324204610BD0068EF -:10C280000549884204D105490868002818BF0047BD -:10C29000704700000C58002000380140F05C00207E -:10C2A0002DE9F8430446FCF7BBFA6B4FB8684FF032 -:10C2B0000009002508BB07F1200307F1200113F056 -:10C2C000070F4FF440500A4605D0CA1DD208D200CD -:10C2D000C2F54050081880180838C008C0003A60FD -:10C2E0007D60B86045600560811A516010605068DB -:10C2F0003861F8604FF00040F8614FF05008F8697D -:10C30000044236D1ACB3083414F0070F1FBF04F158 -:10C31000080004F00704041B14F0070F02D000F01B -:10C3200044F8FEE72CB3F868A04222D33E683946B1 -:10C330007068A04226D2306800281CBF31460646ED -:10C34000F6D11FE0301D02517460084600F061F81C -:10C350007168F8683A69401AF860904238BF3861ED -:10C36000F86901437160356009F007057869401C80 -:10C370007861FCF770FA15B100F017F8FEE748464F -:10C38000BDE8F283B8688642F3D0326808680A6074 -:10C3900000F108097268121B112AD9D3311911F062 -:10C3A0000700CFD000F001F8FEE788F31188BFF353 -:10C3B0004F8FBFF36F8F7047002800D1704738B59B -:10C3C000A0F10805244C6968E2695023114202D1AA -:10C3D00000F018F8FEE7286810B100F013F8FEE747 -:10C3E00091436960FCF71CFAE16868684118E160F4 -:10C3F000284600F00EF8A069401CA061BDE831405D -:10C40000FCF729BA83F31188BFF34F8FBFF36F8F07 -:10C41000704730B510490A4600E02246146884424D -:10C42000FBD35368D418844203D14068C3185360C7 -:10C43000104643681468C518A54208D189688C4223 -:10C4400004D06168CB184360246800E00C460460A7 -:10C45000824218BF106030BD9811002000F1080121 -:10C4600041604FF0FF31816000F10801C16001615E -:10C4700000210160704742684A6093688B6093684E -:10C480005960916008610168491C0160704730B5CE -:10C490000A6812F1010F08BF036907D000F1080311 -:10C4A00000E023465C682568AA42FAD25A684A60CE -:10C4B00091608B60596008610168491C016030BD62 -:10C4C0004368016982689A60836842685A604A6872 -:10C4D000824204BF82684A60002202610868401EEE -:10C4E000086008687047000010B586B000F07DF95C -:10C4F000DFF84843A068D0B100210591049103AA58 -:10C5000004A905A802F05AFA05980499029002229B -:10C51000009201910023039A0FF228310FF271006B -:10C52000FCF73CF8E06010B1012006B010BD00F04F -:10C53000CBF8FEE785F31188BFF34F8FBFF36F8F02 -:10C540007047F8B5044684B01E46002014B900F0C8 -:10C55000BBF8FEE7DFF8E472BD68BDB106290091C3 -:10C56000019202940CDAFCF750FB0228B86807BF6E -:10C570000A9A0023002300226946FCF767FF05E0C2 -:10C580000023324669462846FCF7F8FF05B0F0BDA7 -:10C5900080B5DFF8A8120A68106800281DBF0021C6 -:10C5A000D0680068012100F003F800F0AFF8F0E770 -:10C5B000FEB506460C46FCF733F901A800F047F833 -:10C5C0000546019800283FD19C4F4CBBB5422CD367 -:10C5D000FCF741F93868C168CC68201DFFF770FF8F -:10C5E00094F82800410713D5A16933462A468919D2 -:10C5F000204600F071F878B1002000900023324608 -:10C6000000212046FFF79DFF30B900F05DF8FEE7FE -:10C6100000F0FE0084F828002046216A8847F7BD14 -:10C62000786801684C1EA441E40FB8682246711B6B -:10C63000FDF75CFAFCF70FF940B981494FF08050E3 -:10C640000860FFF779FFF7BDFCF705F9F7BD2DE9A5 -:10C65000FC410446FCF754F9784E054630698542A2 -:10C660000BD30020206035612846BDE8F681786054 -:10C670003F61391D3068FFF70AFF31680868F0B183 -:10C68000C868D0F80080C768381DFFF719FF396AFD -:10C690003846884797F828004107EED5B8694044E6 -:10C6A0008045E4D300200090002342460021384614 -:10C6B000FFF747FF0028E0D100F006F8FEE77068BA -:10C6C000306071600120CDE7502080F31188BFF306 -:10C6D0004F8FBFF36F8F704738B500248A42416097 -:10C6E0000061564D06D38169D21A8A4206D2011DD5 -:10C6F000686807E09A4203D2994201D3012403E01B -:10C70000011D2868FFF7C3FE204632BD38B586B04C -:10C710004A4C04E0134689182846FFF7DDFFA0685D -:10C72000002202A9FCF7B2FF002854D0029800288A -:10C7300003D505990498039A904702980028EED4EF -:10C74000049D686910B1281DFFF7BAFE01A8FFF724 -:10C750007EFF024602980928E1D8DFE800F00606CD -:10C760000635252D06063525D9E700F036F8A869E7 -:10C770000B4641182846FFF7AFFF0028CFD0296AA3 -:10C780002846884795F828004107C8D50021009120 -:10C79000039AA869821800232846FFF7D2FE0028D2 -:10C7A000BDD1FFF791FFFEE700F017F8A96100295E -:10C7B000B0D1FFF789FFFEE795F82800810703D481 -:10C7C0002846FFF7F9FDAAE795F8280000F0FE00DB -:10C7D00085F82800A3E707B030BD95F8280040F0A1 -:10C7E000010085F82800039970471CB5FCF786FC0A -:10C7F000124CA068E8B904F11400FFF72FFE04F111 -:10C800002800FFF72BFE04F11400206004F13C0324 -:10C8100004F12800606004F18C02002000901021D7 -:10C820000A20FCF72CFDA06018B10FF22001FDF7E3 -:10C8300036F9BDE81340FCF77ABC0000145500201F -:10C8400004ED00E0546D722053766300546D725114 -:10C850000000000070470000EFF30980BFF36F8F06 -:10C86000264B1A681EF0100F08BF20ED108A20E931 -:10C87000F04F106009B44FF0500080F31188BFF3FF -:10C880004F8FBFF36F8FFCF79DF84FF0000080F3E0 -:10C89000118809BC19680868B0E8F04F1EF0100F45 -:10C8A00008BFB0EC108A80F30988BFF36F8F704720 -:10C8B000124B19680868B0E8F04F80F30988BFF39D -:10C8C0006F8F4FF0000080F3118870470C480068AC -:10C8D000006880F308884FF0000080F3148862B687 -:10C8E00061B6BFF34F8FBFF36F8F00DFDFF8140027 -:10C8F000016841F470010160704700000857002092 -:10C9000008ED00E088ED00E07FB50C464D4D616814 -:10C910004D4EE8612962284602F05CF82468746094 -:10C9200006F1080000604060012000F068F8012076 -:10C930003070296841B10FF2E9000FF2ED0200906A -:10C9400001920294684688477FBD1FB53E4C04F1B2 -:10C950000800FFF7A6F800BB2178F1B1694604F1A1 -:10C960000800FFF7C7F83748C16949B1009802903D -:10C9700001228DF8042001A888479DF8040000E0FA -:10C9800001202070207818B10098FFF768F904E0C2 -:10C99000009904F10800FFF78DF804F10800FFF793 -:10C9A00080F828B9207818B104F1080000F040FCA4 -:10C9B0001FBD2DE9F04105460E4690461C4600205D -:10C9C00000F01DF8204F7868A0F80950C672324672 -:10C9D00041460C30F7F7B4FF1A4A136900210020D2 -:10C9E000984748F2E80000F02CFC79688A78D21C5D -:10C9F00004F10800F7F7A4FFBDE8F04101201CB5E1 -:10CA00001049124C096A20B901B1884700202070F2 -:10CA100013BD0120207011B1BDE81C40084713BDB3 -:10CA2000002000F00ABC000010B50146064C04F1DD -:10CA30000800FFF749F804F10800BDE8104000F0D5 -:10CA4000F7BB0000EC5B0020745C0020045D00205C -:10CA50000901020081B002D43248815405E0324815 -:10CA600002F00F02104400F8041C01B070472F4A76 -:10CA700013684FF6FF0100020B4000F4E06018431A -:10CA80002B4908431060704738B5284B1C68C4F325 -:10CA90000223C3F10704052C28BF04241D1D072D04 -:10CAA00034BF0023DB1E012505FA04F4641E214077 -:10CAB000994005FA03F35B1E1A401143BDE8344068 -:10CAC000C6E70000010007D4012200F01F01194B46 -:10CAD0008A40400943F82020704701000BD401220E -:10CAE00000F01F01144B8A40400943F82020BFF397 -:10CAF0004F8FBFF36F8F7047010007D4012200F002 -:10CB00001F010E4B8A40400943F820207047010066 -:10CB100007D4012200F01F01094B8A40400943F865 -:10CB20002020704700E400E018ED00E00CED00E08C -:10CB30000000FA0500E100E080E100E000E200E032 -:10CB400080E200E0012001F04FBF000070470000CC -:10CB5000841A71EB030604D26E40001BB141121916 -:10CB600073414FF4001C1CEB410F34BF7CEB4306B8 -:10CB700082E00C0DA4EB1356362E7BDC012E45EA29 -:10CB8000C32341DC43EA525312BFD20292025B0834 -:10CB9000240545EAC12141EA5051D2EBC020994118 -:10CBA00025D407D1B0FA80F610FA06F162D0002041 -:10CBB000203608E0B1FA81F6B140C6F1200220FA31 -:10CBC00002F21143B0404FEAF474B4EB465434F02F -:10CBD00001064FEA74040AD8D6F50016760D04F063 -:10CBE0000044F04061FA06F25040F1404840C00A6B -:10CBF00040EA415021F0004128BF5FEA500550F162 -:10CC0000000044EBD12135E0DB0A45EAC121C90A25 -:10CC1000B6F120050EDD42EA0242120CC5F12006F3 -:10CC200003FA06F6EB4042EA06056D42984161F1CF -:10CC300000010DE062FA06F5F240554063FA06FC89 -:10CC400082EA0C02F3405A406D42904161EB0301CD -:10CC500011F4801F05D1641E620502D06D004041B1 -:10CC6000494121F48011430875F1004350F100005F -:10CC700041EB045170BC70471CEB410F15D223F0FF -:10CC8000004352EA43060BD04FEA4C0CBCEB410F79 -:10CC900004D80C0D661E342EB7DDEBE7801A9941DF -:10CCA00050EA410608BF0021E4E708BF1CEB430F30 -:10CCB00028BF6FF00001DDE7C0680840884201D15D -:10CCC0000120704700207047C0690840884201D1A8 -:10CCD000012070470020704710B56C4C022120469F -:10CCE000FFF7F2FF38B16068C043810703D5FEF754 -:10CCF0008AFF022018E001212046FFF7E5FF38B146 -:10CD00006068C043C10703D5FEF745FF01200BE073 -:10CD100008212046FFF7D8FF38B16068C0430107FB -:10CD200003D5FEF7C4FF0820A06010BD10B5574C16 -:10CD300000F033F818B96068C043810306D400F0EE -:10CD40002CF830B96068C043810302D5BDE81040BB -:10CD50007AE0082100F022F870B96068C04301034E -:10CD60000AD560684A4940F400206060086880473E -:10CD70004FF40020A06010BD202100F00FF858B93A -:10CD80006068C043810207D5606840F400106060AD -:10CD9000BDE81040FEF70EBF10BD022120468BE714 -:10CDA0003C4881B0016841F480110160006800F4E2 -:10CDB0008010009000983848016841F400710160CB -:10CDC0003648026842F40072026040BF20BF344817 -:10CDD000016841F40041016001B0704780B53148FD -:10CDE000016841F480110160006800F48010009037 -:10CDF00000982648016841F001010160026842F490 -:10CE0000803202602C20FFF75DFEBDE802402D203D -:10CE1000FFF758BE2448016849084900016070477F -:10CE200022494FF48030086070471F48016821F0A4 -:10CE30000201016070471C484FF4003141600168F5 -:10CE400021F40031016070471748016841F4003156 -:10CE50000160FEF7D1BE38B504460C4D08212846C6 -:10CE6000FFF72AFF30B10A480460686820F4002008 -:10CE7000686031BDA0474FF40021A96031BD0A4868 -:10CE8000016821F00801016070470000000C0058A3 -:10CE9000EC5C002050010058D408005820080058CD -:10CEA0000C04005850000058040C0058080C00589E -:10CEB00018B5014689B000221A20FFF7E5FD1A20B7 -:10CEC000FFF700FE1448154C016841F48021016011 -:10CED00001A9006800F480200090009802A800F0EA -:10CEE0008BFE00F078FE0E492160002240F2E7310F -:10CEF000E1602261A2600B49B0FBF1F0401E60606E -:10CF0000204601F07BFD18B9204601F084FD00E0C9 -:10CF100001200AB010BD0000600000580C5B00202A -:10CF20000048014040420F00774981B00A6802433F -:10CF30000A60096808400090009801B0704780B509 -:10CF40007248016841F4002101600022006800F489 -:10CF5000002000900F2100986FF00100FFF794FD72 -:10CF6000002206212C20FFF78FFDBDE8084000229B -:10CF700006212D20FFF788BD38B58AB004466846E3 -:10CF80001421F7F7F9FF2068614A624990423ED1C7 -:10CF90000868614D40F001000860096801F0010176 -:10CFA000059105980120FFF7BFFF0C20009002219A -:10CFB00000200191029003210820039100F06AF8FB -:10CFC000402000F060F8082000F064F85348286022 -:10CFD000112000F065F808B1C046C0464FF08850F7 -:10CFE0000690002101200791ADF82010099006A9B4 -:10CFF000284601F045FE08B1C046C046A567AC62B0 -:10D00000002205212520FFF73FFD252037E0444A77 -:10D01000904236D14868434D40F4804048604868AB -:10D0200000F48040059005980120FFF77DFF022065 -:10D03000FFF77AFF4FF4006000F025F8072000F0BA -:10D0400029F8C020009002210120019102900321C3 -:10D0500007200391049069463348FEF77BFE33486E -:10D0600028600F2000F01CF808B1C046C046A56734 -:10D07000AC62002205212420FFF706FD2420FFF7E3 -:10D0800021FD0BB030BD00900221002002900390E2 -:10D0900001917047049069464FF09040FEF75ABEE8 -:10D0A00068601020A8600020E860802028610020CF -:10D0B0006861A861E8612862284601F007BE1CB5D6 -:10D0C00004461B49206888421CD100F0EBF800F0B0 -:10D0D000E9F81848816B21F4407141F48071816353 -:10D0E000816B41F400418163026842F48062026016 -:10D0F000006800F48060009000982046BDE816406B -:10D1000001F0C4BF13BD00004C000058500000588F -:10D11000008000405C000058AC59002044000240F0 -:10D12000003801400C5A002000040048440402402A -:10D13000002800405800005810B54548454C88B0BC -:10D14000016841F400410160FCF7F4FC42480168C9 -:10D15000C908C90041F00401016000203F49FCF703 -:10D1600022FFFBF7D0F801210120FCF7E8FC0121A8 -:10D17000002001F0AEFF0121012001F0AAFF0121F2 -:10D18000022001F0A6FFFEF7C9FC0020F7F7F7FF29 -:10D190002060002200210120F8F761F86060002182 -:10D1A0000FF2DC020FF27500F7F720FFA0602C4CA5 -:10D1B0000FF23501019104F23C50009069460FF2E4 -:10D1C0004500FFF7A1FB04F25470029004F5C96119 -:10D1D00040F23C5005900391049402A8FEF726FD0E -:10D1E000FEF79AFC08B010BD1A4A126810B1012867 -:10D1F00005D070474FF0FF311046F7F7EDBF1046EE -:10D20000F8F70EB880B5FBF78DF8F8F7DBF8BDE856 -:10D21000044000210120FCF792BC000080B54FF0D3 -:10D22000FF3200210120F7F75FFFFFF78EFBF6E7E3 -:10D23000084880680121F7F725BF06484068F8F7DD -:10D240007AB8044840684FF0FF31F8F74FB8000053 -:10D2500008000058845C002080040058C45B002053 -:10D2600030000320012805D0022805D0102805D160 -:10D27000F8F77ABBF8F78DBBF8F78DBB7047000065 -:10D2800090FF000800000000000000000000000007 -:10D29000000000008003000000000000000000000B -:10D2A000000000000248016841F48071016070478D -:10D2B0000004005838B5040044D094F8210028B97F -:10D2C000002184F820102046FFF7F9FE00F049F80D -:10D2D000FF2510B100F03FF834E02168DFF8B0001E -:10D2E0008A6802408A6021688A686368206903430B -:10D2F000A06903431A438A602168E06808612068D6 -:10D300000169A26841EA024101612068C16821F017 -:10D310008001C1602068C16C89088900C1642168EE -:10D32000CA6CE369606903431A43CA642068816870 -:10D33000880609D400F020F830B120684562042145 -:10D3400000F01FF8012032BD20684562012184F8F9 -:10D350002110002032BD20684562042184F821108C -:10D360007047022084F82100CA20216848625320B7 -:10D3700022685062204626E020460BE02068C0F874 -:10D38000248084F82110002084F8200070470000D9 -:10D39000BFFF8FFF70B5044640F2E9362068C168D0 -:10D3A00021F0A001C16001F0FBFA05462068C168C8 -:10D3B000880606D401F0F4FA401BB042F6D30320ED -:10D3C00070BD002070BD70B504462068C1684A0673 -:10D3D00012D44FF0FF32C26040F2E93601F0E0FAB9 -:10D3E00005462068C168480606D401F0D9FA401BFA -:10D3F000B042F6D3032070BD002070BD4FF0B040A6 -:10D40000006800F0F000B02888BFB02070472DE918 -:10D41000F041040054D0207881064FF0B04538D553 -:10D42000A868E96810F00C0001F0030103D00C2893 -:10D4300008BF012946D12868800702D5E069002885 -:10D440003ED0FFF7DBFF616A884207D2084600F052 -:10D45000F6FB002834D100F075FA0FE0286820F0C0 -:10D46000F000014329606968206A21F47F4141EAA4 -:10D4700000216960606A00F0E2FB08BB00F095FBE8 -:10D48000DFF854180860DFF854080068FFF710FD53 -:10D49000B0B92078C1070DD5A868E96800F00C0084 -:10D4A000082801F0030103D00C2808BF03292DD15F -:10D4B0002868800340F139816068002840F0358198 -:10D4C000012038E2E06980B1296841F0010100F0F3 -:10D4D00047FA06462868800700F1248101F060FAC7 -:10D4E000801B0328F6D3032025E22868400840006B -:10D4F000286001F055FA0646286800F01FFAC8D0E7 -:10D5000001F04EFA801B0328F6D3ECE76068B0F513 -:10D51000803F04D1296841F48031296003E02A6802 -:10D5200022F480322A60606860B101F039FA064660 -:10D530002868800300F1F98001F032FA801B652829 -:10D54000F6D3D0E701F02CFA06462868400C10F01C -:10D55000010000F0EA8001F023FA801B6528F4D373 -:10D56000C1E701F01DFAC01B0328C0F01281BAE721 -:10D57000E06878B1296841F4807100F0F1F906465D -:10D580002868400500F1188101F00AFA801B032881 -:10D59000F6D3A8E7286820F48070286001F000FA2C -:10D5A00006462868800A10F0010000F0DC8001F0D7 -:10D5B000F7F9801B0328F4D395E701F0F1F9C01BBC -:10D5C0000328C0F00B818EE740F0010000F0CEF997 -:10D5D00007467068800700F11C8101F0E1F9C01B6B -:10D5E0000328F6D37FE7706820F0040000F0BEF94E -:10D5F00007467068C00810F0010000F0198101F0C2 -:10D60000CFF9C01B0428F4D36DE70528306806D194 -:10D6100040F004003060316841F0010105E040084D -:10D6200040003060316821F004013160A06841F2AF -:10D63000893768B101F0B4F980463068800700F19D -:10D640000C8101F0ADF9A0EB0800B842F5D34AE730 -:10D6500001F0A6F98046306800F070F900F0FD8016 -:10D6600001F09EF9A0EB0800B842F4D33BE701F0CB -:10D6700097F9C01B0328C0F0FE8034E7B06840086B -:10D680004000B06001F08CF90746B06800F056F930 -:10D6900000F0F58001F084F9C01B0328F5D322E7E0 -:10D6A00001F07EF9801B0328C0F01F811BE701F009 -:10D6B00077F9001B0328C0F0398114E7286881013D -:10D6C0000CD4296841F080712960E86840F08050EE -:10D6D000E86001F065F904462868810100F12A81BB -:10D6E00001F05EF9001B0328F6D3FCE60C2931D0CB -:10D6F000286820F080702860E968DFF8E405890870 -:10D700008900E960E9680140E96001F049F90446EF -:10D710002868810140F10E8101F042F9001B0328C5 -:10D72000F6D3E0E600F00EF9B3E6207881071AD5CB -:10D73000A868E96800F00C00042801F0030104D097 -:10D740000C2808BF02297FF413AF2868400503D5D1 -:10D75000E06800283FF4B4AE6968206921F0FE411A -:10D7600041EA006169602168DFF8786511F0180FFF -:10D7700038D0606900283FF436AFC90670687FF57D -:10D7800023AF800709D4706840F0010000F0EEF884 -:10D790000746706880077FF5E4AE706840F00400CB -:10D7A00000F0E4F80746706800070DD401F0F8F8BF -:10D7B000C01B0428F7D396E66868216920F0FE4074 -:10D7C00040EA01606860CEE77068A16920F470608B -:10D7D00040EA0120706000F0C6F8074600F0ADF89E -:10D7E0007FF4EBAE2078410737D5DFF8FC7438685A -:10D7F000C10529D4FFF756FD01F0D2F880463868FC -:10D80000C10521D401F0CCF8A0EB08000328F6D321 -:10D8100069E6706820F0040070607068C00810F05D -:10D820000100DFD001F0BCF8C01B0428F5D35AE694 -:10D8300000F099F8074600F080F8D3D001F0B0F876 -:10D84000C01B0328F7D34EE6A06801287FF4DDAEA5 -:10D85000306840F001003060E8E6217848060ED5D7 -:10D86000A06A00283FF40AAFB16841F00101B1603D -:10D8700001F096F80746B06880077FF5F8AEE06AD9 -:10D88000002857D0A968EA68022801F00C017FF44B -:10D890002DAF236B02F00300984202BF02F070002C -:10D8A000636B984214D1A36BC2F30620984202BF67 -:10D8B00002F47810E36B98420AD1236C02F06060A6 -:10D8C000984202BF02F06042606C82423FF4F6AEC2 -:10D8D0000C293FF4F5AD286841013FF5F1AD296809 -:10D8E00021F0807100F03CF80646286881013FF580 -:10D8F000D7AEE968DFF8F403A26B0140206B014367 -:10D90000606B0143E06B41EA02210143206C01435B -:10D91000606C0143E960286840F080702860E96825 -:10D9200041F08051E96001F03BF80446286881012C -:10D930007FF5BDAE0020BDE8F0817068400810F0B2 -:10D94000010070472968606A21F0F00101432960F5 -:10D950006868216A20F47F4040EA012068607047CF -:10D96000296001F01DB8706840084000706001F047 -:10D9700017B82DE9F8430400884644D0DFF87063F7 -:10D9800000F0CBF847D200F0CDF8074600F0C5F81C -:10D9900041D001F005F8C01B0228F7D90320BAE0F6 -:10D9A00000F0FEFF401B022843D9F7E700F0F8FF24 -:10D9B000A0EB090002284CD9F0E700F0F1FFA0EB42 -:10D9C0000900022854D9E9E700F0EAFF401B0228C9 -:10D9D0005DD9E3E700F0E4FF401B022867D9DDE7EB -:10D9E00000F0DEFF401B484577D3D7E7032802D17C -:10D9F0003968890103E00028396802D1890762D4B7 -:10DA000001E049055FD4012085E000F0C9FFC01B9B -:10DA1000022872D9C2E7207881074FF0B0470BD5B2 -:10DA2000B968A06821F0F0010143B96000F0B8FFC7 -:10DA30000546B868C003B3D52078DFF89852810650 -:10DA40000AD52968606921F0F0010143FFF788FFDA -:10DA5000814628688003A9D5207841060BD529681E -:10DA6000A0690909090141EA1011FFF779FF814610 -:10DA70002868C003A1D5207841070BD5B968E068B4 -:10DA800021F4E0610143B96000F08AFF0546B868FF -:10DA9000800399D5207801070CD5B868216920F456 -:10DAA000605040EAC100B86000F07AFF0546B868EF -:10DAB00040038FD52078C10717D56068022895D11B -:10DAC000396889039FD5B968890840EA8100B86040 -:10DAD00041F2893900F064FF0546B868616800F0DA -:10DAE0000C00B0EB810F7FF47BAF306800F00700D3 -:10DAF000804505D200F016F8074600F00EF884D1F4 -:10DB000000F053F8DFF8D0110860FEF709F9BDE81E -:10DB1000F243FFF7CDB9BDE8F283306800F00700AB -:10DB2000404570473168C90848EAC101316000F0DA -:10DB300037BF38B54FF0B0446F4DA16811F00C01FC -:10DB400006D1FFF75BFCC0F3031055F8200032BD8F -:10DB500004296A4A05D00829694804D12168C90204 -:10DB600022D5104632BDE16801F00301022904D03C -:10DB7000032904D12168C90207D5104605E0FFF743 -:10DB80003DFCC0F3031055F82000E168E268E3684B -:10DB9000C1F306214843C2F30211491C5B0FB0FBDD -:10DBA000F1F05B1CB0FBF3F032BD80B5FFF7C1FFB5 -:10DBB0005049FFE7534A0968C1F3031152F8211095 -:10DBC000B0FBF1F002BD80B5FFF7EFFF00F010F8F9 -:10DBD000C1F3022106E080B5FFF7E7FF00F008F887 -:10DBE000C1F3C22112F8211001F01F01C84002BD8B -:10DBF0004049454A096870476F2202603D4A1368F0 -:10DC000003F00C034360136803F0F00383601368B0 -:10DC100003F4E063C360126802F4605202612D4AAB -:10DC2000136803F0F00343611268120102F0F0027E -:10DC300082612F48026802F007020A60704770B5DF -:10DC40002D49B1282EBFCC6AC0F3031051F82040F3 -:10DC50002048056801F08CFA2A492C4A05F00F0586 -:10DC600051F82510B4FBF1F10024B1FBF2F1B0F54D -:10DC7000007F0FF2B802204609D10FF2940353F847 -:10DC800020508D4214D2401C0328F8D912E00FF224 -:10DC9000900353F820508D420AD2401C0328F8D339 -:10DCA00008E000F07DFE801B03280CD3032070BD2C -:10DCB00052F820400E4D2868C00844EAC000286091 -:10DCC00000F06EFE0646296801F00701A142E8D186 -:10DCD000002070BD0801005864100020541000207E -:10DCE000FFFFFEEE90000058000400588C80C11128 -:10DCF00000400058080000589CF800080024F40078 -:10DD00000048E8015CF800083CFF000840420F00B2 -:10DD10001200000024000000360000004000000057 -:10DD2000060000000C0000001000000000000000D1 -:10DD3000010000000200000003000000DFF82013D3 -:10DD40000A68030903F47F2300019A4300F47F204B -:10DD500000F082B9DFF808231368010C23EA0143BD -:10DD600043EA0043136070472DE9F8430546002459 -:10DD70002878DFF8EC624106A0464FF0B0472DD579 -:10DD8000286B70B1B0F5800F06D0B0F5000F18BF4A -:10DD9000B0F5400F17D01FE0F86840F48030F8600D -:10DDA000EDE0386820F08060386000F0F9FD8146D1 -:10DDB0003868000140F1D08000F0F2FDA0EB0900CE -:10DDC0000228F5D90324D7E000F0EAFDA0EB090012 -:10DDD000022840F2C980F5E70124A0462868010521 -:10DDE00031D5B06800F44078286C80452AD0FFF720 -:10DDF00059FAB8F1000FB16805D1286C21F44071CF -:10DE00000143B1601EE0B06840F48030B06021F49E -:10DE10004071B06820F48030B060286C0143B1607C -:10DE2000B068C0070ED500F0BBFD804641F28939CD -:10DE3000B068800706D400F0B3FDA0EB08004845A9 -:10DE4000F6D30324A0462878C10705D53168A86910 -:10DE5000890840EA810131602878810705D5316859 -:10DE6000E86921F44061014331602878C10644BF6C -:10DE7000A86AFFF76FFF2878810644BFE86AFFF7BA -:10DE800069FF2878410744BF286AFFF757FF2878C1 -:10DE9000010744BF686AFFF751FF2868C1051BD519 -:10DEA0003168686B21F0406101433160686BB0F10B -:10DEB000006F00F0BDF8686BB0F1806F75D100F0B5 -:10DEC000BDF804463868000160D500F069FD001B0C -:10DED0000228F7D94FF0030867E000F061FD001B4E -:10DEE00002285BD9F6E7316821F04041316020F02B -:10DEF0008050326822F0406210433060A86BB0F16D -:10DF0000C05F00F095F8286841056DD53168E86B71 -:10DF100021F0405101433160E86BB0F1005F03D163 -:10DF2000F96841F48031F960E86BB0F1805F5BD152 -:10DF300000F084F804463868000146D500F030FD52 -:10DF4000001B0228F7D94FF003084DE000F028FD30 -:10DF5000001B022841D9F6E700F061F8A86821F417 -:10DF6000781100F071F88146386800017FF52CAF18 -:10DF70003969686901433961002C7FF42EAF31683B -:10DF8000286B21F440010143316027E700F047F896 -:10DF9000E86821F0606100F057F804463868000135 -:10DFA0009BD5396968690143396128688105AAD51B -:10DFB000A86BB0F1804F1CBFB0F1004F002892D188 -:10DFC000316821F04041084397E700F028F82869BC -:10DFD00021F0604100F038F8044638680001B5D5FA -:10DFE00039696869014339612868C10405D5F16858 -:10DFF000686C21F440410143F160286881040BD52D -:10E00000796AE86C21F0300101437962796AA86C81 -:10E01000890840EA810179624046BDE8F2833869A7 -:10E02000696820F4FE4040EA012038613969704790 -:10E0300003D1F96841F08071F9607047396821F0C7 -:10E040008061396000F0ACBC01433961386840F050 -:10E050008060386000F0A4BC104308607047000086 -:10E060008800005838B5040009D004F180056868BC -:10E0700008B900F01EF800F021F8012801D10120B4 -:10E0800032BDA06A08B100F02AF800F00AF821F0C9 -:10E090002A01FFE7816000F01BF8BDE8324000F084 -:10E0A00002BB2068416821F490414160206881688A -:10E0B0007047002129702046FEF75EBF242068606B -:10E0C00020680168490849000160204600F086B9CF -:10E0D0002068016841F00101016020467047204638 -:10E0E00000F07EBA70B5044604F1800513466868F6 -:10E0F00020283CD169B318002BD02878012836D0CD -:10E1000001222A7004F154062165338073800020B7 -:10E11000E86021206860706AE8B1DFF8B414C16279 -:10E12000DFF8B004716A0863716ADFF8AC04486311 -:10E130000020716A88632068216D00F12802706AEE -:10E1400000F02DFE38B11020E8600020287020205B -:10E150006860012070BD216840200862002028709E -:10E160002068816841F080018160002070BD02203C -:10E1700070BD816821F0400181607047206881682E -:10E180004A0670472068016821F01001016070475D -:10E19000F8B5044640F60F002668F1693268B368A6 -:10E1A000084004F15C050ED1880602D5900602D421 -:10E1B000D80040F180806969002900F00E81204676 -:10E1C000BDE8F4400847DFF80C06034204BFDFF85F -:10E1D00008763A426FD0CF0707D5D70505D5012776 -:10E1E00037622E6B46F001062E638E0708D5DE07D8 -:10E1F00006D5276802263E622E6B46F004062E6383 -:10E200004E0708D5DE0706D5276804263E622E6B2A -:10E2100046F002062E630E070AD5960601D4034285 -:10E2200006D0266808203062286B40F0080028637A -:10E23000080509D5500107D526684FF40060306203 -:10E24000286B40F020002863286B002832D0890614 -:10E2500007D5900601D4D80003D5696909B12046D5 -:10E260008847286B21688A68510602D410F0280F6D -:10E270001BD0204600F093FAFFF780FF10D5FFF780 -:10E2800078FF286A60B10FF2DD518163286A00F0DF -:10E29000FFFD00280ED0286A816BBDE8F4400847D6 -:10E2A0002046BDE8F24000F06BBF204600F068FF5A -:10E2B00000202863F1BD2869012853D1CF0651D52C -:10E2C000D0064FD51020306222689068410626D5CE -:10E2D000296A0868406880B20028EBD02B889842F1 -:10E2E0007BDA6880086801688B0614D4106820F413 -:10E2F000807010602068816849084900816020684A -:10E30000FFF737FF2020E86200202861FFF73AFF7F -:10E31000286A00F087FD29886888091A1CE0288887 -:10E320006988411A688800281CBF88B2002854D028 -:10E330001368DFF8400523F4907313602268936834 -:10E34000034093602020E862002028616861206813 -:10E35000026822F0100202602046BDE8F44089B253 -:10E3600000F00FBFC80209D5580207D54FF480103E -:10E3700030622046BDE8F24000F010BB080609D527 -:10E38000100601D4180205D5A96931B32046BDE8AD -:10E39000F440084748060ED550060CD5306820F0EA -:10E3A000400030602021A9620020A8612046BDE81D -:10E3B000F240FDF764BF080206D5500004D52046A0 -:10E3C000BDE8F24000F0DEBEC80148BF002A04D517 -:10E3D0002046BDE8F24000F0D6BEF1BDF8B50446D7 -:10E3E000DFF894042168DFF894C40A68DFF89074B9 -:10E3F0000240A06802432069024360690243E06969 -:10E4000002430A6000254A68E06822F44052024351 -:10E410004A60A369714A91421CBF206A03438E6817 -:10E42000DFF86004064033438B600FF26446CB6A2A -:10E43000606A1B0940EA0313CB626145DFF84804B8 -:10E440004FF4004339D13F6807F00307032F4DD83D -:10E45000DFE807F0024643494FF0010CE169B1F5EE -:10E46000004F4FF6F07740F08080BCF1010F09D0EB -:10E47000BCF1020F0AD0BCF1040F71D0BCF1080F3F -:10E4800071D099E0FFF7A7FB002815D0626A616898 -:10E4900036F81230B0FBF3F04A0802EB4002B2FB50 -:10E4A000F1F080B2A0F11001B942EAD20740C0F306 -:10E4B000420007432068C7607FE0914216D13F6861 -:10E4C00017F4406723D0B7F5806F09D0B7F5006F18 -:10E4D00003D0B7F5406F06D008E04FF0020C07E01C -:10E4E0004FF0040C04E04FF0080C01E04FF0100C6A -:10E4F0009142B3D1BCF1000F09D0BCF1020F0AD098 -:10E50000BCF1040F15D0BCF1080F15D054E0FFF793 -:10E510005AFB002851D0616A36F81120B0FBF2F6A0 -:10E52000626802EB42018E4246D31103B14205D22A -:10E5300042E0FFF7FEFAECE71846ECE7500800214E -:10E5400010EB062051EB16610023FCF7BFFDA0F590 -:10E550004071DFF8382391422ED22268D0602CE03F -:10E56000FFF7E7FA90E7184690E7BCF1010F09D0F2 -:10E57000BCF1020F09D0BCF1040F18D0BCF1080F98 -:10E5800018D019E0FFF727FBB8B1626A36F81230ED -:10E590006168B0FBF3F000EB5100B0FBF1F080B22A -:10E5A000A0F11001B94207D22168C86005E0FFF769 -:10E5B000C0FAE9E71846E8E7012504F168000121FF -:10E5C0004180018000218160C1602846F2BD0000C9 -:10E5D000DDE700080BE8000815E8000800800040AF -:10E5E00090F82810CA0706D502685368C16A23F458 -:10E5F00000330B43536090F828108A0706D5026851 -:10E600005368016B23F480330B43536090F8281058 -:10E610004A0706D502685368416B23F480230B43F5 -:10E62000536090F828100A0706D502685368816B7A -:10E6300023F400430B43536090F82810CA0606D514 -:10E6400002689368C16B23F480530B43936090F886 -:10E6500028108A0606D502689368016C23F40053DB -:10E660000B43936090F828104A0610D5026853684F -:10E67000416C23F480130B435360416CB1F5801F50 -:10E6800005D15368816C23F4C0030B43536090F8A9 -:10E6900028100A0606D501684A68C06C22F40022D8 -:10E6A00002434A607047F8B5044604F18005002033 -:10E6B000E8606FF07E4700F073F906462068016855 -:10E6C0000A0708D50097334600224FF40011204670 -:10E6D00000F017F860B9206801684A070AD500976A -:10E6E000334600224FF48001204600F00AF808B1BA -:10E6F0000320F2BD20206860A8600020E06628703A -:10E70000F2BD2DE9F041069C05460E4690461F4697 -:10E710002868C1693140B1420CBF0120002040454A -:10E720001CD114F1010FF3D000F03AF9C01B844260 -:10E7300000D314B900F015F80CE0286801684A0706 -:10E74000E6D5C1690A05E3D54FF40062026200F024 -:10E7500008F8C16000210170032000E00020BDE83E -:10E76000F0812868016821F4D0710160286881680F -:10E7700049084900816005F18000202141608160E5 -:10E78000704701680A6822F0C0020A6001688A685E -:10E7900022F400028A602021C0F8841070470168CA -:10E7A0000A6822F490720A60DFF8C8100268936861 -:10E7B0000B409360C16E012904D101680A6822F000 -:10E7C00010020A602021C0F888100021C16601678C -:10E7D000704700000100001020010004816A0068F9 -:10E7E0000268930644BF0846FDF749BD0020A1F822 -:10E7F00056000868826822F0800282600868FFE79D -:10E80000016841F0400101607047806A00F0BCBCC3 -:10E8100000000000F8B5846A04F1840504F156078D -:10E8200028686E6821688A68110606D5212804D1F7 -:10E83000002038802046FFF7A4FF20688168480642 -:10E8400006D5222E04D1002038812046FFF7A7FFED -:10E85000A86840F01000A8602046BDE8F24000F033 -:10E860008FBC0000806A00F1560100220A810A80F4 -:10E8700000F086BCFEFFFFEFF369FFCF00380140D8 -:10E8800088000058FFF4FF110024F40000FD0F0081 -:10E89000010002000400060008000A000C0010003D -:10E8A000200040008000000110B500F180010A78CE -:10E8B000012A01D1022010BD01230B7024224A60DD -:10E8C00002681368146864086400146000224266D9 -:10E8D00023F0005300680360202048600020087087 -:10E8E00010BD70B500F01EF801D1022070BD00F01F -:10E8F0001FF822F0604209E070B500F013F801D172 -:10E90000022070BD00F014F822F0606211438160B3 -:10E91000204600F01AF82068066020206860002079 -:10E92000287070BD044604F18005287801287047DE -:10E9300001222A7024206860206806680268520854 -:10E940005200026020688268704730B5416E11B98C -:10E950000121012214E001680FF230048A688968FD -:10E960000FF23003520E02F00702490F655CA45CFF -:10E97000595C9A5CED00E40095FBF1F194FBF2F236 -:10E9800068304180028030BD0000000001010103B9 -:10E99000070100000804020408010101704700009B -:10E9A00001484068704700BF4C1000200248416891 -:10E9B00002788918416070474C100020044B0360B6 -:10E9C00003F15C0008604FF480701060704700BF76 -:10E9D0005C4E00200249016002490161704700BF9E -:10E9E000BBBB0008E3BB000880B5AFF30080024A60 -:10E9F00011001820ABBEFBE72600020038B504006A -:10EA000001D1012032BD00F04FF818B900F048F8EC -:10EA1000C046C0462BE081B090F83D10012918BFD8 -:10EA2000012022D1022280F83D200168CA6842F00C -:10EA30000102CA600168DFF86000814218BFB1F1CD -:10EA4000804F0DD18A68DFF854000240062A18BFB3 -:10EA5000B2F5803F08D0086840F00100086003E08C -:10EA60000A6842F001020A60002001B070470220EB -:10EA70006870211D206800F0CCF801202873A87070 -:10EA8000E87028716871A871E87128726872A872BC -:10EA9000E8726870002032BD002C014007000100C0 -:10EAA000002129702046704704F13C0568787047C2 -:10EAB00010B50446206801698A0715D5C1688A0720 -:10EAC00012D56FF00202026101212177806910F0F6 -:10EAD000030F204602D0C046C04603E0C046C046F1 -:10EAE00000F094F800202077206801694A0715D5C6 -:10EAF000C1684A0712D56FF0040202610221217732 -:10EB0000806910F4407F204602D0C046C04603E032 -:10EB1000C046C04600F07AF80020207720680169DE -:10EB20000A0715D5C1680A0712D56FF008020261FD -:10EB300004212177C06910F0030F204602D0C0469F -:10EB4000C04603E0C046C04600F060F800202077D1 -:10EB500020680169CA0615D5C168CA0612D56FF0CA -:10EB60001002026108212177C06910F4407F20461D -:10EB700002D0C046C04603E0C046C04600F046F89A -:10EB80000020207720680169CA0708D5C168CA0734 -:10EB900005D56FF0010202612046FDF71FFB2068DA -:10EBA00001690A0608D5C1680A0605D56FF080021A -:10EBB00002612046C046C04620680169CA0508D5E2 -:10EBC000C1680A0605D56FF4807202612046C0460E -:10EBD000C046206801694A0608D5C1684A0605D5BD -:10EBE0006FF0400202612046C046C04620680169BD -:10EBF0008A060AD5C1688A0607D56FF0200202612D -:10EC00002046BDE8104000F0C0BA10BD204600F01C -:10EC1000BDBA70B5DFF85C600368DFF85C40DFF810 -:10EC20005C50B04218BFB0F1804F01BF23F07003B9 -:10EC30004A681343B04205D0B0F1804F1CBFA842D0 -:10EC4000A04203D1CA6823F4407313434A6923F0F6 -:10EC5000800313430360B0428A68C2621CBFA842AB -:10EC6000A0420A68826201D1096901630121416100 -:10EC700070BD0000002C01400048014000440140EC -:10EC800018B500F12402507801281BD11378012B0C -:10EC900001D1022012BD536A10701C680A4804405A -:10ECA00008680443C868401E44EAC04448680443F6 -:10ECB000087A497A44EA004444EA41241C6000206E -:10ECC000107012BD012012BDFFFD00E038B5040038 -:10ECD00001D1012032BD2168DFF87003814204F1C7 -:10ECE000240500F044F8022068700A68A0686FF3F9 -:10ECF0000E120243E0680243206902436069024346 -:10ED0000A0690243E0690243206A02430A60204688 -:10ED100000F070F9A068B0F5804F04BF0021616079 -:10ED20002079696A00F03F0000F014F838B1052836 -:10ED300005D2204600F078F900F012F803E0002038 -:10ED400028636863A8630020A86101206870002020 -:10ED5000287032BD0860A96AE86A48606068704738 -:10ED6000296B00200860696BA86B486070470AD265 -:10ED7000DFF8DC0242181423B2FBF3F292002A629D -:10ED8000DFF8D00209E0DFF8D00242181423B2FB0A -:10ED9000F3F292002A62DFF8C402E8617047F8B526 -:10EDA000044604F1240600253078012801D1022010 -:10EDB000F2BD01273770707801282FD102277770B4 -:10EDC000B561206807687F087F000760204600F073 -:10EDD000F5F82168F06820B10A6842F00E020A6076 -:10EDE00008E0086820F0040008602068016841F02D -:10EDF0000A010160706A0168CA0303D5026842F41F -:10EE000080720260306B18B1016841F4807101605A -:10EE10002068026842F00102026001E035700225BC -:10EE20002846F2BD81B040B100F124014A78022A9F -:10EE300005D00420886100200870012026E00268C7 -:10EE4000136823F00E0313604A6A136823F4807377 -:10EE5000136000680268520852000260012091F8B5 -:10EE60002020CB6902F01C02904058608A6AC86A70 -:10EE70005060086B30B1026822F4807202604A6B05 -:10EE8000886B5060012048700020087001B0704706 -:10EE900038B500F1240200245178022903D004205F -:10EEA0009061012428E001680B6823F00E030B60D9 -:10EEB00001680D686D086D000D60516A0B6823F4E0 -:10EEC00080730B60012192F82030D56903F01C0398 -:10EED00099406960936AD16A5960116B31B10B68CE -:10EEE00023F480730B60536B916B59600121517057 -:10EEF0001470516901B18847204632BDF8B500F160 -:10EF000024010423CA6914680268156891F8206016 -:10EF100006F01C0603FA06F73C4210D06F070ED528 -:10EF20001468A50603D4156825F00405156000F0E3 -:10EF30003DF8C968002938D0BDE8F44008470223ED -:10EF400003FA06F73C4213D0AF0711D51468A506A3 -:10EF500005D4156825F00A05156001224A7000F0F5 -:10EF600025F800220A708968F9B1BDE8F440084725 -:10EF7000082303FA06F6344217D02B0715D5136879 -:10EF800023F00E031360012291F82030CC6903F0C6 -:10EF90001C039A40626001228A614A7000220A7052 -:10EFA000096911B1BDE8F4400847F1BD91F820208E -:10EFB000CC6902F01C0293406360704778B5C56C61 -:10EFC000046D6C60446D14B1846DC56D6560012580 -:10EFD00090F84440066C04F01C04A5407560046879 -:10EFE00063608068102802D1A260E16071BDA160F9 -:10EFF000E26071BD416C0268144B89089A4234BFCB -:10F00000174B184B03EB8101816402F0FF02083AB1 -:10F010001421B2FBF1F1144AC26401F01F01012274 -:10F0200002FA01F1016570470179104A01F03F01D0 -:10F0300002EB81024265491E0D4A826501F003011F -:10F0400001228A40C26570470000000008040240A7 -:10F05000F8FFFDBF00000240F8FBFDBF00040240C6 -:10F06000000802401C08024080080240FC080240E0 -:10F07000400902408A60FF2102685162012180F844 -:10F080002110002180F820100020704790F82010F7 -:10F09000012901D102207047012280F8202002219D -:10F0A00080F82110CA210268516253210368596215 -:10F0B00001688A6842F02002FFF7DCBF264981B070 -:10F0C0000A6802430A60096808400090009801B08D -:10F0D0007047F0B585B005460C4668461421F5F733 -:10F0E0004BFF0DB9042004E0012D18BF022D02D101 -:10F0F0000820FFF7E3FF2000184E0FF268070DD13C -:10F1000037F81500009000210191012002900221A2 -:10F11000039100F01BF80120FDF73EF8012C13D1FC -:10F1200037F81500009001210D480190029100F080 -:10F130000DF80FF23800445D00220F2160B2FDF798 -:10F14000A3FC60B2FDF7BEFC05B0F0BD694656F801 -:10F150002500FCF7FFBD00004C00005858100020AF -:10F160000000211010000100020000000A06070044 -:10F17000DFF80800006800F4C06070470004005821 -:10F18000704770477047704770477047704700007E -:10F190004144565F5550444154455F50524F43459A -:10F1A000535300004843495F555345525F455654F9 -:10F1B0005F50524F434553530000000053564343A2 -:10F1C000544C5F4170705F4E6F746966696361741F -:10F1D000696F6E000D0A0D2A2A20444953434F4E91 -:10F1E0004E454354494F4E204556454E54205749AD -:10F1F000544820434C49454E5420646973636F6EF4 -:10F200006E656374696F6E20526561736F6E3D3019 -:10F21000782530325820737563657373200A0D00AA -:10F220000D0A0D2A2A20444953434F4E4E4543545C -:10F23000494F4E204556454E542057495448204387 -:10F240004C49454E5420646973636F6E6E656374F8 -:10F25000696F6E20526561736F6E3D307825303274 -:10F260005820436F6E6E656374696F6E20746572AB -:10F270006D696E61746564206279206C6F63616C86 -:10F2800020686F7374200A0D000000000D0A0D2A1B -:10F290002A20444953434F4E4E454354494F4E2034 -:10F2A0004556454E54205749544820434C49454EF5 -:10F2B0005420646973636F6E6E656374696F6E204A -:10F2C000526561736F6E3D30782530325820436F40 -:10F2D0006E6E656374696F6E207465726D696E61C0 -:10F2E0007465642064756520746F204D4943206601 -:10F2F00061696C757265200A0D0000004143495F29 -:10F300004741505F50414952494E475F434F4D502E -:10F310004C4554455F56534556545F434F44452032 -:10F3200020506565725F426F6E646564203D2564A0 -:10F33000203D3E20256420205365637572697479F1 -:10F340005F4D6F64653D2564203D3E20256420535C -:10F35000656375726974795F4C6576656C3D25648B -:10F36000203D3E202564200A0D0000005465726D8A -:10F3700020436F6E6E656374696F6E20666F7220D6 -:10F380007468652066697273742070616972696E51 -:10F390006720636F6D706C65746520746F20736196 -:10F3A000766520626F6E64696E6720696E666F6D48 -:10F3B0006174696F6E20212121200A0D0000000078 -:10F3C000206163695F6761705F636C6561725F7321 -:10F3D000656375726974795F646220262061636970 -:10F3E0005F6761705F72656D6F76655F626F6E6497 -:10F3F00065645F6465766963652026206163695F83 -:10F400006761705F7465726D696E617465200A0D65 -:10F4100000000000414E43535F50524F4345535349 -:10F4200000000000414E43535F4170705F4B6579AF -:10F43000427574746F6E32416374696F6E000000C0 -:10F4400052657669657720746865205072654578E5 -:10F450006973746564204E6F746966696361746969 -:10F460006F6E200A0D0000004761747450726F6364 -:10F4700052657100414E43535F5345545F444154BC -:10F48000415F4C454E475448207365742064617455 -:10F4900061206C656E677468202564202564206F88 -:10F4A0006B203D3D3E6163695F676174745F6578A1 -:10F4B0006368616E67655F636F6E666967200A00E7 -:10F4C0006163695F676174745F65786368616E67C3 -:10F4D000655F636F6E66696720636D64206F6B2084 -:10F4E0000A0D00006163695F676174745F6578632A -:10F4F00068616E67655F636F6E66696720636D64E0 -:10F50000204B4F20726573756C743D307825303216 -:10F5100078200A0D00000000474154545F50524FBC -:10F52000435F444953435F414E43535F53455256F3 -:10F53000494345206163695F676174745F646973FF -:10F54000635F7072696D6172795F7365727669630A -:10F55000655F62795F7575696420636D64206F6BA8 -:10F560000A000000474154545F50524F435F4449E2 -:10F5700053435F414E43535F5345525649434520E1 -:10F580006163695F676174745F646973635F7072FC -:10F59000696D6172795F736572766963655F6279BF -:10F5A0005F7575696420636D64204E4F4B207374E2 -:10F5B00061747573203D307825303258200A000080 -:10F5C000474154545F50524F435F444953435F4156 -:10F5D0004E43535F5345525649434520414E435392 -:10F5E0002053657276696365206973204E4F5420FD -:10F5F000666F756E6420212121203D3D3E20636FA2 -:10F600006E6E656374656420746F20416E64726F02 -:10F6100069642050686F6E652F506164200A0D0088 -:10F62000474154545F50524F435F444953435F41F5 -:10F630004E43535F5345525649434520414E435331 -:10F640002053657276696365205B307825303458C5 -:10F65000202D203078253034585D20697320666F66 -:10F66000756E6420212121203D3D3E20636F6E6E2A -:10F67000656374656420746F20694F532050686F10 -:10F680006E652F506164200A0D00000010B504461D -:10F69000AFF30080204600F005F80446AFF3008089 -:10F6A000204610BD7CB500F10F06F608F600B0420A -:10F6B00040D2082E04D2082602E0083000F047F8B5 -:10F6C000DFF804512C68210005D1002007E0026812 -:10F6D000B24221D2011D08680028F8D12068291DF6 -:10F6E0000A68824222D01368B34238BF111DF7D393 -:10F6F00012E093190B60801B54685C600B68186003 -:10F700001660096800291DBF48680028081D0020F0 -:10F71000286002F1080076BD61B10A681068A0F1A6 -:10F720000803B342E5D250680860EAE700F04EF8FB -:10F730000028C2D1002076BD10B5040006D0AFF37A -:10F740000080204600F003F8AFF3008010BD0028D1 -:10F7500000D1704750B4A0F108021368072B2BD9D1 -:10F7600013F0070F28D1184C616809B18A4202D200 -:10F770005160626013E0486800B3904238BF0146B0 -:10F78000F9D31BE0964203D11B180B600A4606E032 -:10F79000486810B1134498420ED350604A605068D4 -:10F7A00050B11368D118814206D10021216001684F -:10F7B000CB1813604068506050BC704708680E1842 -:10F7C000B242DFD250BC7047CC5C002007490868C9 -:10F7D00008B1002070470648C008C000086005490D -:10F7E000C908C900091A0160704700BFF45C002015 -:10F7F0000F6D0020087100201349002008604FF4AD -:10F80000E0221248016841F4700101604FF0B041FC -:10F81000086840F0010008608A600D480A680240EC -:10F820000C480A60036823F005030360426852082D -:10F830005200426000220848C8600861086820F44D -:10F84000802008608A61704708ED00E088ED00E0E4 -:10F85000FBFEF6FA9400005800100422010000009C -:10F86000030000000500000001000000010000008E -:10F87000060000000A000000200000000200000056 -:10F88000040000000800000010000000400000001C -:10F89000800000000001000000020000A0860100BE -:10F8A000400D0300801A060000350C0040420F0096 -:10F8B00080841E0000093D0000127A000024F4003C -:10F8C00000366E010048E801006CDC020000000018 -:10F8D0000000000000000000000000002DE9F041E1 -:10F8E00007468846387810F0030F16461D4633D079 -:10F8F000384600F099F878BBB8F1000F1CBFD8E982 -:10F9000000018619012D2ED13888C10415D5396A18 -:10F9100007F14402384600F0A3F83A6B044602B9F6 -:10F920003A69F968384600F09BF8361B341A7A6950 -:10F93000F968384600F094F8261A1EB94DB916F148 -:10F94000010F09D097F903002A46314600F08EF8DE -:10F95000064616F1010F09D12320AFF300804FF0C6 -:10F96000FF30BDE8F081022DE8D1EBE7388810F4D4 -:10F97000405F0ED07868F86038617861B861786867 -:10F98000F86107F14400386207F130007862002026 -:10F990003863B8F1000F05D0D8E9020107F134024D -:10F9A000C2E9000139884CF6FF600140398000202F -:10F9B000BDE8F08170B50546AFF30080288881046A -:10F9C00015D56E680024EA6895F903003146914226 -:10F9D00012D2521AF5F7A1FA10F1010F1CBF00283C -:10F9E0003618F0D10FE04DF6FF700140298028460F -:10F9F000AFF30080002070BD00220021F5F78DFAE2 -:10FA000010F1010F00D101246868E860A861E86185 -:10FA1000002C2988E7D041F4007129802846AFF3F3 -:10FA200000804FF0FF3070BDF8B5A0B9AFF3008093 -:10FA300000250A4E08244FF0FF37306820B1FFF749 -:10FA4000B9FF002848BF3D46361D641EF5D1AFF30F -:10FA500000802846F2BDBDE8F240ABE7401100202F -:10FA6000914234BF511A0021084670473EB5040048 -:10FA70000D00012A02D100F063F807E0022A07D145 -:10FA800000940020019069460C20ABBE2D1801E0C7 -:10FA9000002A0CD10094019569460A20ABBE0028CB -:10FAA00005D100222100280000F027F801E0002005 -:10FAB000C04303B030BD000010B4314A00211346EA -:10FAC0001C6884421EBF491C9C6884421EBF491C9E -:10FAD0001C69844209D09C69491C844205D0491C98 -:10FAE00020331029ECD310BC7047002342F831308A -:10FAF00002EBC1014B6010BC704778B4204C00236E -:10FB000025462E688E421EBF5B1CAE688E421EBF0D -:10FB10005B1C2E698E4209D0AE695B1C8E4205D0FB -:10FB20005B1C2035102BECD372BC7047054604EBF0 -:10FB3000C303012A04BF59684D195D6072BC704748 -:10FB400010B40F4A002113461C6884421EBF491C92 -:10FB50009C6884421EBF491C1C6984420AD09C696F -:10FB6000491C844206D0491C20331029ECD310BC18 -:10FB70000020704702EBC100406810BC70470000D5 -:10FB80002C59002010B50446E068A169884251D381 -:10FB9000218849F202030B40022B08D008044CBF15 -:10FBA0004FF400704FF48440014321803BE001F4A6 -:10FBB000C042B2F5C04F06D1A168884203D32046A7 -:10FBC000FFF732FF78BB208810F4406F02BF6068F7 -:10FBD00004F14401884217D14FF40070FFF756FD3D -:10FBE000606030B904F144006060E060401CA060D7 -:10FBF0000AE0218841F040012180E060606100F569 -:10FC000000726068A260E06160682061A068A06125 -:10FC1000207841070AD502220021204600F00CF886 -:10FC200010F1010F02D14FF0FF3010BD208840F4D9 -:10FC3000C0402080002010BD70B504460D46164619 -:10FC4000AFF3008033462A4600212046FFF746FEE8 -:10FC500005462046AFF30080284670BD38B5040045 -:10FC60000ED0207810F0030F03D094F90300002881 -:10FC700009D5AFF30080204600F030F8AFF30080E4 -:10FC80004FF0FF3032BD2046FFF7CEFE0546AFF302 -:10FC900000802078410644BF606800F05DF80020D5 -:10FCA000606094F90300022804D900F057F808B105 -:10FCB0004FF0FF35E06B48B100F05CF808B14FF051 -:10FCC000FF35E06B00F048F80020E063204600F0CC -:10FCD00005F8AFF30080284632BD000001780A061F -:10FCE00026D51C4A13680021834203D1002342F821 -:10FCF00021301BE05368012183421EBF022193681B -:10FD00008342F3D0D368032183421EBF04211369C9 -:10FD10008342EBD05369052183421EBF06219369BC -:10FD200083421EBF0721D3698342DFD000F014B89D -:10FD3000002101804FF0FF31C17000F144014160AA -:10FD4000C160016141618161C161016200F1300105 -:10FD50004162704740110020FFF7EEBC1CB5020065 -:10FD6000009269460220ABBE04001000FFF7A4FE1B -:10FD7000200016BDE0B50090F6F7F2FF019069464D -:10FD80000E20ABBE03B000BD7047FEE7FEE7FEE706 -:10FD9000FEE770470748FFF7B1B80748FEF788BE8F -:10FDA0000648FEF7F5B90648FEF7F2B90548FFF731 -:10FDB000A5B80000AC5900200C5B00200C580020B6 -:10FDC0007C5700200C5A00201020FCF787B8012037 -:10FDD000FCF784B80220FCF781B8FAF794B8FCF776 -:10FDE000A5BFFCF779BF38B50C46C5B22046AFF3C6 -:10FDF0000080E068A169884204D32046FFF7C2FE74 -:10FE000000280FD4E068401CE06000F8015D208805 -:10FE1000010503D440050BD50A2D09D12046FFF773 -:10FE200003FE28B12046AFF300804FF0FF3032BD13 -:10FE30002046AFF30080284632BD19E050F8042B6D -:10FE4000D30744BFA9F101039A18091F002304290D -:10FE500042F8043BF9D25FEA817C134604D54FF0A7 -:10FE6000000CA2F800C09B1CC90744BF00211970F8 -:10FE700050F8041B0029E1D17047000038B50D4D42 -:10FE80000824286800281CBF017811F0030F05D052 -:10FE900090F90310002958BFFFF7E0FE2D1D641EE6 -:10FEA000EFD1BDE83840002200214FF0FF30F5F7D8 -:10FEB00034B800BF4011002010B50749794418310B -:10FEC000064C7C44163404E00A68081D1144884737 -:10FED0000146A142F8D110BD2C00000060000000D6 -:10FEE0004EF68851CEF20001086840F470000860B8 -:10FEF000BFF34F8FBFF36F8F4FF00070E1EE100A2A -:10FF00007047000037FFFFFF704B00009811002082 -:10FF1000700800003000032000000000074FFFFFC2 -:10FF2000B40100006C01000004000020F74EFFFF48 -:10FF30005A02000006000000280003200000000014 -:10FF400000000000000000000000000001000000B0 -:10FF50000200000003000000040000000120C04671 -:10FF6000002801D0FFF7A8FFAFF300800020AFF317 -:10FF70000080FBF7DAFF00F000F800F001B80000A5 -:10FF80000746FFF77BFF3846FEF72EFDFBE7000034 -:10FF9000534843495F555345525F4556545F50524D -:10FFA0004F4345535300000038B504460D462846DC -:10FFB00000F006F8A84218BF0024204632BD000019 -:10FFC0000149FFF710BF00BFB01000200148804773 -:10FFD00001480047F9F70008F5FF00084852535F51 -:10FFE00050524F434553530064656661756C7454B9 -:10FFF00061736B00AFF30080FFF772FFFFF7AEFF96 +:1084C0000100000000000048010000000000000062 +:1084D00000000000000000009C830008280003202A +:1084E0002C0003202604040062F30F2262F31F42D3 +:1084F00000B500BF130096469446103928BFA0E887 +:108500000C50FAD85FEA417C28BF0CC048BF40F845 +:10851000042BC90728BF20F8022B48BF00F8012B05 +:1085200000BD0000F0B585B050260B9D25B986F33F +:10853000118800F0A9FBFEE70C9C24B986F3118892 +:1085400000F0A2FBFEE75C270097009F5C2F04D0A1 +:1085500086F3118800F098FBFEE70A9E009F2563D2 +:10856000022584F85950029400250395009604AD25 +:10857000019500F034F8204600F077F8049805B033 +:10858000F0BD2DE9F8430646174684B08846994663 +:10859000B80003F07BFE05001CD05C2003F076FEE3 +:1085A000040014D00D990C982563002284F85920FA +:1085B00003920191009002944B463A464146304660 +:1085C00000F00DF8204600F050F8012004E02846A5 +:1085D00003F0E8FE4FF0FF3005B0BDE8F0832DE971 +:1085E000F0470A9F81460C461546386B9A46A522ED +:1085F000A900FFF779FF386B00EB8501081FC00861 +:108600004FEAC00808F0070007F1340554B1002113 +:10861000605C6854605C10B1491C1029F8D30020DC +:10862000E87300E02870089E099C372E88BF372623 +:10863000FE62AE61E861C6F13806381D00210161B5 +:1086400007F11800002101613F61BE617F620020D7 +:10865000286287F8580052464946404600F098FC88 +:10866000386004B12760BDE8F0872DE9F04100F0E3 +:1086700056F8DFF83855DFF83885E86C401CE864B8 +:108680001426A86A28BBAC62E86C012829D100270F +:1086900006FB07F0404403F0D7FE7F1C382FF7D3CA +:1086A00005F1740003F0D0FE05F18807384603F0A9 +:1086B000CBFE284603F0C8FE05F1140003F0C4FE0B +:1086C00005F1380003F0C0FE05F17400E8622F6385 +:1086D00007E0A86D28B9E16AA86AC26A914228BF7A +:1086E000AC62A86E401CA8666064E06A696D814255 +:1086F00038BF68654643211D08EB060003F0B1FE54 +:1087000000F0D9FCA86D40B1A96AC86AE16A884244 +:1087100003D200F007F800F0B7FABDE8F081044694 +:1087200000F0B0BCDFF824174FF0805008607047AD +:1087300080B586B000200590049003AA04A905A87E +:10874000FCF7F6FD05990498029100220092019031 +:108750000023039A0FF248010FF27130FFF7E2FE97 +:1087600098B103F0B7FE5021012810D181F3118890 +:1087700000F08AFADFF834044FF0FF31C1660121BE +:1087800081650021016500F02BFC07B000BD10F1F0 +:10879000010FFAD181F3118800F076FAFEE70000AC +:1087A00049444C4500000000DFF8D007016F491C28 +:1087B00001677047DFF8F423506D002100B10121FB +:1087C000936AD86A28B9DFF8B8371868012800D842 +:1087D00009B100207047D16E106D081A704770B54E +:1087E000DFF8C863306F0024002520B900F044F89A +:1087F00000F04AFAFEE700F045FC306F401E30679B +:10880000316F002936D1F06CD0B933E0F168CC6813 +:1088100000F036F800F003FAE06A716DDFF86027C7 +:10882000814238BF706514235843211D104403F062 +:1088300018FEE06AB16ACA6A904224BF012030661D +:1088400030680028E2D10CB100F092F9F46D3CB12F +:1088500000F01EF808B101203066641EF8D1F565FD +:10886000306E38B1DFF81C074FF0805101250160F0 +:1088700000F00AFA00F050BA502181F311887047D5 +:1088800004F1180003F012BEDFF8F006006D704727 +:108890002DE9F843DFF81473386F0026002851D112 +:1088A0003C6D641C3C6510D1F86A006820B1FFF78C +:1088B000E3FF00F0E9F9FEE7F86A396BF962386323 +:1088C000786E401C786600F053F9F86EDFF8B096C9 +:1088D00084424FF0140824D319E0281D03F0E6FD6C +:1088E000A86A18B105F1180003F0E0FDE86A796D97 +:1088F000814238BF786508FB00F0291D484403F029 +:10890000B0FDE86AB96ACA6A904228BF0126F86ACF +:10891000006898B1F96AC868C56868688442DCD2A2 +:10892000F866B86AC06A08FB00F159F8010002282D +:10893000386E28BF012640B1012606E04FF0FF3116 +:10894000F966EEE7F86D401CF8657BE218B5DFF8D4 +:108950005C22106F10B10121116611BD1066516DBE +:10896000DFF81C3600E0491E14244C43185930B976 +:108970000029F8D1FFF780FF00F086F9FEE718190B +:1089800000F1080443685B684360A34204BF5B686E +:1089900043604068C3689362516511BD10B50C46D1 +:1089A00010B900F06EF9FEE700F01DF803F065FD68 +:1089B0002046BDE81040FFE7012100F0B8BA38B505 +:1089C0000D46144610B900F05CF9FEE700F00BF814 +:1089D00003F047FD0CB14FF0FF3521462846BDE8B6 +:1089E000344000F0A4BADFF89425936A03F118012B +:1089F000704738B5C068C46814B900F042F9FEE7A2 +:108A0000FFF73EFFDFF8A451286F50B900F007F9D7 +:108A100000F014F838BF6A6500F016F800F0A8F806 +:108A200004E004F11801284603F01BFD00F010FAE1 +:108A300002D20120286632BD002032BDE26A686D94 +:108A4000DFF83C359042704714204243211D9818AE +:108A500003F007BDDFF824154A6E0260096D41601E +:108A60007047F8B504460D46502014B900F00AF9D5 +:108A7000FEE715B900F006F9FEE700F003FBDFF8AA +:108A8000FC04016D62682E688B1A16F1010F0ED07E +:108A9000476ED4F800C0674501D091420BD2B34273 +:108AA00007D2F31A2B60416E2160006D60600024D4 +:108AB00002E000202860012400F0FDFA2046F2BD0B +:108AC000DFF8B81401200866704700002DE9F04176 +:108AD000DFF87843DFF8D880344F4FF0805511E04D +:108AE00000F0D0FA386AC668301D03F0DFFCF86C7D +:108AF000401EF864786B401E786300F0DCFA304664 +:108B000000F021F8786B0028EAD1D8F8001001298C +:108B100002D9256000F0B8F8FFF74CFE0128F1D922 +:108B2000386F401C3867F86E396D884208D3FFF7FC +:108B300041FE012888BF03F083FEFFF750FEE1E706 +:108B400000F09FF8FEE710B5044694F8590040B9CC +:108B5000206B03F027FC2046BDE8104003F022BC48 +:108B600010BD0128F7D00228FAD000F08AF8FEE7FD +:108B70000E49C86A006810B94FF0FF3203E0C86AB6 +:108B8000C268D0684268CA667047DFF8F003806A3E +:108B90007047DFF8E813886D08B901207047086F47 +:108BA00008B902207047002070470000E48A0020C6 +:108BB000007E0020F8B5044600207CB3E16ADFF8AF +:108BC000BC53AA6AD36A994222D2A069002804D46D +:108BD000A86AC26AC2F13802A2611427DFF8A06352 +:108BE00060697943314488420ED100F018F8A96ACF +:108BF000C86AE062696D814238BF68654743211DDC +:108C0000F01903F02EFC08E0A86AC16AE16204E0F2 +:108C1000E16CAA6AD36A994200D20120F2BD201DFC +:108C200003F044BC38B50446002144B3DFF84C538C +:108C3000A86A5022844204D082F3118800F024F8FC +:108C4000FEE7206D20B982F3118800F01DF8FEE7E1 +:108C5000E26AE36C401E9A42206510D078B9FFF7B3 +:108C6000DEFFE26CDFF81833E262C2F13800A06187 +:108C7000686D904238BF6A65FFF7E6FE012108463D +:108C800032BD502080F31188BFF34F8FBFF36F8F39 +:108C90007047F8B5040034D0206D502220B982F31B +:108CA0001188FFF7F1FFFEE7E36C994238BF1946E0 +:108CB000E36A8B4225D0012823D1DFF8C052A86A8D +:108CC000844204D182F31188FFF7DEFFFEE7A0693A +:108CD000DFF8AC62E16200285CBFC1F13801A1613C +:108CE000142760697B43F11888420AD1FFF797FF88 +:108CF000E06A696D814238BF68654743211DF019FC +:108D000042E1F1BDDFF87412886A18B1886A026D19 +:108D1000521C0265886A704700F0CDF9284670BD84 +:108D20002DE9F04180460F4614461D4600F0AAF991 +:108D3000DFF84862B06A90F85800022811D0B06A93 +:108D4000416D21EA080141650120B16A81F85800AE +:108D50003DB10121284600F0EAF8FFF7E3FCFFF7F8 +:108D600093FF00F0A8F900F08DF914B1B06A406DDE +:108D70002060B06A90F85800022818BF002405D17E +:108D8000B06A416D21EA070747650124B16A0020F6 +:108D900081F8580000F08FF92046BDE8F08100000E +:108DA0002DE9F84304460F4691461D4601264FF033 +:108DB000500824B988F31188FFF766FFFEE700F03A +:108DC00061F900F0A6F8B9F1040F27D8DFE809F03F +:108DD00006031E052200616D0F43676501282FD130 +:108DE000FFF71DFFE06A654D654B696D814238BF35 +:108DF000686514225043211D184403F032FBA06A19 +:108E0000A8B188F31188FFF73FFFFEE7616D491CA9 +:108E10006165E3E70228E0D1002611E0616D11F100 +:108E2000010FDBD088F31188FFF72EFFFEE7FFF775 +:108E30009FFE00F00DF803D2FFF774FCFFF724FF4C +:108E400000F039F93046BDE8F283000004ED00E09F +:108E5000A86AC16AE06A8142704700002DE9F047C4 +:108E600004460F4692461D4601264FF0500824B98D +:108E700088F31188FFF708FFFEE700F043F9EFF3EE +:108E8000118988F31188FFF7FFFE00F042F8BAF16C +:108E9000040F18D8DFE80AF006030F051300616D10 +:108EA0000F43676501282FD1A06AA8B188F3118804 +:108EB000FFF7EAFEFEE7616D491C6165F2E70228F3 +:108EC000EFD1002620E0616D11F1010FEAD088F3A7 +:108ED0001188FFF7D9FEFEE7284D286F40B9FFF74C +:108EE0009EFEFFF7ABFD38BF6A6500F01BF802E09D +:108EF00004F11801284603F0B4FAFFF7A9FF03D2E2 +:108F0000089800B106602E6689F311883046BDE8E6 +:108F1000F0870DB1606D2860022194F8580084F844 +:108F20005810704714204243211D98187047F8B517 +:108F3000124D2F6D0C46A96A0646081D03F0B6FABD +:108F400016F1010F05D124B1A86A011D05F1380001 +:108F50001AE0A86AF6194660BE42A86A05D2011D49 +:108F6000286BBDE8F44003F088BA011DE86A03F0FD +:108F700084FAE86E864238BFEE66F1BDE48A0020CE +:108F8000007E002004ED00E0BDE8F44003F069BA83 +:108F90004908490010B5A0F120034FF08074996191 +:108FA000DC611A600FF2110159616FF0020140F8A3 +:108FB000241D203810BD000063494A68502012F17A +:108FC000010F06D080F31188BFF34F8FBFF36F8F6F +:108FD000FEE780F31188BFF34F8FBFF36F8FFEE77B +:108FE0007CB55A495A4B0A6850209A4202D100F087 +:108FF00082F8FEE70B68574CA34202D100F07BF8E1 +:10900000FEE7554A14780194FF231370072513785F +:109010004D4C8DF800309DF80030A56003F05003F2 +:10902000237006E05B1EA3609DF800305B008DF8A6 +:109030000030A3689DF800502E06F3D4C3F1070555 +:10904000042D02D000F057F8FEE71B0203F4E063A2 +:10905000A36001981070086A40F470000862086A02 +:1090600040F07040086200F081F80020606003F07A +:1090700033FC3A48016841F04041016003F01CFCB8 +:10908000002076BD502080F31188BFF34F8FBFF3CF +:109090006F8F2D494A68521C012A4A600AD1304913 +:1090A0000A68130606D080F31188BFF34F8FBFF311 +:1090B0006F8FFEE770472449486838B9502080F325 +:1090C0001188BFF34F8FBFF36F8FFEE7401E4860DC +:1090D00008BF80F31188704780B5502000F00BF86E +:1090E000FFF7D6FB18B11E494FF0805008600021F1 +:1090F00081F3118801BD80F31188BFF34F8FBFF357 +:109100006F8F7047EFF30580502110280E4A0BD364 +:10911000144B185C1378984206D281F31188BFF380 +:109120004F8FBFF36F8FFEE790680F4A136803F409 +:10913000E063984206D281F31188BFF34F8FBFF3EB +:109140006F8FFEE7704700007425002000ED00E0FF +:1091500071C20F4170C20F4100E400E034EF00E043 +:1091600004ED00E0F0E300E00CED00E00748002132 +:10917000016081604FF47A7305490A68B2FBF3F32A +:109180005B1E436007210160704700BF10E000E0F4 +:109190009825002038B504000D4602D100F0E1F812 +:1091A000FEE7FFF76FFF206CE16B226800FB01F325 +:1091B000491E13444843A36010440023A363E060A6 +:1091C000626004F144004FF0FF310170417075B9E5 +:1091D0002069A0B104F11000FFF70BFC78B1DFF8B3 +:1091E0008C184FF08050086000F041FB07E004F15C +:1091F000100003F029F904F1240003F025F9FFF72A +:109200005AFF012032BD7CB51C46502320B983F3A0 +:10921000118800F02CFBFEE724B983F3118800F0DD +:1092200026FBFEE72AB129B983F3118800F01FFB62 +:10923000FEE769B90093009E502E0ED1069B009D5B +:10924000012684F84660009400F028F8204676BD98 +:1092500083F3118800F00BFBFEE783F3118800F025 +:1092600006FBFEE7F8B505000E46174602D100F0F2 +:1092700078F8FEE706FB05F0503003F007F804002D +:109280000AD0002184F8461000943B4604F15002B5 +:109290003146284600F002F82046F2BD38B5049D5C +:1092A0001C4601B92A462A60E86329642846012140 +:1092B000FFF770FF85F84C4031BD30B1002181606F +:1092C0000160C1600023002284E0704710B50246AF +:1092D00000210120FFF7C6FF0446FFF7EEFF2046FE +:1092E00010BD1CB500900B46002200210120FFF7A5 +:1092F0008AFF0446FFF7E1FF204616BD10B50400C3 +:1093000002D100F02EF8FEE7FFF73FFCA168814292 +:109310000BD1E068401EE06005D10023002200214F +:10932000204600F057F8012010BD002010BD38B5D0 +:1093300004000D4602D100F014F8FEE7FFF725FC0B +:10934000A168814204D1E068401CE060012032BD88 +:109350002946204600F0E1F910B1E168491CE160BE +:1093600032BD502080F31188BFF34F8FBFF36F8F52 +:1093700070471CB50C461346502120B981F3118863 +:1093800000F075FAFEE7A04204D281F3118800F0E4 +:109390006EFAFEE70221009100220021FFF733FF61 +:1093A00000B1846316BD10B50C46502120B981F37D +:1093B000118800F05CFAFEE7A04204D281F3118824 +:1093C00000F055FAFEE702220021FFF74BFF00B143 +:1093D000846310BD2DE9F64782B004461E4650272F +:1093E00014B900F042FAFEE75FEA010A01D1206CED +:1093F00070B9022E02D1E06B01280CD1FFF7C9FB36 +:1094000000285ED1039800285BD000F02EFAFEE71A +:1094100000F02BFAFEE700F028FAFEE7039907F1C7 +:109420001000FFF7BBFA384600F0C0FAFFF7D7F993 +:1094300018B9C8F8009000F01AFAFFF723FEB86BCD +:10944000F96B884242D3022E40D00398002835D0D1 +:1094500014B900F0F6F90124FFF72DFEFFF7A4F987 +:10946000FFF710FE07F1440000F0EEF904BF002200 +:10947000027000F0EEF904BF00224270FFF71BFEFD +:1094800000F03CF888BBFFF7FDFDB86BF96B884234 +:1094900014BF00250125FFF70EFE002DBED1384672 +:1094A00000F084FAFFF79BF9C7E718B1C8F80090FD +:1094B00000F0DDF9FFF7FFFD01201CE0FFF7FBFDE9 +:1094C00018E02746002400F023F9B6E7324651465B +:1094D000384600F023FA796A0029E6D007F1240023 +:1094E000FFF787FA0028E1D1E4E7384600F05EFA9A +:1094F000FFF775F9002004B0BDE8F08703A96846BE +:10950000FFF7AFBA2DE9F8430446884615461E46D4 +:10951000502714B900F0A9F9FEE7B8F1000F01D106 +:10952000206C28BB022E02D1E06B012823D1FFF76B +:10953000E9FDEFF3118900F063F801D3022E22D187 +:1095400094F94570A06B32464146204600F0E6F99A +:1095500017F1010F12D1606A98B104F12400FFF7EE +:1095600048FA002818BF002D0BD00120286008E021 +:1095700000F07BF9FEE700F078F9FEE77F1C84F845 +:109580004570012000E0002089F31188BDE8F283D6 +:10959000F8B504460D46502714B900F066F9FEE709 +:1095A000206C10B100F061F9FEE7216809B9A068EC +:1095B000D0B9FFF7A7FDEFF3118600F021F81BD219 +:1095C00094F94510401C11F1010FA0630FD1606A9E +:1095D00080B104F12400FFF70CFA002818BF002D19 +:1095E00008D00120286005E000F03FF9FEE7491CA3 +:1095F00084F84510012000E0002086F31188F2BDB8 +:1096000087F31188BFF34F8FBFF36F8FA06BE16BB0 +:10961000884270472DE9F74306460F46002450253F +:1096200026B985F3118800F022F9FEE70FB9306CF6 +:1096300048B9FFF7AEFA78B9029868B185F3118896 +:1096400000F015F9FEE785F3118800F010F9FEE748 +:1096500000F004F9FFF7C3F8FFF714FDB56B00F055 +:1096600057F825B90298B8B9FFF725FD4DE03946FE +:10967000304600F087F96D1EB563306940B106F1E0 +:109680001000FFF7B6F918B1C8F8009000F0EFF835 +:10969000FFF711FD012039E014B900F0D2F80124E0 +:1096A000FFF709FDFFF780F8FFF7ECFC06F1440037 +:1096B000415711F1010F04BF0022027000F0C9F8F8 +:1096C00004BF00224270FFF7F6FC02A9FFF717FF64 +:1096D0000028304610D100F09BF90028B8D000F0E7 +:1096E000BFF800F0BBF8FFF77AF80028B4D1C8F84B +:1096F000009000F0BCF8AFE700F058F9FFF76FF802 +:10970000304600F085F90028A6D00020BDE8FE8391 +:10971000DFF858834FF0805970472DE9F24382B04B +:10972000064600240025502716B900F09EF8FEE7F3 +:10973000306C10B100F099F8FEE7FFF72AFA40B953 +:10974000029830B100F091F8FEE700F087F8FFF7DB +:1097500046F8FFF797FCB06BFFF7DAFF28B90298DD +:10976000D0B9C5B100F081F8FEE7401EB0633068A3 +:1097700010B9FFF7C7FAB060306940B106F11000C8 +:10978000FFF737F918B1C8F8009000F070F8FFF74C +:1097900092FC012053E04FE014B900F052F801248C +:1097A000FFF789FCFFF700F8FFF76CFC06F14400B7 +:1097B00000F04AF804BF0022027000F04AF804BF2B +:1097C00000224270FFF777FC02A9FFF798FE0028FD +:1097D00030461AD100F01CF90028B6D0306838B9EC +:1097E000FFF750FCB068FFF7E5F90546FFF763FCAB +:1097F00000F036F800F032F8FEF7F1FF0028A8D1AB +:10980000C8F8009000F033F8A3E700F0CFF8FEF7B7 +:10981000E6FF304600F0FCF800289AD075B1FFF75B +:1098200031FC706A00281DBF306B0168C1F138013E +:109830000021B068FFF72DFAFFF73DFC0020BDE8DE +:10984000FE836846FFF706B990F9001011F1010F89 +:10985000704790F9011011F1010F70473046A5E0F3 +:10986000029906F12400FFF799B887F31188BFF336 +:109870004F8FBFF36F8F70472DE9F84304460F46B3 +:109880001546502624B986F31188FFF7F0FFFEE74E +:109890000FB9206C70B9FFF735FCEFF3118886F330 +:1098A0001188FFF7E4FFA66B4EB9002088F31188FA +:1098B000BDE8F28386F31188FFF7D9FFFEE794F93C +:1098C00044903946204600F05DF8761E19F1010FEC +:1098D000A6630CD1206970B104F11000FFF789F87C +:1098E000002818BF002D06D00120286003E009F1F0 +:1098F000010084F844000120D8E710B5040002D12B +:10990000FFF72FFDFEE700F09EF894F8460020B91F +:109910002046BDE8104002F045BD10BDF8B5064632 +:109920001546B46B326C002742B9316831BBB06860 +:10993000FFF778F900210746B1601FE065B970684C +:10994000FAF7FAFF7068316C0844B16870608842B9 +:1099500014D33068706011E0F068FAF7EDFF306CF6 +:10996000F16840420144F1603268914202D2B1682C +:109970000844F060022D01D104B1641E641CB4637C +:109980003846F2BD026C002A0B4600D1704710B574 +:10999000C16884681144C160A14224BF0168C160EC +:1099A000C168BDE810401846FAF7C6BFF8B50546CD +:1099B000FFF768FB05F1440494F9016070B20128D7 +:1099C00015DB686A98B105F12400FFF712F808B1B9 +:1099D000FFF776F8761EF1E72869A0B105F11000CF +:1099E000FFF707F808B1FFF76BF87F1E08E04FF0AC +:1099F000FF366670FFF75FFBFFF744FB94F90070DA +:109A000078B20128E8DA2670BDE8F140FFF753BBD1 +:109A100010B50446FFF736FBA06B441EA441FFF7C8 +:109A20004AFBE00F10BD10B50023114C54F8332051 +:109A30001AB15B1C082BF9D310BD44F8331004EBAA +:109A4000C301486010BD10B50021094A02EBC103F3 +:109A50005C68844203D0491C0829F7D310BD00205C +:109A600042F83100586010BD0000000004ED00E035 +:109A7000C08F0020F8B504460D461646FFF702FBDE +:109A800004F1380797F90C0010F1010F04BF002111 +:109A9000397397F90D0010F1010F04BF002179739C +:109AA000FFF709FB386828B93246294604F124003B +:109AB000FEF785FF2046BDE8F24077E70C4800211D +:109AC00001604160704710B500F00CF85C6819B196 +:109AD000012904D1204301E024EA0000586082F308 +:109AE000108810BDEFF3108272B6014B7047000072 +:109AF000DC90002002F053FF9DF80E0005B000BD81 +:109B0000F8B500F10C026B4625214FF66640F1E7EF +:109B1000F8B500F10C026B460F214FF66840E9E7FB +:109B2000F8B502466B460E214FF67540E2E770B578 +:109B30001B491C4B0A681C49C2F30D0201EB820150 +:109B40000C6822689A4205D16569A169E269E368F7 +:109B5000246904E025696169A2696368A4682E0E1E +:109B6000067001722E0C467042722E0A8670C47303 +:109B7000C5F3031605F00F050571C6700D0E45718E +:109B80000D0C85710D0A190E8172C571190CC17207 +:109B90001B0A210E41730373210C8173002070BDD9 +:109BA0003C400058B95646A900000320E0B505A086 +:109BB000042100908DF8041042F62920694600F037 +:109BC0004EFE07BD53544D0010B50078344C18B10B +:109BD00002280FD004D310BDA0800120207310BD37 +:109BE000607B00F08DFA607BBDE8104040F601011B +:109BF00000F0D5BA607BBDE8104000F081BA10B526 +:109C00000FF2A8020FF24500254C0021FBF7AEF938 +:109C1000244A10600020207321460420207042F660 +:109C2000382001F04FF81F20E07204F10D010A20E6 +:109C3000A0800120A0724FF48060E0800122BDE886 +:109C400010400FF25103002000F034BA70B542F614 +:109C50003724134D144E4FF0FF3200210120FBF743 +:109C600003FA3068E97A00F00700413068800A079B +:109C7000287B04D4012807D10020287304E00028A1 +:109C8000F8D1A888401DA880A91C204601F01AF828 +:109C9000E1E70000034800680121FBF7B3B90000C9 +:109CA0008490002018910020282800400C0801080A +:109CB00000000000000000000000000000000000A4 +:109CC000000A00000000000000000000000000008A +:109CD000DFF83C150A6892B200E00246086880B2DC +:109CE0008242FAD170472DE9FC4104461825DFF87D +:109CF0002485DFF82465684308EB000730780628E0 +:109D000008D131787170347078754FF0FF30706021 +:109D1000002039E000F077F8B9680918B96008F157 +:109D20000803B96832786A439A589142327813D35B +:109D300008F1150315FB02FC13F80C30062B25D097 +:109D400008F108066B43F358994222BF08F1150346 +:109D50006A439A5CEED219E01146337869439A421D +:109D60000BD008F1140308F1150C5B5C15FB03F52F +:109D70000CF805407A753B7500E07A7508F114021D +:109D80005454317871703470BDE8F68111466943DE +:109D900008F115035B5C062B04D008F1140615FBD3 +:109DA00003F574557B753A7508F115025454EBE7C9 +:109DB000F8B5DFF86434DFF85C541E7818240246E6 +:109DC0006243B0422A4404D118785870507D18700C +:109DD0000FE0167D507D92F815C005F1150766431A +:109DE000062807F806C004D0167D143514FB00F4CD +:109DF0002E55012010731878062802BF00294FF055 +:109E0000FF315960F1BD10B5DFF80C44606810F106 +:109E1000010F0FD0FFF75CFF6168DFF8002481427B +:109E200061683CBF5388C918081A517848431178B3 +:109E3000C84000E0002080B210BD2DE9F84FDFF8E7 +:109E4000DC53DFF8DCB3D5F80880D8F80000DBF885 +:109E500000104A0500F090F9DFF8BC63DFF8B4A306 +:109E600021F4806181604FF0180934780AF108000C +:109E700019FB04F14758FFF7C6FF874217D20027A6 +:109E80000121B170062C3DD019FB04F40AF1080140 +:109E90000AF108020959814223BF0AF10801095950 +:109EA000091A002111510AEB04014C7DEAE7A98847 +:109EB0004118B94202D2AF880021E2E73F1ADFE73A +:109EC000022802DA2878012800D07F1ED8F8000086 +:109ED000C1684A07FAD500F055F9DBF80C00000C10 +:109EE000BFB247EA0047CBF80C70FFF7F1FE706095 +:109EF000A8680068816841F480618160AFF30080E8 +:109F0000BDE8F18FB8B20028DAD1FFF7E1FE70604A +:109F10000320BDE8F24F02F0E5BD2DE9F843EFF371 +:109F2000108872B6BD4DBB4BA8680168CA224A6250 +:109F300053204862B84A886820F4806088601820FE +:109F40001678374647431F44387B022826D13C68A1 +:109F5000D7F810909078F0B17A7B012A0AD10121CC +:109F60003046FFF725FF88F310887968304600F007 +:109F700016F904E088F31088304600F0C1F8A868AC +:109F80000068CA2141622246532141624846314657 +:109F900000F050F90BE0FFF750FF06E0C8684207F9 +:109FA000FCD500F07EF89F49086088F31088FF21F7 +:109FB000A86802685162BDE8F183F8B5974CA160CA +:109FC000CA2209684A6253224A62954A136843F0DA +:109FD00020031360136803F00703C3F10403237025 +:109FE00095682D0C05F07F056D1C6570EDB29268CB +:109FF000C2F30E02521C628092B2521E6A43A2F554 +:10A00000A072DA404FF6FF739A422CBFA380A28061 +:10A01000854A136843F400231360844B1D6845F49C +:10A0200000251D6048BB7C487A4E012383701825AB +:10A030004FF0FF33436000235FFA83FC06F10C0707 +:10A0400015FB0CFC4FF0000E07F80CE05B1CDFB2B8 +:10A05000062FF1DB06230370886820F48060886097 +:10A0600000F01FF8D060032002F047FDA1680868E7 +:10A07000826842F48042826005E0C868410544BFBE +:10A08000032002F02FFDA1680A68FF205062002221 +:10A090000621032002F0EEFCBDE8F240032002F0AE +:10A0A00007BDC86800F0800060F49060C8604FF49D +:10A0B00000207047F0B504460025EFF3108672B615 +:10A0C0001827DFF850C10CF10C0007FB05FE10F853 +:10A0D0000E0010B16D1C062DF5DB062D0CD06F4364 +:10A0E0000CEB07000127077386F3108804614273A5 +:10A0F00003600D700020F0BD86F310880120F0BDD4 +:10A10000F8B50746EFF3108472B6032002F0DBFCCB +:10A11000424DAE683068CA2141623A4653214162DD +:10A12000182043494243895C02291BD1002138464B +:10A13000FFF73EFE3848017806290ED130683849CD +:10A140000A68530500F018F821F480618160C16845 +:10A150004A07FCD500F016F804E04078884218BFA2 +:10A16000FFF76BFEA9680A68FF205062032002F027 +:10A170009FFC84F31088F1BD02D5C1684A07FCD466 +:10A1800081687047C16801F0800161F49061C1602D +:10A190004FF4002023490860032002F0AEBC2DE9F3 +:10A1A000F04180460F46424618201A4942438C1817 +:10A1B000207B022804BF4046FFF7A2FFEFF3108583 +:10A1C00072B6032002F07FFC144EB0680068CA210A +:10A1D00041625321416202202073A76067604046BC +:10A1E000FFF781FD0C490A784978914202D0FFF7C8 +:10A1F00024FE02E0A168081AA060FF20B1680A6886 +:10A200005062032002F054FC85F31088BDE8F08111 +:10A2100028280040A08C00200C910020C090002035 +:10A22000082800400C080058000800588008005812 +:10A23000AC8C0020104700B587B000F027FA00F082 +:10A24000D7F9812000F078F900F096F900284CBF8A +:10A25000FF209DF8000007B000BD2DE9F84DC7B004 +:10A260009446DDF840E1519A559D569EDDF84CA18B +:10A27000ADF81D108DF81C004FF0000BADF81FC09D +:10A280008DF821308DF822E000F024F800F017F866 +:10A2900024F8095F668000F0ABF93F20832100F0CD +:10A2A00098F9574406910D37049700F068F9002893 +:10A2B0004CBFFF209DF8000048B0BDE8F08D88F845 +:10A2C00000A007AC5499E419524608F10100544427 +:10A2D000FAF793BD8DF82320174652998DF800B0F8 +:10A2E0000DF1240809A8B844FAF787BD00B5C7B036 +:10A2F00000F00CF8852000F048F900F03DF9002846 +:10A300004CBFFF209DF8000047B000BD00218DF834 +:10A310001C008DF80010182201A8FAF774BD2DE971 +:10A32000F841C7B04FF0000800F026F80DF1230007 +:10A33000DDF844E14E9F4F9E509D529C8DF81F309A +:10A34000C0F800E08DF800808DF820708DF8216055 +:10A350008DF822508DF8274000F04AF98620ADF89C +:10A36000060007A90C2000F003F900284CBFFF20CD +:10A370009DF8000000F06EB98DF81C0007A8417030 +:10A380008270704700B5C7B00022ADF81C008DF890 +:10A3900000200DF11E001822016001A80021FAF72B +:10A3A00032FD8820ADF8060007A9062000F0E0F88D +:10A3B00000284CBFFF209DF8000047B000BDF8B555 +:10A3C000C8B005460E4617461C4600F023F808A8FC +:10A3D000467087708DF8205000F0F6F88A21ADF8AD +:10A3E0000A103F20032100F0E2F8002848BFFF20B8 +:10A3F0000ED49DF8000058B94F994E98BDF8012031 +:10A400002280BDF803200280BDF8050008800020EE +:10A4100049B0F0BD072200216846FAF7F4BC00B548 +:10A42000C7B00021ADF81C00FFF773FF0F210291A8 +:10A430008D20022100F0B2F800F09FF800284CBFF8 +:10A44000FF209DF8000047B000BD18B5C7B000F070 +:10A450002CF900F0CDF83F208E2100F01BF900F020 +:10A460008EF800284CBFFF209DF8000048B010BDBA +:10A4700078B5C7B006460C4615460322FFF7CBFF5A +:10A48000ADF81C6000F0B4F8902100F0E6F802216D +:10A49000ADF80400049107A803210390069100F091 +:10A4A0006EF8002848BFFF2009D49DF8000030B99D +:10A4B0009DF8010020709DF802002870002048B02F +:10A4C00070BDADF8060007A90220704700B587B03F +:10A4D00000F0DCF800F08CF8922000F02DF800F08D +:10A4E0004BF800284CBFFF209DF8000007B000BDCE +:10A4F00000B5C7B000F075F80F210291932000F06D +:10A500004CF800F03AF800284CBFFF209DF80000FE +:10A5100047B000BD00B587B000F0B8F800F068F8AB +:10A52000942000F009F800F027F800284CBFFF2025 +:10A530009DF8000007B000BDADF806003F220120E5 +:10A54000704700B5C7B00021ADF81C00FFF7E1FE71 +:10A550009520FFF7B6FF00F00BF800284CBFFF2056 +:10A560009DF8000047B000BDADF8060007A9032024 +:10A5700004903F22012003910690ADF80420CDF80D +:10A5800014D0002101A8FDF7D2BBADF8060007A941 +:10A5900001203F220391049070470321ADF806008B +:10A5A000049107A801213F22039006917047ADF85E +:10A5B0000800059108A8072104900791CDF818D04C +:10A5C000002102A8FDF7B3BB1822002102A8FAF768 +:10A5D0001ABCADF80400ADF8061007A801210390DD +:10A5E000704700228DF80020ADF81C008DF81E1079 +:10A5F0001822002101A8FAF706BC00B5C7B000F088 +:10A6000011F8FFF7F5FFA42100F027F8072100F06B +:10A6100057F8FFF7B4FF00284CBFFF209DF800005B +:10A6200047B000BD00228DF800208DF81C000622E6 +:10A630000DF11D00FAF7E1BB00B5C7B0FFF7D1FF80 +:10A64000A520FFF791FF00284CBFFF209DF80000D8 +:10A6500047B000BD48B0BDE8F081ADF806103F201E +:10A66000704700B5C7B0FFF7DDFFFFF7C1FFAA21B4 +:10A67000FFF7F3FF072100F023F8FFF780FF002822 +:10A680004CBFFF209DF8000047B000BD00208DF8B2 +:10A6900000007047ADF80400ADF8061007A80121CE +:10A6A00003900691641C04947047044600208DF8C2 +:10A6B00000008DF81C4022460DF11D00FAF79DBBED +:10A6C000ADF80400049107A801210390069170479A +:10A6D00001460648064AC3798B4218BF904218BF0C +:10A6E0000838F8D18B4218BF00207047F873FF1F5D +:10A6F0000070FF1F18B50C46C7B0114600228DF838 +:10A7000000208DF81C008DF81D4022460DF11E0022 +:10A71000FAF773FB00F02AF83F200C21ADF8040093 +:10A72000ADF8061007A8012103900691A41C04941B +:10A7300000F02CF800284CBFFF209DF8000048B026 +:10A7400010BD00B5C7B000F00AF80F2000F013F8F4 +:10A7500000284CBFFF209DF8000047B000BD00223C +:10A760008DF800208DF81C008DF81D101822002196 +:10A7700001A8FAF748BBADF8060007A9022004902B +:10A780003F22012003910690ADF80420CDF814D0AB +:10A79000002101A8FDF7CBBA2DE9F841384D0FF2A1 +:10A7A00004180FF2EC060FF2DC070020286087B0D7 +:10A7B00041F60A00ADF8180000950323012206A90E +:10A7C0000120FAF723F90400404609D1FAF726FBE5 +:10A7D0000146862300F03FF829880FF2181008E0A0 +:10A7E000FAF71CFB01468B2300F035F821460FF2E7 +:10A7F0004410FAF78DF842F62920ADF8180001222E +:10A8000004920A20A91C03900023022205910293BE +:10A81000019300922023288806AA0121FAF745F91E +:10A820000400404609D1FAF7F9FA0146A12300F0E5 +:10A8300012F869880FF23C1008E0FAF7EFFA0146C7 +:10A84000A62300F008F821460FF26410FAF760F82A +:10A8500008B0BDE8F0813A463046FAF759B880B5FD +:10A8600042F62922904209D10A6805480092002246 +:10A870000B7941880088FAF772F902BD002002BD09 +:10A88000309100204449535F496E69740000000014 +:10A890000D0A205B25735D5B25735D5B25645D2080 +:10A8A00000000000433A5C776F726B737061636500 +:10A8B0005C46575F57425F414C4C5F4944455C469C +:10A8C00069726D776172655C4D6964646C6577610E +:10A8D0007265735C53545C53544D33325F5750412F +:10A8E0004E5C626C655C7376635C5372635C646936 +:10A8F000732E630044657669636520496E666F72E6 +:10A900006D6174696F6E2053657276696365202886 +:10A910004449532920697320616464656420537538 +:10A92000636365737366756C6C7920253034580ADF +:10A93000000000004641494C454420746F2061648A +:10A94000642044657669636520496E666F726D6147 +:10A9500074696F6E20536572766963652028444977 +:10A9600053292C204572726F723A202530325820BC +:10A9700021210A004D616E7566616374757265729E +:10A98000204E616D65204368617261637465726910 +:10A9900073746963204164646564205375636365FF +:10A9A000737366756C6C79202025303458200A004A +:10A9B0004641494C454420746F20616464204D61D8 +:10A9C0006E756661637475726572204E616D652087 +:10A9D00043686172616374657269737469632C2082 +:10A9E0004572726F723A20253032582021210A00B8 +:10A9F0002DE9F041054686B068780024FF2861D132 +:10AA0000B5F803100FF208360FF2EC280FF21430ED +:10AA1000B74F40F60142891A2BD0123952D1FAF7BA +:10AA2000FDF901467023424600F049F90FF2443027 +:10AA3000F9F76EFFFA88B5F80710521C914241D120 +:10AA4000AB7AB5F805006A7A0124012B08D100928F +:10AA50000A35019500230022FAF787F900202CE03F +:10AA600005F10A030193009280230122FAF77DF990 +:10AA700028E07A88B5F80710921C914222D1697BB0 +:10AA80000124CA070DD5FAF7C9F90146A2234246A7 +:10AA900000F015F90FF20430F9F73AFF8DF808408D +:10AAA0000DE0FAF7BBF90146A823424600F007F98A +:10AAB0000FF22C30F9F72CFF02208DF8080002A8C5 +:10AAC000FFF782F8204606B0BDE8F081FEB50146EA +:10AAD00001AA487A8DF804004B7A08885070DC0788 +:10AAE00004D50888000A9070032300E00223487A06 +:10AAF000040707D54888D0545B1C4888DCB2000A9C +:10AB000010555B1C4C7AE00610D50D7A00200BE046 +:10AB100001EB4004DFB2A688D6555B1CA488DEB2E8 +:10AB2000240A94555B1C401CA842F1DB01A9704823 +:10AB30000091DBB2418800880022FAF710F8FEBDD0 +:10AB40002DE9F84187B06B48694D0FF2D8180FF224 +:10AB5000C0160FF2D027FCF755F841F60D01ADF8FD +:10AB6000181000950823012206A90120F9F74EFFCD +:10AB7000040040460AD1FAF751F901464FF4D9735F +:10AB800000F09CF829880FF2A82009E0FAF746F9AE +:10AB9000014640F2B71300F091F821460FF2C820A9 +:10ABA000F9F7B6FE42F63720ADF8180001220492FC +:10ABB0000A20A91C039000231022059102930193FF +:10ABC00000920723288806AA0121F9F76EFF0400E6 +:10ABD00040460AD1FAF722F9014640F2D31300F0B9 +:10ABE0006DF869880FF2B82009E0FAF717F9014605 +:10ABF0004FF4EC7300F062F821460FF2E820F9F709 +:10AC000087FE42F63820ADF8180000220492029226 +:10AC100001920A20291D03900222059100F047F8B5 +:10AC2000040040460AD1FAF7F9F801464FF4F773E9 +:10AC300000F044F8A9880FF2F42009E0FAF7EEF8E2 +:10AC4000014640F2F31300F039F821460FF21830B4 +:10AC5000F9F75EFE42F63920ADF8180000220492A2 +:10AC600001920A20A91D0390022308220591029354 +:10AC700000F01DF8040040460AD1FAF7CFF801466B +:10AC80004FF4027300F01AF8E9880FF21C3009E063 +:10AC9000FAF7C4F8014640F20D2300F00FF8214600 +:10ACA0000FF23C30F9F734FE08B0BDE8F0810092B5 +:10ACB0000123288806AA0121F9F7F7BE3A46304653 +:10ACC000F9F726BE80B5002242F63723C01A09D014 +:10ACD000401E0BD106480091012381880088F9F7B6 +:10ACE0003EFF02E00846FFF7F1FE0246104602BDB5 +:10ACF00004910020F1A900084865617252617465F1 +:10AD00005F4576656E745F48616E646C65720000C5 +:10AD10000D0A205B25735D5B25735D5B25645D20FB +:10AD200000000000433A5C776F726B73706163657B +:10AD30005C46575F57425F414C4C5F4944455C4617 +:10AD400069726D776172655C4D6964646C65776189 +:10AD50007265735C53545C53544D33325F575041AA +:10AD60004E5C626C655C7376635C5372635C6872A4 +:10AD7000732E63004143495F474154545F57524922 +:10AD800054455F5045524D49545F5245515F5653AB +:10AD90004556545F434F44450A0000004143495F14 +:10ADA000474154545F4154545249425554455F4DB4 +:10ADB0004F4449464945445F56534556545F434FB7 +:10ADC0004445204852535F4E4F54494649434154ED +:10ADD000494F4E5F454E41424C45440A0000000039 +:10ADE0004143495F474154545F415454524942558D +:10ADF00054455F4D4F4449464945445F5653455677 +:10AE0000545F434F4445204852535F4E4F54494688 +:10AE100049434154494F4E5F44495341424C454494 +:10AE20000A0000004852535F496E69740000000038 +:10AE30004865617274205261746520536572766949 +:10AE40006365202848525329206973206164646532 +:10AE500064205375636365737366756C6C79202524 +:10AE60003034580A000000004641494C45442074E3 +:10AE70006F2061646420486561727420526174655A +:10AE800020536572766963652028485253292C2027 +:10AE90004572726F723A20253032582021210A0003 +:10AEA00048656172742052617465204D65617375E7 +:10AEB00072656D656E74204368617261637465725A +:10AEC00069737469632041646465642053756363C6 +:10AED00065737366756C6C79202025303458200AB0 +:10AEE000000000004641494C454420746F206164D5 +:10AEF000642048656172742052617465204D6561FB +:10AF0000737572656D656E742043686172616374F8 +:10AF1000657269737469632C204572726F723A208E +:10AF2000253032582021210A0000000053656E733D +:10AF30006F72204C6F636174696F6E204368617239 +:10AF400061637465726973746963204164646564E4 +:10AF5000205375636365737366756C6C7920202567 +:10AF6000303458200A0000004641494C45442074C2 +:10AF70006F206164642053656E736F72204C6F6341 +:10AF80006174696F6E204368617261637465726990 +:10AF9000737469632C204572726F723A20253032C7 +:10AFA000582021210A000000436F6E74726F6C20DC +:10AFB000506F696E74204368617261637465726971 +:10AFC00073746963204164646564205375636365C9 +:10AFD000737366756C6C79202025303458200A0014 +:10AFE0004641494C454420746F2061646420436F9E +:10AFF0006E74726F6C20506F696E7420436861725A +:10B00000616374657269737469632C204572726F31 +:10B01000723A20253032582021210A007047000062 +:10B020000278C9B28A421AB11CBF10F8012FF9E7A1 +:10B0300018BF00207047000080B508B90FF21C004F +:10B0400005490B681BB122220021984701E001F05D +:10B050006FFD222002BD000028910020636F6E73F7 +:10B06000747261696E742068616E646C65723A20F6 +:10B07000626164206D65737361676500C9B283079F +:10B0800006D0521E22D310F8013B9942F7D11FE09F +:10B09000083A13D302F1040241EA012141EA0141D5 +:10B0A00050F8043B121F21BF4B40A3F1013C2CEA96 +:10B0B000030C1CF0803FF3D0C9B2001F083210F817 +:10B0C000013B521E28BF91EA030FF8D818BF012098 +:10B0D000401E7047B3BBD9B1B2F5803F7DD2022A82 +:10B0E0001ED98C46B1FBF2F102FB11C31B0443EAEB +:10B0F0001043B3FBF2FC02FB1C3380B240EA034373 +:10B10000B3FBF2F002FB103240EA0C400023704720 +:10B11000022A05D98446B0FBF2F002FB10C2704748 +:10B120004AB105D100F0010249085FEA30007047DA +:10B1300000220023704701F0FFBC0B000200002139 +:10B1400000207047904271EB030CF6D3B3F5803FBB +:10B150002FD2F0B5B3FA83F7B1FA81F4A7F10F0E4D +:10B160003D1B5340CEF1200602FA0EF2F34153404C +:10B17000B5F10F0746D80F3C2C444140C4F12006DE +:10B18000A040F1414140B1FBF3F603FB1611A2FBD5 +:10B190000645001BA94102D2761E8018594180EA5B +:10B1A000010221FA0EF362FA0EF200215A403046F3 +:10B1B000F0BD30B4B1FBF3FC03FB1C11A2FB0C454A +:10B1C000001BA94103D2ACF1010C8018594130BCDD +:10B1D00002460B46604600217047B2F1807F65D37E +:10B1E000F0B5B2FA82F7B1FA81F4C7F10F063D1B50 +:10B1F00022FA06F307F1110EF24120355A40B5F15B +:10B200000F07B8D94140C4F12006A040F1414140A8 +:10B21000B1FBF3FC03FB1C11A2FB0C45001BA94175 +:10B2200003D2BCF1010C801859410F2F12D30F3FEC +:10B23000C90341EA5041B1FBF3F603FB1611A2FB2F +:10B240000645D4EBC030A94102D2761E8018594180 +:10B2500046EACC3C07B34140C7F12006B840F14173 +:10B260004140B1FBF3F603FB1611A2FB0645001BA0 +:10B27000A94102D2761E8018594180EA010221FAC2 +:10B280000EF3C7F1200462FA0EF20CFA07F05A40EE +:10B290002CFA04F13043F0BD80EA010221FA0EF3EA +:10B2A000002162FA0EF260465A40F0BD8C46B1FBB6 +:10B2B000F2F102FB11C31B0243EA1063B3FBF2FC81 +:10B2C00002FB1C331B024CEA002043EA1063B3FB71 +:10B2D000F2FC02FB1C331B024CEA002043EA106321 +:10B2E000B3FBF2FC02FB1C331B024CEA002043EAD6 +:10B2F0001063B3FBF2FC02FB1C324CEA002000237B +:10B3000070470000B0B581EA030C0CF0004C40F22D +:10B31000FF7515EA11541DBF15EA1357AC42AF4231 +:10B3200039E0E41923EA455343F48013C90241F09C +:10B33000004141EA505EC7021100A7FB020200284B +:10B340004FF00000EEFB01204FF00001E3FB07216E +:10B3500018BF42F00102401800214941E3FB0E01F1 +:10B36000A4F580640F0302D252004041494154F1D8 +:10B3700001046CDD470872F1004250F1000051EB0E +:10B380000451A1F580115CBF41EA0C01B0BD4CEA4B +:10B3900005510020B0BD05EA1357AC4214BFAF42BF +:10B3A00041E050EA410E1CBF52EA430E02E0614602 +:10B3B0000020B0BD24423C441BD15FEA070EF6D00A +:10B3C000090302BF01460020AEF1140EB1FA81F765 +:10B3D000AEEB070401FA07FE0C37C7F1200100FAB3 +:10B3E00007F7C8404EEA000E23EA455343F48013A2 +:10B3F000A2E733F00043B3FA83F704BFB2FA82FE48 +:10B4000077440B3FE41BB7F1200E2FBF02FA0EF377 +:10B41000BB40C7F1200E22FA0EFE38BF43EA0E03EE +:10B42000BA40641C82E750EA410E14BF52EA430E50 +:10B430006FF000014FF4001717EB430F8ABF194656 +:10B4400017EB410FB5E74CEA05510020B0BDD4F130 +:10B450000104B4F120070FDAC4F12007520828BF15 +:10B4600042F0010210FA07F501FA07F7E1BF2A439B +:10B47000E0403843E1400FE0352C98DCC7F1200470 +:10B4800052EA400220FA07F218BF42F0010231FAF4 +:10B4900007F0A1400A43002172F1004250F1000080 +:10B4A00051EB0C01B0BD000010B5144600F002F8DD +:10B4B000226010BDC1F30A5343B14A0012F5001FC8 +:10B4C00028D2A3F2FE32A1EB0251704750EA410CA0 +:10B4D00020D001F0004C31EA0C01B1FA81F204BF36 +:10B4E000B0FA80F3D2180B3AB2F120032CBF00FA65 +:10B4F00003F1914041EA0C013EBFC2F1200C20FA59 +:10B500000CF319439040524240F2FD33D21A01EB42 +:10B5100003517047002270474FF4001C1CEB410F91 +:10B5200094BF1CEB430F09E041EA030C50EA4C0CBA +:10B5300052EA0C0C03D2994208BF9042704714BFE4 +:10B540008B428242704700004FF4001C1CEB410FFD +:10B5500094BF1CEB430F09E041EA030C50EA4C0C8A +:10B5600052EA0C0C03D28B4208BF8242704714BFD0 +:10B570009942904270470000124254D440F2FF7C3E +:10B580001CEA11530FD0634531D09B1863453CBF73 +:10B5900001EB0251704701F0004141EA0C510020DB +:10B5A000AFF30080704750EA410320D001F0004C17 +:10B5B00091EA0C011CD0B1FA81F30B3B9A420DD9F0 +:10B5C000D21A994051EA0C01C3F1200C20FA0CFC6C +:10B5D00061449840531C40F2FF7CD7E7914041EA18 +:10B5E0000C01C2F1200C20FA0CF319439040704773 +:10B5F000B0FA80F31533202BE0D3202AEED3203A83 +:10B60000203B9A4209D9D21A00FA03F141EA0C010F +:10B610000020531C40F2FF7CB8E700FA02F141EA37 +:10B620000C0100207047524240F2FF7C1CEA11538B +:10B630000DD06345DBD0B2EB030C3CBFA1EB025154 +:10B6400070470CF1010221EA035141F4801150EAE4 +:10B65000410CCCD001F0004C352A27DC30B481EA13 +:10B660000C01B2F1200309DAC2F12003044601FA09 +:10B6700003F5D0402843D1409C400CE0C3F12002A8 +:10B68000450020FA03F418BF44F0010421FA03F046 +:10B6900091400C43002174F1004550F1000051EB42 +:10B6A0000C01244230BC7FF47BAF70476146002020 +:10B6B00076E70000C1F30A5340F2FE329B1A14DD14 +:10B6C000D3F120034FEAE17208DDC90241EA50518B +:10B6D00041F00040D84080185040704703F2E130FC +:10B6E00010B1D24382F00040704700207047000044 +:10B6F000C11768B14840401AB0FA80F29040D21C9D +:10B70000C907C2F5846241EA025202EBD02140052A +:10B710007047000070B44FF0004591EA030F41F10B +:10B720000D826B40841A71EB030603D2001BB141FA +:10B73000121973414FF4001C1CEB410F34BF7CEB1A +:10B74000430442E00C0DA4EB1356352E4FDC45EAC2 +:10B75000C323DB0A45EAC121C912B6F120050DDD7C +:10B7600063FA05F6EB4086EA0305124218BF45F07E +:10B770000105C01851F100010CD213E062FA06F580 +:10B78000F2405540F3415A40B340F3405A408018CC +:10B79000594107D349085FEA30005FEA350528BF01 +:10B7A00045F0010501F58011420875F1004250F1A4 +:10B7B000000041EB04514E0016F5001F70BC38BF6D +:10B7C00070470020090D090570471CEB410F10D28E +:10B7D00052EA43060BD0BCEB410F05D80C0DAB432E +:10B7E000661E342EB6DD02E0AB438018594170BCB2 +:10B7F000704770BC70470000F0B540F2FF7581EAF9 +:10B80000030C0CF0004C15EA11541DBF15EA135738 +:10B81000AC42AF42E5E0BC41C1F31301C3F31303F3 +:10B82000801A994143F4801304D2641E40004941B8 +:10B8300080185941C90241EA5051B1FBF3F603FBAC +:10B840001611A2FB0675D7EBC020A94102D2761EC5 +:10B8500080185941C90241EA5051B1FBF3FE03FB84 +:10B860001E11A2FB0E75D7EBC020A94103D2AEF189 +:10B87000010E80185941890241EA9051760546EA45 +:10B880008E2EB1FBF3F603FB1611A2FB0675D7EB68 +:10B890008020A94102D2761E80185941C90241EA8E +:10B8A00050514EEA060EB1FBF3F603FB1611A2FB54 +:10B8B0000675D7EBC020A94102D2761E80185941E7 +:10B8C000C90241EA5051B1FBF3F703FB1711A2FB88 +:10B8D0000735D3EBC020A94167F100070CBF004238 +:10B8E00047F0010766F3D5274FEA1E31B80814F573 +:10B8F000806412DDBD0775F1004250EB0E5051EB34 +:10B90000045111F5801F5CBF41EA0C01F0BD4CF001 +:10B910007F6141F0E0410020F0BDBD076D0840EAC5 +:10B920000E5041F48011D4F10104B4F120060ADA7A +:10B93000C4F120060200E04001FA06F3E14018439A +:10B94000B24015430EE0342C13DCC6F1200445EA66 +:10B9500040056D0820FA06F2154321FA06F0A140D1 +:10B960000D43002175F1004250F1000051EB0C0134 +:10B97000F0BD00205FEA0C01F0BDCFB992185B4129 +:10B98000B3FA83F704BFB2FA82F6BF190B3FB7F1DF +:10B9900020062FBF02FA06F3BB40C7F1200622FAA9 +:10B9A00006F638BF3343BA401CB1E419641E33E7CE +:10B9B0007F4231F00041B1FA81F404BFB0FA80F661 +:10B9C000A4190B3CB4F120062FBF00FA06F1A140E8 +:10B9D000C4F1200620FA06F638BF3143A0403C1BD4 +:10B9E0001AE7AC421ABF05EA1357AF4212E050EA19 +:10B9F00041061CBF52EA4306BFE750EA4107304602 +:10BA000061461CBF41EA0551F0BD52EA430C08BF34 +:10BA1000C143F0BD00204FF4001616EB410F98BF54 +:10BA200016EB430F08BF16EB410F24BFC14305E0DF +:10BA300016EB430F0CBF61464CEA0551F0BD000008 +:10BA4000400D491840EA81200CD2490DA1F58061D2 +:10BA5000491C40F0004005DBD1F11F0154BFC84034 +:10BA6000C017704700207047014648B1B0FA80F116 +:10BA70008840C91CC1F58461090501EBD02140054E +:10BA800070470000014870470000000004250020B6 +:10BA90000249016002490161704700BF63BB0008B1 +:10BAA00089BB0008006040607047EFF3108172B6F8 +:10BAB000026882420CBF012000201CE0EFF31082DC +:10BAC00072B603680B60486001600868416023E05B +:10BAD000EFF3108272B6086043684B6041604868BB +:10BAE000016019E0EFF3108172B6426803681360D9 +:10BAF00002684368536081F31088704710B5EFF314 +:10BB0000108472B602680A600068FFE7FFF7EAFF78 +:10BB100084F3108810BD0B6082F31088704700001A +:10BB200001F033B96C486D49016001F120024260B7 +:10BB300001F13002826001F13C02026201F1440233 +:10BB4000426201F14C02C26001F15402026101F152 +:10BB50007002426101F1740282618031C16101F0C1 +:10BB600032B938B504465E4D2846FFF79BFF5A4868 +:10BB70004068A1680160E168C16085605949416021 +:10BB800001F03DF958482AE080B5534842681368EF +:10BB900001211972406801F038F9002002BD38B562 +:10BBA000514C4F4D04E000F041F80098216888475F +:10BBB0002846FFF77AFF0028F5D031BD4A48416892 +:10BBC000084738B50446494D284600604060424861 +:10BBD000C068A1680160456001F01CF94448216813 +:10BBE000016061684160002032BD80B53A48C2689A +:10BBF000136810211972C06801F012F9002002BD0B +:10BC000035483B4AC168C16813680868184738B5A9 +:10BC1000374C364D04E000F009F800986168884719 +:10BC20002846FFF742FF0028F5D031BD6946284677 +:10BC3000FFF764BF38B504462E4D2846FFF732FFA4 +:10BC40002D480060406024480069A1688160E16877 +:10BC5000C1600561216801606168416021694161DD +:10BC60006169816131BD80B501462348FFF730FF2E +:10BC7000BDE802400FF2050001F0DBB838B5164C04 +:10BC80001D4D06E0FFF7D2FF009920690069FFF71C +:10BC90001FFF2846FFF709FF0028F3D031BD10B57C +:10BCA000164C2046006040600B4841690C60BDE8BE +:10BCB000104001F0D2B81CB5104C06E06946204691 +:10BCC000FFF71CFF0098C046C0462046FFF7EDFE78 +:10BCD0000028F3D013BD000000000320AC090320AE +:10BCE000480A032090080320EC900020500A03200B +:10BCF000F4900020380A0320E4900020400A03203A +:10BD0000134810B5016841F480710160032000F010 +:10BD1000A4FE002001F0BAF80024002814BF01247A +:10BD200001F0FDF8204610BD0A48806870470948B8 +:10BD300000787047084805E00748016841F00201B3 +:10BD400001607047016841F0010101607047000027 +:10BD50000040005880250020042004E02DE9F84F21 +:10BD60004FF00009674A684B4FF00F0805460E4632 +:10BD700033E0664FBD4214BF072704278F40274397 +:10BD80004CF82E70C1431C6801EA040C7468E4028C +:10BD900048BF40EA0C0CC3F800C05C6801EA040C20 +:10BDA0007468A40248BF40EA0C0CC3F804C01468CD +:10BDB00001EA040C7468E40348BF40EA0C0CC2F8C2 +:10BDC00000C0546801EA040C7168890348BF40EA66 +:10BDD0000C0CC2F804C009F10109316831FA09F00C +:10BDE00000F07E80012404FA09F414EA0100F2D084 +:10BDF0004FEA490C032101FA0CF16FEA010E716858 +:10BE000001F00307012F1CBF01F00301022911D12A +:10BE1000A968F7680EEA010107FA0CF73943A9602F +:10BE2000696821EA04047168C1F3001101FA09F19B +:10BE30000C436C604FEA8901347904F00304032C4D +:10BE40001FD0EC68B7680EEA040407FA0CF73C430D +:10BE5000EC60347904F00304022C12D14FEAD907C4 +:10BE600005EB870401F01C07D4F820A008FA07FBB3 +:10BE70002AEA0B0AD6F810B00BFA07F747EA0A07C6 +:10BE800027622C680EEA0407347904F0030404FAEC +:10BE90000CF43C432C60746814F4403F9BD0DFF8F2 +:10BEA00070C04FEA990E5CF82E7001F00C0108FA90 +:10BEB00001F427EA0404B5F1904F08BF00270ED023 +:10BEC000144FBD4208BF012709D0134FBD4208BF20 +:10BED000022704D0114FBD427FF44BAF03274DE73B +:10BEE000BDE8F18F81B0002A14BF8161816201B089 +:10BEF00070470B4A136803421CBF106001F0BCBAC4 +:10BF000070470000800800580008005800100048E2 +:10BF1000080001400004004800080048000C0048E8 +:10BF20000C080058AC4900E0AC4981B00A680243F3 +:10BF30000A60096808400090009801B0704738B561 +:10BF4000A749A84C4FF400400860FFF7D9FE60688D +:10BF500040010ED56068C0000BD401F071FC01F007 +:10BF60006FFC206840F480302060216821F480312B +:10BF7000216000F0E6F80020FEF7AAFB40B18079CE +:10BF80009949E160E16821F47C5141EA0021E160D6 +:10BF900000F05BF8954C9648964D606204F12400E1 +:10BFA00001F056FC9448016800220260026902F028 +:10BFB000500202610420FFF7B7FF0120FFF7B4FF32 +:10BFC0000220FFF7B1FF0420FFF7ACFF0120FFF7CD +:10BFD000A9FF0220FFF7A6FF00220F210E2000F08C +:10BFE00049FD0E2000F064FD00220F213A2000F0F0 +:10BFF00041FD3A2000F05CFD0020606025600F20CC +:10C00000A06047F6FF70E06000202061A061E06161 +:10C010006061204601F054FCCA206862FF21532071 +:10C020006862A868C008C000A8606962F8F775FF78 +:10C030000FF2E4120FF281100021F8F797FF20664B +:10C0400001F066F8F8F777FFFEE710B5AEB01CA870 +:10C050004821F8F751FF01A81C21F8F74DFF08A867 +:10C060005021F8F749FF01F0EBFB5E48016821F031 +:10C070001801016007216148026822F4C06242F49D +:10C08000007202604FF48032006800F4C0600090DB +:10C090004FF4807400981C9101201E9000214020D4 +:10C0A00020901D9227911F941CA801F0B6FC6F20D0 +:10C0B00001900221002002910390049005900690C7 +:10C0C0000790012101A801F05AFF43F603000890F0 +:10C0D00000214FF4804019900E910F911020022101 +:10C0E0001B901A91189408A802F046F92EB010BDC2 +:10C0F00010B5434C434800F017F84FF40040E0619E +:10C10000002020626062A062204602F0B3FA0021A3 +:10C11000204602F06EFF0021204602F075FF204607 +:10C12000BDE8104002F048BF20604FF4E13060608D +:10C130000020A060E06020610C2060610020A06110 +:10C140007047314881B0016841F4801101603F219E +:10C15000006800F48010009000982C484160416114 +:10C16000016841F47C110160026942F47C120261B1 +:10C17000016841F03F010160026942F03F02026143 +:10C1800001B0704738B5044602F092FF14F1010F78 +:10C19000054609D0FFF7CBFD241805E01C480168CF +:10C1A00021F00401016030BF02F082FF401BA04279 +:10C1B000F4D331BD0000000080B54FF0FF32012103 +:10C1C0000120F8F751FFF8E700681249884208BFDC +:10C1D00002F074BF70470000480000584C0000583F +:10C1E0001040005890000058FECAFECAB08D0020D2 +:10C1F000000C005800280040800800580004005837 +:10C20000108C00200038014050000058040C0058E9 +:10C2100010ED00E00048014018080108000000008F +:10C22000000000000000000000000000000400000A +:10C2300018000000000000000000000010B50024FD +:10C2400088B9114803600E480E4B036002F052FAA1 +:10C25000012805D007D3032804D038BF022402E008 +:10C26000012400E00324204610BD006805498842EF +:10C2700004D105490868002818BF0047704700002E +:10C28000108C002000380140209100202DE9F84357 +:10C290000446FCF789FA6B4FB8684FF00009002597 +:10C2A00008BB07F1200307F1200113F0070F4FF43B +:10C2B000A0400A4605D0CA1DD208D200C2F5A0404F +:10C2C000081880180838C008C0003A607D60B8605F +:10C2D00045600560811A5160106050683861F860EF +:10C2E0004FF00040F8614FF05008F869044236D131 +:10C2F000ACB3083414F0070F1FBF04F1080004F0BA +:10C300000704041B14F0070F02D000F044F8FEE706 +:10C310002CB3F868A04222D33E6839467068A04228 +:10C3200026D2306800281CBF31460646F6D11FE0F1 +:10C33000301D02517460084600F061F87168F868B9 +:10C340003A69401AF860904238BF3861F869014391 +:10C350007160356009F007057869401C7861FCF769 +:10C360003EFA15B100F017F8FEE74846BDE8F28343 +:10C37000B8688642F3D0326808680A6000F108099C +:10C380007268121B112AD9D3311911F00700CFD0CE +:10C3900000F001F8FEE788F31188BFF34F8FBFF379 +:10C3A0006F8F7047002800D1704738B5A0F108059D +:10C3B000244C6968E2695023114202D100F018F858 +:10C3C000FEE7286810B100F013F8FEE791436960BA +:10C3D000FCF7EAF9E16868684118E160284600F076 +:10C3E0000EF8A069401CA061BDE83140FCF7F7B928 +:10C3F00083F31188BFF34F8FBFF36F8F704730B552 +:10C4000010490A4600E0224614688442FBD3536870 +:10C41000D418844203D14068C3185360104643685F +:10C420001468C518A54208D189688C4204D0616897 +:10C43000CB184360246800E00C460460824218BFB9 +:10C44000106030BD9C25002000F1080141604FF0D4 +:10C45000FF31816000F10801C160016100210160CC +:10C46000704742684A6093688B6093685960916036 +:10C4700008610168491C0160704730B50A6812F113 +:10C48000010F08BF036907D000F1080300E023464D +:10C490005C682568AA42FAD25A684A6091608B604B +:10C4A000596008610168491C016030BD4368016939 +:10C4B00082689A60836842685A604A68824204BF10 +:10C4C00082684A60002202610868401E08600868AD +:10C4D0007047000010B586B000F07DF9DFF84843E2 +:10C4E000A068D0B100210591049103AA04A905A870 +:10C4F00002F0ECFD0598049902900222009201914D +:10C500000023039A0FF228310FF27100FCF70AF8AA +:10C51000E06010B1012006B010BD00F0CBF8FEE7DE +:10C5200085F31188BFF34F8FBFF36F8F7047F8B556 +:10C53000044684B01E46002014B900F0BBF8FEE7A4 +:10C54000DFF8E472BD68BDB1062900910192029442 +:10C550000CDAFCF71EFB0228B86807BF0A9A002312 +:10C56000002300226946FCF735FF05E00023324630 +:10C5700069462846FCF7C6FF05B0F0BD80B5DFF878 +:10C58000A8120A68106800281DBF0021D068006842 +:10C59000012100F003F800F0AFF8F0E7FEB5064621 +:10C5A0000C46FCF701F901A800F047F80546019890 +:10C5B00000283FD19C4F4CBBB5422CD3FCF70FF960 +:10C5C0003868C168CC68201DFFF770FF94F8280018 +:10C5D000410713D5A16933462A468919204600F040 +:10C5E00071F878B1002000900023324600212046E7 +:10C5F000FFF79DFF30B900F05DF8FEE700F0FE00A8 +:10C6000084F828002046216A8847F7BD78680168C9 +:10C610004C1EA441E40FB8682246711BFDF72AFAAC +:10C62000FCF7DDF840B981494FF080500860FFF712 +:10C6300079FFF7BDFCF7D3F8F7BD2DE9FC410446BF +:10C64000FCF722F9784E0546306985420BD300206D +:10C65000206035612846BDE8F68178603F61391D6C +:10C660003068FFF70AFF31680868F0B1C868D0F891 +:10C670000080C768381DFFF719FF396A38468847B8 +:10C6800097F828004107EED5B86940448045E4D3C7 +:10C69000002000900023424600213846FFF747FF64 +:10C6A0000028E0D100F006F8FEE7706830607160A5 +:10C6B0000120CDE7502080F31188BFF34F8FBFF3E7 +:10C6C0006F8F704738B500248A4241600061564D33 +:10C6D00006D38169D21A8A4206D2011D686807E032 +:10C6E0009A4203D2994201D3012403E0011D286834 +:10C6F000FFF7C3FE204632BD38B586B04A4C04E091 +:10C70000134689182846FFF7DDFFA068002202A91A +:10C71000FCF780FF002854D00298002803D5059923 +:10C720000498039A904702980028EED4049D686903 +:10C7300010B1281DFFF7BAFE01A8FFF77EFF0246E1 +:10C7400002980928E1D8DFE800F006060635252D15 +:10C7500006063525D9E700F036F8A8690B464118DA +:10C760002846FFF7AFFF0028CFD0296A2846884720 +:10C7700095F828004107C8D500210091039AA869BF +:10C78000821800232846FFF7D2FE0028BDD1FFF70C +:10C7900091FFFEE700F017F8A9610029B0D1FFF77B +:10C7A00089FFFEE795F82800810703D42846FFF7A4 +:10C7B000F9FDAAE795F8280000F0FE0085F82800AA +:10C7C000A3E707B030BD95F8280040F0010085F8D8 +:10C7D0002800039970471CB5FCF754FC124CA06864 +:10C7E000E8B904F11400FFF72FFE04F12800FFF769 +:10C7F0002BFE04F11400206004F13C0304F1280036 +:10C80000606004F18C020020009010210A20FCF7E7 +:10C81000FAFCA06018B10FF22001FDF704F9BDE8A1 +:10C820001340FCF748BC00001889002004ED00E02C +:10C83000546D722053766300546D725100000000F5 +:10C8400070470000EFF30980BFF36F8F264B1A6823 +:10C850001EF0100F08BF20ED108A20E9F04F106085 +:10C8600009B44FF0500080F31188BFF34F8FBFF32E +:10C870006F8FFCF76BF84FF0000080F3118809BC54 +:10C8800019680868B0E8F04F1EF0100F08BFB0EC50 +:10C89000108A80F30988BFF36F8F7047124B1968B5 +:10C8A0000868B0E8F04F80F30988BFF36F8F4FF04E +:10C8B000000080F3118870470C480068006880F31E +:10C8C00008884FF0000080F3148862B661B6BFF3A9 +:10C8D0004F8FBFF36F8F00DFDFF81400016841F462 +:10C8E00070010160704700000C8B002008ED00E033 +:10C8F00088ED00E07FB50C464D4D61684D4EE86116 +:10C900002962284602F0EEFB2468746006F10800F4 +:10C9100000604060012000F068F801203070296854 +:10C9200041B10FF2E9000FF2ED0200900192029482 +:10C93000684688477FBD1FB53E4C04F10800FFF7ED +:10C94000B4F800BB2178F1B1694604F10800FFF7A3 +:10C95000D5F83748C16949B10098029001228DF895 +:10C96000042001A888479DF8040000E00120207001 +:10C97000207818B10098FFF776F904E0009904F1E7 +:10C980000800FFF79BF804F10800FFF78EF828B9BC +:10C99000207818B104F1080000F052FD1FBD2DE908 +:10C9A000F04105460E4690461C46002000F01DF85A +:10C9B000204F7868A0F80950C672324641460C30C4 +:10C9C000F7F7BAFF1A4A136900210020984748F286 +:10C9D000E80000F03EFD79688A78D21C04F1080076 +:10C9E000F7F7AAFFBDE8F04101201CB51049124C31 +:10C9F000096A20B901B188470020207013BD0120C9 +:10CA0000207011B1BDE81C40084713BD002000F0A4 +:10CA10001CBD000010B50146064C04F10800FFF7EC +:10CA200057F804F10800BDE8104000F009BD00000F +:10CA30002C900020A49000203591002009010200D4 +:10CA400081B002D43248815405E0324802F00F022E +:10CA5000104400F8041C01B070472F4A13684FF6C9 +:10CA6000FF0100020B4000F4E06018432B4908432B +:10CA70001060704738B5284B1C68C4F30223C3F11B +:10CA80000704052C28BF04241D1D072D34BF0023D7 +:10CA9000DB1E012505FA04F4641E2140994005FAC5 +:10CAA00003F35B1E1A401143BDE83440C6E70000A3 +:10CAB000010007D4012200F01F01194B8A404009F0 +:10CAC00043F82020704701000BD4012200F01F0121 +:10CAD000144B8A40400943F82020BFF34F8FBFF327 +:10CAE0006F8F7047010007D4012200F01F010E4B29 +:10CAF0008A40400943F820207047010007D40122F2 +:10CB000000F01F01094B8A40400943F8202070477C +:10CB100000E400E018ED00E00CED00E00000FA0594 +:10CB200000E100E080E100E000E200E080E200E0FF +:10CB3000012002F0E1BA000070470000841A71EB96 +:10CB4000030604D26E40001BB141121973414FF429 +:10CB5000001C1CEB410F34BF7CEB430682E00C0D44 +:10CB6000A4EB1356362E7BDC012E45EAC32341DCB1 +:10CB700043EA525312BFD20292025B08240545EAEF +:10CB8000C12141EA5051D2EBC020994125D407D1AF +:10CB9000B0FA80F610FA06F162D00020203608E0E4 +:10CBA000B1FA81F6B140C6F1200220FA02F2114337 +:10CBB000B0404FEAF474B4EB465434F001064FEA47 +:10CBC00074040AD8D6F50016760D04F00044F0403F +:10CBD00061FA06F25040F1404840C00A40EA415034 +:10CBE00021F0004128BF5FEA500550F1000044EBFE +:10CBF000D12135E0DB0A45EAC121C90AB6F1200599 +:10CC00000EDD42EA0242120CC5F1200603FA06F6D6 +:10CC1000EB4042EA06056D42984161F100010DE0EA +:10CC200062FA06F5F240554063FA06FC82EA0C020D +:10CC3000F3405A406D42904161EB030111F4801FB3 +:10CC400005D1641E620502D06D004041494121F4C6 +:10CC50008011430875F1004350F1000041EB04518D +:10CC600070BC70471CEB410F15D223F0004352EA11 +:10CC700043060BD04FEA4C0CBCEB410F04D80C0D13 +:10CC8000661E342EB7DDEBE7801A994150EA410663 +:10CC900008BF0021E4E708BF1CEB430F28BF6FF07B +:10CCA0000001DDE7C0680840884201D101207047DB +:10CCB00000207047C0690840884201D101207047B8 +:10CCC0000020704710B5684C02212046FFF7F2FFA4 +:10CCD00038B16068C043810703D5FEF798FF022092 +:10CCE00018E001212046FFF7E5FF38B16068C04336 +:10CCF000C10703D5FEF753FF01200BE008212046B2 +:10CD0000FFF7D8FF38B16068C043010703D5FEF7CD +:10CD1000D2FF0820A06010BD10B5534C0221204660 +:10CD2000FFF7C0FF58B96068C043810307D560684A +:10CD300040F400306060BDE81040FEF761BF08219C +:10CD40002046FFF7AFFF70B96068C04301030AD502 +:10CD50006068464940F400206060086880474FF4EE +:10CD60000020A06010BD20212046FFF79BFF58B98E +:10CD70006068C043810207D5606840F400106060BD +:10CD8000BDE81040FEF71ABF10BD394881B00168F8 +:10CD900041F480110160006800F480100090009858 +:10CDA0003448016841F4007101603348026842F47C +:10CDB0000072026040BF20BF3048016841F400416A +:10CDC000016001B0704780B52D48016841F48011C1 +:10CDD0000160006800F4801000900098224801680B +:10CDE00041F001010160026842F4803202602C20AF +:10CDF000FFF75EFEBDE802402D20FFF759BE214837 +:10CE0000016849084900016070471F494FF48030AC +:10CE1000086070471B48016821F0020101607047FB +:10CE200018484FF400314160016821F4003101607D +:10CE3000704738B504460C4D08212846FFF732FFED +:10CE400030B10A480460686820F40020686031BD91 +:10CE5000A0474FF40021A96031BD0A48016821F0C4 +:10CE60000801016070470000000C00581C91002070 +:10CE700050010058D4080058200800580C040058ED +:10CE800050000058040C0058080C005818B5014612 +:10CE900089B000221A20FFF7EDFD1A20FFF708FEE7 +:10CEA0001448154C016841F48021016001A9006813 +:10CEB00000F480200090009802A801F0A3F901F08E +:10CEC00090F90E492160002240F2E731E1602261D1 +:10CED000A2600B49B0FBF1F0401E6060204602F0FA +:10CEE00015F918B9204602F01EF900E001200AB039 +:10CEF00010BD000060000058748F00200048014001 +:10CF000040420F00754900E0754981B00A6802434C +:10CF10000A60096808400090009801B0704780B529 +:10CF20004FF40020FFF7F0FF00220F216FF0010007 +:10CF3000FFF7A0FD002205212E20FFF79BFDBDE895 +:10CF400002402E20FFF7B4BD00686649884200D039 +:10CF5000704780B54FF48010FFF7D6FF00220521FF +:10CF60002C20FFF787FD2C20FFF7A2FD00220521D2 +:10CF70002D20FFF77FFDBDE802402D20FFF798BD73 +:10CF800038B58AB0044668461421F7F7B5FF206823 +:10CF9000554A564990423CD10868554D40F0010031 +:10CFA0000860096801F00101059105980120FFF76B +:10CFB000A9FF0C2000900221002001910290032182 +:10CFC00008200391049069464FF09040FEF7C6FE9A +:10CFD00048482860112000F04EF808B1C046C0460D +:10CFE0004FF088500690002101200791ADF82010E5 +:10CFF000099006A9284602F0CBF908B1C046C04600 +:10D00000A567AC62002205212520FFF733FD25200E +:10D010002DE0394A90422CD14868384D40F4804088 +:10D020004860486800F48040059005980220FFF7AA +:10D0300069FFC0200090022101200191029003218C +:10D0400007200391049069462D48FEF787FE2D487E +:10D0500028600F2000F00FF808B1C046C046A56751 +:10D06000AC62002205212420FFF704FD2420FFF7F5 +:10D070001FFD0BB030BD68601020A8600020E86084 +:10D080008020286100206861A861E8612862284644 +:10D0900002F0A4B91CB504461B49206888421CD183 +:10D0A00000F0CEFB00F0CCFB1848816B21F44071FE +:10D0B00041F480718163816B41F4004181630268B6 +:10D0C00042F480620260006800F480600090009882 +:10D0D0002046BDE8164002F061BB13BD4C0000586D +:10D0E00050000058000C0058008000405C000058C0 +:10D0F000148E00204400024000380140748E00204D +:10D100000004004844040240002800405800005831 +:10D1100010B5D348D34C88B0016841F40041016098 +:10D12000FCF7CCFCD0480168C908C90041F00401F3 +:10D1300001600020CD49FCF740FFFBF798F8012182 +:10D140000120FCF7C0FC0121002002F04AFB012174 +:10D15000012002F046FB0121022002F042FBFEF713 +:10D16000E1FC0020F7F7CBFF206000220021012026 +:10D17000F8F735F8606000210FF2A0620FF2AD20E1 +:10D18000F7F7F4FEA060BA4C0FF23501019104F2FA +:10D190003C50009069460FF24500FFF7ABFB04F2EC +:10D1A0005470029004F5C96140F23C50059003911F +:10D1B000049402A8FEF73EFDFEF7B2FC08B010BDD5 +:10D1C000A84A126810B1012805D070474FF0FF310E +:10D1D0001046F7F7C1BF1046F7F7E2BF2DE9F0415F +:10D1E000064688B0716801F10B076846FCF79FFCA2 +:10D1F0000FF2C8240FF2B0250FF2982800F00FF9B3 +:10D200000146EC2300F00EF99DF802309DF8012054 +:10D210009DF800100FF22830F7F77AFB00F0FFF8C6 +:10D220000146ED2300F0FEF89DF804100FF23430B3 +:10D23000F7F76EFB00F0F3F80146EE2300F0F2F88A +:10D240009DF80C309DF80B209DF80A100FF230303D +:10D25000F7F75EFB38884FF41241401A11D0401E98 +:10D2600062D0401E00F08C80801E00F0A280401E24 +:10D2700000F0AB80401E00F0B280401E00F0BD8088 +:10D28000C6E004A81021F7F737FE70680FF21C47BC +:10D290000D30007868BB00F0C2F8014640F22D1353 +:10D2A00000F0B9F80FF22040F7F732FBFAF7EEFF83 +:10D2B0000D208DF810007F216E488DF81210066841 +:10D2C00000F0ADF801464FF4A37300F0A4F8360C5B +:10D2D00031460FF22440F7F71BFBADF81C6004A8A1 +:10D2E000FCF71EFCF8F72EF800210120FCF7EBFB01 +:10D2F0008EE0012820460DD1F7F790FD014640F25F +:10D30000551300F088F80FF21040F7F701FB0020EA +:10D3100030707DE0F7F782FD01464FF4AE7300F008 +:10D320007AF80FF2204071E070680FF2444600F185 +:10D330000D0700F074F801464FF4B673324600F062 +:10D340006BF839780FF23C40F7F7E2FA38780028AA +:10D3500020460AD1F7F762FD01464FF4B873324612 +:10D3600000F05AF80FF2484050E0F7F757FD014639 +:10D370004FF4B973324600F04FF80FF26C4045E0BD +:10D3800000F04DF80146FB2300F04CF80FF20820A6 +:10D39000F7F7BEFA00F043F80146FE2300F042F82A +:10D3A000D7F80620D7F802100FF21820F7F7B0FAD6 +:10D3B0002EE000F034F8014640F2031300F032F89A +:10D3C000D7F802100FF2402014E000F028F80146D0 +:10D3D00040F2071300F026F80FF2602016E000F08C +:10D3E0001EF801464FF4867300F01CF8D7F80210BF +:10D3F0000FF26420F7F78CFA0AE000F010F801460B +:10D400004FF4887300F00EF80FF28420F7F780FADB +:10D4100008B0BDE8F0813A462846F7F779BA2046C9 +:10D42000F7F7FCBC42462846F7F772BA80B54FF0D2 +:10D43000FF3200210120F7F717FEFFF77CFAF6E72D +:10D44000084880680121F7F7DDBD06484068F7F716 +:10D4500032BF044840684FF0FF31F7F707BF0000C4 +:10D4600008000058B490002080040058B08D0020BF +:10D4700030000320002004E0012805D0022805D058 +:10D48000102805D1F8F73DBAF8F750BAF8F750BAB6 +:10D4900070470000415050455F5379735573657272 +:10D4A00045767452780000000D0A205B25735D5BA1 +:10D4B00025735D5B25645D2000000000433A5C77C6 +:10D4C0006F726B73706163655C46575F57425F4173 +:10D4D0004C4C5F4944455C4669726D776172655C8E +:10D4E00050726F6A656374735C502D4E55434C45A2 +:10D4F0004F2D574235352E4E75636C656F5C41700C +:10D50000706C69636174696F6E735C424C455C4218 +:10D510004C455F4865617274526174654672656519 +:10D5200052544F535F414E43535C436F72655C539B +:10D5300072635C6170705F656E7472792E63000057 +:10D54000576972656C657373204669726D77617295 +:10D55000652076657273696F6E2025642E25642EB2 +:10D5600025640A00576972656C6573732046697299 +:10D570006D77617265206275696C642025640A00AC +:10D580004655532076657273696F6E2025642E258B +:10D59000642E25640A0A00002D2D20424C45204EA1 +:10D5A000564D2052414D20484153204245454E2082 +:10D5B0005550444154454420425920434D4F2B205F +:10D5C0000A000000534843495F5355425F45565493 +:10D5D0005F424C455F4E564D5F52414D5F55504442 +:10D5E000415445203A2053746172744164647265F9 +:10D5F0007373203D20256C78202C2053697A652098 +:10D600003D20256C640A0000534843495F5355424E +:10D610005F4556545F4E564D5F53544152545F57C9 +:10D6200052495445203A204E756D6265724F6657D7 +:10D630006F726473203D20256C640A00534843498F +:10D640005F5355425F4556545F4E564D5F454E44BD +:10D650005F57524954450A00534843495F53554266 +:10D660005F4556545F4E564D5F53544152545F458B +:10D6700052415345203A204E756D6265724F665394 +:10D680006563746F7273203D20256C640A0000008E +:10D69000534843495F5355425F4556545F4E564D7C +:10D6A0005F454E445F45524153450A004150504545 +:10D6B0005F537973457674526561647950726F6314 +:10D6C000657373696E670000534843495F53554261 +:10D6D0005F4556545F434F44455F5245414459208E +:10D6E0002D20574952454C4553535F46575F52557D +:10D6F0004E4E494E47200A004442474D43555F472E +:10D7000065745265766973696F6E49443D20256C76 +:10D7100078200A0A00000000534843495F535542ED +:10D720005F4556545F434F44455F5245414459203D +:10D730002D204655535F46575F52554E4E494E4732 +:10D74000200A0000534843495F5355425F455654F1 +:10D750005F434F44455F5245414459209620554E02 +:10D7600045585045435445442043415345200A0001 +:10D77000415050455F5379734576744572726F72AC +:10D7800000000000534843495F5355425F455654DB +:10D790005F4552524F525F4E4F54494620574954AD +:10D7A0004820524541534F4E202578200A00000062 +:10D7B000534843495F5355425F4556545F45525263 +:10D7C0004F525F4E4F5449462057495448205245C6 +:10D7D00041534F4E2096204552525F424C455F497F +:10D7E0004E4954200A000000534843495F535542B4 +:10D7F0005F4556545F4552524F525F4E4F54494613 +:10D80000205749544820524541534F4E20962042BC +:10D810004C45204552524F52200A0000C0070108D3 +:10D8200000000000000000000000000000000000F8 +:10D83000000A0000000000000000000000000000DE +:10D840000248016841F4807101607047000400588B +:10D85000F8B504460025ACB104F13406307910B9AE +:10D860002046FFF771FB0F4F384600F021F838686B +:10D8700040F001103860204600F007F835600120C4 +:10D88000307100E001252846F2BD10B50021064A9E +:10D89000064B00EB8104491C06296360E261F8D362 +:10D8A00010BD0000000C0058FF4E00081B4E000881 +:10D8B000002101604FF03F1141603F2181607047BE +:10D8C00038B5040044D094F8210028B9002184F828 +:10D8D00020102046FFF7DEFB00F049F8FF2510B1CD +:10D8E00000F03FF834E02168DFF8B0008A680240B9 +:10D8F0008A6021688A68636820690343A0690343DA +:10D900001A438A602168E068086120680169A2689A +:10D9100041EA024101612068C16821F08001C160D3 +:10D920002068C16C89088900C1642168CA6CE369F8 +:10D93000606903431A43CA6420688168880609D471 +:10D9400000F020F830B120684562042100F01FF893 +:10D95000012032BD20684562012184F82110002099 +:10D9600032BD20684562042184F8211070470220EE +:10D9700084F82100CA20216848625320226850623E +:10D98000204626E020460BE02068C0F8248084F87A +:10D990002110002084F8200070470000BFFF8FFF97 +:10D9A00070B5044640F2E9362068C16821F0A00154 +:10D9B000C16001F07DFB05462068C168880606D479 +:10D9C00001F076FB401BB042F6D3032070BD00206F +:10D9D00070BD70B504462068C1684A0612D44FF085 +:10D9E000FF32C26040F2E93601F062FB0546206872 +:10D9F000C168480606D401F05BFB401BB042F6D379 +:10DA0000032070BD002070BD4FF0B040006800F0F2 +:10DA1000F000B02888BFB02070472DE9F041040025 +:10DA200054D0207881064FF0B04538D5A868E96811 +:10DA300010F00C0001F0030103D00C2808BF0129ED +:10DA400046D12868800702D5E06900283ED0FFF75C +:10DA5000DBFF616A884207D2084600F0F6FB002827 +:10DA600034D100F075FA0FE0286820F0F00001438F +:10DA700029606968206A21F47F4141EA00216960D8 +:10DA8000606A00F0E2FB08BB00F095FBDFF8581875 +:10DA90000860DFF858080068FFF7F8F9B0B9207897 +:10DAA000C1070DD5A868E96800F00C00082801F04E +:10DAB000030103D00C2808BF03292DD12868800357 +:10DAC00040F139816068002840F03581012038E25A +:10DAD000E06980B1296841F0010100F047FA06468B +:10DAE0002868800700F1248101F0E2FA801B0328F6 +:10DAF000F6D3032025E2286840084000286001F0A2 +:10DB0000D7FA0646286800F01FFAC8D001F0D0FA0C +:10DB1000801B0328F6D3ECE76068B0F5803F04D1A2 +:10DB2000296841F48031296003E02A6822F48032B8 +:10DB30002A60606860B101F0BBFA0646286880037D +:10DB400000F1F98001F0B4FA801B6528F6D3D0E724 +:10DB500001F0AEFA06462868400C10F0010000F013 +:10DB6000EA8001F0A5FA801B6528F4D3C1E701F033 +:10DB70009FFAC01B0328C0F01281BAE7E06878B1B1 +:10DB8000296841F4807100F0F1F9064628684005E3 +:10DB900000F1188101F08CFA801B0328F6D3A8E766 +:10DBA000286820F48070286001F082FA0646286810 +:10DBB000800A10F0010000F0DC8001F079FA801B8F +:10DBC0000328F4D395E701F073FAC01B0328C0F0D3 +:10DBD0000B818EE740F0010000F0CEF90746706837 +:10DBE000800700F11C8101F063FAC01B0328F6D303 +:10DBF0007FE7706820F0040000F0BEF90746706807 +:10DC0000C00810F0010000F0198101F051FAC01BAA +:10DC10000428F4D36DE70528306806D140F00400ED +:10DC20003060316841F0010105E04008400030609B +:10DC3000316821F004013160A06841F2893768B190 +:10DC400001F036FA80463068800700F10C8101F05F +:10DC50002FFAA0EB0800B842F5D34AE701F028FA02 +:10DC60008046306800F070F900F0FD8001F020FA85 +:10DC7000A0EB0800B842F4D33BE701F019FAC01B4F +:10DC80000328C0F0FE8034E7B06840084000B06070 +:10DC900001F00EFA0746B06800F056F900F0F58082 +:10DCA00001F006FAC01B0328F5D322E701F000FAC1 +:10DCB000801B0328C0F01F811BE701F0F9F9001B4E +:10DCC0000328C0F0398114E7286881010CD4296841 +:10DCD00041F080712960E86840F08050E86001F010 +:10DCE000E7F904462868810100F12A8101F0E0F992 +:10DCF000001B0328F6D3FCE60C2931D0286820F05D +:10DD000080702860E968DFF8E80589088900E96023 +:10DD1000E9680140E96001F0CBF904462868810117 +:10DD200040F10E8101F0C4F9001B0328F6D3E0E6B0 +:10DD300000F00EF9B3E6207881071AD5A868E968E3 +:10DD400000F00C00042801F0030104D00C2808BFE7 +:10DD500002297FF413AF2868400503D5E068002846 +:10DD60003FF4B4AE6968206921F0FE4141EA0061E8 +:10DD700069602168DFF87C6511F0180F38D06069A0 +:10DD800000283FF436AFC90670687FF523AF8007DF +:10DD900009D4706840F0010000F0EEF807467068A2 +:10DDA00080077FF5E4AE706840F0040000F0E4F80E +:10DDB0000746706800070DD401F07AF9C01B0428EB +:10DDC000F7D396E66868216920F0FE4040EA0160DA +:10DDD0006860CEE77068A16920F4706040EA0120B5 +:10DDE000706000F0C6F8074600F0ADF87FF4EBAEC7 +:10DDF0002078410737D5DFF800753868C10529D488 +:10DE0000FFF71EFD01F054F980463868C10521D4A2 +:10DE100001F04EF9A0EB08000328F6D369E670681C +:10DE200020F0040070607068C00810F00100DFD0BE +:10DE300001F03EF9C01B0428F5D35AE600F099F82A +:10DE4000074600F080F8D3D001F032F9C01B032858 +:10DE5000F7D34EE6A06801287FF4DDAE306840F0CD +:10DE600001003060E8E6217848060ED5A06A002857 +:10DE70003FF40AAFB16841F00101B16001F018F957 +:10DE80000746B06880077FF5F8AEE06A002857D0F3 +:10DE9000A968EA68022801F00C017FF42DAF236B1A +:10DEA00002F00300984202BF02F07000636B9842D8 +:10DEB00014D1A36BC2F30620984202BF02F478107B +:10DEC000E36B98420AD1236C02F06060984202BF73 +:10DED00002F06042606C82423FF4F6AE0C293FF4DF +:10DEE000F5AD286841013FF5F1AD296821F0807159 +:10DEF00000F03CF80646286881013FF5D7AEE96896 +:10DF0000DFF8F803A26B0140206B0143606B014313 +:10DF1000E06B41EA02210143206C0143606C014344 +:10DF2000E960286840F080702860E96841F080511D +:10DF3000E96001F0BDF80446286881017FF5BDAEB7 +:10DF40000020BDE8F0817068400810F001007047C3 +:10DF50002968606A21F0F001014329606868216A3C +:10DF600020F47F4040EA012068607047296001F09A +:10DF70009FB8706840084000706001F099B82DE9C2 +:10DF8000F8430400884644D0DFF8746300F0CBF80F +:10DF900047D200F0CDF8074600F0C5F841D001F0B7 +:10DFA00087F8C01B0228F7D90320BAE001F080F8F7 +:10DFB000401B022843D9F7E701F07AF8A0EB0900EB +:10DFC00002284CD9F0E701F073F8A0EB0900022811 +:10DFD00054D9E9E701F06CF8401B02285DD9E3E76A +:10DFE00001F066F8401B022867D9DDE701F060F810 +:10DFF000401B484577D3D7E7032802D13968890108 +:10E0000003E00028396802D1890762D401E049059C +:10E010005FD4012085E001F04BF8C01B022872D9C3 +:10E02000C2E7207881074FF0B0470BD5B968A068E8 +:10E0300021F0F0010143B96001F03AF80546B868F3 +:10E04000C003B3D52078DFF89C5281060AD5296831 +:10E05000606921F0F0010143FFF788FF81462868DD +:10E060008003A9D5207841060BD52968A069090944 +:10E07000090141EA1011FFF779FF81462868C003C2 +:10E08000A1D5207841070BD5B968E06821F4E0619B +:10E090000143B96001F00CF80546B868800399D5D2 +:10E0A000207801070CD5B868216920F4605040EA57 +:10E0B000C100B86000F0FCFF0546B86840038FD58A +:10E0C0002078C10717D56068022895D1396889037F +:10E0D0009FD5B968890840EA8100B86041F2893962 +:10E0E00000F0E6FF0546B868616800F00C00B0EB90 +:10E0F000810F7FF47BAF306800F00700804505D2C8 +:10E1000000F016F8074600F00EF884D100F053F83E +:10E11000DFF8D4110860FDF707FEBDE8F243FEF713 +:10E12000B5BEBDE8F283306800F007004045704797 +:10E130003168C90848EAC101316000F0B9BF38B59B +:10E140004FF0B044704DA16811F00C0106D1FFF7FB +:10E150005BFCC0F3031055F8200032BD04296B4A64 +:10E1600005D008296A4804D12168C90222D5104681 +:10E1700032BDE16801F00301022904D0032904D172 +:10E180002168C90207D5104605E0FFF73DFCC0F342 +:10E19000031055F82000E168E268E368C1F3062146 +:10E1A0004843C2F30211491C5B0FB0FBF1F05B1C4A +:10E1B000B0FBF3F032BD80B5FFF7C1FF5149FFE777 +:10E1C000544A0968C1F3031152F82110B0FBF1F071 +:10E1D00002BD80B5FFF7EFFF00F010F8C1F3022198 +:10E1E00006E080B5FFF7E7FF00F008F8C1F3C221B1 +:10E1F00012F8211001F01F01C84002BD4149464AF2 +:10E20000096870476F2202603E4A136803F00C03EE +:10E210004360136803F0F0038360136803F4E06362 +:10E22000C360126802F4605202612E4A136803F060 +:10E23000F00343611268120102F0F002826130487B +:10E24000026802F007020A60704770B52E49B128D3 +:10E250002EBFCC6AC0F3031051F820402148056856 +:10E2600001F00CFB2B492D4A05F00F0551F8251044 +:10E27000B4FBF1F10024B1FBF2F1B0F5007F0FF235 +:10E28000BC02204609D10FF2980353F820508D426A +:10E2900014D2401C0328F8D912E00FF2940353F86B +:10E2A00020508D420AD2401C0328F8D308E000F029 +:10E2B000FFFE801B03280CD3032070BD52F82040C2 +:10E2C0000F4D2868C00844EAC000286000F0F0FE46 +:10E2D0000646296801F00701A142E8D1002070BD7F +:10E2E0000000000008010058982500208825002023 +:10E2F000FFFFFEEE90000058000400588C80C11112 +:10E300000040005808000058F8FF00080024F400FE +:10E310000048E801B8FF00086C07010840420F0000 +:10E320001200000024000000360000004000000041 +:10E33000060000000C0000001000000000000000BB +:10E34000010000000200000003000000DFF82013BD +:10E350000A68030903F47F2300019A4300F47F2035 +:10E3600000F082B9DFF808231368010C23EA0143A7 +:10E3700043EA0043136070472DE9F8430546002443 +:10E380002878DFF8EC624106A0464FF0B0472DD563 +:10E39000286B70B1B0F5800F06D0B0F5000F18BF34 +:10E3A000B0F5400F17D01FE0F86840F48030F860F7 +:10E3B000EDE0386820F08060386000F079FE81463A +:10E3C0003868000140F1D08000F072FEA0EB090037 +:10E3D0000228F5D90324D7E000F06AFEA0EB09007B +:10E3E000022840F2C980F5E70124A046286801050B +:10E3F00031D5B06800F44078286C80452AD0FFF70A +:10E400001FFAB8F1000FB16805D1286C21F44071F2 +:10E410000143B1601EE0B06840F48030B06021F488 +:10E420004071B06820F48030B060286C0143B16066 +:10E43000B068C0070ED500F03BFE804641F2893936 +:10E44000B068800706D400F033FEA0EB0800484512 +:10E45000F6D30324A0462878C10705D53168A869FA +:10E46000890840EA810131602878810705D5316843 +:10E47000E86921F44061014331602878C10644BF56 +:10E48000A86AFFF76FFF2878810644BFE86AFFF7A4 +:10E4900069FF2878410744BF286AFFF757FF2878AB +:10E4A000010744BF686AFFF751FF2868C1051BD503 +:10E4B0003168686B21F0406101433160686BB0F1F5 +:10E4C000006F00F0BDF8686BB0F1806F75D100F09F +:10E4D000BDF804463868000160D500F0E9FD001B76 +:10E4E0000228F7D94FF0030867E000F0E1FD001BB8 +:10E4F00002285BD9F6E7316821F04041316020F015 +:10E500008050326822F0406210433060A86BB0F156 +:10E51000C05F00F095F8286841056DD53168E86B5B +:10E5200021F0405101433160E86BB0F1005F03D14D +:10E53000F96841F48031F960E86BB0F1805F5BD13C +:10E5400000F084F804463868000146D500F0B0FDBC +:10E55000001B0228F7D94FF003084DE000F0A8FD9A +:10E56000001B022841D9F6E700F061F8A86821F401 +:10E57000781100F071F88146386800017FF52CAF02 +:10E580003969686901433961002C7FF42EAF316825 +:10E59000286B21F440010143316027E700F047F880 +:10E5A000E86821F0606100F057F80446386800011F +:10E5B0009BD5396968690143396128688105AAD505 +:10E5C000A86BB0F1804F1CBFB0F1004F002892D172 +:10E5D000316821F04041084397E700F028F82869A6 +:10E5E00021F0604100F038F8044638680001B5D5E4 +:10E5F00039696869014339612868C10405D5F16842 +:10E60000686C21F440410143F160286881040BD516 +:10E61000796AE86C21F0300101437962796AA86C6B +:10E62000890840EA810179624046BDE8F283386991 +:10E63000696820F4FE4040EA01203861396970477A +:10E6400003D1F96841F08071F9607047396821F0B1 +:10E650008061396000F02CBD01433961386840F0B9 +:10E660008060386000F024BD1043086070470000EF +:10E670008800005838B5040009D004F180056868A6 +:10E6800008B900F01EF800F021F8012801D101209E +:10E6900032BDA06A08B100F02AF800F00AF821F0B3 +:10E6A0002A01FFE7816000F01BF8BDE8324000F06E +:10E6B0003EBB2068416821F4904141602068816838 +:10E6C0007047002129702046FEF75ABC242068605C +:10E6D00020680168490849000160204600F0BCB983 +:10E6E0002068016841F00101016020467047204622 +:10E6F00000F0BABA70B5044604F1800513466868A4 +:10E7000020283DD169B318002BD02878012837D0B4 +:10E7100001222A7004F154062165338073800020A1 +:10E72000E86021206860706AE8B1DFF82013C162F8 +:10E73000DFF81C03716A0863716ADFF81803486325 +:10E740000020716A88632068216D00F12802706AD8 +:10E7500000F0ADFE38B11020E860002028702020C5 +:10E760006860012070BD2168402008620020287088 +:10E7700000F008F841F0800100F061FBF8D170BDB5 +:10E78000022070BD206800F1080151E8001F00F16F +:10E7900008027047216851E8002F7047206800F197 +:10E7A000080151E8001F00F1080221F0400142E891 +:10E7B000001000287047F8B5044640F60F002668A0 +:10E7C000F1693268B368084004F15C050ED188062F +:10E7D00002D5900602D4D80040F1818069690029F1 +:10E7E00000F029812046BDE8F4400847DFF8E00644 +:10E7F000034204BFDFF8DC763A4270D0CF0707D57A +:10E80000D70505D5012737622E6B46F001062E632A +:10E810008E0708D5DE0706D5276802263E622E6BD6 +:10E8200046F004062E634E0708D5DE0706D5276896 +:10E8300004263E622E6B46F002062E630E070AD5B2 +:10E84000960601D4034206D0266808203062286B61 +:10E8500040F008002863080509D5500107D526684F +:10E860004FF400603062286B40F020002863286B72 +:10E87000002833D0890607D5900601D4D80003D5E7 +:10E88000696909B120468847286B21688A68510662 +:10E8900002D410F0280F1CD0204600F0EFFA00F050 +:10E8A000D1F811D5FFF77AFFFCD1286A60B10FF2D9 +:10E8B000B1618163286A00F073FE00280ED0286AD7 +:10E8C000816BBDE8F44008472046BDE8F24000F007 +:10E8D000DDBF204600F0DAFF00202863F1BD286983 +:10E8E00001286AD1CF0668D5D00666D510203062DF +:10E8F00000F0A8F82DD5296A0868406880B2002881 +:10E90000ECD02A889042E9DA6880086801688A06B3 +:10E910001BD4FFF73FFF22F4807200F08FF8F8D18C +:10E92000206800F07DFAFBD1FFF738FFFCD12020F2 +:10E93000E86200202861FFF72DFF22F0100200F0AE +:10E940007DF8F8D1286A00F0F5FD29886888091A51 +:10E950002DE028886988411A688800281CBF88B281 +:10E96000002868D0226852E8003F23F4907342E800 +:10E9700000300028F6D1206800F1080200F10803F9 +:10E9800052E8002FDFF8C402024043E800200028CC +:10E99000F1D12020E862002028616861226852E8F5 +:10E9A000003F23F0100342E800300028F6D1204653 +:10E9B000BDE8F44089B200F06ABFC80209D5580228 +:10E9C00007D54FF4801030622046BDE8F24000F0D9 +:10E9D0006DBB080609D5100601D4180205D5A96932 +:10E9E00049B32046BDE8F4400847480611D5500613 +:10E9F0000FD5FFF7CFFE22F0400200F01FF8F8D14C +:10EA00002020A8620020A8612046BDE8F240FDF762 +:10EA10002CBC080206D5500004D52046BDE8F240C3 +:10EA200000F036BFC80148BF002A04D52046BDE823 +:10EA3000F24000F02EBFF1BD22F4F07241E8002058 +:10EA4000002870472068816848067047DDEE00089E +:10EA50000FEF000815EF0008F8B50446DFF8380599 +:10EA60002168DFF838C50A68DFF834750240A0680D +:10EA700002432069024360690243E06902430A607D +:10EA800000254A68E06822F4405202434A60A369C4 +:10EA9000DFF8102591421CBF206A03438E68DFF81F +:10EAA0000805064033438B600FF2A416CB6A606AF8 +:10EAB0001B0940EA0313CB626145DFF8F0044FF411 +:10EAC000004339D13F6807F00307032F4DD8DFE833 +:10EAD00007F0024643494FF0010CE169B1F5004FE0 +:10EAE0004FF6F07740F08080BCF1010F09D0BCF107 +:10EAF000020F0AD0BCF1040F71D0BCF1080F71D025 +:10EB000099E0FFF76EFB002815D0626A616836F85D +:10EB10001230B0FBF3F04A0802EB4002B2FBF1F016 +:10EB200080B2A0F11001B942EAD20740C0F342001E +:10EB300007432068C7607FE0914216D13F6817F411 +:10EB4000406723D0B7F5806F09D0B7F5006F03D0C9 +:10EB5000B7F5406F06D008E04FF0020C07E04FF029 +:10EB6000040C04E04FF0080C01E04FF0100C91424F +:10EB7000B3D1BCF1000F09D0BCF1020F0AD0BCF137 +:10EB8000040F15D0BCF1080F15D054E0FFF721FB9E +:10EB9000002851D0616A36F81120B0FBF2F66268A5 +:10EBA00002EB42018E4246D31103B14205D242E04C +:10EBB000FFF7C5FAECE71846ECE75008002110EB28 +:10EBC000062051EB16610023FCF784FAA0F5407192 +:10EBD000DFF8DC2391422ED22268D0602CE0FFF7D0 +:10EBE000AEFA90E7184690E7BCF1010F09D0BCF1EE +:10EBF000020F09D0BCF1040F18D0BCF1080F18D0D7 +:10EC000019E0FFF7EEFAB8B1626A36F812306168BF +:10EC1000B0FBF3F000EB5100B0FBF1F080B2A0F1DB +:10EC20001001B94207D22168C86005E0FFF787FAF2 +:10EC3000E9E71846E8E7012504F168000121418071 +:10EC4000018000218160C1602846F2BDFEFFFFEF18 +:10EC5000010002000400060008000A000C00100079 +:10EC6000200040008000000190F82810CA0706D557 +:10EC700002685368C16A23F400330B43536090F871 +:10EC800028108A0706D502685368016B23F4803385 +:10EC90000B43536090F828104A0706D50268536862 +:10ECA000416B23F480230B43536090F828100A072C +:10ECB00006D502685368816B23F400430B4353600D +:10ECC00090F82810CA0606D502689368C16B23F431 +:10ECD00080530B43936090F828108A0606D502688B +:10ECE0009368016C23F400530B43936090F8281051 +:10ECF0004A0610D502685368416C23F480130B4315 +:10ED00005360416CB1F5801F05D15368816C23F4C9 +:10ED1000C0030B43536090F828100A0606D501681B +:10ED20004A68C06C22F4002202434A607047F8B57A +:10ED3000044604F180050020E8606FF07E4700F093 +:10ED4000B7F90646206801680A0708D500973346D8 +:10ED500000224FF40011204600F017F860B9206837 +:10ED600001684A070AD50097334600224FF4800114 +:10ED7000204600F00AF808B10320F2BD20206860A8 +:10ED8000A8600020E0662870F2BD2DE9F041069CE5 +:10ED900005460E4690461F462868C1693140B1427B +:10EDA0000CBF01200020404526D114F1010FF3D003 +:10EDB00000F07EF9C01B844200D33CB900F025F876 +:10EDC00000F02DF8FCD100F01AF811E02868016875 +:10EDD0004A07E1D5C1690A05DED54FF40062026237 +:10EDE00000F013F800F01BF8FCD100F008F8C16047 +:10EDF00000210170032000E00020BDE8F08105F152 +:10EE000080002021416081607047296851E8002F0F +:10EE100022F4D07241E800200028F6D1704728681B +:10EE200000F1080151E8001F490800F108024900FB +:10EE300042E8001000287047DFF87801014042E8FE +:10EE40000010002870470000026852E8003F23F0DD +:10EE5000C00342E800310029F6D1016801F108023F +:10EE600052E8002F01F1080322F4000243E80021D8 +:10EE70000029F2D12021C0F884107047026852E8BE +:10EE8000003F23F4907342E800310029F6D1016875 +:10EE900001F1080201F1080352E8002F0E490A406F +:10EEA00043E800210029F2D1C16E012908D102688E +:10EEB00052E8003F23F0100342E800310029F6D168 +:10EEC0002021C0F888100021C1660167704700004A +:10EED0000100001020010004FEFFFFEF0146886AD8 +:10EEE00009680A68930610D40021A0F8561001683A +:10EEF00001F1080252E8002F01F1080322F080021C +:10EF000043E800210029F2D13BE0FDF7AEB9806A69 +:10EF100000F0C0BCF8B5846A04F1840504F156071A +:10EF200028686E6821688A68110606D5212804D1F0 +:10EF3000002038802046FFF787FFFFF783FD06D5C6 +:10EF4000222E04D1002038812046FFF797FFA868C1 +:10EF500040F01000A8602046BDE8F24000F096BCEA +:10EF6000806A00F1560100220A810A8000F08EBCFE +:10EF7000026852E8003F23F0800342E80031002994 +:10EF8000F6D1026852E8003F43F0400342E8003106 +:10EF90000029F6D170470000F369FFCF0038014027 +:10EFA0008800005800800040FFF4FF110024F400A6 +:10EFB00000FD0F00FEFF7FEF10B500F180010A7821 +:10EFC000012A01D1022010BD01230B7024224A60C6 +:10EFD00002681368146864086400146000224266C2 +:10EFE00023F0005300680360202048600020087070 +:10EFF00010BD70B500F01EF801D1022070BD00F008 +:10F000001FF822F0604209E070B500F013F801D15A +:10F01000022070BD00F014F822F06062114381609C +:10F02000204600F01AF82068066020206860002062 +:10F03000287070BD044604F18005287801287047C7 +:10F0400001222A702420686020680668026852083D +:10F050005200026020688268704730B5416E11B975 +:10F060000121012214E001680FF230048A688968E6 +:10F070000FF23003520E02F00702490F655CA45CE8 +:10F08000595C9A5CED00E40095FBF1F194FBF2F21F +:10F0900068304180028030BD0000000001010103A2 +:10F0A0000701000008040204080101017047000084 +:10F0B00001484068704700BF802500200248416831 +:10F0C000027889184160704780250020044B036056 +:10F0D00003F15C0008604FF480701060704700BF5F +:10F0E000608200200249016002490161704700BF4F +:10F0F000C3BB0008EBBB000880B5AFF30080024A39 +:10F1000011001820ABBEFBE72600020038B5040052 +:10F1100001D1012032BD00F04FF818B900F048F8D5 +:10F12000C046C0462BE081B090F83D10012918BFC1 +:10F13000012022D1022280F83D200168CA6842F0F5 +:10F140000102CA600168DFF86000814218BFB1F1B6 +:10F15000804F0DD18A68DFF854000240062A18BF9C +:10F16000B2F5803F08D0086840F00100086003E075 +:10F170000A6842F001020A60002001B070470220D4 +:10F180006870211D206800F0CCF801202873A87059 +:10F19000E87028716871A871E87128726872A872A5 +:10F1A000E8726870002032BD002C014007000100A9 +:10F1B000002129702046704704F13C0568787047AB +:10F1C00010B50446206801698A0715D5C1688A0709 +:10F1D00012D56FF00202026101212177806910F0DF +:10F1E000030F204602D0C046C04603E0C046C046DA +:10F1F00000F094F800202077206801694A0715D5AF +:10F20000C1684A0712D56FF004020261022121771A +:10F21000806910F4407F204602D0C046C04603E01B +:10F22000C046C04600F07AF80020207720680169C7 +:10F230000A0715D5C1680A0712D56FF008020261E6 +:10F2400004212177C06910F0030F204602D0C04688 +:10F25000C04603E0C046C04600F060F800202077BA +:10F2600020680169CA0615D5C168CA0612D56FF0B3 +:10F270001002026108212177C06910F4407F204606 +:10F2800002D0C046C04603E0C046C04600F046F883 +:10F290000020207720680169CA0708D5C168CA071D +:10F2A00005D56FF0010202612046FCF78DFF206852 +:10F2B00001690A0608D5C1680A0605D56FF0800203 +:10F2C00002612046C046C04620680169CA0508D5CB +:10F2D000C1680A0605D56FF4807202612046C046F7 +:10F2E000C046206801694A0608D5C1684A0605D5A6 +:10F2F0006FF0400202612046C046C04620680169A6 +:10F300008A060AD5C1688A0607D56FF02002026115 +:10F310002046BDE8104000F0BEBA10BD204600F007 +:10F32000BBBA70B5DFF85C600368DFF85C40DFF8FB +:10F330005C50B04218BFB0F1804F01BF23F07003A2 +:10F340004A681343B04205D0B0F1804F1CBFA842B9 +:10F35000A04203D1CA6823F4407313434A6923F0DF +:10F36000800313430360B0428A68C2621CBFA84294 +:10F37000A0420A68826201D10969016301214161E9 +:10F3800070BD0000002C01400048014000440140D5 +:10F3900018B500F12402507801281BD11378012BF5 +:10F3A00001D1022012BD536A10701C680A48044043 +:10F3B00008680443C868401E44EAC04448680443DF +:10F3C000087A497A44EA004444EA41241C60002057 +:10F3D000107012BD012012BDFFFD00E038B5040021 +:10F3E00001D1012032BD2168DFF87003814204F1B0 +:10F3F000240500F044F8022068700A68A0686FF3E2 +:10F400000E120243E068024320690243606902432E +:10F41000A0690243E0690243206A02430A60204671 +:10F4200000F070F9A068B0F5804F04BF0021616062 +:10F430002079696A00F03F0000F014F838B105281F +:10F4400005D2204600F078F900F012F803E0002021 +:10F4500028636863A8630020A86101206870002009 +:10F46000287032BD0860A96AE86A48606068704721 +:10F47000296B00200860696BA86B486070470AD24E +:10F48000DFF8DC0242181423B2FBF3F292002A6286 +:10F49000DFF8D00209E0DFF8D00242181423B2FBF3 +:10F4A000F3F292002A62DFF8C402E8617047F8B50F +:10F4B000044604F1240600253078012801D10220F9 +:10F4C000F2BD01273770707801282FD1022777709D +:10F4D000B561206807687F087F000760204600F05C +:10F4E000F5F82168F06820B10A6842F00E020A605F +:10F4F00008E0086820F0040008602068016841F016 +:10F500000A010160706A0168CA0303D5026842F407 +:10F5100080720260306B18B1016841F48071016043 +:10F520002068026842F00102026001E035700225A5 +:10F530002846F2BD81B040B100F124014A78022A88 +:10F5400005D00420886100200870012026E00268B0 +:10F55000136823F00E0313604A6A136823F4807360 +:10F56000136000680268520852000260012091F89E +:10F570002020CB6902F01C02904058608A6AC86A59 +:10F580005060086B30B1026822F4807202604A6BEE +:10F59000886B5060012048700020087001B07047EF +:10F5A00038B500F1240200245178022903D0042048 +:10F5B0009061012428E001680B6823F00E030B60C2 +:10F5C00001680D686D086D000D60516A0B6823F4C9 +:10F5D00080730B60012192F82030D56903F01C0381 +:10F5E00099406960936AD16A5960116B31B10B68B7 +:10F5F00023F480730B60536B916B59600121517040 +:10F600001470516901B18847204632BDF8B500F148 +:10F6100024010423CA6914680268156891F82060FF +:10F6200006F01C0603FA06F73C4210D06F070ED511 +:10F630001468A50603D4156825F00405156000F0CC +:10F640003DF8C968002938D0BDE8F44008470223D6 +:10F6500003FA06F73C4213D0AF0711D51468A5068C +:10F6600005D4156825F00A05156001224A7000F0DE +:10F6700025F800220A708968F9B1BDE8F44008470E +:10F68000082303FA06F6344217D02B0715D5136862 +:10F6900023F00E031360012291F82030CC6903F0AF +:10F6A0001C039A40626001228A614A7000220A703B +:10F6B000096911B1BDE8F4400847F1BD91F8202077 +:10F6C000CC6902F01C0293406360704778B5C56C4A +:10F6D000046D6C60446D14B1846DC56D6560012569 +:10F6E00090F84440066C04F01C04A5407560046862 +:10F6F00063608068102802D1A260E16071BDA160E2 +:10F70000E26071BD416C0268144B89089A4234BFB3 +:10F71000174B184B03EB8101816402F0FF02083A9A +:10F720001421B2FBF1F1144AC26401F01F0101225D +:10F7300002FA01F1016570470179104A01F03F01B9 +:10F7400002EB81024265491E0D4A826501F0030108 +:10F7500001228A40C2657047000000000804024090 +:10F76000F8FFFDBF00000240F8FBFDBF00040240AF +:10F77000000802401C08024080080240FC080240C9 +:10F78000400902408A60FF2102685162012180F82D +:10F790002110002180F820100020704790F82010E0 +:10F7A000012901D102207047012280F82020022186 +:10F7B00080F82110CA2102685162532103685962FE +:10F7C00001688A6842F02002FFF7DCBF264981B059 +:10F7D0000A6802430A60096808400090009801B076 +:10F7E0007047F0B585B005460C4668461421F5F71C +:10F7F00083FB0DB9042004E0012D18BF022D02D1B6 +:10F800000820FFF7E3FF2000184E0FF264070DD128 +:10F8100037F815000090002101910120029002218B +:10F82000039100F01CF80120FCF7ACFC012C14D172 +:10F8300037F81500009001214FF404100190029157 +:10F8400000F00DF80FF23000445D00220F2160B28D +:10F85000FDF710F960B2FDF72BF905B0F0BD694670 +:10F8600056F82500FCF77ABA4C0000588C25002089 +:10F8700010000100020000000A060700DFF808007F +:10F88000006800F4C060704700040058704770477B +:10F890007047704770477047704700004144565F9B +:10F8A0005550444154455F50524F43455353000017 +:10F8B0004843495F555345525F4556545F50524F38 +:10F8C000434553530000000053564343544C5F419B +:10F8D00070705F4E6F74696669636174696F6E0002 +:10F8E0000D0A0D2A2A20444953434F4E4E45435496 +:10F8F000494F4E204556454E5420574954482043C1 +:10F900004C49454E5420646973636F6E6E65637431 +:10F91000696F6E20526561736F6E3D3078253032AD +:10F92000582073756363657373200A0D000000002F +:10F930000D0A0D2A2A20444953434F4E4E45435445 +:10F94000494F4E204556454E542057495448204370 +:10F950004C49454E5420646973636F6E6E656374E1 +:10F96000696F6E20526561736F6E3D30782530325D +:10F970005820436F6E6E656374696F6E2074657294 +:10F980006D696E61746564206279206C6F63616C6F +:10F9900020686F7374200A0D000000000D0A0D2A04 +:10F9A0002A20444953434F4E4E454354494F4E201D +:10F9B0004556454E54205749544820434C49454EDE +:10F9C0005420646973636F6E6E656374696F6E2033 +:10F9D000526561736F6E3D30782530325820436F29 +:10F9E0006E6E656374696F6E207465726D696E61A9 +:10F9F0007465642064756520746F204D49432066EA +:10FA000061696C757265200A0D000000202A2A20A9 +:10FA100050616972696E67204B4F20537461747531 +:10FA2000733D256420526561736F6E3D30782530DB +:10FA30003278202C200A0D2021212120506C656174 +:10FA400073652069676E6F72652074686973204200 +:10FA50004C4520446576696365206F6E2074686547 +:10FA600020694F532F416E64726F6964204465763C +:10FA70006963652053657474696E673D3E426C75B9 +:10FA800065746F6F74683D3E4D7920446576696397 +:10FA900065206F72205061697265642044657669E3 +:10FAA000636520212121200A0D0000004143495FA8 +:10FAB0004741505F50414952494E475F434F4D5077 +:10FAC0004C4554455F56534556545F434F4445207B +:10FAD00020506565725F426F6E646564203D2564E9 +:10FAE000203D3E202564202053656375726974793A +:10FAF0005F4D6F64653D2564203D3E2025642053A5 +:10FB0000656375726974795F4C6576656C3D2564D3 +:10FB1000203D3E202564200A0D000000206163691D +:10FB20005F6761705F636C6561725F736563757257 +:10FB30006974795F64622026206163695F67617020 +:10FB40005F72656D6F76655F626F6E6465645F643A +:10FB500065766963652026206163695F6761705F10 +:10FB60007465726D696E617465200A0D0000000095 +:10FB7000414E43535F50524F4345535300000000E2 +:10FB8000414E43535F4170705F4B657942757474A9 +:10FB90006F6E32416374696F6E0000005265766962 +:10FBA000657720746865205072654578697374655F +:10FBB00064204E6F74696669636174696F6E200AB0 +:10FBC0000D0000004761747450726F6352657100DC +:10FBD000414E43535F5345545F444154415F4C454C +:10FBE0004E475448207365742064617461206C65CD +:10FBF0006E677468202564202564206F6B203D3D6E +:10FC00003E6163695F676174745F65786368616EA4 +:10FC100067655F636F6E666967200A006163695F8D +:10FC2000676174745F65786368616E67655F636F51 +:10FC30006E66696720636D64206F6B200A0D00009B +:10FC40006163695F676174745F65786368616E673B +:10FC5000655F636F6E66696720636D64204B4F203C +:10FC6000726573756C743D307825303278200A0DDA +:10FC700000000000474154545F50524F435F4449D5 +:10FC800053435F414E43535F5345525649434520CA +:10FC90006163695F676174745F646973635F7072E5 +:10FCA000696D6172795F736572766963655F6279A8 +:10FCB0005F7575696420636D64206F6B0A000000D6 +:10FCC000474154545F50524F435F444953435F414F +:10FCD0004E43535F53455256494345206163695F24 +:10FCE000676174745F646973635F7072696D617278 +:10FCF000795F736572766963655F62795F7575694F +:10FD00006420636D64204E4F4B207374617475736F +:10FD1000203D307825303258200A000047415454A5 +:10FD20005F50524F435F444953435F414E43535FDB +:10FD30005345525649434520414E43532053657223 +:10FD400076696365206973204E4F5420666F756E27 +:10FD50006420212121203D3D3E20636F6E6E65634E +:10FD600074656420746F20416E64726F6964205002 +:10FD7000686F6E652F506164200A0D00474154542E +:10FD80005F50524F435F444953435F414E43535F7B +:10FD90005345525649434520414E435320536572C3 +:10FDA00076696365205B307825303458202D20300B +:10FDB00078253034585D20697320666F756E642035 +:10FDC000212121203D3D3E20636F6E6E6563746589 +:10FDD0006420746F20694F532050686F6E652F50F8 +:10FDE0006164200A0D00000010B50446AFF30080E6 +:10FDF000204600F005F80446AFF30080204610BD11 +:10FE00007CB500F10F06F608F600B04240D2082E8D +:10FE100004D2082602E0083000F047F8DFF8045169 +:10FE20002C68210005D1002007E00268B24221D2EF +:10FE3000011D08680028F8D12068291D0A6882423F +:10FE400022D01368B34238BF111DF7D312E09319C3 +:10FE50000B60801B54685C600B6818601660096852 +:10FE600000291DBF48680028081D0020286002F1F5 +:10FE7000080076BD61B10A681068A0F10803B342BA +:10FE8000E5D250680860EAE700F04EF80028C2D1D9 +:10FE9000002076BD10B5040006D0AFF300802046E8 +:10FEA00000F003F8AFF3008010BD002800D17047C8 +:10FEB00050B4A0F108021368072B2BD913F0070FD9 +:10FEC00028D1184C616809B18A4202D2516062603F +:10FED00013E0486800B3904238BF0146F9D31BE0F5 +:10FEE000964203D11B180B600A4606E0486810B121 +:10FEF000134498420ED350604A60506850B1136862 +:10FF0000D118814206D1002121600168CB1813600D +:10FF10004068506050BC704708680E18B242DFD28B +:10FF200050BC7047FC9000200749086808B10020C9 +:10FF300070470648C008C00008600549C908C900E4 +:10FF4000091A0160704700BF249100200F100020A3 +:10FF5000081400201349002008604FF4E0221248E2 +:10FF6000016841F4700101604FF0B041086840F051 +:10FF7000010008608A600D480A6802400C480A6067 +:10FF8000036823F005030360426852085200426090 +:10FF900000220848C8600861086820F480200860D2 +:10FFA0008A61704708ED00E088ED00E0FBFEF6FA9C +:10FFB000940000580010042201000000030000001B +:10FFC0000500000001000000010000000600000024 +:10FFD0000A000000200000000200000004000000F1 +:10FFE0000800000010000000400000008000000039 +:10FFF0000001000000020000A0860100400D030087 :020000040801F1 -:1000000000002E00FFF7FEBFFFF7FEBFFFF7FEBFA9 -:10001000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF14 -:10002000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF04 -:10003000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF4 -:10004000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFE4 -:10005000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFD4 -:10006000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC4 -:10007000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB4 -:10008000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFA4 -:10009000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF94 -:1000A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF84 -:1000B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF74 -:1000C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF64 -:1000D000FFF7FEBFF002030DFF010001F3FF010077 -:1000E00001F1FF01F1FF01F1FF01F1FF01F1FF015A -:1000F000F1FF01F1FF01F1FF01F1FF01F1FF01F15A -:10010000FF01F1FF01F1FF01F1FF01F1250112AA49 -:10011000018F000030102210085003080048000C26 -:1001200004100A093D0001040000AC100020AD04D9 -:1001300052AC042127A10852980CF10B01200A02AD -:10014000040101BC5A00200C5B002008210421346A -:10015000610812F444F213E04850020802026C40B5 -:10016000526C0421346108F004113C110020281164 -:100170004812686C12B004F208F874F3070108041E -:0D01800052FF01F2000214030000520001C2 -:040000050800FFF5FB +:10000000801A060000350C0040420F0080841E005C +:1000100000093D0000127A000024F40000366E0151 +:100020000048E801006CDC02000000000000000055 +:1000300000000000000000002DE9F041074688465E +:10004000387810F0030F16461D4633D0384600F0BE +:1000500099F878BBB8F1000F1CBFD8E900018619E8 +:10006000012D2ED13888C10415D5396A07F1440213 +:10007000384600F0A3F83A6B044602B93A69F968C9 +:10008000384600F09BF8361B341A7A69F96838460E +:1000900000F094F8261A1EB94DB916F1010F09D0D7 +:1000A00097F903002A46314600F08EF8064616F10D +:1000B000010F09D12320AFF300804FF0FF30BDE8DE +:1000C000F081022DE8D1EBE7388810F4405F0ED0C4 +:1000D0007868F86038617861B8617868F86107F12C +:1000E0004400386207F13000786200203863B8F1CC +:1000F000000F05D0D8E9020107F13402C2E900017E +:1001000039884CF6FF60014039800020BDE8F0815D +:1001100070B50546AFF300802888810415D56E6858 +:100120000024EA6895F903003146914212D2521A2E +:10013000F4F7B3FE10F1010F1CBF00283618F0D100 +:100140000FE04DF6FF70014029802846AFF3008094 +:10015000002070BD00220021F4F79FFE10F1010F76 +:1001600000D101246868E860A861E861002C298852 +:10017000E7D041F4007129802846AFF300804FF0AA +:10018000FF3070BDF8B5A0B9AFF3008000250A4E6E +:1001900008244FF0FF37306820B1FFF7B9FF00287F +:1001A00048BF3D46361D641EF5D1AFF3008028469A +:1001B000F2BDBDE8F240ABE73C250020914234BFE0 +:1001C000511A0021084670473EB504000D00012A6F +:1001D00002D100F063F807E0022A07D10094002062 +:1001E000019069460C20ABBE2D1801E0002A0CD10D +:1001F0000094019569460A20ABBE002805D1002273 +:100200002100280000F027F801E00020C04303B0DF +:1002100030BD000010B4314A002113461C688442EE +:100220001EBF491C9C6884421EBF491C1C69844235 +:1002300009D09C69491C844205D0491C20331029EF +:10024000ECD310BC7047002342F8313002EBC101FF +:100250004B6010BC704778B4204C002325462E68B4 +:100260008E421EBF5B1CAE688E421EBF5B1C2E6999 +:100270008E4209D0AE695B1C8E4205D05B1C2035D6 +:10028000102BECD372BC7047054604EBC303012A64 +:1002900004BF59684D195D6072BC704710B40F4AB5 +:1002A000002113461C6884421EBF491C9C6884427E +:1002B0001EBF491C1C6984420AD09C69491C8442A7 +:1002C00006D0491C20331029ECD310BC0020704705 +:1002D00002EBC100406810BC70470000308D002068 +:1002E00010B50446E068A169884251D3218849F2DB +:1002F00002030B40022B08D008044CBF4FF40070DF +:100300004FF48440014321803BE001F4C042B2F548 +:10031000C04F06D1A168884203D32046FFF732FFC1 +:1003200078BB208810F4406F02BF606804F144017C +:10033000884217D14FF40070FFF756FD606030B966 +:1003400004F144006060E060401CA0600AE0218885 +:1003500041F040012180E060606100F5007260685A +:10036000A260E06160682061A068A0612078410718 +:100370000AD502220021204600F00CF810F1010FEE +:1003800002D14FF0FF3010BD208840F4C0402080E3 +:10039000002010BD70B504460D461646AFF3008030 +:1003A00033462A4600212046FFF746FE05462046F2 +:1003B000AFF30080284670BD2DE9FC4D016800F1C7 +:1003C0000805490805EBC102019200F108024068E6 +:1003D00000F0010A02EBC108400808EBC00B002046 +:1003E0000021019A95422FD02A68AE186A683244DB +:1003F00000920835009A9642F3D016F9014B009A04 +:10040000964205D12A68AE186A68324400920835CF +:1004100016F8017B884210D1D84508BFFCF788FB4D +:10042000D8F80000D8F80410BAF1000F18BF4844FB +:100430000144884208F10808EED0002C00F8017B46 +:1004400005D5641CE6D1D5E75846BDE8F68D641E97 +:10045000D5D5CFE738B504000ED0207810F0030FC3 +:1004600003D094F90300002809D5AFF3008020469B +:1004700000F030F8AFF300804FF0FF3032BD20467F +:10048000FFF780FE0546AFF300802078410644BFA9 +:10049000606800F05DF80020606094F903000228B5 +:1004A00004D900F057F808B14FF0FF35E06B48B1C0 +:1004B00000F05CF808B14FF0FF35E06B00F048F851 +:1004C0000020E063204600F005F8AFF300802846E6 +:1004D00032BD000001780A0626D51C4A13680021A7 +:1004E000834203D1002342F821301BE053680121ED +:1004F00083421EBF022193688342F3D0D368032155 +:1005000083421EBF042113698342EBD05369052146 +:1005100083421EBF0621936983421EBF0721D36910 +:100520008342DFD000F014B8002101804FF0FF318A +:10053000C17000F144014160C160016141618161AC +:10054000C161016200F13001416270473C25002029 +:10055000FFF7A0BC1CB50200009269460220ABBEAA +:1005600004001000FFF756FE200016BDE0B5009015 +:10057000F6F7A6FB019069460E20ABBE03B000BDA6 +:100580007047FEE7FEE7FEE7FEE770470A48FFF721 +:100590003DB80A48FEF714BE0948FEF70CB90948F1 +:1005A000FEF709B9FCF78EBBFCF7B6BB00F01AB832 +:1005B0000548FFF72BB80000148E0020748F002030 +:1005C000108C0020808B0020748E00201020FBF700 +:1005D00090BC0120FBF78DBC0220FBF78ABCF9F729 +:1005E0009CBC00000449C8680A6882430A604860ED +:1005F00000F004B80000000000150058704738B53E +:100600000C46C5B22046AFF30080E068A16988427D +:1006100004D32046FFF764FE00280FD4E068401C96 +:10062000E06000F8015D2088010503D440050BD58A +:100630000A2D09D12046FFF7A5FD28B12046AFF3CA +:1006400000804FF0FF3032BD2046AFF300802846D7 +:1006500032BD19E050F8042BD30744BFA9F10103C0 +:100660009A18091F0023042942F8043BF9D25FEAD3 +:10067000817C134604D54FF0000CA2F800C09B1CEF +:10068000C90744BF0021197050F8041B0029E1D1AB +:100690007047000038B50D4D0824286800281CBF9D +:1006A000017811F0030F05D090F90310002958BF0D +:1006B000FFF7D0FE2D1D641EEFD1BDE838400022AB +:1006C00000214FF0FF30F4F7E8BB00BF3C250020CD +:1006D00010B5074979441831064C7C44163404E0BF +:1006E0000A68081D114488470146A142F8D110BD8F +:1006F0002C000000780000004EF68851CEF2000178 +:10070000086840F470000860BFF34F8FBFF36F8F2D +:100710004FF00070E1EE100A7047000037FFFFFF56 +:100720009C6B00009C250020700800003000032016 +:100730000000000085FCFFFF020000000200000036 +:10074000C001000002000000280003200800000093 +:1007500069FCFFFF0200000002000000A60100008B +:100760001F01000008140020941100000000000088 +:100770000000000000000000000000000100000078 +:100780000200000003000000040000000120C04639 +:10079000002801D0FFF79CFFAFF300800020AFF3EB +:1007A0000080FBF7CCFB00F000F800F001B800007F +:1007B0000746FFF76FFF3846FEF79EFCFBE7000099 +:1007C000534843495F555345525F4556545F505215 +:1007D0004F4345535300000038B504460D462846A4 +:1007E00000F006F8A84218BF0024204632BD0000E1 +:1007F0000149FFF704BF00BF74240020014880476F +:100800000148004755FF0008250801084852535F7A +:1008100050524F434553530064656661756C745480 +:1008200061736B00AFF30080FFF766FFFFF7AEFF69 +:1008300000002E00FFF7FEBFFFF7FEBFFFF7FEBF71 +:10084000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFDC +:10085000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFCC +:10086000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFBC +:10087000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAC +:10088000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9C +:10089000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8C +:1008A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7C +:1008B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF6C +:1008C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5C +:1008D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4C +:1008E000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3C +:1008F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF2C +:10090000F8000001810081008100810081008100E8 +:1009100081008100810081008100810081008100CF +:1009200081008100810081008100810081008100BF +:1009300081008100810081008100810081008100AF +:1009400081008100BD0013010400007024002071AB +:100950002400207024002070240020FC0003702458 +:100960000020FC0007702400205C240020E000131D +:1009700002040101248F0020748F0020248F0020A6 +:10098000248F0020FC0003248F0020FC0007B824E3 +:100990000020A4240020E0001302080202D48E00EC +:1009A00020248F0020D48E0020D48E0020FC000351 +:1009B000D48E0020FB0006250020EC240020E0005F +:1009C0001B30080108300801083008010830080110 +:1009D00008300801083008010830080108F8FF0B4A +:1009E000320801083008010830080108FAFF0D003C +:1009F000002C24002074240020BC240020EC0002E1 +:100A00000DFF01E700FCAAFC000001F9000010FC4A +:100A1000000E080048000C0048000C004800093D8A +:010A200000D5 +:0400000508010825C1 :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_conf.h index 4f1770110..3f3eb5f62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -275,6 +275,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -284,11 +288,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -296,6 +304,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -438,6 +459,7 @@ /** tick timer value in us */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -606,5 +628,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_conf.h index e14c6bf08..18080f202 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,5 +212,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/main.h index 92bdf910e..ea85a1235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_hal_conf.h index fc4a470ae..3d144bf42 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_it.h index ecf110e79..beb732e86 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_entry.c index 12a5bc2d8..1a2a8b67e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +28,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -84,6 +85,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ static void Led_Init( void ); @@ -210,23 +213,161 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) return; } + /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -337,4 +478,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_freertos.c index 68fda81f5..f7bbac97b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/app_freertos.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,4 +66,3 @@ __weak void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime ) /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/freertos_port.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/freertos_port.c index 2a6bf7141..8be354ec1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/freertos_port.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/freertos_port.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : freertos_port.c - * Description : Custom porting of FreeRTOS functionalities - * - ****************************************************************************** + ****************************************************************************** + * File Name : freertos_port.c + * Description : Custom porting of FreeRTOS functionalities + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -25,11 +24,11 @@ #include "FreeRTOS.h" #include "task.h" #include "stm32_lpm.h" +#include /* Private typedef -----------------------------------------------------------*/ typedef struct { - uint64_t LpTimeDiffVal; uint32_t LpTimeLeftOnEntry; uint8_t LpTimerFreeRTOS_Id; } LpTimerContext_t; @@ -201,7 +200,6 @@ void vPortSetupTimerInterrupt( void ) static void LpTimerInit( void ) { ( void ) HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(LpTimerContext.LpTimerFreeRTOS_Id), hw_ts_SingleShot, LpTimerCb); - LpTimerContext.LpTimeDiffVal = 0; return; } @@ -236,13 +234,15 @@ static void LpTimerStart( uint32_t time_to_sleep ) uint64_t time; /* Converts the number of FreeRTOS ticks into hw timer tick */ - - time = (time_to_sleep * 1000LL * 1000LL ); - time = time / ( CFG_TS_TICK_VAL * configTICK_RATE_HZ ); - - if(time > 0xFFFF0000) + if (time_to_sleep > (ULLONG_MAX / 1e12)) /* Prevent overflow in else statement */ { - time = 0xFFFF0000; /* maximum value */ + time = 0xFFFF0000; /* Maximum value equal to 24 days */ + } + else + { + /* The result always fits in uint32_t and is always less than 0xFFFF0000 */ + time = time_to_sleep * 1000000000000ULL; + time = (uint64_t)( time / ( CFG_TS_TICK_VAL_PS * configTICK_RATE_HZ )); } HW_TS_Start(LpTimerContext.LpTimerFreeRTOS_Id, (uint32_t)time); @@ -284,31 +284,30 @@ static void LpEnter( void ) #if ( CFG_LPM_SUPPORTED != 0) static uint32_t LpGetElapsedTime( void ) { - uint64_t val_ticks, time_us, diff_ps; - uint32_t LpTimeLeftOnExit, time2_us; + uint64_t val_ticks, time_ps; + uint32_t LpTimeLeftOnExit; LpTimeLeftOnExit = HW_TS_RTC_ReadLeftTicksToCount(); - time_us = (CFG_TS_TICK_VAL) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Corrects the time precision lost in CFG_TS_TICK_VAL computation */ - - /* Compute the amount of pico seconds lost at each TS ticks */ - diff_ps = DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1000000 * 1000000), (uint64_t)LSE_VALUE ); - diff_ps -= DIVF( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) * 1000000; - /* Compute the total amount of time shift */ - diff_ps *= (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Save the time shift for next time */ - LpTimerContext.LpTimeDiffVal += diff_ps; - - /* Reports the time difference into returned time elapsed value */ - time2_us = LpTimerContext.LpTimeDiffVal / (1000ULL * 1000ULL); - LpTimerContext.LpTimeDiffVal = LpTimerContext.LpTimeDiffVal - time2_us * (1000ULL * 1000ULL); - time_us += time2_us; - - /* Convert uS time into OS ticks */ - val_ticks = time_us * configTICK_RATE_HZ; - val_ticks = val_ticks / (1000 * 1000); + /* This cannot overflow. Max result is ~ 1.6e13 */ + time_ps = (uint64_t)((CFG_TS_TICK_VAL_PS) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit)); + + /* time_ps can be less than 1 RTOS tick in following situations + * a) MCU didn't go to STOP2 due to wake-up unrelated to Timer Server or woke up from STOP2 very shortly after. + * Advancing RTOS clock by 1 FreeRTOS tick doesn't hurt in this case. + * b) vPortSuppressTicksAndSleep(xExpectedIdleTime) was called with xExpectedIdleTime = 2 which is minimum value defined by configEXPECTED_IDLE_TIME_BEFORE_SLEEP. + * The xExpectedIdleTime is decremented by one RTOS tick to wake-up in advance. + * Ex: RTOS tick is 1ms, the timer Server wakes the MCU in ~977 us. RTOS clock should be advanced by 1 ms. + * */ + if(time_ps <= (1e12 / configTICK_RATE_HZ)) /* time_ps < RTOS tick */ + { + val_ticks = 1; + } + else + { + /* Convert pS time into OS ticks */ + val_ticks = time_ps * configTICK_RATE_HZ; /* This cannot overflow. Max result is ~ 1.6e16 */ + val_ticks = (uint64_t)(val_ticks / (1e12)); /* The result always fits in uint32_t */ + } /** * The system may have been out from another reason than the timer @@ -322,4 +321,3 @@ static uint32_t LpGetElapsedTime( void ) } #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/main.c index 480882891..72fe0a5ae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -753,5 +753,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_msp.c index 046fea95a..f9025c21a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -367,4 +366,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..3f92f07b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -145,5 +146,3 @@ void HAL_ResumeTick(void) /* Enable TIM17 Update interrupt */ __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_it.c index 647efd98b..a7e462252 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -323,4 +322,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.c index 16307032f..510daacdf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ancs_client_app.c * @author MCD Application Team * @brief ANCS client Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -87,7 +86,7 @@ typedef enum } AncsProcId_t; /** - * structure of fields for GATT notication source characteristic + * structure of fields for GATT notification source characteristic */ typedef struct notifyListS { uint8_t used; /*flag to indicate notification processed or not*/ @@ -323,7 +322,7 @@ static void ANCS_Show_Attr(NotificationAttributeID attrID) */ static void ANCS_Show_AppAttr(AppAttributeID appAttrID) { - printf("\r\n*************** App Attribute Infomation Received **********************\r\n"); + printf("\r\n*************** App Attribute Information Received **********************\r\n"); switch (appAttrID) { case AppAttributeIDDisplayName: printf("** DisplayName: "); @@ -332,11 +331,11 @@ static void ANCS_Show_AppAttr(AppAttributeID appAttrID) } /** - * Display different fields for GATT notication source characteristic received + * Display different fields for GATT notification source characteristic received */ static void ANCS_Show_Notification(uint16_t index) { - printf("\r\n*************** Data Source Detail Infomation Received **********************\r\n"); + printf("\r\n*************** Data Source Detail Information Received **********************\r\n"); ANCS_Show_EventID((EventID)ancs_context.notifyList[index].evID); ANCS_Show_EventFlag((EventFlags)ancs_context.notifyList[index].evFlag); ANCS_Show_CategoryID((CategoryID)ancs_context.notifyList[index].catID); @@ -559,7 +558,7 @@ static void ANCS_Parse_GetNotificationAttr_Resp(uint8_t commandID, uint16_t att ancs_context.AppIdentifierLength = MAX_DISPLAY_NAME_LEN; } - ancs_context.state = ANCS_GET_APP_ATTRIBUTE; /* 3.2 Get APP Attributes (Detail Infomation about the App, Now only support to Get Name of App) */ + ancs_context.state = ANCS_GET_APP_ATTRIBUTE; /* 3.2 Get APP Attributes (Detail Information about the App, Now only support to Get Name of App) */ appId = FALSE; } @@ -570,11 +569,11 @@ static void ANCS_Parse_GetNotificationAttr_Resp(uint8_t commandID, uint16_t att if(ancs_context.state == ANCS_GET_APP_ATTRIBUTE) { - APP_DBG_MSG(" 3.2 Get APP Attributes (Detail Infomation about the App, Now only support to Get Name of App) => ANCS_GET_APP_ATTRIBUTE \n\r"); + APP_DBG_MSG(" 3.2 Get APP Attributes (Detail Information about the App, Now only support to Get Name of App) => ANCS_GET_APP_ATTRIBUTE \n\r"); } else { - /* Note, there is no AppIdentifier, so we only perform active action, but you also can perform negtive action */ + /* Note, there is no AppIdentifier, so we only perform active action, but you also can perform negative action */ if( (PositiveActionLabel == TRUE) || (NegativeActionLabel == TRUE) ) { ancs_context.state = ANCS_PERFORM_NOTIFICATION_ACTION; /* 3.2 Perform Notification Action */ @@ -683,7 +682,7 @@ static void ANCS_Notification_Source_Received_event( { uint16_t i; - printf("*************** Notification Source Basic Infomation Received **********************\r\n"); + printf("*************** Notification Source Basic Information Received **********************\r\n"); ANCS_Show_EventID(evID); ANCS_Show_EventFlag(evFlag); ANCS_Show_CategoryID(catID); @@ -740,7 +739,7 @@ void ANCS_Notification_Check(EventFlags EventFlagMask) ancs_context.notifyEntry = idx; ancs_context.notifyShowed = FALSE; ancs_context.state = ANCS_GET_NOTIFICATION_ATTRIBUTE; - APP_DBG_MSG("2. Get More Detail Infomations notifyEntry=%d ==> ANCS_GET_NOTIFICATION_ATTRIBUTE \n\r",ancs_context.notifyEntry); + APP_DBG_MSG("2. Get More Detail Information notifyEntry=%d ==> ANCS_GET_NOTIFICATION_ATTRIBUTE \n\r",ancs_context.notifyEntry); break; } } @@ -975,9 +974,9 @@ static void GattParseServices(aci_att_read_by_group_type_resp_event_rp0 *pr) } else if (uuid == DEVICE_INFORMATION_SERVICE_UUID) /* 0x180A */ { APP_DBG_MSG("DEVICE_INFORMATION_SERVICE_UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == 0x180B) /* 0x180B */ { - APP_DBG_MSG("Unkown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); + APP_DBG_MSG("Unknown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == 0x180C) /* 0x180C */ { - APP_DBG_MSG("Unkown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); + APP_DBG_MSG("Unknown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == HEART_RATE_SERVICE_UUID) /* 0x180D */ { APP_DBG_MSG("AMS_SERVICE_UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == PHONE_ALERT_SERVICE_UUID) /* 0x180E */ { @@ -1176,11 +1175,11 @@ static void GattParseDescs(aci_att_find_info_resp_event_rp0 *pr) handle = UNPACK_2_BYTE_PARAMETER(&pr->Handle_UUID_Pair[uuid_offset-2]); uuid = UNPACK_2_BYTE_PARAMETER(&pr->Handle_UUID_Pair[uuid_offset+uuid_short_offset]); - /* 1. primary serice handle + primary serice UUID */ + /* 1. primary service handle + primary service UUID */ if(uuid == PRIMARY_SERVICE_UUID) { APP_DBG_MSG("PRIMARY_SERVICE_UUID=0x%04X handle=0x%04X\n\r",uuid,handle); - }/* 1. primary serice handle + primary serice UUID */ + }/* 1. primary service handle + primary service UUID */ /* 2. char handle + char UUID */ else if(uuid == CHARACTERISTIC_UUID) @@ -1282,10 +1281,10 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) if (ancs_context.connection_handle == pr->Connection_Handle) { - // 1. Incomming Nofification + // 1. Incoming Nofification if (pr->Attribute_Handle == ancs_context.ANCSNotificationSourceCharValueHdle) { - APP_DBG_MSG("1. Incomming Nofification received BASIC information : \n\r"); + APP_DBG_MSG("1. Incoming Nofification received BASIC information : \n\r"); EventID evID = (EventID)pr->Attribute_Value[0]; EventFlags evFlag = (EventFlags)pr->Attribute_Value[1]; CategoryID catID = (CategoryID)pr->Attribute_Value[2]; @@ -1293,7 +1292,7 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) uint32_t notifUID = (uint32_t)(*((uint32_t *)&pr->Attribute_Value[4])); ANCS_Notification_Source_Received_event(evID, evFlag, catID, catCount, notifUID); - // 2. Get More Detail Infomations + // 2. Get More Detail Information if( (evID == EventIDNotificationAdded) ) { if((evFlag & EventFlagSilent) != EventFlagSilent) @@ -1304,7 +1303,7 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) } }// ANCSNotificationSourceCharValueHdle - // 3. Parse Detail Infomations, Perform Notification Action or Get APP Attributes + // 3. Parse Detail Information, Perform Notification Action or Get APP Attributes if (pr->Attribute_Handle == ancs_context.ANCSDataSourceCharValueHdle) { CommandID cmdID = (CommandID)pr->Attribute_Value[0]; @@ -1319,25 +1318,25 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) /***********************************************************************************/ if (cmdID == CommandIDGetNotificationAttributes) { - APP_DBG_MSG("3.1 Parse Detail Infomation of Notification Attribute, CommandIDGetNotificationAttributes Response: \n\r"); + APP_DBG_MSG("3.1 Parse Detail Information of Notification Attribute, CommandIDGetNotificationAttributes Response: \n\r"); notifUID = (uint32_t)(*((uint32_t *)&pr->Attribute_Value[1])); AttributeLength = pr->Attribute_Value_Length - (1+4); AttributeList = (uint8_t *)&pr->Attribute_Value[1+4]; - // 3.1 Parse Detail Infomation of Notification Attribute + // 3.1 Parse Detail Information of Notification Attribute ANCS_Parse_GetNotificationAttr_Resp(cmdID,AttributeLength,AttributeList); } UNUSED(notifUID); if (cmdID == CommandIDGetAppAttributes) { - APP_DBG_MSG("3.3 Parse Detail Infomation of APP Attribute, CommandIDGetAppAttributes Response: \n\r"); + APP_DBG_MSG("3.3 Parse Detail Information of APP Attribute, CommandIDGetAppAttributes Response: \n\r"); strcpy(AppIdentifier,(char *)&pr->Attribute_Value[1]); AppIdentifierLength = strlen((char *)&pr->Attribute_Value[1]); AttributeLength = pr->Attribute_Value_Length - (1+AppIdentifierLength+1); AttributeList = (uint8_t *)&pr->Attribute_Value[1+AppIdentifierLength+1]; - // 3.3 Parse Detail Infomation of App Attribute + // 3.3 Parse Detail Information of App Attribute ANCS_Parse_GetAppAttr_Resp(cmdID,AttributeLength,AttributeList); } @@ -1998,5 +1997,3 @@ void ANCS_App_Notification( Connection_Context_t *pNotification ) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.h index 69a070616..447451926 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ancs_client_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ancs_client_app.h * @author MCD Application Team * @brief Header for ancs_client_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -177,7 +176,7 @@ typedef struct notificationAttrS { * iOS notification. */ uint32_t UID; - /** App Identifer flag, if TRUE this attribute is requested from the Get Notification Attributes command */ + /** App Identifier flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t appID_flag; /** Title flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t title_flag; @@ -185,7 +184,7 @@ typedef struct notificationAttrS { uint16_t title_max_size; /** Subtitle flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t subtitle_flag; - /** Max Subtitle length paramter */ + /** Max Subtitle length parameter */ uint16_t subtitle_max_size; /** Message flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t message_flag; @@ -270,5 +269,3 @@ void ANCS_App_Notification( Connection_Context_t *pNotification ); #endif #endif /*__ANCS_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.c index e9c86f444..3cbb1e483 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -345,7 +344,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -468,7 +468,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) BleApplicationContext.Device_Connection_Status = APP_BLE_IDLE; if(disconnection_complete_event->Reason == ERR_CMD_SUCCESS){ - APP_DBG_MSG("\r\n\r** DISCONNECTION EVENT WITH CLIENT disconnection Reason=0x%02X sucess \n\r",disconnection_complete_event->Reason); + APP_DBG_MSG("\r\n\r** DISCONNECTION EVENT WITH CLIENT disconnection Reason=0x%02X success \n\r",disconnection_complete_event->Reason); }else if(disconnection_complete_event->Reason == HCI_CONNECTION_TERMINATED_BY_LOCAL_HOST_ERR_CODE){ APP_DBG_MSG("\r\n\r** DISCONNECTION EVENT WITH CLIENT disconnection Reason=0x%02X Connection terminated by local host \n\r",disconnection_complete_event->Reason); }else if(disconnection_complete_event->Reason == HCI_CONNECTION_TERMINATED_DUE_TO_MIC_FAILURE_ERR_CODE){ @@ -689,7 +689,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) if (Peer_Bonded == 0x00)/* only for the first paring complete*/ { - APP_DBG_MSG("Term Connection for the first pairing complete to save bonding infomation !!! \n\r"); + APP_DBG_MSG("Term Connection for the first pairing complete to save bonding information !!! \n\r"); for (int loop=0;loop<10;loop++) /* */ { @@ -1362,4 +1362,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.h index ec9ad8243..65d29cb51 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -88,5 +87,3 @@ void APP_BLE_Remove_Bonding_Info(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_conf.h index b51aa7b87..cd8a42274 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_dbg_conf.h index df9e12c2f..d688bd867 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/ble_dbg_conf.h @@ -1,23 +1,23 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* USER CODE END Header */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BLE_DBG_CONF_H @@ -197,5 +197,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.c index 3240fbf9d..290aea233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.c index 08cff5588..d1aefc194 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.c @@ -6,17 +6,16 @@ * @brief Heart Rate Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -252,5 +251,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.h index 0246d2811..89b91bab3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/hrs_app.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void HRSAPP_Init( void ); #endif #endif /*__HRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..5d488c347 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/readme.txt index 035547b48..da81047c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRateFreeRTOS_ANCS/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRateFreeRTOS_ANCS example. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -122,7 +122,7 @@ Considering connection with ios device: - connect to a device - select the HRanc in the device list - call your ios device by using another smartphone, the call will be answered automatically. or, send message to your ios device,the message can be displayed on terminal. - Warning: if the HRanc has already been bonded or pairing timeout, you should erase it from bluetooth connected ios device list and press SW3 stored bonded infomation. + Warning: if the HRanc has already been bonded or pairing timeout, you should erase it from bluetooth connected ios device list and press SW3 stored bonded information. (in ios device settings: select bluetooth icon, then select my device and forget or ignore it). The Heart Rate is displayed each second on the ios device. Moreover to display ANCS notifications messages, please open an hyper-terminal on PC diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Binary/BLE_HeartRate_ANCS_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Binary/BLE_HeartRate_ANCS_reference.hex index 006f6369b..8ad5d7954 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Binary/BLE_HeartRate_ANCS_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Binary/BLE_HeartRate_ANCS_reference.hex @@ -1,26 +1,26 @@ :020000040800F2 -:100000003030002009DE0008D1DB0008D3DB000817 -:10001000D5DB0008D7DB0008D9DB000800000000B2 -:10002000000000000000000000000000DBDB000812 -:10003000DDDB000800000000DFDB0008E1DB00087A -:100040002BDE00082FDE000833DE00081FDC00086E -:1000500037DE00083BDE000813DC000819DC00086E -:100060003FDE000843DE00080DDC000847DE000824 -:100070004BDE00084FDE0008E5DB000853DE000819 -:1000800057DE00085BDE00085FDE000863DE000864 -:1000900067DE00086BDE00086FDE000873DE000814 -:1000A00077DE00087BDE00087FDE000883DE0008C4 -:1000B00087DE00088BDE00088FDE000893DE000874 -:1000C00097DE00089BDE00089FDE0008A3DE000824 -:1000D000EBDB0008F1DB0008A7DE0008ABDE000860 -:1000E000AFDE0008B3DE0008B7DE0008BBDE0008A4 -:1000F00027DC000823DC0008BFDE0008C3DE0008A0 -:10010000C7DE0008CBDE0008CFDE0008D3DE000823 -:10011000D7DE0008DBDE0008DFDE0008E3DE0008D3 -:10012000E7DE0008EBDE0008F7DB0008EFDE000882 -:10013000F3DE0008F7DE0008FBDE000818B1022835 +:10000000081000205DE60008EDE30008EFE30008BB +:10001000F1E30008F3E30008F5E300080000000046 +:10002000000000000000000000000000F7E30008EE +:10003000F9E3000800000000FBE30008FDE300080E +:100040007FE6000883E6000887E6000847E400082A +:100050008BE600088FE600083BE4000841E4000856 +:1000600093E6000897E6000835E400089BE60008E0 +:100070009FE60008A3E6000801E40008A7E60008E0 +:10008000ABE60008AFE60008B3E60008B7E60008F4 +:10009000BBE60008BFE60008C3E60008C7E60008A4 +:1000A000CBE60008CFE60008D3E60008D7E6000854 +:1000B000DBE60008DFE60008E3E60008E7E6000804 +:1000C000EBE60008EFE60008F3E60008F7E60008B4 +:1000D00007E400080DE40008FBE60008FFE600085E +:1000E00003E7000807E700080BE700080FE7000830 +:1000F00013E4000817E400081BE4000813E70008F5 +:1001000017E700081BE700081FE7000823E70008BF +:1001100027E700082BE700082FE7000833E700086F +:1001200037E700083BE700081FE400083FE7000846 +:1001300043E7000847E700084BE7000818B102282A :1001400007D003D370470FF2140004E00FF2200031 -:1001500001E00FF2340004F089BB00002A2A204598 +:1001500001E00FF2340004F085BB00002A2A20459C :1001600076656E7449443A2041646465640D0A0002 :100170002A2A204576656E7449443A204D6F646999 :10018000666965640D0A00002A2A204576656E744A @@ -28,12 +28,12 @@ :1001A00010B50128044608D0022809D004280AD036 :1001B00008280BD010280CD00FE00FF270000AE0D6 :1001C0000FF2800007E00FF2980004E00FF2B00099 -:1001D00001E00FF2CC0004F049FB0FF2E40004F060 -:1001E00045FBE00744BF0FF2E80004F03FFBA00727 -:1001F00044BF0FF2E40004F039FB600744BF0FF284 -:10020000E40004F033FB200744BF0FF2E80004F0E1 -:100210002DFBE00644BF0FF2EC0004F027FBBDE825 -:10022000104001A004F022BB0A0D00002A2A20453C +:1001D00001E00FF2CC0004F045FB0FF2E40004F064 +:1001E00041FBE00744BF0FF2E80004F03BFBA0072F +:1001F00044BF0FF2E40004F035FB600744BF0FF288 +:10020000E40004F02FFB200744BF0FF2E80004F0E5 +:1002100029FBE00644BF0FF2EC0004F023FBBDE82D +:10022000104001A004F01EBB0A0D00002A2A204540 :1002300076656E74466C61673A2053696C656E74BE :100240000D0A00002A2A204576656E74466C6167A7 :100250003A20496D706F7274616E740D0A0000006F @@ -54,7 +54,7 @@ :100340000FF2A40013E00FF2B80010E00FF2CC009F :100350000DE00FF2E0000AE00FF2F00007E00FF20C :10036000101004E00FF2301001E00FF2481004F01A -:100370007DBA70472A2A2043617465676F72794994 +:1003700079BA70472A2A2043617465676F72794998 :10038000443A204F746865720D0A00002A2A2043FF :10039000617465676F727949443A20496E636F6D85 :1003A000696E672043616C6C0D0A00002A2A2043A5 @@ -77,7 +77,7 @@ :1004B0000A0000002A2A2043617465676F72794937 :1004C000443A20456E7465727461696E6D656E7430 :1004D0000D0A00000FB418B585B068460FF2FC0194 -:1004E000142204F0E7F908988DF801000024089818 +:1004E000142204F0E3F908988DF80100002408981C :1004F0008DF80040000A8DF8020005220898000CD3 :100500008DF803000898000E8DF804009DF8240073 :10051000012804BF8DF8054006229DF8250001281A @@ -89,10 +89,10 @@ :100570003100012803D1D0B2052300F049F89DF8DD :100580003200012803D1D0B2062300F041F89DF8D3 :100590003300012803D1D0B2072300F039F8DFF887 -:1005A000DC0BB0F83A1840886B46D2B204F03EFB40 -:1005B000044647F2305000F093FD54B100F08AFD3C -:1005C000014640F2A7130FF2280202F0BFFE03F02B -:1005D000BFFE06B010BC5DF814FB00000000000078 +:1005A000E00BB0F83A1840886B46D2B204F03AFB40 +:1005B000044647F2305000F095FD54B100F08CFD38 +:1005C000014640F2A7130FF2280202F0C1FE03F029 +:1005D000C1FE06B010BC5DF814FB00000000000076 :1005E000000001FFFF02FFFF03FFFF0405060700F5 :1005F000414E43535F436D645F4765744E6F74694A :100600006669636174696F6E417474720000000002 @@ -100,44 +100,44 @@ :10062000521C0DF80300D3B2000A0DF80300521C4F :10063000704700002DE9F04F00260024002885B007 :10064000A04640F0E080ADF80C1001928DF8024019 -:10065000DFF82C9B0FF2D41ADFF8205BDFF824BB05 +:10065000DFF8309B0FF2D41ADFF8245BDFF828BBF9 :1006600001E0F61CB6B2BDF80C00864280F2CE80E6 -:100670000198801900F064FBBDF800100029F0D04B +:100670000198801900F066FBBDF800100029F0D049 :1006800005F6080002900146887810BB0F880FF22B -:10069000C01004F0EBF80C204743E819049000F276 +:10069000C01004F0E7F80C204743E819049000F27A :1006A00009273878FFF74AFD7878FFF779FDB878A1 -:1006B000FFF730FEF9780FF2EC1004F0D7F8049849 -:1006C000D0F810120FF2F41004F0D0F802990120C3 +:1006B000FFF730FEF9780FF2EC1004F0D3F804984D +:1006C000D0F810120FF2F41004F0CCF802990120C7 :1006D00088700198805D07281ED8DFE800F01916A1 :1006E00013100D0A07040FF2F41013E00FF20820A4 :1006F00010E00FF220200DE00FF224200AE00FF2AC :10070000342007E00FF23C2004E00FF2482001E023 -:100710000FF24C2004F0AAF80198805D08B901247A +:100710000FF24C2004F0A6F80198805D08B901247E :1007200009E0062803D101208DF8020003E0072824 :1007300008BF4FF00108761CB6B2029605F5837724 :100740000198BDF800208619FF2A08D8B11C384648 -:1007500004F001FBBDF800100020785410E000F018 -:10076000F5FA014640F21F2300F090F900F0BCFAC0 -:10077000FE22B11C384604F0EEFA002085F804028F +:1007500004F0FDFABDF800100020785410E000F01D +:10076000F7FA014640F21F2300F092F900F0BEFABA +:10077000FE22B11C384604F0EAFA002085F8040293 :10078000029EBDF800008619B61C2000B6B217D034 :10079000BDF80020521C812A05F1860006DA394690 -:1007A00004F0D9FABDF80000401C04E0802239466C -:1007B00004F0D1FA802085F8850000240F202870ED -:1007C000BDF80000002804D039460FF2984004F02C -:1007D0004DF848E758EA00000AD0102000F0B5FABA -:1007E000014640F2432300F051F90FF2881008E06F -:1007F00000F0ABFA01464FF4127300F047F90FF224 -:10080000BC1004F033F805B0BDE8F08F29789DF8EE -:1008100002000F29DED100F099FA014640F23B2395 -:1008200000F034F90FF2E810EBE70000414E4353BB +:1007A00004F0D5FABDF80000401C04E08022394670 +:1007B00004F0CDFA802085F8850000240F202870F1 +:1007C000BDF80000002804D039460FF29C4004F028 +:1007D00049F848E758EA00000AD0102000F0B7FABC +:1007E000014640F2432300F053F90FF2881008E06D +:1007F00000F0ADFA01464FF4127300F049F90FF220 +:10080000BC1004F02FF805B0BDE8F08F29789DF8F2 +:1008100002000F29DED100F09BFA014640F23B2393 +:1008200000F036F90FF2E810EBE70000414E4353B9 :100830005F50617273655F4765744E6F7469666976 :10084000636174696F6E417474725F526573700096 :100850000D0A2A2A2A2A2A2A2A2A2A2A2A2A2A2A35 :100860002A204461746120536F757263652044656A -:100870007461696C20496E666F6D6174696F6E207A -:100880005265636569766564202A2A2A2A2A2A2AFB -:100890002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A0DD5 -:1008A0000A0000002A2A2043617465676F72794349 +:100870007461696C20496E666F726D6174696F6E28 +:10088000205265636569766564202A2A2A2A2A2A05 +:100890002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2AB8 +:1008A0000D0A00002A2A2043617465676F7279433C :1008B0006F756E743A2025640D0A00002A2A204EB6 :1008C0006F74696669636174696F6E5549443A2053 :1008D0003078253038780D0A000000002A2A204E92 @@ -162,3423 +162,3563 @@ :100A0000414E43535F49444C45200A0D000000000D :100A100020332E3220476574204150502041747499 :100A200072696275746573202844657461696C200D -:100A3000496E666F6D6174696F6E2061626F757467 -:100A400020746865204170702C204E6F77206F6E87 -:100A50006C7920737570706F727420746F204765A5 -:100A600074204E616D65206F662041707029203DB5 -:100A70003E20414E43535F4745545F4150505F41D4 -:100A80005454524942555445200A0D005246484696 -:100A900003F0ECBE2DE9FE4F0027012840F08380D3 -:100AA000DFF8D866DFF8D8860FF23819DFF8D4B649 -:100AB000ADF80210154606F5837A01E0FF1CBFB2BF -:100AC000BDF80200874270DAE81900F039F9BDF884 -:100AD00000100029F2D0EC5D0FF2241003F0C6FEE6 -:100AE0001CB90FF26C1003F0C1FEE85D441EA44176 -:100AF0007F1CBFB20197E40FBDF80020EF19FF2A59 -:100B000009D8B91C504604F026F9BDF800100020A1 -:100B10000AF8010010E000F019F9014640F27923CB -:100B200001F07EFB00F0E0F8FE22B91C504604F014 -:100B300012F9002086F80402019FBDF80000C719D1 -:100B4000BF1CBFB28CB1421C812A07DA5146701D0E -:100B500004F001F9BDF80000401C05E08022514678 -:100B6000701D04F0F8F880203071BDF800000028F6 -:100B7000A6D051460FF2EC0003F078FEA0E700F09B -:100B8000E5F8014640F2992301F04AFB29880FF26B -:100B9000DC0003F06BFE288844433019002180F804 -:100BA000081211203070BDE8F78F06F608050C24F6 -:100BB00028886043301890F80B02012818BF0528D8 -:100BC000DDD1012028721020307000F0BFF80146FE -:100BD00040F2972301F024FB0FF2C40003F046FE1D -:100BE000E1E70000414E43535F50617273655F4718 -:100BF0006574417070417474725F52657370000067 -:100C00000D0A2A2A2A2A2A2A2A2A2A2A2A2A2A2A81 -:100C10002A20417070204174747269627574652075 -:100C2000496E666F6D6174696F6E205265636569A8 -:100C3000766564202A2A2A2A2A2A2A2A2A2A2A2A5D -:100C40002A2A2A2A2A2A2A2A2A2A0D0A00000000E9 -:100C50002A2A20446973706C61794E616D653A206F -:100C6000000000002025730D0A000000436F6D6D29 -:100C7000616E64494447657441707041747472696F -:100C80006275746573206E6F74696679456E7472EF -:100C9000793D25642052656D6F7665640A0D00000C -:100CA00020332E3420506572666F726D204E6F7443 -:100CB000696669636174696F6E20416374696F6E00 -:100CC000203D3E20414E43535F504552464F524DCA -:100CD0005F4E4F54494649434154494F4E5F41434B -:100CE00054494F4E200A0D00BDF800100FF20800C5 -:100CF000FF2203F0BBBD000063757420746865209B -:100D00004174747269627574654944207820566133 -:100D10006C7565206C656E3D2564203C3D207369D3 -:100D20007A656F6628616E63735F636F6E74657852 -:100D3000742E6C697374293D2564200A0D0000002F -:100D4000411C0222684604F006B82870584604F098 -:100D50004FB82DE9FC410546089C0FF2A4000E4651 -:100D60001746984603F082FD2846FFF7E7F930461C -:100D7000FFF716FA3846FFF7CDFA41460FF2D800D2 -:100D800003F074FD21460FF2E80003F06FFD0C2222 -:100D9000022DDFF8E83311D1002102FB01F01844E5 -:100DA00000F502708568A54203D0491C8029F4DB58 -:100DB00024E0002202700FF2D8001BE0002102FBA9 -:100DC00001F0184400F5027C9CF8000018B1491CA1 -:100DD0008029F4DB12E001208CF800008CF801502F -:100DE0008CF802608CF803708CF80480CCF8084012 -:100DF0000FF2BC00BDE8FC4103F038BDBDE8F38153 -:100E00002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A204C -:100E10004E6F74696669636174696F6E20536F7594 -:100E200072636520426173696320496E666F6D610C -:100E300074696F6E205265636569766564202A2A3D -:100E40002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A2A02 -:100E50002A2A2A2A0D0A00002A2A2043617465677B -:100E60006F7279436F756E743A202564200D0A0005 -:100E70002A2A204E6F74696669636174696F6E55C2 -:100E800049443A2030782530386C78200D0A00002B -:100E90002A2A206E6F74696679456E7472793A20D9 -:100EA00025642052656D6F7665640D0A00000000B0 -:100EB0002A2A206E6F74696679456E7472793A20B9 -:100EC00025642041646465640D0A00007CB5AB4C68 -:100ED00004F608054FF6FF7601462E8000220C230B -:100EE0005343234403F50273187818B19B780B40E1 -:100EF0008B4213D0521C802AF1DB2888B0420CD1DF -:100F000000F0E8F801464FF43B7302F01DFA0FF2CF -:100F1000340003F0ABFC0020207073BD0020A870EB -:100F2000D2B20E2020702A8000F0D4F8014640F2A0 -:100F3000E52302F009FA29880FF24C0003F096FC31 -:100F4000DBE7000020616E63735F636F6E7465782A -:100F5000742E6E6F74696679456E747279203D3DAA -:100F600020494E56414C49445F4E4F544946595FC3 -:100F7000454E545259203D3E20414E43535F494413 -:100F80004C45200A0D000000322E20476574204D8C -:100F90006F72652044657461696C20496E666F6D7F -:100FA0006174696F6E7320206E6F74696679456E27 -:100FB0007472793D2564203D3D3E20414E43535F90 -:100FC0004745545F4E4F54494649434154494F4E5B -:100FD0005F415454524942555445200A0D000000C7 -:100FE00010B5664C40F64401204603F06FFF002028 -:100FF0000C210023C2B24A432244401C82F808322A -:10100000C2B2802AF6DB4FF6FF706080A4F80808B1 -:10101000237000F05FF801464FF443730FF21002A3 -:1010200002F094F9BDE810400FF2180003F01EBC66 -:10103000414E43535F436C69656E745F52657365DF -:1010400074000000414E435320434C49454E542008 -:101050005245534554200A0D00000000002108208D -:1010600003F0B8BF80B5DFF8180D04F031F8DFF8F1 -:10107000142D0021082003F0A0FFFFF7B1FF00F0BE -:1010800029F8014640F226330FF2100202F05EF911 -:10109000BDE802400FF21C0003F0E8BB414E435391 -:1010A0005F436C69656E745F4170705F496E69740F -:1010B000000000002D2D20414E435320434C494554 -:1010C0004E5420494E495449414C495A4544200AFE -:1010D0000D0000002B4803F08BBE082003F0A0BFDA -:1010E000082003F0A5BF2DE9F8430746DFF89480F8 -:1010F000234C0FF294050FF2A80901F0C8FC014639 -:1011000040F23E3300F0ECF8BA7839880FF2001064 -:1011100003F0ACFB002611E001F0B9FC01464FF4EE -:10112000517300F0DDF807EB8600B0F80530B0F839 -:1011300003203146FFF7ABFC761CF6B2B878864246 -:10114000EADB0E480178082916D100F62E06B7F81A -:1011500003003080B7F80500708001F098FC01466C -:1011600040F24D3300F0BCF8728831880FF2001065 -:10117000BDE8F84303F07ABBBDE8F183FC11002021 -:101180009C440008B0440008476174745061727355 -:1011900065536572766963657342795555494400B4 -:1011A0004143495F4154545F46494E445F42595F51 -:1011B000545950455F56414C55455F524553505F19 -:1011C00056534556545F434F4445202D204E756D70 -:1011D000506169723D256420466F756E645F41748D -:1011E000747269627574655F48616E646C653D30E8 -:1011F00078253034582C47726F75705F456E645F88 -:1012000048616E646C653D3078253034580A0D00B5 -:101210004143495F4154545F46494E445F42595FE0 -:10122000545950455F56414C55455F524553505FA8 -:1012300056534556545F434F4445202D20436F6E0F -:101240006E656374696F6E5F48616E646C653D3096 -:1012500078253034582C4E756D5F6F665F48616E2F -:10126000646C655F506169723D25640A0D00000081 -:101270004143495F4154545F46494E445F42595F80 -:10128000545950455F56414C55455F524553505F48 -:1012900056534556545F434F4445202D20466F75A5 -:1012A0006E6420414E43535365727669636553748F -:1012B00061727448616E646C653D307825303458D5 -:1012C0002C414E435353657276696365456E64489D -:1012D000616E646C653D3078253034580A0D00002D -:1012E0002A46204603F0C2BA2DE9F04F0546DFF842 -:1012F000988A87B001F0CBFBDFF8909A0FF2103A92 -:10130000014640F25E33FFF7C1FBEB78AA782988EB -:101310000FF2103003F0AAFA00F074FF40F067817A -:10132000A878E978142802F6120204BF04270C24D6 -:10133000039291FBF0F106280495C9B204BF04277B -:10134000002406940020059120E003F051FD0146A1 -:1013500040F2C333FFF79AFB0FF23C302B46324684 -:1013600059460FE045F22B0083454046EDD103F08E -:101370003FFD40F2C1330146FFF788FB2B46324662 -:101380005946204603F072FA00F042FF8DF808003B -:101390009DF808400598844280F2378104983844CB -:1013A000857806784178C07845EA002546EA012626 -:1013B00006980499C01908440179407941EA002B44 -:1013C00001F065FB014640F28333FFF75FFB0195B7 -:1013D00000965B46059A0FF2E820214603F046FA94 -:1013E0000398008808B1864201DA039806800398C2 -:1013F000408808B1A84201DA03984580BBF5C05F78 -:1014000012D10398868040460399CD8003F0F0FC0A -:10141000014640F29533FFF739FB0FF2E8202B46E7 -:1014200032464FF4C051ADE741F6010083450ED17D -:1014300003980682404603994D8203F0D9FC014689 -:1014400040F29B33FFF722FB0FF2E42086E741F6E0 -:10145000020083450FF2143404D101F018FB40F26E -:101460009E3388E741F60300834509D101F00FFB65 -:1014700001464FF46873FFF709FB0FF21C306DE76C -:1014800041F60400834509D101F001FB014640F219 -:10149000A233FFF7FBFA0FF234305FE741F60500A5 -:1014A000834509D101F0F3FA01464FF46973FFF760 -:1014B000EDFA0FF24C3051E741F60600834509D1B1 -:1014C00001F0E5FA014640F2A633FFF7DFFA0FF22A -:1014D000683043E741F60700834509D101F0D7FAA8 -:1014E00001464FF46A73FFF7D1FA0FF28C3035E7FB -:1014F00041F60800834509D101F0C9FA014640F2DE -:10150000AA33FFF7C3FA0FF2A83027E741F6090024 -:10151000834509D101F0BBFA01464FF46B73FFF725 -:10152000B5FA0FF2BC3019E741F60A00834509D13C -:1015300001F0ADFA014640F2AE33FFF7A7FA0FF221 -:10154000DC300BE741F60B00834509D101F09FFA2F -:1015500001464FF46C73FFF799FA0FF2FC30FDE689 -:1015600041F60C00834509D101F091FA014640F2A1 -:10157000B233FFF78BFA0FF2E030EFE641F60D00E1 -:10158000834504D101F083FA4FF46D73F3E641F61D -:101590000E00834509D101F07AFA014640F2B633D4 -:1015A000FFF774FA0FF2D830D8E641F60F00834502 -:1015B00009D101F06CFA01464FF46E73FFF766FA39 -:1015C0000FF2F030CAE64FF2314083457FF4CAAEE5 -:1015D0000398868340460399CD8303F009FC0146B6 -:1015E00040F2BF33FFF752FA0FF2F830B6E601F0DF -:1015F0004EFA014640F2CB33FFF748FA07B0BDE898 -:10160000F04F0FF2104003F031B900F0D1BF0000ED -:10161000476174745061727365536572766963656E -:10162000730000004143495F4154545F52454144B7 -:101630005F42595F47524F55505F545950455F5272 -:101640004553505F56534556545F434F4445202DF4 -:1016500020436F6E6E656374696F6E5F48616E6480 -:101660006C653D3078253034582C41747472696251 -:101670007574655F446174615F4C656E6774683D45 -:1016800025642C446174615F4C656E6774683D2508 -:101690006420210A00000000696E76616C69642094 -:1016A000555549443D30782530345820666F756E65 -:1016B00064205B2530345820253034585D210A00E1 -:1016C0006E756D536572763D25642F25642C7368A5 -:1016D0006F727420555549443D3078253034582078 -:1016E0005365727669636548616E646C65205B3032 -:1016F0007825303458202D203078253034585D201E -:101700000A0D00004741505F534552564943455F1B -:10171000555549443D30782530345820666F756EF4 -:1017200064205B2530345820253034585D210A0070 -:1017300047454E455249435F4154545249425554DE -:10174000455F534552564943455F555549443D30E1 -:10175000782530345820666F756E64205B253034F0 -:101760005820253034585D210A000000414D535F58 -:10177000534552564943455F555549443D307825B8 -:1017800030345820666F756E64205B2530345820E5 -:10179000253034585D210A004C494E4B5F4C4F5365 -:1017A000535F534552564943455F555549443D3073 -:1017B000782530345820666F756E64205B25303490 -:1017C0005820253034585D210A00000054585F50DD -:1017D0004F5745525F534552564943455F5555490A -:1017E000443D30782530345820666F756E64205B38 -:1017F0002530345820253034585D210A000000007F -:1018000043555252454E545F54494D455F534552DE -:10181000564943455F555549443D30782530345845 -:1018200020666F756E64205B253034582025303477 -:10183000585D210A000000005245464552454E437E -:10184000455F5550444154455F54494D455F5345AC -:1018500052564943455F555549443D30782530340B -:101860005820666F756E64205B2530345820253013 -:1018700034585D210A0000004E4558545F445354CB -:101880005F4348414E47455F534552564943455F84 -:10189000555549443D30782530345820666F756E73 -:1018A00064205B2530345820253034585D210A00EF -:1018B000474C55434F53455F534552564943455F47 -:1018C000555549443D30782530345820666F756E43 -:1018D00064205B2530345820253034585D210A00BF -:1018E0004845414C54485F544845524D4F4D45542E -:1018F00045525F534552564943455F555549443D0E -:1019000030782530345820666F756E64205B253042 -:10191000345820253034585D210A0000444556498A -:1019200043455F494E464F524D4154494F4E5F53D8 -:101930004552564943455F555549443D3078253019 -:10194000345820666F756E64205B2530345820252E -:101950003034585D210A0000556E6B6F776E20554C -:101960005549443D30782530345820666F756E6493 -:10197000205B2530345820253034585D210A000082 -:1019800050484F4E455F414C4552545F5345525667 -:101990004943455F555549443D30782530345820FA -:1019A000666F756E64205B253034582025303458BE -:1019B0005D210A00424154544552595F53455256E5 -:1019C0004943455F555549443D30782530345820CA -:1019D000666F756E64205B2530345820253034588E -:1019E0005D210A00414E43535F53455256494345DA -:1019F0005F555549443D30782530345820666F7521 -:101A00006E64205B2530345820253034585D210A1F -:101A1000000000004143495F4154545F5245414436 -:101A20005F42595F47524F55505F545950455F527E -:101A30004553505F56534556545F434F44452C2001 -:101A40006661696C6564206E6F20667265652069E9 -:101A50006E64657820696E20636F6E6E656374696D -:101A60006F6E207461626C6520210A0D0000000019 -:101A70002DE9F84F0546DFF810A388B001F07EF994 -:101A8000DFF808830FF2083901464FF4777300F04E -:101A9000C7FBEB78AA7829880FF2043002F0E6FE43 -:101AA00000F0B0FB40F05B81EB78A878152804BF0C -:101AB00005270C24072804BF05270024194691FB9D -:101AC000F0F1581EE870C9B202F61A020020039223 -:101AD00004950794069124E001F050F9014640F284 -:101AE000434300F09DFB0FF224302B462246314643 -:101AF00013E042F6A62B5E45EED1039804800398CE -:101B0000458001F03BF9014640F2414300F088FB7B -:101B10000FF228302B462246594602F0A7FE00F06D -:101B200077FB8DF808009DF808B00698834580F291 -:101B300024810498C01910F8014C017844EA01246A -:101B4000417805918578C078049945EA0025079881 -:101B5000C01908440679407956EA00261CBF05984A -:101B60000028DCD0002C18BF002DD8D001F006F9D9 -:101B700001464FF4816300F053FB059B0FF2F82000 -:101B8000019500943246594602F070FEB6F5285F82 -:101B90000DD101F0F3F8014640F20C4300F040FB98 -:101BA0000FF240302B4622464FF42851B5E742F65B -:101BB000012086420FF25C3B0CD101F0DFF80146B8 -:101BC00040F20E4300F02CFB2B46224642F6012148 -:101BD0005846A2E742F6022086420DD101F0CEF827 -:101BE00001464FF4826300F01BFB0FF258302B4686 -:101BF000224642F6022190E742F6032086420BD1AC -:101C000001F0BCF8014640F2124300F009FB2B46FC -:101C1000224642F60321DBE742F6042086420BD13E -:101C200001F0ACF8014640F2144300F0F9FA2B46FB -:101C3000224642F60421CBE742F6052086420ED129 -:101C40000398848150460399CD8103F0D1F8014671 -:101C500040F21A4300F0E4FA0FF2243045E742F66E -:101C60001920864209D101F089F8014640F21D434E -:101C700000F0D6FA0FF24C3037E742F62B208642BE -:101C800009D101F07BF801464FF4846300F0C8FAF3 -:101C90000FF2643029E742F60F20864209D101F0A5 -:101CA0006DF8014640F2224300F0BAFA0FF27C30A0 -:101CB0001BE742F62920864209D101F05FF8014670 -:101CC00040F2254300F0ACFA0FF29C300DE742F6EB -:101CD0002420864209D101F051F8014640F2274301 -:101CE00000F09EFA0FF2CC30FFE641F20D20864262 -:101CF0000ED10398048350460399CD8303F078F8FE -:101D0000014640F22E4300F08BFA0FF2F030ECE681 -:101D10004DF6F30086420ED1039844835046039952 -:101D20000D8403F065F8014640F2344300F078FA80 -:101D30000FF20840D9E64CF2E96086427FF4D9AE52 -:101D400003988483504603994D8403F051F801466B -:101D500040F23A4300F064FA0FF21840C5E601F091 -:101D60000DF8014640F24B4300F05AFA09B0BDE8C5 -:101D7000F04F0FF2384002F079BD09B0BDE8F08FA6 -:101D8000832D00086D330008B04400089C4400080F -:101D900047617474506172736543686172730000C7 -:101DA0004143495F4154545F524541445F42595F4A -:101DB000545950455F524553505F56534556545FF2 -:101DC000434F4445202D20436F6E6E656374696FE9 -:101DD0006E5F48616E646C653D307825782C486193 -:101DE0006E646C655F56616C75655F506169725FAA -:101DF0004C656E6774683D25642C446174615F4C6A -:101E0000656E6774683D25640A0D0000556E6B6E43 -:101E10006F776E5F6368617220555549443D307835 -:101E20002530345820666F756E64205B2530345839 -:101E300020253034585D210A0000000043454E54EF -:101E400052414C5F414444524553535F5245534FB6 -:101E50004C5554494F4E5F555549443D30782530D7 -:101E6000345820666F756E64205B25303458202509 -:101E70003034585D210A00002D2D20474154542054 -:101E80003A206E756D48646C6556616C756550617D -:101E900069723D25642C73686F72742055554944EE -:101EA0003D30782530345820464F554E4420436805 -:101EB000617250726F706572746965733D30782518 -:101EC000303458204368617248616E646C65205BF1 -:101ED000307825303458202D203078253034585D26 -:101EE0000A000000474150204445564943455F4E93 -:101EF000414D455F555549443D3078253034582093 -:101F0000666F756E64205B25303458202530345858 -:101F10005D210A0047415020415050454152414EF9 -:101F200043455F555549443D307825303458206647 -:101F30006F756E64205B2530345820253034585D31 -:101F4000210A00004741502050455249504845520F -:101F5000414C5F505249564143595F464C41475F9F -:101F6000555549443D30782530345820666F756E9C -:101F700064205B2530345820253034585D210A0018 -:101F80004741545420534552564943455F434841C5 -:101F90004E4745445F43484152414354455249539B -:101FA0005449435F555549443D30782530345820D5 -:101FB000666F756E64205B253034582025303458A8 -:101FC0005D210A00424154544552595F4C455645E3 -:101FD0004C5F434841525F555549443D3078253068 -:101FE000345820666F756E64205B25303458202588 -:101FF0003034585D210A000043555252454E545F1B -:1020000054494D455F434841525F555549443D3021 -:10201000782530345820666F756E64205B25303427 -:102020005820253034585D210A0000004C4F4341B0 -:102030004C5F54494D455F494E464F524D415449BE -:102040004F4E5F434841525F555549443D307825D6 -:1020500030345820666F756E64205B25303458200C -:10206000253034585D210A00446576696365496E00 -:10207000666F726D6174696F6E53657276696365C0 -:10208000204D414E5546414354555245525F4E41B5 -:102090004D455F555549443D3078253034582066CC -:1020A0006F756E64205B2530345820253034585DC0 -:1020B000210A0000446576696365496E666F726D3A -:1020C0006174696F6E53657276696365204D4F4424 -:1020D000454C5F4E554D4245525F555549443D3044 -:1020E000782530345820666F756E64205B25303457 -:1020F0005820253034585D210A000000414E4353DA -:102100005F4E4F54494649434154494F4E5F534FE8 -:10211000555243455F434841525F555549443D3010 -:10212000782530345820666F756E64205B25303416 -:102130005820253034585D210A000000414E435399 -:102140005F434F4E54524F4C5F504F494E545F4384 -:102150004841525F555549443D3078253034582028 -:10216000666F756E64205B253034582025303458F6 -:102170005D210A00414E43535F444154415F534F38 -:10218000555243455F434841525F555549443D30A0 -:10219000782530345820666F756E64205B253034A6 -:1021A0005820253034585D210A0000004143495F22 -:1021B0004154545F524541445F42595F5459504520 -:1021C0005F524553505F56534556545F434F444505 -:1021D0002C206661696C65642068616E646C6520A2 -:1021E0006E6F7420666F756E6420696E20636F6E0B -:1021F0006E656374696F6E207461626C6520210A7C -:102200000D000000DFF8602D298850888842704753 -:10221000049881789DF80800CF19FFB2401C7047E0 -:102220004A46404602F022BB2DE9F04F0646DFF851 -:102230003C8D87B000F02BFCDFF834AD0FF2783B1B -:10224000014640F2594300F01DFCF378B278318822 -:102250000FF2743002F00AFBDFF80C2D3188508841 -:10226000884240F09781B078012803D102244FF0D2 -:1022700000090425022803D102244FF00C0912257D -:1022800002F62802F078DFF8EC7C0292E9B20396BD -:1022900090FBF1F1CDF81890C9B20595002004919A -:1022A00023E002F0A5FD014640F2CF4300F0EAFB37 -:1022B0000FF270302A4631460FE042F6A6294E450D -:1022C0004046EED102F094FD014640F2CD4300F0CD -:1022D000D9FB0FF28C302A46494602F0C7FA05981E -:1022E00004199DF80400E4B2401C8DF804009DF828 -:1022F00004100498814280F25B810398811C0019CC -:102300000D5DC078039945EA0025069800190A1D5D -:10231000165C0844407946EA0026B6F5205F0CD1E9 -:1023200000F0B5FB014640F27C4300F0ABFB0FF23E -:1023300074302A464FF42051CFE742F603094E4548 -:102340000ED100203880B880F8807D8000F09FFB9F -:10235000014640F2894300F095FB0FF27430BAE772 -:10236000B6F5245F1CBF42F60210864240D1FD80C4 -:102370000299B8880A880FF2943990420FD14D80A3 -:1023800000F085FB40F29443014600F07BFB009592 -:10239000BB887A883146484602F068FA9FE70A8A85 -:1023A000904205D1CD8200F072FB4FF49363EBE7CE -:1023B0008A8A904205D14D8300F069FB40F29C432C -:1023C000E2E74A8A904205D10D8300F060FB4FF4AA -:1023D0009463D9E700F05BFB014640F2A24300F0B2 -:1023E00051FB0095BB887A880FF24C303146D3E719 -:1023F0003E80B6F5285FBD800CD100F048FB014659 -:1024000040F2AC4300F03EFB0FF26C302A464FF432 -:10241000285162E742F6012086420FF288390BD13B -:1024200000F035FB014640F2AE4300F02BFB2A469C -:1024300042F60121484650E742F6022086420CD17E -:1024400000F025FB01464FF4966300F01BFB0FF2F2 -:1024500080302A4642F602213FE742F603208642B8 -:102460000AD100F014FB014640F2B24300F00AFB2F -:102470002A4642F60321DDE742F6042086420AD1CD -:1024800000F005FB014640F2B44300F0FBFA2A4697 -:1024900042F60421CEE742F60520864209D100F03B -:1024A000F6FA014640F2B74300F0ECFA0FF258306A -:1024B00000E742F61920864209D100F0E8FA014609 -:1024C00040F2BA4300F0DEFA0FF28030F2E642F654 -:1024D0002B20864209D100F0DAFA014640F2BD43D2 -:1024E00000F0D0FA0FF29430E4E642F60F20864274 -:1024F00009D100F0CCFA014640F2BF4300F0C2FA25 -:102500000FF2A830D6E642F62920864209D100F023 -:10251000BEFA014640F2C24300F0B4FA0FF2C430F2 -:10252000C8E642F62420864209D100F0B0FA0146FE -:1025300040F2C44300F0A6FA0FF2F030BAE641F2DE -:102540000D20864209D100F0A2FA014640F2C743AD -:1025500000F098FA0FF21840ACE64DF6F300864210 -:1025600009D100F094FA014640F2C94300F08AFA1A -:102570000FF240409EE64CF2E96086427FF49DAE49 -:1025800000F085FA014640F2CB4300F07BFA0FF2EF -:1025900064408FE600F07BFA014640F2D74300F03A -:1025A00071FA07B0BDE8F04F0FF2844002F05EB957 -:1025B00007B0BDE8F08F000047617474506172731A -:1025C00065446573637300004143495F4154545F40 -:1025D00046494E445F494E464F5F524553505F5601 -:1025E000534556545F434F4445202D20436F6E6E34 -:1025F000656374696F6E5F48616E646C653D3078C9 -:1026000025782C466F726D61743D25642C45766586 -:102610006E745F446174615F4C656E6774683D25DC -:10262000640A0D0020696E76616C696420636861DC -:10263000722076616C756520555549443D3078258A -:10264000303458204368617256616C756548616E1C -:10265000646C65205B253034585D210A0000000061 -:10266000202043454E5452414C5F4144445245530F -:10267000535F5245534F4C5554494F4E5F55554942 -:10268000443D307825303458204368617256616C7F -:10269000756548616E646C65205B253034585D213A -:1026A0000A0000005052494D4152595F534552565D -:1026B0004943455F555549443D30782530345820CD -:1026C00068616E646C653D3078253034580A0D00C1 -:1026D00072657365742043484152414354455249E1 -:1026E000535449435F555549443D3078253034585B -:1026F0002043686172537461727448616E646C65E2 -:102700003D3078253034580A0D0000007575696435 -:102710003D3078253034582068616E646C653D30FA -:1027200078253034582D3078253034582D307825A0 -:102730003034580A0D0A0D0020756E6B6F776E5F8E -:10274000636861725F6465736320555549443D3029 -:1027500078253034582068616E646C653D3078258A -:102760003034582D3078253034582D307825303499 -:1027700058200A0D000000004741502044455649AA -:1027800043455F4E414D455F555549443D307825A1 -:1027900030345820666F756E64205B253034585D88 -:1027A000210A000047415020415050454152414EBE -:1027B00043455F555549443D3078253034582066AF -:1027C0006F756E64205B253034585D210A0000006F -:1027D000474150205045524950484552414C5F5066 -:1027E0005249564143595F464C41475F555549440C -:1027F0003D30782530345820666F756E64205B2537 -:102800003034585D210A0000205345525649434553 -:102810005F4348414E4745445F434841524143541A -:10282000455249535449435F555549443D307825F5 -:10283000303458204368617256616C756548616E2A -:10284000646C65205B253034585D0A004241545465 -:102850004552595F4C4556454C5F434841525F5580 -:102860005549443D30782530345820666F756E6484 -:10287000205B253034585D210A0000004355525238 -:10288000454E545F54494D455F434841525F55554D -:1028900049443D30782530345820666F756E642089 -:1028A0005B253034585D210A000000004C4F434145 -:1028B0004C5F54494D455F494E464F524D41544936 -:1028C0004F4E5F434841525F555549443D3078254E -:1028D00030345820666F756E64205B253034585D47 -:1028E000210A0000446576696365496E666F726D02 -:1028F0006174696F6E53657276696365204D414EF0 -:102900005546414354555245525F4E414D455F55E2 -:102910005549443D30782530345820666F756E64D3 -:10292000205B253034585D210A000000446576693B -:102930006365496E666F726D6174696F6E5365721F -:1029400076696365204D4F44454C5F4E554D424579 -:10295000525F555549443D30782530345820666FD4 -:10296000756E64205B253034585D210A000000003C -:1029700020414E43535F4E4F5449464943415449C9 -:102980004F4E5F534F555243455F434841525F5549 -:102990005549443D3078253034582043686172569B -:1029A000616C756548616E646C65205B25303458D8 -:1029B0005D210A002020414E43535F434F4E545245 -:1029C0004F4C5F504F494E545F434841525F5555FD -:1029D00049443D307825303458204368617256614F -:1029E0006C756548616E646C65205B253034585D9C -:1029F000210A000020414E43535F444154415F533C -:102A00004F555243455F434841525F555549443DF8 -:102A1000307825303458204368617256616C756592 -:102A200048616E646C65205B253034585D210A0076 -:102A30004143495F4154545F46494E445F494E46C5 -:102A40004F5F524553505F56534556545F434F4472 -:102A5000452C206661696C65642068616E646C65F4 -:102A6000206E6F7420666F756E6420696E20636FD0 -:102A70006E6E656374696F6E207461626C6520218F -:102A80000A0D00005A46504601F0F0BE387040462C -:102A900002F0AEB92DE9FC470446DFF8D0A4DFF818 -:102AA000D0840FF2001900F069F9014640F2DF43CB -:102AB000FFF7B6FB2379628821880FF2001001F03E -:102AC000D5FEDFF8A4042288418891425AD100F64D -:102AD00038056088298888421DD100F04FF90146E9 -:102AE00040F2E643FFF79CFB0FF2401001F0BEFE00 -:102AF0006779A679D4F809000090237AE279314603 -:102B00003846FEF726F937B9F00704D43046FEF709 -:102B1000DDF9FEF7A3FA6088A98888423FD165797C -:102B200095B900F02BF901464FF4A163FFF778FB4C -:102B30000FF2341001F09AFE2079411F04F10A02CD -:102B400089B20020FDF776FD012D17D100F016F9AE -:102B5000014640F21453FFF763FB0FF2741001F0CB -:102B600085FEA01D02F01EFBE11D82B20A44217900 -:102B7000081A811E89B20120FDF78CFFBDE8F347DA -:102B8000FEF76CBA00F0FAF8014640F22353FFF763 -:102B900047FBBDE8F6470FF2901001F067BEBDE8B5 -:102BA000F38700004761747450617273654E6F74EF -:102BB000696669636174696F6E0000004143495F33 -:102BC000474154545F4E4F54494649434154494F3D -:102BD0004E5F56534556545F434F4445202D204386 -:102BE0006F6E6E656374696F6E5F48616E646C656D -:102BF0003D307825782C4174747269627574655F14 -:102C000048616E646C653D3078253034582C4174D1 -:102C1000747269627574655F56616C75655F4C6549 -:102C20006E6774683D25640A0D000000312E20494E -:102C30006E636F6D6D696E67204E6F66696669635E -:102C40006174696F6E2072656365697665642042A0 -:102C50004153494320696E666F726D6174696F6E8E -:102C6000203A200A0D000000332E3120506172738B -:102C7000652044657461696C20496E666F6D61748E -:102C8000696F6E206F66204E6F7469666963617448 -:102C9000696F6E204174747269627574652C20438B -:102CA0006F6D6D616E6449444765744E6F746966FB -:102CB00069636174696F6E41747472696275746579 -:102CC0007320526573706F6E73653A200A0D0000B1 -:102CD000332E332050617273652044657461696CD2 -:102CE00020496E666F6D6174696F6E206F6620415A -:102CF0005050204174747269627574652C20436F62 -:102D00006D6D616E644944476574417070417474BF -:102D10007269627574657320526573706F6E736546 -:102D20003A200A0D000000004143495F47415454D6 -:102D30005F4E4F54494649434154494F4E5F5653A5 -:102D40004556545F434F44452C206661696C656469 -:102D50002068616E646C65206E6F7420666F756E9E -:102D60006420696E20636F6E6E656374696F6E2098 -:102D70007461626C6520210A0D000000504602F06B -:102D800037B82DE9FC41054601246878FF2840F05A -:102D9000E680B5F80300764E0FF2DC17DFF8CC8141 -:102DA00040F60141401A63D0801E74D0401E30D0DE -:102DB000401E49D0401E1CD0001F0AD0401F53D0D7 -:102DC000401E00F08380401E00F0A880401E30D0DE -:102DD000B7E0FFF75CFE01464FF4A8633A4601F006 -:102DE00091F90FF2B01001F041FD681DFEF77CFA79 -:102DF000B6E0FFF74CFE014640F247533A4601F079 -:102E000081F90FF2C01001F031FD681DFEF730FEB0 -:102E1000A6E0FFF73CFE014640F24E533A4601F071 -:102E200071F90FF2C81001F021FD681DFFF7FCF9E0 -:102E300096E0FFF72CFE014640F255533A4601F06A -:102E400061F90FF2CC1066E0FFF721FE014640F277 -:102E50005C533A4601F056F90FF2E81001F006FD16 -:102E6000681DFEF740F97BE0681DFFF713FE77E071 -:102E7000FFF70DFE014640F26E533A4601F042F96B -:102E8000B5F80B30B5F80920B5F807100FF2E410CB -:102E900001F0ECFC64E0FFF7FAFD01464FF4AF638C -:102EA0003A4601F02FF9B5F80720B5F805100FF2F2 -:102EB000282001F0DBFC06208DF8040001A8B5F8FD -:102EC0000510ADF8061001F04BFA49E0E87970B151 -:102ED000FFF7DDFD014640F285533A4601F012F955 -:102EE000EA79B5F805100FF2642001F0BFFC1E4826 -:102EF0004188B5F80500814203D10020FEF7EDF8C6 -:102F00002EE0FFF7C4FD014640F28D533A4601F032 -:102F1000F9F80FF2982001F0A9FC21E0FFF7B7FDC6 -:102F2000014640F294533A4601F0ECF8A87A00903A -:102F30002B89EA79B5F805100FF2C42001F096FC50 -:102F40000EE0FFF7A4FD014640F299533A4601F026 -:102F5000D9F8B5F803100FF25C3001F087FC0024BB -:102F60002046BDE8F6810000FC110020B0440008B6 -:102F70009C440008D01F0020414E43535F436C69BE -:102F8000656E745F4576656E745F48616E646C65EE -:102F900072000000204143495F4154545F52454153 -:102FA000445F42595F47524F55505F545950455FF7 -:102FB000524553505F56534556545F434F44450A5C -:102FC00000000000204143495F4154545F52454195 -:102FD000445F42595F545950455F524553505F56C4 -:102FE000534556545F434F44450A0000204143492E -:102FF0005F4154545F46494E445F494E464F5F52CD -:103000004553505F56534556545F434F44450A005D -:10301000204143495F474154545F444953435F5201 -:103020004541445F434841525F42595F55554944C9 -:103030005F524553505F56534556545F434F444586 -:103040000A000000204143495F4154545F46494E05 -:10305000445F42595F545950455F56414C55455F56 -:10306000524553505F56534556545F434F44450AAB -:10307000000000004143495F474154545F415454AC -:103080005249425554455F4D4F4449464945445F76 -:1030900056534556545F434F444520417474725F04 -:1030A00048616E646C653D307825303458204F6639 -:1030B000667365743D3078253034582041747472DD -:1030C0005F446174615F4C656E6774683D3078255C -:1030D000303458200A0D00004143495F4154545F89 -:1030E00045584348414E47455F4D54555F524553FF -:1030F000505F56534556545F434F444520436F6ECF -:103100006E656374696F6E5F48616E646C653D30B7 -:103110007825303458205365727665725F52585F57 -:103120004D5455203D202564203D3D3E20414E43D9 -:10313000535F4D54555F45584348414E47455F43A3 -:103140004F4D504C455445200A0000004143495F13 -:10315000474154545F50524F435F434F4D504C458D -:1031600054455F56534556545F434F4445202D20E8 -:10317000436F6E6E656374696F6E5F48616E646CF9 -:10318000653D3078253034782C4572726F725F431C -:103190006F64653D307825303258202830783431DE -:1031A0003A204661696C6564290A0D004143495F14 -:1031B000474154545F50524F435F434F4D504C452D -:1031C00054455F56534556545F434F44452C206643 -:1031D00061696C65642068616E646C65206E6F74F3 -:1031E00020666F756E6420696E20636F6E6E656316 -:1031F00074696F6E207461626C6520210A0D000095 -:103200004143495F474154545F4552524F525F52C8 -:103210004553505F56534556545F434F44452043F2 -:103220006F6E6E656374696F6E5F48616E646C6526 -:103230003D307825303458205265715F4F70636F90 -:1032400064653D307825303258204174747269626B -:103250007574655F48616E646C653D307825303407 -:1032600058204572726F725F436F64653D307825F8 -:103270003032582028307830353A20496E737566E0 -:1032800066696369656E742061757468656E7469DA -:10329000636174696F6E2C307830413A20417474E8 -:1032A000726962757465206E6F7420666F756E64E6 -:1032B000290A0000696E76616C69642065636F6439 -:1032C00065203078253034580A00000080B5FDF7BD -:1032D00001FF014640F2AE530FF2280200F036F82B -:1032E0000FF23C0001F0C2FA11208DF80000DFF867 -:1032F00014164888ADF80200684601F031F801BDA7 -:1033000000000000414E43535F4170705F4B657990 -:10331000427574746F6E32416374696F6E000000A1 -:1033200052657669657720746865205072654578C6 -:103330006973746564204E6F74696669636174694A -:103340006F6E200A0D0000000FF20802DFF8B805CA -:1033500001F08CBA414E43535F4E6F7469666963E6 -:103360006174696F6E5F436865636B0010B5DFF869 -:1033700094452078052808D0082808D00E281FD0AA -:103380000F281FD010281FD023E0002015E00120B7 -:1033900000F030F8022000F02DF8032000F02AF8A9 -:1033A000042000F027F804F62E00018800291EBF33 -:1033B0004088002802F0E7FB0520BDE8104019E036 -:1033C000002002E0012000E00220BDE8104000F0F3 -:1033D000A0BEFDF77FFE014640F21C63DFF82C25FE -:1033E000FFF7B4FF2178DFF82805BDE8104001F0B1 -:1033F0003DBA00002DE9FF47DFF80875DFF80865E2 -:10340000DFF81095DFF81085052807F6120547F25A -:10341000305A10D8DFE810F006003E00B000FE0081 -:103420007C01E101042038704FF404627888FA21AD -:1034300003F0BAF9002840F06282FFF728FB01464A -:1034400040F22E6300F05DFE4FF40462FA21DFF8D3 -:10345000CC0401F00BFA05203870788801F050FB9D -:1034600000F053FE002C404609D101F0C1FC01469A -:1034700040F2346300F045FEDFF8B80E30E201F0B0 -:10348000B7FC01464FF4C76300F03BFE2146DFF86E -:10349000A80E32E2082038700021D0208DF80000FC -:1034A0008DF801102D208DF8020012218DF80310E7 -:1034B0001E208DF804004B218DF805100F208DF88B -:1034C0000600A4218DF8071099208DF808004E21E0 -:1034D0008DF80910CE208DF80A00B5218DF80B105B -:1034E00031208DF80C00F4218DF80D1005208DF899 -:1034F0000E0079218DF80F106A467888022101F0BC -:1035000042FB040040460BD101F072FC014640F240 -:10351000476300F0F6FDDFF8240E01F0A7F90BE099 -:1035200001F066FC014640F24B6300F0EAFD2146E3 -:10353000DFF80C0E01F09AF95046FDF7D1FDE88B4B -:10354000A98B59B900283DD1FFF7A1FA014640F2F5 -:10355000516300F0D6FDDFF8EC0DC1E100283ED04C -:10356000FFF795FA014640F2556300F0CAFDEA8B79 -:10357000A98BDFF8D40DC8E007203870788801F0F7 -:10358000E8FA00F0C2FD002C40460BD101F030FCFF -:10359000014640F2626300F0B4FDDFF8B00D01F0C7 -:1035A00065F90BE001F024FC014640F2666300F08F -:1035B000A8FD21460FF2683001F058F9E88BA98B7D -:1035C00061B9002840F09B81FFF761FA014640F2A3 -:1035D0006B6300F096FD0FF2A83081E1002800F047 -:1035E0008E81FFF754FA014640F26F6300F089FDC7 -:1035F000EA8BA98B0FF2D03001F038F9FFF747FAC8 -:1036000001464FF4CE6300F07CFD6A8A298A0FF2EE -:103610000C407AE00920FFF739FA014640F27B635B -:1036200000F06FFDA88B019000906B882A88798844 -:103630000FF23C4001F01AF96A882988788801F075 -:10364000C5FA00F062FD002C404609D101F0D0FB24 -:10365000014640F2846300F054FD0FF2844008E01C -:1036600001F0C6FB01464FF4D16300F04AFD0FF2B2 -:10367000A04001F0FBF8298C00291CBFE88C002831 -:103680000CD0FFF704FA014640F28D6300F039FDDB -:10369000EA8C298C0FF2A04001F0E8F8A98C0029EF -:1036A0001CBF688D00280CD0FFF7F1F9014640F2ED -:1036B000916300F026FD6A8DA98C0FF2F04001F0B5 -:1036C000D5F8698C00291CBF288D00280CD0FFF785 -:1036D000DEF9014640F2956300F013FD2A8D698CF6 -:1036E0000FF22C5001F0C2F8A98A00291CBFE88A09 -:1036F00000280CD0FFF7CBF9014640F2996300F0A7 -:1037000000FDEA8AA98A0FF2705001F0AFF8F6E0E6 -:103710000A20FFF7BBF9014640F2A36300F0F1FC79 -:103720006A8829880FF2B45001F0A0F86A882988C5 -:10373000788801F05CFA00F0E8FC002C404609D1E2 -:1037400001F056FB014640F2AB6300F0DAFC0FF2E9 -:10375000B85008E001F04CFB014640F2AF6300F0C6 -:10376000D0FC0FF2E05001F081F8A88D58B1FFF7BE -:103770008EF9014640F2B46300F0C3FCA98D0FF24C -:10378000F85001F073F8E88D58B1FFF780F9014661 -:103790004FF4D76300F0B5FCE98D0FF2246001F01F -:1037A00065F8288E58B1FFF772F9014640F2BC6304 -:1037B00000F0A7FC298E0FF2486001F057F8288B23 -:1037C0000028A4D0FFF763F901464FF4D86300F056 -:1037D00098FC298B0FF268608FE00120298BADF8EF -:1037E000000031B30D2038706B467888022201F05A -:1037F00037FA00F08AFC002C40460CD101F0F8FAB0 -:10380000014640F2D46300F07CFC298B0FF270601B -:1038100001F02CF80DE001F0EBFA014640F2D9631B -:1038200000F06FFC298B0FF2A0602346462201F0C6 -:103830001DF8288E002830D00C213970FFF727F9A9 -:10384000014640F2E26300F05CFC2A8E79880FF2B8 -:10385000E46001F00BF8298E00F04EFC00F055FCFE -:10386000002C40460BD101F0C3FA014640F2EB6355 -:1038700000F047FC0FF2F86000F0F8FF0DE001F0F7 -:10388000B7FA01464FF4DE6300F03BFC298E0FF2DD -:1038900020702346462200F0E9FFA88D00282ED094 -:1038A0000B213970FFF7F3F8014640F2F96300F09D -:1038B00028FCAA8D79880FF2647000F0D7FFA98DDB -:1038C00000F01AFC00F021FC002C40460BD101F066 -:1038D0008FFA014640F2027300F013FC0FF2807081 -:1038E00000F0C4FF0BE001F083FA014640F20673DA -:1038F00000F007FC21460FF2B07000F0B7FFBDE802 -:10390000FF870000FC1100209C44000828D200081A -:1039100040D2000864D20008B044000870D2000809 -:10392000474154545F50524F435F444953435F41B2 -:103930004C4C5F5052494D4152595F534552564984 -:10394000434553206163695F676174745F646973A1 -:10395000635F616C6C5F7072696D6172795F7365D2 -:1039600072766963657320636D64204E4F4B2073DC -:103970007461747573203D307825303258200A0008 -:10398000474154545F50524F435F444953435F4152 -:103990004C4C5F5052494D4152595F534552564924 -:1039A00043455320414E4353205365727669636506 -:1039B000206973204E4F5420666F756E642021215C -:1039C00021200A0D00000000474154545F50524F1F -:1039D000435F444953435F414C4C5F5052494D4112 -:1039E00052595F534552564943455320414E435324 -:1039F0002053657276696365205B307825303458D2 -:103A0000202D203078253034585D20697320666F72 -:103A1000756E6420212121200A0D00004741545475 -:103A20005F50524F435F444953435F414C4C5F509A -:103A300052494D4152595F534552564943455320CF -:103A4000474154542053657276696365205B307832 -:103A500025303458202D203078253034585D2069A9 -:103A60007320666F756E6420212121200A0D0000ED -:103A7000414E43535F444953434F5645525F414C77 -:103A80004C5F434841525320636F6E6E65637469A7 -:103A90006F6E5F68616E646C653D307825303458B8 -:103AA00020414C4C5365727669636548616E646C65 -:103AB000655B25303458202D20253034585D204159 -:103AC0004E43535365727669636548616E646C65F5 -:103AD0005B25303458202D20253034585D0A0000F5 -:103AE000414C4C20636861726163746572697374E0 -:103AF00069637320646973636F76657265642053CC -:103B000075636365737366756C6C79200A0D0000CC -:103B1000414C4C20636861726163746572697374AF -:103B200069637320646973636F7665727920466197 -:103B3000696C6564200A0D00474154545F50524F30 -:103B4000435F444953435F414C4C5F4348415253A8 -:103B500020414E43534E6F74696669636174696FA7 -:103B60006E536F75726365436861725374617274EA -:103B700048646C653D3078253034582020414E43F0 -:103B8000534E6F74696669636174696F6E536F75C4 -:103B90007263654368617256616C756548646C65F3 -:103BA0003D307825303458200A0D000047415454E8 -:103BB0005F50524F435F444953435F414C4C5F4316 -:103BC0004841525320414E435344617461536F75D1 -:103BD00072636543686172537461727448646C65A2 -:103BE0003D3078253034582020414E435344617491 -:103BF00061536F757263654368617256616C756578 -:103C000048646C653D307825303458200A0D00003A -:103C1000474154545F50524F435F444953435F41BF -:103C20004C4C5F434841525320414E4353436F6EC7 -:103C300074726F6C506F696E744368617253746113 -:103C4000727448646C653D307825303458202041CA -:103C50004E4353436F6E74726F6C506F696E744352 -:103C600068617256616C756548646C653D30782595 -:103C7000303458200A0D0000474154545F50524FD1 -:103C8000435F444953435F414C4C5F434841525367 -:103C900020536572766963654368616E6765644346 -:103CA000686172537461727448646C653D30782544 -:103CB0003034582020536572766963654368616EBD -:103CC0006765644368617256616C756548646C65CC -:103CD0003D307825303458200A0D0000414E4353C2 -:103CE0005F444953434F5645525F414C4C5F4348F4 -:103CF00041525F4445534353205B25303458202DB7 -:103D000020253034585D0A00416C6C206368617274 -:103D10006163746572697374696320646573637247 -:103D20006970746F727320646973636F766572650E -:103D300064205375636365737366756C6C79200AD0 -:103D40000D000000416C6C206368617261637465F2 -:103D50007269737469632064657363726970746FE8 -:103D6000727320646973636F766572792046616946 -:103D70006C6564200A0D0000474154545F50524F57 -:103D8000435F444953435F414C4C5F444553435365 -:103D900020414E43534E6F74696669636174696F65 -:103DA0006E536F75726365436861724465736348EF -:103DB000646C653D307825303458200A0D000000D1 -:103DC000474154545F50524F435F444953435F410E -:103DD0004C4C5F444553435320414E4353436F6E15 -:103DE00074726F6C506F696E74436861724465736E -:103DF0006348646C653D307825303458200A0D00E6 -:103E0000474154545F50524F435F444953435F41CD -:103E10004C4C5F444553435320414E4353446174DB -:103E200061536F757263654368617244657363487B -:103E3000646C653D307825303458200A0D00000050 -:103E4000474154545F50524F435F444953435F418D -:103E50004C4C5F4445534353205365727669636508 -:103E60004368616E67656443686172446573634863 -:103E7000646C653D307825303458200A0D00000010 -:103E8000536572766963654368616E67656443680C -:103E900061724465736348646C653D3078253034E5 -:103EA00058206E6F74696669636174696F6E20650E -:103EB0006E61626C656420537563636573736675C8 -:103EC0006C6C79200A0D0000536572766963654356 -:103ED00068616E67656443686172446573634864D2 -:103EE0006C653D307825303458206E6F7469666992 -:103EF000636174696F6E20656E61626C65642046F3 -:103F000061696C656420424C455F5354415455537C -:103F10005F4E4F545F414C4C4F5745443D307825E0 -:103F200030327820726573756C743D30782530328C -:103F3000580A0000414E43535F454E41424C455F95 -:103F40004E4F54494649434154494F4E5F444154B2 -:103F5000415F534F555243455F44455343203078AA -:103F60002530345820307825303458200A0000009D -:103F7000414E435344617461536F75726365436886 -:103F800061724465736348646C65206E6F74696622 -:103F900069636174696F6E20656E61626C6564202F -:103FA0005375636365737366756C6C79200A0D00D5 -:103FB000414E435344617461536F75726365436846 -:103FC00061724465736348646C653D3078253034B4 -:103FD00058206E6F74696669636174696F6E2065DD -:103FE0006E61626C6564204661696C656420424C58 -:103FF000455F5354415455535F4E4F545F414C4CB1 -:104000004F5745443D3078253032782072657375BE -:104010006C743D3078253032580A0000414E4353CD -:104020005F454E41424C455F4E4F544946494341DE -:1040300054494F4E5F4E4F54494649434154494FAE -:104040004E5F534F555243455F44455343203078AC -:104050002530345820307825303458200A000000AC -:10406000414E43534E6F74696669636174696F6E44 -:10407000536F757263654368617244657363486426 -:104080006C65206E6F74696669636174696F6E2018 -:10409000656E61626C6564205375636365737366F6 -:1040A000756C6C79200A0D00414E43534E6F746954 -:1040B0006669636174696F6E536F75726365436897 -:1040C00061724465736348646C65206E6F746966E1 -:1040D00069636174696F6E20656E61626C656420EE -:1040E0004661696C656420726573756C743D3078E7 -:1040F000253032580A00000078886B46022200F012 -:10410000AFBD4A46304600F0B1BB04465046FCF70E -:10411000E7BF2DE9F84FDE4D0FF280380FF2984BD4 -:104120000FF28C39A0B005F5047405F6080647F2C5 -:10413000305A0C274FF6FF7120B1022800F08E8014 -:1041400049D3F4E00E2028703088884201D08028BE -:104150000BDB00F002F9014640F21B735A46FEF7F2 -:1041600060F831880FF25C408AE000F0F6F8014612 -:1041700040F221735A46FEF754F8308878432158AC -:104180000FF27C4000F072FB308847430121E05978 -:1041900001908DF808108DF809108DF80C108DF82D -:1041A00010108DF814108DF815108DF816108DF86C -:1041B00017104FF49470ADF80A00ADF80E00ADF88A -:1041C000120001A984B06846142200F073FB0FBCF2 -:1041D000FCF780F9ABE00F242C7000F0BEF801462C -:1041E00040F23A735A46FEF71CF805F1860495F83A -:1041F00085100FF27440224600F038FB95F8857068 -:104200006846802100F062FE01208DF80000002148 -:104210006B4605E014F801C003F800C01046491CC5 -:10422000421CB942C0B2F5DB00211954D2B2718EE2 -:10423000688800F0FBFC04465046FCF751FF002C58 -:1042400075D000F08AF801464FF4F1730FF2543242 -:10425000FDF7E7FF21460FF2EC2011E01020287057 -:104260003088884201D080280DDB00F076F80146C6 -:1042700040F245735A46FDF7D4FF31880FF22C40C7 -:1042800000F0F4FA53E000F068F8014640F24B7396 -:104290005A46FDF7C6FF318807FB01F0002322587C -:1042A0000FF2444000F0E2FA31880FF2F022794335 -:1042B0006058D2E90034CDE900348DF80100020ADB -:1042C0008DF8022002218DF80010020C000E8DF8EE -:1042D00004008DF8032000208DF805006B46718ED8 -:1042E0006888062200F0A2FC04465046FCF7F8FE5F -:1042F00054B100F032F801464FF4E3730FF2782224 -:10430000FDF78FFF00F024F800F027F8014640F297 -:1043100052735A46FDF785FF31880FF2204000F0B6 -:10432000A5FA30884743E819002180F8081221B027 -:10433000BDE8F08FBCD20008E0D2000814D300081A -:1043400060D30008BCD300081CD4000888D400083F -:1043500021460FF2F01000F089BA484600F048BD3F -:1043600070B501460FF234150A780FF20C460FF2C1 -:104370004010474C012A0CD0022A1AD0032A25D01B -:10438000052A34D0062A3FD0082A51D0112A5DD000 -:1043900070BD498861800821217000F029FD014627 -:1043A00040F2647300F076F80FF2E43000F05EFA49 -:1043B0006AE000F01DFD014640F26C7300F06AF8FF -:1043C0000FF2004000F052FA02200BE000F010FD66 -:1043D000014640F2747300F05DF80FF2004000F007 -:1043E00045FA03202070BDE87040FCF7F9BD00F0ED -:1043F000FFFC014640F27C7300F04CF80FF2F830FD -:1044000000F034FA05201FE000F0F2FC014640F213 -:10441000847300F03FF80FF2F43000F027FA2078B0 -:10442000052804BF0020FCF758FE0620207070BD50 -:1044300000F0DEFC014640F28E7300F02BF80FF224 -:10444000EC3000F013FA082020701DE011212170DB -:1044500000F0CEFC014640F2977300F01BF80FF21B -:10446000EC3000F003FA0021C8B20C2250432218AD -:1044700002F50272107820B9491CC8B28028F3DB1B -:1044800070BD9078FCF722FDBDE87040FCF7E6BDFA -:10449000FC1100203246284600F0E8B90D0A205BE6 -:1044A00025735D5B25735D5B25645D200000000066 -:1044B000433A5C424C455F444F52595F5061636BD5 -:1044C000616765735C53544D3332437562655F4673 -:1044D000575F57425F56312E31312E305243345C94 -:1044E00050726F6A656374735C502D4E55434C4532 -:1044F0004F2D574235352E4E75636C656F5C41709C -:10450000706C69636174696F6E735C424C455C42A8 -:104510004C455F4865617274526174655F414E43FA -:10452000535C53544D33325F5750414E5C41707071 -:104530005C616E63735F636C69656E745F617070FC -:104540002E630000206163695F676174745F777236 -:104550006974655F636861725F76616C756520631D -:104560006D64204E4F4B20737461747573203D3021 -:104570007825303258200A00414E43535F436D6422 -:104580005F506572666F726D4E6F746966696361C4 -:1045900074696F6E416374696F6E00000200000001 -:1045A00000000000414E43535F436D645F476574F4 -:1045B0004170704174747200416E637350726F6326 -:1045C00052657100414E43535F4745545F4E4F540F -:1045D000494649434154494F4E5F41545452494220 -:1045E00055544520494E56414C49445F4E4F54491D -:1045F00046595F454E545259202564200A0D00004B -:10460000414E43535F4745545F4E4F5449464943DB -:104610004154494F4E5F41545452494255544520EC -:10462000696E746572616374207769746820694F7C -:1046300053204E6F74696669636174696F6E494493 -:104640002030782530386C782C207265747269655A -:104650007665206D6F726520696E666F726D61742C -:10466000696F6E0A0D000000414E43535F47455489 -:104670005F4150505F415454524942555445204186 -:1046800070704964656E7469666965724C656E67C1 -:1046900074683D2564204170704964656E74696674 -:1046A0006965723A2573200A0D000000414E43539C -:1046B0005F504552464F524D5F4E4F544946494315 -:1046C0004154494F4E5F414354494F4E20494E5645 -:1046D000414C49445F4E4F544946595F454E5452F0 -:1046E00059202564200A0D00414E43535F50455226 -:1046F000464F524D5F4E4F54494649434154494FEE -:104700004E5F414354494F4E206E6F746966794540 -:104710006E7472793D2564204E6F746966696361B9 -:1047200074696F6E49442030782530386C78206188 -:10473000637449443D2564200A0D0000414E4353F3 -:104740005F504552464F524D5F4E4F544946494384 -:104750004154494F4E5F414354494F4E206E6F7450 -:10476000696679456E7472793D25642052656D6F76 -:104770007665640A0D000000414E43535F4170703E -:104780005F4E6F74696669636174696F6E000000E3 -:10479000414E43535F434F4E4E4543544544203DA5 -:1047A0003D3E20414E43535F444953434F5645528B -:1047B0005F414E43535F53455256494345200A0DCE -:1047C00000000000414E43535F444953434F4E4E57 -:1047D000454354494E47200A0D000000414E4353C3 -:1047E0005F444953434F4E4E5F434F4D504C4554E9 -:1047F00045200A0D00000000414E43535F4D5455C3 -:104800005F555044415445200A0D0000414E43532A -:104810005F4D54555F45584348414E47455F434FB0 -:104820004D504C455445200A0D000000414E435365 -:104830005F444953434F5645525F414E43535F5384 -:10484000455256494345200A0D000000203D3D3E9B -:1048500020414E43535F434845434B5F4E4F5449BD -:104860004649434154494F4E200A0D000EB4C0B58D -:10487000024603A800210190009101AB01210448E8 -:1048800078440C3002F026F806BC5DF810FB00BF3F -:104890005795000062B38B0708D0521E11F8013BF8 -:1048A00000F8013B00F024808B07F6D1830740F02D -:1048B000208000BF103A07D330B4B1E83810103A66 -:1048C000A0E83810F9D230BC530724BFB1E8081073 -:1048D000A0E8081044BF51F8043B40F8043BD2075D -:1048E00024BF31F8022B20F8022B44BF0B78037051 -:1048F0007047121F17D35B0009D151F8043B20F811 -:10490000023B1B0C121F20F8023BF6D20BE051F8C1 -:10491000043B00F8013B1B0A20F8023B1B0C121F52 -:1049200000F8013BF3D238BF121D521E24BF11F80C -:10493000013B00F8013BF8D8704700B587B0002074 -:104940008DF8000000F087F940F20110ADF8060084 -:104950003F220120069000F0F6F900284CBFFF200E -:104960009DF8000007B000BD2DE9F8410746012879 -:10497000C7B0884615461E4608BF022003D002284D -:104980000CBF102000200DF11D010C1800F036F8AE -:10499000012F8DF81C7002D0022F18D019E00227C9 -:1049A0003A4641460DF11D0000F0D5F925706670BC -:1049B00000F051F93F204FF4817100F016F8FF1C10 -:1049C000049700F0C2F9002805D5FF2009E0102760 -:1049D000E6E7472005E09DF8000010B94E9800F08A -:1049E00067F8FFE748B0BDE8F081ADF80400ADF826 -:1049F000061007A8032103900691704703220021A7 -:104A0000684600F0AEB92DE9F64F0C460546012C7C -:104A1000C7B09B4608BF022003D0022C0CBF102059 -:104A200000200DF11F010E18FFF7E8FF012CADF873 -:104A30001C508DF81E4002D0022C2CD02DE00227F5 -:104A4000569C559DDDF85091DDF84CA1DDF848816C -:104A500048993A4600F0B6F8A6F800B086F8028009 -:104A600086F803A086F804907571B47100F0F3F82D -:104A70003F20ADF804004FF4827107A8ADF806108E -:104A8000039003210A370497069100F05EF900288D -:104A900005D5FF2009E01027D2E7472005E09DF863 -:104AA000000010B9579800F003F849B0BDE8F08F46 -:104AB000BDF8011001800020704730B5C7B01C461A -:104AC0004A9B00F023F900258DF800508DF8214015 -:104AD000224619460DF1220000F03DF900F0BBF826 -:104AE0003F204FF4837100F01CF9A41D049400F0E2 -:104AF0002CF900284CBFFF209DF8000047B030BDC6 -:104B000000B5C7B000F039F800F017F80F21029196 -:104B100040F20B10022100F00EF900284CBFFF20DC -:104B20009DF8000047B000BD0023ADF81C008DF8D3 -:104B3000003007A8418082800021182201A800F0DF -:104B400010B900228DF80020ADF81C008DF81E1061 -:104B5000704700B5C7B000F010F8FFF7EEFF0F2167 -:104B600002914FF48970022100F0E5F800284CBF53 -:104B7000FF209DF8000047B000BD0021ADF81C00EB -:104B80008DF80010704718B5C7B0134600228DF895 -:104B900000200229FFF7D8FF0CBF10240224224670 -:104BA000194600F00FF800F056F840F2131100F02B -:104BB0002FF800F0CAF800284CBFFF209DF8000035 -:104BC00048B010BD0DF11F0000F0C5B800B5C7B06A -:104BD000FFF7AAFF0F21029140F2151000F0AAF88A -:104BE00000284CBFFF209DF8000047B000BD00B575 -:104BF000C7B0FFF799FF0F21029140F2171000F0A4 -:104C000099F800284CBFFF209DF8000047B000BD78 -:104C1000ADF806103F2007A9ADF8040003910F205E -:104C2000012102900691E41C0494704718B5C7B0A6 -:104C300000F02BF800F041F800F00DF84FF48E7101 -:104C400000F02DF800F081F800284CBFFF209DF8FF -:104C5000000048B010BD1822002101A800F081B862 -:104C600018B5C7B000F011F800F027F8FFF7F3FF10 -:104C700040F2211100F013F800F067F800284CBF53 -:104C8000FF209DF8000048B010BD1446ADF81C0090 -:104C9000002207A88DF80020418004717047ADF80C -:104CA00006103F2007A9ADF8040003910F20012151 -:104CB00002900691641D04947047224619460DF136 -:104CC000210000F048B878B5C7B04C9C4D9D00F06D -:104CD0001DF800268DF821308DF800608DF82240F7 -:104CE0002246294600F019F8FFF7B5FF3F204FF4A0 -:104CF000937100F016F8E41D049400F026F80028E3 -:104D00004CBFFF209DF8000048B070BDADF81C00FE -:104D1000ADF81E108DF8202070470DF1230000F033 -:104D20001AB8ADF80400ADF8061007A801210390E9 -:104D3000069170470621ADF80600049107A80121ED -:104D40003F2203900691ADF80420CDF814D0002145 -:104D500001A802F0DEBD10B50446FFF79BFD20461A -:104D600010BD10B5044610460A460146204602F022 -:104D700061FE204610BDF0B4024610689568131815 -:104D8000506803EB5004C00721D54D441FE0F0BC30 -:104D900002F10C00704713F8017B05F8017B491EF6 -:104DA000F9D1A0B1B60813F8011B06F00306032ED3 -:104DB00008BF13F8016B01EB06214942801C29440E -:104DC00005D011F8016B05F8016B401EF9D1A34223 -:104DD000DDD013F8016B16F0030104BF13F8011BBB -:104DE000C91C30090F28DAD113F8010B0F30D6E7B0 -:104DF00038B55C21044602F050FE254608B15C211E -:104E000005E02F21204602F048FE20B12F21204648 -:104E100002F043FE451C284632BD38B5EFF310843E -:104E200072B6284D6946281D02F05CFF6946281DB0 -:104E300002F0B5FF38B184F31088BDF80010224AA3 -:104E400003F094F831BD0120287084F3108831BD3F -:104E500080B503F089F8022100910023194800F180 -:104E600024014FF48052001D02F023FE01BD00BF5B -:104E7000F8B514460026EFF3108510F1010F1ED08F -:104E800001281CBF02284FF0FF3618D1BCB12646BE -:104E900072B60C4F012392B2381D02F01EFE00289C -:104EA0001CBF3978002908D000223A7085F3108899 -:104EB000A1B2054A03F05AF801E085F310883046A4 -:104EC000F2BD00001C0000201B4E0008002203F071 -:104ED000E9B8B1F5807F02D34FF0FF307047017021 -:104EE000012070470078401E8041C043C00F7047CA -:104EF0002DE9FC475B4CDFF87091A5692840A06163 -:104F00004FF0FF3A4FF0010830E0491C54F83100EF -:104F10000642FAD004EBC106184071681040014205 -:104F200008BFC6F804A07768384000F09FF86062B8 -:104F300008FA00F087437760EFF3108172B6626A77 -:104F4000206908FA02F2D24310402061022004EBEB -:104F5000C00353F8086C1640401E43F8086CF6D1A5 -:104F600081F31088606A59F82010884763692069C6 -:104F7000A2691840104207D0E069216A084203D1B3 -:104F8000002103EA0206C1E7C4F824A003F0A3F855 -:104F9000EFF3108972B6216960690140A06901428E -:104FA00001BFE169206A014203F0F7F889F3108834 -:104FB00003F00FF9A561BDE8F38738B51446EFF3A8 -:104FC000108572B600F052F8274941F8204085F369 -:104FD000108831BD10B500F00BF804431C6153F884 -:104FE0003140204343F83100FFE782F3108810BDC1 -:104FF000EFF3108272B61B4B1C697047EFF3108100 -:1050000072B6184A536923EA000005E0EFF31081F5 -:1050100072B6144A53691843506181F3108870477F -:10502000EFF3108172B60F4AD3691843D061F4E7E9 -:10503000F8B50C4C656A276A2E4615F1010F0EBFB4 -:105040000025012101FA05F5206202E0284603F05F -:10505000A5F8216AE0690842F8D088436662E061F9 -:105060002762F1BD40100020901C00200246002065 -:10507000110C090404BF1020120412F07F4F04BF6A -:10508000083012020FF2180112F0704F04BF001D19 -:105090001201120FC0F11F00895C401AC0B27047A4 -:1050A00004030202010101010000000000000000F1 -:1050B00027490020087700222648027300F04CB8E8 -:1050C00023490A7F41F82200087F401C0877704777 -:1050D00020490A7B41F82200087B401C0873704776 -:1050E00070B504466078FF2802BFB4F8031001F4DD -:1050F0007F41B1F5406F1FD10025154E317FE8B2D9 -:10510000884222D2E9B256F821102046884700286A -:1051100008BF6D1CF2D018E0761C297BF0B28842E3 -:105120000AD2F1B255F82110204688470100F3D089 -:1051300002D0022805D006E02046BDE8704000F00D -:10514000A9B8002070BD012070BD0026014DE4E724 -:10515000641F0020A41F002080B503F03BF803F07B -:105160003AF803F039F803F039F803F069F903F07D -:1051700068F903F00FFA03F081FC03F080FC03F000 -:105180007FFC03F07EFC03F07DFC03F07CFC03F06D -:105190007BFC03F07AFC03F079FCBDE8014003F0EE -:1051A00076BC000000F10103810704D010F8011B58 -:1051B00089B18107FAD10268B2F10131914311F04E -:1051C000803F04BF50F8042FF6E710F8011B11B11F -:1051D00010F8011BFBE7C01A7047000038B58EB00D -:1051E00002A80FF6E431DFF8044B3022FFF762FB30 -:1051F0000FF6C1300190009469460FF6A13002F01D -:1052000035FB0121022003F048FCDFF8E42A0021ED -:105210000420FFF7D2FE02A803F05CFC08B103F003 -:10522000DBFD00F0C9FAFFF743FFDFF8C85A0FF6BD -:10523000B102002085F8900005F126044FF6FF70BA -:10524000208000210120FFF7B8FE03F0C7FD03F026 -:10525000EEFDFBF707FF0FF68103002205F19F012A -:10526000002004F01DF80220E07080210120A070D1 -:105270000D2020710220A070182060710320A07002 -:10528000DFF8740A0180A0214180012000F073FB47 -:105290000FB030BD2DE9F047044688B06078DFF8E4 -:1052A000546ADFF8589ADFF858AADFF8588A0528B8 -:1052B00006F1900505D03E2852D0FF2800F020814D -:1052C00041E2A088F18C884246D10020F084287009 -:1052D000A07950B900F04EFD014640F2B71300F03E -:1052E00036FAA179DFF8200A28E016280AD100F062 -:1052F00041FD014640F2B91300F029FAA179DFF827 -:105300000C0A1BE03D2840460ED1FFF771FD014617 -:1053100040F2BB1300F01BFAA179DFF8F409FFF7A4 -:10532000A5FA00F017FC0BE0FFF762FD01464FF411 -:10533000DF7300F00CFAA179DFF8D809FFF796FACD -:1053400003208DF81C0007A8A188ADF81E10FFF7F8 -:1053500007F8002000F011FD012000F00CFBF2E145 -:10536000E078012800F08780032802D00C2822D0A2 -:10537000E9E100F0FFFC01464FF4ED7300F0E7F9BE -:10538000DFF89409FFF772FA00F0F4FC014640F2EE -:10539000DF1300F0DCF9B4F80B000190B4F8090059 -:1053A0000090B4F80730B4F805202179DFF86C09D3 -:1053B000FFF75CFAC7E100F0DDFC01464FF4F27341 -:1053C00000F0C5F9DFF85809FFF750FA20790028F6 -:1053D000404609D1FFF70CFD01464FF4F47300F08D -:1053E000B6F9DFF8400908E0FFF702FD01464FF487 -:1053F000F67300F0ACF9DFF83009FFF737FAF08CFC -:1054000006AA0DF1190101F002FA0028404628D140 -:10541000FFF7EEFC01464FF4F97300F098F9DFF85E -:105420000C09DFF80C49FFF721FA9DF81900022852 -:1054300004BF9DF81810022904D100F09BFC4FF422 -:10544000FB7303E000F096FC4FF4FD73014600F09F -:105450007EF99DF818209DF819102046FFF706FAEE -:1054600071E1FFF7C5FC014640F2FF1300F06FF950 -:10547000DFF8C00865E1E87B03F038FF28780428EE -:105480000CBF062005202870B4F80500F08400F059 -:1054900071FC014640F2252300F059F9607A05902D -:1054A000A07A0490E07A0390207B0290607B0190C8 -:1054B000A07B0090237AE279B4F80510DFF8780831 -:1054C000FFF7D4F9B4F805006880207A6871A07BF2 -:1054D000E872607BA872207B6872E07A2872A07AFA -:1054E000E871607AA87100F0FDFA01208DF81C00C7 -:1054F00007A8B4F80510ADF81E10FEF731FF22E141 -:10550000B4F803004FF48061401A19D0401E00F037 -:105510008E80401E1ED0401E2BD0401E33D0401E19 -:105520003BD0801E00F00481401E43D0401E55D069 -:10553000401E49D040F60601401A00F0EF8002E11B -:1055400000F018FC014640F24D2300F000F9DFF8AE -:10555000EC07F6E000F00EFC014640F2532300F0A9 -:10556000F6F8B4F80510DFF8D807FFF77FF9022046 -:105570005AE000F0FFFB014640F2592300F0E7F843 -:10558000DFF8C007DDE000F0F5FB014640F25E23E6 -:1055900000F0DDF8DFF8B007D3E000F0EBFB0146E8 -:1055A00040F2652300F0D3F8DFF8A007FFF75EF9BB -:1055B000042039E000F0DEFB014640F26D2300F0EC -:1055C000C6F80FF63400BCE000F0D4FB014640F210 -:1055D000712300F0BCF80FF65000B2E000F0CAFBF7 -:1055E000014640F2762300F0B2F8D4F807100FF627 -:1055F0006800FFF73BF900F0BDFB014640F277235E -:1056000000F0A5F8D4F807100FF66400FFF72EF9A4 -:1056100000F0B0FB01464FF41E7300F098F80FF64F -:105620006400FFF723F9032000F0C0FA8BE000F0DC -:10563000A1FB014640F2812300F089F8237AE27948 -:10564000B4F805100FF69C00FFF710F9E079012877 -:105650000BD100F08FFB014640F2832300F077F876 -:10566000227AE1790FF6D4000CE002280FD100F085 -:1056700081FB014640F2862300F069F8227AE17945 -:105680000FF65C10FFF7F2F800F064FA3FE0002834 -:105690003DD12C796E7BAF7B00F024FA00F06AFBE1 -:1056A00001464FF4247300F052F8A87B0290019752 -:1056B0003346687B2A79009021460FF6C410FFF725 -:1056C000D5F824BB00F056FB01464FF4257300F0DB -:1056D0003EF80FF61C20DFF87866FFF7C7F80A24BB -:1056E0000FF2842931460846411E0028FBD1484666 -:1056F000FFF7BCF8641EF5D16888132104F00BF89D -:1057000028B902208DF81C0007A8FEF729FE287B87 -:10571000012818D1002000F030FB14E000F02AFB33 -:1057200001464FF42C7300F012F80FF6182008E031 -:1057300000F020FB014640F2B72300F008F80FF616 -:105740002C20FFF793F8012008B0BDE8F0875246FF -:105750004846FFF78BB880B500F0F8F9014640F2F3 -:10576000D2230FF6342200F0EDF90FF64820FFF7B0 -:105770007DF8DFF88005B0F89200BDE8044018E03D -:10578000FDF7A4BD10B500F0E1F9014640F2DE23BB -:105790000FF6402200F0D6F90FF65420FFF766F816 -:1057A00000F0C9F904F065F803F0C7FF2088BDE8F0 -:1057B0001040132103F0AFBF78B50FF68820DFF853 -:1057C00094550088DFF8906589B0ADF81A0000F0B4 -:1057D000CBFF286810F1010F0ED069683074090AF8 -:1057E000000A707406F110046868B074F174080A55 -:1057F000090C3075717506E0002004F059F80400BA -:1058000008BF0FF6442422460621002004F062F867 -:1058100060793072102120797072E078B072A078CF -:10582000F0726078307320780FF62424707322466B -:10583000182004F04FF80FF6282600F097F84EF6DF -:105840006E50089007AA28680FF6242507900621B5 -:105850002E2004F03FF822461021182004F03AF8D8 -:1058600000F084F81821012004F05BF8FFF765F8D8 -:105870000DF1160006A90190009105AB0722002149 -:10588000012003F092FE0FF60020BDF818100FF66D -:1058900038640FF6486600900523BDF81400002216 -:1058A000FFF70BF968B13046FFF7A2FA01464FF453 -:1058B00058732A462046FEF7D9FF0FF6D410FEF79C -:1058C000D5FF0DF11A0000900223BDF81610BDF8A7 -:1058D00014000022FFF7F1F868B13046FFF788FAAC -:1058E000014640F26A332A462046FEF7BFFF0FF614 -:1058F000D010FEF7BBFF02220221002000F0BAFF09 -:10590000DFF8F0430320207003F0E6FD0020607014 -:10591000E070082060751020A07500202075DFF869 -:105920003C04A0610120A0700020C1B22144087194 -:10593000401CC1B21029F8DB002004900023A069AC -:10594000617803900122207D0290A07D0190607D0E -:105950000090A07803F0D9FDA07808B103F0C0FE54 -:105960000AB070BD000000002E0A0D003246102162 -:10597000082003F0AFBF2DE9F84F04462546012D5E -:1059800088B003D1DC480688408803E04FF4C8663D -:105990004FF47A60DFF85C83ADF81C0008F19007E3 -:1059A0000FF63859F87B0FF6205A0FF6441B03F018 -:1059B0009DFC4846FFF71CFA01464FF46C7300F05B -:1059C00087F839780FF63410FEF750FF022D22D1F8 -:1059D0003878012818BF02281DD103F022FD00905D -:1059E000002848460BD1FFF703FA014640F2BA33CC -:1059F00000F06EF80FF62010FEF738FF0BE0FFF70F -:105A0000F7F9014640F2BE3300F062F800990FF654 -:105A10002C10FEF72BFF3C7000200690059008F13B -:105A200029010491062298F828000FF638110192F6 -:105A300003900291002300933146BDF81C20002002 -:105A400003F001FDC4490E2003F0F5FD040022D14E -:105A5000012D484611D1FFF7CBF9014640F2D93369 -:105A600000F036F80FF60410FEF700FFF87BBC4993 -:105A700009B0BDE8F04F03F088BCFFF7B9F9014663 -:105A800040F2DF3300F024F809B0BDE8F04F0FF624 -:105A90000410FEF7EBBE012D48460AD1FFF7A8F926 -:105AA000014640F2E63300F013F821460FF61010DD -:105AB00009E0FFF79DF9014640F2EA3300F008F8EB -:105AC00021460FF62C1009B0BDE8F04FFEF7CEBE10 -:105AD0005A465046FEF7CABE00210120FFF77ABAA7 -:105AE000022048E71CB500F026F803F08CFE401EAB -:105AF0008041C00FA0706A4620880DF1010103F0BB -:105B0000BDFD9DF80110E1729DF80010217388B968 -:105B100000F01CF801464FF48C630FF60C1200F0F5 -:105B200011F89DF800309DF80120A1780FF61410AF -:105B3000FEF79CFE13BD6F4800F1920400F1960140 -:105B4000E07870470FF68030FEF790BE0FF68C308D -:105B5000FFF74EB980B5FFF7F9FF01464FF48D63AB -:105B60000FF61812FFF7EEFF0FF62C10FEF77EFE71 -:105B7000604800F1960190F8950003F07AFEBDE8C8 -:105B8000014003F0DABD80B5FFF7ACFF7549087836 -:105B900030B1012801BF487A0128897A012903D14F -:105BA000BDE80240012001E001BD00002DE9F843FD -:105BB00004286D4F0FF610360FF61C190FF61C381F -:105BC00047F2305500F28F80DFE800F0600330527A -:105BD00041000120B872388803F017FD04000BD093 -:105BE00000F0C8F801464FF4916300F0BFF8214679 -:105BF0000FF6F000FEF73AFE00F0BCF8014640F266 -:105C00008F4300F0B3F80FF62810FEF72FFE28465A -:105C100000F0B6F80020B87200F0ACF8014640F28F -:105C2000924300F0A3F80FF63C1058E000F0A2F801 -:105C300001464FF4936300F099F80FF65C10FEF7FD -:105C400015FE38884549BDE8F44303F091BC00F0E7 -:105C500091F8014640F29F4300F088F839880FF62A -:105C60005810FEF703FE3888BDE8F24303F077BD15 -:105C70003888012103F0E3FD00F07CF801464FF481 -:105C8000956300F073F80FF6681028E000F072F8E2 -:105C9000014640F2AE4300F069F80FF6B810FEF787 -:105CA000E5FD3888132103F036FD04000BD000F029 -:105CB00061F8014640F2B24300F058F821460FF671 -:105CC000AC10FEF7D3FD284600F05AF800F052F869 -:105CD000014640F2B64300F049F80FF6B410BDE8B3 -:105CE000F243FEF7C3BDBDE8F1830000A008032026 -:105CF000AB780008401A002020200020C866000869 -:105D000034CD0008DC6600084CCD000898CD0008B2 -:105D100004CE000874CE0008BCCE0008E8CE00080F -:105D200084CF0008A0CF0008C8CF0008F0CF00083B -:105D300004D0000820D000083CD00008C8D00008DB -:105D4000F8D0000854D1000884D10008ECD1000834 -:105D500040420F008075FF1F0400002007B20100C1 -:105D600046E00100D41A0020D21A00204A463046EC -:105D7000FEF77CBD4046FFF73BB80420FFF750B963 -:105D80000420FFF755B900210420FFF723B90120B3 -:105D9000FFF746B90120FFF74BB9000010B50446E4 -:105DA000616801F10800FFF79BF900B10120207044 -:105DB00010BD000010B1012803D070470F20FFF77D -:105DC0001DB90F20FFF722B90000000000000000FD -:105DD0000000000000000000000000004400080077 -:105DE000400502011C3AFA00F4010000FFFF000028 -:105DF00048010100002000000D0A0D2A2A2041431D -:105E0000495F4741505F414444525F4E4F545F5297 -:105E100045534F4C5645445F56534556545F434F88 -:105E20004445200A000000000D0A0D2A2A204143A3 -:105E3000495F4741505F4B455950524553535F4E60 -:105E40004F54494649434154494F4E5F5653455676 -:105E5000545F434F44450A00206E756D6572696357 -:105E60005F76616C7565203D20256C640A0000003A -:105E7000204865785F76616C7565203D20256C78DB -:105E80000A0000004143495F4741505F4E554D4570 -:105E90005249435F434F4D50415249534F4E5F5615 -:105EA000414C55455F56534556545F434F4445203A -:105EB0003D3D3E204741505F50524F435F4E554D50 -:105EC000455249435F434F4D50415249534F4E5FF6 -:105ED00056414C55455F434F4E4649524D200A0DA1 -:105EE000000000004143495F4741505F5041495223 -:105EF000494E475F434F4D504C4554455F565345BF -:105F000056545F434F44452C20436F6E6E65637457 -:105F1000696F6E5F48616E646C653D307825303422 -:105F200058205374617475733D2564205265617304 -:105F30006F6E3D307825303278200A00202A2A20E2 -:105F400050616972696E672054696D656F75742060 -:105F50005374617475733D256420526561736F6E6F -:105F60003D307825303278202C200A0D2021212147 -:105F700020506C656173652069676E6F726520746F -:105F800068697320424C4520446576696365206FDB -:105F90006E2074686520694F532F416E64726F697B -:105FA00064204465766963652053657474696E671F -:105FB0003D3E426C7565746F6F74683D3E4D79204F -:105FC000446576696365206F72205061697265640B -:105FD0002044657669636520212121200A0D000097 -:105FE000202A2A2050616972696E67204B4F205326 -:105FF00074617475733D256420526561736F6E3DE5 -:10600000307825303278202C200A0D2021212120C3 -:10601000506C656173652069676E6F726520746886 -:10602000697320424C4520446576696365206F6E34 -:106030002074686520694F532F416E64726F6964E4 -:10604000204465766963652053657474696E673DA5 -:106050003E426C7565746F6F74683D3E4D792044A7 -:106060006576696365206F7220506169726564208E -:1060700044657669636520212121200A0D00000016 -:106080004143495F4741505F50414952494E475F44 -:10609000434F4D504C4554455F56534556545F430E -:1060A0004F44452020506565725F426F6E646564A1 -:1060B000203D2564203D3E202564202053656375E6 -:1060C000726974795F4D6F64653D2564203D3E20A3 -:1060D00025642053656375726974795F4C657665D4 -:1060E0006C3D2564203D3E202564200A0D00000003 -:1060F0005465726D20436F6E6E656374696F6E20B8 -:10610000666F7220746865206669727374207061AE -:106110006972696E6720636F6D706C657465207459 -:106120006F207361766520626F6E64696E672069A7 -:106130006E666F6D6174696F6E20212121200A0DDA -:1061400000000000202A2A204143495F474154545F -:106150005F50524F435F434F4D504C4554455F563F -:10616000534556545F434F4445200A000D0A0D2AFB -:106170002A204143495F4741505F50524F435F439C -:106180004F4D504C4554455F56534556545F434F11 -:106190004445200A000000004150505F424C455FDA -:1061A0004B65795F427574746F6E315F41637469DA -:1061B0006F6E00000A0D202A2A205465726D20435C -:1061C0004F4E4E454354494F4E202A2A20200A0D57 -:1061D000000000004150505F424C455F4B65795FC5 -:1061E000427574746F6E335F416374696F6E000043 -:1061F000206163695F6761705F636C6561725F7383 -:10620000656375726974795F6462202620616369D1 -:106210005F6761705F72656D6F76655F626F6E64F8 -:1062200065645F6465766963652026206163695FE4 -:106230006761705F7465726D696E617465200A0DC7 -:1062400000000000400300006C7AD8AC57720000D8 -:10625000123456789ABCDEF0123456789ABCDEF0CE -:10626000FEDCBA0987654321FEDCBA098765432154 -:10627000426C655F4863695F4761705F4761747432 -:106280005F496E69740000004852616E630000004F -:10629000446576696365204E616D65206163695F61 -:1062A000676174745F7570646174655F636861725F -:1062B0005F76616C7565206661696C65642E0A00A5 -:1062C000417070656172616E6365206163695F67CB -:1062D0006174745F7570646174655F636861725F37 -:1062E00076616C7565206661696C65642E0A0000D4 -:1062F0004164765F526571756573740046697273A7 -:106300007420696E64657820696E2025642073743A -:10631000617465200A0000005375636365737366DA -:10632000756C6C792053746F70706564204164766D -:106330006572746973696E67200A000053746F7028 -:10634000204164766572746973696E67204661697D -:106350006C6564202C20726573756C743A2025641A -:10636000200A0000094852616E63000053756363A0 -:1063700065737366756C6C79205374617274204612 -:10638000617374204164766572746973696E672005 -:106390000A0000005375636365737366756C6C79EE -:1063A000205374617274204C6F7720506F77657240 -:1063B000204164766572746973696E67200A000013 -:1063C00053746172742046617374204164766572FF -:1063D000746973696E67204661696C6564202C205E -:1063E000726573756C743A307825303278200A0003 -:1063F0005374617274204C6F7720506F77657220F0 -:106400004164766572746973696E67204661696C70 -:106410006564202C20726573756C743A2030782581 -:10642000303278200A0000004150505F424C455FF6 -:10643000506565725F426F6E6465645F4368656353 -:106440006B000000506565725F426F6E6465643D6D -:1064500025642053656375726974795F4D6F646557 -:106460003D2025642C2053656375726974795F4CF7 -:106470006576656C3D202564200A0D004150505F13 -:10648000424C455F52656D6F76655F426F6E646921 -:106490006E675F496E666F00206163695F67617058 -:1064A0005F636C6561725F73656375726974795F50 -:1064B00064622026206163695F6761705F72656D49 -:1064C0006F76655F626F6E6465645F64657669634D -:1064D00065200A0D0000000047617050726F635222 -:1064E000657100004741505F50524F435F534C412C -:1064F00056455F53454355524954595F52455120C3 -:106500006163695F6761705F736C6176655F736516 -:106510006375726974795F72657120207374617438 -:1065200075733D307825303278200A0D0000000068 -:1065300077616974696E6720666F722020414349F4 -:106540005F4741505F50414952494E475F434F4D6D -:10655000504C4554455F56534556545F434F444550 -:10656000200A0D0077616974656420666F722020CF -:106570004143495F4741505F50414952494E475F4F -:10658000434F4D504C4554455F56534556545F4319 -:106590004F4445200A0D00004741505F50524F4381 -:1065A0005F504153535F4B45595F524553504F4ED7 -:1065B0005345200A0D0000004741505F50524F43A1 -:1065C0005F414C4C4F575F5245424F4E44206163F0 -:1065D000695F6761705F616C6C6F775F7265626F36 -:1065E0006E6428307825303458290A0D00000000E8 -:1065F0004741505F50524F435F4E554D45524943BE -:106600005F434F4D50415249534F4E5F56414C5599 -:10661000455F434F4E4649524D202A2A2061636907 -:106620005F6761705F6E756D657269635F636F6DE3 -:1066300070617269736F6E5F76616C75655F636FB1 -:106640006E6669726D5F7965736E6F2D2D3E59456B -:1066500053200A007465726D696E61746520636F02 -:106660006E6E656374696F6E200A00005465726D0A -:1066700020436F6E6E656374696F6E20636D642076 -:106680006661696C7572653A20307825780A000079 -:106690004741505F50524F435F5445524D494E4120 -:1066A00054455F434F4E4E454354494F4E20636F10 -:1066B0006D706C657465206576656E7420726563B7 -:1066C00065697665640A00000D0A205B25735D5BD1 -:1066D00025735D5B25645D2000000000433A5C4249 -:1066E0004C455F444F52595F5061636B61676573FE -:1066F0005C53544D3332437562655F46575F574272 -:106700005F56312E31312E305243345C50726F6AF5 -:10671000656374735C502D4E55434C454F2D574265 -:1067200035352E4E75636C656F5C4170706C6963B6 -:106730006174696F6E735C424C455C424C455F48C6 -:1067400065617274526174655F414E43535C53548A -:106750004D33325F5750414E5C4170705C617070D8 -:106760005F626C652E63000000B587B000F014F81E -:10677000012003220690ADF80420ADF8062000F0B9 -:10678000A3F800284CBFFF209DF8000007B000BD13 -:10679000ADF806100820704700208DF80000182280 -:1067A000002101A8FEF7DDBA78B5C7B004460D4652 -:1067B0001646032200F01EF8ADF81C40ADF81E503E -:1067C000ADF82060FFF7EBFF2221FFF7E1FF062184 -:1067D00000F009F800F076F800284CBFFF209DF883 -:1067E000000048B070BDADF80400049107A8032173 -:1067F0007047092200216846FEF7B3BA182200212B -:1068000002A8FEF7AEBA182201A8FEF7AABA70B520 -:10681000C8B006460C4615460522FFF7EBFFADF85B -:106820002060FFF7EBFF302100F014F80521049001 -:1068300000F019F8002848BFFF2009D49DF8000097 -:1068400030B99DF8030020709DF8040028700020E6 -:1068500048B070BDADF80A1008200221ADF808005C -:10686000059108A870470791CDF818D0002102A81B -:1068700001F04FB800B5C7B000F00EF8FFF7C3FF46 -:10688000312000F013F800F01FF800284CBFFF2063 -:106890009DF8000047B000BD00238DF81C008DF866 -:1068A000003007A84170827000217047ADF80600E3 -:1068B00007A9032004900822012003910690ADF857 -:1068C0000420704703900691CDF814D0002101A850 -:1068D00001F01FB82DE9F84F0FF2D017A2B0D7E999 -:1068E0000045CDE900452C9EDFF82C7C04918DF805 -:1068F000436000210FF2BC140D9112944FF0FF364B -:106900008246904699460FE0C3462C461BF8011B71 -:106910000498D0470028049000F0B2800D98401CE5 -:10692000641E0D90F2D1A84498F80000252807D1E4 -:1069300000210791089109910A910B910C910DE0AA -:106940006A463146404603F047F8050001D10D98EC -:10695000B4E0D9D50125E6E741F0010118F8010FAF -:106960002028F9D023280CD02B2804D02D2805D09E -:10697000302809D086E041F00201EFE741F0040140 -:10698000ECE741F00801E9E741F01001E6E70020FB -:106990000F900AE00F98B84205DA00EB800302EB93 -:1069A0004302303A0F9208F1010898F80020A2F152 -:1069B00030000A28EED398F800002E2818BF0E9653 -:1069C00029D118F8010F2A280BD1D9F80000C9F8ED -:1069D000000008F1010850F8042BC9F800000E92DD -:1069E00019E02D280CBF18F8010B002000220E9290 -:1069F0000BE040B90E9ABA4205DA02EB820403EBCF -:106A00004403303B0E9308F1010898F80030A3F1DD -:106A100030020A2AEDD3ADF84010129898F8001011 -:106A200002F0E6FF08B118F8010B8DF842009DF85E -:106A30004200682804BF98F80010682903D162203A -:106A40008DF8420008E06C2804BF98F800006C281C -:106A500004D171218DF8421008F1010813A80690A5 -:106A60004A4618F8013B02A9504600F067F838B9C9 -:106A700013AA02A9504600F0C9F900287FF554AFC7 -:106A800030461BE02A2882D1D9F80020C9F800201E -:106A900052F8040BC9F8002000280F9003D540429B -:106AA0000F9041F0040108F1010884E700000000A4 -:106AB00000000000686A6C747A4C000023B0BDE8E6 -:106AC000F08F622820D0682811D06A2803D06C2863 -:106AD00027D0712825D10868C01D20F00700086064 -:106AE000D0E9002308300860194610467047002A94 -:106AF0000A680A60106803D0121D0A6000B217E02D -:106B0000121D0A6080B217E0002A0A680A60106845 -:106B100003D0121D0A6040B20AE0121D0A60C0B222 -:106B20000AE0002A0A680A60106803D0121D0A6091 -:106B3000C1177047121D0A60002170477CB50D46D1 -:106B400011461C462E69B4F1250200F04D811C3A15 -:106B500000F08680121F022A40F282800E3A00F076 -:106B60000781521F5AD0093A7AD0921E16D0521E6F -:106B700035D0521E022A73D9121F30D0521F00F096 -:106B80009A80521E4AD0521E00F0E480D21E00F0BD -:106B9000FD80921E42D0D21E40D02BE195F83A20C3 -:106BA0006C2A09D06869421C6A610A680A6052F856 -:106BB000043B0A60335427E10A680A6052F8043B38 -:106BC0000A600021009301914FF0FF322A632946A9 -:106BD0006A4600F096F9002840F1168101E195F827 -:106BE0003A000122FFF76DFFC5E900010023994239 -:106BF00004DA6869411C69612D210DE0288F810745 -:106C000004D56869411C69612B2105E0C00722D5C4 -:106C10006869411C6961202131541CE095F83A00F3 -:106C20000022FFF74EFFC5E9000195F83800010783 -:106C300011D5D5E900230020834208BF82420AD043 -:106C400044F02000782806D1686930213154401C76 -:106C5000411C69613454214668693044E86083E02E -:106C60000868C01D20F007000860D0E90023083044 -:106C70000860C5E90023D5E90001C80F04D06869A0 -:106C8000411C69612D210DE0288F810704D56869B9 -:106C9000411C69612B2105E0C00704D56869411CCE -:106CA00069612021315468693044E86021462846F2 -:106CB00000F032FAA8E005F13A02507820B14FF026 -:106CC000FF340FF6243070E01078622808D068286E -:106CD00024D06A2812D06C282ED071280ED02BE038 -:106CE0000A680A6052F8040B0A6020B94FF0FF34BA -:106CF0000FF60C3059E0E96A017085E00A680A6015 -:106D000052F8040B0A6020B94FF0FF340FF6F02060 -:106D10004BE0EA6AD317C0E9002375E00A680A600D -:106D200052F8040B0A6020B94FF0FF340FF6D02060 -:106D30003BE0E96A018067E00A680A6052F8040BE8 -:106D40000A6020B94FF0FF340FF6B4202DE0E96A55 -:106D5000016059E00A680A6052F8040B0A600021D9 -:106D6000C5E90001EE607821284600F029F94BE0E2 -:106D70006C2285F83A200B680B6053F8042B0B60EB -:106D800052BB4FF0FF340FF6AC200EE095F83A20DE -:106D90006C2AF0D00868086050F8044B0860EC607A -:106DA0003CB94FF0FF340FF6702002F02DFE201A90 -:106DB00076BD2E6B002E04D52046FEF7F3F904466F -:106DC00008E032460021204602F040FE002814BFB1 -:106DD000041B3446AC6117E0294600F092F8002805 -:106DE00012D54FF0FF3076BD6869411C69612521DD -:106DF000315409E06969481C6861252272542100F8 -:106E000002D0411C69613454002076BD2DE9F04167 -:106E10000E460546716B7069B46A091A306A091A20 -:106E2000B069091A706A091AF069091A96F83800E7 -:106E30000C1B410790460DD4002C0BDD2746B06893 -:106E40002021A8470028B06057D0F06A401C7F1E60 -:106E5000F062F4D1736942463146284600F0ACFC3A -:106E600000284AD1376A002F0ADDB0683021A847D0 -:106E70000028B06041D0F06A401C7F1EF062F4D15F -:106E8000B369F2683146284600F096FCA8BB776AE1 -:106E9000002F09DDB0683021A847B06068B3F06A00 -:106EA000401C7F1EF062F5D1F068B169F3694218A9 -:106EB0003146284600F080FCF8B9B76A002F09DD9A -:106EC000B0683021A847B060B8B1F06A401C7F1E9E -:106ED000F062F5D196F8380041070BD5002C09DD9A -:106EE000B0682021A847B06038B1F06A401C641E29 -:106EF000F062F5D10020BDE8F0814FF0FF30BDE831 -:106F0000F0812DE9F8470D46A3B02F6B002F814685 -:106F1000904648BF6FF0004702F0C4FD696B40180F -:106F20000FF62C118128D1E90023CDE9012328BFD8 -:106F30004FF0FF303ED20024002F2FDDD8F8001094 -:106F400001AA684602F04AFD0646002E35D4D8F85C -:106F5000000008B9761E30D4B7421FDB68693018CC -:106F600081280AD30020686303AA29464846FFF710 -:106F70004DFF040012D40020686103A8D5F814A0C6 -:106F8000324669465044FDF785FCB244C5F814A06A -:106F900058F8040B002818BFBF1BCDD12CB903AA89 -:106FA00029464846FFF732FF044614B900206861BD -:106FB0006863204624B0BDE8F0874FF0FF34F8E75F -:106FC0002DE9FC4707468A463E69BAF16F0F08BFB4 -:106FD000082405D04AF02001782914BF0A2410247F -:106FE0003C25D7E90023BAF1640F18BFBAF1690F45 -:106FF0009046994606D100218B4203DAD8F1000869 -:1070000069EB49090020814508BF80451FD1386BD5 -:10701000E8B9082C4CD197F83800010748D5302042 -:107020003B2586F83B0043E000280ED597F8380052 -:1070300000F01400102808D17A6B7869121A386AA7 -:10704000121A511A0029C8BF3962BDE8F3878DF8BA -:1070500000A0404649462246E31702F029FD30329F -:10706000D0B26D1E3A28019504DB9DF80000A0F116 -:1070700051018A187255404649462246E31702F0EC -:1070800017FD804689460020814508BF804503D012 -:10709000F86871198842DCD3082C09D197F83800B8 -:1070A000010705D5715D302902D06D1E3020705565 -:1070B000C5F13C01B9617019F860386B8142B3DAEF -:1070C000411A39624FF6EF70398F01403987BDE8B8 -:1070D000F3872DE9D04306460F4614464FF00008CB -:1070E000DFF8389412E0E00707D542464B463046B9 -:1070F000394602F0F5FD06460F46404649464246EF -:107100004B4602F0EDFD641080468946002CEAD122 -:1071100030463946BDE8D0832DE9F34F054641F0AE -:1071200020048DB0D5E90089612C02AE09D0286B0E -:10713000002848BF062003D408BF672C01D10120D6 -:107140002863D5E9002358004015401C0ED11903CF -:107150000CD00320A8619DF8380061381A2802D2AB -:107160000FF2F46111E00FF2F4610EE058004015E7 -:10717000401C0FD119030DD10320A8619DF83800E0 -:1071800061381A2814D30FF2DC61E8680322FDF796 -:1071900081FBD3E1194621F00043B3F5801F10466F -:1071A0000DD20027BB4208BFBA42019703D111E0BC -:1071B0000FF2AC61E9E701AA02F064FE0AE0DFF831 -:1071C000607307EB1352DFF85C3301921940DFF86C -:1071D00058331943C5E90001612C0ED1E86830210C -:1071E0000170811CE9609DF8381061290CBF78217D -:1071F000582141706869801C6861D5E900AB2BF0AB -:10720000004300202AF00002834204BF8242002390 -:1072100000F05A81612C40F0A980286B00284CBFF7 -:107220002120401C00904046009F7F1C49460022C0 -:10723000002302F05FFED94601988DF8082038BF80 -:1072400089F00049001F0190002FD0460DF1090080 -:1072500040F3498140F2FF71DFF8D0B20C9106464D -:10726000404649460022002302F05CFE80F03A814D -:107270004800400D00F11C0210D0002A0EDD0C98D1 -:10728000824205DB09F0004040EA0B01002013E0D8 -:10729000A448084040EA025140460DE029F000436E -:1072A000002028F00002834208BF82420FBF404600 -:1072B0001C22404602F04EFE8046894602F0E8FE5F -:1072C000FF1F002F044609DD02F000FF02460B46B7 -:1072D0004046494602F00CFF80468946F01D0721D2 -:1072E00004E004F00F0200F8012D2411002C01DD50 -:1072F000491EF6D5491E5CBF002200F8012DF9D5C4 -:10730000ECE00020194602AA0A4400E05B1E12F8D5 -:107310000149491E8442F9D00F2804D10DF109001A -:10732000425C521C4254002904D50198001D02AE53 -:107330005B1C0190591E12D49DF838007218147805 -:1073400004F130085FFA88F4392CC4BFA0F13A0484 -:10735000A044491E02F80189F1D58DF83800286B48 -:10736000002840F1B080591E2963ACE040464946F0 -:107370000022002302F0BEFD019938BF89F00049C8 -:1073800047F2975041436A4A91FBF2F20192D2F1DF -:10739000070204DD40464946FFF79BFE0AE05242E1 -:1073A00000206449FFF795FE02460B4640464946D9 -:1073B00002F010FF8046662C286BDFF87CB106BF18 -:1073C000019F0A3706273F18142FC8BF1427302003 -:1073D0008DF8080089460DF1090000E03046002FC5 -:1073E00034DD06464046494603F018F801460A4691 -:1073F00006F1080304200A26B2FBF6F606EB860E19 -:10740000A2EB4E02303203F8012C0A22B6FBF2F254 -:1074100002EB820EA6EB4E063036401E03F8026DDC -:10742000E9D1083F002F03F10806D7DD084603F035 -:1074300009F802460B464046494602F059FE002232 -:107440005B4602F04DFC80468946CBE70DF1090111 -:10745000401A0DF1090604E00199491E401E0191F0 -:10746000761C31783029F7D0662C02D10199491C5D -:1074700003E0652C0CBF012100212B6BCB18984237 -:10748000B8BF431E002B1ED4834204DAF05C3528BB -:10749000A8BF392000DA30201946721E02EB01081D -:1074A00000E05B1E18F80199491E8145F9D0392882 -:1074B00002D1705C401C7054002904D50198401C16 -:1074C00016465B1C0190019800B200901BB29DF81B -:1074D00038103246284600F034F82FE0C61D002F41 -:1074E0003FF7BEAE30460DF10901401A0099034640 -:1074F0008842C8BF0B46002B0DF109063FF52FAFA0 -:107500008342BFF6FEAE0DF10900C05C07287FF78D -:10751000F8AE0F20F6E60000CBCCCC0C00002440E7 -:1075200002FCFFFFFFFF0F800000E03F0000F07F44 -:10753000A08601000000F03F84D797410FB0BDE85E -:10754000F08F2DE9F84783B006468A4617469846DD -:1075500002F046FAB8F1000F406A356B90F80090DF -:1075600003DC4FF001080FF20037BDF930404AF05C -:107570002000662808BF641C15D0672840F084806E -:1075800014F1040FC0F28680AC4280F2838096F83A -:107590003800641C010702D4A845B8BF454620B294 -:1075A0002D1A48BF00250FFA84FAF068B169BAF1C4 -:1075B000000F25DC4A1C30234354002D03DC96F8D1 -:1075C0003800010703D5F06800F80290521C15EB53 -:1075D0000A0FB8BF6C4220B2441941424445B8BFBB -:1075E000A046B26171620FFA88F5F561F068B3697F -:1075F0002A4639461844FDF74DF9641BB462C4E0CD -:1076000022B29045084417DA42463946FDF742F95E -:10761000B0694044B061AAEB0801002D716203DC3F -:1076200096F838100A0705D5F16801F80090F0695E -:10763000401CF061B562A8E03946FDF72BF9B0694E -:10764000002D5044A8EB040803DC96F838100A0714 -:1076500003D5F16801F80090401CB0610FFA88F082 -:107660008542F068B369B8BFA8460FFA88F207EB05 -:107670000A011844FDF70EF9B0690FFA88F10844C1 -:10768000B061681A706280E0BAF1610F14D14FF0F6 -:10769000700A16E0A84504DA96F838100A0758BFB1 -:1076A00045466D1E48BF0025BAF1670F14BF4FF065 -:1076B000450A4FF0650A04E0BAF1410F08BF4FF0E8 -:1076C000500AB169F368481CB061002D17F8012B0E -:1076D0005A5403DC96F838100A071BD5F168431C8E -:1076E000B36101F80090002D14DDA8F101080FFA34 -:1076F00088F08542F068B8BFA8460FFA88F239468C -:107700001844FDF7C7F8B0690FFA88F108446D1AFC -:10771000B0617562F068B1690844002C80F800A07F -:1077200003D42B214170811C03E02D214170644260 -:10773000811C00206A460AE023460A2493FBF4F4E5 -:1077400004EB8405A3EB450302F8013B401C24B283 -:10775000002CF1DC012806DC4AF02002652A04BF77 -:10776000302201F8012B48B9302001F8010B07E065 -:10777000401E1DF80020303201F8012B0028F7DCF4 -:10778000F068B2691044091AF16196F8380000F007 -:10779000140010280DD17169B0694118706A411840 -:1077A000F0694118B06A4118706B8142BCBF411A40 -:1077B000316204B0BDE8F087F8B505460E461746BD -:1077C0001C46002074B117F8011BB068A847B060D0 -:1077D00030B1F06A401CF0620020641EF3D1F2BDAB -:1077E0004FF0FF30F2BD00007072696E74665F7317 -:1077F0003A20256E20646973616C6C6F7765640054 -:107800007072696E74663A2062616420256E206130 -:107810007267756D656E74007072696E74665F7301 -:107820003A2062616420257320617267756D656E10 -:10783000740000007072696E74665F733A20626152 -:107840006420256C7320617267756D656E7400002D -:1078500000000000000000006E616E004E414E000E -:10786000696E6600494E4600300000007FB50C4648 -:107870006D4D61686D4EE8612962284602F0F0FDA9 -:10788000246805F1240002F0F5FD746006F108009B -:1078900002F0F0FD01203070296829B10FF2551077 -:1078A00000900294684688477FBD1FB55F4C04F185 -:1078B000080002F0E2FD00BB2178F1B1694604F155 -:1078C000080002F003FE5848C16949B100980290CF -:1078D00001228DF8042001A888479DF8040000E0EB -:1078E00001202070207818B1009802F0A4FE04E076 -:1078F000009904F1080002F0C9FD04F1080002F04B -:10790000BCFD28B9207818B104F10800FEF73BFA55 -:107910001FBD2DE9F8430646002000F05FF874888B -:107920003088B268DFF80081C4F3090444EA802497 -:10793000F068A4B2C1B2204600F03CF8002748F23B -:10794000E8094846FEF726FA08E06888A04202D116 -:10795000316928780870687800B1012708F124009F -:1079600002F08BFDF0B9694608F1240002F0AEFD8B -:10797000009800F10B05407A0F28E6D0B5F8011009 -:10798000A1420DD10098817AC81E7169C0B28842A7 -:10799000C8BF0846706102463069E91CFCF77AFFEF -:1079A0002878D9E73800CCD0012000F017F8002063 -:1079B000BDE8F28310B513461C4A5468A4F80900C8 -:1079C000E1720A46194604F10C00FCF763FF164AFF -:1079D0001369BDE810400021002018471249096AC8 -:1079E00082B008B921B101E011B1012002B008470D -:1079F00002B0704710B50146487A0F2818BF0E280C -:107A000007D10B4802F04CFDBDE810400020FEF706 -:107A1000BEB9064C04F1080002F042FD04F1080072 -:107A2000BDE81040FEF7AFB9F01E0020941F002003 -:107A3000141F002062F30F2262F31F42401810F05F -:107A4000030308D0C91A1FD3DB0748BF00F8012D74 -:107A500028BF20F8022D130030B414461546103903 -:107A600028BF20E93C00FAD8490728BF20E90C00CC -:107A700048BF40F8042D890028BF20F8022D48BFD8 -:107A800000F8012D30BC7047C91818BF00F8012D4F -:107A9000CB0728BF00F8012D70470246C9B200206D -:107AA00013788B4208BF104612F8013B002BF7D128 -:107AB000704710B5029C016042600021C160016105 -:107AC000416181610381A107047704D5008910B168 -:107AD0004FF0FF3010BD002010BD2DE9F04F0646DD -:107AE00085B030890C460027BB4600287169DC460A -:107AF0000CBF4FF00208D84681B168B93069776889 -:107B0000451CBD4228BFED1B3768385C7D5D00EB2E -:107B10000527BF1CBFB203E0074600E000B10246E4 -:107B20003069F568A84223BF7568281AC01B002079 -:107B3000154608EB050903FB09FE864532BF002008 -:107B4000B0FBF9FA09FB1A00C0B2804509DA96F8D1 -:107B50001C905FEAC97A48BF84465FEA897048BFD3 -:107B6000C446100000F0B4807068714461448842DB -:107B7000C0F0AE8008EB020080B20390D946100A34 -:107B8000ADF802000294ADF80020049359E080079C -:107B900040D53089002840F09B803268D018A34639 -:107BA00000F8024C200A32681A4402F8010C2246FE -:107BB00030681844FCF76EFE706920187061B06977 -:107BC000019C401CB061200A31680C70316848701B -:107BD0001CE08CB3307FC207D9D5308940B93168F9 -:107BE0001944FF2001F8020C3168194401F8010C16 -:107BF0004FF0000B7069241874612C463089002303 -:107C000040B931680C70210A3068417002237069F4 -:107C1000801C706108EB04070021BFB231615CB1C8 -:107C2000DA44029800EB0A01306822461844FCF757 -:107C300031FE70692418746109F10109B069401CB2 -:107C4000B061049A70683169914545D279188142D2 -:107C50002CBF081A0846306103463089A0B9306845 -:107C6000BDF80010C1545B1C70683168834228BFA6 -:107C70001B1ABDF80200C8545B1C7068834228BF01 -:107C80001B1A7069801C706105FB09FA7468BDF8E5 -:107C90000000E41A844288BF0446029800EB0A01FF -:107CA000281BAC42019003D093D2307F002890D1A2 -:107CB00037682246F818FCF7EDFD706920187061EE -:107CC000A346019C039F0023A9E73068404400E0DD -:107CD000002005B0BDE8F08F88448045F5D3A8EBBF -:107CE0000008F2E778B5028900230B80002A446976 -:107CF0000CBF02250025002C4FD0028952B9C26862 -:107D00004668531CB34228BF9B1B0668B25CF35CF9 -:107D100002EB03220A80027F02F00302012A25D12E -:107D20000B884FF6FF72934204BF0289002A09D0E4 -:107D3000C36802699A4219D20289BAB14668F31A35 -:107D4000934213D24368C268E41A14190022C26035 -:107D5000446102894AB902681478012B94BFC3F1C7 -:107D600001030123D25C04EB02220A80C46842684A -:107D700006682B19934228BF9B1A33440E88416929 -:107D8000891B491B416105D034192D19954228BF23 -:107D9000AD1AC5608169491E8161184672BDF8B58A -:107DA000028900230B80002A42690CBF02240024B0 -:107DB000002A3BD0C56802892B464AB946686A1C2E -:107DC000B24228BF921B0668775DB25C07EB0222C5 -:107DD0000A80067F06F00306012E20D10F884FF699 -:107DE000FF72974204BF0289002A07D1426800232C -:107DF000012A94BFC2F1010201220AE00269AA42EB -:107E00000DD202895AB14668751B954207D20023EC -:107E100004E005682E78AA5C06EB02220A8041681D -:107E20000068E4188C4228BF641A03191846F2BD92 -:107E3000484900E0484981B00A6802430A6009687D -:107E400008400090009801B0704780B502F05CFCDB -:107E500002F05CFC4148016841F480310160FCF7AC -:107E6000F7FFBDE801400EE000B587B068460FF2AD -:107E700018211C22FCF71EFD02F0F9FB684600F0F9 -:107E800031FE07B000BDF0B585B068461421FDF79E -:107E90001DF800260025002400210FF2DC0000EB75 -:107EA000C102907988B11368B3F1904F08D02C4F7C -:107EB000BB4208D02B4FBB4204BF9088044304E070 -:107EC0009088064301E090880543491C2229E4DBA1 -:107ED000002002900121032003900191B0B288B1EB -:107EE00000900120FFF7A4FF0120FFF7A3FF6946E0 -:107EF0004FF0904002F01CFC0022B1B24FF09040D5 -:107F000002F0D3FCA8B280B100900220FFF790FFEE -:107F10000220FFF78FFF124E6946304602F008FC40 -:107F20000022A9B2304602F0C0FCA0B280B100909D -:107F30000420FFF77DFF0420FFF77CFF094D694611 -:107F4000284602F0F5FB0022A1B2284602F0ADFC63 -:107F500005B0F0BD4C0000584C0100589008005886 -:107F6000000400480008004800F0B5BE13460A4669 -:107F70000146002002F0BABC0000004801000000E9 -:107F8000000000480100000000000048010000005F -:107F9000000000480100000000000048010000004F -:107FA000000000480100000000000048010000003F -:107FB000000000480100000000000048010000002F -:107FC000000000480100000000000048010000001F -:107FD000000000480100000000000048010000000F -:107FE00000000048010000000000004801000000FF -:107FF00000000048010000000000004801000000EF -:1080000000000048010000000000004801000000DE -:1080100000000048010000000000004801000000CE -:1080200000000048010000000000004801000000BE -:1080300000000048010000000000004801000000AE -:10804000000000480100000000000048010000009E -:10805000000000480100000000000048010000008E -:10806000000000480100000000000048010000007E -:10807000000000480100000000000048010000006E -:1080800000000048010000000000000000000000A7 -:1080900000000000787F0008280003202C00032047 -:1080A0002204040000B500BF130096469446103920 -:1080B00028BFA0E80C50FAD85FEA417C28BF0CC06A -:1080C00048BF40F8042BC90728BF20F8022B48BF3F -:1080D00000F8012B00BD704710B52448244C88B02F -:1080E000016841F40041016000F0D2FC21480168C0 -:1080F000C908C90041F00401016000201E4901F0D7 -:1081000052F8FFF7A2FE0121012000F0C6FC012178 -:10811000002002F01EFC0121012002F01AFC0121C6 -:10812000022002F016FC02F0E5F9144A00211020AA -:10813000FCF743FF04F23C500FF24501009001911F -:1081400069460FF2410002F053FC04F254700290B1 -:1081500004F5C96140F23C5005900391049402A8D3 -:1081600002F050FA02F0C4F908B010BD080000583F -:1081700030000320800400581C1F002033AA000890 -:108180007047000080B5FFF76FFEFDF727F8BDE8E8 -:1081900004400021012000F080BC70474FF0FF3008 -:1081A000FCF7A6BE00211020FCF714BF0220FCF74C -:1081B00037BF0220FCF73CBF012805D0022805D0BC -:1081C000102805D1FDF7C7BAFDF7DABAFDF7DABA1C -:1081D0007047704770477047704700002DE9F841BD -:1081E000384D0FF204180FF2EC060FF2DC070020F6 -:1081F000286087B041F60A00ADF818000095032307 -:10820000012206A90120FCF7AFFB0400404609D17A -:10821000FCF7EEFD0146872300F03FF829880FF2B6 -:10822000241008E0FCF7E4FD01468C2300F035F84B -:1082300021460FF25010FCF719FB42F62920ADF849 -:108240001800012204920A20A91C03900023022294 -:1082500005910293019300922023288806AA012108 -:10826000FCF7D1FB0400404609D1FCF7C1FD0146F3 -:10827000A22300F012F869880FF2481008E0FCF71A -:10828000B7FD0146A72300F008F821460FF2701051 -:10829000FCF7ECFA08B0BDE8F0813A463046FCF74E -:1082A000E5BA80B542F62922904209D10A6805480C -:1082B000009200220B7941880088FCF7FEFB02BD8A -:1082C000002002BD242000204449535F496E697498 -:1082D000000000000D0A205B25735D5B25735D5B6C -:1082E00025645D2000000000433A5C424C455F4439 -:1082F0004F52595F5061636B616765735C53544DB6 -:108300003332437562655F46575F57425F56312E81 -:1083100031312E305243345C4D6964646C65776151 -:108320007265735C53545C53544D33325F57504104 -:108330004E5C626C655C7376635C5372635C64690B -:10834000732E630044657669636520496E666F72BB -:108350006D6174696F6E205365727669636520285C -:10836000444953292069732061646465642053750E -:10837000636365737366756C6C7920253034580AB5 -:10838000000000004641494C454420746F20616460 -:10839000642044657669636520496E666F726D611D -:1083A00074696F6E2053657276696365202844494D -:1083B00053292C204572726F723A20253032582092 -:1083C00021210A004D616E75666163747572657274 -:1083D000204E616D652043686172616374657269E6 -:1083E00073746963204164646564205375636365D5 -:1083F000737366756C6C79202025303458200A0020 -:108400004641494C454420746F20616464204D61AD -:108410006E756661637475726572204E616D65205C -:1084200043686172616374657269737469632C2057 -:108430004572726F723A20253032582021210A008D -:10844000704770472DE9F041054686B068780024F2 -:10845000FF2861D1B5F803100FF208360FF2EC28AF -:108460000FF21430B74F40F60142891A2BD012395F -:1084700052D1FCF7BDFC01467123424600F049F998 -:108480000FF25030FCF7F2F9FA88B5F80710521CD9 -:10849000914241D1AB7AB5F805006A7A0124012BEB -:1084A00008D100920A35019500230022FCF70BFC4D -:1084B00000202CE005F10A030193009280230122A1 -:1084C000FCF701FC28E07A88B5F80710921C91426D -:1084D00022D1697B0124CA070DD5FCF789FC01462E -:1084E000A323424600F015F90FF21030FCF7BEF955 -:1084F0008DF808400DE0FCF77BFC0146A9234246BD -:1085000000F007F90FF23830FCF7B0F902208DF8CF -:10851000080002A800F070FC204606B0BDE8F0811B -:10852000FEB5014601AA487A8DF804004B7A088806 -:108530005070DC0704D50888000A9070032300E01F -:108540000223487A040707D54888D0545B1C488822 -:10855000DCB2000A10555B1C4C7AE00610D50D7A8F -:1085600000200BE001EB4004DFB2A688D6555B1C6F -:10857000A488DEB2240A94555B1C401CA842F1DB9F -:1085800001A970480091DBB2418800880022FCF705 -:1085900094FAFEBD2DE9F84187B06B48694D0FF2A2 -:1085A000D8180FF2C0160FF2DC27FCF789FD41F650 -:1085B0000D01ADF8181000950823012206A901202D -:1085C000FCF7D2F9040040460AD1FCF711FC014641 -:1085D00040F2B31300F09CF829880FF2B42009E0B0 -:1085E000FCF706FC01464FF4DC7300F091F82146DD -:1085F0000FF2D420FCF73AF942F63720ADF8180014 -:10860000012204920A20A91C039000231022059144 -:108610000293019300920723288806AA0121FCF700 -:10862000F2F9040040460AD1FCF7E2FB01464FF4A0 -:10863000EA7300F06DF869880FF2C42009E0FCF7D6 -:10864000D7FB014640F2D91300F062F821460FF241 -:10865000F420FCF70BF942F63820ADF818000022A0 -:108660000492029201920A20291D03900222059190 -:1086700000F047F8040040460AD1FCF7B9FB014678 -:1086800040F2EF1300F044F8A9880FF2003009E03F -:10869000FCF7AEFB01464FF4FA7300F039F82146BF -:1086A0000FF22430FCF7E2F842F63920ADF818005A -:1086B0000022049201920A20A91D0390022308229D -:1086C0000591029300F01DF8040040460AD1FCF722 -:1086D0008FFB014640F2092300F01AF8E9880FF2F7 -:1086E000283009E0FCF784FB014640F20E2300F03D -:1086F0000FF821460FF24830FCF7B8F808B0BDE893 -:10870000F08100920123288806AA0121FCF77BB999 -:108710003A463046FCF7AAB880B5002242F6372325 -:10872000C01A09D0401E0BD1064800910123818850 -:108730000088FCF7C2F902E00846FFF7F1FE0246A6 -:10874000104602BD00200020458400084865617283 -:10875000526174655F4576656E745F48616E646CE6 -:10876000657200000D0A205B25735D5B25735D5B00 -:1087700025645D2000000000433A5C424C455F44A4 -:108780004F52595F5061636B616765735C53544D21 -:108790003332437562655F46575F57425F56312EED -:1087A00031312E305243345C4D6964646C657761BD -:1087B0007265735C53545C53544D33325F57504170 -:1087C0004E5C626C655C7376635C5372635C68726A -:1087D000732E63004143495F474154545F575249E8 -:1087E00054455F5045524D49545F5245515F565371 -:1087F0004556545F434F44450A0000004143495FDA -:10880000474154545F4154545249425554455F4D79 -:108810004F4449464945445F56534556545F434F7C -:108820004445204852535F4E4F54494649434154B2 -:10883000494F4E5F454E41424C45440A00000000FE -:108840004143495F474154545F4154545249425552 -:1088500054455F4D4F4449464945445F565345563C -:10886000545F434F4445204852535F4E4F5449464E -:1088700049434154494F4E5F44495341424C45445A -:108880000A0000004852535F496E697400000000FE -:10889000486561727420526174652053657276690F -:1088A00063652028485253292069732061646465F8 -:1088B00064205375636365737366756C6C792025EA -:1088C0003034580A000000004641494C45442074A9 -:1088D0006F20616464204865617274205261746520 -:1088E00020536572766963652028485253292C20ED -:1088F0004572726F723A20253032582021210A00C9 -:1089000048656172742052617465204D65617375AC -:1089100072656D656E74204368617261637465721F -:10892000697374696320416464656420537563638B -:1089300065737366756C6C79202025303458200A75 -:10894000000000004641494C454420746F2061649A -:10895000642048656172742052617465204D6561C0 -:10896000737572656D656E742043686172616374BE -:10897000657269737469632C204572726F723A2054 -:10898000253032582021210A0000000053656E7303 -:108990006F72204C6F636174696F6E2043686172FF -:1089A00061637465726973746963204164646564AA -:1089B000205375636365737366756C6C792020252D -:1089C000303458200A0000004641494C4544207488 -:1089D0006F206164642053656E736F72204C6F6307 -:1089E0006174696F6E204368617261637465726956 -:1089F000737469632C204572726F723A202530328D -:108A0000582021210A000000436F6E74726F6C20A1 -:108A1000506F696E74204368617261637465726936 -:108A2000737469632041646465642053756363658E -:108A3000737366756C6C79202025303458200A00D9 -:108A40004641494C454420746F2061646420436F63 -:108A50006E74726F6C20506F696E7420436861721F -:108A6000616374657269737469632C204572726FF7 -:108A7000723A20253032582021210A007047704771 -:108A8000704770477047704770477047704770472E -:108A90000C48002101604160704710B500F00CF8EF -:108AA0005C6819B1012904D1204301E024EA0000E7 -:108AB000586082F3108810BDEFF3108272B6014B3C -:108AC00070470000D81F002001F0E7FF9DF80E005E -:108AD00005B000BDF8B500F10C026B4624214FF63D -:108AE0006640F1E7F8B500F10C026B460F214FF636 -:108AF0006840E9E7A94900E0A94981B00A68024352 -:108B00000A60096808400090009801B0704710B5ED -:108B1000A449A54C4FF40040086001F0DBFD6068FB -:108B200040010ED56068C0000BD402F005F802F0D9 -:108B300003F8206840F480302060216821F48031FF -:108B4000216000F0F1F8002000F0B2FE40B1807921 -:108B50009649E160E16821F47C5141EA0021E1603D -:108B600000F047F89248934C0168002202600269C5 -:108B700002F0500202610420FFF7BEFF0120FFF760 -:108B8000BBFF0220FFF7B8FF0420FFF7B3FF01206F -:108B9000FFF7B0FF0220FFF7ADFF00220F210E20EC -:108BA00001F0EEFF0E2002F009F800220F213A201A -:108BB00001F0E6FF3A2002F001F800217E48416012 -:108BC0000F218160046047F6FF71C16002F04CF82C -:108BD000CA206062FF2153206062A068C008C00004 -:108BE000A0606162FFF778FA4FF0FF30FCF780F980 -:108BF000FAE738B5AEB01CA84821FCF767F901A820 -:108C00001C21FCF763F908A85021FCF75FF901F07B -:108C100093FF6548694C016821F0180101604FF429 -:108C20008032206820F4C06040F4007020604FF46F -:108C30008075216801F4C0610091072100981C91A2 -:108C400001201E900021402020901D9227911F9509 -:108C50001CA802F0B6F86F200190022100200291BA -:108C600003900490059006900790012101A802F05E -:108C70005AFB43F60300089000214FF480401990FE -:108C80000E910F91102002211B901A91189508A89F -:108C900002F022FDE06920F07000E06148480168C0 -:108CA000C1F303200090009830B9E1690909090176 -:108CB00041F00401E16108E00098E169801E80F361 -:108CC0000400090940EA0110E061E06940F4004055 -:108CD000E0612FB030BD10B53A4C3B4800F017F8BA -:108CE0004FF40040E061002020626062A0622046F4 -:108CF00002F070FE0021204603F0ABFA002120466E -:108D000003F0B2FA2046BDE8104003F085BA2060B7 -:108D10004FF4E13060600020A060E06020610C2032 -:108D200060610020A0617047284881B0016841F46B -:108D3000801101603F21006800F4801000900098CD -:108D4000234841604161016841F47C11016002697E -:108D500042F47C120261016841F03F010160026946 -:108D600042F03F02026101B0704738B5044603F09B -:108D7000CFFA14F1010F054609D001F0C2FC241806 -:108D800005E01448016821F00401016030BF03F0E0 -:108D9000BFFA401BA042F4D331BD00004800005888 -:108DA0004C0000581040005890000058FECAFECAFF -:108DB00080080058002800401C1F002000040058B4 -:108DC0005875FF1F701B00200038014050000058EC -:108DD000040C005810ED00E070470000E0B505A05D -:108DE000042100908DF8041042F629206946FFF70F -:108DF00058FA07BD53544D0010B500782B4C18B1EC -:108E000002280FD004D310BDA0800120207310BD14 -:108E1000607B00F06BFA607BBDE8104040F601011A -:108E200000F0B3BA607BBDE8104000F05FBA10B547 -:108E30000FF2450200210220FCF7BFF81B4C002175 -:108E4000042021732070214642F63820FFF764FC8D -:108E50001F20E07204F10D010A20A0800120A07201 -:108E60004FF48060E0800122BDE810400FF245031E -:108E7000002000F015BA00000D480C490068CA7ABD -:108E800000F00700413048801307087B04D518B96B -:108E90008888401D888003E0012804BF00200873F3 -:108EA000891C42F63720FFF737BC0000841F0020E2 -:108EB0002828004000210220FCF78CB8DFF83C1580 -:108EC0000A6892B200E00246086880B28242FAD193 -:108ED00070472DE9FC4104461825DFF82485DFF8AA -:108EE0002465684308EB00073078062808D13178FC -:108EF0007170347078754FF0FF307060002039E089 -:108F000000F077F8B9680918B96008F10803B96882 -:108F100032786A439A589142327813D308F1150394 -:108F200015FB02FC13F80C30062B25D008F10806BF -:108F30006B43F358994222BF08F115036A439A5CC8 -:108F4000EED219E01146337869439A420BD008F10A -:108F5000140308F1150C5B5C15FB03F50CF80540D8 -:108F60007A753B7500E07A7508F114025454317833 -:108F700071703470BDE8F6811146694308F115033C -:108F80005B5C062B04D008F1140615FB03F5745541 -:108F90007B753A7508F115025454EBE7F8B5DFF824 -:108FA0006434DFF85C541E78182402466243B042F1 -:108FB0002A4404D118785870507D18700FE0167D3F -:108FC000507D92F815C005F115076643062807F88D -:108FD00006C004D0167D143514FB00F42E55012074 -:108FE00010731878062802BF00294FF0FF3159602E -:108FF000F1BD10B5DFF80C44606810F1010F0FD01F -:10900000FFF75CFF6168DFF80024814261683CBFC4 -:109010005388C918081A517848431178C84000E0AD -:10902000002080B210BD2DE9F84FDFF8DC53DFF8E7 -:10903000DCB3D5F80880D8F80000DBF800104A054A -:1090400000F090F9DFF8BC63DFF8B4A321F480618D -:1090500081604FF0180934780AF1080019FB04F117 -:109060004758FFF7C6FF874217D200270121B1708A -:10907000062C3DD019FB04F40AF108010AF108029C -:109080000959814223BF0AF108010959091A00212F -:1090900011510AEB04014C7DEAE7A9884118B94255 -:1090A00002D2AF880021E2E73F1ADFE7022802DAA6 -:1090B0002878012800D07F1ED8F80000C1684A0730 -:1090C000FAD500F055F9DBF80C00000CBFB247EA06 -:1090D0000047CBF80C70FFF7F1FE7060A8680068DD -:1090E000816841F480618160AFF30080BDE8F18F59 -:1090F000B8B20028DAD1FFF7E1FE70600320BDE8C6 -:10910000F24F01F089BD2DE9F843EFF3108872B6F4 -:10911000BD4DBB4BA8680168CA224A625320486211 -:10912000B84A886820F4806088601820167837462E -:1091300047431F44387B022826D13C68D7F810905B -:109140009078F0B17A7B012A0AD101213046FFF7ED -:1091500025FF88F310887968304600F016F904E09E -:1091600088F31088304600F0C1F8A8680068CA216A -:1091700041622246532141624846314600F050F98F -:109180000BE0FFF750FF06E0C8684207FCD500F08F -:109190007EF89F49086088F31088FF21A86802685C -:1091A0005162BDE8F183F8B5974CA160CA22096805 -:1091B0004A6253224A62954A136843F020031360BF -:1091C000136803F00703C3F10403237095682D0CA3 -:1091D00005F07F056D1C6570EDB29268C2F30E025A -:1091E000521C628092B2521E6A43A2F5A072DA400B -:1091F0004FF6FF739A422CBFA380A280854A136862 -:1092000043F400231360844B1D6845F400251D6062 -:1092100048BB7C487A4E0123837018254FF0FF33FA -:10922000436000235FFA83FC06F10C0715FB0CFC7E -:109230004FF0000E07F80CE05B1CDFB2062FF1DBED -:1092400006230370886820F48060886000F01FF8AF -:10925000D060032001F0EBFCA1680868826842F44A -:109260008042826005E0C868410544BF032001F0E8 -:10927000D3FCA1680A68FF2050620022032103206A -:1092800001F07EFCBDE8F240032001F097BCC86805 -:1092900000F0800060F49060C8604FF400207047D8 -:1092A000F0B504460025EFF3108672B61827DFF8F4 -:1092B00050C10CF10C0007FB05FE10F80E0010B1B8 -:1092C0006D1C062DF5DB062D0CD06F430CEB070053 -:1092D0000127077386F310880461427303600D70E1 -:1092E0000020F0BD86F310880120F0BDF8B50746D8 -:1092F000EFF3108472B6032001F06BFC424DAE68B0 -:109300003068CA2141623A465321416218204349DC -:109310004243895C02291BD100213846FFF73EFEFB -:109320003848017806290ED1306838490A68530553 -:1093300000F018F821F480618160C1684A07FCD50B -:1093400000F016F804E04078884218BFFFF76BFE83 -:10935000A9680A68FF205062032001F02FFC84F303 -:109360001088F1BD02D5C1684A07FCD481687047F6 -:10937000C16801F0800161F49061C1604FF4002088 -:1093800023490860032001F052BC2DE9F0418046DA -:109390000F46424618201A4942438C18207B022867 -:1093A00004BF4046FFF7A2FFEFF3108572B603201B -:1093B00001F00FFC144EB0680068CA2141625321CD -:1093C000416202202073A76067604046FFF781FD7D -:1093D0000C490A784978914202D0FFF724FE02E056 -:1093E000A168081AA060FF20B1680A6850620320D3 -:1093F00001F0E4FB85F31088BDE8F08128280040E7 -:10940000001C002008200020C41F00200828004065 -:109410000C08005800080058800800580C1C002058 -:10942000104700B587B000F072F900F0B2F9812062 -:1094300000F068F900F0C4F900284CBFFF209DF847 -:10944000000007B000BD2DE9F84DC7B09446DDF827 -:1094500040E1519A559D569EDDF84CA1ADF81D1086 -:109460008DF81C004FF0000BADF81FC08DF82130B7 -:109470008DF822E000F024F800F017F824F8095FD6 -:10948000668000F086F93F20832100F0B4F957444C -:1094900006910D37049700F096F900284CBFFF2085 -:1094A0009DF8000048B0BDE8F08D88F800A007AC3A -:1094B0005499E419524608F101005444FBF74BBC9F -:1094C0008DF82320174652998DF800B00DF124082D -:1094D00009A8B844FBF73FBC00B5C7B000F00CF8D2 -:1094E000852000F0C3F800F06BF900284CBFFF2086 -:1094F0009DF8000047B000BD00218DF81C008DF8DC -:109500000010182201A8FBF72CBC2DE9F841C7B0C8 -:109510004FF0000800F026F80DF12300DDF844E1DB -:109520004E9F4F9E509D529C8DF81F30C0F800E01A -:109530008DF800808DF820708DF821608DF8225014 -:109540008DF8274000F025F98620ADF8060007A920 -:109550000C2000F031F900284CBFFF209DF80000DE -:1095600000F07BB98DF81C0007A84170827070472D -:1095700000B5C7B00022ADF81C008DF800200DF139 -:109580001E001822016001A80021FBF7EAFB8820D9 -:10959000ADF8060007A9062000F00EF900284CBF20 -:1095A000FF209DF8000047B000BDF8B5C8B00546E3 -:1095B0000E4617461C4600F023F808A84670877030 -:1095C0008DF8205000F012F98A21ADF80A103F20E2 -:1095D000032100F0FEF8002848BFFF200ED49DF8BC -:1095E000000058B94F994E98BDF801202280BDF86F -:1095F00003200280BDF805000880002049B0F0BDBE -:10960000072200216846FBF7ACBB00B5C7B00021BC -:10961000ADF81C00FFF773FF0F2102918D2002218E -:1096200000F0BDF800F0CDF800284CBFFF209DF8F9 -:10963000000047B000BD18B5C7B0044600F067F899 -:109640008DF81C40224600F0F6F800F0A2F83F200A -:109650008E2100F005F9641C049400F0B4F8002891 -:109660004CBFFF209DF8000048B010BDADF80600CB -:1096700007A901203F2203910490704778B5C7B035 -:1096800006460C4615460322FFF7BBFFADF81C60EB -:1096900000F07FF8902100F01AF80221ADF80400E4 -:1096A000049107A803210390069100F08CF800288C -:1096B00048BFFF2009D49DF8000030B99DF8010093 -:1096C00020709DF802002870002048B070BDADF8F1 -:1096D00006103F207047ADF8060007A9022070472A -:1096E00000B587B000F013F800F053F8922000F0B6 -:1096F00009F800F065F800284CBFFF209DF8000035 -:1097000007B000BDADF806003F22012070470020E1 -:109710008DF80000704700B5C7B000F033F80F2196 -:109720000291932000F03AF800F04BF800284CBF6B -:10973000FF209DF8000047B000BD00B587B0FFF7DF -:10974000E6FF00F026F89420FFF7DCFF00F038F881 -:1097500000284CBFFF209DF8000007B000BD00B5F9 -:10976000C7B00021ADF81C00FFF7C9FE9520FFF738 -:10977000B2FF00F021F800284CBFFF209DF8000048 -:1097800047B000BD00228DF80020ADF81C008DF818 -:109790001E101822002101A8FBF7E3BA0321ADF83F -:1097A0000600049107A801213F220390069170470B -:1097B000ADF8060007A9032004903F220120039181 -:1097C0000690ADF80420CDF814D0002101A8FEF7D2 -:1097D000A0B8ADF80800059108A8072104900791EA -:1097E000CDF818D0002102A8FEF793B81822002166 -:1097F00002A8FBF7B6BAADF80400ADF8061007A84A -:1098000001210390704700B5C7B000F00EF8FFF7D4 -:10981000C0FFA42100F03FF8FFF7D5FF00284CBFA0 -:10982000FF209DF8000047B000BD00228DF8002009 -:109830008DF81C0006220DF11D00FBF78CBA00B557 -:10984000C7B0FFF79FFFA520FFF7B2FF00284CBF6E -:10985000FF209DF8000047B000BD48B0BDE8F08192 -:10986000ADF80400ADF8061007A801210390069199 -:10987000704700B5C7B0FFF7D8FFFFF78AFFAA21EE -:1098800000F009F8FFF79FFF00284CBFFF209DF86C -:10989000000047B000BDADF806103F200721ADF82D -:1098A0000400049107A8012103900691704700006D -:1098B00001460648064AC3798B4218BF904218BF3A -:1098C0000838F8D18B4218BF00207047F873FF1F8B -:1098D0000070FF1F18B50C46C7B0114600228DF866 -:1098E00000208DF81C008DF81D4022460DF11E0051 -:1098F000FBF731FA00F02AF83F200C21ADF8040004 -:10990000ADF8061007A8012103900691A41C049449 -:1099100000F02CF800284CBFFF209DF8000048B054 -:1099200010BD00B5C7B000F00AF80F2000F013F822 -:1099300000284CBFFF209DF8000047B000BD00226A -:109940008DF800208DF81C008DF81D1018220021C4 -:1099500001A8FBF706BAADF8060007A9022004909B -:109960003F22012003910690ADF80420CDF814D0D9 -:10997000002101A8FDF7CDBF1B48704730B45368E4 -:10998000D418042B09DA41B1057804F8015B10F80A -:10999000015B15B15B1C491EF3E7536030BC704797 -:1099A00038B514461D4661B1FFF7E8FF61686A6B80 -:1099B000204690476FF00102811A02D0491E03D061 -:1099C00005E06FF0010032BD4FF0FF3032BD0021E5 -:1099D000616032BDDA6B1047034BE1E7024BF9E7F8 -:1099E0000248704700000000BC10002084100020D6 -:1099F0000278C9B28A421AB11CBF10F8012FF9E7E8 -:109A000018BF00207047000080B508B90FF21C0095 -:109A100005490B681BB122220021984701E002F0A2 -:109A20007DFC222002BD000018200020636F6E73B1 -:109A3000747261696E742068616E646C65723A203C -:109A4000626164206D65737361676500C9B28307E5 -:109A500006D0521E22D310F8013B9942F7D11FE0E5 -:109A6000083A13D302F1040241EA012141EA01411B -:109A700050F8043B121F21BF4B40A3F1013C2CEADC -:109A8000030C1CF0803FF3D0C9B2001F083210F85D -:109A9000013B521E28BF91EA030FF8D818BF0120DE -:109AA000401E704780B5FFF767FF006C02BD0000E5 -:109AB000B3BBD9B1B2F5803F7DD2022A1ED98C4604 -:109AC000B1FBF2F102FB11C31B0443EA1043B3FBE9 -:109AD000F2FC02FB1C3380B240EA0343B3FBF2F01A -:109AE00002FB103240EA0C4000237047022A05D9DD -:109AF0008446B0FBF2F002FB10C270474AB105D1B8 -:109B000000F0010249085FEA30007047002200239C -:109B1000704702F007BC0B000200002100207047D4 -:109B2000904271EB030CF6D3B3F5803F2FD2F0B522 -:109B3000B3FA83F7B1FA81F4A7F10F0E3D1B53403E -:109B4000CEF1200602FA0EF2F3415340B5F10F07B1 -:109B500046D80F3C2C444140C4F12006A040F141BE -:109B60004140B1FBF3F603FB1611A2FB0645001BB7 -:109B7000A94102D2761E8018594180EA010221FAD9 -:109B80000EF362FA0EF200215A403046F0BD30B4B6 -:109B9000B1FBF3FC03FB1C11A2FB0C45001BA9410C -:109BA00003D2ACF1010C8018594130BC02460B467F -:109BB000604600217047B2F1807F65D3F0B5B2FAFC -:109BC00082F7B1FA81F4C7F10F063D1B22FA06F3C2 -:109BD00007F1110EF24120355A40B5F10F07B8D9FF -:109BE0004140C4F12006A040F1414140B1FBF3FCEB -:109BF00003FB1C11A2FB0C45001BA94103D2BCF1C5 -:109C0000010C801859410F2F12D30F3FC90341EAAD -:109C10005041B1FBF3F603FB1611A2FB0645D4EB52 -:109C2000C030A94102D2761E8018594146EACC3C88 -:109C300007B34140C7F12006B840F1414140B1FBB4 -:109C4000F3F603FB1611A2FB0645001BA94102D245 -:109C5000761E8018594180EA010221FA0EF3C7F1FD -:109C6000200462FA0EF20CFA07F05A402CFA04F1C2 -:109C70003043F0BD80EA010221FA0EF3002162FABE -:109C80000EF260465A40F0BD8C46B1FBF2F102FB89 -:109C900011C31B0243EA1063B3FBF2FC02FB1C334B -:109CA0001B024CEA002043EA1063B3FBF2FC02FB08 -:109CB0001C331B024CEA002043EA1063B3FBF2FCA6 -:109CC00002FB1C331B024CEA002043EA1063B3FB87 -:109CD000F2FC02FB1C324CEA00200023704700001B -:109CE000B0B581EA030C0CF0004C40F2FF7515EAA8 -:109CF00011541DBF15EA1357AC42AF4239E0E419C5 -:109D000023EA455343F48013C90241F0004141EA7C -:109D1000505EC7021100A7FB020200284FF00000AE -:109D2000EEFB01204FF00001E3FB072118BF42F0DA -:109D30000102401800214941E3FB0E01A4F58064B3 -:109D40000F0302D252004041494154F101046CDD3D -:109D5000470872F1004250F1000051EB0451A1F5A7 -:109D600080115CBF41EA0C01B0BD4CEA05510020F6 -:109D7000B0BD05EA1357AC4214BFAF4241E050EA10 -:109D8000410E1CBF52EA430E02E061460020B0BD06 -:109D900024423C441BD15FEA070EF6D0090302BF00 -:109DA00001460020AEF1140EB1FA81F7AEEB0704C4 -:109DB00001FA07FE0C37C7F1200100FA07F7C84087 -:109DC0004EEA000E23EA455343F48013A2E733F032 -:109DD0000043B3FA83F704BFB2FA82FE77440B3F25 -:109DE000E41BB7F1200E2FBF02FA0EF3BB40C7F100 -:109DF000200E22FA0EFE38BF43EA0E03BA40641C5E -:109E000082E750EA410E14BF52EA430E6FF00001A0 -:109E10004FF4001717EB430F8ABF194617EB410F9A -:109E2000B5E74CEA05510020B0BDD4F10104B4F10E -:109E300020070FDAC4F12007520828BF42F00102C0 -:109E400010FA07F501FA07F7E1BF2A43E04038436B -:109E5000E1400FE0352C98DCC7F1200452EA4002C3 -:109E600020FA07F218BF42F0010231FA07F0A140D0 -:109E70000A43002172F1004250F1000051EB0C0145 -:109E8000B0BD000010B5144600F002F8226010BD0D -:109E9000C1F30A5343B14A0012F5001F28D2A3F2BE -:109EA000FE32A1EB0251704750EA410C20D001F084 -:109EB000004C31EA0C01B1FA81F204BFB0FA80F330 -:109EC000D2180B3AB2F120032CBF00FA03F19140F3 -:109ED00041EA0C013EBFC2F1200C20FA0CF31943F9 -:109EE0009040524240F2FD33D21A01EB03517047C9 -:109EF000002270474FF4001C1CEB410F94BF1CEB79 -:109F0000430F09E041EA030C50EA4C0C52EA0C0CF6 -:109F100003D2994208BF9042704714BF8B428242DD -:109F2000704700004FF4001C1CEB410F94BF1CEB6A -:109F3000430F09E041EA030C50EA4C0C52EA0C0CC6 -:109F400003D28B4208BF8242704714BF99429042AD -:109F500070470000124254D440F2FF7C1CEA1153B7 -:109F60000FD0634531D09B1863453CBF01EB0251D4 -:109F7000704701F0004141EA0C510020AFF300802E -:109F8000704750EA410320D001F0004C91EA0C01E7 -:109F90001CD0B1FA81F30B3B9A420DD9D21A9940E9 -:109FA00051EA0C01C3F1200C20FA0CFC61449840EA -:109FB000531C40F2FF7CD7E7914041EA0C01C2F10B -:109FC000200C20FA0CF3194390407047B0FA80F34C -:109FD0001533202BE0D3202AEED3203A203B9A429F -:109FE00009D9D21A00FA03F141EA0C010020531CEE -:109FF00040F2FF7CB8E700FA02F141EA0C010020D0 -:10A000007047524240F2FF7C1CEA11530DD0634569 -:10A01000DBD0B2EB030C3CBFA1EB025170470CF15B -:10A02000010221EA035141F4801150EA410CCCD0E5 -:10A0300001F0004C352A27DC30B481EA0C01B2F182 -:10A04000200309DAC2F12003044601FA03F5D040E7 -:10A050002843D1409C400CE0C3F12002450020FA87 -:10A0600003F418BF44F0010421FA03F091400C43BB -:10A07000002174F1004550F1000051EB0C01244225 -:10A0800030BC7FF47BAF70476146002076E700006C -:10A09000C1F30A5340F2FE329B1A14DDD3F12003C0 -:10A0A0004FEAE17208DDC90241EA505141F0004037 -:10A0B000D84080185040704703F2E13010B1D243CD -:10A0C00082F000407047002070470000C11768B15F -:10A0D0004840401AB0FA80F29040D21CC907C2F53D -:10A0E000846241EA025202EBD02140057047000031 -:10A0F00070B44FF0004591EA030F42F115816B40B7 -:10A10000841A71EB030603D2001BB141121973418B -:10A110004FF4001C1CEB410F34BF7CEB430442E0C6 -:10A120000C0DA4EB1356352E4FDC45EAC323DB0A96 -:10A1300045EAC121C912B6F120050DDD63FA05F625 -:10A14000EB4086EA0305124218BF45F00105C0182E -:10A1500051F100010CD213E062FA06F5F2405540CD -:10A16000F3415A40B340F3405A408018594107D355 -:10A1700049085FEA30005FEA350528BF45F0010570 -:10A1800001F58011420875F1004250F1000041EBE9 -:10A1900004514E0016F5001F70BC38BF70470020F8 -:10A1A000090D090570471CEB410F10D252EA430616 -:10A1B0000BD0BCEB410F05D80C0DAB43661E342E03 -:10A1C000B6DD02E0AB438018594170BC704770BCEB -:10A1D00070470000F0B540F2FF7581EA030C0CF007 -:10A1E000004C15EA11541DBF15EA1357AC42AF429B -:10A1F000E5E0BC41C1F31301C3F31303801A994195 -:10A2000043F4801304D2641E400049418018594130 -:10A21000C90241EA5051B1FBF3F603FB1611A2FB50 -:10A220000675D7EBC020A94102D2761E801859418D -:10A23000C90241EA5051B1FBF3FE03FB1E11A2FB20 -:10A240000E75D7EBC020A94103D2AEF1010E8018E4 -:10A250005941890241EA9051760546EA8E2EB1FBBA -:10A26000F3F603FB1611A2FB0675D7EB8020A9417C -:10A2700002D2761E80185941C90241EA50514EEA75 -:10A28000060EB1FBF3F603FB1611A2FB0675D7EB26 -:10A29000C020A94102D2761E80185941C90241EA64 -:10A2A0005051B1FBF3F703FB1711A2FB0735D3EBBA -:10A2B000C020A94167F100070CBF004247F0010729 -:10A2C00066F3D5274FEA1E31B80814F5806412DD15 -:10A2D000BD0775F1004250EB0E5051EB045111F5E2 -:10A2E000801F5CBF41EA0C01F0BD4CF07F6141F082 -:10A2F000E0410020F0BDBD076D0840EA0E5041F47A -:10A300008011D4F10104B4F120060ADAC4F1200668 -:10A310000200E04001FA06F3E1401843B240154361 -:10A320000EE0342C13DCC6F1200445EA40056D082C -:10A3300020FA06F2154321FA06F0A1400D43002150 -:10A3400075F1004250F1000051EB0C01F0BD00200E -:10A350005FEA0C01F0BDCFB992185B41B3FA83F705 -:10A3600004BFB2FA82F6BF190B3FB7F120062FBF28 -:10A3700002FA06F3BB40C7F1200622FA06F638BF00 -:10A380003343BA401CB1E419641E33E77F4231F015 -:10A390000041B1FA81F404BFB0FA80F6A4190B3C75 -:10A3A000B4F120062FBF00FA06F1A140C4F1200647 -:10A3B00020FA06F638BF3143A0403C1B1AE7AC42F6 -:10A3C0001ABF05EA1357AF4212E050EA41061CBF1C -:10A3D00052EA4306BFE750EA4107304661461CBFD8 -:10A3E00041EA0551F0BD52EA430C08BFC143F0BD3C -:10A3F00000204FF4001616EB410F98BF16EB430FE9 -:10A4000008BF16EB410F24BFC14305E016EB430F15 -:10A410000CBF61464CEA0551F0BD0000400D4918E3 -:10A4200040EA81200CD2490DA1F58061491C40F021 -:10A43000004005DBD1F11F0154BFC840C017704771 -:10A4400000207047014648B1B0FA80F18840C91C2D -:10A45000C1F58461090501EBD0214005704700007A -:10A460000249016002490161704700BF33A500083D -:10A4700059A50008006040607047EFF3108172B684 -:10A48000026882420CBF012000201CE0EFF3108222 -:10A4900072B603680B60486001600868416023E0A1 -:10A4A000EFF3108272B6086043684B604160486801 -:10A4B000016019E0EFF3108172B64268036813601F -:10A4C00002684368536081F31088704710B5EFF35A -:10A4D000108472B602680A600068FFE7FFF7EAFFBF -:10A4E00084F3108810BD0B6082F310887047000061 -:10A4F00002F042B86C486D49016001F120024260EF -:10A5000001F13002826001F13C02026201F1440279 -:10A51000426201F14C02C26001F15402026101F198 -:10A520007002426101F1740282618031C16102F006 -:10A5300041B838B504465E4D2846FFF79BFF5A48A0 -:10A540004068A1680160E168C16085605949416067 -:10A5500002F04CF858482AE080B553484268136826 -:10A5600001211972406802F047F8002002BD38B599 -:10A57000514C4F4D04E000F041F8009821688847A5 -:10A580002846FFF77AFF0028F5D031BD4A484168D8 -:10A59000084738B50446494D2846FFF76BFF424847 -:10A5A000C068A1680160456002F02BF8444821684A -:10A5B000016061684160002032BD80B53A48C268E0 -:10A5C000136810211972C06802F021F8002002BD42 -:10A5D00035483B4AC168C16813680868184738B5F0 -:10A5E000374C364D04E000F009F800986168884760 -:10A5F0002846FFF742FF0028F5D031BD69462846BE -:10A60000FFF764BF38B504462E4D2846FFF732FFEA -:10A610002D48FFF72FFF24480069A1688160E16899 -:10A62000C160056121680160616841602169416123 -:10A630006169816131BD80B501462348FFF730FF74 -:10A64000BDE802400FF2050001F0F1BF38B5164C2D -:10A650001D4D06E0FFF7D2FF009920690069FFF762 -:10A660001FFF2846FFF709FF0028F3D031BD10B5C2 -:10A67000164C2046FFF7FEFE0B4841690C60BDE812 -:10A68000104001F0E8BF1CB5104C06E069462046BA -:10A69000FFF71CFF009800F01BF82046FFF7EDFEC7 -:10A6A0000028F3D013BD000000000320AC090320F4 -:10A6B000480A032090080320E81F0020500A0320C6 -:10A6C000F01F0020380A0320E01F0020400A03206A -:10A6D00070470000134810B5016841F480710160B3 -:10A6E000032000F040FA002001F0CEFF00240028F3 -:10A6F00014BF012401F0F2FF204610BD0A48806813 -:10A700007047094800787047084805E00748016825 -:10A7100041F0020101607047016841F001010160F0 -:10A72000704700000040005868100020042004E03A -:10A730002DE9F84F4FF00009644A654B4FF00F08C0 -:10A7400005460E4633E0634FBD4214BF072704277A -:10A750008F4027434CF82E70C1431C6801EA040C5B -:10A760007468E40348BF40EA0C0CC3F800C05C689E -:10A7700001EA040C7468A40348BF40EA0C0CC3F857 -:10A7800004C0146801EA040C7468E40248BF40EA9B -:10A790000C0CC2F800C0546801EA040C716889020C -:10A7A00048BF40EA0C0CC2F804C009F10109316845 -:10A7B00031FA09F077D0012404FA09F414EA01000F -:10A7C000F3D04FEA490C032101FA0CF16FEA010EB4 -:10A7D0007168012918BF022903D0112918BF122955 -:10A7E00011D1A968F7680EEA010107FA0CF739439D -:10A7F000A960696821EA04047168C1F3001101FAD3 -:10A8000009F10C436C60E968B4680EEA010104FACE -:10A810000CF42143E9604FEA89017468022C18BFE7 -:10A82000122C12D14FEAD90405EB840401F01C0765 -:10A83000D4F820A008FA07FB2AEA0B0AD6F810B0D1 -:10A840000BFA07F747EA0A0727622C680EEA0407A3 -:10A85000347904F0030404FA0CF43C432C6074686B -:10A86000E400A2D5DFF870C04FEA990E5CF82E70B4 -:10A8700001F00C0108FA01F427EA0404B5F1904F45 -:10A8800008BF00270ED0154FBD4208BF012709D0D1 -:10A89000134FBD4208BF022704D0124FBD427FF4C0 -:10A8A00052AF032754E7BDE8F18F81B0002A14BFEF -:10A8B0008161816201B070470B4A136803421CBF7B -:10A8C0001060FDF779BC70470000000000080058D8 -:10A8D00080080058001000480800014000040048AB -:10A8E00000080048000C00480C08005810B500246F -:10A8F00088B9114803600E480E4B036001F0AAF8B6 -:10A90000012805D007D3032804D038BF022402E071 -:10A91000012400E00324204610BD00680549884258 -:10A9200004D105490868002818BF00477047000097 -:10A93000701B00200038014014200020264981B0FF -:10A940000A6802430A60096808400090009801B054 -:10A950007047F0B585B005460C4668461421FAF7F5 -:10A96000B5FA0DB9042004E0012D18BF022D02D163 -:10A970000820FFF7E3FF2000184E0FF268070DD103 -:10A9800037F815000090002101910120029002216A -:10A99000039100F01BF80120FEF7E7F9012C13D119 -:10A9A00037F81500009001210D480190029100F048 -:10A9B0000DF80FF23800445D00220F2160B200F064 -:10A9C000DFF860B200F0FAF805B0F0BD694656F85D -:10A9D0002500FFF7ADBE00004C00005874100020A9 -:10A9E0000000211010000100020000000A0607000C -:10A9F0007FB50C464D4D61684D4EE8612962284691 -:10AA000001F058FF2468746006F10800FFF732FD7A -:10AA1000012000F068F801203070296841B10FF280 -:10AA2000E9000FF2ED020090019202946846884717 -:10AA30007FBD1FB53E4C04F10800FFF71EFD00BBB3 -:10AA40002178F1B1694604F10800FFF73FFD37486E -:10AA5000C16949B10098029001228DF8042001A833 -:10AA600088479DF8040000E001202070207818B18C -:10AA70000098FFF7E0FD04E0009904F10800FFF7FB -:10AA800005FD04F10800FFF7F8FC28B9207818B19B -:10AA900004F10800FDF786FB1FBD2DE9F0410546D6 -:10AAA0000E4690461C46002000F01DF8204F7868A6 -:10AAB000A0F80950C672324641460C30F9F7EAFE5A -:10AAC0001A4A136900210020984748F2E800FDF770 -:10AAD00070FB79688A78D21C04F10800F9F7DAFE75 -:10AAE000BDE8F04101201CB51049124C096A20B99B -:10AAF00001B188470020207013BD0120207011B1E2 -:10AB0000BDE81C40084713BD0020FDF74FBB000007 -:10AB100010B50146064C04F10800FFF7C1FC04F132 -:10AB20000800BDE81040FDF73DBB0000401F0020BD -:10AB3000B41F0020282000200248016841F48071E1 -:10AB400001607047000400580901020081B002D47E -:10AB50003C48815405E03C4802F00F02104400F8E4 -:10AB6000041C01B07047394A13684FF6FF01000218 -:10AB70000B4000F4E060184335490843106070470B -:10AB800038B5324B1C68C4F30223C3F10704052C0B -:10AB900028BF04241D1D072D34BF0023DB1E012503 -:10ABA00005FA04F4641E2140994005FA03F35B1E84 -:10ABB0001A401143BDE83440C6E70000010007D445 -:10ABC000012200F01F01234B8A40400943F8202056 -:10ABD000704701000BD4012200F01F011E4B8A4078 -:10ABE000400943F82020BFF34F8FBFF36F8F7047AA -:10ABF00010B5401EB0F1807F01D3012010BD174C6D -:10AC000060600F214FF0FF30FFF79EFF0022A2602F -:10AC100007202060002010BD010007D4012200F0B1 -:10AC20001F010F4B8A40400943F820207047010064 -:10AC300007D4012200F01F010A4B8A40400943F863 -:10AC40002020704700E400E018ED00E00CED00E08B -:10AC50000000FA0500E100E080E100E010E000E023 -:10AC600000E200E080E200E038B5040044D094F84F -:10AC7000210028B9002184F82010204601F0DEFDD3 -:10AC800000F049F8FF2510B100F03FF834E02168EA -:10AC9000DFF8B0008A6802408A6021688A686368C9 -:10ACA00020690343A06903431A438A602168E0686E -:10ACB000086120680169A26841EA024101612068D7 -:10ACC000C16821F08001C1602068C16C89088900D9 -:10ACD000C1642168CA6CE369606903431A43CA64AA -:10ACE00020688168880609D400F020F830B1206817 -:10ACF0004562042100F01FF8012032BD2068456242 -:10AD0000012184F82110002032BD20684562042111 -:10AD100084F821107047022084F82100CA2021689D -:10AD20004862532022685062204626E020460BE00D -:10AD30002068C0F8248084F82110002084F82000C6 -:10AD400070470000BFFF8FFF70B5044640F2E93640 -:10AD50002068C16821F0A001C16001F0D9FA054660 -:10AD60002068C168880606D401F0D2FA401BB042C0 -:10AD7000F6D3032070BD002070BD70B50446206876 -:10AD8000C1684A0612D44FF0FF32C26040F2E93681 -:10AD900001F0BEFA05462068C168480606D401F0F5 -:10ADA000B7FA401BB042F6D3032070BD002070BD3F -:10ADB0004FF0B040006800F0F000B02888BFB0202D -:10ADC00070472DE9F041040054D0207881064FF0FF -:10ADD000B04538D5A868E96810F00C0001F003010F -:10ADE00003D00C2808BF012946D12868800702D566 -:10ADF000E06900283ED0FFF7DBFF616A884207D296 -:10AE0000084600F0D3FB002834D100F075FA0FE0BB -:10AE1000286820F0F000014329606968206A21F465 -:10AE20007F4141EA00216960606A00F0BFFB08BB16 -:10AE300000F095FBDFF810180860DFF810080068D4 -:10AE400001F022FCB0B92078C1070DD5A868E968E7 -:10AE500000F00C00082801F0030103D00C2808BF03 -:10AE600003292DD12868800340F1398160680028CA -:10AE700040F03581012038E2E06980B1296841F075 -:10AE8000010100F047FA06462868800700F1248196 -:10AE900001F03EFA801B0328F6D3032025E2286840 -:10AEA00040084000286001F033FA0646286800F0A8 -:10AEB0001FFAC8D001F02CFA801B0328F6D3ECE768 -:10AEC0006068B0F5803F04D1296841F48031296081 -:10AED00003E02A6822F480322A60606860B101F0E1 -:10AEE00017FA06462868800300F1F98001F010FA8D -:10AEF000801B6528F6D3D0E701F00AFA06462868D9 -:10AF0000400C10F0010000F0EA8001F001FA801B13 -:10AF10006528F4D3C1E701F0FBF9C01B0328C0F09A -:10AF20001281BAE7E06878B1296841F4807100F0D5 -:10AF3000F1F906462868400500F1188101F0E8F9AA -:10AF4000801B0328F6D3A8E7286820F480702860C7 -:10AF500001F0DEF906462868800A10F0010000F0D2 -:10AF6000DC8001F0D5F9801B0328F4D395E701F0CC -:10AF7000CFF9C01B0328C0F00B818EE740F0010021 -:10AF800000F0CEF907467068800700F11C8101F0DF -:10AF9000BFF9C01B0328F6D37FE7706820F00400D8 -:10AFA00000F0BEF907467068C00810F0010000F01C -:10AFB000198101F0ADF9C01B0428F4D36DE7052811 -:10AFC000306806D140F004003060316841F0010182 -:10AFD00005E0400840003060316821F00401316034 -:10AFE000A06841F2893768B101F092F98046306873 -:10AFF000800700F10C8101F08BF9A0EB0800B8424A -:10B00000F5D34AE701F084F98046306800F070F922 -:10B0100000F0FD8001F07CF9A0EB0800B842F4D309 -:10B020003BE701F075F9C01B0328C0F0FE8034E750 -:10B03000B06840084000B06001F06AF90746B068A7 -:10B0400000F056F900F0F58001F062F9C01B03280A -:10B05000F5D322E701F05CF9801B0328C0F01F81C3 -:10B060001BE701F055F9001B0328C0F0398114E7F4 -:10B07000286881010CD4296841F080712960E86852 -:10B0800040F08050E86001F043F9044628688101EF -:10B0900000F12A8101F03CF9001B0328F6D3FCE6FD -:10B0A0000C2931D0286820F080702860E968DFF82A -:10B0B000A00589088900E960E9680140E96001F0BC -:10B0C00027F904462868810140F10E8101F020F93A -:10B0D000001B0328F6D3E0E600F00EF9B3E6207873 -:10B0E00081071AD5A868E96800F00C00042801F06F -:10B0F000030104D00C2808BF02297FF413AF28688D -:10B10000400503D5E06800283FF4B4AE69682069C3 -:10B1100021F0FE4141EA006169602168DFF8346591 -:10B1200011F0180F38D0606900283FF436AFC90617 -:10B1300070687FF523AF800709D4706840F0010084 -:10B1400000F0EEF80746706880077FF5E4AE70689F -:10B1500040F0040000F0E4F80746706800070DD4E2 -:10B1600001F0D6F8C01B0428F7D396E66868216979 -:10B1700020F0FE4040EA01606860CEE77068A16997 -:10B1800020F4706040EA0120706000F0C6F80746C5 -:10B1900000F0ADF87FF4EBAE2078410737D5DFF84B -:10B1A000B8743868C10529D4FFF7C6FC01F0B0F8BF -:10B1B00080463868C10521D401F0AAF8A0EB080048 -:10B1C0000328F6D369E6706820F0040070607068A8 -:10B1D000C00810F00100DFD001F09AF8C01B04286D -:10B1E000F5D35AE600F099F8074600F080F8D3D07E -:10B1F00001F08EF8C01B0328F7D34EE6A0680128A3 -:10B200007FF4DDAE306840F001003060E8E6217880 -:10B2100048060ED5A06A00283FF40AAFB16841F095 -:10B220000101B16001F074F80746B06880077FF54E -:10B23000F8AEE06A002857D0A968EA68022801F051 -:10B240000C017FF42DAF236B02F00300984202BF84 -:10B2500002F07000636B984214D1A36BC2F3062016 -:10B26000984202BF02F47810E36B98420AD1236C33 -:10B2700002F06060984202BF02F06042606C82425D -:10B280003FF4F6AE0C293FF4F5AD286841013FF5D7 -:10B29000F1AD296821F0807100F03CF8064628687D -:10B2A00081013FF5D7AEE968DFF8B003A26B01403A -:10B2B000206B0143606B0143E06B41EA02210143D3 -:10B2C000206C0143606C0143E960286840F08070A5 -:10B2D0002860E96841F08051E96001F019F80446FE -:10B2E000286881017FF5BDAE0020BDE8F08170685F -:10B2F000400810F0010070472968606A21F0F001F1 -:10B30000014329606868216A20F47F4040EA0120F7 -:10B3100068607047296000F0FBBF7068400840001B -:10B32000706000F0F5BF2DE9F8430400884644D072 -:10B33000DFF82C6300F0CBF847D200F0CDF80746D9 -:10B3400000F0C5F841D000F0E3FFC01B0228F7D998 -:10B350000320BAE000F0DCFF401B022843D9F7E7E6 -:10B3600000F0D6FFA0EB090002284CD9F0E700F06E -:10B37000CFFFA0EB0900022854D9E9E700F0C8FF8D -:10B38000401B02285DD9E3E700F0C2FF401B022802 -:10B3900067D9DDE700F0BCFF401B484577D3D7E70E -:10B3A000032802D13968890103E00028396802D1F5 -:10B3B000890762D401E049055FD4012085E000F0EF -:10B3C000A7FFC01B022872D9C2E7207881074FF07F -:10B3D000B0470BD5B968A06821F0F0010143B9600E -:10B3E00000F096FF0546B868C003B3D52078DFF8B3 -:10B3F000545281060AD52968606921F0F0010143A1 -:10B40000FFF788FF814628688003A9D52078410688 -:10B410000BD52968A0690909090141EA1011FFF754 -:10B4200079FF81462868C003A1D5207841070BD554 -:10B43000B968E06821F4E0610143B96000F068FF99 -:10B440000546B868800399D5207801070CD5B868FF -:10B45000216920F4605040EAC100B86000F058FF54 -:10B460000546B86840038FD52078C10717D56068B6 -:10B47000022895D1396889039FD5B968890840EABF -:10B480008100B86041F2893900F042FF0546B86892 -:10B49000616800F00C00B0EB810F7FF47BAF306887 -:10B4A00000F00700804505D200F016F8074600F0CE -:10B4B0000EF884D100F053F8DFF88C110860FFF724 -:10B4C0001DF9BDE8F24301F0DFB8BDE8F283306852 -:10B4D00000F00700404570473168C90848EAC101DB -:10B4E000316000F015BF38B54FF0B0445E4DA16833 -:10B4F00011F00C0106D1FFF75BFCC0F3031055F807 -:10B50000200032BD0429594A05D00829584804D1E1 -:10B510002168C90222D5104632BDE16801F003015D -:10B52000022904D0032904D12168C90207D5104695 -:10B5300005E0FFF73DFCC0F3031055F82000E1687B -:10B54000E268E368C1F306214843C2F30211491CD3 -:10B550005B0FB0FBF1F05B1CB0FBF3F032BD80B5CC -:10B56000FFF7C1FF3F49FFE7424A0968C1F30311F2 -:10B5700052F82110B0FBF1F002BD80B5FFF7EFFFEC -:10B5800000F010F8C1F3022106E080B5FFF7E7FFF5 -:10B5900000F008F8C1F3C22112F8211001F01F01D8 -:10B5A000C84002BD2F49344A0968704770B52E491A -:10B5B000B1282EBFCC6AC0F3031051F820402148B7 -:10B5C000056801F081F92B492C4A05F00F0551F867 -:10B5D0002510B4FBF1F10024B1FBF2F1B0F5007FCE -:10B5E0000FF2B802204609D10FF2940353F820500D -:10B5F0008D4214D2401C0328F8D912E00FF29003B8 -:10B6000053F820508D420AD2401C0328F8D308E09A -:10B6100000F07EFE801B03280CD3032070BD52F87F -:10B6200020400F4D2868C00844EAC000286000F0A0 -:10B630006FFE0646296801F00701A142E8D100200B -:10B6400070BD00000801005880100020701000201C -:10B65000FFFFFEEE90000058000400588C80C111DE -:10B660000040005808000058E4D600080024F40008 -:10B670000048E801A4D6000890DD000840420F0011 -:10B68000120000002400000036000000400000000E -:10B69000060000000C000000100000000000000088 -:10B6A000010000000200000003000000DFF820138A -:10B6B0000A68030903F47F2300019A4300F47F2002 -:10B6C00000F082B9DFF808231368010C23EA014374 -:10B6D00043EA0043136070472DE9F8430546002410 -:10B6E0002878DFF8EC624106A0464FF0B0472DD530 -:10B6F000286B70B1B0F5800F06D0B0F5000F18BF01 -:10B70000B0F5400F17D01FE0F86840F48030F860C3 -:10B71000EDE0386820F08060386000F0F9FD814687 -:10B720003868000140F1D08000F0F2FDA0EB090084 -:10B730000228F5D90324D7E000F0EAFDA0EB0900C8 -:10B74000022840F2C980F5E70124A04628680105D7 -:10B7500031D5B06800F44078286C80452AD0FFF7D6 -:10B76000EBF9B8F1000FB16805D1286C21F44071F4 -:10B770000143B1601EE0B06840F48030B06021F455 -:10B780004071B06820F48030B060286C0143B16033 -:10B79000B068C0070ED500F0BBFD804641F2893984 -:10B7A000B068800706D400F0B3FDA0EB0800484560 -:10B7B000F6D30324A0462878C10705D53168A869C7 -:10B7C000890840EA810131602878810705D5316810 -:10B7D000E86921F44061014331602878C10644BF23 -:10B7E000A86AFFF76FFF2878810644BFE86AFFF771 -:10B7F00069FF2878410744BF286AFFF757FF287878 -:10B80000010744BF686AFFF751FF2868C1051BD5CF -:10B810003168686B21F0406101433160686BB0F1C1 -:10B82000006F00F0BDF8686BB0F1806F75D100F06B -:10B83000BDF804463868000160D500F069FD001BC2 -:10B840000228F7D94FF0030867E000F061FD001B04 -:10B8500002285BD9F6E7316821F04041316020F0E1 -:10B860008050326822F0406210433060A86BB0F123 -:10B87000C05F00F095F8286841056DD53168E86B28 -:10B8800021F0405101433160E86BB0F1005F03D11A -:10B89000F96841F48031F960E86BB0F1805F5BD109 -:10B8A00000F084F804463868000146D500F030FD09 -:10B8B000001B0228F7D94FF003084DE000F028FDE7 -:10B8C000001B022841D9F6E700F061F8A86821F4CE -:10B8D000781100F071F88146386800017FF52CAFCF -:10B8E0003969686901433961002C7FF42EAF3168F2 -:10B8F000286B21F440010143316027E700F047F84D -:10B90000E86821F0606100F057F8044638680001EB -:10B910009BD5396968690143396128688105AAD5D1 -:10B92000A86BB0F1804F1CBFB0F1004F002892D13E -:10B93000316821F04041084397E700F028F8286972 -:10B9400021F0604100F038F8044638680001B5D5B0 -:10B9500039696869014339612868C10405D5F1680E -:10B96000686C21F440410143F160286881040BD5E3 -:10B97000796AE86C21F0300101437962796AA86C38 -:10B98000890840EA810179624046BDE8F28338695E -:10B99000696820F4FE4040EA012038613969704747 -:10B9A00003D1F96841F08071F9607047396821F07E -:10B9B0008061396000F0ACBC01433961386840F007 -:10B9C0008060386000F0A4BC10430860704700003D -:10B9D0008800005838B5040009D004F18005686873 -:10B9E00008B900F01EF800F021F8012801D101206B -:10B9F00032BDA06A08B100F02AF800F00AF821F080 -:10BA00002A01FFE7816000F01BF8BDE8324000F03A -:10BA100002BB2068416821F4904141602068816840 -:10BA2000704700212970204600F065BE2420686020 -:10BA300020680168490849000160204600F086B985 -:10BA40002068016841F001010160204670472046EE -:10BA500000F07EBA70B5044604F1800513466868AC -:10BA600020283CD169B318002BD02878012836D083 -:10BA700001222A7004F1540621653380738000206E -:10BA8000E86021206860706AE8B1DFF8B414C16230 -:10BA9000DFF8B004716A0863716ADFF8AC044863C8 -:10BAA0000020716A88632068216D00F12802706AA5 -:10BAB00000F07BFF38B11020E860002028702020C3 -:10BAC0006860012070BD2168402008620020287055 -:10BAD0002068816841F080018160002070BD0220F3 -:10BAE00070BD816821F040018160704720688168E5 -:10BAF0004A0670472068016821F010010160704714 -:10BB0000F8B5044640F60F002668F1693268B3685C -:10BB1000084004F15C050ED1880602D5900602D4D7 -:10BB2000D80040F180806969002900F00E8120462C -:10BB3000BDE8F4400847DFF80C06034204BFDFF815 -:10BB400008763A426FD0CF0707D5D70505D501272C -:10BB500037622E6B46F001062E638E0708D5DE078E -:10BB600006D5276802263E622E6B46F004062E6339 -:10BB70004E0708D5DE0706D5276804263E622E6BE1 -:10BB800046F002062E630E070AD5960601D403423C -:10BB900006D0266808203062286B40F00800286331 -:10BBA000080509D5500107D526684FF400603062BA -:10BBB000286B40F020002863286B002832D08906CB -:10BBC00007D5900601D4D80003D5696909B120468C -:10BBD0008847286B21688A68510602D410F0280F24 -:10BBE0001BD0204600F093FAFFF780FF10D5FFF737 -:10BBF00078FF286A60B10FF2DD518163286A00F096 -:10BC00004DFF00280ED0286A816BBDE8F44008473C -:10BC10002046BDE8F24001F033B8204601F030F88C -:10BC200000202863F1BD2869012853D1CF0651D5E2 -:10BC3000D0064FD51020306222689068410626D584 -:10BC4000296A0868406880B20028EBD02B889842A7 -:10BC50007BDA6880086801688B0614D4106820F4C9 -:10BC60008070106020688168490849008160206800 -:10BC7000FFF737FF2020E86200202861FFF73AFF36 -:10BC8000286A00F0D5FE29886888091A1CE02888EF -:10BC90006988411A688800281CBF88B2002854D0DF -:10BCA0001368DFF8400523F49073136022689368EB -:10BCB000034093602020E8620020286168612068CA -:10BCC000026822F0100202602046BDE8F44089B20A -:10BCD00000F0D7BFC80209D5580207D54FF480102D -:10BCE00030622046BDE8F24000F010BB080609D5DE -:10BCF000100601D4180205D5A96931B32046BDE864 -:10BD0000F440084748060ED550060CD5306820F0A0 -:10BD1000400030602021A9620020A8612046BDE8D3 -:10BD2000F240FEF7FABD080206D5500004D52046C1 -:10BD3000BDE8F24000F0A6BFC80148BF002A04D504 -:10BD40002046BDE8F24000F09EBFF1BDF8B50446C4 -:10BD5000DFF894042168DFF894C40A68DFF890746F -:10BD60000240A06802432069024360690243E0691F -:10BD700002430A6000254A68E06822F44052024308 -:10BD80004A60A369714A91421CBF206A03438E68CE -:10BD9000DFF86004064033438B600FF26446CB6AE1 -:10BDA000606A1B0940EA0313CB626145DFF848046F -:10BDB0004FF4004339D13F6807F00307032F4DD8F4 -:10BDC000DFE807F0024643494FF0010CE169B1F5A5 -:10BDD000004F4FF6F07740F08080BCF1010F09D0A2 -:10BDE000BCF1020F0AD0BCF1040F71D0BCF1080FF6 -:10BDF00071D099E0FFF7C9FB002815D0626A61682D -:10BE000036F81230B0FBF3F04A0802EB4002B2FB06 -:10BE1000F1F080B2A0F11001B942EAD20740C0F3BC -:10BE2000420007432068C7607FE0914216D13F6817 -:10BE300017F4406723D0B7F5806F09D0B7F5006FCE -:10BE400003D0B7F5406F06D008E04FF0020C07E0D2 -:10BE50004FF0040C04E04FF0080C01E04FF0100C20 -:10BE60009142B3D1BCF1000F09D0BCF1020F0AD04E -:10BE7000BCF1040F15D0BCF1080F15D054E0FFF74A -:10BE80007CFB002851D0616A36F81120B0FBF2F635 -:10BE9000626802EB42018E4246D31103B14205D2E1 -:10BEA00042E0FFF720FBECE71846ECE750080021E2 -:10BEB00010EB062051EB16610023FDF7F9FDA0F50C -:10BEC0004071DFF8382391422ED22268D0602CE0F6 -:10BED000FFF709FB90E7184690E7BCF1010F09D086 -:10BEE000BCF1020F09D0BCF1040F18D0BCF1080F4F -:10BEF00018D019E0FFF749FBB8B1626A36F8123082 -:10BF00006168B0FBF3F000EB5100B0FBF1F080B2E0 -:10BF1000A0F11001B94207D22168C86005E0FFF71F -:10BF2000E2FAE9E71846E8E7012504F16800012193 -:10BF30004180018000218160C1602846F2BD00007F -:10BF40004DC100087BC1000885C100080080004089 -:10BF500090F82810CA0706D502685368C16A23F40E -:10BF600000330B43536090F828108A0706D5026807 -:10BF70005368016B23F480330B43536090F828100F -:10BF80004A0706D502685368416B23F480230B43AC -:10BF9000536090F828100A0706D502685368816B31 -:10BFA00023F400430B43536090F82810CA0606D5CB -:10BFB00002689368C16B23F480530B43936090F83D -:10BFC00028108A0606D502689368016C23F4005392 -:10BFD0000B43936090F828104A0610D50268536806 -:10BFE000416C23F480130B435360416CB1F5801F07 -:10BFF00005D15368816C23F4C0030B43536090F860 -:10C0000028100A0606D501684A68C06C22F400228E -:10C0100002434A607047F8B5044604F180050020E9 -:10C02000E8606FF07E4700F073F90646206801680B -:10C030000A0708D50097334600224FF40011204626 -:10C0400000F017F860B9206801684A070AD5009720 -:10C05000334600224FF48001204600F00AF808B170 -:10C060000320F2BD20206860A8600020E0662870F0 -:10C07000F2BD2DE9F041069C05460E4690461F464E -:10C080002868C1693140B1420CBF01200020404501 -:10C090001CD114F1010FF3D000F03AF9C01B844217 -:10C0A00000D314B900F015F80CE0286801684A07BD -:10C0B000E6D5C1690A05E3D54FF40062026200F0DB -:10C0C00008F8C16000210170032000E00020BDE8F5 -:10C0D000F0812868016821F4D071016028688168C6 -:10C0E00049084900816005F180002021416081609C -:10C0F000704701680A6822F0C0020A6001688A6815 -:10C1000022F400028A602021C0F884107047016880 -:10C110000A6822F490720A60DFF8C8100268936817 -:10C120000B409360C16E012904D101680A6822F0B6 -:10C1300010020A602021C0F888100021C166016742 -:10C14000704700000100001020010004816A0068AF -:10C150000268930644BF0846FEF7DFBB0020A1F843 -:10C1600056000868826822F0800282600868FFE753 -:10C17000016841F0400101607047806A00F084BDB1 -:10C1800000000000F8B5846A04F1840504F1560744 -:10C1900028686E6821688A68110606D5212804D1AE -:10C1A000002038802046FFF7A4FF206881684806F9 -:10C1B00006D5222E04D1002038812046FFF7A7FFA4 -:10C1C000A86840F01000A8602046BDE8F24000F0EA -:10C1D00057BD0000806A00F1560100220A810A80E2 -:10C1E00000F04EBDFEFFFFEFF369FFCF00380140C6 -:10C1F00088000058FFF4FF110024F40000FD0F0038 -:10C20000010002000400060008000A000C001000F3 -:10C21000200040008000000110B500F180010A7884 -:10C22000012A01D1022010BD01230B7024224A6093 -:10C23000026813681468640864001460002242668F -:10C2400023F000530068036020204860002008703D -:10C2500010BD70B500F01EF801D1022070BD00F0D5 -:10C260001FF822F0604209E070B500F013F801D128 -:10C27000022070BD00F014F822F06062114381606A -:10C28000204600F01AF82068066020206860002030 -:10C29000287070BD044604F1800528780128704795 -:10C2A00001222A702420686020680668026852080B -:10C2B0005200026020688268704730B5416E11B943 -:10C2C0000121012214E001680FF230048A688968B4 -:10C2D0000FF23003520E02F00702490F655CA45CB6 -:10C2E000595C9A5CED00E40095FBF1F194FBF2F2ED -:10C2F00068304180028030BD000000000101010370 -:10C300000701000008040204080101017047000051 -:10C3100001484068704700BF68100020012000F00D -:10C32000B5BC000070470000841A71EB030604D20C -:10C330006E40001BB141121973414FF4001C1CEBFD -:10C34000410F34BF7CEB430682E00C0DA4EB135687 -:10C35000362E7BDC012E45EAC32341DC43EA5253EF -:10C3600012BFD20292025B08240545EAC12141EACC -:10C370005051D2EBC020994125D407D1B0FA80F6B4 -:10C3800010FA06F162D00020203608E0B1FA81F6FA -:10C39000B140C6F1200220FA02F21143B0404FEA48 -:10C3A000F474B4EB465434F001064FEA74040AD82E -:10C3B000D6F50016760D04F00044F04061FA06F25E -:10C3C0005040F1404840C00A40EA415021F000414D -:10C3D00028BF5FEA500550F1000044EBD12135E061 -:10C3E000DB0A45EAC121C90AB6F120050EDD42EAA1 -:10C3F0000242120CC5F1200603FA06F6EB4042EAAF -:10C4000006056D42984161F100010DE062FA06F502 -:10C41000F240554063FA06FC82EA0C02F3405A40AF -:10C420006D42904161EB030111F4801F05D1641E40 -:10C43000620502D06D004041494121F4801143085A -:10C4400075F1004350F1000041EB045170BC70479E -:10C450001CEB410F15D223F0004352EA43060BD0E8 -:10C460004FEA4C0CBCEB410F04D80C0D661E342E69 -:10C47000B7DDEBE7801A994150EA410608BF002179 -:10C48000E4E708BF1CEB430F28BF6FF00001DDE7B6 -:10C49000C0680840884201D10120704700207047E1 -:10C4A000C0690840884201D10120704700207047D0 -:10C4B00010B56C4C02212046FFF7F2FF38B16068DE -:10C4C000C043810703D5FEF78AF8022018E0012156 -:10C4D0002046FFF7E5FF38B16068C043C10703D5C8 -:10C4E000FEF745F801200BE008212046FFF7D8FFB2 -:10C4F00038B16068C043010703D5FEF7C4F80820CF -:10C50000A06010BD10B5574C00F033F818B9606842 -:10C51000C043810306D400F02CF830B96068C043F2 -:10C52000810302D5BDE810407AE0082100F022F82E -:10C5300070B96068C04301030AD560684A4940F495 -:10C5400000206060086880474FF40020A06010BDA4 -:10C55000202100F00FF858B96068C043810207D568 -:10C56000606840F400106060BDE81040FEF70EB84F -:10C5700010BD022120468BE73C4881B0016841F4A0 -:10C5800080110160006800F4801000900098384825 -:10C59000016841F4007101603648026842F400729B -:10C5A000026040BF20BF3448016841F4004101608F -:10C5B00001B0704780B53148016841F480110160D5 -:10C5C000006800F48010009000982648016841F04F -:10C5D00001010160026842F4803202602C20FEF703 -:10C5E000EDFABDE802402D20FEF7E8BA24480168C4 -:10C5F000490849000160704722494FF480300860C3 -:10C6000070471F48016821F00201016070471C4813 -:10C610004FF400314160016821F40031016070473E -:10C620001748016841F400310160FDF7D1BF38B50A -:10C6300004460C4D08212846FFF72AFF30B10A486E -:10C640000460686820F40020686031BDA0474FF4A2 -:10C650000021A96031BD0A48016821F0080101608C -:10C6600070470000000C00581020002050010058B6 -:10C67000D4080058200800580C04005850000058F6 -:10C68000040C0058080C005870B50F4E0446307862 -:10C690000025A8B1FEF763FF32784FF47A71B1FB41 -:10C6A000F2F1B0FBF1F0FEF7A3FA48B9102C07D273 -:10C6B000002221464FF0FF30FEF762FAB46000E03E -:10C6C0000125284670BD00BF681000206D4981B06B -:10C6D0000A6802430A600968084008E06A4881B0B5 -:10C6E000016841F400210160006800F4002000901E -:10C6F000009801B0704738B58AB0044668461421E6 -:10C70000F8F7E4FB2068614A614990423ED108682D -:10C71000604D40F001000860096801F001010591D9 -:10C7200005980120FFF7D2FF0C2000900221002085 -:10C730000191029003210820039100F06AF8402043 -:10C7400000F060F8082000F064F8534828601120D9 -:10C7500000F065F808B1FCF73FFB4FF088500690F9 -:10C76000002101200791ADF82010099006A9284664 -:10C7700000F096FA08B1FCF72FFBA567AC62002227 -:10C7800000212520FEF7FCF9252037E0434A90429E -:10C7900036D14868424D40F480404860486800F413 -:10C7A0008040059005980120FFF790FF0220FFF7D9 -:10C7B0008DFF4FF4006000F025F8072000F029F805 -:10C7C000C020009002210120019102900321072046 -:10C7D0000391049069463348FDF7AAFF3248286068 -:10C7E0000F2000F01CF808B1FCF7F6FAA567AC6260 -:10C7F000002200212420FEF7C3F92420FEF7DEF9F1 -:10C800000BB030BD009002210020029003900191F6 -:10C810007047049069464FF09040FDF789BF68600B -:10C820001020A8600020E860802028610020686156 -:10C83000A861E8612862284600F04EB81CB504469D -:10C840001A49206888421CD1FEF776F9FEF774F980 -:10C850001748816B21F4407141F480718163816BD1 -:10C8600041F400418163026842F480620260006822 -:10C8700000F48060009000982046BDE8164000F06B -:10C8800041BA13BD4C0000585000005800800040D1 -:10C890005C000058901D0020440002400038014018 -:10C8A000F01D00200004004844040240002800401D -:10C8B000580000580249016002490161704700BFF9 -:10C8C00093A50008BBA50008DFF80800006800F485 -:10C8D000C06070470004005838B5040001D1012041 -:10C8E00032BD2168DFF87003814204F1240500F0B5 -:10C8F00044F8022068700A68A0686FF30E120243C1 -:10C90000E06802432069024360690243A069024370 -:10C91000E0690243206A02430A60204600F070F991 -:10C92000A068B0F5804F04BF002161602079696A7A -:10C9300000F03F0000F014F838B1052805D2204679 -:10C9400000F078F900F012F803E000202863686333 -:10C95000A8630020A861012068700020287032BD03 -:10C960000860A96AE86A486060687047296B00201F -:10C970000860696BA86B486070470AD2DFF8DC0278 -:10C9800042181423B2FBF3F292002A62DFF8D002BD -:10C9900009E0DFF8D00242181423B2FBF3F2920050 -:10C9A0002A62DFF8C402E8617047F8B5044604F172 -:10C9B000240600253078012801D10220F2BD01278C -:10C9C0003770707801282FD102277770B561206801 -:10C9D00007687F087F000760204600F0F5F82168AF -:10C9E000F06820B10A6842F00E020A6008E00868A8 -:10C9F00020F0040008602068016841F00A0101602D -:10CA0000706A0168CA0303D5026842F4807202604A -:10CA1000306B18B1016841F48071016020680268D0 -:10CA200042F00102026001E0357002252846F2BDA5 -:10CA300081B040B100F124014A78022A05D00420D7 -:10CA4000886100200870012026E00268136823F046 -:10CA50000E0313604A6A136823F48073136000683E -:10CA60000268520852000260012091F82020CB6930 -:10CA700002F01C02904058608A6AC86A5060086BD5 -:10CA800030B1026822F4807202604A6B886B506099 -:10CA9000012048700020087001B0704738B500F1DF -:10CAA000240200245178022903D00420906101243B -:10CAB00028E001680B6823F00E030B6001680D6825 -:10CAC0006D086D000D60516A0B6823F480730B6074 -:10CAD000012192F82030D56903F01C039940696068 -:10CAE000936AD16A5960116B31B10B6823F480737A -:10CAF0000B60536B916B5960012151701470516937 -:10CB000001B18847204632BDF8B500F12401042365 -:10CB1000CA6914680268156891F8206006F01C065E -:10CB200003FA06F73C4210D06F070ED51468A5062D -:10CB300003D4156825F00405156000F03DF8C968B8 -:10CB4000002938D0BDE8F4400847022303FA06F76D -:10CB50003C4213D0AF0711D51468A50605D415685B -:10CB600025F00A05156001224A7000F025F8002220 -:10CB70000A708968F9B1BDE8F4400847082303FA50 -:10CB800006F6344217D02B0715D5136823F00E0391 -:10CB90001360012291F82030CC6903F01C039A4005 -:10CBA000626001228A614A7000220A70096911B12B -:10CBB000BDE8F4400847F1BD91F82020CC6902F0AF -:10CBC0001C0293406360704778B5C56C046D6C605F -:10CBD000446D14B1846DC56D6560012590F84440C5 -:10CBE000066C04F01C04A5407560046863608068EE -:10CBF000102802D1A260E16071BDA160E26071BD48 -:10CC0000416C0268144B89089A4234BF174B184B89 -:10CC100003EB8101816402F0FF02083A1421B2FBA8 -:10CC2000F1F1144AC26401F01F01012202FA01F17C -:10CC3000016570470179104A01F03F0102EB810262 -:10CC40004265491E0D4A826501F0030101228A40B6 -:10CC5000C26570470000000008040240F8FFFDBFF5 -:10CC600000000240F8FBFDBF000402400008024043 -:10CC70001C08024080080240FC08024040090240B3 -:10CC800070477047704770477047000080B5AFF33A -:10CC90000080024A11001820ABBEFBE7260002000C -:10CCA00018B500F12402507801281BD11378012B0C -:10CCB00001D1022012BD536A10701C680A4804405A -:10CCC00008680443C868401E44EAC04448680443F6 -:10CCD000087A497A44EA004444EA41241C6000206E -:10CCE000107012BD012012BDFFFD00E08A60FF211F -:10CCF00002685162012180F82110002180F8201083 -:10CD00000020704790F82010012901D102207047BF -:10CD1000012280F82020022180F82110CA21026817 -:10CD2000516253210368596201688A6842F0200207 -:10CD3000FFF7DCBF53564343544C5F4170705F4E66 -:10CD40006F74696669636174696F6E000D0A0D2AFC -:10CD50002A20444953434F4E4E454354494F4E2099 -:10CD60004556454E54205749544820434C49454E5A -:10CD70005420646973636F6E6E656374696F6E20AF -:10CD8000526561736F6E3D3078253032582073756F -:10CD900063657373200A0D000D0A0D2A2A20444989 -:10CDA00053434F4E4E454354494F4E204556454EF2 -:10CDB00054205749544820434C49454E54206469F7 -:10CDC00073636F6E6E656374696F6E205265617315 -:10CDD0006F6E3D30782530325820436F6E6E65633C -:10CDE00074696F6E207465726D696E61746564201C -:10CDF0006279206C6F63616C20686F7374200A0D18 -:10CE0000000000000D0A0D2A2A20444953434F4ECA -:10CE10004E454354494F4E204556454E54205749A0 -:10CE2000544820434C49454E5420646973636F6EE7 -:10CE30006E656374696F6E20526561736F6E3D300D -:10CE4000782530325820436F6E6E656374696F6E5B -:10CE5000207465726D696E61746564206475652007 -:10CE6000746F204D4943206661696C757265200AB4 -:10CE70000D0000000D0A0D2A2A20444953434F4E4D -:10CE80004E454354494F4E204556454E5420574930 -:10CE9000544820434C49454E5420646973636F6E77 -:10CEA0006E656374696F6E20526561736F6E3D309D -:10CEB0007825303258200A0D000000000D0A0D2A96 -:10CEC0002A20434F4E4E454354494F4E205550441F -:10CED000415445204556454E542057495448204317 -:10CEE0004C49454E54200A004843495F4C455F4336 -:10CEF0004F4E4E454354494F4E5F55504441544563 -:10CF00005F434F4D504C4554455F53554245565431 -:10CF10005F434F4445205374617475733D307825E9 -:10CF200030325820436F6E6E656374696F6E5F4870 -:10CF3000616E646C653D30782530345820436F6EE7 -:10CF40006E5F496E74657276616C3D307825303461 -:10CF50005820436F6E6E5F4C6174656E63793D302F -:10CF60007825303458205375706572766973696F0F -:10CF70006E5F54696D656F75743D30782530345837 -:10CF8000200A0D004556545F5550444154455F50AA -:10CF900048595F434F4D504C455445200A0000000E -:10CFA0004556545F5550444154455F5048595F437E -:10CFB0004F4D504C4554452C20737461747573204B -:10CFC0006F6B200A000000004556545F55504441E5 -:10CFD00054455F5048595F434F4D504C4554452C84 -:10CFE00020737461747573206E6F6B200A000000EB -:10CFF000526561645F50485920737563636573734C -:10D00000200A000050485920506172616D20205460 -:10D01000583D2025642C2052583D202564200A00CC -:10D020005265616420636F6E66206E6F7420737545 -:10D03000636365657373200A000000004843495F1D -:10D040004C455F434F4E4E454354494F4E5F434F0F -:10D050004D504C4554455F5355424556545F434FE0 -:10D06000444520436F6E6E656374696F6E5F4861FF -:10D070006E646C653D30782530345820526F6C6595 -:10D080003D256420506565725F4164647265737309 -:10D090005F547970653D256420506565725F416419 -:10D0A00064726573733A2530325820253032582027 -:10D0B000253032582025303258202530325820254E -:10D0C000303258200A0D00000D0A0D2A2A20414353 -:10D0D000495F4741505F4C494D495445445F44497D -:10D0E00053434F56455241424C455F565345565463 -:10D0F0005F434F4445200A004143495F4741505F29 -:10D10000504153535F4B45595F5245515F5653450C -:10D1100056545F434F4445203D3D3E204741505FBC -:10D1200050524F435F504153535F4B45595F5245F7 -:10D1300053504F4E534520436F6E6E656374696F55 -:10D140006E5F48616E646C653D30782530345820E0 -:10D150000A0D00000D0A0D2A2A204143495F47416C -:10D16000505F415554484F52495A4154494F4E5FC0 -:10D170005245515F56534556545F434F4445200A2C -:10D18000000000004143495F4741505F534C415606 -:10D19000455F53454355524954595F494E49544997 -:10D1A000415445445F56534556545F434F444520D0 -:10D1B000736C61766520736563757269747920722A -:10D1C0006571756573742069732073756363657326 -:10D1D0007366756C6C792073656E7420746F20743F -:10D1E0006865206D6173746572200A004143495F70 -:10D1F0004741505F424F4E445F4C4F53545F56532C -:10D200004556545F434F4445203D3D3E20474150E5 -:10D210005F50524F435F414C4C4F575F5245424F16 -:10D220004E44200A0D000000414E43535F41707090 -:10D230005F5570646174655F5365727669636500FC -:10D24000696E76616C696420616E63735F636F6E93 -:10D25000746578742E73746174653D2564200A0DBD -:10D26000000000004761747450726F635265710072 -:10D27000414E43535F5345545F444154415F4C45D5 -:10D280004E475448207365742064617461206C6556 -:10D290006E677468202564202564206F6B203D3DF7 -:10D2A0003E6163695F676174745F65786368616E2E -:10D2B00067655F636F6E666967200A006163695F17 -:10D2C000676174745F65786368616E67655F636FDB -:10D2D0006E66696720636D64206F6B200A0D000025 -:10D2E0006163695F676174745F65786368616E67C5 -:10D2F000655F636F6E66696720636D64204B4F20C6 -:10D30000726573756C743D307825303278200A0D63 -:10D3100000000000474154545F50524F435F44495E -:10D3200053435F414E43535F534552564943452053 -:10D330006163695F676174745F646973635F70726E -:10D34000696D6172795F736572766963655F627931 -:10D350005F7575696420636D64206F6B0A0000005F -:10D36000474154545F50524F435F444953435F41D8 -:10D370004E43535F53455256494345206163695FAD -:10D38000676174745F646973635F7072696D617201 -:10D39000795F736572766963655F62795F757569D8 -:10D3A0006420636D64204E4F4B20737461747573F9 -:10D3B000203D307825303258200A0000474154542F -:10D3C0005F50524F435F444953435F414E43535F65 -:10D3D0005345525649434520414E435320536572AD -:10D3E00076696365206973204E4F5420666F756EB1 -:10D3F0006420212121203D3D3E20636F6E6E6563D8 -:10D4000074656420746F20416E64726F696420508B -:10D41000686F6E652F506164200A0D0047415454B7 -:10D420005F50524F435F444953435F414E43535F04 -:10D430005345525649434520414E4353205365724C -:10D4400076696365205B307825303458202D203094 -:10D4500078253034585D20697320666F756E6420BE -:10D46000212121203D3D3E20636F6E6E6563746512 -:10D470006420746F20694F532050686F6E652F5081 -:10D480006164200A0D000000474154545F50524F20 -:10D49000435F444953435F414C4C5F5052494D41B7 -:10D4A00052595F534552564943455320414C4C20F5 -:10D4B000736572766963657320646973636F7665FB -:10D4C000726564205375636365737366756C6C79FC -:10D4D000200A000010B50446AFF30080204600F09B -:10D4E00005F80446AFF30080204610BD7CB500F17E -:10D4F0000F06F608F600B04240D2082E04D20826E5 -:10D5000002E0083000F047F8DFF804512C682100F1 -:10D5100005D1002007E00268B24221D2011D08684F -:10D520000028F8D12068291D0A68824222D0136899 -:10D53000B34238BF111DF7D312E093190B60801B63 -:10D5400054685C600B6818601660096800291DBF8C -:10D5500048680028081D0020286002F1080076BDF8 -:10D5600061B10A681068A0F10803B342E5D25068BF -:10D570000860EAE700F04EF80028C2D1002076BD2E -:10D5800010B5040006D0AFF30080204600F003F889 -:10D59000AFF3008010BD002800D1704750B4A0F157 -:10D5A00008021368072B2BD913F0070F28D1184C4A -:10D5B000616809B18A4202D25160626013E0486832 -:10D5C00000B3904238BF0146F9D31BE0964203D125 -:10D5D0001B180B600A4606E0486810B113449842D5 -:10D5E0000ED350604A60506850B11368D118814220 -:10D5F00006D1002121600168CB181360406850609B -:10D6000050BC704708680E18B242DFD250BC704759 -:10D61000F81F00200749086808B100207047064835 -:10D62000C008C00008600549C908C900091A01609E -:10D63000704700BF1C20002037300020303400200D -:10D640001349002008604FF4E0221248016841F4B9 -:10D65000700101604FF0B041086840F001000860BF -:10D660008A600D480A6802400C480A60036823F08B -:10D6700005030360426852085200426000220848D5 -:10D68000C8600861086820F4802008608A617047DB -:10D6900008ED00E088ED00E0FBFEF6FA940000588B -:10D6A000001004220100000003000000050000003B -:10D6B0000100000001000000060000000A00000058 -:10D6C000200000000200000004000000080000002C -:10D6D0001000000040000000800000000001000079 -:10D6E00000020000A0860100400D0300801A060021 -:10D6F00000350C0040420F0080841E0000093D00F0 -:10D7000000127A000024F40000366E010048E8019F -:10D71000006CDC02000000000000000000000000BF -:10D72000000000002DE9F04107468846387810F0E7 -:10D73000030F16461D4633D0384600F099F878BBE3 -:10D74000B8F1000F1CBFD8E900018619012D2ED1B8 -:10D750003888C10415D5396A07F14402384600F00B -:10D76000A3F83A6B044602B93A69F968384600F002 -:10D770009BF8361B341A7A69F968384600F094F839 -:10D78000261A1EB94DB916F1010F09D097F90300F9 -:10D790002A46314600F08EF8064616F1010F09D1EF -:10D7A0002320AFF300804FF0FF30BDE8F081022D61 -:10D7B000E8D1EBE7388810F4405F0ED07868F86065 -:10D7C00038617861B8617868F86107F144003862BF -:10D7D00007F13000786200203863B8F1000F05D0FF -:10D7E000D8E9020107F13402C2E9000139884CF698 -:10D7F000FF60014039800020BDE8F08170B505462A -:10D80000AFF300802888810415D56E680024EA688B -:10D8100095F903003146914212D2521AF7F727FBCD -:10D8200010F1010F1CBF00283618F0D10FE04DF6A3 -:10D83000FF70014029802846AFF30080002070BDB2 -:10D8400000220021F7F713FB10F1010F00D1012492 -:10D850006868E860A861E861002C2988E7D041F495 -:10D86000007129802846AFF300804FF0FF3070BD73 -:10D87000F8B5A0B9AFF3008000250A4E08244FF098 -:10D88000FF37306820B1FFF7B9FF002848BF3D4699 -:10D89000361D641EF5D1AFF300802846F2BDBDE809 -:10D8A000F240ABE7DC110020914234BF511A002155 -:10D8B000084670473EB504000D00012A02D100F071 -:10D8C00063F807E0022A07D100940020019069461E -:10D8D0000C20ABBE2D1801E0002A0CD1009401955C -:10D8E00069460A20ABBE002805D10022210028008D -:10D8F00000F027F801E00020C04303B030BD000075 -:10D9000010B4314A002113461C6884421EBF491CD2 -:10D910009C6884421EBF491C1C69844209D09C69D2 -:10D92000491C844205D0491C20331029ECD310BC7B -:10D930007047002342F8313002EBC1014B6010BC4C -:10D94000704778B4204C002325462E688E421EBFB7 -:10D950005B1CAE688E421EBF5B1C2E698E4209D0D6 -:10D96000AE695B1C8E4205D05B1C2035102BECD3BE -:10D9700072BC7047054604EBC303012A04BF596813 -:10D980004D195D6072BC704710B40F4A00211346F8 -:10D990001C6884421EBF491C9C6884421EBF491CEF -:10D9A0001C6984420AD09C69491C844206D0491CE7 -:10D9B00020331029ECD310BC0020704702EBC100CB -:10D9C000406810BC70470000101D002010B50446D0 -:10D9D000E068A169884251D3218849F202030B40D3 -:10D9E000022B08D008044CBF4FF400704FF4844061 -:10D9F000014321803BE001F4C042B2F5C04F06D1A3 -:10DA0000A168884203D32046FFF732FF78BB208805 -:10DA100010F4406F02BF606804F14401884217D1DE -:10DA20004FF40070FFF756FD606030B904F1440018 -:10DA30006060E060401CA0600AE0218841F0400185 -:10DA40002180E060606100F500726068A260E061C2 -:10DA500060682061A068A061207841070AD5022291 -:10DA60000021204600F00CF810F1010F02D14FF018 -:10DA7000FF3010BD208840F4C0402080002010BD41 -:10DA800070B504460D461646AFF3008033462A466D -:10DA900000212046FFF746FE05462046AFF30080F2 -:10DAA000284670BD38B504000ED0207810F0030F62 -:10DAB00003D094F90300002809D5AFF30080204675 -:10DAC00000F030F8AFF300804FF0FF3032BD204659 -:10DAD000FFF7CEFE0546AFF300802078410644BF35 -:10DAE000606800F05DF80020606094F9030002288F -:10DAF00004D900F057F808B14FF0FF35E06B48B19A -:10DB000000F05CF808B14FF0FF35E06B00F048F82A -:10DB10000020E063204600F005F8AFF300802846BF -:10DB200032BD000001780A0626D51C4A1368002180 -:10DB3000834203D1002342F821301BE053680121C6 -:10DB400083421EBF022193688342F3D0D36803212E -:10DB500083421EBF042113698342EBD05369052120 -:10DB600083421EBF0621936983421EBF0721D369EA -:10DB70008342DFD000F014B8002101804FF0FF3164 -:10DB8000C17000F144014160C16001614161816186 -:10DB9000C161016200F1300141627047DC11002077 -:10DBA000FFF7EEBC1CB50200009269460220ABBE36 -:10DBB00004001000FFF7A4FE200016BDE0B50090A1 -:10DBC000F7F7F0FA019069460E20ABBE03B000BD36 -:10DBD0007047FEE7FEE7FEE7FEE7704770477047D5 -:10DBE00000F024B80548FEF78FBF0548FDF788BF51 -:10DBF0000448FDF785BF0448FEF786BF901D00204E -:10DC0000701B0020E01A0020F01D00201020FCF7FF -:10DC100053BE0120FCF750BE0220FCF74DBEFBF7BF -:10DC200072BAFEF76FBCFEF743BC000002484168C1 -:10DC300002788918416070476810002038B50C469A -:10DC4000C5B22046AFF30080E068A169884204D3E2 -:10DC50002046FFF7BBFE00280FD4E068401CE060C0 -:10DC600000F8015D2088010503D440050BD50A2D7D -:10DC700009D12046FFF7FCFD28B12046AFF3008014 -:10DC80004FF0FF3032BD2046AFF30080284632BD52 -:10DC900019E050F8042BD30744BFA9F101039A18E7 -:10DCA000091F0023042942F8043BF9D25FEA817C72 -:10DCB000134604D54FF0000CA2F800C09B1CC90706 -:10DCC00044BF0021197050F8041B0029E1D17047AE -:10DCD00038B50D4D0824286800281CBF017811F0C4 -:10DCE000030F05D090F90310002958BFFFF7DAFEA3 -:10DCF0002D1D641EEFD1BDE83840002200214FF0F9 -:10DD0000FF30F7F7B4B800BFDC11002010B50749A9 -:10DD100079441831064C7C44163404E00A68081D26 -:10DD2000114488470146A142F8D110BD2C000000E3 -:10DD3000600000004EF68851CEF20001086840F401 -:10DD400070000860BFF34F8FBFF36F8F4FF000700C -:10DD5000E1EE100A7047000039FFFFFF300E0000AF -:10DD6000FC110020700800003000032000000000BB -:10DD70000770FFFF8C0100009A01000004000020E2 -:10DD8000F76FFFFF49020000060000002800032093 -:10DD90000000000000000000000000000000000083 -:10DDA0000100000002000000030000000400000069 -:10DDB00000F00DF8002801D0FFF7A8FFAFF30080B6 -:10DDC0000020AFF30080FAF7A2FE00F002F8012075 -:10DDD000704700F001B800000746FFF779FF3846AA -:10DDE000FEF754FFFBE738B504460D46284600F021 -:10DDF00005F8A84218BF0024204632BD0149FFF7AC -:10DE00001DBF00BF4C11002001488047014800475A -:10DE100041D6000819DE0008AFF30080FFF78AFF43 -:10DE2000FFF7C6FF00002E004300FFF7FEBFFFF71D -:10DE3000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF716 -:10DE4000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF706 -:10DE5000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7F6 -:10DE6000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7E6 -:10DE7000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7D6 -:10DE8000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7C6 -:10DE9000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7B6 -:10DEA000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7A6 -:10DEB000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF796 -:10DEC000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF786 -:10DED000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF776 -:10DEE000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF766 -:10DEF000FEBFFFF7FEBFFFF7FEBFFFF7FEBF00004C -:10DF0000F002030DFF010001F3FF010001F1FF0129 -:10DF1000F1FF01F1FF01F1FF01F1FF01F1FF01F15B -:10DF2000FF01F1FF01F1FF01F1FF01F1FF01F1FF3D -:10DF300001F1FF01F1FF01F1350152FF01AD3F1089 -:10DF40006D4C102210085003080048000C04F00526 -:10DF500007093D0024DE000804614CF2002614107D -:10DF6000010000280C2158FC021784100020AB107F -:10DF700013E54E7E110143D34E3C210110070104ED -:10DF80000000481100204904524804211BA108F355 -:10DF900011341164100702040101A01E0020F004D6 -:10DFA00052A00421346108129044F2137C485002BC -:10DFB00008020250405250042134610812D844F241 -:10DFC00012C448120424124C04F206942C5200018C -:040000050800DE19F8 +:100A3000496E666F726D6174696F6E2061626F7569 +:100A40007420746865204170702C204E6F77206F81 +:100A50006E6C7920737570706F727420746F20479C +:100A60006574204E616D65206F662041707029208D +:100A70003D3E20414E43535F4745545F4150505FD8 +:100A8000415454524942555445200A0D000000007B +:100A90005246484603F0E6BE2DE9FE4F00270128E6 +:100AA00040F08380DFF8D866DFF8D8860FF2381977 +:100AB000DFF8D4B6ADF80210154606F5837A01E0EA +:100AC000FF1CBFB2BDF80200874270DAE81900F0DF +:100AD00039F9BDF800100029F2D0EC5D0FF22410B6 +:100AE00003F0C0FE1CB90FF26C1003F0BBFEE85D12 +:100AF000441EA4417F1CBFB20197E40FBDF8002043 +:100B0000EF19FF2A09D8B91C504604F020F9BDF8A6 +:100B1000001000200AF8010010E000F019F9014669 +:100B200040F2792301F07EFB00F0E0F8FE22B91CD0 +:100B3000504604F00CF9002086F80402019FBDF82D +:100B40000000C719BF1CBFB28CB1421C812A07DA52 +:100B50005146701D04F0FBF8BDF80000401C05E094 +:100B600080225146701D04F0F2F880203071BDF8EB +:100B700000000028A6D051460FF2EC0003F072FEF0 +:100B8000A0E700F0E5F8014640F2992301F04AFBA6 +:100B900029880FF2DC0003F065FE288844433019F1 +:100BA000002180F8081211203070BDE8F78F06F69A +:100BB00008050C2428886043301890F80B0201289F +:100BC00018BF0528DDD1012028721020307000F0F8 +:100BD000BFF8014640F2972301F024FB0FF2C40056 +:100BE00003F040FEE1E70000414E43535F50617265 +:100BF00073655F476574417070417474725F5265CC +:100C0000737000000D0A2A2A2A2A2A2A2A2A2A2A46 +:100C10002A2A2A2A2A20417070204174747269623B +:100C200075746520496E666F726D6174696F6E20B0 +:100C30005265636569766564202A2A2A2A2A2A2A47 +:100C40002A2A2A2A2A2A2A2A2A2A2A2A2A2A2A0D21 +:100C50000A0000002A2A20446973706C61794E6191 +:100C60006D653A20000000002025730D0A00000089 +:100C7000436F6D6D616E64494447657441707041A6 +:100C8000747472696275746573206E6F74696679C5 +:100C9000456E7472793D25642052656D6F7665648A +:100CA0000A0D000020332E3420506572666F726D7D +:100CB000204E6F74696669636174696F6E20416369 +:100CC00074696F6E203D3E20414E43535F50455244 +:100CD000464F524D5F4E4F54494649434154494F48 +:100CE0004E5F414354494F4E200A0D00BDF800109D +:100CF0000FF20800FF2203F0B5BD000063757420F9 +:100D00007468652041747472696275746549442021 +:100D1000782056616C7565206C656E3D2564203CBD +:100D20003D2073697A656F6628616E63735F636FD8 +:100D30006E746578742E6C697374293D2564200A7D +:100D40000D000000411C0222684604F000B8287023 +:100D5000584604F01BB82DE9FC410546089C0FF2EB +:100D6000A4000E461746984603F07CFD2846FFF780 +:100D7000E5F93046FFF714FA3846FFF7CBFA41465B +:100D80000FF2D80003F06EFD21460FF2E80003F0E9 +:100D900069FD0C22022DDFF8E83311D1002102FB9E +:100DA00001F0184400F502708568A54203D0491C83 +:100DB0008029F4DB24E0002202700FF2D8001BE04F +:100DC000002102FB01F0184400F5027C9CF80000B1 +:100DD00018B1491C8029F4DB12E001208CF80000D6 +:100DE0008CF801508CF802608CF803708CF8048049 +:100DF000CCF808400FF2BC00BDE8FC4103F032BD66 +:100E0000BDE8F3812A2A2A2A2A2A2A2A2A2A2A2AD1 +:100E10002A2A2A204E6F74696669636174696F6E4D +:100E200020536F7572636520426173696320496E58 +:100E3000666F726D6174696F6E2052656365697665 +:100E40006564202A2A2A2A2A2A2A2A2A2A2A2A2A97 +:100E50002A2A2A2A2A2A2A2A2A0D0A002A2A20434A +:100E6000617465676F7279436F756E743A2025649B +:100E7000200D0A002A2A204E6F7469666963617426 +:100E8000696F6E5549443A2030782530386C7820A7 +:100E90000D0A00002A2A206E6F74696679456E7407 +:100EA00072793A2025642052656D6F7665640D0A6B +:100EB000000000002A2A206E6F74696679456E74FE +:100EC00072793A2025642041646465640D0A00004B +:100ED0007CB5AB4C04F608054FF6FF7601462E8034 +:100EE00000220C235343234403F50273187818B1EE +:100EF0009B780B408B4213D0521C802AF1DB288850 +:100F0000B0420CD100F0E8F801464FF43B7302F018 +:100F10001DFA0FF2340003F0A5FC0020207073BD11 +:100F20000020A870D2B20E2020702A8000F0D4F8E1 +:100F3000014640F2E52302F009FA29880FF24C003D +:100F400003F090FCDBE7000020616E63735F636F6A +:100F50006E746578742E6E6F74696679456E7472FE +:100F600079203D3D20494E56414C49445F4E4F54F7 +:100F70004946595F454E545259203D3E20414E430B +:100F8000535F49444C45200A0D000000322E204793 +:100F90006574204D6F72652044657461696C2049E9 +:100FA0006E666F726D6174696F6E20206E6F74690A +:100FB0006679456E7472793D2564203D3D3E204141 +:100FC0004E43535F4745545F4E4F54494649434152 +:100FD00054494F4E5F415454524942555445200A9A +:100FE0000D00000010B5664C40F64401204603F0A9 +:100FF0003BFF00200C210023C2B24A432244401C84 +:1010000082F80832C2B2802AF6DB4FF6FF706080A9 +:10101000A4F80808237000F05FF801464FF443730A +:101020000FF2100202F094F9BDE810400FF2180020 +:1010300003F018BC414E43535F436C69656E745FA7 +:101040005265736574000000414E435320434C4980 +:10105000454E54205245534554200A0D00000000CF +:101060000021082003F078BF80B5DFF8180D03F0E9 +:10107000F9FFDFF8142D0021082003F060FFFFF7CF +:10108000B1FF00F029F8014640F226330FF21002BA +:1010900002F05EF9BDE802400FF21C0003F0E2BB73 +:1010A000414E43535F436C69656E745F4170705F7E +:1010B000496E6974000000002D2D20414E435320DD +:1010C000434C49454E5420494E495449414C495A94 +:1010D0004544200A0D0000002B4803F057BE0820AD +:1010E00003F060BF082003F065BF2DE9F843074611 +:1010F000DFF89480234C0FF294050FF2A80901F059 +:10110000C8FC014640F23E3300F0ECF8BA7839886A +:101110000FF2001003F0A6FB002611E001F0B9FC6D +:1011200001464FF4517300F0DDF807EB8600B0F88C +:101130000530B0F803203146FFF7ABFC761CF6B261 +:10114000B8788642EADB0E480178082916D100F605 +:101150002E06B7F803003080B7F80500708001F064 +:1011600098FC014640F24D3300F0BCF8728831889B +:101170000FF20010BDE8F84303F074BBBDE8F18343 +:1011800000260020A0440008B4440008476174749D +:101190005061727365536572766963657342795500 +:1011A000554944004143495F4154545F46494E44C8 +:1011B0005F42595F545950455F56414C55455F5207 +:1011C0004553505F56534556545F434F4445202D79 +:1011D000204E756D506169723D256420466F756EB5 +:1011E000645F4174747269627574655F48616E64AE +:1011F0006C653D3078253034582C47726F75705FC0 +:10120000456E645F48616E646C653D3078253034AE +:10121000580A0D004143495F4154545F46494E44CA +:101220005F42595F545950455F56414C55455F5296 +:101230004553505F56534556545F434F4445202D08 +:1012400020436F6E6E656374696F6E5F48616E6494 +:101250006C653D3078253034582C4E756D5F6F6667 +:101260005F48616E646C655F506169723D25640A18 +:101270000D0000004143495F4154545F46494E44CC +:101280005F42595F545950455F56414C55455F5236 +:101290004553505F56534556545F434F4445202DA8 +:1012A00020466F756E6420414E43535365727669D4 +:1012B0006365537461727448616E646C653D307827 +:1012C000253034582C414E4353536572766963651B +:1012D000456E6448616E646C653D307825303458E5 +:1012E0000A0D00002A46204603F0BCBA2DE9F04F53 +:1012F0000546DFF8988A87B001F0CBFBDFF8909ABB +:101300000FF2103A014640F25E33FFF7C1FBEB7873 +:10131000AA7829880FF2103003F0A4FA00F074FFC5 +:1013200040F06781A878E978142802F6120204BF19 +:1013300004270C24039291FBF0F106280495C9B20E +:1013400004BF0427002406940020059120E003F048 +:101350001DFD014640F2C333FFF79AFB0FF23C300C +:101360002B46324659460FE045F22B008345404656 +:10137000EDD103F00BFD40F2C1330146FFF788FBCE +:101380002B4632465946204603F06CFA00F042FFE5 +:101390008DF808009DF808400598844280F2378156 +:1013A00004983844857806784178C07845EA002565 +:1013B00046EA012606980499C01908440179407943 +:1013C00041EA002B01F065FB014640F28333FFF751 +:1013D0005FFB019500965B46059A0FF2E8202146D7 +:1013E00003F040FA0398008808B1864201DA0398B6 +:1013F00006800398408808B1A84201DA0398458026 +:10140000BBF5C05F12D10398868040460399CD801A +:1014100003F0BCFC014640F29533FFF739FB0FF2B5 +:10142000E8202B4632464FF4C051ADE741F60100AB +:1014300083450ED103980682404603994D8203F0FE +:10144000A5FC014640F29B33FFF722FB0FF2E4209C +:1014500086E741F6020083450FF2143404D101F00F +:1014600018FB40F29E3388E741F60300834509D11B +:1014700001F00FFB01464FF46873FFF709FB0FF211 +:101480001C306DE741F60400834509D101F001FBF2 +:10149000014640F2A233FFF7FBFA0FF234305FE768 +:1014A00041F60500834509D101F0F3FA01464FF4F6 +:1014B0006973FFF7EDFA0FF24C3051E741F6060081 +:1014C000834509D101F0E5FA014640F2A633FFF762 +:1014D000DFFA0FF2683043E741F60700834509D190 +:1014E00001F0D7FA01464FF46A73FFF7D1FA0FF211 +:1014F0008C3035E741F60800834509D101F0C9FA7F +:10150000014640F2AA33FFF7C3FA0FF2A83027E7EB +:1015100041F60900834509D101F0BBFA01464FF4B9 +:101520006B73FFF7B5FA0FF2BC3019E741F60A000A +:10153000834509D101F0ADFA014640F2AE33FFF721 +:10154000A7FA0FF2DC300BE741F60B00834509D117 +:1015500001F09FFA01464FF46C73FFF799FA0FF20E +:10156000FC30FDE641F60C00834509D101F091FA0B +:10157000014640F2B233FFF78BFA0FF2E030EFE6AC +:1015800041F60D00834504D101F083FA4FF46D73E9 +:10159000F3E641F60E00834509D101F07AFA0146DF +:1015A00040F2B633FFF774FA0FF2D830D8E641F6BE +:1015B0000F00834509D101F06CFA01464FF46E73B8 +:1015C000FFF766FA0FF2F030CAE64FF2314083457A +:1015D0007FF4CAAE0398868340460399CD8303F017 +:1015E000D5FB014640F2BF33FFF752FA0FF2F83055 +:1015F000B6E601F04EFA014640F2CB33FFF748FA67 +:1016000007B0BDE8F04F0FF2104003F02BB900F027 +:10161000D1BF000047617474506172736553657285 +:1016200076696365730000004143495F4154545F2C +:10163000524541445F42595F47524F55505F54599C +:1016400050455F524553505F56534556545F434F84 +:101650004445202D20436F6E6E656374696F6E5F25 +:1016600048616E646C653D3078253034582C417487 +:10167000747269627574655F446174615F4C656E14 +:101680006774683D25642C446174615F4C656E67C6 +:1016900074683D256420210A00000000696E7661AF +:1016A0006C696420555549443D30782530345820C4 +:1016B000666F756E64205B253034582025303458B1 +:1016C0005D210A006E756D536572763D25642F2588 +:1016D000642C73686F727420555549443D307825E9 +:1016E000303458205365727669636548616E646C66 +:1016F00065205B307825303458202D203078253017 +:1017000034585D200A0D00004741505F5345525642 +:101710004943455F555549443D307825303458207C +:10172000666F756E64205B25303458202530345840 +:101730005D210A0047454E455249435F415454528A +:1017400049425554455F534552564943455F5555A7 +:1017500049443D30782530345820666F756E6420DA +:101760005B2530345820253034585D210A000000B4 +:10177000414D535F534552564943455F5555494482 +:101780003D30782530345820666F756E64205B25B7 +:1017900030345820253034585D210A004C494E4BD6 +:1017A0005F4C4F53535F534552564943455F555520 +:1017B00049443D30782530345820666F756E64207A +:1017C0005B2530345820253034585D210A00000054 +:1017D00054585F504F5745525F5345525649434501 +:1017E0005F555549443D30782530345820666F7533 +:1017F0006E64205B2530345820253034585D210A32 +:101800000000000043555252454E545F54494D4527 +:101810005F534552564943455F555549443D3078DD +:101820002530345820666F756E64205B253034583F +:1018300020253034585D210A0000000052454645FD +:1018400052454E43455F5550444154455F54494DC0 +:10185000455F534552564943455F555549443D30D0 +:10186000782530345820666F756E64205B253034DF +:101870005820253034585D210A0000004E45585448 +:101880005F4453545F4348414E47455F534552566A +:101890004943455F555549443D30782530345820FB +:1018A000666F756E64205B253034582025303458BF +:1018B0005D210A00474C55434F53455F53455256EF +:1018C0004943455F555549443D30782530345820CB +:1018D000666F756E64205B2530345820253034588F +:1018E0005D210A004845414C54485F544845524DDB +:1018F0004F4D455445525F534552564943455F55F8 +:101900005549443D30782530345820666F756E64F3 +:10191000205B2530345820253034585D210A0000E2 +:101920004445564943455F494E464F524D415449FF +:101930004F4E5F534552564943455F555549443DC7 +:1019400030782530345820666F756E64205B253002 +:10195000345820253034585D210A0000556E6B6ED6 +:101960006F776E20555549443D30782530345820E6 +:10197000666F756E64205B253034582025303458EE +:101980005D210A0050484F4E455F414C4552545F1F +:10199000534552564943455F555549443D30782596 +:1019A00030345820666F756E64205B2530345820C3 +:1019B000253034585D210A00424154544552595F44 +:1019C000534552564943455F555549443D30782566 +:1019D00030345820666F756E64205B253034582093 +:1019E000253034585D210A00414E43535F53455220 +:1019F000564943455F555549443D30782530345864 +:101A000020666F756E64205B253034582025303495 +:101A1000585D210A000000004143495F4154545F72 +:101A2000524541445F42595F47524F55505F5459A8 +:101A300050455F524553505F56534556545F434F90 +:101A400044452C206661696C6564206E6F20667267 +:101A5000656520696E64657820696E20636F6E6EBF +:101A6000656374696F6E207461626C6520210A0D74 +:101A7000000000002DE9F84F0546DFF810A388B0FC +:101A800001F07EF9DFF808830FF2083901464FF4C0 +:101A9000777300F0C7FBEB78AA7829880FF204303F +:101AA00002F0E0FE00F0B0FB40F05B81EB78A8783C +:101AB000152804BF05270C24072804BF0527002488 +:101AC000194691FBF0F1581EE870C9B202F61A02ED +:101AD0000020039204950794069124E001F050F948 +:101AE000014640F2434300F09DFB0FF224302B46A9 +:101AF0002246314613E042F6A62B5E45EED103980E +:101B000004800398458001F03BF9014640F24143CF +:101B100000F088FB0FF228302B462246594602F08F +:101B2000A1FE00F077FB8DF808009DF808B006983C +:101B3000834580F224810498C01910F8014C017883 +:101B400044EA0124417805918578C078049945EAF2 +:101B500000250798C01908440679407956EA0026FE +:101B60001CBF05980028DCD0002C18BF002DD8D051 +:101B700001F006F901464FF4816300F053FB059B29 +:101B80000FF2F820019500943246594602F06AFEA1 +:101B9000B6F5285F0DD101F0F3F8014640F20C4391 +:101BA00000F040FB0FF240302B4622464FF4285104 +:101BB000B5E742F6012086420FF25C3B0CD101F002 +:101BC000DFF8014640F20E4300F02CFB2B46224684 +:101BD00042F601215846A2E742F6022086420DD184 +:101BE00001F0CEF801464FF4826300F01BFB0FF2C8 +:101BF00058302B46224642F6022190E742F6032057 +:101C000086420BD101F0BCF8014640F2124300F0CD +:101C100009FB2B46224642F60321DBE742F604206D +:101C200086420BD101F0ACF8014640F2144300F0BB +:101C3000F9FA2B46224642F60421CBE742F605206C +:101C400086420ED10398848150460399CD8103F0DA +:101C50009DF8014640F21A4300F0E4FA0FF22430F6 +:101C600045E742F61920864209D101F089F801467C +:101C700040F21D4300F0D6FA0FF24C3037E742F63F +:101C80002B20864209D101F07BF801464FF4846392 +:101C900000F0C8FA0FF2643029E742F60F208642BE +:101CA00009D101F06DF8014640F2224300F0BAFA82 +:101CB0000FF27C301BE742F62920864209D101F061 +:101CC0005FF8014640F2254300F0ACFA0FF29C3079 +:101CD0000DE742F62420864209D101F051F8014671 +:101CE00040F2274300F09EFA0FF2CC30FFE641F2BB +:101CF0000D2086420ED10398048350460399CD836C +:101D000003F044F8014640F22E4300F08BFA0FF244 +:101D1000F030ECE64DF6F30086420ED10398448392 +:101D2000504603990D8403F031F8014640F23443E4 +:101D300000F078FA0FF20840D9E64CF2E9608642EA +:101D40007FF4D9AE03988483504603994D8403F001 +:101D50001DF8014640F23A4300F064FA0FF21840D1 +:101D6000C5E601F00DF8014640F24B4300F05AFA87 +:101D700009B0BDE8F04F0FF2384002F073BD09B072 +:101D8000BDE8F08F872D000871330008B4440008C7 +:101D9000A0440008476174745061727365436861C0 +:101DA000727300004143495F4154545F52454144BE +:101DB0005F42595F545950455F524553505F5653E7 +:101DC0004556545F434F4445202D20436F6E6E654A +:101DD0006374696F6E5F48616E646C653D30782531 +:101DE000782C48616E646C655F56616C75655F50F8 +:101DF0006169725F4C656E6774683D25642C44614F +:101E000074615F4C656E6774683D25640A0D00005F +:101E1000556E6B6E6F776E5F6368617220555549C2 +:101E2000443D30782530345820666F756E64205BF1 +:101E30002530345820253034585D210A0000000038 +:101E400043454E5452414C5F414444524553535FC5 +:101E50005245534F4C5554494F4E5F555549443D9B +:101E600030782530345820666F756E64205B2530DD +:101E7000345820253034585D210A00002D2D20478C +:101E8000415454203A206E756D48646C6556616CFF +:101E90007565506169723D25642C73686F7274209A +:101EA000555549443D30782530345820464F554EDD +:101EB00044204368617250726F7065727469657313 +:101EC0003D307825303458204368617248616E6433 +:101ED0006C65205B307825303458202D20307825F3 +:101EE0003034585D0A0000004741502044455649AF +:101EF00043455F4E414D455F555549443D3078253A +:101F000030345820666F756E64205B25303458205D +:101F1000253034585D210A0047415020415050453A +:101F20004152414E43455F555549443D3078253037 +:101F3000345820666F756E64205B25303458202538 +:101F40003034585D210A0000474150205045524925 +:101F500050484552414C5F505249564143595F46A3 +:101F60004C41475F555549443D3078253034582021 +:101F7000666F756E64205B253034582025303458E8 +:101F80005D210A0047415454205345525649434568 +:101F90005F4348414E4745445F43484152414354A3 +:101FA000455249535449435F555549443D3078257E +:101FB00030345820666F756E64205B2530345820AD +:101FC000253034585D210A00424154544552595F2E +:101FD0004C4556454C5F434841525F555549443D39 +:101FE00030782530345820666F756E64205B25305C +:101FF000345820253034585D210A00004355525290 +:10200000454E545F54494D455F434841525F5555D5 +:1020100049443D30782530345820666F756E642011 +:102020005B2530345820253034585D210A000000EB +:102030004C4F43414C5F54494D455F494E464F52CA +:102040004D4154494F4E5F434841525F55554944B5 +:102050003D30782530345820666F756E64205B25DE +:1020600030345820253034585D210A0044657669A3 +:102070006365496E666F726D6174696F6E536572E8 +:1020800076696365204D414E55464143545552454E +:10209000525F4E414D455F555549443D307825309E +:1020A000345820666F756E64205B253034582025C7 +:1020B0003034585D210A0000446576696365496ED5 +:1020C000666F726D6174696F6E5365727669636570 +:1020D000204D4F44454C5F4E554D4245525F55553E +:1020E00049443D30782530345820666F756E642041 +:1020F0005B2530345820253034585D210A0000001B +:10210000414E43535F4E4F54494649434154494F12 +:102110004E5F534F555243455F434841525F5555BB +:1021200049443D30782530345820666F756E642000 +:102130005B2530345820253034585D210A000000DA +:10214000414E43535F434F4E54524F4C5F504F49A3 +:102150004E545F434841525F555549443D307825C0 +:1021600030345820666F756E64205B2530345820FB +:10217000253034585D210A00414E43535F44415499 +:10218000415F534F555243455F434841525F555558 +:1021900049443D30782530345820666F756E642090 +:1021A0005B2530345820253034585D210A0000006A +:1021B0004143495F4154545F524541445F42595F36 +:1021C000545950455F524553505F56534556545FDE +:1021D000434F44452C206661696C65642068616EDC +:1021E000646C65206E6F7420666F756E6420696E16 +:1021F00020636F6E6E656374696F6E207461626CCC +:102200006520210A0D000000DFF8602D2988508824 +:1022100088427047049881789DF80800CF19FFB272 +:10222000401C70474A46404602F01CBB2DE9F04F67 +:102230000646DFF83C8D87B000F02BFCDFF834ADAC +:102240000FF2783B014640F2594300F01DFCF37851 +:10225000B27831880FF2743002F004FBDFF80C2DF5 +:1022600031885088884240F09781B078012803D1A6 +:1022700002244FF000090425022803D102244FF064 +:102280000C09122502F62802F078DFF8EC7C0292A5 +:10229000E9B2039690FBF1F1CDF81890C9B205951B +:1022A0000020049123E002F071FD014640F2CF438B +:1022B00000F0EAFB0FF270302A4631460FE042F69A +:1022C000A6294E454046EED102F060FD014640F29F +:1022D000CD4300F0D9FB0FF28C302A46494602F07C +:1022E000C1FA059804199DF80400E4B2401C8DF869 +:1022F00004009DF804100498814280F25B810398E9 +:10230000811C00190D5DC078039945EA00250698E7 +:1023100000190A1D165C0844407946EA0026B6F505 +:10232000205F0CD100F0B5FB014640F27C4300F089 +:10233000ABFB0FF274302A464FF42051CFE742F640 +:1023400003094E450ED100203880B880F8807D808A +:1023500000F09FFB014640F2894300F095FB0FF22D +:102360007430BAE7B6F5245F1CBF42F6021086420D +:1023700040D1FD800299B8880A880FF294399042C2 +:102380000FD14D8000F085FB40F29443014600F0F0 +:102390007BFB0095BB887A883146484602F062FA9A +:1023A0009FE70A8A904205D1CD8200F072FB4FF47C +:1023B0009363EBE78A8A904205D14D8300F069FB75 +:1023C00040F29C43E2E74A8A904205D10D8300F037 +:1023D00060FB4FF49463D9E700F05BFB014640F2E9 +:1023E000A24300F051FB0095BB887A880FF24C3075 +:1023F0003146D3E73E80B6F5285FBD800CD100F0B2 +:1024000048FB014640F2AC4300F03EFB0FF26C305B +:102410002A464FF4285162E742F6012086420FF225 +:1024200088390BD100F035FB014640F2AE4300F095 +:102430002BFB2A4642F60121484650E742F602208D +:1024400086420CD100F025FB01464FF4966300F064 +:102450001BFB0FF280302A4642F602213FE742F68C +:10246000032086420AD100F014FB014640F2B24339 +:1024700000F00AFB2A4642F60321DDE742F604207B +:1024800086420AD100F005FB014640F2B44300F059 +:10249000FBFA2A4642F60421CEE742F605208642A0 +:1024A00009D100F0F6FA014640F2B74300F0ECFA29 +:1024B0000FF2583000E742F61920864209D100F0A9 +:1024C000E8FA014640F2BA4300F0DEFA0FF280303B +:1024D000F2E642F62B20864209D100F0DAFA0146F4 +:1024E00040F2BD4300F0D0FA0FF29430E4E642F639 +:1024F0000F20864209D100F0CCFA014640F2BF43DA +:1025000000F0C2FA0FF2A830D6E642F62920864241 +:1025100009D100F0BEFA014640F2C24300F0B4FA1D +:102520000FF2C430C8E642F62420864209D100F0FA +:10253000B0FA014640F2C44300F0A6FA0FF2F030C0 +:10254000BAE641F20D20864209D100F0A2FA014616 +:1025500040F2C74300F098FA0FF21840ACE64DF68F +:10256000F300864209D100F094FA014640F2C943D3 +:1025700000F08AFA0FF240409EE64CF2E960864293 +:102580007FF49DAE00F085FA014640F2CB4300F0A7 +:102590007BFA0FF264408FE600F07BFA014640F2CE +:1025A000D74300F071FA07B0BDE8F04F0FF2844056 +:1025B00002F058B907B0BDE8F08F000047617474AD +:1025C0005061727365446573637300004143495FF2 +:1025D0004154545F46494E445F494E464F5F524511 +:1025E00053505F56534556545F434F4445202D206A +:1025F000436F6E6E656374696F6E5F48616E646C85 +:10260000653D307825782C466F726D61743D256488 +:102610002C4576656E745F446174615F4C656E67CE +:1026200074683D25640A0D0020696E76616C6964EA +:1026300020636861722076616C7565205555494448 +:102640003D307825303458204368617256616C758E +:102650006548616E646C65205B253034585D210AE5 +:1026600000000000202043454E5452414C5F41443D +:1026700044524553535F5245534F4C5554494F4E66 +:102680005F555549443D30782530345820436861C2 +:102690007256616C756548616E646C65205B2530AF +:1026A00034585D210A0000005052494D4152595F93 +:1026B000534552564943455F555549443D30782569 +:1026C0003034582068616E646C653D307825303454 +:1026D000580A0D00726573657420434841524143A6 +:1026E00054455249535449435F555549443D307808 +:1026F00025303458204368617253746172744861A4 +:102700006E646C653D3078253034580A0D00000049 +:10271000757569643D3078253034582068616E6481 +:102720006C653D3078253034582D3078253034585C +:102730002D3078253034580A0D0A0D0020756E6B47 +:102740006F776E5F636861725F6465736320555570 +:1027500049443D3078253034582068616E646C659A +:102760003D3078253034582D3078253034582D3090 +:102770007825303458200A0D0000000047415020D1 +:102780004445564943455F4E414D455F5555494483 +:102790003D30782530345820666F756E64205B2597 +:1027A0003034585D210A00004741502041505045C7 +:1027B0004152414E43455F555549443D307825309F +:1027C000345820666F756E64205B253034585D2167 +:1027D0000A00000047415020504552495048455298 +:1027E000414C5F505249564143595F464C41475F07 +:1027F000555549443D30782530345820666F756E04 +:1028000064205B253034585D210A00002053455276 +:10281000564943455F4348414E4745445F4348411D +:1028200052414354455249535449435F55554944D5 +:102830003D307825303458204368617256616C759C +:102840006548616E646C65205B253034585D0A0014 +:10285000424154544552595F4C4556454C5F43489C +:1028600041525F555549443D3078253034582066F3 +:102870006F756E64205B253034585D210A000000BE +:1028800043555252454E545F54494D455F4348416C +:10289000525F555549443D30782530345820666F95 +:1028A000756E64205B253034585D210A00000000FD +:1028B0004C4F43414C5F54494D455F494E464F5242 +:1028C0004D4154494F4E5F434841525F555549442D +:1028D0003D30782530345820666F756E64205B2556 +:1028E0003034585D210A0000446576696365496E9D +:1028F000666F726D6174696F6E5365727669636538 +:10290000204D414E5546414354555245525F4E412C +:102910004D455F555549443D307825303458206643 +:102920006F756E64205B253034585D210A0000000D +:10293000446576696365496E666F726D6174696F2F +:102940006E53657276696365204D4F44454C5F4E0A +:10295000554D4245525F555549443D3078253034F8 +:102960005820666F756E64205B253034585D210AEF +:102970000000000020414E43535F4E4F54494649EA +:10298000434154494F4E5F534F555243455F43486F +:1029900041525F555549443D3078253034582043E5 +:1029A00068617256616C756548616E646C65205B28 +:1029B000253034585D210A002020414E43535F43A7 +:1029C0004F4E54524F4C5F504F494E545F43484115 +:1029D000525F555549443D3078253034582043687E +:1029E000617256616C756548616E646C65205B252B +:1029F0003034585D210A000020414E43535F44416A +:102A000054415F534F555243455F434841525F55D0 +:102A10005549443D3078253034582043686172561A +:102A2000616C756548616E646C65205B2530345857 +:102A30005D210A004143495F4154545F46494E4479 +:102A40005F494E464F5F524553505F56534556546B +:102A50005F434F44452C206661696C656420686162 +:102A60006E646C65206E6F7420666F756E6420698D +:102A70006E20636F6E6E656374696F6E2074616241 +:102A80006C6520210A0D00005A46504601F0EABE4E +:102A90003870404602F07AB92DE9FC470446DFF869 +:102AA000D0A4DFF8D0840FF2001900F069F90146D4 +:102AB00040F2DF43FFF7B6FB2379628821880FF2EB +:102AC000001001F0CFFEDFF8A40422884188914273 +:102AD0005AD100F638056088298888421DD100F057 +:102AE0004FF9014640F2E643FFF79CFB0FF240101E +:102AF00001F0B8FE6779A679D4F809000090237A2E +:102B0000E27931463846FEF726F937B9F00704D4A2 +:102B10003046FEF7DDF9FEF7A3FA6088A9888842FF +:102B20003FD1657995B900F02BF901464FF4A163C7 +:102B3000FFF778FB0FF2341001F094FE2079411F6B +:102B400004F10A0289B20020FDF774FD012D17D1AE +:102B500000F016F9014640F21453FFF763FB0FF241 +:102B6000741001F07FFEA01D02F0D2FAE11D82B2C6 +:102B70000A442179081A811E89B20120FDF78CFFD1 +:102B8000BDE8F347FEF76CBA00F0FAF8014640F2F0 +:102B90002353FFF747FBBDE8F6470FF2901001F013 +:102BA00061BEBDE8F38700004761747450617273C1 +:102BB000654E6F74696669636174696F6E000000C9 +:102BC0004143495F474154545F4E4F54494649433E +:102BD0004154494F4E5F56534556545F434F444509 +:102BE000202D20436F6E6E656374696F6E5F486160 +:102BF0006E646C653D307825782C4174747269621E +:102C00007574655F48616E646C653D30782530345D +:102C1000582C4174747269627574655F56616C7585 +:102C2000655F4C656E6774683D25640A0D000000A1 +:102C3000312E20496E636F6D696E67204E6F666935 +:102C40006669636174696F6E207265636569766534 +:102C50006420424153494320696E666F726D61740E +:102C6000696F6E203A200A0D00000000332E3120DB +:102C700050617273652044657461696C20496E66A9 +:102C80006F726D6174696F6E206F66204E6F74692C +:102C90006669636174696F6E2041747472696275EC +:102CA00074652C20436F6D6D616E64494447657493 +:102CB0004E6F74696669636174696F6E4174747292 +:102CC00069627574657320526573706F6E73653ACF +:102CD000200A0D00332E3320506172736520446545 +:102CE0007461696C20496E666F726D6174696F6E94 +:102CF000206F66204150502041747472696275746F +:102D0000652C20436F6D6D616E6449444765744165 +:102D10007070417474726962757465732052657362 +:102D2000706F6E73653A200A0D0000004143495FE1 +:102D3000474154545F4E4F54494649434154494FCB +:102D40004E5F56534556545F434F44452C206661B1 +:102D5000696C65642068616E646C65206E6F7420B8 +:102D6000666F756E6420696E20636F6E6E65637446 +:102D7000696F6E207461626C6520210A0D0000008D +:102D8000504602F003B82DE9FC410546012468785D +:102D9000FF2840F0E680B5F80300764E0FF2DC170E +:102DA000DFF8CC8140F60141401A63D0801E74D018 +:102DB000401E30D0401E49D0401E1CD0001F0AD0FB +:102DC000401F53D0401E00F08380401E00F0A880BA +:102DD000401E30D0B7E0FFF75CFE01464FF4A86319 +:102DE0003A4601F091F90FF2B01001F03BFD681D79 +:102DF000FEF77CFAB6E0FFF74CFE014640F247537F +:102E00003A4601F081F90FF2C01001F02BFD681D68 +:102E1000FEF730FEA6E0FFF73CFE014640F24E53BF +:102E20003A4601F071F90FF2C81001F01BFD681D60 +:102E3000FFF7FCF996E0FFF72CFE014640F25553F0 +:102E40003A4601F061F90FF2CC1066E0FFF721FE7F +:102E5000014640F25C533A4601F056F90FF2E81091 +:102E600001F000FD681DFEF740F97BE0681DFFF7EB +:102E700013FE77E0FFF70DFE014640F26E533A462F +:102E800001F042F9B5F80B30B5F80920B5F8071094 +:102E90000FF2E41001F0E6FC64E0FFF7FAFD0146F2 +:102EA0004FF4AF633A4601F02FF9B5F80720B5F8B3 +:102EB00005100FF2282001F0D5FC06208DF8040043 +:102EC00001A8B5F80510ADF8061001F04BFA49E07D +:102ED000E87970B1FFF7DDFD014640F285533A46CF +:102EE00001F012F9EA79B5F805100FF2642001F04B +:102EF000B9FC1E484188B5F80500814203D1002085 +:102F0000FEF7EDF82EE0FFF7C4FD014640F28D53C9 +:102F10003A4601F0F9F80FF2982001F0A3FC21E005 +:102F2000FFF7B7FD014640F294533A4601F0ECF842 +:102F3000A87A00902B89EA79B5F805100FF2C42021 +:102F400001F090FC0EE0FFF7A4FD014640F299531A +:102F50003A4601F0D9F8B5F803100FF25C3001F0F1 +:102F600081FC00242046BDE8F681000000260020F8 +:102F7000B4440008A044000800340020414E4353EC +:102F80005F436C69656E745F4576656E745F48611A +:102F90006E646C6572000000204143495F415454E7 +:102FA0005F524541445F42595F47524F55505F540D +:102FB0005950455F524553505F56534556545F43F1 +:102FC0004F44450A00000000204143495F415454EA +:102FD0005F524541445F42595F545950455F5245E5 +:102FE00053505F56534556545F434F44450A0000C3 +:102FF000204143495F4154545F46494E445F494E26 +:10300000464F5F524553505F56534556545F434FAA +:1030100044450A00204143495F474154545F4449B5 +:1030200053435F524541445F434841525F42595FB9 +:10303000555549445F524553505F56534556545F6A +:10304000434F44450A000000204143495F41545426 +:103050005F46494E445F42595F545950455F56415F +:103060004C55455F524553505F56534556545F4348 +:103070004F44450A000000004143495F4741545412 +:103080005F4154545249425554455F4D4F4449465F +:103090004945445F56534556545F434F444520418C +:1030A0007474725F48616E646C653D3078253034AD +:1030B00058204F66667365743D307825303458204B +:1030C000417474725F446174615F4C656E677468CB +:1030D0003D307825303458200A0D00004143495FC7 +:1030E0004154545F45584348414E47455F4D545500 +:1030F0005F524553505F56534556545F434F4445C6 +:1031000020436F6E6E656374696F6E5F48616E64B5 +:103110006C653D3078253034582053657276657281 +:103120005F52585F4D5455203D202564203D3D3E63 +:1031300020414E43535F4D54555F45584348414EDF +:1031400047455F434F4D504C455445200A00000011 +:103150004143495F474154545F50524F435F434F8F +:103160004D504C4554455F56534556545F434F446C +:1031700045202D20436F6E6E656374696F6E5F48E6 +:10318000616E646C653D3078253034782C45727200 +:103190006F725F436F64653D307825303258202868 +:1031A000307834313A204661696C6564290A0D0033 +:1031B0004143495F474154545F50524F435F434F2F +:1031C0004D504C4554455F56534556545F434F440C +:1031D000452C206661696C65642068616E646C656D +:1031E000206E6F7420666F756E6420696E20636F49 +:1031F0006E6E656374696F6E207461626C65202108 +:103200000A0D00004143495F474154545F45525203 +:103210004F525F524553505F56534556545F434F8C +:10322000444520436F6E6E656374696F6E5F4861DD +:103230006E646C653D307825303458205265715F7E +:103240004F70636F64653D3078253032582041748B +:10325000747269627574655F48616E646C653D3057 +:103260007825303458204572726F725F436F646501 +:103270003D3078253032582028307830353A204992 +:103280006E73756666696369656E742061757468CE +:10329000656E7469636174696F6E2C307830413A81 +:1032A00020417474726962757465206E6F74206653 +:1032B0006F756E64290A0000696E76616C6964201E +:1032C00065636F6465203078253034580A0000004B +:1032D00080B5FDF701FF014640F2AE530FF2280220 +:1032E00000F036F80FF23C0001F0BCFA11208DF826 +:1032F0000000DFF814164888ADF80200684601F0B7 +:1033000031F801BD00000000414E43535F41707031 +:103310005F4B6579427574746F6E32416374696F87 +:103320006E000000526576696577207468652050EC +:10333000726545786973746564204E6F7469666957 +:10334000636174696F6E200A0D0000000FF20802BD +:10335000DFF8B80501F086BA414E43535F4E6F74F3 +:10336000696669636174696F6E5F436865636B006A +:1033700010B5DFF894452078052808D0082808D033 +:103380000E281FD00F281FD010281FD023E00020A8 +:1033900015E0012000F030F8022000F02DF80320A5 +:1033A00000F02AF8042000F027F804F62E00018827 +:1033B00000291EBF4088002802F0A7FB0520BDE8B9 +:1033C000104019E0002002E0012000E00220BDE8EA +:1033D000104000F0A0BEFDF77FFE014640F21C63E6 +:1033E000DFF82C25FFF7B4FF2178DFF82805BDE8CA +:1033F000104001F037BA00002DE9FF47DFF80875EB +:10340000DFF80865DFF81095DFF81085052807F666 +:10341000120547F2305A10D8DFE810F006003E00DF +:10342000B000FE007C01E101042038704FF404621A +:103430007888FA2103F08EF9002840F06282FFF7C5 +:1034400028FB014640F22E6300F05DFE4FF404625B +:10345000FA21DFF8CC0401F005FA052038707888ED +:1034600001F04AFB00F053FE002C404609D101F068 +:103470008DFC014640F2346300F045FEDFF8B80EE3 +:1034800030E201F083FC01464FF4C76300F03BFEDD +:103490002146DFF8A80E32E2082038700021D02043 +:1034A0008DF800008DF801102D208DF802001221FA +:1034B0008DF803101E208DF804004B218DF80510A7 +:1034C0000F208DF80600A4218DF8071099208DF8A3 +:1034D00008004E218DF80910CE208DF80A00B52184 +:1034E0008DF80B1031208DF80C00F4218DF80D10A3 +:1034F00005208DF80E0079218DF80F106A46788826 +:10350000022101F03CFB040040460BD101F03EFCDF +:10351000014640F2476300F0F6FDDFF8240E01F0AB +:10352000A1F90BE001F032FC014640F24B6300F0E0 +:10353000EAFD2146DFF80C0E01F094F95046FDF744 +:10354000D1FDE88BA98B59B900283DD1FFF7A1FA2D +:10355000014640F2516300F0D6FDDFF8EC0DC1E109 +:1035600000283ED0FFF795FA014640F2556300F07F +:10357000CAFDEA8BA98BDFF8D40DC8E007203870AC +:10358000788801F0E2FA00F0C2FD002C40460BD131 +:1035900001F0FCFB014640F2626300F0B4FDDFF88D +:1035A000B00D01F05FF90BE001F0F0FB014640F2D5 +:1035B000666300F0A8FD21460FF2683001F052F971 +:1035C000E88BA98B61B9002840F09B81FFF761FA75 +:1035D000014640F26B6300F096FD0FF2A83081E1E6 +:1035E000002800F08E81FFF754FA014640F26F6325 +:1035F00000F089FDEA8BA98B0FF2D03001F032F98F +:10360000FFF747FA01464FF4CE6300F07CFD6A8A6B +:10361000298A0FF20C407AE00920FFF739FA0146B7 +:1036200040F27B6300F06FFDA88B019000906B88E7 +:103630002A8879880FF23C4001F014F96A882988B9 +:10364000788801F0BFFA00F062FD002C404609D1F5 +:1036500001F09CFB014640F2846300F054FD0FF240 +:10366000844008E001F092FB01464FF4D16300F082 +:103670004AFD0FF2A04001F0F5F8298C00291CBF8B +:10368000E88C00280CD0FFF704FA014640F28D6365 +:1036900000F039FDEA8C298C0FF2A04001F0E2F82D +:1036A000A98C00291CBF688D00280CD0FFF7F1F908 +:1036B000014640F2916300F026FD6A8DA98C0FF25D +:1036C000F04001F0CFF8698C00291CBF288D00283C +:1036D0000CD0FFF7DEF9014640F2956300F013FDD0 +:1036E0002A8D698C0FF22C5001F0BCF8A98A0029B0 +:1036F0001CBFE88A00280CD0FFF7CBF9014640F246 +:10370000996300F000FDEA8AA98A0FF2705001F077 +:10371000A9F8F6E00A20FFF7BBF9014640F2A363DF +:1037200000F0F1FC6A8829880FF2B45001F09AF891 +:103730006A882988788801F056FA00F0E8FC002CA5 +:10374000404609D101F022FB014640F2AB6300F094 +:10375000DAFC0FF2B85008E001F018FB014640F225 +:10376000AF6300F0D0FC0FF2E05001F07BF8A88DC1 +:1037700058B1FFF78EF9014640F2B46300F0C3FC84 +:10378000A98D0FF2F85001F06DF8E88D58B1FFF7F0 +:1037900080F901464FF4D76300F0B5FCE98D0FF2D4 +:1037A000246001F05FF8288E58B1FFF772F90146E6 +:1037B00040F2BC6300F0A7FC298E0FF2486001F0D4 +:1037C00051F8288B0028A4D0FFF763F901464FF485 +:1037D000D86300F098FC298B0FF268608FE001201D +:1037E000298BADF8000031B30D2038706B46788816 +:1037F000022201F031FA00F08AFC002C40460CD184 +:1038000001F0C4FA014640F2D46300F07CFC298B3D +:103810000FF2706001F026F80DE001F0B7FA0146F2 +:1038200040F2D96300F06FFC298B0FF2A0602346B1 +:103830000C2201F017F8288E002830D00C213970A6 +:10384000FFF727F9014640F2E26300F05CFC2A8EA4 +:1038500079880FF2E46001F005F8298E00F04EFC43 +:1038600000F055FC002C40460BD101F08FFA0146C8 +:1038700040F2EB6300F047FC0FF2F86000F0F2FF5B +:103880000DE001F083FA01464FF4DE6300F03BFCEB +:10389000298E0FF2207023460C2200F0E3FFA88D42 +:1038A00000282ED00B213970FFF7F3F8014640F2C3 +:1038B000F96300F028FCAA8D79880FF2647000F09B +:1038C000D1FFA98D00F01AFC00F021FC002C40462D +:1038D0000BD101F05BFA014640F2027300F013FCD9 +:1038E0000FF2807000F0BEFF0BE001F04FFA0146CE +:1038F00040F2067300F007FC21460FF2B07000F0B2 +:10390000B1FFBDE8FF87000000260020A0440008AA +:10391000A8D90008C0D90008E4D90008B4440008B8 +:10392000F0D90008474154545F50524F435F444917 +:1039300053435F414C4C5F5052494D4152595F5384 +:1039400045525649434553206163695F676174740A +:103950005F646973635F616C6C5F7072696D6172E3 +:10396000795F736572766963657320636D64204E59 +:103970004F4B20737461747573203D30782530325D +:1039800058200A00474154545F50524F435F444906 +:1039900053435F414C4C5F5052494D4152595F5324 +:1039A0004552564943455320414E43532053657277 +:1039B00076696365206973204E4F5420666F756E7B +:1039C0006420212121200A0D0000000047415454A9 +:1039D0005F50524F435F444953435F414C4C5F50EB +:1039E00052494D4152595F53455256494345532020 +:1039F000414E43532053657276696365205B30788E +:103A000025303458202D203078253034585D2069F9 +:103A10007320666F756E6420212121200A0D00003D +:103A2000474154545F50524F435F444953435F41B1 +:103A30004C4C5F5052494D4152595F534552564983 +:103A4000434553204741545420536572766963655A +:103A5000205B307825303458202D203078253034C4 +:103A6000585D20697320666F756E642021212120C6 +:103A70000A0D0000414E43535F444953434F56459E +:103A8000525F414C4C5F434841525320636F6E6E0E +:103A9000656374696F6E5F68616E646C653D3078F4 +:103AA0002530345820414C4C536572766963654823 +:103AB000616E646C655B25303458202D20253034D0 +:103AC000585D20414E435353657276696365486182 +:103AD0006E646C655B25303458202D2025303458B9 +:103AE0005D0A0000414C4C2063686172616374653B +:103AF0007269737469637320646973636F76657246 +:103B00006564205375636365737366756C6C7920A7 +:103B10000A0D0000414C4C2063686172616374655A +:103B20007269737469637320646973636F76657215 +:103B300079204661696C6564200A0D004741545440 +:103B40005F50524F435F444953435F414C4C5F4386 +:103B50004841525320414E43534E6F746966696326 +:103B60006174696F6E536F757263654368617253F8 +:103B70007461727448646C653D3078253034582027 +:103B800020414E43534E6F74696669636174696F77 +:103B90006E536F757263654368617256616C7565CB +:103BA00048646C653D307825303458200A0D00009B +:103BB000474154545F50524F435F444953435F4120 +:103BC0004C4C5F434841525320414E43534461742F +:103BD00061536F7572636543686172537461727487 +:103BE00048646C653D3078253034582020414E4380 +:103BF0005344617461536F757263654368617256B3 +:103C0000616C756548646C653D30782530345820AA +:103C10000A0D0000474154545F50524F435F4449DE +:103C200053435F414C4C5F434841525320414E4304 +:103C300053436F6E74726F6C506F696E744368613A +:103C400072537461727448646C653D307825303409 +:103C5000582020414E4353436F6E74726F6C506F07 +:103C6000696E744368617256616C756548646C6511 +:103C70003D307825303458200A0D00004741545417 +:103C80005F50524F435F444953435F414C4C5F4345 +:103C90004841525320536572766963654368616E8B +:103CA00067656443686172537461727448646C65DB +:103CB0003D3078253034582020536572766963652D +:103CC0004368616E6765644368617256616C7565CF +:103CD00048646C653D307825303458200A0D00006A +:103CE000414E43535F444953434F5645525F414C05 +:103CF0004C5F434841525F4445534353205B25305A +:103D00003458202D20253034585D0A00416C6C2039 +:103D10006368617261637465726973746963206456 +:103D2000657363726970746F727320646973636F13 +:103D30007665726564205375636365737366756C2D +:103D40006C79200A0D000000416C6C206368617280 +:103D50006163746572697374696320646573637207 +:103D60006970746F727320646973636F76657279BA +:103D7000204661696C6564200A0D00004741545477 +:103D80005F50524F435F444953435F414C4C5F4443 +:103D90004553435320414E43534E6F7469666963E4 +:103DA0006174696F6E536F757263654368617244C5 +:103DB00065736348646C653D307825303458200A5B +:103DC0000D000000474154545F50524F435F444937 +:103DD00053435F414C4C5F444553435320414E4352 +:103DE00053436F6E74726F6C506F696E7443686189 +:103DF000724465736348646C653D3078253034588F +:103E0000200A0D00474154545F50524F435F4449CC +:103E100053435F414C4C5F444553435320414E4311 +:103E20005344617461536F75726365436861724492 +:103E300065736348646C653D307825303458200ADA +:103E40000D000000474154545F50524F435F4449B6 +:103E500053435F414C4C5F44455343532053657279 +:103E6000766963654368616E67656443686172443F +:103E700065736348646C653D307825303458200A9A +:103E80000D000000536572766963654368616E6773 +:103E90006564436861724465736348646C653D3072 +:103EA0007825303458206E6F74696669636174696F +:103EB0006F6E20656E61626C656420537563636527 +:103EC000737366756C6C79200A0D00005365727609 +:103ED0006963654368616E676564436861724465E0 +:103EE000736348646C653D307825303458206E6FBC +:103EF00074696669636174696F6E20656E61626C76 +:103F00006564204661696C656420424C455F53548A +:103F1000415455535F4E4F545F414C4C4F574544AD +:103F20003D30782530327820726573756C743D3081 +:103F300078253032580A0000414E43535F454E41C8 +:103F4000424C455F4E4F54494649434154494F4EB8 +:103F50005F444154415F534F555243455F4445537D +:103F6000432030782530345820307825303458209C +:103F70000A000000414E435344617461536F7572EF +:103F80006365436861724465736348646C65206E61 +:103F90006F74696669636174696F6E20656E6162D2 +:103FA0006C6564205375636365737366756C6C79B7 +:103FB000200A0D00414E435344617461536F757282 +:103FC0006365436861724465736348646C653D3042 +:103FD0007825303458206E6F74696669636174693E +:103FE0006F6E20656E61626C6564204661696C6508 +:103FF0006420424C455F5354415455535F4E4F54D7 +:104000005F414C4C4F5745443D3078253032782045 +:10401000726573756C743D3078253032580A000033 +:10402000414E43535F454E41424C455F4E4F5449CC +:104030004649434154494F4E5F4E4F5449464943C8 +:104040004154494F4E5F534F555243455F4445538A +:1040500043203078253034582030782530345820AB +:104060000A000000414E43534E6F746966696361F4 +:1040700074696F6E536F75726365436861724465EE +:10408000736348646C65206E6F74696669636174FC +:10409000696F6E20656E61626C6564205375636341 +:1040A00065737366756C6C79200A0D00414E43533D +:1040B0004E6F74696669636174696F6E536F757270 +:1040C0006365436861724465736348646C65206E20 +:1040D0006F74696669636174696F6E20656E616291 +:1040E0006C6564204661696C656420726573756CEB +:1040F000743D3078253032580A00000078886B46CD +:10410000022200F0A9BD4A46304600F0ABBB04468F +:104110005046FCF7E7BF2DE9F84FDE4D0FF280382F +:104120000FF28C4B0FF28C39A0B005F5047405F634 +:10413000080647F2305A0C274FF6FF7120B10228CB +:1041400000F08E8049D3F4E00E2028703088884239 +:1041500001D080280BDB00F002F9014640F21B730E +:104160005A46FEF760F831880FF250408AE000F0BE +:10417000F6F8014640F221735A46FEF754F83088AB +:10418000784321580FF2704000F06CFB30884743B1 +:104190000121E05901908DF808108DF809108DF873 +:1041A0000C108DF810108DF814108DF815108DF876 +:1041B00016108DF817104FF49470ADF80A00ADF892 +:1041C0000E00ADF8120001A984B06846142200F078 +:1041D0006DFB0FBCFCF77EF9ABE00F242C7000F0F8 +:1041E000BEF8014640F23A735A46FEF71CF805F154 +:1041F000860495F885100FF26840224600F032FBE5 +:1042000095F885706846802100F02EFE01208DF81B +:10421000000000216B4605E014F801C003F800C05F +:104220001046491C421CB942C0B2F5DB00211954AA +:10423000D2B2718E688800F0F5FC04465046FCF757 +:1042400051FF002C75D000F08AF801464FF4F1734D +:104250000FF24832FDF7E7FF21460FF2E02011E0B0 +:10426000102028703088884201D080280DDB00F0B3 +:1042700076F8014640F245735A46FDF7D4FF31887F +:104280000FF2204000F0EEFA53E000F068F801462B +:1042900040F24B735A46FDF7C6FF318807FB01F029 +:1042A000002322580FF2384000F0DCFA31880FF278 +:1042B000E42279436058D2E90034CDE900348DF826 +:1042C0000100020A8DF8022002218DF80010020C74 +:1042D000000E8DF804008DF8032000208DF80500F5 +:1042E0006B46718E6888062200F09CFC044650469E +:1042F000FCF7F8FE54B100F032F801464FF4E373D6 +:104300000FF26C22FDF78FFF00F024F800F027F881 +:10431000014640F252735A46FDF785FF31880FF28D +:10432000144000F09FFA30884743E819002180F8D4 +:10433000081221B0BDE8F08F3CDA000860DA00080E +:1043400094DA0008E0DA00083CDB00089CDB000897 +:1043500008DC000821460FF2E41000F083BA48465A +:1043600000F014BD70B501460FF234150A780FF253 +:1043700000460FF24010474C012A0CD0022A1AD0F6 +:10438000032A25D0052A34D0062A3FD0082A51D046 +:10439000112A5DD070BD498861800821217000F02C +:1043A000F5FC014640F2647300F076F80FF2D83065 +:1043B00000F058FA6AE000F0E9FC014640F26C7344 +:1043C00000F06AF80FF2F43000F04CFA02200BE033 +:1043D00000F0DCFC014640F2747300F05DF80FF26F +:1043E000F43000F03FFA03202070BDE87040FCF785 +:1043F000F9BD00F0CBFC014640F27C7300F04CF8B4 +:104400000FF2EC3000F02EFA05201FE000F0BEFCA9 +:10441000014640F2847300F03FF80FF2E83000F0FC +:1044200021FA2078052804BF0020FCF758FE06205A +:10443000207070BD00F0AAFC014640F28E7300F0BF +:104440002BF80FF2E03000F00DFA082020701DE08C +:104450001121217000F09AFC014640F2977300F0A0 +:104460001BF80FF2E03000F0FDF90021C8B20C2279 +:104470005043221802F50272107820B9491CC8B2C4 +:104480008028F3DB70BD9078FCF722FDBDE870401A +:10449000FCF7E6BD002600203246284600F0E2B9CF +:1044A0000D0A205B25735D5B25735D5B25645D20D4 +:1044B00000000000433A5C776F726B737061636554 +:1044C0005C46575F57425F414C4C5F4944455C46F0 +:1044D00069726D776172655C50726F6A656374733F +:1044E0005C502D4E55434C454F2D574235352E4E81 +:1044F00075636C656F5C4170706C69636174696F42 +:104500006E735C424C455C424C455F486561727419 +:10451000526174655F414E43535C53544D33325F77 +:104520005750414E5C4170705C616E63735F636CA9 +:1045300069656E745F6170702E630000206163694D +:104540005F676174745F77726974655F63686172D5 +:104550005F76616C756520636D64204E4F4B2073F0 +:104560007461747573203D307825303258200A000C +:10457000414E43535F436D645F506572666F726D69 +:104580004E6F74696669636174696F6E41637469C3 +:104590006F6E00000200000000000000414E435317 +:1045A0005F436D645F47657441707041747472005D +:1045B000416E637350726F6352657100414E435395 +:1045C0005F4745545F4E4F54494649434154494F14 +:1045D0004E5F41545452494255544520494E56412C +:1045E0004C49445F4E4F544946595F454E545259C9 +:1045F000202564200A0D0000414E43535F47455477 +:104600005F4E4F54494649434154494F4E5F4154D0 +:104610005452494255544520696E74657261637401 +:10462000207769746820694F53204E6F74696669FA +:10463000636174696F6E49442030782530386C7836 +:104640002C207265747269657665206D6F726520C5 +:10465000696E666F726D6174696F6E0A0D0000009D +:10466000414E43535F4745545F4150505F4154545E +:10467000524942555445204170704964656E7469D1 +:10468000666965724C656E6774683D25642041708B +:10469000704964656E7469666965723A2573200AAB +:1046A0000D000000414E43535F504552464F524D5E +:1046B0005F4E4F54494649434154494F4E5F414331 +:1046C00054494F4E20494E56414C49445F4E4F5439 +:1046D0004946595F454E545259202564200A0D0021 +:1046E000414E43535F504552464F524D5F4E4F54DB +:1046F000494649434154494F4E5F414354494F4E07 +:10470000206E6F74696679456E7472793D256420F8 +:104710004E6F74696669636174696F6E49442030D5 +:10472000782530386C782061637449443D256420D5 +:104730000A0D0000414E43535F504552464F524DC3 +:104740005F4E4F54494649434154494F4E5F4143A0 +:1047500054494F4E206E6F74696679456E74727954 +:104760003D25642052656D6F7665640A0D0000007A +:10477000414E43535F4170705F4E6F746966696369 +:104780006174696F6E000000414E43535F434F4EAA +:104790004E4543544544203D3D3E20414E43535FEA +:1047A000444953434F5645525F414E43535F53452F +:1047B0005256494345200A0D00000000414E435324 +:1047C0005F444953434F4E4E454354494E47200A98 +:1047D0000D000000414E43535F444953434F4E4E3A +:1047E0005F434F4D504C455445200A0D00000000DA +:1047F000414E43535F4D54555F55504441544520FD +:104800000A0D0000414E43535F4D54555F455843D8 +:1048100048414E47455F434F4D504C455445200A53 +:104820000D000000414E43535F444953434F5645EA +:10483000525F414E43535F53455256494345200A08 +:104840000D000000203D3D3E20414E43535F434854 +:1048500045434B5F4E4F54494649434154494F4E9F +:10486000200A0D000EB4C0B5024603A80021019035 +:10487000009101AB0121044878440C3002F004F8A7 +:1048800006BC5DF810FB00BFB39D000062B38B0750 +:1048900008D0521E11F8013B00F8013B00F02480C3 +:1048A0008B07F6D1830740F0208000BF103A07D372 +:1048B00030B4B1E83810103AA0E83810F9D230BC62 +:1048C000530724BFB1E80810A0E8081044BF51F80E +:1048D000043B40F8043BD20724BF31F8022B20F8F8 +:1048E000022B44BF0B7803707047121F17D35B0075 +:1048F00009D151F8043B20F8023B1B0C121F20F891 +:10490000023BF6D20BE051F8043B00F8013B1B0AD6 +:1049100020F8023B1B0C121F00F8013BF3D238BFFA +:10492000121D521E24BF11F8013B00F8013BF8D8BC +:10493000704700B587B000208DF8000000F087F9BF +:1049400040F20110ADF806003F220120069000F071 +:10495000F6F900284CBFFF209DF8000007B000BD0D +:104960002DE9F84107460128C7B0884615461E467E +:1049700008BF022003D002280CBF102000200DF138 +:104980001D010C1800F036F8012F8DF81C7002D0B4 +:10499000022F18D019E002273A4641460DF11D00BA +:1049A00000F0D5F92570667000F051F93F204FF402 +:1049B000817100F016F8FF1C049700F0C2F900287E +:1049C00005D5FF2009E01027E6E7972005E09DF8D0 +:1049D000000010B94E9800F067F8FFE748B0BDE856 +:1049E000F081ADF80400ADF8061007A8032103908C +:1049F0000691704703220021684600F0AEB92DE908 +:104A0000F64F0C460546012CC7B09B4608BF022056 +:104A100003D0022C0CBF102000200DF11F010E1836 +:104A2000FFF7E8FF012CADF81C508DF81E4002D0B6 +:104A3000022C2CD02DE00227569C559DDDF850917C +:104A4000DDF84CA1DDF8488148993A4600F0B6F807 +:104A5000A6F800B086F8028086F803A086F80490D5 +:104A60007571B47100F0F3F83F20ADF804004FF415 +:104A7000827107A8ADF80610039003210A37049746 +:104A8000069100F05EF9002805D5FF2009E0102707 +:104A9000D2E7972005E09DF8000010B9579800F084 +:104AA00003F849B0BDE8F08FBDF801100180002087 +:104AB000704730B5C7B01C464A9B00F023F900256B +:104AC0008DF800508DF82140224619460DF1220044 +:104AD00000F03DF900F0BBF83F204FF4837100F087 +:104AE0001CF9A41D049400F02CF900284CBFFF20F1 +:104AF0009DF8000047B030BD00B5C7B000F039F8F0 +:104B000000F017F80F21029140F20B10022100F083 +:104B10000EF900284CBFFF209DF8000047B000BDF3 +:104B20000023ADF81C008DF8003007A8418082807A +:104B30000021182201A800F010B900228DF80020F1 +:104B4000ADF81C008DF81E10704700B5C7B000F01E +:104B500010F8FFF7EEFF0F2102914FF48970022148 +:104B600000F0E5F800284CBFFF209DF8000047B09A +:104B700000BD0021ADF81C008DF80010704718B57D +:104B8000C7B0134600228DF800200229FFF7D8FF96 +:104B90000CBF102402242246194600F00FF800F042 +:104BA00056F840F2131100F02FF800F0CAF8002870 +:104BB0004CBFFF209DF8000048B010BD0DF11F0054 +:104BC00000F0C5B800B5C7B0FFF7AAFF0F210291EA +:104BD00040F2151000F0AAF800284CBFFF209DF805 +:104BE000000047B000BD00B5C7B0FFF799FF0F2127 +:104BF000029140F2171000F099F800284CBFFF20F6 +:104C00009DF8000047B000BDADF806103F2007A991 +:104C1000ADF8040003910F20012102900691E41CDD +:104C20000494704718B5C7B000F02BF800F041F8B5 +:104C300000F00DF84FF48E7100F02DF800F081F8BF +:104C400000284CBFFF209DF8000048B010BD18227E +:104C5000002101A800F081B818B5C7B000F011F824 +:104C600000F027F8FFF7F3FF40F2211100F013F8EE +:104C700000F067F800284CBFFF209DF8000048B006 +:104C800010BD1446ADF81C00002207A88DF80020C6 +:104C9000418004717047ADF806103F2007A9ADF8B8 +:104CA000040003910F20012102900691641D0494D9 +:104CB0007047224619460DF1210000F048B878B53A +:104CC000C7B04C9C4D9D00F01DF800268DF821309A +:104CD0008DF800608DF822402246294600F019F830 +:104CE000FFF7B5FF3F204FF4937100F016F8E41D75 +:104CF000049400F026F800284CBFFF209DF8000027 +:104D000048B070BDADF81C00ADF81E108DF8202025 +:104D100070470DF1230000F01AB8ADF80400ADF8AB +:104D2000061007A801210390069170470621ADF8EF +:104D30000600049107A801213F2203900691ADF8D7 +:104D40000420CDF814D0002101A802F0BCBD10B59C +:104D50000446FFF79BFD204610BD10B504461046E3 +:104D60000A460146204602F03FFE204610BDB1F53E +:104D7000807F02D34FF0FF307047017001207047F1 +:104D80000078401E8041C043C00F704738B55C2199 +:104D9000044602F05CFE254608B15C2105E02F21A7 +:104DA000204602F054FE20B12F21204602F04FFE93 +:104DB000451C284632BD38B5EFF3108472B6284D35 +:104DC0006946281D02F068FF6946281D02F0C2FFEF +:104DD00038B184F31088BDF80010224A03F0A4F81B +:104DE00031BD0120287084F3108831BD80B503F0F7 +:104DF00099F8022100910023194800F124014FF491 +:104E00008052001D02F02FFE01BD00BFF8B5144610 +:104E10000026EFF3108510F1010F1ED001281CBFF2 +:104E200002284FF0FF3618D1BCB1264672B60C4F9F +:104E3000012392B2381D02F02AFE00281CBF3978E7 +:104E4000002908D000223A7085F31088A1B2054AE3 +:104E500003F06AF801E085F310883046F2BD0000E7 +:104E600008140020B74D0008002203F009B970476C +:104E70002DE9FC47604CDFF88491A5692840A061CA +:104E80004FF0FF3A21694FF0010834E0521C54F80A +:104E90003200616919400142F8D0616904EBC20631 +:104EA000084071681840014208BFC6F804A077683E +:104EB000384000F0A5F8606208FA00F08743776098 +:104EC000EFF3108172B6626A206908FA02F2D243E7 +:104ED00010402061022004EBC00353F8086C164018 +:104EE000401E43F8086CF6D181F31088606A59F8C7 +:104EF000201088472169A36960690140194205D0E3 +:104F0000E069216A084208BF0022C0D0C4F824A08A +:104F100003F0CFF8EFF3108972B6216960690140A0 +:104F2000A069014201BFE169206A014203F03FFA32 +:104F300089F3108803F018FCA561BDE8F38738B544 +:104F40001446EFF3108572B600F05AF82B4941F879 +:104F5000204085F3108831BD10B500F00BF80443F4 +:104F60001C6153F83140204343F83100FFE782F3DE +:104F7000108810BDEFF3108272B61F4B1C6970478A +:104F8000EFF3108172B61C4A536923EA000005E072 +:104F9000EFF3108172B6184A53691843506181F3D8 +:104FA00010887047EFF3108172B6134AD369184323 +:104FB000D061F4E7F8B5104C666A256A374616F1F9 +:104FC000010F0EBF0026012101FA06F6206202E061 +:104FD000304603F0EDF9216AE0690842F8D06762D3 +:104FE000EFF3108172B6E269206A8243E26181F3D5 +:104FF00010882562F1BD0000842500209430002037 +:1050000002460020110C090404BF1020120412F003 +:105010007F4F04BF083012020FF2180112F0704FD8 +:1050200004BF001D1201120FC0F11F00895C401A5D +:10503000C0B2704704030202010101010000000038 +:10504000000000001C490020087700221B48027065 +:1050500000F036B818490A7F41F82200087F401C4A +:1050600008777047704770B504466078FF2802BF24 +:10507000B4F8031001F47F41B1F5406F12D100265E +:105080000D4D00E0761C297FF0B288420AD2F1B2C1 +:1050900055F82110204688470100F3D002D002289D +:1050A00005D006E02046BDE8704000F0A9B8002019 +:1050B00070BD012070BD0000A433002058340020D2 +:1050C00080B503F052FB03F051FB03F050FB03F0FB +:1050D0004FFB03F079FC03F078FC03F01FFD03F0B5 +:1050E0008BFF03F08AFF03F089FF03F088FF03F0D2 +:1050F00087FF03F086FF03F085FF03F084FF03F0D2 +:1051000083FF03F082FFBDE8014003F07FBF7047DB +:1051100000F10103810704D010F8011B89B1810758 +:10512000FAD10268B2F10131914311F0803F04BF1E +:1051300050F8042FF6E710F8011B11B110F8011B0D +:10514000FBE7C01A7047000030B58FB002A80FF619 +:10515000FC31DFF81C4B3422FFF7A8FB0FF6D930E7 +:105160000190009469460FF6B93002F059FB012115 +:10517000022003F052FFDFF8FC2A00210420FFF791 +:10518000DEFE02A803F066FF08B104F019F900F092 +:10519000D6FAFFF757FFDFF8E05A0FF6C9020020F2 +:1051A00085F8900005F126044FF6FF70208000215D +:1051B0000120FFF7C4FE04F005F904F02CF9FBF719 +:1051C00053FF0FF69903002205F19F01002004F020 +:1051D0005BFB0220E07080210120A0700D20207177 +:1051E0000220A070182060710320A070DFF88C0AE4 +:1051F0000180A0214180012000F07FFB0FB030BD75 +:105200002DE9F047044688B06078DFF86C6ADFF873 +:10521000709ADFF870AADFF8708A052806F1900509 +:1052200005D03E2852D0FF2800F02D814EE2A08804 +:10523000F18C884246D10020F0842870A07950B9C2 +:1052400000F05AFD014640F2BB1300F043FAA17989 +:10525000DFF8380A28E016280AD100F04DFD014693 +:1052600040F2BD1300F036FAA179DFF8240A1BE002 +:105270003D2840460ED1FFF789FD014640F2BF139D +:1052800000F028FAA179DFF80C0AFFF7EBFA00F03A +:1052900023FC0BE0FFF77AFD01464FF4E17300F0C9 +:1052A00019FAA179DFF8F009FFF7DCFA03208DF88D +:1052B0001C0007A8A188ADF81E10FFF753F80020C6 +:1052C00000F01DFD012000F018FBFFE1E07801284F +:1052D00000F08780032802D00C2822D0F6E100F0ED +:1052E0000BFD014640F2DF1300F0F4F9DFF8AC09E2 +:1052F000FFF7B8FA00F000FD01464FF4F27300F03A +:10530000E9F9B4F80B000190B4F809000090B4F882 +:105310000730B4F805202179DFF88409FFF7A2FAF5 +:10532000D4E100F0E9FC014640F2E91300F0D2F9C3 +:10533000DFF87009FFF796FA20790028404609D176 +:10534000FFF724FD014640F2ED1300F0C3F9DFF84A +:10535000580908E0FFF71AFD014640F2F11300F08A +:10536000B9F9DFF84809FFF77DFAF08C06AA0DF1CC +:10537000190101F026FA0028404628D1FFF706FD62 +:10538000014640F2F71300F0A5F9DFF82409DFF831 +:105390002449FFF767FA9DF81900022804BF9DF819 +:1053A0001810022904D100F0A7FC40F2FB1303E01F +:1053B00000F0A2FC40F2FF13014600F08BF99DF8CB +:1053C00018209DF819102046FFF74CFA7EE1FFF7F0 +:1053D000DDFC01464FF4017300F07CF9DFF8D808DA +:1053E00072E1E87B04F076FA00F086FC014640F2B8 +:1053F000152300F06FF9B4F80510DFF8C008FFF7C7 +:1054000031FA287804280CBF062005202870B4F84B +:105410000500F08400F070FC014640F22B2300F000 +:1054200059F9607A0590A07A0490E07A0390207B85 +:105430000290607B0190A07B0090237AE279B4F81F +:105440000510DFF87C08FFF70DFAB4F80500688056 +:10545000207A6871A07BE872607BA872207B6872FA +:10546000E07A2872A07AE871607AA87100F0FCFAFC +:1054700001208DF81C0007A8B4F80510ADF81E1027 +:10548000FEF770FF22E1B4F803004FF48061401A88 +:1054900019D0401E00F08E80401E1ED0401E2BD022 +:1054A000401E33D0401E3BD0801E00F00481401EC1 +:1054B00043D0401E55D0401E49D040F60601401A48 +:1054C00000F0EF8002E100F017FC014640F25723A4 +:1054D00000F000F9DFF8EC07F6E000F00DFC014603 +:1054E00040F25D2300F0F6F8B4F80510DFF8D807B5 +:1054F000FFF7B8F902205AE000F0FEFB014640F247 +:10550000632300F0E7F8DFF8C407DDE000F0F4FB08 +:10551000014640F2672300F0DDF8DFF8B407D3E07E +:1055200000F0EAFB014640F26D2300F0D3F80FF6DD +:105530005000FFF797F9042039E000F0DDFB014649 +:1055400040F2732300F0C6F80FF67000BCE000F0E4 +:10555000D3FB014640F2772300F0BCF80FF68C0035 +:10556000B2E000F0C9FB014640F27B2300F0B2F844 +:10557000D4F807100FF6A400FFF774F900F0BCFB95 +:1055800001464FF41F7300F0A5F8D4F807100FF68A +:10559000A400FFF767F900F0AFFB014640F27D235E +:1055A00000F098F80FF6A000FFF75CF9032000F078 +:1055B000BFFA8BE000F0A0FB014640F2852300F02B +:1055C00089F8237AE279B4F805100FF6DC00FFF7CA +:1055D00049F9E07901280BD100F08EFB014640F239 +:1055E000872300F077F8227AE1790FF614100CE0A7 +:1055F00002280FD100F080FB014640F28A2300F020 +:1056000069F8227AE1790FF69C10FFF72BF900F088 +:1056100063FA3FE000283DD12C796E7BAF7B00F030 +:1056200023FA00F069FB01464FF4257300F052F8AD +:10563000A87B029001973346687B2A790090214627 +:105640000FF60020FFF70EF924BB00F055FB0146D2 +:105650004FF4267300F03EF80FF65820DFF874661A +:10566000FFF700F90A240FF2842931460846411E4B +:105670000028FBD14846FFF7F5F8641EF5D168888D +:10568000132104F01FFB28B902208DF81C0007A885 +:10569000FEF768FE287B012818D1002000F02FFBC0 +:1056A00014E000F029FB01464FF42D7300F012F8CE +:1056B0000FF6542008E000F01FFB014640F2BB2328 +:1056C00000F008F80FF66820FFF7CCF8012008B0CA +:1056D000BDE8F08752464846FFF7C4B880B500F0F1 +:1056E000F7F9014640F2DE230FF6702200F0ECF9E4 +:1056F0000FF68420FFF7B6F8DFF87C05B0F89200CB +:10570000BDE8044018E0FDF7E3BD10B500F0E0F996 +:10571000014640F2EA230FF6802200F0D5F90FF699 +:105720009420FFF79FF800F0C8F904F084FB04F020 +:10573000DBFA2088BDE81040132104F0C3BA78B525 +:105740000FF6C420DFF890550088DFF8906589B027 +:10575000ADF81A0000F0E2FF286810F1010F0ED03A +:1057600069683074090A000A707406F110046868E8 +:10577000B074F174080A090C3075717506E00020E8 +:1057800004F090FB040008BF0FF680242246062197 +:10579000002004F099FB607930721021207970723A +:1057A000E078B072A078F0726078307320780FF6ED +:1057B000642470732246182004F086FB0FF66426DA +:1057C00000F096F84EF66E50089007AA28680FF67B +:1057D0006425079006212E2004F076FB2246102136 +:1057E000182004F071FB00F083F81821012004F068 +:1057F00092FBFFF79EF80DF1160006A901900091AB +:1058000005AB07220021012004F0C3F90FF63C206C +:10581000BDF81810DFF86844DFF86C6400900523C9 +:10582000BDF814000022FFF744F968B13046FFF7D5 +:10583000ADFA01464FF45B732A462046FFF712F893 +:105840000FF61020FFF70EF80DF11A00009002235A +:10585000BDF81610BDF814000022FFF72AF968B150 +:105860003046FFF793FA014640F276332A46204647 +:10587000FEF7F8FF0FF60C20FEF7F4FF02220221DC +:10588000002000F0D1FFDFF8F0430320207004F087 +:1058900017F900206070E070082060751020A07576 +:1058A00000202075DFF83804A0610120A0700020DE +:1058B000C1B221440871401CC1B21029F8DB00209C +:1058C00004900023A069617803900122207D02905A +:1058D000A07D0190607D0090A07804F00AF9A07886 +:1058E00008B104F0DDF90AB070BD00002E0A0D0009 +:1058F00032461021082004F0E7BA2DE9F84F04469B +:105900002546012D88B003D1DC480688408803E095 +:105910004FF4C8664FF47A60DFF85C83ADF81C0082 +:1059200008F190070FF67459F87B0FF65C5A0FF6E2 +:10593000841B03F0CFFF4846FFF728FA01464FF4D7 +:105940006F7300F087F839780FF67410FEF78AFF4E +:10595000022D22D13878012818BF02281DD104F069 +:1059600054F80090002848460BD1FFF70FFA014683 +:1059700040F2C63300F06EF80FF66010FEF772FFCB +:105980000BE0FFF703FA014640F2CA3300F062F879 +:1059900000990FF66C10FEF765FF3C700020069032 +:1059A000059008F129010491062298F828000FF6C5 +:1059B0007811019203900291002300933146BDF8C3 +:1059C0001C20002004F033F8C4490E2004F027F90D +:1059D000040022D1012D484611D1FFF7D7F9014625 +:1059E00040F2E33300F036F80FF64410FEF73AFFCA +:1059F000F87BBC4909B0BDE8F04F03F0BABFFFF730 +:105A0000C5F9014640F2E93300F024F809B0BDE8D9 +:105A1000F04F0FF64410FEF725BF012D48460AD17E +:105A2000FFF7B4F901464FF47C7300F013F82146F8 +:105A30000FF6501009E0FFF7A9F901464FF47D7306 +:105A400000F008F821460FF66C1009B0BDE8F04FE1 +:105A5000FEF708BF5A465046FEF704BF002101205A +:105A6000FFF77ABA022048E71CB500F026F804F0E8 +:105A7000AEF9401E8041C00FA0706A4620880DF12B +:105A8000010104F0DFF89DF80110E1729DF80010AB +:105A9000217388B900F01CF8014640F269430FF603 +:105AA000481200F011F89DF800309DF80120A1780F +:105AB0000FF65010FEF7D6FE13BD6F4800F19204AA +:105AC00000F19601E07870470FF6BC30FEF7CABED1 +:105AD0000FF6C830FFF75AB980B5FFF7F9FF014656 +:105AE00040F271430FF65412FFF7EEFF0FF6681005 +:105AF000FEF7B8FE604800F1960190F8950004F0BA +:105B00009AF9BDE8014004F0EFB880B5FFF7ACFFAB +:105B10007549087830B1012801BF487A0128897A8F +:105B2000012903D1BDE80240012001E001BD0000D0 +:105B30002DE9F84304286D4F0FF64C360FF658192F +:105B40000FF6583847F2305500F28F80DFE800F04A +:105B50006003305241000120B872388804F049F8DF +:105B600004000BD000F0C8F8014640F2914300F069 +:105B7000BFF821460FF62C10FEF774FE00F0BCF8BB +:105B800001464FF4936300F0B3F80FF66410FEF78C +:105B900069FE284600F0B6F80020B87200F0ACF8B4 +:105BA000014640F29B4300F0A3F80FF6781058E04E +:105BB00000F0A2F8014640F2A14300F099F80FF678 +:105BC0009810FEF74FFE38884549BDE8F44303F0CE +:105BD000C3BF00F091F801464FF4956300F088F8D8 +:105BE00039880FF69410FEF73DFE3888BDE8F24381 +:105BF00004F091B83888012104F008F900F07CF82D +:105C0000014640F2B14300F073F80FF6A41028E00B +:105C100000F072F8014640F2B74300F069F80FF661 +:105C2000F410FEF71FFE3888132104F04BF804002F +:105C30000BD000F061F8014640F2BB4300F058F889 +:105C400021460FF6E810FEF70DFE284600F05AF840 +:105C500000F052F8014640F2BF4300F049F80FF659 +:105C6000F010BDE8F243FEF7FDBDBDE8F183000092 +:105C7000A00803205F780008442E00205034002044 +:105C800088660008A8D400089C660008C0D40008F4 +:105C900010D500087CD50008ECD5000834D60008E3 +:105CA00060D60008FCD6000818D7000840D70008C6 +:105CB00068D700087CD7000898D70008B4D7000838 +:105CC000F8D7000884D80008B4D8000810D9000814 +:105CD00040D9000840420F008075FF1FCC250020EE +:105CE00007B2010046E00100D82E0020D62E002089 +:105CF0004A463046FEF7B6BD4046FFF747B8042097 +:105D0000FFF750B90420FFF755B900210420FFF731 +:105D100023B90120FFF746B90120FFF74BB9000076 +:105D200010B50446616801F10800FFF79CF900B165 +:105D30000120207010BD000010B1012803D0704771 +:105D40007F20FFF71DB97F20FFF722B90000000078 +:105D50000000000000000000000000000000000043 +:105D600044000800400502011C3AFA00F40100005A +:105D7000FFFFFFFF480101000020000000000000BD +:105D80004143495F4741505F424F4E445F4C4F5340 +:105D9000545F56534556545F434F4445203D3D3E66 +:105DA000204741505F50524F435F414C4C4F575F2B +:105DB0005245424F4E44200A0D0000000D0A0D2AA4 +:105DC0002A204143495F4741505F414444525F4E5E +:105DD0004F545F5245534F4C5645445F56534556BA +:105DE000545F434F4445200A000000000D0A0D2A6D +:105DF0002A204143495F4741505F4B455950524526 +:105E000053535F4E4F54494649434154494F4E5FA7 +:105E100056534556545F434F44450A00206E756DF6 +:105E2000657269635F76616C7565203D20256C64E1 +:105E30000A000000204865785F76616C7565203D3A +:105E400020256C780A0000004143495F4741505FBC +:105E50004E554D455249435F434F4D504152495372 +:105E60004F4E5F56414C55455F56534556545F4320 +:105E70004F4445203D3D3E204741505F50524F43E7 +:105E80005F4E554D455249435F434F4D5041524936 +:105E9000534F4E5F56414C55455F434F4E46495216 +:105EA0004D200A0D000000004143495F4741505F0B +:105EB00050414952494E475F434F4D504C45544520 +:105EC0005F56534556545F434F44452C20436F6EF5 +:105ED0006E656374696F6E5F48616E646C653D30BA +:105EE0007825303458205374617475733D256420CF +:105EF000526561736F6E3D307825303278200A002C +:105F0000202A2A2050616972696E672054696D6584 +:105F10006F7574205374617475733D2564205265E8 +:105F200061736F6E3D307825303278202C200A0D59 +:105F30002021212120506C656173652069676E6F97 +:105F40007265207468697320424C45204465766907 +:105F50006365206F6E2074686520694F532F416E12 +:105F600064726F6964204465766963652053657463 +:105F700074696E673D3E426C7565746F6F74683D01 +:105F80003E4D7920446576696365206F72205061CB +:105F9000697265642044657669636520212121204A +:105FA0000A0D0000202A2A2050616972696E67205C +:105FB0004B4F205374617475733D256420526561A5 +:105FC000736F6E3D307825303278202C200A0D20FA +:105FD00021212120506C656173652069676E6F72A5 +:105FE00065207468697320424C4520446576696376 +:105FF00065206F6E2074686520694F532F416E6471 +:10600000726F6964204465766963652053657474B2 +:10601000696E673D3E426C7565746F6F74683D3E96 +:106020004D7920446576696365206F7220506169FF +:106030007265642044657669636520212121200A08 +:106040000D0000004143495F4741505F50414952B4 +:10605000494E475F434F4D504C4554455F5653455D +:1060600056545F434F44452020506565725F426F30 +:106070006E646564203D2564203D3E20256420201B +:1060800053656375726974795F4D6F64653D25640E +:10609000203D3E2025642053656375726974795FE5 +:1060A0004C6576656C3D2564203D3E202564200AC4 +:1060B0000D0000005465726D20436F6E6E65637451 +:1060C000696F6E20666F72207468652066697273EE +:1060D000742070616972696E6720636F6D706C65A2 +:1060E000746520746F207361766520626F6E6469D9 +:1060F0006E6720696E666F726D6174696F6E2021C4 +:106100002121200A0D000000202A2A204143495F56 +:10611000474154545F50524F435F434F4D504C459D +:1061200054455F56534556545F434F4445200A003B +:106130000D0A0D2A2A204143495F4741505F5052C2 +:106140004F435F434F4D504C4554455F5653455662 +:10615000545F434F4445200A000000004150505F07 +:10616000424C455F4B65795F427574746F6E315F69 +:10617000416374696F6E00000A0D202A2A2054655D +:10618000726D20434F4E4E454354494F4E202A2AAC +:1061900020200A0D000000004150505F424C455F36 +:1061A0004B65795F427574746F6E335F41637469D8 +:1061B0006F6E0000206163695F6761705F636C658B +:1061C00061725F73656375726974795F64622026BA +:1061D000206163695F6761705F72656D6F76655F8F +:1061E000626F6E6465645F6465766963652026200E +:1061F0006163695F6761705F7465726D696E617418 +:1062000065200A0D00000000400300006C7AD8AC45 +:1062100057720000123456789ABCDEF01234567869 +:106220009ABCDEF0FEDCBA0987654321FEDCBA09C0 +:1062300087654321426C655F4863695F4761705FB2 +:10624000476174745F496E69740000004852616E62 +:1062500063000000446576696365204E616D6520CA +:106260006163695F676174745F7570646174655FB1 +:10627000636861725F76616C7565206661696C65E3 +:10628000642E0A00417070656172616E6365206101 +:1062900063695F676174745F7570646174655F637F +:1062A0006861725F76616C7565206661696C6564B2 +:1062B0002E0A00004164765F526571756573740043 +:1062C000466972737420696E64657820696E202552 +:1062D00064207374617465200A0000005375636361 +:1062E00065737366756C6C792053746F7070656438 +:1062F000204164766572746973696E67200A0000D4 +:1063000053746F70204164766572746973696E6747 +:10631000204661696C6564202C20726573756C740D +:106320003A202564200A0000094852616E6300008B +:106330005375636365737366756C6C792053746110 +:106340007274204661737420416476657274697357 +:10635000696E67200A000000537563636573736696 +:10636000756C6C79205374617274204C6F77205077 +:106370006F776572204164766572746973696E67C0 +:10638000200A0000537461727420466173742041C6 +:1063900064766572746973696E67204661696C65BD +:1063A00064202C20726573756C743A202564200A71 +:1063B000000000005374617274204C6F7720506F9E +:1063C000776572204164766572746973696E6720BF +:1063D0004661696C6564202C20726573756C743A33 +:1063E000202564200A0000004150505F424C455F68 +:1063F000506565725F426F6E6465645F4368656394 +:106400006B000000506565725F426F6E6465643DAD +:1064100025642053656375726974795F4D6F646597 +:106420003D2025642C2053656375726974795F4C37 +:106430006576656C3D202564200A0D004150505F53 +:10644000424C455F52656D6F76655F426F6E646961 +:106450006E675F496E666F00206163695F67617098 +:106460005F636C6561725F73656375726974795F90 +:1064700064622026206163695F6761705F72656D89 +:106480006F76655F626F6E6465645F64657669638D +:1064900065200A0D0000000047617050726F635262 +:1064A000657100004741505F50524F435F534C416C +:1064B00056455F53454355524954595F5245512003 +:1064C0006163695F6761705F736C6176655F736557 +:1064D0006375726974795F72657120207374617479 +:1064E00075733D307825303278200A0D00000000A9 +:1064F00077616974696E6720666F72202041434935 +:106500005F4741505F50414952494E475F434F4DAD +:10651000504C4554455F56534556545F434F444590 +:10652000200A0D0077616974656420666F7220200F +:106530004143495F4741505F50414952494E475F8F +:10654000434F4D504C4554455F56534556545F4359 +:106550004F4445200A0D00004741505F50524F43C1 +:106560005F504153535F4B45595F524553504F4E17 +:106570005345200A0D0000004741505F50524F43E1 +:106580005F414C4C4F575F5245424F4E4420616330 +:10659000695F6761705F616C6C6F775F7265626F76 +:1065A0006E6428307825303458290A0D0000000028 +:1065B0004741505F50524F435F4E554D45524943FE +:1065C0005F434F4D50415249534F4E5F56414C55DA +:1065D000455F434F4E4649524D202A2A2061636948 +:1065E0005F6761705F6E756D657269635F636F6D24 +:1065F00070617269736F6E5F76616C75655F636FF2 +:106600006E6669726D5F7965736E6F2D2D3E5945AB +:1066100053200A007465726D696E61746520636F42 +:106620006E6E656374696F6E200A00005465726D4A +:1066300020436F6E6E656374696F6E20636D6420B6 +:106640006661696C7572653A20307825780A0000B9 +:106650004741505F50524F435F5445524D494E4160 +:1066600054455F434F4E4E454354494F4E20636F50 +:106670006D706C657465206576656E7420726563F7 +:1066800065697665640A00000D0A205B25735D5B11 +:1066900025735D5B25645D2000000000433A5C7754 +:1066A0006F726B73706163655C46575F57425F4101 +:1066B0004C4C5F4944455C4669726D776172655C1C +:1066C00050726F6A656374735C502D4E55434C4530 +:1066D0004F2D574235352E4E75636C656F5C41709A +:1066E000706C69636174696F6E735C424C455C42A7 +:1066F0004C455F4865617274526174655F414E43F9 +:10670000535C53544D33325F5750414E5C4170706F +:106710005C6170705F626C652E63000000B587B0CD +:1067200000F03DF8012003220690ADF80420ADF8FA +:10673000062000F0A3F800284CBFFF209DF80000C1 +:1067400007B000BD182201A8FEF707BBADF8061080 +:106750000820704778B5C7B004460D461646032298 +:1067600000F026F8ADF81C40ADF81E50ADF82060E2 +:1067700000F018F82221FFF7E9FF062100F009F8E0 +:1067800000F07AF800284CBFFF209DF8000048B0C8 +:1067900070BDADF80400049107A8032170470020E4 +:1067A0008DF800001822002101A8FEF7D6BA0922B0 +:1067B00000216846FEF7D1BA1822002102A8FEF790 +:1067C000CCBA70B5C8B006460C4615460522FFF790 +:1067D000EFFFADF82060FFF7EFFF302100F014F875 +:1067E0000521049000F019F8002848BFFF2009D4C3 +:1067F0009DF8000030B99DF8030020709DF804005A +:106800002870002048B070BDADF80A1008200221A1 +:10681000ADF80800059108A870470791CDF818D089 +:10682000002102A801F04FB800B5C7B000F00EF883 +:10683000FFF788FF312000F013F800F01FF8002860 +:106840004CBFFF209DF8000047B000BD00238DF82D +:106850001C008DF8003007A841708270002170473D +:10686000ADF8060007A90320049008220120039137 +:106870000690ADF80420704703900691CDF814D02F +:10688000002101A801F01FB82DE9F84F0FF2D01731 +:10689000A2B0D7E90045CDE900452C9EDFF82C7C5D +:1068A00004918DF8436000210FF2BC140D911294F5 +:1068B0004FF0FF368246904699460FE0C3462C467D +:1068C0001BF8011B0498D0470028049000F0B28008 +:1068D0000D98401C641E0D90F2D1A84498F8000059 +:1068E000252807D100210791089109910A910B9160 +:1068F0000C910DE06A463146404603F067FB050007 +:1069000001D10D98B4E0D9D50125E6E741F00101A8 +:1069100018F8010F2028F9D023280CD02B2804D0F8 +:106920002D2805D0302809D086E041F00201EFE79C +:1069300041F00401ECE741F00801E9E741F0100102 +:10694000E6E700200F900AE00F98B84205DA00EB66 +:10695000800302EB4302303A0F9208F1010898F8E5 +:106960000020A2F130000A28EED398F800002E286B +:1069700018BF0E9629D118F8010F2A280BD1D9F883 +:106980000000C9F8000008F1010850F8042BC9F80C +:1069900000000E9219E02D280CBF18F8010B002002 +:1069A00000220E920BE040B90E9ABA4205DA02EBD1 +:1069B000820403EB4403303B0E9308F1010898F87E +:1069C0000030A3F130020A2AEDD3ADF8401012983E +:1069D00098F8001003F006FB08B118F8010B8DF8C9 +:1069E00042009DF84200682804BF98F8001068290A +:1069F00003D162208DF8420008E06C2804BF98F8AB +:106A000000006C2804D171218DF8421008F10108B2 +:106A100013A806904A4618F8013B02A9504600F018 +:106A200067F838B913AA02A9504600F0C9F900283E +:106A30007FF554AF30461BE02A2882D1D9F80020D8 +:106A4000C9F8002052F8040BC9F8002000280F9064 +:106A500003D540420F9041F0040108F1010884E79A +:106A60000000000000000000686A6C747A4C0000AE +:106A700023B0BDE8F08F622820D0682811D06A28A2 +:106A800003D06C2827D0712825D10868C01D20F0BC +:106A900007000860D0E90023083008601946104656 +:106AA0007047002A0A680A60106803D0121D0A6045 +:106AB00000B217E0121D0A6080B217E0002A0A68CF +:106AC0000A60106803D0121D0A6040B20AE0121D6D +:106AD0000A60C0B20AE0002A0A680A60106803D09F +:106AE000121D0A60C1177047121D0A60002170470D +:106AF0007CB50D4611461C462E69B4F1250200F006 +:106B00004D811C3A00F08680121F022A40F28280DA +:106B10000E3A00F00781521F5AD0093A7AD0921EDD +:106B200016D0521E35D0521E022A73D9121F30D0F1 +:106B3000521F00F09A80521E4AD0521E00F0E4808C +:106B4000D21E00F0FD80921E42D0D21E40D02BE11A +:106B500095F83A206C2A09D06869421C6A610A6873 +:106B60000A6052F8043B0A60335427E10A680A605D +:106B700052F8043B0A600021009301914FF0FF326C +:106B80002A6329466A4600F096F9002840F11681EA +:106B900001E195F83A000122FFF76DFFC5E9000118 +:106BA0000023994204DA6869411C69612D210DE0D6 +:106BB000288F810704D56869411C69612B2105E094 +:106BC000C00722D56869411C6961202131541CE04D +:106BD00095F83A000022FFF74EFFC5E9000195F84D +:106BE0003800010711D5D5E900230020834208BFF2 +:106BF00082420AD044F02000782806D1686930210A +:106C00003154401C411C6961345421466869304448 +:106C1000E86083E00868C01D20F007000860D0E944 +:106C2000002308300860C5E90023D5E90001C80F3A +:106C300004D06869411C69612D210DE0288F81070E +:106C400004D56869411C69612B2105E0C00704D5A2 +:106C50006869411C69612021315468693044E860E9 +:106C60002146284600F032FAA8E005F13A025078B1 +:106C700020B14FF0FF340FF6243070E01078622816 +:106C800008D0682824D06A2812D06C282ED0712809 +:106C90000ED02BE00A680A6052F8040B0A6020B993 +:106CA0004FF0FF340FF60C3059E0E96A017085E0CF +:106CB0000A680A6052F8040B0A6020B94FF0FF34EA +:106CC0000FF6F0204BE0EA6AD317C0E9002375E025 +:106CD0000A680A6052F8040B0A6020B94FF0FF34CA +:106CE0000FF6D0203BE0E96A018067E00A680A609D +:106CF00052F8040B0A6020B94FF0FF340FF6B420AD +:106D00002DE0E96A016059E00A680A6052F8040B54 +:106D10000A600021C5E90001EE607821284600F0F4 +:106D200029F94BE06C2285F83A200B680B6053F888 +:106D3000042B0B6052BB4FF0FF340FF6AC200EE07B +:106D400095F83A206C2AF0D00868086050F8044B97 +:106D50000860EC603CB94FF0FF340FF6702003F090 +:106D60004DF9201A76BD2E6B002E04D52046FEF775 +:106D7000CFF9044608E032460021204603F060F9CE +:106D8000002814BF041B3446AC6117E0294600F00C +:106D900092F8002812D54FF0FF3076BD6869411C8B +:106DA00069612521315409E06969481C686125221F +:106DB0007254210002D0411C69613454002076BD18 +:106DC0002DE9F0410E460546716B7069B46A091AE7 +:106DD000306A091AB069091A706A091AF069091A41 +:106DE00096F838000C1B410790460DD4002C0BDDA3 +:106DF0002746B0682021A8470028B06057D0F06A25 +:106E0000401C7F1EF062F4D1736942463146284629 +:106E100000F0ACFC00284AD1376A002F0ADDB068C8 +:106E20003021A8470028B06041D0F06A401C7F1E86 +:106E3000F062F4D1B369F2683146284600F096FC5E +:106E4000A8BB776A002F09DDB0683021A847B06081 +:106E500068B3F06A401C7F1EF062F5D1F068B1693A +:106E6000F36942183146284600F080FCF8B9B76A49 +:106E7000002F09DDB0683021A847B060B8B1F06AD2 +:106E8000401C7F1EF062F5D196F8380041070BD503 +:106E9000002C09DDB0682021A847B06038B1F06A45 +:106EA000401C641EF062F5D10020BDE8F0814FF077 +:106EB000FF30BDE8F0812DE9F8470D46A3B02F6BF8 +:106EC000002F8146904648BF6FF0004703F0E4F87A +:106ED000696B40180FF62C118128D1E90023CDE908 +:106EE000012328BF4FF0FF303ED20024002F2FDDBA +:106EF000D8F8001001AA684603F06AF80646002E8A +:106F000035D4D8F8000008B9761E30D4B7421FDB5C +:106F10006869301881280AD30020686303AA2946CB +:106F20004846FFF74DFF040012D40020686103A813 +:106F3000D5F814A0324669465044FDF7A7FCB24488 +:106F4000C5F814A058F8040B002818BFBF1BCDD1FA +:106F50002CB903AA29464846FFF732FF044614B964 +:106F6000002068616863204624B0BDE8F0874FF0D8 +:106F7000FF34F8E72DE9FC4707468A463E69BAF137 +:106F80006F0F08BF082405D04AF02001782914BFEC +:106F90000A2410243C25D7E90023BAF1640F18BF56 +:106FA000BAF1690F9046994606D100218B4203DA67 +:106FB000D8F1000869EB49090020814508BF8045E8 +:106FC0001FD1386BE8B9082C4CD197F8380001076D +:106FD00048D530203B2586F83B0043E000280ED5FD +:106FE00097F8380000F01400102808D17A6B7869FF +:106FF000121A386A121A511A0029C8BF3962BDE83C +:10700000F3878DF800A0404649462246E31703F077 +:1070100049F83032D0B26D1E3A28019504DB9DF854 +:107020000000A0F151018A18725540464946224697 +:10703000E31703F037F8804689460020814508BFF2 +:10704000804503D0F86871198842DCD3082C09D137 +:1070500097F83800010705D5715D302902D06D1E03 +:1070600030207055C5F13C01B9617019F860386B7A +:107070008142B3DA411A39624FF6EF70398F01401D +:107080003987BDE8F3872DE9D04306460F461446FD +:107090004FF00008DFF8389412E0E00707D54246C9 +:1070A0004B463046394603F015F906460F46404632 +:1070B000494642464B4603F00DF964108046894626 +:1070C000002CEAD130463946BDE8D0832DE9F34F94 +:1070D000054641F020048DB0D5E90089612C02AE4F +:1070E00009D0286B002848BF062003D408BF672CAE +:1070F00001D101202863D5E9002358004015401C28 +:107100000ED119030CD00320A8619DF83800613816 +:107110001A2802D20FF2F46111E00FF2F4610EE0CE +:1071200058004015401C0FD119030DD10320A86150 +:107130009DF8380061381A2814D30FF2DC61E86832 +:107140000322FDF7A3FBD3E1194621F00043B3F579 +:10715000801F10460DD20027BB4208BFBA420197DC +:1071600003D111E00FF2AC61E9E701AA03F084F961 +:107170000AE0DFF8607307EB1352DFF85C3301922B +:107180001940DFF858331943C5E90001612C0ED1CD +:10719000E86830210170811CE9609DF83810612990 +:1071A0000CBF7821582141706869801C6861D5E95D +:1071B00000AB2BF0004300202AF00002834204BF02 +:1071C0008242002300F05A81612C40F0A980286B94 +:1071D00000284CBF2120401C00904046009F7F1C8F +:1071E00049460022002303F07FF9D94601988DF823 +:1071F000082038BF89F00049001F0190002FD046B9 +:107200000DF1090040F3498140F2FF71DFF8D0B27F +:107210000C910646404649460022002303F07CF9C3 +:1072200080F03A814800400D00F11C0210D0002A85 +:107230000EDD0C98824205DB09F0004040EA0B01AC +:10724000002013E0A448084040EA025140460DE007 +:1072500029F00043002028F00002834208BF824248 +:107260000FBF40461C22404603F06EF98046894617 +:1072700003F008FAFF1F002F044609DD03F020FA8F +:1072800002460B464046494603F02CFA80468946A2 +:10729000F01D072104E004F00F0200F8012D241175 +:1072A000002C01DD491EF6D5491E5CBF002200F806 +:1072B000012DF9D5ECE00020194602AA0A4400E0AD +:1072C0005B1E12F80149491E8442F9D00F2804D1EF +:1072D0000DF10900425C521C4254002904D501986A +:1072E000001D02AE5B1C0190591E12D49DF838009F +:1072F0007218147804F130085FFA88F4392CC4BF8E +:10730000A0F13A04A044491E02F80189F1D58DF894 +:107310003800286B002840F1B080591E2963ACE08A +:10732000404649460022002303F0DEF8019938BFA9 +:1073300089F0004947F2975041436A4A91FBF2F2C3 +:107340000192D2F1070204DD40464946FFF79BFE59 +:107350000AE0524200206449FFF795FE02460B46C0 +:107360004046494603F030FA8046662C286BDFF829 +:107370007CB106BF019F0A3706273F18142FC8BFEC +:10738000142730208DF8080089460DF1090000E02F +:107390003046002F34DD06464046494603F038FBB0 +:1073A00001460A4606F1080304200A26B2FBF6F657 +:1073B00006EB860EA2EB4E02303203F8012C0A22B5 +:1073C000B6FBF2F202EB820EA6EB4E063036401E02 +:1073D00003F8026DE9D1083F002F03F10806D7DD5D +:1073E000084603F029FB02460B464046494603F097 +:1073F00079F900225B4602F06DFF80468946CBE7B3 +:107400000DF10901401A0DF1090604E00199491E28 +:10741000401E0191761C31783029F7D0662C02D1BC +:107420000199491C03E0652C0CBF012100212B6B45 +:10743000CB189842B8BF431E002B1ED4834204DAF7 +:10744000F05C3528A8BF392000DA30201946721EBA +:1074500002EB010800E05B1E18F80199491E814506 +:10746000F9D0392802D1705C401C7054002904D531 +:107470000198401C16465B1C0190019800B20090D8 +:107480001BB29DF838103246284600F034F82FE041 +:10749000C61D002F3FF7BEAE30460DF10901401A60 +:1074A000009903468842C8BF0B46002B0DF1090620 +:1074B0003FF52FAF8342BFF6FEAE0DF10900C05C71 +:1074C00007287FF7F8AE0F20F6E60000CBCCCC0CF7 +:1074D0000000244002FCFFFFFFFF0F800000E03FA0 +:1074E0000000F07FA08601000000F03F84D79741A4 +:1074F0000FB0BDE8F08F2DE9F84783B006468A4605 +:107500001746984602F066FDB8F1000F406A356BE9 +:1075100090F8009003DC4FF001080FF20037BDF93E +:1075200030404AF02000662808BF641C15D0672848 +:1075300040F0848014F1040FC0F28680AC4280F2E7 +:10754000838096F83800641C010702D4A845B8BFB0 +:10755000454620B22D1A48BF00250FFA84FAF0687C +:10756000B169BAF1000F25DC4A1C30234354002DC9 +:1075700003DC96F83800010703D5F06800F80290A4 +:10758000521C15EB0A0FB8BF6C4220B2441941429D +:107590004445B8BFA046B26171620FFA88F5F56143 +:1075A000F068B3692A4639461844FDF76FF9641B41 +:1075B000B462C4E022B29045084417DA4246394624 +:1075C000FDF764F9B0694044B061AAEB0801002DF1 +:1075D000716203DC96F838100A0705D5F16801F8E6 +:1075E0000090F069401CF061B562A8E03946FDF7F3 +:1075F0004DF9B069002D5044A8EB040803DC96F85F +:1076000038100A0703D5F16801F80090401CB061FA +:107610000FFA88F08542F068B369B8BFA8460FFA40 +:1076200088F207EB0A011844FDF730F9B0690FFA48 +:1076300088F10844B061681A706280E0BAF1610FA5 +:1076400014D14FF0700A16E0A84504DA96F8381005 +:107650000A0758BF45466D1E48BF0025BAF1670F9F +:1076600014BF4FF0450A4FF0650A04E0BAF1410F2C +:1076700008BF4FF0500AB169F368481CB061002D93 +:1076800017F8012B5A5403DC96F838100A071BD55B +:10769000F168431CB36101F80090002D14DDA8F1DE +:1076A00001080FFA88F08542F068B8BFA8460FFAC3 +:1076B00088F239461844FDF7E9F8B0690FFA88F105 +:1076C00008446D1AB0617562F068B1690844002C15 +:1076D00080F800A003D42B214170811C03E02D21F0 +:1076E00041706442811C00206A460AE023460A2455 +:1076F00093FBF4F404EB8405A3EB450302F8013B90 +:10770000401C24B2002CF1DC012806DC4AF02002E7 +:10771000652A04BF302201F8012B48B9302001F856 +:10772000010B07E0401E1DF80020303201F8012B4C +:107730000028F7DCF068B2691044091AF16196F884 +:10774000380000F0140010280DD17169B06941189B +:10775000706A4118F0694118B06A4118706B814233 +:10776000BCBF411A316204B0BDE8F087F8B50546E8 +:107770000E4617461C46002074B117F8011BB0686E +:10778000A847B06030B1F06A401CF0620020641E6F +:10779000F3D1F2BD4FF0FF30F2BD00007072696EA0 +:1077A00074665F733A20256E20646973616C6C6F38 +:1077B000776564007072696E74663A206261642055 +:1077C000256E20617267756D656E74007072696EEA +:1077D00074665F733A20626164202573206172676A +:1077E000756D656E740000007072696E74665F730B +:1077F0003A2062616420256C7320617267756D6543 +:107800006E74000000000000000000006E616E0059 +:107810004E414E00696E6600494E46003000000041 +:107820007FB50C466D4D61686D4EE8612962284652 +:1078300003F010F9246805F1240003F015F97460D1 +:1078400006F1080003F010F901203070296829B111 +:107850000FF2551000900294684688477FBD1FB50F +:107860005F4C04F1080003F002F900BB2178F1B18C +:10787000694604F1080003F023F95848C16949B189 +:107880000098029001228DF8042001A888479DF8F5 +:10789000040000E001202070207818B1009803F067 +:1078A000C4F904E0009904F1080003F0E9F804F1D8 +:1078B000080003F0DCF828B9207818B104F10800BA +:1078C000FEF723FA1FBD2DE9F8430646002000F01D +:1078D0005FF874883088B268DFF80081C4F3090467 +:1078E00044EA8024F068A4B2C1B2204600F03CF81B +:1078F000002748F2E8094846FEF70EFA08E06888D3 +:10790000A04202D1316928780870687800B1012757 +:1079100008F1240003F0ABF8F0B9694608F124003F +:1079200003F0CEF8009800F10B05407A0F28E6D05E +:10793000B5F80110A1420DD10098817AC81E716975 +:10794000C0B28842C8BF0846706102463069E91C6F +:10795000FCF79CFF2878D9E73800CCD0012000F054 +:1079600017F80020BDE8F28310B513461C4A54688E +:10797000A4F80900E1720A46194604F10C00FCF76C +:1079800085FF164A1369BDE8104000210020184702 +:107990001249096A82B008B921B101E011B1012090 +:1079A00002B0084702B0704710B50146487A0F2868 +:1079B00018BF0E2807D10B4803F06CF8BDE8104043 +:1079C0000020FEF7A6B9064C04F1080003F062F8A7 +:1079D00004F10800BDE81040FEF797B954330020C9 +:1079E000D43300207833002062F30F2262F31F4269 +:1079F000401810F0030308D0C91A1FD3DB0748BF93 +:107A000000F8012D28BF20F8022D130030B41446D1 +:107A10001546103928BF20E93C00FAD8490728BF8D +:107A200020E90C0048BF40F8042D890028BF20F849 +:107A3000022D48BF00F8012D30BC7047C91818BF8F +:107A400000F8012DCB0728BF00F8012D7047024632 +:107A5000C9B2002013788B4208BF104612F8013BD0 +:107A6000002BF7D1704710B5029C016042600021E5 +:107A7000C1600161416181610381A107047704D57F +:107A8000008910B14FF0FF3010BD002010BD2DE96E +:107A9000F04F064685B030890C460027BB460028CB +:107AA0007169DC460CBF4FF00208D84681B168B955 +:107AB00030697768451CBD4228BFED1B3768385CCC +:107AC0007D5D00EB0527BF1CBFB203E0074600E069 +:107AD00000B102463069F568A84223BF7568281ACC +:107AE000C01B0020154608EB050903FB09FE86456F +:107AF00032BF0020B0FBF9FA09FB1A00C0B2804582 +:107B000009DA96F81C905FEAC97A48BF84465FEAB2 +:107B1000897048BFC446100000F0B480706871449A +:107B200061448842C0F0AE8008EB020080B203904E +:107B3000D946100AADF802000294ADF80020049373 +:107B400059E0800740D53089002840F09B8032689A +:107B5000D018A34600F8024C200A32681A4402F8F2 +:107B6000010C224630681844FCF790FE706920181A +:107B70007061B069019C401CB061200A31680C70D2 +:107B8000316848701CE08CB3307FC207D9D530898A +:107B900040B931681944FF2001F8020C31681944DA +:107BA00001F8010C4FF0000B7069241874612C4629 +:107BB0003089002340B931680C70210A3068417067 +:107BC00002237069801C706108EB04070021BFB2BA +:107BD00031615CB1DA44029800EB0A013068224658 +:107BE0001844FCF753FE70692418746109F1010907 +:107BF000B069401CB061049A70683169914545D202 +:107C0000791881422CBF081A084630610346308932 +:107C1000A0B93068BDF80010C1545B1C70683168B1 +:107C2000834228BF1B1ABDF80200C8545B1C706851 +:107C3000834228BF1B1A7069801C706105FB09FA1A +:107C40007468BDF80000E41A844288BF04460298B4 +:107C500000EB0A01281BAC42019003D093D2307F85 +:107C6000002890D137682246F818FCF70FFE70699B +:107C700020187061A346019C039F0023A9E7306888 +:107C8000404400E0002005B0BDE8F08F8844804506 +:107C9000F5D3A8EB0008F2E7F8B5024600231089F7 +:107CA000546900280CBF022500250026002C4DD069 +:107CB00060B9D36857685E1CBE4228BFF61B1768C0 +:107CC000FB5CBE5D03EB0626B6B200E00646137F02 +:107CD00003F00303012B23D14FF6FF77BE4208BF09 +:107CE000002808D0D36817699F4219D2C0B15768DD +:107CF000FB1A834214D25668D368A41B1C190023B4 +:107D00005461D36058B910680378012E94BFC6F14E +:107D100001060126805D03EB0026B6B200E00646B0 +:107D2000D76854681368E819A04228BF001B0344B1 +:107D30005069801B401B506105D0F719ED19A54211 +:107D400028BF2D1BD5609069401E906101B10E8047 +:107D50001846F2BDF8B50246002410895369002880 +:107D60000CBF022500250026002B3AD0D4682346FC +:107D700058B95768661CBE4228BFF61B176817F82B +:107D800004C0BE5D0CEB062600E00646177F07F038 +:107D90000307012F1ED1B7B24FF6FF7C674508BF1E +:107DA000002807D150680023012894BFC0F10100CA +:107DB00001200AE01769A7420CD258B157683C1B52 +:107DC000844207D20023064604E014682678205C2B +:107DD00006EB00265068ED18854228BF2D1A106862 +:107DE000441901B10E802046F2BD0000484900E070 +:107DF000484981B00A6802430A6009680840009057 +:107E0000009801B0704780B502F078FF02F078FF6B +:107E10004148016841F480310160FCF7E7FFBDE8AB +:107E200001400EE000B587B068460FF238211C22F1 +:107E3000FCF73CFD02F015FF684601F013F907B0AE +:107E400000BDF0B585B068461421FDF70DF8002699 +:107E50000025002400210FF2DC0000EBC102907924 +:107E600088B11368B3F1904F08D02C4FBB4208D0B3 +:107E70002B4FBB4204BF9088044304E09088064324 +:107E800001E090880543491C2629E4DB002002908C +:107E90000121032003900191B0B288B1009001202C +:107EA000FFF7A4FF0120FFF7A3FF69464FF09040C2 +:107EB00002F038FF0022B1B24FF0904002F0F6FF1E +:107EC000A8B280B100900220FFF790FF0220FFF7D8 +:107ED0008FFF124E6946304602F024FF0022A9B2FD +:107EE000304602F0E3FFA0B280B100900420FFF71B +:107EF0007DFF0420FFF77CFF094D6946284602F00C +:107F000011FF0022A1B2284602F0D0FF05B0F0BD5B +:107F10004C0000584C0100589008005800040048DC +:107F20000008004801F0CAB913460A46014600207D +:107F300002F0DCBF00000048010000000000004823 +:107F4000010000000000004801000000000000489F +:107F5000010000000000004801000000000000488F +:107F6000010000000000004801000000000000487F +:107F7000010000000000004801000000000000486F +:107F8000010000000000004801000000000000485F +:107F9000010000000000004801000000000000484F +:107FA000010000000000004801000000000000483F +:107FB000010000000000004801000000000000482F +:107FC000010000000000004801000000000000481F +:107FD000010000000000004801000000000000480F +:107FE00001000000000000480100000000000048FF +:107FF00001000000000000480100000000000048EF +:1080000001000000000000480100000000000048DE +:1080100001000000000000480100000000000048CE +:1080200001000000000000480100000000000048BE +:1080300001000000000000480100000000000048AE +:10804000010000000000004801000000000000489E +:10805000010000000000004801000000000000488E +:10806000010000000000000000000000000000000F +:10807000347F0008280003202C000320260404007D +:1080800000B500BF130096469446103928BFA0E8FB +:108090000C50FAD85FEA417C28BF0CC048BF40F8BA +:1080A000042BC90728BF20F8022B48BF00F8012B7A +:1080B00000BD704710B5B248B24C88B0016841F4B9 +:1080C0000041016000F0A4FFAF480168C908C90081 +:1080D00041F0040101600020AC4901F058FBFFF7BA +:1080E00092FE0121012000F098FF0121002002F002 +:1080F00030FF0121012002F02CFF0121022002F0BB +:1081000028FF02F0F1FCA24A00218020FCF717FFB3 +:1081100004F23C500FF231010090019169460FF2D8 +:108120002D0002F063FF04F25470029004F5C9615F +:1081300040F23C5005900391049402A802F05CFDCB +:1081400002F0D0FC08B010BD704700002DE9F041EE +:10815000064688B0716801F10B07684600F091FF90 +:108160000FF2AC240FF294250FF27C2800F018F9DE +:108170000146CB2300F017F99DF802309DF801204D +:108180009DF800100FF20430FCF76CFB00F008F9CA +:108190000146CC2300F007F99DF804100FF21030CF +:1081A000FCF760FB00F0FCF80146CD2300F0FBF883 +:1081B0009DF80C309DF80B209DF80A100FF20C3042 +:1081C000FCF750FB38884FF41241401A11D0401E82 +:1081D00062D0401E00F08C80801E00F0A280401E05 +:1081E00000F0AA80401E00F0B080401E00F0BA806F +:1081F000C2E004A81021FCF737FE70680FF2F837D0 +:108200000D30007868BB00F0CBF801464FF4867360 +:1082100000F0C2F80FF2FC30FCF724FBFFF702FE7F +:108220000D208DF810007F215A488DF81210066835 +:1082300000F0B6F8014640F2251300F0ADF8360C18 +:1082400031460FF20040FCF70DFBADF81C6004A8AE +:1082500000F010FFFCF778FF0021012000F0DDFEA8 +:108260008AE0012820460DD1FCF790FD01464FF42D +:108270009A7300F091F80FF2EC30FCF7F3FA00205B +:10828000307079E0FCF782FD014640F23B1300F0CC +:1082900083F80FF2FC306DE070680FF2204600F1B9 +:1082A0000D0700F07DF8014640F24B13324600F016 +:1082B00074F839780FF21840FCF7D4FA38780028AF +:1082C00020460AD1FCF762FD014640F24F133246C8 +:1082D00000F063F80FF224404CE0FCF757FD014634 +:1082E00040F25113324600F058F80FF2484041E096 +:1082F00000F056F80146DA2300F055F80FF2E410CA +:10830000FCF7B0FA00F04CF80146DD2300F04BF822 +:10831000D7F80620D7F802100FF2F410FCF7A2FAF3 +:108320002AE000F03DF80146E22300F03CF8D7F8DF +:1083300002100FF2202012E000F032F80146E6238E +:1083400000F031F80FF2402014E000F029F8014667 +:10835000EB2300F028F8D7F802100FF24820FCF7C2 +:1083600081FA09E000F01CF80146EF2300F01BF849 +:108370000FF26820FCF776FA08B0BDE8F081000043 +:108380000800005830000320800400589431002079 +:108390002FB00008002004E03A462846FCF762BAF5 +:1083A0002046FCF7F3BC42462846FCF75BBA704710 +:1083B0004FF0FF30FCF75CBD00218020FCF7CCBD06 +:1083C0000220FCF7EFBD0220FCF7F4BD012805D028 +:1083D000022805D0102805D1FDF780B9FDF793B923 +:1083E000FDF793B970470000415050455F537973D2 +:1083F0005573657245767452780000000D0A205B53 +:1084000025735D5B25735D5B25645D2000000000C6 +:10841000433A5C776F726B73706163655C46575F5C +:1084200057425F414C4C5F4944455C4669726D77E9 +:108430006172655C50726F6A656374735C502D4E37 +:1084400055434C454F2D574235352E4E75636C655F +:108450006F5C4170706C69636174696F6E735C42CC +:108460004C455C424C455F4865617274526174656D +:108470005F414E43535C436F72655C5372635C6152 +:1084800070705F656E7472792E6300005769726553 +:108490006C657373204669726D77617265207665CD +:1084A0007273696F6E2025642E25642E25640A0080 +:1084B000576972656C657373204669726D77617276 +:1084C00065206275696C642025640A004655532056 +:1084D00076657273696F6E2025642E25642E25647F +:1084E0000A0A00002D2D20424C45204E564D2052A8 +:1084F000414D20484153204245454E20555044416E +:1085000054454420425920434D4F2B200A0000007F +:10851000534843495F5355425F4556545F424C456B +:108520005F4E564D5F52414D5F555044415445207A +:108530003A20537461727441646472657373203DB0 +:1085400020256C78202C2053697A65203D20256CED +:10855000640A0000534843495F5355425F455654EF +:108560005F4E564D5F53544152545F5752495445E4 +:10857000203A204E756D6265724F66576F72647354 +:10858000203D20256C640A00534843495F535542FF +:108590005F4556545F4E564D5F454E445F575249B6 +:1085A00054450A00534843495F5355425F4556546A +:1085B0005F4E564D5F53544152545F4552415345AF +:1085C000203A204E756D6265724F66536563746F15 +:1085D0007273203D20256C640A0000005348434913 +:1085E0005F5355425F4556545F4E564D5F454E446E +:1085F0005F45524153450A00415050455F537973DE +:10860000457674526561647950726F6365737369FE +:108610006E670000534843495F5355425F455654C7 +:108620005F434F44455F5245414459202D205749EF +:1086300052454C4553535F46575F52554E4E494E37 +:1086400047200A004442474D43555F4765745265D1 +:10865000766973696F6E49443D20256C78200A0A5B +:1086600000000000534843495F5355425F4556544C +:108670005F434F44455F5245414459202D204655A4 +:10868000535F46575F52554E4E494E47200A0000F1 +:10869000534843495F5355425F4556545F434F44E7 +:1086A000455F5245414459209620554E4558504506 +:1086B000435445442043415345200A00415050450E +:1086C0005F5379734576744572726F7200000000D3 +:1086D000534843495F5355425F4556545F45525294 +:1086E0004F525F4E4F5449462057495448205245F7 +:1086F00041534F4E202578200A000000534843493B +:108700005F5355425F4556545F4552524F525F4E3C +:108710004F544946205749544820524541534F4EE3 +:108720002096204552525F424C455F494E495420A5 +:108730000A000000534843495F5355425F45565471 +:108740005F4552524F525F4E4F544946205749544D +:108750004820524541534F4E209620424C452045DB +:1087600052524F52200A00007047704770477047BE +:108770002DE9F841384D0FF204180FF2EC060FF214 +:10878000DC070020286087B041F60A00ADF8180029 +:1087900000950323012206A90120FCF7E1F804005B +:1087A000404609D1FCF7F2FA0146862300F03FF873 +:1087B00029880FF2181008E0FCF7E8FA01468B232D +:1087C00000F035F821460FF24410FCF74BF842F662 +:1087D0002920ADF81800012204920A20A91C039058 +:1087E00000230222059102930193009220232888FE +:1087F00006AA0121FCF703F90400404609D1FCF761 +:10880000C5FA0146A12300F012F869880FF23C1066 +:1088100008E0FCF7BBFA0146A62300F008F8214661 +:108820000FF26410FCF71EF808B0BDE8F0813A467C +:108830003046FCF717B880B542F62922904209D19C +:108840000A680548009200220B7941880088FCF7ED +:1088500030F902BD002002BD543400204449535F6A +:10886000496E6974000000000D0A205B25735D5B92 +:1088700025735D5B25645D2000000000433A5C7752 +:108880006F726B73706163655C46575F57425F41FF +:108890004C4C5F4944455C4669726D776172655C1A +:1088A0004D6964646C6577617265735C53545C53A5 +:1088B000544D33325F5750414E5C626C655C737649 +:1088C000635C5372635C6469732E6300446576690C +:1088D000636520496E666F726D6174696F6E2053B7 +:1088E000657276696365202844495329206973209D +:1088F0006164646564205375636365737366756C46 +:108900006C7920253034580A000000004641494C5B +:10891000454420746F206164642044657669636512 +:1089200020496E666F726D6174696F6E2053657257 +:10893000766963652028444953292C204572726F5B +:10894000723A20253032582021210A004D616E757F +:108950006661637475726572204E616D652043684F +:1089600061726163746572697374696320416464E0 +:108970006564205375636365737366756C6C7920E9 +:108980002025303458200A004641494C4544207483 +:108990006F20616464204D616E75666163747572E9 +:1089A0006572204E616D6520436861726163746514 +:1089B0007269737469632C204572726F723A202554 +:1089C0003032582021210A00704770472DE9F041CC +:1089D000054686B068780024FF2861D1B5F80310F9 +:1089E0000FF208360FF2EC280FF21430B74F40F6B2 +:1089F0000142891A2BD0123952D1FCF7C7F901462E +:108A00007023424600F049F90FF24430FBF72AFF89 +:108A1000FA88B5F80710521C914241D1AB7AB5F8EB +:108A200005006A7A0124012B08D100920A350195CC +:108A300000230022FCF743F900202CE005F10A0393 +:108A40000193009280230122FCF739F928E07A880B +:108A5000B5F80710921C914222D1697B0124CA0704 +:108A60000DD5FCF793F90146A223424600F015F913 +:108A70000FF20430FBF7F6FE8DF808400DE0FCF72E +:108A800085F90146A823424600F007F90FF22C3081 +:108A9000FBF7E8FE02208DF8080002A800F0A0FC19 +:108AA000204606B0BDE8F081FEB5014601AA487A2D +:108AB0008DF804004B7A08885070DC0704D50888CC +:108AC000000A9070032300E00223487A040707D5C8 +:108AD0004888D0545B1C4888DCB2000A10555B1CE7 +:108AE0004C7AE00610D50D7A00200BE001EB400433 +:108AF000DFB2A688D6555B1CA488DEB2240A945542 +:108B00005B1C401CA842F1DB01A970480091DBB25C +:108B1000418800880022FBF7CCFFFEBD2DE9F8411B +:108B200087B06B48694D0FF2D8180FF2C0160FF2DC +:108B3000D027FCF78FFA41F60D01ADF8181000951B +:108B40000823012206A90120FBF70AFF0400404682 +:108B50000AD1FCF71BF901464FF4D97300F09CF8D9 +:108B600029880FF2A82009E0FCF710F9014640F22D +:108B7000B71300F091F821460FF2C820FBF772FE00 +:108B800042F63720ADF81800012204920A20A91CF1 +:108B90000390002310220591029301930092072372 +:108BA000288806AA0121FBF72AFF040040460AD1C3 +:108BB000FCF7ECF8014640F2D31300F06DF8698839 +:108BC0000FF2B82009E0FCF7E1F801464FF4EC732E +:108BD00000F062F821460FF2E820FBF743FE42F670 +:108BE0003820ADF8180000220492029201920A2067 +:108BF000291D03900222059100F047F80400404629 +:108C00000AD1FCF7C3F801464FF4F77300F044F8BB +:108C1000A9880FF2F42009E0FCF7B8F8014640F209 +:108C2000F31300F039F821460FF21830FBF71AFE63 +:108C300042F63920ADF818000022049201920A2071 +:108C4000A91D0390022308220591029300F01DF84C +:108C5000040040460AD1FCF799F801464FF402732C +:108C600000F01AF8E9880FF21C3009E0FCF78EF8E2 +:108C7000014640F20D2300F00FF821460FF23C3080 +:108C8000FBF7F0FD08B0BDE8F081009201232888D1 +:108C900006AA0121FBF7B3BE3A463046FBF7E2BD18 +:108CA00080B5002242F63723C01A09D0401E0BD1EE +:108CB00006480091012381880088FBF7FAFE02E054 +:108CC0000846FFF7F1FE0246104602BD3034002090 +:108CD000CD89000848656172526174655F457665AB +:108CE0006E745F48616E646C657200000D0A205BF3 +:108CF00025735D5B25735D5B25645D2000000000CE +:108D0000433A5C776F726B73706163655C46575F63 +:108D100057425F414C4C5F4944455C4669726D77F0 +:108D20006172655C4D6964646C6577617265735CE2 +:108D300053545C53544D33325F5750414E5C626C18 +:108D4000655C7376635C5372635C6872732E630058 +:108D50004143495F474154545F57524954455F501E +:108D600045524D49545F5245515F56534556545FE5 +:108D7000434F44450A0000004143495F4741545472 +:108D80005F4154545249425554455F4D4F44494602 +:108D90004945445F56534556545F434F4445204828 +:108DA00052535F4E4F54494649434154494F4E5FD9 +:108DB000454E41424C45440A000000004143495F92 +:108DC000474154545F4154545249425554455F4DB4 +:108DD0004F4449464945445F56534556545F434FB7 +:108DE0004445204852535F4E4F54494649434154ED +:108DF000494F4E5F44495341424C45440A000000EC +:108E00004852535F496E6974000000004865617202 +:108E100074205261746520536572766963652028F9 +:108E20004852532920697320616464656420537536 +:108E3000636365737366756C6C7920253034580AEA +:108E4000000000004641494C454420746F20616495 +:108E500064204865617274205261746520536572A4 +:108E6000766963652028485253292C204572726F19 +:108E7000723A20253032582021210A00486561725B +:108E8000742052617465204D6561737572656D65FE +:108E90006E7420436861726163746572697374698A +:108EA000632041646465642053756363657373660E +:108EB000756C6C79202025303458200A00000000A1 +:108EC0004641494C454420746F20616464204865E4 +:108ED0006172742052617465204D656173757265AD +:108EE0006D656E7420436861726163746572697345 +:108EF0007469632C204572726F723A2025303258A3 +:108F00002021210A0000000053656E736F72204C0F +:108F10006F636174696F6E20436861726163746529 +:108F20007269737469632041646465642053756376 +:108F30006365737366756C6C792020253034582016 +:108F40000A0000004641494C454420746F2061648A +:108F5000642053656E736F72204C6F636174696F28 +:108F60006E204368617261637465726973746963CA +:108F70002C204572726F723A202530325820212100 +:108F80000A000000436F6E74726F6C20506F696E40 +:108F90007420436861726163746572697374696394 +:108FA00020416464656420537563636573736675FB +:108FB0006C6C79202025303458200A004641494CF9 +:108FC000454420746F2061646420436F6E74726F37 +:108FD0006C20506F696E74204368617261637465C0 +:108FE0007269737469632C204572726F723A20251E +:108FF0003032582021210A0070477047704770476F +:10900000704770477047704770477047704700005F +:109010000C48002101604160704710B500F00CF869 +:109020005C6819B1012904D1204301E024EA000061 +:10903000586082F3108810BDEFF3108272B6014BB6 +:10904000704700000834002002F025F89DF80E005B +:1090500005B000BDF8B500F10C026B4625214FF6B6 +:109060006640F1E7F8B500F10C026B460F214FF6B0 +:109070006840E9E7F8B502466B460E214FF67540A9 +:10908000E2E770B51B491C4B0A681C49C2F30D028C +:1090900001EB82010C6822689A4205D16569A169D9 +:1090A000E269E368246904E025696169A26963688B +:1090B000A4682E0E067001722E0C467042722E0AA3 +:1090C0008670C473C5F3031605F00F050571C670ED +:1090D0000D0E45710D0C85710D0A190E8172C57149 +:1090E000190CC1721B0A210E41730373210C817389 +:1090F000002070BD3C400058B95646A9000003202E +:10910000A04900E0A04981B00A6802430A600968EA +:1091100008400090009801B0704738B59B499C4CBE +:109120004FF40040086001F0CFFD606840010ED5AB +:109130006068C0000BD401F0FDFF01F0FBFF206868 +:1091400040F480302060216821F48031216000F0FB +:10915000DEF8002000F0A6FE40B180798D49E16084 +:10916000E16821F47C5141EA0021E16000F053F80C +:10917000894C8A488A4D606204F1240001F0E2FFC4 +:109180008848016800220260026902F05002026110 +:109190000420FFF7B7FF0120FFF7B4FF0220FFF71D +:1091A000B1FF0420FFF7ACFF0120FFF7A9FF022069 +:1091B000FFF7A6FF00220F210E2002F017F80E2065 +:1091C00002F032F800220F213A2002F00FF83A2084 +:1091D00002F02AF80020606025600F20A06047F6AA +:1091E000FF70E06000202061A061E06160612046C6 +:1091F00002F070F8CA206862FF2153206862A868F4 +:10920000C008C000A8606962FEF754FF4FF0FF304D +:10921000FBF72EFEFAE710B5AEB01CA84821FBF70D +:1092200023FE01A81C21FBF71FFE08A85021FBF715 +:109230001BFE01F07FFF5648016821F01801016014 +:1092400007215948026822F4C06242F400720260A9 +:109250004FF48032006800F4C06000904FF48074D6 +:1092600000981C9101201E900021402020901D920A +:1092700027911F941CA802F0DAF86F2001900221B8 +:109280000020029103900490059006900790012120 +:1092900001A802F07EFB43F60300089000214FF482 +:1092A000804019900E910F91102002211B901A916D +:1092B000189408A802F046FD2EB010BD10B53B4C26 +:1092C0003B4800F017F84FF40040E06100202062B6 +:1092D0006062A062204602F0B3FE0021204603F047 +:1092E0006EFB0021204603F075FB2046BDE81040D0 +:1092F00003F048BB20604FF4E13060600020A060C4 +:10930000E06020610C2060610020A0617047294866 +:1093100081B0016841F4801101603F21006800F4D0 +:10932000801000900098244841604161016841F438 +:109330007C110160026942F47C120261016841F013 +:109340003F010160026942F03F02026101B07047D3 +:1093500038B5044603F092FB14F1010F054609D01D +:1093600001F0C9FC241805E01448016821F004014B +:10937000016030BF03F082FB401BA042F4D331BD3B +:1093800000000000480000584C00005810400058F1 +:1093900090000058FECAFECA94310020000C00580C +:1093A000002800408008005800040058742F002056 +:1093B0000038014050000058040C005810ED00E047 +:1093C00070470000E0B505A0042100908DF804105E +:1093D00042F629206946FFF72EFA07BD53544D0087 +:1093E00010B500782B4C18B102280FD004D310BD53 +:1093F000A0800120207310BD607B00F06BFA607BC1 +:10940000BDE8104040F6010100F0B3BA607BBDE852 +:10941000104000F05FBA10B50FF2450200210220A3 +:10942000FBF78DFD1B4C0021042021732070214689 +:1094300042F63820FFF734FC1F20E07204F10D01E2 +:109440000A20A0800120A0724FF48060E0800122F9 +:10945000BDE810400FF24503002000F015BA0000EF +:109460000D480C490068CA7A00F007004130488076 +:109470001307087B04D518B98888401D888003E04D +:10948000012804BF00200873891C42F63720FFF72B +:1094900007BC0000C433002028280040002102201F +:1094A000FBF75ABDDFF83C150A6892B200E00246AD +:1094B000086880B28242FAD170472DE9FC41044627 +:1094C0001825DFF82485DFF82465684308EB0007DA +:1094D0003078062808D131787170347078754FF083 +:1094E000FF307060002039E000F077F8B9680918A3 +:1094F000B96008F10803B96832786A439A58914212 +:10950000327813D308F1150315FB02FC13F80C3065 +:10951000062B25D008F108066B43F358994222BF69 +:1095200008F115036A439A5CEED219E011463378CC +:1095300069439A420BD008F1140308F1150C5B5CE7 +:1095400015FB03F50CF805407A753B7500E07A755C +:1095500008F114025454317871703470BDE8F6810A +:109560001146694308F115035B5C062B04D008F132 +:10957000140615FB03F574557B753A7508F1150251 +:109580005454EBE7F8B5DFF86434DFF85C541E7828 +:10959000182402466243B0422A4404D11878587015 +:1095A000507D18700FE0167D507D92F815C005F1C2 +:1095B00015076643062807F806C004D0167D143543 +:1095C00014FB00F42E55012010731878062802BFF2 +:1095D00000294FF0FF315960F1BD10B5DFF80C44A0 +:1095E000606810F1010F0FD0FFF75CFF6168DFF8D2 +:1095F0000024814261683CBF5388C918081A517819 +:1096000048431178C84000E0002080B210BD2DE929 +:10961000F84FDFF8DC53DFF8DCB3D5F80880D8F872 +:109620000000DBF800104A0500F090F9DFF8BC6399 +:10963000DFF8B4A321F4806181604FF01809347819 +:109640000AF1080019FB04F14758FFF7C6FF8742EB +:1096500017D200270121B170062C3DD019FB04F46C +:109660000AF108010AF108020959814223BF0AF1EF +:1096700008010959091A002111510AEB04014C7D16 +:10968000EAE7A9884118B94202D2AF880021E2E78F +:109690003F1ADFE7022802DA2878012800D07F1E6F +:1096A000D8F80000C1684A07FAD500F055F9DBF890 +:1096B0000C00000CBFB247EA0047CBF80C70FFF774 +:1096C000F1FE7060A8680068816841F48061816083 +:1096D000AFF30080BDE8F18FB8B20028DAD1FFF710 +:1096E000E1FE70600320BDE8F24F01F0CBBD2DE933 +:1096F000F843EFF3108872B6BD4DBB4BA868016804 +:10970000CA224A6253204862B84A886820F48060BE +:10971000886018201678374647431F44387B022854 +:1097200026D13C68D7F810909078F0B17A7B012A66 +:109730000AD101213046FFF725FF88F310887968A8 +:10974000304600F016F904E088F31088304600F047 +:10975000C1F8A8680068CA214162224653214162CB +:109760004846314600F050F90BE0FFF750FF06E0A5 +:10977000C8684207FCD500F07EF89F49086088F36E +:109780001088FF21A86802685162BDE8F183F8B52E +:10979000974CA160CA2209684A6253224A62954ADC +:1097A000136843F020031360136803F00703C3F149 +:1097B0000403237095682D0C05F07F056D1C657002 +:1097C000EDB29268C2F30E02521C628092B2521E37 +:1097D0006A43A2F5A072DA404FF6FF739A422CBF9B +:1097E000A380A280854A136843F400231360844B4E +:1097F0001D6845F400251D6048BB7C487A4E012356 +:10980000837018254FF0FF33436000235FFA83FC19 +:1098100006F10C0715FB0CFC4FF0000E07F80CE0EE +:109820005B1CDFB2062FF1DB06230370886820F48F +:109830008060886000F01FF8D060032001F02DFDEB +:10984000A1680868826842F48042826005E0C868C6 +:10985000410544BF032001F015FDA1680A68FF20FF +:10986000506200220321032001F0C0FCBDE8F24059 +:10987000032001F0D9BCC86800F0800060F490605B +:10988000C8604FF400207047F0B504460025EFF3A0 +:10989000108672B61827DFF850C10CF10C0007FBD8 +:1098A00005FE10F80E0010B16D1C062DF5DB062D1F +:1098B0000CD06F430CEB07000127077386F3108869 +:1098C0000461427303600D700020F0BD86F31088C0 +:1098D0000120F0BDF8B50746EFF3108472B60320FF +:1098E00001F0ADFC424DAE683068CA2141623A4693 +:1098F00053214162182043494243895C02291BD10C +:1099000000213846FFF73EFE3848017806290ED17F +:10991000306838490A68530500F018F821F480616E +:109920008160C1684A07FCD500F016F804E0407871 +:10993000884218BFFFF76BFEA9680A68FF205062D3 +:10994000032001F071FC84F31088F1BD02D5C168D9 +:109950004A07FCD481687047C16801F0800161F456 +:109960009061C1604FF4002023490860032001F09A +:1099700094BC2DE9F04180460F46424618201A4912 +:1099800042438C18207B022804BF4046FFF7A2FF09 +:10999000EFF3108572B6032001F051FC144EB0684D +:1099A0000068CA2141625321416202202073A760EE +:1099B00067604046FFF781FD0C490A78497891427B +:1099C00002D0FFF724FE02E0A168081AA060FF2081 +:1099D000B1680A685062032001F026FC85F3108804 +:1099E000BDE8F081282800400430002038340020F1 +:1099F000F4330020082800400C08005800080058E4 +:109A00008008005810300020104700B587B000F0E3 +:109A100027FA00F0D7F9812000F078F900F096F9E4 +:109A200000284CBFFF209DF8000007B000BD2DE9C5 +:109A3000F84DC7B09446DDF840E1519A559D569EC9 +:109A4000DDF84CA1ADF81D108DF81C004FF0000B97 +:109A5000ADF81FC08DF821308DF822E000F024F819 +:109A600000F017F824F8095F668000F0ABF93F209A +:109A7000832100F098F9574406910D37049700F0C0 +:109A800068F900284CBFFF209DF8000048B0BDE8F1 +:109A9000F08D88F800A007AC5499E419524608F1FB +:109AA00001005444FBF753B98DF82320174652990F +:109AB0008DF800B00DF1240809A8B844FBF747B9A8 +:109AC00000B5C7B000F00CF8852000F048F900F0B0 +:109AD0003DF900284CBFFF209DF8000047B000BDB5 +:109AE00000218DF81C008DF80010182201A8FBF74A +:109AF00034B92DE9F841C7B04FF0000800F026F85E +:109B00000DF12300DDF844E14E9F4F9E509D529C85 +:109B10008DF81F30C0F800E08DF800808DF82070BF +:109B20008DF821608DF822508DF8274000F04AF919 +:109B30008620ADF8060007A90C2000F003F90028E4 +:109B40004CBFFF209DF8000000F06EB98DF81C009E +:109B500007A841708270704700B5C7B00022ADF809 +:109B60001C008DF800200DF11E001822016001A8D4 +:109B70000021FBF7F2F88820ADF8060007A90620BF +:109B800000F0E0F800284CBFFF209DF8000047B02F +:109B900000BDF8B5C8B005460E4617461C4600F095 +:109BA00023F808A8467087708DF8205000F0F6F86A +:109BB0008A21ADF80A103F20032100F0E2F80028C6 +:109BC00048BFFF200ED49DF8000058B94F994E9819 +:109BD000BDF801202280BDF803200280BDF80500F9 +:109BE0000880002049B0F0BD072200216846FBF73D +:109BF000B4B800B5C7B00021ADF81C00FFF773FF83 +:109C00000F2102918D20022100F0B2F800F09FF8A0 +:109C100000284CBFFF209DF8000047B000BD18B5DC +:109C2000C7B000F02CF900F0CDF83F208E2100F0F5 +:109C30001BF900F08EF800284CBFFF209DF80000B3 +:109C400048B010BD78B5C7B006460C46154603228D +:109C5000FFF7CBFFADF81C6000F0B4F8902100F0E6 +:109C6000E6F80221ADF80400049107A8032103904F +:109C7000069100F06EF8002848BFFF2009D49DF837 +:109C8000000030B99DF8010020709DF80200287096 +:109C9000002048B070BDADF8060007A9022070474B +:109CA00000B587B000F0DCF800F08CF8922000F0EE +:109CB0002DF800F04BF800284CBFFF209DF8000065 +:109CC00007B000BD00B5C7B000F075F80F210291D4 +:109CD000932000F04CF800F03AF800284CBFFF2029 +:109CE0009DF8000047B000BD00B587B000F0B8F89F +:109CF00000F068F8942000F009F800F027F8002838 +:109D00004CBFFF209DF8000007B000BDADF8060075 +:109D10003F220120704700B5C7B00021ADF81C00FC +:109D2000FFF7E1FE9520FFF7B6FF00F00BF80028E3 +:109D30004CBFFF209DF8000047B000BDADF8060005 +:109D400007A9032004903F22012003910690ADF85B +:109D50000420CDF814D0002101A8FDF7B4BDADF862 +:109D6000060007A901203F220391049070470321B8 +:109D7000ADF80600049107A801213F220390069147 +:109D80007047ADF80800059108A8072104900791D5 +:109D9000CDF818D0002102A8FDF795BD18220021AA +:109DA00002A8FAF7DABFADF80400ADF8061007A86C +:109DB00001210390704700228DF80020ADF81C00AF +:109DC0008DF81E101822002101A8FAF7C6BF00B5B1 +:109DD000C7B000F011F8FFF7F5FFA42100F027F855 +:109DE000072100F057F8FFF7B4FF00284CBFFF2011 +:109DF0009DF8000047B000BD00228DF800208DF8CE +:109E00001C0006220DF11D00FAF7A1BF00B5C7B076 +:109E1000FFF7D1FFA520FFF791FF00284CBFFF20DF +:109E20009DF8000047B000BD48B0BDE8F081ADF836 +:109E300006103F20704700B5C7B0FFF7DDFFFFF702 +:109E4000C1FFAA21FFF7F3FF072100F023F8FFF776 +:109E500080FF00284CBFFF209DF8000047B000BDE8 +:109E600000208DF800007047ADF80400ADF8061032 +:109E700007A8012103900691641C049470470446CE +:109E800000208DF800008DF81C4022460DF11D00C9 +:109E9000FAF75DBFADF80400049107A80121039013 +:109EA0000691704701460648064AC3798B4218BF9F +:109EB000904218BF0838F8D18B4218BF0020704775 +:109EC000F873FF1F0070FF1F18B50C46C7B011468E +:109ED00000228DF800208DF81C008DF81D402246D0 +:109EE0000DF11E00FAF733FF00F02AF83F200C2195 +:109EF000ADF80400ADF8061007A801210390069103 +:109F0000A41C049400F02CF800284CBFFF209DF8FE +:109F1000000048B010BD00B5C7B000F00AF80F202F +:109F200000F013F800284CBFFF209DF8000047B058 +:109F300000BD00228DF800208DF81C008DF81D104A +:109F40001822002101A8FAF708BFADF8060007A9FA +:109F5000022004903F22012003910690ADF80420D6 +:109F6000CDF814D0002101A8FDF7ADBC1B48704707 +:109F700030B45368D418042B09DA41B1057804F8D9 +:109F8000015B10F8015B15B15B1C491EF3E75360E0 +:109F900030BC704738B514461D4661B1FFF7E8FF85 +:109FA00061686A6B204690476FF00102811A02D007 +:109FB000491E03D005E06FF0010032BD4FF0FF30C5 +:109FC00032BD0021616032BDDA6B1047034BE1E71F +:109FD000024BF9E702487047000000002C240020E3 +:109FE0004C2500200278C9B28A421AB11CBF10F871 +:109FF000012FF9E718BF00207047000080B508B9AD +:10A000000FF21C0005490B681BB122220021984762 +:10A0100001E002F039FD222002BD0000483400209A +:10A02000636F6E73747261696E742068616E646CC4 +:10A0300065723A20626164206D65737361676500C3 +:10A04000C9B2830706D0521E22D310F8013B9942B1 +:10A05000F7D11FE0083A13D302F1040241EA0121CB +:10A0600041EA014150F8043B121F21BF4B40A3F1CC +:10A07000013C2CEA030C1CF0803FF3D0C9B2001F56 +:10A08000083210F8013B521E28BF91EA030FF8D89E +:10A0900018BF0120401E704780B5FFF767FF006CB6 +:10A0A00002BD0000B3BBD9B1B2F5803F7DD2022A18 +:10A0B0001ED98C46B1FBF2F102FB11C31B0443EA2B +:10A0C0001043B3FBF2FC02FB1C3380B240EA0343B3 +:10A0D000B3FBF2F002FB103240EA0C400023704761 +:10A0E000022A05D98446B0FBF2F002FB10C2704789 +:10A0F0004AB105D100F0010249085FEA300070471B +:10A1000000220023704702F0C3BC0B0002000021B4 +:10A1100000207047904271EB030CF6D3B3F5803FFB +:10A120002FD2F0B5B3FA83F7B1FA81F4A7F10F0E8D +:10A130003D1B5340CEF1200602FA0EF2F34153408C +:10A14000B5F10F0746D80F3C2C444140C4F120061E +:10A15000A040F1414140B1FBF3F603FB1611A2FB15 +:10A160000645001BA94102D2761E8018594180EA9B +:10A17000010221FA0EF362FA0EF200215A40304633 +:10A18000F0BD30B4B1FBF3FC03FB1C11A2FB0C458A +:10A19000001BA94103D2ACF1010C8018594130BC1D +:10A1A00002460B46604600217047B2F1807F65D3BE +:10A1B000F0B5B2FA82F7B1FA81F4C7F10F063D1B90 +:10A1C00022FA06F307F1110EF24120355A40B5F19B +:10A1D0000F07B8D94140C4F12006A040F1414140E9 +:10A1E000B1FBF3FC03FB1C11A2FB0C45001BA941B6 +:10A1F00003D2BCF1010C801859410F2F12D30F3F2D +:10A20000C90341EA5041B1FBF3F603FB1611A2FB6F +:10A210000645D4EBC030A94102D2761E80185941C0 +:10A2200046EACC3C07B34140C7F12006B840F141B3 +:10A230004140B1FBF3F603FB1611A2FB0645001BE0 +:10A24000A94102D2761E8018594180EA010221FA02 +:10A250000EF3C7F1200462FA0EF20CFA07F05A402E +:10A260002CFA04F13043F0BD80EA010221FA0EF32A +:10A27000002162FA0EF260465A40F0BD8C46B1FBF6 +:10A28000F2F102FB11C31B0243EA1063B3FBF2FCC1 +:10A2900002FB1C331B024CEA002043EA1063B3FBB1 +:10A2A000F2FC02FB1C331B024CEA002043EA106361 +:10A2B000B3FBF2FC02FB1C331B024CEA002043EA16 +:10A2C0001063B3FBF2FC02FB1C324CEA00200023BB +:10A2D00070470000B0B581EA030C0CF0004C40F26E +:10A2E000FF7515EA11541DBF15EA1357AC42AF4272 +:10A2F00039E0E41923EA455343F48013C90241F0DD +:10A30000004141EA505EC7021100A7FB020200288B +:10A310004FF00000EEFB01204FF00001E3FB0721AE +:10A3200018BF42F00102401800214941E3FB0E0131 +:10A33000A4F580640F0302D252004041494154F118 +:10A3400001046CDD470872F1004250F1000051EB4E +:10A350000451A1F580115CBF41EA0C01B0BD4CEA8B +:10A3600005510020B0BD05EA1357AC4214BFAF42FF +:10A3700041E050EA410E1CBF52EA430E02E0614642 +:10A380000020B0BD24423C441BD15FEA070EF6D04A +:10A39000090302BF01460020AEF1140EB1FA81F7A5 +:10A3A000AEEB070401FA07FE0C37C7F1200100FAF3 +:10A3B00007F7C8404EEA000E23EA455343F48013E2 +:10A3C000A2E733F00043B3FA83F704BFB2FA82FE88 +:10A3D00077440B3FE41BB7F1200E2FBF02FA0EF3B8 +:10A3E000BB40C7F1200E22FA0EFE38BF43EA0E032F +:10A3F000BA40641C82E750EA410E14BF52EA430E91 +:10A400006FF000014FF4001717EB430F8ABF194696 +:10A4100017EB410FB5E74CEA05510020B0BDD4F170 +:10A420000104B4F120070FDAC4F12007520828BF55 +:10A4300042F0010210FA07F501FA07F7E1BF2A43DB +:10A44000E0403843E1400FE0352C98DCC7F12004B0 +:10A4500052EA400220FA07F218BF42F0010231FA34 +:10A4600007F0A1400A43002172F1004250F10000C0 +:10A4700051EB0C01B0BD000010B5144600F002F81D +:10A48000226010BDC1F30A5343B14A0012F5001F08 +:10A4900028D2A3F2FE32A1EB0251704750EA410CE0 +:10A4A00020D001F0004C31EA0C01B1FA81F204BF76 +:10A4B000B0FA80F3D2180B3AB2F120032CBF00FAA5 +:10A4C00003F1914041EA0C013EBFC2F1200C20FA99 +:10A4D0000CF319439040524240F2FD33D21A01EB83 +:10A4E00003517047002270474FF4001C1CEB410FD2 +:10A4F00094BF1CEB430F09E041EA030C50EA4C0CFB +:10A5000052EA0C0C03D2994208BF9042704714BF24 +:10A510008B428242704700004FF4001C1CEB410F3D +:10A5200094BF1CEB430F09E041EA030C50EA4C0CCA +:10A5300052EA0C0C03D28B4208BF8242704714BF10 +:10A540009942904270470000124254D440F2FF7C7E +:10A550001CEA11530FD0634531D09B1863453CBFB3 +:10A5600001EB0251704701F0004141EA0C5100201B +:10A57000AFF30080704750EA410320D001F0004C57 +:10A5800091EA0C011CD0B1FA81F30B3B9A420DD930 +:10A59000D21A994051EA0C01C3F1200C20FA0CFCAC +:10A5A00061449840531C40F2FF7CD7E7914041EA58 +:10A5B0000C01C2F1200C20FA0CF3194390407047B3 +:10A5C000B0FA80F31533202BE0D3202AEED3203AC3 +:10A5D000203B9A4209D9D21A00FA03F141EA0C0150 +:10A5E0000020531C40F2FF7CB8E700FA02F141EA78 +:10A5F0000C0100207047524240F2FF7C1CEA1153CC +:10A600000DD06345DBD0B2EB030C3CBFA1EB025194 +:10A6100070470CF1010221EA035141F4801150EA24 +:10A62000410CCCD001F0004C352A27DC30B481EA53 +:10A630000C01B2F1200309DAC2F12003044601FA49 +:10A6400003F5D0402843D1409C400CE0C3F12002E8 +:10A65000450020FA03F418BF44F0010421FA03F086 +:10A6600091400C43002174F1004550F1000051EB82 +:10A670000C01244230BC7FF47BAF70476146002060 +:10A6800076E70000C1F30A5340F2FE329B1A14DD54 +:10A69000D3F120034FEAE17208DDC90241EA5051CB +:10A6A00041F00040D84080185040704703F2E1303C +:10A6B00010B1D24382F00040704700207047000084 +:10A6C000C11768B14840401AB0FA80F29040D21CDD +:10A6D000C907C2F5846241EA025202EBD02140056B +:10A6E0007047000070B44FF0004591EA030F42F14B +:10A6F000D1816B40841A71EB030603D2001BB14178 +:10A70000121973414FF4001C1CEB410F34BF7CEB5A +:10A71000430442E00C0DA4EB1356352E4FDC45EA02 +:10A72000C323DB0A45EAC121C912B6F120050DDDBC +:10A7300063FA05F6EB4086EA0305124218BF45F0BE +:10A740000105C01851F100010CD213E062FA06F5C0 +:10A75000F2405540F3415A40B340F3405A4080180C +:10A76000594107D349085FEA30005FEA350528BF41 +:10A7700045F0010501F58011420875F1004250F1E4 +:10A78000000041EB04514E0016F5001F70BC38BFAD +:10A7900070470020090D090570471CEB410F10D2CE +:10A7A00052EA43060BD0BCEB410F05D80C0DAB436E +:10A7B000661E342EB6DD02E0AB438018594170BCF2 +:10A7C000704770BC70470000F0B540F2FF7581EA39 +:10A7D000030C0CF0004C15EA11541DBF15EA135779 +:10A7E000AC42AF42E5E0BC41C1F31301C3F3130334 +:10A7F000801A994143F4801304D2641E40004941F9 +:10A8000080185941C90241EA5051B1FBF3F603FBEC +:10A810001611A2FB0675D7EBC020A94102D2761E05 +:10A8200080185941C90241EA5051B1FBF3FE03FBC4 +:10A830001E11A2FB0E75D7EBC020A94103D2AEF1C9 +:10A84000010E80185941890241EA9051760546EA85 +:10A850008E2EB1FBF3F603FB1611A2FB0675D7EBA8 +:10A860008020A94102D2761E80185941C90241EACE +:10A8700050514EEA060EB1FBF3F603FB1611A2FB94 +:10A880000675D7EBC020A94102D2761E8018594127 +:10A89000C90241EA5051B1FBF3F703FB1711A2FBC8 +:10A8A0000735D3EBC020A94167F100070CBF004278 +:10A8B00047F0010766F3D5274FEA1E31B80814F5B3 +:10A8C000806412DDBD0775F1004250EB0E5051EB74 +:10A8D000045111F5801F5CBF41EA0C01F0BD4CF042 +:10A8E0007F6141F0E0410020F0BDBD076D0840EA06 +:10A8F0000E5041F48011D4F10104B4F120060ADABB +:10A90000C4F120060200E04001FA06F3E1401843DA +:10A91000B24015430EE0342C13DCC6F1200445EAA6 +:10A9200040056D0820FA06F2154321FA06F0A14011 +:10A930000D43002175F1004250F1000051EB0C0174 +:10A94000F0BD00205FEA0C01F0BDCFB992185B4169 +:10A95000B3FA83F704BFB2FA82F6BF190B3FB7F11F +:10A9600020062FBF02FA06F3BB40C7F1200622FAE9 +:10A9700006F638BF3343BA401CB1E419641E33E70E +:10A980007F4231F00041B1FA81F404BFB0FA80F6A1 +:10A99000A4190B3CB4F120062FBF00FA06F1A14028 +:10A9A000C4F1200620FA06F638BF3143A0403C1B14 +:10A9B0001AE7AC421ABF05EA1357AF4212E050EA59 +:10A9C00041061CBF52EA4306BFE750EA4107304642 +:10A9D00061461CBF41EA0551F0BD52EA430C08BF75 +:10A9E000C143F0BD00204FF4001616EB410F98BF95 +:10A9F00016EB430F08BF16EB410F24BFC14305E020 +:10AA000016EB430F0CBF61464CEA0551F0BD000048 +:10AA1000400D491840EA81200CD2490DA1F5806112 +:10AA2000491C40F0004005DBD1F11F0154BFC84074 +:10AA3000C017704700207047014648B1B0FA80F156 +:10AA40008840C91CC1F58461090501EBD02140058E +:10AA5000704700000249016002490161704700BF70 +:10AA600027AB00084DAB0008006040607047EFF373 +:10AA7000108172B6026882420CBF012000201CE0E7 +:10AA8000EFF3108272B603680B60486001600868DB +:10AA9000416023E0EFF3108272B6086043684B60B8 +:10AAA00041604868016019E0EFF3108172B64268B6 +:10AAB0000368136002684368536081F3108870472D +:10AAC00010B5EFF3108472B602680A600068FFE701 +:10AAD000FFF7EAFF84F3108810BD0B6082F3108843 +:10AAE0007047000002F0FDB86C486D49016001F14B +:10AAF0002002426001F13002826001F13C020262F8 +:10AB000001F14402426201F14C02C26001F15402BF +:10AB1000026101F17002426101F1740282618031CF +:10AB2000C16102F0FCB838B504465E4D2846FFF717 +:10AB30009BFF5A484068A1680160E168C160856078 +:10AB40005949416002F007F958482AE080B5534856 +:10AB50004268136801211972406802F002F900206E +:10AB600002BD38B5514C4F4D04E000F041F800985B +:10AB7000216888472846FFF77AFF0028F5D031BDC5 +:10AB80004A484168084738B50446494D2846FFF70A +:10AB90006BFF4248C068A1680160456002F0E6F8BA +:10ABA00044482168016061684160002032BD80B581 +:10ABB0003A48C268136810211972C06802F0DCF8C4 +:10ABC000002002BD35483B4AC168C1681368086867 +:10ABD000184738B5374C364D04E000F009F80098B6 +:10ABE000616888472846FFF742FF0028F5D031BD4D +:10ABF00069462846FFF764BF38B504462E4D2846FF +:10AC0000FFF732FF2D48FFF72FFF24480069A168A6 +:10AC10008160E168C160056121680160616841602F +:10AC2000216941616169816131BD80B50146234877 +:10AC3000FFF730FFBDE802400FF2050002F0A5B8B3 +:10AC400038B5164C1D4D06E0FFF7D2FF009920697C +:10AC50000069FFF71FFF2846FFF709FF0028F3D020 +:10AC600031BD10B5164C2046FFF7FEFE0B4841697A +:10AC70000C60BDE8104002F09CB81CB5104C06E01A +:10AC800069462046FFF71CFF009800F01BF820469D +:10AC9000FFF7EDFE0028F3D013BD000000000320F5 +:10ACA000AC090320480A0320900803201834002030 +:10ACB000500A032020340020380A032010340020DA +:10ACC000400A032070470000134810B5016841F4A2 +:10ACD00080710160032000F07CFA002002F082F80D +:10ACE0000024002814BF012402F0ABF8204610BD58 +:10ACF0000A4880687047094800787047084805E0AE +:10AD00000748016841F0020101607047016841F0A5 +:10AD1000010101607047000000400058E425002058 +:10AD2000042004E02DE9F84F4FF00009674A684B12 +:10AD30004FF00F0805460E4633E0664FBD4214BF84 +:10AD4000072704278F4027434CF82E70C1431C6807 +:10AD500001EA040C7468E40248BF40EA0C0CC3F832 +:10AD600000C05C6801EA040C7468A40248BF40EAB1 +:10AD70000C0CC3F804C0146801EA040C7468E40302 +:10AD800048BF40EA0C0CC2F800C0546801EA040C49 +:10AD90007168890348BF40EA0C0CC2F804C009F18D +:10ADA0000109316831FA09F000F07E80012404FACB +:10ADB00009F414EA0100F2D04FEA490C032101FA28 +:10ADC0000CF16FEA010E716801F00307012F1CBF3F +:10ADD00001F00301022911D1A968F7680EEA010107 +:10ADE00007FA0CF73943A960696821EA040471681D +:10ADF000C1F3001101FA09F10C436C604FEA8901BB +:10AE0000347904F00304032C1FD0EC68B7680EEA11 +:10AE1000040407FA0CF73C43EC60347904F00304B3 +:10AE2000022C12D14FEAD90705EB870401F01C0769 +:10AE3000D4F820A008FA07FB2AEA0B0AD6F810B0CB +:10AE40000BFA07F747EA0A0727622C680EEA04079D +:10AE5000347904F0030404FA0CF43C432C60746865 +:10AE600014F4403F9BD0DFF870C04FEA990E5CF8B5 +:10AE70002E7001F00C0108FA01F427EA0404B5F180 +:10AE8000904F08BF00270ED0144FBD4208BF0127C6 +:10AE900009D0134FBD4208BF022704D0114FBD4255 +:10AEA0007FF44BAF03274DE7BDE8F18F81B0002A57 +:10AEB00014BF8161816201B070470B4A136803427D +:10AEC0001CBF1060FDF782BA704700008008005870 +:10AED0000008005800100048080001400004004825 +:10AEE00000080048000C00480C08005810B5002469 +:10AEF00088B9114803600E480E4B036001F0E0F87A +:10AF0000012805D007D3032804D038BF022402E06B +:10AF1000012400E00324204610BD00680549884252 +:10AF200004D105490868002818BF00477047000091 +:10AF3000742F00200038014044340020264981B09D +:10AF40000A6802430A60096808400090009801B04E +:10AF50007047F0B585B005460C4668461421F9F7F0 +:10AF600083FF0DB9042004E0012D18BF022D02D18A +:10AF70000820FFF7E3FF2000184E0FF264070DD101 +:10AF800037F8150000900021019101200290022164 +:10AF9000039100F01CF80120FEF7DAF9012C14D11E +:10AFA00037F81500009001214FF404100190029130 +:10AFB00000F00DF80FF23000445D00220F2160B266 +:10AFC00000F014F960B200F02FF905B0F0BD694649 +:10AFD00056F82500FFF7A6BE4C000058F0250020CB +:10AFE00010000100020000000A0607007FB50C46B1 +:10AFF0004D4D61684D4EE8612962284602F014F813 +:10B000002468746006F10800FFF72EFD012000F0AF +:10B0100068F801203070296841B10FF2E9000FF2A1 +:10B02000ED02009001920294684688477FBD1FB5EB +:10B030003E4C04F10800FFF71AFD00BB2178F1B186 +:10B04000694604F10800FFF73BFD3748C16949B183 +:10B050000098029001228DF8042001A888479DF8ED +:10B06000040000E001202070207818B10098FFF75C +:10B07000DCFD04E0009904F10800FFF701FD04F194 +:10B080000800FFF7F4FC28B9207818B104F1080093 +:10B09000FDF792F91FBD2DE9F04105460E46904699 +:10B0A0001C46002000F01DF8204F7868A0F80950D9 +:10B0B000C672324641460C30F9F7E8FB1A4A13696A +:10B0C00000210020984748F2E800FDF77CF97968F4 +:10B0D0008A78D21C04F10800F9F7D8FBBDE8F041EA +:10B0E00001201CB51049124C096A20B901B18847EA +:10B0F0000020207013BD0120207011B1BDE81C405C +:10B10000084713BD0020FDF75BB9000010B50146EC +:10B11000064C04F10800FFF7BDFC04F10800BDE88F +:10B120001040FDF749B9000080330020E4330020CF +:10B13000593400200248016841F480710160704771 +:10B1400000040058F8B504460025ACB104F13406FB +:10B15000307910B9204601F083FE0F4F384600F0D9 +:10B1600021F8386840F001103860204600F007F8F8 +:10B1700035600120307100E001252846F2BD10B590 +:10B180000021064A064B00EB8104491C0629636036 +:10B19000E261F8D310BD0000000C00580F51000808 +:10B1A0006F4E0008002101604FF03F1141603F21C8 +:10B1B000816070470901020081B002D43C4881548B +:10B1C00005E03C4802F00F02104400F8041C01B0F6 +:10B1D0007047394A13684FF6FF0100020B4000F434 +:10B1E000E0601843354908431060704738B5324B6A +:10B1F0001C68C4F30223C3F10704052C28BF0424F0 +:10B200001D1D072D34BF0023DB1E012505FA04F4A4 +:10B21000641E2140994005FA03F35B1E1A40114356 +:10B22000BDE83440C6E70000010007D4012200F069 +:10B230001F01234B8A40400943F82020704701003A +:10B240000BD4012200F01F011E4B8A40400943F835 +:10B250002020BFF34F8FBFF36F8F704710B5401E94 +:10B26000B0F1807F01D3012010BD174C60600F2129 +:10B270004FF0FF30FFF79EFF0022A2600720206002 +:10B28000002010BD010007D4012200F01F010F4B68 +:10B290008A40400943F820207047010007D401226A +:10B2A00000F01F010A4B8A40400943F820207047F4 +:10B2B00000E400E018ED00E00CED00E00000FA050D +:10B2C00000E100E080E100E010E000E000E200E0EA +:10B2D00080E200E038B5040044D094F8210028B999 +:10B2E000002184F82010204601F060FE00F049F8AB +:10B2F000FF2510B100F03FF834E02168DFF8B0001E +:10B300008A6802408A6021688A686368206903430A +:10B31000A06903431A438A602168E06808612068D5 +:10B320000169A26841EA024101612068C16821F017 +:10B330008001C1602068C16C89088900C1642168EE +:10B34000CA6CE369606903431A43CA642068816870 +:10B35000880609D400F020F830B120684562042145 +:10B3600000F01FF8012032BD20684562012184F8F9 +:10B370002110002032BD20684562042184F821108C +:10B380007047022084F82100CA20216848625320B7 +:10B3900022685062204626E020460BE02068C0F874 +:10B3A000248084F82110002084F8200070470000D9 +:10B3B000BFFF8FFF70B5044640F2E9362068C168D0 +:10B3C00021F0A001C16001F059FB05462068C16869 +:10B3D000880606D401F052FB401BB042F6D303208E +:10B3E00070BD002070BD70B504462068C1684A0673 +:10B3F00012D44FF0FF32C26040F2E93601F03EFB5A +:10B4000005462068C168480606D401F037FB401B9A +:10B41000B042F6D3032070BD002070BD4FF0B040A5 +:10B42000006800F0F000B02888BFB02070472DE918 +:10B43000F041040054D0207881064FF0B04538D553 +:10B44000A868E96810F00C0001F0030103D00C2893 +:10B4500008BF012946D12868800702D5E069002885 +:10B460003ED0FFF7DBFF616A884207D2084600F052 +:10B47000D3FB002834D100F075FA0FE0286820F0E3 +:10B48000F000014329606968206A21F47F4141EAA4 +:10B4900000216960606A00F0BFFB08BB00F095FB0B +:10B4A000DFF810180860DFF81008006801F09AFC57 +:10B4B000B0B92078C1070DD5A868E96800F00C0084 +:10B4C000082801F0030103D00C2808BF03292DD15F +:10B4D0002868800340F139816068002840F0358198 +:10B4E000012038E2E06980B1296841F0010100F0F3 +:10B4F00047FA06462868800700F1248101F0BEFA69 +:10B50000801B0328F6D3032025E22868400840006A +:10B51000286001F0B3FA0646286800F01FFAC8D088 +:10B5200001F0ACFA801B0328F6D3ECE76068B0F5B5 +:10B53000803F04D1296841F48031296003E02A6802 +:10B5400022F480322A60606860B101F097FA064602 +:10B550002868800300F1F98001F090FA801B6528CB +:10B56000F6D3D0E701F08AFA06462868400C10F0BE +:10B57000010000F0EA8001F081FA801B6528F4D315 +:10B58000C1E701F07BFAC01B0328C0F01281BAE7C3 +:10B59000E06878B1296841F4807100F0F1F906465D +:10B5A0002868400500F1188101F068FA801B032823 +:10B5B000F6D3A8E7286820F48070286001F05EFACE +:10B5C00006462868800A10F0010000F0DC8001F0D7 +:10B5D00055FA801B0328F4D395E701F04FFAC01BFE +:10B5E0000328C0F00B818EE740F0010000F0CEF997 +:10B5F00007467068800700F11C8101F03FFAC01B0C +:10B600000328F6D37FE7706820F0040000F0BEF94D +:10B6100007467068C00810F0010000F0198101F0C1 +:10B620002DFAC01B0428F4D36DE70528306806D135 +:10B6300040F004003060316841F0010105E040084D +:10B6400040003060316821F004013160A06841F2AF +:10B65000893768B101F012FA80463068800700F13E +:10B660000C8101F00BFAA0EB0800B842F5D34AE7D1 +:10B6700001F004FA8046306800F070F900F0FD80B7 +:10B6800001F0FCF9A0EB0800B842F4D33BE701F06D +:10B69000F5F9C01B0328C0F0FE8034E7B06840080D +:10B6A0004000B06001F0EAF90746B06800F056F9D2 +:10B6B00000F0F58001F0E2F9C01B0328F5D322E782 +:10B6C00001F0DCF9801B0328C0F01F811BE701F0AB +:10B6D000D5F9001B0328C0F0398114E728688101DF +:10B6E0000CD4296841F080712960E86840F08050EE +:10B6F000E86001F0C3F904462868810100F12A815D +:10B7000001F0BCF9001B0328F6D3FCE60C2931D06C +:10B71000286820F080702860E968DFF8A0058908B3 +:10B720008900E960E9680140E96001F0A7F9044691 +:10B730002868810140F10E8101F0A0F9001B032867 +:10B74000F6D3E0E600F00EF9B3E6207881071AD5CB +:10B75000A868E96800F00C00042801F0030104D097 +:10B760000C2808BF02297FF413AF2868400503D5D1 +:10B77000E06800283FF4B4AE6968206921F0FE411A +:10B7800041EA006169602168DFF8346511F0180F43 +:10B7900038D0606900283FF436AFC90670687FF57D +:10B7A00023AF800709D4706840F0010000F0EEF884 +:10B7B0000746706880077FF5E4AE706840F00400CB +:10B7C00000F0E4F80746706800070DD401F056F960 +:10B7D000C01B0428F7D396E66868216920F0FE4074 +:10B7E00040EA01606860CEE77068A16920F470608B +:10B7F00040EA0120706000F0C6F8074600F0ADF89E +:10B800007FF4EBAE2078410737D5DFF8B87438689D +:10B81000C10529D4FFF78EFC01F030F98046386865 +:10B82000C10521D401F02AF9A0EB08000328F6D3C2 +:10B8300069E6706820F0040070607068C00810F05D +:10B840000100DFD001F01AF9C01B0428F5D35AE635 +:10B8500000F099F8074600F080F8D3D001F00EF917 +:10B86000C01B0328F7D34EE6A06801287FF4DDAEA5 +:10B87000306840F001003060E8E6217848060ED5D7 +:10B88000A06A00283FF40AAFB16841F00101B1603D +:10B8900001F0F4F80746B06880077FF5F8AEE06A7B +:10B8A000002857D0A968EA68022801F00C017FF44B +:10B8B0002DAF236B02F00300984202BF02F070002C +:10B8C000636B984214D1A36BC2F30620984202BF67 +:10B8D00002F47810E36B98420AD1236C02F06060A6 +:10B8E000984202BF02F06042606C82423FF4F6AEC2 +:10B8F0000C293FF4F5AD286841013FF5F1AD296809 +:10B9000021F0807100F03CF80646286881013FF57F +:10B91000D7AEE968DFF8B003A26B0140206B0143AA +:10B92000606B0143E06B41EA02210143206C01435B +:10B93000606C0143E960286840F080702860E96825 +:10B9400041F08051E96001F099F8044628688101CE +:10B950007FF5BDAE0020BDE8F0817068400810F0B2 +:10B96000010070472968606A21F0F00101432960F5 +:10B970006868216A20F47F4040EA012068607047CF +:10B98000296001F07BB8706840084000706001F0E9 +:10B9900075B82DE9F8430400884644D0DFF82C63DD +:10B9A00000F0CBF847D200F0CDF8074600F0C5F81C +:10B9B00041D001F063F8C01B0228F7D90320BAE098 +:10B9C00001F05CF8401B022843D9F7E701F056F874 +:10B9D000A0EB090002284CD9F0E701F04FF8A0EBEA +:10B9E0000900022854D9E9E701F048F8401B022871 +:10B9F0005DD9E3E701F042F8401B022867D9DDE793 +:10BA000001F03CF8401B484577D3D7E7032802D123 +:10BA10003968890103E00028396802D1890762D4B6 +:10BA200001E049055FD4012085E001F027F8C01B43 +:10BA3000022872D9C2E7207881074FF0B0470BD5B2 +:10BA4000B968A06821F0F0010143B96001F016F86F +:10BA50000546B868C003B3D52078DFF85452810694 +:10BA60000AD52968606921F0F0010143FFF788FFDA +:10BA7000814628688003A9D5207841060BD529681E +:10BA8000A0690909090141EA1011FFF779FF814610 +:10BA90002868C003A1D5207841070BD5B968E068B4 +:10BAA00021F4E0610143B96000F0E8FF0546B868A1 +:10BAB000800399D5207801070CD5B868216920F456 +:10BAC000605040EAC100B86000F0D8FF0546B86891 +:10BAD00040038FD52078C10717D56068022895D11B +:10BAE000396889039FD5B968890840EA8100B86040 +:10BAF00041F2893900F0C2FF0546B868616800F07C +:10BB00000C00B0EB810F7FF47BAF306800F00700D2 +:10BB1000804505D200F016F8074600F00EF884D1F3 +:10BB200000F053F8DFF88C110860FFF7E1F8BDE88A +:10BB3000F24301F057B9BDE8F283306800F0070026 +:10BB4000404570473168C90848EAC101316000F0DA +:10BB500095BF38B54FF0B0445E4DA16811F00C01AF +:10BB600006D1FFF75BFCC0F3031055F8200032BD8F +:10BB70000429594A05D00829584804D12168C90226 +:10BB800022D5104632BDE16801F00301022904D03C +:10BB9000032904D12168C90207D5104605E0FFF743 +:10BBA0003DFCC0F3031055F82000E168E268E3684B +:10BBB000C1F306214843C2F30211491C5B0FB0FBDD +:10BBC000F1F05B1CB0FBF3F032BD80B5FFF7C1FFB5 +:10BBD0003F49FFE7424A0968C1F3031152F82110B7 +:10BBE000B0FBF1F002BD80B5FFF7EFFF00F010F8F9 +:10BBF000C1F3022106E080B5FFF7E7FF00F008F887 +:10BC0000C1F3C22112F8211001F01F01C84002BD8A +:10BC10002F49344A0968704770B52E49B1282EBFA4 +:10BC2000CC6AC0F3031051F820402148056801F0A8 +:10BC300005FA2B492C4A05F00F0551F82510B4FBE5 +:10BC4000F1F10024B1FBF2F1B0F5007F0FF2B80280 +:10BC5000204609D10FF2940353F820508D4214D29C +:10BC6000401C0328F8D912E00FF2900353F820503B +:10BC70008D420AD2401C0328F8D308E000F0FEFEF3 +:10BC8000801B03280CD3032070BD52F820400F4DB9 +:10BC90002868C00844EAC000286000F0EFFE0646AD +:10BCA000296801F00701A142E8D1002070BD000021 +:10BCB00008010058FC250020EC250020FFFFFEEEC7 +:10BCC00090000058000400588C80C11100400058BA +:10BCD0000800005864DE00080024F4000048E80171 +:10BCE00024DE0008E4E5000840420F0012000000D6 +:10BCF00024000000360000004000000006000000A4 +:10BD00000C00000010000000000000000100000016 +:10BD10000200000003000000DFF820130A68030996 +:10BD200003F47F2300019A4300F47F2000F082B9DE +:10BD3000DFF808231368010C23EA014343EA0043B8 +:10BD4000136070472DE9F843054600242878DFF892 +:10BD5000EC624106A0464FF0B0472DD5286B70B17C +:10BD6000B0F5800F06D0B0F5000F18BFB0F5400F4A +:10BD700017D01FE0F86840F48030F860EDE03868D4 +:10BD800020F08060386000F079FE8146386800015C +:10BD900040F1D08000F072FEA0EB09000228F5D936 +:10BDA0000324D7E000F06AFEA0EB0900022840F26D +:10BDB000C980F5E70124A0462868010531D5B0689F +:10BDC00000F44078286C80452AD0FFF7B3F9B8F129 +:10BDD000000FB16805D1286C21F440710143B160B6 +:10BDE0001EE0B06840F48030B06021F44071B0686B +:10BDF00020F48030B060286C0143B160B068C007A7 +:10BE00000ED500F03BFE804641F28939B0688007CC +:10BE100006D400F033FEA0EB08004845F6D3032417 +:10BE2000A0462878C10705D53168A869890840EA85 +:10BE3000810131602878810705D53168E86921F4EE +:10BE40004061014331602878C10644BFA86AFFF70A +:10BE50006FFF2878810644BFE86AFFF769FF2878FA +:10BE6000410744BF286AFFF757FF2878010744BFFE +:10BE7000686AFFF751FF2868C1051BD53168686BF8 +:10BE800021F0406101433160686BB0F1006F00F058 +:10BE9000BDF8686BB0F1806F75D100F0BDF8044655 +:10BEA0003868000160D500F0E9FD001B0228F7D9D1 +:10BEB0004FF0030867E000F0E1FD001B02285BD9AA +:10BEC000F6E7316821F04041316020F0805032685F +:10BED00022F0406210433060A86BB0F1C05F00F008 +:10BEE00095F8286841056DD53168E86B21F040511F +:10BEF00001433160E86BB0F1005F03D1F96841F4B0 +:10BF00008031F960E86BB0F1805F5BD100F084F8BC +:10BF100004463868000146D500F0B0FD001B022839 +:10BF2000F7D94FF003084DE000F0A8FD001B0228F0 +:10BF300041D9F6E700F061F8A86821F4781100F023 +:10BF400071F88146386800017FF52CAF396968695E +:10BF500001433961002C7FF42EAF3168286B21F446 +:10BF600040010143316027E700F047F8E86821F01D +:10BF7000606100F057F80446386800019BD53969C4 +:10BF800068690143396128688105AAD5A86BB0F1B9 +:10BF9000804F1CBFB0F1004F002892D1316821F0D2 +:10BFA0004041084397E700F028F8286921F06041F4 +:10BFB00000F038F8044638680001B5D53969686979 +:10BFC000014339612868C10405D5F168686C21F422 +:10BFD00040410143F160286881040BD5796AE86C1F +:10BFE00021F0300101437962796AA86C890840EA3E +:10BFF000810179624046BDE8F2833869696820F4BE +:10C00000FE4040EA012038613969704703D1F96880 +:10C0100041F08071F9607047396821F080613960C2 +:10C0200000F02CBD01433961386840F08060386011 +:10C0300000F024BD104308607047000088000058DD +:10C0400038B5040009D004F18005686808B900F02B +:10C050001EF800F021F8012801D1012032BDA06AAC +:10C0600008B100F02AF800F00AF821F02A01FFE7F1 +:10C07000816000F01BF8BDE8324000F03EBB206854 +:10C08000416821F490414160206881687047002137 +:10C090002970204600F000BF2420686020680168F5 +:10C0A000490849000160204600F0BCB920680168D9 +:10C0B00041F00101016020467047204600F0BABA05 +:10C0C00070B5044604F180051346686820283DD108 +:10C0D00069B318002BD02878012837D001222A70A4 +:10C0E00004F154062165338073800020E86021202C +:10C0F0006860706AE8B1DFF82013C162DFF81C03E2 +:10C10000716A0863716ADFF8180348630020716A76 +:10C1100088632068216D00F12802706A00F0FFFF3B +:10C1200038B11020E86000202870202068600120CD +:10C1300070BD2168402008620020287000F008F8D7 +:10C1400041F0800100F061FBF8D170BD022070BDAC +:10C15000206800F1080151E8001F00F10802704753 +:10C16000216851E8002F7047206800F1080151E86C +:10C17000001F00F1080221F0400142E800100028F1 +:10C180007047F8B5044640F60F002668F16932683A +:10C19000B368084004F15C050ED1880602D590060C +:10C1A00002D4D80040F181806969002900F029811A +:10C1B0002046BDE8F4400847DFF8E006034204BF2C +:10C1C000DFF8DC763A4270D0CF0707D5D70505D522 +:10C1D000012737622E6B46F001062E638E0708D5C5 +:10C1E000DE0706D5276802263E622E6B46F004065F +:10C1F0002E634E0708D5DE0706D5276804263E6263 +:10C200002E6B46F002062E630E070AD5960601D461 +:10C21000034206D0266808203062286B40F00800F0 +:10C220002863080509D5500107D526684FF400603A +:10C230003062286B40F020002863286B002833D040 +:10C24000890607D5900601D4D80003D5696909B1DC +:10C2500020468847286B21688A68510602D410F06E +:10C26000280F1CD0204600F0EFFA00F0D1F811D5CD +:10C27000FFF77AFFFCD1286A60B10FF2B1618163E8 +:10C28000286A00F0C5FF00280ED0286A816BBDE83F +:10C29000F44008472046BDE8F24001F0ABB8204624 +:10C2A00001F0A8F800202863F1BD286901286AD1AF +:10C2B000CF0668D5D00666D51020306200F0A8F809 +:10C2C0002DD5296A0868406880B20028ECD02A88F9 +:10C2D0009042E9DA6880086801688A061BD4FFF793 +:10C2E0003FFF22F4807200F08FF8F8D1206800F050 +:10C2F0007DFAFBD1FFF738FFFCD12020E862002057 +:10C300002861FFF72DFF22F0100200F07DF8F8D130 +:10C31000286A00F047FF29886888091A2DE02888D4 +:10C320006988411A688800281CBF88B2002868D034 +:10C33000226852E8003F23F4907342E8003000285E +:10C34000F6D1206800F1080200F1080352E8002F3E +:10C35000DFF8C402024043E800200028F1D1202089 +:10C36000E862002028616861226852E8003F23F0FB +:10C37000100342E800300028F6D12046BDE8F44022 +:10C3800089B201F038B8C80209D5580207D54FF470 +:10C39000801030622046BDE8F24000F06DBB080618 +:10C3A00009D5100601D4180205D5A96949B320465C +:10C3B000BDE8F4400847480611D550060FD5FFF7F1 +:10C3C000CFFE22F0400200F01FF8F8D12020A86232 +:10C3D0000020A8612046BDE8F240FEF79EBD08029D +:10C3E00006D5500004D52046BDE8F24001F004B85F +:10C3F000C80148BF002A04D52046BDE8F24000F03D +:10C40000FCBFF1BD22F4F07241E800200028704723 +:10C410002068816848067047A9C80008DBC8000882 +:10C42000E1C80008F8B50446DFF838052168DFF8F0 +:10C4300038C50A68DFF834750240A06802432069F5 +:10C44000024360690243E06902430A6000254A68CA +:10C45000E06822F4405202434A60A369DFF81025E5 +:10C4600091421CBF206A03438E68DFF8080506402E +:10C4700033438B600FF2A416CB6A606A1B0940EA53 +:10C480000313CB626145DFF8F0044FF4004339D168 +:10C490003F6807F00307032F4DD8DFE807F0024697 +:10C4A00043494FF0010CE169B1F5004F4FF6F077C9 +:10C4B00040F08080BCF1010F09D0BCF1020F0AD01E +:10C4C000BCF1040F71D0BCF1080F71D099E0FFF7F7 +:10C4D00092FB002815D0626A616836F81230B0FB12 +:10C4E000F3F04A0802EB4002B2FBF1F080B2A0F197 +:10C4F0001001B942EAD20740C0F342000743206866 +:10C50000C7607FE0914216D13F6817F4406723D09F +:10C51000B7F5806F09D0B7F5006F03D0B7F5406F5E +:10C5200006D008E04FF0020C07E04FF0040C04E0E6 +:10C530004FF0080C01E04FF0100C9142B3D1BCF168 +:10C54000000F09D0BCF1020F0AD0BCF1040F15D0C6 +:10C55000BCF1080F15D054E0FFF745FB002851D07F +:10C56000616A36F81120B0FBF2F6626802EB420114 +:10C570008E4246D31103B14205D242E0FFF7E9FAF9 +:10C58000ECE71846ECE75008002110EB062051EBD1 +:10C5900016610023FDF786FDA0F54071DFF8DC236E +:10C5A00091422ED22268D0602CE0FFF7D2FA90E7B9 +:10C5B000184690E7BCF1010F09D0BCF1020F09D079 +:10C5C000BCF1040F18D0BCF1080F18D019E0FFF728 +:10C5D00012FBB8B1626A36F812306168B0FBF3F052 +:10C5E00000EB5100B0FBF1F080B2A0F11001B942B4 +:10C5F00007D22168C86005E0FFF7ABFAE9E7184603 +:10C60000E8E7012504F16800012141800180002153 +:10C610008160C1602846F2BDFEFFFFEF010002000D +:10C620000400060008000A000C0010002000400072 +:10C630008000000190F82810CA0706D502685368E8 +:10C64000C16A23F400330B43536090F828108A0723 +:10C6500006D502685368016B23F480330B435360A3 +:10C6600090F828104A0706D502685368416B23F4F6 +:10C6700080230B43536090F828100A0706D5026800 +:10C680005368816B23F400430B43536090F82810E8 +:10C69000CA0606D502689368C16B23F480530B4326 +:10C6A000936090F828108A0606D502689368016C9A +:10C6B00023F400530B43936090F828104A0610D5DA +:10C6C00002685368416C23F480130B435360416C40 +:10C6D000B1F5801F05D15368816C23F4C0030B436F +:10C6E000536090F828100A0606D501684A68C06CA5 +:10C6F00022F4002202434A607047F8B5044604F170 +:10C7000080050020E8606FF07E4700F0B7F906462C +:10C71000206801680A0708D50097334600224FF4C5 +:10C720000011204600F017F860B9206801684A0738 +:10C730000AD50097334600224FF48001204600F0CE +:10C740000AF808B10320F2BD20206860A86000202C +:10C75000E0662870F2BD2DE9F041069C05460E46C4 +:10C7600090461F462868C1693140B1420CBF012084 +:10C770000020404526D114F1010FF3D000F07EF9DE +:10C78000C01B844200D33CB900F025F800F02DF81E +:10C79000FCD100F01AF811E0286801684A07E1D5D9 +:10C7A000C1690A05DED54FF40062026200F013F899 +:10C7B00000F01BF8FCD100F008F8C1600021017006 +:10C7C000032000E00020BDE8F08105F18000202179 +:10C7D000416081607047296851E8002F22F4D072CF +:10C7E00041E800200028F6D17047286800F10801D0 +:10C7F00051E8001F490800F10802490042E8001012 +:10C8000000287047DFF87801014042E80010002856 +:10C8100070470000026852E8003F23F0C00342E87E +:10C8200000310029F6D1016801F1080252E8002F19 +:10C8300001F1080322F4000243E800210029F2D1AB +:10C840002021C0F884107047026852E8003F23F4AA +:10C85000907342E800310029F6D1016801F1080225 +:10C8600001F1080352E8002F0E490A4043E8002175 +:10C870000029F2D1C16E012908D1026852E8003FB7 +:10C8800023F0100342E800310029F6D12021C0F83E +:10C8900088100021C1660167704700000100001088 +:10C8A00020010004FEFFFFEF0146886A09680A685C +:10C8B000930610D40021A0F85610016801F1080277 +:10C8C00052E8002F01F1080322F0800243E8002122 +:10C8D0000029F2D13BE0FEF720BB806A00F08EBD5C +:10C8E000F8B5846A04F1840504F1560728686E6877 +:10C8F00021688A68110606D5212804D100203880D5 +:10C900002046FFF787FFFFF783FD06D5222E04D1CF +:10C91000002038812046FFF797FFA86840F01000FC +:10C92000A8602046BDE8F24000F064BD806A00F1D6 +:10C93000560100220A810A8000F05CBD026852E8BC +:10C94000003F23F0800342E800310029F6D102685D +:10C9500052E8003F43F0400342E800310029F6D19D +:10C9600070470000F369FFCF00380140880000588D +:10C9700000800040FFF4FF110024F40000FD0F00D0 +:10C98000FEFF7FEF10B500F180010A78012A01D186 +:10C99000022010BD01230B7024224A600268136834 +:10C9A00014686408640014600022426623F0005397 +:10C9B00000680360202048600020087010BD70B53A +:10C9C00000F01EF801D1022070BD00F01FF822F027 +:10C9D000604209E070B500F013F801D1022070BD8B +:10C9E00000F014F822F0606211438160204600F0EC +:10C9F0001AF820680660202068600020287070BD4A +:10CA0000044604F1800528780128704701222A7025 +:10CA1000242068602068066802685208520002609C +:10CA200020688268704730B5416E11B9012101223A +:10CA300014E001680FF230048A6889680FF230034D +:10CA4000520E02F00702490F655CA45C595C9A5CC7 +:10CA5000ED00E40095FBF1F194FBF2F268304180C7 +:10CA6000028030BD00000000010101030701000049 +:10CA700008040204080101017047000001484068F1 +:10CA8000704700BFE4250020012000F0B9BC000081 +:10CA900070470000841A71EB030604D26E40001B3D +:10CAA000B141121973414FF4001C1CEB410F34BF0C +:10CAB0007CEB430682E00C0DA4EB1356362E7BDC98 +:10CAC000012E45EAC32341DC43EA525312BFD2028E +:10CAD00092025B08240545EAC12141EA5051D2EB9C +:10CAE000C020994125D407D1B0FA80F610FA06F19A +:10CAF00062D00020203608E0B1FA81F6B140C6F1DC +:10CB0000200220FA02F21143B0404FEAF474B4EB71 +:10CB1000465434F001064FEA74040AD8D6F50016DC +:10CB2000760D04F00044F04061FA06F25040F14006 +:10CB30004840C00A40EA415021F0004128BF5FEA66 +:10CB4000500550F1000044EBD12135E0DB0A45EA05 +:10CB5000C121C90AB6F120050EDD42EA0242120CDB +:10CB6000C5F1200603FA06F6EB4042EA06056D42DF +:10CB7000984161F100010DE062FA06F5F24055407E +:10CB800063FA06FC82EA0C02F3405A406D4290417F +:10CB900061EB030111F4801F05D1641E620502D010 +:10CBA0006D004041494121F48011430875F1004373 +:10CBB00050F1000041EB045170BC70471CEB410F79 +:10CBC00015D223F0004352EA43060BD04FEA4C0C37 +:10CBD000BCEB410F04D80C0D661E342EB7DDEBE71D +:10CBE000801A994150EA410608BF0021E4E708BFD6 +:10CBF0001CEB430F28BF6FF00001DDE7C068084061 +:10CC0000884201D10120704700207047C069084068 +:10CC1000884201D1012070470020704710B5684C50 +:10CC200002212046FFF7F2FF38B16068C043810758 +:10CC300003D5FDF7CEFF022018E001212046FFF7C3 +:10CC4000E5FF38B16068C043C10703D5FDF789FF30 +:10CC500001200BE008212046FFF7D8FF38B16068BB +:10CC6000C043010703D5FEF708F80820A06010BDF7 +:10CC700010B5534C02212046FFF7C0FF58B9606839 +:10CC8000C043810307D5606840F400306060BDE8B0 +:10CC90001040FDF797BF08212046FFF7AFFF70B99E +:10CCA0006068C04301030AD56068464940F400202B +:10CCB0006060086880474FF40020A06010BD20210C +:10CCC0002046FFF79BFF58B96068C043810207D533 +:10CCD000606840F400106060BDE81040FDF750BF90 +:10CCE00010BD394881B0016841F4801101600068CD +:10CCF00000F48010009000983448016841F40071FD +:10CD000001603348026842F40072026040BF20BFF5 +:10CD10003048016841F40041016001B0704780B5BE +:10CD20002D48016841F480110160006800F4801012 +:10CD3000009000982248016841F0010101600268FA +:10CD400042F4803202602C20FEF76EFABDE8024009 +:10CD50002D20FEF769BA21480168490849000160A1 +:10CD600070471F494FF48030086070471B480168C6 +:10CD700021F002010160704718484FF40031416012 +:10CD8000016821F400310160704738B504460C4D4C +:10CD900008212846FFF732FF30B10A48046068686E +:10CDA00020F40020686031BDA0474FF40021A96045 +:10CDB00031BD0A48016821F0080101607047000098 +:10CDC000000C00584034002050010058D40800588E +:10CDD000200800580C04005850000058040C00585B +:10CDE000080C005870B50F4E044630780025A8B1E5 +:10CDF000FEF7EBFE32784FF47A71B1FBF2F1B0FB43 +:10CE0000F1F0FEF72BFA48B9102C07D20022214688 +:10CE10004FF0FF30FEF7EAF9B46000E00125284644 +:10CE200070BD00BFE4250020724900E0724981B066 +:10CE30000A6802430A60096808400090009801B03F +:10CE4000704780B54FF40020FFF7F0FF002200216B +:10CE50002E20FEF7CBF9BDE802402E20FEF7E4B904 +:10CE600000686649884200D0704780B54FF4801052 +:10CE7000FFF7DCFF002200212C20FEF7B7F92C2061 +:10CE8000FEF7D2F9002200212D20FEF7AFF9BDE810 +:10CE900002402D20FEF7C8B938B58AB0044668466E +:10CEA0001421F7F7E1FF2068554A564990423CD1DA +:10CEB0000868554D40F001000860096801F0010163 +:10CEC000059105980120FFF7AFFF0C20009002218B +:10CED00000200191029003210820039104906946EB +:10CEE0004FF09040FDF71EFF48482860112000F0E9 +:10CEF0004EF808B1FCF764FA4FF088500690002114 +:10CF000001200791ADF82010099006A9284600F0ED +:10CF100081FA08B1FCF754FAA567AC62002200213F +:10CF20002520FEF763F925202DE0394A90422CD1C7 +:10CF30004868384D40F480404860486800F48040BC +:10CF4000059005980220FFF76FFFC0200090022196 +:10CF5000012001910290032107200391049069466A +:10CF60002D48FDF7DFFE2D4828600F2000F00FF858 +:10CF700008B1FCF725FAA567AC6200220021242045 +:10CF8000FEF734F92420FEF74FF90BB030BD68608E +:10CF90001020A8600020E8608020286100206861DF +:10CFA000A861E8612862284600F050B81CB5044624 +:10CFB0001B49206888421CD1FEF7BCF8FEF7BAF87E +:10CFC0001848816B21F4407141F480718163816B59 +:10CFD00041F400418163026842F4806202600068AB +:10CFE00000F48060009000982046BDE8164000F0F4 +:10CFF00043BA13BD4C00005850000058000C0058B4 +:10D00000008000405C000058F431002044000240E1 +:10D01000003801405432002000040048440402401B +:10D02000002800405800005802490160024901618F +:10D03000704700BF87AB0008AFAB0008DFF80800FF +:10D04000006800F4C06070470004005838B5040060 +:10D0500001D1012032BD2168DFF87003814204F163 +:10D06000240500F044F8022068700A68A0686FF395 +:10D070000E120243E06802432069024360690243E2 +:10D08000A0690243E0690243206A02430A60204625 +:10D0900000F070F9A068B0F5804F04BF0021616016 +:10D0A0002079696A00F03F0000F014F838B10528D3 +:10D0B00005D2204600F078F900F012F803E00020D5 +:10D0C00028636863A8630020A861012068700020BD +:10D0D000287032BD0860A96AE86A486060687047D5 +:10D0E000296B00200860696BA86B486070470AD202 +:10D0F000DFF8DC0242181423B2FBF3F292002A623A +:10D10000DFF8D00209E0DFF8D00242181423B2FBA6 +:10D11000F3F292002A62DFF8C402E8617047F8B5C2 +:10D12000044604F1240600253078012801D10220AC +:10D13000F2BD01273770707801282FD10227777050 +:10D14000B561206807687F087F000760204600F00F +:10D15000F5F82168F06820B10A6842F00E020A6012 +:10D1600008E0086820F0040008602068016841F0C9 +:10D170000A010160706A0168CA0303D5026842F4BB +:10D1800080720260306B18B1016841F480710160F7 +:10D190002068026842F00102026001E03570022559 +:10D1A0002846F2BD81B040B100F124014A78022A3C +:10D1B00005D00420886100200870012026E0026864 +:10D1C000136823F00E0313604A6A136823F4807314 +:10D1D000136000680268520852000260012091F852 +:10D1E0002020CB6902F01C02904058608A6AC86A0D +:10D1F0005060086B30B1026822F4807202604A6BA2 +:10D20000886B5060012048700020087001B07047A2 +:10D2100038B500F1240200245178022903D00420FB +:10D220009061012428E001680B6823F00E030B6075 +:10D2300001680D686D086D000D60516A0B6823F47C +:10D2400080730B60012192F82030D56903F01C0334 +:10D2500099406960936AD16A5960116B31B10B686A +:10D2600023F480730B60536B916B596001215170F3 +:10D270001470516901B18847204632BDF8B500F1FC +:10D2800024010423CA6914680268156891F82060B3 +:10D2900006F01C0603FA06F73C4210D06F070ED5C5 +:10D2A0001468A50603D4156825F00405156000F080 +:10D2B0003DF8C968002938D0BDE8F440084702238A +:10D2C00003FA06F73C4213D0AF0711D51468A50640 +:10D2D00005D4156825F00A05156001224A7000F092 +:10D2E00025F800220A708968F9B1BDE8F4400847C2 +:10D2F000082303FA06F6344217D02B0715D5136816 +:10D3000023F00E031360012291F82030CC6903F062 +:10D310001C039A40626001228A614A7000220A70EE +:10D32000096911B1BDE8F4400847F1BD91F820202A +:10D33000CC6902F01C0293406360704778B5C56CFD +:10D34000046D6C60446D14B1846DC56D656001251C +:10D3500090F84440066C04F01C04A5407560046815 +:10D3600063608068102802D1A260E16071BDA16095 +:10D37000E26071BD416C0268144B89089A4234BF67 +:10D38000174B184B03EB8101816402F0FF02083A4E +:10D390001421B2FBF1F1144AC26401F01F01012211 +:10D3A00002FA01F1016570470179104A01F03F016D +:10D3B00002EB81024265491E0D4A826501F00301BC +:10D3C00001228A40C2657047000000000804024044 +:10D3D000F8FFFDBF00000240F8FBFDBF0004024063 +:10D3E000000802401C08024080080240FC0802407D +:10D3F000400902407047704770477047704700000F +:10D4000080B5AFF30080024A11001820ABBEFBE7E5 +:10D410002600020018B500F12402507801281BD123 +:10D420001378012B01D1022012BD536A10701C68C1 +:10D430000A48044008680443C868401E44EAC044DF +:10D4400048680443087A497A44EA004444EA41249B +:10D450001C600020107012BD012012BDFFFD00E015 +:10D460008A60FF2102685162012180F821100021A9 +:10D4700080F820100020704790F82010012901D179 +:10D4800002207047012280F82020022180F821101C +:10D49000CA210268516253210368596201688A688F +:10D4A00042F02002FFF7DCBF53564343544C5F4128 +:10D4B00070705F4E6F74696669636174696F6E0046 +:10D4C0000D0A0D2A2A20444953434F4E4E454354DA +:10D4D000494F4E204556454E542057495448204305 +:10D4E0004C49454E5420646973636F6E6E65637476 +:10D4F000696F6E20526561736F6E3D3078253032F2 +:10D50000582073756363657373200A0D0000000073 +:10D510000D0A0D2A2A20444953434F4E4E45435489 +:10D52000494F4E204556454E5420574954482043B4 +:10D530004C49454E5420646973636F6E6E65637425 +:10D54000696F6E20526561736F6E3D3078253032A1 +:10D550005820436F6E6E656374696F6E20746572D8 +:10D560006D696E61746564206279206C6F63616CB3 +:10D5700020686F7374200A0D000000000D0A0D2A48 +:10D580002A20444953434F4E4E454354494F4E2061 +:10D590004556454E54205749544820434C49454E22 +:10D5A0005420646973636F6E6E656374696F6E2077 +:10D5B000526561736F6E3D30782530325820436F6D +:10D5C0006E6E656374696F6E207465726D696E61ED +:10D5D0007465642064756520746F204D494320662E +:10D5E00061696C757265200A0D0000000D0A0D2A34 +:10D5F0002A20444953434F4E4E454354494F4E20F1 +:10D600004556454E54205749544820434C49454EB1 +:10D610005420646973636F6E6E656374696F6E2006 +:10D62000526561736F6E3D307825303258200A0D97 +:10D63000000000000D0A0D2A2A20434F4E4E45439C +:10D6400054494F4E20555044415445204556454E6F +:10D6500054205749544820434C49454E54200A0011 +:10D660004843495F4C455F434F4E4E454354494FF5 +:10D670004E5F5550444154455F434F4D504C4554C7 +:10D68000455F5355424556545F434F4445205374BC +:10D69000617475733D30782530325820436F6E6E5B +:10D6A000656374696F6E5F48616E646C653D307868 +:10D6B0002530345820436F6E6E5F496E7465727604 +:10D6C000616C3D30782530345820436F6E6E5F4C6E +:10D6D0006174656E63793D30782530345820537518 +:10D6E000706572766973696F6E5F54696D656F7589 +:10D6F000743D307825303458200A0D004556545F6B +:10D700005550444154455F5048595F434F4D504C2C +:10D71000455445200A0000004556545F5550444189 +:10D7200054455F5048595F434F4D504C4554452C2C +:10D7300020737461747573206F6B200A0000000001 +:10D740004556545F5550444154455F5048595F43D6 +:10D750004F4D504C4554452C2073746174757320A3 +:10D760006E6F6B200A000000526561645F5048597B +:10D770002073756363657373200A00005048592055 +:10D78000506172616D202054583D2025642C205238 +:10D79000583D202564200A005265616420636F6E45 +:10D7A00066206E6F74207375636365657373200AFA +:10D7B000000000004843495F4C455F434F4E4E45D3 +:10D7C0004354494F4E5F434F4D504C4554455F5372 +:10D7D00055424556545F434F444520666F7220635F +:10D7E0006F6E6E656374696F6E2068616E646C65E0 +:10D7F00020307825780A00004843495F4C455F4354 +:10D800004F4E4E454354494F4E5F434F4D504C454C +:10D8100054455F5355424556545F434F444520435A +:10D820006F6E6E656374696F6E5F48616E646C6580 +:10D830003D30782530345820526F6C653D2564208A +:10D84000506565725F416464726573735F5479708B +:10D85000653D256420506565725F4164647265733F +:10D86000733A25303258202530325820253032582E +:10D87000202530325820253032582025303258208B +:10D880000A0D00000D0A0D2A2A204143495F474135 +:10D89000505F4C494D495445445F444953434F56AA +:10D8A000455241424C455F56534556545F434F44A1 +:10D8B00045200A004143495F4741505F504153535F +:10D8C0005F4B45595F5245515F56534556545F4330 +:10D8D0004F4445203D3D3E204741505F50524F430D +:10D8E0005F504153535F4B45595F524553504F4E24 +:10D8F000534520436F6E6E656374696F6E5F486158 +:10D900006E646C653D307825303458200A0D000077 +:10D910000D0A0D2A2A204143495F4741505F415576 +:10D9200054484F52495A4154494F4E5F5245515FF6 +:10D9300056534556545F434F4445200A00000000AB +:10D940004143495F4741505F534C4156455F534502 +:10D950004355524954595F494E49544941544544ED +:10D960005F56534556545F434F444520736C617670 +:10D970006520736563757269747920726571756568 +:10D980007374206973207375636365737366756C54 +:10D990006C792073656E7420746F20746865206DD7 +:10D9A0006173746572200A00414E43535F41707089 +:10D9B0005F5570646174655F536572766963650075 +:10D9C000696E76616C696420616E63735F636F6E0C +:10D9D000746578742E73746174653D2564200A0D36 +:10D9E000000000004761747450726F6352657100EB +:10D9F000414E43535F5345545F444154415F4C454E +:10DA00004E475448207365742064617461206C65CE +:10DA10006E677468202564202564206F6B203D3D6F +:10DA20003E6163695F676174745F65786368616EA6 +:10DA300067655F636F6E666967200A006163695F8F +:10DA4000676174745F65786368616E67655F636F53 +:10DA50006E66696720636D64206F6B200A0D00009D +:10DA60006163695F676174745F65786368616E673D +:10DA7000655F636F6E66696720636D64204B4F203E +:10DA8000726573756C743D307825303278200A0DDC +:10DA900000000000474154545F50524F435F4449D7 +:10DAA00053435F414E43535F5345525649434520CC +:10DAB0006163695F676174745F646973635F7072E7 +:10DAC000696D6172795F736572766963655F6279AA +:10DAD0005F7575696420636D64206F6B0A000000D8 +:10DAE000474154545F50524F435F444953435F4151 +:10DAF0004E43535F53455256494345206163695F26 +:10DB0000676174745F646973635F7072696D617279 +:10DB1000795F736572766963655F62795F75756950 +:10DB20006420636D64204E4F4B2073746174757371 +:10DB3000203D307825303258200A000047415454A7 +:10DB40005F50524F435F444953435F414E43535FDD +:10DB50005345525649434520414E43532053657225 +:10DB600076696365206973204E4F5420666F756E29 +:10DB70006420212121203D3D3E20636F6E6E656350 +:10DB800074656420746F20416E64726F6964205004 +:10DB9000686F6E652F506164200A0D004741545430 +:10DBA0005F50524F435F444953435F414E43535F7D +:10DBB0005345525649434520414E435320536572C5 +:10DBC00076696365205B307825303458202D20300D +:10DBD00078253034585D20697320666F756E642037 +:10DBE000212121203D3D3E20636F6E6E656374658B +:10DBF0006420746F20694F532050686F6E652F50FA +:10DC00006164200A0D000000474154545F50524F98 +:10DC1000435F444953435F414C4C5F5052494D412F +:10DC200052595F534552564943455320414C4C206D +:10DC3000736572766963657320646973636F766573 +:10DC4000726564205375636365737366756C6C7974 +:10DC5000200A000010B50446AFF30080204600F013 +:10DC600005F80446AFF30080204610BD7CB500F1F6 +:10DC70000F06F608F600B04240D2082E04D208265D +:10DC800002E0083000F047F8DFF804512C6821006A +:10DC900005D1002007E00268B24221D2011D0868C8 +:10DCA0000028F8D12068291D0A68824222D0136812 +:10DCB000B34238BF111DF7D312E093190B60801BDC +:10DCC00054685C600B6818601660096800291DBF05 +:10DCD00048680028081D0020286002F1080076BD71 +:10DCE00061B10A681068A0F10803B342E5D2506838 +:10DCF0000860EAE700F04EF80028C2D1002076BDA7 +:10DD000010B5040006D0AFF30080204600F003F801 +:10DD1000AFF3008010BD002800D1704750B4A0F1CF +:10DD200008021368072B2BD913F0070F28D1184CC2 +:10DD3000616809B18A4202D25160626013E04868AA +:10DD400000B3904238BF0146F9D31BE0964203D19D +:10DD50001B180B600A4606E0486810B1134498424D +:10DD60000ED350604A60506850B11368D118814298 +:10DD700006D1002121600168CB1813604068506013 +:10DD800050BC704708680E18B242DFD250BC7047D2 +:10DD9000283400200749086808B100207047064869 +:10DDA000C008C00008600549C908C900091A016017 +:10DDB000704700BF4C3400200F10002008140020D2 +:10DDC0001349002008604FF4E0221248016841F432 +:10DDD000700101604FF0B041086840F00100086038 +:10DDE0008A600D480A6802400C480A60036823F004 +:10DDF000050303604268520852004260002208484E +:10DE0000C8600861086820F4802008608A61704753 +:10DE100008ED00E088ED00E0FBFEF6FA9400005803 +:10DE200000100422010000000300000005000000B3 +:10DE30000100000001000000060000000A000000D0 +:10DE400020000000020000000400000008000000A4 +:10DE500010000000400000008000000000010000F1 +:10DE600000020000A0860100400D0300801A060099 +:10DE700000350C0040420F0080841E0000093D0068 +:10DE800000127A000024F40000366E010048E80118 +:10DE9000006CDC0200000000000000000000000038 +:10DEA000000000002DE9F04107468846387810F060 +:10DEB000030F16461D4633D0384600F099F878BB5C +:10DEC000B8F1000F1CBFD8E900018619012D2ED131 +:10DED0003888C10415D5396A07F14402384600F084 +:10DEE000A3F83A6B044602B93A69F968384600F07B +:10DEF0009BF8361B341A7A69F968384600F094F8B2 +:10DF0000261A1EB94DB916F1010F09D097F9030071 +:10DF10002A46314600F08EF8064616F1010F09D167 +:10DF20002320AFF300804FF0FF30BDE8F081022DD9 +:10DF3000E8D1EBE7388810F4405F0ED07868F860DD +:10DF400038617861B8617868F86107F14400386237 +:10DF500007F13000786200203863B8F1000F05D077 +:10DF6000D8E9020107F13402C2E9000139884CF610 +:10DF7000FF60014039800020BDE8F08170B50546A2 +:10DF8000AFF300802888810415D56E680024EA6804 +:10DF900095F903003146914212D2521AF6F735FF35 +:10DFA00010F1010F1CBF00283618F0D10FE04DF61C +:10DFB000FF70014029802846AFF30080002070BD2B +:10DFC00000220021F6F721FF10F1010F00D10124FA +:10DFD0006868E860A861E861002C2988E7D041F40E +:10DFE000007129802846AFF300804FF0FF3070BDEC +:10DFF000F8B5A0B9AFF3008000250A4E08244FF011 +:10E00000FF37306820B1FFF7B9FF002848BF3D4611 +:10E01000361D641EF5D1AFF300802846F2BDBDE881 +:10E02000F240ABE7AC250020914234BF511A0021E9 +:10E03000084670473EB504000D00012A02D100F0E9 +:10E0400063F807E0022A07D1009400200190694696 +:10E050000C20ABBE2D1801E0002A0CD100940195D4 +:10E0600069460A20ABBE002805D100222100280005 +:10E0700000F027F801E00020C04303B030BD0000ED +:10E0800010B4314A002113461C6884421EBF491C4B +:10E090009C6884421EBF491C1C69844209D09C694B +:10E0A000491C844205D0491C20331029ECD310BCF4 +:10E0B0007047002342F8313002EBC1014B6010BCC5 +:10E0C000704778B4204C002325462E688E421EBF30 +:10E0D0005B1CAE688E421EBF5B1C2E698E4209D04F +:10E0E000AE695B1C8E4205D05B1C2035102BECD337 +:10E0F00072BC7047054604EBC303012A04BF59688C +:10E100004D195D6072BC704710B40F4A0021134670 +:10E110001C6884421EBF491C9C6884421EBF491C67 +:10E120001C6984420AD09C69491C844206D0491C5F +:10E1300020331029ECD310BC0020704702EBC10043 +:10E14000406810BC704700001431002010B5044630 +:10E15000E068A169884251D3218849F202030B404B +:10E16000022B08D008044CBF4FF400704FF48440D9 +:10E17000014321803BE001F4C042B2F5C04F06D11B +:10E18000A168884203D32046FFF732FF78BB20887E +:10E1900010F4406F02BF606804F14401884217D157 +:10E1A0004FF40070FFF756FD606030B904F1440091 +:10E1B0006060E060401CA0600AE0218841F04001FE +:10E1C0002180E060606100F500726068A260E0613B +:10E1D00060682061A068A061207841070AD502220A +:10E1E0000021204600F00CF810F1010F02D14FF091 +:10E1F000FF3010BD208840F4C0402080002010BDBA +:10E2000070B504460D461646AFF3008033462A46E5 +:10E2100000212046FFF746FE05462046AFF300806A +:10E22000284670BD2DE9FC4D016800F1080549083C +:10E2300005EBC102019200F10802406800F0010AFA +:10E2400002EBC108400808EBC00B00200021019A36 +:10E2500095422FD02A68AE186A6832440092083579 +:10E26000009A9642F3D016F9014B009A964205D1D6 +:10E270002A68AE186A6832440092083516F8017BA5 +:10E28000884210D1D84508BFFEF7FEFBD8F8000041 +:10E29000D8F80410BAF1000F18BF4844014488426E +:10E2A00008F10808EED0002C00F8017B05D5641CAD +:10E2B000E6D1D5E75846BDE8F68D641ED5D5CFE743 +:10E2C00038B504000ED0207810F0030F03D094F975 +:10E2D0000300002809D5AFF30080204600F030F895 +:10E2E000AFF300804FF0FF3032BD2046FFF780FED5 +:10E2F0000546AFF300802078410644BF606800F017 +:10E300005DF80020606094F90300022804D900F051 +:10E3100057F808B14FF0FF35E06B48B100F05CF8FA +:10E3200008B14FF0FF35E06B00F048F80020E063E3 +:10E33000204600F005F8AFF30080284632BD00000B +:10E3400001780A0626D51C4A13680021834203D1AE +:10E35000002342F821301BE05368012183421EBF95 +:10E36000022193688342F3D0D368032183421EBF06 +:10E37000042113698342EBD05369052183421EBFF8 +:10E380000621936983421EBF0721D3698342DFD0F0 +:10E3900000F014B8002101804FF0FF31C17000F18E +:10E3A00044014160C160016141618161C1610162FB +:10E3B00000F1300141627047AC250020FFF7A0BC9E +:10E3C0001CB50200009269460220ABBE040010009A +:10E3D000FFF756FE200016BDE0B50090F6F798FE58 +:10E3E000019069460E20ABBE03B000BD7047FEE74A +:10E3F000FEE7FEE7FEE770477047704700F026B87B +:10E400000848FEF73BBF0848FDF7BBBE0748FDF7CD +:10E41000B8BEFEF703BCFEF72BBC00F01FB80448E3 +:10E42000FEF72CBFF4310020742F0020E42E0020D2 +:10E43000543200201020FCF740BD0120FCF73DBD08 +:10E440000220FCF73ABDFBF752B9000002484168D0 +:10E450000278891841607047E42500200449C868A3 +:10E460000A6882430A60486000F004B800000000B7 +:10E4700000150058704738B50C46C5B22046AFF3BA +:10E480000080E068A169884204D32046FFF75EFE61 +:10E4900000280FD4E068401CE06000F8015D20888F +:10E4A000010503D440050BD50A2D09D12046FFF7FD +:10E4B0009FFD28B12046AFF300804FF0FF3032BD02 +:10E4C0002046AFF30080284632BD19E050F8042BF7 +:10E4D000D30744BFA9F101039A18091F0023042997 +:10E4E00042F8043BF9D25FEA817C134604D54FF031 +:10E4F000000CA2F800C09B1CC90744BF0021197082 +:10E5000050F8041B0029E1D17047000038B50D4DCB +:10E510000824286800281CBF017811F0030F05D0DB +:10E5200090F90310002958BFFFF7CAFE2D1D641E85 +:10E53000EFD1BDE83840002200214FF0FF30F6F760 +:10E5400064BC00BFAC25002010B5074979441831E0 +:10E55000064C7C44163404E00A68081D11448847C0 +:10E560000146A142F8D110BD2C0000007800000047 +:10E570004EF68851CEF20001086840F47000086041 +:10E58000BFF34F8FBFF36F8F4FF00070E1EE100AB3 +:10E590007047000037FFFFFF5C0E000000260020E0 +:10E5A00070080000300003200000000079FCFFFF2D +:10E5B00002000000020000009801000002000000BC +:10E5C00028000320080000005DFCFFFF020000009F +:10E5D000020000007E0100003D0100000814002040 +:10E5E000F811000000000000000000000000000022 +:10E5F0000000000001000000020000000300000015 +:10E600000400000000F00DF8002801D0FFF79CFF87 +:10E61000AFF300800020AFF30080FAF77EFD00F03A +:10E6200002F80120704700F001B800000746FFF72C +:10E630006DFF3846FEF7E4FEFBE738B504460D46AD +:10E64000284600F005F8A84218BF0024204632BD35 +:10E650000149FFF710BF00BFBC24002001488047DC +:10E6600001480047C1DD00086DE60008AFF30080F7 +:10E67000FFF77EFFFFF7C6FF00002E004300FFF705 +:10E68000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7BE +:10E69000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7AE +:10E6A000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF79E +:10E6B000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF78E +:10E6C000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF77E +:10E6D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF76E +:10E6E000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF75E +:10E6F000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF74E +:10E70000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF73D +:10E71000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF72D +:10E72000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF71D +:10E73000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF70D +:10E74000FEBFFFF7FEBFFFF7FEBFFFF7FEBF0000F3 +:10E75000F8000001810081008100810081008100BA +:10E7600081008100810081008100810081008100A1 +:10E770008100810081008100810081008100810091 +:10E780008100810081008100810081008100810081 +:10E7900081008100BD00047CE6000801FD00034CFF +:10E7A000250020D80003814D0008FC00046F4D00B7 +:10E7B0000801F9001301040000B8240020B9240066 +:10E7C00020B8240020B8240020FC0003B824002036 +:10E7D000FC0007B8240020A4240020E00013020459 +:10E7E000010104330020543300200433002004339B +:10E7F0000020FC000304330020FB0006250020EC71 +:10E80000240020E0001302080202B4320020043386 +:10E810000020B4320020B4320020FC0003B43200E7 +:10E8200020FC00074825002034250020E0001B784C +:10E83000E6000878E6000878E6000878E600087840 +:10E84000E6000878E6000878E60008F8FF0B7AE6AC +:10E85000000878E6000878E60008FAFFEA00F8FF0A +:10E86000F4000B74240020BC24002004250020ECBC +:10E8700000020DFF01EB000001F9000010FC000E8A +:0FE88000080048000C0048000C004800093D004B +:040000050800E66D9C :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_conf.h index 209113466..db896136a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -275,6 +275,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -284,11 +288,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -296,6 +304,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -622,5 +643,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_conf.h index 7290a09a4..f5d6dac71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_hal_conf.h index 5c7e54e50..d9284212b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_it.h index fc60d50ba..21a06ec60 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_entry.c index 01bb38d07..3edaf2157 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -69,6 +70,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ static void Led_Init( void ); @@ -179,22 +182,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -300,4 +440,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/main.c index 1a9506504..142b1e7df 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -670,5 +670,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_hal_msp.c index 4f3093e2a..94ce189f0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -365,4 +364,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_it.c index 4afccfa78..32ca22953 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -343,4 +342,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/stm32wb55xx_flash_cm4.icf index b3ee76e61..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; -place in RAM_SHARED_region { section MB_MEM2}; \ No newline at end of file +place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.c index ca3fdc9c8..dbfe35cbd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ancs_client_app.c * @author MCD Application Team * @brief ANCS client Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -85,7 +84,7 @@ typedef enum } AncsProcId_t; /** - * structure of fields for GATT notication source characteristic + * structure of fields for GATT notification source characteristic */ typedef struct notifyListS { uint8_t used; /*flag to indicate notification processed or not*/ @@ -321,7 +320,7 @@ static void ANCS_Show_Attr(NotificationAttributeID attrID) */ static void ANCS_Show_AppAttr(AppAttributeID appAttrID) { - printf("\r\n*************** App Attribute Infomation Received **********************\r\n"); + printf("\r\n*************** App Attribute Information Received **********************\r\n"); switch (appAttrID) { case AppAttributeIDDisplayName: printf("** DisplayName: "); @@ -330,11 +329,11 @@ static void ANCS_Show_AppAttr(AppAttributeID appAttrID) } /** - * Display different fields for GATT notication source characteristic received + * Display different fields for GATT notification source characteristic received */ static void ANCS_Show_Notification(uint16_t index) { - printf("\r\n*************** Data Source Detail Infomation Received **********************\r\n"); + printf("\r\n*************** Data Source Detail Information Received **********************\r\n"); ANCS_Show_EventID((EventID)ancs_context.notifyList[index].evID); ANCS_Show_EventFlag((EventFlags)ancs_context.notifyList[index].evFlag); ANCS_Show_CategoryID((CategoryID)ancs_context.notifyList[index].catID); @@ -557,7 +556,7 @@ static void ANCS_Parse_GetNotificationAttr_Resp(uint8_t commandID, uint16_t att ancs_context.AppIdentifierLength = MAX_DISPLAY_NAME_LEN; } - ancs_context.state = ANCS_GET_APP_ATTRIBUTE; /* 3.2 Get APP Attributes (Detail Infomation about the App, Now only support to Get Name of App) */ + ancs_context.state = ANCS_GET_APP_ATTRIBUTE; /* 3.2 Get APP Attributes (Detail Information about the App, Now only support to Get Name of App) */ appId = FALSE; } @@ -568,11 +567,11 @@ static void ANCS_Parse_GetNotificationAttr_Resp(uint8_t commandID, uint16_t att if(ancs_context.state == ANCS_GET_APP_ATTRIBUTE) { - APP_DBG_MSG(" 3.2 Get APP Attributes (Detail Infomation about the App, Now only support to Get Name of App) => ANCS_GET_APP_ATTRIBUTE \n\r"); + APP_DBG_MSG(" 3.2 Get APP Attributes (Detail Information about the App, Now only support to Get Name of App) => ANCS_GET_APP_ATTRIBUTE \n\r"); } else { - /* Note, there is no AppIdentifier, so we only perform active action, but you also can perform negtive action */ + /* Note, there is no AppIdentifier, so we only perform active action, but you also can perform negative action */ if( (PositiveActionLabel == TRUE) || (NegativeActionLabel == TRUE) ) { ancs_context.state = ANCS_PERFORM_NOTIFICATION_ACTION; /* 3.2 Perform Notification Action */ @@ -681,7 +680,7 @@ static void ANCS_Notification_Source_Received_event( { uint16_t i; - printf("*************** Notification Source Basic Infomation Received **********************\r\n"); + printf("*************** Notification Source Basic Information Received **********************\r\n"); ANCS_Show_EventID(evID); ANCS_Show_EventFlag(evFlag); ANCS_Show_CategoryID(catID); @@ -738,7 +737,7 @@ void ANCS_Notification_Check(EventFlags EventFlagMask) ancs_context.notifyEntry = idx; ancs_context.notifyShowed = FALSE; ancs_context.state = ANCS_GET_NOTIFICATION_ATTRIBUTE; - APP_DBG_MSG("2. Get More Detail Infomations notifyEntry=%d ==> ANCS_GET_NOTIFICATION_ATTRIBUTE \n\r",ancs_context.notifyEntry); + APP_DBG_MSG("2. Get More Detail Information notifyEntry=%d ==> ANCS_GET_NOTIFICATION_ATTRIBUTE \n\r",ancs_context.notifyEntry); break; } } @@ -941,9 +940,9 @@ static void GattParseServices(aci_att_read_by_group_type_resp_event_rp0 *pr) } else if (uuid == DEVICE_INFORMATION_SERVICE_UUID) /* 0x180A */ { APP_DBG_MSG("DEVICE_INFORMATION_SERVICE_UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == 0x180B) /* 0x180B */ { - APP_DBG_MSG("Unkown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); + APP_DBG_MSG("Unknown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == 0x180C) /* 0x180C */ { - APP_DBG_MSG("Unkown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); + APP_DBG_MSG("Unknown UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == HEART_RATE_SERVICE_UUID) /* 0x180D */ { APP_DBG_MSG("AMS_SERVICE_UUID=0x%04X found [%04X %04X]!\n",uuid,ServiceStartHandle,ServiceEndHandle); } else if (uuid == PHONE_ALERT_SERVICE_UUID) /* 0x180E */ { @@ -1142,11 +1141,11 @@ static void GattParseDescs(aci_att_find_info_resp_event_rp0 *pr) handle = UNPACK_2_BYTE_PARAMETER(&pr->Handle_UUID_Pair[uuid_offset-2]); uuid = UNPACK_2_BYTE_PARAMETER(&pr->Handle_UUID_Pair[uuid_offset+uuid_short_offset]); - /* 1. primary serice handle + primary serice UUID */ + /* 1. primary service handle + primary service UUID */ if(uuid == PRIMARY_SERVICE_UUID) { APP_DBG_MSG("PRIMARY_SERVICE_UUID=0x%04X handle=0x%04X\n\r",uuid,handle); - }/* 1. primary serice handle + primary serice UUID */ + }/* 1. primary service handle + primary service UUID */ /* 2. char handle + char UUID */ else if(uuid == CHARACTERISTIC_UUID) @@ -1248,10 +1247,10 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) if (ancs_context.connection_handle == pr->Connection_Handle) { - // 1. Incomming Nofification + // 1. Incoming Nofification if (pr->Attribute_Handle == ancs_context.ANCSNotificationSourceCharValueHdle) { - APP_DBG_MSG("1. Incomming Nofification received BASIC information : \n\r"); + APP_DBG_MSG("1. Incoming Nofification received BASIC information : \n\r"); EventID evID = (EventID)pr->Attribute_Value[0]; EventFlags evFlag = (EventFlags)pr->Attribute_Value[1]; CategoryID catID = (CategoryID)pr->Attribute_Value[2]; @@ -1259,7 +1258,7 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) uint32_t notifUID = (uint32_t)(*((uint32_t *)&pr->Attribute_Value[4])); ANCS_Notification_Source_Received_event(evID, evFlag, catID, catCount, notifUID); - // 2. Get More Detail Infomations + // 2. Get More Detail Information if( (evID == EventIDNotificationAdded) ) { if((evFlag & EventFlagSilent) != EventFlagSilent) @@ -1270,7 +1269,7 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) } }// ANCSNotificationSourceCharValueHdle - // 3. Parse Detail Infomations, Perform Notification Action or Get APP Attributes + // 3. Parse Detail Information, Perform Notification Action or Get APP Attributes if (pr->Attribute_Handle == ancs_context.ANCSDataSourceCharValueHdle) { CommandID cmdID = (CommandID)pr->Attribute_Value[0]; @@ -1285,25 +1284,25 @@ static void GattParseNotification(aci_gatt_notification_event_rp0 *pr) /***********************************************************************************/ if (cmdID == CommandIDGetNotificationAttributes) { - APP_DBG_MSG("3.1 Parse Detail Infomation of Notification Attribute, CommandIDGetNotificationAttributes Response: \n\r"); + APP_DBG_MSG("3.1 Parse Detail Information of Notification Attribute, CommandIDGetNotificationAttributes Response: \n\r"); notifUID = (uint32_t)(*((uint32_t *)&pr->Attribute_Value[1])); AttributeLength = pr->Attribute_Value_Length - (1+4); AttributeList = (uint8_t *)&pr->Attribute_Value[1+4]; - // 3.1 Parse Detail Infomation of Notification Attribute + // 3.1 Parse Detail Information of Notification Attribute ANCS_Parse_GetNotificationAttr_Resp(cmdID,AttributeLength,AttributeList); } UNUSED(notifUID); if (cmdID == CommandIDGetAppAttributes) { - APP_DBG_MSG("3.3 Parse Detail Infomation of APP Attribute, CommandIDGetAppAttributes Response: \n\r"); + APP_DBG_MSG("3.3 Parse Detail Information of APP Attribute, CommandIDGetAppAttributes Response: \n\r"); strcpy(AppIdentifier,(char *)&pr->Attribute_Value[1]); AppIdentifierLength = strlen((char *)&pr->Attribute_Value[1]); AttributeLength = pr->Attribute_Value_Length - (1+AppIdentifierLength+1); AttributeList = (uint8_t *)&pr->Attribute_Value[1+AppIdentifierLength+1]; - // 3.3 Parse Detail Infomation of App Attribute + // 3.3 Parse Detail Information of App Attribute ANCS_Parse_GetAppAttr_Resp(cmdID,AttributeLength,AttributeList); } @@ -1964,5 +1963,3 @@ void ANCS_App_Notification( Connection_Context_t *pNotification ) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.h index 69a070616..447451926 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ancs_client_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ancs_client_app.h * @author MCD Application Team * @brief Header for ancs_client_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -177,7 +176,7 @@ typedef struct notificationAttrS { * iOS notification. */ uint32_t UID; - /** App Identifer flag, if TRUE this attribute is requested from the Get Notification Attributes command */ + /** App Identifier flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t appID_flag; /** Title flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t title_flag; @@ -185,7 +184,7 @@ typedef struct notificationAttrS { uint16_t title_max_size; /** Subtitle flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t subtitle_flag; - /** Max Subtitle length paramter */ + /** Max Subtitle length parameter */ uint16_t subtitle_max_size; /** Message flag, if TRUE this attribute is requested from the Get Notification Attributes command */ uint8_t message_flag; @@ -270,5 +269,3 @@ void ANCS_App_Notification( Connection_Context_t *pNotification ); #endif #endif /*__ANCS_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.c index 253966ab6..cb284573f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -316,7 +315,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -439,7 +439,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) BleApplicationContext.Device_Connection_Status = APP_BLE_IDLE; if(disconnection_complete_event->Reason == ERR_CMD_SUCCESS){ - APP_DBG_MSG("\r\n\r** DISCONNECTION EVENT WITH CLIENT disconnection Reason=0x%02X sucess \n\r",disconnection_complete_event->Reason); + APP_DBG_MSG("\r\n\r** DISCONNECTION EVENT WITH CLIENT disconnection Reason=0x%02X success \n\r",disconnection_complete_event->Reason); }else if(disconnection_complete_event->Reason == HCI_CONNECTION_TERMINATED_BY_LOCAL_HOST_ERR_CODE){ APP_DBG_MSG("\r\n\r** DISCONNECTION EVENT WITH CLIENT disconnection Reason=0x%02X Connection terminated by local host \n\r",disconnection_complete_event->Reason); }else if(disconnection_complete_event->Reason == HCI_CONNECTION_TERMINATED_DUE_TO_MIC_FAILURE_ERR_CODE){ @@ -660,7 +660,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) if (Peer_Bonded == 0x00)/* only for the first paring complete*/ { - APP_DBG_MSG("Term Connection for the first pairing complete to save bonding infomation !!! \n\r"); + APP_DBG_MSG("Term Connection for the first pairing complete to save bonding information !!! \n\r"); for (int loop=0;loop<10;loop++) /* */ { @@ -1315,4 +1315,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.h index ec9ad8243..65d29cb51 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -88,5 +87,3 @@ void APP_BLE_Remove_Bonding_Info(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_conf.h index b51aa7b87..cd8a42274 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_dbg_conf.h index df9e12c2f..d688bd867 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/ble_dbg_conf.h @@ -1,23 +1,23 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* USER CODE END Header */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BLE_DBG_CONF_H @@ -197,5 +197,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.c index 3240fbf9d..290aea233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.c index ec6f828e6..7c121e375 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,5 +226,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.h index 0246d2811..89b91bab3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/hrs_app.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void HRSAPP_Init( void ); #endif #endif /*__HRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..5d488c347 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/readme.txt index d57590167..3963cc0d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ANCS/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRate_ANCS example. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -124,7 +124,7 @@ Considering connection with ios device: - connect to a device - select the HRanc in the device list - call your ios device by using another smartphone, the call will be answered automatically. or, send message to your ios device,the message can be displayed on terminal. - Warning: if the HRanc has already been bonded or pairing timeout, you should erase it from bluetooth connected ios device list and press SW3 stored bonded infomation. + Warning: if the HRanc has already been bonded or pairing timeout, you should erase it from bluetooth connected ios device list and press SW3 stored bonded information. (in ios device settings: select bluetooth icon, then select my device and forget or ignore it). The Heart Rate is displayed each second on the ios device. Moreover to display ANCS notifications messages, please open an hyper-terminal on PC diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin index cfd500f4d..bb4fdf749 100644 Binary files a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin and b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Binary/BLE_HeartRate_ota_reference.bin differ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h index 4ecbac73c..8d5bd6567 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -252,6 +252,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -261,11 +265,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -273,6 +281,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -578,7 +599,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -597,5 +618,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h index 7fcd60664..db52de81a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h index 4b10d2beb..5d45ed43f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h index 316f32ae3..1990a4ef1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h index eec6a770b..c7e221d07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c index a00f1921c..e03565061 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -69,7 +70,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); - +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -187,22 +189,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -308,4 +447,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c index b078302c7..b6e7e8539 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -642,5 +642,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c index bc34026dd..c51a70a3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -386,4 +385,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c index 4afccfa78..32ca22953 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -343,4 +342,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c index da850965c..80b59155f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -348,5 +349,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf index 4ab0df190..3efb6db6b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define region OTA_TAG_region = mem:[from (__ICFEDIT_region_ROM_start__ + 0x140) to (__ICFEDIT_region_ROM_start__ + 0x140 + 4)]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; @@ -33,12 +34,14 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; keep { section TAG_OTA_START}; keep { section TAG_OTA_END }; -place in OTA_TAG_region { section TAG_OTA_START }; -place in ROM_region { readonly, last section TAG_OTA_END }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in OTA_TAG_region { section TAG_OTA_START }; +place in ROM_region { readonly, last section TAG_OTA_END }; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb55xx_cm4.s index ae8ea1d13..6b15e16b3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -366,4 +366,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct index 71a77851c..d3f87e77c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,15 @@ LR_IROM1 0x08007000 0x260 { ; load region size_region RW_IRAM1 0x20000008 0x0002FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM2aRet_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM2aRet_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM2aRet_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } } LR_IROM3 0x08007260 0x78DA0 { diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 8dc18f166..961653017 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -156,7 +140,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c index d42614f49..30a4296ba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -280,7 +279,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1084,4 +1084,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h index 657ba432b..a3a0637b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h index 3e0d875d2..abbdb81db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -88,7 +87,7 @@ #define BLE_CFG_HRS_ENERGY_RR_INTERVAL_FLAG 1/**< Max number of RR interval values - Shall not be greater than 9 */ /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -101,4 +100,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 1/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h index a24660c50..029b0f8e6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c index 59c66fad3..2a47aaa02 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c index 081905ee3..89c6171ff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,5 +226,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h index 0246d2811..89b91bab3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/hrs_app.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void HRSAPP_Init( void ); #endif #endif /*__HRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/readme.txt index 6bca8c3d4..fdf029df0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_HeartRate_ota/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRate_ota example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_common.h index d580f0365..d9622368f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_conf.h index 0be1bf56c..83f8f4c6e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_conf.h @@ -5,17 +5,16 @@ * @brief Application configuration file ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -246,26 +245,34 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -274,6 +281,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -557,7 +576,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -576,5 +595,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_entry.h index 89d350648..bdd1fe558 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +39,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_conf.h index b311e6acc..a0e057a65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/main.h index d104dcb7e..8e5a4fd81 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -35,5 +34,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ void Error_Handler(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_hal_conf.h index 3f313a2f5..8d5527ca3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_it.h index 877423276..dd23dde77 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_entry.c index b722825a0..dc46398be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -34,6 +33,8 @@ #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private typedef -----------------------------------------------------------*/ @@ -55,6 +56,8 @@ static void Led_Init( void ); static void Button_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* Functions Definition ------------------------------------------------------*/ void APPE_Init( void ) @@ -187,26 +190,164 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - /**< Traces channel initialization */ - APPD_EnableCPU2(); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } + /************************************************************* * * WRAP FUNCTIONS @@ -267,5 +408,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/main.c index cef7ef745..b22b3504a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -337,4 +337,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32wbxx_it.c index 1a9df55be..933fd6f63 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -181,5 +180,3 @@ void IPCC_C1_RX_IRQHandler(void) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.c index 596754249..2c5f4038e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -246,7 +245,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -876,5 +876,3 @@ void SVCCTL_ResumeUserEventFlow( void ) hci_resume_flow(); return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.h index 967d84ab8..b4a176e17 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -52,5 +51,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*__APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.c index 9a0b3528f..1ef3d8f7e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.c @@ -1,23 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file bas_app.c * @author MCD Application Team - * @version V1.0.1 - * @date 7-Dec-2016 * @brief Battery Service Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -151,5 +148,3 @@ static void BASAPP_UpdateLevel( void ) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.h index 4cc9f3355..50c0c1dcd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/bas_app.h @@ -1,24 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file bats_app.h * @author MCD Application Team - * @version V1.0.0 - * @date 7-Dec-2016 * @brief Header for bats_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BAS_APP_H @@ -44,5 +41,3 @@ void BASAPP_Level(void); #endif #endif /*__BAS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_conf.h index 71e15d97b..7c2ac8c16 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_conf.h @@ -5,17 +5,16 @@ * @brief BLE configuration file ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -119,7 +118,7 @@ #define BLE_CFG_HIDS_PROTOCOL_MODE 1 /**< Report Protocol Mode */ /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -127,5 +126,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_HID_SENSOR_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_dbg_conf.h index b00fcb2b1..3b612ef09 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/ble_dbg_conf.h @@ -5,17 +5,16 @@ * @brief BLE Debug configuration file ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -210,5 +209,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.c index 8c957041f..c7c8e1f2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void DISAPP_Init(void) /* USER CODE END FD */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.h index 054c00dfa..138e1c0bc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/dis_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/dis_app.h * Description : Entry application source file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -74,4 +73,3 @@ void DISAPP_Init(void); #endif /*__DIS_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.c index 3f92128b8..b68bc2fc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.c @@ -5,17 +5,16 @@ * @brief Human Interface Device Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -173,7 +172,7 @@ void HIDS_Notification(HIDS_App_Notification_evt_t *pNotification) uint8_t i; BLE_DBG_APP_MSG("HIDS_OUTPUT_REPORT\n"); - BLE_DBG_HIDS_MSG("HID Intance %d Report %d \n", + BLE_DBG_HIDS_MSG("HID Instance %d Report %d \n", pNotification->Instance, pNotification->Index); @@ -191,7 +190,7 @@ void HIDS_Notification(HIDS_App_Notification_evt_t *pNotification) uint8_t i; BLE_DBG_APP_MSG("HIDS_MOUSE_INPUT_REPORT\n"); - BLE_DBG_HIDS_MSG("HID Intance %d Report %d \n", + BLE_DBG_HIDS_MSG("HID Instance %d Report %d \n", pNotification->Instance, pNotification->Index); @@ -209,7 +208,7 @@ void HIDS_Notification(HIDS_App_Notification_evt_t *pNotification) uint8_t i; BLE_DBG_APP_MSG("HIDS_KEYBOARD_INPUT_REPORT\n"); - BLE_DBG_HIDS_MSG("HID Intance %d Report %d \n", + BLE_DBG_HIDS_MSG("HID Instance %d Report %d \n", pNotification->Instance, pNotification->Index); @@ -225,7 +224,7 @@ void HIDS_Notification(HIDS_App_Notification_evt_t *pNotification) uint8_t i; BLE_DBG_APP_MSG("HIDS_KEYBOARD_OUTPUT_REPORT\n"); - BLE_DBG_HIDS_MSG("HID Intance %d Report %d \n", + BLE_DBG_HIDS_MSG("HID Instance %d Report %d \n", pNotification->Instance, pNotification->Index); @@ -305,5 +304,3 @@ void HIDSAPP_Profile_UpdateChar(void) } } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.h index 583a9afd4..da1c34cb9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/hids_app.h @@ -6,17 +6,16 @@ * @brief Header for hids_app.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -43,5 +42,3 @@ extern "C" #endif #endif /* __HIDS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/readme.txt index 0f9b4cc2e..3720b63ac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Hid/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE Human Interface Device example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -22,7 +22,7 @@ How to use the Human Interface Device profile as specified by the BLE SIG. -Add here a detailled but simple description of the example. this description will be +Add here a detailed but simple description of the example. this description will be reused inside the application note which list all the example. This paragraph end when a "." is at the end of a line like the following one ==> . diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h index 7e66ee35a..8d15b5c11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h index ae7d61ab5..6c5bad802 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -260,26 +259,34 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -288,6 +295,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -575,7 +594,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -591,5 +610,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h index 5d85cd90c..b82056fc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h @@ -1,4 +1,4 @@ - +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file app_entry.h @@ -7,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +40,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h index 7fcd60664..db52de81a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h index 18c088d3e..51ece819e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file hw_flash.h * @brief Header for hw_flash.c module -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __HW_FLASH_H @@ -83,5 +82,3 @@ uint32_t HW_FLASH_OB_GetSNBRSA(void); #endif #endif /*__HW_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h index 41f226faf..cc30a4de0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file lp_timer.h * @brief Header for lp_timer.c module -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __LP_TIMER_H @@ -56,5 +55,3 @@ extern "C" { #endif #endif /*__LP_TIMER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h index 7d6b87d0e..8cebdcea9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -36,5 +35,3 @@ void Error_Handler(void); /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h index 4ee14873e..306f81569 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h index 06d41fa17..19f28be5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void TIM1_CC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h index 4b9e79dde..2e913957b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c index 8dd4a7e3b..c39489a31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,7 +28,6 @@ #include "stm32_seq.h" #include "shci_tl.h" #include "stm32_lpm.h" -#include "app_debug.h" #include "app_debug.h" @@ -38,6 +36,8 @@ #include "pal_nvm.h" #include "lp_timer.h" #include "mesh_cfg.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -96,6 +96,8 @@ static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -230,26 +232,163 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - /* Enable debug on CPU2 */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } + /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ static void Led_Init( void ) { @@ -390,4 +529,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c index 882181c8c..7355cea62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "common.h" #include "stm32_seq.h" @@ -148,5 +147,3 @@ static void HW_FLASH_PageErase(uint32_t Page) // DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c index cb97bd718..7a42785ae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c index 404bb2e3b..eafc19123 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c @@ -1,17 +1,16 @@ /** - *************************************************************************************** + *************************************************************************************** * File Name : lp_timer.c * Description : Low power timer to be used within Mesh Application. - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,4 @@ static void LpTimerCb( void ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c index cbf88434b..a7c98664c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -438,4 +438,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c index 8120bda4a..0a48a2414 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -229,5 +228,3 @@ void TIM1_CC_IRQHandler(void) /* USER CODE END TIM1_IRQn 1 */ } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c index 3f6475b15..ec4c0eb3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c index e9b50f44e..5365f0d06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c @@ -1,21 +1,20 @@ /** - ******************************************************************************* + ****************************************************************************** * @file PWM_config.c * @author BLE Mesh Team * @brief Configuration file for PWM. - ******************************************************************************* - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ******************************************************************************* -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c index dc0f184c2..a7691cd61 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c @@ -1,43 +1,20 @@ /** -******************************************************************************** + ****************************************************************************** * @file PWM_handlers.c * @author BLE Mesh Team -* @version V1.0.0 -* @date 31-July-2018 * @brief Handlers for PWM and other support functions. -******************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2017 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h index a27fa757b..2d1346363 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h @@ -2,20 +2,18 @@ ****************************************************************************** * @file PWM/PWM_handlers.c * @author SNM Application Team -* @version V1.0.0 -* @date September-2015 * @brief Handlers for PWM and other support functions. ****************************************************************************** * @attention * - * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS - * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE - * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY - * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING - * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE - * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - *

                                                                  © COPYRIGHT 2015 STMicroelectronics

                                                                  ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c index 72c64a839..d520f128a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,7 +271,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -672,4 +672,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h index d87d3e466..629ef1bb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void APP_BLE_Init( void ); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c index 6a94692e4..7440fb163 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.c * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Config Model APIs callback from ST BLE Mesh Library -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include #include "hal_common.h" @@ -356,4 +353,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t* pPubParameters) /** * @} */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h index ccfbfcc74..ac0fb660c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.h * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Header file for the application config file -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_H @@ -51,4 +48,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t*); #endif /* __APPLI_CONFIG_H */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c index 3b7fce7a2..d0584e763 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c @@ -1,22 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file appli_config_client.c * @author BLE Mesh Team * @brief Application interface for Config CLient Mesh Model - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * - ****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -716,7 +714,7 @@ void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState) /** * @brief This function is Init function for the state machine of the - Configuration Client. The Function shall be called everytime a new + Configuration Client. The Function shall be called every time a new node is provisioned * @param None * @retval None @@ -1456,7 +1454,7 @@ MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be added for Publishing */ /* Do NOTHING, let the next Model be picked */ @@ -1538,7 +1536,7 @@ MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be Subscribed */ /* Do NOTHING, let the next Model be picked */ @@ -1603,7 +1601,7 @@ MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be binded + /* If Model is Foundation Model, then it does not need to be binded with AppKey */ /* Do NOTHING, let the next Model be picked */ @@ -1914,5 +1912,4 @@ MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h index b380cf636..52462b86f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_CLIENT_H @@ -89,5 +88,4 @@ MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIdx); #endif /* __APPLI_CONFIG_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c index 6e2d2ad18..16add7034 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -466,5 +465,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h index 0d6c708e1..92266787d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,5 +153,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St #endif /* __APPLI_GENERIC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c index 219e5c5b3..74ed4a322 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -341,5 +340,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h index 80ecb070c..f6c569564 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_GENERIC_CLIENT_H @@ -36,5 +35,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op #endif /* __APPLI_GENERIC_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c index fefaa383b..e7f8ec9fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1181,7 +1180,7 @@ void HSL2RGB_Conversion(MOBLEUINT8 elementIndex) mValue = (MOBLEUINT16)((lightnessvalue * 1000) - (cValue/2)); xValue = (MOBLEUINT16)(cValue * (1 - fabs(fmod(hueValue / 60.0, 2.0) - 1))); - /* Conditons applied for the different angle of hue value */ + /* Conditions applied for the different angle of hue value */ if (hueValue > 0 && hueValue < (HUE_UPPER_LIMIT / 6)) { RgbF_Create(cValue + mValue, xValue + mValue, mValue, elementIndex); @@ -1347,5 +1346,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state ,Appli_LightPwmValue_t light_state) /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h index a6da69fce..24ada82ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,5 +276,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state, #endif /* __APPLI_LIGHT_H */ /******************************************************************************/ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c index ef4644a11..8d7dda2f7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -1202,5 +1201,4 @@ MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, MOB * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h index 77a93eb92..530d0964b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_CLIENT_H @@ -107,5 +106,4 @@ MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, #endif /* __APPLI_LIGHT_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c index 29efc487d..b1d53e1ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -450,5 +449,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h index 9b75aa9ff..42c59766e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_lc.h * @author BLE Mesh Team * @brief Application interface for Light Control Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_LC_H @@ -77,5 +76,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_LIGHT_LC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c index 77d217d01..4cfa39c2b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1902,4 +1901,3 @@ WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInP /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h index 353e06664..a28aa8984 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,4 @@ MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLE #endif /* __APPLI_MESH_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c index 564d86bf5..ce9af8d33 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -601,7 +600,7 @@ void AppliNvm_Process(void) /** -* @brief Fuction used to set the flag which is responsible for storing the +* @brief Function used to set the flag which is responsible for storing the states in flash. * @param void * @retval void @@ -748,4 +747,3 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h index 75353565a..22946c7a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** -*/ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_NVM_H @@ -95,5 +94,4 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, #endif /* __APPLI_NVM_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c index d751be1cf..086096403 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -304,7 +303,7 @@ void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pSeriesParam, * Read from application to optimize RAM * @param Sensor offset in sensor init structure * @param descriptor parameters - * @retval Fail if sensor doesn't exist or property ID mismatch occurrs + * @retval Fail if sensor doesn't exist or property ID mismatch occurs * else Success */ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, @@ -354,7 +353,7 @@ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, * Read sensor value and update buffer * data length <= 128 * PreviousTemperatureValue, PresentTemperatureValue to be updated - * everytime sensor value is changed and call to Sensor_UpdateCadence + * every time sensor value is changed and call to Sensor_UpdateCadence * @param Sensor offset in sensor init structure * @param Value parameters * @retval Fail if sensor doesn't exist @@ -579,7 +578,7 @@ MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, } else { - /* Implmented only for sensor at offset 0 */ + /* Implemented only for sensor at offset 0 */ } return fastCadenceStatus; @@ -840,5 +839,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h index 172acf4f7..e45f3d83b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_SENSOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c index 3525a880f..1ce2d49ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensors_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -328,5 +327,4 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h index e28aac4df..350bc4cdf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensor_client.h * @author BLE Mesh Team * @brief Application interface for Sensor Mesh Models -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_SENSOR_CLIENT_H @@ -69,4 +68,3 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, #endif /* __APPLI_SENSOR_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c index dad3f88ac..c1c72ebb2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -555,5 +554,4 @@ void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h index 8515c36e2..cb16bfefe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,5 +41,4 @@ MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress); #endif /* __APPLI_VENDOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h index 4cc3ce72b..57713f5e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,12 +62,10 @@ #define BLE_CFG_CLT_MAX_NBR_CB 5 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_HR_SENSOR_APPEARANCE (832) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h index 35a4d96ab..49a3419cb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,5 +202,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h index 3afc2e373..3ab0f207f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ #ifndef _CUBE_HAL_H_ #define _CUBE_HAL_H_ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s index 636eb47c6..782844084 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s @@ -8,33 +8,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. -;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;* -;* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -;* (MoBLE) technology. The present solution is developed and maintained for both -;* Mesh library and Applications solely by STMicroelectronics. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ;*/ @@ -47,4 +26,3 @@ _mobleNvmBase_data FILL 4096, 0x00 END -;/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h index 704a08d80..d6748ef45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,4 @@ void InitDevice(void); void ShouldSleepFunc(void); #endif /* _HAL_H_ */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h index 8cd46ecd6..57710e05b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -37,7 +36,7 @@ /* * Different provision bearer supported by BLE-Mesh. * Define according to application. -* Atleast one of PB-ADV and PB-GATT should be defined +* At least one of PB-ADV and PB-GATT should be defined */ #define ENABLE_PB_ADV @@ -281,7 +280,7 @@ Comment this macro to disable the publication /* Define the following Macro to check the Power-OnOff Cycles -5 Continous cycles of OnOff with Ontime <2 sec will cause unprovisioning +5 Continuous cycles of OnOff with Ontime <2 sec will cause unprovisioning */ //#define ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE @@ -358,7 +357,7 @@ For STMicroelectronics : it is 0x0030 */ /* Contains a 16-bit vendor-assigned product version ID */ #define PRODUCT_VERSION_ID 0x010A -#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go upto 160*/ +#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go up to 160*/ #define TPT_SEGMENT_COUNT (((MAX_APPLICATION_PACKET_SIZE)/12)+2) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c index 58186edea..668ecbea7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,7 +129,7 @@ __attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = __attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = { - /*Vendor Commads*/ + /*Vendor Commands*/ Appli_Vendor_LEDControl, Appli_Vendor_DeviceInfo, Appli_Vendor_Test, @@ -479,7 +478,7 @@ void BLEMesh_ModelsCommand(void) pLightLCOccupancyModeParam[0] = Led_Value; pLightLCOnOffParam[0] = Led_Value; - /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functionning */ + /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functioning */ switch (ButtonIndex_Value){ case 0: ButtonIndex_Value=0x1; @@ -1150,4 +1149,3 @@ __weak void Test_Process(void) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h index f00d2d28d..daa30e380 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,4 @@ MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 ele #endif /* __MODELS_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c index 12df6a87f..37960317a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * -****************************************************************************** -*/ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "types.h" @@ -440,4 +439,3 @@ MOBLE_RESULT PalNvmProcess(void) return MOBLE_RESULT_SUCCESS; } -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h index 0b0a971e5..91c8a0ad7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file sensor_cfg_usr.h * @author BLE Mesh Team * @brief sensor server initialization parameters -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __SENSOR_USR_CFG_H @@ -262,7 +261,7 @@ typedef struct } /** -* Combined defined of all sensors intialization parameters +* Combined defined of all sensors initialization parameters */ #define SENSOR_SERVER_INIT_PARAMS \ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c index 1816cf137..81ff38b74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ const uint8_t* SVCCTL_GetBdAddress( void ) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h index 6df3dc0c7..f9c44a264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -29,5 +28,3 @@ #endif /*__TL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c index 609ca64cf..85aa6e5da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,4 +43,3 @@ void shci_register_io_bus(tSHciIO* fops) -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c index 43a0e548d..349251ecd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.c * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief User interface file -****************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "cube_hal.h" #include "ble_clock.h" @@ -196,7 +174,7 @@ void InitDevice(void) /** -* @brief ShouldSleepFunc sleep mode fuction +* @brief ShouldSleepFunc sleep mode function * @param void * @retval void */ @@ -361,4 +339,3 @@ uint8_t __io_getcharNonBlocking(uint8_t *data) return 0; }/* end serialReadByte() */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h index 773b36116..47889703c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.h * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief Header file for User interface file -****************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef _USER_INTERFACE_H_ @@ -58,5 +36,4 @@ typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t #endif /* _USER_INTERFACE_H_ */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h index 22b6dc41c..5dc48464c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,5 +47,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/readme.txt index 151cfc447..77ca3201b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingLPN/readme.txt @@ -8,18 +8,19 @@ * @brief Description of the BLE Mesh Lighting Low Power Node demo example. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Example Description -This is the implementation of the BLE Mesh Low Power Node profile as specified by the BLE SIG. +This is the implementation of the BLE Mesh Low Power Node profile as specified by the BLE SIG, +a Low Power Node with the capacity to be associated to a Proxy-Relay-Friend Node for Friendship. @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from @@ -42,7 +43,7 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h Parameters configuration file of the application - BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h Configuration file of the HW - BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h Configuration file of the FLASH driver needed by EE module - - BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h Configuration file of the Hardware Iterface + - BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h Configuration file of the Hardware Interface - BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h Configuration file of the Low power timer to be used within Mesh Application. - BLE/BLE_MeshLightingLPN/Core/Inc/main.h Header for main.c module - BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file @@ -62,18 +63,28 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c stm32wbxx system source file - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/app_ble.c BLE Profile implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/app_ble.h Header of BLE Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config.c Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config.h Header of Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config_client.c Application interface for Config CLient Mesh Model + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_config_client.h Header of Application interface for Config CLient Mesh Model - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic.c Application interface for Generic Mesh Models - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic.h Header of Application interface for Generic Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic_client.c Application interface for Client Generic Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_generic_client.h Header of Application interface for Client Generic Mesh Models - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light.c BLE Mesh Light Profile implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light.h Header of BLE Mesh Light Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_client.c Application interface for Client Light Mesh Models + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_client.h Header of Application interface for Client Light Mesh Models - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_lc.c BLE Mesh Light Lightness Controller Profile implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_light_lc.h Header of BLE Mesh Light Lightness Controller Profile implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_mesh.c BLE Mesh application implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_mesh.h Header of BLE Mesh application implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_nvm.c BLE Mesh NVM application implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_nvm.h Header of BLE Mesh NVM application implementation - - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor.c BLE Mesh Sensor Profile implementation - - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor.c BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor_client.c BLE Mesh Client Sensor Profile implementation + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_sensor_client.h Header of BLE Mesh Client Sensor Profile implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_vendor.c BLE Mesh Vendor Profile implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/appli_vendor.h Header of BLE Mesh Vendor Profile implementation - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/ble_conf.h BLE Services configuration @@ -89,8 +100,10 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/PWM_config.h Header of Pulse Width Modulation configuration - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/PWM_handlers.c Pulse Width Modulation handlers - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/PWM_handlers.h Header of Pulse Width Modulation handlers + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/sensor_cfg_usr.c Header for user Mesh Sensor Model configuration - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/svcctl_conf.c Service Controller configuration API - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/tl_conf.h Configuration file of the Transport layer + - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/tl_dbg_conf.h Debug configuration file for stm32wpan transport layer interface. - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/tl_if.c Transport Layer interface - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/user_if.h Header file for User interface file - BLE/BLE_MeshLightingLPN/STM32_WPAN/App/user_if.c User interface file @@ -143,7 +156,7 @@ one FN must be in the direct radio range of an LPN to establish Friendship. @Configuration Low Power Node -Low Power feature support is defined in mesh_cfg_usr.h by hte predefinition of ENABLE_LOW_POWER_FEATURE. +Low Power feature support is defined in mesh_cfg_usr.h by the predefinition of ENABLE_LOW_POWER_FEATURE. Note: A Low Power feature-enabled node does not support any other feature: all the other features should be undefined. @@ -151,9 +164,15 @@ undefined. General default setting defined in mesh_cfg_usr.h: ENABLE_GENERIC_MODEL_SERVER_ONOFF (1) /* GENERIC SERVER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_LEVEL (1) /* GENERIC SERVER LEVEL MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF (1) /* GENERIC SERVER POWER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF_SETUP (1) /* GENERIC SERVER POWER ONOFF SETUP MODEL ON FIRST ELEMENT */ + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS (1) /* LIGHT LIGHTNESS SERVER MODEL ON FIRST ELEMENT */ + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP (1) /* LIGHT LIGHTNESS SETUP SERVER MODEL ON FIRST ELEMENT */ APPLICATION_NUMBER_OF_ELEMENTS 1 /* NUMBER OF ELEMENT SUPPORTED */ - APPLICATION_SIG_MODELS_MAX_COUNT 20 /* TOTAL NUMBER OF MODELS SUPPORTED */ - APPLICATION_VENDOR_MODELS_MAX_COUNT 2 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + APPLICATION_SIG_MODELS_MAX_COUNT 6 /* TOTAL NUMBER OF MODELS SUPPORTED */ + APPLICATION_VENDOR_MODELS_MAX_COUNT 1 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + ENABLE_LOW_POWER_FEATURE /* LOW POWER SUPPORT */ ENABLE_PB_ADV /* Provisioning Bearer over advertising channels support */ ENABLE_PB_GATT /* Provisioning Bearer over GATT proxy support */ @@ -162,7 +181,7 @@ boards as Low Power nodes. Low Power node setup: Step 1. Configure LPN parameters. - Change only if required ohterwise skip this step (use example parameters defined in mesh_cfg_usr.h) + Change only if required otherwise skip this step (use example parameters defined in mesh_cfg_usr.h) LPN_RSSI_FACTOR_LEVEL 1 LPN_RECIVE_WINDOW_FACTOR_LEVEL 1 LPN_MINIMUM_QUEUE_SIZE_LOG 2 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h index 7e66ee35a..8d15b5c11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h index 0f02d8147..e88af7753 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -260,26 +259,34 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -288,6 +295,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -575,7 +594,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -591,5 +610,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h index 5d85cd90c..b82056fc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h @@ -1,4 +1,4 @@ - +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file app_entry.h @@ -7,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +40,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h index 7fcd60664..db52de81a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h index 18c088d3e..51ece819e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file hw_flash.h * @brief Header for hw_flash.c module -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __HW_FLASH_H @@ -83,5 +82,3 @@ uint32_t HW_FLASH_OB_GetSNBRSA(void); #endif #endif /*__HW_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h index 41f226faf..cc30a4de0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file lp_timer.h * @brief Header for lp_timer.c module -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __LP_TIMER_H @@ -56,5 +55,3 @@ extern "C" { #endif #endif /*__LP_TIMER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h index 0dfed68a8..5ddcf89b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -36,5 +35,3 @@ void Error_Handler(void); /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h index 4ee14873e..306f81569 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h index 06d41fa17..19f28be5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void TIM1_CC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h index 4b9e79dde..2e913957b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c index 4d73aa799..4ced60cf8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -31,13 +30,13 @@ #include "stm32_lpm.h" #include "app_debug.h" -#include "app_debug.h" - #include "appli_mesh.h" #include "appli_nvm.h" #include "pal_nvm.h" #include "lp_timer.h" #include "mesh_cfg.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -96,6 +95,8 @@ static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -230,23 +231,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - /* Enable debug on CPU2 */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -389,4 +526,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c index 882181c8c..7355cea62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "common.h" #include "stm32_seq.h" @@ -148,5 +147,3 @@ static void HW_FLASH_PageErase(uint32_t Page) // DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c index cb97bd718..7a42785ae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c index 404bb2e3b..eafc19123 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c @@ -1,17 +1,16 @@ /** - *************************************************************************************** + *************************************************************************************** * File Name : lp_timer.c * Description : Low power timer to be used within Mesh Application. - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,4 @@ static void LpTimerCb( void ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c index cbf88434b..a7c98664c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -438,4 +438,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c index 8120bda4a..0a48a2414 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -229,5 +228,3 @@ void TIM1_CC_IRQHandler(void) /* USER CODE END TIM1_IRQn 1 */ } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c index 3f6475b15..ec4c0eb3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..f203232d2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -57,7 +41,8 @@ MEMORY { FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FFF8 -RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K +RAM_SHARED1 (xrw) : ORIGIN = 0x20030000, LENGTH = 0x28 +RAM_SHARED2 (xrw) : ORIGIN = 0x20030028, LENGTH = 10K } /* Define output sections */ @@ -145,7 +130,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) @@ -179,9 +164,9 @@ SECTIONS } .ARM.attributes 0 : { *(.ARM.attributes) } - MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED - MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED - MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED + MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED1 + MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED2 + MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED2 } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c index e9b50f44e..5365f0d06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c @@ -1,21 +1,20 @@ /** - ******************************************************************************* + ****************************************************************************** * @file PWM_config.c * @author BLE Mesh Team * @brief Configuration file for PWM. - ******************************************************************************* - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ******************************************************************************* -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c index dc0f184c2..a7691cd61 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c @@ -1,43 +1,20 @@ /** -******************************************************************************** + ****************************************************************************** * @file PWM_handlers.c * @author BLE Mesh Team -* @version V1.0.0 -* @date 31-July-2018 * @brief Handlers for PWM and other support functions. -******************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2017 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h index a27fa757b..2d1346363 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h @@ -2,20 +2,18 @@ ****************************************************************************** * @file PWM/PWM_handlers.c * @author SNM Application Team -* @version V1.0.0 -* @date September-2015 * @brief Handlers for PWM and other support functions. ****************************************************************************** * @attention * - * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS - * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE - * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY - * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING - * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE - * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - *

                                                                  © COPYRIGHT 2015 STMicroelectronics

                                                                  ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c index 72c64a839..d520f128a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,7 +271,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -672,4 +672,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h index d87d3e466..629ef1bb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void APP_BLE_Init( void ); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c index 6a94692e4..7440fb163 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.c * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Config Model APIs callback from ST BLE Mesh Library -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include #include "hal_common.h" @@ -356,4 +353,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t* pPubParameters) /** * @} */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h index ccfbfcc74..ac0fb660c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.h * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Header file for the application config file -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_H @@ -51,4 +48,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t*); #endif /* __APPLI_CONFIG_H */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c index 3b7fce7a2..d0584e763 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c @@ -1,22 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file appli_config_client.c * @author BLE Mesh Team * @brief Application interface for Config CLient Mesh Model - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * - ****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -716,7 +714,7 @@ void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState) /** * @brief This function is Init function for the state machine of the - Configuration Client. The Function shall be called everytime a new + Configuration Client. The Function shall be called every time a new node is provisioned * @param None * @retval None @@ -1456,7 +1454,7 @@ MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be added for Publishing */ /* Do NOTHING, let the next Model be picked */ @@ -1538,7 +1536,7 @@ MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be Subscribed */ /* Do NOTHING, let the next Model be picked */ @@ -1603,7 +1601,7 @@ MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be binded + /* If Model is Foundation Model, then it does not need to be binded with AppKey */ /* Do NOTHING, let the next Model be picked */ @@ -1914,5 +1912,4 @@ MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h index b380cf636..52462b86f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_CLIENT_H @@ -89,5 +88,4 @@ MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIdx); #endif /* __APPLI_CONFIG_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c index 7cd69b5fc..2adbeacb1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -466,5 +465,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h index 9ed198bcd..a98425cbc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,5 +153,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St #endif /* __APPLI_GENERIC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c index 67fb3a069..22bd7e99a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -341,5 +340,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h index 80ecb070c..f6c569564 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_GENERIC_CLIENT_H @@ -36,5 +35,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op #endif /* __APPLI_GENERIC_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c index fefaa383b..e7f8ec9fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1181,7 +1180,7 @@ void HSL2RGB_Conversion(MOBLEUINT8 elementIndex) mValue = (MOBLEUINT16)((lightnessvalue * 1000) - (cValue/2)); xValue = (MOBLEUINT16)(cValue * (1 - fabs(fmod(hueValue / 60.0, 2.0) - 1))); - /* Conditons applied for the different angle of hue value */ + /* Conditions applied for the different angle of hue value */ if (hueValue > 0 && hueValue < (HUE_UPPER_LIMIT / 6)) { RgbF_Create(cValue + mValue, xValue + mValue, mValue, elementIndex); @@ -1347,5 +1346,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state ,Appli_LightPwmValue_t light_state) /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h index a6da69fce..24ada82ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,5 +276,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state, #endif /* __APPLI_LIGHT_H */ /******************************************************************************/ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c index ef4644a11..8d7dda2f7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -1202,5 +1201,4 @@ MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, MOB * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h index 77a93eb92..530d0964b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_CLIENT_H @@ -107,5 +106,4 @@ MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, #endif /* __APPLI_LIGHT_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c index 29efc487d..b1d53e1ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -450,5 +449,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h index 9b75aa9ff..42c59766e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_lc.h * @author BLE Mesh Team * @brief Application interface for Light Control Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_LC_H @@ -77,5 +76,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_LIGHT_LC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c index 77d217d01..4cfa39c2b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1902,4 +1901,3 @@ WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInP /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h index 353e06664..a28aa8984 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,4 @@ MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLE #endif /* __APPLI_MESH_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c index 564d86bf5..ce9af8d33 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -601,7 +600,7 @@ void AppliNvm_Process(void) /** -* @brief Fuction used to set the flag which is responsible for storing the +* @brief Function used to set the flag which is responsible for storing the states in flash. * @param void * @retval void @@ -748,4 +747,3 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h index 75353565a..22946c7a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** -*/ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_NVM_H @@ -95,5 +94,4 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, #endif /* __APPLI_NVM_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c index d751be1cf..086096403 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -304,7 +303,7 @@ void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pSeriesParam, * Read from application to optimize RAM * @param Sensor offset in sensor init structure * @param descriptor parameters - * @retval Fail if sensor doesn't exist or property ID mismatch occurrs + * @retval Fail if sensor doesn't exist or property ID mismatch occurs * else Success */ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, @@ -354,7 +353,7 @@ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, * Read sensor value and update buffer * data length <= 128 * PreviousTemperatureValue, PresentTemperatureValue to be updated - * everytime sensor value is changed and call to Sensor_UpdateCadence + * every time sensor value is changed and call to Sensor_UpdateCadence * @param Sensor offset in sensor init structure * @param Value parameters * @retval Fail if sensor doesn't exist @@ -579,7 +578,7 @@ MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, } else { - /* Implmented only for sensor at offset 0 */ + /* Implemented only for sensor at offset 0 */ } return fastCadenceStatus; @@ -840,5 +839,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h index 172acf4f7..e45f3d83b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_SENSOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c index 3525a880f..1ce2d49ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensors_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -328,5 +327,4 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h index e28aac4df..350bc4cdf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensor_client.h * @author BLE Mesh Team * @brief Application interface for Sensor Mesh Models -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_SENSOR_CLIENT_H @@ -69,4 +68,3 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, #endif /* __APPLI_SENSOR_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c index dad3f88ac..c1c72ebb2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -555,5 +554,4 @@ void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h index 8515c36e2..cb16bfefe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,5 +41,4 @@ MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress); #endif /* __APPLI_VENDOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h index 4cc3ce72b..57713f5e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,12 +62,10 @@ #define BLE_CFG_CLT_MAX_NBR_CB 5 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_HR_SENSOR_APPEARANCE (832) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h index 35a4d96ab..49a3419cb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,5 +202,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h index 3afc2e373..3ab0f207f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ #ifndef _CUBE_HAL_H_ #define _CUBE_HAL_H_ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s index 636eb47c6..782844084 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s @@ -8,33 +8,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. -;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;* -;* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -;* (MoBLE) technology. The present solution is developed and maintained for both -;* Mesh library and Applications solely by STMicroelectronics. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ;*/ @@ -47,4 +26,3 @@ _mobleNvmBase_data FILL 4096, 0x00 END -;/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h index 704a08d80..d6748ef45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,4 @@ void InitDevice(void); void ShouldSleepFunc(void); #endif /* _HAL_H_ */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h index 7ee3a54c0..7c618adc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ /* * Different provision bearer supported by BLE-Mesh. * Define according to application. -* Atleast one of PB-ADV and PB-GATT should be defined +* At least one of PB-ADV and PB-GATT should be defined */ #define ENABLE_PB_ADV @@ -85,7 +84,7 @@ This may result into excessive flash erase operations, this should be avoided to */ #define SAVE_EMBD_PROVISION_DATA 1 -/* Enables the UUID saving per Node - Currenly Not Supported */ +/* Enables the UUID saving per Node - Currently Not Supported */ #define ENABLE_SAVE_UUID_PER_NODE 0 //#define ENABLE_SERIAL_PRVN 1 @@ -327,7 +326,7 @@ Comment this macro to disable the publication /* Define the following Macro to check the Power-OnOff Cycles -5 Continous cycles of OnOff with Ontime <2 sec will cause unprovisioning +5 Continuous cycles of OnOff with Ontime <2 sec will cause unprovisioning */ //#define ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE @@ -404,7 +403,7 @@ For STMicroelectronics : it is 0x0030 */ /* Contains a 16-bit vendor-assigned product version ID */ #define PRODUCT_VERSION_ID 0x010A -#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go upto 160*/ +#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go up to 160*/ #define TPT_SEGMENT_COUNT (((MAX_APPLICATION_PACKET_SIZE)/12)+2) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c index 58186edea..668ecbea7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,7 +129,7 @@ __attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = __attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = { - /*Vendor Commads*/ + /*Vendor Commands*/ Appli_Vendor_LEDControl, Appli_Vendor_DeviceInfo, Appli_Vendor_Test, @@ -479,7 +478,7 @@ void BLEMesh_ModelsCommand(void) pLightLCOccupancyModeParam[0] = Led_Value; pLightLCOnOffParam[0] = Led_Value; - /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functionning */ + /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functioning */ switch (ButtonIndex_Value){ case 0: ButtonIndex_Value=0x1; @@ -1150,4 +1149,3 @@ __weak void Test_Process(void) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h index f00d2d28d..daa30e380 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,4 @@ MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 ele #endif /* __MODELS_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c index 12df6a87f..37960317a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * -****************************************************************************** -*/ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "types.h" @@ -440,4 +439,3 @@ MOBLE_RESULT PalNvmProcess(void) return MOBLE_RESULT_SUCCESS; } -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h index 0b0a971e5..91c8a0ad7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file sensor_cfg_usr.h * @author BLE Mesh Team * @brief sensor server initialization parameters -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __SENSOR_USR_CFG_H @@ -262,7 +261,7 @@ typedef struct } /** -* Combined defined of all sensors intialization parameters +* Combined defined of all sensors initialization parameters */ #define SENSOR_SERVER_INIT_PARAMS \ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c index 1816cf137..81ff38b74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ const uint8_t* SVCCTL_GetBdAddress( void ) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h index 6df3dc0c7..f9c44a264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -29,5 +28,3 @@ #endif /*__TL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c index 609ca64cf..85aa6e5da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,4 +43,3 @@ void shci_register_io_bus(tSHciIO* fops) -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c index 43a0e548d..349251ecd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.c * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief User interface file -****************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "cube_hal.h" #include "ble_clock.h" @@ -196,7 +174,7 @@ void InitDevice(void) /** -* @brief ShouldSleepFunc sleep mode fuction +* @brief ShouldSleepFunc sleep mode function * @param void * @retval void */ @@ -361,4 +339,3 @@ uint8_t __io_getcharNonBlocking(uint8_t *data) return 0; }/* end serialReadByte() */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h index 773b36116..47889703c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.h * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief Header file for User interface file -****************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef _USER_INTERFACE_H_ @@ -58,5 +36,4 @@ typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t #endif /* _USER_INTERFACE_H_ */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h index 22b6dc41c..5dc48464c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,5 +47,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt index b1283885e..035320ca7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt @@ -8,18 +8,19 @@ * @brief Description of the BLE Mesh Lighting Proxy Relay Friend Node demo example. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Example Description -This is the implementation of the BLE Mesh Lighting profile as specified by the BLE SIG. +This is the implementation of the BLE Mesh Lighting profile as specified by the BLE SIG, +a Proxy-Relay-Friend Node with the capacity to handle a Friendship with a Low Power Node. @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from @@ -42,7 +43,7 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h Parameters configuration file of the application - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h Configuration file of the HW - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h Configuration file of the FLASH driver needed by EE module - - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h Configuration file of the Hardware Iterface + - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h Configuration file of the Hardware Interface - BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h Configuration file of the Low power timer to be used within Mesh Application. - BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h Header for main.c module - BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file @@ -62,18 +63,28 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c stm32wbxx system source file - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/app_ble.c BLE Profile implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/app_ble.h Header of BLE Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config.c Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config.h Header of Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config_client.c Application interface for Config CLient Mesh Model + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_config_client.h Header of Application interface for Config CLient Mesh Model - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic.c Application interface for Generic Mesh Models - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic.h Header of Application interface for Generic Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic_client.c Application interface for Client Generic Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_generic_client.h Header of Application interface for Client Generic Mesh Models - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light.c BLE Mesh Light Profile implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light.h Header of BLE Mesh Light Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_client.c Application interface for Client Light Mesh Models + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_client.h Header of Application interface for Client Light Mesh Models - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_lc.c BLE Mesh Light Lightness Controller Profile implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_light_lc.h Header of BLE Mesh Light Lightness Controller Profile implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_mesh.c BLE Mesh application implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_mesh.h Header of BLE Mesh application implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_nvm.c BLE Mesh NVM application implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_nvm.h Header of BLE Mesh NVM application implementation - - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor.c BLE Mesh Sensor Profile implementation - - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor.c BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor_client.c BLE Mesh Client Sensor Profile implementation + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_sensor_client.h Header of BLE Mesh Client Sensor Profile implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_vendor.c BLE Mesh Vendor Profile implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/appli_vendor.h Header of BLE Mesh Vendor Profile implementation - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/ble_conf.h BLE Services configuration @@ -89,8 +100,10 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/PWM_config.h Header of Pulse Width Modulation configuration - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/PWM_handlers.c Pulse Width Modulation handlers - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/PWM_handlers.h Header of Pulse Width Modulation handlers + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/sensor_cfg_usr.c Header for user Mesh Sensor Model configuration - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/svcctl_conf.c Service Controller configuration API - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/tl_conf.h Configuration file of the Transport layer + - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/tl_dbg_conf.h Debug configuration file for stm32wpan transport layer interface. - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/tl_if.c Transport Layer interface - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/user_if.h Header file for User interface file - BLE/BLE_MeshLightingPRFNode/STM32_WPAN/App/user_if.c User interface file @@ -143,7 +156,7 @@ one FN must be in the direct radio range of an LPN to establish Friendship. @Configuration Low Power Node -Low Power feature support is defined in mesh_cfg_usr.h by hte predefinition of ENABLE_LOW_POWER_FEATURE. +Low Power feature support is defined in mesh_cfg_usr.h by the predefinition of ENABLE_LOW_POWER_FEATURE. Note: A Low Power feature-enabled node does not support any other feature: all the other features should be undefined. @@ -151,9 +164,17 @@ undefined. General default setting defined in mesh_cfg_usr.h: ENABLE_GENERIC_MODEL_SERVER_ONOFF (1) /* GENERIC SERVER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_LEVEL (1) /* GENERIC SERVER LEVEL MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF (1) /* GENERIC SERVER POWER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF_SETUP (1) /* GENERIC SERVER POWER ONOFF SETUP MODEL ON FIRST ELEMENT */ + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS (1) /* LIGHT LIGHTNESS SERVER MODEL ON FIRST ELEMENT */ + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP (1) /* LIGHT LIGHTNESS SETUP SERVER MODEL ON FIRST ELEMENT */ APPLICATION_NUMBER_OF_ELEMENTS 1 /* NUMBER OF ELEMENT SUPPORTED */ - APPLICATION_SIG_MODELS_MAX_COUNT 20 /* TOTAL NUMBER OF MODELS SUPPORTED */ - APPLICATION_VENDOR_MODELS_MAX_COUNT 2 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + APPLICATION_SIG_MODELS_MAX_COUNT 6 /* TOTAL NUMBER OF MODELS SUPPORTED */ + APPLICATION_VENDOR_MODELS_MAX_COUNT 1 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + ENABLE_RELAY_FEATURE /* RELAY SUPPORT */ + ENABLE_PROXY_FEATURE /* PROXY SUPPORT FOR GATT CONNECTION */ + ENABLE_FRIEND_FEATURE /* FRIEND SUPPORT FOR FRIENDSHIP WITH LOW POWER NODE */ ENABLE_PB_ADV /* Provisioning Bearer over advertising channels support */ ENABLE_PB_GATT /* Provisioning Bearer over GATT proxy support */ @@ -162,8 +183,8 @@ boards as Low Power nodes. Low Power Node setup (use the Low Power Node BLE_MeshLightingLPN project): Step 1. Configure LPN parameters. - Change only if required ohterwise skip this step (use example parameters defined in mesh_cfg_usr.h) - LPN_RSSI_FACTOR_LEVEL 1 + Change only if required otherwise skip this step (use example parameters defined in mesh_cfg_usr.h) + LPN_RSSI_FACTOR_LEVEL 1 LPN_RECIVE_WINDOW_FACTOR_LEVEL 1 LPN_MINIMUM_QUEUE_SIZE_LOG 2 LPN_RECEIVE_DELAY 150 ms diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_common.h index 7e66ee35a..8d15b5c11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_conf.h index 0f02d8147..e88af7753 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -260,26 +259,34 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -288,6 +295,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -575,7 +594,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -591,5 +610,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_entry.h index 5d85cd90c..b82056fc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/app_entry.h @@ -1,4 +1,4 @@ - +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file app_entry.h @@ -7,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +40,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_conf.h index 7fcd60664..db52de81a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_flash.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_flash.h index 18c088d3e..51ece819e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_flash.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_flash.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file hw_flash.h * @brief Header for hw_flash.c module -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __HW_FLASH_H @@ -83,5 +82,3 @@ uint32_t HW_FLASH_OB_GetSNBRSA(void); #endif #endif /*__HW_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/lp_timer.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/lp_timer.h index 41f226faf..cc30a4de0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/lp_timer.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/lp_timer.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file lp_timer.h * @brief Header for lp_timer.c module -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __LP_TIMER_H @@ -56,5 +55,3 @@ extern "C" { #endif #endif /*__LP_TIMER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/main.h index 0dfed68a8..5ddcf89b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -36,5 +35,3 @@ void Error_Handler(void); /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_hal_conf.h index 4ee14873e..306f81569 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_it.h index 06d41fa17..19f28be5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void TIM1_CC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/vcp_conf.h index 4b9e79dde..2e913957b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_entry.c index 5abd0cceb..fe4756bd8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -38,6 +37,8 @@ #include "pal_nvm.h" #include "lp_timer.h" #include "mesh_cfg.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -96,6 +97,8 @@ static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -230,23 +233,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - /* Enable debug on CPU2 */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -389,4 +528,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_flash.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_flash.c index 882181c8c..7355cea62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_flash.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_flash.c @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "common.h" #include "stm32_seq.h" @@ -148,5 +147,3 @@ static void HW_FLASH_PageErase(uint32_t Page) // DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_uart.c index cb97bd718..7a42785ae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/lp_timer.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/lp_timer.c index 404bb2e3b..eafc19123 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/lp_timer.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/lp_timer.c @@ -1,17 +1,16 @@ /** - *************************************************************************************** + *************************************************************************************** * File Name : lp_timer.c * Description : Low power timer to be used within Mesh Application. - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,4 @@ static void LpTimerCb( void ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/main.c index cbf88434b..a7c98664c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -438,4 +438,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32wbxx_it.c index 8120bda4a..0a48a2414 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -229,5 +228,3 @@ void TIM1_CC_IRQHandler(void) /* USER CODE END TIM1_IRQn 1 */ } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/system_stm32wbxx.c index 3f6475b15..ec4c0eb3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_config.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_config.c index e9b50f44e..5365f0d06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_config.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_config.c @@ -1,21 +1,20 @@ /** - ******************************************************************************* + ****************************************************************************** * @file PWM_config.c * @author BLE Mesh Team * @brief Configuration file for PWM. - ******************************************************************************* - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ******************************************************************************* -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.c index dc0f184c2..a7691cd61 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.c @@ -1,43 +1,20 @@ /** -******************************************************************************** + ****************************************************************************** * @file PWM_handlers.c * @author BLE Mesh Team -* @version V1.0.0 -* @date 31-July-2018 * @brief Handlers for PWM and other support functions. -******************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2017 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.h index a27fa757b..2d1346363 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/PWM_handlers.h @@ -2,20 +2,18 @@ ****************************************************************************** * @file PWM/PWM_handlers.c * @author SNM Application Team -* @version V1.0.0 -* @date September-2015 * @brief Handlers for PWM and other support functions. ****************************************************************************** * @attention * - * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS - * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE - * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY - * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING - * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE - * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - *

                                                                  © COPYRIGHT 2015 STMicroelectronics

                                                                  ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.c index 4e4d613fd..6be1560ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,7 +271,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -672,4 +672,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.h index d87d3e466..629ef1bb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/app_ble.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void APP_BLE_Init( void ); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.c index 6a94692e4..7440fb163 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.c @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.c * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Config Model APIs callback from ST BLE Mesh Library -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include #include "hal_common.h" @@ -356,4 +353,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t* pPubParameters) /** * @} */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.h index ccfbfcc74..ac0fb660c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config.h @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.h * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Header file for the application config file -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_H @@ -51,4 +48,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t*); #endif /* __APPLI_CONFIG_H */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.c index ba0b3307a..478a911d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.c @@ -1,22 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file appli_config_client.c * @author BLE Mesh Team * @brief Application interface for Config CLient Mesh Model - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * - ****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -716,7 +714,7 @@ void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState) /** * @brief This function is Init function for the state machine of the - Configuration Client. The Function shall be called everytime a new + Configuration Client. The Function shall be called every time a new node is provisioned * @param None * @retval None @@ -1456,7 +1454,7 @@ MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be added for Publishing */ /* Do NOTHING, let the next Model be picked */ @@ -1538,7 +1536,7 @@ MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be Subscribed */ /* Do NOTHING, let the next Model be picked */ @@ -1603,7 +1601,7 @@ MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be binded + /* If Model is Foundation Model, then it does not need to be binded with AppKey */ /* Do NOTHING, let the next Model be picked */ @@ -1914,5 +1912,4 @@ MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.h index b380cf636..52462b86f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_config_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_CLIENT_H @@ -89,5 +88,4 @@ MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIdx); #endif /* __APPLI_CONFIG_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.c index 6e2d2ad18..16add7034 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -466,5 +465,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.h index 0d6c708e1..92266787d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,5 +153,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St #endif /* __APPLI_GENERIC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.c index 219e5c5b3..74ed4a322 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -341,5 +340,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.h index 80ecb070c..f6c569564 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_generic_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_GENERIC_CLIENT_H @@ -36,5 +35,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op #endif /* __APPLI_GENERIC_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.c index fefaa383b..e7f8ec9fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1181,7 +1180,7 @@ void HSL2RGB_Conversion(MOBLEUINT8 elementIndex) mValue = (MOBLEUINT16)((lightnessvalue * 1000) - (cValue/2)); xValue = (MOBLEUINT16)(cValue * (1 - fabs(fmod(hueValue / 60.0, 2.0) - 1))); - /* Conditons applied for the different angle of hue value */ + /* Conditions applied for the different angle of hue value */ if (hueValue > 0 && hueValue < (HUE_UPPER_LIMIT / 6)) { RgbF_Create(cValue + mValue, xValue + mValue, mValue, elementIndex); @@ -1347,5 +1346,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state ,Appli_LightPwmValue_t light_state) /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.h index a6da69fce..24ada82ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,5 +276,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state, #endif /* __APPLI_LIGHT_H */ /******************************************************************************/ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.c index 27f449c3a..1fdabe390 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -1202,5 +1201,4 @@ MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, MOB * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.h index 77a93eb92..530d0964b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_CLIENT_H @@ -107,5 +106,4 @@ MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, #endif /* __APPLI_LIGHT_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.c index 29efc487d..b1d53e1ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -450,5 +449,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.h index 9b75aa9ff..42c59766e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_light_lc.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_lc.h * @author BLE Mesh Team * @brief Application interface for Light Control Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_LC_H @@ -77,5 +76,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_LIGHT_LC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.c index ee938270b..bbcb58b6f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -2173,4 +2172,3 @@ WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInP /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.h index 353e06664..a28aa8984 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_mesh.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,4 @@ MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLE #endif /* __APPLI_MESH_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.c index 97f93daf0..f418e0013 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -664,7 +663,7 @@ void AppliNvm_Process(void) /** -* @brief Fuction used to set the flag which is responsible for storing the +* @brief Function used to set the flag which is responsible for storing the states in flash. * @param void * @retval void @@ -1053,7 +1052,7 @@ MOBLE_RESULT AppliPrvnNvm_FactorySettingReset(MOBLEUINT8 *flag) } else { - /* After reset of provisioner , retreiving the next node address to be provisioned */ + /* After reset of provisioner , retrieving the next node address to be provisioned */ if(currSubPageIdx == 0) { *flag = 1; @@ -1094,4 +1093,3 @@ MOBLE_RESULT AppliPrvnNvm_FactorySettingReset(MOBLEUINT8 *flag) /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.h index 75353565a..22946c7a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_nvm.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** -*/ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_NVM_H @@ -95,5 +94,4 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, #endif /* __APPLI_NVM_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.c index d751be1cf..086096403 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -304,7 +303,7 @@ void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pSeriesParam, * Read from application to optimize RAM * @param Sensor offset in sensor init structure * @param descriptor parameters - * @retval Fail if sensor doesn't exist or property ID mismatch occurrs + * @retval Fail if sensor doesn't exist or property ID mismatch occurs * else Success */ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, @@ -354,7 +353,7 @@ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, * Read sensor value and update buffer * data length <= 128 * PreviousTemperatureValue, PresentTemperatureValue to be updated - * everytime sensor value is changed and call to Sensor_UpdateCadence + * every time sensor value is changed and call to Sensor_UpdateCadence * @param Sensor offset in sensor init structure * @param Value parameters * @retval Fail if sensor doesn't exist @@ -579,7 +578,7 @@ MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, } else { - /* Implmented only for sensor at offset 0 */ + /* Implemented only for sensor at offset 0 */ } return fastCadenceStatus; @@ -840,5 +839,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.h index 172acf4f7..e45f3d83b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_SENSOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.c index 3525a880f..1ce2d49ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensors_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -328,5 +327,4 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.h index e28aac4df..350bc4cdf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_sensors_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensor_client.h * @author BLE Mesh Team * @brief Application interface for Sensor Mesh Models -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_SENSOR_CLIENT_H @@ -69,4 +68,3 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, #endif /* __APPLI_SENSOR_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.c index dad3f88ac..c1c72ebb2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -555,5 +554,4 @@ void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.h index 8515c36e2..cb16bfefe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/appli_vendor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,5 +41,4 @@ MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress); #endif /* __APPLI_VENDOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_conf.h index 4cc3ce72b..57713f5e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,12 +62,10 @@ #define BLE_CFG_CLT_MAX_NBR_CB 5 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_HR_SENSOR_APPEARANCE (832) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_dbg_conf.h index 35a4d96ab..49a3419cb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/ble_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,5 +202,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/cube_hal.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/cube_hal.h index 3afc2e373..3ab0f207f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/cube_hal.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/cube_hal.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ #ifndef _CUBE_HAL_H_ #define _CUBE_HAL_H_ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/data.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/data.s index 636eb47c6..782844084 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/data.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/data.s @@ -8,33 +8,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. -;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;* -;* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -;* (MoBLE) technology. The present solution is developed and maintained for both -;* Mesh library and Applications solely by STMicroelectronics. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ;*/ @@ -47,4 +26,3 @@ _mobleNvmBase_data FILL 4096, 0x00 END -;/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/hal_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/hal_common.h index 704a08d80..d6748ef45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/hal_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/hal_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,4 @@ void InitDevice(void); void ShouldSleepFunc(void); #endif /* _HAL_H_ */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/mesh_cfg_usr.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/mesh_cfg_usr.h index bf99ea1eb..89b4b3201 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/mesh_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/mesh_cfg_usr.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -41,7 +40,7 @@ /* * Different provision bearer supported by BLE-Mesh. * Define according to application. -* Atleast one of PB-ADV and PB-GATT should be defined +* At least one of PB-ADV and PB-GATT should be defined */ #define ENABLE_PB_ADV @@ -84,7 +83,7 @@ This may result into excessive flash erase operations, this should be avoided to */ #define SAVE_EMBD_PROVISION_DATA 1 -/* Enables the UUID saving per Node - Currenly Not Supported */ +/* Enables the UUID saving per Node - Currently Not Supported */ #define ENABLE_SAVE_UUID_PER_NODE 0 #define ENABLE_SERIAL_PRVN 1 @@ -326,7 +325,7 @@ Comment this macro to disable the publication /* Define the following Macro to check the Power-OnOff Cycles -5 Continous cycles of OnOff with Ontime <2 sec will cause unprovisioning +5 Continuous cycles of OnOff with Ontime <2 sec will cause unprovisioning */ //#define ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE @@ -403,7 +402,7 @@ For STMicroelectronics : it is 0x0030 */ /* Contains a 16-bit vendor-assigned product version ID */ #define PRODUCT_VERSION_ID 0x010A -#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go upto 160*/ +#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go up to 160*/ #define TPT_SEGMENT_COUNT (((MAX_APPLICATION_PACKET_SIZE)/12)+2) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.c index 58186edea..668ecbea7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,7 +129,7 @@ __attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = __attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = { - /*Vendor Commads*/ + /*Vendor Commands*/ Appli_Vendor_LEDControl, Appli_Vendor_DeviceInfo, Appli_Vendor_Test, @@ -479,7 +478,7 @@ void BLEMesh_ModelsCommand(void) pLightLCOccupancyModeParam[0] = Led_Value; pLightLCOnOffParam[0] = Led_Value; - /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functionning */ + /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functioning */ switch (ButtonIndex_Value){ case 0: ButtonIndex_Value=0x1; @@ -1150,4 +1149,3 @@ __weak void Test_Process(void) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.h index f00d2d28d..daa30e380 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/models_if.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,4 @@ MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 ele #endif /* __MODELS_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/pal_nvm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/pal_nvm.c index 12df6a87f..37960317a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/pal_nvm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/pal_nvm.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * -****************************************************************************** -*/ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "types.h" @@ -440,4 +439,3 @@ MOBLE_RESULT PalNvmProcess(void) return MOBLE_RESULT_SUCCESS; } -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/sensor_cfg_usr.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/sensor_cfg_usr.h index 0b0a971e5..91c8a0ad7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/sensor_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/sensor_cfg_usr.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file sensor_cfg_usr.h * @author BLE Mesh Team * @brief sensor server initialization parameters -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __SENSOR_USR_CFG_H @@ -262,7 +261,7 @@ typedef struct } /** -* Combined defined of all sensors intialization parameters +* Combined defined of all sensors initialization parameters */ #define SENSOR_SERVER_INIT_PARAMS \ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/svcctl_conf.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/svcctl_conf.c index 1816cf137..81ff38b74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/svcctl_conf.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/svcctl_conf.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ const uint8_t* SVCCTL_GetBdAddress( void ) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_conf.h index 6df3dc0c7..f9c44a264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -29,5 +28,3 @@ #endif /*__TL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_if.c index 609ca64cf..85aa6e5da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/tl_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,4 +43,3 @@ void shci_register_io_bus(tSHciIO* fops) -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.c index 43a0e548d..349251ecd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.c @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.c * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief User interface file -****************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "cube_hal.h" #include "ble_clock.h" @@ -196,7 +174,7 @@ void InitDevice(void) /** -* @brief ShouldSleepFunc sleep mode fuction +* @brief ShouldSleepFunc sleep mode function * @param void * @retval void */ @@ -361,4 +339,3 @@ uint8_t __io_getcharNonBlocking(uint8_t *data) return 0; }/* end serialReadByte() */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.h index 773b36116..47889703c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/user_if.h @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.h * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief Header file for User interface file -****************************************************************************** -* @attention -* -*

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef _USER_INTERFACE_H_ @@ -58,5 +36,4 @@ typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t #endif /* _USER_INTERFACE_H_ */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/vcp_conf.h index 22b6dc41c..5dc48464c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/app/vcp_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,5 +47,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/STM32_WPAN/target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/readme.txt index 0e514fca3..5715cf220 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MeshLightingProvisioner/readme.txt @@ -8,18 +8,20 @@ * @brief Description of the BLE Mesh Lighting Embedded Provisioner demo example. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Example Description -This is the implementation of the BLE Mesh Lighting profile as specified by the BLE SIG. +This is the implementation of the BLE Mesh Lighting Embedded Provisioner as specified by the BLE SIG, +a Node with the capacity of creating MESH network from unprovisionned Nodes, like Proxy-Relay-Friend Nodes or +Low Power Nodes. @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from @@ -42,7 +44,7 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingProvisioner/Core/Inc/app_entry.h Parameters configuration file of the application - BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_conf.h Configuration file of the HW - BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_flash.h Configuration file of the FLASH driver needed by EE module - - BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_if.h Configuration file of the Hardware Iterface + - BLE/BLE_MeshLightingProvisioner/Core/Inc/hw_if.h Configuration file of the Hardware Interface - BLE/BLE_MeshLightingProvisioner/Core/Inc/lp_timer.h Configuration file of the Low power timer to be used within Mesh Application. - BLE/BLE_MeshLightingProvisioner/Core/Inc/main.h Header for main.c module - BLE/BLE_MeshLightingProvisioner/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file @@ -62,6 +64,8 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingProvisioner/Core/Src/system_stm32wbxx.c stm32wbxx system source file - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/app_ble.c BLE Profile implementation - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/app_ble.h Header of BLE Profile implementation + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_config.c Application interface for Config Server Mesh Model + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_config.h Header of Application interface for Config Server Mesh Model - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_config_client.c Application interface for Config CLient Mesh Model - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_config_client.h Header of Application interface for Config CLient Mesh Model - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_generic.c Application interface for Generic Mesh Models @@ -78,8 +82,10 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_mesh.h Header of BLE Mesh application implementation - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_nvm.c BLE Mesh NVM application implementation - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_nvm.h Header of BLE Mesh NVM application implementation - - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_sensor.c BLE Mesh Sensor Profile implementation - - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Sensor Profile implementation + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_sensor.c BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_sensor.h Header of BLE Mesh Server Sensor Profile implementation + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_sensor_client.c BLE Mesh Client Sensor Profile implementation + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_sensor_client.h Header of BLE Mesh Client Sensor Profile implementation - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_vendor.c BLE Mesh Vendor Profile implementation - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/appli_vendor.h Header of BLE Mesh Vendor Profile implementation - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/ble_conf.h BLE Services configuration @@ -95,8 +101,10 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/PWM_config.h Header of Pulse Width Modulation configuration - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/PWM_handlers.c Pulse Width Modulation handlers - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/PWM_handlers.h Header of Pulse Width Modulation handlers + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/sensor_cfg_usr.c Header for user Mesh Sensor Model configuration - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/svcctl_conf.c Service Controller configuration API - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/tl_conf.h Configuration file of the Transport layer + - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/tl_dbg_conf.h Debug configuration file for stm32wpan transport layer interface. - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/tl_if.c Transport Layer interface - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/user_if.h Header file for User interface file - BLE/BLE_MeshLightingProvisioner/STM32_WPAN/App/user_if.c User interface file @@ -150,9 +158,19 @@ one FN must be in the direct radio range of an LPN to establish Friendship. General default setting defined in mesh_cfg_usr.h: ENABLE_GENERIC_MODEL_SERVER_ONOFF (1) /* GENERIC SERVER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_LEVEL (1) /* GENERIC SERVER LEVEL MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF (1) /* GENERIC SERVER POWER ONOFF MODEL ON FIRST ELEMENT */ + ENABLE_GENERIC_MODEL_SERVER_POWER_ONOFF_SETUP (1) /* GENERIC SERVER POWER ONOFF SETUP MODEL ON FIRST ELEMENT */ + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS (1) /* LIGHT LIGHTNESS SERVER MODEL ON FIRST ELEMENT */ + ENABLE_LIGHT_MODEL_SERVER_LIGHTNESS_SETUP (1) /* LIGHT LIGHTNESS SETUP SERVER MODEL ON FIRST ELEMENT */ + ENABLE_CONFIG_MODEL_CLIENT (1) /* CONFIGURATION CLIENT MODEL ON FIRST ELEMENT */ APPLICATION_NUMBER_OF_ELEMENTS 1 /* NUMBER OF ELEMENT SUPPORTED */ - APPLICATION_SIG_MODELS_MAX_COUNT 20 /* TOTAL NUMBER OF MODELS SUPPORTED */ - APPLICATION_VENDOR_MODELS_MAX_COUNT 2 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + APPLICATION_SIG_MODELS_MAX_COUNT 6 /* TOTAL NUMBER OF MODELS SUPPORTED */ + APPLICATION_VENDOR_MODELS_MAX_COUNT 1 /* TOTAL NIMBER OF VENDOR MODELS SUPPORTED */ + ENABLE_RELAY_FEATURE /* RELAY SUPPORT */ + ENABLE_PROXY_FEATURE /* PROXY SUPPORT FOR GATT CONNECTION */ + ENABLE_FRIEND_FEATURE /* FRIEND SUPPORT FOR FRIENDSHIP WITH LOW POWER NODE */ + DYNAMIC_PROVISIONER /* DYNAMIC PROVISIONER SUPPORT */ ENABLE_PB_ADV /* Provisioning Bearer over advertising channels support */ ENABLE_PB_GATT /* Provisioning Bearer over GATT proxy support */ @@ -268,7 +286,7 @@ In the Provisioner terminal, after self provisioning and self configuration you - provision and configure the un-provisioned device with the command: atep prvn-0 2 0: is the scanned Device ID, 0 for Device-0 with the UUID address F81D4FAE7DEC4B53A154F6FB0726E1C0 2: is the unicast address you want to associates to the provisioned node (1 is used for the provisioner Node) - Many lines are displayed on the terminal, until hte following one: + Many lines are displayed on the terminal, until the following one: 38281 Appli_ConfigClient_ConfigureNode - **Node is configured** By pressing [SW1] button on the Provisioner Node: diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_common.h index 23a9cc8d9..33a4d44ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_common.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_conf.h index 6be161a0a..3c45bc86d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -324,32 +323,53 @@ typedef enum { /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) #define CFG_BLE_MIN_TX_POWER (0) #define CFG_BLE_MAX_TX_POWER (0) + + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -662,7 +682,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -682,4 +702,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_conf.h index bccc06db7..ba1c6fde8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,5 +271,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/main.h index 55097bac8..9f6242f0c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_hal_conf.h index a1c252133..d2b693818 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -350,5 +351,3 @@ void assert_failed(uint8_t* file, uint32_t line); #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_it.h index 4d7078cd3..7e8cf2dcb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_entry.c index ab9b8cb5e..8fee9e183 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -391,4 +390,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/main.c index b2abf19eb..8136427b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -640,5 +640,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_hal_msp.c index 87614ca60..6958534a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_it.c index cb0b6d47e..aebdfa7fd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -290,4 +289,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.c index ad58713b1..b9dadbb26 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble_cl.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1130,5 +1129,3 @@ static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.h index 4bc492475..f81941839 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_cl.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -75,5 +74,3 @@ extern "C" { #endif #endif /*APP_BLE_CL_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.c index 2101401a1..85faa31de 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble_common.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -122,5 +121,3 @@ void SVCCTL_ResumeUserEventFlow( void ) hci_resume_flow(); return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.h index fe8a2e1c1..841ffff43 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_common.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*APP_BLE_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.c index 29fd967a8..0aa9262c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble_hr.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1043,4 +1042,3 @@ static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.h index dba4cde54..74c53d2b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_hr.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void APP_BLE_HR_Key_Button3_Action(void); #endif #endif /*APP_BLE_HR_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.c index 8a1ff3950..b8480cd94 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble_sv.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1260,4 +1259,3 @@ static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.h index 541988d48..2554970c6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/app_ble_sv.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,5 +77,3 @@ void APP_BLE_SV_Key_Button3_Action(void); #endif #endif /*APP_BLE_SV_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_conf.h index 1abc07f89..d9d7e0862 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -89,7 +88,7 @@ /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0 #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_dbg_conf.h index 79e3c4965..0f78a5a4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.c index 59c66fad3..2a47aaa02 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.c index 8dbad464e..010b45a98 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -231,5 +230,3 @@ static void HRSAPP_Measurement(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.h index 9000a7d6d..e8bd3bd51 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/hrs_app.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void HRSAPP_Init( void ); #endif #endif /*__HRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.c index b0af6afab..f5b7e3393 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -125,7 +124,7 @@ typedef struct{ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonStatus; @@ -360,7 +359,7 @@ static SVCCTL_EvtAckStatus_t Event_Handler(void *Event) * 2bytes start handle * 2bytes end handle * 2 or 16 bytes data - * we are intersted only if the UUID is 16 bit. + * we are interested only if the UUID is 16 bit. * So check if the data length is 6 */ #if (UUID_128BIT_FORMAT==1) @@ -758,7 +757,7 @@ void Update_Service() aP2PClientContext[index].P2PServiceEndHandle); break; - case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No decriptor */ + case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No descriptor */ APP_DBG_MSG("* GATT : Discover Descriptor of TX - Write Characteritic\n"); aci_gatt_disc_all_char_desc(aP2PClientContext[index].connHandle, aP2PClientContext[index].P2PWriteToServerCharHdle, @@ -802,5 +801,3 @@ void Update_Service() return; } /* USER CODE END LF */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.h index 07c940f8f..94ef54919 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_client_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.h * @author MCD Application Team * @brief Header for p2p_server_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -82,5 +81,3 @@ void Disable_Notification( void ); #endif #endif /*__P2P_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.c index 66d93c0cf..9c145bbf9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -51,7 +50,7 @@ extern uint8_t NotifyCharData[2]; typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -398,5 +397,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.h index 628edb0f9..34995830c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.c index 210276489..60fe9b9d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file uart_app.c * @author MCD Application Team * @brief UART Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -517,5 +516,3 @@ static uint8_t* hex_decode(const char *in, size_t len,uint8_t *out) return out; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.h index b961f4419..1b19ec840 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/App/uart_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/uart_app.h - * Description : Header for uart_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/uart_app.h + * Description : Header for uart_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,4 +55,3 @@ typedef struct #endif /*__UART_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/readme.txt index e8898631f..a02196714 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_MultiAppAt/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ble_multi_app_at application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex index 803d88266..2d4a39f85 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Binary/BLE_Ota_reference.hex @@ -1,1039 +1,1080 @@ :020000040800F2 -:10000000F0230020FD3E0008053E0008073E0008E2 -:10001000193F00081D3F0008213F000800000000B4 -:10002000000000000000000000000000093E000881 -:100030000B3E0008000000000D3E00080F3E0008C7 -:10004000253F0008293F00082D3F00081F3E0008FB -:10005000313F0008353F0008393F00083D3F0008A8 -:10006000413F0008453F0008493F00084D3F000858 -:10007000513F0008553F0008593F00085D3F000808 -:10008000613F0008653F0008693F00086D3F0008B8 -:10009000713F0008753F0008793F00087D3F000868 -:1000A000813F0008853F0008893F00088D3F000818 -:1000B000913F0008953F0008993F00089D3F0008C8 -:1000C000A13F0008A53F0008A93F0008AD3F000878 -:1000D000133E0008B13F0008B53F0008B93F0008D3 -:1000E000BD3F0008C13F0008C53F0008C93F0008E8 -:1000F000273E0008233E0008CD3F0008D13F0008FE -:10010000D53F0008D93F0008DD3F0008E13F000867 -:10011000E53F0008E93F0008ED3F0008F13F000817 -:10012000F53F0008F93F0008193E0008FD3F0008B0 -:1001300001400008054000080940000838B50400E7 -:1001400009D004F18005686808B900F01EF800F0D5 -:1001500021F8012801D1012032BDA06A08B100F0C8 -:100160002AF800F00AF821F02A01FFE7816000F088 -:100170001BF8BDE8324000F0B6BA2068416821F4AF -:1001800090414160206881687047002129702046B5 -:1001900000F087BB24206860206801684908490096 -:1001A0000160204600F040B92068016841F001017B -:1001B000016020467047204600F032BA816821F085 -:1001C000400181607047206881684A067047206856 -:1001D000016821F0100101607047F8B5044640F64F -:1001E0000F002668F1693268B368084004F15C05C5 -:1001F0000ED1880602D5900602D4D80040F1808046 -:100200006969002900F00E812046BDE8F4400847E6 -:10021000DFF8E405034204BFDFF8E0753A426FD02F -:10022000CF0707D5D70505D5012737622E6B46F0D6 -:1002300001062E638E0708D5DE0706D5276802263D -:100240003E622E6B46F004062E634E0708D5DE078D -:1002500006D5276804263E622E6B46F002062E6302 -:100260000E070AD5960601D4034206D02668082058 -:100270003062286B40F008002863080509D550015A -:1002800007D526684FF400603062286B40F02000EC -:100290002863286B002832D0890607D5900601D440 -:1002A000D80003D5696909B120468847286B2168C1 -:1002B0008A68510602D410F0280F1BD0204600F0A7 -:1002C00080FAFFF780FF10D5FFF778FF286A60B14A -:1002D0000FF22D518163286A00F017FC00280ED020 -:1002E000286A816BBDE8F44008472046BDE8F2402B -:1002F00000F0E0BC204600F0DDFC00202863F1BDEA -:100300002869012853D1CF0651D5D0064FD51020EA -:10031000306222689068410626D5296A08684068DC -:1003200080B20028EBD02B8898427BDA688008687E -:1003300001688B0614D4106820F480701060206867 -:1003400081684908490081602068FFF737FF202055 -:10035000E86200202861FFF73AFF286A00F09FFB5F -:1003600029886888091A1CE028886988411A6888E1 -:1003700000281CBF88B2002854D01368DFF890040E -:1003800023F49073136022689368034093602020E5 -:10039000E8620020286168612068026822F010028B -:1003A00002602046BDE8F44089B200F084BCC80277 -:1003B00009D5580207D54FF4801030622046BDE8B9 -:1003C000F24000F079BC080609D5100601D41802E5 -:1003D00005D5A96931B32046BDE8F4400847480671 -:1003E0000ED550060CD5306820F04000306020213A -:1003F000A9620020A8612046BDE8F24000F0C9BA19 -:10040000080206D5500004D52046BDE8F24000F0B1 -:1004100054BCC80148BF002A04D52046BDE8F240BC -:1004200000F04CBCF1BD0000F8B50446DFF8E40371 -:100430002168DFF8E4C30A68DFF8E0730240A068CF -:1004400002432069024360690243E06902430A6093 -:1004500000254A68E06822F4405202434A60A369DA -:100460006E4A91421CBF206A03438E68DFF8B003D6 -:10047000064033438B600FF2B436CB6A606A1B09C7 -:1004800040EA0313CB626145DFF898034FF4004361 -:1004900039D13F6807F00307032F4DD8DFE807F095 -:1004A000024643494FF0010CE169B1F5004F4FF6A8 -:1004B000F07740F08080BCF1010F09D0BCF1020F51 -:1004C0000AD0BCF1040F71D0BCF1080F71D099E0D3 -:1004D00000F051FC002815D0626A616836F81230CD -:1004E000B0FBF3F04A0802EB4002B2FBF1F080B23D -:1004F000A0F11001B942EAD20740C0F3420007431D -:100500002068C7607FE0914216D13F6817F44067CA -:1005100023D0B7F5806F09D0B7F5006F03D0B7F5DA -:10052000406F06D008E04FF0020C07E04FF0040CDB -:1005300004E04FF0080C01E04FF0100C9142B3D1F1 -:10054000BCF1000F09D0BCF1020F0AD0BCF1040FBE -:1005500015D0BCF1080F15D054E000F004FC0028C1 -:1005600051D0616A36F81120B0FBF2F6626802EBF6 -:1005700042018E4246D31103B14205D242E000F05F -:10058000A8FBECE71846ECE75008002110EB06202A -:1005900051EB1661002300F00BFCA0F54071DFF871 -:1005A000882291422ED22268D0602CE000F091FB8C -:1005B00090E7184690E7BCF1010F09D0BCF1020F9B -:1005C00009D0BCF1040F18D0BCF1080F18D019E005 -:1005D00000F0D1FBB8B1626A36F812306168B0FB46 -:1005E000F3F000EB5100B0FBF1F080B2A0F110018C -:1005F000B94207D22168C86005E000F06AFBE9E76C -:100600001846E8E7012504F16800012141800180D6 -:1006100000218160C1602846F2BD000000800040DA -:1006200090F82810CA0706D502685368C16A23F4F7 -:1006300000330B43536090F828108A0706D50268F0 -:100640005368016B23F480330B43536090F82810F8 -:100650004A0706D502685368416B23F480230B4395 -:10066000536090F828100A0706D502685368816B1A -:1006700023F400430B43536090F82810CA0606D5B4 -:1006800002689368C16B23F480530B43936090F826 -:1006900028108A0606D502689368016C23F400537B -:1006A0000B43936090F828104A0610D502685368EF -:1006B000416C23F480130B435360416CB1F5801FF0 -:1006C00005D15368816C23F4C0030B43536090F849 -:1006D00028100A0606D501684A68C06C22F4002278 -:1006E00002434A607047F8B5044604F180050020D3 -:1006F000E8606FF07E4700F073FC064620680168F2 -:100700000A0708D50097334600224FF4001120460F -:1007100000F017F860B9206801684A070AD5009709 -:10072000334600224FF48001204600F00AF808B159 -:100730000320F2BD20206860A8600020E0662870D9 -:10074000F2BD2DE9F041069C05460E4690461F4637 -:100750002868C1693140B1420CBF012000204045EA -:100760001CD114F1010FF3D000F03AFCC01B8442FD -:1007700000D314B900F015F80CE0286801684A07A6 -:10078000E6D5C1690A05E3D54FF40062026200F0C4 -:1007900008F8C16000210170032000E00020BDE8DE -:1007A000F0812868016821F4D071016028688168AF -:1007B00049084900816005F1800020214160816085 -:1007C000704701680A6822F490720A60DFF84010EE -:1007D000026893680B409360C16E012904D10168DF -:1007E0000A6822F010020A602021C0F88810002157 -:1007F000C16601677047000001000010200100047D -:10080000806A00F1560100220A810A8000F052BA83 -:10081000FEFFFFEFF369FFCF00380140880000586A -:10082000FFF4FF110024F40000FD0F00010002009E -:100830000400060008000A000C0010002000400020 -:1008400080000001584900E0584981B00A6802431D -:100850000A60096808400090009801B0704798B994 -:100860005348544901604FF4E131416000218160F7 -:10087000C160016181610C2141614FF40041C1619E -:1008800000218162FFF75ABC7047002804BF484826 -:10089000FFF7A3BC704718B94548806F00F06BB9EB -:1008A000704738B586B004466846142100F09EFBB8 -:1008B0002168404A91425FD10220FFF7C5FF4020E6 -:1008C00000F05CF83D4D284600F094FB0220FFF755 -:1008D000BBFF802000F052F8284600F08BFB01207F -:1008E000FFF7B2FF4FF400600221009001910291E6 -:1008F000072003210391049069464FF0904000F0D7 -:1009000079FB2F482F4D816A8908890041F0010148 -:1009100081620022016841F4804101600F2100687A -:1009200000F4804005900598242000F051FC24201C -:1009300000F06CFC0220FFF785FF0420FFF782FF28 -:10094000214828600F2068601020A8600020E8601F -:100950008020286100206861A861E861286228463B -:1009600000F034F8A567AC6200220F213A2000F0B5 -:100970002FFC3A2000F04AFC07B030BD0090022165 -:100980000020019102900321072003910490694601 -:10099000704700680749884204D107490868002861 -:1009A00018BF004770470000480000584C0000582E -:1009B000B810002000380140E8130020000400486F -:1009C00060000058581200204404024038B504006A -:1009D00001D1012032BD2168DFF8B002814204F16B -:1009E000240500F044F8022068700A68A0686FF3DC -:1009F0000E120243E0680243206902436069024329 -:100A0000A0690243E0690243206A02430A6020466B -:100A100000F011F9A068B0F5804F04BF00216160BB -:100A20002079696A00F03F0000F014F838B1052819 -:100A300005D2204600F019F900F012F803E000207A -:100A400028636863A8630020A86101206870002003 -:100A5000287032BD0860A96AE86A4860606870471B -:100A6000296B00200860696BA86B486070470AD248 -:100A7000DFF81C0242181423B2FBF3F292002A6240 -:100A8000DFF8100209E0DFF8100242181423B2FB6D -:100A9000F3F292002A62DFF80402E861704781B045 -:100AA00040B100F124014A78022A05D0042088616F -:100AB00000200870012026E00268136823F00E036E -:100AC00013604A6A136823F4807313600068026835 -:100AD000520852000260012091F82020CB6902F0F8 -:100AE0001C02904058608A6AC86A5060086B30B136 -:100AF000026822F4807202604A6B886B50600120A9 -:100B000048700020087001B0704738B500F1240229 -:100B100000245178022903D004209061012428E0A8 -:100B200001680B6823F00E030B6001680D686D0807 -:100B30006D000D60516A0B6823F480730B60012116 -:100B400092F82030D56903F01C0399406960936ADC -:100B5000D16A5960116B31B10B6823F480730B605B -:100B6000536B916B5960012151701470516901B13F -:100B70008847204632BDF8B500F124010423CA6934 -:100B800014680268156891F8206006F01C0603FAE4 -:100B900006F73C4210D06F070ED51468A50603D4A3 -:100BA000156825F00405156000F03DF8C9680029B6 -:100BB00038D0BDE8F4400847022303FA06F73C4268 -:100BC00013D0AF0711D51468A50605D4156825F014 -:100BD0000A05156001224A7000F025F800220A700B -:100BE0008968F9B1BDE8F4400847082303FA06F61E -:100BF000344217D02B0715D5136823F00E0313606A -:100C0000012291F82030CC6903F01C039A40626005 -:100C100001228A614A7000220A70096911B1BDE897 -:100C2000F4400847F1BD91F82020CC6902F01C0285 -:100C3000934063607047416C0268144B89089A4284 -:100C400034BF174B174B03EB8101816402F0FF02A5 -:100C5000083A1421B2FBF1F1134AC26401F01F01FA -:100C6000012202FA01F10165704701790F4A01F092 -:100C70003F0102EB81024265491E0D4A826501F087 -:100C8000030101228A40C265704700000804024047 -:100C9000F8FFFDBF00000240F8FBFDBF000402406A -:100CA000000802401C08024080080240FC08024084 -:100CB0004009024070477047704770477047000016 -:100CC0004FF0B040006800F0F000B02888BFB020BE -:100CD000704738B54FF0B044304DA16811F00C01A9 -:100CE00006D1FFF7EDFFC0F3031055F8200032BD29 -:100CF00004292B4A05D008292A4804D12168C902B1 -:100D000022D5104632BDE16801F00301022904D06A -:100D1000032904D12168C90207D5104605E0FFF771 -:100D2000CFFFC0F3031055F82000E168E268E368E4 -:100D3000C1F306214843C2F30211491C5B0FB0FB0B -:100D4000F1F05B1CB0FBF3F032BD80B5FFF7C1FFE3 -:100D50001149FFE7144A0968C1F3031152F8211041 -:100D6000B0FBF1F002BD80B5FFF7EFFF00F010F827 -:100D7000C1F3022106E080B5FFF7E7FF00F008F8B5 -:100D8000C1F3C22112F8211001F01F01C84002BDB9 -:100D90000149064A0968704708000058243D0008C8 -:100DA0000024F4000048E801E43C0008983E0008F4 -:100DB000B3BBD9B1B2F5803F7DD2022A1ED98C4691 -:100DC000B1FBF2F102FB11C31B0443EA1043B3FB76 -:100DD000F2FC02FB1C3380B240EA0343B3FBF2F0A7 -:100DE00002FB103240EA0C4000237047022A05D96A -:100DF0008446B0FBF2F002FB10C270474AB105D145 -:100E000000F0010249085FEA300070470022002329 -:100E1000704700F051BA0B0002000021002070471B -:100E2000904271EB030CF6D3B3F5803F2FD2F0B5AF -:100E3000B3FA83F7B1FA81F4A7F10F0E3D1B5340CB -:100E4000CEF1200602FA0EF2F3415340B5F10F073E -:100E500046D80F3C2C444140C4F12006A040F1414B -:100E60004140B1FBF3F603FB1611A2FB0645001B44 -:100E7000A94102D2761E8018594180EA010221FA66 -:100E80000EF362FA0EF200215A403046F0BD30B443 -:100E9000B1FBF3FC03FB1C11A2FB0C45001BA94199 -:100EA00003D2ACF1010C8018594130BC02460B460C -:100EB000604600217047B2F1807F65D3F0B5B2FA89 -:100EC00082F7B1FA81F4C7F10F063D1B22FA06F34F -:100ED00007F1110EF24120355A40B5F10F07B8D98C -:100EE0004140C4F12006A040F1414140B1FBF3FC78 -:100EF00003FB1C11A2FB0C45001BA94103D2BCF152 -:100F0000010C801859410F2F12D30F3FC90341EA3A -:100F10005041B1FBF3F603FB1611A2FB0645D4EBDF -:100F2000C030A94102D2761E8018594146EACC3C15 -:100F300007B34140C7F12006B840F1414140B1FB41 -:100F4000F3F603FB1611A2FB0645001BA94102D2D2 -:100F5000761E8018594180EA010221FA0EF3C7F18A -:100F6000200462FA0EF20CFA07F05A402CFA04F14F -:100F70003043F0BD80EA010221FA0EF3002162FA4B -:100F80000EF260465A40F0BD8C46B1FBF2F102FB16 -:100F900011C31B0243EA1063B3FBF2FC02FB1C33D8 -:100FA0001B024CEA002043EA1063B3FBF2FC02FB95 -:100FB0001C331B024CEA002043EA1063B3FBF2FC33 -:100FC00002FB1C331B024CEA002043EA1063B3FB14 -:100FD000F2FC02FB1C324CEA0020002370470000A8 -:100FE00001484068704700BF60100020002200F0F8 -:100FF00065B900002DE9F84F4FF000095F4A604BDA -:101000004FF00F0805460E4633E05E4FBD4214BF59 -:10101000072704278F4027434CF82E70C1431C68D4 -:1010200001EA040C7468E40348BF40EA0C0CC3F8FE -:1010300000C05C6801EA040C7468A40348BF40EA7D -:101040000C0CC3F804C0146801EA040C7468E402D0 -:1010500048BF40EA0C0CC2F800C0546801EA040C16 -:101060007168890248BF40EA0C0CC2F804C009F15B -:101070000109316831FA09F077D0012404FA09F442 -:1010800014EA0100F3D04FEA490C032101FA0CF1F4 -:101090006FEA010E7168012918BF022903D01129D6 -:1010A00018BF122911D1A968F7680EEA010107FAE1 -:1010B0000CF73943A960696821EA04047168C1F337 -:1010C000001101FA09F10C436C60E968B4680EEA9A -:1010D000010104FA0CF42143E9604FEA89017468C4 -:1010E000022C18BF122C12D14FEAD90405EB84044C -:1010F00001F01C07D4F820A008FA07FB2AEA0B0A23 -:10110000D6F810B00BFA07F747EA0A0727622C68EF -:101110000EEA0407347904F0030404FA0CF43C43A7 -:101120002C607468E400A2D5DFF85CC04FEA990E29 -:101130005CF82E7001F00C0108FA01F427EA0404AF -:10114000B5F1904F08BF00270ED0104FBD4208BF29 -:10115000012709D00E4FBD4208BF022704D00D4F12 -:10116000BD427FF452AF032754E7BDE8F18F81B051 -:10117000002A14BF8161816201B0704700080058E5 -:101180008008005800100048080001400004004892 -:1011900000080048000C00480901020081B002D498 -:1011A0003C48815405E03C4802F00F02104400F82E -:1011B000041C01B07047394A13684FF6FF01000262 -:1011C0000B4000F4E0601843354908431060704755 -:1011D00038B5324B1C68C4F30223C3F10704052C55 -:1011E00028BF04241D1D072D34BF0023DB1E01254D -:1011F00005FA04F4641E2140994005FA03F35B1ECE -:101200001A401143BDE83440C6E70000010007D48E -:10121000012200F01F01234B8A40400943F820209F -:10122000704701000BD4012200F01F011E4B8A40C1 -:10123000400943F82020BFF34F8FBFF36F8F7047F3 -:1012400010B5401EB0F1807F01D3012010BD174CB6 -:1012500060600F214FF0FF30FFF79EFF0022A26079 -:1012600007202060002010BD010007D4012200F0FB -:101270001F010F4B8A40400943F8202070470100AE -:1012800007D4012200F01F010A4B8A40400943F8AD -:101290002020704700E400E018ED00E00CED00E0D5 -:1012A0000000FA0500E100E080E100E010E000E06D -:1012B00000E200E080E200E07047000000B500BFFF -:1012C000130096469446103928BFA0E80C50FAD86F -:1012D0005FEA417C28BF0CC048BF40F8042BC90717 -:1012E00028BF20F8022B48BF00F8012B00BD0000EA -:1012F000DFF8F0140A6892B200E00246086880B293 -:101300008242FAD170472DE9FC4104461825DFF8E6 -:10131000D884DFF8D864684308EB000730780628E3 -:1013200008D131787170347078754FF0FF3070608B -:10133000002039E000F077F8B9680918B96008F1C1 -:101340000803B96832786A439A589142327813D3C5 -:1013500008F1150315FB02FC13F80C30062B25D001 -:1013600008F108066B43F358994222BF08F11503B0 -:101370006A439A5CEED219E01146337869439A4287 -:101380000BD008F1140308F1150C5B5C15FB03F599 -:101390000CF805407A753B7500E07A7508F1140287 -:1013A0005454317871703470BDE8F6811146694348 -:1013B00008F115035B5C062B04D008F1140615FB3D -:1013C00003F574557B753A7508F115025454EBE733 -:1013D000F8B5DFF81834DFF810541E7818240246E8 -:1013E0006243B0422A4404D118785870507D187076 -:1013F0000FE0167D507D92F815C005F11507664384 -:10140000062807F806C004D0167D143514FB00F436 -:101410002E55012010731878062802BF00294FF0BE -:10142000FF315960F1BD10B5DFF8C043606810F1BD -:10143000010F0FD0FFF75CFF6168DFF8B423814232 -:1014400061683CBF5388C918081A5178484311781D -:10145000C84000E0002080B210BD2DE9F84FDFF851 -:101460009053DFF890B3D5F80880D8F80000DBF887 -:1014700000104A0500F06AF9DFF87063DFF868A32E -:1014800021F4806181604FF0180934780AF1080076 -:1014900019FB04F14758FFF7C6FF874217D2002710 -:1014A0000121B170062C3DD019FB04F40AF10801AA -:1014B0000AF108020959814223BF0AF108010959BA -:1014C000091A002111510AEB04014C7DEAE7A988B1 -:1014D0004118B94202D2AF880021E2E73F1ADFE7A4 -:1014E000022802DA2878012800D07F1ED8F80000F0 -:1014F000C1684A07FAD500F02FF9DBF80C00000CA0 -:10150000BFB247EA0047CBF80C70FFF7F1FE7060FE -:10151000A8680068816841F480618160AFF3008051 -:10152000BDE8F18FB8B20028DAD1FFF7E1FE7060B4 -:101530000320BDE8F24FFFF797BE2DE9F843EFF324 -:10154000108872B6AA4DA84BA8680168CA224A62E0 -:1015500053204862A54A886820F48060886018207B -:101560001678374647431F44387B022826D13C680B -:10157000D7F810909078F0B17A7B012A0AD1012136 -:101580003046FFF725FF88F310887968304600F071 -:10159000F0F804E088F31088304600F09BF8A86863 -:1015A0000068CA21416222465321416248463146C1 -:1015B00000F02AF90BE0FFF750FF06E0C868420789 -:1015C000FCD500F07EF88C49086088F31088FF2174 -:1015D000A86802685162BDE8F183F8B5844CA16047 -:1015E000CA2209684A6253224A62824A136843F057 -:1015F00020031360136803F00703C3F1040323708F -:1016000095682D0C05F07F056D1C6570EDB2926834 -:10161000C2F30E02521C628092B2521E6A43A2F5BD -:10162000A072DA404FF6FF739A422CBFA380A280CB -:10163000724A136843F400231360714B1D6845F42C -:1016400000251D6048BB6948674E0123837018253B -:101650004FF0FF33436000235FFA83FC06F10C0771 -:1016600015FB0CFC4FF0000E07F80CE05B1CDFB222 -:10167000062FF1DB06230370886820F48060886001 -:1016800000F01FF8D0600320FFF7F9FDA16808689B -:10169000826842F48042826005E0C868410544BF28 -:1016A0000320FFF7E1FDA1680A68FF2050620022D5 -:1016B00003210320FFF78CFDBDE8F2400320FFF774 -:1016C000A5BDC86800F0800060F49060C8604FF469 -:1016D00000207047F8B50746EFF3108472B6032078 -:1016E000FFF79FFD424DAE683068CA2141623A461D -:1016F00053214162182043494243895C02291BD18E -:1017000000213846FFF764FE3848017806290ED1DB -:10171000306838490A68530500F018F821F48061F0 -:101720008160C1684A07FCD500F016F804E04078F3 -:10173000884218BFFFF791FEA9680A68FF2050622F -:101740000320FFF763FD84F31088F1BD02D5C16863 -:101750004A07FCD481687047C16801F0800161F4D8 -:101760009061C1604FF40020234908600320FFF717 -:1017700086BD2DE9F04180460F46424618201A49A1 -:1017800042438C18207B022804BF4046FFF7A2FF8B -:10179000EFF3108572B60320FFF743FD144EB068D7 -:1017A0000068CA2141625321416202202073A76070 -:1017B00067604046FFF7A7FD0C490A7849789142D7 -:1017C00002D0FFF74AFE02E0A168081AA060FF20DD -:1017D000B1680A6850620320FFF718FD85F310888E -:1017E000BDE8F0812828004048110020DC130020CB -:1017F0004C130020082800400C080058000800582E -:1018000080080058541100201047000018B595B00A -:1018100009A80FF2C421894C302200F085F90FF29B -:101820006D200190009469460FF2492000F0C0F944 -:101830000121022000F0A5FA814A0021012000F0D8 -:101840001CFB09A800F0BFFB08B1C046C046002041 -:10185000ADF81A0000F0CCFB00F0D3F802460621E8 -:10186000002000F0E9FB4EF66E50089007AA75497B -:101870000868079006212E2000F0DEFB0FF23022D0 -:101880001021182000F0D8FB0FF23422102108207C -:1018900000F0D2FB1821012000F0F5FB00F01EFC47 -:1018A0000DF1160006A90190009105AB0722002159 -:1018B000012000F0D3FD0FF2E810BDF818100090E1 -:1018C0000723BDF81400002200F0C8FC0DF11A0037 -:1018D00000900223BDF81610BDF81400002200F09D -:1018E000BDFC002000F06EFD00200490102356493E -:1018F000039108200022019300900292002301210D -:10190000012000F078FD00F03DFE50484FF400410A -:1019100001600221006F019100F0FF004FF00051C3 -:101920004A780292062A0ED200200870BFF34F8F29 -:10193000474948480A6802F4E06202430A60BFF37C -:101940004F8F00BFFDE789780391891888423CBF1B -:10195000801A039000F0ABFE694601A800F002FF78 -:1019600000F0B3FE00F04DF83B4942790A7202796B -:101970004A72C2788A728278CA7242780A7302788E -:10198000521C4A73062142798DF8052002798DF8A0 -:101990000420C2788DF8032082788DF802204278E6 -:1019A0008DF801206A460078401C8DF80000002068 -:1019B00000F042FB00F00AF816B010BD80B5407888 -:1019C000052808BF00F002F8012002BD00B587B06D -:1019D00000200690059000220FF2F40004920821E6 -:1019E00000230290019100920393A0228021002005 -:1019F00000F09FFC07B05DF804EB17490E2000F0E3 -:101A00005DBD80B50F490A6812F1010F0DD0134872 -:101A10004B6802701B0A120A427049688170C370D9 -:101A2000190A01711B0C437102BD002000F014FF64 -:101A300008B90FF2740002BD00000000A0080320E6 -:101A4000EF1B00088075FF1F07B20100104000580F -:101A50000CED00E00400FA0504000020B41300209F -:101A60000021012000F016BA012000F039BA01204F -:101A700000F03EBA10B50446616801F1080000F0BC -:101A800091FD00B10120207010BD000010B10128AF -:101A900003D07047012000F011BA00F017BA00001F -:101AA000424C45636F7265006C7AD8AC5772000087 -:101AB000123456789ABCDEF0123456789ABCDEF0B6 -:101AC000FEDCBA0987654321FEDCBA09876543213C -:101AD0000953544D5F4F54410000000000000000C6 -:101AE00000000000000000000000000044000800AA -:101AF0004005020112279C00F4010000FFFF0000D6 -:101B0000480101000020000062B38B0708D0521E7C -:101B100011F8013B00F8013B00F024808B07F6D15F -:101B2000830740F0208000BF103A07D330B4B1E8FB -:101B30003810103AA0E83810F9D230BC530724BF4F -:101B4000B1E80810A0E8081044BF51F8043B40F881 -:101B5000043BD20724BF31F8022B20F8022B44BFEC -:101B60000B7803707047121F17D35B0009D151F82F -:101B7000043B20F8023B1B0C121F20F8023BF6D25C -:101B80000BE051F8043B00F8013B1B0A20F8023B34 -:101B90001B0C121F00F8013BF3D238BF121D521E5E -:101BA00024BF11F8013B00F8013BF8D87047000052 -:101BB0007FB50C466D4D61686D4EE861296228461F -:101BC00000F05CFE246805F1240000604060746051 -:101BD00006F108000060406001203070296829B1DA -:101BE0000FF2551000900294684688477FBD1FB5DC -:101BF0005F4C04F1080000F04EFE00BB2178F1B10B -:101C0000694604F1080000F06FFE5848C16949B107 -:101C10000098029001228DF8042001A888479DF8C1 -:101C2000040000E001202070207818B1009800F036 -:101C300010FF04E0009904F1080000F035FE04F103 -:101C4000080000F028FE28B9207818B104F1080037 -:101C5000FFF706FF1FBD2DE9F8430646002000F000 -:101C60005FF874883088B268DFF80081C4F3090433 -:101C700044EA8024F068A4B2C1B2204600F03CF8E7 -:101C8000002748F2E8094846FFF7F1FE08E06888B7 -:101C9000A04202D1316928780870687800B1012724 -:101CA00008F1240000F0F7FDF0B9694608F12400BE -:101CB00000F01AFE009800F10B05407A0F28E6D0DC -:101CC000B5F80110A1420DD10098817AC81E716942 -:101CD000C0B28842C8BF0846706102463069E91C3C -:101CE000FFF712FF2878D9E73800CCD0012000F0A8 -:101CF00017F80020BDE8F28310B513461C4A54685B -:101D0000A4F80900E1720A46194604F10C00FFF735 -:101D1000FBFE164A1369BDE8104000210020184759 -:101D20001249096A82B008B921B101E011B101205C -:101D300002B0084702B0704710B50146487A0F2834 -:101D400018BF0E2807D10B4800F0B8FDBDE81040C1 -:101D50000020FFF789BE064C04F1080000F0AEFD3C -:101D600004F10800BDE81040FFF77ABEB812002069 -:101D700088130020DC1200200C4800210160416023 -:101D8000704710B500F00CF85C6819B1012904D156 -:101D9000204301E024EA0000586082F3108810BD5F -:101DA000EFF3108272B6014B70470000BC130020A5 -:101DB0002DE9FC475B4CDFF87091A5692840A061D4 -:101DC0004FF0FF3A4FF0010830E0491C54F8310061 -:101DD0000642FAD004EBC106184071681040014277 -:101DE00008BFC6F804A07768384000F09FF860622A -:101DF00008FA00F087437760EFF3108172B6626AE9 -:101E0000206908FA02F2D24310402061022004EB5C -:101E1000C00353F8086C1640401E43F8086CF6D116 -:101E200081F31088606A59F8201088476369206937 -:101E3000A2691840104207D0E069216A084203D124 -:101E4000002103EA0206C1E7C4F824A0C046C04648 -:101E5000EFF3108972B6216960690140A0690142FF -:101E600001BFE169206A014200F0F8FE89F31088A1 -:101E7000C046C046A561BDE8F38738B51446EFF308 -:101E8000108572B600F052F8274941F8204085F3DA -:101E9000108831BD10B500F00BF804431C6153F8F5 -:101EA0003140204343F83100FFE782F3108810BD32 -:101EB000EFF3108272B61B4B1C697047EFF3108171 -:101EC00072B6184A536923EA000005E0EFF3108167 -:101ED00072B6144A53691843506181F310887047F1 -:101EE000EFF3108172B60F4AD3691843D061F4E75B -:101EF000F8B50C4C656A276A2E4615F1010F0EBF26 -:101F00000025012101FA05F5206202E0284600F0D3 -:101F1000A6FE216AE0690842F8D088436662E06163 -:101F20002762F1BD38100020D811002002460020A1 -:101F3000110C090404BF1020120412F07F4F04BFDB -:101F4000083012020FF2180112F0704F04BF001D8A -:101F50001201120FC0F11F00895C401AC0B2704715 -:101F60000403020201010101000000000000000062 -:101F70001FB500F038F84FF6524000F0D4FE14B10F -:101F80009DF80F0020700EE01FB5002408B10090EE -:101F9000042409B10191241D6B466A46E1B24FF653 -:101FA000544000F0C0FE9DF80E0004B010BD00F0DB -:101FB000BAFE9DF80E0005B000BDF8B500F014F8AB -:101FC0004FF65A40F3E7F8B500F10C026B462421B6 -:101FD0004FF66640EBE7F8B500F10C026B460F21B7 -:101FE0004FF66840E3E704466B4600220021704745 -:101FF00000B587B000F010F8012003220690ADF87C -:102000000420ADF8062000F011F800284CBFFF2096 -:102010009DF8000007B000BD00208DF800001822D8 -:10202000002101A800F0D4BE03900691CDF814D091 -:10203000002101A8FFF70FBE18B50C46C7B0114626 -:1020400000228DF800208DF81C008DF81D402246DE -:102050000DF11E0000F0B6FE00F02AF83F200C2122 -:10206000ADF80400ADF8061007A801210390069111 -:10207000A41C049400F02CF800284CBFFF209DF80D -:10208000000048B010BD00B5C7B000F00AF80F203E -:1020900000F013F800284CBFFF209DF8000047B067 -:1020A00000BD00228DF800208DF81C008DF81D1059 -:1020B0001822002101A800F08BBEADF8060007A988 -:1020C000022004903F22012003910690ADF80420E5 -:1020D000CDF814D0002101A8FFF7BDBD00B587B031 -:1020E00000208DF8000000F0E0F840F20110ADF89B -:1020F00006003F220120069000F013F900284CBF93 -:10210000FF209DF8000007B000BD2DE9F84107460B -:102110000128C7B0884615461E4608BF022003D0D6 -:1021200002280CBF102000200DF11D010C1800F03A -:1021300036F8012F8DF81C7002D0022F18D019E04C -:1021400002273A4641460DF11D0000F03BFE257086 -:10215000667000F0AAF83F204FF4817100F016F885 -:10216000FF1C049700F0DFF8002805D5FF2009E0E8 -:102170001027E6E7472005E09DF8000010B94E98CB -:1021800000F067F8FFE748B0BDE8F081ADF8040063 -:10219000ADF8061007A803210390069170470322AB -:1021A0000021684600F014BE2DE9F64F0C460546A6 -:1021B000012CC7B09B4608BF022003D0022C0CBFE5 -:1021C000102000200DF11F010E18FFF7E8FF012C71 -:1021D000ADF81C508DF81E4002D0022C2CD02DE002 -:1021E0000227569C559DDDF85091DDF84CA1DDF895 -:1021F000488148993A4600F054F8A6F800B086F8AD -:10220000028086F803A086F804907571B47100F01E -:102210004CF83F20ADF804004FF4827107A8ADF8E8 -:102220000610039003210A370497069100F07BF80B -:10223000002805D5FF2009E01027D2E7472005E058 -:102240009DF8000010B9579800F003F849B0BDE8B8 -:10225000F08FBDF8011001800020704730B5C7B085 -:102260001C464A9B00F049F800258DF800508DF877 -:102270002140224619460DF1220000F0A3FD00F096 -:1022800014F83F204FF4837100F042F8A41D049429 -:1022900000F049F800284CBFFF209DF8000047B02F -:1022A00030BD0DF11F0000F08DBD1822002101A8E6 -:1022B00000F08EBD78B5C7B04C9C4D9D00F01DF868 -:1022C00000268DF821308DF800608DF822402246DE -:1022D000294600F019F8FFF7E8FF3F204FF493710B -:1022E00000F016F8E41D049400F01DF800284CBF1F -:1022F000FF209DF8000048B070BDADF81C00ADF89F -:102300001E108DF8202070470DF1230000F05ABDFB -:10231000ADF80400ADF8061007A80121039006915E -:102320007047ADF80420CDF814D0002101A8FFF7C4 -:1023300092BC2DE9F84DC7B09446DDF840E1519AC2 -:10234000559D569EDDF84CA1ADF81D108DF81C0072 -:102350004FF0000BADF81FC08DF821308DF822E052 -:1023600000F024F800F017F824F8095F668000F008 -:10237000CCF83F20832100F0ECF8574406910D374C -:10238000049700F0CEF800284CBFFF209DF8000015 -:1023900048B0BDE8F08D88F800A007AC5499E41966 -:1023A000524608F10100544400F00CBD8DF8232082 -:1023B000174652998DF800B00DF1240809A8B844C9 -:1023C00000F000BD00B5C7B000F00CF8852000F0AB -:1023D00090F800F0A3F800284CBFFF209DF8000003 -:1023E00047B000BD00218DF81C008DF800101822A8 -:1023F00001A800F0EDBC2DE9F841C7B04FF000088E -:1024000000F026F80DF12300DDF844E14E9F4F9EC9 -:10241000509D529C8DF81F30C0F800E08DF8008070 -:102420008DF820708DF821608DF822508DF82740AE -:1024300000F06BF88620ADF8060007A90C2000F02C -:1024400069F800284CBFFF209DF8000000F08DB80F -:102450008DF81C0007A8417082707047F8B5C8B0AD -:1024600005460E4617461C4600F023F808A846709D -:1024700087708DF8205000F067F88A21ADF80A10B7 -:102480003F20032100F053F8002848BFFF200ED45E -:102490009DF8000058B94F994E98BDF80120228050 -:1024A000BDF803200280BDF805000880002049B077 -:1024B000F0BD07220021684600F08ABC18B5C7B0FD -:1024C000044600F01EF88DF81C40224600F049F842 -:1024D00000F01BF83F208E2100F04AF8641C0494A1 -:1024E00000F01FF800284CBFFF209DF8000048B006 -:1024F00010BDADF8060007A901203F22039104900A -:10250000704700208DF8000070471822002101A8B4 -:1025100000F05EBC04903F22012003910690ADF8CC -:102520000420CDF814D0002101A8FFF794BBADF82A -:102530000800059108A8072104900791CDF818D04C -:10254000002102A8FFF787BB1822002102A800F093 -:102550003FBCADF80400ADF8061007A801210390B8 -:1025600070470DF11D0000F02DBC48B0BDE8F081B2 -:10257000ADF80400ADF8061007A8012103900691FC -:10258000704700001C490020087700221B48027099 -:1025900000F036B818490A7F41F82200087F401C35 -:1025A0000877704770B504466078FF2802BFB4F81A -:1025B000031001F47F41B1F5406F12D100260E4D9A -:1025C00000E0761C297FF0B288420AD2F1B255F8B9 -:1025D0002110204688470100F3D002D0022805D000 -:1025E00006E02046BDE87040FFF7E8B9002070BD66 -:1025F000012070BD000000002C130020EC1300200F -:1026000080B5C046C046C046C046C046C046C0466B -:10261000C046C046C046C046C046C046C046C0468A -:10262000C046C046C046C046C046C046C046C0467A -:10263000C046C046C04600F027FCC046C046C04663 -:10264000C046BDE8014000F097BC0000DFF800F094 -:10265000891000202DE9F0413C4F064638780128CA -:10266000884614461D4608BF02201BD00121397040 -:102670000020786000F018F8010011D1012E2246E8 -:102680002B46404602D100F054F802E01146FFF715 -:10269000DDFF00F009F82E490A6822EA06060E60FE -:1026A00000213970BDE8F0814FF47A7018E02A49B2 -:1026B000CA680020002A07D5284B294A0B600A6007 -:1026C000C968002948BF0120704721490A6842F0C3 -:1026D00000420A6000200968002958BF01207047A5 -:1026E00070B50546FEF77CFC06461A4C2068C1030F -:1026F00011D5FEF775FC801BA842F7D3032070BDEF -:10270000124920604860012070BDFEF769FC801B03 -:10271000A84209D3F2E72068C10744BF0121216024 -:102720004CF2FA310840EBD120684103EDD400208F -:1027300070BD10B506490C6844F001040C6040F807 -:10274000042BBFF36F8F036010BD000070130020D7 -:1027500014400058104000580840005823016745B5 -:10276000AB89EFCD2DE9F04100F053F8884608BF62 -:1027700002204CD000F052F800F055F8010044D18E -:102780002968DFF8C470022919D14FF0FF32C8F868 -:1027900000206E6800E0761C6968AA6851188E42B5 -:1027A00008D2304600F043F800F03DF80100F2D0C6 -:1027B000C8F800607A69DFF894100A407A613968D5 -:1027C0008A050FD53A6822F400723A60396841F4FC -:1027D000006139603A6822F400623A60396841F475 -:1027E000007139603A6851050FD5396821F480616C -:1027F00039603A6842F480523A60396821F4805175 -:1028000039603A6842F480623A6000212170BDE884 -:10281000F081104C054620780128704700200121E6 -:102820006060217070474FF47A70FFF759BF084914 -:102830000A6822F4FF6242EAC00242F4803242F0A7 -:1028400002020A60704700000040005805F8FFFFD0 -:10285000144000587013002001460648064AC37908 -:102860008B4218BF904218BF0838F8D18B4218BF6E -:1028700000207047F873FF1F0070FF1F02490160BE -:1028800002490161704700BF4F29000875290008FF -:10289000006040607047EFF3108172B602688242B8 -:1028A0000CBF012000201CE0EFF3108272B6036819 -:1028B0000B60486001600868416023E0EFF310821C -:1028C00072B6086043684B6041604868016019E077 -:1028D000EFF3108172B642680368136002684368C0 -:1028E000536081F31088704710B5EFF3108472B60F -:1028F00002680A600068FFE7FFF7EAFF84F31088C8 -:1029000010BD0B6082F310887047000000F0AABB76 -:102910006C486D49016001F12002426001F1300212 -:10292000826001F13C02026201F14402426201F163 -:102930004C02C26001F15402026101F17002426175 -:1029400001F1740282618031C16100F0A9BB38B528 -:1029500004465E4D2846FFF79BFF5A484068A16831 -:102960000160E168C16085605949416000F0B4FBD5 -:1029700058482AE080B5534842681368012119720B -:10298000406800F0AFFB002002BD38B5514C4F4D00 -:1029900004E000F041F80098216888472846FFF7D6 -:1029A0007AFF0028F5D031BD4A484168084738B55C -:1029B0000446494D2846006040604248C068A1680E -:1029C0000160456000F093FB444821680160616844 -:1029D0004160002032BD80B53A48C26813681021BA -:1029E0001972C06800F089FB002002BD35483B4ADF -:1029F000C168C16813680868184738B5374C364D48 -:102A000004E000F009F80098616888472846FFF75D -:102A100042FF0028F5D031BD69462846FFF764BF64 -:102A200038B504462E4D2846FFF732FF2D4800608A -:102A3000406024480069A1688160E168C160056167 -:102A4000216801606168416021694161616981615A -:102A500031BD80B501462348FFF730FFBDE8024095 -:102A60000FF2050000F059BB38B5164C1D4D06E0BD -:102A7000FFF7D2FF009920690069FFF71FFF284682 -:102A8000FFF709FF0028F3D031BD10B5164C2046E2 -:102A9000006040600B4841690C60BDE8104000F0E8 -:102AA00050BB1CB5104C06E069462046FFF71CFFE2 -:102AB0000098C046C0462046FFF7EDFE0028F3D040 -:102AC00013BD000000000320AC090320480A0320C6 -:102AD00090080320CC130020500A0320D4130020B8 -:102AE000380A0320C4130020400A0320BFF34F8F8D -:102AF0002C492D480A6802F4E06202430A60BFF3E1 -:102B00004F8F00BFFDE710B52848294C88B00168F9 -:102B100041F400410160FFF72FF926480168C90818 -:102B2000C90041F00401016000202349FEF755FD72 -:102B300000F02DFB01210120FFF723F9002000F018 -:102B40005BFC012000F058FC022000F055FC012045 -:102B500000F079FC0121002000F08BFCFFF7D8FE8B -:102B6000164A00210220FFF788F904F23C500FF2C8 -:102B700051010090019169460FF2490000F07EF882 -:102B800004F25470029004F5C96140F23C50059083 -:102B90000391049402A8FFF743FFFFF7B7FE08B0C4 -:102BA00010BD00000CED00E00400FA05080000581C -:102BB0003000032080040058E4120020BF2C0008DD -:102BC0007047000070B50546686800F10B06318853 -:102BD000B1F5124F15D1002000F040FCB0784FF055 -:102BE000005478B92178022908BF207033D000F052 -:102BF000DDFA00210120FFF7C4F8FEF707FE0120EF -:102C0000287070BD0020FFF7B3F9FF2823D042F2EF -:102C10001075A0B9207802280BD100212170FFF790 -:102C2000CCF9002000F00FFC0121002000F080FC16 -:102C3000FAE70220207000210020FFF7A5F900200C -:102C400000F001FC284600F01BFD0020FFF790F982 -:102C500010382028F6D3FFF749FF00BF70474FF028 -:102C6000FF30FFF7A5B800210220FFF713B90220BB -:102C7000FFF736B90220FFF73BB900007FB50C46DD -:102C80004D4D61684D4EE8612962284600F020FDF7 -:102C90002468746006F1080000604060012000F0C4 -:102CA00068F801203070296841B10FF2E9000FF295 -:102CB000ED02009001920294684688477FBD1FB5DF -:102CC0003E4C04F10800FFF7E6FD00BB2178F1B1AE -:102CD000694604F10800FFF707FE3748C16949B1AA -:102CE0000098029001228DF8042001A888479DF8E1 -:102CF000040000E001202070207818B10098FFF750 -:102D0000A8FE04E0009904F10800FFF7CDFD04F1EE -:102D10000800FFF7C0FD28B9207818B104F10800B9 -:102D2000FFF7A1FF1FBD2DE9F04105460E46904675 -:102D30001C46002000F01DF8204F7868A0F80950CC -:102D4000C672324641460C30FEF7DEFE1A4A13695F -:102D500000210020984748F2E800FFF78BFF7968D0 -:102D60008A78D21C04F10800FEF7CEFEBDE8F041DF -:102D700001201CB51049124C096A20B901B18847DD -:102D80000020207013BD0120207011B1BDE81C404F -:102D9000084713BD0020FFF76ABF000010B50146C9 -:102DA000064C04F10800FFF789FD04F10800BDE8B6 -:102DB0001040FFF758BF00000813002098130020B0 -:102DC000ED13002010B50446FEF79EFE204610BD10 -:102DD00010B5044610460A460146204600F082FC23 -:102DE000204610BD1FB541780024FF2949D1B0F815 -:102DF00003104F4A40F60143C91A04D012392ED0AD -:102E0000091F1AD03DE05388B0F807105B1C9942A7 -:102E10000BD100218DF80C1000F10D02029201245B -:102E2000B0F80B108DF80D1015E0D288521C9142AD -:102E300027D101248DF80C4006E0117A09B31472F1 -:102E4000032101248DF80C1000F10D020292B0F85C -:102E50000B008DF80D0002A800F088FC11E0D2886C -:102E6000B0F80710521C91420BD100F10A030193F4 -:102E70000023427A00920022B0F80500FFF71AFA08 -:102E80000124204604B010BD10B586B02948284C56 -:102E9000FFF780FB0094082301220FF29C0102201F -:102EA000FFF733F9002104910191A01C05900A223B -:102EB00001230421039202930091042320880FF23E -:102EC00088020221FFF770F900210491029101911B -:102ED000201D05900A2220210392009101232088C1 -:102EE0000FF274020221FFF75FF9A01D0590012186 -:102EF000049100200A2203230190042103920293EB -:102F00000091142320880FF260020221FFF74CF990 -:102F10000020207206B010BD80B500910122044847 -:102F200081880272012300880022FFF797F902BD11 -:102F3000A8130020E52D00088FE5B3D52E7F4A9811 -:102F40002A487ACC20FE000019ED82AEED214C9D7E -:102F50004145228E22FE000019ED82AEED214C9DEE -:102F60004145228E23FE000019ED82AEED214C9DDD -:102F70004145228E24FE000070470000C0680840D2 -:102F8000884201D10120704700207047C069084085 -:102F9000884201D1012070470020704710B56C4C69 -:102FA00002212046FFF7F2FF38B16068C043810775 -:102FB00003D5FFF722FD022018E001212046FFF78C -:102FC000E5FF38B16068C043C10703D5FFF7DDFCFA -:102FD00001200BE008212046FFF7D8FF38B16068D8 -:102FE000C043010703D5FFF75CFD0820A06010BDBA -:102FF00010B5574C00F033F818B96068C04381032E -:1030000006D400F02CF830B96068C043810302D5C3 -:10301000BDE810407AE0082100F022F870B960683D -:10302000C04301030AD560684A4940F4002060604B -:10303000086880474FF40020A06010BD202100F0F8 -:103040000FF858B96068C043810207D5606840F442 -:1030500000106060BDE81040FFF7A6BC10BD022163 -:1030600020468BE73C4881B0016841F48011016043 -:10307000006800F48010009000983848016841F41E -:10308000007101603648026842F40072026040BF7D -:1030900020BF3448016841F40041016001B070472D -:1030A00080B53148016841F480110160006800F486 -:1030B0008010009000982648016841F001010160ED -:1030C000026842F4803202602C20FEF79FF8BDE8CF -:1030D00002402D20FEF79AB82448016849084900AB -:1030E0000160704722494FF48030086070471F48E4 -:1030F000016821F00201016070471C484FF4003163 -:103100004160016821F4003101607047174801688F -:1031100041F400310160FFF769BC38B504460C4D3D -:1031200008212846FFF72AFF30B10A480460686882 -:1031300020F40020686031BDA0474FF40021A96051 -:1031400031BD0A48016821F00801016070470000A4 -:10315000000C0058E413002050010058D408005817 -:10316000200800580C04005850000058040C005867 -:10317000080C0058484900E0484981B00A680243F9 -:103180000A60096808400090009801B0704780B557 -:1031900000F0DCFB00F0DCFB4148016841F48031C9 -:1031A000016000F0E7FBBDE801400EE000B587B02C -:1031B00068460FF210211C22FEF7B6FCFFF765FCF3 -:1031C0006846FEF708FF07B000BDF0B585B0684659 -:1031D0001421FDF70BFF00260025002400210FF22B -:1031E000D40000EBC102907988B11368B3F1904F1D -:1031F00008D02C4FBB4208D02B4FBB4204BF908855 -:10320000044304E09088064301E090880543491C8C -:103210002229E4DB00200290012103200390019188 -:10322000B0B288B100900120FFF7A4FF0120FFF7A2 -:10323000A3FF69464FF09040FDF7DCFE0022B1B2DB -:103240004FF09040FDF793FFA8B280B100900220AC -:10325000FFF790FF0220FFF78FFF124E69463046BE -:10326000FDF7C8FE0022A9B23046FDF780FFA0B2EC -:1032700080B100900420FFF77DFF0420FFF77CFF62 -:10328000094D69462846FDF7B5FE0022A1B2284641 -:10329000FDF76DFF05B0F0BD4C0000584C01005823 -:1032A0009008005800040048000800480020FDF77E -:1032B000D6BA0000000000480100000000000048ED -:1032C000010000000000004801000000000000486C -:1032D000010000000000004801000000000000485C -:1032E000010000000000004801000000000000484C -:1032F000010000000000004801000000000000483C -:10330000010000000000004801000000000000482B -:10331000010000000000004801000000000000481B -:10332000010000000000004801000000000000480B -:1033300001000000000000480100000000000048FB -:1033400001000000000000480100000000000048EB -:1033500001000000000000480100000000000048DB -:1033600001000000000000480100000000000048CB -:1033700001000000000000480100000000000048BB -:1033800001000000000000480100000000000048AB -:10339000010000000000004801000000000000489B -:1033A000010000000000004801000000000000488B -:1033B000010000000000004801000000000000487B -:1033C00001000000000000000000000000000000FC -:1033D000B4320008280003202C000320220404003B -:1033E000DFF81C1181B00A6802430A6009680840CE -:1033F0000090009801B0704778B585B0044600F0A1 -:103400007AF80220FFF7ECFF00F010F80095012099 -:1034100001900021022003900291694656F8240091 -:10342000FDF7E8FD00F009F806B070BD0FF2E0000E -:10343000DFF8D06030F81450704756F824000022AE -:103440002946FDF794BE0FF2C801DFF8B83031F815 -:10345000101053F820000122FDF789BE0FF2B001D1 -:10346000DFF8A03031F8101053F820000022FDF7EB -:103470007EBEF0B585B005460C4600F03CF80DB9AF -:10348000042004E0012D18BF022D02D10820FFF70F -:10349000A7FF2000DFF870600FF27C070DD137F82E -:1034A000150000900021019101200290022103915A -:1034B00000F01CF8012000F0E3F8012C14D137F8DB -:1034C000150000900121DFF844000190029100F006 -:1034D0000DF80FF24C00445D00220F2160B2FDF7A1 -:1034E00077FE60B2FDF792FE05B0F0BD694656F872 -:1034F0002500FDF77FBD68461421FDF777BD00006C -:103500004C0000586C1000207810002000002110A2 -:103510002000010002000000100001000200000075 -:103520000A0607001148016841F480710160704784 -:1035300010B50C460E490028086805D1810507D54D -:1035400000F030FA20B110BD810558BF00F024FA18 -:103550000848016821F00401012C016001D130BF4D -:1035600010BD40BF20BF20BF10BD000000040058A8 -:103570001404005810ED00E010B54D494D4C4FF4C7 -:103580000040086000F0D0F9606840010ED5606826 -:10359000C0000BD4FFF7C6FFFFF7C4FF206840F45C -:1035A00080302060216821F48031216000F022F811 -:1035B000FFF7B8FFFFF7B6FF206840F0010020607A -:1035C00020688007FCD50022606820F4404040F469 -:1035D00080406060384801680260026902F0500271 -:1035E000026100F028F8FFF78EFA4FF0FF30FEF787 -:1035F000DFFBFAE7314881B0016841F480110160D6 -:103600003F21006800F48010009000982C48416031 -:103610004161016841F47C110160026942F47C124D -:103620000261016841F03F010160026942F03F021E -:10363000026101B0704710B5FFF774FFFFF772FF2A -:103640001C48204C016821F4407141F480710160F4 -:103650000F21026842F4004202601B48816047F675 -:10366000FF71C160046000F0BFF9CA206062FF21F1 -:1036700053206062A068C008C000A060616210BDF5 -:1036800038B50446FDF7ACFC14F1010F054609D02E -:1036900000F059F9241805E00C48016821F00401F4 -:1036A000016030BFFDF79CFC401BA042F4D331BD4C -:1036B00010400058900000588008005850000058F2 -:1036C000040C005800280040E412002010ED00E037 -:1036D0000249016002490161704700BFAF2900083B -:1036E000D729000862F30F2262F31F42401810F03E -:1036F000030308D0C91A1FD3DB0748BF00F8012D08 -:1037000028BF20F8022D130030B414461546103996 -:1037100028BF20E93C00FAD8490728BF20E90C005F -:1037200048BF40F8042D890028BF20F8022D48BF6B -:1037300000F8012D30BC7047C91818BF00F8012DE2 -:10374000CB0728BF00F8012D7047000000EB810077 -:10375000644AD0F88010914201D0012070470020C7 -:10376000704742F4806240F8212070472DE9F84309 -:103770000546DFF874912879DFF870815C4E20B13E -:10378000012825D0032869D010E029680A78012A89 -:103790004FF0006004D0022A0AD0072A10D005E0BA -:1037A00000223060727400F0B4F83274BDE8F18326 -:1037B00001213060717400F0ACF800203074F5E73E -:1037C00001228DF8002069460220FFF7A5FBEDE7F6 -:1037D0006C79002702214046FFF7B8FF0028F9D195 -:1037E000FEF765FF22E0296806F108033944184412 -:1037F000FEF78AF900F086F8D6E902233168012045 -:10380000FEF728FFD6F800C0D6E90201DCE9002364 -:103810008B4208BF824209D10CF108003060307C35 -:10382000C0F10800241AC71900203074307CC0F1A0 -:1038300008029442D7D2FEF748FF00F05FF8002C50 -:10384000B4D02868337CC11906F108002246184418 -:10385000FEF75AF9307C24183474A7E7307C10B393 -:10386000C0F1080106F10803FF221844FFF73AFFF0 -:1038700002214046FFF76AFF0028F9D1FEF717FF43 -:1038800004E000F03FF80120FEF7E4FE3168D6E9DD -:103890000223D1E900459D4208BF9442F1D1FEF7D1 -:1038A00014FF00F02BF8707C90B10128D5D14FF0B7 -:1038B000005100200870BFF34F8F0E490E480A6870 -:1038C00002F4E06202430A60BFF34F8F00BFFDE7DE -:1038D000FEF74EFB0020FEF74BFB01210020FFF717 -:1038E00027FEFAE70004008010400058001400583A -:1038F000581300200CED00E00400FA05002202211C -:1039000040462EE7D9F80000C00C10F00100F9D1B4 -:1039100070472868C1783170296888787070286885 -:103920004178B17070470000032010B5FDF743FCEB -:103930000F2000F0FDF80024002814BF012400F03F -:1039400017F8204610BD084800787047074805E082 -:103950000648016841F0020101607047016841F0CA -:10396000010101607047000060100020042004E0A5 -:103970007047000080B5FFF799FC022100910023F9 -:10398000044800F124014FF48052001D00F0F2F8C9 -:1039900001BD0000140000201048016841F480417E -:1039A0000160704710B50D4A0D4B106820F480403F -:1039B000106032211C680B48B4FBF0F04843516999 -:1039C0008B0506D5002818BF401EF8D101E0002065 -:1039D00010BD50698105FAD5032010BD00040058C0 -:1039E0008410002040420F0038B5040044D094F801 -:1039F000210028B9002184F820102046C046C04686 -:103A000000F049F8FF2510B100F03FF834E02168DC -:103A1000DFF8B0008A6802408A6021688A686368BB -:103A200020690343A06903431A438A602168E06860 -:103A3000086120680169A26841EA024101612068C9 -:103A4000C16821F08001C1602068C16C89088900CB -:103A5000C1642168CA6CE369606903431A43CA649C -:103A600020688168880609D400F020F830B1206809 -:103A70004562042100F01FF8012032BD2068456234 -:103A8000012184F82110002032BD20684562042104 -:103A900084F821107047022084F82100CA20216890 -:103AA0004862532022685062204626E020460BE000 -:103AB0002068C0F8248084F82110002084F82000B9 -:103AC00070470000BFFF8FFF70B5044640F2E93633 -:103AD0002068C16821F0A001C160FDF781FA0546A8 -:103AE0002068C168880606D4FDF77AFA401BB04208 -:103AF000F6D3032070BD002070BD70B50446206869 -:103B0000C1684A0612D44FF0FF32C26040F2E93673 -:103B1000FDF766FA05462068C168480606D4FDF739 -:103B20005FFA401BB042F6D3032070BD002070BD89 -:103B300070B50F4E044630780025A8B1FDF705F9A1 -:103B400032784FF47A71B1FBF2F1B0FBF1F0FDF78E -:103B500077FB48B9102C07D2002221464FF0FF30E6 -:103B6000FDF736FBB46000E00125284670BD00BFBC -:103B70006010002010B5029C016042600021C1600D -:103B80000161416181610381A107047704D5008946 -:103B900010B14FF0FF3010BD002010BD4748484A1B -:103BA00001681268B1F1006F0AD3120302F47F2298 -:103BB000444882188A4203D308684349884201D0A6 -:103BC000002070470120704780B540494048086098 -:103BD000016881F308884068804730BF01BD10B597 -:103BE000FFF7DCFF4FF0005420B100202070BDE84B -:103BF0001040E9E70120207007206070FF20A070CE -:103C000010BD38B5334C2068C00002D42068800154 -:103C10001AD54FF00055287828B9FFF7BFFF10B12B -:103C2000FFF7D2FF12E0287848B9FFF7B7FF30B9A5 -:103C30000120287007206870FF20A87006E028780F -:103C4000012818BF022801D0FFF7C9FF22480168E8 -:103C500041F4700101600020FEF7FEFD40B1807963 -:103C60001E49A160A16821F47C5141EA0021A160B4 -:103C70004FF0B040016841F48031016018490A6892 -:103C8000D208D20042F001020A600A6802F007027C -:103C9000012AFAD101688903FCD581688908890065 -:103CA00041F002018160816801F00C010829FAD11C -:103CB000016849084900016031BD000040710008F9 -:103CC00080400058FCFFFF07298A449408ED00E07B -:103CD000007000089400005888ED00E0FECAFECA9B -:103CE0000040005801000000030000000500000033 -:103CF0000100000001000000060000000A000000B2 -:103D00002000000002000000040000000800000085 -:103D100010000000400000008000000000010000D2 -:103D200000020000A0860100400D0300801A06007A -:103D300000350C0040420F0080841E0000093D0049 -:103D400000127A000024F40000366E010048E801F9 -:103D5000006CDC0200000000000000000000000019 -:103D60000000000019E050F8042BD30744BFA9F16C -:103D700001039A18091F0023042942F8043BF9D2D1 -:103D80005FEA817C134604D54FF0000CA2F800C016 -:103D90009B1CC90744BF0021197050F8041B00295F -:103DA000E1D1704730B5016884684218416802EB80 -:103DB0005103C9070BD54C4409E012F9011B12F855 -:103DC000015B002904F8015B05D5491CF9D19A4231 -:103DD000F3D10C3030BD491EF1D5F8E710B50749D5 -:103DE00079441831064C7C44163404E00A68081DF6 -:103DF000114488470146A142F8D110BD640000007B -:103E0000980000007047FEE770477047704700F069 -:103E10000DB80020FCF739BD0020FCF73CBDFDF7D4 -:103E20008CBBFFF7E5B8FFF7B9B80000024841685E -:103E30000278891841607047601000204EF6885162 -:103E4000CEF20001086840F470000860BFF34F8FA5 -:103E5000BFF36F8F4FF00070E1EE100A7047000063 -:103E600005FFFFFF38030000B810002070080000B5 -:103E700030000320000000002DFFFFFF9001000034 -:103E800046010000040000201DFFFFFF2302000088 -:103E900004000000280003200000000000000000D3 -:103EA000000000000000000001000000020000000F -:103EB00003000000040000000120C046002801D0DB -:103EC000FFF78CFFAFF300800020AFF30080FFF717 -:103ED00053FB00F000F800F001B800000746384638 -:103EE00000F002F8FBE7000080B5AFF30080024A63 -:103EF00011001820ABBEFBE72600020001488047F6 -:103F000001480047033C00080D3F0008AFF3008064 -:103F1000FFF794FFFFF7D0FFFFF7FEBFFFF7FEBFED -:103F2000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC5 -:103F3000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB5 -:103F4000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFA5 -:103F5000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF95 -:103F6000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF85 -:103F7000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF75 -:103F8000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF65 -:103F9000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF55 -:103FA000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF45 -:103FB000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF35 -:103FC000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF25 -:103FD000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF15 -:103FE000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF05 -:103FF000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF5 -:10400000FFF7FEBFFFF7FEBFFFF7FEBF030DFF0187 -:1040100086F400000181008100810081008100811F -:104020000081008100810081008100810081008188 -:104030000081008100810081008100810081008178 -:104040000081008100810081008100810081008168 -:104050000081008100A900F8FFF4000001F90000D0 -:1040600010FC004A04004800040048000400480016 -:10407000080048000C0048000C004800093D0030D2 -:10408000B50A4B5A6842F480225A60EFF3108472EA -:10409000B6802251F8045B40F8045B521EF9D11837 -:1040A00068C103FCD484F3108830BD10400058F878 -:0140B000000F -:0400000508003F0DA3 +:1000000008100020D53D0008414100084341000888 +:100010004D40000851400008554000080000000015 +:100020000000000000000000000000004541000842 +:100030004741000800000000494100084B4100080A +:10004000594000085D400008614000085B4100081D +:1000500065400008694000086D40000871400008D4 +:1000600075400008794000087D4000088140000884 +:1000700085400008894000088D4000089140000834 +:1000800095400008994000089D400008A1400008E4 +:10009000A5400008A9400008AD400008B140000894 +:1000A000B5400008B9400008BD400008C140000844 +:1000B000C5400008C9400008CD400008D1400008F4 +:1000C000D5400008D9400008DD400008E1400008A4 +:1000D0004F410008E5400008E9400008ED400008F5 +:1000E000F1400008F5400008F9400008FD40000814 +:1000F000634100085F410008014100080541000814 +:10010000094100080D41000811410008154100088F +:10011000194100081D41000821410008254100083F +:10012000294100082D4100085541000831410008CF +:1001300035410008394100083D4100080000000039 +:1001400000000000000000000000000001000000AE +:1001500002000000030000000400000010B596B08B +:1001600009A80FF2AC21834C342200F07BF90FF286 +:1001700055200190009469460FF2312000F0B6F945 +:100180000121022000F09BFA7B4A0021012000F0AF +:1001900014FB09A800F0BFFB08B1C046C046002010 +:1001A000ADF81A0000F0DEFB00F0C8F802460621A8 +:1001B000002000F0FBFB4EF66E50089007AA6F4936 +:1001C0000868079006212E2000F0F0FB0FF218229D +:1001D0001021182000F0EAFB0FF21C221021082049 +:1001E00000F0E4FB1821012000F007FC00F030FCD7 +:1001F0000DF1160006A90190009105AB0722002120 +:10020000012000F0E5FD0FF2D010BDF818100090AD +:100210000723BDF81400002200F0DAFC0DF11A00EB +:1002200000900223BDF81610BDF81400002200F063 +:10023000CFFC002000F080FD0020049010235049E6 +:1002400003910820002201930090029200230121D3 +:10025000012000F08AFD00F04BFE4A484FF40041B7 +:1002600001604FF00051026F4878052802F0FF024C +:100270000EDC00200870BFF34F8F434943480A68E3 +:1002800002F4E06202430A60BFF34F8F00BFFDE754 +:1002900089780B189A4238BF111A00F09FFE00F0BF +:1002A0004DF83B4942790A7202794A72C2788A72E1 +:1002B0008278CA7242780A730278521C4A73062105 +:1002C00042798DF8052002798DF80420C2788DF8E6 +:1002D000032082788DF8022042788DF801206A464A +:1002E0000078401C8DF80000002000F05FFB00F05B +:1002F0000AF816B010BD80B54078052808BF00F098 +:1003000002F8012002BD00B587B0002006900590DC +:1003100000220FF2F40004920821002302900191C0 +:1003200000920393A0228021002000F0BCFC07B0C3 +:100330005DF804EB16490E2000F07ABD80B50F4938 +:100340000A6812F1010F0DD012484B6802701B0AA7 +:10035000120A427049688170C370190A01711B0C3E +:10036000437102BD002000F0FDFE08B90FF27000DD +:1003700002BD0000A00803202B0500088075FF1FA8 +:1003800007B20100104000580CED00E00400FA052F +:1003900008100020BC2300200021012000F01ABA20 +:1003A000012000F03DBA012000F042BA10B5044629 +:1003B000616801F1080000F0ABFD00B10120207080 +:1003C00010BD000010B1012803D07047012000F0DB +:1003D00015BA00F01BBA0000424C45636F7265000D +:1003E0006C7AD8AC57720000123456789ABCDEF0A2 +:1003F000123456789ABCDEF0FEDCBA0987654321D8 +:10040000FEDCBA09876543210953544D5F4F5441BF +:1004100000000000000000000000000000000000DC +:100420000000000044000800400502011C3AFB00E7 +:10043000F4010000FFFFFFFF480101000020000061 +:100440000000000062B38B0708D0521E11F8013B78 +:1004500000F8013B00F024808B07F6D1830740F0C1 +:10046000208000BF103A07D330B4B1E83810103AFA +:10047000A0E83810F9D230BC530724BFB1E8081007 +:10048000A0E8081044BF51F8043B40F8043BD207F1 +:1004900024BF31F8022B20F8022B44BF0B780370E5 +:1004A0007047121F17D35B0009D151F8043B20F8A5 +:1004B000023B1B0C121F20F8023BF6D20BE051F856 +:1004C000043B00F8013B1B0A20F8023B1B0C121FE7 +:1004D00000F8013BF3D238BF121D521E24BF11F8A1 +:1004E000013B00F8013BF8D8704700007FB50C468F +:1004F0006D4D61686D4EE8612962284600F044FE4A +:10050000246805F1240000604060746006F1080072 +:100510000060406001203070296829B10FF2551049 +:1005200000900294684688477FBD1FB55F4C04F178 +:10053000080000F036FE00BB2178F1B1694604F1F5 +:10054000080000F057FE5848C16949B10098029070 +:1005500001228DF8042001A888479DF8040000E0DE +:1005600001202070207818B1009800F0F8FE04E017 +:10057000009904F1080000F01DFE04F1080000F0ED +:1005800010FE28B9207818B104F10800FFF704FF25 +:100590001FBD2DE9F8430646002000F05FF874887F +:1005A0003088B268DFF80081C4F3090444EA80248B +:1005B000F068A4B2C1B2204600F03CF8002748F22F +:1005C000E8094846FFF7EFFE08E06888A04202D13C +:1005D000316928780870687800B1012708F1240093 +:1005E00000F0DFFDF0B9694608F1240000F002FEDA +:1005F000009800F10B05407A0F28E6D0B5F80110FD +:10060000A1420DD10098817AC81E7169C0B288429A +:10061000C8BF0846706102463069E91CFFF712FF47 +:100620002878D9E73800CCD0012000F017F8002056 +:10063000BDE8F28310B513461C4A5468A4F80900BB +:10064000E1720A46194604F10C00FFF7FBFE164A58 +:100650001369BDE810400021002018471249096ABB +:1006600082B008B921B101E011B1012002B0084700 +:1006700002B0704710B50146487A0F2818BF0E28FF +:1006800007D10B4800F0A0FDBDE810400020FFF7A7 +:1006900087BE064C04F1080000F096FD04F1080046 +:1006A000BDE81040FFF778BEBC2200209023002058 +:1006B000E02200200C48002101604160704710B525 +:1006C00000F00CF85C6819B1012904D1204301E065 +:1006D00024EA0000586082F3108810BDEFF3108206 +:1006E00072B6014B70470000C42300202DE9FC477F +:1006F000604CDFF88491A5692840A0614FF0FF3A73 +:1007000021694FF0010834E0521C54F8320061694D +:1007100019400142F8D0616904EBC20608407168D3 +:100720001840014208BFC6F804A07768384000F0BE +:10073000A5F8606208FA00F087437760EFF3108154 +:1007400072B6626A206908FA02F2D2431040206150 +:10075000022004EBC00353F8086C1640401E43F817 +:10076000086CF6D181F31088606A59F82010884728 +:100770002169A36960690140194205D0E069216AD5 +:10078000084208BF0022C0D0C4F824A000F034FE04 +:10079000EFF3108972B6216960690140A0690142D6 +:1007A00001BFE169206A014200F0E3FE89F310888D +:1007B000C046C046A561BDE8F38738B51446EFF3DF +:1007C000108572B600F05AF82B4941F8204085F3A5 +:1007D000108831BD10B500F00BF804431C6153F8CC +:1007E0003140204343F83100FFE782F3108810BD09 +:1007F000EFF3108272B61F4B1C697047EFF3108144 +:1008000072B61C4A536923EA000005E0EFF3108139 +:1008100072B6184A53691843506181F310887047C3 +:10082000EFF3108172B6134AD3691843D061F4E72D +:10083000F8B5104C666A256A374616F1010F0EBFEF +:100840000026012101FA06F6206202E0304600F09F +:1008500091FE216AE0690842F8D06762EFF31081E7 +:1008600072B6E269206A8243E26181F310882562F0 +:10087000F1BD00003C200020DC21002002460020C9 +:10088000110C090404BF1020120412F07F4F04BFA2 +:10089000083012020FF2180112F0704F04BF001D51 +:1008A0001201120FC0F11F00895C401AC0B27047DC +:1008B0000403020201010101000000000000000029 +:1008C0001FB500F044F84FF6524000F0B6FE14B1E8 +:1008D0009DF80F0020700EE01FB5002408B10090B5 +:1008E000042409B10191241D6B466A46E1B24FF61A +:1008F000544000F0A2FE9DF80E0004B010BD00F0C0 +:100900009CFE9DF80E0005B000BDF8B500F020F883 +:100910004FF65A40F3E7F8B500F10C026B4625217B +:100920004FF66640EBE7F8B500F10C026B460F217D +:100930004FF66840E3E7F8B500F003F84FF669407A +:10094000DDE78DF800006B466A46012170470446DA +:100950006B46002200217047F8B5FFF7F2FF4FF613 +:100960007340CCE700B587B000F010F801200322F7 +:100970000690ADF80420ADF8062000F011F800282C +:100980004CBFFF209DF8000007B000BD00208DF88F +:1009900000001822002101A800F0A4BE03900691D7 +:1009A000CDF814D0002101A8FFF7F3BD18B50C460F +:1009B000C7B0114600228DF800208DF81C008DF87C +:1009C0001D4022460DF11E0000F086FE00F02AF8C0 +:1009D0003F200C21ADF80400ADF8061007A8012156 +:1009E00003900691A41C049400F02CF800284CBF3E +:1009F000FF209DF8000048B010BD00B5C7B000F062 +:100A00000AF80F2000F013F800284CBFFF209DF8D3 +:100A1000000047B000BD00228DF800208DF81C00BA +:100A20008DF81D101822002101A800F05BBEADF862 +:100A3000060007A9022004903F220120039106909E +:100A4000ADF80420CDF814D0002101A8FFF7A1BD16 +:100A500000B587B000208DF8000000F0E0F840F20B +:100A60000110ADF806003F220120069000F013F9B6 +:100A700000284CBFFF209DF8000007B000BD2DE905 +:100A8000F84107460128C7B0884615461E4608BFEC +:100A9000022003D002280CBF102000200DF11D0100 +:100AA0000C1800F036F8012F8DF81C7002D0022FC0 +:100AB00018D019E002273A4641460DF11D0000F01A +:100AC0000BFE2570667000F0AAF83F204FF481718C +:100AD00000F016F8FF1C049700F0DFF8002805D599 +:100AE000FF2009E01027E6E7972005E09DF80000C9 +:100AF00010B94E9800F067F8FFE748B0BDE8F08104 +:100B0000ADF80400ADF8061007A803210390069184 +:100B1000704703220021684600F0E4BD2DE9F64F3E +:100B20000C460546012CC7B09B4608BF022003D0E7 +:100B3000022C0CBF102000200DF11F010E18FFF732 +:100B4000E8FF012CADF81C508DF81E4002D0022C9D +:100B50002CD02DE00227569C559DDDF85091DDF8F4 +:100B60004CA1DDF8488148993A4600F054F8A6F8BF +:100B700000B086F8028086F803A086F804907571AC +:100B8000B47100F04CF83F20ADF804004FF48271CE +:100B900007A8ADF80610039003210A3704970691C1 +:100BA00000F07BF8002805D5FF2009E01027D2E7E8 +:100BB000972005E09DF8000010B9579800F003F861 +:100BC00049B0BDE8F08FBDF80110018000207047EA +:100BD00030B5C7B01C464A9B00F049F800258DF897 +:100BE00000508DF82140224619460DF1220000F0F8 +:100BF00073FD00F014F83F204FF4837100F042F8C9 +:100C0000A41D049400F049F800284CBFFF209DF873 +:100C1000000047B030BD0DF11F0000F05DBD18228F +:100C2000002101A800F05EBD78B5C7B04C9C4D9D79 +:100C300000F01DF800268DF821308DF800608DF849 +:100C400022402246294600F019F8FFF7E8FF3F202E +:100C50004FF4937100F016F8E41D049400F01DF8B1 +:100C600000284CBFFF209DF8000048B070BDADF8D3 +:100C70001C00ADF81E108DF8202070470DF12300E8 +:100C800000F02ABDADF80400ADF8061007A8012158 +:100C9000039006917047ADF80420CDF814D00021E0 +:100CA00001A8FFF776BC2DE9F84DC7B09446DDF8F2 +:100CB00040E1519A559D569EDDF84CA1ADF81D10AE +:100CC0008DF81C004FF0000BADF81FC08DF82130DF +:100CD0008DF822E000F024F800F017F824F8095FFE +:100CE000668000F0E7F83F20832100F0DBF85744EE +:100CF00006910D37049700F0B5F800284CBFFF208F +:100D00009DF8000048B0BDE8F08D88F800A007AC61 +:100D10005499E419524608F10100544400F0DCBC37 +:100D20008DF82320174652998DF800B00DF1240854 +:100D300009A8B84400F0D0BC00B5C7B000F00CF86A +:100D4000852000F095F800F08AF800284CBFFF20BD +:100D50009DF8000047B000BD00218DF81C008DF803 +:100D60000010182201A800F0BDBC2DE9F841C7B061 +:100D70004FF0000800F026F80DF12300DDF844E103 +:100D80004E9F4F9E509D529C8DF81F30C0F800E042 +:100D90008DF800808DF820708DF821608DF822503C +:100DA0008DF8274000F086F88620ADF8060007A9E8 +:100DB0000C2000F050F800284CBFFF209DF80000E8 +:100DC00000F07DB88DF81C0007A841708270704754 +:100DD000F8B5C8B005460E4617461C4600F023F885 +:100DE00008A8467087708DF8205000F056F88A21C8 +:100DF000ADF80A103F20032100F042F8002848BF58 +:100E0000FF200ED49DF8000058B94F994E98BDF8B8 +:100E100001202280BDF803200280BDF80500088073 +:100E2000002049B0F0BD07220021684600F05ABCFE +:100E300018B5C7B000F051F800F03CF83F208E2103 +:100E400000F040F800F00EF800284CBFFF209DF89D +:100E5000000048B010BD04903F220120039106908D +:100E6000ADF80420CDF814D0002101A8FFF791BB04 +:100E7000ADF8060007A901203F22039104907047B6 +:100E8000ADF80800059108A8072104900791CDF856 +:100E900018D0002102A8FFF77CBB1822002102A86D +:100EA00000F020BCADF80400ADF8061007A8012141 +:100EB000039070471822002101A800F013BC48B02D +:100EC000BDE8F081ADF80400ADF8061007A80121D7 +:100ED00003900691641C04947047044600208DF82A +:100EE00000008DF81C4022460DF11D0000F0F4BBFF +:100EF0001C490020087700221B48027000F036B819 +:100F000018490A7F41F82200087F401C0877704783 +:100F100070B504466078FF2802BFB4F8031001F4EE +:100F20007F41B1F5406F12D100260E4D00E0761CD6 +:100F3000297FF0B288420AD2F1B255F8211020463A +:100F400088470100F3D002D0022805D006E02046F1 +:100F5000BDE87040FFF7CFB9002070BD012070BD23 +:100F60000000000030230020F423002080B5C0469C +:100F7000C046C046C046C046C046C046C046C04641 +:100F8000C046C046C046C046C046C046C046C04631 +:100F9000C046C046C046C046C046C046C046C04621 +:100FA000C046C046C04600F0F9FBC046C046C04639 +:100FB000C046BDE8014000F069BC000000EB8100C4 +:100FC000654AD0F88010914201D00120704700207E +:100FD000704742F4806240F8212070472DE9F041CB +:100FE00004460D460026DFF8748102214046FFF7D3 +:100FF000E5FF0028F9D100F07CFC0120FFF79BFC05 +:101000000027AF4215D2300013D1381900F045F84F +:1010100006467F1CF5E70020FFF78DFC00F077FC0B +:10102000002202214046FFF7D4FF00252846BDE8F4 +:10103000F081002EEFD0ED1B6D1CF7E72DE9F84392 +:1010400080460C4615460026DFF8109102214846DE +:10105000FFF7B4FF0028F9D100F04BFC0027AF42A6 +:1010600016D2AEB904EBC700D0E9002308EBC700E5 +:1010700000F023F806467F1CF1E700F048FC002250 +:1010800002214846FFF7A5FF00252846BDE8F28368 +:10109000002EF2D0ED1B6D1CF7E782B00146002058 +:1010A000009002E0009A521C009200982328F9D385 +:1010B00000220023002002B001E0014601202DE9BA +:1010C000F84F86B0022501260295049603918DF80B +:1010D000000005919246DFF88480214F9B46EFF394 +:1010E000108938680003FCD472B6D8F8180008B12B +:1010F000012519E007214046FFF760FF0025C4B233 +:1011000094B99DF8000020B901A902A800F054FC90 +:1011100005E0059952465B46012000F0BDFB002228 +:1011200007214046FFF755FF89F310880DB10020D5 +:1011300002E0002C03D001200020C04606462543D3 +:1011400018BF002ECDD138684103FCD4701E8041F9 +:10115000C00F07B0BDE8F08F0004008000140058F5 +:101160001040005801460648064AC3798B4218BF12 +:10117000904218BF0838F8D18B4218BF0020704742 +:10118000F873FF1F0070FF1F0249016002490161EF +:10119000704700BF5B1200088112000800604060C9 +:1011A0007047EFF3108172B6026882420CBF0120D3 +:1011B00000201CE0EFF3108272B603680B604860F9 +:1011C00001600868416023E0EFF3108272B60860A6 +:1011D00043684B6041604868016019E0EFF310819B +:1011E00072B642680368136002684368536081F313 +:1011F0001088704710B5EFF3108472B602680A6069 +:101200000068FFE7FFF7EAFF84F3108810BD0B606A +:1012100082F310887047000000F0BBBC6C486D4939 +:10122000016001F12002426001F13002826001F1AF +:101230003C02026201F14402426201F14C02C260CE +:1012400001F15402026101F17002426101F1740284 +:1012500082618031C16100F0BABC38B504465E4D90 +:101260002846FFF79BFF5A484068A1680160E16883 +:10127000C16085605949416000F0C5FC58482AE0CA +:1012800080B553484268136801211972406800F024 +:10129000C0FC002002BD38B5514C4F4D04E000F0B9 +:1012A00041F80098216888472846FFF77AFF002810 +:1012B000F5D031BD4A484168084738B50446494D24 +:1012C0002846006040604248C068A16801604560EF +:1012D00000F0A4FC4448216801606168416000207E +:1012E00032BD80B53A48C268136810211972C068CF +:1012F00000F09AFC002002BD35483B4AC168C16835 +:1013000013680868184738B5374C364D04E000F0CC +:1013100009F80098616888472846FFF742FF0028CF +:10132000F5D031BD69462846FFF764BF38B504469D +:101330002E4D2846FFF732FF2D48006040602448BC +:101340000069A1688160E168C16005612168016090 +:1013500061684160216941616169816131BD80B528 +:1013600001462348FFF730FFBDE802400FF20500B9 +:1013700000F063BC38B5164C1D4D06E0FFF7D2FFF8 +:10138000009920690069FFF71FFF2846FFF709FF52 +:101390000028F3D031BD10B5164C204600604060E7 +:1013A0000B4841690C60BDE8104000F05ABC1CB508 +:1013B000104C06E069462046FFF71CFF0098C04627 +:1013C000C0462046FFF7EDFE0028F3D013BD000015 +:1013D00000000320AC090320480A032090080320E2 +:1013E000D4230020500A0320DC230020380A0320E5 +:1013F000CC230020400A032070470000BFF34F8F2A +:101400002C492D480A6802F4E06202430A60BFF3E7 +:101410004F8F00BFFDE710B52848294C88B0016800 +:1014200041F400410160FFF745F926480168C90809 +:10143000C90041F0040101600020234900F09FFD34 +:1014400000F0C3FE01210120FFF739F9002001F06F +:1014500001F8012000F0FEFF022000F0FBFF012058 +:1014600001F01FF80121002001F031F8FFF7D6FE4E +:10147000164A00210220FFF7A0F904F23C500FF2B7 +:1014800051010090019169460FF2490000F080F887 +:1014900004F25470029004F5C96140F23C5005908A +:1014A0000391049402A8FFF741FFFFF7B5FE08B0CF +:1014B00010BD00000CED00E00400FA050800005823 +:1014C0003000032080040058E8220020D3150008D3 +:1014D0007047000070B50546686800F10B0631885A +:1014E000B1F5124F18D1002000F0E6FFB0784FF0B0 +:1014F000005490B92178022908BF207036D000F03E +:1015000073FE0120FFF728FA00210120FFF7D7F82A +:10151000FEF724FE0120287070BD0020FFF7D0F9EF +:10152000FF2823D042F21075A0B9207802280BD1F1 +:1015300000212170FFF7E9F9002000F0B2FF01213E +:10154000002001F021F8FAE702202070002100209D +:10155000FFF7C2F9002000F0A4FF284601F0BCF814 +:101560000020FFF7ADF910382028F6D3FFF746FF2B +:1015700000BF70474FF0FF30FFF7B8B800210220DE +:10158000FFF728B90220FFF74BB90220FFF750B947 +:101590007FB50C464D4D61684D4EE8612962284685 +:1015A00001F0C2F82468746006F108000060406031 +:1015B000012000F068F801203070296841B10FF275 +:1015C000E9000FF2ED02009001920294684688470C +:1015D0007FBD1FB53E4C04F10800FFF7E2FD00BBE4 +:1015E0002178F1B1694604F10800FFF703FE37489E +:1015F000C16949B10098029001228DF8042001A828 +:1016000088479DF8040000E001202070207818B180 +:101610000098FFF7A4FE04E0009904F10800FFF72A +:10162000C9FD04F10800FFF7BCFD28B9207818B106 +:1016300004F10800FFF7A2FF1FBD2DE9F0410546A8 +:101640000E4690461C46002000F01DF8204F78689A +:10165000A0F80950C672324641460C30FEF7F2FE41 +:101660001A4A136900210020984748F2E800FFF762 +:101670008CFF79688A78D21C04F10800FEF7E2FE3C +:10168000BDE8F04101201CB51049124C096A20B98F +:1016900001B188470020207013BD0120207011B1D6 +:1016A000BDE81C40084713BD0020FFF76BBF0000DA +:1016B00010B50146064C04F10800FFF785FD04F162 +:1016C0000800BDE81040FFF759BF00000C230020C0 +:1016D000A0230020F523002010B50446FEF7B2FE3B +:1016E000204610BD10B5044610460A460146204665 +:1016F00001F024F8204610BD1FB541780024FF29D1 +:1017000049D1B0F803104F4A40F60143C91A04D03A +:1017100012392ED0091F1AD03DE05388B0F80710B7 +:101720005B1C99420BD100218DF80C1000F10D02C9 +:1017300002920124B0F80B108DF80D1015E0D2883C +:10174000521C914227D101248DF80C4006E0117AF9 +:1017500009B31472032101248DF80C1000F10D025D +:101760000292B0F80B008DF80D0002A801F01AF8F3 +:1017700011E0D288B0F80710521C91420BD100F151 +:101780000A0301930023427A00920022B0F8050078 +:10179000FFF74AFA0124204604B010BD10B586B008 +:1017A0002948284CFFF7ACFB0094082301220FF2D4 +:1017B0009C010220FFF763F9002104910191A01C14 +:1017C00005900A220123042103920293009104232D +:1017D00020880FF288020221FFF7A0F9002104916E +:1017E00002910191201D05900A222021039200916F +:1017F000012320880FF274020221FFF78FF9A01D48 +:1018000005900121049100200A2203230190042164 +:10181000039202930091F82320880FF260020221C4 +:10182000FFF77CF90020207206B010BD80B5009152 +:101830000122044881880272012300880022FFF7F8 +:10184000C7F902BDB0230020F91600088FE5B3D513 +:101850002E7F4A982A487ACC20FE000019ED82AEED +:10186000ED214C9D4145228E22FE000019ED82AEF5 +:10187000ED214C9D4145228E23FE000019ED82AEE4 +:10188000ED214C9D4145228E24FE00007047000052 +:10189000DFF800F08D2000202DE9F041404F064692 +:1018A00038780128884614461D4608BF02201BD000 +:1018B000012139700020786000F018F8010011D182 +:1018C000012E22462B46404602D100F05BF802E092 +:1018D0001146FFF7DDFF00F009F832490A6822EAF5 +:1018E00006060E6000213970BDE8F0814FF47A7071 +:1018F00018E02E49CA680020002A07D52C4B2D4A33 +:101900000B600A60C968002948BF0120704725495B +:101910000A6842F000420A6000200968002958BFA6 +:101920000120704770B5054600F0EAFF06461E4CE0 +:101930002068C10311D500F0E3FF801BA842F7D354 +:10194000032070BD164920604860012070BD00F082 +:10195000D7FF801BA84210D3F2E72068C10744BF1D +:1019600001212160010404D54FF40041216020F4DD +:1019700000404CF2FA310840E4D120684103E6D43B +:10198000002070BD10B507490C6844F001040C60DC +:1019900040F8042BBFF36F8F036010BD0000000000 +:1019A0007823002014400058104000580840005888 +:1019B00023016745AB89EFCD2DE9F04100F053F8E5 +:1019C000884608BF02204CD000F052F800F055F8CD +:1019D000010044D12968DFF8C470022919D14FF001 +:1019E000FF32C8F800206E6800E0761C6968AA68BB +:1019F00051188E4208D2304600F043F800F03DF80E +:101A00000100F2D0C8F800607A69DFF894100A404B +:101A10007A6139688A050FD53A6822F400723A6013 +:101A2000396841F4006139603A6822F400623A6032 +:101A3000396841F4007139603A6851050FD5396849 +:101A400021F4806139603A6842F480523A60396822 +:101A500021F4805139603A6842F480623A60002192 +:101A60002170BDE8F081104C0546207801287047B0 +:101A7000002001216060217070474FF47A70FFF7F9 +:101A800051BF08490A6822F4FF6242EAC00242F4E8 +:101A9000803242F002020A607047000000400058A5 +:101AA00005F8FFFF1440005878230020C068084064 +:101AB000884201D10120704700207047C06908406A +:101AC000884201D1012070470020704710B5684C52 +:101AD00002212046FFF7F2FF38B16068C04381075A +:101AE00003D5FFF710FC022018E001212046FFF784 +:101AF000E5FF38B16068C043C10703D5FFF7CBFBF2 +:101B000001200BE008212046FFF7D8FF38B16068BC +:101B1000C043010703D5FFF74AFC0820A06010BDB1 +:101B200010B5534C02212046FFF7C0FF58B960683A +:101B3000C043810307D5606840F400306060BDE8B1 +:101B40001040FFF7D9BB08212046FFF7AFFF70B95F +:101B50006068C04301030AD56068464940F400202C +:101B60006060086880474FF40020A06010BD20210D +:101B70002046FFF79BFF58B96068C043810207D534 +:101B8000606840F400106060BDE81040FFF792BB51 +:101B900010BD394881B0016841F4801101600068CE +:101BA00000F48010009000983448016841F40071FE +:101BB00001603348026842F40072026040BF20BFF7 +:101BC0003048016841F40041016001B0704780B5C0 +:101BD0002D48016841F480110160006800F4801014 +:101BE000009000982248016841F0010101600268FC +:101BF00042F4803202602C2000F0C2FEBDE80240B8 +:101C00002D2000F0BDBE214801684908490001604F +:101C100070471F494FF48030086070471B480168C7 +:101C200021F002010160704718484FF40031416013 +:101C3000016821F400310160704738B504460C4D4D +:101C400008212846FFF732FF30B10A48046068686F +:101C500020F40020686031BDA0474FF40021A96046 +:101C600031BD0A48016821F0080101607047000099 +:101C7000000C0058EC23002050010058D4080058F4 +:101C8000200800580C04005850000058040C00585C +:101C9000080C0058DFF8F0140A6892B200E002461F +:101CA000086880B28242FAD170472DE9FC410446AF +:101CB0001825DFF8D884DFF8D864684308EB0007FC +:101CC0003078062808D131787170347078754FF00B +:101CD000FF307060002039E000F077F8B96809182B +:101CE000B96008F10803B96832786A439A5891429A +:101CF000327813D308F1150315FB02FC13F80C30EE +:101D0000062B25D008F108066B43F358994222BFF1 +:101D100008F115036A439A5CEED219E01146337854 +:101D200069439A420BD008F1140308F1150C5B5C6F +:101D300015FB03F50CF805407A753B7500E07A75E4 +:101D400008F114025454317871703470BDE8F68192 +:101D50001146694308F115035B5C062B04D008F1BA +:101D6000140615FB03F574557B753A7508F11502D9 +:101D70005454EBE7F8B5DFF81834DFF810541E7848 +:101D8000182402466243B0422A4404D1187858709D +:101D9000507D18700FE0167D507D92F815C005F14A +:101DA00015076643062807F806C004D0167D1435CB +:101DB00014FB00F42E55012010731878062802BF7A +:101DC00000294FF0FF315960F1BD10B5DFF8C04375 +:101DD000606810F1010F0FD0FFF75CFF6168DFF85A +:101DE000B423814261683CBF5388C918081A5178EE +:101DF00048431178C84000E0002080B210BD2DE9B2 +:101E0000F84FDFF89053DFF890B3D5F80880D8F892 +:101E10000000DBF800104A0500F06AF9DFF8706393 +:101E2000DFF868A321F4806181604FF018093478ED +:101E30000AF1080019FB04F14758FFF7C6FF874273 +:101E400017D200270121B170062C3DD019FB04F4F4 +:101E50000AF108010AF108020959814223BF0AF177 +:101E600008010959091A002111510AEB04014C7D9E +:101E7000EAE7A9884118B94202D2AF880021E2E717 +:101E80003F1ADFE7022802DA2878012800D07F1EF7 +:101E9000D8F80000C1684A07FAD500F02FF9DBF83E +:101EA0000C00000CBFB247EA0047CBF80C70FFF7FC +:101EB000F1FE7060A8680068816841F4806181600B +:101EC000AFF30080BDE8F18FB8B20028DAD1FFF798 +:101ED000E1FE70600320BDE8F24F00F07FBD2DE908 +:101EE000F843EFF3108872B6AA4DA84BA8680168B2 +:101EF000CA224A6253204862A54A886820F480605A +:101F0000886018201678374647431F44387B0228DC +:101F100026D13C68D7F810909078F0B17A7B012AEE +:101F20000AD101213046FFF725FF88F31088796830 +:101F3000304600F0F0F804E088F31088304600F0F6 +:101F40009BF8A8680068CA21416222465321416279 +:101F50004846314600F02AF90BE0FFF750FF06E053 +:101F6000C8684207FCD500F07EF88C49086088F309 +:101F70001088FF21A86802685162BDE8F183F8B5B6 +:101F8000844CA160CA2209684A6253224A62824A8A +:101F9000136843F020031360136803F00703C3F1D1 +:101FA0000403237095682D0C05F07F056D1C65708A +:101FB000EDB29268C2F30E02521C628092B2521EBF +:101FC0006A43A2F5A072DA404FF6FF739A422CBF23 +:101FD000A380A280724A136843F400231360714BFC +:101FE0001D6845F400251D6048BB6948674E012304 +:101FF000837018254FF0FF33436000235FFA83FCA2 +:1020000006F10C0715FB0CFC4FF0000E07F80CE076 +:102010005B1CDFB2062FF1DB06230370886820F417 +:102020008060886000F01FF8D060032000F0E1FCC1 +:10203000A1680868826842F48042826005E0C8684E +:10204000410544BF032000F0C9FCA1680A68FF20D5 +:10205000506200220321032000F074FCBDE8F2402E +:10206000032000F08DBCC86800F0800060F4906030 +:10207000C8604FF400207047F8B50746EFF31084AE +:1020800072B6032000F087FC424DAE683068CA216A +:1020900041623A4653214162182043494243895CD8 +:1020A00002291BD100213846FFF764FE3848017829 +:1020B00006290ED1306838490A68530500F018F82F +:1020C00021F480618160C1684A07FCD500F016F8F0 +:1020D00004E04078884218BFFFF791FEA9680A68BB +:1020E000FF205062032000F04BFC84F31088F1BD08 +:1020F00002D5C1684A07FCD481687047C16801F005 +:10210000800161F49061C1604FF4002023490860B0 +:10211000032000F06EBC2DE9F04180460F46424698 +:1021200018201A4942438C18207B022804BF4046DD +:10213000FFF7A2FFEFF3108572B6032000F02BFC2F +:10214000144EB0680068CA214162532141620220E6 +:102150002073A76067604046FFF7A7FD0C490A7827 +:102160004978914202D0FFF74AFE02E0A168081ABE +:10217000A060FF20B1680A685062032000F000FCF4 +:1021800085F31088BDE8F081282800404C2100200C +:10219000E423002050230020082800400C080058A9 +:1021A00000080058800800585821002010470000FF +:1021B000484900E0484981B00A6802430A6009685A +:1021C00008400090009801B0704780B500F040FCD6 +:1021D00000F040FC4148016841F48031016000F0AA +:1021E0004BFCBDE801400EE000B587B068460FF239 +:1021F00030211C22FEF736F9FFF7CDF86846FEF7CE +:1022000092FB07B000BDF0B585B06846142100F020 +:1022100045FC00260025002400210FF2D40000EB2D +:10222000C102907988B11368B3F1904F08D02C4F58 +:10223000BB4208D02B4FBB4204BF9088044304E04C +:102240009088064301E090880543491C2629E4DB79 +:10225000002002900121032003900191B0B288B1C7 +:1022600000900120FFF7A4FF0120FFF7A3FF6946BC +:102270004FF0904000F016FC0022B1B24FF09040B9 +:1022800000F0D4FCA8B280B100900220FFF790FFCC +:102290000220FFF78FFF124E6946304600F002FC25 +:1022A0000022A9B2304600F0C1FCA0B280B100907B +:1022B0000420FFF77DFF0420FFF77CFF094D6946EE +:1022C000284600F0EFFB0022A1B2284600F0AEFC49 +:1022D00005B0F0BD4C0000584C0100589008005863 +:1022E0000004004800080048002000F0C2BC0000C4 +:1022F000000000480100000000000048010000004C +:10230000000000480100000000000048010000003B +:10231000000000480100000000000048010000002B +:10232000000000480100000000000048010000001B +:10233000000000480100000000000048010000000B +:1023400000000048010000000000004801000000FB +:1023500000000048010000000000004801000000EB +:1023600000000048010000000000004801000000DB +:1023700000000048010000000000004801000000CB +:1023800000000048010000000000004801000000BB +:1023900000000048010000000000004801000000AB +:1023A000000000480100000000000048010000009B +:1023B000000000480100000000000048010000008B +:1023C000000000480100000000000048010000007B +:1023D000000000480100000000000048010000006B +:1023E000000000480100000000000048010000005B +:1023F000000000480100000000000048010000004B +:10240000000000480100000000000048010000003A +:10241000000000480100000000000048010000002A +:10242000000000000000000000000000F022000892 +:10243000280003202C00032026040400DFF81C11D0 +:1024400081B00A6802430A60096808400090009859 +:1024500001B0704778B585B0044600F07AF80220E4 +:10246000FFF7ECFF00F010F800950120019000212B +:10247000022003900291694656F8240000F012FBF6 +:1024800000F009F806B070BD0FF2DC00DFF8D06094 +:1024900030F81450704756F824000022294600F006 +:1024A000C5BB0FF2C401DFF8B83031F8101053F893 +:1024B0002000012200F0BABB0FF2AC01DFF8A0301F +:1024C00031F8101053F82000002200F0AFBBF0B537 +:1024D00085B005460C4600F03CF80DB9042004E038 +:1024E000012D18BF022D02D10820FFF7A7FF200001 +:1024F000DFF870600FF278070DD137F81500009003 +:1025000000210191012002900221039100F01CF8AA +:10251000012000F0E1F8012C14D137F815000090EB +:1025200001214FF404100190029100F00DF80FF218 +:102530004800445D00220F2160B200F003FA60B24F +:1025400000F01EFA05B0F0BD694656F8250000F00F +:10255000A9BA6846142100F0A1BA00004C00005846 +:10256000702000207C2000202000010002000000DC +:1025700010000100020000000A060700114801686F +:1025800041F480710160704710B50C460E49002877 +:10259000086805D1810507D500F028FC20B110BDE1 +:1025A000810558BF00F01CFC0848016821F00401B7 +:1025B000012C016001D130BF10BD40BF20BF20BF42 +:1025C00010BD0000000400581404005810ED00E095 +:1025D00010B54D494D4C4FF40040086000F026FA0C +:1025E000606840010ED56068C0000BD4FFF7C6FFDD +:1025F000FFF7C4FF206840F480302060216821F498 +:102600008031216000F022F8FFF7B8FFFFF7B6FF36 +:10261000206840F00100206020688007FCD500227F +:10262000606820F4404040F48040606038480168B1 +:102630000260026902F05002026100F028F8FEF721 +:10264000EAFE4FF0FF30FEF751F8FAE7314881B06B +:10265000016841F4801101603F21006800F480109E +:10266000009000982C4841604161016841F47C1160 +:102670000160026942F47C120261016841F03F018D +:102680000160026942F03F02026101B0704710B57B +:10269000FFF774FFFFF772FF1C48204C016821F41C +:1026A000407141F4807101600F21026842F40042E0 +:1026B00002601B48816047F6FF71C160046000F052 +:1026C000B7FBCA206062FF2153206062A068C00887 +:1026D000C000A060616210BD38B5044600F010F97A +:1026E00014F1010F054609D000F0AFF9241805E0F8 +:1026F0000C48016821F00401016030BF00F000F9CE +:10270000401BA042F4D331BD104000589000005847 +:102710008008005850000058040C00580028004061 +:10272000E822002010ED00E0024901600249016149 +:10273000704700BFBB120008E312000862F30F22CB +:1027400062F31F42401810F0030308D0C91A1FD3C8 +:10275000DB0748BF00F8012D28BF20F8022D130029 +:1027600030B414461546103928BF20E93C00FAD889 +:10277000490728BF20E90C0048BF40F8042D890014 +:1027800028BF20F8022D48BF00F8012D30BC70474B +:10279000C91818BF00F8012DCB0728BF00F8012D7C +:1027A00070470000F8B506464A4D307920B101283F +:1027B00024D0032857D0F1BD31680A78012A4FF0A0 +:1027C000006004D0022A09D0072A0FD0F1BD0022F0 +:1027D00028606A7400F08AF82A74F1BD012128602B +:1027E000697400F083F800202874F1BD01228DF88F +:1027F000002069460220FFF719F8F1BD747900271F +:102800001EE0316805F1080339441844FDF71AFE4B +:1028100000F066F80028FBD1D5F800C0D5E9022306 +:10282000DCE90001994208BF904209D10CF108008F +:102830002860287CC0F10800241AC71900202874D9 +:10284000287CC0F108029442DBD2002CC5D031684C +:1028500005F10803224639441844FDF7F3FD287CAE +:1028600024182C74F1BD287CA8B1C0F1080105F131 +:102870000803FF221844FFF761FF03E000F030F87F +:102880000028FBD12868D5E90267D0E90023BB42C4 +:1028900008BFB242F2D1687C90B101289DD14FF0BF +:1028A000005100200870BFF34F8F0B490B480A6896 +:1028B00002F4E06202430A60BFF34F8F00BFFDE7FE +:1028C000FDF7FEFF0020FDF7FBFF01210020FFF7D1 +:1028D0005BFEFAE7602300200CED00E00400FA053F +:1028E0002868012205F10801FEF7A8BB3068C1780D +:1028F000297031688878687030684178A9707047AD +:1029000001484068704700BF6420002009010200B0 +:1029100081B002D43C48815405E03C4802F00F02EB +:10292000104400F8041C01B07047394A13684FF690 +:10293000FF0100020B4000F4E060184335490843F2 +:102940001060704738B5324B1C68C4F30223C3F1E2 +:102950000704052C28BF04241D1D072D34BF0023A8 +:10296000DB1E012505FA04F4641E2140994005FA96 +:1029700003F35B1E1A401143BDE83440C6E7000074 +:10298000010007D4012200F01F01234B8A404009B7 +:1029900043F82020704701000BD4012200F01F01F2 +:1029A0001E4B8A40400943F82020BFF34F8FBFF3EE +:1029B0006F8F704710B5401EB0F1807F01D30120AA +:1029C00010BD174C60600F214FF0FF30FFF79EFFE6 +:1029D0000022A26007202060002010BD010007D463 +:1029E000012200F01F010F4B8A40400943F82020CC +:1029F0007047010007D4012200F01F010A4B8A40F2 +:102A0000400943F82020704700E400E018ED00E0A2 +:102A10000CED00E00000FA0500E100E080E100E0DC +:102A200010E000E000E200E080E200E0032010B5EA +:102A3000FFF77BFF0F2000F09FFA0024002814BF4F +:102A4000012400F017F8204610BD084800787047B0 +:102A5000074805E00648016841F00201016070473F +:102A6000016841F00101016070470000642000200E +:102A7000042004E07047000080B5FFF735FC022118 +:102A800000910023044800F124014FF48052001DFE +:102A900000F094FA01BD000018100020002200F0A0 +:102AA000A1BA00002DE9F84F4FF00009634A644BCA +:102AB0004FF00F0805460E4633E0624FBD4214BF8B +:102AC000072704278F4027434CF82E70C1431C680A +:102AD00001EA040C7468E40248BF40EA0C0CC3F835 +:102AE00000C05C6801EA040C7468A40248BF40EAB4 +:102AF0000C0CC3F804C0146801EA040C7468E40305 +:102B000048BF40EA0C0CC2F800C0546801EA040C4B +:102B10007168890348BF40EA0C0CC2F804C009F18F +:102B20000109316831FA09F000F07E80012404FACD +:102B300009F414EA0100F2D04FEA490C032101FA2A +:102B40000CF16FEA010E716801F00307012F1CBF41 +:102B500001F00301022911D1A968F7680EEA010109 +:102B600007FA0CF73943A960696821EA040471681F +:102B7000C1F3001101FA09F10C436C604FEA8901BD +:102B8000347904F00304032C1FD0EC68B7680EEA14 +:102B9000040407FA0CF73C43EC60347904F00304B6 +:102BA000022C12D14FEAD90705EB870401F01C076C +:102BB000D4F820A008FA07FB2AEA0B0AD6F810B0CE +:102BC0000BFA07F747EA0A0727622C680EEA0407A0 +:102BD000347904F0030404FA0CF43C432C60746868 +:102BE00014F4403F9BD0DFF860C04FEA990E5CF8C8 +:102BF0002E7001F00C0108FA01F427EA0404B5F183 +:102C0000904F08BF00270ED0104FBD4208BF0127CC +:102C100009D00F4FBD4208BF022704D00D4FBD425F +:102C20007FF44BAF03274DE7BDE8F18F81B0002A59 +:102C300014BF8161816201B07047000080080058B4 +:102C40000008005800100048080001400004004837 +:102C500000080048000C0048584900E0584981B07D +:102C60000A6802430A60096808400090009801B0B1 +:102C7000704798B95348544901604FF4E1314160BD +:102C800000218160C160016181610C2141614FF4CB +:102C90000041C1610021816200F0BEB97047002887 +:102CA00004BF484800F009BA704718B94548806F1A +:102CB00000F059BE704738B586B004466846142106 +:102CC000FFF7ECFE2168404A91425FD10220FFF7F6 +:102CD000C5FF402000F05CF83D4D2846FFF7E2FEBE +:102CE0000220FFF7BBFF802000F052F82846FFF7D4 +:102CF000D9FE0120FFF7B2FF4FF4006002210090DF +:102D000001910291072003210391049069464FF03D +:102D10009040FFF7C7FE2F482F4D816A8908890030 +:102D200041F0010181620022016841F480410160AB +:102D30000F21006800F48040059005982420FFF7DB +:102D400001FE2420FFF71CFE0220FFF785FF042070 +:102D5000FFF782FF214828600F2068601020A860DC +:102D60000020E8608020286100206861A861E86197 +:102D70002862284600F022FDA567AC6200220F21E0 +:102D80003A20FFF7DFFD3A20FFF7FAFD07B030BD2C +:102D9000009002210020019102900321072003915D +:102DA00004906946704700680749884204D1074982 +:102DB0000868002818BF0047704700004800005806 +:102DC0004C000058BC20002000380140F0230020B7 +:102DD00000040048600000585C22002044040240C7 +:102DE0001048016841F480410160704710B50D4AF8 +:102DF0000D4B106820F48040106032211C680B4895 +:102E0000B4FBF0F0484351698B0506D5002818BF84 +:102E1000401EF8D101E0002010BD50698105FAD5AF +:102E2000032010BD000400588820002040420F00FD +:102E300038B5040044D094F8210028B9002184F862 +:102E400020102046C046C04600F049F8FF2510B1CA +:102E500000F03FF834E02168DFF8B0008A680240F3 +:102E60008A6021688A68636820690343A069034314 +:102E70001A438A602168E068086120680169A268D5 +:102E800041EA024101612068C16821F08001C1600E +:102E90002068C16C89088900C1642168CA6CE36933 +:102EA000606903431A43CA6420688168880609D4AC +:102EB00000F020F830B120684562042100F01FF8CE +:102EC000012032BD20684562012184F821100020D4 +:102ED00032BD20684562042184F821107047022029 +:102EE00084F82100CA202168486253202268506279 +:102EF000204626E020460BE02068C0F8248084F8B5 +:102F00002110002084F8200070470000BFFF8FFFD1 +:102F100070B5044640F2E9362068C16821F0A0018E +:102F2000C160FFF7EDFC05462068C168880606D43D +:102F3000FFF7E6FC401BB042F6D3032070BD002033 +:102F400070BD70B504462068C1684A0612D44FF0BF +:102F5000FF32C26040F2E936FFF7D2FC0546206836 +:102F6000C168480606D4FFF7CBFC401BB042F6D33D +:102F7000032070BD002070BD70B50F4E0446307840 +:102F80000025A8B100F0D3FD32784FF47A71B1FB7F +:102F9000F2F1B0FBF1F0FFF70DFD48B9102C07D2AC +:102FA000002221464FF0FF30FFF7CCFCB46000E078 +:102FB0000125284670BD00BF6420002010B5029C8A +:102FC000016042600021C160016141618161038152 +:102FD000A107047704D5008910B14FF0FF3010BD70 +:102FE000002010BD00B500BF13009646944610396E +:102FF00028BFA0E80C50FAD85FEA417C28BF0CC07B +:1030000048BF40F8042BC90728BF20F8022B48BF4F +:1030100000F8012B00BD000038B5040009D004F110 +:103020008005686808B900F01EF800F021F8012852 +:1030300001D1012032BDA06A08B100F02AF800F0E9 +:103040000AF821F02A01FFE7816000F01BF8BDE8D3 +:10305000324000F0E8BA2068416821F490414160B4 +:10306000206881687047002129702046FFF723BE41 +:1030700024206860206801684908490001602046F2 +:1030800000F066B92068016841F001010160204646 +:103090007047204600F064BA216851E8002F70475D +:1030A000206800F1080151E8001F00F1080221F03A +:1030B000400142E8001000287047F8B5044640F689 +:1030C0000F002668F1693268B368084004F15C05B6 +:1030D0000ED1880602D5900602D4D80040F1818036 +:1030E0006969002900F029812046BDE8F4400847BD +:1030F000DFF89006034204BFDFF88C763A4270D0C6 +:10310000CF0707D5D70505D5012737622E6B46F0C7 +:1031100001062E638E0708D5DE0706D5276802262E +:103120003E622E6B46F004062E634E0708D5DE077E +:1031300006D5276804263E622E6B46F002062E63F3 +:103140000E070AD5960601D4034206D02668082049 +:103150003062286B40F008002863080509D550014B +:1031600007D526684FF400603062286B40F02000DD +:103170002863286B002833D0890607D5900601D430 +:10318000D80003D5696909B120468847286B2168B2 +:103190008A68510602D410F0280F1CD0204600F097 +:1031A000C7FA00F0D1F811D5FFF77AFFFCD1286AF1 +:1031B00060B10FF2DD518163286A00F09EFB0028A8 +:1031C0000ED0286A816BBDE8F44008472046BDE870 +:1031D000F24000F0DFBC204600F0DCFC0020286359 +:1031E000F1BD286901286AD1CF0668D5D00666D519 +:1031F0001020306200F0A8F82DD5296A08684068D0 +:1032000080B20028ECD02A889042E9DA6880086809 +:1032100001688A061BD4FFF73FFF22F4807200F09A +:103220008FF8F8D1206800F077FAFBD1FFF738FF6C +:10323000FCD12020E86200202861FFF72DFF22F05A +:10324000100200F07DF8F8D1286A00F020FB2988F0 +:103250006888091A2DE028886988411A688800283A +:103260001CBF88B2002868D0226852E8003F23F4CF +:10327000907342E800300028F6D1206800F108027F +:1032800000F1080352E8002FDFF8B802024043E8DB +:1032900000200028F1D12020E86200202861686128 +:1032A000226852E8003F23F0100342E80030002873 +:1032B000F6D12046BDE8F44089B200F06CBCC802EB +:1032C00009D5580207D54FF4801030622046BDE87A +:1032D000F24000F061BC080609D5100601D41802BE +:1032E00005D5A96949B32046BDE8F440084748061A +:1032F00011D550060FD5FFF7CFFE22F0400200F0A7 +:103300001FF8F8D12020A8620020A8612046BDE85F +:10331000F240FFF748BD080206D5500004D520460C +:10332000BDE8F24000F039BCC80148BF002A04D50E +:103330002046BDE8F24000F031BCF1BD22F4F0724D +:1033400041E80020002870472068816848067047DF +:10335000F8B50446DFF848042168DFF848C40A6875 +:10336000DFF844740240A0680243206902436069A8 +:103370000243E06902430A6000254A68E06822F4DB +:10338000405202434A60A369DFF8202491421CBFE7 +:10339000206A03438E68DFF81804064033438B60CD +:1033A0000FF2A416CB6A606A1B0940EA0313CB62D2 +:1033B0006145DFF800044FF4004339D13F6807F05E +:1033C0000307032F4DD8DFE807F0024643494FF0CB +:1033D000010CE169B1F5004F4FF6F07740F08080C5 +:1033E000BCF1010F09D0BCF1020F0AD0BCF1040FEF +:1033F00071D0BCF1080F71D099E000F0AEFB00284D +:1034000015D0626A616836F81230B0FBF3F04A08F2 +:1034100002EB4002B2FBF1F080B2A0F11001B94220 +:10342000EAD20740C0F3420007432068C7607FE04C +:10343000914216D13F6817F4406723D0B7F5806FEB +:1034400009D0B7F5006F03D0B7F5406F06D008E09C +:103450004FF0020C07E04FF0040C04E04FF0080CB2 +:1034600001E04FF0100C9142B3D1BCF1000F09D034 +:10347000BCF1020F0AD0BCF1040F15D0BCF1080F4B +:1034800015D054E000F061FB002851D0616A36F895 +:103490001120B0FBF2F6626802EB42018E4246D385 +:1034A0001103B14205D242E000F005FBECE71846FB +:1034B000ECE75008002110EB062051EB16610023C9 +:1034C00000F06EFBA0F54071DFF8EC2291422ED2A5 +:1034D0002268D0602CE000F0EEFA90E7184690E702 +:1034E000BCF1010F09D0BCF1020F09D0BCF1040FEF +:1034F00018D0BCF1080F18D019E000F02EFBB8B1BD +:10350000626A36F812306168B0FBF3F000EB5100EC +:10351000B0FBF1F080B2A0F11001B94207D22168EE +:10352000C86005E000F0C7FAE9E71846E8E70125BA +:1035300004F1680001214180018000218160C160A7 +:103540002846F2BDFEFFFFEF010002000400060066 +:1035500008000A000C00100020004000800000015C +:1035600090F82810CA0706D502685368C16A23F488 +:1035700000330B43536090F828108A0706D5026881 +:103580005368016B23F480330B43536090F8281089 +:103590004A0706D502685368416B23F480230B4326 +:1035A000536090F828100A0706D502685368816BAB +:1035B00023F400430B43536090F82810CA0606D545 +:1035C00002689368C16B23F480530B43936090F8B7 +:1035D00028108A0606D502689368016C23F400530C +:1035E0000B43936090F828104A0610D50268536880 +:1035F000416C23F480130B435360416CB1F5801F81 +:1036000005D15368816C23F4C0030B43536090F8D9 +:1036100028100A0606D501684A68C06C22F4002208 +:1036200002434A607047F8B5044604F18005002063 +:10363000E8606FF07E47FFF763F90646206801688F +:103640000A0708D50097334600224FF400112046A0 +:1036500000F017F860B9206801684A070AD500979A +:10366000334600224FF48001204600F00AF808B1EA +:103670000320F2BD20206860A8600020E06628706A +:10368000F2BD2DE9F041069C05460E4690461F46C8 +:103690002868C1693140B1420CBF0120002040457B +:1036A00026D114F1010FF3D0FFF72AF9C01B844291 +:1036B00000D33CB900F025F800F02DF8FCD100F063 +:1036C0001AF811E0286801684A07E1D5C1690A05BE +:1036D000DED54FF40062026200F013F800F01BF830 +:1036E000FCD100F008F8C16000210170032000E067 +:1036F0000020BDE8F08105F180002021416081605B +:103700007047296851E8002F22F4D07241E8002068 +:103710000028F6D17047286800F1080151E8001F21 +:10372000490800F10802490042E8001000287047EB +:10373000026852E8003F23F4907342E80031002908 +:10374000F6D1016801F1080201F1080352E8002FE7 +:103750000E490A4043E800210029F2D1C16E012937 +:1037600008D1026852E8003F23F0100342E800311C +:103770000029F6D12021C0F888100021C166016718 +:10378000704700000100001020010004FEFFFFEF61 +:10379000806A00F1560100220A810A8000F0FAB91D +:1037A000F369FFCF003801408800005800800040D6 +:1037B000FFF4FF110024F40000FD0F0038B50400F1 +:1037C00001D1012032BD2168DFF8B002814204F14D +:1037D000240500F044F8022068700A68A0686FF3BE +:1037E0000E120243E068024320690243606902430B +:1037F000A0690243E0690243206A02430A6020464E +:1038000000F011F9A068B0F5804F04BF002161609D +:103810002079696A00F03F0000F014F838B10528FB +:1038200005D2204600F019F900F012F803E000205C +:1038300028636863A8630020A861012068700020E5 +:10384000287032BD0860A96AE86A486060687047FD +:10385000296B00200860696BA86B486070470AD22A +:10386000DFF81C0242181423B2FBF3F292002A6222 +:10387000DFF8100209E0DFF8100242181423B2FB4F +:10388000F3F292002A62DFF80402E861704781B027 +:1038900040B100F124014A78022A05D00420886151 +:1038A00000200870012026E00268136823F00E0350 +:1038B00013604A6A136823F4807313600068026817 +:1038C000520852000260012091F82020CB6902F0DA +:1038D0001C02904058608A6AC86A5060086B30B118 +:1038E000026822F4807202604A6B886B506001208B +:1038F00048700020087001B0704738B500F124020C +:1039000000245178022903D004209061012428E08A +:1039100001680B6823F00E030B6001680D686D08E9 +:103920006D000D60516A0B6823F480730B600121F8 +:1039300092F82030D56903F01C0399406960936ABE +:10394000D16A5960116B31B10B6823F480730B603D +:10395000536B916B5960012151701470516901B121 +:103960008847204632BDF8B500F124010423CA6916 +:1039700014680268156891F8206006F01C0603FAC6 +:1039800006F73C4210D06F070ED51468A50603D485 +:10399000156825F00405156000F03DF8C968002998 +:1039A00038D0BDE8F4400847022303FA06F73C424A +:1039B00013D0AF0711D51468A50605D4156825F0F6 +:1039C0000A05156001224A7000F025F800220A70ED +:1039D0008968F9B1BDE8F4400847082303FA06F600 +:1039E000344217D02B0715D5136823F00E0313604C +:1039F000012291F82030CC6903F01C039A406260E8 +:103A000001228A614A7000220A70096911B1BDE879 +:103A1000F4400847F1BD91F82020CC6902F01C0267 +:103A2000934063607047416C0268144B89089A4266 +:103A300034BF174B174B03EB8101816402F0FF0287 +:103A4000083A1421B2FBF1F1134AC26401F01F01DC +:103A5000012202FA01F10165704701790F4A01F074 +:103A60003F0102EB81024265491E0D4A826501F069 +:103A7000030101228A40C265704700000804024029 +:103A8000F8FFFDBF00000240F8FBFDBF000402404C +:103A9000000802401C08024080080240FC08024066 +:103AA000400902404FF0B040006800F0F000B0283C +:103AB00088BFB020704738B54FF0B044304DA16892 +:103AC00011F00C0106D1FFF7EDFFC0F3031055F81C +:103AD000200032BD04292B4A05D008292A4804D1E8 +:103AE0002168C90222D5104632BDE16801F0030108 +:103AF000022904D0032904D12168C90207D5104640 +:103B000005E0FFF7CFFFC0F3031055F82000E16890 +:103B1000E268E368C1F306214843C2F30211491C7D +:103B20005B0FB0FBF1F05B1CB0FBF3F032BD80B576 +:103B3000FFF7C1FF1149FFE7144A0968C1F30311F8 +:103B400052F82110B0FBF1F002BD80B5FFF7EFFF96 +:103B500000F010F8C1F3022106E080B5FFF7E7FF9F +:103B600000F008F8C1F3C22112F8211001F01F0182 +:103B7000C84002BD0149064A09687047080000585C +:103B80007C3F00080024F4000048E8013C3F0008A6 +:103B90003C0100087047704770477047704700004D +:103BA000B3BBD9B1B2F5803F7DD2022A1ED98C4673 +:103BB000B1FBF2F102FB11C31B0443EA1043B3FB58 +:103BC000F2FC02FB1C3380B240EA0343B3FBF2F089 +:103BD00002FB103240EA0C4000237047022A05D94C +:103BE0008446B0FBF2F002FB10C270474AB105D127 +:103BF00000F0010249085FEA30007047002200230C +:103C0000704700F0E5B80B0002000021002070476B +:103C1000904271EB030CF6D3B3F5803F2FD2F0B591 +:103C2000B3FA83F7B1FA81F4A7F10F0E3D1B5340AD +:103C3000CEF1200602FA0EF2F3415340B5F10F0720 +:103C400046D80F3C2C444140C4F12006A040F1412D +:103C50004140B1FBF3F603FB1611A2FB0645001B26 +:103C6000A94102D2761E8018594180EA010221FA48 +:103C70000EF362FA0EF200215A403046F0BD30B425 +:103C8000B1FBF3FC03FB1C11A2FB0C45001BA9417B +:103C900003D2ACF1010C8018594130BC02460B46EE +:103CA000604600217047B2F1807F65D3F0B5B2FA6B +:103CB00082F7B1FA81F4C7F10F063D1B22FA06F331 +:103CC00007F1110EF24120355A40B5F10F07B8D96E +:103CD0004140C4F12006A040F1414140B1FBF3FC5A +:103CE00003FB1C11A2FB0C45001BA94103D2BCF134 +:103CF000010C801859410F2F12D30F3FC90341EA1D +:103D00005041B1FBF3F603FB1611A2FB0645D4EBC1 +:103D1000C030A94102D2761E8018594146EACC3CF7 +:103D200007B34140C7F12006B840F1414140B1FB23 +:103D3000F3F603FB1611A2FB0645001BA94102D2B4 +:103D4000761E8018594180EA010221FA0EF3C7F16C +:103D5000200462FA0EF20CFA07F05A402CFA04F131 +:103D60003043F0BD80EA010221FA0EF3002162FA2D +:103D70000EF260465A40F0BD8C46B1FBF2F102FBF8 +:103D800011C31B0243EA1063B3FBF2FC02FB1C33BA +:103D90001B024CEA002043EA1063B3FBF2FC02FB77 +:103DA0001C331B024CEA002043EA1063B3FBF2FC15 +:103DB00002FB1C331B024CEA002043EA1063B3FBF6 +:103DC000F2FC02FB1C324CEA00200023704700008A +:103DD0007047000001488047014800475B3E0008EB +:103DE00067410008024841680278891841607047BD +:103DF000642000204748484A01681268B1F1006F0A +:103E00000AD3120302F47F22444882188A4203D361 +:103E100008684349884201D000207047012070475C +:103E200080B5404940480860016881F308884068CF +:103E3000804730BF01BD10B5FFF7DCFF4FF00054E5 +:103E400020B100202070BDE81040E9E7012020707B +:103E500007206070FF20A07010BD38B5334C20687B +:103E6000C00002D4206880011AD54FF00055287890 +:103E700028B9FFF7BFFF10B1FFF7D2FF12E0287893 +:103E800048B9FFF7B7FF30B90120287007206870E4 +:103E9000FF20A87006E02878012818BF022801D06A +:103EA000FFF7C9FF2248016841F47001016000205A +:103EB000FDF758F940B180791E49A160A16821F44D +:103EC0007C5141EA0021A1604FF0B040016841F40B +:103ED0008031016018490A68D208D20042F001021C +:103EE0000A600A6802F00702012AFAD10168890310 +:103EF000FCD581688908890041F0020181608168F0 +:103F000001F00C010829FAD1016849084900016053 +:103F100031BD00004071000880400058FCFFFF07E1 +:103F2000298A449408ED00E00070000894000058CD +:103F300088ED00E0FECAFECA004000580100000003 +:103F40000300000005000000010000000100000067 +:103F5000060000000A00000020000000020000002F +:103F600004000000080000001000000040000000F5 +:103F7000800000000001000000020000A086010097 +:103F8000400D0300801A060000350C0040420F006F +:103F900080841E0000093D0000127A000024F40015 +:103FA00000366E010048E801006CDC0200000000F1 +:103FB0000000000000000000000000004EF68851E4 +:103FC000CEF20001086840F470000860BFF34F8F24 +:103FD000BFF36F8F4FF00070E1EE100A70470000E2 +:103FE0000120C046002801D000F00AF8AFF300809D +:103FF0000020AFF30080FEF7EBFA00F015F80000A8 +:1040000010B5074979441831064C7C44163404E055 +:104010000A68081D114488470146A142F8D110BD25 +:10402000340200008002000000F000B80746384665 +:1040300000F002F8FBE7000080B5AFF30080024A11 +:1040400011001820ABBEFBE726000200FFF7FEBF01 +:10405000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF94 +:10406000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF84 +:10407000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF74 +:10408000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF64 +:10409000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF54 +:1040A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF44 +:1040B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF34 +:1040C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF24 +:1040D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF14 +:1040E000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF04 +:1040F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF4 +:10410000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFE3 +:10411000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFD3 +:10412000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC3 +:10413000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB3 +:104140007047FEE7704770477047FFF74BBE00208F +:10415000FEF7A5BD0020FEF7A8BDFDF7C0BEFDF728 +:10416000DFBCFDF7B3BCAFF30080FFF727FFFFF71D +:1041700037FF0120FFF760BF19E050F8042BD30789 +:1041800044BFA9F101039A18091F0023042942F82A +:10419000043BF9D25FEA817C134604D54FF0000C52 +:1041A000A2F800C09B1CC90744BF0021197050F839 +:1041B000041B0029E1D170472DE9FC4D016800F195 +:1041C0000805490805EBC102019200F108024068A8 +:1041D00000F0010A02EBC108400808EBC00B002008 +:1041E0000021019A95422FD02A68AE186A6832449D +:1041F00000920835009A9642F3D016F9014B009AC6 +:10420000964205D12A68AE186A6832440092083591 +:1042100016F8017B884210D1D84508BFFFF7A9FFE7 +:10422000D8F80000D8F80410BAF1000F18BF4844BD +:104230000144884208F10808EED0002C00F8017B08 +:1042400005D5641CE6D1D5E75846BDE8F68D641E59 +:10425000D5D5CFE725FFFFFF3C030000BC200020A1 +:104260007008000030000320000000004DFFFFFF39 +:1042700002000000020000002C000000A30000006B +:1042800008100020B410000031FFFFFF0200000002 +:1042900002000000B300000002000000280003201C +:1042A00008000000030DFF0186F400000181008179 +:1042B00000810081008100810081008100810081F6 +:1042C00000810081008100810081008100810081E6 +:1042D00000810081008100810081008100810081D6 +:1042E00000810081008100810081008100A900F827 +:1042F000FFF4000001F9000010FC004A040048002F +:104300000400480004004800080048000C00480071 +:104310000C004800093D0030B50A4B5A6842F48051 +:10432000225A60EFF3108472B6802251F8045B4089 +:10433000F8045B521EF9D11868C103FCD484F31051 +:094340008830BD10400058F8005F +:040000050800416747 :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_common.h index 7e66ee35a..8d15b5c11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h index c362c2538..b8b371f68 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -96,6 +95,8 @@ * SMPS used when Set to 1 */ #define CFG_USE_SMPS 0 + + /* USER CODE END Generic_Parameters */ /**< specific parameters ********************************************************/ @@ -110,7 +111,7 @@ /** * AD Element - Group B Feature */ -/* LSB - Firt Byte */ +/* LSB - First Byte */ #define CFG_FEATURE_OTA_SW (0x08) @@ -168,7 +169,7 @@ * Maximum supported ATT_MTU size * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" */ -#define CFG_BLE_MAX_ATT_MTU (156) + #define CFG_BLE_MAX_ATT_MTU (251) /** * Size of the storage area for Attribute values @@ -243,26 +244,34 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -271,6 +280,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -549,7 +570,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -568,5 +589,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h index 89d350648..bdd1fe558 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +39,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h index ad8a207e6..593788991 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/flash_driver.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,5 +174,3 @@ uint32_t FD_EraseSectors(uint32_t FirstSector, uint32_t NbrOfSectors); #endif #endif /*FLASH_DRIVER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h index 7fcd60664..db52de81a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/main.h index c4e49e649..ca03f66cf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -35,5 +34,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ void Error_Handler(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h index f20427b46..beff9bc3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/ota_sbsfu.h @@ -5,17 +5,16 @@ * @brief OTP manager interface ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* This file brings SBSFU functions and constants that are needed by ble_ota project*/ @@ -46,5 +45,3 @@ extern "C" { #endif #endif /*__OTA_SBSFU_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h index 3f313a2f5..8d5527ca3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h index 877423276..dd23dde77 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_debug.c index 8b5be2941..c3a2228a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,17 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ + }; /** @@ -358,5 +366,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_entry.c index 548f7ba79..21931a40e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -439,5 +438,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c index dcd415b18..8279bf76d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/flash_driver.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** - * File Name : flash_driver.c - * Description : Dual core Flash driver - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : flash_driver.c + * Description : Dual core Flash driver + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -82,7 +81,8 @@ uint32_t FD_EraseSectors(uint32_t FirstSector, uint32_t NbrOfSectors) { /** * Notify the CPU2 there will be no request anymore to erase the flash - * On reception of this command, the CPU2 disables the BLE timing protection versus flash erase processing + * On reception of this command, the CPU2 will disables the BLE timing protection versus flash erase processing + * The protection is active until next end of radio event. */ SHCI_C2_FLASH_EraseActivity(ERASE_ACTIVITY_OFF); @@ -142,6 +142,9 @@ SingleFlashOperationStatus_t FD_EraseSingleSector(uint32_t SectorNumber) { SingleFlashOperationStatus_t return_value; + /* Add at least 5us (CPU1 up to 64MHz) to guarantee that CPU2 can take SEM7 to protect BLE timing */ + for (volatile uint32_t i = 0; i < 35; i++); + /* The last parameter is unused in that case and set to 0 */ return_value = ProcessSingleFlashOperation(FLASH_ERASE, SectorNumber, 0); @@ -308,10 +311,10 @@ __WEAK WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) { /** * The timing protection is enabled by either CPU1 or CPU2. It should be decided here if the driver shall - * keep trying to erase/write the flash until successful or if it shall exit ans report to the user that the action + * keep trying to erase/write the flash until successful or if it shall exit and report to the user that the action * has not been executed. * WAITED_SEM_BUSY returns to the user - * WAITED_SEM_FREE keep looping in the driver until the action is executed. This will result in the current tack looping + * WAITED_SEM_FREE keep looping in the driver until the action is executed. This will result in the current stack looping * until this is done. In a bare metal implementation, only the code within interrupt handler can be executed. With an OS, * only task with higher priority can be processed * @@ -319,4 +322,3 @@ __WEAK WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) return WAITED_SEM_BUSY; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/main.c index 8ffb1cb95..b0c1646cf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -370,5 +370,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c index 01979a6d2..811446fff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -178,5 +177,3 @@ void IPCC_C1_RX_IRQHandler(void) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c index 1a1ec888e..750685ab2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS @@ -177,10 +176,12 @@ const uint32_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4}; const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -const uint32_t SmpsPrescalerTable[4][6]={{1,3,2,2,1,2}, \ - {2,6,4,3,2,4}, \ - {4,12,8,6,4,8}, \ - {4,12,8,6,4,8}}; +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -613,5 +614,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..3e0852c8c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in ROM_region { readonly, last section TAG_OTA_END }; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c index 40fde8b7d..ba3cf970e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -125,7 +124,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -202,6 +202,7 @@ void APP_BLE_Init( void ) SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) { + hci_event_pckt *event_pckt; evt_le_meta_event *meta_evt; evt_blecore_aci *blecore_evt; @@ -580,5 +581,3 @@ void SVCCTL_ResumeUserEventFlow( void ) hci_resume_flow(); return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h index 34dd2643e..8986e6ab9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -48,5 +47,3 @@ extern "C" { #endif #endif /*__APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h index 3162e1277..6b889012e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ble_conf.h * @author MCD Application Team * @brief BLE configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -55,12 +54,10 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_HR_SENSOR_APPEARANCE (832) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h index 6d72ba832..c87c21d32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/ble_dbg_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ble_dbg_conf.h * @author MCD Application Team * @brief BLE Debug configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -203,5 +202,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c index 2fbb5de4c..ee5ec0de0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/otas_app.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file otas_app.c * @author MCD Application Team * @brief OTA Service Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -196,7 +195,7 @@ void OTAS_STM_Notification( OTA_STM_Notification_t *p_notification ) CFG_OTA_REBOOT_VAL_MSG = CFG_REBOOT_ON_FW_APP; #ifdef OTA_SBSFU - /* Comunication with SBSFU : FW application installation by SBSFU requested */ + /* Communication with SBSFU : FW application installation by SBSFU requested */ STANDALONE_LOADER_STATE = STANDALONE_LOADER_INSTALL_REQ; #endif /* OTA_SBSFU */ @@ -205,7 +204,7 @@ void OTAS_STM_Notification( OTA_STM_Notification_t *p_notification ) case Wireless_Fw: #ifdef OTA_SBSFU - /* Comunication with SBSFU : by-pass mode requested for Wireless stack installation by FUS */ + /* Communication with SBSFU : by-pass mode requested for Wireless stack installation by FUS */ STANDALONE_LOADER_STATE = STANDALONE_LOADER_BYPASS_REQ; NVIC_SystemReset(); /* it waits until reset */ @@ -235,5 +234,3 @@ void OTAS_STM_Notification( OTA_STM_Notification_t *p_notification ) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/readme.txt index 182846046..f803a26ef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Ota/readme.txt @@ -8,12 +8,12 @@ * @brief OTA implementation ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -57,7 +57,7 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, Dual core - BLE/BLE_Ota/Core/Src/stm32_lpm_if.c Low Power Manager Interface - BLE/BLE_Ota/Core/Src/hw_timerserver.c Timer Server based on RTC - BLE/BLE_Ota/Core/Src/hw_uart.c UART Driver - - BLE/BLE_Ota/STM32_WPAN/App/otas_app.c The OTA service mangement + - BLE/BLE_Ota/STM32_WPAN/App/otas_app.c The OTA service management @par Hardware and Software environment diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_common.h index 23a9cc8d9..33a4d44ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_common.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_conf.h index e6460f0c1..fdadcd042 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,6 +161,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -170,11 +174,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -182,6 +190,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -239,5 +260,3 @@ #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_conf.h index fc9c10d82..092a2a60a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -62,4 +61,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_dbg_conf.h index ceef47f82..86f0fbfe5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/ble_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/gatt_service.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/gatt_service.h index e68ebae02..7bfa8e327 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/gatt_service.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/gatt_service.h @@ -5,17 +5,16 @@ * @brief Header for gatt_service.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -48,5 +47,3 @@ tBleStatus MyVeryOwnWriteCharacteristic_Update(uint16_t UUID, uint16_t newValueL #endif #endif /* __GATT_SERVICE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_conf.h index 6163988c3..3761f5787 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/main.h index 2010fb041..17e4a2819 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_hal_conf.h index a39a652d7..0c95bbe0f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_it.h index bdf9838a0..479867a13 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/gatt_service.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/gatt_service.c index 5c4add26d..9b90ab46b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/gatt_service.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/gatt_service.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file gatt_service.c * @author MCD Application Team * @brief My Very Own Service (Custom STM) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -227,5 +226,3 @@ tBleStatus MyVeryOwnWriteCharacteristic_Update(uint16_t UUID, uint16_t newValueL return ret; }/* end MyVeryOwnWriteCharacteristic_Update() */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/main.c index c08479fca..42e5d0a9b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the Wireless Coprocessor binary. @endverbatim -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -445,7 +445,8 @@ static void BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -663,7 +664,7 @@ static void Ble_Hci_Gap_Gatt_Init(void) } /** - * Update GAP Service Appearence characteristic value + * Update GAP Service Appearance characteristic value */ ret = aci_gatt_update_char_value(gap_service_handle, gap_appearance_char_handle, @@ -1054,5 +1055,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_hal_msp.c index 636f1185b..bbb81916e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +79,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_it.c index 55e1e5b61..d6013f011 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -216,4 +215,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/readme.txt index 28a4f887c..b7c23e4c0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_Peripheral_Lite application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_common.h index 23a9cc8d9..33a4d44ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_common.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_conf.h index f723dcb30..7e14bcf67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -153,32 +152,53 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) #define CFG_BLE_MIN_TX_POWER (0) #define CFG_BLE_MAX_TX_POWER (0) + + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -237,4 +257,3 @@ #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_conf.h index fc9c10d82..092a2a60a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -62,4 +61,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_dbg_conf.h index ceef47f82..86f0fbfe5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/ble_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/gatt_service.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/gatt_service.h index e69b2d1c7..cfc15fe6b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/gatt_service.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/gatt_service.h @@ -5,17 +5,16 @@ * @brief Header for gatt_service.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -57,5 +56,3 @@ tBleStatus MyVeryOwnWriteCharacteristic_Update(uint16_t UUID, uint16_t newValueL #endif #endif /* __GATT_SERVICE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_conf.h index 6163988c3..3761f5787 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/main.h index 2010fb041..17e4a2819 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_hal_conf.h index a39a652d7..0c95bbe0f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_it.h index bdf9838a0..479867a13 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/gatt_service.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/gatt_service.c index ec8f3bc65..61b6124ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/gatt_service.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/gatt_service.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file gatt_service.c * @author MCD Application Team * @brief My Very Own Service (Custom STM) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -162,5 +161,3 @@ tBleStatus MyVeryOwnWriteCharacteristic_Update(uint16_t UUID, uint16_t newValueL return ret; }/* end MyVeryOwnWriteCharacteristic_Update() */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/main.c index c58d776ed..15917674b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the Wireless Coprocessor binary. @endverbatim -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -447,7 +447,8 @@ static void BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -665,7 +666,7 @@ static void Ble_Hci_Gap_Gatt_Init(void) } /** - * Update GAP Service Appearence characteristic value + * Update GAP Service Appearance characteristic value */ ret = aci_gatt_update_char_value(gap_service_handle, gap_appearance_char_handle, @@ -1234,5 +1235,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_hal_msp.c index 636f1185b..bbb81916e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +79,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_it.c index 55e1e5b61..d6013f011 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -216,4 +215,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/system_stm32wbxx.c index d4653a0ce..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/readme.txt index 7f7c6e8e3..bc8b37b59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Peripheral_Lite_EventCallbacks/readme.txt @@ -8,19 +8,19 @@ * @brief Description of the BLE_Peripheral_Lite_EventCallbacks application ****************************************************************************** * - * Copyright (c) 2021 STMicroelectronics. All rights reserved. + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to communicate with simple BLE peripheral with minimum activated features. +How to communicate with simple BLE peripheral with minimum activated features with implemented BLE API event callbacks functions. This example is to demonstrate simple BLE peripheral operation with bidirectional communication with minimalistic CPU2 configuration flow and Lite service support with minimum needed features activation (not including e.g. Tasks Sequencer, Timer Server, Low-Power Manager). diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_common.h index d580f0365..d9622368f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_conf.h index 74d64b36c..08285b23c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_conf.h @@ -5,17 +5,16 @@ * @brief Application configuration file ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -224,26 +223,34 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -252,6 +259,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -533,7 +552,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -552,5 +571,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_entry.h index 89d350648..bdd1fe558 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +39,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_conf.h index b311e6acc..a0e057a65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/main.h index d104dcb7e..8e5a4fd81 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -35,5 +34,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ void Error_Handler(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_hal_conf.h index 3f313a2f5..8d5527ca3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_it.h index 877423276..dd23dde77 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_debug.c index 8b5be2941..7ccfffc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -38,7 +37,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -109,8 +108,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -358,5 +365,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_entry.c index d6fb21b78..209a605eb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -34,6 +33,8 @@ #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private typedef -----------------------------------------------------------*/ @@ -55,6 +56,8 @@ static void Led_Init( void ); static void Button_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* Functions Definition ------------------------------------------------------*/ void APPE_Init( void ) @@ -186,26 +189,164 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - /**< Traces channel initialization */ - APPD_EnableCPU2(); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } + /************************************************************* * * WRAP FUNCTIONS @@ -266,5 +407,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/main.c index 216f28713..a87e093ef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -333,4 +333,3 @@ void Error_Handler(void) /* USER CODE END Error_Handler_Debug */ } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32wbxx_it.c index 93ab2face..cf9bc982f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -179,5 +178,3 @@ void IPCC_C1_RX_IRQHandler(void) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.c index 9fda9ac13..c0fab3ee7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -239,7 +238,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -846,5 +846,3 @@ void SVCCTL_ResumeUserEventFlow( void ) hci_resume_flow(); return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.h index 204004c50..24afa6f0d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -59,5 +58,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*__APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_conf.h index ef00701bf..45c916e29 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ble_conf.h * @author MCD Application Team * @brief BLE configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -56,10 +55,8 @@ /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_dbg_conf.h index 029084b45..16f830164 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ble_dbg_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ble_dbg_conf.h * @author MCD Application Team * @brief BLE Debug configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -210,5 +209,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.c index c67e40016..44bf5e1e0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.c @@ -5,17 +5,16 @@ * @brief Immediate Alert Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -90,5 +89,3 @@ void IAS_App_Notification(IAS_App_Notification_evt_t *pNotification) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.h index 50923e8ed..3f6b96010 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/ias_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file ias_app.h * @author MCD Application Team * @brief Header for ias_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -42,5 +41,3 @@ void IASAPP_Init(void); #endif #endif /*__IAS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.c index c60a30aa7..8e1775d58 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.c @@ -5,17 +5,16 @@ * @brief Link Loss Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -122,5 +121,3 @@ void LLS_App_Notification(LLS_App_Notification_evt_t *pNotification) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.h index 06dd0dd2a..782b7e584 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/lls_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file lls_app.h * @author MCD Application Team * @brief Header for lls_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -42,5 +41,3 @@ void LLSAPP_Init(void); #endif #endif /*__LLS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.c index b42344a8e..c7bf337ba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.c @@ -5,17 +5,16 @@ * @brief TX Power Service Application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -63,5 +62,3 @@ void TPSAPP_Init(void) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.h index 1d2072788..800560a92 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/App/tps_app.h @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file tps_app.h * @author MCD Application Team * @brief Header for tps_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -42,5 +41,3 @@ void TPSAPP_Init(void); #endif #endif /*__TPS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/readme.txt index 89aa386b5..856efad76 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Proximity/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE Proximity example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -107,7 +107,7 @@ With the Smart Phone application: - The Proximity Service Set an RSSI threshold - The red led is switched ON (green led switched OFF) if the Path loss value exceeds the threshold - The green led is switched ON red led switched OFF) if the Path loss is under the threshold. - - The path loss value varies with the distance beetween the phone and the nucleo board. + - The path loss value varies with the distance between the phone and the nucleo board. + Warning: the led status in Proximity Service is notified (by BLE profile application) only when the threshold is updated by user. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Binary/BLE_RfWithFlash_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Binary/BLE_RfWithFlash_reference.hex index d0e9b5711..c3709ce88 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Binary/BLE_RfWithFlash_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Binary/BLE_RfWithFlash_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:1000000018C8022051880008FD850008FF850008F7 -:10001000018600080386000805860008000000002D -:10002000000000000000000000000000078600083B -:1000300009860008000000000B8600080D860008F5 -:1000400073880008778800087B8800084B860008C2 -:100050007F880008838800083F86000845860008DE -:10006000878800088B880008398600088F88000878 -:100070009388000897880008118600089B8800086C -:100080009F880008A3880008A7880008AB8800089C -:10009000AF880008B3880008B7880008BB8800084C -:1000A000BF880008C3880008C7880008CB880008FC -:1000B000CF880008D3880008D7880008DB880008AC -:1000C000DF880008E3880008E7880008EB8800085C -:1000D000178600081D860008EF880008F3880008CE -:1000E000F7880008FB880008FF88000803890008DB -:1000F000538600084F8600085786000807890008C5 -:100100000B8900080F890008138900081789000867 -:100110001B8900081F890008238900082789000817 -:100120002B8900082F8900082386000833890008DE -:10013000378900083B8900083F8900082DE9F84FFE +:1000000008100020AD8A00084188000843880008D5 +:10001000458800084788000849880008000000005B +:100020000000000000000000000000004B880008F5 +:100030004D880008000000004F8800085188000823 +:10004000CF8A0008D38A0008D78A00088F88000862 +:10005000DB8A0008DF8A0008838800088988000896 +:10006000E38A0008E78A00087D880008EB8A000818 +:10007000EF8A0008F38A000855880008F78A00080C +:10008000FB8A0008FF8A0008038B0008078B000822 +:100090000B8B00080F8B0008138B0008178B0008D0 +:1000A0001B8B00081F8B0008238B0008278B000880 +:1000B0002B8B00082F8B0008338B0008378B000830 +:1000C0003B8B00083F8B0008438B0008478B0008E0 +:1000D0005B880008618800084B8B00084F8B000884 +:1000E000538B0008578B00085B8B00085F8B000860 +:1000F00097880008938800089B880008638B000895 +:10010000678B00086B8B00086F8B0008738B0008EF +:10011000778B00087B8B00087F8B0008838B00089F +:10012000878B00088B8B0008678800088F8B00087E +:10013000938B0008978B00089B8B00082DE9F84FE4 :100140000FF2D017A2B0D7E90045CDE900452C9EAB :10015000DFF82C7C04918DF8436000210FF2BC1471 :100160000D9112944FF0FF368246904699460FE06B @@ -26,7 +26,7 @@ :1001800000F0B2800D98401C641E0D90F2D1A8447E :1001900098F80000252807D10021079108910991BE :1001A0000A910B910C910DE06A463146404600F0F1 -:1001B000FDFF050001D10D98B4E0D9D50125E6E792 +:1001B000CFFF050001D10D98B4E0D9D50125E6E7C0 :1001C00041F0010118F8010F2028F9D023280CD0A4 :1001D0002B2804D02D2805D0302809D086E041F006 :1001E0000201EFE741F00401ECE741F00801E9E723 @@ -39,7 +39,7 @@ :10025000010B002000220E920BE040B90E9ABA4228 :1002600005DA02EB820403EB4403303B0E9308F102 :10027000010898F80030A3F130020A2AEDD3ADF856 -:100280004010129898F8001000F09CFF08B118F880 +:100280004010129898F8001000F06EFF08B118F8AE :10029000010B8DF842009DF84200682804BF98F8D1 :1002A0000010682903D162208DF8420008E06C2814 :1002B00004BF98F800006C2804D171218DF8421019 @@ -96,9 +96,9 @@ :1005E0000B6053F8042B0B6052BB4FF0FF340FF637 :1005F000AC200EE095F83A206C2AF0D0086808602C :1006000050F8044B0860EC603CB94FF0FF340FF633 -:10061000702000F0F1FD201A76BD2E6B002E04D55F -:10062000204600F00BFE044608E03246002120463A -:1006300000F020FE002814BF041B3446AC6117E014 +:10061000702000F0B5FD201A76BD2E6B002E04D59B +:10062000204600F0CFFD044608E032460021204677 +:1006300000F0E4FD002814BF041B3446AC6117E051 :10064000294600F092F8002812D54FF0FF3076BD11 :100650006869411C69612521315409E06969481CB8 :10066000686125227254210002D0411C6961345412 @@ -119,14 +119,14 @@ :1007500038B1F06A401C641EF062F5D10020BDE89B :10076000F0814FF0FF30BDE8F0812DE9F8470D46EC :10077000A3B02F6B002F8146904648BF6FF0004713 -:1007800000F0A4FD696B40180FF62C118128D1E907 +:1007800000F068FD696B40180FF62C118128D1E943 :100790000023CDE9012328BF4FF0FF303ED20024D3 -:1007A000002F2FDDD8F8001001AA684600F000FDE8 +:1007A000002F2FDDD8F8001001AA684600F0D2FC17 :1007B0000646002E35D4D8F8000008B9761E30D48D :1007C000B7421FDB6869301881280AD300206863AC :1007D00003AA29464846FFF74DFF040012D4002023 :1007E000686103A8D5F814A032466946504400F069 -:1007F00073FDB244C5F814A058F8040B002818BFC4 +:1007F00037FDB244C5F814A058F8040B002818BF00 :10080000BF1BCDD12CB903AA29464846FFF732FFBA :10081000044614B9002068616863204624B0BDE82E :10082000F0874FF0FF34F8E72DE9FC4707468A468A @@ -139,17 +139,17 @@ :1008900000280ED597F8380000F01400102808D171 :1008A0007A6B7869121A386A121A511A0029C8BF6D :1008B0003962BDE8F3878DF800A0404649462246DC -:1008C000E31700F05DFD3032D0B26D1E3A2801957D +:1008C000E31700F021FD3032D0B26D1E3A280195B9 :1008D00004DB9DF80000A0F151018A1872554046D2 -:1008E00049462246E31700F04BFD8046894600202A +:1008E00049462246E31700F00FFD80468946002066 :1008F000814508BF804503D0F86871198842DCD370 :10090000082C09D197F83800010705D5715D302909 :1009100002D06D1E30207055C5F13C01B9617019CF :10092000F860386B8142B3DA411A39624FF6EF70E2 :10093000398F01403987BDE8F3872DE9D04306465A :100940000F4614464FF00008DFF8389412E0E00735 -:1009500007D542464B463046394600F029FE06464A -:100960000F464046494642464B4600F021FE641081 +:1009500007D542464B463046394600F0EDFD064687 +:100960000F464046494642464B4600F0E5FD6410BE :1009700080468946002CEAD130463946BDE8D0830E :100980002DE9F34F054641F020048DB0D5E90089EB :10099000612C02AE09D0286B002848BF062003D482 @@ -158,27 +158,27 @@ :1009C000380061381A2802D20FF2F46111E00FF2F8 :1009D000F4610EE058004015401C0FD119030DD1F1 :1009E0000320A8619DF8380061381A2814D30FF24B -:1009F000DC61E868032200F06FFCD3E1194621F0C6 +:1009F000DC61E868032200F033FCD3E1194621F002 :100A00000043B3F5801F10460DD20027BB4208BF3C :100A1000BA42019703D111E00FF2AC61E9E701AAF4 -:100A200000F098FE0AE0DFF8607307EB1352DFF87E +:100A200000F05CFE0AE0DFF8607307EB1352DFF8BA :100A30005C3301921940DFF858331943C5E90001CE :100A4000612C0ED1E86830210170811CE9609DF8AD :100A5000381061290CBF7821582141706869801CC9 :100A60006861D5E900AB2BF0004300202AF00002BA :100A7000834204BF8242002300F05A81612C40F07F :100A8000A980286B00284CBF2120401C00904046C4 -:100A9000009F7F1C49460022002300F093FED946A8 +:100A9000009F7F1C49460022002300F057FED946E4 :100AA00001988DF8082038BF89F00049001F019097 :100AB000002FD0460DF1090040F3498140F2FF714B :100AC000DFF8D0B20C91064640464946002200238A -:100AD00000F090FE80F03A814800400D00F11C02C9 +:100AD00000F054FE80F03A814800400D00F11C0205 :100AE00010D0002A0EDD0C98824205DB09F0004090 :100AF00040EA0B01002013E0A448084040EA0251FC :100B000040460DE029F00043002028F00002834217 -:100B100008BF82420FBF40461C22404600F082FEC2 -:100B20008046894600F01CFFFF1F002F044609DDA8 -:100B300000F034FF02460B464046494600F040FFB5 +:100B100008BF82420FBF40461C22404600F046FEFE +:100B20008046894600F0E0FEFF1F002F044609DDE5 +:100B300000F0F8FE02460B464046494600F004FF2E :100B400080468946F01D072104E004F00F0200F8FA :100B5000012D2411002C01DD491EF6D5491E5CBF74 :100B6000002200F8012DF9D5ECE00020194602AA78 @@ -188,20 +188,20 @@ :100BA0009DF838007218147804F130085FFA88F460 :100BB000392CC4BFA0F13A04A044491E02F80189AF :100BC000F1D58DF83800286B002840F1B080591E0F -:100BD0002963ACE0404649460022002300F0F2FDC4 +:100BD0002963ACE0404649460022002300F0B6FD00 :100BE000019938BF89F0004947F2975041436A4A5A :100BF00091FBF2F20192D2F1070204DD4046494630 :100C0000FFF79BFE0AE0524200206449FFF795FE81 -:100C100002460B464046494600F044FF8046662C9B +:100C100002460B464046494600F008FF8046662CD7 :100C2000286BDFF87CB106BF019F0A3706273F1803 :100C3000142FC8BF142730208DF8080089460DF105 :100C4000090000E03046002F34DD064640464946A4 -:100C500001F04CF801460A4606F1080304200A2672 +:100C500001F010F801460A4606F1080304200A26AE :100C6000B2FBF6F606EB860EA2EB4E02303203F82C :100C7000012C0A22B6FBF2F202EB820EA6EB4E0624 :100C80003036401E03F8026DE9D1083F002F03F112 -:100C90000806D7DD084601F03DF802460B464046FF -:100CA000494600F08DFE00225B4600F081FC804644 +:100C90000806D7DD084601F001F802460B4640463B +:100CA000494600F051FE00225B4600F045FC8046BC :100CB0008946CBE70DF10901401A0DF1090604E060 :100CC0000199491E401E0191761C31783029F7D0D8 :100CD000662C02D10199491C03E0652C0CBF01214F @@ -218,7 +218,7 @@ :100D8000CBCCCC0C0000244002FCFFFFFFFF0F8007 :100D90000000E03F0000F07FA08601000000F03F6F :100DA00084D797410FB0BDE8F08F2DE9F84783B0A5 -:100DB00006468A461746984600F0FCF9B8F1000F3F +:100DB00006468A461746984600F0CEF9B8F1000F6D :100DC000406A356B90F8009003DC4FF001080FF299 :100DD0000037BDF930404AF02000662808BF641C87 :100DE00015D0672840F0848014F1040FC0F286808B @@ -229,14 +229,14 @@ :100E300000F80290521C15EB0A0FB8BF6C4220B2AA :100E4000441941424445B8BFA046B26171620FFAED :100E500088F5F561F068B3692A463946184400F010 -:100E60003BFA641BB462C4E022B29045084417DA2E -:100E70004246394600F030FAB0694044B061AAEB0E +:100E6000FFF9641BB462C4E022B29045084417DA6B +:100E70004246394600F0F4F9B0694044B061AAEB4B :100E80000801002D716203DC96F838100A0705D5B9 :100E9000F16801F80090F069401CF061B562A8E0CB -:100EA000394600F019FAB069002D5044A8EB040847 +:100EA000394600F0DDF9B069002D5044A8EB040884 :100EB00003DC96F838100A0703D5F16801F80090B2 :100EC000401CB0610FFA88F08542F068B369B8BF82 -:100ED000A8460FFA88F207EB0A01184400F0FCF963 +:100ED000A8460FFA88F207EB0A01184400F0C0F99F :100EE000B0690FFA88F10844B061681A706280E056 :100EF000BAF1610F14D14FF0700A16E0A84504DA78 :100F000096F838100A0758BF45466D1E48BF0025A1 @@ -245,7 +245,7 @@ :100F3000B061002D17F8012B5A5403DC96F83810D5 :100F40000A071BD5F168431CB36101F80090002D1E :100F500014DDA8F101080FFA88F08542F068B8BFE7 -:100F6000A8460FFA88F23946184400F0B5F9B0697E +:100F6000A8460FFA88F23946184400F079F9B069BA :100F70000FFA88F108446D1AB0617562F068B169C2 :100F80000844002C80F800A003D42B214170811C60 :100F900003E02D2141706442811C00206A460AE072 @@ -268,1950 +268,1995 @@ :1010A00074665F733A2062616420256C73206172FC :1010B00067756D656E7400000000000000000000A0 :1010C0006E616E004E414E00696E6600494E4600EC -:1010D0003000F0B40246106895681318506803EBAE -:1010E0005004C00721D54D441FE0F0BC02F10C00B4 -:1010F000704713F8017B05F8017B491EF9D1A0B1B7 -:10110000B60813F8011B06F00306032E08BF13F8F8 -:10111000016B01EB06214942801C294405D011F8DE -:10112000016B05F8016B401EF9D1A342DDD013F825 -:10113000016B16F0030104BF13F8011BC91C300931 -:101140000F28DAD113F8010B0F30D6E71B48704790 -:1011500030B45368D418042B09DA41B1057804F887 -:10116000015B10F8015B15B15B1C491EF3E753608E -:1011700030BC704738B514461D4661B1FFF7E8FF33 -:1011800061686A6B204690476FF00102811A02D0B5 -:10119000491E03D005E06FF0010032BD4FF0FF3073 -:1011A00032BD0021616032BDDA6B1047034BE1E7CD -:1011B000024BF9E70248704700000000E4100020ED -:1011C000AC1000200278C9B28A421AB11CBF10F8D4 -:1011D000012FF9E718BF00207047B1F5807F02D3D7 -:1011E0004FF0FF3070470170012070470078401EBB -:1011F0008041C043C00F704780B508B90FF21C0092 -:1012000005490B681BB122220021984701E000F03C -:101210008EFD222002BD00000CB80220636F6E73A9 -:10122000747261696E742068616E646C65723A20D4 -:10123000626164206D6573736167650000F101038D -:10124000810704D010F8011B89B18107FAD1026827 -:10125000B2F10131914311F0803F04BF50F8042FE7 -:10126000F6E710F8011B11B110F8011BFBE7C01ADB -:1012700070470000C9B2830706D0521E22D310F86F -:10128000013B9942F7D11FE0083A13D302F104025F -:1012900041EA012141EA014150F8043B121F21BFFC -:1012A0004B40A3F1013C2CEA030C1CF0803FF3D02F -:1012B000C9B2001F083210F8013B521E28BF91EA44 -:1012C000030FF8D818BF0120401E704780B5FFF704 -:1012D0003DFF006C02BD000062B38B0708D0521EB8 -:1012E00011F8013B00F8013B00F024808B07F6D198 -:1012F000830740F0208000BF103A07D330B4B1E834 -:101300003810103AA0E83810F9D230BC530724BF87 -:10131000B1E80810A0E8081044BF51F8043B40F8B9 -:10132000043BD20724BF31F8022B20F8022B44BF24 -:101330000B7803707047121F17D35B0009D151F867 -:10134000043B20F8023B1B0C121F20F8023BF6D294 -:101350000BE051F8043B00F8013B1B0A20F8023B6C -:101360001B0C121F00F8013BF3D238BF121D521E96 -:1013700024BF11F8013B00F8013BF8D8704700008A -:10138000B3BBD9B1B2F5803F7DD2022A1ED98C46BB -:10139000B1FBF2F102FB11C31B0443EA1043B3FBA0 -:1013A000F2FC02FB1C3380B240EA0343B3FBF2F0D1 -:1013B00002FB103240EA0C4000237047022A05D994 -:1013C0008446B0FBF2F002FB10C270474AB105D16F -:1013D00000F0010249085FEA300070470022002354 -:1013E000704700F0A7BC0B000200002100207047EE -:1013F000904271EB030CF6D3B3F5803F2FD2F0B5DA -:10140000B3FA83F7B1FA81F4A7F10F0E3D1B5340F5 -:10141000CEF1200602FA0EF2F3415340B5F10F0768 -:1014200046D80F3C2C444140C4F12006A040F14175 -:101430004140B1FBF3F603FB1611A2FB0645001B6E -:10144000A94102D2761E8018594180EA010221FA90 -:101450000EF362FA0EF200215A403046F0BD30B46D -:10146000B1FBF3FC03FB1C11A2FB0C45001BA941C3 -:1014700003D2ACF1010C8018594130BC02460B4636 -:10148000604600217047B2F1807F65D3F0B5B2FAB3 -:1014900082F7B1FA81F4C7F10F063D1B22FA06F379 -:1014A00007F1110EF24120355A40B5F10F07B8D9B6 -:1014B0004140C4F12006A040F1414140B1FBF3FCA2 -:1014C00003FB1C11A2FB0C45001BA94103D2BCF17C -:1014D000010C801859410F2F12D30F3FC90341EA65 -:1014E0005041B1FBF3F603FB1611A2FB0645D4EB0A -:1014F000C030A94102D2761E8018594146EACC3C40 -:1015000007B34140C7F12006B840F1414140B1FB6B -:10151000F3F603FB1611A2FB0645001BA94102D2FC -:10152000761E8018594180EA010221FA0EF3C7F1B4 -:10153000200462FA0EF20CFA07F05A402CFA04F179 -:101540003043F0BD80EA010221FA0EF3002162FA75 -:101550000EF260465A40F0BD8C46B1FBF2F102FB40 -:1015600011C31B0243EA1063B3FBF2FC02FB1C3302 -:101570001B024CEA002043EA1063B3FBF2FC02FBBF -:101580001C331B024CEA002043EA1063B3FBF2FC5D -:1015900002FB1C331B024CEA002043EA1063B3FB3E -:1015A000F2FC02FB1C324CEA0020002370470000D2 -:1015B000B0B581EA030C0CF0004C40F2FF7515EA5F -:1015C00011541DBF15EA1357AC42AF4239E0E4197C -:1015D00023EA455343F48013C90241F0004141EA34 -:1015E000505EC7021100A7FB020200284FF0000066 -:1015F000EEFB01204FF00001E3FB072118BF42F092 -:101600000102401800214941E3FB0E01A4F580646A -:101610000F0302D252004041494154F101046CDDF4 -:10162000470872F1004250F1000051EB0451A1F55E -:1016300080115CBF41EA0C01B0BD4CEA05510020AD -:10164000B0BD05EA1357AC4214BFAF4241E050EAC7 -:10165000410E1CBF52EA430E02E061460020B0BDBD -:1016600024423C441BD15FEA070EF6D0090302BFB7 -:1016700001460020AEF1140EB1FA81F7AEEB07047B -:1016800001FA07FE0C37C7F1200100FA07F7C8403E -:101690004EEA000E23EA455343F48013A2E733F0E9 -:1016A0000043B3FA83F704BFB2FA82FE77440B3FDC -:1016B000E41BB7F1200E2FBF02FA0EF3BB40C7F1B7 -:1016C000200E22FA0EFE38BF43EA0E03BA40641C15 -:1016D00082E750EA410E14BF52EA430E6FF0000158 -:1016E0004FF4001717EB430F8ABF194617EB410F52 -:1016F000B5E74CEA05510020B0BDD4F10104B4F1C6 -:1017000020070FDAC4F12007520828BF42F0010277 -:1017100010FA07F501FA07F7E1BF2A43E040384322 -:10172000E1400FE0352C98DCC7F1200452EA40027A -:1017300020FA07F218BF42F0010231FA07F0A14087 -:101740000A43002172F1004250F1000051EB0C01FC -:10175000B0BD000010B5144600F002F8226010BDC4 -:10176000C1F30A5343B14A0012F5001F28D2A3F275 -:10177000FE32A1EB0251704750EA410C20D001F03B -:10178000004C31EA0C01B1FA81F204BFB0FA80F3E7 -:10179000D2180B3AB2F120032CBF00FA03F19140AA -:1017A00041EA0C013EBFC2F1200C20FA0CF31943B0 -:1017B0009040524240F2FD33D21A01EB0351704780 -:1017C000002270474FF4001C1CEB410F94BF1CEB30 -:1017D000430F09E041EA030C50EA4C0C52EA0C0CAE -:1017E00003D2994208BF9042704714BF8B42824295 -:1017F000704700004FF4001C1CEB410F94BF1CEB22 -:10180000430F09E041EA030C50EA4C0C52EA0C0C7D -:1018100003D28B4208BF8242704714BF9942904264 -:1018200070470000124254D440F2FF7C1CEA11536E -:101830000FD0634531D09B1863453CBF01EB02518B -:10184000704701F0004141EA0C510020AFF30080E5 -:10185000704750EA410320D001F0004C91EA0C019E -:101860001CD0B1FA81F30B3B9A420DD9D21A9940A0 -:1018700051EA0C01C3F1200C20FA0CFC61449840A1 -:10188000531C40F2FF7CD7E7914041EA0C01C2F1C2 -:10189000200C20FA0CF3194390407047B0FA80F303 -:1018A0001533202BE0D3202AEED3203A203B9A4256 -:1018B00009D9D21A00FA03F141EA0C010020531CA5 -:1018C00040F2FF7CB8E700FA02F141EA0C01002087 -:1018D0007047524240F2FF7C1CEA11530DD0634521 -:1018E000DBD0B2EB030C3CBFA1EB025170470CF113 -:1018F000010221EA035141F4801150EA410CCCD09D -:1019000001F0004C352A27DC30B481EA0C01B2F139 -:10191000200309DAC2F12003044601FA03F5D0409E -:101920002843D1409C400CE0C3F12002450020FA3E -:1019300003F418BF44F0010421FA03F091400C4372 -:10194000002174F1004550F1000051EB0C012442DC -:1019500030BC7FF47BAF70476146002076E7000023 -:10196000C1F30A5340F2FE329B1A14DDD3F1200377 -:101970004FEAE17208DDC90241EA505141F00040EE -:10198000D84080185040704703F2E13010B1D24384 -:1019900082F000407047002070470000C11768B116 -:1019A0004840401AB0FA80F29040D21CC907C2F5F4 -:1019B000846241EA025202EBD021400570470000E8 -:1019C00070B44FF0004591EA030F40F1B5816B40D0 -:1019D000841A71EB030603D2001BB1411219734143 -:1019E0004FF4001C1CEB410F34BF7CEB430442E07E -:1019F0000C0DA4EB1356352E4FDC45EAC323DB0A4E -:101A000045EAC121C912B6F120050DDD63FA05F6DC -:101A1000EB4086EA0305124218BF45F00105C018E5 -:101A200051F100010CD213E062FA06F5F240554084 -:101A3000F3415A40B340F3405A408018594107D30C -:101A400049085FEA30005FEA350528BF45F0010527 -:101A500001F58011420875F1004250F1000041EBA0 -:101A600004514E0016F5001F70BC38BF70470020AF -:101A7000090D090570471CEB410F10D252EA4306CD -:101A80000BD0BCEB410F05D80C0DAB43661E342EBA -:101A9000B6DD02E0AB438018594170BC704770BCA2 -:101AA00070470000F0B540F2FF7581EA030C0CF0BE -:101AB000004C15EA11541DBF15EA1357AC42AF4252 -:101AC000E5E0BC41C1F31301C3F31303801A99414C -:101AD00043F4801304D2641E4000494180185941E8 -:101AE000C90241EA5051B1FBF3F603FB1611A2FB08 -:101AF0000675D7EBC020A94102D2761E8018594145 -:101B0000C90241EA5051B1FBF3FE03FB1E11A2FBD7 -:101B10000E75D7EBC020A94103D2AEF1010E80189B -:101B20005941890241EA9051760546EA8E2EB1FB71 -:101B3000F3F603FB1611A2FB0675D7EB8020A94133 -:101B400002D2761E80185941C90241EA50514EEA2C -:101B5000060EB1FBF3F603FB1611A2FB0675D7EBDD -:101B6000C020A94102D2761E80185941C90241EA1B -:101B70005051B1FBF3F703FB1711A2FB0735D3EB71 -:101B8000C020A94167F100070CBF004247F00107E0 -:101B900066F3D5274FEA1E31B80814F5806412DDCC -:101BA000BD0775F1004250EB0E5051EB045111F599 -:101BB000801F5CBF41EA0C01F0BD4CF07F6141F039 -:101BC000E0410020F0BDBD076D0840EA0E5041F431 -:101BD0008011D4F10104B4F120060ADAC4F1200620 -:101BE0000200E04001FA06F3E1401843B240154319 -:101BF0000EE0342C13DCC6F1200445EA40056D08E4 -:101C000020FA06F2154321FA06F0A1400D43002107 -:101C100075F1004250F1000051EB0C01F0BD0020C5 -:101C20005FEA0C01F0BDCFB992185B41B3FA83F7BC -:101C300004BFB2FA82F6BF190B3FB7F120062FBFDF -:101C400002FA06F3BB40C7F1200622FA06F638BFB7 -:101C50003343BA401CB1E419641E33E77F4231F0CC -:101C60000041B1FA81F404BFB0FA80F6A4190B3C2C -:101C7000B4F120062FBF00FA06F1A140C4F12006FE -:101C800020FA06F638BF3143A0403C1B1AE7AC42AD -:101C90001ABF05EA1357AF4212E050EA41061CBFD3 -:101CA00052EA4306BFE750EA4107304661461CBF8F -:101CB00041EA0551F0BD52EA430C08BFC143F0BDF3 -:101CC00000204FF4001616EB410F98BF16EB430FA0 -:101CD00008BF16EB410F24BFC14305E016EB430FCD -:101CE0000CBF61464CEA0551F0BD0000400D49189B -:101CF00040EA81200CD2490DA1F58061491C40F0D9 -:101D0000004005DBD1F11F0154BFC840C017704728 -:101D100000207047014648B1B0FA80F18840C91CE4 -:101D2000C1F58461090501EBD02140057047012010 -:101D300000F0B6B870470000841A71EB030604D2B5 -:101D40006E40001BB141121973414FF4001C1CEB93 -:101D5000410F34BF7CEB430682E00C0DA4EB13561D -:101D6000362E7BDC012E45EAC32341DC43EA525385 -:101D700012BFD20292025B08240545EAC12141EA62 -:101D80005051D2EBC020994125D407D1B0FA80F64A -:101D900010FA06F162D00020203608E0B1FA81F690 -:101DA000B140C6F1200220FA02F21143B0404FEADE -:101DB000F474B4EB465434F001064FEA74040AD8C4 -:101DC000D6F50016760D04F00044F04061FA06F2F4 -:101DD0005040F1404840C00A40EA415021F00041E3 -:101DE00028BF5FEA500550F1000044EBD12135E0F7 -:101DF000DB0A45EAC121C90AB6F120050EDD42EA37 -:101E00000242120CC5F1200603FA06F6EB4042EA44 -:101E100006056D42984161F100010DE062FA06F598 -:101E2000F240554063FA06FC82EA0C02F3405A4045 -:101E30006D42904161EB030111F4801F05D1641ED6 -:101E4000620502D06D004041494121F480114308F0 -:101E500075F1004350F1000041EB045170BC704734 -:101E60001CEB410F15D223F0004352EA43060BD07E -:101E70004FEA4C0CBCEB410F04D80C0D661E342EFF -:101E8000B7DDEBE7801A994150EA410608BF00210F -:101E9000E4E708BF1CEB430F28BF6FF00001DDE74C -:101EA00080B5AFF30080024A11001820ABBEFBE7FB -:101EB0002600020070B58EB002A80FF20811DFF8FC -:101EC00048473022FFF718FA0FF2A57001900094EE -:101ED00069460FF2857000F075FF0121022001F0C4 -:101EE0005AF8DFF828270021082001F0D0F802A8CE -:101EF00001F04EF908B101F005FB00F017FA01F00E -:101F000003FBDFF80C470FF24562DFF8086700209B -:101F100084F8900004F126054FF6FF702880002118 -:101F2000012001F0B4F80FF271620021042001F0E9 -:101F3000AEF82A2070614FF4A840B0610020B07064 -:101F4000F070307100210FF26D22202001F09FF817 -:101F5000012001F039F90020DFF8BC26002102EB56 -:101F6000C003C3E90001401CB0F5A84FF7D3DFF868 -:101F7000AC164FF400400860062001F059FB002029 -:101F800030700120707001F0E8FB0FF2FD53002269 -:101F900004F19101002001F0DDFE0FF2F553002263 -:101FA00004F19201002001F0D5FE0020688080211C -:101FB000DFF86C060180A0214180012000F05CFA6E -:101FC0000EB070BD00000000000000000000000026 -:101FD000000000000000000044000800400502016D -:101FE00012279C00F4010000FFFF000048010100DF -:101FF00000200000F8B50746DFF814467878DFF8CF -:102000001456052804F1900604D03E2812D0FF286B -:1020100061D0CDE0B888E18C884206D10020E08410 -:1020200030700FF2706001F057FF012000F024FAC9 -:10203000012048E0F87801282BD0032802D00C2892 -:1020400003D0B5E00FF27460A8E00FF29C6001F0DD -:1020500043FF387900280CBF0FF2A8600FF2CC6064 -:1020600001F03AFFE08C6A460DF1010101F072FFC8 -:1020700060B90FF2E06001F02FFF9DF800209DF89D -:1020800001100FF2E46001F027FF91E00FF2F4601D -:1020900084E0707801F084FEB7F805100FF200704C -:1020A00001F01AFF307804280CBF0620052030709C -:1020B0000021B7F80500E0846881297205F1080065 -:1020C00001F045FB00202872E08C688105F10800D2 -:1020D00001F03DFB6CE0B7F80300001F61D04FF446 -:1020E0007F71401A18D0401E49D0401E17D0401EA4 -:1020F0001CD0401E1DD0401E1ED0801E4CD0401E45 -:1021000024D0401E28D0401E23D040F2F631401A81 -:1021100004BF012068704BE00FF2C8603EE00FF290 -:10212000F46001F0D9FE0FF2147037E00FF22C705A -:1021300034E00FF2587031E00FF2847001F0CCFE01 -:10214000E08C02F084F80FF2A07027E00FF2B47078 -:1021500024E00FF2E07021E0D7F807100FF604003A -:1021600001F0BAFED7F807100FF6100001F0B4FE28 -:10217000E08C012102F0B9F80FF614000EE0F979B5 -:102180000FF64C0001F0A8FEF879002814BF0FF6F6 -:10219000B4000FF69C0001E00FF6BC0001F09CFEBD -:1021A00006E0012002F0EFF8B0780A2101F047FEC6 -:1021B0000120F2BD2DE9FC47DFF86804DFF8546424 -:1021C0000468F178B0780FF6EC09DFF85C7404F07D -:1021D000FF04651E0029A4F12A0839D138B92A461E -:1021E00041460FF6A00001F077FE0121B170706941 -:1021F0000146201A02F040F9002870616FD10120D9 -:10220000F0704FF0FF320020B0702A20706100267D -:10221000A01907EB003E4FF4007CDEE9000191427B -:1022200008BF90420CD1BCF1010C0EF1080EF4D1A4 -:10223000761C2A2EECD32A4641460FF6980041E040 -:102240007146484601F048FE022002F09CF8FEE785 -:1022500038B92A4641460FF6BC0001F03DFE012088 -:10226000B0704FEA043AB269DFF8AC43D0004042A4 -:102270002044134600F5283152420AEBC20000F117 -:1022800000601A4602F028F9B06140BBF070B070EF -:1022900057444FF4A840B0614FF0000C04EBCC0E53 -:1022A000D7E90023DEE900018B4208BF82420ED14C -:1022B00008370CF1010CBCF5A84FEFD32A46414674 -:1022C0000FF6800002B0BDE8F04701F005BE3946C8 -:1022D000484601F001FE022002F055F8FEE7BDE895 -:1022E000FC471FE080B5CB49087940B901220A714B -:1022F0000FF6900001F0F0FDCC490A6809E00020DB -:1023000008710FF6A40001F0E7FDC9494FF48060A1 -:102310000860BDE8014001F03ABA0021042000F055 -:10232000C3BE00BF0021202000F0BEBE78B589B03A -:102330000020ADF81A0001F0E3FDBE4DBE4E286846 -:1023400010F1010F0ED069683074090A000A707428 -:1023500006F110046868B074F174080A090C30754D -:10236000717506E0002002F043F9040008BF0FF683 -:10237000242422460621002001F025F960793072DC -:1023800007AA207970720621E078B072A078F07206 -:102390006078307320789E4C70734EF66E500890C3 -:1023A000286807902E2001F00EF90FF6F012102188 -:1023B000182001F008F90FF6F4121021082001F09E -:1023C00002F91821012001F025F902F023F90DF19D -:1023D000160006A90190009105AB072200210120FB -:1023E00001F0C2FE0FF2E470BDF818100090072350 -:1023F000BDF81400002202F0CDF90DF11A00009092 -:102400000223BDF81610BDF81400002202F0C2F934 -:1024100002220221002001F0D0FD0320207001F0F3 -:1024200057FE012060700020E070082060751020C9 -:10243000A075002020758148A0610020A070C1B265 -:1024400021440871401CC1B21029F8DB002004901F -:102450000023A069617803900122207D0290A07D75 -:102460000190607D0090A07801F04BFEA07808B14B -:1024700001F0D2FE0AB070BD2DE9F8410446012CEE -:1024800087B003D166480588478803E04FF4C865E4 -:102490004FF47A67DFF8788108F19006707801F0E0 -:1024A0007FFC31780FF22C7001F016FD022C11D157 -:1024B0003078012818BF02280CD101F0AEFD0100D0 -:1024C00004D10FF22C7001F007FD03E00FF244700D -:1024D00001F002FD347000200690059008F12901FA -:1024E0000491082298F828000FF6D0010390029179 -:1024F0000192002300933A462946002001F09FFDF7 -:102500004D490E2001F060FE010013D1012C0AD1CB -:102510000FF2287001F0E0FC7078494908B0BDE87E -:10252000F04101F08CBC08B0BDE8F0410FF234700E -:1025300001F0D2BC08B0012CBDE8F0410CBF0FF295 -:1025400050700FF27C7001F0C7BC000010B5012084 -:1025500001F023FF2E4C94F89000052812D001F0D2 -:102560005CFD002184F8901030B90FF2887001F002 -:10257000B3FC0FF2887001E00FF29C70BDE81040D0 -:1025800001F0AABC10BD00000021012000F08CBDAC -:10259000012001F002BF00001CB51D4C94F8900012 -:1025A000012818BF00282DD01A484178012929D1C7 -:1025B000002201784270491C01EBD1725210A1EB4C -:1025C00042010170F7EE040A017800EB81004FF43C -:1025D000FA7190ED030AE08C0091C0EE200AFDEE46 -:1025E000E00A10EE902A92B20023114602F016F98A -:1025F000BDE8164000280CBF0FF240700FF26C705F -:1026000001F06ABC13BD0000A0080320032E0008DF -:1026100058B202201C000020581200201040005820 -:1026200014B80220804000580060FD07981400583C -:10263000181400588075FF1F0400002007B2010025 -:1026400046E001000021082000F02EBD012000F02E -:1026500051BD012000F056BD10B50446616801F17E -:10266000080000F05FFF00B10120207010BD0000E5 -:1026700010B1012803D070470F2000F029BD0F20B2 -:1026800000F02EBD402812BF8028042000F032BD8B -:10269000704700000D0A0D2A2A20444953434F4E2B -:1026A0004E454354494F4E204556454E54205749B8 -:1026B000544820434C49454E54200A000D0A0D2A27 -:1026C0002A20434F4E4E454354494F4E20555044C7 -:1026D000415445204556454E5420574954482043BF -:1026E0004C49454E54200A004556545F55504441CC -:1026F00054455F5048595F434F4D504C4554452019 -:102700000A0000004556545F5550444154455F50FF -:1027100048595F434F4D504C4554452C20737461CC -:10272000747573206F6B200A000000004556545FDB -:102730005550444154455F5048595F434F4D504CAC -:102740004554452C20737461747573206E6F6B2033 -:102750000A000000526561645F5048592073756338 -:1027600063657373200A00005048592050617261FC -:102770006D202054583D2025642C2052583D2025A2 -:1027800064200A005265616420636F6E66206E6F7C -:1027900074207375636365657373200A000000001D -:1027A0004843495F4C455F434F4E4E454354494F64 -:1027B0004E5F434F4D504C4554455F53554245562F -:1027C000545F434F444520666F7220636F6E6E65A1 -:1027D0006374696F6E2068616E646C652030782563 -:1027E000780A00000D0A0D2A2A204143495F47411B -:1027F000505F4C494D495445445F444953434F56FB -:10280000455241424C455F56534556545F434F44F1 -:1028100045200A000D0A0D2A2A204143495F4741FD -:10282000505F504153535F4B45595F5245515F567E -:10283000534556545F434F4445200A000D0A0D2A64 -:102840002A206163695F6761705F706173735F6B9A -:1028500065795F72657370200A0000000D0A0D2A09 -:102860002A204143495F4741505F415554484F52E8 -:10287000495A4154494F4E5F5245515F5653455650 -:10288000545F434F4445200A000000000D0A0D2A02 -:102890002A204143495F4741505F534C4156455FB1 -:1028A00053454355524954595F494E49544941543F -:1028B00045445F56534556545F434F4445200A00F4 -:1028C0000D0A0D2A2A204143495F4741505F424F7C -:1028D0004E445F4C4F53545F56534556545F434FDD -:1028E0004445200A000000000D0A0D2A2A205365E5 -:1028F0006E6420616C6C6F77207265626F6E64200D -:102900000A0000000D0A0D2A2A204143495F474171 -:10291000505F414444525F4E4F545F5245534F4CB9 -:102920005645445F56534556545F434F4445200A2D -:10293000000000000D0A0D2A2A204143495F47414B -:10294000505F4B455950524553535F4E4F54494683 -:1029500049434154494F4E5F56534556545F434F88 -:1029600044450A006E756D657269635F76616C75CA -:1029700065203D20256C640A000000004865785FF2 -:1029800076616C7565203D20256C780A000000009A -:102990000D0A0D2A2A206163695F6761705F6E7599 -:1029A0006D657269635F636F6D70617269736F6E7D -:1029B0005F76616C75655F636F6E6669726D5F7976 -:1029C00065736E6F2D2D3E594553200A000000009F -:1029D000424C455F4354524C5F4170705F4E6F7480 -:1029E000696669636174696F6E3A204143495F4764 -:1029F00041505F50414952494E475F434F4D504C03 -:102A00004554455F56534556545F434F44452C202B -:102A100070616972696E675F636F6D706C65746514 -:102A20002D3E537461747573203D2025640A0000A7 -:102A30000D0A0D2A2A2050616972696E67204F4B7A -:102A4000200A00000D0A0D2A2A2050616972696E61 -:102A500067204B4F200A00000D0A0D2A2A2041430F -:102A6000495F4741505F50524F435F434F4D504C79 -:102A70004554455F56534556545F434F4445200ADD -:102A8000000000000D0A0D5354415254204552419C -:102A900053494E4720414C4C20534543544F5253C9 -:102AA0002046524F4D20256C6420544F20256C64E5 -:102AB0000A0000000D0A0D4552524F522041542089 -:102AC000414444524553532030782530386C5820C7 -:102AD0000A0000000D0A0D414C4C20534543544F51 -:102AE00052532046524F4D20256C6420544F2025D0 -:102AF0006C642048415645204245454E205355437D -:102B00004345535346554C4C592045524153454437 -:102B10000A0000000D0A0D535441525420575249E7 -:102B200054494E4720414C4C20534543544F525337 -:102B30002046524F4D20256C6420544F20256C6454 -:102B40000A0000000D0A0D414C4C20534543544FE0 -:102B500052532046524F4D20256C6420544F20255F -:102B60006C642048415645204245454E205355430C -:102B70004345535346554C4C59205752495454459C -:102B80004E0A00000D0A0D435055312054494D495D -:102B90004E472050524F54454354494F4E20454EC6 -:102BA00041424C45440A00000D0A0D435055312066 -:102BB00054494D494E472050524F54454354494F74 -:102BC0004E2044495341424C45440A005032505330 -:102BD00052563100466972737420696E64657820BC -:102BE000696E202564207374617465200A000000FA -:102BF0005375636365737366756C6C792053746F7A -:102C000070706564204164766572746973696E677B -:102C1000200A000053746F702041647665727469F5 -:102C200073696E67204661696C6564202C2072654B -:102C300073756C743A202564200A00005375636331 -:102C400065737366756C6C79205374617274204679 -:102C5000617374204164766572746973696E67206C -:102C60000A0000005375636365737366756C6C7955 -:102C7000205374617274204C6F7720506F776572A7 -:102C8000204164766572746973696E67200A00007A -:102C90005374617274204661737420416476657266 -:102CA000746973696E67204661696C6564202C20C5 -:102CB000726573756C743A202564200A0000000068 -:102CC0005374617274204C6F7720506F7765722057 -:102CD0004164766572746973696E67204661696CD8 -:102CE0006564202C20726573756C743A202564200D -:102CF0000A00000020200D0A0D0000002A2A20539F -:102D0000544F50204144564552544953494E472050 -:102D10002A2A20200D0A0D002A2A2053544F502021 -:102D20004144564552544953494E47202A2A2020AF -:102D30004661696C6564200D0A0D0000424C455FD8 -:102D40005356435F4C324341505F436F6E6E5F5545 -:102D5000706461746528292C2053756363657373EF -:102D600066756C6C79200D0A0D000000424C455FC1 -:102D70005356435F4C324341505F436F6E6E5F5515 -:102D8000706461746528292C204661696C65642033 -:102D90000D0A0D006C7AD8AC5772000012345678C8 -:102DA0009ABCDEF0123456789ABCDEF0FEDCBA092A -:102DB00087654321FEDCBA098765432109503250FB -:102DC000535256317FB50C466D4D61686D4EE861CA -:102DD0002962284601F056FD246805F1240001F01F -:102DE0005BFD746006F1080001F056FD01203070B3 -:102DF000296829B10FF2551000900294684688475F -:102E00007FBD1FB55F4C04F1080001F048FD00BB19 -:102E10002178F1B1694604F1080001F069FD5848D4 -:102E2000C16949B10098029001228DF8042001A8DF -:102E300088479DF8040000E001202070207818B138 -:102E4000009801F00AFE04E0009904F1080001F086 -:102E50002FFD04F1080001F022FD28B9207818B1F7 -:102E600004F10800FFF7EEFB1FBD2DE9F84306460D -:102E7000002000F05FF874883088B268DFF80081C5 -:102E8000C4F3090444EA8024F068A4B2C1B2204625 -:102E900000F03CF8002748F2E8094846FFF7D9FB64 -:102EA00008E06888A04202D1316928780870687803 -:102EB00000B1012708F1240001F0F1FCF0B96946E6 -:102EC00008F1240001F014FD009800F10B05407A90 -:102ED0000F28E6D0B5F80110A1420DD10098817AF3 -:102EE000C81E7169C0B28842C8BF084670610246F8 -:102EF0003069E91CFEF7F0F92878D9E73800CCD022 -:102F0000012000F017F80020BDE8F28310B5134649 -:102F10001C4A5468A4F80900E1720A46194604F1F3 -:102F20000C00FEF7D9F9164A1369BDE810400021DC -:102F3000002018471249096A82B008B921B101E09E -:102F400011B1012002B0084702B0704710B5014628 -:102F5000487A0F2818BF0E2807D10B4801F0B2FCA1 -:102F6000BDE810400020FFF771BB064C04F10800DB -:102F700001F0A8FC04F10800BDE81040FFF762BBB7 -:102F8000FCB6022088B7022020B702200C4800219E -:102F900001604160704710B500F00CF85C6819B131 -:102FA000012904D1204301E024EA0000586082F3A3 -:102FB000108810BDEFF3108272B6014B704700000D -:102FC000C8B702202DE9FC475B4CDFF87091A5697A -:102FD0002840A0614FF0FF3A4FF0010830E0491C53 -:102FE00054F831000642FAD004EBC106184071686B -:102FF0001040014208BFC6F804A07768384000F0CE -:103000009FF8606208FA00F087437760EFF3108161 -:1030100072B6626A206908FA02F2D2431040206157 -:10302000022004EBC00353F8086C1640401E43F81E -:10303000086CF6D181F31088606A59F8201088472F -:1030400063692069A2691840104207D0E069216ACB -:10305000084203D1002103EA0206C1E7C4F824A014 -:1030600001F049FDEFF3108972B6216960690140F2 -:10307000A069014201BFE169206A014201F022FE1C -:1030800089F3108801F042FFA561BDE8F38738B5E8 -:103090001446EFF3108572B600F052F8274941F854 -:1030A000204085F3108831BD10B500F00BF80443C3 -:1030B0001C6153F83140204343F83100FFE782F3AD -:1030C000108810BDEFF3108272B61B4B1C6970475D -:1030D000EFF3108172B6184A536923EA000005E045 -:1030E000EFF3108172B6144A53691843506181F3AB -:1030F00010887047EFF3108172B60F4AD3691843F6 -:10310000D061F4E7F8B50C4C656A276A2E4615F1D4 -:10311000010F0EBF0025012101FA05F5206202E032 -:10312000284601F0D0FD216AE0690842F8D08843C2 -:103130006662E0612762F1BD5C1000209CB4022051 -:1031400002460020110C090404BF1020120412F0E2 -:103150007F4F04BF083012020FF2180112F0704FB7 -:1031600004BF001D1201120FC0F11F00895C401A3C -:10317000C0B2704704030202010101010000000017 -:103180000000000001F019FF9DF80E0005B000BD21 -:10319000F8B500F10C026B4624214FF66640F1E7CA -:1031A000F8B500F10C026B460F214FF66840E9E7D5 -:1031B000F8B500F003F84FF66940E3E78DF800003A -:1031C0006B466A4601217047F8B5FFF7F7FF4FF6E7 -:1031D0007340D7E7F8B502466B460C214FF67540B1 -:1031E000D0E770B51B491C4B0A681C49C2F30D029D -:1031F00001EB82010C6822689A4205D16569A169D8 -:10320000E269E368246904E025696169A269636889 -:10321000A4682E0E067001722E0C467042722E0AA1 -:103220008670C473C5F3031605F00F050571C670EB -:103230000D0E45710D0C85710D0A190E8172C57147 -:10324000190CC1721B0A210E41730373210C817387 -:10325000002070BD3C400058B95646A9000003202C -:103260009A4900E09A4981B00A6802430A600968F5 -:1032700008400090009801B0704710B59549964CF1 -:103280004FF40040086001F0E7FE606840010ED591 -:103290006068C0000BD401F00DFF01F00BFF206847 -:1032A00040F480302060216821F48031216000F0FA -:1032B000D2F8002001F09CF940B180798749E160A3 -:1032C000E16821F47C5141EA0021E16000F047F817 -:1032D0008348844C016800220260026902F05002B7 -:1032E00002610420FFF7BEFF0120FFF7BBFF0220B1 -:1032F000FFF7B8FF0420FFF7B3FF0120FFF7B0FF8F -:103300000220FFF7ADFF00220F210E2001F0F6FE94 -:103310000E2001F011FF00220F213A2001F0EEFEF5 -:103320003A2001F009FF00216F4841600F218160C0 -:10333000046047F6FF71C16001F054FFCA2060626B -:10334000FF2153206062A068C008C000A0606162D5 -:1033500001F0D2FB4FF0FF30FFF734FEFAE710B573 -:10336000AEB01CA8482101F0E1FF01A81C2101F02A -:10337000DDFF08A8502101F0D9FF01F09BFE56485F -:10338000016821F01801016007215848026822F401 -:10339000C06242F4007202604FF48032006800F4B0 -:1033A000C06000904FF4807400981C9101201E9022 -:1033B0000021402020901D9227911F941CA801F00D -:1033C000C2FF6F200190022100200291039004901F -:1033D000059006900790012101A802F066FA43F6D5 -:1033E0000300089000214FF4804019900E910F9136 -:1033F000102002211B901A91189408A802F02EFCAC -:103400002EB010BD10B53A4C3A4800F017F84FF402 -:103410000040E061002020626062A062204602F06D -:103420009BFD0021204603F0D6F90021204603F041 -:10343000DDF92046BDE8104003F0B0B920604FF43C -:10344000E13060600020A060E06020610C206061DD -:103450000020A0617047284881B0016841F48011C4 -:1034600001603F21006800F480100090009823481C -:1034700041604161016841F47C110160026942F4DC -:103480007C120261016841F03F010160026942F073 -:103490003F02026101B0704738B5044603F0FAF903 -:1034A00014F1010F054609D001F0EDFD241805E0E7 -:1034B0001348016821F00401016030BF03F0EAF90C -:1034C000401BA042F4D331BD00000000480000586A -:1034D0004C0000581040005890000058FECAFECA28 -:1034E000800800580028004028B702200004005837 -:1034F0007CB302200038014050000058040C0058F2 -:1035000010ED00E0704700001B48002101710172BE -:1035100000F034B818490A7941F822000879401CB3 -:103520000871704770B504466078FF2802BFB4F890 -:10353000031001F47F41B1F5406F12D100260E4D0A -:1035400000E0761C2979F0B288420AD2F1B255F82F -:103550002110204688470100F3D002D0022805D070 -:1035600006E02046BDE87040FEF744BD002070BD77 -:10357000012070BD00000000B4B7022080B503F048 -:103580008FF903F08EF903F08DF903F08CF903F055 -:103590008BF903F08AF903F089F903F088F903F055 -:1035A00087F903F086F903F085F903F084F903F055 -:1035B000B9F903F071FA03F070FA03F06FFABDE89D -:1035C000014003F06CBA18B50C46C7B01146002292 -:1035D0008DF800208DF81C008DF81D4022460DF15D -:1035E0001E0003F05DFA00F03BF83F200C21ADF81F -:1035F0000400ADF8061007A8012103900691A41C51 -:10360000049400F043F800284CBFFF209DF8000010 -:1036100048B010BD00B5C7B000F01BF80F2000F097 -:103620002AF800284CBFFF209DF8000047B000BDDD -:1036300000B5C7B00021ADF81C0000F016F8182046 -:1036400000F019F800284CBFFF209DF8000047B09B -:1036500000BD00228DF800208DF81C008DF81D1093 -:103660001822002101A803F021BA8DF800101822B9 -:1036700001A803F01BBAADF8060007A902200490C8 -:103680003F22012003910690ADF80420CDF814D01C -:10369000002101A8FFF7E9BB70B506464E4C307813 -:1036A0004CA520B1012807D0032810D070BD0120FF -:1036B00020700FF2281003E0002121700FF250104B -:1036C00000F00AFC2846BDE8704000F005BC7168B7 -:1036D0000878C8B94978012909D100F054FE0FF2E1 -:1036E000641000F0F9FB00F02FF80120A070716861 -:1036F000487848B900F051FE0FF2701000F0ECFB72 -:1037000000F022F80020A0707068017801291AD119 -:10371000407801280AD1002000F035FE0FF2741025 -:1037200000F0DAFB00F010F80120A0707168487812 -:1037300048B900F032FE0FF2841000F0CDFB00F02B -:1037400003F80020A07070BD284600F0C5BB0078CB -:10375000012808BF00F00DB8704780B50FF239029C -:1037600000210220FFF793FC1B4900220A70BDE8EC -:10377000014080B5002000F010FE17480121417083 -:10378000002181700121C1700021017101BD002162 -:103790000220FFF789BC000010B50F4C2079401EB5 -:1037A0008041C00F2071207868B10FF2381000F00E -:1037B00093FB08A000F090FBE11CBDE810404FF621 -:1037C000426003F03FB9BDE810400FF2581000F01E -:1037D00083BB0000200A0D00F0B702202D2D2050E1 -:1037E0003250204150504C49434154494F4E205390 -:1037F0004552564552203A204E4F5449464943417E -:1038000054494F4E20454E41424C45440A00000069 -:103810002D2D20503250204150504C4943415449A5 -:103820004F4E20534552564552203A204E4F544950 -:103830004649434154494F4E2044495341424C4527 -:10384000440A00002D2D20503250204150504C4948 -:10385000434154494F4E2053455256455220203A39 -:10386000204C454431204F4E0A0000002D2D2050A1 -:103870003250204150504C49434154494F4E2053FF -:10388000455256455220203A204C454431204F465F -:10389000460A00002D2D20503250204150504C49F6 -:1038A000434154494F4E20534552564552203120F2 -:1038B0003A204C454431204F4E0A00002D2D205017 -:1038C0003250204150504C49434154494F4E2053AF -:1038D00045525645522031203A204C454431204F24 -:1038E00046460A002D2D20503250204150504C4960 -:1038F000434154494F4E2053455256455220203A99 -:1039000020494E464F524D20434C49454E5420428B -:103910005554544F4E203120505553484544200AA9 -:10392000200000002D2D20503250204150504C4995 -:10393000434154494F4E20534552564552203A2058 -:1039400043414E275420494E464F524D20434C4947 -:10395000454E54202D20204E4F5449464943415452 -:10396000494F4E2044495341424C45440A200000EF -:10397000DFF83C150A6892B200E00246086880B29F -:103980008242FAD170472DE9FC4104461825DFF840 -:103990002485DFF82465684308EB000730780628A3 -:1039A00008D131787170347078754FF0FF307060E5 -:1039B000002039E000F077F8B9680918B96008F11B -:1039C0000803B96832786A439A589142327813D31F -:1039D00008F1150315FB02FC13F80C30062B25D05B -:1039E00008F108066B43F358994222BF08F115030A -:1039F0006A439A5CEED219E01146337869439A42E1 -:103A00000BD008F1140308F1150C5B5C15FB03F5F2 -:103A10000CF805407A753B7500E07A7508F11402E0 -:103A20005454317871703470BDE8F68111466943A1 -:103A300008F115035B5C062B04D008F1140615FB96 -:103A400003F574557B753A7508F115025454EBE78C -:103A5000F8B5DFF86434DFF85C541E7818240246A9 -:103A60006243B0422A4404D118785870507D1870CF -:103A70000FE0167D507D92F815C005F115076643DD -:103A8000062807F806C004D0167D143514FB00F490 -:103A90002E55012010731878062802BF00294FF018 -:103AA000FF315960F1BD10B5DFF80C44606810F1CA -:103AB000010F0FD0FFF75CFF6168DFF8002481423F -:103AC00061683CBF5388C918081A51784843117877 -:103AD000C84000E0002080B210BD2DE9F84FDFF8AB -:103AE000DC53DFF8DCB3D5F80880D8F80000DBF849 -:103AF00000104A0500F090F9DFF8BC63DFF8B4A3CA -:103B000021F4806181604FF0180934780AF10800CF -:103B100019FB04F14758FFF7C6FF874217D2002769 -:103B20000121B170062C3DD019FB04F40AF1080103 -:103B30000AF108020959814223BF0AF10801095913 -:103B4000091A002111510AEB04014C7DEAE7A9880A -:103B50004118B94202D2AF880021E2E73F1ADFE7FD -:103B6000022802DA2878012800D07F1ED8F8000049 -:103B7000C1684A07FAD500F055F9DBF80C00000CD3 -:103B8000BFB247EA0047CBF80C70FFF7F1FE706058 -:103B9000A8680068816841F480618160AFF30080AB -:103BA000BDE8F18FB8B20028DAD1FFF7E1FE70600E -:103BB0000320BDE8F24F01F0EDBA2DE9F843EFF331 -:103BC000108872B6BD4DBB4BA8680168CA224A6214 -:103BD00053204862B84A886820F4806088601820C2 -:103BE0001678374647431F44387B022826D13C6865 -:103BF000D7F810909078F0B17A7B012A0AD1012190 -:103C00003046FFF725FF88F310887968304600F0CA -:103C100016F904E088F31088304600F0C1F8A8686F -:103C20000068CA214162224653214162484631461A -:103C300000F050F90BE0FFF750FF06E0C8684207BC -:103C4000FCD500F07EF89F49086088F31088FF21BA -:103C5000A86802685162BDE8F183F8B5974CA1608D -:103C6000CA2209684A6253224A62954A136843F09D -:103C700020031360136803F00703C3F104032370E8 -:103C800095682D0C05F07F056D1C6570EDB292688E -:103C9000C2F30E02521C628092B2521E6A43A2F517 -:103CA000A072DA404FF6FF739A422CBFA380A28025 -:103CB000854A136843F400231360844B1D6845F460 -:103CC00000251D6048BB7C487A4E0123837018256F -:103CD0004FF0FF33436000235FFA83FC06F10C07CB -:103CE00015FB0CFC4FF0000E07F80CE05B1CDFB27C -:103CF000062FF1DB06230370886820F4806088605B -:103D000000F01FF8D060032001F04FFAA1680868A6 -:103D1000826842F48042826005E0C868410544BF81 -:103D2000032001F037FAA1680A68FF2050620022E0 -:103D30000321032001F0E2F9BDE8F240032001F085 -:103D4000FBB9C86800F0800060F49060C8604FF470 -:103D500000207047F0B504460025EFF3108672B6D8 -:103D60001827DFF850C10CF10C0007FB05FE10F816 -:103D70000E0010B16D1C062DF5DB062D0CD06F4327 -:103D80000CEB07000127077386F310880461427368 -:103D900003600D700020F0BD86F310880120F0BD97 -:103DA000F8B50746EFF3108472B6032001F0CFF99F -:103DB000424DAE683068CA2141623A4653214162A1 -:103DC000182043494243895C02291BD1002138460F -:103DD000FFF73EFE3848017806290ED13068384991 -:103DE0000A68530500F018F821F480618160C16809 -:103DF0004A07FCD500F016F804E04078884218BF66 -:103E0000FFF76BFEA9680A68FF205062032001F0EB -:103E100093F984F31088F1BD02D5C1684A07FCD438 -:103E200081687047C16801F0800161F49061C160F0 -:103E30004FF4002023490860032001F0B6B92DE9B2 -:103E4000F04180460F46424618201A4942438C18DA -:103E5000207B022804BF4046FFF7A2FFEFF3108546 -:103E600072B6032001F073F9144EB0680068CA21DD -:103E700041625321416202202073A760676040467F -:103E8000FFF781FD0C490A784978914202D0FFF78B -:103E900024FE02E0A168081AA060FF20B1680A6849 -:103EA0005062032001F048F985F31088BDE8F081E5 -:103EB000282800400CB4022000B80220A8B7022035 -:103EC000082800400C0800580008005880080058D6 -:103ED00018B40220104700000EB4C0B5024603A873 -:103EE00000210190009101AB0121044878440C307D -:103EF000FCF724F906BC5DF810FB00BF3349000055 -:103F000000B587B000F010F8012003220690ADF84C -:103F10000420ADF8062000F07AF800284CBFFF20FE -:103F20009DF8000007B000BD00208DF800001822A9 -:103F3000002101A802F0BABD09220021684602F062 -:103F4000B5BD1822002102A802F0B0BD182201A8B8 -:103F500002F0ACBD70B5C8B006460C461546052249 -:103F6000FFF7EBFFADF82060FFF7EBFF302100F02B -:103F700014F80521049000F019F8002848BFFF202C -:103F800009D49DF8000030B99DF8030020709DF819 -:103F900004002870002048B070BDADF80A10082059 -:103FA0000221ADF80800059108A870470791CDF8E7 -:103FB00018D0002102A8FEF758BF00B5C7B000F026 -:103FC0000EF8FFF7C3FF312000F013F800F01FF8E0 -:103FD00000284CBFFF209DF8000047B000BD002323 -:103FE0008DF81C008DF8003007A841708270002108 -:103FF0007047ADF8060007A90320049008220120AD -:1040000003910690ADF80420704703900691CDF817 -:1040100014D0002101A8FEF728BF00B587B000F03A -:1040200012F900F02EF9812000F008F900F036F9BD -:1040300000284CBFFF209DF8000007B000BD2DE90F -:10404000F84DC7B09446DDF840E1519A559D569E13 -:10405000DDF84CA1ADF81D108DF81C004FF0000BE1 -:10406000ADF81FC08DF821308DF822E000F024F863 -:1040700000F017F824F8095F668000F002F93F208D -:10408000832100F026F9574406910D37049700F07C -:1040900008F900284CBFFF209DF8000048B0BDE89B -:1040A000F08D88F800A007AC5499E419524608F145 -:1040B0000100544402F0F4BC8DF8232017465299B5 -:1040C0008DF800B00DF1240809A8B84402F0E8BC4E -:1040D00000B5C7B000F00CF8852000F090F800F0B3 -:1040E000DDF800284CBFFF209DF8000047B000BD60 -:1040F00000218DF81C008DF80010182201A802F094 -:10410000D5BC2DE9F841C7B04FF0000800F026F803 -:104110000DF12300DDF844E14E9F4F9E509D529CCF -:104120008DF81F30C0F800E08DF800808DF8207009 -:104130008DF821608DF822508DF8274000F0A1F80D -:104140008620ADF8060007A90C2000F0A3F800288F -:104150004CBFFF209DF8000000F0D5B88DF81C0082 -:1041600007A8417082707047F8B5C8B005460E4682 -:1041700017461C4600F023F808A8467087708DF893 -:10418000205000F0A1F88A21ADF80A103F20032149 -:1041900000F08DF8002848BFFF200ED49DF80000E5 -:1041A00058B94F994E98BDF801202280BDF80320E0 -:1041B0000280BDF805000880002049B0F0BD07224C -:1041C0000021684602F072BC18B5C7B0044600F082 -:1041D0003AF88DF81C40224600F083F800F051F8C0 -:1041E0003F208E2100F092F8641C049400F059F8EE -:1041F00000284CBFFF209DF8000048B010BDADF86E -:10420000060007A901203F22039104907047ADF8F2 -:10421000060007A90220704700B587B000F013F828 -:1042200000F02FF8922000F009F800F037F800288D -:104230004CBFFF209DF8000007B000BDADF80600A0 -:104240003F220120704700208DF80000704700B524 -:10425000C7B00021ADF81C00FFF74DFF9520FFF718 -:10426000D6FF00F017F800284CBFFF209DF8000093 -:1042700047B000BD00228DF80020ADF81C008DF87D -:104280001E101822002101A802F010BCADF8060093 -:1042900007A9032004903F22012003910690ADF866 -:1042A0000420CDF814D0002101A8FEF7DEBDADF842 -:1042B0000800059108A8072104900791CDF818D0AF -:1042C000002102A8FEF7D1BD1822002102A802F0A9 -:1042D000EDBBADF80400ADF8061007A8012103906E -:1042E00070470DF11D0002F0DBBB00B5C7B0FFF752 -:1042F000C1FFA520FFF7CAFF00284CBFFF209DF893 -:10430000000047B000BD48B0BDE8F081ADF8040042 -:10431000ADF8061007A80121039006917047000030 -:10432000444981B00A6802430A6009680840009065 -:10433000009801B0704778B585B0044668461421EE -:1043400000F0F4FF0220FFF7EBFF00F010F80095FB -:10435000012001900021022003900291694656F845 -:10436000240002F0ADFB00F008F806B070BD0FF2BB -:10437000D400314E30F81450704756F82400002213 -:10438000294602F05ABC0FF2BC012B4B31F8101039 -:1043900053F82000012202F050BC0FF2A801264B76 -:1043A00031F8101053F82000002202F046BCF0B59E -:1043B00085B005460C466846142100F0B7FF0DB9DC -:1043C000042004E0012D18BF022D02D10820FFF7C0 -:1043D000A7FF2000194E0FF274070DD137F8150012 -:1043E000009000210191012002900221039100F030 -:1043F0001BF80120FFF750F8012C13D137F81500F6 -:10440000009001210E480190029100F00DF80FF28A -:104410004400445D00220F2160B200F06FFE60B2E4 -:1044200000F08AFE05B0F0BD694656F8250002F09E -:1044300047BB00004C000058901000209C1000204A -:104440000000211020000100020000001000010007 -:10445000020000000A06070000EB8100604AD0F865 -:104460008010914201D0012070470020704742F433 -:10447000806240F8212070472DE9F04104460D4646 -:104480000026DFF8608102214046FFF7E5FF0028A3 -:10449000F9D102F024FC0120FEF78AFE0027AF428A -:1044A00015D2300013D1381900F045F806467F1CAC -:1044B000F5E70020FEF77CFE02F01FFC002202213F -:1044C0004046FFF7D4FF00252846BDE8F081002EC6 -:1044D000EFD0ED1B6D1CF7E72DE9F84380460C4645 -:1044E00015460026DFF8FC9002214846FFF7B4FF8E -:1044F0000028F9D102F0F3FB0027AF4216D2AEB983 -:1045000004EBC700D0E9002308EBC70000F018F85F -:1045100006467F1CF1E702F0F0FB0022022148462C -:10452000FFF7A5FF00252846BDE8F283002EF2D054 -:10453000ED1B6D1CF7E7014600220023002001E07F -:10454000014601202DE9F84F86B00225012602958B -:10455000049603918DF8000005919246DFF884805F -:10456000214F9B46EFF3108938680003FCD472B6E4 -:10457000D8F8180008B1012519E007214046FFF7D7 -:104580006BFF0025C4B294B99DF8000020B901A9C1 -:1045900002A802F0FFFB05E0059952465B460120A8 -:1045A00002F070FB002207214046FFF760FF89F30D -:1045B00010880DB1002002E0002C03D0012000F093 -:1045C00015F80646254318BF002ECDD138684103A3 -:1045D000FCD4701E8041C00F07B0BDE8F08F000012 -:1045E000000400800014005810400058002070475C -:1045F00001460648064AC3798B4218BF904218BF4D -:104600000838F8D18B4218BF00207047F873FF1F9D -:104610000070FF1F00B587B000208DF8000000F08B -:10462000E0F840F20110ADF806003F2201200690AC -:1046300000F0ECF800284CBFFF209DF8000007B008 -:1046400000BD2DE9F84107460128C7B08846154648 -:104650001E4608BF022003D002280CBF10200020F5 -:104660000DF11D010C1800F036F8012F8DF81C70AB -:1046700002D0022F18D019E002273A4641460DF128 -:104680001D0002F00DFA2570667000F0AAF83F20B8 -:104690004FF4817100F016F8FF1C049700F0B8F891 -:1046A000002805D5FF2009E01027E6E7472005E0B0 -:1046B0009DF8000010B94E9800F067F8FFE748B089 -:1046C000BDE8F081ADF80400ADF8061007A803219D -:1046D00003900691704703220021684602F0E6B974 -:1046E0002DE9F64F0C460546012CC7B09B4608BF86 -:1046F000022003D0022C0CBF102000200DF11F015E -:104700000E18FFF7E8FF012CADF81C508DF81E4085 -:1047100002D0022C2CD02DE00227569C559DDDF8AE -:104720005091DDF84CA1DDF8488148993A4600F0F7 -:1047300054F8A6F800B086F8028086F803A086F840 -:1047400004907571B47100F04CF83F20ADF804008E -:104750004FF4827107A8ADF80610039003210A37C1 -:104760000497069100F054F8002805D5FF2009E0D1 -:104770001027D2E7472005E09DF8000010B95798B0 -:1047800000F003F849B0BDE8F08FBDF801100180DA -:104790000020704730B5C7B01C464A9B00F026F891 -:1047A00000258DF800508DF82140224619460DF164 -:1047B000220002F075F900F014F83F204FF48371E5 -:1047C00000F01BF8A41D049400F022F800284CBF50 -:1047D000FF209DF8000047B030BD0DF11F0002F032 -:1047E0005FB91822002101A802F060B9ADF81C00E1 -:1047F000ADF81E108DF820207047ADF80400ADF81C -:10480000061007A80121039006917047ADF8042017 -:10481000CDF814D0002101A8FEF727BB30B5C7B0F2 -:104820000025ADF81C0007A84A9C41808280ADF8A5 -:10483000223004818DF8005000F01EF80F21029103 -:1048400040F281100A21ADF80600049107A8012169 -:104850003F220390069100F007F800284CBFFF208C -:104860009DF8000047B030BDADF80420CDF814D05D -:10487000002101A8FEF7F9BA1822002101A802F0D0 -:1048800015B900000249016002490161704700BF8B -:10489000574900087D490008006040607047EFF309 -:1048A000108172B6026882420CBF012000201CE019 -:1048B000EFF3108272B603680B604860016008680D -:1048C000416023E0EFF3108272B6086043684B60EA -:1048D00041604868016019E0EFF3108172B64268E8 -:1048E0000368136002684368536081F3108870475F -:1048F00010B5EFF3108472B602680A600068FFE733 -:10490000FFF7EAFF84F3108810BD0B6082F3108874 -:104910007047000002F02CBB6C486D49016001F14A -:104920002002426001F13002826001F13C02026229 -:1049300001F14402426201F14C02C26001F15402F1 -:10494000026101F17002426101F174028261803101 -:10495000C16102F02BBB38B504465E4D2846FFF717 -:104960009BFF5A484068A1680160E168C1608560AA -:104970005949416002F036FB58482AE080B5534857 -:104980004268136801211972406802F031FB00206F -:1049900002BD38B5514C4F4D04E000F041F800988D -:1049A000216888472846FFF77AFF0028F5D031BDF7 -:1049B0004A484168084738B50446494D2846FFF73C -:1049C0006BFF4248C068A1680160456002F015FBBA -:1049D00044482168016061684160002032BD80B5B3 -:1049E0003A48C268136810211972C06802F00BFBC4 -:1049F000002002BD35483B4AC168C1681368086899 -:104A0000184738B5374C364D04E000F009F80098E7 -:104A1000616888472846FFF742FF0028F5D031BD7E -:104A200069462846FFF764BF38B504462E4D284630 -:104A3000FFF732FF2D48FFF72FFF24480069A168D8 -:104A40008160E168C1600561216801606168416061 -:104A5000216941616169816131BD80B501462348A9 -:104A6000FFF730FFBDE802400FF2050002F0DBBAAD -:104A700038B5164C1D4D06E0FFF7D2FF00992069AE -:104A80000069FFF71FFF2846FFF709FF0028F3D052 -:104A900031BD10B5164C2046FFF7FEFE0B484169AC -:104AA0000C60BDE8104002F0D2BA1CB5104C06E014 -:104AB00069462046FFF71CFF009800F01BF82046CF -:104AC000FFF7EDFE0028F3D013BD00000000032027 -:104AD000AC090320480A032090080320D8B702201D -:104AE000500A0320E0B70220380A0320D0B7022082 -:104AF000400A03207047704710B52A482A4C88B0F6 -:104B0000016841F400410160FEF740FA274801685E -:104B1000C908C90041F00401016000202449FFF7E1 -:104B20009CF802F0BAFA01210120FEF734FA0020C5 -:104B3000FFF701FC0120FFF7FEFB0220FFF7FBFB64 -:104B40000120FFF720FC01210020FFF730FC0121AC -:104B50000120FFF72CFC01210220FFF728FCFFF7C2 -:104B6000DBFE144A00211020FEF791FA04F23C50BB -:104B70000FF245010090019169460FF2410000F0EB -:104B8000C7F904F25470029004F5C96140F23C5038 -:104B900005900391049402A8FFF746FFFFF7BAFEC1 -:104BA00008B010BD080000583000032080040058F1 -:104BB00028B70220534F00087047000030B587B077 -:104BC000044604A800210022002380E80E0061684A -:104BD00001F10B056846FEF704FB9DF802309DF8D5 -:104BE00001209DF800100FF21410FFF775F99DF8E1 -:104BF00004100FF22C10FFF76FF99DF80B109DF8C1 -:104C00000C300FF238100A46FFF766F928884FF487 -:104C10001241401A0ED0401E2BD0401E2DD0401EF7 -:104C200032D0401E39D0401E3CD0401E3DD0401EE8 -:104C300042D045E0A878A8B90FF21810FFF74CF958 -:104C400002F03AFA0B208DF810007F218DF8121037 -:104C500004A8FEF7BFFAFDF72DF900210120FEF7A9 -:104C60009AF92DE00FF21C10FFF736F900202070A2 -:104C700026E0A9780FF238101BE0D5F80620D5F809 -:104C800002100FF2581005E0D5F80620D5F80210F2 -:104C90000FF28C10FFF720F912E0D5F802100FF296 -:104CA000C81006E00FF2F41008E0D5F802100FF279 -:104CB0000820FFF711F903E00FF23420FFF70CF999 -:104CC00007B030BD70474FF0FF30FEF77BB90021D1 -:104CD0001020FEF7E9B90220FEF70CBA0220FEF719 -:104CE00011BA012805D0022805D0102805D1FDF7FA -:104CF000F9BAFDF712BBFDF714BB7047576972652F -:104D00006C657373204669726D7761726520766594 -:104D10007273696F6E2025642E25642E25640A0047 -:104D2000576972656C657373204669726D7761723D -:104D300065206275696C642025640A00465553201D -:104D400076657273696F6E2025642E25642E256446 -:104D50000A0A0000534843495F5355425F45565481 -:104D60005F434F44455F5245414459202D205749E8 -:104D700052454C4553535F46575F52554E4E494E30 -:104D800047200A00534843495F5355425F455654F4 -:104D90005F434F44455F5245414459202D204655BD -:104DA000535F46575F52554E4E494E47200A00000A -:104DB000534843495F5355425F4556545F455252ED -:104DC0004F525F4E4F544946205749544820524550 -:104DD00041534F4E202578200A0000005348434994 -:104DE0005F5355425F4556545F424C455F4E564DAA -:104DF0005F52414D5F555044415445203A20537411 -:104E000061727441646472657373203D20256C780F -:104E1000202C2053697A65203D20256C640A00000F -:104E2000534843495F5355425F4556545F54485277 -:104E30004541445F4E564D5F52414D5F5550444190 -:104E40005445203A205374617274416464726573EE -:104E500073203D20256C78202C2053697A65203DF5 -:104E600020256C640A000000534843495F535542B3 -:104E70005F4556545F4E564D5F53544152545F57F1 -:104E800052495445203A204E756D6265724F6657FF -:104E90006F726473203D20256C640A0053484349B7 -:104EA0005F5355425F4556545F4E564D5F454E44E5 -:104EB0005F57524954450A00534843495F5355428E -:104EC0005F4556545F4E564D5F53544152545F57A1 -:104ED00052495445203A204E756D6265724F6653B3 -:104EE0006563746F7273203D20256C640A000000B6 -:104EF000534843495F5355425F4556545F4E564DA4 -:104F00005F454E445F45524153450A0070470000DB -:104F10007FB50C464D4D61684D4EE86129622846CB -:104F200002F0E8F92468746006F10800FFF7B4FCA9 -:104F3000012000F068F801203070296841B10FF2BB -:104F4000E9000FF2ED020090019202946846884752 -:104F50007FBD1FB53E4C04F10800FFF7A0FC00BB6D -:104F60002178F1B1694604F10800FFF7C1FC374828 -:104F7000C16949B10098029001228DF8042001A86E -:104F800088479DF8040000E001202070207818B1C7 -:104F90000098FFF762FD04E0009904F10800FFF7B4 -:104FA00087FC04F10800FFF77AFC28B9207818B1D3 -:104FB00004F10800FFF78BFE1FBD2DE9F041054607 -:104FC0000E4690461C46002000F01DF8204F7868E1 -:104FD000A0F80950C672324641460C30FCF77CF905 -:104FE0001A4A136900210020984748F2E800FFF7A9 -:104FF00075FE79688A78D21C04F10800FCF76CF918 -:10500000BDE8F04101201CB51049124C096A20B9D5 -:1050100001B188470020207013BD0120207011B11C -:10502000BDE81C40084713BD0020FFF754BE000038 -:1050300010B50146064C04F10800FFF743FC04F1EB -:105040000800BDE81040FFF742BE00004CB7022048 -:1050500098B70220BDB70220134810B5016841F48B -:1050600080710160032000F03CF8002002F04CF950 -:105070000024002814BF012402F073F9204610BD5B -:105080000A4880687047094800787047084805E07A -:105090000748016841F0020101607047016841F072 -:1050A000010101607047000000400058841000209A -:1050B000042004E00248016841F4807101607047F7 -:1050C000000400580901020081B002D43C48815418 -:1050D00005E03C4802F00F02104400F8041C01B047 -:1050E0007047394A13684FF6FF0100020B4000F485 -:1050F000E0601843354908431060704738B5324BBB -:105100001C68C4F30223C3F10704052C28BF042440 -:105110001D1D072D34BF0023DB1E012505FA04F4F5 -:10512000641E2140994005FA03F35B1E1A401143A7 -:10513000BDE83440C6E70000010007D4012200F0BA -:105140001F01234B8A40400943F82020704701008B -:105150000BD4012200F01F011E4B8A40400943F886 -:105160002020BFF34F8FBFF36F8F704710B5401EE5 -:10517000B0F1807F01D3012010BD174C60600F217A -:105180004FF0FF30FFF79EFF0022A2600720206053 -:10519000002010BD010007D4012200F01F010F4BB9 -:1051A0008A40400943F820207047010007D40122BB -:1051B00000F01F010A4B8A40400943F82020704745 -:1051C00000E400E018ED00E00CED00E00000FA055E -:1051D00000E100E080E100E010E000E000E200E03B -:1051E00080E200E038B5040044D094F8210028B9EA -:1051F000002184F82010204602F06BF900F049F8F5 -:10520000FF2510B100F03FF834E02168DFF8B0006E -:105210008A6802408A6021688A686368206903435B -:10522000A06903431A438A602168E0680861206826 -:105230000169A26841EA024101612068C16821F068 -:105240008001C1602068C16C89088900C16421683F -:10525000CA6CE369606903431A43CA6420688168C1 -:10526000880609D400F020F830B120684562042196 -:1052700000F01FF8012032BD20684562012184F84A -:105280002110002032BD20684562042184F82110DD -:105290007047022084F82100CA2021684862532008 -:1052A00022685062204626E020460BE02068C0F8C5 -:1052B000248084F82110002084F82000704700002A -:1052C000BFFF8FFF70B5044640F2E9362068C16821 -:1052D00021F0A001C16001F0DDFA05462068C16837 -:1052E000880606D401F0D6FA401BB042F6D303205C -:1052F00070BD002070BD70B504462068C1684A06C4 -:1053000012D44FF0FF32C26040F2E93601F0C2FA27 -:1053100005462068C168480606D401F0BBFA401B68 -:10532000B042F6D3032070BD002070BD002202F011 -:105330000DB900004FF0B040006800F0F000B02858 -:1053400088BFB02070472DE9F041040054D0207888 -:1053500081064FF0B04538D5A868E96810F00C0018 -:1053600001F0030103D00C2808BF012946D12868A9 -:10537000800702D5E06900283ED0FFF7DBFF616AB5 -:10538000884207D2084600F0D3FB002834D100F051 -:1053900075FA0FE0286820F0F00001432960696881 -:1053A000206A21F47F4141EA00216960606A00F0CF -:1053B000BFFB08BB00F095FBDFF810180860DFF8B2 -:1053C0001008006801F0A0FFB0B92078C1070DD522 -:1053D000A868E96800F00C00082801F0030103D078 -:1053E0000C2808BF03292DD12868800340F139819A -:1053F0006068002840F03581012038E2E06980B122 -:10540000296841F0010100F047FA06462868800744 -:1054100000F1248101F03EFA801B0328F6D303201B -:1054200025E2286840084000286001F033FA06466B -:10543000286800F01FFAC8D001F02CFA801B03285E -:10544000F6D3ECE76068B0F5803F04D1296841F4F9 -:105450008031296003E02A6822F480322A60606883 -:1054600060B101F017FA06462868800300F1F98060 -:1054700001F010FA801B6528F6D3D0E701F00AFA94 -:1054800006462868400C10F0010000F0EA8001F0A8 -:1054900001FA801B6528F4D3C1E701F0FBF9C01BBA -:1054A0000328C0F01281BAE7E06878B1296841F4B6 -:1054B000807100F0F1F906462868400500F1188176 -:1054C00001F0E8F9801B0328F6D3A8E7286820F448 -:1054D0008070286001F0DEF906462868800A10F026 -:1054E000010000F0DC8001F0D5F9801B0328F4D323 -:1054F00095E701F0CFF9C01B0328C0F00B818EE7C0 -:1055000040F0010000F0CEF907467068800700F116 -:105510001C8101F0BFF9C01B0328F6D37FE7706838 -:1055200020F0040000F0BEF907467068C00810F0D3 -:10553000010000F0198101F0ADF9C01B0428F4D37B -:105540006DE70528306806D140F00400306031680E -:1055500041F0010105E0400840003060316821F071 -:1055600004013160A06841F2893768B101F092F915 -:1055700080463068800700F10C8101F08BF9A0EBC8 -:105580000800B842F5D34AE701F084F98046306854 -:1055900000F070F900F0FD8001F07CF9A0EB08004C -:1055A000B842F4D33BE701F075F9C01B0328C0F003 -:1055B000FE8034E7B06840084000B06001F06AF94E -:1055C0000746B06800F056F900F0F58001F062F986 -:1055D000C01B0328F5D322E701F05CF9801B0328E8 -:1055E000C0F01F811BE701F055F9001B0328C0F034 -:1055F000398114E7286881010CD4296841F0807151 -:105600002960E86840F08050E86001F043F9044602 -:105610002868810100F12A8101F03CF9001B032870 -:10562000F6D3FCE60C2931D0286820F08070286081 -:10563000E968DFF8A00589088900E960E9680140A8 -:10564000E96001F027F904462868810140F10E81E4 -:1056500001F020F9001B0328F6D3E0E600F00EF974 -:10566000B3E6207881071AD5A868E96800F00C0035 -:10567000042801F0030104D00C2808BF02297FF49C -:1056800013AF2868400503D5E06800283FF4B4AEA6 -:105690006968206921F0FE4141EA00616960216882 -:1056A000DFF8346511F0180F38D0606900283FF436 -:1056B00036AFC90670687FF523AF800709D47068DC -:1056C00040F0010000F0EEF80746706880077FF5B3 -:1056D000E4AE706840F0040000F0E4F8074670683B -:1056E00000070DD401F0D6F8C01B0428F7D396E6C6 -:1056F0006868216920F0FE4040EA01606860CEE7FA -:105700007068A16920F4706040EA0120706000F0C8 -:10571000C6F8074600F0ADF87FF4EBAE20784107FD -:1057200037D5DFF8B8743868C10529D4FFF7C2FC53 -:1057300001F0B0F880463868C10521D401F0AAF81C -:10574000A0EB08000328F6D369E6706820F0040097 -:1057500070607068C00810F00100DFD001F09AF8A6 -:10576000C01B0428F5D35AE600F099F8074600F06C -:1057700080F8D3D001F08EF8C01B0328F7D34EE693 -:10578000A06801287FF4DDAE306840F00100306091 -:10579000E8E6217848060ED5A06A00283FF40AAF53 -:1057A000B16841F00101B16001F074F80746B068DA -:1057B00080077FF5F8AEE06A002857D0A968EA684C -:1057C000022801F00C017FF42DAF236B02F00300DF -:1057D000984202BF02F07000636B984214D1A36B31 -:1057E000C2F30620984202BF02F47810E36B98429D -:1057F0000AD1236C02F06060984202BF02F060425E -:10580000606C82423FF4F6AE0C293FF4F5AD286897 -:1058100041013FF5F1AD296821F0807100F03CF8BD -:105820000646286881013FF5D7AEE968DFF8B00386 -:10583000A26B0140206B0143606B0143E06B41EAC6 -:1058400002210143206C0143606C0143E960286838 -:1058500040F080702860E96841F08051E96001F013 -:1058600019F80446286881017FF5BDAE0020BDE827 -:10587000F0817068400810F0010070472968606A84 -:1058800021F0F001014329606868216A20F47F401B -:1058900040EA012068607047296000F0FBBF706833 -:1058A00040084000706000F0F5BF2DE9F8430400A7 -:1058B000884644D0DFF82C6300F0CBF847D200F0E4 -:1058C000CDF8074600F0C5F841D000F0E3FFC01B5B -:1058D0000228F7D90320BAE000F0DCFF401B0228C1 -:1058E00043D9F7E700F0D6FFA0EB090002284CD916 -:1058F000F0E700F0CFFFA0EB0900022854D9E9E758 -:1059000000F0C8FF401B02285DD9E3E700F0C2FFAA -:10591000401B022867D9DDE700F0BCFF401B48456B -:1059200077D3D7E7032802D13968890103E000283B -:10593000396802D1890762D401E049055FD40120AA -:1059400085E000F0A7FFC01B022872D9C2E72078CB -:1059500081074FF0B0470BD5B968A06821F0F0017E -:105960000143B96000F096FF0546B868C003B3D59F -:105970002078DFF8545281060AD52968606921F041 -:10598000F0010143FFF788FF814628688003A9D50D -:10599000207841060BD52968A0690909090141EA67 -:1059A0001011FFF779FF81462868C003A1D5207840 -:1059B00041070BD5B968E06821F4E0610143B960A3 -:1059C00000F068FF0546B868800399D52078010784 -:1059D0000CD5B868216920F4605040EAC100B86075 -:1059E00000F058FF0546B86840038FD52078C107FE -:1059F00017D56068022895D1396889039FD5B968A1 -:105A0000890840EA8100B86041F2893900F042FF1C -:105A10000546B868616800F00C00B0EB810F7FF4B8 -:105A20007BAF306800F00700804505D200F016F823 -:105A3000074600F00EF884D100F053F8DFF88C111F -:105A40000860FFF71DFBBDE8F24301F05DBCBDE857 -:105A5000F283306800F00700404570473168C9089C -:105A600048EAC101316000F015BF38B54FF0B044CD -:105A70005E4DA16811F00C0106D1FFF75BFCC0F38D -:105A8000031055F8200032BD0429594A05D00829D1 -:105A9000584804D12168C90222D5104632BDE168B8 -:105AA00001F00301022904D0032904D12168C902AD -:105AB00007D5104605E0FFF73DFCC0F3031055F88D -:105AC0002000E168E268E368C1F306214843C2F3BD -:105AD0000211491C5B0FB0FBF1F05B1CB0FBF3F053 -:105AE00032BD80B5FFF7C1FF3F49FFE7424A096871 -:105AF000C1F3031152F82110B0FBF1F002BD80B5E3 -:105B0000FFF7EFFF00F010F8C1F3022106E080B5C7 -:105B1000FFF7E7FF00F008F8C1F3C22112F82110E7 -:105B200001F01F01C84002BD2F49344A096870477F -:105B300070B52E49B1282EBFCC6AC0F3031051F8BE -:105B400020402148056801F01BFD2B492C4A05F037 -:105B50000F0551F82510B4FBF1F10024B1FBF2F16F -:105B6000B0F5007F0FF2B802204609D10FF294037E -:105B700053F820508D4214D2401C0328F8D912E06B -:105B80000FF2900353F820508D420AD2401C032894 -:105B9000F8D308E000F07EFE801B03280CD303201E -:105BA00070BD52F820400F4D2868C00844EAC0007C -:105BB000286000F06FFE0646296801F00701A14247 -:105BC000E8D1002070BD000008010058A810002096 -:105BD0008C100020FFFFFEEE9000005800040058DB -:105BE0008C80C11100400058080000581081000846 -:105BF0000024F4000048E801D0800008D88700089D -:105C000040420F0012000000240000003600000097 -:105C100040000000060000000C0000001000000022 -:105C2000000000000100000002000000030000006E -:105C3000DFF820130A68030903F47F2300019A4365 -:105C400000F47F2000F082B9DFF808231368010C0C -:105C500023EA014343EA0043136070472DE9F84308 -:105C6000054600242878DFF8EC624106A0464FF094 -:105C7000B0472DD5286B70B1B0F5800F06D0B0F5C8 -:105C8000000F18BFB0F5400F17D01FE0F86840F4C0 -:105C90008030F860EDE0386820F08060386000F017 -:105CA000F9FD81463868000140F1D08000F0F2FD36 -:105CB000A0EB09000228F5D90324D7E000F0EAFDA3 -:105CC000A0EB0900022840F2C980F5E70124A046B4 -:105CD0002868010531D5B06800F44078286C80450B -:105CE0002AD0FFF7E7F9B8F1000FB16805D1286CA9 -:105CF00021F440710143B1601EE0B06840F480308F -:105D0000B06021F44071B06820F48030B060286C3D -:105D10000143B160B068C0070ED500F0BBFD8046FE -:105D200041F28939B068800706D400F0B3FDA0EBDA -:105D300008004845F6D30324A0462878C10705D5B6 -:105D40003168A869890840EA8101316028788107B3 -:105D500005D53168E86921F4406101433160287854 -:105D6000C10644BFA86AFFF76FFF2878810644BFC9 -:105D7000E86AFFF769FF2878410744BF286AFFF700 -:105D800057FF2878010744BF686AFFF751FF28686A -:105D9000C1051BD53168686B21F04061014331605A -:105DA000686BB0F1006F00F0BDF8686BB0F1806F08 -:105DB00075D100F0BDF804463868000160D500F0E8 -:105DC00069FD001B0228F7D94FF0030867E000F0D7 -:105DD00061FD001B02285BD9F6E7316821F04041E4 -:105DE000316020F08050326822F040621043306011 -:105DF000A86BB0F1C05F00F095F8286841056DD53B -:105E00003168E86B21F0405101433160E86BB0F13B -:105E1000005F03D1F96841F48031F960E86BB0F1BB -:105E2000805F5BD100F084F804463868000146D5F5 -:105E300000F030FD001B0228F7D94FF003084DE0B9 -:105E400000F028FD001B022841D9F6E700F061F8B8 -:105E5000A86821F4781100F071F8814638680001D3 -:105E60007FF52CAF3969686901433961002C7FF4F3 -:105E70002EAF3168286B21F440010143316027E7E0 -:105E800000F047F8E86821F0606100F057F8044638 -:105E9000386800019BD53969686901433961286810 -:105EA0008105AAD5A86BB0F1804F1CBFB0F1004F9F -:105EB000002892D1316821F04041084397E700F073 -:105EC00028F8286921F0604100F038F80446386865 -:105ED0000001B5D539696869014339612868C10491 -:105EE00005D5F168686C21F440410143F1602868F0 -:105EF00081040BD5796AE86C21F0300101437962A5 -:105F0000796AA86C890840EA810179624046BDE857 -:105F1000F2833869696820F4FE4040EA0120386164 -:105F20003969704703D1F96841F08071F9607047B1 -:105F3000396821F08061396000F0ACBC01433961FF -:105F4000386840F08060386000F0A4BC10430860FE -:105F5000704700008800005838B5040009D004F1EB -:105F60008005686808B900F01EF800F021F80128E3 -:105F700001D1012032BDA06A08B100F02AF800F07A -:105F80000AF821F02A01FFE7816000F01BF8BDE864 -:105F9000324000F002BB2068416821F4904141602A -:105FA00020688168704700212970204601F0EEB911 -:105FB0002420686020680168490849000160204683 -:105FC00000F086B92068016841F0010101602046B7 -:105FD0007047204600F07EBA70B5044604F1800593 -:105FE0001346686820283CD169B318002BD0287864 -:105FF000012836D001222A7004F15406216533802D -:1060000073800020E86021206860706AE8B1DFF8E2 -:10601000B414C162DFF8B004716A0863716ADFF812 -:10602000AC0448630020716A88632068216D00F128 -:106030002802706A01F015FB38B11020E8600020DA -:10604000287020206860012070BD2168402008620F -:10605000002028702068816841F080018160002064 -:1060600070BD022070BD816821F0400181607047E1 -:10607000206881684A0670472068016821F0100195 -:1060800001607047F8B5044640F60F002668F169D4 -:106090003268B368084004F15C050ED1880602D569 -:1060A000900602D4D80040F180806969002900F090 -:1060B0000E812046BDE8F4400847DFF80C06034295 -:1060C00004BFDFF808763A426FD0CF0707D5D7056F -:1060D00005D5012737622E6B46F001062E638E0729 -:1060E00008D5DE0706D5276802263E622E6B46F0ED -:1060F00004062E634E0708D5DE0706D5276804265A -:106100003E622E6B46F002062E630E070AD59606F7 -:1061100001D4034206D0266808203062286B40F084 -:1061200008002863080509D5500107D526684FF4F3 -:1061300000603062286B40F020002863286B002844 -:1061400032D0890607D5900601D4D80003D56969F5 -:1061500009B120468847286B21688A68510602D415 -:1061600010F0280F1BD0204600F093FAFFF780FFB5 -:1061700010D5FFF778FF286A60B10FF2DD51816317 -:10618000286A01F0E7FA00280ED0286A816BBDE882 -:10619000F44008472046BDE8F24001F0CDBB204660 -:1061A00001F0CAFB00202863F1BD2869012853D102 -:1061B000CF0651D5D0064FD51020306222689068A6 -:1061C000410626D5296A0868406880B20028EBD0CD -:1061D0002B8898427BDA6880086801688B0614D4A3 -:1061E000106820F4807010602068816849084900B8 -:1061F00081602068FFF737FF2020E86200202861D7 -:10620000FFF73AFF286A01F06FFA29886888091AAF -:106210001CE028886988411A688800281CBF88B259 -:10622000002854D01368DFF8400523F490731360FE -:1062300022689368034093602020E8620020286170 -:1062400068612068026822F0100202602046BDE802 -:10625000F44089B201F071BBC80209D5580207D5D4 -:106260004FF4801030622046BDE8F24000F010BBD1 -:10627000080609D5100601D4180205D5A96931B35D -:106280002046BDE8F440084748060ED550060CD518 -:10629000306820F0400030602021A9620020A86111 -:1062A0002046BDE8F24001F072BB080206D550005E -:1062B00004D52046BDE8F24001F086BBC80148BFC6 -:1062C000002A04D52046BDE8F24001F07EBBF1BDB6 -:1062D000F8B50446DFF894042168DFF894C40A682E -:1062E000DFF890740240A0680243206902436069AD -:1062F0000243E06902430A6000254A68E06822F42C -:10630000405202434A60A369714A91421CBF206A0D -:1063100003438E68DFF86004064033438B600FF25E -:106320006446CB6A606A1B0940EA0313CB6261458D -:10633000DFF848044FF4004339D13F6807F0030702 -:10634000032F4DD8DFE807F0024643494FF0010C18 -:10635000E169B1F5004F4FF6F07740F08080BCF175 -:10636000010F09D0BCF1020F0AD0BCF1040F71D0AB -:10637000BCF1080F71D099E0FFF7C9FB002815D0D8 -:10638000626A616836F81230B0FBF3F04A0802EB3B -:106390004002B2FBF1F080B2A0F11001B942EAD2A2 -:1063A0000740C0F3420007432068C7607FE0914286 -:1063B00016D13F6817F4406723D0B7F5806F09D036 -:1063C000B7F5006F03D0B7F5406F06D008E04FF087 -:1063D000020C07E04FF0040C04E04FF0080C01E061 -:1063E0004FF0100C9142B3D1BCF1000F09D0BCF1B9 -:1063F000020F0AD0BCF1040F15D0BCF1080F15D064 -:1064000054E0FFF77CFB002851D0616A36F8112078 -:10641000B0FBF2F6626802EB42018E4246D31103F2 -:10642000B14205D242E0FFF720FBECE71846ECE76B -:106430005008002110EB062051EB16610023FAF7FB -:106440009FFFA0F54071DFF8382391422ED22268D9 -:10645000D0602CE0FFF709FB90E7184690E7BCF10D -:10646000010F09D0BCF1020F09D0BCF1040F18D004 -:10647000BCF1080F18D019E0FFF749FBB8B1626A08 -:1064800036F812306168B0FBF3F000EB5100B0FB5E -:10649000F1F080B2A0F11001B94207D22168C860C2 -:1064A00005E0FFF7E2FAE9E71846E8E7012504F11D -:1064B000680001214180018000218160C16028467F -:1064C000F2BD0000D1660008FF66000809670008F9 -:1064D0000080004090F82810CA0706D5026853686B -:1064E000C16A23F400330B43536090F828108A07E5 -:1064F00006D502685368016B23F480330B43536065 -:1065000090F828104A0706D502685368416B23F4B7 -:1065100080230B43536090F828100A0706D50268C1 -:106520005368816B23F400430B43536090F82810A9 -:10653000CA0606D502689368C16B23F480530B43E7 -:10654000936090F828108A0606D502689368016C5B -:1065500023F400530B43936090F828104A0610D59B -:1065600002685368416C23F480130B435360416C01 -:10657000B1F5801F05D15368816C23F4C0030B4330 -:10658000536090F828100A0606D501684A68C06C66 -:1065900022F4002202434A607047F8B5044604F131 -:1065A00080050020E8606FF07E4700F073F9064632 -:1065B000206801680A0708D50097334600224FF487 -:1065C0000011204600F017F860B9206801684A07FA -:1065D0000AD50097334600224FF48001204600F090 -:1065E0000AF808B10320F2BD20206860A8600020EE -:1065F000E0662870F2BD2DE9F041069C05460E4686 -:1066000090461F462868C1693140B1420CBF012045 -:10661000002040451CD114F1010FF3D000F03AF9ED -:10662000C01B844200D314B900F015F80CE02868B0 -:1066300001684A07E6D5C1690A05E3D54FF400624F -:10664000026200F008F8C16000210170032000E040 -:106650000020BDE8F0812868016821F4D071016054 -:106660002868816849084900816005F1800020217F -:1066700041608160704701680A6822F0C0020A60C8 -:1066800001688A6822F400028A602021C0F8841020 -:10669000704701680A6822F490720A60DFF8C81037 -:1066A000026893680B409360C16E012904D10168B0 -:1066B0000A6822F010020A602021C0F88810002128 -:1066C000C16601677047000001000010200100044E -:1066D000816A00680268930644BF084601F057B912 -:1066E0000020A1F856000868826822F080028260CB -:1066F0000868FFE7016841F0400101607047806A67 -:1067000001F064B900000000F8B5846A04F1840562 -:1067100004F1560728686E6821688A68110606D554 -:10672000212804D1002038802046FFF7A4FF2068EC -:106730008168480606D5222E04D1002038812046E3 -:10674000FFF7A7FFA86840F01000A8602046BDE84A -:10675000F24001F0F1B80000806A00F15601002219 -:106760000A810A8001F0E8B8FEFFFFEFF369FFCF6E -:106770000038014088000058FFF4FF110024F400A5 -:1067800000FD0F00010002000400060008000A00DE -:106790000C001000200040008000000110B500F146 -:1067A00080010A78012A01D1022010BD01230B705B -:1067B00024224A6002681368146864086400146044 -:1067C0000022426623F000530068036020204860E6 -:1067D0000020087010BD70B500F01EF801D1022035 -:1067E00070BD00F01FF822F0604209E070B500F0C3 -:1067F00013F801D1022070BD00F014F822F060629D -:1068000011438160204600F01AF8206806602020BD -:1068100068600020287070BD044604F18005287867 -:106820000128704701222A702420686020680668C9 -:10683000026852085200026020688268704730B5D2 -:10684000416E11B90121012214E001680FF23004F8 -:106850008A6889680FF23003520E02F00702490F6E -:10686000655CA45C595C9A5CED00E40095FBF1F179 -:1068700094FBF2F268304180028030BD00000000DD -:1068800001010103070100000804020408010101DD -:106890007047000001484068704700BF8410002026 -:1068A0007047704770477047704770477047704730 -:1068B000704770477047704738B5054684B06878B0 -:1068C0000024FF2802BFB5F8031040F601408142C2 -:1068D00025D165498A88B5F80700921C904209D1F4 -:1068E000687B0124C10752BF8DF8004000218DF85C -:1068F000001011E04988491C884210D10FF2701035 -:10690000FDF7EAFA03208DF8000005F10D00B5F857 -:106910000B108DF8081001906846FCF7BDFE20466C -:1069200005B030BD10B58AB050484F4CFCF7F2FDB1 -:106930008F218DF81810E520B3218DF819008DF8FE -:106940001A10D5202E218DF81B008DF81C107F20E9 -:106950004A218DF81D008DF81E1098202A218DF8EF -:106960001F008DF8201048207A218DF821008DF825 -:106970002210CC2040218DF823008DF82410FE2019 -:1069800000218DF82500ADF826100094082301227F -:1069900006A90220FDF755FE00F032F8412000F074 -:1069A00023F8A01C00F010F8062100F015F800F004 -:1069B00027F8422000F018F8201D00F005F81021FB -:1069C00000F00AF80AB010BD05900121049102916F -:1069D00000200A2201907047039200910223208830 -:1069E00006AA0221FDF77CBE8E218DF824008DF8C9 -:1069F00023100020FE21ADF826008DF825107047E9 -:106A000019208DF81800ED2182208DF81A008DF8DC -:106A10001910ED20AE218DF81C008DF81B104C20B4 -:106A200021218DF81E008DF81D1041209D218DF82B -:106A300020008DF81F10222045218DF822008DF8AE -:106A40002110704780B542224FF64263984208D128 -:106A5000054800910223818800880022FDF79AFEF4 -:106A60000246104602BD0000F8B70220B9680008CF -:106A70002D2D2047415454203A204C454420434F6B -:106A80004E46494755524154494F4E205245434581 -:106A9000495645440A0000007047704770477047E8 -:106AA00010B50446FAF718FC204610BD10B5044690 -:106AB00010460A460146204600F08AFF204610BDD7 -:106AC0002DE9F84F4FF00009644A654B4FF00F086D -:106AD00005460E4633E0634FBD4214BF0727042727 -:106AE0008F4027434CF82E70C1431C6801EA040C08 -:106AF0007468E40348BF40EA0C0CC3F800C05C684B -:106B000001EA040C7468A40348BF40EA0C0CC3F803 -:106B100004C0146801EA040C7468E40248BF40EA47 -:106B20000C0CC2F800C0546801EA040C71688902B8 -:106B300048BF40EA0C0CC2F804C009F101093168F1 -:106B400031FA09F077D0012404FA09F414EA0100BB -:106B5000F3D04FEA490C032101FA0CF16FEA010E60 -:106B60007168012918BF022903D0112918BF122901 -:106B700011D1A968F7680EEA010107FA0CF7394349 -:106B8000A960696821EA04047168C1F3001101FA7F -:106B900009F10C436C60E968B4680EEA010104FA7B -:106BA0000CF42143E9604FEA89017468022C18BF94 -:106BB000122C12D14FEAD90405EB840401F01C0712 -:106BC000D4F820A008FA07FB2AEA0B0AD6F810B07E -:106BD0000BFA07F747EA0A0727622C680EEA040750 -:106BE000347904F0030404FA0CF43C432C60746818 -:106BF000E400A2D5DFF870C04FEA990E5CF82E7061 -:106C000001F00C0108FA01F427EA0404B5F1904FF1 -:106C100008BF00270ED0154FBD4208BF012709D07D -:106C2000134FBD4208BF022704D0124FBD427FF46C -:106C300052AF032754E7BDE8F18F81B0002A14BF9B -:106C40008161816201B070470B4A136803421CBF27 -:106C50001060FEF746B870470000000000080058BA -:106C60008008005800100048080001400004004857 -:106C700000080048000C00480C080058DFF800F03D -:106C8000251200202DE9F0413C4F064638780128B6 -:106C9000884614461D4608BF02201BD001213970CA -:106CA0000020786000F018F8010011D1012E224672 -:106CB0002B46404602D100F054F802E01146FFF79F -:106CC000DDFF00F009F82E490A6822EA06060E6088 -:106CD00000213970BDE8F0814FF47A7018E02A493C -:106CE000CA680020002A07D5284B294A0B600A6091 -:106CF000C968002948BF0120704721490A6842F04D -:106D000000420A6000200968002958BF012070472E -:106D100070B50546FFF7BEFD06461A4C2068C10354 -:106D200011D5FFF7B7FD801BA842F7D3032070BD34 -:106D3000124920604860012070BDFFF7ABFD801B49 -:106D4000A84209D3F2E72068C10744BF01212160AE -:106D50004CF2FA310840EBD120684103EDD4002019 -:106D600070BD10B506490C6844F001040C6040F891 -:106D7000042BBFF36F8F036010BD000070B70220BB -:106D8000144000581040005808400058230167453F -:106D9000AB89EFCD2DE9F04100F053F8884608BFEC -:106DA00002204CD000F052F800F055F8010044D118 -:106DB0002968DFF8C470022919D14FF0FF32C8F8F2 -:106DC00000206E6800E0761C6968AA6851188E423F -:106DD00008D2304600F043F800F03DF80100F2D050 -:106DE000C8F800607A69DFF894100A407A6139685F -:106DF0008A050FD53A6822F400723A60396841F486 -:106E0000006139603A6822F400623A60396841F4FE -:106E1000007139603A6851050FD5396821F48061F5 -:106E200039603A6842F480523A60396821F48051FE -:106E300039603A6842F480623A6000212170BDE80E -:106E4000F081104C05462078012870470020012170 -:106E50006060217070474FF47A70FFF759BF08499E -:106E60000A6822F4FF6242EAC00242F4803242F031 -:106E700002020A60704700000040005805F8FFFF5A -:106E80001440005870B70220C0680840884201D101 -:106E90000120704700207047C0690840884201D136 -:106EA000012070470020704710B56C4C022120462D -:106EB000FFF7F2FF38B16068C043810703D5FDF7E3 -:106EC000A0FD022018E001212046FFF7E5FF38B1C0 -:106ED0006068C043C10703D5FDF75BFD01200BE0EF -:106EE00008212046FFF7D8FF38B16068C04301078A -:106EF00003D5FDF7DAFD0820A06010BD10B5574C92 -:106F000000F033F818B96068C043810306D400F07C -:106F10002CF830B96068C043810302D5BDE8104049 -:106F20007AE0082100F022F870B96068C0430103DC -:106F30000AD560684A4940F40020606008688047CC -:106F40004FF40020A06010BD202100F00FF858B9C8 -:106F50006068C043810207D5606840F4001060603B -:106F6000BDE81040FDF724BD10BD022120468BE78F -:106F70003C4881B0016841F480110160006800F470 -:106F80008010009000983848016841F40071016059 -:106F90003648026842F40072026040BF20BF3448A5 -:106FA000016841F40041016001B0704780B531488B -:106FB000016841F480110160006800F480100090C5 -:106FC00000982648016841F001010160026842F41E -:106FD000803202602C20FEF7AFF8BDE802402D2081 -:106FE000FEF7AAB8244801684908490001607047C3 -:106FF00022494FF48030086070471F48016821F033 -:107000000201016070471C484FF400314160016883 -:1070100021F40031016070471748016841F40031E4 -:107020000160FDF7E7BC38B504460C4D0821284641 -:10703000FFF72AFF30B10A480460686820F4002096 -:10704000686031BDA0474FF40021A96031BD0A48F6 -:10705000016821F00801016070470000000C005831 -:1070600008B8022050010058D408005820080058E1 -:107070000C04005850000058040C0058080C00582C -:10708000484900E0484981B00A6802430A6009683B -:1070900008400090009801B0704780B5FDF7F6FFFA -:1070A000FDF7F6FF4148016841F48031016000F0CE -:1070B000DEFCBDE801400EE000B587B068460FF287 -:1070C00018211C22FAF718F9FDF7E3FC6846FCF7D3 -:1070D00067F807B000BDF0B585B068461421FEF72B -:1070E00025F900260025002400210FF2DC0000EB2A -:1070F000C102907988B11368B3F1904F08D02C4F3A -:10710000BB4208D02B4FBB4204BF9088044304E02D -:107110009088064301E090880543491C2229E4DB5E -:10712000002002900121032003900191B0B288B1A8 -:1071300000900120FFF7A4FF0120FFF7A3FF69469D -:107140004FF09040FFF7BCFC0022B1B24FF09040EE -:10715000FFF773FDA8B280B100900220FFF790FF07 -:107160000220FFF78FFF124E69463046FFF7A8FC5A -:107170000022A9B23046FFF760FDA0B280B10090B6 -:107180000420FFF77DFF0420FFF77CFF094D6946CF -:107190002846FFF795FC0022A1B22846FFF74DFDD7 -:1071A00005B0F0BD4C0000584C0100589008005844 -:1071B0000004004800080048FCF724B913460A46BA -:1071C0000146002000F0C2BB0000004801000000A2 -:1071D000000000480100000000000048010000001D -:1071E000000000480100000000000048010000000D -:1071F00000000048010000000000004801000000FD -:1072000000000048010000000000004801000000EC -:1072100000000048010000000000004801000000DC -:1072200000000048010000000000004801000000CC -:1072300000000048010000000000004801000000BC -:1072400000000048010000000000004801000000AC -:10725000000000480100000000000048010000009C -:10726000000000480100000000000048010000008C -:10727000000000480100000000000048010000007C -:10728000000000480100000000000048010000006C -:10729000000000480100000000000048010000005C -:1072A000000000480100000000000048010000004C -:1072B000000000480100000000000048010000003C -:1072C000000000480100000000000048010000002C -:1072D0000000004801000000000000000000000065 -:1072E00000000000C8710008280003202C000320C3 -:1072F000220404000249016002490161704700BF95 -:10730000B7490008DF49000870B50F4E04463078D1 -:107310000025A8B1FEF7E5FB32784FF47A71B1FB96 -:10732000F2F1B0FBF1F0FDF721FF48B9102C07D2C4 -:10733000002221464FF0FF30FDF7E0FEB46000E090 -:107340000125284670BD00BF84100020734981B01C -:107350000A6802430A60096808400090009801B07A -:10736000704780B56E48016841F400210160002239 -:10737000006800F4002000900F2100982E20FDF7F7 -:10738000BDFEBDE802402E20FDF7D6BE38B58AB05E -:10739000044668461421FDF7C9FF2068614A624926 -:1073A00090423ED10868614D40F0010008600968D4 -:1073B00001F00101059105980120FFF7C7FF0C209E -:1073C00000900221002001910290032108200391E6 -:1073D00000F06AF8402000F060F8082000F064F83F -:1073E00053482860112000F065F808B1FCF78AF8CE -:1073F0004FF088500690002101200791ADF8201031 -:10740000099006A9284600F071FB08B1FCF77AF84C -:10741000A567AC62002200212520FDF76FFE252024 -:1074200037E0444A904236D14868434D40F48040AA -:107430004860486800F48040059005980120FFF7F7 -:1074400085FF0220FFF782FF4FF4006000F025F86F -:10745000072000F029F8C0200090022101200191AE -:107460000290032107200391049069463348FFF7F7 -:1074700027FB334828600F2000F01CF808B1FCF708 -:1074800041F8A567AC62002200212420FDF736FEFA -:107490002420FDF751FE0BB030BD009002210020EA -:1074A0000290039001917047049069464FF090401C -:1074B000FFF706BB68601020A8600020E86080200D -:1074C000286100206861A861E8612862284600F010 -:1074D0005FB81CB504461B49206888421CD1FDF7E3 -:1074E000E9FDFDF7E7FD1848816B21F4407141F497 -:1074F00080718163816B41F400418163026842F4D1 -:1075000080620260006800F480600090009820466D -:10751000BDE8164000F01CBB13BD00004C00005835 -:1075200050000058008000405C0000589CB50220CC -:107530004400024000380140FCB50220000400482D -:1075400044040240002800405800005800B500BF25 -:10755000130096469446103928BFA0E80C50FAD87C -:107560005FEA417C28BF0CC048BF40F8042BC90724 -:1075700028BF20F8022B48BF00F8012B00BD0000F7 -:10758000DFF80800006800F4C0607047000400588D -:1075900038B5040001D1012032BD2168DFF8700345 -:1075A000814204F1240500F044F8022068700A6862 -:1075B000A0686FF30E120243E068024320690243A1 -:1075C00060690243A0690243E0690243206A024302 -:1075D0000A60204600F070F9A068B0F5804F04BF43 -:1075E000002161602079696A00F03F0000F014F822 -:1075F00038B1052805D2204600F078F900F012F8DD -:1076000003E0002028636863A8630020A8610120CC -:1076100068700020287032BD0860A96AE86A486076 -:1076200060687047296B00200860696BA86B486030 -:1076300070470AD2DFF8DC0242181423B2FBF3F2DF -:1076400092002A62DFF8D00209E0DFF8D002421887 -:107650001423B2FBF3F292002A62DFF8C402E8615D -:107660007047F8B5044604F1240600253078012857 -:1076700001D10220F2BD01273770707801282FD187 -:1076800002277770B561206807687F087F00076070 -:10769000204600F0F5F82168F06820B10A6842F051 -:1076A0000E020A6008E0086820F004000860206804 -:1076B000016841F00A010160706A0168CA0303D5DC -:1076C000026842F480720260306B18B1016841F4C4 -:1076D000807101602068026842F00102026001E0EE -:1076E000357002252846F2BD81B040B100F1240179 -:1076F0004A78022A05D00420886100200870012001 -:1077000026E00268136823F00E0313604A6A1368C8 -:1077100023F480731360006802685208520002600C -:10772000012091F82020CB6902F01C0290405860A3 -:107730008A6AC86A5060086B30B1026822F48072AD -:1077400002604A6B886B506001204870002008700E -:1077500001B0704738B500F12402002451780229A5 -:1077600003D004209061012428E001680B6823F015 -:107770000E030B6001680D686D086D000D60516AA5 -:107780000B6823F480730B60012192F82030D569D7 -:1077900003F01C0399406960936AD16A5960116BC8 -:1077A00031B10B6823F480730B60536B916B59609C -:1077B000012151701470516901B18847204632BDD2 -:1077C000F8B500F124010423CA6914680268156839 -:1077D00091F8206006F01C0603FA06F73C4210D030 -:1077E0006F070ED51468A50603D4156825F00405A7 -:1077F000156000F03DF8C968002938D0BDE8F440B4 -:107800000847022303FA06F73C4213D0AF0711D50D -:107810001468A50605D4156825F00A05156001222F -:107820004A7000F025F800220A708968F9B1BDE8B5 -:10783000F4400847082303FA06F6344217D02B0712 -:1078400015D5136823F00E031360012291F8203040 -:10785000CC6903F01C039A40626001228A614A707D -:1078600000220A70096911B1BDE8F4400847F1BD72 -:1078700091F82020CC6902F01C02934063607047AD -:1078800078B5C56C046D6C60446D14B1846DC56DC4 -:107890006560012590F84440066C04F01C04A54086 -:1078A0007560046863608068102802D1A260E1609E -:1078B00071BDA160E26071BD416C0268144B890822 -:1078C0009A4234BF174B184B03EB8101816402F0DD -:1078D000FF02083A1421B2FBF1F1144AC26401F02C -:1078E0001F01012202FA01F1016570470179104A76 -:1078F00001F03F0102EB81024265491E0D4A82659B -:1079000001F0030101228A40C265704700000000B7 -:1079100008040240F8FFFDBF00000240F8FBFDBF75 -:1079200000040240000802401C0802408008024097 -:10793000FC080240400902407047704763601D48E0 -:107940001D4B704723601D481D4B704770B51C468A -:10795000002300251B4E10B1022804D00AE0346039 -:10796000FFF7F1FF02E07460FFF7E9FF0360FEF745 -:1079700033FB0346012B05D007D3032B04D038BFBC -:10798000022502E0012500E00325284670BD82B0F3 -:107990000068094A0B49904206D0094A904207D133 -:1079A000086828B102B00047486808B102B0004733 -:1079B00002B07047ECB20220008000407CB302208D -:1079C00000380140C0B70220704770477047000080 -:1079D00062F30F2262F31F42401810F0030308D035 -:1079E000C91A1FD3DB0748BF00F8012D28BF20F8B4 -:1079F000022D130030B414461546103928BF20E973 -:107A00003C00FAD8490728BF20E90C0048BF40F8DD -:107A1000042D890028BF20F8022D48BF00F8012D51 -:107A200030BC7047C91818BF00F8012DCB0728BF1C -:107A300000F8012D7047000038B5EFF3108472B6DE -:107A4000284D6946281D00F0B4F96946281D00F04C -:107A50000DFA38B184F31088BDF80010224AFFF700 -:107A6000ADFB31BD0120287084F3108831BD80B595 -:107A7000FFF7A2FB0221009100231A4800F1240124 -:107A80004FF48052001D00F07BF801BD00BFF8B537 -:107A900014460026EFF3108510F1010F1ED00128C7 -:107AA0001CBF02284FF0FF3618D1BCB1264672B673 -:107AB0000C4F012392B2381D00F076F800281CBF4D -:107AC0003978002908D000223A7085F31088A1B2D5 -:107AD000054AFFF773FB01E085F310883046F2BDDD -:107AE0000000000038000020397A000818B500F1C5 -:107AF0002402507801281BD11378012B01D10220D8 -:107B000012BD536A10701C680A4804400868044398 -:107B1000C868401E44EAC04448680443087A497A69 -:107B200044EA004444EA41241C600020107012BD65 -:107B3000012012BDFFFD00E08A60FF210268516252 -:107B4000012180F82110002180F8201000207047CA -:107B500090F82010012901D102207047012280F8FD -:107B60002020022180F82110CA210268516253218D -:107B70000368596201688A6842F02002FFF7DCBF9F -:107B800010B5029C016042600021C1600161416149 -:107B900081610381A107047704D5008910B14FF0FA -:107BA000FF3010BD002010BD2DE9F04F064685B016 -:107BB00030890C460027BB4600287169DC460CBFA3 -:107BC0004FF00208D84681B168B930697768451C22 -:107BD000BD4228BFED1B3768385C7D5D00EB052793 -:107BE000BF1CBFB203E0074600E000B102463069A7 -:107BF000F568A84223BF7568281AC01B00201546E7 -:107C000008EB050903FB09FE864532BF0020B0FBE7 -:107C1000F9FA09FB1A00C0B2804509DA96F81C90FF -:107C20005FEAC97A48BF84465FEA897048BFC446A4 -:107C3000100000F0B4807068714461448842C0F064 -:107C4000AE8008EB020080B20390D946100AADF86E -:107C500002000294ADF80020049359E0800740D55B -:107C60003089002840F09B803268D018A34600F885 -:107C7000024C200A32681A4402F8010C224630688D -:107C80001844F9F729FB706920187061B069019CEC -:107C9000401CB061200A31680C70316848701CE0EB -:107CA0008CB3307FC207D9D5308940B931681944C7 -:107CB000FF2001F8020C3168194401F8010C4FF063 -:107CC000000B7069241874612C463089002340B978 -:107CD00031680C70210A3068417002237069801C81 -:107CE000706108EB04070021BFB231615CB1DA4476 -:107CF000029800EB0A01306822461844F9F7ECFAC2 -:107D000070692418746109F10109B069401CB061FF -:107D1000049A70683169914545D2791881422CBF27 -:107D2000081A0846306103463089A0B93068BDF8AA -:107D30000010C1545B1C70683168834228BF1B1A55 -:107D4000BDF80200C8545B1C7068834228BF1B1A30 -:107D50007069801C706105FB09FA7468BDF8000049 -:107D6000E41A844288BF0446029800EB0A01281BEB -:107D7000AC42019003D093D2307F002890D1376875 -:107D80002246F818F9F7A8FA706920187061A3461E -:107D9000019C039F0023A9E73068404400E00020D5 -:107DA00005B0BDE8F08F88448045F5D3A8EB000806 -:107DB000F2E778B5028900230B80002A44690CBFE2 -:107DC00002250025002C4FD0028952B9C2684668AE -:107DD000531CB34228BF9B1B0668B25CF35C02EBEA -:107DE00003220A80027F02F00302012A25D10B88B8 -:107DF0004FF6FF72934204BF0289002A09D0C3687C -:107E000002699A4219D20289BAB14668F31A9342BA -:107E100013D24368C268E41A14190022C260446194 -:107E200002894AB902681478012B94BFC3F1010397 -:107E30000123D25C04EB02220A80C468426806680F -:107E40002B19934228BF9B1A33440E884169891B22 -:107E5000491B416105D034192D19954228BFAD1A2F -:107E6000C5608169491E8161184672BDF8B50289F5 -:107E700000230B80002A42690CBF02240024002A40 -:107E80003BD0C56802892B464AB946686A1CB24293 -:107E900028BF921B0668775DB25C07EB02220A805E -:107EA000067F06F00306012E20D10F884FF6FF72E1 -:107EB000974204BF0289002A07D142680023012AA1 -:107EC00094BFC2F1010201220AE00269AA420DD266 -:107ED00002895AB14668751B954207D2002304E017 -:107EE00005682E78AA5C06EB02220A8041680068C9 -:107EF000E4188C4228BF641A03191846F2BD00002A -:107F000010B50446AFF30080204600F005F80446A3 -:107F1000AFF30080204610BD7CB500F10F06F608D7 -:107F2000F600B04240D2082E04D2082602E0083003 -:107F300000F047F8DFF804512C68210005D100203B -:107F400007E00268B24221D2011D08680028F8D17A -:107F50002068291D0A68824222D01368B34238BFC4 -:107F6000111DF7D312E093190B60801B54685C60FD -:107F70000B6818601660096800291DBF4868002852 -:107F8000081D0020286002F1080076BD61B10A6872 -:107F90001068A0F10803B342E5D250680860EAE730 -:107FA00000F04EF80028C2D1002076BD10B50400C4 -:107FB00006D0AFF30080204600F003F8AFF3008056 -:107FC00010BD002800D1704750B4A0F1080213681A -:107FD000072B2BD913F0070F28D1184C616809B172 -:107FE0008A4202D25160626013E0486800B3904256 -:107FF00038BF0146F9D31BE0964203D11B180B6032 -:108000000A4606E0486810B1134498420ED3506007 -:108010004A60506850B11368D118814206D10021DE -:1080200021600168CB1813604068506050BC7047F5 -:1080300008680E18B242DFD250BC7047E8B7022081 -:108040000749086808B1002070470648C008C0000A -:1080500008600549C908C900091A0160704700BFD6 -:1080600010B802201FC8022018CC0220134900209B -:1080700008604FF4E0221248016841F47001016089 -:108080004FF0B041086840F0010008608A600D4878 -:108090000A6802400C480A60036823F00503036085 -:1080A000426852085200426000220848C8600861D5 -:1080B000086820F4802008608A61704708ED00E0BD -:1080C00088ED00E0FBFEF6FA940000580010042250 -:1080D0000100000003000000050000000100000096 -:1080E00001000000060000000A000000200000005F -:1080F0000200000004000000080000001000000062 -:1081000040000000800000000001000000020000AC -:10811000A0860100400D0300801A060000350C0007 -:1081200040420F0080841E0000093D0000127A00CA -:108130000024F40000366E010048E801006CDC0207 -:10814000000000000000000000000000000000002F -:108150002DE9F04107468846387810F0030F16469F -:108160001D4633D0384600F099F878BBB8F1000FBF -:108170001CBFD8E900018619012D2ED13888C10411 -:1081800015D5396A07F14402384600F0A3F83A6B76 -:10819000044602B93A69F968384600F09BF8361B84 -:1081A000341A7A69F968384600F094F8261A1EB92C -:1081B0004DB916F1010F09D097F903002A4631464F -:1081C00000F08EF8064616F1010F09D12320AFF317 -:1081D00000804FF0FF30BDE8F081022DE8D1EBE7E1 -:1081E000388810F4405F0ED07868F86038617861A4 -:1081F000B8617868F86107F14400386207F130002F -:10820000786200203863B8F1000F05D0D8E9020188 -:1082100007F13402C2E9000139884CF6FF600140E1 -:1082200039800020BDE8F08170B50546AFF30080CD -:108230002888810415D56E680024EA6895F9030042 -:108240003146914212D2521AFFF720FC10F1010F71 -:108250001CBF00283618F0D10FE04DF6FF7001402A -:1082600029802846AFF30080002070BD0022002145 -:10827000FFF70CFC10F1010F00D101246868E860E1 -:10828000A861E861002C2988E7D041F400712980B9 -:108290002846AFF300804FF0FF3070BDF8B5A0B9AD -:1082A000AFF3008000250A4E08244FF0FF373068F6 -:1082B00020B1FFF7B9FF002848BF3D46361D641EB8 -:1082C000F5D1AFF300802846F2BDBDE8F240ABE740 -:1082D00004120020914234BF511A00210846704711 -:1082E0003EB504000D00012A02D100F063F807E05A -:1082F000022A07D100940020019069460C20ABBEF1 -:108300002D1801E0002A0CD10094019569460A203D -:10831000ABBE002805D100222100280000F027F87C -:1083200001E00020C04303B030BD000010B4314A6A -:10833000002113461C6884421EBF491C9C6884426D -:108340001EBF491C1C69844209D09C69491C844297 -:1083500005D0491C20331029ECD310BC70470023F2 -:1083600042F8313002EBC1014B6010BC704778B469 -:10837000204C002325462E688E421EBF5B1CAE6833 -:108380008E421EBF5B1C2E698E4209D0AE695B1CFB -:108390008E4205D05B1C2035102BECD372BC70478D -:1083A000054604EBC303012A04BF59684D195D60FB -:1083B00072BC704710B40F4A002113461C688442F7 -:1083C0001EBF491C9C6884421EBF491C1C69844214 -:1083D0000AD09C69491C844206D0491C20331029CC -:1083E000ECD310BC0020704702EBC100406810BC09 -:1083F000704700001CB5022010B50446E068A16972 -:10840000884251D3218849F202030B40022B08D045 -:1084100008044CBF4FF400704FF4844001432180A6 -:108420003BE001F4C042B2F5C04F06D1A1688842DA -:1084300003D32046FFF732FF78BB208810F4406F4B -:1084400002BF606804F14401884217D14FF4007004 -:10845000FFF756FD606030B904F144006060E060F1 -:10846000401CA0600AE0218841F040012180E060CA -:10847000606100F500726068A260E0616068206180 -:10848000A068A061207841070AD502220021204679 -:1084900000F00CF810F1010F02D14FF0FF3010BDC9 -:1084A000208840F4C0402080002010BD70B50446F4 -:1084B0000D461646AFF3008033462A46002120467B -:1084C000FFF746FE05462046AFF30080284670BD04 -:1084D00038B504000ED0207810F0030F03D094F9C3 -:1084E0000300002809D5AFF30080204600F030F8E3 -:1084F000AFF300804FF0FF3032BD2046FFF7CEFED5 -:108500000546AFF300802078410644BF606800F064 -:108510005DF80020606094F90300022804D900F09F -:1085200057F808B14FF0FF35E06B48B100F05CF848 -:1085300008B14FF0FF35E06B00F048F80020E06331 -:10854000204600F005F8AFF30080284632BD000059 -:1085500001780A0626D51C4A13680021834203D1FC -:10856000002342F821301BE05368012183421EBFE3 -:10857000022193688342F3D0D368032183421EBF54 -:10858000042113698342EBD05369052183421EBF46 -:108590000621936983421EBF0721D3698342DFD03E -:1085A00000F014B8002101804FF0FF31C17000F1DC -:1085B00044014160C160016141618161C161016249 -:1085C00000F130014162704704120020FFF7EEBC59 -:1085D0001CB50200009269460220ABBE04001000E8 -:1085E000FFF7A4FE200016BDE0B50090F8F726FEC8 -:1085F000019069460E20ABBE03B000BD7047FEE798 -:10860000FEE7FEE7FEE770477047704700F026B8C8 -:108610000548FFF7D5B80548FDF734BD0448FDF718 -:1086200031BD0448FFF7CCB89CB502207CB30220D2 -:10863000ECB20220FCB502201020FEF705BB0120A1 -:10864000FEF702BB0220FEF7FFBAFBF7B6BAFEF751 -:1086500055BCFEF729BC00F009B80000024841688B -:108660000278891841607047841000200449C86866 -:108670000A6882430A604860FAF704B80000000004 -:108680000015005838B50C46C5B22046AFF300803F -:10869000E068A169884204D32046FFF7ADFE0028B8 -:1086A0000FD4E068401CE06000F8015D20880105FF -:1086B00003D440050BD50A2D09D12046FFF7EEFD66 -:1086C00028B12046AFF300804FF0FF3032BD204686 -:1086D000AFF30080284632BD19E050F8042BD307D1 -:1086E00044BFA9F101039A18091F0023042942F885 -:1086F000043BF9D25FEA817C134604D54FF0000CAD -:10870000A2F800C09B1CC90744BF0021197050F893 -:10871000041B0029E1D1704738B50D4D08242868A5 -:1087200000281CBF017811F0030F05D090F9031049 -:10873000002958BFFFF7CCFE2D1D641EEFD1BDE808 -:108740003840002200214FF0FF30FFF79FB900BFF3 -:108750000412002010B5074979441831064C7C44B6 -:10876000163404E00A68081D114488470146A142F6 -:10877000F8D110BD2C000000600000004EF68851BA -:10878000CEF20001086840F470000860BFF34F8F1C -:10879000BFF36F8F4FF00070E1EE100A70470000DA -:1087A00039FFFFFFC0A5020058120020700800002A -:1087B00030000320000000001B89FFFF880100003B -:1087C0001C020000040000200B89FFFF860200004D -:1087D0000600000028000320000000000000000048 -:1087E0000000000000000000010000000200000086 -:1087F000030000000400000000F00DF8002801D084 -:10880000FFF7A8FFAFF300800020AFF30080FAF776 -:1088100034FD00F002F80120704700F001B80000BC -:108820000746FFF779FF3846F9F73AFBFBE738B51B -:1088300004460D46284600F005F8A84218BF00245B -:10884000204632BD0149FFF71DBF00BF7411002053 -:1088500001488047014800476D8000086188000892 -:10886000AFF30080FFF78AFFFFF7C6FF00002E007E -:108870004300FFF7FEBFFFF7FEBFFFF7FEBFFFF7A6 -:10888000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF71C -:10889000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF70C -:1088A000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7FC -:1088B000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7EC -:1088C000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7DC -:1088D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7CC -:1088E000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7BC -:1088F000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7AC -:10890000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF79B -:10891000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF78B -:10892000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF77B -:10893000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF76B -:10894000FEBF0000F003100DFF018300016004482A -:108950004200007A4428F3FF010001F1FF01F1FF1A -:1089600001F1FF01F1FF01F1FF01F1FF01F1FF0151 -:10897000F1FF01F1FF01F1FF01F1FF01F1FF01F151 -:10898000FF01F1FF01F1350152FF01AD3F106D4CC8 -:1089900010221008700104004804120804520C044C -:1089A000F00507093D006C880008046158F2006E6C -:1089B0001410010000700C2164FC0217AC100020A0 -:1089C000B71013ED117E110143DB113C210113019E -:1089D000044C10021100207104527004211BA108E4 -:1089E000F3115C1164100702040101ACB60220FC13 -:1089F0000452AC042134610812B844F213A4485064 -:108A0000020802025C40525C0421346108F0031247 -:108A100000120020EC48122C24127404F206BC2C24 -:108A2000101730B50A4B5A6842F480225A60EFF3AF -:108A3000108472B6802251F8045B40040012521E6A -:108A4000F9D11868C103FCD484F3108830BD1040FC -:058A5000005852000176 -:040000050800886106 +:1010D0003000B1F5807F02D34FF0FF3070470170D0 +:1010E000012070470078401E8041C043C00F704708 +:1010F0001B48704730B45368D418042B09DA41B147 +:10110000057804F8015B10F8015B15B15B1C491E02 +:10111000F3E7536030BC704738B514461D4661B1E3 +:10112000FFF7E8FF61686A6B204690476FF00102A5 +:10113000811A02D0491E03D005E06FF0010032BDD4 +:101140004FF0FF3032BD0021616032BDDA6B1047D5 +:10115000034BE1E7024BF9E702487047000000004B +:101160002C2400204C2500200278C9B28A421AB1F2 +:101170001CBF10F8012FF9E718BF002070470000CE +:1011800080B508B90FF21C0005490B681BB122227B +:101190000021984701E000F08EFD222002BD0000F2 +:1011A0000CCC0220636F6E73747261696E74206878 +:1011B000616E646C65723A20626164206D65737360 +:1011C0006167650000F10103810704D010F8011B7D +:1011D00089B18107FAD10268B2F10131914311F06E +:1011E000803F04BF50F8042FF6E710F8011B11B13F +:1011F00010F8011BFBE7C01A70470000C9B2830753 +:1012000006D0521E22D310F8013B9942F7D11FE0BD +:10121000083A13D302F1040241EA012141EA0141F3 +:1012200050F8043B121F21BF4B40A3F1013C2CEAB4 +:10123000030C1CF0803FF3D0C9B2001F083210F835 +:10124000013B521E28BF91EA030FF8D818BF0120B6 +:10125000401E704780B5FFF74BFF006C02BD0000D9 +:1012600062B38B0708D0521E11F8013B00F8013B16 +:1012700000F024808B07F6D1830740F0208000BF68 +:10128000103A07D330B4B1E83810103AA0E838105B +:10129000F9D230BC530724BFB1E80810A0E8081009 +:1012A00044BF51F8043B40F8043BD20724BF31F857 +:1012B000022B20F8022B44BF0B7803707047121FDB +:1012C00017D35B0009D151F8043B20F8023B1B0CFB +:1012D000121F20F8023BF6D20BE051F8043B00F855 +:1012E000013B1B0A20F8023B1B0C121F00F8013BBC +:1012F000F3D238BF121D521E24BF11F8013B00F873 +:10130000013BF8D870470000B3BBD9B1B2F5803FBC +:101310007DD2022A1ED98C46B1FBF2F102FB11C329 +:101320001B0443EA1043B3FBF2FC02FB1C3380B204 +:1013300040EA0343B3FBF2F002FB103240EA0C40F8 +:1013400000237047022A05D98446B0FBF2F002FB65 +:1013500010C270474AB105D100F0010249085FEAA6 +:101360003000704700220023704700F0A7BC0B003C +:101370000200002100207047904271EB030CF6D36D +:10138000B3F5803F2FD2F0B5B3FA83F7B1FA81F409 +:10139000A7F10F0E3D1B5340CEF1200602FA0EF2CC +:1013A000F3415340B5F10F0746D80F3C2C44414060 +:1013B000C4F12006A040F1414140B1FBF3F603FB2C +:1013C0001611A2FB0645001BA94102D2761E801809 +:1013D000594180EA010221FA0EF362FA0EF200216D +:1013E0005A403046F0BD30B4B1FBF3FC03FB1C1196 +:1013F000A2FB0C45001BA94103D2ACF1010C8018E3 +:10140000594130BC02460B46604600217047B2F19C +:10141000807F65D3F0B5B2FA82F7B1FA81F4C7F1F3 +:101420000F063D1B22FA06F307F1110EF24120359B +:101430005A40B5F10F07B8D94140C4F12006A04089 +:10144000F1414140B1FBF3FC03FB1C11A2FB0C4535 +:10145000001BA94103D2BCF1010C801859410F2F88 +:1014600012D30F3FC90341EA5041B1FBF3F603FB2E +:101470001611A2FB0645D4EBC030A94102D2761E5C +:101480008018594146EACC3C07B34140C7F12006D9 +:10149000B840F1414140B1FBF3F603FB1611A2FB4A +:1014A0000645001BA94102D2761E8018594180EAE8 +:1014B000010221FA0EF3C7F1200462FA0EF20CFACF +:1014C00007F05A402CFA04F13043F0BD80EA0102E3 +:1014D00021FA0EF3002162FA0EF260465A40F0BD86 +:1014E0008C46B1FBF2F102FB11C31B0243EA10630D +:1014F000B3FBF2FC02FB1C331B024CEA002043EA64 +:101500001063B3FBF2FC02FB1C331B024CEA00200D +:1015100043EA1063B3FBF2FC02FB1C331B024CEAF0 +:10152000002043EA1063B3FBF2FC02FB1C324CEADE +:101530000020002370470000B0B581EA030C0CF0D6 +:10154000004C40F2FF7515EA11541DBF15EA135700 +:10155000AC42AF4239E0E41923EA455343F4801327 +:10156000C90241F0004141EA505EC7021100A7FBE9 +:10157000020200284FF00000EEFB01204FF00001B6 +:10158000E3FB072118BF42F0010240180021494146 +:10159000E3FB0E01A4F580640F0302D25200404128 +:1015A000494154F101046CDD470872F1004250F1E9 +:1015B000000051EB0451A1F580115CBF41EA0C0120 +:1015C000B0BD4CEA05510020B0BD05EA1357AC424E +:1015D00014BFAF4241E050EA410E1CBF52EA430E35 +:1015E00002E061460020B0BD24423C441BD15FEACA +:1015F000070EF6D0090302BF01460020AEF1140E1B +:10160000B1FA81F7AEEB070401FA07FE0C37C7F118 +:10161000200100FA07F7C8404EEA000E23EA4553BE +:1016200043F48013A2E733F00043B3FA83F704BF17 +:10163000B2FA82FE77440B3FE41BB7F1200E2FBFB6 +:1016400002FA0EF3BB40C7F1200E22FA0EFE38BF9D +:1016500043EA0E03BA40641C82E750EA410E14BF0D +:1016600052EA430E6FF000014FF4001717EB430FDF +:101670008ABF194617EB410FB5E74CEA0551002028 +:10168000B0BDD4F10104B4F120070FDAC4F1200792 +:10169000520828BF42F0010210FA07F501FA07F7D5 +:1016A000E1BF2A43E0403843E1400FE0352C98DCAD +:1016B000C7F1200452EA400220FA07F218BF42F0B4 +:1016C000010231FA07F0A1400A43002172F1004201 +:1016D00050F1000051EB0C01B0BD000010B51446F4 +:1016E00000F002F8226010BDC1F30A5343B14A0072 +:1016F00012F5001F28D2A3F2FE32A1EB025170476F +:1017000050EA410C20D001F0004C31EA0C01B1FA52 +:1017100081F204BFB0FA80F3D2180B3AB2F1200381 +:101720002CBF00FA03F1914041EA0C013EBFC2F127 +:10173000200C20FA0CF319439040524240F2FD3342 +:10174000D21A01EB03517047002270474FF4001C7E +:101750001CEB410F94BF1CEB430F09E041EA030C63 +:1017600050EA4C0C52EA0C0C03D2994208BF90424A +:10177000704714BF8B428242704700004FF4001C38 +:101780001CEB410F94BF1CEB430F09E041EA030C33 +:1017900050EA4C0C52EA0C0C03D28B4208BF824236 +:1017A000704714BF9942904270470000124254D4CF +:1017B00040F2FF7C1CEA11530FD0634531D09B18D7 +:1017C00063453CBF01EB0251704701F0004141EA23 +:1017D0000C510020AFF30080704750EA410320D045 +:1017E00001F0004C91EA0C011CD0B1FA81F30B3BE3 +:1017F0009A420DD9D21A994051EA0C01C3F1200C3A +:1018000020FA0CFC61449840531C40F2FF7CD7E75F +:10181000914041EA0C01C2F1200C20FA0CF319436B +:1018200090407047B0FA80F31533202BE0D3202A84 +:10183000EED3203A203B9A4209D9D21A00FA03F19A +:1018400041EA0C010020531C40F2FF7CB8E700FA8B +:1018500002F141EA0C0100207047524240F2FF7C45 +:101860001CEA11530DD06345DBD0B2EB030C3CBF37 +:10187000A1EB025170470CF1010221EA035141F43E +:10188000801150EA410CCCD001F0004C352A27DC05 +:1018900030B481EA0C01B2F1200309DAC2F120036D +:1018A000044601FA03F5D0402843D1409C400CE0A7 +:1018B000C3F12002450020FA03F418BF44F00104EC +:1018C00021FA03F091400C43002174F1004550F1DE +:1018D000000051EB0C01244230BC7FF47BAF704719 +:1018E0006146002076E70000C1F30A5340F2FE3261 +:1018F0009B1A14DDD3F120034FEAE17208DDC9021F +:1019000041EA505141F00040D840801850407047A3 +:1019100003F2E13010B1D24382F000407047002062 +:1019200070470000C11768B14840401AB0FA80F211 +:101930009040D21CC907C2F5846241EA025202EB10 +:10194000D02140057047000070B44FF0004591EA87 +:10195000030F40F1B5816B40841A71EB030603D28B +:10196000001BB141121973414FF4001C1CEB410FD5 +:1019700034BF7CEB430442E00C0DA4EB1356352E30 +:101980004FDC45EAC323DB0A45EAC121C912B6F19F +:1019900020050DDD63FA05F6EB4086EA03051242E9 +:1019A00018BF45F00105C01851F100010CD213E039 +:1019B00062FA06F5F2405540F3415A40B340F34015 +:1019C0005A408018594107D349085FEA30005FEA5E +:1019D000350528BF45F0010501F58011420875F174 +:1019E000004250F1000041EB04514E0016F5001F7B +:1019F00070BC38BF70470020090D090570471CEB0B +:101A0000410F10D252EA43060BD0BCEB410F05D870 +:101A10000C0DAB43661E342EB6DD02E0AB438018DE +:101A2000594170BC704770BC70470000F0B540F27F +:101A3000FF7581EA030C0CF0004C15EA11541DBF30 +:101A400015EA1357AC42AF42E5E0BC41C1F31301C4 +:101A5000C3F31303801A994143F4801304D2641E24 +:101A60004000494180185941C90241EA5051B1FB37 +:101A7000F3F603FB1611A2FB0675D7EBC020A941B4 +:101A800002D2761E80185941C90241EA5051B1FB79 +:101A9000F3FE03FB1E11A2FB0E75D7EBC020A9417C +:101AA00003D2AEF1010E80185941890241EA9051EA +:101AB000760546EA8E2EB1FBF3F603FB1611A2FB68 +:101AC0000675D7EB8020A94102D2761E80185941B5 +:101AD000C90241EA50514EEA060EB1FBF3F603FB90 +:101AE0001611A2FB0675D7EBC020A94102D2761EC3 +:101AF00080185941C90241EA5051B1FBF3F703FB89 +:101B00001711A2FB0735D3EBC020A94167F10007ED +:101B10000CBF004247F0010766F3D5274FEA1E319C +:101B2000B80814F5806412DDBD0775F1004250EB72 +:101B30000E5051EB045111F5801F5CBF41EA0C01BE +:101B4000F0BD4CF07F6141F0E0410020F0BDBD07E9 +:101B50006D0840EA0E5041F48011D4F10104B4F153 +:101B600020060ADAC4F120060200E04001FA06F37A +:101B7000E1401843B24015430EE0342C13DCC6F1AB +:101B8000200445EA40056D0820FA06F2154321FAC3 +:101B900006F0A1400D43002175F1004250F1000014 +:101BA00051EB0C01F0BD00205FEA0C01F0BDCFB994 +:101BB00092185B41B3FA83F704BFB2FA82F6BF19F9 +:101BC0000B3FB7F120062FBF02FA06F3BB40C7F167 +:101BD000200622FA06F638BF3343BA401CB1E41996 +:101BE000641E33E77F4231F00041B1FA81F404BF53 +:101BF000B0FA80F6A4190B3CB4F120062FBF00FA0E +:101C000006F1A140C4F1200620FA06F638BF3143A0 +:101C1000A0403C1B1AE7AC421ABF05EA1357AF427B +:101C200012E050EA41061CBF52EA4306BFE750EA01 +:101C30004107304661461CBF41EA0551F0BD52EAFA +:101C4000430C08BFC143F0BD00204FF4001616EB53 +:101C5000410F98BF16EB430F08BF16EB410F24BF8F +:101C6000C14305E016EB430F0CBF61464CEA05513A +:101C7000F0BD0000400D491840EA81200CD2490D0A +:101C8000A1F58061491C40F0004005DBD1F11F0146 +:101C900054BFC840C017704700207047014648B184 +:101CA000B0FA80F18840C91CC1F58461090501EBD7 +:101CB000D02140057047012000F0B6B87047000001 +:101CC000841A71EB030604D26E40001BB141121955 +:101CD00073414FF4001C1CEB410F34BF7CEB4306F7 +:101CE00082E00C0DA4EB1356362E7BDC012E45EA68 +:101CF000C32341DC43EA525312BFD20292025B0873 +:101D0000240545EAC12141EA5051D2EBC020994156 +:101D100025D407D1B0FA80F610FA06F162D000207F +:101D2000203608E0B1FA81F6B140C6F1200220FA6F +:101D300002F21143B0404FEAF474B4EB465434F06D +:101D400001064FEA74040AD8D6F50016760D04F0A1 +:101D50000044F04061FA06F25040F1404840C00AA9 +:101D600040EA415021F0004128BF5FEA500550F1A0 +:101D7000000044EBD12135E0DB0A45EAC121C90A64 +:101D8000B6F120050EDD42EA0242120CC5F1200632 +:101D900003FA06F6EB4042EA06056D42984161F10E +:101DA00000010DE062FA06F5F240554063FA06FCC8 +:101DB00082EA0C02F3405A406D42904161EB03010C +:101DC00011F4801F05D1641E620502D06D004041F0 +:101DD000494121F48011430875F1004350F100009E +:101DE00041EB045170BC70471CEB410F15D223F03E +:101DF000004352EA43060BD04FEA4C0CBCEB410FB8 +:101E000004D80C0D661E342EB7DDEBE7801A99411D +:101E100050EA410608BF0021E4E708BF1CEB430F6E +:101E200028BF6FF00001DDE780B5AFF30080024A04 +:101E300011001820ABBEFBE72600020078B58FB07A +:101E400002A80FF20811DFF84C473422FFF718FA06 +:101E50000FF2A9700190009469460FF2897000F0AA +:101E600077FF0121022001F05CF8DFF82C27002128 +:101E7000202001F0D4F802A801F05AF908B101F0CD +:101E800011FB00F019FA01F00FFBDFF810470FF219 +:101E90004962DFF80C67002084F8900004F1260501 +:101EA0004FF6FF7028800021012001F0B8F80FF2F2 +:101EB00075620021102001F0B2F82A2070614FF401 +:101EC000A840B0610020B070F070307100210FF2B6 +:101ED0007122802001F0A3F8012001F045F90020D3 +:101EE000DFF8C026002102EBC003C3E90001401C5B +:101EF000B0F5A84FF7D3DFF8B0164FF400400860F4 +:101F0000062001F067FB002030700120707001F0A6 +:101F1000F4FB0FF20163002204F19101002001F0B3 +:101F2000E9FE0FF2F953002204F19201002001F0C2 +:101F3000E1FE002068808021DFF870060180A0218A +:101F40004180012000F05EFA10B070BD000000007A +:101F50000000000000000000000000000000000081 +:101F6000440008004005020112279C00F401000013 +:101F7000FFFFFFFF480101000020000000000000FB +:101F8000F8B50746DFF814467878DFF814560528C8 +:101F900004F1900604D03E2812D0FF2861D0CDE095 +:101FA000B888E18C884206D10020E08430700FF2BE +:101FB000706001F061FF012000F024FA012048E088 +:101FC000F87801282BD0032802D00C2803D0B5E0E4 +:101FD0000FF27460A8E00FF29C6001F04DFF3879B9 +:101FE00000280CBF0FF2A8600FF2CC6001F044FF94 +:101FF000E08C6A460DF1010101F07CFF60B90FF23F +:10200000E06001F039FF9DF800209DF801100FF20B +:10201000E46001F031FF91E00FF2F46084E0707849 +:1020200001F08EFEB7F805100FF2007001F024FFEA +:10203000307804280CBF0620052030700021B7F846 +:102040000500E0846881297205F1080001F04FFB6A +:1020500000202872E08C688105F1080001F047FB40 +:102060006CE0B7F80300001F61D04FF47F71401A95 +:1020700018D0401E49D0401E17D0401E1CD0401E14 +:102080001DD0401E1ED0801E4CD0401E24D0401EAD +:1020900028D0401E23D040F2F631401A04BF012060 +:1020A00068704BE00FF2C8603EE00FF2F46001F0A0 +:1020B000E3FE0FF2147037E00FF22C7034E00FF2F1 +:1020C000587031E00FF2847001F0D6FEE08C02F01F +:1020D0007AF80FF2A07027E00FF2B47024E00FF24C +:1020E000E07021E0D7F807100FF6040001F0C4FEFD +:1020F000D7F807100FF6100001F0BEFEE08C0121AA +:1021000002F0B3F80FF614000EE0F9790FF64C0068 +:1021100001F0B2FEF879002814BF0FF6B4000FF6F4 +:102120009C0001E00FF6BC0001F0A6FE06E00120D5 +:1021300002F0F9F8B0780A2101F051FE0120F2BD59 +:102140002DE9FC47DFF86804DFF854640468F1788F +:10215000B0780FF6EC09DFF85C7404F0FF04651E3C +:102160000029A4F12A0839D138B92A4641460FF688 +:10217000A00001F081FE0121B17070690146201AB2 +:1021800002F048F9002870616FD10120F0704FF023 +:10219000FF320020B0702A2070610026A01907EBE2 +:1021A000003E4FF4007CDEE90001914208BF9042FE +:1021B0000CD1BCF1010C0EF1080EF4D1761C2A2EC4 +:1021C000ECD32A4641460FF6980041E07146484656 +:1021D00001F052FE022002F0A6F8FEE738B92A46C6 +:1021E00041460FF6BC0001F047FE0120B0704FEAF7 +:1021F000043AB269DFF8AC43D000404220441346B1 +:1022000000F5283152420AEBC20000F100601A4684 +:1022100002F030F9B06140BBF070B07057444FF439 +:10222000A840B0614FF0000C04EBCC0ED7E90023BE +:10223000DEE900018B4208BF82420ED108370CF163 +:10224000010CBCF5A84FEFD32A4641460FF680009B +:1022500002B0BDE8F04701F00FBE3946484601F034 +:102260000BFE022002F05FF8FEE7BDE8FC471FE02E +:1022700080B5CB49087940B901220A710FF6900068 +:1022800001F0FAFDCC490A6809E0002008710FF658 +:10229000A40001F0F1FDC9494FF480600860BDE879 +:1022A000014001F044BA0021102000F0C5BE00BF7B +:1022B0000021802000F0C0BE78B589B00020ADF8C4 +:1022C0001A0001F0EDFDBE4DBE4E286810F1010F61 +:1022D0000ED069683074090A000A707406F110049F +:1022E0006868B074F174080A090C3075717506E0FD +:1022F000002002F04BF9040008BF0FF62424224608 +:102300000621002001F031F96079307207AA2079A6 +:1023100070720621E078B072A078F0726078307345 +:1023200020789E4C70734EF66E5008902868079087 +:102330002E2001F01AF90FF6F0121021182001F0EA +:1023400014F90FF6F4121021082001F00EF91821EB +:10235000012001F031F902F02BF90DF1160006A968 +:102360000190009105AB07220021012001F0CCFE75 +:102370000FF2E470BDF8181000900723BDF81400A8 +:10238000002202F0D5F90DF11A0000900223BDF8E9 +:102390001610BDF81400002202F0CAF90222022130 +:1023A000002001F0DAFD0320207001F061FE012021 +:1023B00060700020E070082060751020A07500207B +:1023C00020758148A0610020A070C1B2214408712D +:1023D000401CC1B21029F8DB002004900023A06942 +:1023E000617803900122207D0290A07D0190607DA4 +:1023F0000090A07801F055FEA07808B101F0CCFE65 +:102400000AB070BD2DE9F8410446012C87B003D114 +:1024100066480588478803E04FF4C8654FF47A673B +:10242000DFF8788108F19006707801F089FC317846 +:102430000FF22C7001F020FD022C11D13078012810 +:1024400018BF02280CD101F0B8FD010004D10FF231 +:102450002C7001F011FD03E00FF2447001F00CFD4F +:10246000347000200690059008F12901049108229B +:1024700098F828000FF6D0010390029101920023F2 +:1024800000933A462946002001F0A9FD4D490E204F +:1024900001F06AFE010013D1012C0AD10FF228705D +:1024A00001F0EAFC7078494908B0BDE8F04101F05C +:1024B00096BC08B0BDE8F0410FF2347001F0DCBC0E +:1024C00008B0012CBDE8F0410CBF0FF250700FF2C4 +:1024D0007C7001F0D1BC000010B5012001F02DFF8F +:1024E0002E4C94F89000052812D001F066FD0021D2 +:1024F00084F8901030B90FF2887001F0BDFC0FF233 +:10250000887001E00FF29C70BDE8104001F0B4BC8F +:1025100010BD00000021012000F08EBD012001F05F +:102520000CBF00001CB51D4C94F89000012818BF8A +:1025300000282DD01A484178012929D1002201789C +:102540004270491C01EBD1725210A1EB42010170A3 +:10255000F7EE040A017800EB81004FF4FA7190ED78 +:10256000030AE08C0091C0EE200AFDEEE00A10EEB6 +:10257000902A92B20023114602F01EF9BDE81640DF +:1025800000280CBF0FF240700FF26C7001F074BCA9 +:1025900013BD0000A00803208F2D000858C602209C +:1025A000FC250020582600201040005814CC0220A2 +:1025B000804000580060FD07981400581814005817 +:1025C0008075FF1F1826002007B2010046E00100B9 +:1025D0000021202000F030BD012000F053BD01207B +:1025E00000F058BD10B50446616801F1080000F024 +:1025F00069FF00B10120207010BD000010B101285A +:1026000003D070473F2000F02BBD3F2000F030BDCD +:10261000402812BF8028042000F034BD704700001D +:102620000D0A0D2A2A20444953434F4E4E45435428 +:10263000494F4E204556454E542057495448204353 +:102640004C49454E54200A000D0A0D2A2A20434FBA +:102650004E4E454354494F4E205550444154452019 +:102660004556454E54205749544820434C49454E01 +:1026700054200A004556545F5550444154455F501C +:1026800048595F434F4D504C455445200A000000C7 +:102690004556545F5550444154455F5048595F4337 +:1026A0004F4D504C4554452C207374617475732004 +:1026B0006F6B200A000000004556545F555044419E +:1026C00054455F5048595F434F4D504C4554452C3D +:1026D00020737461747573206E6F6B200A000000A4 +:1026E000526561645F504859207375636365737305 +:1026F000200A000050485920506172616D2020541A +:10270000583D2025642C2052583D202564200A0085 +:102710005265616420636F6E66206E6F74207375FE +:10272000636365657373200A000000004843495FD6 +:102730004C455F434F4E4E454354494F4E5F434FC8 +:102740004D504C4554455F5355424556545F434F99 +:10275000444520666F7220636F6E6E656374696FA7 +:102760006E2068616E646C6520307825780A000000 +:102770000D0A0D2A2A204143495F4741505F4C49C9 +:102780004D495445445F444953434F564552414295 +:102790004C455F56534556545F434F4445200A000D +:1027A0000D0A0D2A2A204143495F4741505F50419D +:1027B00053535F4B45595F5245515F5653455654ED +:1027C0005F434F4445200A000D0A0D2A2A20616309 +:1027D000695F6761705F706173735F6B65795F726A +:1027E000657370200A0000000D0A0D2A2A2041435B +:1027F000495F4741505F415554484F52495A4154EF +:10280000494F4E5F5245515F56534556545F434FB3 +:102810004445200A000000000D0A0D2A2A204143E9 +:10282000495F4741505F534C4156455F53454355BF +:10283000524954595F494E495449415445445F56A1 +:10284000534556545F434F4445200A000D0A0D2A54 +:102850002A204143495F4741505F424F4E445F4CFD +:102860004F53545F56534556545F434F4445200AD7 +:10287000000000000D0A0D2A2A2053656E642061B5 +:102880006C6C6F77207265626F6E64200A000000C6 +:102890000D0A0D2A2A204143495F4741505F4144B8 +:1028A00044525F4E4F545F5245534F4C5645445F20 +:1028B00056534556545F434F4445200A00000000DC +:1028C0000D0A0D2A2A204143495F4741505F4B457D +:1028D0005950524553535F4E4F5449464943415412 +:1028E000494F4E5F56534556545F434F44450A0087 +:1028F0006E756D657269635F76616C7565203D20EC +:10290000256C640A000000004865785F76616C758C +:1029100065203D20256C780A000000000D0A0D2A74 +:102920002A206163695F6761705F6E756D657269AA +:10293000635F636F6D70617269736F6E5F76616CF8 +:1029400075655F636F6E6669726D5F7965736E6FD3 +:102950002D2D3E594553200A00000000424C455F92 +:102960004354524C5F4170705F4E6F746966696387 +:102970006174696F6E3A204143495F4741505F502F +:10298000414952494E475F434F4D504C4554455F76 +:1029900056534556545F434F44452C20706169722D +:1029A000696E675F636F6D706C6574652D3E5374FF +:1029B00061747573203D2025640A00000D0A0D2AFC +:1029C0002A2050616972696E67204F4B200A00000F +:1029D0000D0A0D2A2A2050616972696E67204B4FDB +:1029E000200A00000D0A0D2A2A204143495F474171 +:1029F000505F50524F435F434F4D504C4554455FDD +:102A000056534556545F434F4445200A000000008A +:102A10000D0A0D53544152542045524153494E47DB +:102A200020414C4C20534543544F52532046524F63 +:102A30004D20256C6420544F20256C640A00000052 +:102A40000D0A0D4552524F522041542041444452E8 +:102A50004553532030782530386C58200A00000048 +:102A60000D0A0D414C4C20534543544F52532046C0 +:102A7000524F4D20256C6420544F20256C64204813 +:102A8000415645204245454E2053554343455353F7 +:102A900046554C4C59204552415345440A000000CC +:102AA0000D0A0D53544152542057524954494E4730 +:102AB00020414C4C20534543544F52532046524FD3 +:102AC0004D20256C6420544F20256C640A000000C2 +:102AD0000D0A0D414C4C20534543544F5253204650 +:102AE000524F4D20256C6420544F20256C642048A3 +:102AF000415645204245454E205355434345535387 +:102B000046554C4C59205752495454454E0A0000E2 +:102B10000D0A0D435055312054494D494E47205020 +:102B2000524F54454354494F4E20454E41424C4527 +:102B3000440A00000D0A0D435055312054494D49B7 +:102B40004E472050524F54454354494F4E2044491C +:102B50005341424C45440A005032505352563100C2 +:102B6000466972737420696E64657820696E2025E9 +:102B700064207374617465200A00000053756363F8 +:102B800065737366756C6C792053746F70706564CF +:102B9000204164766572746973696E67200A00006B +:102BA00053746F70204164766572746973696E67DF +:102BB000204661696C6564202C20726573756C74A5 +:102BC0003A202564200A00005375636365737366B9 +:102BD000756C6C7920537461727420466173742033 +:102BE0004164766572746973696E67200A0000003B +:102BF0005375636365737366756C6C792053746188 +:102C00007274204C6F7720506F7765722041647624 +:102C10006572746973696E67200A0000537461728B +:102C200074204661737420416476657274697369B7 +:102C30006E67204661696C6564202C20726573752F +:102C40006C743A202564200A0000000053746172FD +:102C500074204C6F7720506F7765722041647665E1 +:102C600072746973696E67204661696C6564202CB3 +:102C700020726573756C743A202564200A00000088 +:102C800020200D0A0D0000002A2A2053544F502006 +:102C90004144564552544953494E47202A2A202040 +:102CA0000D0A0D002A2A2053544F50204144564506 +:102CB00052544953494E47202A2A20204661696CC4 +:102CC0006564200D0A0D0000424C455F5356435F7A +:102CD0004C324341505F436F6E6E5F557064617458 +:102CE0006528292C205375636365737366756C6C56 +:102CF00079200D0A0D000000424C455F5356435F9A +:102D00004C324341505F436F6E6E5F557064617427 +:102D10006528292C204661696C6564200D0A0D0028 +:102D20006C7AD8AC57720000123456789ABCDEF038 +:102D3000123456789ABCDEF0FEDCBA09876543216E +:102D4000FEDCBA098765432109503250535256318F +:102D50007FB50C466D4D61686D4EE861296228466D +:102D600001F05EFD246805F1240001F063FD74604C +:102D700006F1080001F05EFD01203070296829B1DC +:102D80000FF2551000900294684688477FBD1FB52A +:102D90005F4C04F1080001F050FD00BB2178F1B157 +:102DA000694604F1080001F071FD5848C16949B154 +:102DB0000098029001228DF8042001A888479DF810 +:102DC000040000E001202070207818B1009801F084 +:102DD00012FE04E0009904F1080001F037FD04F14F +:102DE000080001F02AFD28B9207818B104F1080084 +:102DF000FFF7EEFB1FBD2DE9F8430646002000F06B +:102E00005FF874883088B268DFF80081C4F3090481 +:102E100044EA8024F068A4B2C1B2204600F03CF835 +:102E2000002748F2E8094846FFF7D9FB08E0688820 +:102E3000A04202D1316928780870687800B1012772 +:102E400008F1240001F0F9FCF0B9694608F124000A +:102E500001F01CFD009800F10B05407A0F28E6D028 +:102E6000B5F80110A1420DD10098817AC81E716990 +:102E7000C0B28842C8BF0846706102463069E91C8A +:102E8000FEF7EEF92878D9E73800CCD0012000F021 +:102E900017F80020BDE8F28310B513461C4A5468A9 +:102EA000A4F80900E1720A46194604F10C00FEF785 +:102EB000D7F9164A1369BDE81040002100201847D1 +:102EC0001249096A82B008B921B101E011B10120AB +:102ED00002B0084702B0704710B50146487A0F2883 +:102EE00018BF0E2807D10B4801F0BAFCBDE810400E +:102EF0000020FFF771BB064C04F1080001F0B0FCA4 +:102F000004F10800BDE81040FFF762BBFCCA0220D4 +:102F100088CB022020CB02200C48002101604160B8 +:102F2000704710B500F00CF85C6819B1012904D1A4 +:102F3000204301E024EA0000586082F3108810BDAD +:102F4000EFF3108272B6014B70470000C8CB02202D +:102F50002DE9FC47604CDFF88491A5692840A06109 +:102F60004FF0FF3A21694FF0010834E0521C54F849 +:102F70003200616919400142F8D0616904EBC20670 +:102F8000084071681840014208BFC6F804A077687D +:102F9000384000F0A5F8606208FA00F087437760D7 +:102FA000EFF3108172B6626A206908FA02F2D24326 +:102FB00010402061022004EBC00353F8086C164057 +:102FC000401E43F8086CF6D181F31088606A59F806 +:102FD000201088472169A36960690140194205D022 +:102FE000E069216A084208BF0022C0D0C4F824A0CA +:102FF00001F04FFDEFF3108972B62169606901405D +:10300000A069014201BFE169206A014201F042FE6C +:1030100089F3108801F0B4FFA561BDE8F38738B5E6 +:103020001446EFF3108572B600F05AF82B4941F8B8 +:10303000204085F3108831BD10B500F00BF8044333 +:103040001C6153F83140204343F83100FFE782F31D +:10305000108810BDEFF3108272B61F4B1C697047C9 +:10306000EFF3108172B61C4A536923EA000005E0B1 +:10307000EFF3108172B6184A53691843506181F317 +:1030800010887047EFF3108172B6134AD369184362 +:10309000D061F4E7F8B5104C666A256A374616F138 +:1030A000010F0EBF0026012101FA06F6206202E0A0 +:1030B000304601F0F0FD216AE0690842F8D067620D +:1030C000EFF3108172B6E269206A8243E26181F314 +:1030D00010882562F1BD0000B42500209CC80220A4 +:1030E00002460020110C090404BF1020120412F043 +:1030F0007F4F04BF083012020FF2180112F0704F18 +:1031000004BF001D1201120FC0F11F00895C401A9C +:10311000C0B2704704030202010101010000000077 +:103120000000000001F083FF9DF80E0005B000BD17 +:10313000F8B500F10C026B4625214FF66640F1E729 +:10314000F8B500F10C026B460F214FF66840E9E735 +:10315000F8B500F003F84FF66940E3E78DF800009A +:103160006B466A4601217047F8B5FFF7F7FF4FF647 +:103170007340D7E7F8B502466B460E214FF675400F +:10318000D0E770B51B491C4B0A681C49C2F30D02FD +:1031900001EB82010C6822689A4205D16569A16938 +:1031A000E269E368246904E025696169A2696368EA +:1031B000A4682E0E067001722E0C467042722E0A02 +:1031C0008670C473C5F3031605F00F050571C6704C +:1031D0000D0E45710D0C85710D0A190E8172C571A8 +:1031E000190CC1721B0A210E41730373210C8173E8 +:1031F000002070BD3C400058B95646A9000003208D +:103200009A4900E09A4981B00A6802430A60096855 +:1032100008400090009801B0704710B59549964C51 +:103220004FF40040086001F051FF606840010ED586 +:103230006068C0000BD401F077FF01F075FF2068D3 +:1032400040F480302060216821F48031216000F05A +:10325000D2F8002001F09AF940B180798749E16005 +:10326000E16821F47C5141EA0021E16000F047F877 +:103270008348844C016800220260026902F0500217 +:1032800002610420FFF7BEFF0120FFF7BBFF022011 +:10329000FFF7B8FF0420FFF7B3FF0120FFF7B0FFEF +:1032A0000220FFF7ADFF00220F210E2001F060FF8A +:1032B0000E2001F07BFF00220F213A2001F058FF81 +:1032C0003A2001F073FF00216F4841600F218160B7 +:1032D000046047F6FF71C16001F0BEFFCA20606262 +:1032E000FF2153206062A068C008C000A060616236 +:1032F00001F0D0FB4FF0FF30FFF72AFEFAE710B5E0 +:10330000AEB01CA8482102F04BF801A81C2102F025 +:1033100047F808A8502102F043F801F005FF56488D +:10332000016821F01801016007215848026822F461 +:10333000C06242F4007202604FF48032006800F410 +:10334000C06000904FF4807400981C9101201E9082 +:103350000021402020901D9227911F941CA802F06C +:103360002CF86F200190022100200291039004901C +:10337000059006900790012101A802F0D0FA43F6CB +:103380000300089000214FF4804019900E910F9196 +:10339000102002211B901A91189408A802F098FCA2 +:1033A0002EB010BD10B53A4C3A4800F017F84FF463 +:1033B0000040E061002020626062A062204602F0CE +:1033C00005FE0021204603F0C0FA0021204603F04C +:1033D000C7FA2046BDE8104003F09ABA20604FF4C7 +:1033E000E13060600020A060E06020610C2060613E +:1033F0000020A0617047284881B0016841F4801125 +:1034000001603F21006800F480100090009823487C +:1034100041604161016841F47C110160026942F43C +:103420007C120261016841F03F010160026942F0D3 +:103430003F02026101B0704738B5044603F0E4FA78 +:1034400014F1010F054609D001F057FE241805E0DC +:103450001348016821F00401016030BF03F0D4FA81 +:10346000401BA042F4D331BD0000000048000058CA +:103470004C0000581040005890000058FECAFECA88 +:10348000800800580028004028CB02200004005883 +:103490007CC702200038014050000058040C00583E +:1034A00010ED00E0704700001B480021017101721F +:1034B00000F034B818490A7941F822000879401C14 +:1034C0000871704770B504466078FF2802BFB4F8F1 +:1034D000031001F47F41B1F5406F12D100260E4D6B +:1034E00000E0761C2979F0B288420AD2F1B255F890 +:1034F0002110204688470100F3D002D0022805D0D1 +:1035000006E02046BDE87040FEF73ABD002070BDE1 +:10351000012070BD00000000B4CB022080B503F094 +:1035200079FA03F078FA03F077FA03F076FA03F009 +:1035300075FA03F074FA03F073FA03F072FA03F009 +:1035400071FA03F070FA03F06FFA03F06EFA03F009 +:10355000A3FA03F05BFB03F05AFB03F059FB03F003 +:1035600058FBBDE8014003F055BB18B50C46C7B089 +:10357000114600228DF800208DF81C008DF81D40AA +:1035800022460DF11E0003F046FB00F03FF83F20FD +:103590000C21ADF80400ADF8061007A80121039036 +:1035A0000691A41C049400F041F800284CBFFF20B1 +:1035B0009DF8000048B010BD00B5C7B000F01FF87E +:1035C0000F2000F028F800284CBFFF209DF80000D5 +:1035D00047B000BD00B5C7B00021ADF81C008DF8A4 +:1035E0000010182201A803F01CFB182000F013F8AB +:1035F00000284CBFFF209DF8000047B000BD00220E +:103600008DF800208DF81C008DF81D101822002167 +:1036100001A803F006BBADF8060007A9022004903C +:103620003F22012003910690ADF80420CDF814D07C +:10363000002101A8FFF7DFBB70B506464E4C30787D +:103640004CA520B1012807D0032810D070BD01205F +:1036500020700FF2281003E0002121700FF25010AB +:1036600000F00AFC2846BDE8704000F005BC716817 +:103670000878C8B94978012909D100F054FE0FF241 +:10368000641000F0F9FB00F02FF80120A0707168C1 +:10369000487848B900F051FE0FF2701000F0ECFBD2 +:1036A00000F022F80020A0707068017801291AD17A +:1036B000407801280AD1002000F035FE0FF2741086 +:1036C00000F0DAFB00F010F80120A0707168487873 +:1036D00048B900F032FE0FF2841000F0CDFB00F08C +:1036E00003F80020A07070BD284600F0C5BB00782C +:1036F000012808BF00F00DB8704780B50FF23902FD +:1037000000210220FFF78BFC1B4900220A70BDE854 +:10371000014080B5002000F010FE174801214170E3 +:10372000002181700121C1700021017101BD0021C2 +:103730000220FFF781BC000010B50F4C2079401E1D +:103740008041C00F2071207868B10FF2381000F06E +:1037500093FB08A000F090FBE11CBDE810404FF681 +:10376000426003F029BABDE810400FF2581000F093 +:1037700083BB0000200A0D00F0CB02202D2D20502D +:103780003250204150504C49434154494F4E2053F0 +:103790004552564552203A204E4F544946494341DE +:1037A00054494F4E20454E41424C45440A000000CA +:1037B0002D2D20503250204150504C494341544906 +:1037C0004F4E20534552564552203A204E4F5449B1 +:1037D0004649434154494F4E2044495341424C4588 +:1037E000440A00002D2D20503250204150504C49A9 +:1037F000434154494F4E2053455256455220203A9A +:10380000204C454431204F4E0A0000002D2D205001 +:103810003250204150504C49434154494F4E20535F +:10382000455256455220203A204C454431204F46BF +:10383000460A00002D2D20503250204150504C4956 +:10384000434154494F4E2053455256455220312052 +:103850003A204C454431204F4E0A00002D2D205077 +:103860003250204150504C49434154494F4E20530F +:1038700045525645522031203A204C454431204F84 +:1038800046460A002D2D20503250204150504C49C0 +:10389000434154494F4E2053455256455220203AF9 +:1038A00020494E464F524D20434C49454E542042EC +:1038B0005554544F4E203120505553484544200A0A +:1038C000200000002D2D20503250204150504C49F6 +:1038D000434154494F4E20534552564552203A20B9 +:1038E00043414E275420494E464F524D20434C49A8 +:1038F000454E54202D20204E4F54494649434154B3 +:10390000494F4E2044495341424C45440A2000004F +:10391000DFF83C150A6892B200E00246086880B2FF +:103920008242FAD170472DE9FC4104461825DFF8A0 +:103930002485DFF82465684308EB00073078062803 +:1039400008D131787170347078754FF0FF30706045 +:10395000002039E000F077F8B9680918B96008F17B +:103960000803B96832786A439A589142327813D37F +:1039700008F1150315FB02FC13F80C30062B25D0BB +:1039800008F108066B43F358994222BF08F115036A +:103990006A439A5CEED219E01146337869439A4241 +:1039A0000BD008F1140308F1150C5B5C15FB03F553 +:1039B0000CF805407A753B7500E07A7508F1140241 +:1039C0005454317871703470BDE8F6811146694302 +:1039D00008F115035B5C062B04D008F1140615FBF7 +:1039E00003F574557B753A7508F115025454EBE7ED +:1039F000F8B5DFF86434DFF85C541E78182402460A +:103A00006243B0422A4404D118785870507D18702F +:103A10000FE0167D507D92F815C005F1150766433D +:103A2000062807F806C004D0167D143514FB00F4F0 +:103A30002E55012010731878062802BF00294FF078 +:103A4000FF315960F1BD10B5DFF80C44606810F12A +:103A5000010F0FD0FFF75CFF6168DFF8002481429F +:103A600061683CBF5388C918081A517848431178D7 +:103A7000C84000E0002080B210BD2DE9F84FDFF80B +:103A8000DC53DFF8DCB3D5F80880D8F80000DBF8A9 +:103A900000104A0500F090F9DFF8BC63DFF8B4A32A +:103AA00021F4806181604FF0180934780AF1080030 +:103AB00019FB04F14758FFF7C6FF874217D20027CA +:103AC0000121B170062C3DD019FB04F40AF1080164 +:103AD0000AF108020959814223BF0AF10801095974 +:103AE000091A002111510AEB04014C7DEAE7A9886B +:103AF0004118B94202D2AF880021E2E73F1ADFE75E +:103B0000022802DA2878012800D07F1ED8F80000A9 +:103B1000C1684A07FAD500F055F9DBF80C00000C33 +:103B2000BFB247EA0047CBF80C70FFF7F1FE7060B8 +:103B3000A8680068816841F480618160AFF300800B +:103B4000BDE8F18FB8B20028DAD1FFF7E1FE70606E +:103B50000320BDE8F24F01F057BB2DE9F843EFF326 +:103B6000108872B6BD4DBB4BA8680168CA224A6274 +:103B700053204862B84A886820F480608860182022 +:103B80001678374647431F44387B022826D13C68C5 +:103B9000D7F810909078F0B17A7B012A0AD10121F0 +:103BA0003046FFF725FF88F310887968304600F02B +:103BB00016F904E088F31088304600F0C1F8A868D0 +:103BC0000068CA214162224653214162484631467B +:103BD00000F050F90BE0FFF750FF06E0C86842071D +:103BE000FCD500F07EF89F49086088F31088FF211B +:103BF000A86802685162BDE8F183F8B5974CA160EE +:103C0000CA2209684A6253224A62954A136843F0FD +:103C100020031360136803F00703C3F10403237048 +:103C200095682D0C05F07F056D1C6570EDB29268EE +:103C3000C2F30E02521C628092B2521E6A43A2F577 +:103C4000A072DA404FF6FF739A422CBFA380A28085 +:103C5000854A136843F400231360844B1D6845F4C0 +:103C600000251D6048BB7C487A4E012383701825CF +:103C70004FF0FF33436000235FFA83FC06F10C072B +:103C800015FB0CFC4FF0000E07F80CE05B1CDFB2DC +:103C9000062FF1DB06230370886820F480608860BB +:103CA00000F01FF8D060032001F0B9FAA16808689D +:103CB000826842F48042826005E0C868410544BFE2 +:103CC000032001F0A1FAA1680A68FF2050620022D7 +:103CD0000321032001F04CFABDE8F240032001F07B +:103CE00065BAC86800F0800060F49060C8604FF466 +:103CF00000207047F0B504460025EFF3108672B639 +:103D00001827DFF850C10CF10C0007FB05FE10F876 +:103D10000E0010B16D1C062DF5DB062D0CD06F4387 +:103D20000CEB07000127077386F3108804614273C8 +:103D300003600D700020F0BD86F310880120F0BDF7 +:103D4000F8B50746EFF3108472B6032001F039FA94 +:103D5000424DAE683068CA2141623A465321416201 +:103D6000182043494243895C02291BD1002138466F +:103D7000FFF73EFE3848017806290ED130683849F1 +:103D80000A68530500F018F821F480618160C16869 +:103D90004A07FCD500F016F804E04078884218BFC6 +:103DA000FFF76BFEA9680A68FF205062032001F04C +:103DB000FDF984F31088F1BD02D5C1684A07FCD42F +:103DC00081687047C16801F0800161F49061C16051 +:103DD0004FF4002023490860032001F020BA2DE9A8 +:103DE000F04180460F46424618201A4942438C183B +:103DF000207B022804BF4046FFF7A2FFEFF31085A7 +:103E000072B6032001F0DDF9144EB0680068CA21D3 +:103E100041625321416202202073A76067604046DF +:103E2000FFF781FD0C490A784978914202D0FFF7EB +:103E300024FE02E0A168081AA060FF20B1680A68A9 +:103E40005062032001F0B2F985F31088BDE8F081DB +:103E5000282800400CC8022000CC0220A8CB022059 +:103E6000082800400C080058000800588008005836 +:103E700018C80220104700000EB4C0B5024603A8BF +:103E800000210190009101AB0121044878440C30DD +:103E9000FCF754F906BC5DF810FB00BFEF4B0000C7 +:103EA00000B587B000F014F8012003220690ADF8A9 +:103EB0000420ADF8062000F07AF800284CBFFF205F +:103EC0009DF8000007B000BD182201A802F0A9BEAD +:103ED00000208DF800001822002101A802F0A1BEE8 +:103EE00009220021684602F09CBE1822002102A887 +:103EF00002F097BE70B5C8B006460C4615460522BE +:103F0000FFF7EFFFADF82060FFF7EFFF302100F083 +:103F100014F80521049000F019F8002848BFFF208C +:103F200009D49DF8000030B99DF8030020709DF879 +:103F300004002870002048B070BDADF80A100820B9 +:103F40000221ADF80800059108A870470791CDF847 +:103F500018D0002102A8FEF74EBF00B5C7B000F090 +:103F60000EF8FFF7B1FF312000F013F800F01FF852 +:103F700000284CBFFF209DF8000047B000BD002383 +:103F80008DF81C008DF8003007A841708270002168 +:103F90007047ADF8060007A903200490082201200D +:103FA00003910690ADF80420704703900691CDF878 +:103FB00014D0002101A8FEF71EBF00B587B000F0A5 +:103FC00065F900F04DF9812000F0F8F800F016F9DD +:103FD00000284CBFFF209DF8000007B000BD2DE970 +:103FE000F84DC7B09446DDF840E1519A559D569E74 +:103FF000DDF84CA1ADF81D108DF81C004FF0000B42 +:10400000ADF81FC08DF821308DF822E000F024F8C3 +:1040100000F017F824F8095F668000F021F93F20CE +:10402000832100F00EF9574406910D37049700F0F4 +:10403000E8F800284CBFFF209DF8000048B0BDE81C +:10404000F08D88F800A007AC5499E419524608F1A5 +:104050000100544402F0DFBD8DF823201746529929 +:104060008DF800B00DF1240809A8B84402F0D3BDC2 +:1040700000B5C7B000F00CF8852000F0C8F800F0DB +:10408000BDF800284CBFFF209DF8000047B000BDE0 +:1040900000218DF81C008DF80010182201A802F0F4 +:1040A000C0BD2DE9F841C7B04FF0000800F026F878 +:1040B0000DF12300DDF844E14E9F4F9E509D529C30 +:1040C0008DF81F30C0F800E08DF800808DF820706A +:1040D0008DF821608DF822508DF8274000F0C0F84F +:1040E0008620ADF8060007A90C2000F083F8002810 +:1040F0004CBFFF209DF8000000F0C5B88DF81C00F3 +:1041000007A8417082707047F8B5C8B005460E46E2 +:1041100017461C4600F023F808A8467087708DF8F3 +:10412000205000F089F88A21ADF80A103F200321C1 +:1041300000F075F8002848BFFF200ED49DF800005D +:1041400058B94F994E98BDF801202280BDF8032040 +:104150000280BDF805000880002049B0F0BD0722AC +:104160000021684602F05DBD18B5C7B000F09DF8AB +:1041700000F076F83F208E2100F08CF800F041F836 +:1041800000284CBFFF209DF8000048B010BDADF8DE +:10419000060007A90220704700B587B000F076F846 +:1041A00000F05EF8922000F009F800F027F80028EF +:1041B0004CBFFF209DF8000007B000BDADF8060021 +:1041C0003F220120704700B5C7B00021ADF81C00A8 +:1041D000FFF761FF9520FFF7DAFF00F00BF80028EA +:1041E0004CBFFF209DF8000047B000BDADF80600B1 +:1041F00007A9032004903F22012003910690ADF807 +:104200000420CDF814D0002101A8FEF7F4BDADF8CC +:10421000060007A901203F22039104907047ADF8E2 +:104220000800059108A8072104900791CDF818D03F +:10423000002102A8FEF7DFBD1822002102A802F02B +:10424000F0BCADF80400ADF8061007A801210390FA +:10425000704700228DF80020ADF81C008DF81E106C +:104260001822002101A802F0DCBC00B5C7B0FFF79E +:10427000F0FFA520FFF7BAFF00284CBFFF209DF8F4 +:10428000000047B000BD48B0BDE8F08100208DF8C7 +:1042900000007047ADF80400ADF8061007A8012132 +:1042A00003900691641C04947047044600208DF826 +:1042B00000008DF81C4022460DF11D0002F0ABBC41 +:1042C000444981B00A6802430A60096808400090C6 +:1042D000009801B0704778B585B00446684614214F +:1042E00001F05EF80220FFF7EBFF00F010F80095F8 +:1042F000012001900021022003900291694656F8A6 +:10430000240002F099FC00F008F806B070BD0FF22E +:10431000D000314E30F81450704756F82400002277 +:10432000294602F04DBD0FF2B8012B4B31F81010A9 +:1043300053F82000012202F043BD0FF2A401264BE6 +:1043400031F8101053F82000002202F039BDF0B50A +:1043500085B005460C466846142101F021F80DB9D8 +:10436000042004E0012D18BF022D02D10820FFF720 +:10437000A7FF2000194E0FF270070DD137F8150076 +:10438000009000210191012002900221039100F090 +:104390001CF80120FFF750F8012C14D137F8150054 +:1043A000009001214FF404100190029100F00DF8EB +:1043B0000FF23C00445D00220F2160B200F0D8FEF5 +:1043C00060B200F0F3FE05B0F0BD694656F8250076 +:1043D00002F032BC4C0000583C2600204826002049 +:1043E0002000010002000000100001000200000097 +:1043F0000A06070000EB8100604AD0F88010914265 +:1044000001D0012070470020704742F4806240F8DC +:10441000212070472DE9F04104460D460026DFF8C3 +:10442000608102214046FFF7E5FF0028F9D102F044 +:1044300018FD0120FEF78CFE0027AF4215D2300098 +:1044400013D1381900F045F806467F1CF5E7002027 +:10445000FEF77EFE02F013FD002202214046FFF728 +:10446000D4FF00252846BDE8F081002EEFD0ED1BDB +:104470006D1CF7E72DE9F84380460C4615460026EB +:10448000DFF8FC9002214846FFF7B4FF0028F9D17D +:1044900002F0E7FC0027AF4216D2AEB904EBC7002A +:1044A000D0E9002308EBC70000F018F806467F1C8F +:1044B000F1E702F0E4FC002202214846FFF7A5FFE5 +:1044C00000252846BDE8F283002EF2D0ED1B6D1CBE +:1044D000F7E7014600220023002001E00146012009 +:1044E0002DE9F84F86B00225012602950496039126 +:1044F0008DF8000005919246DFF88480214F9B469D +:10450000EFF3108938680003FCD472B6D8F81800AD +:1045100008B1012519E007214046FFF76BFF002590 +:10452000C4B294B99DF8000020B901A902A802F014 +:10453000FBFC05E0059952465B46012002F064FC55 +:10454000002207214046FFF760FF89F310880DB174 +:10455000002002E0002C03D0012000F015F80646F0 +:10456000254318BF002ECDD138684103FCD4701EFE +:104570008041C00F07B0BDE8F08F0000000400804C +:1045800000140058104000580020704701460648AB +:10459000064AC3798B4218BF904218BF0838F8D139 +:1045A0008B4218BF00207047F873FF1F0070FF1F79 +:1045B00000B587B000208DF8000000F0E0F840F270 +:1045C0000110ADF806003F220120069000F0ECF843 +:1045D00000284CBFFF209DF8000007B000BD2DE96A +:1045E000F84107460128C7B0884615461E4608BF51 +:1045F000022003D002280CBF102000200DF11D0165 +:104600000C1800F036F8012F8DF81C7002D0022F24 +:1046100018D019E002273A4641460DF11D0002F07C +:10462000FAFA2570667000F0AAF83F204FF4817105 +:1046300000F016F8FF1C049700F0B8F8002805D524 +:10464000FF2009E01027E6E7972005E09DF800002D +:1046500010B94E9800F067F8FFE748B0BDE8F08168 +:10466000ADF80400ADF8061007A8032103900691E9 +:10467000704703220021684602F0D3BA2DE9F64FB5 +:104680000C460546012CC7B09B4608BF022003D04C +:10469000022C0CBF102000200DF11F010E18FFF797 +:1046A000E8FF012CADF81C508DF81E4002D0022C02 +:1046B0002CD02DE00227569C559DDDF85091DDF859 +:1046C0004CA1DDF8488148993A4600F054F8A6F824 +:1046D00000B086F8028086F803A086F80490757111 +:1046E000B47100F04CF83F20ADF804004FF4827133 +:1046F00007A8ADF80610039003210A370497069126 +:1047000000F054F8002805D5FF2009E01027D2E773 +:10471000972005E09DF8000010B9579800F003F8C5 +:1047200049B0BDE8F08FBDF801100180002070474E +:1047300030B5C7B01C464A9B00F026F800258DF81E +:1047400000508DF82140224619460DF1220002F05A +:1047500062FA00F014F83F204FF4837100F01BF868 +:10476000A41D049400F022F800284CBFFF209DF8FF +:10477000000047B030BD0DF11F0002F04CBA182206 +:10478000002101A802F04DBAADF81C00ADF81E10D2 +:104790008DF820207047ADF80400ADF8061007A88A +:1047A0000121039006917047ADF80420CDF814D094 +:1047B000002101A8FEF71FBB30B5C7B00025ADF83A +:1047C0001C0007A84A9C41808280ADF822300481F9 +:1047D0008DF8005000F01EF80F21029140F2811078 +:1047E0000A21ADF80600049107A801213F22039099 +:1047F000069100F007F800284CBFFF209DF800004C +:1048000047B030BDADF80420CDF814D0002101A888 +:10481000FEF7F1BA1822002101A802F002BA000046 +:104820000249016002490161704700BFF348000876 +:1048300019490008006040607047EFF3108172B6BC +:10484000026882420CBF012000201CE0EFF31082BE +:1048500072B603680B60486001600868416023E03D +:10486000EFF3108272B6086043684B60416048689D +:10487000016019E0EFF3108172B6426803681360BB +:1048800002684368536081F31088704710B5EFF3F6 +:10489000108472B602680A600068FFE7FFF7EAFF5B +:1048A00084F3108810BD0B6082F3108870470000FD +:1048B00002F027BC6C486D49016001F120024260A2 +:1048C00001F13002826001F13C02026201F1440216 +:1048D000426201F14C02C26001F15402026101F135 +:1048E0007002426101F1740282618031C16102F0A3 +:1048F00026BC38B504465E4D2846FFF79BFF5A4854 +:104900004068A1680160E168C16085605949416003 +:1049100002F031FC58482AE080B5534842681368D9 +:1049200001211972406802F02CFC002002BD38B54C +:10493000514C4F4D04E000F041F800982168884741 +:104940002846FFF77AFF0028F5D031BD4A48416874 +:10495000084738B50446494D2846FFF76BFF4248E3 +:10496000C068A1680160456002F010FC44482168FD +:10497000016061684160002032BD80B53A48C2687C +:10498000136810211972C06802F006FC002002BDF5 +:1049900035483B4AC168C16813680868184738B58C +:1049A000374C364D04E000F009F8009861688847FC +:1049B0002846FFF742FF0028F5D031BD694628465A +:1049C000FFF764BF38B504462E4D2846FFF732FF87 +:1049D0002D48FFF72FFF24480069A1688160E16836 +:1049E000C1600561216801606168416021694161C0 +:1049F0006169816131BD80B501462348FFF730FF11 +:104A0000BDE802400FF2050002F0CFBB38B5164CEE +:104A10001D4D06E0FFF7D2FF009920690069FFF7FE +:104A20001FFF2846FFF709FF0028F3D031BD10B55E +:104A3000164C2046FFF7FEFE0B4841690C60BDE8AE +:104A4000104002F0C6BB1CB5104C06E0694620467B +:104A5000FFF71CFF009800F01BF82046FFF7EDFE63 +:104A60000028F3D013BD000000000320AC09032090 +:104A7000480A032090080320D8CB0220500A0320C4 +:104A8000E0CB0220380A0320D0CB0220400A0320CA +:104A90007047704710B57948794C88B0016841F487 +:104AA00000410160FEF738FA76480168C908C9007C +:104AB00041F00401016000207349FFF79EF802F005 +:104AC000AEFB01210120FEF72CFA0020FFF703FCCA +:104AD0000120FFF700FC0220FFF7FDFB0120FFF79C +:104AE00022FC01210020FFF732FC01210120FFF709 +:104AF0002EFC01210220FFF72AFCFFF7DBFE634AB0 +:104B000000214020FEF78BFA04F23C500FF23101F5 +:104B10000090019169460FF22D0000F033FA04F283 +:104B20005470029004F5C96140F23C500590039125 +:104B3000049402A8FFF746FFFFF7BAFE08B010BDC5 +:104B40007047000038B5044688B0616801F10B0574 +:104B50006846FEF716FB9DF802309DF801209DF88F +:104B600000100FF26810FFF787F99DF804100FF29C +:104B70008010FFF781F99DF80C309DF80B209DF80F +:104B80000A100FF28810FFF777F928884FF41241C6 +:104B9000401A0CD0401E3ED0401E4CD0801E57D034 +:104BA000401E5AD0401E5BD0401E60D063E004A877 +:104BB000102100F0F5FB60680D300078F8B90FF2B5 +:104BC0007820FFF759F902F039FB0D208DF810001D +:104BD0007F212F488DF8121004680FF28C20240CCE +:104BE0002146FFF749F9ADF81C4004A8FEF7C2FAC8 +:104BF000FDF724F900210120FEF793F93BE001289D +:104C000006D10FF28420FFF737F90020207032E040 +:104C10000FF2A0202DE0606800F10D040FF2C42017 +:104C20002178FFF729F92078002814BF0FF21830F7 +:104C30000FF2DC201DE00FF2EC00FFF71DF9D5F8B4 +:104C40000620D5F802100FF20810FFF715F912E050 +:104C5000D5F802100FF23C1006E00FF26C1008E0DD +:104C6000D5F802100FF27C10FFF706F903E00FF2FF +:104C7000AC10FFF701F909B030BD00000800005882 +:104C8000300003208004005828CB0220C74F0008C2 +:104C9000002004E070474FF0FF30FEF759B90021C3 +:104CA0004020FEF7C9B90220FEF7ECB90220FEF75A +:104CB000F1B9012805D0022805D0102805D1FDF74B +:104CC000D7BAFDF7F0BAFDF7F2BA704757697265C7 +:104CD0006C657373204669726D77617265207665C5 +:104CE0007273696F6E2025642E25642E25640A0078 +:104CF000576972656C657373204669726D7761726E +:104D000065206275696C642025640A00465553204D +:104D100076657273696F6E2025642E25642E256476 +:104D20000A0A00002D2D20424C45204E564D20529F +:104D3000414D20484153204245454E205550444165 +:104D400054454420425920434D4F2B200A00000077 +:104D5000534843495F5355425F4556545F424C4563 +:104D60005F4E564D5F52414D5F5550444154452072 +:104D70003A20537461727441646472657373203DA8 +:104D800020256C78202C2053697A65203D20256CE5 +:104D9000640A0000534843495F5355425F455654E7 +:104DA0005F4E564D5F53544152545F5752495445DC +:104DB000203A204E756D6265724F66576F7264734C +:104DC000203D20256C640A00534843495F535542F7 +:104DD0005F4556545F4E564D5F454E445F575249AE +:104DE00054450A00534843495F5355425F45565462 +:104DF0005F4E564D5F53544152545F4552415345A7 +:104E0000203A204E756D6265724F66536563746F0C +:104E10007273203D20256C640A000000534843490A +:104E20005F5355425F4556545F4E564D5F454E4465 +:104E30005F45524153450A00534843495F53554229 +:104E40005F4556545F434F44455F524541445920A6 +:104E50002D20574952454C4553535F46575F525595 +:104E60004E4E494E47200A004442474D43555F4746 +:104E700065745265766973696F6E49443D20256C8F +:104E800078200A0A00000000534843495F53554206 +:104E90005F4556545F434F44455F52454144592056 +:104EA0002D204655535F46575F52554E4E494E474B +:104EB000200A0000534843495F5355425F4556540A +:104EC0005F434F44455F524541445920E28093205F +:104ED000554E455850454354454420434153452081 +:104EE0000A000000534843495F5355425F455654FA +:104EF0005F4552524F525F4E4F54494620574954D6 +:104F00004820524541534F4E202578200A0000008A +:104F1000534843495F5355425F4556545F4552528B +:104F20004F525F4E4F5449462057495448205245EE +:104F300041534F4E20E28093204552525F424C45F0 +:104F40005F494E4954200A00534843495F53554234 +:104F50005F4556545F4552524F525F4E4F5449463B +:104F6000205749544820524541534F4E20E28093E8 +:104F700020424C45204552524F52200A000000006A +:104F8000704700007FB50C464D4D61684D4EE8619D +:104F90002962284602F080FA2468746006F108004D +:104FA000FFF748FC012000F068F801203070296804 +:104FB00041B10FF2E9000FF2ED020090019202946C +:104FC000684688477FBD1FB53E4C04F10800FFF7D7 +:104FD00034FC00BB2178F1B1694604F10800FFF709 +:104FE00055FC3748C16949B10098029001228DF8FB +:104FF000042001A888479DF8040000E001202070EB +:10500000207818B10098FFF7F6FC04E0009904F14D +:105010000800FFF71BFC04F10800FFF70EFC28B99D +:10502000207818B104F10800FFF739FE1FBD2DE903 +:10503000F04105460E4690461C46002000F01DF843 +:10504000204F7868A0F80950C672324641460C30AD +:10505000FCF706F91A4A136900210020984748F224 +:10506000E800FFF723FE79688A78D21C04F1080073 +:10507000FCF7F6F8BDE8F04101201CB51049124CD0 +:10508000096A20B901B188470020207013BD0120B2 +:10509000207011B1BDE81C40084713BD0020FFF788 +:1050A00002BE000010B50146064C04F10800FFF7EF +:1050B000D7FB04F10800BDE81040FFF7F0BD000089 +:1050C0004CCB022098CB0220BDCB0220134810B558 +:1050D000016841F480710160032000F03CF8002079 +:1050E00002F0E4F90024002814BF012402F00BFAB6 +:1050F000204610BD0A48806870470948007870470C +:10510000084805E00748016841F002010160704766 +:10511000016841F001010160704700000040005843 +:1051200030260020042004E00248016841F4807128 +:1051300001607047000400580901020081B002D4E8 +:105140003C48815405E03C4802F00F02104400F84E +:10515000041C01B07047394A13684FF6FF01000282 +:105160000B4000F4E0601843354908431060704775 +:1051700038B5324B1C68C4F30223C3F10704052C75 +:1051800028BF04241D1D072D34BF0023DB1E01256D +:1051900005FA04F4641E2140994005FA03F35B1EEE +:1051A0001A401143BDE83440C6E70000010007D4AF +:1051B000012200F01F01234B8A40400943F82020C0 +:1051C000704701000BD4012200F01F011E4B8A40E2 +:1051D000400943F82020BFF34F8FBFF36F8F704714 +:1051E00010B5401EB0F1807F01D3012010BD174CD7 +:1051F00060600F214FF0FF30FFF79EFF0022A2609A +:1052000007202060002010BD010007D4012200F01B +:105210001F010F4B8A40400943F8202070470100CE +:1052200007D4012200F01F010A4B8A40400943F8CD +:105230002020704700E400E018ED00E00CED00E0F5 +:105240000000FA0500E100E080E100E010E000E08D +:1052500000E200E080E200E038B5040044D094F8B9 +:10526000210028B9002184F82010204602F003FA1A +:1052700000F049F8FF2510B100F03FF834E0216854 +:10528000DFF8B0008A6802408A6021688A68636833 +:1052900020690343A06903431A438A602168E068D8 +:1052A000086120680169A26841EA02410161206841 +:1052B000C16821F08001C1602068C16C8908890043 +:1052C000C1642168CA6CE369606903431A43CA6414 +:1052D00020688168880609D400F020F830B1206881 +:1052E0004562042100F01FF8012032BD20684562AC +:1052F000012184F82110002032BD2068456204217C +:1053000084F821107047022084F82100CA20216807 +:105310004862532022685062204626E020460BE077 +:105320002068C0F8248084F82110002084F8200030 +:1053300070470000BFFF8FFF70B5044640F2E936AA +:105340002068C16821F0A001C16001F05DFB054645 +:105350002068C168880606D401F056FB401BB042A5 +:10536000F6D3032070BD002070BD70B504462068E0 +:10537000C1684A0612D44FF0FF32C26040F2E936EB +:1053800001F042FB05462068C168480606D401F0DA +:105390003BFB401BB042F6D3032070BD002070BD24 +:1053A000002202F0A5B900004FF0B040006800F004 +:1053B000F000B02888BFB02070472DE9F04104000C +:1053C00054D0207881064FF0B04538D5A868E968F8 +:1053D00010F00C0001F0030103D00C2808BF0129D4 +:1053E00046D12868800702D5E06900283ED0FFF743 +:1053F000DBFF616A884207D2084600F0D3FB002831 +:1054000034D100F075FA0FE0286820F0F000014375 +:1054100029606968206A21F47F4141EA00216960BE +:10542000606A00F0BFFB08BB00F095FBDFF81018C6 +:105430000860DFF81008006802F038F8B0B920788A +:10544000C1070DD5A868E96800F00C00082801F034 +:10545000030103D00C2808BF03292DD1286880033D +:1054600040F139816068002840F03581012038E240 +:10547000E06980B1296841F0010100F047FA064671 +:105480002868800700F1248101F0BEFA801B032800 +:10549000F6D3032025E2286840084000286001F088 +:1054A000B3FA0646286800F01FFAC8D001F0ACFA3B +:1054B000801B0328F6D3ECE76068B0F5803F04D189 +:1054C000296841F48031296003E02A6822F480329F +:1054D0002A60606860B101F097FA06462868800388 +:1054E00000F1F98001F090FA801B6528F6D3D0E72F +:1054F00001F08AFA06462868400C10F0010000F01E +:10550000EA8001F081FA801B6528F4D3C1E701F03D +:105510007BFAC01B0328C0F01281BAE7E06878B1BB +:10552000296841F4807100F0F1F9064628684005C9 +:1055300000F1188101F068FA801B0328F6D3A8E770 +:10554000286820F48070286001F05EFA064628681A +:10555000800A10F0010000F0DC8001F055FA801B99 +:105560000328F4D395E701F04FFAC01B0328C0F0DD +:105570000B818EE740F0010000F0CEF9074670681D +:10558000800700F11C8101F03FFAC01B0328F6D30D +:105590007FE7706820F0040000F0BEF907467068ED +:1055A000C00810F0010000F0198101F02DFAC01BB5 +:1055B0000428F4D36DE70528306806D140F00400D4 +:1055C0003060316841F0010105E040084000306082 +:1055D000316821F004013160A06841F2893768B177 +:1055E00001F012FA80463068800700F10C8101F06A +:1055F0000BFAA0EB0800B842F5D34AE701F004FA31 +:105600008046306800F070F900F0FD8001F0FCF990 +:10561000A0EB0800B842F4D33BE701F0F5F9C01B5A +:105620000328C0F0FE8034E7B06840084000B06056 +:1056300001F0EAF90746B06800F056F900F0F5808D +:1056400001F0E2F9C01B0328F5D322E701F0DCF9F1 +:10565000801B0328C0F01F811BE701F0D5F9001B58 +:105660000328C0F0398114E7286881010CD4296827 +:1056700041F080712960E86840F08050E86001F0F6 +:10568000C3F904462868810100F12A8101F0BCF9C0 +:10569000001B0328F6D3FCE60C2931D0286820F043 +:1056A00080702860E968DFF8A00589088900E96052 +:1056B000E9680140E96001F0A7F904462868810122 +:1056C00040F10E8101F0A0F9001B0328F6D3E0E6BB +:1056D00000F00EF9B3E6207881071AD5A868E968CA +:1056E00000F00C00042801F0030104D00C2808BFCE +:1056F00002297FF413AF2868400503D5E06800282D +:105700003FF4B4AE6968206921F0FE4141EA0061CE +:1057100069602168DFF8346511F0180F38D06069CE +:1057200000283FF436AFC90670687FF523AF8007C5 +:1057300009D4706840F0010000F0EEF80746706888 +:1057400080077FF5E4AE706840F0040000F0E4F8F4 +:105750000746706800070DD401F056F9C01B0428F5 +:10576000F7D396E66868216920F0FE4040EA0160C0 +:105770006860CEE77068A16920F4706040EA01209B +:10578000706000F0C6F8074600F0ADF87FF4EBAEAD +:105790002078410737D5DFF8B8743868C10529D4B7 +:1057A000FFF7C2FC01F030F980463868C10521D40A +:1057B00001F02AF9A0EB08000328F6D369E6706827 +:1057C00020F0040070607068C00810F00100DFD0A5 +:1057D00001F01AF9C01B0428F5D35AE600F099F835 +:1057E000074600F080F8D3D001F00EF9C01B032863 +:1057F000F7D34EE6A06801287FF4DDAE306840F0B4 +:1058000001003060E8E6217848060ED5A06A00283D +:105810003FF40AAFB16841F00101B16001F0F4F862 +:105820000746B06880077FF5F8AEE06A002857D0D9 +:10583000A968EA68022801F00C017FF42DAF236B00 +:1058400002F00300984202BF02F07000636B9842BE +:1058500014D1A36BC2F30620984202BF02F4781061 +:10586000E36B98420AD1236C02F06060984202BF59 +:1058700002F06042606C82423FF4F6AE0C293FF4C5 +:10588000F5AD286841013FF5F1AD296821F080713F +:1058900000F03CF80646286881013FF5D7AEE9687C +:1058A000DFF8B003A26B0140206B0143606B014342 +:1058B000E06B41EA02210143206C0143606C01432B +:1058C000E960286840F080702860E96841F0805104 +:1058D000E96001F099F80446286881017FF5BDAEC2 +:1058E0000020BDE8F0817068400810F001007047AA +:1058F0002968606A21F0F001014329606868216A23 +:1059000020F47F4040EA012068607047296001F080 +:105910007BB8706840084000706001F075B82DE9F0 +:10592000F8430400884644D0DFF82C6300F0CBF83D +:1059300047D200F0CDF8074600F0C5F841D001F09D +:1059400063F8C01B0228F7D90320BAE001F05CF825 +:10595000401B022843D9F7E701F056F8A0EB0900F5 +:1059600002284CD9F0E701F04FF8A0EB090002281B +:1059700054D9E9E701F048F8401B02285DD9E3E774 +:1059800001F042F8401B022867D9DDE701F03CF83E +:10599000401B484577D3D7E7032802D139688901EE +:1059A00003E00028396802D1890762D401E0490583 +:1059B0005FD4012085E001F027F8C01B022872D9CE +:1059C000C2E7207881074FF0B0470BD5B968A068CF +:1059D00021F0F0010143B96001F016F80546B868FE +:1059E000C003B3D52078DFF8545281060AD5296860 +:1059F000606921F0F0010143FFF788FF81462868C4 +:105A00008003A9D5207841060BD52968A06909092A +:105A1000090141EA1011FFF779FF81462868C003A8 +:105A2000A1D5207841070BD5B968E06821F4E06181 +:105A30000143B96000F0E8FF0546B868800399D5D6 +:105A4000207801070CD5B868216920F4605040EA3D +:105A5000C100B86000F0D8FF0546B86840038FD594 +:105A60002078C10717D56068022895D13968890365 +:105A70009FD5B968890840EA8100B86041F2893948 +:105A800000F0C2FF0546B868616800F00C00B0EB9A +:105A9000810F7FF47BAF306800F00700804505D2AE +:105AA00000F016F8074600F00EF884D100F053F825 +:105AB000DFF88C110860FFF71DFBBDE8F24301F031 +:105AC000F5BCBDE8F283306800F007004045704740 +:105AD0003168C90848EAC101316000F095BF38B5A6 +:105AE0004FF0B0445E4DA16811F00C0106D1FFF7F4 +:105AF0005BFCC0F3031055F8200032BD0429594A5D +:105B000005D00829584804D12168C90222D5104679 +:105B100032BDE16801F00301022904D0032904D158 +:105B20002168C90207D5104605E0FFF73DFCC0F328 +:105B3000031055F82000E168E268E368C1F306212C +:105B40004843C2F30211491C5B0FB0FBF1F05B1C30 +:105B5000B0FBF3F032BD80B5FFF7C1FF3F49FFE76F +:105B6000424A0968C1F3031152F82110B0FBF1F069 +:105B700002BD80B5FFF7EFFF00F010F8C1F302217E +:105B800006E080B5FFF7E7FF00F008F8C1F3C22197 +:105B900012F8211001F01F01C84002BD2F49344AFC +:105BA0000968704770B52E49B1282EBFCC6AC0F382 +:105BB000031051F820402148056801F0B3FD2B493E +:105BC0002C4A05F00F0551F82510B4FBF1F1002423 +:105BD000B1FBF2F1B0F5007F0FF2B802204609D117 +:105BE0000FF2940353F820508D4214D2401C032826 +:105BF000F8D912E00FF2900353F820508D420AD2E8 +:105C0000401C0328F8D308E000F0FEFE801B0328A8 +:105C10000CD3032070BD52F820400F4D2868C008F7 +:105C200044EAC000286000F0EFFE0646296801F053 +:105C30000701A142E8D1002070BD00000801005812 +:105C40005426002038260020FFFFFEEE900000586A +:105C5000000400588C80C111004000580800005812 +:105C6000B88200080024F4000048E80178820008A7 +:105C7000348A000840420F00120000002400000097 +:105C80003600000040000000060000000C0000008C +:105C900010000000000000000100000002000000F1 +:105CA00003000000DFF820130A68030903F47F23D0 +:105CB00000019A4300F47F2000F082B9DFF8082346 +:105CC0001368010C23EA014343EA00431360704761 +:105CD0002DE9F843054600242878DFF8EC624106F8 +:105CE000A0464FF0B0472DD5286B70B1B0F5800FAE +:105CF00006D0B0F5000F18BFB0F5400F17D01FE069 +:105D0000F86840F48030F860EDE0386820F080609A +:105D1000386000F079FE81463868000140F1D0809B +:105D200000F072FEA0EB09000228F5D90324D7E0A9 +:105D300000F06AFEA0EB0900022840F2C980F5E7F6 +:105D40000124A0462868010531D5B06800F44078E8 +:105D5000286C80452AD0FFF7E7F9B8F1000FB16849 +:105D600005D1286C21F440710143B1601EE0B06898 +:105D700040F48030B06021F44071B06820F480308D +:105D8000B060286C0143B160B068C0070ED500F068 +:105D90003BFE804641F28939B068800706D400F0A6 +:105DA00033FEA0EB08004845F6D30324A04628782C +:105DB000C10705D53168A869890840EA81013160C9 +:105DC0002878810705D53168E86921F440610143ED +:105DD00031602878C10644BFA86AFFF76FFF2878B2 +:105DE000810644BFE86AFFF769FF2878410744BF8E +:105DF000286AFFF757FF2878010744BF686AFFF752 +:105E000051FF2868C1051BD53168686B21F04061DE +:105E100001433160686BB0F1006F00F0BDF8686B52 +:105E2000B0F1806F75D100F0BDF80446386800010C +:105E300060D500F0E9FD001B0228F7D94FF00308F8 +:105E400067E000F0E1FD001B02285BD9F6E731684E +:105E500021F04041316020F08050326822F04062F1 +:105E600010433060A86BB0F1C05F00F095F828686F +:105E700041056DD53168E86B21F040510143316037 +:105E8000E86BB0F1005F03D1F96841F48031F9604B +:105E9000E86BB0F1805F5BD100F084F804463868AD +:105EA000000146D500F0B0FD001B0228F7D94FF0E5 +:105EB00003084DE000F0A8FD001B022841D9F6E7D9 +:105EC00000F061F8A86821F4781100F071F88146BB +:105ED000386800017FF52CAF396968690143396181 +:105EE000002C7FF42EAF3168286B21F44001014370 +:105EF000316027E700F047F8E86821F0606100F0C2 +:105F000057F80446386800019BD539696869014330 +:105F1000396128688105AAD5A86BB0F1804F1CBFF4 +:105F2000B0F1004F002892D1316821F04041084380 +:105F300097E700F028F8286921F0604100F038F870 +:105F4000044638680001B5D539696869014339618B +:105F50002868C10405D5F168686C21F4404101430B +:105F6000F160286881040BD5796AE86C21F0300172 +:105F700001437962796AA86C890840EA81017962F3 +:105F80004046BDE8F2833869696820F4FE4040EA83 +:105F9000012038613969704703D1F96841F0807197 +:105FA000F9607047396821F08061396000F02CBDDC +:105FB00001433961386840F08060386000F024BDEA +:105FC00010430860704700008800005838B504008E +:105FD00009D004F18005686808B900F01EF800F0E7 +:105FE00021F8012801D1012032BDA06A08B100F0DA +:105FF0002AF800F00AF821F02A01FFE7816000F09A +:106000001BF8BDE8324000F03EBB2068416821F437 +:1060100090414160206881687047002129702046C6 +:1060200001F086BA242068602068016849084900A8 +:106030000160204600F0BCB92068016841F0010110 +:10604000016020467047204600F0BABA70B5044699 +:1060500004F180051346686820283DD169B3180013 +:106060002BD02878012837D001222A7004F1540659 +:106070002165338073800020E86021206860706AA9 +:10608000E8B1DFF82013C162DFF81C03716A08630E +:10609000716ADFF8180348630020716A886320681A +:1060A000216D00F12802706A01F0ADFB38B11020BB +:1060B000E8600020287020206860012070BD216801 +:1060C000402008620020287000F008F841F08001AC +:1060D00000F061FBF8D170BD022070BD206800F1B6 +:1060E000080151E8001F00F108027047216851E8DB +:1060F000002F7047206800F1080151E8001F00F1EF +:10610000080221F0400142E8001000287047F8B56D +:10611000044640F60F002668F1693268B36808400B +:1061200004F15C050ED1880602D5900602D4D80091 +:1061300040F181806969002900F029812046BDE88D +:10614000F4400847DFF8E006034204BFDFF8DC76DE +:106150003A4270D0CF0707D5D70505D5012737625A +:106160002E6B46F001062E638E0708D5DE0706D596 +:10617000276802263E622E6B46F004062E634E0709 +:1061800008D5DE0706D5276804263E622E6B46F04A +:1061900002062E630E070AD5960601D4034206D0E6 +:1061A000266808203062286B40F008002863080544 +:1061B00009D5500107D526684FF400603062286B7E +:1061C00040F020002863286B002833D0890607D5CB +:1061D000900601D4D80003D5696909B120468847E3 +:1061E000286B21688A68510602D410F0280F1CD051 +:1061F000204600F0EFFA00F0D1F811D5FFF77AFF52 +:10620000FCD1286A60B10FF2B1618163286A01F0A4 +:1062100073FB00280ED0286A816BBDE8F440084764 +:106220002046BDE8F24001F059BC204601F056FC82 +:1062300000202863F1BD286901286AD1CF0668D5FE +:10624000D00666D51020306200F0A8F82DD5296A56 +:106250000868406880B20028ECD02A889042E9DAC9 +:106260006880086801688A061BD4FFF73FFF22F4A4 +:10627000807200F08FF8F8D1206800F07DFAFBD131 +:10628000FFF738FFFCD12020E86200202861FFF7EB +:106290002DFF22F0100200F07DF8F8D1286A01F0FD +:1062A000F5FA29886888091A2DE028886988411A32 +:1062B000688800281CBF88B2002868D0226852E88D +:1062C000003F23F4907342E800300028F6D12068A4 +:1062D00000F1080200F1080352E8002FDFF8C402C1 +:1062E000024043E800200028F1D12020E86200208D +:1062F00028616861226852E8003F23F0100342E8F9 +:1063000000300028F6D12046BDE8F44089B201F003 +:10631000E6BBC80209D5580207D54FF48010306299 +:106320002046BDE8F24000F06DBB080609D5100616 +:1063300001D4180205D5A96949B32046BDE8F44047 +:106340000847480611D550060FD5FFF7CFFE22F0BB +:10635000400200F01FF8F8D12020A8620020A861B8 +:106360002046BDE8F24001F0E4BB080206D550002B +:1063700004D52046BDE8F24001F0F8BBC80148BF93 +:10638000002A04D52046BDE8F24001F0F0BBF1BD83 +:1063900022F4F07241E800200028704720688168EC +:1063A0004806704735680008676800086D6800088F +:1063B000F8B50446DFF838052168DFF838C50A6803 +:1063C000DFF834750240A068024320690243606927 +:1063D0000243E06902430A6000254A68E06822F44B +:1063E000405202434A60A369DFF8102591421CBF66 +:1063F000206A03438E68DFF80805064033438B604C +:106400000FF2A416CB6A606A1B0940EA0313CB6241 +:106410006145DFF8F0044FF4004339D13F6807F0DD +:106420000307032F4DD8DFE807F0024643494FF03A +:10643000010CE169B1F5004F4FF6F07740F0808034 +:10644000BCF1010F09D0BCF1020F0AD0BCF1040F5E +:1064500071D0BCF1080F71D099E0FFF792FB0028D2 +:1064600015D0626A616836F81230B0FBF3F04A0862 +:1064700002EB4002B2FBF1F080B2A0F11001B94290 +:10648000EAD20740C0F3420007432068C7607FE0BC +:10649000914216D13F6817F4406723D0B7F5806F5B +:1064A00009D0B7F5006F03D0B7F5406F06D008E00C +:1064B0004FF0020C07E04FF0040C04E04FF0080C22 +:1064C00001E04FF0100C9142B3D1BCF1000F09D0A4 +:1064D000BCF1020F0AD0BCF1040F15D0BCF1080FBB +:1064E00015D054E0FFF745FB002851D0616A36F81B +:1064F0001120B0FBF2F6626802EB42018E4246D3F5 +:106500001103B14205D242E0FFF7E9FAECE7184681 +:10651000ECE75008002110EB062051EB1661002338 +:10652000FAF7F2FEA0F54071DFF8DC2391422ED29B +:106530002268D0602CE0FFF7D2FA90E7184690E787 +:10654000BCF1010F09D0BCF1020F09D0BCF1040F5E +:1065500018D0BCF1080F18D019E0FFF712FBB8B142 +:10656000626A36F812306168B0FBF3F000EB51005C +:10657000B0FBF1F080B2A0F11001B94207D221685E +:10658000C86005E0FFF7ABFAE9E71846E8E7012540 +:1065900004F1680001214180018000218160C16017 +:1065A0002846F2BDFEFFFFEF0100020004000600D6 +:1065B00008000A000C0010002000400080000001CC +:1065C00090F82810CA0706D502685368C16A23F4F8 +:1065D00000330B43536090F828108A0706D50268F1 +:1065E0005368016B23F480330B43536090F82810F9 +:1065F0004A0706D502685368416B23F480230B4396 +:10660000536090F828100A0706D502685368816B1A +:1066100023F400430B43536090F82810CA0606D5B4 +:1066200002689368C16B23F480530B43936090F826 +:1066300028108A0606D502689368016C23F400537B +:106640000B43936090F828104A0610D502685368EF +:10665000416C23F480130B435360416CB1F5801FF0 +:1066600005D15368816C23F4C0030B43536090F849 +:1066700028100A0606D501684A68C06C22F4002278 +:1066800002434A607047F8B5044604F180050020D3 +:10669000E8606FF07E4700F0B7F9064620680168B1 +:1066A0000A0708D50097334600224FF40011204610 +:1066B00000F017F860B9206801684A070AD500970A +:1066C000334600224FF48001204600F00AF808B15A +:1066D0000320F2BD20206860A8600020E0662870DA +:1066E000F2BD2DE9F041069C05460E4690461F4638 +:1066F0002868C1693140B1420CBF012000204045EB +:1067000026D114F1010FF3D000F07EF9C01B8442B2 +:1067100000D33CB900F025F800F02DF8FCD100F0D2 +:106720001AF811E0286801684A07E1D5C1690A052D +:10673000DED54FF40062026200F013F800F01BF89F +:10674000FCD100F008F8C16000210170032000E0D6 +:106750000020BDE8F08105F18000202141608160CA +:106760007047296851E8002F22F4D07241E80020D8 +:106770000028F6D17047286800F1080151E8001F91 +:10678000490800F10802490042E80010002870475B +:10679000DFF87801014042E800100028704700004F +:1067A000026852E8003F23F0C00342E800310029AC +:1067B000F6D1016801F1080252E8002F01F1080347 +:1067C00022F4000243E800210029F2D12021C0F880 +:1067D00084107047026852E8003F23F4907342E847 +:1067E00000310029F6D1016801F1080201F1080326 +:1067F00052E8002F0E490A4043E800210029F2D157 +:10680000C16E012908D1026852E8003F23F010034D +:1068100042E800310029F6D12021C0F8881000217B +:10682000C1660167704700000100001020010004EC +:10683000FEFFFFEF0146886A09680A68930610D4D4 +:106840000021A0F85610016801F1080252E8002F5B +:1068500001F1080322F0800243E800210029F2D16F +:106860003BE001F066B9806A01F082B9F8B5846A4C +:1068700004F1840504F1560728686E6821688A6867 +:10688000110606D5212804D1002038802046FFF7C4 +:1068900087FFFFF783FD06D5222E04D10020388123 +:1068A0002046FFF797FFA86840F01000A860204638 +:1068B000BDE8F24001F012B9806A00F156010022F1 +:1068C0000A810A8001F00AB9026852E8003F23F009 +:1068D000800342E800310029F6D1026852E8003F07 +:1068E00043F0400342E800310029F6D17047000030 +:1068F000F369FFCF00380140880000580080004055 +:10690000FFF4FF110024F40000FD0F00FEFF7FEFF5 +:1069100010B500F180010A78012A01D1022010BDD2 +:1069200001230B7024224A6002681368146864080B +:10693000640014600022426623F000530068036084 +:10694000202048600020087010BD70B500F01EF8CF +:1069500001D1022070BD00F01FF822F0604209E072 +:1069600070B500F013F801D1022070BD00F014F8EA +:1069700022F0606211438160204600F01AF820681E +:106980000660202068600020287070BD044604F175 +:10699000800528780128704701222A702420686029 +:1069A0002068066802685208520002602068826807 +:1069B000704730B5416E11B90121012214E0016820 +:1069C0000FF230048A6889680FF23003520E02F029 +:1069D0000702490F655CA45C595C9A5CED00E40019 +:1069E00095FBF1F194FBF2F268304180028030BDFA +:1069F0000000000001010103070100000804020477 +:106A0000080101017047000001484068704700BF5D +:106A100030260020704770477047704770477047B6 +:106A200070477047704770477047704738B50546E4 +:106A300084B068780024FF2802BFB5F8031040F640 +:106A40000140814225D165498A88B5F80700921C2A +:106A5000904209D1687B0124C10752BF8DF80040E4 +:106A600000218DF8001011E04988491C884210D19E +:106A70000FF27010FDF700FA03208DF8000005F109 +:106A80000D00B5F80B108DF8081001906846FCF762 +:106A9000D3FD204605B030BD10B58AB050484F4CEC +:106AA000FCF708FD8F218DF81810E520B3218DF833 +:106AB00019008DF81A10D5202E218DF81B008DF8A5 +:106AC0001C107F204A218DF81D008DF81E10982083 +:106AD0002A218DF81F008DF8201048207A218DF88A +:106AE00021008DF82210CC2040218DF823008DF854 +:106AF0002410FE2000218DF82500ADF8261000940A +:106B00000823012206A90220FDF769FD00F032F8F2 +:106B1000412000F023F8A01C00F010F8062100F03E +:106B200015F800F027F8422000F018F8201D00F0BA +:106B300005F8102100F00AF80AB010BD05900121F7 +:106B40000491029100200A22019070470392009163 +:106B50000223208806AA0221FDF790BD8E218DF820 +:106B600024008DF823100020FE21ADF826008DF8BA +:106B70002510704719208DF81800ED2182208DF81E +:106B80001A008DF81910ED20AE218DF81C008DF83B +:106B90001B104C2021218DF81E008DF81D10412066 +:106BA0009D218DF820008DF81F10222045218DF8A1 +:106BB00022008DF82110704780B592224FF6426373 +:106BC000984208D10548009102238188008800225C +:106BD000FDF7AEFD0246104602BD0000F8CB0220D4 +:106BE0002D6A00082D2D2047415454203A204C4551 +:106BF0004420434F4E46494755524154494F4E2039 +:106C000052454345495645440A00000070477047C5 +:106C100070477047704710B50446FAF721FB2046CD +:106C200010BD10B5044610460A460146204600F045 +:106C3000A1FF204610BD00002DE9F84F4FF00009DC +:106C4000674A684B4FF00F0805460E4633E0664F23 +:106C5000BD4214BF072704278F4027434CF82E70EE +:106C6000C1431C6801EA040C7468E40248BF40EAAE +:106C70000C0CC3F800C05C6801EA040C7468A40240 +:106C800048BF40EA0C0CC3F804C0146801EA040CC5 +:106C90007468E40348BF40EA0C0CC2F800C05468B2 +:106CA00001EA040C7168890348BF40EA0C0CC2F881 +:106CB00004C009F10109316831FA09F000F07E8061 +:106CC000012404FA09F414EA0100F2D04FEA490C55 +:106CD000032101FA0CF16FEA010E716801F003075C +:106CE000012F1CBF01F00301022911D1A968F76827 +:106CF0000EEA010107FA0CF73943A960696821EA35 +:106D000004047168C1F3001101FA09F10C436C60CD +:106D10004FEA8901347904F00304032C1FD0EC6896 +:106D2000B7680EEA040407FA0CF73C43EC603479C8 +:106D300004F00304022C12D14FEAD90705EB8704B3 +:106D400001F01C07D4F820A008FA07FB2AEA0B0A76 +:106D5000D6F810B00BFA07F747EA0A0727622C6843 +:106D60000EEA0407347904F0030404FA0CF43C43FB +:106D70002C60746814F4403F9BD0DFF870C04FEA79 +:106D8000990E5CF82E7001F00C0108FA01F427EA64 +:106D90000404B5F1904F08BF00270ED0144FBD4238 +:106DA00008BF012709D0134FBD4208BF022704D0F6 +:106DB000114FBD427FF44BAF03274DE7BDE8F18F84 +:106DC00081B0002A14BF8161816201B070470B4A13 +:106DD000136803421CBF1060FDF76BBF70470000D3 +:106DE00080080058000800580010004808000140C2 +:106DF0000004004800080048000C00480C08005837 +:106E0000DFF800F0852500202DE9F041404F0646CF +:106E100038780128884614461D4608BF02201BD03A +:106E2000012139700020786000F018F8010011D1BC +:106E3000012E22462B46404602D100F05BF802E0CC +:106E40001146FFF7DDFF00F009F832490A6822EA2F +:106E500006060E6000213970BDE8F0814FF47A70AB +:106E600018E02E49CA680020002A07D52C4B2D4A6D +:106E70000B600A60C968002948BF01207047254996 +:106E80000A6842F000420A6000200968002958BFE1 +:106E90000120704770B50546FFF7B6FD06461E4C4B +:106EA0002068C10311D5FFF7AFFD801BA842F7D3BF +:106EB000032070BD164920604860012070BDFFF7B7 +:106EC000A3FD801BA84210D3F2E72068C10744BF8E +:106ED00001212160010404D54FF40041216020F418 +:106EE00000404CF2FA310840E4D120684103E6D476 +:106EF000002070BD10B507490C6844F001040C6017 +:106F000040F8042BBFF36F8F036010BD000000003A +:106F100070CB022014400058104000580840005820 +:106F200023016745AB89EFCD2DE9F04100F053F81F +:106F3000884608BF02204CD000F052F800F055F807 +:106F4000010044D12968DFF8C470022919D14FF03B +:106F5000FF32C8F800206E6800E0761C6968AA68F5 +:106F600051188E4208D2304600F043F800F03DF848 +:106F70000100F2D0C8F800607A69DFF894100A4086 +:106F80007A6139688A050FD53A6822F400723A604E +:106F9000396841F4006139603A6822F400623A606D +:106FA000396841F4007139603A6851050FD5396884 +:106FB00021F4806139603A6842F480523A6039685D +:106FC00021F4805139603A6842F480623A600021CD +:106FD0002170BDE8F081104C0546207801287047EB +:106FE000002001216060217070474FF47A70FFF734 +:106FF00051BF08490A6822F4FF6242EAC00242F423 +:10700000803242F002020A607047000000400058DF +:1070100005F8FFFF1440005870CB0220C0680840FC +:10702000884201D10120704700207047C0690840A4 +:10703000884201D1012070470020704710B5684C8C +:1070400002212046FFF7F2FF38B16068C043810794 +:1070500003D5FDF7A4FC022018E001212046FFF72C +:10706000E5FF38B16068C043C10703D5FDF75FFC99 +:1070700001200BE008212046FFF7D8FF38B16068F7 +:10708000C043010703D5FDF7DEFC0820A06010BD5A +:1070900010B5534C02212046FFF7C0FF58B9606875 +:1070A000C043810307D5606840F400306060BDE8EC +:1070B0001040FDF76DBC08212046FFF7AFFF70B907 +:1070C0006068C04301030AD56068464940F4002067 +:1070D0006060086880474FF40020A06010BD202148 +:1070E0002046FFF79BFF58B96068C043810207D56F +:1070F000606840F400106060BDE81040FDF726BCF9 +:1071000010BD394881B0016841F480110160006808 +:1071100000F48010009000983448016841F4007138 +:1071200001603348026842F40072026040BF20BF31 +:107130003048016841F40041016001B0704780B5FA +:107140002D48016841F480110160006800F480104E +:10715000009000982248016841F001010160026836 +:1071600042F4803202602C20FEF720F8BDE8024095 +:107170002D20FEF71BB8214801684908490001602D +:1071800070471F494FF48030086070471B48016802 +:1071900021F002010160704718484FF4003141604E +:1071A000016821F400310160704738B504460C4D88 +:1071B00008212846FFF732FF30B10A4804606868AA +:1071C00020F40020686031BDA0474FF40021A96081 +:1071D00031BD0A48016821F00801016070470000D4 +:1071E000000C005808CC022050010058D408005868 +:1071F000200800580C04005850000058040C005897 +:10720000080C0058484900E0484981B00A68024328 +:107210000A60096808400090009801B0704780B586 +:10722000FDF76EFFFDF76EFF4148016841F48031C4 +:10723000016000F0EEFCBDE801400EE000B587B053 +:1072400068460FF238211C22FAF71AF8FDF7EFFB17 +:107250006846FBF775FF07B000BDF0B585B068461E +:107260001421FEF79DF800260025002400210FF2CE +:10727000DC0000EBC102907988B11368B3F1904F44 +:1072800008D02C4FBB4208D02B4FBB4204BF908884 +:10729000044304E09088064301E090880543491CBC +:1072A0002629E4DB002002900121032003900191B4 +:1072B000B0B288B100900120FFF7A4FF0120FFF7D2 +:1072C000A3FF69464FF09040FFF7B6FC0022B1B231 +:1072D0004FF09040FFF774FDA8B280B100900220FB +:1072E000FFF790FF0220FFF78FFF124E69463046EE +:1072F000FFF7A2FC0022A9B23046FFF761FDA0B261 +:1073000080B100900420FFF77DFF0420FFF77CFF91 +:10731000094D69462846FFF78FFC0022A1B2284696 +:10732000FFF74EFD05B0F0BD4C0000584C01005871 +:10733000900800580004004800080048FCF732B8E4 +:1073400013460A460146002000F0D2BB0000004868 +:10735000010000000000004801000000000000489B +:10736000010000000000004801000000000000488B +:10737000010000000000004801000000000000487B +:10738000010000000000004801000000000000486B +:10739000010000000000004801000000000000485B +:1073A000010000000000004801000000000000484B +:1073B000010000000000004801000000000000483B +:1073C000010000000000004801000000000000482B +:1073D000010000000000004801000000000000481B +:1073E000010000000000004801000000000000480B +:1073F00001000000000000480100000000000048FB +:1074000001000000000000480100000000000048EA +:1074100001000000000000480100000000000048DA +:1074200001000000000000480100000000000048CA +:1074300001000000000000480100000000000048BA +:1074400001000000000000480100000000000048AA +:10745000010000000000004801000000000000489A +:10746000010000000000004801000000000000488A +:1074700001000000000000480100000000000000C2 +:1074800000000000000000004C73000828000320EA +:107490002C00032026040400024901600249016116 +:1074A000704700BF534900087B49000870B50F4E74 +:1074B000044630780025A8B1FEF74DFB32784FF432 +:1074C0007A71B1FBF2F1B0FBF1F0FDF789FE48B93A +:1074D000102C07D2002221464FF0FF30FDF748FE66 +:1074E000B46000E00125284670BD00BF30260020B2 +:1074F000734981B00A6802430A6009680840009035 +:10750000009801B0704780B56E48016841F40021D1 +:1075100001600022006800F4002000900F21009814 +:107520002E20FDF725FEBDE802402E20FDF73EBED1 +:1075300038B58AB0044668461421FDF731FF20684B +:10754000614A624990423ED10868614D40F00100B5 +:107550000860096801F00101059105980120FFF715 +:10756000C7FF0C200090022100200191029003210E +:107570000820039100F06AF8402000F060F808202D +:1075800000F064F853482860112000F065F808B155 +:10759000FBF788FF4FF088500690002101200791EB +:1075A000ADF82010099006A9284600F071FB08B13B +:1075B000FBF778FFA567AC62002200212520FDF7CC +:1075C000D7FD252037E0444A904236D14868434DE4 +:1075D00040F480404860486800F480400590059879 +:1075E0000120FFF785FF0220FFF782FF4FF40060C4 +:1075F00000F025F8072000F029F8C02000900221B3 +:107600000120019102900321072003910490694613 +:107610003348FFF711FB334828600F2000F01CF8B7 +:1076200008B1FBF73FFFA567AC62002200212420D0 +:10763000FDF79EFD2420FDF7B9FD0BB030BD009095 +:107640000221002002900390019170470490694646 +:107650004FF09040FFF7F0BA68601020A86000205B +:10766000E8608020286100206861A861E8612862E4 +:10767000284600F05FB81CB504461B4920688842C4 +:107680001CD1FDF751FDFDF74FFD1848816B21F42A +:10769000407141F480718163816B41F400418163E9 +:1076A000026842F480620260006800F4806000902A +:1076B00000982046BDE8164000F01CBB13BD00003A +:1076C0004C00005850000058008000405C000058FA +:1076D0009CC902204400024000380140FCC902203D +:1076E00000040048440402400028004058000058AC +:1076F00000B500BF130096469446103928BFA0E895 +:107700000C50FAD85FEA417C28BF0CC048BF40F853 +:10771000042BC90728BF20F8022B48BF00F8012B13 +:1077200000BD0000DFF80800006800F4C06070478A +:107730000004005838B5040001D1012032BD216891 +:10774000DFF87003814204F1240500F044F80220C0 +:1077500068700A68A0686FF30E120243E068024383 +:107760002069024360690243A0690243E069024361 +:10777000206A02430A60204600F070F9A068B0F564 +:10778000804F04BF002161602079696A00F03F00EA +:1077900000F014F838B1052805D2204600F078F939 +:1077A00000F012F803E0002028636863A86300205B +:1077B000A861012068700020287032BD0860A96AA5 +:1077C000E86A486060687047296B00200860696B50 +:1077D000A86B486070470AD2DFF8DC024218142315 +:1077E000B2FBF3F292002A62DFF8D00209E0DFF880 +:1077F000D00242181423B2FBF3F292002A62DFF89F +:10780000C402E8617047F8B5044604F12406002577 +:107810003078012801D10220F2BD0127377070783D +:1078200001282FD102277770B561206807687F088B +:107830007F000760204600F0F5F82168F06820B16D +:107840000A6842F00E020A6008E0086820F00400AE +:1078500008602068016841F00A010160706A0168EF +:10786000CA0303D5026842F480720260306B18B11B +:10787000016841F4807101602068026842F00102F1 +:10788000026001E0357002252846F2BD81B040B1AA +:1078900000F124014A78022A05D0042088610020E2 +:1078A0000870012026E00268136823F00E031360BD +:1078B0004A6A136823F480731360006802685208F0 +:1078C00052000260012091F82020CB6902F01C02D6 +:1078D000904058608A6AC86A5060086B30B102688C +:1078E00022F4807202604A6B886B506001204870FD +:1078F0000020087001B0704738B500F12402002460 +:107900005178022903D004209061012428E0016805 +:107910000B6823F00E030B6001680D686D086D00A5 +:107920000D60516A0B6823F480730B60012192F89B +:107930002030D56903F01C0399406960936AD16ACD +:107940005960116B31B10B6823F480730B60536B7A +:10795000916B5960012151701470516901B18847D0 +:10796000204632BDF8B500F124010423CA69146829 +:107970000268156891F8206006F01C0603FA06F705 +:107980003C4210D06F070ED51468A50603D41568C5 +:1079900025F00405156000F03DF8C968002938D0CD +:1079A000BDE8F4400847022303FA06F73C4213D02F +:1079B000AF0711D51468A50605D4156825F00A058A +:1079C000156001224A7000F025F800220A708968CB +:1079D000F9B1BDE8F4400847082303FA06F634423B +:1079E00017D02B0715D5136823F00E03136001225F +:1079F00091F82030CC6903F01C039A4062600122A8 +:107A00008A614A7000220A70096911B1BDE8F44028 +:107A10000847F1BD91F82020CC6902F01C02934088 +:107A20006360704778B5C56C046D6C60446D14B1CB +:107A3000846DC56D6560012590F84440066C04F0C6 +:107A40001C04A5407560046863608068102802D13A +:107A5000A260E16071BDA160E26071BD416C02682D +:107A6000144B89089A4234BF174B184B03EB810122 +:107A7000816402F0FF02083A1421B2FBF1F1144ACA +:107A8000C26401F01F01012202FA01F10165704791 +:107A90000179104A01F03F0102EB81024265491E63 +:107AA0000D4A826501F0030101228A40C2657047D8 +:107AB0000000000008040240F8FFFDBF0000024083 +:107AC000F8FBFDBF00040240000802401C08024011 +:107AD00080080240FC08024040090240704770479D +:107AE00063601D481D4B704723601D481D4B704748 +:107AF00070B51C46002300251B4E10B1022804D08F +:107B00000AE03460FFF7F1FF02E07460FFF7E9FF7D +:107B10000360FEF79BFA0346012B05D007D3032B26 +:107B200004D038BF022502E0012500E003252846E5 +:107B300070BD82B00068094A0B49904206D0094ADC +:107B4000904207D1086828B102B00047486808B1E0 +:107B500002B0004702B07047ECC60220008000402F +:107B60007CC7022000380140C0CB0220704770471C +:107B70007047000062F30F2262F31F42401810F0BA +:107B8000030308D0C91A1FD3DB0748BF00F8012D33 +:107B900028BF20F8022D130030B4144615461039C2 +:107BA00028BF20E93C00FAD8490728BF20E90C008B +:107BB00048BF40F8042D890028BF20F8022D48BF97 +:107BC00000F8012D30BC7047C91818BF00F8012D0E +:107BD000CB0728BF00F8012D7047000038B5EFF340 +:107BE000108472B6284D6946281D00F0B4F9694624 +:107BF000281D00F00EFA38B184F31088BDF800108B +:107C0000224AFFF79DFB31BD0120287084F31088C4 +:107C100031BD80B5FFF792FB0221009100231A4885 +:107C200000F124014FF48052001D00F07BF801BDEB +:107C300000BFF8B514460026EFF3108510F1010FD0 +:107C40001ED001281CBF02284FF0FF3618D1BCB14E +:107C5000264672B60C4F012392B2381D00F076F81A +:107C600000281CBF3978002908D000223A7085F31B +:107C70001088A1B2054AFFF763FB01E085F3108885 +:107C80003046F2BD0000000008140020DD7B000833 +:107C900018B500F12402507801281BD11378012B6C +:107CA00001D1022012BD536A10701C680A480440BA +:107CB00008680443C868401E44EAC0444868044356 +:107CC000087A497A44EA004444EA41241C600020CE +:107CD000107012BD012012BDFFFD00E08A60FF217F +:107CE00002685162012180F82110002180F82010E3 +:107CF0000020704790F82010012901D10220704720 +:107D0000012280F82020022180F82110CA21026877 +:107D1000516253210368596201688A6842F0200267 +:107D2000FFF7DCBF10B5029C016042600021C1601A +:107D30000161416181610381A107047704D5008954 +:107D400010B14FF0FF3010BD002010BD2DE9F04FF5 +:107D5000064685B030890C460027BB46002871696D +:107D6000DC460CBF4FF00208D84681B168B93069D3 +:107D70007768451CBD4228BFED1B3768385C7D5DC8 +:107D800000EB0527BF1CBFB203E0074600E000B1CF +:107D900002463069F568A84223BF7568281AC01BDF +:107DA0000020154608EB050903FB09FE864532BF96 +:107DB0000020B0FBF9FA09FB1A00C0B2804509DACD +:107DC00096F81C905FEAC97A48BF84465FEA8970DA +:107DD00048BFC446100000F0B4807068714461442C +:107DE0008842C0F0AE8008EB020080B20390D94612 +:107DF000100AADF802000294ADF80020049359E097 +:107E0000800740D53089002840F09B803268D01828 +:107E1000A34600F8024C200A32681A4402F8010C0A +:107E2000224630681844F9F71BFA7069201870610F +:107E3000B069019C401CB061200A31680C70316847 +:107E400048701CE08CB3307FC207D9D5308940B967 +:107E500031681944FF2001F8020C3168194401F817 +:107E6000010C4FF0000B7069241874612C463089A6 +:107E7000002340B931680C70210A30684170022338 +:107E80007069801C706108EB04070021BFB231618A +:107E90005CB1DA44029800EB0A01306822461844CB +:107EA000F9F7DEF970692418746109F10109B06904 +:107EB000401CB061049A70683169914545D27918C7 +:107EC00081422CBF081A0846306103463089A0B9A8 +:107ED0003068BDF80010C1545B1C70683168834283 +:107EE00028BF1B1ABDF80200C8545B1C706883428F +:107EF00028BF1B1A7069801C706105FB09FA746841 +:107F0000BDF80000E41A844288BF0446029800EBE2 +:107F10000A01281BAC42019003D093D2307F002885 +:107F200090D137682246F818F9F79AF97069201845 +:107F30007061A346019C039F0023A9E73068404479 +:107F400000E0002005B0BDE8F08F88448045F5D3FF +:107F5000A8EB0008F2E7F8B502460023108954693F +:107F600000280CBF022500250026002C4DD060B94A +:107F7000D36857685E1CBE4228BFF61B1768FB5CBF +:107F8000BE5D03EB0626B6B200E00646137F03F0A3 +:107F90000303012B23D14FF6FF77BE4208BF002811 +:107FA00008D0D36817699F4219D2C0B15768FB1A2D +:107FB000834214D25668D368A41B1C190023546151 +:107FC000D36058B910680378012E94BFC6F101063A +:107FD0000126805D03EB0026B6B200E00646D768B6 +:107FE00054681368E819A04228BF001B0344506975 +:107FF000801B401B506105D0F719ED19A54228BF21 +:108000002D1BD5609069401E906101B10E8018460D +:10801000F2BDF8B5024600241089536900280CBF50 +:10802000022500250026002B3AD0D468234658B9F3 +:108030005768661CBE4228BFF61B176817F804C0B5 +:10804000BE5D0CEB062600E00646177F07F003072F +:10805000012F1ED1B7B24FF6FF7C674508BF00283D +:1080600007D150680023012894BFC0F1010001200E +:108070000AE01769A7420CD258B157683C1B8442EA +:1080800007D20023064604E014682678205C06EB3D +:1080900000265068ED18854228BF2D1A1068441933 +:1080A00001B10E802046F2BD10B50446AFF300804A +:1080B000204600F005F80446AFF30080204610BDCE +:1080C0007CB500F10F06F608F600B04240D2082E4B +:1080D00004D2082602E0083000F047F8DFF8045127 +:1080E0002C68210005D1002007E00268B24221D2AD +:1080F000011D08680028F8D12068291D0A688242FD +:1081000022D01368B34238BF111DF7D312E0931980 +:108110000B60801B54685C600B681860166009680F +:1081200000291DBF48680028081D0020286002F1B2 +:10813000080076BD61B10A681068A0F10803B34277 +:10814000E5D250680860EAE700F04EF80028C2D196 +:10815000002076BD10B5040006D0AFF300802046A5 +:1081600000F003F8AFF3008010BD002800D1704785 +:1081700050B4A0F108021368072B2BD913F0070F96 +:1081800028D1184C616809B18A4202D251606260FC +:1081900013E0486800B3904238BF0146F9D31BE0B2 +:1081A000964203D11B180B600A4606E0486810B1DE +:1081B000134498420ED350604A60506850B113681F +:1081C000D118814206D1002121600168CB181360CB +:1081D0004068506050BC704708680E18B242DFD249 +:1081E00050BC7047E8CB02200749086808B100205E +:1081F00070470648C008C00008600549C908C900A2 +:10820000091A0160704700BF10CC02200F10002037 +:10821000081400201349002008604FF4E02212489F +:10822000016841F4700101604FF0B041086840F00E +:10823000010008608A600D480A6802400C480A6024 +:10824000036823F00503036042685208520042604D +:1082500000220848C8600861086820F4802008608F +:108260008A61704708ED00E088ED00E0FBFEF6FA59 +:1082700094000058001004220100000003000000D8 +:1082800005000000010000000100000006000000E1 +:108290000A000000200000000200000004000000AE +:1082A00008000000100000004000000080000000F6 +:1082B0000001000000020000A0860100400D030044 +:1082C000801A060000350C0040420F0080841E001A +:1082D00000093D0000127A000024F40000366E010F +:1082E0000048E801006CDC02000000000000000013 +:1082F00000000000000000002DE9F041074688461C +:10830000387810F0030F16461D4633D0384600F07B +:1083100099F878BBB8F1000F1CBFD8E900018619A5 +:10832000012D2ED13888C10415D5396A07F14402D0 +:10833000384600F0A3F83A6B044602B93A69F96886 +:10834000384600F09BF8361B341A7A69F9683846CB +:1083500000F094F8261A1EB94DB916F1010F09D094 +:1083600097F903002A46314600F08EF8064616F1CA +:10837000010F09D12320AFF300804FF0FF30BDE89B +:10838000F081022DE8D1EBE7388810F4405F0ED081 +:108390007868F86038617861B8617868F86107F1E9 +:1083A0004400386207F13000786200203863B8F189 +:1083B000000F05D0D8E9020107F13402C2E900013B +:1083C00039884CF6FF60014039800020BDE8F0811B +:1083D00070B50546AFF300802888810415D56E6816 +:1083E0000024EA6895F903003146914212D2521AEC +:1083F000FFF71EFC10F1010F1CBF00283618F0D14A +:108400000FE04DF6FF70014029802846AFF3008051 +:10841000002070BD00220021FFF70AFC10F1010FBF +:1084200000D101246868E860A861E861002C29880F +:10843000E7D041F4007129802846AFF300804FF067 +:10844000FF3070BDF8B5A0B9AFF3008000250A4E2B +:1084500008244FF0FF37306820B1FFF7B9FF00283C +:1084600048BF3D46361D641EF5D1AFF30080284657 +:10847000F2BDBDE8F240ABE7DC250020914234BFFD +:10848000511A0021084670473EB504000D00012A2C +:1084900002D100F063F807E0022A07D1009400201F +:1084A000019069460C20ABBE2D1801E0002A0CD1CA +:1084B0000094019569460A20ABBE002805D1002230 +:1084C0002100280000F027F801E00020C04303B09D +:1084D00030BD000010B4314A002113461C688442AC +:1084E0001EBF491C9C6884421EBF491C1C698442F3 +:1084F00009D09C69491C844205D0491C20331029AD +:10850000ECD310BC7047002342F8313002EBC101BC +:108510004B6010BC704778B4204C002325462E6871 +:108520008E421EBF5B1CAE688E421EBF5B1C2E6956 +:108530008E4209D0AE695B1C8E4205D05B1C203593 +:10854000102BECD372BC7047054604EBC303012A21 +:1085500004BF59684D195D6072BC704710B40F4A72 +:10856000002113461C6884421EBF491C9C6884423B +:108570001EBF491C1C6984420AD09C69491C844264 +:1085800006D0491C20331029ECD310BC00207047C2 +:1085900002EBC100406810BC704700001CC90220FB +:1085A00010B50446E068A169884251D3218849F298 +:1085B00002030B40022B08D008044CBF4FF400709C +:1085C0004FF48440014321803BE001F4C042B2F506 +:1085D000C04F06D1A168884203D32046FFF732FF7F +:1085E00078BB208810F4406F02BF606804F144013A +:1085F000884217D14FF40070FFF756FD606030B924 +:1086000004F144006060E060401CA0600AE0218842 +:1086100041F040012180E060606100F50072606817 +:10862000A260E06160682061A068A06120784107D5 +:108630000AD502220021204600F00CF810F1010FAB +:1086400002D14FF0FF3010BD208840F4C0402080A0 +:10865000002010BD70B504460D461646AFF30080ED +:1086600033462A4600212046FFF746FE05462046AF +:10867000AFF30080284670BD2DE9FC4D016800F184 +:108680000805490805EBC102019200F108024068A3 +:1086900000F0010A02EBC108400808EBC00B002003 +:1086A0000021019A95422FD02A68AE186A68324498 +:1086B00000920835009A9642F3D016F9014B009AC1 +:1086C000964205D12A68AE186A683244009208358D +:1086D00016F8017B884210D1D84508BFF9F7EBFAAC +:1086E000D8F80000D8F80410BAF1000F18BF4844B9 +:1086F0000144884208F10808EED0002C00F8017B04 +:1087000005D5641CE6D1D5E75846BDE8F68D641E54 +:10871000D5D5CFE738B504000ED0207810F0030F80 +:1087200003D094F90300002809D5AFF30080204658 +:1087300000F030F8AFF300804FF0FF3032BD20463C +:10874000FFF780FE0546AFF300802078410644BF66 +:10875000606800F05DF80020606094F90300022872 +:1087600004D900F057F808B14FF0FF35E06B48B17D +:1087700000F05CF808B14FF0FF35E06B00F048F80E +:108780000020E063204600F005F8AFF300802846A3 +:1087900032BD000001780A0626D51C4A1368002164 +:1087A000834203D1002342F821301BE053680121AA +:1087B00083421EBF022193688342F3D0D368032112 +:1087C00083421EBF042113698342EBD05369052104 +:1087D00083421EBF0621936983421EBF0721D369CE +:1087E0008342DFD000F014B8002101804FF0FF3148 +:1087F000C17000F144014160C1600161416181616A +:10880000C161016200F1300141627047DC25002046 +:10881000FFF7A0BC1CB50200009269460220ABBE67 +:1088200004001000FFF756FE200016BDE0B50090D2 +:10883000F8F7C8FC019069460E20ABBE03B000BD3E +:108840007047FEE7FEE7FEE7FEE7704770477047B8 +:1088500000F026B80548FFF785B80548FDF757BC76 +:108860000448FDF754BC0448FFF77CB89CC90220BB +:108870007CC70220ECC60220FCC902201020FEF7B3 +:10888000A6BA0120FEF7A3BA0220FEF7A0BAFBF7B2 +:1088900064B9FEF7FDBBFEF7D1BB00F009B80000DC +:1088A00002484168027889184160704730260020EC +:1088B0000449C8680A6882430A604860F9F7A8BE9C +:1088C000000000000015005838B50C46C5B220461F +:1088D000AFF30080E068A169884204D32046FFF727 +:1088E0005FFE00280FD4E068401CE06000F8015DE6 +:1088F0002088010503D440050BD50A2D09D1204657 +:10890000FFF7A0FD28B12046AFF300804FF0FF3005 +:1089100032BD2046AFF30080284632BD19E050F842 +:10892000042BD30744BFA9F101039A18091F0023A0 +:10893000042942F8043BF9D25FEA817C134604D54E +:108940004FF0000CA2F800C09B1CC90744BF0021D7 +:10895000197050F8041B0029E1D1704738B50D4D4E +:108960000824286800281CBF017811F0030F05D0E7 +:1089700090F90310002958BFFFF7CCFE2D1D641E8F +:10898000EFD1BDE83840002200214FF0FF30FFF763 +:108990004FB900BFDC25002010B5074979441831D4 +:1089A000064C7C44163404E00A68081D11448847CC +:1089B0000146A142F8D110BD2C0000007800000053 +:1089C0004EF68851CEF20001086840F4700008604D +:1089D000BFF34F8FBFF36F8F4FF00070E1EE100ABF +:1089E0007047000039FFFFFFC0A502005826002095 +:1089F0007008000030000320000000007DFCFFFF35 +:108A000002000000020000009801000002000000C7 +:108A1000280003200800000061FCFFFF02000000A6 +:108A2000020000007E010000860100000814002002 +:108A300050120000000000000000000000000000D4 +:108A40000000000001000000020000000300000020 +:108A50000400000000F00DF8002801D0FFF79CFF93 +:108A6000AFF300800020AFF30080FAF7D6FB00F0F0 +:108A700002F80120704700F001B800000746FFF738 +:108A80006DFF3846F9F7D0F9FBE738B504460D46D7 +:108A9000284600F005F8A84218BF0024204632BD41 +:108AA0000149FFF711BF00BFBC24002001488047E7 +:108AB0000148004715820008BD8A0008AFF3008016 +:108AC000FFF77EFFFFF7C6FF00002E004300FFF711 +:108AD000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7CA +:108AE000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7BA +:108AF000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7AA +:108B0000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF799 +:108B1000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF789 +:108B2000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF779 +:108B3000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF769 +:108B4000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF759 +:108B5000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF749 +:108B6000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF739 +:108B7000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF729 +:108B8000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF719 +:108B9000FEBFFFF7FEBFFFF7FEBFFFF7FEBF0000FF +:108BA000F8000001810081008100810081008100C6 +:108BB00081008100810081008100810081008100AD +:108BC000810081008100810081008100810081009D +:108BD000810081008100810081008100810081008D +:108BE00081008100BD0004CC8A000801FD00034C17 +:108BF000250020D80003E5100008FC0004D3100075 +:108C00000801F9001301040000B8240020B9240071 +:108C100020B8240020B8240020FC0003B824002041 +:108C2000FC0007B8240020A4240020E00013020464 +:108C30000101ACCA0220FCCA0220ACCA0220ACCAA4 +:108C40000220FC0003ACCA0220FB0006250020EC39 +:108C5000240020E00013020802025CCA0220ACCA11 +:108C600002205CCA02205CCA0220FC00035CCA022B +:108C700020FC00074825002034250020E0001BC808 +:108C80008A0008C88A0008C88A0008C88A0008C87C +:108C90008A0008C88A0008C88A0008F8FF0BCA8A38 +:108CA0000008C88A0008C88A0008FAFF31000030AE +:108CB000B50A4B5A6842F480225A60EFF31084726E +:108CC000B6802251F8045B40F8045B521EF9D118BB +:108CD00068C103FCD484F3108830BD10400058EC08 +:108CE00000F8FFF4000B74240020BC2400200425AD +:108CF0000020DE0005484200007A44F800030DFF22 +:108D00000183EC000001F9000010FC001A04004887 +:108D1000000400480004004800080048000C004817 +:088D2000000C004800093D00B1 +:0400000508008ABDA8 :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_conf.h index 63e4daa3b..4ffab1647 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -240,7 +240,8 @@ #define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1344) /** - * Prepare Write List size in terms of number of packet with ATT_MTU=23 bytes + * Prepare Write List size in terms of number of packet + * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS is set to 1" */ #define CFG_BLE_PREPARE_WRITE_LIST_SIZE BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU) @@ -275,9 +276,9 @@ /** * Source for the low speed clock for RF wake-up - * 1 : external high speed crystal HSE/32/32 + * 1 : external high speed crystal HSE/32/32 * 0 : external low speed crystal ( no calibration ) - */ + */ #define CFG_BLE_LSE_SOURCE 0 /** @@ -299,32 +300,54 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 + * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) #define CFG_BLE_MIN_TX_POWER (0) #define CFG_BLE_MAX_TX_POWER (0) + + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -618,7 +641,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -637,5 +660,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/flash_driver.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/flash_driver.h index ad8a207e6..593788991 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/flash_driver.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/flash_driver.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,5 +174,3 @@ uint32_t FD_EraseSectors(uint32_t FirstSector, uint32_t NbrOfSectors); #endif #endif /*FLASH_DRIVER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_conf.h index bccc06db7..ba1c6fde8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,5 +271,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/main.h index 4b10d2beb..5d45ed43f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_hal_conf.h index 316f32ae3..1990a4ef1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_it.h index bdc3e950c..cc5a4e4f4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_entry.c index 5a0b5f1bb..40bc20263 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** +* @file app_entry.c +* @author MCD Application Team +* @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -72,6 +71,9 @@ static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); + #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -88,72 +90,72 @@ static void Button_Init( void ); void APPE_Init( void ) { SystemPower_Config(); /**< Configure the system Power Mode */ - + HW_TS_Init(hw_ts_InitMode_Full, &hrtc); /**< Initialize the TimerServer */ - -/* USER CODE BEGIN APPE_Init_1 */ + + /* USER CODE BEGIN APPE_Init_1 */ APPD_Init(); /** - * The Standby mode should not be entered before the initialization is over - * The default state of the Low Power Manager is to allow the Standby Mode so an request is needed here - */ + * The Standby mode should not be entered before the initialization is over + * The default state of the Low Power Manager is to allow the Standby Mode so an request is needed here + */ UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_DISABLE); - + Led_Init(); - + Button_Init(); -/* USER CODE END APPE_Init_1 */ + /* USER CODE END APPE_Init_1 */ appe_Tl_Init(); /* Initialize all transport layers */ - + /** - * From now, the application is waiting for the ready event ( VS_HCI_C2_Ready ) - * received on the system channel before starting the Stack - * This system event is received with APPE_SysUserEvtRx() - */ -/* USER CODE BEGIN APPE_Init_2 */ - -/* USER CODE END APPE_Init_2 */ - return; + * From now, the application is waiting for the ready event ( VS_HCI_C2_Ready ) + * received on the system channel before starting the Stack + * This system event is received with APPE_SysUserEvtRx() + */ + /* USER CODE BEGIN APPE_Init_2 */ + + /* USER CODE END APPE_Init_2 */ + return; } /* USER CODE BEGIN FD */ /* USER CODE END FD */ /************************************************************* - * - * LOCAL FUNCTIONS - * - *************************************************************/ +* +* LOCAL FUNCTIONS +* +*************************************************************/ /** - * @brief Configure the system for power optimization - * - * @note This API configures the system to be ready for low power mode - * - * @param None - * @retval None - */ +* @brief Configure the system for power optimization +* +* @note This API configures the system to be ready for low power mode +* +* @param None +* @retval None +*/ static void SystemPower_Config(void) { - + /** - * Select HSI as system clock source after Wake Up from Stop mode - */ + * Select HSI as system clock source after Wake Up from Stop mode + */ LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); - + /* Initialize low power manager */ UTIL_LPM_Init(); /* Initialize the CPU2 reset value before starting CPU2 with C2BOOT */ LL_C2_PWR_SetPowerMode(LL_PWR_MODE_SHUTDOWN); - + #if (CFG_USB_INTERFACE_ENABLE != 0) /** - * Enable USB power - */ + * Enable USB power + */ HAL_PWREx_EnableVddUSB(); #endif - + return; } @@ -163,22 +165,22 @@ static void appe_Tl_Init( void ) SHCI_TL_HciInitConf_t SHci_Tl_Init_Conf; /**< Reference table initialization */ TL_Init(); - + /**< System channel initialization */ UTIL_SEQ_RegTask( 1<< CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, UTIL_SEQ_RFU, shci_user_evt_proc ); SHci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&SystemCmdBuffer; SHci_Tl_Init_Conf.StatusNotCallBack = APPE_SysStatusNot; shci_init(APPE_SysUserEvtRx, (void*) &SHci_Tl_Init_Conf); - + /**< Memory Manager channel initialization */ tl_mm_config.p_BleSpareEvtBuffer = BleSpareEvtBuffer; tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer; tl_mm_config.p_AsynchEvtPool = EvtPool; tl_mm_config.AsynchEvtPoolSize = POOL_SIZE; TL_MM_Init( &tl_mm_config ); - + TL_Enable(); - + return; } @@ -189,107 +191,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { TL_AsynchEvt_t *p_sys_event; - SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; WirelessFwInfo_t WirelessInfo; - + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); - + /* Read the firmware version of both the wireless firmware and the FUS */ SHCI_GetWirelessFwInfo( &WirelessInfo ); APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); - APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); - + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + switch(p_sys_event->subevtcode) { - case SHCI_SUB_EVT_CODE_READY: - if(((SHCI_C2_Ready_Evt_t*)p_sys_event->payload)->sysevt_ready_rsp == WIRELESS_FW_RUNNING) - { - /** - * The wireless firmware is running on the CPU2 - */ - APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); - - /* Traces channel initialization */ - APPD_EnableCPU2( ); - - /* Enable all events Notification */ - config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; - config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE - + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE - + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE - + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE - + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE - + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE - + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; - (void)SHCI_C2_Config(&config_param); - - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); - - } - else - { - /** - * The FUS firmware is running on the CPU2 - * In the scope of this application, there should be no case when we get here - */ - APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); - - /* The packet shall not be released as this is not supported by the FUS */ - ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; - } - break; - - case SHCI_SUB_EVT_ERROR_NOTIF: - APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n", ((SHCI_C2_ErrorNotif_Evt_t*)p_sys_event->payload)->errorCode ); - break; - - case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: - APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", - ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, - ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); - break; - - case SHCI_SUB_EVT_THREAD_NVM_RAM_UPDATE: - APP_DBG_MSG("SHCI_SUB_EVT_THREAD_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", - ((SHCI_C2_ThreadNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, - ((SHCI_C2_ThreadNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); - break; - - case SHCI_SUB_EVT_NVM_START_WRITE: - APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", - ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); - break; - - case SHCI_SUB_EVT_NVM_END_WRITE: - APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); - break; - - case SHCI_SUB_EVT_NVM_START_ERASE: - APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfSectors = %ld\n", - ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); - break; - - case SHCI_SUB_EVT_NVM_END_ERASE: - APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); - break; - - default: - break; + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; } + + return; +} +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY – UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON – ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON – BLE ERROR \n"); + } return; } @@ -298,16 +352,16 @@ static void Led_Init( void ) { #if (CFG_LED_SUPPORTED == 1) /** - * Leds Initialization - */ - + * Leds Initialization + */ + BSP_LED_Init(LED_BLUE); BSP_LED_Init(LED_GREEN); BSP_LED_Init(LED_RED); - + BSP_LED_On(LED_GREEN); #endif - + return; } @@ -315,23 +369,23 @@ static void Button_Init( void ) { #if (CFG_BUTTON_SUPPORTED == 1) /** - * Button Initialization - */ - + * Button Initialization + */ + BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI); BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI); BSP_PB_Init(BUTTON_SW3, BUTTON_MODE_EXTI); #endif - + return; } /* USER CODE END FD_LOCAL_FUNCTIONS */ /************************************************************* - * - * WRAP FUNCTIONS - * - *************************************************************/ +* +* WRAP FUNCTIONS +* +*************************************************************/ void UTIL_SEQ_Idle( void ) { @@ -342,12 +396,12 @@ void UTIL_SEQ_Idle( void ) } /** - * @brief This function is called by the scheduler each time an event - * is pending. - * - * @param evt_waited_bm : Event pending. - * @retval None - */ +* @brief This function is called by the scheduler each time an event +* is pending. +* +* @param evt_waited_bm : Event pending. +* @retval None +*/ void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); @@ -376,23 +430,22 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) { switch (GPIO_Pin) { - case BUTTON_SW1_PIN: - APP_BLE_Key_Button1_Action(); - break; - - case BUTTON_SW2_PIN: - APP_BLE_Key_Button2_Action(); - break; - - case BUTTON_SW3_PIN: - APP_BLE_Key_Button3_Action(); - break; - - default: - break; - + case BUTTON_SW1_PIN: + APP_BLE_Key_Button1_Action(); + break; + + case BUTTON_SW2_PIN: + APP_BLE_Key_Button2_Action(); + break; + + case BUTTON_SW3_PIN: + APP_BLE_Key_Button3_Action(); + break; + + default: + break; + } return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/flash_driver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/flash_driver.c index dcd415b18..aca4361c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/flash_driver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/flash_driver.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** - * File Name : flash_driver.c - * Description : Dual core Flash driver - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : flash_driver.c + * Description : Dual core Flash driver + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -82,7 +81,8 @@ uint32_t FD_EraseSectors(uint32_t FirstSector, uint32_t NbrOfSectors) { /** * Notify the CPU2 there will be no request anymore to erase the flash - * On reception of this command, the CPU2 disables the BLE timing protection versus flash erase processing + * On reception of this command, the CPU2 will disables the BLE timing protection versus flash erase processing + * The protection is active until next end of radio event. */ SHCI_C2_FLASH_EraseActivity(ERASE_ACTIVITY_OFF); @@ -308,10 +308,10 @@ __WEAK WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) { /** * The timing protection is enabled by either CPU1 or CPU2. It should be decided here if the driver shall - * keep trying to erase/write the flash until successful or if it shall exit ans report to the user that the action + * keep trying to erase/write the flash until successful or if it shall exit and report to the user that the action * has not been executed. * WAITED_SEM_BUSY returns to the user - * WAITED_SEM_FREE keep looping in the driver until the action is executed. This will result in the current tack looping + * WAITED_SEM_FREE keep looping in the driver until the action is executed. This will result in the current stack looping * until this is done. In a bare metal implementation, only the code within interrupt handler can be executed. With an OS, * only task with higher priority can be processed * @@ -319,4 +319,3 @@ __WEAK WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) return WAITED_SEM_BUSY; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/main.c index 7f2152bb0..df8577e4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -638,5 +638,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_hal_msp.c index 0fd13443f..9aeb5e029 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -330,4 +329,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_it.c index aa528a8ea..6949330ff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -323,4 +322,3 @@ void HSEM_IRQHandler(void) /* USER CODE END HSEM_IRQn 1 */ } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.c index f769a84ce..f6abc1127 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -436,7 +435,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1408,6 +1408,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1457,7 +1459,7 @@ WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) LL_HSEM_ClearFlag_C1ICR(HSEM, __HAL_HSEM_SEMID_TO_MASK(CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID)); /* There is a bug in __HAL_HSEM_CLEAR_FLAG() */ if(LL_HSEM_GetStatus(HSEM, CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID)) { - APP_DBG_MSG("\r\n\rWAIT UNTILL CPU1 ALLOWS FLASH OPERATION\n"); + APP_DBG_MSG("\r\n\rWAIT UNTIL CPU1 ALLOWS FLASH OPERATION\n"); HAL_HSEM_ActivateNotification(__HAL_HSEM_SEMID_TO_MASK(CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID)); UTIL_SEQ_WaitEvt( 1<< CFG_IDLEEVT_FLASH_OPER_ALLOWED); @@ -1470,7 +1472,7 @@ WaitedSemStatus_t FD_WaitForSemAvailable(WaitedSemId_t WaitedSemId) LL_HSEM_ClearFlag_C1ICR(HSEM, __HAL_HSEM_SEMID_TO_MASK(CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID)); /* There is a bug in __HAL_HSEM_CLEAR_FLAG() */ if(LL_HSEM_GetStatus(HSEM, CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID)) { - APP_DBG_MSG("\r\n\rWAIT UNTILL CPU2 ALLOWS FLASH OPERATION\n"); + APP_DBG_MSG("\r\n\rWAIT UNTIL CPU2 ALLOWS FLASH OPERATION\n"); HAL_HSEM_ActivateNotification(__HAL_HSEM_SEMID_TO_MASK(CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID)); UTIL_SEQ_WaitEvt( 1<< CFG_IDLEEVT_FLASH_OPER_ALLOWED); @@ -1496,4 +1498,3 @@ void HAL_HSEM_FreeCallback(uint32_t SemMask) } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.h index 657ba432b..a3a0637b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_conf.h index bdb821276..14a542030 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_dbg_conf.h index 926abb3f0..0f78a5a4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.c index 5c95b3afe..7e3e501d4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -46,7 +45,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -385,5 +384,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.h index ab5aaf17e..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/readme.txt index c7f244a33..c79dd05ef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_RfWithFlash/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_RfWithFlash example ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -100,7 +100,7 @@ On the android/ios device, enable the Bluetooth communications, and if not done - The blue led on the board can be switched ON/OFF from the phone. Specific implementation for the test flash procedure - The descritpions above are taken from the BLE_p2pServer and are still valid as the BLE_RfWithFlash application is built on top of the + The descriptions above are taken from the BLE_p2pServer and are still valid as the BLE_RfWithFlash application is built on top of the BLE_p2pServer application. The BLE_RfWithFlash application is working in the same way than BLE_p2pServer application with additional features : - Each time SW3 is pressed, the application alternatively : @@ -116,7 +116,7 @@ On the android/ios device, enable the Bluetooth communications, and if not done - When SW3 is pressed while the CPU1 timing protection has been enabled with SW1, the CPU1 loops into the FlashOperationProc() until the CPU1 timing protection is disabled. Over all the time, the RF link activity is maintained. -Second demonstration - The phone may be replaced by the BLE_p2pClient application dowloaded on a STM32WB55xx board +Second demonstration - The phone may be replaced by the BLE_p2pClient application downloaded on a STM32WB55xx board - BLE_RfWithFlash may be connected by BLE_p2pClient. - Once the code (BLE_RfWithFlash & BLE_p2pClient) is downloaded into the two STM32WB55xx boards and executed, the modules are initialized. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc index 710047db5..3dfc15e66 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/BLE_TransparentMode.ioc @@ -78,8 +78,8 @@ Mcu.PinsNb=17 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -152,6 +152,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_TransparentMode +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -278,5 +280,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_TransparentMode -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex index 7f5e4a487..b818c7c31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Binary/BLE_TransparentMode_reference.hex @@ -1,1144 +1,1209 @@ :020000040800F2 -:100000002015002029460008F5430008F7430008A2 -:10001000F9430008FB430008FD430008000000000E -:10002000000000000000000000000000FF43000886 -:1000300001440008000000000344000805440008D3 -:1000400045460008494600084D460008434400085C -:100050005146000855460008594600085D4600080C -:1000600061460008654600083D4400080944000850 -:10007000694600086D46000871460008754600088C -:10008000794600087D46000881460008854600083C -:10009000894600088D4600089146000895460008EC -:1000A000994600089D460008A1460008A54600089C -:1000B000A9460008AD460008B1460008B54600084C -:1000C000B9460008BD460008C1460008C5460008FC -:1000D0000F44000815440008C9460008CD46000832 -:1000E000D1460008D5460008D9460008DD4600087C -:1000F0001B4400081F44000823440008E146000890 -:10010000E5460008E9460008ED460008F14600080B -:10011000F5460008F9460008FD46000801470008BA -:100120000547000809470008274400080D47000854 -:1001300011470008154700081947000838B50400A2 +:1000000008100020114A0008D5470008D74700080B +:10001000D9470008DB470008DD4700080000000062 +:10002000000000000000000000000000DF470008A2 +:10003000E147000800000000E3470008E54700082A +:10004000354A0008394A00083D4A0008E9470008D7 +:10005000414A0008454A0008274800082D48000882 +:10006000494A00084D4A000821480008ED470008A9 +:10007000514A0008554A0008594A00085D4A0008DC +:10008000614A0008654A0008694A00086D4A00088C +:10009000714A0008754A0008794A00087D4A00083C +:1000A000814A0008854A0008894A00088D4A0008EC +:1000B000914A0008954A0008994A00089D4A00089C +:1000C000A14A0008A54A0008A94A0008AD4A00084C +:1000D000F3470008F9470008B14A0008B54A00088C +:1000E000B94A0008BD4A0008C14A0008C54A0008CC +:1000F000FF4700080348000807480008C94A0008ED +:10010000CD4A0008D14A0008D54A0008D94A00085B +:10011000DD4A0008E14A0008E54A0008E94A00080B +:10012000ED4A0008F14A00080B480008F54A0008AB +:10013000F94A0008FD4A0008014B000838B50400E0 :1001400009D004F18005686808B900F01EF800F0D5 :1001500021F8012801D1012032BDA06A08B100F0C8 :100160002AF800F00AF821F02A01FFE7816000F088 -:100170001BF8BDE8324000F02EBB2068416821F436 +:100170001BF8BDE8324000F074BB2068416821F4F0 :1001800090414160206881687047002129702046B5 -:1001900000F03EBE242068602068016849084900DC -:1001A0000160204600F0B0B92068016841F001010B -:1001B000016020467047204600F0AABA30B500F131 -:1001C00080035C68202C41D109B1140001D10120C9 -:1001D00030BD1C78012C39D001251D7000F154046C -:1001E00001652280628000212162D960212159604D -:1001F00021698268B1F1005F13D1B2F5805F04BF5D -:100200000169002907BFDFF8F4242262DFF8F01447 -:100210002162002119700068816841F40001816049 -:1002200012E0B2F5805F04BF0169002907BFDFF863 -:10023000D4242262DFF8D0142162002119700068F2 -:10024000016841F080010160002030BD022030BD16 -:1002500038B500F180039C68202C0DD109B1140041 -:1002600001D1012032BD1C78012C05D000F006F828 -:10027000BDE8384000F01DBB022032BD01251D70D5 -:100280000023C366DFF884440368A34206D05C6899 -:10029000250203D51D6845F080651D6070478168A3 -:1002A00021F0400181607047206881684A067047EC -:1002B0002068016821F0100101607047F8B504461C -:1002C00040F60F002668F1693268B368084004F10F -:1002D0005C050ED1880602D5900602D4D80040F104 -:1002E00080806969002900F00E812046BDE8F44055 -:1002F0000847DFF8BC06034204BFDFF8B8763A428D -:100300006FD0CF0707D5D70505D5012737622E6BEC -:1003100046F001062E638E0708D5DE0706D527684E -:1003200002263E622E6B46F004062E634E0708D569 -:10033000DE0706D5276804263E622E6B46F00206CD -:100340002E630E070AD5960601D4034206D026680E -:1003500008203062286B40F008002863080509D5A2 -:10036000500107D526684FF400603062286B40F0DA -:1003700020002863286B002832D0890607D5900614 -:1003800001D4D80003D5696909B120468847286B94 -:1003900021688A68510602D410F0280F1BD020462D -:1003A00000F0EBFAFFF780FF10D5FFF778FF286A1F -:1003B00060B10FF219618163286A00F080FE0028A5 -:1003C0000ED0286A816BBDE8F44008472046BDE89E -:1003D000F24000F049BF204600F046FF00202863AD -:1003E000F1BD2869012853D1CF0651D5D0064FD58C -:1003F0001020306222689068410626D5296A086874 -:10040000406880B20028EBD02B8898427BDA688065 -:10041000086801688B0614D4106820F4807010609E -:10042000206881684908490081602068FFF737FF2C -:100430002020E86200202861FFF73AFF286A00F0D8 -:1004400008FE29886888091A1CE028886988411AEA -:10045000688800281CBF88B2002854D01368DFF8D1 -:10046000440823F4907313602268936803409360F8 -:100470002020E8620020286168612068026822F07C -:10048000100202602046BDE8F44089B200F0EDBEE3 -:10049000C80209D5580207D54FF4801030622046B3 -:1004A000BDE8F24000F05CBF080609D5100601D493 -:1004B000180205D5A96931B32046BDE8F4400847C4 -:1004C00048060ED550060CD5306820F0400030604C -:1004D0002021A9620020A8612046BDE8F24000F07A -:1004E0005DBF080206D5500004D52046BDE8F240A5 -:1004F00000F066BFC80148BF002A04D52046BDE809 -:10050000F24000F05EBFF1BDF8B50446DFF8980791 -:100510002168DFF898C70A68DFF894770240A0687E -:1005200002432069024360690243E06902430A60B2 -:1005300000254A68E06822F4405202434A60A369F9 -:10054000724A91421CBF206A03438E68DFF8640739 -:10055000064033438B600FF63006CB6A606A1B0996 -:1005600040EA0313CB626145DFF84C074FF40043C8 -:1005700039D13F6807F00307032F4DD8DFE807F0B4 -:10058000024643494FF0010CE169B1F5004F4FF6C7 -:10059000F07740F08080BCF1010F09D0BCF1020F70 -:1005A0000AD0BCF1040F71D0BCF1080F71D099E0F2 -:1005B00001F0F5FA002815D0626A616836F8123049 -:1005C000B0FBF3F04A0802EB4002B2FBF1F080B25C -:1005D000A0F11001B942EAD20740C0F3420007433C -:1005E0002068C7607FE0914216D13F6817F44067EA -:1005F00023D0B7F5806F09D0B7F5006F03D0B7F5FA -:10060000406F06D008E04FF0020C07E04FF0040CFA -:1006100004E04FF0080C01E04FF0100C9142B3D110 -:10062000BCF1000F09D0BCF1020F0AD0BCF1040FDD -:1006300015D0BCF1080F15D054E001F0A8FA00283D -:1006400051D0616A36F81120B0FBF2F6626802EB15 -:1006500042018E4246D31103B14205D242E001F07D -:100660004CFAECE71846ECE75008002110EB0620A6 -:1006700051EB1661002301F023FBA0F54071DFF878 -:100680003C2691422ED22268D0602CE001F035FA4F -:1006900090E7184690E7BCF1010F09D0BCF1020FBA -:1006A00009D0BCF1040F18D0BCF1080F18D019E024 -:1006B00001F075FAB8B1626A36F812306168B0FBC1 -:1006C000F3F000EB5100B0FBF1F080B2A0F11001AB -:1006D000B94207D22168C86005E001F00EFAE9E7E7 -:1006E0001846E8E7012504F16800012141800180F6 -:1006F00000218160C1602846F2BD0000750A000833 -:10070000350A0008070A0008DD09000800800040DB -:1007100090F82810CA0706D502685368C16A23F406 -:1007200000330B43536090F828108A0706D50268FF -:100730005368016B23F480330B43536090F8281007 -:100740004A0706D502685368416B23F480230B43A4 -:10075000536090F828100A0706D502685368816B29 -:1007600023F400430B43536090F82810CA0606D5C3 -:1007700002689368C16B23F480530B43936090F835 -:1007800028108A0606D502689368016C23F400538A -:100790000B43936090F828104A0610D502685368FE -:1007A000416C23F480130B435360416CB1F5801FFF -:1007B00005D15368816C23F4C0030B43536090F858 -:1007C00028100A0606D501684A68C06C22F4002287 -:1007D00002434A607047F8B5044604F180050020E2 -:1007E000E8606FF07E4701F083FB064620680168F1 -:1007F0000A0708D50097334600224FF4001120461F -:1008000000F017F860B9206801684A070AD5009718 -:10081000334600224FF48001204600F00AF808B168 -:100820000320F2BD20206860A8600020E0662870E8 -:10083000F2BD2DE9F041069C05460E4690461F4646 -:100840002868C1693140B1420CBF012000204045F9 -:100850001CD114F1010FF3D001F04AFBC01B8442FC -:1008600000D314B900F015F80CE0286801684A07B5 -:10087000E6D5C1690A05E3D54FF40062026200F0D3 -:1008800008F8C16000210170032000E00020BDE8ED -:10089000F0812868016821F4D071016028688168BE -:1008A00049084900816005F1800020214160816094 -:1008B000704730B500F15C0381651A805A800021D1 -:1008C0005961FF248168B1F5805F04D1016961B984 -:1008D00040F2FF1409E011B9016929B905E0B1F14D -:1008E000805F06D1016911B97F249C8003E03F211C -:1008F00000E00021998000F180040021E1602221C4 -:10090000A16001688D6845F001058D609968B1F1BD -:10091000005F1CD19D89AA4219D38268B2F5805F1D -:1009200004BF0169002907BF0FF2ED225A610FF2DF -:10093000512159610021217001680A6842F48072D6 -:100940000A600068816841F08051816013E082682C -:10095000B2F5805F04BF0169002907BF0FF295124D -:100960005A610FF269115961002121700068016814 -:1009700041F490710160002030BD01680A6822F4E2 -:1009800090720A60DFF81C13026893680B40936052 -:10099000C16E012904D101680A6822F010020A60C0 -:1009A0002021C0F888100021C1660167704700004F -:1009B0000100001020010004136823F0800313607D -:1009C0000068016841F0400101607047806A00F1F1 -:1009D000560100220A810A8000F046BCD0F884103B -:1009E00021290FD10268B0F8561001B9E4E7036D70 -:1009F00019789162016D4A1C0265B0F856104A1EC2 -:100A0000A0F856207047D0F88410212911D102682F -:100A1000B0F8561001B9CFE7036D1988C1F308018A -:100A20009162016D8A1C0265B0F856104A1EA0F84A -:100A300056207047D0F88410212900D0704730B577 -:100A400000F15602938A0CE0E1690D0608D5016DAC -:100A50000D78A562016D4C1C04651488611E11801F -:100A60005B1E99B229B1046811880029ECD100F00D -:100A700023F830BDD0F88410212900D0704730B55C -:100A800000F15602938A0EE0E1690D060AD5016D68 -:100A90000D88C5F30805A562016D8C1C04651488DA -:100AA000611E11805B1E99B229B10468118800296A -:100AB000EAD100F001F830BDA26822F40002A26081 -:100AC0000068016841F04001016070471CB500F00A -:100AD00025F80AD14A6AA1880A40816D0A70816DA1 -:100AE0004A1C00F021F821B924E0886940F0080090 -:100AF000886113BD1CB500F011F80AD14A6AA188BB -:100B00000A40816D0A80816D8A1C00F00DF821B9C0 -:100B100010E0886940F00800886113BD00F15C04B2 -:100B20000168E26A222A7047826561884A1E6280F3 -:100B30006188704700F01DF801688A685208520009 -:100B40008A602021E162002161612169012905D1CA -:100B500000F009F8218800F088FB01E000F014FCA7 -:100B60000020206113BD01680A6822F010020A60AB -:100B7000704701680A6822F490720A6070470000AA -:100B80002DE9F04700F0B3F83CD1A089DFF81481DB -:100B900080B96088002837D0A189884234DA00F013 -:100BA000A0F8474800F096F82EE0304600F0ECFB45 -:100BB00000202061A806ECD500F086F80870B06D22 -:100BC000411C00F0B6F814D0E90748BF5FEAC951EC -:100BD00001D500F0B7F8A80703D5F80701D500F054 -:100BE000A0F800F091F820B1304600F03DFB002164 -:100BF000216360880028DDD100F0B4F8D5D100F081 -:100C0000A8F8D5E700F002F8BDE8F087816941F067 -:100C100008018161704700002DE9F04700F067F896 -:100C20003CD1A089DFF87C8080B96088002837D06B -:100C3000A189884234DA00F054F8224800F04AF8DA -:100C40002EE0304600F0A0FB00202061A806ECD585 -:100C500000F03AF80880B06D811C00F06AF814D0FA -:100C6000E90748BF5FEAC95101D500F06BF8A80752 -:100C700003D5F80701D500F054F800F045F820B18D -:100C8000304600F0F1FA0021216360880028DDD1B0 -:100C900000F068F8D5D100F05CF8D5E7FFF7B6FFB3 -:100CA000BDE8F087FEFFFFEFF369FFCF003801409A -:100CB00088000058FFF4FF110024F40000FD0F002D -:100CC000CD0A0008F50A00083068406AB16D0AEAEA -:100CD0000000704760613068016841F020010160E8 -:100CE00070473068816821F0805181607047064606 -:100CF00006F15C043068B4F804A0C569D0F800902F -:100D00008768E16A22297047680708D5F80706D581 -:100D1000316804200862206B40F002002063206BE1 -:100D20007047316802200862206B40F004002063A5 -:100D30007047B1656088411E61803068C56915F0F3 -:100D4000070F704701210162206B40F00100206312 -:100D500070473068016821F0100101603046218839 -:100D600000F083BA3068016821F480710160306856 -:100D7000816808EA010181602020E0620020606152 -:100D800020690128704700000100020004000600ED -:100D900008000A000C001000200040008000000144 -:100DA0006A4900E06A4981B00A6802430A6009683A -:100DB00008400090009801B0704780B54FF40020C3 -:100DC000FFF7F0FF002200212E2001F0B3F8BDE86C -:100DD00002402E2001F0CCB800685E49884200D065 -:100DE000704780B54FF48010FFF7DCFF0022002130 -:100DF0002C2001F09FF82C2001F0BAF800220021ED -:100E00002D2001F097F8BDE802402D2001F0B0B888 -:100E100038B586B004466846142101F0FFF8206812 -:100E20004D4A4E4990422CD108684D4D40F001008A -:100E30000860096801F00101059105980120FFF79C -:100E4000AFFF0C20009002210020019102900321AD -:100E500008200391049069464FF0904001F0E2F8B9 -:100E600040482860112000F03EF808B101F018FB5E -:100E7000A567AC6200220021252001F05BF8252047 -:100E80002DE0394A90422CD14868384D40F48040DA -:100E90004860486800F48040059005980220FFF7FC -:100EA0007FFFC020009002210120019102900321C8 -:100EB00007200391049069462D4801F0B3F82D48AE -:100EC00028600F2000F00FF808B101F0E9FAA567DB -:100ED000AC6200220021242001F02CF8242001F033 -:100EE00047F807B030BD68601020A8600020E860B7 -:100EF0008020286100206861A861E8612862284696 -:100F000000F03EB81CB504461B49206888421CD13D -:100F100001F0C8FA01F0C6FA1848816B21F440715B -:100F200041F480718163816B41F400418163026807 -:100F300042F480620260006800F4806000900098D3 -:100F40002046BDE8164001F0C1BA13BD4C00005860 -:100F500050000058000C0058008000405C00005811 -:100F6000F803002008000240003801405804002027 -:100F70000004004844040240002800405800005883 -:100F800038B5040001D1012032BD2168DFF8B0027C -:100F9000814204F1240500F044F8022068700A68D8 -:100FA000A0686FF30E120243E06802432069024317 -:100FB00060690243A0690243E0690243206A024378 -:100FC0000A60204600F011F9A068B0F5804F04BF18 -:100FD000002161602079696A00F03F0000F014F898 -:100FE00038B1052805D2204600F019F900F012F8B2 -:100FF00003E0002028636863A8630020A861012043 -:1010000068700020287032BD0860A96AE86A4860EC -:1010100060687047296B00200860696BA86B4860A6 -:1010200070470AD2DFF81C0242181423B2FBF3F215 -:1010300092002A62DFF8100209E0DFF8100242187D -:101040001423B2FBF3F292002A62DFF80402E86193 -:10105000704781B040B100F124014A78022A05D0DE -:101060000420886100200870012026E002681368CF -:1010700023F00E0313604A6A136823F4807313602D -:1010800000680268520852000260012091F8202096 -:10109000CB6902F01C02904058608A6AC86A5060AE -:1010A000086B30B1026822F4807202604A6B886B70 -:1010B0005060012048700020087001B0704738B5BA -:1010C00000F1240200245178022903D00420906109 -:1010D000012428E001680B6823F00E030B6001680F -:1010E0000D686D086D000D60516A0B6823F4807304 -:1010F0000B60012192F82030D56903F01C03994060 -:101100006960936AD16A5960116B31B10B6823F43D -:1011100080730B60536B916B596001215170147097 -:10112000516901B18847204632BDF8B500F124016C -:101130000423CA6914680268156891F8206006F0F3 -:101140001C0603FA06F73C4210D06F070ED5146850 -:10115000A50603D4156825F00405156000F03DF8D8 -:10116000C968002938D0BDE8F4400847022303FAD3 -:1011700006F73C4213D0AF0711D51468A50605D475 -:10118000156825F00A05156001224A7000F025F85F -:1011900000220A708968F9B1BDE8F44008470823C5 -:1011A00003FA06F6344217D02B0715D5136823F03F -:1011B0000E031360012291F82030CC6903F01C0368 -:1011C0009A40626001228A614A7000220A700969AD -:1011D00011B1BDE8F4400847F1BD91F82020CC6979 -:1011E00002F01C02934063607047416C0268144B2C -:1011F00089089A4234BF174B174B03EB8101816476 -:1012000002F0FF02083A1421B2FBF1F1134AC26462 -:1012100001F01F01012202FA01F101657047017915 -:101220000F4A01F03F0102EB81024265491E0D4A5F -:10123000826501F0030101228A40C2657047000007 -:1012400008040240F8FFFDBF00000240F8FBFDBFAC -:1012500000040240000802401C08024080080240CE -:10126000FC080240400902407047704710B500F189 -:1012700080010A78012A01D1022010BD01230B70E0 -:1012800024224A60026813681468640864001460C9 -:101290000022426623F0005300680360202048606B -:1012A0000020087010BD70B500F01EF801D10220BA -:1012B00070BD00F01FF822F0604209E070B500F048 -:1012C00013F801D1022070BD00F014F822F0606222 -:1012D00011438160204600F01AF820680660202043 -:1012E00068600020287070BD044604F180052878ED -:1012F0000128704701222A7024206860206806684F -:10130000026852085200026020688268704730B557 -:10131000416E11B90121012214E001680FF230047D -:101320008A6889680FF23003520E02F00702490FF3 -:10133000655CA45C595C9A5CED00E40095FBF1F1FE -:1013400094FBF2F268304180028030BD0000000062 -:101350000101010307010000080402040801010162 -:101360007047704730B9124803601248124B03604F -:10137000FEF76EBF704730B9104803600D480E4B42 -:101380000360FEF71BBF704700680B49884204D119 -:1013900007490868002818BF0047704700680649D9 -:1013A000884204D105490868002818BF00477047E3 -:1013B00018050020F8010020003801401C0500201D -:1013C000704770474FF0B040006800F0F000B02860 -:1013D00088BFB02070472DE9F041040054D0207838 -:1013E00081064FF0B04538D5A868E96810F00C00C8 -:1013F00001F0030103D00C2808BF012946D1286859 -:10140000800702D5E06900283ED0FFF7DBFF616A64 -:10141000884207D2084600F0D3FB002834D100F000 -:1014200075FA0FE0286820F0F00001432960696830 -:10143000206A21F47F4141EA00216960606A00F07E -:10144000BFFB08BB00F095FBDFF810180860DFF861 -:101450001008006801F052F8B0B92078C1070DD526 -:10146000A868E96800F00C00082801F0030103D027 -:101470000C2808BF03292DD12868800340F1398149 -:101480006068002840F03581012038E2E06980B1D1 -:10149000296841F0010100F047FA064628688007F4 -:1014A00000F1248100F024FD801B0328F6D30320E3 -:1014B00025E2286840084000286000F019FD064633 -:1014C000286800F01FFAC8D000F012FD801B032826 -:1014D000F6D3ECE76068B0F5803F04D1296841F4A9 -:1014E0008031296003E02A6822F480322A60606833 -:1014F00060B100F0FDFC06462868800300F1F98029 -:1015000000F0F6FC801B6528F6D3D0E700F0F0FC75 -:1015100006462868400C10F0010000F0EA8000F058 -:10152000E7FC801B6528F4D3C1E700F0E1FCC01B99 -:101530000328C0F01281BAE7E06878B1296841F465 -:10154000807100F0F1F906462868400500F1188125 -:1015500000F0CEFC801B0328F6D3A8E7286820F40F -:101560008070286000F0C4FC06462868800A10F0ED -:10157000010000F0DC8000F0BBFC801B0328F4D3EA -:1015800095E700F0B5FCC01B0328C0F00B818EE787 -:1015900040F0010000F0CEF907467068800700F1C6 -:1015A0001C8100F0A5FCC01B0328F6D37FE7706800 -:1015B00020F0040000F0BEF907467068C00810F083 -:1015C000010000F0198100F093FCC01B0428F4D343 -:1015D0006DE70528306806D140F0040030603168BE -:1015E00041F0010105E0400840003060316821F021 -:1015F00004013160A06841F2893768B100F078FCDD -:1016000080463068800700F10C8100F071FCA0EB8F -:101610000800B842F5D34AE700F06AFC804630681B -:1016200000F070F900F0FD8000F062FCA0EB080013 -:10163000B842F4D33BE700F05BFCC01B0328C0F0CA -:10164000FE8034E7B06840084000B06000F050FC15 -:101650000746B06800F056F900F0F58000F048FC4D -:10166000C01B0328F5D322E700F042FC801B0328AF -:10167000C0F01F811BE700F03BFC001B0328C0F0FB -:10168000398114E7286881010CD4296841F0807100 -:101690002960E86840F08050E86000F029FC0446CA -:1016A0002868810100F12A8100F022FC001B032838 -:1016B000F6D3FCE60C2931D0286820F08070286031 -:1016C000E968DFF8A00589088900E960E968014058 -:1016D000E96000F00DFC04462868810140F10E81AC -:1016E00000F006FC001B0328F6D3E0E600F00EF93C -:1016F000B3E6207881071AD5A868E96800F00C00E5 -:10170000042801F0030104D00C2808BF02297FF44B -:1017100013AF2868400503D5E06800283FF4B4AE55 -:101720006968206921F0FE4141EA00616960216831 -:10173000DFF8346511F0180F38D0606900283FF4E5 -:1017400036AFC90670687FF523AF800709D470688B -:1017500040F0010000F0EEF80746706880077FF562 -:10176000E4AE706840F0040000F0E4F807467068EA -:1017700000070DD400F0BCFBC01B0428F7D396E68D -:101780006868216920F0FE4040EA01606860CEE7A9 -:101790007068A16920F4706040EA0120706000F078 -:1017A000C6F8074600F0ADF87FF4EBAE20784107AD -:1017B00037D5DFF8B8743868C10529D400F072FE57 -:1017C00000F096FB80463868C10521D400F090FBFC -:1017D000A0EB08000328F6D369E6706820F0040047 -:1017E00070607068C00810F00100DFD000F080FB6E -:1017F000C01B0428F5D35AE600F099F8074600F01C -:1018000080F8D3D000F074FBC01B0328F7D34EE65A -:10181000A06801287FF4DDAE306840F00100306040 -:10182000E8E6217848060ED5A06A00283FF40AAF02 -:10183000B16841F00101B16000F05AFB0746B068A1 -:1018400080077FF5F8AEE06A002857D0A968EA68FB -:10185000022801F00C017FF42DAF236B02F003008E -:10186000984202BF02F07000636B984214D1A36BE0 -:10187000C2F30620984202BF02F47810E36B98424C -:101880000AD1236C02F06060984202BF02F060420D -:10189000606C82423FF4F6AE0C293FF4F5AD286847 -:1018A00041013FF5F1AD296821F0807100F03CF86D -:1018B0000646286881013FF5D7AEE968DFF8B00336 -:1018C000A26B0140206B0143606B0143E06B41EA76 -:1018D00002210143206C0143606C0143E9602868E8 -:1018E00040F080702860E96841F08051E96000F0C4 -:1018F000FFFA0446286881017FF5BDAE0020BDE8EF -:10190000F0817068400810F0010070472968606A33 -:1019100021F0F001014329606868216A20F47F40CA -:1019200040EA012068607047296000F0E1BA706801 -:1019300040084000706000F0DBBA2DE9F843040075 -:10194000884644D0DFF82C6300F0CBF847D200F093 -:10195000CDF8074600F0C5F841D000F0C9FAC01B29 -:101960000228F7D90320BAE000F0C2FA401B02288F -:1019700043D9F7E700F0BCFAA0EB090002284CD9E4 -:10198000F0E700F0B5FAA0EB0900022854D9E9E726 -:1019900000F0AEFA401B02285DD9E3E700F0A8FA98 -:1019A000401B022867D9DDE700F0A2FA401B48453A -:1019B00077D3D7E7032802D13968890103E00028EB -:1019C000396802D1890762D401E049055FD401205A -:1019D00085E000F08DFAC01B022872D9C2E720789A -:1019E00081074FF0B0470BD5B968A06821F0F0012E -:1019F0000143B96000F07CFA0546B868C003B3D56E -:101A00002078DFF8545281060AD52968606921F0F0 -:101A1000F0010143FFF788FF814628688003A9D5BC -:101A2000207841060BD52968A0690909090141EA16 -:101A30001011FFF779FF81462868C003A1D52078EF -:101A400041070BD5B968E06821F4E0610143B96052 -:101A500000F04EFA0546B868800399D52078010752 -:101A60000CD5B868216920F4605040EAC100B86024 -:101A700000F03EFA0546B86840038FD52078C107CC -:101A800017D56068022895D1396889039FD5B96850 -:101A9000890840EA8100B86041F2893900F028FAEB -:101AA0000546B868616800F00C00B0EB810F7FF468 -:101AB0007BAF306800F00700804505D200F016F8D3 -:101AC000074600F00EF884D100F053F8DFF88C11CF -:101AD000086000F049FDBDE8F24300F00FBDBDE82D -:101AE000F283306800F00700404570473168C9084C -:101AF00048EAC101316000F0FBB938B54FF0B0449D -:101B00005E4DA16811F00C0106D1FFF75BFCC0F33C -:101B1000031055F8200032BD0429594A05D0082980 -:101B2000584804D12168C90222D5104632BDE16867 -:101B300001F00301022904D0032904D12168C9025C -:101B400007D5104605E0FFF73DFCC0F3031055F83C -:101B50002000E168E268E368C1F306214843C2F36C -:101B60000211491C5B0FB0FBF1F05B1CB0FBF3F002 -:101B700032BD80B5FFF7C1FF3F49FFE7424A096820 -:101B8000C1F3031152F82110B0FBF1F002BD80B592 -:101B9000FFF7EFFF00F010F8C1F3022106E080B577 -:101BA000FFF7E7FF00F008F8C1F3C22112F8211097 -:101BB00001F01F01C84002BD2F49344A096870472F -:101BC00070B52E49B1282EBFCC6AC0F3031051F86E -:101BD00020402148056800F0E7FC2B492C4A05F01D -:101BE0000F0551F82510B4FBF1F10024B1FBF2F11F -:101BF000B0F5007F0FF2B802204609D10FF294032E -:101C000053F820508D4214D2401C0328F8D912E01A -:101C10000FF2900353F820508D420AD2401C032843 -:101C2000F8D308E000F064F9801B03280CD30320EC -:101C300070BD52F820400F4D2868C00844EAC0002B -:101C4000286000F055F90646296801F00701A14215 -:101C5000E8D1002070BD00000801005850000020AD -:101C600034000020FFFFFEEE9000005800040058F2 -:101C70008C80C1110040005808000058B44300088F -:101C80000024F4000048E80174430008A845000857 -:101C900040420F0012000000240000003600000047 -:101CA00040000000060000000C00000010000000D2 -:101CB000000000000100000002000000030000001E -:101CC000B3BBD9B1B2F5803F7DD2022A1ED98C4672 -:101CD000B1FBF2F102FB11C31B0443EA1043B3FB57 -:101CE000F2FC02FB1C3380B240EA0343B3FBF2F088 -:101CF00002FB103240EA0C4000237047022A05D94B -:101D00008446B0FBF2F002FB10C270474AB105D125 -:101D100000F0010249085FEA30007047002200230A -:101D2000704700F049BC0B00020000210020704702 -:101D3000904271EB030CF6D3B3F5803F2FD2F0B590 -:101D4000B3FA83F7B1FA81F4A7F10F0E3D1B5340AC -:101D5000CEF1200602FA0EF2F3415340B5F10F071F -:101D600046D80F3C2C444140C4F12006A040F1412C -:101D70004140B1FBF3F603FB1611A2FB0645001B25 -:101D8000A94102D2761E8018594180EA010221FA47 -:101D90000EF362FA0EF200215A403046F0BD30B424 -:101DA000B1FBF3FC03FB1C11A2FB0C45001BA9417A -:101DB00003D2ACF1010C8018594130BC02460B46ED -:101DC000604600217047B2F1807F65D3F0B5B2FA6A -:101DD00082F7B1FA81F4C7F10F063D1B22FA06F330 -:101DE00007F1110EF24120355A40B5F10F07B8D96D -:101DF0004140C4F12006A040F1414140B1FBF3FC59 -:101E000003FB1C11A2FB0C45001BA94103D2BCF132 -:101E1000010C801859410F2F12D30F3FC90341EA1B -:101E20005041B1FBF3F603FB1611A2FB0645D4EBC0 -:101E3000C030A94102D2761E8018594146EACC3CF6 -:101E400007B34140C7F12006B840F1414140B1FB22 -:101E5000F3F603FB1611A2FB0645001BA94102D2B3 -:101E6000761E8018594180EA010221FA0EF3C7F16B -:101E7000200462FA0EF20CFA07F05A402CFA04F130 -:101E80003043F0BD80EA010221FA0EF3002162FA2C -:101E90000EF260465A40F0BD8C46B1FBF2F102FBF7 -:101EA00011C31B0243EA1063B3FBF2FC02FB1C33B9 -:101EB0001B024CEA002043EA1063B3FBF2FC02FB76 -:101EC0001C331B024CEA002043EA1063B3FBF2FC14 -:101ED00002FB1C331B024CEA002043EA1063B3FBF5 -:101EE000F2FC02FB1C324CEA0020002370477047D2 -:101EF00001484068704700BF2C0000200901020023 -:101F000081B002D43C48815405E03C4802F00F0205 -:101F1000104400F8041C01B07047394A13684FF6AA -:101F2000FF0100020B4000F4E0601843354908430C -:101F30001060704738B5324B1C68C4F30223C3F1FC -:101F40000704052C28BF04241D1D072D34BF0023C2 -:101F5000DB1E012505FA04F4641E2140994005FAB0 -:101F600003F35B1E1A401143BDE83440C6E700008E -:101F7000010007D4012200F01F01234B8A404009D1 -:101F800043F82020704701000BD4012200F01F010C -:101F90001E4B8A40400943F82020BFF34F8FBFF308 -:101FA0006F8F704710B5401EB0F1807F01D30120C4 -:101FB00010BD174C60600F214FF0FF30FFF79EFF00 -:101FC0000022A26007202060002010BD010007D47D -:101FD000012200F01F010F4B8A40400943F82020E6 -:101FE0007047010007D4012200F01F010A4B8A400C -:101FF000400943F82020704700E400E018ED00E0BD -:102000000CED00E00000FA0500E100E080E100E0F6 -:1020100010E000E000E200E080E200E0002200F0DA -:10202000CDBA00002DE9F84F4FF00009644A654B26 -:102030004FF00F0805460E4633E0634FBD4214BF14 -:10204000072704278F4027434CF82E70C1431C6894 -:1020500001EA040C7468E40348BF40EA0C0CC3F8BE -:1020600000C05C6801EA040C7468A40348BF40EA3D -:102070000C0CC3F804C0146801EA040C7468E40290 -:1020800048BF40EA0C0CC2F800C0546801EA040CD6 -:102090007168890248BF40EA0C0CC2F804C009F11B -:1020A0000109316831FA09F077D0012404FA09F402 -:1020B00014EA0100F3D04FEA490C032101FA0CF1B4 -:1020C0006FEA010E7168012918BF022903D0112996 -:1020D00018BF122911D1A968F7680EEA010107FAA1 -:1020E0000CF73943A960696821EA04047168C1F3F7 -:1020F000001101FA09F10C436C60E968B4680EEA5A -:10210000010104FA0CF42143E9604FEA8901746883 -:10211000022C18BF122C12D14FEAD90405EB84040B -:1021200001F01C07D4F820A008FA07FB2AEA0B0AE2 -:10213000D6F810B00BFA07F747EA0A0727622C68AF -:102140000EEA0407347904F0030404FA0CF43C4367 -:102150002C607468E400A2D5DFF870C04FEA990ED5 -:102160005CF82E7001F00C0108FA01F427EA04046F -:10217000B5F1904F08BF00270ED0154FBD4208BFE4 -:10218000012709D0134FBD4208BF022704D0124FC8 -:10219000BD427FF452AF032754E7BDE8F18F81B011 -:1021A000002A14BF8161816201B070470B4A136835 -:1021B00003421CBF106000F09DBA70470000000091 -:1021C000000800588008005800100048080001402E -:1021D0000004004800080048000C00480C080058A3 -:1021E000A04900E0A04981B00A6802430A6009687A -:1021F00008400090009801B0704738B59B499C4C4E -:102200004FF40040086000F09BF9606840010ED573 -:102210006068C0000BD400F045F900F043F9206875 -:1022200040F480302060216821F48031216000F08A -:10223000DEF8002000F064FA40B180798D49E16059 -:10224000E16821F47C5141EA0021E16000F053F89B -:10225000894C8A488A4D606204F1240000F062FAD9 -:102260008848016800220260026902F0500202619F -:102270000420FFF7B7FF0120FFF7B4FF0220FFF7AC -:10228000B1FF0420FFF7ACFF0220FFF7A9FF0120F8 -:10229000FFF7A6FF00220F210B20FFF74BFE0B20BC -:1022A000FFF766FE00220F213A20FFF743FE3A2097 -:1022B000FFF75EFE0020606025600F20A06047F6FB -:1022C000FF70E06000202061A061E0616061204655 -:1022D00000F060FACA206862FF2153206862A86893 -:1022E000C008C000A860696200F082F94FF0FF30BA -:1022F00000F0F4FAFAE710B5AEB01CA84821FFF7D9 -:102300008DFE01A81C21FFF789FE08A85021FFF7C8 -:1023100085FE00F0C7F85648016821F018010160F9 -:1023200007215948026822F4C06242F40072026038 -:102330004FF48032006800F4C06000904FF4807465 -:1023400000981C9101201E900021402020901D9299 -:1023500027911F941CA8FFF73EF86F2001900221DF -:1023600000200291039004900590069007900121AF -:1023700001A8FFF7E2FA43F60300089000214FF4AA -:10238000804019900E910F91102002211B901A91FC -:10239000189408A800F08AFB2EB010BD10B53B4C75 -:1023A0003B4800F017F84FF40040E0610020206245 -:1023B0006062A0622046FDF7C1FE00212046FEF7C4 -:1023C00072FF00212046FEF779FF2046BDE810404D -:1023D000FEF74CBF20604FF4E13060600020A06049 -:1023E000E06020610C2060610020A06170472948F6 -:1023F00081B0016841F4801101603F21006800F460 -:10240000801000900098244841604161016841F4C7 -:102410007C110160026942F47C120261016841F0A2 -:102420003F010160026942F03F02026101B0704762 -:1024300038B50446FFF75CFD14F1010F054609D0DD -:1024400000F095F8241805E01448016821F0040113 -:10245000016030BFFFF74CFD401BA042F4D331BDFB -:1024600000000000480000584C0000581040005880 -:1024700090000058FECAFECA98030020000C0058C5 -:10248000002800408008005800040058F80100208F -:102490000038014050000058040C005810ED00E0D6 -:1024A000704700000248016841F480710160704784 -:1024B000000400588A60FF2102685162012180F8FF -:1024C0002110002180F820100020704790F8201083 -:1024D000012901D102207047012280F82020022129 -:1024E00080F82110CA2102685162532103685962A1 -:1024F00001688A6842F02002FFF7DCBF70B50F4E1A -:10250000044630780025A8B1FFF733FB32784FF44A -:102510007A71B1FBF2F1B0FBF1F0FFF743FD48B97E -:10252000102C07D2002221464FF0FF30FFF702FDAA -:10253000B46000E00125284670BD00BF2C000020DB -:10254000164810B5016841F4807101600320FFF75F -:10255000E4FC0020FFF7D2FF0024002814BF012470 -:10256000FEF72BFC204610BD0D48806870470C48D4 -:10257000007870470B480BE00A48016821F002011F -:10258000016070470748016821F00401016070474D -:102590000168490849000160704700000040005888 -:1025A0002C000020042004E0DFF80800006800F49C -:1025B000C0607047000400587047000000B500BFBD -:1025C000130096469446103928BFA0E80C50FAD85C -:1025D0005FEA417C28BF0CC048BF40F8042BC90704 -:1025E00028BF20F8022B48BF00F8012B00BD0000D7 -:1025F00018B53748374C89B0016841F40041016093 -:1026000000F0D2FB34480168C908C90041F0040158 -:1026100001600020314900F082FD00F0A6FE01219A -:10262000012000F0D3FB002000F0EFFF012000F0BC -:10263000ECFF022000F0E9FF012001F00EF801217B -:10264000002001F01EF801F073F8254801F069F947 -:102650000FF259020021202000F0A5F904F23C50AD -:10266000029020490FF22D0001900091684601F080 -:10267000B8F804F25470039004F5C96140F23C507C -:1026800006900491059403A801F0E4F801F04EF8D7 -:102690000AB010BD80B50146114801F04EF9BDE801 -:1026A00004400021202000F08BB9000080B500F02C -:1026B0008AFE0021012000F089FB6946084801F0EC -:1026C00052F9009801F0DFF801F05EF901BD000059 -:1026D00008000058300003208004005898030020B0 -:1026E000E4040020533A000800F084BB4FF0FF30B0 -:1026F00000F0F4B8102808BF01F0BAB97047000024 -:1027000001460648064AC3798B4218BF904218BF5B -:102710000838F8D18B4218BF00207047F873FF1FAC -:102720000070FF1FF8B504460025ACB104F1340673 -:10273000307910B92046FEF74FFB0F4F384600F0B6 -:1027400021F8386840F001103860204600F007F8A2 -:1027500035600120307100E001252846F2BD10B53A -:102760000021064A064B00EB8104491C06296360E0 -:10277000E261F8D310BD0000000C0058EF1E000805 -:1027800063130008002101604FF03F1141603F21B9 -:102790008160704738B5040044D094F8210028B90E -:1027A000002184F820102046FEF7ACFB00F049F829 -:1027B000FF2510B100F03FF834E02168DFF8B000E9 -:1027C0008A6802408A6021688A68636820690343D6 -:1027D000A06903431A438A602168E06808612068A1 -:1027E0000169A26841EA024101612068C16821F0E3 -:1027F0008001C1602068C16C89088900C1642168BA -:10280000CA6CE369606903431A43CA64206881683B -:10281000880609D400F020F830B120684562042110 -:1028200000F01FF8012032BD20684562012184F8C4 -:102830002110002032BD20684562042184F8211057 -:102840007047022084F82100CA2021684862532082 -:1028500022685062204626E020460BE02068C0F83F -:10286000248084F82110002084F8200070470000A4 -:10287000BFFF8FFF70B5044640F2E9362068C1689B -:1028800021F0A001C160FFF733FB05462068C16855 -:10289000880606D4FFF72CFB401BB042F6D303207A -:1028A00070BD002070BD70B504462068C1684A063E -:1028B00012D44FF0FF32C26040F2E936FFF718FB46 -:1028C00005462068C168480606D4FFF711FB401B87 -:1028D000B042F6D3032070BD002070BD2DE9FC4747 -:1028E000544CDFF85491A5692840A0614FF0FF3A9D -:1028F0004FF0010830E0491C54F831000642FAD08C -:1029000004EBC106184071681040014208BFC6F8C8 -:1029100004A07768384000F091F8606208FA00F08F -:1029200087437760EFF3108172B6626A206908FA14 -:1029300002F2D24310402061022004EBC00353F89E -:10294000086C1640401E43F8086CF6D181F31088DD -:10295000606A59F82010884763692069A2691840A5 -:10296000104207D0E069216A084203D1002103EA3E -:102970000206C1E7C4F824A001F0E0F9EFF31089E2 -:1029800072B6216960690140A069014201BFE16935 -:10299000206A0142FFF7A8FE89F3108801F0CFF901 -:1029A000A561BDE8F38738B51446EFF3108572B61C -:1029B00000F044F8204941F8204085F3108831BDEB -:1029C00010B500F00BF804431C6153F8314020436C -:1029D00043F83100FFE782F3108810BDEFF3108257 -:1029E00072B6144B1C697047506181F310887047B0 -:1029F000EFF3108172B60F4AD3691843D061F4E740 -:102A0000F8B50C4C656A276A2E4615F1010F0EBF0A -:102A10000025012101FA05F5206202E02846FFF7B2 -:102A200065FE216AE0690842F8D088436662E06189 -:102A30002762F1BD04000020180300200246002098 -:102A4000110C090404BF1020120412F07F4F04BFC0 -:102A5000083012020FF2180112F0704F04BF001D6F -:102A60001201120FC0F11F00895C401AC0B27047FA -:102A70000403020201010101000000000000000047 -:102A8000DFF820130A68030903F47F2300019A4347 -:102A900000F47F2000F082B9DFF808231368010CEE -:102AA00023EA014343EA0043136070472DE9F843EA -:102AB000054600242878DFF8EC624106A0464FF076 -:102AC000B0472DD5286B70B1B0F5800F06D0B0F5AA -:102AD000000F18BFB0F5400F17D01FE0F86840F4A2 -:102AE0008030F860EDE0386820F080603860FFF7F3 -:102AF000FFF981463868000140F1D080FFF7F8F90E -:102B0000A0EB09000228F5D90324D7E0FFF7F0F97C -:102B1000A0EB0900022840F2C980F5E70124A04695 -:102B20002868010531D5B06800F44078286C8045EC -:102B30002AD0FFF7B7FCB8F1000FB16805D1286CB7 -:102B400021F440710143B1601EE0B06840F4803070 -:102B5000B06021F44071B06820F48030B060286C1F -:102B60000143B160B068C0070ED5FFF7C1F98046D8 -:102B700041F28939B068800706D4FFF7B9F9A0EBB4 -:102B800008004845F6D30324A0462878C10705D598 -:102B90003168A869890840EA810131602878810795 -:102BA00005D53168E86921F4406101433160287836 -:102BB000C10644BFA86AFFF76FFF2878810644BFAB -:102BC000E86AFFF769FF2878410744BF286AFFF7E2 -:102BD00057FF2878010744BF686AFFF751FF28684C -:102BE000C1051BD53168686B21F04061014331603C -:102BF000686BB0F1006F00F0BDF8686BB0F1806FEA -:102C000075D100F0BDF804463868000160D5FFF7C3 -:102C10006FF9001B0228F7D94FF0030867E0FFF7B0 -:102C200067F9001B02285BD9F6E7316821F04041C3 -:102C3000316020F08050326822F0406210433060F2 -:102C4000A86BB0F1C05F00F095F8286841056DD51C -:102C50003168E86B21F0405101433160E86BB0F11D -:102C6000005F03D1F96841F48031F960E86BB0F19D -:102C7000805F5BD100F084F804463868000146D5D7 -:102C8000FFF736F9001B0228F7D94FF003084DE093 -:102C9000FFF72EF9001B022841D9F6E700F061F892 -:102CA000A86821F4781100F071F8814638680001B5 -:102CB0007FF52CAF3969686901433961002C7FF4D5 -:102CC0002EAF3168286B21F440010143316027E7C2 -:102CD00000F047F8E86821F0606100F057F804461A -:102CE000386800019BD539696869014339612868F2 -:102CF0008105AAD5A86BB0F1804F1CBFB0F1004F81 -:102D0000002892D1316821F04041084397E700F054 -:102D100028F8286921F0604100F038F80446386846 -:102D20000001B5D539696869014339612868C10472 -:102D300005D5F168686C21F440410143F1602868D1 -:102D400081040BD5796AE86C21F030010143796286 -:102D5000796AA86C890840EA810179624046BDE839 -:102D6000F2833869696820F4FE4040EA0120386146 -:102D70003969704703D1F96841F08071F960704793 -:102D8000396821F080613960FFF7B2B801433961D9 -:102D9000386840F080603860FFF7AAB810430860D8 -:102DA0007047000088000058204800210160416001 -:102DB000704710B500F019F81C6819B1012904D149 -:102DC000204301E024EA000018600BE010B500F099 -:102DD0000CF85C6819B1012904D1204301E024EA10 -:102DE0000000586082F3108810BDEFF3108272B6B5 -:102DF0000E4B704738B5EFF3108472B60B490C4D8B -:102E0000086820B129688847686880470AE04868F0 -:102E100020B1A9688847E868804703E028698047AF -:102E20006869804784F3108831BD0000EC040020FD -:102E300010460008DFF8F0140A6892B200E002467B -:102E4000086880B28242FAD170472DE9FC410446FD -:102E50001825DFF8D884DFF8D864684308EB00074A -:102E60003078062808D131787170347078754FF059 -:102E7000FF307060002039E000F077F8B968091879 -:102E8000B96008F10803B96832786A439A589142E8 -:102E9000327813D308F1150315FB02FC13F80C303C -:102EA000062B25D008F108066B43F358994222BF40 -:102EB00008F115036A439A5CEED219E011463378A3 -:102EC00069439A420BD008F1140308F1150C5B5CBE -:102ED00015FB03F50CF805407A753B7500E07A7533 -:102EE00008F114025454317871703470BDE8F681E1 -:102EF0001146694308F115035B5C062B04D008F109 -:102F0000140615FB03F574557B753A7508F1150227 -:102F10005454EBE7F8B5DFF81834DFF810541E7896 -:102F2000182402466243B0422A4404D118785870EB -:102F3000507D18700FE0167D507D92F815C005F198 -:102F400015076643062807F806C004D0167D143519 -:102F500014FB00F42E55012010731878062802BFC8 -:102F600000294FF0FF315960F1BD10B5DFF8C043C3 -:102F7000606810F1010F0FD0FFF75CFF6168DFF8A8 -:102F8000B423814261683CBF5388C918081A51783C -:102F900048431178C84000E0002080B210BD2DE900 -:102FA000F84FDFF89053DFF890B3D5F80880D8F8E1 -:102FB0000000DBF800104A0500F06AF9DFF87063E2 -:102FC000DFF868A321F4806181604FF0180934783C -:102FD0000AF1080019FB04F14758FFF7C6FF8742C2 -:102FE00017D200270121B170062C3DD019FB04F443 -:102FF0000AF108010AF108020959814223BF0AF1C6 -:1030000008010959091A002111510AEB04014C7DEC -:10301000EAE7A9884118B94202D2AF880021E2E765 -:103020003F1ADFE7022802DA2878012800D07F1E45 -:10303000D8F80000C1684A07FAD500F02FF9DBF88C -:103040000C00000CBFB247EA0047CBF80C70FFF74A -:10305000F1FE7060A8680068816841F48061816059 -:10306000AFF30080BDE8F18FB8B20028DAD1FFF7E6 -:10307000E1FE70600320BDE8F24FFEF7A7BF2DE927 -:10308000F843EFF3108872B6AA4DA84BA868016800 -:10309000CA224A6253204862A54A886820F48060A8 -:1030A000886018201678374647431F44387B02282B -:1030B00026D13C68D7F810909078F0B17A7B012A3D -:1030C0000AD101213046FFF725FF88F3108879687F -:1030D000304600F0F0F804E088F31088304600F045 -:1030E0009BF8A8680068CA214162224653214162C8 -:1030F0004846314600F02AF90BE0FFF750FF06E0A2 -:10310000C8684207FCD500F07EF88C49086088F357 -:103110001088FF21A86802685162BDE8F183F8B504 -:10312000844CA160CA2209684A6253224A62824AD8 -:10313000136843F020031360136803F00703C3F11F -:103140000403237095682D0C05F07F056D1C6570D8 -:10315000EDB29268C2F30E02521C628092B2521E0D -:103160006A43A2F5A072DA404FF6FF739A422CBF71 -:10317000A380A280724A136843F400231360714B4A -:103180001D6845F400251D6048BB6948674E012352 -:10319000837018254FF0FF33436000235FFA83FCF0 -:1031A00006F10C0715FB0CFC4FF0000E07F80CE0C5 -:1031B0005B1CDFB2062FF1DB06230370886820F466 -:1031C0008060886000F01FF8D0600320FEF709FFE0 -:1031D000A1680868826842F48042826005E0C8689D -:1031E000410544BF0320FEF7F1FEA1680A68FF20F5 -:1031F0005062002203210320FEF79CFEBDE8F2404E -:103200000320FEF7B5BEC86800F0800060F490604F -:10321000C8604FF400207047F8B50746EFF31084FC -:1032200072B60320FEF7AFFE424DAE683068CA2189 -:1032300041623A4653214162182043494243895C26 -:1032400002291BD100213846FFF764FE3848017877 -:1032500006290ED1306838490A68530500F018F87D -:1032600021F480618160C1684A07FCD500F016F83E -:1032700004E04078884218BFFFF791FEA9680A6809 -:10328000FF2050620320FEF773FE84F31088F1BD27 -:1032900002D5C1684A07FCD481687047C16801F053 -:1032A000800161F49061C1604FF4002023490860FF -:1032B0000320FEF796BE2DE9F04180460F464246B8 -:1032C00018201A4942438C18207B022804BF40462C -:1032D000FFF7A2FFEFF3108572B60320FEF753FE4F -:1032E000144EB0680068CA21416253214162022035 -:1032F0002073A76067604046FFF7A7FD0C490A7876 -:103300004978914202D0FFF74AFE02E0A168081A0C -:10331000A060FF20B1680A6850620320FEF728FE13 -:1033200085F31088BDE8F08128280040880200203D -:103330000C050020D8040020082800400C08005884 -:103340000008005880080058940200201047000030 -:10335000564900E0564981B00A6802430A6009688C -:1033600008400090009801B0704718B585B06846D5 -:103370001421FEF753FE032001904FF46041002416 -:10338000009102940120FFF7E3FF00F097F8474C0B -:103390002068400840002060182100910220FFF7BB -:1033A000D7FF69464348FEF73DFE206820F0020043 -:1033B0002060FFF7DFF8FFF7DFF8FFF7E3F800F032 -:1033C00011F806B010BD00B587B068460FF20821AD -:1033D0001C2200F0C5FC00F072FA684600F012FDF5 -:1033E00007B000BDF0B585B068461421FEF716FEA3 -:1033F00000260025002400210FF2CC0000EBC102C2 -:10340000907988B11368B3F1904F08D0294FBB422F -:1034100008D0294FBB4204BF9088044304E0908841 -:10342000064301E090880543491C2229E4DB002083 -:1034300002900121032003900191B0B270B100907D -:103440000120FFF785FF0120FFF784FF00F036F829 -:103450000022B1B24FF09040FEF7A1FEA8B280B1B9 -:1034600000900220FFF774FF0220FFF773FF114E58 -:1034700069463046FEF7D6FD0022A9B23046FEF777 -:103480008EFEA0B280B100900420FFF761FF0420FF -:10349000FFF760FF084D69462846FEF7C3FD00228E -:1034A000A1B22846FEF77BFE05B0F0BD4C000058E7 -:1034B0004C010058000400480008004869464FF0DD -:1034C0009040FEF7AFBD0000000000480100000082 -:1034D000000000480100000000000048010000005A -:1034E000000000480100000000000048010000004A -:1034F000000000480100000000000048010000003A -:103500000000004801000000000000480100000029 -:103510000000004801000000000000480100000019 -:103520000000004801000000000000480100000009 -:1035300000000048010000000000004801000000F9 -:1035400000000048010000000000004801000000E9 -:1035500000000048010000000000004801000000D9 -:1035600000000048010000000000004801000000C9 -:1035700000000048010000000000004801000000B9 -:1035800000000048010000000000004801000000A9 -:103590000000004801000000000000480100000099 -:1035A0000000004801000000000000480100000089 -:1035B0000000004801000000000000480100000079 -:1035C0000000004801000000000000480100000069 -:1035D00000000048010000000000000000000000A2 -:1035E00000000000C8340008280003202C0003203D -:1035F00022040400444981B00A6802430A60096851 -:1036000008400090009801B0704778B585B0044636 -:1036100068461421FEF702FD0220FFF7EBFF00F0E1 -:1036200010F80095012001900021022003900291E2 -:10363000694656F82400FEF7F5FC00F008F806B0DD -:1036400070BD0FF2D400314E30F81450704756F868 -:10365000240000222946FEF7A2BD0FF2BC012B4B2D -:1036600031F8101053F820000122FEF798BD0FF238 -:10367000A801264B31F8101053F820000022FEF765 -:103680008EBDF0B585B005460C4668461421FEF7A0 -:10369000C5FC0DB9042004E0012D18BF022D02D194 -:1036A0000820FFF7A7FF2000194E0FF274070DD175 -:1036B00037F81500009000210191012002900221AD -:1036C000039100F01BF80120FEF7B2FE012C13D18C -:1036D00037F81500009001210E480190029100F08A -:1036E0000DF80FF24400445D00220F2160B2FEF796 -:1036F00021FC60B2FEF73CFC05B0F0BD694656F80F -:103700002500FEF78FBC00004C0000583800002058 -:1037100044000020000021102000010002000000F1 -:1037200010000100020000000A06070000F0E6BBDE -:1037300071487249016001F12002426001F13002DA -:10374000826001F13C02026201F14402426201F135 -:103750004C02C26001F15402026101F17002426147 -:1037600001F1740282618031C16100F0E5BB38B5BE -:103770000446634D284600F0D4F85F484068A168CD -:103780000160E168C16085605E49416000F0F0FB66 -:103790005D4834E080B558484268136801211972C9 -:1037A000406800F0EBFB002002BD38B5564C544D8C -:1037B00004E000F04BF8009821688847284600F0A4 -:1037C000B3F80028F5D031BD80B54B494A68D168BF -:1037D0000220087200F0D7FB002002BD4A48416871 -:1037E000084738B50446494D284600F09AF8424843 -:1037F000C068A1680160456000F0CEFB44482168C4 -:10380000016061684160002032BD80B53A48C268FD -:10381000136810211972C06800F0C4FB002002BDBB -:1038200035483B4AC168C16813680868184738B50D -:10383000374C364D04E000F009F80098616888477D -:10384000284600F071F80028F5D031BD69462846B9 -:1038500000F089B838B504462E4D284600F061F8CE -:103860002D4800F05EF824480069A1688160E16895 -:10387000C160056121680160616841602169416141 -:103880006169816131BD80B50146234800F055F87A -:10389000BDE802400FF2050000F094BB38B5164CAD -:1038A0001D4D06E0FFF7D2FF00992069006900F086 -:1038B00044F8284600F038F80028F3D031BD10B5A0 -:1038C000164C204600F02DF80B4841690C60BDE80D -:1038D000104000F08BBB1CB5104C06E0694620463A -:1038E00000F041F8009800F01BF8204600F01CF8AA -:1038F0000028F3D013BD000000000320B40A032009 -:10390000500B0320A40A0320FC040020580B0320C2 -:1039100004050020400B0320F4040020480B032082 -:103920007047006040607047EFF3108172B6026824 -:1039300082420CBF0120002012E0EFF3108272B629 -:10394000086043684B6041604868016019E0EFF32C -:10395000108172B64268036813600268436853605E -:1039600081F31088704710B5EFF3108472B60268C7 -:103970000A600068FFE7FFF7EAFF84F3108810BDD4 -:103980000B6082F31088704710B590B004A80FF256 -:103990007C31DFF85043302200F0E2F92068DFF894 -:1039A00048434FF6FC7101EA8001DFF840034118FB -:1039B000DFF83C030290E16000F5867003900FF29F -:1039C000B9210FF2CD20019000916846FFF7CFFE9C -:1039D00001210220FFF7FAF901210220FFF7E9F99E -:1039E0000020E070A07004A800F004FA0FF20112A9 -:1039F00000210820FEF7D7FFBE4A00210120FEF774 -:103A0000D2FF0FF2990200211020FEF7CCFFBA4A34 -:103A100000210220FEF7C7FFB84A00210420FEF76C -:103A2000C2FF012060700020A06004F11800FFF7C1 -:103A300078FFFEF7B3FC04F11000606000202070F6 -:103A400001220FF2011304F11001FDF78BFC10B0FD -:103A500010BD80B5A44A917831B10020907001204A -:103A6000BDE80240FEF7C4BF014602F1180007E1BD -:103A700010B59D4CE07830B90120FFF7F8FD012129 -:103A8000E170002105E00120FFF7E7FD0020E07074 -:103A90000121BDE810400220FFF78BB938B5EFF3E4 -:103AA0001084914D6878012821D10021697005F1B9 -:103AB000180005F10801FFF756FFE878A0B9A868DB -:103AC0000FF28113017A022972B607BFB0F80B20FA -:103AD000521D827AD21C00F1080192B20020FDF73B -:103AE0004AFC84F3108831BDBDE83140AAE031BD05 -:103AF00010B5834CB4F809004FF66052811A04D017 -:103B0000491E06D0491E08D00BE0204600F086FA78 -:103B100011E0204600F0BDFA0DE0204600F0DFFA8B -:103B200009E0A0810120A073E072212020720E2004 -:103B300060720420A07221467248FFF7FEFEBDE8C5 -:103B40001040A1E0F8B5684D69682A78002400208B -:103B50001AB1022A64D013D358E00978012905D09C -:103B6000022907D0102918BF202907D10120287069 -:103B700003244BE001202870042447E0012445E0A1 -:103B80000E78E868022E11D0102E02D0202E03D01D -:103B90001CE0CC78C0681BE0CC78594805F11001D6 -:103BA00000F108070A6840F8082F18E04068CA7852 -:103BB0000979C36802EB012403F10807052205F126 -:103BC0001001384600F0BCF8052009E0CC784068C8 -:103BD000016805F1100001F108070168396004204F -:103BE0006F60A1B211B1022129700FE0022E25D021 -:103BF000102E1DD0202E1ED000210120FEF7E0FE49 -:103C0000002005F11001287001246960A2B201B002 -:103C100069683D4BBDE8F04001440020FDF7A2BBC0 -:103C2000087802280AD0102802D0202803D0E3E721 -:103C300000210220E2E700210820DFE70021042024 -:103C4000DCE700001CB5284C01206070E0680169C9 -:103C5000A0688A68904205D3C9681144884238BF79 -:103C6000FFF711FE04F11800FFF75EFE10B9BDE882 -:103C70001C4009E013BD000080B50146DFF8840058 -:103C8000FFF75BFEBDE8044000211020FEF798BE60 -:103C9000704770B51446134A134E12681D4601232F -:103CA000B3704FF6FC7303EA8203104AD3180A4636 -:103CB000DE683668A6F80900F17206F10C002146AC -:103CC00000F03EF800210020FFF79FFD0120FEF7E5 -:103CD00097FE314605F10800B278BDE87040D21C6D -:103CE00000F02EB83C400058B8040020000003202B -:103CF00090080320953700080B380008C9370008E2 -:103D00005C000020D0040020453B000800000000BB -:103D100000000000000000000000000000000000A3 -:103D2000440008004005020112279C00F401000035 -:103D3000FFFF0000480101000020000070477047AD -:103D400062B38B0708D0521E11F8013B00F8013B0B -:103D500000F024808B07F6D1830740F0208000BF5D -:103D6000103A07D330B4B1E83810103AA0E8381050 -:103D7000F9D230BC530724BFB1E80810A0E80810FE -:103D800044BF51F8043B40F8043BD20724BF31F84C -:103D9000022B20F8022B44BF0B7803707047121FD0 -:103DA00017D35B0009D151F8043B20F8023B1B0CF0 -:103DB000121F20F8023BF6D20BE051F8043B00F84A -:103DC000013B1B0A20F8023B1B0C121F00F8013BB1 -:103DD000F3D238BF121D521E24BF11F8013B00F868 -:103DE000013BF8D870470000FFF753FF9DF80E0025 -:103DF00005B000BDF8B500F10C026B4624214FF66A -:103E00006640F1E7F8B500F10C026B460F214FF662 -:103E10006840E9E7C0680840884201D10120704746 -:103E200000207047C0690840884201D101207047D6 -:103E30000020704710B5704C02212046FFF7F2FFBA -:103E400038B16068C043810703D5FFF7F0FC02205A -:103E500018E001212046FFF7E5FF38B16068C04354 -:103E6000C10703D5FFF7A1FC01200BE00821204684 -:103E7000FFF7D8FF38B16068C043010703D5FFF7EB -:103E80002AFD0820A06010BD10B55B4C00F033F88F -:103E900018B96068C043810306D400F02CF830B92B -:103EA0006068C043810302D5BDE8104083E008216B -:103EB00000F022F870B96068C04301030AD5606859 -:103EC0004E4940F400206060086880474FF40020AD -:103ED000A06010BD202100F00FF858B96068C04301 -:103EE000810207D5606840F400106060BDE81040B2 -:103EF000FFF774BC10BD022120468BE7404881B01B -:103F0000016841F480110160006800F480100090A5 -:103F100000983C48016841F4007101603A48026829 -:103F200042F40072026040BF20BF3848016841F48B -:103F30000041016001B0704780B53548016841F427 -:103F400080110160006800F48010009000982A48F9 -:103F5000016841F001010160026842F480320260B0 -:103F60002C20FEF705F8BDE802402D20FEF700B832 -:103F700028480168490849000160704726494FF404 -:103F800080300860704723484FF400114160016899 -:103F900021F40011016070471E48016821F0020100 -:103FA000016070471B484FF400314160016821F403 -:103FB0000031016070471748016841F40031016029 -:103FC000FFF72EBC38B504460B4D08212846FFF7F5 -:103FD00021FF30B109480460686820F4002068605F -:103FE00031BDA0474FF40021A96031BD09480168E7 -:103FF00021F0080101607047000C005814050020F2 -:1040000050010058D4080058200800580C040058EB -:1040100050000058040C0058080C005870B5EFF31D -:104020001081027B012A02D0022A07D00DE000F0A5 -:1040300028F8137800F01FF814700CE000F021F855 -:10404000138800F018F8148005E000F01AF81368DF -:1040500000F011F8146081F31088212101720E2103 -:104060004172042181724FF6605181810021817378 -:104070000121C17270BD264623EA040435402C4359 -:10408000704772B6D0F81120D0F80D40D0F8155016 -:10409000704781B0017B012902D0022904D008E0D9 -:1040A000D0F80D10097807E0D0F80D100A880092BA -:1040B00003E0D0F80D10096800910E214172212211 -:1040C0000821817202724FF6615181810121C17212 -:1040D00000218173009A40F80F2F01B0704738B566 -:1040E0000446284800684FF6FC7505EA8005264816 -:1040F0004519212020720E2060724220A0724FF6D6 -:104100006250A0810120E0720020A0731F48016866 -:10411000090CA4F80F100068C0F30B00A4F81100FC -:104120001B4801781B4801F01F01E17441682175AB -:104130004168090AC4F815100268C4F81920016919 -:10414000C4F81D104169C4F8211004F129018069E7 -:10415000C4F82500286802680A600C222B68191D23 -:1041600004F12D00FFF7ECFD286800F1100110228A -:1041700004F13900FFF7E4FD07480168C4F849106D -:1041800031BD00003C40005800000320002004E046 -:104190000075FF1F8075FF1F1C47000800EB8100A2 -:1041A000404AD0F88010914201D001207047002091 -:1041B000704742F4806240F82120704780B500F0DB -:1041C00097F839481F2181610168C908C90041F089 -:1041D000030100F026F861E000F092B810B500F09D -:1041E00087F8324C00F04CF80028FBD1042100F095 -:1041F00048F828B92E480068010403D500F043F8B8 -:1042000000F05CF80022032100F03FF82648016826 -:10421000C908C90041F0020100F003F8016030BF95 -:1042200010BD01602348016841F00401704710B5DA -:104230001E4C00F028F800F023F80028FBD14FF0C6 -:10424000B040816801F00C01042911D1016841F4EA -:104250008031016001688903FCD581688908890083 -:1042600041F002018160816801F00C010829FAD156 -:104270000022032100F009F8BDE8104000F040B82A -:10428000032120468AE700220421204691E780B5D9 -:1042900000F02EF80748016821F00401016030BFEA -:1042A00001BD000000040080000400580014005804 -:1042B0008804005810ED00E000F022B84FF0B04044 -:1042C000016841F48071016001684905FCD581688D -:1042D0008908890041F001018160416A89088900EB -:1042E0004162816801F00C010429FAD17047000095 -:1042F0000248016821F002010160704710E000E00F -:104300000248016841F002010160704710E000E0DE -:104310001349002008604FF4E0221248016841F47C -:10432000700101604FF0B041086840F00100086082 -:104330008A600D480A6802400C480A60036823F04E -:104340000503036042685208520042600022084898 -:10435000C8600861086820F4802008608A6170479E -:1043600008ED00E088ED00E0FBFEF6FA940000584E -:1043700000100422010000000300000005000000FE -:104380000100000001000000060000000A0000001B -:1043900020000000020000000400000008000000EF -:1043A000100000004000000080000000000100003C -:1043B00000020000A0860100400D0300801A0600E4 -:1043C00000350C0040420F0080841E0000093D00B3 -:1043D00000127A000024F40000366E010048E80163 -:1043E000006CDC0200000000000000000000000083 -:1043F000000000007047FEE7FEE7FEE7FEE77047BB -:104400007047704700F020B80848FCF78EBE084897 -:10441000FBF754BF0748FBF751BFFFF70BBDFFF792 -:1044200033BD00F019B80448FCF77FBEF803002044 -:10443000F801002068010020580400201020FDF73A -:10444000B5BEFEF71CBE000002484168027889181C -:10445000416070472C0000200449C8680A68824304 -:104460000A60486000F004B8000000000015005821 -:10447000704719E050F8042BD30744BFA9F101039A -:104480009A18091F0023042942F8043BF9D25FEA75 -:10449000817C134604D54FF0000CA2F800C09B1C91 -:1044A000C90744BF0021197050F8041B0029E1D14D -:1044B000704730B5016884684218416802EB5103C7 -:1044C000C9070BD54C4409E012F9011B12F8015B36 -:1044D000002904F8015B05D5491CF9D19A42F3D1B2 -:1044E0000C3030BD491EF1D5F8E7000010B500F0E2 -:1044F00013F802000023DB4300241068984203D025 -:1045000011000220ABBE14605068984203D0111D08 -:104510000220ABBE546010BD01487047000000008F -:104520005400002010B5074979441831064C7C44EA -:10453000163404E00A68081D114488470146A14268 -:10454000F8D110BD2C000000600000004EF688512C -:10455000CEF20001086840F470000860BFF34F8F8E -:10456000BFF36F8F4FF00070E1EE100A704700004C -:1045700003FFFFFFC40400005C000020840A000069 -:1045800030000320000000002BFFFFFF940100001B -:1045900058000000040000201BFFFFFFB0010000D6 -:1045A00004000000280003200000000000000000BC -:1045B00000000000000000000100000002000000F8 -:1045C000030000000400000000F00DF8002801D0F6 -:1045D000FFF7A8FFAFF300800020AFF30080FDF7E6 -:1045E0000CFE00F002F80120704700F001B8000056 -:1045F0000746384600F002F8FBE7000080B5FFF7F9 -:1046000075FF024A11001820ABBEFBE7260002002E -:104610008F420008B9420008DD4100082F4200081F -:10462000BD410008D94100080148804701480047C2 -:104630001143000839460008AFF30080FFF786FFFA -:10464000FFF7C2FFFFF7FEBFFFF7FEBFFFF7FEBF9A -:10465000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8E -:10466000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7E -:10467000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF6E -:10468000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5E -:10469000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4E -:1046A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3E -:1046B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF2E -:1046C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF1E -:1046D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF0E -:1046E000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFFE -:1046F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFEE -:10470000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFDD -:10471000FFF7FEBFFFF7FEBFFFF7FEBF000100007F -:10472000EC00F8FFF4000001F9000010FC001A048E -:104730000048000400480004004800080048000C3D -:0E4740000048000C004800093D00F8FFF8009A -:040000050800463970 +:1001900000F040BF242068602068016849084900D9 +:1001A0000160204600F0F2B92068016841F00101C9 +:1001B000016020467047204600F0F0BA30B5034693 +:1001C00003F180046068202846D109B1100001D1F4 +:1001D000012030BD207801283ED001252570196509 +:1001E000002003F154010A804A800862E060212067 +:1001F000606008699A68B0F1005F16D1B2F5805F5F +:1002000004BF1869002807BFDFF86C230A62DFF813 +:100210006C0308620020207000F01DFC41F4000116 +:1002200000F024FCF8D1002030BDB2F5805F04BF9F +:100230001869002807BFDFF848230A62DFF8440383 +:10024000086200202070196851E8002F42F08002F7 +:1002500000F089F9F7D1E6E7022030BD38B500F0AB +:1002600011F80DD109B1140001D1012032BD04787B +:10027000012C05D000F00CF8BDE8384000F076BB4A +:10028000022032BD034603F180008468202C7047B1 +:10029000012505700020D866DFF8EC421868A042FE +:1002A0000BD04068040208D51C6854E8005F45F094 +:1002B000806544E800500028F6D118467047216850 +:1002C00051E8002F7047206800F1080151E8001F35 +:1002D00000F1080221F0400142E8001000287047B8 +:1002E000F8B5044640F60F002668F1693268B36835 +:1002F000084004F15C050ED1880602D5900602D4B0 +:10030000D80040F181806969002900F029812046E8 +:10031000BDE8F4400847DFF8B407034204BFDFF844 +:10032000B0773A4270D0CF0707D5D70505D501275A +:1003300037622E6B46F001062E638E0708D5DE0766 +:1003400006D5276802263E622E6B46F004062E6311 +:100350004E0708D5DE0706D5276804263E622E6BB9 +:1003600046F002062E630E070AD5960601D4034214 +:1003700006D0266808203062286B40F00800286309 +:10038000080509D5500107D526684FF40060306292 +:10039000286B40F020002863286B002833D08906A2 +:1003A00007D5900601D4D80003D5696909B1204664 +:1003B0008847286B21688A68510602D410F0280FFC +:1003C0001CD0204600F057FB00F0D1F811D5FFF704 +:1003D0007AFFFCD1286A60B10FF2FD618163286A5F +:1003E00000F095FF00280ED0286A816BBDE8F4402C +:1003F00008472046BDE8F24001F05EB8204601F013 +:100400005BF800202863F1BD286901286AD1CF0676 +:1004100068D5D00666D51020306200F0A8F82DD53A +:10042000296A0868406880B20028ECD02A88904287 +:10043000E9DA6880086801688A061BD4FFF73FFF85 +:1004400022F4807200F08FF8F8D1206800F082FA70 +:10045000FBD1FFF738FFFCD12020E86200202861A3 +:10046000FFF72DFF22F0100200F07DF8F8D1286A86 +:1004700000F017FF29886888091A2DE02888698804 +:10048000411A688800281CBF88B2002868D02268FA +:1004900052E8003F23F4907342E800300028F6D180 +:1004A000206800F1080200F1080352E8002FDFF88D +:1004B000D002024043E800200028F1D12020E86269 +:1004C000002028616861226852E8003F23F0100391 +:1004D00042E800300028F6D12046BDE8F44089B259 +:1004E00000F0EBBFC80209D5580207D54FF48010C1 +:1004F00030622046BDE8F24001F05AB8080609D53E +:10050000100601D4180205D5A96949B32046BDE8F3 +:10051000F4400847480611D550060FD5FFF7CFFE27 +:1005200022F0400200F01FF8F8D12020A86200203D +:10053000A8612046BDE8F24001F058B8080206D58F +:10054000500004D52046BDE8F24001F061B8C80172 +:1005500048BF002A04D52046BDE8F24001F059B852 +:10056000F1BD22F4F07241E80020002870472068B5 +:100570008168480670470000C90B0008670B000837 +:10058000130B0008E90A000800800040F8B5044693 +:10059000DFF888092168DFF888C90A68DFF88479FC +:1005A0000240A06802432069024360690243E06997 +:1005B00002430A6000254A68E06822F44052024380 +:1005C0004A60A369DFF8602991421CBF206A034397 +:1005D0008E68DFF85809064033438B600FF2A4168B +:1005E000CB6A606A1B0940EA0313CB626145DFF8FE +:1005F00040094FF4004339D13F6807F00307032F48 +:100600004DD8DFE807F0024643494FF0010CE1699D +:10061000B1F5004F4FF6F07740F08080BCF1010F4C +:1006200009D0BCF1020F0AD0BCF1040F71D0BCF1AB +:10063000080F71D099E001F0DAFB002815D0626A4A +:10064000616836F81230B0FBF3F04A0802EB400262 +:10065000B2FBF1F080B2A0F11001B942EAD207403A +:10066000C0F3420007432068C7607FE0914216D183 +:100670003F6817F4406723D0B7F5806F09D0B7F50E +:10068000006F03D0B7F5406F06D008E04FF0020CC2 +:1006900007E04FF0040C04E04FF0080C01E04FF0CD +:1006A000100C9142B3D1BCF1000F09D0BCF1020F84 +:1006B0000AD0BCF1040F15D0BCF1080F15D054E0DE +:1006C00001F08DFB002851D0616A36F81120B0FB93 +:1006D000F2F6626802EB42018E4246D31103B14248 +:1006E00005D242E001F031FBECE71846ECE7500898 +:1006F000002110EB062051EB1661002301F008FCED +:10070000A0F54071DFF82C2891422ED22268D060EB +:100710002CE001F01AFB90E7184690E7BCF1010FBE +:1007200009D0BCF1020F09D0BCF1040F18D0BCF104 +:10073000080F18D019E001F05AFBB8B1626A36F818 +:1007400012306168B0FBF3F000EB5100B0FBF1F048 +:1007500080B2A0F11001B94207D22168C86005E05B +:1007600001F0F3FAE9E71846E8E7012504F168002B +:1007700001214180018000218160C1602846F2BDD5 +:10078000FEFFFFEF010002000400060008000A005F +:100790000C001000200040008000000190F828109C +:1007A000CA0706D502685368C16A23F400330B43B5 +:1007B000536090F828108A0706D502685368016BC9 +:1007C00023F480330B43536090F828104A0706D572 +:1007D00002685368416B23F480230B43536090F805 +:1007E00028100A0706D502685368816B23F400437A +:1007F0000B43536090F82810CA0606D50268936828 +:10080000C16B23F480530B43936090F828108A0641 +:1008100006D502689368016C23F400530B43936080 +:1008200090F828104A0610D502685368416C23F4EA +:1008300080130B435360416CB1F5801F05D15368A1 +:10084000816C23F4C0030B43536090F828100A0610 +:1008500006D501684A68C06C22F4002202434A604F +:100860007047F8B5044604F180050020E8606FF099 +:100870007E4701F065FC0646206801680A0708D536 +:100880000097334600224FF40011204600F017F87D +:1008900060B9206801684A070AD5009733460022EC +:1008A0004FF48001204600F00AF808B10320F2BDA1 +:1008B00020206860A8600020E0662870F2BD2DE965 +:1008C000F041069C05460E4690461F462868C169C1 +:1008D0003140B1420CBF01200020404526D114F127 +:1008E000010FF3D001F02CFCC01B844200D33CB9B3 +:1008F00000F025F800F02DF8FCD100F01AF811E016 +:10090000286801684A07E1D5C1690A05DED54FF4B8 +:100910000062026200F013F800F01BF8FCD100F056 +:1009200008F8C16000210170032000E00020BDE84C +:10093000F08105F1800020214160816070472968C5 +:1009400051E8002F22F4D07241E800200028F6D1AF +:100950007047286800F1080151E8001F490800F1BC +:100960000802490042E800100028704770B50346AD +:1009700000209965FF2403F15C010A804A804861E8 +:100980009868B0F5805F04D1186960B940F2FF142F +:1009900009E010B9186928B905E0B0F1805F06D107 +:1009A000186910B97F248C8003E03F2000E000200C +:1009B000888003F180040020E0602220A060186895 +:1009C00000F1080555E8005F00F1080645F0010553 +:1009D00046E800500028F2D18868B0F1005F22D1CB +:1009E0008D89AA421FD39A68B2F5805F04BF186947 +:1009F000002807BF0FF2ED324A610FF23D30486127 +:100A000000202070196851E8002F42F48072FFF72F +:100A1000AAFDF7D100F01FF841F0805100F026F850 +:100A2000F8D1002070BD9A68B2F5805F04BF1869E4 +:100A3000002807BF0FF239224A610FF2ED1048611A +:100A400000202070196851E8002F42F49072FFF7DF +:100A50008AFDF7D1E5E7186800F1080151E8001FA9 +:100A600000F108027047DFF8D004014042E80010AE +:100A7000002870470000026852E8003F23F490739A +:100A800042E800310029F6D1016801F1080201F1C4 +:100A9000080352E8002F0F490A4043E800210029CB +:100AA000F2D1C16E012908D1026852E8003F23F05B +:100AB000100342E800310029F6D12021C0F8881047 +:100AC0000021C166016770470000000001000010AE +:100AD00020010004FEFFFFEF806A00F156010022B2 +:100AE0000A810A8000F0E8BCD0F88420212A0FD1C6 +:100AF000B0F8561001B923E0016D03680A789A62D4 +:100B0000016D4A1C0265B0F856104A1EA0F8562026 +:100B10007047D0F88420212A11D1B0F8561001B9BD +:100B20000EE0016D03680A88C2F308029A62016D43 +:100B30008A1C0265B0F856104A1EA0F8562070476D +:100B4000026852E8003F23F0800342E800310029A8 +:100B5000F6D1026852E8003F43F0400342E800311A +:100B60000029F6D17047D0F88410212900D07047B1 +:100B700030B500F15602938A0DE00168CC69250674 +:100B800008D5046D25788D62016D4C1C04651488B0 +:100B9000611E11805B1E99B241B111880029ECD110 +:100BA00000F005F8FCD100F035F8FCD130BD01684B +:100BB00001F1080252E8002F01F1080322F40002BB +:100BC00043E8002100297047D0F88410212900D083 +:100BD000704730B500F15602938A0FE00168CC6986 +:100BE00025060AD5046D2588C5F308058D62016DBB +:100BF0008C1C04651488611E11805B1E99B241B182 +:100C000011880029EAD1FFF7D2FFFCD100F002F8E9 +:100C1000FCD130BD026852E8003F43F0400342E897 +:100C2000003100297047000010B500F04BF81AD1D0 +:100C30004B6A91880B40816D0B70816D4B1C00F0ED +:100C40003BF8A1B900F044F800F060F8FCD100F0E6 +:100C500056F807D10023136100F044F844BF102474 +:100C60000C6260E064E0886940F00800886110BDB3 +:100C700010B500F027F81AD14B6A91880B40816DAE +:100C80000B80816D8B1C00F017F8A1B900F020F8E3 +:100C900000F03CF8FCD100F032F807D100231361DA +:100CA00000F020F844BF10240C623CE040E088696A +:100CB00040F00800886110BD836551884B1E538049 +:100CC0005188704700F15C020168D36A222B70479B +:100CD000036853E8004F24F4907443E8004100296E +:100CE000F6D17047036853E8004F24F0100443E83E +:100CF00000410029F6D10168CB69DC06704720214C +:100D0000D16200215161116901297047016801F127 +:100D1000080353E8003F5B0801F108045B0044E866 +:100D20000031002970471188BDE8104000F0C5BBB4 +:100D3000BDE8104000F050BC2DE9F84300F0A9F8E0 +:100D400047D1A08978B96088002844D0A189884219 +:100D500041DA00F0ABF87948606100F0BDF83AE0A4 +:100D6000304600F039FCA806EDD500F08CF808708C +:100D7000B06D411C00F0F7F819D0E90748BF5FEAF1 +:100D8000C95101D500F0F8F8A80703D5F80701D537 +:100D900000F0DAF8680703D5F80701D500F094F8F9 +:100DA000206B20B1304600F087FB00212163608872 +:100DB0000028D8D100F09AF800F0CEF8D0D100F099 +:100DC000E2F844BF102202622188304600F075FB31 +:100DD000C9E700F002F8BDE8F183816941F008013C +:100DE000816170472DE9F84300F053F847D1A0899D +:100DF00078B96088002844D0A189884241DA00F09F +:100E000055F84F48606100F067F83AE0304600F06E +:100E1000E3FBA806EDD500F036F80880B06D811C24 +:100E200000F0A1F819D0E90748BF5FEAC95101D520 +:100E300000F0A2F8A80703D5F80701D500F084F860 +:100E4000680703D5F80701D500F03EF8206B20B104 +:100E5000304600F031FB0021216360880028D8D1A2 +:100E600000F044F800F078F8D0D100F08CF844BFDE +:100E7000102202622188304600F01FFBC9E7FFF70D +:100E8000ACFFBDE8F1833068406AB16D08EA00004C +:100E90007047064606F15C043068B4F80480C56902 +:100EA000D0F800908768E16A22297047306800F125 +:100EB000080151E8001F00F1080221F0805142E8CA +:100EC00000100028F2D17047316804200862206BBE +:100ED00040F0020020637047316851E8002F42F073 +:100EE000200241E800200028F6D17047316851E81F +:100EF000002F22F4807241E800200028F6D13068EB +:100F000000F1080100F1080251E8001F0D480140FE +:100F100042E800100028F2D170470000F369FFCFCB +:100F2000003801408800005800800040FFF4FF11A5 +:100F30000024F40000FD0F00FEFF7FEF290C0008E5 +:100F4000710C0008FEFFFFEF316802200862206B81 +:100F500040F00400206370472020E06200206061C0 +:100F6000206901287047B1656088411E6180306842 +:100F7000C56915F0070F704701210162206B40F031 +:100F800001002063704700212161316851E8002F82 +:100F900022F0100241E800200028F6D13068C16933 +:100FA000CA0670477D4900E07D4981B00A68024366 +:100FB0000A60096808400090009801B0704780B549 +:100FC0004FF40020FFF7F0FF002200212E2001F057 +:100FD000D9F8BDE802402E2001F0F2B8006871494E +:100FE000884200D0704780B54FF48010FFF7DCFFD7 +:100FF000002200212C2001F0C5F82C2001F0E0F89F +:10100000002200212D2001F0BDF8BDE802402D2076 +:1010100001F0D6B838B59AB004466846142101F0FC +:1010200025F906A8502101F021F920685E495F4D9D +:10103000884236D10220069000210D9106A801F0C9 +:101040002FF908B101F093FB286840F001002860F7 +:101050002968574D01F00101059105980120FFF71E +:10106000A1FF0C2000900221002001910290032199 +:1010700008200391049069464FF0904001F078FBFE +:101080004C482860112000F048F808B101F06FFBCF +:10109000A567AC6200220021252001F073F825200D +:1010A00037E04549884236D10120069000210C9155 +:1010B00006A801F0F5F808B101F059FB686840F4A2 +:1010C0008040686068683D4D00F480400590059858 +:1010D0000220FFF767FFC02000900221012001914C +:1010E000029003210720039104906946344801F0DF +:1010F0003FFB344828600F2000F00FF808B101F0E2 +:1011000036FBA567AC6200220021242001F03AF8EA +:10111000242001F055F81BB030BD68601020A86095 +:101120000020E8608020286100206861A861E861F3 +:101130002862284600F04CB818B595B0044601A8BE +:10114000502101F093F821681F4A914224D14FF4B5 +:10115000006001904FF48071119101A801F0A0F896 +:1011600008B101F004FB1948816B41F4004181632F +:101170000021026842F4806202600022006800F4EC +:10118000806000900098032000F0FCFF032001F035 +:1011900017F8204601F06CFC16B010BD4C0000584A +:1011A00050000058000C0058008000405C000058BF +:1011B000FC13002008000240003801405C140020AD +:1011C0000004004844040240002800405800005831 +:1011D00038B5040001D1012032BD2168DFF8B0022A +:1011E000814204F1240500F044F8022068700A6886 +:1011F000A0686FF30E120243E068024320690243C5 +:1012000060690243A0690243E0690243206A024325 +:101210000A60204600F011F9A068B0F5804F04BFC5 +:10122000002161602079696A00F03F0000F014F845 +:1012300038B1052805D2204600F019F900F012F85F +:1012400003E0002028636863A8630020A8610120F0 +:1012500068700020287032BD0860A96AE86A48609A +:1012600060687047296B00200860696BA86B486054 +:1012700070470AD2DFF81C0242181423B2FBF3F2C3 +:1012800092002A62DFF8100209E0DFF8100242182B +:101290001423B2FBF3F292002A62DFF80402E86141 +:1012A000704781B040B100F124014A78022A05D08C +:1012B0000420886100200870012026E0026813687D +:1012C00023F00E0313604A6A136823F480731360DB +:1012D00000680268520852000260012091F8202044 +:1012E000CB6902F01C02904058608A6AC86A50605C +:1012F000086B30B1026822F4807202604A6B886B1E +:101300005060012048700020087001B0704738B567 +:1013100000F1240200245178022903D004209061B6 +:10132000012428E001680B6823F00E030B600168BC +:101330000D686D086D000D60516A0B6823F48073B1 +:101340000B60012192F82030D56903F01C0399400D +:101350006960936AD16A5960116B31B10B6823F4EB +:1013600080730B60536B916B596001215170147045 +:10137000516901B18847204632BDF8B500F124011A +:101380000423CA6914680268156891F8206006F0A1 +:101390001C0603FA06F73C4210D06F070ED51468FE +:1013A000A50603D4156825F00405156000F03DF886 +:1013B000C968002938D0BDE8F4400847022303FA81 +:1013C00006F73C4213D0AF0711D51468A50605D423 +:1013D000156825F00A05156001224A7000F025F80D +:1013E00000220A708968F9B1BDE8F4400847082373 +:1013F00003FA06F6344217D02B0715D5136823F0ED +:101400000E031360012291F82030CC6903F01C0315 +:101410009A40626001228A614A7000220A7009695A +:1014200011B1BDE8F4400847F1BD91F82020CC6926 +:1014300002F01C02934063607047416C0268144BD9 +:1014400089089A4234BF174B174B03EB8101816423 +:1014500002F0FF02083A1421B2FBF1F1134AC26410 +:1014600001F01F01012202FA01F1016570470179C3 +:101470000F4A01F03F0102EB81024265491E0D4A0D +:10148000826501F0030101228A40C26570470000B5 +:1014900008040240F8FFFDBF00000240F8FBFDBF5A +:1014A00000040240000802401C080240800802407C +:1014B000FC080240400902407047704710B500F137 +:1014C00080010A78012A01D1022010BD01230B708E +:1014D00024224A6002681368146864086400146077 +:1014E0000022426623F00053006803602020486019 +:1014F0000020087010BD70B500F01EF801D1022068 +:1015000070BD00F01FF822F0604209E070B500F0F5 +:1015100013F801D1022070BD00F014F822F06062CF +:1015200011438160204600F01AF8206806602020F0 +:1015300068600020287070BD044604F1800528789A +:101540000128704701222A702420686020680668FC +:10155000026852085200026020688268704730B505 +:10156000416E11B90121012214E001680FF230042B +:101570008A6889680FF23003520E02F00702490FA1 +:10158000655CA45C595C9A5CED00E40095FBF1F1AC +:1015900094FBF2F268304180028030BD0000000010 +:1015A0000101010307010000080402040801010110 +:1015B0007047704730B9124803601248124B0360FD +:1015C000FEF74CBE704730B9104803600D480E4B13 +:1015D0000360FEF7F3BD704700680B49884204D1F1 +:1015E00007490868002818BF004770470068064987 +:1015F000884204D105490868002818BF0047704791 +:101600001C150020FC11002000380140201500208E +:10161000704770474FF0B040006800F0F000B0280D +:1016200088BFB02070472DE9F041040054D02078E5 +:1016300081064FF0B04538D5A868E96810F00C0075 +:1016400001F0030103D00C2808BF012946D1286806 +:10165000800702D5E06900283ED0FFF7DBFF616A12 +:10166000884207D2084600F0D3FB002834D100F0AE +:1016700075FA0FE0286820F0F000014329606968DE +:10168000206A21F47F4141EA00216960606A00F02C +:10169000BFFB08BB00F095FBDFF810180860DFF80F +:1016A0001008006801F0FCF9B0B92078C1070DD529 +:1016B000A868E96800F00C00082801F0030103D0D5 +:1016C0000C2808BF03292DD12868800340F13981F7 +:1016D0006068002840F03581012038E2E06980B17F +:1016E000296841F0010100F047FA064628688007A2 +:1016F00000F1248100F024FD801B0328F6D3032091 +:1017000025E2286840084000286000F019FD0646E0 +:10171000286800F01FFAC8D000F012FD801B0328D3 +:10172000F6D3ECE76068B0F5803F04D1296841F456 +:101730008031296003E02A6822F480322A606068E0 +:1017400060B100F0FDFC06462868800300F1F980D6 +:1017500000F0F6FC801B6528F6D3D0E700F0F0FC23 +:1017600006462868400C10F0010000F0EA8000F006 +:10177000E7FC801B6528F4D3C1E700F0E1FCC01B47 +:101780000328C0F01281BAE7E06878B1296841F413 +:10179000807100F0F1F906462868400500F11881D3 +:1017A00000F0CEFC801B0328F6D3A8E7286820F4BD +:1017B0008070286000F0C4FC06462868800A10F09B +:1017C000010000F0DC8000F0BBFC801B0328F4D398 +:1017D00095E700F0B5FCC01B0328C0F00B818EE735 +:1017E00040F0010000F0CEF907467068800700F174 +:1017F0001C8100F0A5FCC01B0328F6D37FE77068AE +:1018000020F0040000F0BEF907467068C00810F030 +:10181000010000F0198100F093FCC01B0428F4D3F0 +:101820006DE70528306806D140F00400306031686B +:1018300041F0010105E0400840003060316821F0CE +:1018400004013160A06841F2893768B100F078FC8A +:1018500080463068800700F10C8100F071FCA0EB3D +:101860000800B842F5D34AE700F06AFC80463068C9 +:1018700000F070F900F0FD8000F062FCA0EB0800C1 +:10188000B842F4D33BE700F05BFCC01B0328C0F078 +:10189000FE8034E7B06840084000B06000F050FCC3 +:1018A0000746B06800F056F900F0F58000F048FCFB +:1018B000C01B0328F5D322E700F042FC801B03285D +:1018C000C0F01F811BE700F03BFC001B0328C0F0A9 +:1018D000398114E7286881010CD4296841F08071AE +:1018E0002960E86840F08050E86000F029FC044678 +:1018F0002868810100F12A8100F022FC001B0328E6 +:10190000F6D3FCE60C2931D0286820F080702860DE +:10191000E968DFF8A00589088900E960E968014005 +:10192000E96000F00DFC04462868810140F10E8159 +:1019300000F006FC001B0328F6D3E0E600F00EF9E9 +:10194000B3E6207881071AD5A868E96800F00C0092 +:10195000042801F0030104D00C2808BF02297FF4F9 +:1019600013AF2868400503D5E06800283FF4B4AE03 +:101970006968206921F0FE4141EA006169602168DF +:10198000DFF8346511F0180F38D0606900283FF493 +:1019900036AFC90670687FF523AF800709D4706839 +:1019A00040F0010000F0EEF80746706880077FF510 +:1019B000E4AE706840F0040000F0E4F80746706898 +:1019C00000070DD400F0BCFBC01B0428F7D396E63B +:1019D0006868216920F0FE4040EA01606860CEE757 +:1019E0007068A16920F4706040EA0120706000F026 +:1019F000C6F8074600F0ADF87FF4EBAE207841075B +:101A000037D5DFF8B8743868C10529D401F06AF811 +:101A100000F096FB80463868C10521D400F090FBA9 +:101A2000A0EB08000328F6D369E6706820F00400F4 +:101A300070607068C00810F00100DFD000F080FB1B +:101A4000C01B0428F5D35AE600F099F8074600F0C9 +:101A500080F8D3D000F074FBC01B0328F7D34EE608 +:101A6000A06801287FF4DDAE306840F001003060EE +:101A7000E8E6217848060ED5A06A00283FF40AAFB0 +:101A8000B16841F00101B16000F05AFB0746B0684F +:101A900080077FF5F8AEE06A002857D0A968EA68A9 +:101AA000022801F00C017FF42DAF236B02F003003C +:101AB000984202BF02F07000636B984214D1A36B8E +:101AC000C2F30620984202BF02F47810E36B9842FA +:101AD0000AD1236C02F06060984202BF02F06042BB +:101AE000606C82423FF4F6AE0C293FF4F5AD2868F5 +:101AF00041013FF5F1AD296821F0807100F03CF81B +:101B00000646286881013FF5D7AEE968DFF8B003E3 +:101B1000A26B0140206B0143606B0143E06B41EA23 +:101B200002210143206C0143606C0143E960286895 +:101B300040F080702860E96841F08051E96000F071 +:101B4000FFFA0446286881017FF5BDAE0020BDE89C +:101B5000F0817068400810F0010070472968606AE1 +:101B600021F0F001014329606868216A20F47F4078 +:101B700040EA012068607047296000F0E1BA7068AF +:101B800040084000706000F0DBBA2DE9F843040023 +:101B9000884644D0DFF82C6300F0CBF847D200F041 +:101BA000CDF8074600F0C5F841D000F0C9FAC01BD7 +:101BB0000228F7D90320BAE000F0C2FA401B02283D +:101BC00043D9F7E700F0BCFAA0EB090002284CD992 +:101BD000F0E700F0B5FAA0EB0900022854D9E9E7D4 +:101BE00000F0AEFA401B02285DD9E3E700F0A8FA46 +:101BF000401B022867D9DDE700F0A2FA401B4845E8 +:101C000077D3D7E7032802D13968890103E0002898 +:101C1000396802D1890762D401E049055FD4012007 +:101C200085E000F08DFAC01B022872D9C2E7207847 +:101C300081074FF0B0470BD5B968A06821F0F001DB +:101C40000143B96000F07CFA0546B868C003B3D51B +:101C50002078DFF8545281060AD52968606921F09E +:101C6000F0010143FFF788FF814628688003A9D56A +:101C7000207841060BD52968A0690909090141EAC4 +:101C80001011FFF779FF81462868C003A1D520789D +:101C900041070BD5B968E06821F4E0610143B96000 +:101CA00000F04EFA0546B868800399D52078010700 +:101CB0000CD5B868216920F4605040EAC100B860D2 +:101CC00000F03EFA0546B86840038FD52078C1077A +:101CD00017D56068022895D1396889039FD5B968FE +:101CE000890840EA8100B86041F2893900F028FA99 +:101CF0000546B868616800F00C00B0EB810F7FF416 +:101D00007BAF306800F00700804505D200F016F880 +:101D1000074600F00EF884D100F053F8DFF88C117C +:101D2000086000F0FBFEBDE8F24300F0B9BEBDE87C +:101D3000F283306800F00700404570473168C908F9 +:101D400048EAC101316000F0FBB938B54FF0B0444A +:101D50005E4DA16811F00C0106D1FFF75BFCC0F3EA +:101D6000031055F8200032BD0429594A05D008292E +:101D7000584804D12168C90222D5104632BDE16815 +:101D800001F00301022904D0032904D12168C9020A +:101D900007D5104605E0FFF73DFCC0F3031055F8EA +:101DA0002000E168E268E368C1F306214843C2F31A +:101DB0000211491C5B0FB0FBF1F05B1CB0FBF3F0B0 +:101DC00032BD80B5FFF7C1FF3F49FFE7424A0968CE +:101DD000C1F3031152F82110B0FBF1F002BD80B540 +:101DE000FFF7EFFF00F010F8C1F3022106E080B525 +:101DF000FFF7E7FF00F008F8C1F3C22112F8211045 +:101E000001F01F01C84002BD2F49344A09687047DC +:101E100070B52E49B1282EBFCC6AC0F3031051F81B +:101E200020402148056800F099FE2B492C4A05F016 +:101E30000F0551F82510B4FBF1F10024B1FBF2F1CC +:101E4000B0F5007F0FF2B802204609D10FF29403DB +:101E500053F820508D4214D2401C0328F8D912E0C8 +:101E60000FF2900353F820508D420AD2401C0328F1 +:101E7000F8D308E000F064F9801B03280CD303209A +:101E800070BD52F820400F4D2868C00844EAC000D9 +:101E9000286000F055F90646296801F00701A142C3 +:101EA000E8D1002070BD0000080100585C1000203F +:101EB00038100020FFFFFEEE90000058000400588C +:101EC0008C80C11100400058080000589447000859 +:101ED0000024F4000048E801544700089049000835 +:101EE00040420F00120000002400000036000000F5 +:101EF00040000000060000000C0000001000000080 +:101F000000000000010000000200000003000000CB +:101F1000B3BBD9B1B2F5803F7DD2022A1ED98C461F +:101F2000B1FBF2F102FB11C31B0443EA1043B3FB04 +:101F3000F2FC02FB1C3380B240EA0343B3FBF2F035 +:101F400002FB103240EA0C4000237047022A05D9F8 +:101F50008446B0FBF2F002FB10C270474AB105D1D3 +:101F600000F0010249085FEA3000704700220023B8 +:101F7000704700F0FBBD0B000200002100207047FD +:101F8000904271EB030CF6D3B3F5803F2FD2F0B53E +:101F9000B3FA83F7B1FA81F4A7F10F0E3D1B53405A +:101FA000CEF1200602FA0EF2F3415340B5F10F07CD +:101FB00046D80F3C2C444140C4F12006A040F141DA +:101FC0004140B1FBF3F603FB1611A2FB0645001BD3 +:101FD000A94102D2761E8018594180EA010221FAF5 +:101FE0000EF362FA0EF200215A403046F0BD30B4D2 +:101FF000B1FBF3FC03FB1C11A2FB0C45001BA94128 +:1020000003D2ACF1010C8018594130BC02460B469A +:10201000604600217047B2F1807F65D3F0B5B2FA17 +:1020200082F7B1FA81F4C7F10F063D1B22FA06F3DD +:1020300007F1110EF24120355A40B5F10F07B8D91A +:102040004140C4F12006A040F1414140B1FBF3FC06 +:1020500003FB1C11A2FB0C45001BA94103D2BCF1E0 +:10206000010C801859410F2F12D30F3FC90341EAC9 +:102070005041B1FBF3F603FB1611A2FB0645D4EB6E +:10208000C030A94102D2761E8018594146EACC3CA4 +:1020900007B34140C7F12006B840F1414140B1FBD0 +:1020A000F3F603FB1611A2FB0645001BA94102D261 +:1020B000761E8018594180EA010221FA0EF3C7F119 +:1020C000200462FA0EF20CFA07F05A402CFA04F1DE +:1020D0003043F0BD80EA010221FA0EF3002162FADA +:1020E0000EF260465A40F0BD8C46B1FBF2F102FBA5 +:1020F00011C31B0243EA1063B3FBF2FC02FB1C3367 +:102100001B024CEA002043EA1063B3FBF2FC02FB23 +:102110001C331B024CEA002043EA1063B3FBF2FCC1 +:1021200002FB1C331B024CEA002043EA1063B3FBA2 +:10213000F2FC02FB1C324CEA00200023704770477F +:1021400001484068704700BF3010002009010200BC +:1021500081B002D43C48815405E03C4802F00F02B3 +:10216000104400F8041C01B07047394A13684FF658 +:10217000FF0100020B4000F4E060184335490843BA +:102180001060704738B5324B1C68C4F30223C3F1AA +:102190000704052C28BF04241D1D072D34BF002370 +:1021A000DB1E012505FA04F4641E2140994005FA5E +:1021B00003F35B1E1A401143BDE83440C6E700003C +:1021C000010007D4012200F01F01234B8A4040097F +:1021D00043F82020704701000BD4012200F01F01BA +:1021E0001E4B8A40400943F82020BFF34F8FBFF3B6 +:1021F0006F8F704710B5401EB0F1807F01D3012072 +:1022000010BD174C60600F214FF0FF30FFF79EFFAD +:102210000022A26007202060002010BD010007D42A +:10222000012200F01F010F4B8A40400943F8202093 +:102230007047010007D4012200F01F010A4B8A40B9 +:10224000400943F82020704700E400E018ED00E06A +:102250000CED00E00000FA0500E100E080E100E0A4 +:1022600010E000E000E200E080E200E0002200F088 +:102270007FBC0000DFF820130A68030903F47F2302 +:1022800000019A4300F47F2000F082B9DFF80823B0 +:102290001368010C23EA014343EA004313607047CB +:1022A0002DE9F843054600242878DFF8EC62410662 +:1022B000A0464FF0B0472DD5286B70B1B0F5800F18 +:1022C00006D0B0F5000F18BFB0F5400F17D01FE0D3 +:1022D000F86840F48030F860EDE0386820F0806005 +:1022E0003860FFF72DFF81463868000140F1D0804B +:1022F000FFF726FFA0EB09000228F5D90324D7E059 +:10230000FFF71EFFA0EB0900022840F2C980F5E7A5 +:102310000124A0462868010531D5B06800F4407852 +:10232000286C80452AD000F0DDFBB8F1000FB168C1 +:1023300005D1286C21F440710143B1601EE0B06802 +:1023400040F48030B06021F44071B06820F48030F7 +:10235000B060286C0143B160B068C0070ED5FFF7CC +:10236000EFFE804641F28939B068800706D4FFF756 +:10237000E7FEA0EB08004845F6D30324A0462878E2 +:10238000C10705D53168A869890840EA8101316033 +:102390002878810705D53168E86921F44061014357 +:1023A00031602878C10644BFA86AFFF76FFF28781C +:1023B000810644BFE86AFFF769FF2878410744BFF8 +:1023C000286AFFF757FF2878010744BF686AFFF7BC +:1023D00051FF2868C1051BD53168686B21F0406149 +:1023E00001433160686BB0F1006F00F0BDF8686BBD +:1023F000B0F1806F75D100F0BDF804463868000177 +:1024000060D5FFF79DFE001B0228F7D94FF00308A7 +:1024100067E0FFF795FE001B02285BD9F6E73168FD +:1024200021F04041316020F08050326822F040625B +:1024300010433060A86BB0F1C05F00F095F82868D9 +:1024400041056DD53168E86B21F0405101433160A1 +:10245000E86BB0F1005F03D1F96841F48031F960B5 +:10246000E86BB0F1805F5BD100F084F80446386817 +:10247000000146D5FFF764FE001B0228F7D94FF094 +:1024800003084DE0FFF75CFE001B022841D9F6E788 +:1024900000F061F8A86821F4781100F071F8814625 +:1024A000386800017FF52CAF3969686901433961EB +:1024B000002C7FF42EAF3168286B21F440010143DA +:1024C000316027E700F047F8E86821F0606100F02C +:1024D00057F80446386800019BD53969686901439B +:1024E000396128688105AAD5A86BB0F1804F1CBF5F +:1024F000B0F1004F002892D1316821F040410843EB +:1025000097E700F028F8286921F0604100F038F8DA +:10251000044638680001B5D53969686901433961F5 +:102520002868C10405D5F168686C21F44041014375 +:10253000F160286881040BD5796AE86C21F03001DC +:1025400001437962796AA86C890840EA810179625D +:102550004046BDE8F2833869696820F4FE4040EAED +:10256000012038613969704703D1F96841F0807101 +:10257000F9607047396821F080613960FFF7E0BD8C +:1025800001433961386840F080603860FFF7D8BD9A +:10259000104308607047000088000058644900E05C +:1025A000644981B00A6802430A60096808400090E3 +:1025B000009801B0704710B500F09CFA00F0F2FAF4 +:1025C00000F046F800F082F85B4C5C48606204F171 +:1025D000240000F0FBFB0420FFF7E2FF0120FFF7DF +:1025E000DFFF0220FFF7DCFF0420FFF7D7FF022008 +:1025F000FFF7D4FF0120FFF7D1FF00220F210B20AE +:10260000FFF7C0FD0B20FFF7DBFD00220F213A2072 +:10261000FFF7B8FD3A20FFF7D3FD494820600020BE +:1026200060600F20A06047F6FF70E060002020612E +:10263000A061E0616061204600F000FC0022002102 +:10264000204600F085F900F0D5FA00F0B1FBFCE778 +:1026500080B59AB008A84821FFF708FE01A81C2100 +:10266000FFF704FE00F03EFA3648016821F0180139 +:10267000016007213448026822F4C06242F400720B +:1026800002604FF48032006800F4C060009000984F +:10269000089101200A904FF480710B9140200C901A +:1026A00000210992139108A8FEF7BDFF6F20019049 +:1026B000022100200291039004900590069007905B +:1026C000012101A8FFF761FA1BB000BD10B594B05D +:1026D00068465021FFF7CAFD4FF480401190022157 +:1026E000102013904FF44054129100946846FFF765 +:1026F000D7FD14B010BD10B5144C154800F02AF8E1 +:102700004FF40040E061002020626062A062204639 +:10271000FDF714FD00212046FEF7EDFE00212046C6 +:10272000FEF7F4FE2046BDE81040FEF7C7BE0000ED +:10273000480000584C0000589C130020000C005822 +:10274000002800409000005800040058FC110020B0 +:102750000038014020604FF4E13060600020A0604C +:10276000E06020610C2060610020A061704770472C +:102770002DE9F84F4FF00009674A684B4FF00F08FA +:1027800005460E4633E0664FBD4214BF07270427B7 +:102790008F4027434CF82E70C1431C6801EA040C9B +:1027A0007468E40248BF40EA0C0CC3F800C05C68DF +:1027B00001EA040C7468A40248BF40EA0C0CC3F898 +:1027C00004C0146801EA040C7468E40348BF40EADA +:1027D0000C0CC2F800C0546801EA040C716889034B +:1027E00048BF40EA0C0CC2F804C009F10109316885 +:1027F00031FA09F000F07E80012404FA09F414EAA9 +:102800000100F2D04FEA490C032101FA0CF16FEA02 +:10281000010E716801F00307012F1CBF01F00301D5 +:10282000022911D1A968F7680EEA010107FA0CF72D +:102830003943A960696821EA04047168C1F3001191 +:1028400001FA09F10C436C604FEA8901347904F014 +:102850000304032C1FD0EC68B7680EEA040407FADF +:102860000CF73C43EC60347904F00304022C12D1E1 +:102870004FEAD90705EB870401F01C07D4F820A024 +:1028800008FA07FB2AEA0B0AD6F810B00BFA07F78A +:1028900047EA0A0727622C680EEA0407347904F035 +:1028A000030404FA0CF43C432C60746814F4403FB5 +:1028B0009BD0DFF870C04FEA990E5CF82E7001F0E3 +:1028C0000C0108FA01F427EA0404B5F1904F08BF9F +:1028D00000270ED0144FBD4208BF012709D0134F67 +:1028E000BD4208BF022704D0114FBD427FF44BAF59 +:1028F00003274DE7BDE8F18F81B0002A14BF816145 +:10290000816201B070470B4A136803421CBF10601C +:1029100000F056BA704700008008005800080058C0 +:10292000001000480800014000040048000800486A +:10293000000C00480C0800588A60FF2102685162B0 +:10294000012180F82110002180F82010002070471C +:102950002DE9F84300F065F808BF022038D000F0F8 +:1029600067F814D5FFF7ECFB07462068C1684807F5 +:102970000DD5FFF7E5FBC01B4845F6D300F039F84D +:1029800026E0FFF7DDFBC01B484507D3F6E700F064 +:102990002AF800F065F8FFF7D3FB07462068C16806 +:1029A0004A07EED5C0F81480206800F013F82A48D2 +:1029B000016841F4002101602848026842F40022C5 +:1029C00002602068816841F48041816000F01BF85A +:1029D000BDE8F2838168C908C90081602068816808 +:1029E0000D43856070472068816821F480618160B3 +:1029F000704720684662032184F82110002084F883 +:102A00002000032070472068816841F48061816064 +:102A100001212068466284F82110002084F82000FB +:102A200070470446884694F82000012815467047F0 +:102A3000012184F82010022084F82100CA20216896 +:102A40004862532022685062FF262068816848054A +:102A500040F2E9397047000080080058000800582B +:102A60002068C16801F0800161F49061C160704725 +:102A700090F82010012901D102207047012280F82E +:102A80002020022180F82110CA21026851625321BE +:102A90000368596201688A6842F02002FFF74CBF60 +:102AA00070B50F4E044630780025A8B1FFF789F9BC +:102AB00032784FF47A71B1FBF2F1B0FBF1F0FFF72D +:102AC00099FB48B9102C07D2002221464FF0FF3065 +:102AD000FFF758FBB46000E00125284670BD00BF39 +:102AE000301000200248016841F480710160704795 +:102AF00000040058164810B5016841F48071016067 +:102B00000320FFF732FB0020FFF7CAFF0024002854 +:102B100014BF0124FEF753FA204610BD0D4880680B +:102B200070470C48007870470B480BE00A48016872 +:102B300021F00201016070470748016821F004019B +:102B40000160704701684908490001607047000052 +:102B50000040005830100020042004E0DFF8080096 +:102B6000006800F4C060704700040058704700001F +:102B700000B500BF130096469446103928BFA0E860 +:102B80000C50FAD85FEA417C28BF0CC048BF40F81F +:102B9000042BC90728BF20F8022B48BF00F8012BDF +:102BA00000BD000010B57449744C4FF4004008603B +:102BB000606840010ED56068C0000BD4FFF792FF3B +:102BC000FFF790FF206840F480302060216821F4F6 +:102BD0008031216000F077F8002000F0D3F940B197 +:102BE00080796749E160E16821F47C5141EA002184 +:102BF000E16010BD18B56348634C89B0016801609D +:102C0000CA216248C1615321C161FF220168C9081C +:102C1000C9000160C2615E48016841F40041016081 +:102C200000F0C2F95B480168C908C90041F004011D +:102C300001600020584900F072FB00F096FC012171 +:102C4000012000F0C3F9002000F0EFFD012000F0AA +:102C5000ECFD022000F0E9FD012000F00EFE012154 +:102C6000002000F01EFE0121012000F01AFE0121CB +:102C7000022000F016FE00F069FE484800F05FFFF9 +:102C80000FF2A10200214FF4807000F0F2FF04F275 +:102C90003C50029042490FF2750001900091684645 +:102CA00000F0ADFE04F25470039004F5C96140F2E7 +:102CB0003C5006900491059403A800F0D9FE00F062 +:102CC00043FE0AB010BD374881B0016841F480115D +:102CD00001603F21006800F48010009000983248A5 +:102CE00041604161016841F47C110160026942F474 +:102CF0007C120261016841F03F010160026942F00B +:102D00003F02026101B070470000000080B501463B +:102D1000224800F020FFBDE8044000214FF48070FD +:102D200000F0B4BF80B500F04EFC0021012000F09F +:102D30004DF96946194800F024FF009800F0B1FEF3 +:102D400001F00CF801BD38B50446FFF7F9F914F1AC +:102D5000010F054609D0FFF7E4FE241805E01348EB +:102D6000016821F00401016030BFFFF7E9F9401B61 +:102D7000A042F4D331BD000010400058900000582C +:102D8000FECAFECA90080058300003200828004000 +:102D900008000058800400589C130020E81400200C +:102DA000273E000850000058040C005810ED00E0C9 +:102DB00002E000F01FB900BF4FF0FF3000F0F2BE9C +:102DC000102808BF01F03EB870470000F8B504466F +:102DD0000025ACB104F13406307910B92046FEF775 +:102DE000FDF80F4F384600F021F8386840F0011028 +:102DF0003860204600F007F835600120307100E0AF +:102E000001252846F2BD10B50021064A064B00EB0D +:102E10008104491C06296360E261F8D310BD0000FB +:102E2000000C00583F210008B31500080021016084 +:102E30004FF03F1141603F218160704738B5040079 +:102E400044D094F8210028B9002184F820102046AD +:102E5000FEF772F900F049F8FF2510B100F03FF8D5 +:102E600034E02168DFF8B0008A6802408A60216897 +:102E70008A68636820690343A06903431A438A6030 +:102E80002168E068086120680169A26841EA02419E +:102E900001612068C16821F08001C1602068C16CB7 +:102EA00089088900C1642168CA6CE36960690343C9 +:102EB0001A43CA6420688168880609D400F020F8A3 +:102EC00030B120684562042100F01FF8012032BDB6 +:102ED00020684562012184F82110002032BD20685D +:102EE0004562042184F821107047022084F82100F3 +:102EF000CA2021684862532022685062204626E09A +:102F000020460BE02068C0F8248084F821100020BF +:102F100084F8200070470000BFFF8FFF70B50446A3 +:102F200040F2E9362068C16821F0A001C160FFF7D6 +:102F300007F905462068C168880606D4FFF700F93E +:102F4000401BB042F6D3032070BD002070BD70B5A9 +:102F500004462068C1684A0612D44FF0FF32C260AE +:102F600040F2E936FFF7ECF805462068C1684806EC +:102F700006D4FFF7E5F8401BB042F6D3032070BD3E +:102F8000002070BD01460648064AC3798B4218BF2F +:102F9000904218BF0838F8D18B4218BF0020704704 +:102FA000F873FF1F0070FF1F20480021016041607F +:102FB000704710B500F019F81C6819B1012904D147 +:102FC000204301E024EA000018600BE010B500F097 +:102FD0000CF85C6819B1012904D1204301E024EA0E +:102FE0000000586082F3108810BDEFF3108272B6B3 +:102FF0000E4B704738B5EFF3108472B60B490C4D89 +:10300000086820B129688847686880470AE04868EE +:1030100020B1A9688847E868804703E028698047AD +:103020006869804784F3108831BD0000F0140020E7 +:10303000F8490008DFF8F0140A6892B200E002468E +:10304000086880B28242FAD170472DE9FC410446FB +:103050001825DFF8D884DFF8D864684308EB000748 +:103060003078062808D131787170347078754FF057 +:10307000FF307060002039E000F077F8B968091877 +:10308000B96008F10803B96832786A439A589142E6 +:10309000327813D308F1150315FB02FC13F80C303A +:1030A000062B25D008F108066B43F358994222BF3E +:1030B00008F115036A439A5CEED219E011463378A1 +:1030C00069439A420BD008F1140308F1150C5B5CBC +:1030D00015FB03F50CF805407A753B7500E07A7531 +:1030E00008F114025454317871703470BDE8F681DF +:1030F0001146694308F115035B5C062B04D008F107 +:10310000140615FB03F574557B753A7508F1150225 +:103110005454EBE7F8B5DFF81834DFF810541E7894 +:10312000182402466243B0422A4404D118785870E9 +:10313000507D18700FE0167D507D92F815C005F196 +:1031400015076643062807F806C004D0167D143517 +:1031500014FB00F42E55012010731878062802BFC6 +:1031600000294FF0FF315960F1BD10B5DFF8C043C1 +:10317000606810F1010F0FD0FFF75CFF6168DFF8A6 +:10318000B423814261683CBF5388C918081A51783A +:1031900048431178C84000E0002080B210BD2DE9FE +:1031A000F84FDFF89053DFF890B3D5F80880D8F8DF +:1031B0000000DBF800104A0500F06AF9DFF87063E0 +:1031C000DFF868A321F4806181604FF0180934783A +:1031D0000AF1080019FB04F14758FFF7C6FF8742C0 +:1031E00017D200270121B170062C3DD019FB04F441 +:1031F0000AF108010AF108020959814223BF0AF1C4 +:1032000008010959091A002111510AEB04014C7DEA +:10321000EAE7A9884118B94202D2AF880021E2E763 +:103220003F1ADFE7022802DA2878012800D07F1E43 +:10323000D8F80000C1684A07FAD500F02FF9DBF88A +:103240000C00000CBFB247EA0047CBF80C70FFF748 +:10325000F1FE7060A8680068816841F48061816057 +:10326000AFF30080BDE8F18FB8B20028DAD1FFF7E4 +:10327000E1FE70600320BDE8F24FFEF7CFBF2DE9FD +:10328000F843EFF3108872B6AA4DA84BA8680168FE +:10329000CA224A6253204862A54A886820F48060A6 +:1032A000886018201678374647431F44387B022829 +:1032B00026D13C68D7F810909078F0B17A7B012A3B +:1032C0000AD101213046FFF725FF88F3108879687D +:1032D000304600F0F0F804E088F31088304600F043 +:1032E0009BF8A8680068CA214162224653214162C6 +:1032F0004846314600F02AF90BE0FFF750FF06E0A0 +:10330000C8684207FCD500F07EF88C49086088F355 +:103310001088FF21A86802685162BDE8F183F8B502 +:10332000844CA160CA2209684A6253224A62824AD6 +:10333000136843F020031360136803F00703C3F11D +:103340000403237095682D0C05F07F056D1C6570D6 +:10335000EDB29268C2F30E02521C628092B2521E0B +:103360006A43A2F5A072DA404FF6FF739A422CBF6F +:10337000A380A280724A136843F400231360714B48 +:103380001D6845F400251D6048BB6948674E012350 +:10339000837018254FF0FF33436000235FFA83FCEE +:1033A00006F10C0715FB0CFC4FF0000E07F80CE0C3 +:1033B0005B1CDFB2062FF1DB06230370886820F464 +:1033C0008060886000F01FF8D0600320FEF731FFB6 +:1033D000A1680868826842F48042826005E0C8689B +:1033E000410544BF0320FEF719FFA1680A68FF20CA +:1033F0005062002203210320FEF7C4FEBDE8F24024 +:103400000320FEF7DDBEC86800F0800060F4906025 +:10341000C8604FF400207047F8B50746EFF31084FA +:1034200072B60320FEF7D7FE424DAE683068CA215F +:1034300041623A4653214162182043494243895C24 +:1034400002291BD100213846FFF764FE3848017875 +:1034500006290ED1306838490A68530500F018F87B +:1034600021F480618160C1684A07FCD500F016F83C +:1034700004E04078884218BFFFF791FEA9680A6807 +:10348000FF2050620320FEF79BFE84F31088F1BDFD +:1034900002D5C1684A07FCD481687047C16801F051 +:1034A000800161F49061C1604FF4002023490860FD +:1034B0000320FEF7BEBE2DE9F04180460F4642468E +:1034C00018201A4942438C18207B022804BF40462A +:1034D000FFF7A2FFEFF3108572B60320FEF77BFE25 +:1034E000144EB0680068CA21416253214162022033 +:1034F0002073A76067604046FFF7A7FD0C490A7874 +:103500004978914202D0FFF74AFE02E0A168081A0A +:10351000A060FF20B1680A6850620320FEF750FEE9 +:1035200085F31088BDE8F081282800408C12002027 +:1035300010150020DC140020082800400C0800585A +:10354000000800588008005898120020104700001A +:10355000564900E0564981B00A6802430A6009688A +:1035600008400090009801B0704718B585B06846D3 +:103570001421FEF77BFE032001904FF460410024EC +:10358000009102940120FFF7E3FF00F097F8474C09 +:103590002068400840002060182100910220FFF7B9 +:1035A000D7FF69464348FFF7E3F8206820F00200A0 +:1035B0002060FFF7B9FAFFF7B9FAFFF7BDFA00F09C +:1035C00011F806B010BD00B587B068460FF228218B +:1035D0001C2200F0AFFD00F080FA684600F0FCFD10 +:1035E00007B000BDF0B585B068461421FEF73EFE79 +:1035F00000260025002400210FF2CC0000EBC102C0 +:10360000907988B11368B3F1904F08D0294FBB422D +:1036100008D0294FBB4204BF9088044304E090883F +:10362000064301E090880543491C2629E4DB00207D +:1036300002900121032003900191B0B270B100907B +:103640000120FFF785FF0120FFF784FF00F036F827 +:103650000022B1B24FF09040FFF74EF9A8B280B10E +:1036600000900220FFF774FF0220FFF773FF114E56 +:1036700069463046FFF77CF80022A9B23046FFF7D2 +:103680003BF9A0B280B100900420FFF761FF042055 +:10369000FFF760FF084D69462846FFF769F80022EA +:1036A000A1B22846FFF728F905B0F0BD4C0000583C +:1036B0004C010058000400480008004869464FF0DB +:1036C0009040FFF755B800000000004801000000DE +:1036D0000000004801000000000000480100000058 +:1036E0000000004801000000000000480100000048 +:1036F0000000004801000000000000480100000038 +:103700000000004801000000000000480100000027 +:103710000000004801000000000000480100000017 +:103720000000004801000000000000480100000007 +:1037300000000048010000000000004801000000F7 +:1037400000000048010000000000004801000000E7 +:1037500000000048010000000000004801000000D7 +:1037600000000048010000000000004801000000C7 +:1037700000000048010000000000004801000000B7 +:1037800000000048010000000000004801000000A7 +:103790000000004801000000000000480100000097 +:1037A0000000004801000000000000480100000087 +:1037B0000000004801000000000000480100000077 +:1037C0000000004801000000000000480100000067 +:1037D0000000004801000000000000480100000057 +:1037E0000000004801000000000000480100000047 +:1037F0000000004801000000000000000000000080 +:1038000000000000C8360008280003202C00032018 +:1038100026040400444981B00A6802430A6009682A +:1038200008400090009801B0704778B585B0044614 +:1038300068461421FEF71AFD0220FFF7EBFF00F0A7 +:1038400010F80095012001900021022003900291C0 +:10385000694656F82400FEF78BFF00F008F806B022 +:1038600070BD0FF2D000314E30F81450704756F84A +:10387000240000222946FFF73FB80FF2B8012B4B76 +:1038800031F8101053F820000122FFF735B80FF27D +:10389000A401264B31F8101053F820000022FFF746 +:1038A0002BB8F0B585B005460C4668461421FEF7E6 +:1038B000DDFC0DB9042004E0012D18BF022D02D15A +:1038C0000820FFF7A7FF2000194E0FF270070DD157 +:1038D00037F815000090002101910120029002218B +:1038E000039100F01CF80120FFF72DFA012C14D1F0 +:1038F00037F81500009001214FF404100190029157 +:1039000000F00DF80FF23C00445D00220F2160B280 +:10391000FEF738FC60B2FEF753FC05B0F0BD694617 +:1039200056F82500FEF724BF4C0000583C1000203C +:1039300048100020200001000200000010000100DB +:10394000020000000A06070000F0C1BC714872497D +:10395000016001F12002426001F13002826001F158 +:103960003C02026201F14402426201F14C02C26077 +:1039700001F15402026101F17002426101F174022D +:1039800082618031C16100F0C0BC38B50446634D2E +:10399000284600F0D4F85F484068A1680160E168FB +:1039A000C16085605E49416000F0CBFC5D4834E059 +:1039B00080B558484268136801211972406800F0C8 +:1039C000C6FC002002BD38B5564C544D04E000F052 +:1039D0004BF8009821688847284600F0B3F8002883 +:1039E000F5D031BD80B54B494A68D16802200872D4 +:1039F00000F0B2FC002002BD4A484168084738B5D3 +:103A00000446494D284600F09AF84248C068A1682B +:103A10000160456000F0A9FC4448216801606168CC +:103A20004160002032BD80B53A48C2681368102159 +:103A30001972C06800F09FFC002002BD35483B4A67 +:103A4000C168C16813680868184738B5374C364DE7 +:103A500004E000F009F8009861688847284600F003 +:103A600071F80028F5D031BD6946284600F089B8C4 +:103A700038B504462E4D284600F061F82D4800F078 +:103A80005EF824480069A1688160E168C160056151 +:103A900021680160616841602169416161698161FA +:103AA00031BD80B50146234800F055F8BDE802401D +:103AB0000FF2050000F068BC38B5164C1D4D06E04D +:103AC000FFF7D2FF00992069006900F044F828460A +:103AD00000F038F80028F3D031BD10B5164C204660 +:103AE00000F02DF80B4841690C60BDE8104000F073 +:103AF0005FBC1CB5104C06E06946204600F041F85A +:103B0000009800F01BF8204600F01CF80028F3D0C5 +:103B100013BD000000000320B40A0320500B032053 +:103B2000A40A032000150020580B032008150020CC +:103B3000400B0320F8140020480B0320704700605E +:103B400040607047EFF3108172B6026882420CBF8A +:103B50000120002012E0EFF3108272B60860436883 +:103B60004B6041604868016019E0EFF3108172B664 +:103B700042680368136002684368536081F31088E9 +:103B8000704710B5EFF3108472B602680A600068DF +:103B9000FFE7FFF7EAFF84F3108810BD0B6082F3A4 +:103BA000108870472DE9FC47594CDFF86891A569EA +:103BB0002840A0614FF0FF3A21694FF0010834E03E +:103BC000521C54F83200616919400142F8D0616911 +:103BD00004EBC206084071681840014208BFC6F8ED +:103BE00004A07768384000F097F8606208FA00F0A7 +:103BF00087437760EFF3108172B6626A206908FA32 +:103C000002F2D24310402061022004EBC00353F8BB +:103C1000086C1640401E43F8086CF6D181F31088FA +:103C2000606A59F8201088472169A36960690140DA +:103C3000194205D0E069216A084208BF0022C0D0BD +:103C4000C4F824A000F0CCFBEFF3108972B6216910 +:103C500060690140A069014201BFE169206A014237 +:103C6000FFF7A7F889F3108800F0BBFBA561BDE85A +:103C7000F38738B51446EFF3108572B600F04CF8B0 +:103C8000244941F8204085F3108831BD10B500F07B +:103C90000BF804431C6153F83140204343F83100D2 +:103CA000FFE782F3108810BDEFF3108272B6184B55 +:103CB0001C697047506181F310887047EFF31081E1 +:103CC00072B6134AD3691843D061F4E7F8B5104CC3 +:103CD000666A256A374616F1010F0EBF00260121DC +:103CE00001FA06F6206202E03046FFF764F8216A26 +:103CF000E0690842F8D06762EFF3108172B6E269BA +:103D0000206A8243E26181F310882562F1BD0000E0 +:103D1000081000201C13002002460020110C09048A +:103D200004BF1020120412F07F4F04BF08301202AB +:103D30000FF2180112F0704F04BF001D1201120F94 +:103D4000C0F11F00895C401AC0B270470403020230 +:103D500001010101000000000000000018B591B051 +:103D600004A80FF27C31DFF85043342200F0E2F96E +:103D70002068DFF848434FF6FC7101EA8001DFF864 +:103D800040034118DFF83C030290E16000F58670C3 +:103D900003900FF2B9210FF2CD20019000916846F7 +:103DA000FFF7F3FD01210220FFF710F901210220A6 +:103DB000FFF7FFF80020E070A07004A800F004FAFC +:103DC0000FF2011200210820FFF753FFBE4A002125 +:103DD0000120FFF74EFF0FF2990200211020FFF79C +:103DE00048FFBA4A00210220FFF743FFB84A0021EA +:103DF0000420FFF73EFF012060700020A06004F166 +:103E00001800FFF79CFEFEF776FC04F110006060DE +:103E10000020207001220FF2011304F11001FDF7C0 +:103E2000C9FB12B010BD80B5A44A917831B1002011 +:103E300090700120BDE80240FFF740BF014602F14B +:103E4000180007E110B59D4CE07830B90120FFF76C +:103E50001EFD0121E170002105E00120FFF70DFDAD +:103E60000020E0700121BDE810400220FFF7A1B85A +:103E700038B5EFF31084914D6878012821D10021E5 +:103E8000697005F1180005F10801FFF77AFEE8787E +:103E9000A0B9A8680FF28113017A022972B607BF90 +:103EA000B0F80B20521D827AD21C00F1080192B2A8 +:103EB0000020FDF788FB84F3108831BDBDE8314058 +:103EC000AAE031BD10B5834CB4F809004FF660523A +:103ED000811A04D0491E06D0491E08D00BE02046A6 +:103EE00000F080FA11E0204600F0B7FA0DE020461D +:103EF00000F0D9FA09E0A0810120A073E07221202E +:103F000020720E2060720420A07221467248FFF7D2 +:103F100022FEBDE81040A1E0F8B5684D69682A7836 +:103F2000002400201AB1022A64D013D358E0097883 +:103F3000012905D0022907D0102918BF202907D14F +:103F40000120287003244BE001202870042447E05E +:103F5000012445E00E78E868022E11D0102E02D020 +:103F6000202E03D01CE0CC78C0681BE0CC785948E8 +:103F700005F1100100F108070A6840F8082F18E061 +:103F80004068CA780979C36802EB012403F1080785 +:103F9000052205F11001384600F0BCF8052009E0C3 +:103FA000CC784068016805F1100001F1080701684C +:103FB000396004206F60A1B211B1022129700FE0B5 +:103FC000022E25D0102E1DD0202E1ED00021012023 +:103FD000FFF75CFE002005F11001287001246960E4 +:103FE000A2B201B069683D4BBDE8F0400144002039 +:103FF000FDF7E0BA087802280AD0102802D020285D +:1040000003D0E3E700210220E2E700210820DFE7F8 +:1040100000210420DCE700001CB5284C0120607062 +:10402000E0680169A0688A68904205D3C9681144B4 +:10403000884238BFFFF735FD04F11800FFF782FD15 +:1040400010B9BDE81C4009E013BD000080B5014671 +:10405000DFF88400FFF77FFDBDE804400021102059 +:10406000FFF714BE704770B51446134A134E12681A +:104070001D460123B3704FF6FC7303EA8203104A16 +:10408000D3180A46DE683668A6F80900F17206F110 +:104090000C00214600F03EF800210020FFF7C3FC91 +:1040A0000120FFF713FE314605F10800B278BDE8A4 +:1040B0007040D21C00F02EB83C400058BC140020C8 +:1040C0000000032090080320B1390008273A0008B7 +:1040D000E539000860100020D4140020193F0008C2 +:1040E00000000000000000000000000000000000D0 +:1040F00000000000440008004005020112279C0057 +:10410000F4010000FFFFFFFF480101000020000054 +:104110000000000062B38B0708D0521E11F8013B6B +:1041200000F8013B00F024808B07F6D1830740F0B4 +:10413000208000BF103A07D330B4B1E83810103AED +:10414000A0E83810F9D230BC530724BFB1E80810FA +:10415000A0E8081044BF51F8043B40F8043BD207E4 +:1041600024BF31F8022B20F8022B44BF0B780370D8 +:104170007047121F17D35B0009D151F8043B20F898 +:10418000023B1B0C121F20F8023BF6D20BE051F849 +:10419000043B00F8013B1B0A20F8023B1B0C121FDA +:1041A00000F8013BF3D238BF121D521E24BF11F894 +:1041B000013B00F8013BF8D870470000FFF753FFC0 +:1041C0009DF80E0005B000BDF8B500F10C026B467D +:1041D00025214FF66640F1E7F8B500F10C026B4679 +:1041E0000F214FF66840E9E7C0680840884201D1D6 +:1041F0000120704700207047C0690840884201D103 +:10420000012070470020704710B56C4C02212046F9 +:10421000FFF7F2FF38B16068C043810703D5FFF7AD +:1042200014FC022018E001212046FFF7E5FF38B119 +:104230006068C043C10703D5FFF7C5FB01200BE051 +:1042400008212046FFF7D8FF38B16068C043010756 +:1042500003D5FFF74EFC0820A06010BD10B5574CE9 +:1042600002212046FFF7C0FF58B96068C0438103B0 +:1042700007D5606840F400306060BDE81040FFF78B +:10428000DDBB08212046FFF7AFFF70B96068C0436F +:1042900001030AD560684A4940F40020606008685C +:1042A00080474FF40020A06010BD20212046FFF77A +:1042B0009BFF58B96068C043810207D5606840F42D +:1042C00000106060BDE81040FFF796BB10BD3D4890 +:1042D00081B0016841F480110160006800F4801031 +:1042E000009000983848016841F400710160374837 +:1042F000026842F40072026040BF20BF3448016887 +:1043000041F40041016001B0704780B53148016857 +:1043100041F480110160006800F480100090009862 +:104320002648016841F001010160026842F48032D0 +:1043300002602C20FDF744FFBDE802402D20FDF770 +:104340003FBF25480168490849000160704723497B +:104350004FF48030086070471F484FF400114160EF +:10436000016821F40011016070471B48016821F0C9 +:1043700002010160704718484FF400314160016844 +:1043800021F400310160704738B504460B4D082117 +:104390002846FFF729FF30B109480460686820F417 +:1043A0000020686031BDA0474FF40021A96031BDF5 +:1043B0000948016821F0080101607047000C0058AD +:1043C0001815002050010058D40800582008005843 +:1043D0000C04005850000058040C0058080C0058F9 +:1043E0007047704770B5EFF31081027B012A02D04D +:1043F000022A07D00DE000F028F8137800F01FF82B +:1044000014700CE000F021F8138800F018F8148004 +:1044100005E000F01AF8136800F011F8146081F359 +:104420001088212101720E214172042181724FF600 +:1044300060518181002181730121C17270BD2646C6 +:1044400023EA040435402C43704772B6D0F811209B +:10445000D0F80D40D0F81550704781B0017B01298C +:1044600002D0022904D008E0D0F80D10097807E046 +:10447000D0F80D100A88009203E0D0F80D100968FA +:1044800000910E21417221220821817202724FF6A1 +:10449000615181810121C17200218173009A40F82C +:1044A0000F2F01B0704738B50446284800684FF612 +:1044B000FC7505EA800526484519212020720E204A +:1044C00060724220A0724FF66250A0810120E0721B +:1044D0000020A0731F480168090CA4F80F100068A1 +:1044E000C0F30B00A4F811001B4801781B4801F031 +:1044F0001F01E174416821754168090AC4F815106B +:104500000268C4F819200169C4F81D104169C4F893 +:10451000211004F129018069C4F825002868026887 +:104520000A600C222B68191D04F12D00FFF7F2FD23 +:10453000286800F11001102204F13900FFF7EAFDAC +:1045400007480168C4F8491031BD00003C400058DC +:1045500000000320002004E00075FF1F8075FF1F8E +:10456000044B000800EB8100444AD0F880109142CF +:1045700001D0012070470020704742F4806240F86B +:104580002120704780B500F0A3F800F05CF83C48AB +:104590001F2181610168C908C90041F003010CE0D5 +:1045A00000F09EB880B500F093F800F04CF8344865 +:1045B0000168C908C90041F0020101603148016881 +:1045C00041F00401016030BF01BD10B52E4C00F078 +:1045D00061F800F02BF80028FBD14FF0B040816863 +:1045E00001F00C01042918D1016841F48031016007 +:1045F00026490A68D208D20042F001020A60016826 +:104600008903FCD581688908890041F00201816035 +:10461000816801F00C010829FAD10022032120460B +:10462000FFF7ABFFBDE8104000F05AB80321204669 +:1046300098E780B500F04CF81248016821F00401B9 +:10464000C0E700F04DB810B50F4CFFF7EFFF0028A2 +:10465000FBD10421FFF7EBFF40B90D4801680904C5 +:1046600002D40068400503D500F014F800F016F8F5 +:104670002046BDE81040002203217EE700040080B0 +:104680000004005810ED00E00014005800400058ED +:10469000880400580022042120466EE74FF0B04005 +:1046A000016841F48071016001684905FCD58168A9 +:1046B0008908890041F001018160416A8908890007 +:1046C0004162816801F00C010429FAD170470000B1 +:1046D0000248016821F002010160704710E000E02B +:1046E0000248016841F002010160704710E000E0FB +:1046F0001349002008604FF4E0221248016841F499 +:10470000700101604FF0B041086840F0010008609E +:104710008A600D480A6802400C480A60036823F06A +:1047200005030360426852085200426000220848B4 +:10473000C8600861086820F4802008608A617047BA +:1047400008ED00E088ED00E0FBFEF6FA940000586A +:10475000001004220100000003000000050000001A +:104760000100000001000000060000000A00000037 +:10477000200000000200000004000000080000000B +:104780001000000040000000800000000001000058 +:1047900000020000A0860100400D0300801A060000 +:1047A00000350C0040420F0080841E0000093D00CF +:1047B00000127A000024F40000366E010048E8017F +:1047C000006CDC020000000000000000000000009F +:1047D000000000007047FEE7FEE7FEE7FEE77047D7 +:1047E0007047704700F026B8FEF749BD0848FCF74F +:1047F000C4BD0848FBF774BD0748FBF771BDFFF760 +:1048000003BDFFF72BBD00F01DB80448FCF7B5BD94 +:10481000FC130020FC1100206C1100205C1400200F +:104820001020FEF770B80120FEF76DB80220FEF7E9 +:104830006AB80000024841680278891841607047F0 +:10484000301000200449C8680A6882430A60486042 +:1048500000F004B80000000000150058704719E08F +:1048600050F8042BD30744BFA9F101039A18091F7C +:104870000023042942F8043BF9D25FEA817C134605 +:1048800004D54FF0000CA2F800C09B1CC90744BF20 +:104890000021197050F8041B0029E1D17047000075 +:1048A00010B500F013F802000023DB430024106869 +:1048B000984203D011000220ABBE146050689842A9 +:1048C00003D0111D0220ABBE546010BD01487047DB +:1048D000000000005410002010B450F8041B79B1FF +:1048E0000268436802440830DC0744BFA9F10104B0 +:1048F000E31852F8044B43F8044B091FF9D1ECE7D5 +:1049000010BC704710B5074979441831064C7C44F7 +:10491000163404E00A68081D114488470146A14284 +:10492000F8D110BD2C000000680000004EF6885140 +:10493000CEF20001086840F470000860BFF34F8FAA +:10494000BFF36F8F4FF00070E1EE100A7047000068 +:104950000FFFFFFFC404000060100020840A000065 +:10496000300003200000000071FFFFFF080000007E +:10497000BC00000028000320000000005DFFFFFFD6 +:104980005800000084010000081000200000000012 +:104990000000000000000000000000000000000017 +:1049A00001000000020000000300000004000000FD +:1049B00000F00DF8002801D0FFF7A4FFAFF300804E +:1049C0000020AFF30080FDF7F6FD00F002F80120B3 +:1049D000704700F001B800000746384600F002F8C2 +:1049E000FBE7000080B5FFF75BFF024A11001820CB +:1049F000ABBEFBE726000200334600084346000832 +:104A0000A5450008CB45000885450008A1450008DC +:104A10000148804701480047F1460008214A000844 +:104A2000AFF30080FFF782FFFFF7C2FF0000000036 +:104A300000000000FFF7FEBFFFF7FEBFFFF7FEBF5D +:104A4000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9A +:104A5000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8A +:104A6000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7A +:104A7000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF6A +:104A8000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5A +:104A9000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4A +:104AA000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3A +:104AB000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF2A +:104AC000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF1A +:104AD000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF0A +:104AE000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFFA +:104AF000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFEA +:104B0000FFF7FEBF000100000000000000000000F1 +:104B1000000000000000000000000000FFFFFFFF99 +:104B2000FFFFFFFF00000000000000000000000089 +:104B30000100000000000000100000000004004818 +:104B4000000400480004004800080048000C004829 +:104B5000000C0048FFFFFFFFFFFFFFFF00093D00C3 +:0400000508004A2184 :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h index 82bcc8f40..7ebc65aa8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,6 +215,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -224,11 +228,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -236,6 +244,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -383,8 +403,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -503,11 +524,11 @@ typedef enum CFG_TASK_HCI_ACL_DATA_ID, CFG_TASK_SYS_LOCAL_CMD_ID, CFG_TASK_TX_TO_HOST_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -516,11 +537,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -552,9 +574,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -565,5 +587,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h index ff084c8f2..c1ccd8d90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h index 7290a09a4..f5d6dac71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h index dde6cce5a..71075a4c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c index cee6a8a85..c084effe4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -166,9 +165,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -373,6 +371,8 @@ static void shci_user_evt_proc ( void ) TL_MM_EvtDone( p_evt_rx ); TM_Init( ); + + return; } /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ @@ -472,6 +472,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ @@ -492,4 +494,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/main.c index df41b0818..43f84ee24 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,5 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c index f5d3d418e..8092edf93 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,11 +145,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -196,6 +205,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -304,11 +323,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -352,4 +381,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c index 8f60bf94a..3a4948752 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp index d37f1c814..08088ac75 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/BLE_TransparentMode.ewp @@ -1110,6 +1110,12 @@                                                                   + + CMSIS + + $PROJ_DIR$/../Core/Src/system_stm32wbxx.c + + STM32WBxx_HAL_Driver @@ -1173,12 +1179,6 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - - CMSIS - - $PROJ_DIR$/../Core/Src/system_stm32wbxx.c - - Middlewares @@ -1205,9 +1205,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/lhci/lhci.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h index 375fa058d..420310bdb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,4 +90,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h index 845d0f00d..85558e1b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c index 5d82ae9a1..9692ea08c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file tm.c - * @author MCD Application Team - * @brief Transparent mode - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file tm.c + * @author MCD Application Team + * @brief Transparent mode + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -522,5 +521,3 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl /* USER CODE BEGIN FD_WRAP_FUNCTIONS*/ /* USER CODE END FD_WRAP_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h index ed49b4036..d93990039 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/App/tm.h @@ -6,17 +6,16 @@ * @brief Transparent mode interface ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TM_H @@ -93,5 +92,3 @@ extern "C" { #endif #endif /*__TM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/readme.txt index 7003bfa9c..9bbcfb6af 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode/readme.txt @@ -8,12 +8,12 @@ * @brief add here the very short description of the example (the name ?). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc index 94f6db094..b6c006526 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/BLE_p2pClient.ioc @@ -97,8 +97,8 @@ Mcu.PinsNb=19 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -179,6 +179,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_p2pClient +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -327,5 +329,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_p2pClient -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex index 9d89dbcb4..7f0a012fa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:1000000008280020A9790008B1770008B377000814 -:10001000B5770008B7770008B9770008000000003E -:10002000000000000000000000000000BB77000896 -:10003000BD77000800000000BF770008C177000806 -:10004000CB790008CF790008D3790008FF77000842 -:10005000D7790008DB790008DF790008E379000828 -:10006000E7790008EB790008F9770008EF790008D4 -:10007000F3790008F7790008C5770008FB790008D4 -:10008000FF790008037A0008077A00080B7A000855 -:100090000F7A0008137A0008177A00081B7A000804 -:1000A0001F7A0008237A0008277A00082B7A0008B4 -:1000B0002F7A0008337A0008377A00083B7A000864 -:1000C0003F7A0008437A0008477A00084B7A000814 -:1000D000CB770008D17700084F7A0008537A0008E0 -:1000E000577A00085B7A00085F7A0008637A000894 -:1000F000D7770008DB770008DF770008677A000809 -:100100006B7A00086F7A0008737A0008777A000823 -:100110007B7A00087F7A0008837A0008877A0008D3 -:100120008B7A00088F7A0008E3770008937A00083A -:10013000977A00089B7A00089F7A00082DE9F84F0B +:100000000810002009810008997E00089B7E0008E6 +:100010009D7E00089F7E0008A17E00080000000071 +:10002000000000000000000000000000A37E0008A7 +:10003000A57E000800000000A77E0008A97E000839 +:100040002B8100082F81000833810008AD7E000855 +:10005000378100083B810008EB7E0008F17E000834 +:100060003F81000843810008E57E000847810008C1 +:100070004B8100084F810008B17E000853810008C1 +:10008000578100085B8100085F81000863810008D8 +:10009000678100086B8100086F8100087381000888 +:1000A000778100087B8100087F8100088381000838 +:1000B000878100088B8100088F81000893810008E8 +:1000C000978100089B8100089F810008A381000898 +:1000D000B77E0008BD7E0008A7810008AB8100083C +:1000E000AF810008B3810008B7810008BB81000818 +:1000F000C37E0008C77E0008CB7E0008BF810008D1 +:10010000C3810008C7810008CB810008CF810008A7 +:10011000D3810008D7810008DB810008DF81000857 +:10012000E3810008E7810008CF7E0008EB8100082A +:10013000EF810008F3810008F78100082DE9F84FEE :100140000FF2D017A2B0D7E90045CDE900452C9EAB :10015000DFF82C7C04918DF8436000210FF2BC1471 :100160000D9112944FF0FF368246904699460FE06B @@ -26,7 +26,7 @@ :1001800000F0B2800D98401C641E0D90F2D1A8447E :1001900098F80000252807D10021079108910991BE :1001A0000A910B910C910DE06A463146404600F0F1 -:1001B000FDFF050001D10D98B4E0D9D50125E6E792 +:1001B000CFFF050001D10D98B4E0D9D50125E6E7C0 :1001C00041F0010118F8010F2028F9D023280CD0A4 :1001D0002B2804D02D2805D0302809D086E041F006 :1001E0000201EFE741F00401ECE741F00801E9E723 @@ -39,7 +39,7 @@ :10025000010B002000220E920BE040B90E9ABA4228 :1002600005DA02EB820403EB4403303B0E9308F102 :10027000010898F80030A3F130020A2AEDD3ADF856 -:100280004010129898F8001000F09CFF08B118F880 +:100280004010129898F8001000F06EFF08B118F8AE :10029000010B8DF842009DF84200682804BF98F8D1 :1002A0000010682903D162208DF8420008E06C2814 :1002B00004BF98F800006C2804D171218DF8421019 @@ -96,9 +96,9 @@ :1005E0000B6053F8042B0B6052BB4FF0FF340FF637 :1005F000AC200EE095F83A206C2AF0D0086808602C :1006000050F8044B0860EC603CB94FF0FF340FF633 -:10061000702000F0F1FD201A76BD2E6B002E04D55F -:10062000204600F00BFE044608E03246002120463A -:1006300000F020FE002814BF041B3446AC6117E014 +:10061000702000F0B5FD201A76BD2E6B002E04D59B +:10062000204600F0CFFD044608E032460021204677 +:1006300000F0E4FD002814BF041B3446AC6117E051 :10064000294600F092F8002812D54FF0FF3076BD11 :100650006869411C69612521315409E06969481CB8 :10066000686125227254210002D0411C6961345412 @@ -119,14 +119,14 @@ :1007500038B1F06A401C641EF062F5D10020BDE89B :10076000F0814FF0FF30BDE8F0812DE9F8470D46EC :10077000A3B02F6B002F8146904648BF6FF0004713 -:1007800000F0A4FD696B40180FF62C118128D1E907 +:1007800000F068FD696B40180FF62C118128D1E943 :100790000023CDE9012328BF4FF0FF303ED20024D3 -:1007A000002F2FDDD8F8001001AA684600F000FDE8 +:1007A000002F2FDDD8F8001001AA684600F0D2FC17 :1007B0000646002E35D4D8F8000008B9761E30D48D :1007C000B7421FDB6869301881280AD300206863AC :1007D00003AA29464846FFF74DFF040012D4002023 :1007E000686103A8D5F814A032466946504400F069 -:1007F00073FDB244C5F814A058F8040B002818BFC4 +:1007F00037FDB244C5F814A058F8040B002818BF00 :10080000BF1BCDD12CB903AA29464846FFF732FFBA :10081000044614B9002068616863204624B0BDE82E :10082000F0874FF0FF34F8E72DE9FC4707468A468A @@ -139,17 +139,17 @@ :1008900000280ED597F8380000F01400102808D171 :1008A0007A6B7869121A386A121A511A0029C8BF6D :1008B0003962BDE8F3878DF800A0404649462246DC -:1008C000E31700F05DFD3032D0B26D1E3A2801957D +:1008C000E31700F021FD3032D0B26D1E3A280195B9 :1008D00004DB9DF80000A0F151018A1872554046D2 -:1008E00049462246E31700F04BFD8046894600202A +:1008E00049462246E31700F00FFD80468946002066 :1008F000814508BF804503D0F86871198842DCD370 :10090000082C09D197F83800010705D5715D302909 :1009100002D06D1E30207055C5F13C01B9617019CF :10092000F860386B8142B3DA411A39624FF6EF70E2 :10093000398F01403987BDE8F3872DE9D04306465A :100940000F4614464FF00008DFF8389412E0E00735 -:1009500007D542464B463046394600F029FE06464A -:100960000F464046494642464B4600F021FE641081 +:1009500007D542464B463046394600F0EDFD064687 +:100960000F464046494642464B4600F0E5FD6410BE :1009700080468946002CEAD130463946BDE8D0830E :100980002DE9F34F054641F020048DB0D5E90089EB :10099000612C02AE09D0286B002848BF062003D482 @@ -158,27 +158,27 @@ :1009C000380061381A2802D20FF2F46111E00FF2F8 :1009D000F4610EE058004015401C0FD119030DD1F1 :1009E0000320A8619DF8380061381A2814D30FF24B -:1009F000DC61E868032200F06FFCD3E1194621F0C6 +:1009F000DC61E868032200F033FCD3E1194621F002 :100A00000043B3F5801F10460DD20027BB4208BF3C :100A1000BA42019703D111E00FF2AC61E9E701AAF4 -:100A200000F098FE0AE0DFF8607307EB1352DFF87E +:100A200000F05CFE0AE0DFF8607307EB1352DFF8BA :100A30005C3301921940DFF858331943C5E90001CE :100A4000612C0ED1E86830210170811CE9609DF8AD :100A5000381061290CBF7821582141706869801CC9 :100A60006861D5E900AB2BF0004300202AF00002BA :100A7000834204BF8242002300F05A81612C40F07F :100A8000A980286B00284CBF2120401C00904046C4 -:100A9000009F7F1C49460022002300F093FED946A8 +:100A9000009F7F1C49460022002300F057FED946E4 :100AA00001988DF8082038BF89F00049001F019097 :100AB000002FD0460DF1090040F3498140F2FF714B :100AC000DFF8D0B20C91064640464946002200238A -:100AD00000F090FE80F03A814800400D00F11C02C9 +:100AD00000F054FE80F03A814800400D00F11C0205 :100AE00010D0002A0EDD0C98824205DB09F0004090 :100AF00040EA0B01002013E0A448084040EA0251FC :100B000040460DE029F00043002028F00002834217 -:100B100008BF82420FBF40461C22404600F082FEC2 -:100B20008046894600F01CFFFF1F002F044609DDA8 -:100B300000F034FF02460B464046494600F040FFB5 +:100B100008BF82420FBF40461C22404600F046FEFE +:100B20008046894600F0E0FEFF1F002F044609DDE5 +:100B300000F0F8FE02460B464046494600F004FF2E :100B400080468946F01D072104E004F00F0200F8FA :100B5000012D2411002C01DD491EF6D5491E5CBF74 :100B6000002200F8012DF9D5ECE00020194602AA78 @@ -188,20 +188,20 @@ :100BA0009DF838007218147804F130085FFA88F460 :100BB000392CC4BFA0F13A04A044491E02F80189AF :100BC000F1D58DF83800286B002840F1B080591E0F -:100BD0002963ACE0404649460022002300F0F2FDC4 +:100BD0002963ACE0404649460022002300F0B6FD00 :100BE000019938BF89F0004947F2975041436A4A5A :100BF00091FBF2F20192D2F1070204DD4046494630 :100C0000FFF79BFE0AE0524200206449FFF795FE81 -:100C100002460B464046494600F044FF8046662C9B +:100C100002460B464046494600F008FF8046662CD7 :100C2000286BDFF87CB106BF019F0A3706273F1803 :100C3000142FC8BF142730208DF8080089460DF105 :100C4000090000E03046002F34DD064640464946A4 -:100C500001F04CF801460A4606F1080304200A2672 +:100C500001F010F801460A4606F1080304200A26AE :100C6000B2FBF6F606EB860EA2EB4E02303203F82C :100C7000012C0A22B6FBF2F202EB820EA6EB4E0624 :100C80003036401E03F8026DE9D1083F002F03F112 -:100C90000806D7DD084601F03DF802460B464046FF -:100CA000494600F08DFE00225B4600F081FC804644 +:100C90000806D7DD084601F001F802460B4640463B +:100CA000494600F051FE00225B4600F045FC8046BC :100CB0008946CBE70DF10901401A0DF1090604E060 :100CC0000199491E401E0191761C31783029F7D0D8 :100CD000662C02D10199491C03E0652C0CBF01214F @@ -218,7 +218,7 @@ :100D8000CBCCCC0C0000244002FCFFFFFFFF0F8007 :100D90000000E03F0000F07FA08601000000F03F6F :100DA00084D797410FB0BDE8F08F2DE9F84783B0A5 -:100DB00006468A461746984600F0FCF9B8F1000F3F +:100DB00006468A461746984600F0CEF9B8F1000F6D :100DC000406A356B90F8009003DC4FF001080FF299 :100DD0000037BDF930404AF02000662808BF641C87 :100DE00015D0672840F0848014F1040FC0F286808B @@ -229,14 +229,14 @@ :100E300000F80290521C15EB0A0FB8BF6C4220B2AA :100E4000441941424445B8BFA046B26171620FFAED :100E500088F5F561F068B3692A463946184400F010 -:100E60003BFA641BB462C4E022B29045084417DA2E -:100E70004246394600F030FAB0694044B061AAEB0E +:100E6000FFF9641BB462C4E022B29045084417DA6B +:100E70004246394600F0F4F9B0694044B061AAEB4B :100E80000801002D716203DC96F838100A0705D5B9 :100E9000F16801F80090F069401CF061B562A8E0CB -:100EA000394600F019FAB069002D5044A8EB040847 +:100EA000394600F0DDF9B069002D5044A8EB040884 :100EB00003DC96F838100A0703D5F16801F80090B2 :100EC000401CB0610FFA88F08542F068B369B8BF82 -:100ED000A8460FFA88F207EB0A01184400F0FCF963 +:100ED000A8460FFA88F207EB0A01184400F0C0F99F :100EE000B0690FFA88F10844B061681A706280E056 :100EF000BAF1610F14D14FF0700A16E0A84504DA78 :100F000096F838100A0758BF45466D1E48BF0025A1 @@ -245,7 +245,7 @@ :100F3000B061002D17F8012B5A5403DC96F83810D5 :100F40000A071BD5F168431CB36101F80090002D1E :100F500014DDA8F101080FFA88F08542F068B8BFE7 -:100F6000A8460FFA88F23946184400F0B5F9B0697E +:100F6000A8460FFA88F23946184400F079F9B069BA :100F70000FFA88F108446D1AB0617562F068B169C2 :100F80000844002C80F800A003D42B214170811C60 :100F900003E02D2141706442811C00206A460AE072 @@ -268,1711 +268,1837 @@ :1010A00074665F733A2062616420256C73206172FC :1010B00067756D656E7400000000000000000000A0 :1010C0006E616E004E414E00696E6600494E4600EC -:1010D0003000F0B40246106895681318506803EBAE -:1010E0005004C00721D54D441FE0F0BC02F10C00B4 -:1010F000704713F8017B05F8017B491EF9D1A0B1B7 -:10110000B60813F8011B06F00306032E08BF13F8F8 -:10111000016B01EB06214942801C294405D011F8DE -:10112000016B05F8016B401EF9D1A342DDD013F825 -:10113000016B16F0030104BF13F8011BC91C300931 -:101140000F28DAD113F8010B0F30D6E71B48704790 -:1011500030B45368D418042B09DA41B1057804F887 -:10116000015B10F8015B15B15B1C491EF3E753608E -:1011700030BC704738B514461D4661B1FFF7E8FF33 -:1011800061686A6B204690476FF00102811A02D0B5 -:10119000491E03D005E06FF0010032BD4FF0FF3073 -:1011A00032BD0021616032BDDA6B1047034BE1E7CD -:1011B000024BF9E70248704700000000B010002021 -:1011C000781000200278C9B28A421AB11CBF10F808 -:1011D000012FF9E718BF00207047B1F5807F02D3D7 -:1011E0004FF0FF3070470170012070470078401EBB -:1011F0008041C043C00F704780B508B90FF21C0092 -:1012000005490B681BB122220021984701E000F03C -:101210008EFD222002BD0000F8170020636F6E7360 -:10122000747261696E742068616E646C65723A20D4 -:10123000626164206D6573736167650000F101038D -:10124000810704D010F8011B89B18107FAD1026827 -:10125000B2F10131914311F0803F04BF50F8042FE7 -:10126000F6E710F8011B11B110F8011BFBE7C01ADB -:1012700070477047C9B2830706D0521E22D310F8B8 -:10128000013B9942F7D11FE0083A13D302F104025F -:1012900041EA012141EA014150F8043B121F21BFFC -:1012A0004B40A3F1013C2CEA030C1CF0803FF3D02F -:1012B000C9B2001F083210F8013B521E28BF91EA44 -:1012C000030FF8D818BF0120401E704780B5FFF704 -:1012D0003DFF006C02BD704762B38B0708D0521E01 -:1012E00011F8013B00F8013B00F024808B07F6D198 -:1012F000830740F0208000BF103A07D330B4B1E834 -:101300003810103AA0E83810F9D230BC530724BF87 -:10131000B1E80810A0E8081044BF51F8043B40F8B9 -:10132000043BD20724BF31F8022B20F8022B44BF24 -:101330000B7803707047121F17D35B0009D151F867 -:10134000043B20F8023B1B0C121F20F8023BF6D294 -:101350000BE051F8043B00F8013B1B0A20F8023B6C -:101360001B0C121F00F8013BF3D238BF121D521E96 -:1013700024BF11F8013B00F8013BF8D8704700008A -:10138000B3BBD9B1B2F5803F7DD2022A1ED98C46BB -:10139000B1FBF2F102FB11C31B0443EA1043B3FBA0 -:1013A000F2FC02FB1C3380B240EA0343B3FBF2F0D1 -:1013B00002FB103240EA0C4000237047022A05D994 -:1013C0008446B0FBF2F002FB10C270474AB105D16F -:1013D00000F0010249085FEA300070470022002354 -:1013E000704700F0A7BC0B000200002100207047EE -:1013F000904271EB030CF6D3B3F5803F2FD2F0B5DA -:10140000B3FA83F7B1FA81F4A7F10F0E3D1B5340F5 -:10141000CEF1200602FA0EF2F3415340B5F10F0768 -:1014200046D80F3C2C444140C4F12006A040F14175 -:101430004140B1FBF3F603FB1611A2FB0645001B6E -:10144000A94102D2761E8018594180EA010221FA90 -:101450000EF362FA0EF200215A403046F0BD30B46D -:10146000B1FBF3FC03FB1C11A2FB0C45001BA941C3 -:1014700003D2ACF1010C8018594130BC02460B4636 -:10148000604600217047B2F1807F65D3F0B5B2FAB3 -:1014900082F7B1FA81F4C7F10F063D1B22FA06F379 -:1014A00007F1110EF24120355A40B5F10F07B8D9B6 -:1014B0004140C4F12006A040F1414140B1FBF3FCA2 -:1014C00003FB1C11A2FB0C45001BA94103D2BCF17C -:1014D000010C801859410F2F12D30F3FC90341EA65 -:1014E0005041B1FBF3F603FB1611A2FB0645D4EB0A -:1014F000C030A94102D2761E8018594146EACC3C40 -:1015000007B34140C7F12006B840F1414140B1FB6B -:10151000F3F603FB1611A2FB0645001BA94102D2FC -:10152000761E8018594180EA010221FA0EF3C7F1B4 -:10153000200462FA0EF20CFA07F05A402CFA04F179 -:101540003043F0BD80EA010221FA0EF3002162FA75 -:101550000EF260465A40F0BD8C46B1FBF2F102FB40 -:1015600011C31B0243EA1063B3FBF2FC02FB1C3302 -:101570001B024CEA002043EA1063B3FBF2FC02FBBF -:101580001C331B024CEA002043EA1063B3FBF2FC5D -:1015900002FB1C331B024CEA002043EA1063B3FB3E -:1015A000F2FC02FB1C324CEA0020002370470000D2 -:1015B000B0B581EA030C0CF0004C40F2FF7515EA5F -:1015C00011541DBF15EA1357AC42AF4239E0E4197C -:1015D00023EA455343F48013C90241F0004141EA34 -:1015E000505EC7021100A7FB020200284FF0000066 -:1015F000EEFB01204FF00001E3FB072118BF42F092 -:101600000102401800214941E3FB0E01A4F580646A -:101610000F0302D252004041494154F101046CDDF4 -:10162000470872F1004250F1000051EB0451A1F55E -:1016300080115CBF41EA0C01B0BD4CEA05510020AD -:10164000B0BD05EA1357AC4214BFAF4241E050EAC7 -:10165000410E1CBF52EA430E02E061460020B0BDBD -:1016600024423C441BD15FEA070EF6D0090302BFB7 -:1016700001460020AEF1140EB1FA81F7AEEB07047B -:1016800001FA07FE0C37C7F1200100FA07F7C8403E -:101690004EEA000E23EA455343F48013A2E733F0E9 -:1016A0000043B3FA83F704BFB2FA82FE77440B3FDC -:1016B000E41BB7F1200E2FBF02FA0EF3BB40C7F1B7 -:1016C000200E22FA0EFE38BF43EA0E03BA40641C15 -:1016D00082E750EA410E14BF52EA430E6FF0000158 -:1016E0004FF4001717EB430F8ABF194617EB410F52 -:1016F000B5E74CEA05510020B0BDD4F10104B4F1C6 -:1017000020070FDAC4F12007520828BF42F0010277 -:1017100010FA07F501FA07F7E1BF2A43E040384322 -:10172000E1400FE0352C98DCC7F1200452EA40027A -:1017300020FA07F218BF42F0010231FA07F0A14087 -:101740000A43002172F1004250F1000051EB0C01FC -:10175000B0BD000010B5144600F002F8226010BDC4 -:10176000C1F30A5343B14A0012F5001F28D2A3F275 -:10177000FE32A1EB0251704750EA410C20D001F03B -:10178000004C31EA0C01B1FA81F204BFB0FA80F3E7 -:10179000D2180B3AB2F120032CBF00FA03F19140AA -:1017A00041EA0C013EBFC2F1200C20FA0CF31943B0 -:1017B0009040524240F2FD33D21A01EB0351704780 -:1017C000002270474FF4001C1CEB410F94BF1CEB30 -:1017D000430F09E041EA030C50EA4C0C52EA0C0CAE -:1017E00003D2994208BF9042704714BF8B42824295 -:1017F000704700004FF4001C1CEB410F94BF1CEB22 -:10180000430F09E041EA030C50EA4C0C52EA0C0C7D -:1018100003D28B4208BF8242704714BF9942904264 -:1018200070470000124254D440F2FF7C1CEA11536E -:101830000FD0634531D09B1863453CBF01EB02518B -:10184000704701F0004141EA0C510020AFF30080E5 -:10185000704750EA410320D001F0004C91EA0C019E -:101860001CD0B1FA81F30B3B9A420DD9D21A9940A0 -:1018700051EA0C01C3F1200C20FA0CFC61449840A1 -:10188000531C40F2FF7CD7E7914041EA0C01C2F1C2 -:10189000200C20FA0CF3194390407047B0FA80F303 -:1018A0001533202BE0D3202AEED3203A203B9A4256 -:1018B00009D9D21A00FA03F141EA0C010020531CA5 -:1018C00040F2FF7CB8E700FA02F141EA0C01002087 -:1018D0007047524240F2FF7C1CEA11530DD0634521 -:1018E000DBD0B2EB030C3CBFA1EB025170470CF113 -:1018F000010221EA035141F4801150EA410CCCD09D -:1019000001F0004C352A27DC30B481EA0C01B2F139 -:10191000200309DAC2F12003044601FA03F5D0409E -:101920002843D1409C400CE0C3F12002450020FA3E -:1019300003F418BF44F0010421FA03F091400C4372 -:10194000002174F1004550F1000051EB0C012442DC -:1019500030BC7FF47BAF70476146002076E7000023 -:10196000C1F30A5340F2FE329B1A14DDD3F1200377 -:101970004FEAE17208DDC90241EA505141F00040EE -:10198000D84080185040704703F2E13010B1D24384 -:1019900082F000407047002070470000C11768B116 -:1019A0004840401AB0FA80F29040D21CC907C2F5F4 -:1019B000846241EA025202EBD021400570470000E8 -:1019C00070B44FF0004591EA030F40F1B5816B40D0 -:1019D000841A71EB030603D2001BB1411219734143 -:1019E0004FF4001C1CEB410F34BF7CEB430442E07E -:1019F0000C0DA4EB1356352E4FDC45EAC323DB0A4E -:101A000045EAC121C912B6F120050DDD63FA05F6DC -:101A1000EB4086EA0305124218BF45F00105C018E5 -:101A200051F100010CD213E062FA06F5F240554084 -:101A3000F3415A40B340F3405A408018594107D30C -:101A400049085FEA30005FEA350528BF45F0010527 -:101A500001F58011420875F1004250F1000041EBA0 -:101A600004514E0016F5001F70BC38BF70470020AF -:101A7000090D090570471CEB410F10D252EA4306CD -:101A80000BD0BCEB410F05D80C0DAB43661E342EBA -:101A9000B6DD02E0AB438018594170BC704770BCA2 -:101AA00070470000F0B540F2FF7581EA030C0CF0BE -:101AB000004C15EA11541DBF15EA1357AC42AF4252 -:101AC000E5E0BC41C1F31301C3F31303801A99414C -:101AD00043F4801304D2641E4000494180185941E8 -:101AE000C90241EA5051B1FBF3F603FB1611A2FB08 -:101AF0000675D7EBC020A94102D2761E8018594145 -:101B0000C90241EA5051B1FBF3FE03FB1E11A2FBD7 -:101B10000E75D7EBC020A94103D2AEF1010E80189B -:101B20005941890241EA9051760546EA8E2EB1FB71 -:101B3000F3F603FB1611A2FB0675D7EB8020A94133 -:101B400002D2761E80185941C90241EA50514EEA2C -:101B5000060EB1FBF3F603FB1611A2FB0675D7EBDD -:101B6000C020A94102D2761E80185941C90241EA1B -:101B70005051B1FBF3F703FB1711A2FB0735D3EB71 -:101B8000C020A94167F100070CBF004247F00107E0 -:101B900066F3D5274FEA1E31B80814F5806412DDCC -:101BA000BD0775F1004250EB0E5051EB045111F599 -:101BB000801F5CBF41EA0C01F0BD4CF07F6141F039 -:101BC000E0410020F0BDBD076D0840EA0E5041F431 -:101BD0008011D4F10104B4F120060ADAC4F1200620 -:101BE0000200E04001FA06F3E1401843B240154319 -:101BF0000EE0342C13DCC6F1200445EA40056D08E4 -:101C000020FA06F2154321FA06F0A1400D43002107 -:101C100075F1004250F1000051EB0C01F0BD0020C5 -:101C20005FEA0C01F0BDCFB992185B41B3FA83F7BC -:101C300004BFB2FA82F6BF190B3FB7F120062FBFDF -:101C400002FA06F3BB40C7F1200622FA06F638BFB7 -:101C50003343BA401CB1E419641E33E77F4231F0CC -:101C60000041B1FA81F404BFB0FA80F6A4190B3C2C -:101C7000B4F120062FBF00FA06F1A140C4F12006FE -:101C800020FA06F638BF3143A0403C1B1AE7AC42AD -:101C90001ABF05EA1357AF4212E050EA41061CBFD3 -:101CA00052EA4306BFE750EA4107304661461CBF8F -:101CB00041EA0551F0BD52EA430C08BFC143F0BDF3 -:101CC00000204FF4001616EB410F98BF16EB430FA0 -:101CD00008BF16EB410F24BFC14305E016EB430FCD -:101CE0000CBF61464CEA0551F0BD0000400D49189B -:101CF00040EA81200CD2490DA1F58061491C40F0D9 -:101D0000004005DBD1F11F0154BFC840C017704728 -:101D100000207047014648B1B0FA80F18840C91CE4 -:101D2000C1F58461090501EBD02140057047012010 -:101D300000F0B6B870470000841A71EB030604D2B5 -:101D40006E40001BB141121973414FF4001C1CEB93 -:101D5000410F34BF7CEB430682E00C0DA4EB13561D -:101D6000362E7BDC012E45EAC32341DC43EA525385 -:101D700012BFD20292025B08240545EAC12141EA62 -:101D80005051D2EBC020994125D407D1B0FA80F64A -:101D900010FA06F162D00020203608E0B1FA81F690 -:101DA000B140C6F1200220FA02F21143B0404FEADE -:101DB000F474B4EB465434F001064FEA74040AD8C4 -:101DC000D6F50016760D04F00044F04061FA06F2F4 -:101DD0005040F1404840C00A40EA415021F00041E3 -:101DE00028BF5FEA500550F1000044EBD12135E0F7 -:101DF000DB0A45EAC121C90AB6F120050EDD42EA37 -:101E00000242120CC5F1200603FA06F6EB4042EA44 -:101E100006056D42984161F100010DE062FA06F598 -:101E2000F240554063FA06FC82EA0C02F3405A4045 -:101E30006D42904161EB030111F4801F05D1641ED6 -:101E4000620502D06D004041494121F480114308F0 -:101E500075F1004350F1000041EB045170BC704734 -:101E60001CEB410F15D223F0004352EA43060BD07E -:101E70004FEA4C0CBCEB410F04D80C0D661E342EFF -:101E8000B7DDEBE7801A994150EA410608BF00210F -:101E9000E4E708BF1CEB430F28BF6FF00001DDE74C -:101EA00080B5AFF30080024A11001820ABBEFBE7FB -:101EB000260002004FF0B040006800F0F000B028AB -:101EC00088BFB02070472DE9F041040054D020783D -:101ED00081064FF0B04538D5A868E96810F00C00CD -:101EE00001F0030103D00C2808BF012946D128685E -:101EF000800702D5E06900283ED0FFF7DBFF616A6A -:101F0000884207D2084600F0D3FB002834D100F005 -:101F100075FA0FE0286820F0F00001432960696835 -:101F2000206A21F47F4141EA00216960606A00F083 -:101F3000BFFB08BB00F095FBDFF810180860DFF866 -:101F40001008006800F034FCB0B92078C1070DD546 -:101F5000A868E96800F00C00082801F0030103D02C -:101F60000C2808BF03292DD12868800340F139814E -:101F70006068002840F03581012038E2E06980B1D6 -:101F8000296841F0010100F047FA064628688007F9 -:101F900000F1248100F02EFC801B0328F6D30320DF -:101FA00025E2286840084000286000F023FC06462F -:101FB000286800F01FFAC8D000F01CFC801B032822 -:101FC000F6D3ECE76068B0F5803F04D1296841F4AE -:101FD0008031296003E02A6822F480322A60606838 -:101FE00060B100F007FC06462868800300F1F98024 -:101FF00000F000FC801B6528F6D3D0E700F0FAFB68 -:1020000006462868400C10F0010000F0EA8000F05D -:10201000F1FB801B6528F4D3C1E700F0EBFBC01B8C -:102020000328C0F01281BAE7E06878B1296841F46A -:10203000807100F0F1F906462868400500F118812A -:1020400000F0D8FB801B0328F6D3A8E7286820F40B -:102050008070286000F0CEFB06462868800A10F0E9 -:10206000010000F0DC8000F0C5FB801B0328F4D3E6 -:1020700095E700F0BFFBC01B0328C0F00B818EE783 -:1020800040F0010000F0CEF907467068800700F1CB -:102090001C8100F0AFFBC01B0328F6D37FE77068FC -:1020A00020F0040000F0BEF907467068C00810F088 -:1020B000010000F0198100F09DFBC01B0428F4D33F -:1020C0006DE70528306806D140F0040030603168C3 -:1020D00041F0010105E0400840003060316821F026 -:1020E00004013160A06841F2893768B100F082FBD9 -:1020F00080463068800700F10C8100F07BFBA0EB8C -:102100000800B842F5D34AE700F074FB8046306817 -:1021100000F070F900F0FD8000F06CFBA0EB08000F -:10212000B842F4D33BE700F065FBC01B0328C0F0C6 -:10213000FE8034E7B06840084000B06000F05AFB11 -:102140000746B06800F056F900F0F58000F052FB49 -:10215000C01B0328F5D322E700F04CFB801B0328AB -:10216000C0F01F811BE700F045FB001B0328C0F0F7 -:10217000398114E7286881010CD4296841F0807105 -:102180002960E86840F08050E86000F033FB0446C6 -:102190002868810100F12A8100F02CFB001B032834 -:1021A000F6D3FCE60C2931D0286820F08070286036 -:1021B000E968DFF8A00589088900E960E96801405D -:1021C000E96000F017FB04462868810140F10E81A8 -:1021D00000F010FB001B0328F6D3E0E600F00EF938 -:1021E000B3E6207881071AD5A868E96800F00C00EA -:1021F000042801F0030104D00C2808BF02297FF451 -:1022000013AF2868400503D5E06800283FF4B4AE5A -:102210006968206921F0FE4141EA00616960216836 -:10222000DFF8346511F0180F38D0606900283FF4EA -:1022300036AFC90670687FF523AF800709D4706890 -:1022400040F0010000F0EEF80746706880077FF567 -:10225000E4AE706840F0040000F0E4F807467068EF -:1022600000070DD400F0C6FAC01B0428F7D396E689 -:102270006868216920F0FE4040EA01606860CEE7AE -:102280007068A16920F4706040EA0120706000F07D -:10229000C6F8074600F0ADF87FF4EBAE20784107B2 -:1022A00037D5DFF8B8743868C10529D400F0A8FA2A -:1022B00000F0A0FA80463868C10521D400F09AFAEF -:1022C000A0EB08000328F6D369E6706820F004004C -:1022D00070607068C00810F00100DFD000F08AFA6A -:1022E000C01B0428F5D35AE600F099F8074600F021 -:1022F00080F8D3D000F07EFAC01B0328F7D34EE657 -:10230000A06801287FF4DDAE306840F00100306045 -:10231000E8E6217848060ED5A06A00283FF40AAF07 -:10232000B16841F00101B16000F064FA0746B0689D -:1023300080077FF5F8AEE06A002857D0A968EA6800 -:10234000022801F00C017FF42DAF236B02F0030093 -:10235000984202BF02F07000636B984214D1A36BE5 -:10236000C2F30620984202BF02F47810E36B984251 -:102370000AD1236C02F06060984202BF02F0604212 -:10238000606C82423FF4F6AE0C293FF4F5AD28684C -:1023900041013FF5F1AD296821F0807100F03CF872 -:1023A0000646286881013FF5D7AEE968DFF8B0033B -:1023B000A26B0140206B0143606B0143E06B41EA7B -:1023C00002210143206C0143606C0143E9602868ED -:1023D00040F080702860E96841F08051E96000F0C9 -:1023E00009FA0446286881017FF5BDAE0020BDE8EA -:1023F000F0817068400810F0010070472968606A39 -:1024000021F0F001014329606868216A20F47F40CF -:1024100040EA012068607047296000F0EBB97068FD -:1024200040084000706000F0E5B92DE9F843040071 -:10243000884644D0DFF82C6300F0CBF847D200F098 -:10244000CDF8074600F0C5F841D000F0D3F9C01B25 -:102450000228F7D90320BAE000F0CCF9401B02288B -:1024600043D9F7E700F0C6F9A0EB090002284CD9E0 -:10247000F0E700F0BFF9A0EB0900022854D9E9E722 -:1024800000F0B8F9401B02285DD9E3E700F0B2F98B -:10249000401B022867D9DDE700F0ACF9401B484536 -:1024A00077D3D7E7032802D13968890103E00028F0 -:1024B000396802D1890762D401E049055FD401205F -:1024C00085E000F097F9C01B022872D9C2E7207896 -:1024D00081074FF0B0470BD5B968A06821F0F00133 -:1024E0000143B96000F086F90546B868C003B3D56A -:1024F0002078DFF8545281060AD52968606921F0F6 -:10250000F0010143FFF788FF814628688003A9D5C1 -:10251000207841060BD52968A0690909090141EA1B -:102520001011FFF779FF81462868C003A1D52078F4 -:1025300041070BD5B968E06821F4E0610143B96057 -:1025400000F058F90546B868800399D5207801074E -:102550000CD5B868216920F4605040EAC100B86029 -:1025600000F048F90546B86840038FD52078C107C8 -:1025700017D56068022895D1396889039FD5B96855 -:10258000890840EA8100B86041F2893900F032F9E7 -:102590000546B868616800F00C00B0EB810F7FF46D -:1025A0007BAF306800F00700804505D200F016F8D8 -:1025B000074600F00EF884D100F053F8DFF88C11D4 -:1025C000086000F039F9BDE8F24300F0F1B8BDE869 -:1025D000F283306800F00700404570473168C90851 -:1025E00048EAC101316000F005B938B54FF0B04498 -:1025F0005E4DA16811F00C0106D1FFF75BFCC0F342 -:10260000031055F8200032BD0429594A05D0082985 -:10261000584804D12168C90222D5104632BDE1686C -:1026200001F00301022904D0032904D12168C90261 -:1026300007D5104605E0FFF73DFCC0F3031055F841 -:102640002000E168E268E368C1F306214843C2F371 -:102650000211491C5B0FB0FBF1F05B1CB0FBF3F007 -:1026600032BD80B5FFF7C1FF3F49FFE7424A096825 -:10267000C1F3031152F82110B0FBF1F002BD80B597 -:10268000FFF7EFFF00F010F8C1F3022106E080B57C -:10269000FFF7E7FF00F008F8C1F3C22112F821109C -:1026A00001F01F01C84002BD2F49344A0968704734 -:1026B00070B52E49B1282EBFCC6AC0F3031051F873 -:1026C00020402148056800F0D1F82B492C4A05F03C -:1026D0000F0551F82510B4FBF1F10024B1FBF2F124 -:1026E000B0F5007F0FF2B802204609D10FF2940333 -:1026F00053F820508D4214D2401C0328F8D912E020 -:102700000FF2900353F820508D420AD2401C032848 -:10271000F8D308E000F06EF8801B03280CD30320E8 -:1027200070BD52F820400F4D2868C00844EAC00030 -:10273000286000F05FF80646296801F00701A14211 -:10274000E8D1002070BD000008010058741000207E -:1027500058100020FFFFFEEE9000005800040058C3 -:102760008C80C111004000580800005870720008A9 -:102770000024F4000048E8013072000830790008B5 -:1027800040420F001200000024000000360000004C -:1027900040000000060000000C00000010000000D7 -:1027A0000000000001000000020000000300000023 -:1027B00070B50F4E044630780025A8B1FFF751FFE1 -:1027C00032784FF47A71B1FBF2F1B0FBF1F000F026 -:1027D000A9F848B9102C07D2002221464FF0FF304B -:1027E00000F068F8B46000E00125284670BD00BF25 -:1027F0005010002001484068704700BF5010002072 -:102800000248016841F4807101607047000400587B -:10281000134810B5016841F480710160032000F095 -:102820003CF80020FFF7C4FF0024002814BF012457 -:1028300000F0C1F8204610BD0A488068704709487A -:1028400000787047084805E00748016841F0020138 -:1028500001607047016841F00101016070470000AC -:102860000040005850100020042004E0DFF8080069 -:10287000006800F4C06070470004005809010200BD -:1028800081B002D43C48815405E03C4802F00F027C -:10289000104400F8041C01B07047394A13684FF621 -:1028A000FF0100020B4000F4E06018433549084383 -:1028B0001060704738B5324B1C68C4F30223C3F173 -:1028C0000704052C28BF04241D1D072D34BF002339 -:1028D000DB1E012505FA04F4641E2140994005FA27 -:1028E00003F35B1E1A401143BDE83440C6E7000005 -:1028F000010007D4012200F01F01234B8A40400948 -:1029000043F82020704701000BD4012200F01F0182 -:102910001E4B8A40400943F82020BFF34F8FBFF37E -:102920006F8F704710B5401EB0F1807F01D301203A -:1029300010BD174C60600F214FF0FF30FFF79EFF76 -:102940000022A26007202060002010BD010007D4F3 -:10295000012200F01F010F4B8A40400943F820205C -:102960007047010007D4012200F01F010A4B8A4082 -:10297000400943F82020704700E400E018ED00E033 -:102980000CED00E00000FA0500E100E080E100E06D -:1029900010E000E000E200E080E200E0724900E0C8 -:1029A000724981B00A6802430A60096808400090D1 -:1029B000009801B0704780B54FF40020FFF7F0FF9A -:1029C000002200212E20FFF775FFBDE802402E20D7 -:1029D000FFF78EBF00686649884200D0704780B517 -:1029E0004FF48010FFF7DCFF002200212C20FFF7BE -:1029F00061FF2C20FFF77CFF002200212D20FFF734 -:102A000059FFBDE802402D20FFF772BF38B58AB0EC -:102A100004466846142100F0C1F82068554A56491A -:102A200090423CD10868554D40F0010008600968AB -:102A300001F00101059105980120FFF7AFFF0C207F -:102A400000900221002001910290032108200391AF -:102A5000049069464FF0904000F0A4F84848286080 -:102A6000112000F04EF808B100F0DAFA4FF088506B -:102A70000690002101200791ADF82010099006A9C9 -:102A8000284600F0CFFA08B100F0CAFAA567AC6298 -:102A9000002200212520FFF70DFF25202DE0394AD7 -:102AA00090422CD14868384D40F4804048604868D6 -:102AB00000F48040059005980220FFF76FFFC020CA -:102AC000009002210120019102900321072003912F -:102AD000049069462D4800F065F82D4828600F20C5 -:102AE00000F00FF808B100F09BFAA567AC62002275 -:102AF00000212420FFF7DEFE2420FFF7F9FE0BB0B3 -:102B000030BD68601020A8600020E8608020286147 -:102B100000206861A861E8612862284600F0A8BA30 -:102B20001CB504461B49206888421CD1FFF768FE8B -:102B3000FFF766FE1848816B21F4407141F4807103 -:102B40008163816B41F400418163026842F48062D9 -:102B50000260006800F48060009000982046BDE8A4 -:102B6000164000F065BC13BD4C00005850000058E2 -:102B7000000C0058008000405C00005884150020C4 -:102B80004400024000380140E415002000040048E1 -:102B9000440402400028004058000058002200F081 -:102BA0005FBC00002DE9F84F4FF00009644A654B07 -:102BB0004FF00F0805460E4633E0634FBD4214BF89 -:102BC000072704278F4027434CF82E70C1431C6809 -:102BD00001EA040C7468E40348BF40EA0C0CC3F833 -:102BE00000C05C6801EA040C7468A40348BF40EAB2 -:102BF0000C0CC3F804C0146801EA040C7468E40205 -:102C000048BF40EA0C0CC2F800C0546801EA040C4A -:102C10007168890248BF40EA0C0CC2F804C009F18F -:102C20000109316831FA09F077D0012404FA09F476 -:102C300014EA0100F3D04FEA490C032101FA0CF128 -:102C40006FEA010E7168012918BF022903D011290A -:102C500018BF122911D1A968F7680EEA010107FA15 -:102C60000CF73943A960696821EA04047168C1F36B -:102C7000001101FA09F10C436C60E968B4680EEACE -:102C8000010104FA0CF42143E9604FEA89017468F8 -:102C9000022C18BF122C12D14FEAD90405EB840480 -:102CA00001F01C07D4F820A008FA07FB2AEA0B0A57 -:102CB000D6F810B00BFA07F747EA0A0727622C6824 -:102CC0000EEA0407347904F0030404FA0CF43C43DC -:102CD0002C607468E400A2D5DFF870C04FEA990E4A -:102CE0005CF82E7001F00C0108FA01F427EA0404E4 -:102CF000B5F1904F08BF00270ED0154FBD4208BF59 -:102D0000012709D0134FBD4208BF022704D0124F3C -:102D1000BD427FF452AF032754E7BDE8F18F81B085 -:102D2000002A14BF8161816201B070470B4A1368A9 -:102D300003421CBF106000F021BC7047000000007F -:102D400000080058800800580010004808000140A2 -:102D50000004004800080048000C00480C08005817 -:102D6000A04900E0A04981B00A6802430A600968EE -:102D700008400090009801B0704738B59B499C4CC2 -:102D80004FF400400860FFF743FD606840010ED536 -:102D90006068C0000BD4FFF733FDFFF731FD2068FA -:102DA00040F480302060216821F48031216000F0FF -:102DB000DEF8002000F0F0FB40B180798D49E16041 -:102DC000E16821F47C5141EA0021E16000F053F810 -:102DD000894C8A488A4D606204F1240000F0EEFBC1 -:102DE0008848016800220260026902F05002026114 -:102DF0000420FFF7B7FF0120FFF7B4FF0220FFF721 -:102E0000B1FF0420FFF7ACFF0220FFF7A9FF01206C -:102E1000FFF7A6FF00220F210E20FFF74BFD0E202B -:102E2000FFF766FD00220F213A20FFF743FD3A200D -:102E3000FFF75EFD0020606025600F20A06047F670 -:102E4000FF70E06000202061A061E06160612046C9 -:102E500000F0ECFBCA206862FF2153206862A8687A -:102E6000C008C000A860696200F014FB4FF0FF309A -:102E700000F080FCFAE710B5AEB01CA84821FFF7BF -:102E80008DFE01A81C21FFF789FE08A85021FFF73D -:102E900085FEFFF7B5FC5648016821F01801016076 -:102EA00007215948026822F4C06242F400720260AD -:102EB0004FF48032006800F4C06000904FF48074DA -:102EC00000981C9101201E900021402020901D920E -:102ED00027911F941CA8FEF7F6FF6F200190022196 -:102EE0000020029103900490059006900790012124 -:102EF00001A8FFF79AFA43F60300089000214FF467 -:102F0000804019900E910F91102002211B901A9170 -:102F1000189408A800F024FD2EB010BD10B53B4C4D -:102F20003B4800F017F84FF40040E06100202062B9 -:102F30006062A062204600F091FE0021204601F070 -:102F4000CCFA0021204601F0D3FA2046BDE810401B -:102F500001F0A6BA20604FF4E13060600020A0606C -:102F6000E06020610C2060610020A061704729486A -:102F700081B0016841F4801101603F21006800F4D4 -:102F8000801000900098244841604161016841F43C -:102F90007C110160026942F47C120261016841F017 -:102FA0003F010160026942F03F02026101B07047D7 -:102FB00038B50446FFF71EFC14F1010F054609D091 -:102FC000FFF73DFC241805E01448016821F00401D6 -:102FD000016030BFFFF70EFC401BA042F4D331BDAF -:102FE00000000000480000584C00005810400058F5 -:102FF00090000058FECAFECA24150020000C00589C -:10300000002800408008005800040058801200206A -:103010000038014050000058040C005810ED00E04A -:103020007047000018B500F12402507801281BD128 -:103030001378012B01D1022012BD536A10701C6855 -:103040000A48044008680443C868401E44EAC04473 -:1030500048680443087A497A44EA004444EA41242F -:103060001C600020107012BD012012BDFFFD00E0A9 -:1030700038B5040001D1012032BD2168DFF87003AA -:10308000814204F1240500F044F8022068700A68C7 -:10309000A0686FF30E120243E06802432069024306 -:1030A00060690243A0690243E0690243206A024367 -:1030B0000A60204600F070F9A068B0F5804F04BFA8 -:1030C000002161602079696A00F03F0000F014F887 -:1030D00038B1052805D2204600F078F900F012F842 -:1030E00003E0002028636863A8630020A861012032 -:1030F00068700020287032BD0860A96AE86A4860DC -:1031000060687047296B00200860696BA86B486095 -:1031100070470AD2DFF8DC0242181423B2FBF3F244 -:1031200092002A62DFF8D00209E0DFF8D0024218EC -:103130001423B2FBF3F292002A62DFF8C402E861C2 -:103140007047F8B5044604F12406002530780128BC -:1031500001D10220F2BD01273770707801282FD1EC -:1031600002277770B561206807687F087F000760D5 -:10317000204600F0F5F82168F06820B10A6842F0B6 -:103180000E020A6008E0086820F004000860206869 -:10319000016841F00A010160706A0168CA0303D541 -:1031A000026842F480720260306B18B1016841F429 -:1031B000807101602068026842F00102026001E053 -:1031C000357002252846F2BD81B040B100F12401DE -:1031D0004A78022A05D00420886100200870012066 -:1031E00026E00268136823F00E0313604A6A13682E -:1031F00023F4807313600068026852085200026072 -:10320000012091F82020CB6902F01C029040586008 -:103210008A6AC86A5060086B30B1026822F4807212 -:1032200002604A6B886B5060012048700020087073 -:1032300001B0704738B500F124020024517802290A -:1032400003D004209061012428E001680B6823F07A -:103250000E030B6001680D686D086D000D60516A0A -:103260000B6823F480730B60012192F82030D5693C -:1032700003F01C0399406960936AD16A5960116B2D -:1032800031B10B6823F480730B60536B916B596001 -:10329000012151701470516901B18847204632BD37 -:1032A000F8B500F124010423CA691468026815689E -:1032B00091F8206006F01C0603FA06F73C4210D095 -:1032C0006F070ED51468A50603D4156825F004050C -:1032D000156000F03DF8C968002938D0BDE8F44019 -:1032E0000847022303FA06F73C4213D0AF0711D573 -:1032F0001468A50605D4156825F00A051560012295 -:103300004A7000F025F800220A708968F9B1BDE81A -:10331000F4400847082303FA06F6344217D02B0777 -:1033200015D5136823F00E031360012291F82030A5 -:10333000CC6903F01C039A40626001228A614A70E2 -:1033400000220A70096911B1BDE8F4400847F1BDD7 -:1033500091F82020CC6902F01C0293406360704712 -:1033600078B5C56C046D6C60446D14B1846DC56D29 -:103370006560012590F84440066C04F01C04A540EB -:103380007560046863608068102802D1A260E16003 -:1033900071BDA160E26071BD416C0268144B890887 -:1033A0009A4234BF174B184B03EB8101816402F042 -:1033B000FF02083A1421B2FBF1F1144AC26401F091 -:1033C0001F01012202FA01F1016570470179104ADB -:1033D00001F03F0102EB81024265491E0D4A826500 -:1033E00001F0030101228A40C2657047000000001D -:1033F00008040240F8FFFDBF00000240F8FBFDBFDB -:1034000000040240000802401C08024080080240FC -:10341000FC080240400902408A60FF2102685162B4 -:10342000012180F82110002180F820100020704731 -:1034300090F82010012901D102207047012280F864 -:103440002020022180F82110CA21026851625321F4 -:103450000368596201688A6842F02002FFF7DCBF06 -:1034600000B500BF130096469446103928BFA0E867 -:103470000C50FAD85FEA417C28BF0CC048BF40F826 -:10348000042BC90728BF20F8022B48BF00F8012BE6 -:1034900000BD000010B52648264C88B0016841F4F4 -:1034A0000041016001F078F823480168C908C900AB -:1034B00041F0040101600020204901F0FEF901F013 -:1034C00048FB0121012001F06CF8002001F079FC9B -:1034D000012001F076FC022001F073FC012001F0D4 -:1034E00098FC0121002001F0A8FC01F0FDFC144A29 -:1034F0000021402000F0A3F904F23C500FF24501F6 -:103500000090019169460FF2410001F0DDFD04F2E7 -:103510005470029004F5C96140F23C50059003914B -:10352000049402A801F068FD01F0DCFC08B010BDB5 -:1035300008000058300003208004005824150020A3 -:103540000B5100087047000080B501F011FB01F03D -:103550005FFEBDE804400021012001F022B8704761 -:103560004FF0FF3000F006B90021402000F074B9A0 -:10357000022000F097B9022000F09CB9012805D084 -:10358000022805D0102805D101F065BF01F072BFF7 -:1035900001F071BF7047000001460648064AC37932 -:1035A0008B4218BF904218BF0838F8D18B4218BF21 -:1035B00000207047F873FF1F0070FF1FF8B5044626 -:1035C0000025ACB104F13406307910B92046FFF77C -:1035D00001FA0F4F384600F021F8386840F001102A -:1035E0003860204600F007F835600120307100E0B7 -:1035F00001252846F2BD10B50021064A064B00EB16 -:103600008104491C06296360E261F8D310BD000003 -:10361000000C0058D7120008731200080021016046 -:103620004FF03F1141603F218160704738B5040081 -:1036300044D094F8210028B9002184F820102046B5 -:10364000FFF76EFA00F049F8FF2510B100F03FF8DF -:1036500034E02168DFF8B0008A6802408A6021689F -:103660008A68636820690343A06903431A438A6038 -:103670002168E068086120680169A26841EA0241A6 -:1036800001612068C16821F08001C1602068C16CBF -:1036900089088900C1642168CA6CE36960690343D1 -:1036A0001A43CA6420688168880609D400F020F8AB -:1036B00030B120684562042100F01FF8012032BDBE -:1036C00020684562012184F82110002032BD206865 -:1036D0004562042184F821107047022084F82100FB -:1036E000CA2021684862532022685062204626E0A2 -:1036F00020460BE02068C0F8248084F821100020C8 -:1037000084F8200070470000BFFF8FFF70B50446AB -:1037100040F2E9362068C16821F0A001C160FFF7DE -:1037200069F805462068C168880606D4FFF762F884 -:10373000401BB042F6D3032070BD002070BD70B5B1 -:1037400004462068C1684A0612D44FF0FF32C260B6 -:1037500040F2E936FFF74EF805462068C168480692 -:1037600006D4FFF747F8401BB042F6D3032070BDE4 -:10377000002070BD2DE9FC475B4CDFF87091A56916 -:103780002840A0614FF0FF3A4FF0010830E0491C9B -:1037900054F831000642FAD004EBC10618407168B3 -:1037A0001040014208BFC6F804A07768384000F016 -:1037B0009FF8606208FA00F087437760EFF31081AA -:1037C00072B6626A206908FA02F2D24310402061A0 -:1037D000022004EBC00353F8086C1640401E43F867 -:1037E000086CF6D181F31088606A59F82010884778 -:1037F00063692069A2691840104207D0E069216A14 -:10380000084203D1002103EA0206C1E7C4F824A05C -:1038100002F060F8EFF3108972B621696069014027 -:10382000A069014201BFE169206A0142FFF797FEEA -:1038300089F3108802F04FF8A561BDE8F38738B529 -:103840001446EFF3108572B600F052F8274941F89C -:10385000204085F3108831BD10B500F00BF804430B -:103860001C6153F83140204343F83100FFE782F3F5 -:10387000108810BDEFF3108272B61B4B1C697047A5 -:10388000EFF3108172B6184A536923EA000005E08D -:10389000EFF3108172B6144A53691843506181F3F3 -:1038A00010887047EFF3108172B60F4AD36918433E -:1038B000D061F4E7F8B50C4C656A276A2E4615F11D -:1038C000010F0EBF0025012101FA05F5206202E07B -:1038D0002846FFF745FE216AE0690842F8D0884390 -:1038E0006662E0612762F1BD2810002024140020E8 -:1038F00002460020110C090404BF1020120412F02B -:103900007F4F04BF083012020FF2180112F0704FFF -:1039100004BF001D1201120FC0F11F00895C401A84 -:10392000C0B270470403020201010101000000005F -:1039300000000000DFF820130A68030903F47F2366 -:1039400000019A4300F47F2000F082B9DFF80823D9 -:103950001368010C23EA014343EA004313607047F4 -:103960002DE9F843054600242878DFF8EC6241068B -:10397000A0464FF0B0472DD5286B70B1B0F5800F41 -:1039800006D0B0F5000F18BFB0F5400F17D01FE0FC -:10399000F86840F48030F860EDE0386820F080602E -:1039A0003860FEF727FF81463868000140F1D0807B -:1039B000FEF720FFA0EB09000228F5D90324D7E089 -:1039C000FEF718FFA0EB0900022840F2C980F5E7D6 -:1039D0000124A0462868010531D5B06800F440787C -:1039E000286C80452AD0FEF70BFFB8F1000FB168B4 -:1039F00005D1286C21F440710143B1601EE0B0682C -:103A000040F48030B06021F44071B06820F4803020 -:103A1000B060286C0143B160B068C0070ED5FEF7F6 -:103A2000E9FE804641F28939B068800706D4FEF786 -:103A3000E1FEA0EB08004845F6D30324A046287811 -:103A4000C10705D53168A869890840EA810131605C -:103A50002878810705D53168E86921F44061014380 -:103A600031602878C10644BFA86AFFF76FFF287845 -:103A7000810644BFE86AFFF769FF2878410744BF21 -:103A8000286AFFF757FF2878010744BF686AFFF7E5 -:103A900051FF2868C1051BD53168686B21F0406172 -:103AA00001433160686BB0F1006F00F0BDF8686BE6 -:103AB000B0F1806F75D100F0BDF8044638680001A0 -:103AC00060D5FEF797FE001B0228F7D94FF00308D8 -:103AD00067E0FEF78FFE001B02285BD9F6E731682E -:103AE00021F04041316020F08050326822F0406285 -:103AF00010433060A86BB0F1C05F00F095F8286803 -:103B000041056DD53168E86B21F0405101433160CA -:103B1000E86BB0F1005F03D1F96841F48031F960DE -:103B2000E86BB0F1805F5BD100F084F80446386840 -:103B3000000146D5FEF75EFE001B0228F7D94FF0C4 -:103B400003084DE0FEF756FE001B022841D9F6E7B8 -:103B500000F061F8A86821F4781100F071F881464E -:103B6000386800017FF52CAF396968690143396114 -:103B7000002C7FF42EAF3168286B21F44001014303 -:103B8000316027E700F047F8E86821F0606100F055 -:103B900057F80446386800019BD5396968690143C4 -:103BA000396128688105AAD5A86BB0F1804F1CBF88 -:103BB000B0F1004F002892D1316821F04041084314 -:103BC00097E700F028F8286921F0604100F038F804 -:103BD000044638680001B5D539696869014339611F -:103BE0002868C10405D5F168686C21F4404101439F -:103BF000F160286881040BD5796AE86C21F0300106 -:103C000001437962796AA86C890840EA8101796286 -:103C10004046BDE8F2833869696820F4FE4040EA16 -:103C2000012038613969704703D1F96841F080712A -:103C3000F9607047396821F080613960FEF7DABDBC -:103C400001433961386840F080603860FEF7D2BDCA -:103C500010430860704700008800005838B5040021 -:103C600009D004F18005686808B900F01EF800F07A -:103C700021F8012801D1012032BDA06A08B100F06D -:103C80002AF800F00AF821F02A01FFE7816000F02D -:103C90001BF8BDE8324000F002BB2068416821F407 -:103CA000904141602068816870470021297020465A -:103CB000FEF7ACBE2420686020680168490849000E -:103CC0000160204600F086B92068016841F00101DA -:103CD000016020467047204600F07EBA70B5044669 -:103CE00004F180051346686820283CD169B31800A8 -:103CF0002BD02878012836D001222A7004F15406EE -:103D00002165338073800020E86021206860706A3C -:103D1000E8B1DFF8B414C162DFF8B004716A086377 -:103D2000716ADFF8AC0448630020716A8863206818 -:103D3000216D00F12802706AFFF703FA38B11020F4 -:103D4000E8600020287020206860012070BD216894 -:103D500040200862002028702068816841F08001BE -:103D60008160002070BD022070BD816821F040019B -:103D700081607047206881684A0670472068016842 -:103D800021F0100101607047F8B5044640F60F00BD -:103D90002668F1693268B368084004F15C050ED109 -:103DA000880602D5900602D4D80040F18080696967 -:103DB000002900F00E812046BDE8F4400847DFF8F6 -:103DC0000C06034204BFDFF808763A426FD0CF07F3 -:103DD00007D5D70505D5012737622E6B46F00106BA -:103DE0002E638E0708D5DE0706D5276802263E62B9 -:103DF0002E6B46F004062E634E0708D5DE0706D567 -:103E0000276804263E622E6B46F002062E630E07DC -:103E10000AD5960601D4034206D0266808203062EF -:103E2000286B40F008002863080509D5500107D524 -:103E300026684FF400603062286B40F02000286351 -:103E4000286B002832D0890607D5900601D4D80007 -:103E500003D5696909B120468847286B21688A68BB -:103E6000510602D410F0280F1BD0204600F093FA20 -:103E7000FFF780FF10D5FFF778FF286A60B10FF2D7 -:103E8000DD518163286AFFF7D5F900280ED0286A32 -:103E9000816BBDE8F44008472046BDE8F24001F0E0 -:103EA0001BBD204601F018FD00202863F1BD2869E4 -:103EB000012853D1CF0651D5D0064FD510203062FE -:103EC00022689068410626D5296A0868406880B251 -:103ED0000028EBD02B8898427BDA6880086801685C -:103EE0008B0614D4106820F48070106020688168FC -:103EF0004908490081602068FFF737FF2020E86209 -:103F000000202861FFF73AFF286AFFF75DF929884A -:103F10006888091A1CE028886988411A688800287E -:103F20001CBF88B2002854D01368DFF8400523F482 -:103F30009073136022689368034093602020E862C6 -:103F40000020286168612068026822F01002026087 -:103F50002046BDE8F44089B201F0BFBCC80209D5D3 -:103F6000580207D54FF4801030622046BDE8F24079 -:103F700000F010BB080609D5100601D4180205D5BB -:103F8000A96931B32046BDE8F440084748060ED57C -:103F900050060CD5306820F0400030602021A96226 -:103FA0000020A8612046BDE8F24001F0AEBC080246 -:103FB00006D5500004D52046BDE8F24001F0B6BC5D -:103FC000C80148BF002A04D52046BDE8F24001F0F0 -:103FD000AEBCF1BDF8B50446DFF894042168DFF803 -:103FE00094C40A68DFF890740240A0680243206914 -:103FF000024360690243E06902430A6000254A689F -:10400000E06822F4405202434A60A369714A914237 -:104010001CBF206A03438E68DFF860040640334308 -:104020008B600FF26446CB6A606A1B0940EA031397 -:10403000CB626145DFF848044FF4004339D13F6853 -:1040400007F00307032F4DD8DFE807F00246434986 -:104050004FF0010CE169B1F5004F4FF6F07740F0F9 -:104060008080BCF1010F09D0BCF1020F0AD0BCF175 -:10407000040F71D0BCF1080F71D099E0FEF707FB77 -:10408000002815D0626A616836F81230B0FBF3F090 -:104090004A0802EB4002B2FBF1F080B2A0F110013D -:1040A000B942EAD20740C0F3420007432068C76024 -:1040B0007FE0914216D13F6817F4406723D0B7F5EF -:1040C000806F09D0B7F5006F03D0B7F5406F06D009 -:1040D00008E04FF0020C07E04FF0040C04E04FF052 -:1040E000080C01E04FF0100C9142B3D1BCF1000F6D -:1040F00009D0BCF1020F0AD0BCF1040F15D0BCF1FD -:10410000080F15D054E0FEF7BAFA002851D0616AC2 -:1041100036F81120B0FBF2F6626802EB42018E42E3 -:1041200046D31103B14205D242E0FEF75EFAECE756 -:104130001846ECE75008002110EB062051EB166101 -:104140000023FDF71DF9A0F54071DFF838239142F7 -:104150002ED22268D0602CE0FEF747FA90E718468E -:1041600090E7BCF1010F09D0BCF1020F09D0BCF1FE -:10417000040F18D0BCF1080F18D019E0FEF787FA29 -:10418000B8B1626A36F812306168B0FBF3F000EB48 -:104190005100B0FBF1F080B2A0F11001B94207D29A -:1041A0002168C86005E0FEF720FAE9E71846E8E76D -:1041B000012504F168000121418001800021816016 -:1041C000C1602846F2BD0000D54300080344000842 -:1041D0000D4400080080004090F82810CA0706D55A -:1041E00002685368C16A23F400330B43536090F8AC -:1041F00028108A0706D502685368016B23F48033C0 -:104200000B43536090F828104A0706D5026853689C -:10421000416B23F480230B43536090F828100A0766 -:1042200006D502685368816B23F400430B43536047 -:1042300090F82810CA0606D502689368C16B23F46B -:1042400080530B43936090F828108A0606D50268C5 -:104250009368016C23F400530B43936090F828108B -:104260004A0610D502685368416C23F480130B434F -:104270005360416CB1F5801F05D15368816C23F404 -:10428000C0030B43536090F828100A0606D5016856 -:104290004A68C06C22F4002202434A607047F8B5B5 -:1042A000044604F180050020E8606FF07E47FEF7C9 -:1042B000A1FA0646206801680A0708D50097334628 -:1042C00000224FF40011204600F017F860B9206872 -:1042D00001684A070AD50097334600224FF480014F -:1042E000204600F00AF808B10320F2BD20206860E3 -:1042F000A8600020E0662870F2BD2DE9F041069C20 -:1043000005460E4690461F462868C1693140B142B5 -:104310000CBF0120002040451CD114F1010FF3D047 -:10432000FEF768FAC01B844200D314B900F015F8F8 -:104330000CE0286801684A07E6D5C1690A05E3D59B -:104340004FF40062026200F008F8C16000210170C1 -:10435000032000E00020BDE8F0812868016821F416 -:10436000D07101602868816849084900816005F1C1 -:104370008000202141608160704701680A6822F056 -:10438000C0020A6001688A6822F400028A60202163 -:10439000C0F88410704701680A6822F490720A60BD -:1043A000DFF8C810026893680B409360C16E012962 -:1043B00004D101680A6822F010020A602021C0F8C6 -:1043C00088100021C16601677047000001000010DD -:1043D00020010004816A00680268930644BF084611 -:1043E00001F093BA0020A1F856000868826822F014 -:1043F000800282600868FFE7016841F040010160C7 -:104400007047806A01F094BA00000000F8B5846A31 -:1044100004F1840504F1560728686E6821688A68EB -:10442000110606D5212804D1002038802046FFF748 -:10443000A4FF20688168480606D5222E04D10020FA -:1044400038812046FFF7A7FFA86840F01000A86059 -:104450002046BDE8F24001F03FBA0000806A00F15A -:10446000560100220A810A8001F036BAFEFFFFEFF2 -:10447000F369FFCF0038014088000058FFF4FF11B6 -:104480000024F40000FD0F000100020004000600FB -:1044900008000A000C00100020004000800000010D -:1044A00010B500F180010A78012A01D1022010BD67 -:1044B00001230B7024224A600268136814686408A0 -:1044C000640014600022426623F000530068036019 -:1044D000202048600020087010BD70B500F01EF864 -:1044E00001D1022070BD00F01FF822F0604209E007 -:1044F00070B500F013F801D1022070BD00F014F87F -:1045000022F0606211438160204600F01AF82068B2 -:104510000660202068600020287070BD044604F109 -:10452000800528780128704701222A7024206860BD -:10453000206806680268520852000260206882689B -:10454000704730B5416E11B90121012214E00168B4 -:104550000FF230048A6889680FF23003520E02F0BD -:104560000702490F655CA45C595C9A5CED00E400AD -:1045700095FBF1F194FBF2F268304180028030BD8E -:10458000000000000101010307010000080402040B -:1045900008010101704700000C48002101604160E2 -:1045A000704710B500F00CF85C6819B1012904D10E -:1045B000204301E024EA0000586082F3108810BD17 -:1045C000EFF3108272B6014B70470000B81700205D -:1045D000DFF83C150A6892B200E00246086880B233 -:1045E0008242FAD170472DE9FC4104461825DFF8D4 -:1045F0002485DFF82465684308EB00073078062837 -:1046000008D131787170347078754FF0FF30706078 -:10461000002039E000F077F8B9680918B96008F1AE -:104620000803B96832786A439A589142327813D3B2 -:1046300008F1150315FB02FC13F80C30062B25D0EE -:1046400008F108066B43F358994222BF08F115039D -:104650006A439A5CEED219E01146337869439A4274 -:104660000BD008F1140308F1150C5B5C15FB03F586 -:104670000CF805407A753B7500E07A7508F1140274 -:104680005454317871703470BDE8F6811146694335 -:1046900008F115035B5C062B04D008F1140615FB2A -:1046A00003F574557B753A7508F115025454EBE720 -:1046B000F8B5DFF86434DFF85C541E78182402463D -:1046C0006243B0422A4404D118785870507D187063 -:1046D0000FE0167D507D92F815C005F11507664371 -:1046E000062807F806C004D0167D143514FB00F424 -:1046F0002E55012010731878062802BF00294FF0AC -:10470000FF315960F1BD10B5DFF80C44606810F15D -:10471000010F0FD0FFF75CFF6168DFF800248142D2 -:1047200061683CBF5388C918081A5178484311780A -:10473000C84000E0002080B210BD2DE9F84FDFF83E -:10474000DC53DFF8DCB3D5F80880D8F80000DBF8DC -:1047500000104A0500F090F9DFF8BC63DFF8B4A35D -:1047600021F4806181604FF0180934780AF1080063 -:1047700019FB04F14758FFF7C6FF874217D20027FD -:104780000121B170062C3DD019FB04F40AF1080197 -:104790000AF108020959814223BF0AF108010959A7 -:1047A000091A002111510AEB04014C7DEAE7A9889E -:1047B0004118B94202D2AF880021E2E73F1ADFE791 -:1047C000022802DA2878012800D07F1ED8F80000DD -:1047D000C1684A07FAD500F055F9DBF80C00000C67 -:1047E000BFB247EA0047CBF80C70FFF7F1FE7060EC -:1047F000A8680068816841F480618160AFF300803F -:10480000BDE8F18FB8B20028DAD1FFF7E1FE7060A1 -:104810000320BDE8F24FFEF799B82DE9F843EFF316 -:10482000108872B6BD4DBB4BA8680168CA224A62A7 -:1048300053204862B84A886820F480608860182055 -:104840001678374647431F44387B022826D13C68F8 -:10485000D7F810909078F0B17A7B012A0AD1012123 -:104860003046FFF725FF88F310887968304600F05E -:1048700016F904E088F31088304600F0C1F8A86803 -:104880000068CA21416222465321416248463146AE -:1048900000F050F90BE0FFF750FF06E0C868420750 -:1048A000FCD500F07EF89F49086088F31088FF214E -:1048B000A86802685162BDE8F183F8B5974CA16021 -:1048C000CA2209684A6253224A62954A136843F031 -:1048D00020031360136803F00703C3F1040323707C -:1048E00095682D0C05F07F056D1C6570EDB2926822 -:1048F000C2F30E02521C628092B2521E6A43A2F5AB -:10490000A072DA404FF6FF739A422CBFA380A280B8 -:10491000854A136843F400231360844B1D6845F4F3 -:1049200000251D6048BB7C487A4E01238370182502 -:104930004FF0FF33436000235FFA83FC06F10C075E -:1049400015FB0CFC4FF0000E07F80CE05B1CDFB20F -:10495000062FF1DB06230370886820F480608860EE -:1049600000F01FF8D0600320FDF7FBFFA168086886 -:10497000826842F48042826005E0C868410544BF15 -:104980000320FDF7E3FFA1680A68FF2050620022C0 -:1049900003210320FDF78EFFBDE8F2400320FDF761 -:1049A000A7BFC86800F0800060F49060C8604FF452 -:1049B00000207047F0B504460025EFF3108672B66C -:1049C0001827DFF850C10CF10C0007FB05FE10F8AA -:1049D0000E0010B16D1C062DF5DB062D0CD06F43BB -:1049E0000CEB07000127077386F3108804614273FC -:1049F00003600D700020F0BD86F310880120F0BD2B -:104A0000F8B50746EFF3108472B60320FDF77BFF7D -:104A1000424DAE683068CA2141623A465321416234 -:104A2000182043494243895C02291BD100213846A2 -:104A3000FFF73EFE3848017806290ED13068384924 -:104A40000A68530500F018F821F480618160C1689C -:104A50004A07FCD500F016F804E04078884218BFF9 -:104A6000FFF76BFEA9680A68FF2050620320FDF77C -:104A70003FFF84F31088F1BD02D5C1684A07FCD41A -:104A800081687047C16801F0800161F49061C16084 -:104A90004FF40020234908600320FDF762BF2DE991 -:104AA000F04180460F46424618201A4942438C186E -:104AB000207B022804BF4046FFF7A2FFEFF31085DA -:104AC00072B60320FDF71FFF144EB0680068CA21BC -:104AD00041625321416202202073A7606760404613 -:104AE000FFF781FD0C490A784978914202D0FFF71F -:104AF00024FE02E0A168081AA060FF20B1680A68DD -:104B000050620320FDF7F4FE85F31088BDE8F081C4 -:104B10002828004010130020E8170020A4170020C8 -:104B2000082800400C080058000800588008005869 -:104B30001C13002010470000484900E0484981B09C -:104B40000A6802430A60096808400090009801B0B2 -:104B5000704780B5FDF776FEFDF776FE41480168A7 -:104B600041F48031016000F000FFBDE801400EE03B -:104B700000B587B068460FF218211C22FCF7BCFB79 -:104B800000F06FFA684600F03DFF07B000BDF0B5D9 -:104B900085B068461421FEF701F8002600250024A0 -:104BA00000210FF2DC0000EBC102907988B113689C -:104BB000B3F1904F08D02C4FBB4208D02B4FBB42D3 -:104BC00004BF9088044304E09088064301E0908885 -:104BD0000543491C2229E4DB002002900121032027 -:104BE00003900191B0B288B100900120FFF7A4FFBB -:104BF0000120FFF7A3FF69464FF09040FDF7D2FF79 -:104C00000022B1B24FF09040FEF789F8A8B280B10F -:104C100000900220FFF790FF0220FFF78FFF124E57 -:104C200069463046FDF7BEFF0022A9B23046FEF7C6 -:104C300076F8A0B280B100900420FFF77DFF042039 -:104C4000FFF77CFF094D69462846FDF7ABFF0022C0 -:104C5000A1B22846FEF763F805B0F0BD4C0000583D -:104C60004C01005890080058000400480008004813 -:104C7000FEF754B913460A460146002000F02EBE46 -:104C80000000004801000000000000480100000092 -:104C90000000004801000000000000480100000082 -:104CA0000000004801000000000000480100000072 -:104CB0000000004801000000000000480100000062 -:104CC0000000004801000000000000480100000052 -:104CD0000000004801000000000000480100000042 -:104CE0000000004801000000000000480100000032 -:104CF0000000004801000000000000480100000022 -:104D00000000004801000000000000480100000011 -:104D10000000004801000000000000480100000001 -:104D200000000048010000000000004801000000F1 -:104D300000000048010000000000004801000000E1 -:104D400000000048010000000000004801000000D1 -:104D500000000048010000000000004801000000C1 -:104D600000000048010000000000004801000000B1 -:104D700000000048010000000000004801000000A1 -:104D80000000004801000000000000480100000091 -:104D9000000000000000000000000000804C00083F -:104DA000280003202C00032022040400444981B081 -:104DB0000A6802430A60096808400090009801B040 -:104DC000704778B585B0044668461421FDF7E6FEC5 -:104DD0000220FFF7EBFF00F010F800950120019092 -:104DE0000021022003900291694656F82400FDF745 -:104DF000D9FE00F008F806B070BD0FF2D400314EB5 -:104E000030F81450704756F8240000222946FDF768 -:104E100086BF0FF2BC012B4B31F8101053F8200065 -:104E20000122FDF77CBF0FF2A801264B31F81010CC -:104E300053F820000022FDF772BFF0B585B005469B -:104E40000C4668461421FDF7A9FE0DB9042004E0C4 -:104E5000012D18BF022D02D10820FFF7A7FF200067 -:104E6000194E0FF274070DD137F81500009000218C -:104E70000191012002900221039100F01BF8012012 -:104E8000FEF796F8012C13D137F815000090012198 -:104E90000E480190029100F00DF80FF24400445DBD -:104EA00000220F2160B2FDF705FD60B2FDF720FD85 -:104EB00005B0F0BD694656F82500FDF773BE000049 -:104EC0004C0000585C1000206810002000002110E9 -:104ED000200001000200000010000100020000009C -:104EE0000A06070000F00ABE6C486D49016001F136 -:104EF0002002426001F13002826001F13C02026254 -:104F000001F14402426201F14C02C26001F154021B -:104F1000026101F17002426101F17402826180312B -:104F2000C16100F009BE38B504465E4D284600F068 -:104F30006DFE5A484068A1680160E168C160856003 -:104F40005949416000F014FE58482AE080B55348A2 -:104F50004268136801211972406800F00FFE0020BA -:104F600002BD38B5514C4F4D04E000F041F80098B7 -:104F700021688847284600F04CFE0028F5D031BD56 -:104F80004A484168084738B50446494D284600F06C -:104F90003DFE4248C068A1680160456000F0F3FD35 -:104FA00044482168016061684160002032BD80B5DD -:104FB0003A48C268136810211972C06800F0E9FD10 -:104FC000002002BD35483B4AC168C16813680868C3 -:104FD000184738B5374C364D04E000F009F8009812 -:104FE00061688847284600F014FE0028F5D031BDDE -:104FF0006946284600F036BE38B504462E4D284690 -:1050000000F004FE2D4800F001FE24480069A1686C -:105010008160E168C160056121680160616841608B -:10502000216941616169816131BD80B501462348D3 -:1050300000F002FEBDE802400FF2050000F0B9BD2D -:1050400038B5164C1D4D06E0FFF7D2FF00992069D8 -:10505000006900F0F1FD284600F0DBFD0028F3D0E8 -:1050600031BD10B5164C204600F0D0FD0B4841690B -:105070000C60BDE8104000F0B0BD1CB5104C06E05F -:105080006946204600F0EEFD009800F01BF820462F -:1050900000F0BFFD0028F3D013BD00000000032086 -:1050A000AC090320480A032090080320C8170020F9 -:1050B000500A0320D0170020380A0320C017002010 -:1050C000400A0320704700007FB50C464D4D6168D3 -:1050D0004D4EE8612962284600F0D6FD24687460D0 -:1050E00006F1080000F092FD012000F068F80120B0 -:1050F0003070296841B10FF2E9000FF2ED02009023 -:1051000001920294684688477FBD1FB53E4C04F16A -:10511000080000F07EFD00BB2178F1B1694604F182 -:10512000080000F09FFD3748C16949B1009802901E -:1051300001228DF8042001A888479DF8040000E0B2 -:1051400001202070207818B10098FFF76EFF04E06E -:10515000009904F1080000F065FD04F1080000F07A -:1051600058FD28B9207818B104F10800FEF7FCF9C1 -:105170001FBD2DE9F04105460E4690461C46002015 -:1051800000F01DF8204F7868A0F80950C67232462A -:1051900041460C30FCF7A0F81A4A136900210020A0 -:1051A000984748F2E800FEF7E6F979688A78D21C59 -:1051B00004F10800FCF790F8BDE8F04101201CB5AF -:1051C0001049124C096A20B901B1884700202070AB -:1051D00013BD0120207011B1BDE81C40084713BD6C -:1051E0000020FEF7C5B9000010B50146064C04F1D9 -:1051F000080000F021FD04F10800BDE81040FEF7B2 -:10520000B3B90000101700209417002000180020E8 -:1052100010B58EB002A80FF28C61DFF80044302286 -:10522000FCF76AF80FF245400190009469460FF2CE -:10523000254000F033FD01210220FFF7B2F9DFF82D -:10524000E02300212020FEF7FAFA02A800F0D2FBAA -:1052500008B1FDF7E5FE00F00FF900F003FE0FF2D4 -:10526000293200210120FEF7EAFA0FF2593200211B -:105270000220FEF7E4FADFF8AC43002084F8800057 -:10528000202000F095FE00F0C7FE0FF2AD330022A3 -:1052900004F181010020FFF78DFB0EB010BD2DE958 -:1052A000F043074685B07878DFF87843DFF8786315 -:1052B00005284FF0000804F1800554D03E2863D043 -:1052C000FF280DD101203072B7F80300042842D026 -:1052D00040F20741884204D040F60201884218D0CB -:1052E000A6E07879022804BFB9790029F8D1002016 -:1052F000FFF799FD0FF2883001F0D2F9A878012864 -:1053000006D12978062903D000210220FEF7A4FA4D -:105310008EE0002000F04CFEF879307301253889CA -:10532000F08179893182BA897282FB89B382388AA5 -:1053300004950090F082357BE08A03951026029652 -:10534000019601F0C1F910B10220FFF762FD2020A3 -:1053500000F02EFE6CE00120FFF75BFD68780A216B -:10536000FFF79DFB64E0B888E18A884260D1A4F829 -:10537000168085F800800FF2383001F091F9012095 -:10538000307200F059F853E0F878012802D0022872 -:105390001DD04DE0B7F80500E082062028700FF21E -:1053A000383001F07DF986F8088000F045F8E08A91 -:1053B00001F019FA30B90FF2483001F071F90FF22B -:1053C000743001E00FF29C3001F06AF930E097F898 -:1053D0000D90787960BB29E007EB0800847BC07BE7 -:1053E000FF2821D1072C1FDB07EB0800007C0128D8 -:1053F0001AD10FF2B03001F053F907EB0800407CEE -:10540000832811D10FF2BC3001F04AF90120A870B5 -:10541000F8793070387A7070787AB070B87AF07045 -:10542000F87A3071387B7071641CA044C845D3DBB6 -:10543000012005B0BDE8F083E08A708106F1080024 -:1054400000F00BBE7749CA8A824202D191F88000EF -:1054500070470020704780B500F01FFF062805D078 -:10546000BDE8044000210120FEF7F6B9BDE8014087 -:1054700000F005BE7047704718B589B00020ADF840 -:105480001A0001F06EFA694C216811F1010F0DD07C -:10549000674862680170120A090A41706168817088 -:1054A000C270110A120C0171427105E00020FEF772 -:1054B00073F808B90FF2C43002460621002000F04C -:1054C00042FD4EF66E50089007AA2068554C079092 -:1054D00006212E2000F037FD0FF2A83210211820EF -:1054E00000F031FD0FF2AC321021082000F02BFD4E -:1054F0001821012000F04EFD01F02EF90DF11600EB -:1055000006A90190009105AB07220021042001F0BB -:1055100098FA0FF2D420BDF8181000900523BDF8BA -:105520001400002201F02FF90DF11A00009002235F -:10553000BDF81610BDF81400002201F024F9012076 -:10554000207001F032FA01206070012108202071E2 -:10555000A1701020607100210120E07004911021E1 -:105560003448A0600390082201200191009202902B -:1055700000230122012101F031FAA07808B101F0E5 -:1055800098FA0AB010BD0000264890F8801006294D -:1055900000D1704780B50020FFF73BFC4FF4487105 -:1055A00001230022084601F09FFA10B90FF24020B3 -:1055B00004E00220FFF72DFC0FF26420BDE802405A -:1055C00001F06EB818B587B00FF28420154C01F0C9 -:1055D00067F894F8800006281DD0102106910591E7 -:1055E0004FF4FA70049050210023029128220020E9 -:1055F0000393019200904FF448710B4B0022084630 -:1056000001F097FA08B9042003E00220FFF701FC3B -:10561000002084F8800008B010BD0000A00803201E -:10562000DB5C0008A0130020541700208075FF1FCA -:10563000B017002007B201000120FFF7F4BB0021E2 -:105640002020FEF709B90120FEF72CB90120FEF752 -:1056500031B9000010B50446616801F1080000F09E -:1056600011FC00B10120207010BD000010B1012814 -:1056700003D070473F20FEF703B93F20FEF708B97B -:105680002D2D204741502047454E4552414C204446 -:105690004953434F564552592050524F4345445564 -:1056A00052455F434F4D504C455445440A0000005D -:1056B0000D0A0D2A2A20444953434F4E4E45435468 -:1056C000494F4E204556454E542057495448205383 -:1056D0004552564552200A000D0A0D2A2A20434FF2 -:1056E0004E4E454354494F4E204556454E54205743 -:1056F00049544820534552564552200A00000000A4 -:105700000D0A0D2A2A204741545420534552564928 -:105710004345532026204348415241435445524972 -:10572000535449435320444953434F5645525920FB -:10573000200A00002A2047415454203A2020537464 -:1057400061727420536561726368696E672050727C -:10575000696D617279205365727669636573200D96 -:105760000A0D0000424C455F4354524C5F4170703B -:105770005F4E6F74696669636174696F6E28292C66 -:1057800020416C6C2073657276696365732064696F -:1057900073636F76657279204661696C6564200D6C -:1057A0000A0D00002D2D2D205354204D414E5546FD -:1057B00041435455524552204944202D2D2D200A55 -:1057C000000000002D2D20534552564552204445DF -:1057D000544543544544202D2D20564941204D41E8 -:1057E0004E2049440A0000005032505F4300000040 -:1057F000200D0A0D2A2A2053544152542047454E69 -:105800004552414C20444953434F56455259202854 -:105810005343414E29202A2A20200D0A0D00000062 -:105820002D2D20424C455F4170705F53746172743E -:105830005F4C696D697465645F446973635F526549 -:10584000712C204661696C6564200D0A0D00000012 -:105850000D0A0D2A2A2043524541544520434F4EFC -:105860004E454354494F4E20544F205345525645C0 -:1058700052202A2A20200D0A0D0000006C7AD8AC94 -:1058800057720000123456789ABCDEF01234567803 -:105890009ABCDEF0FEDCBA0987654321FEDCBA095A -:1058A00087654321000000000000000000000000A8 -:1058B0000000000000000000440008004005020154 -:1058C00012279C00F4010000FFFF000048010100C6 -:1058D00000200000704770477047704710B50024E3 -:1058E00088B9114803600E480E4B0360FEF7F6F9C5 -:1058F000012805D007D3032804D038BF022402E0D2 -:10590000012400E00324204610BD006805498842B8 -:1059100004D105490868002818BF004770470000F7 -:105920008012002000380140F417002070477047B3 -:105930007047000038B5EFF3108472B6284D694601 -:10594000281D01F086FA6946281D01F0DFFA38B1FA -:1059500084F31088BDF80010224AFFF78BF931BD9F -:105960000120287084F3108831BD80B5FFF780F9DD -:105970000221009100231A4800F124014FF48052C3 -:10598000001D01F04DF901BD00BFF8B51446002619 -:10599000EFF3108510F1010F1ED001281CBF022863 -:1059A0004FF0FF3618D1BCB1264672B60C4F01231A -:1059B00092B2381D01F048F900281CBF397800293F -:1059C00008D000223A7085F31088A1B2054AFFF78B -:1059D00051F901E085F310883046F2BD0000000067 -:1059E0000400002035590008FFF7C3FB9DF80E00A6 -:1059F00005B000BDF8B500F10C026B4624214FF64E -:105A00006640F1E7F8B500F10C026B460F214FF646 -:105A10006840E9E7C0680840884201D1012070472A -:105A200000207047C0690840884201D101207047BA -:105A30000020704710B56C4C02212046FFF7F2FFA2 -:105A400038B16068C043810703D5FFF7C2FA02206E -:105A500018E001212046FFF7E5FF38B16068C04338 -:105A6000C10703D5FFF77DFA01200BE0082120468E -:105A7000FFF7D8FF38B16068C043010703D5FFF7CF -:105A8000FCFA0820A06010BD10B5574C00F033F8A8 -:105A900018B96068C043810306D400F02CF830B90F -:105AA0006068C043810302D5BDE810407AE0082158 -:105AB00000F022F870B96068C04301030AD560683D -:105AC0004A4940F400206060086880474FF4002095 -:105AD000A06010BD202100F00FF858B96068C043E5 -:105AE000810207D5606840F400106060BDE8104096 -:105AF000FFF746BA10BD022120468BE73C4881B033 -:105B0000016841F480110160006800F48010009089 -:105B100000983848016841F4007101603648026815 -:105B200042F40072026040BF20BF3448016841F473 -:105B30000041016001B0704780B53148016841F40F -:105B400080110160006800F48010009000982648E1 -:105B5000016841F001010160026842F48032026094 -:105B60002C20FCF7C5FEBDE802402D20FCF7C0BE8E -:105B700024480168490849000160704722494FF4F0 -:105B80008030086070471F48016821F00201016001 -:105B900070471C484FF400314160016821F4003126 -:105BA000016070471748016841F400310160FFF758 -:105BB00009BA38B504460C4D08212846FFF72AFFDC -:105BC00030B10A480460686820F40020686031BD84 -:105BD000A0474FF40021A96031BD0A48016821F0B7 -:105BE0000801016070470000000C0058F017002009 -:105BF00050010058D4080058200800580C040058E0 -:105C000050000058040C0058080C00580060406018 -:105C10007047EFF3108172B6026882420CBF012018 -:105C200000201CE0EFF3108272B603680B6048603E -:105C300001600868416023E0EFF3108272B60860EB -:105C400043684B6041604868016019E0EFF31081E0 -:105C500072B642680368136002684368536081F358 -:105C60001088704710B5EFF3108472B602680A60AE -:105C70000068FFE7FFF7EAFF84F3108810BD0B60B0 -:105C800082F31088704700000249016002490161F7 -:105C9000704700BF874F0008AF4F00087FB50C4624 -:105CA0006D4D61686D4EE8612962284601F078F912 -:105CB000246805F12400FFF7A9FF746006F10800CD -:105CC000FFF7A4FF01203070296829B10FF25510A9 -:105CD00000900294684688477FBD1FB55F4C04F171 -:105CE0000800FFF796FF00BB2178F1B1694604F187 -:105CF0000800FFF7B7FF5848C16949B10098029002 -:105D000001228DF8042001A888479DF8040000E0D6 -:105D100001202070207818B10098FFF786F904E080 -:105D2000009904F10800FFF77DFF04F10800FFF778 -:105D300070FF28B9207818B104F10800FFF77FFC44 -:105D40001FBD2DE9F8430646002000F05FF8748877 -:105D50003088B268DFF80081C4F3090444EA802483 -:105D6000F068A4B2C1B2204600F03CF8002748F227 -:105D7000E8094846FFF76AFC08E06888A04202D1BB -:105D8000316928780870687800B1012708F124008B -:105D9000FFF73FFFF0B9694608F12400FFF762FF03 -:105DA000009800F10B05407A0F28E6D0B5F80110F5 -:105DB000A1420DD10098817AC81E7169C0B2884293 -:105DC000C8BF0846706102463069E91CFBF784FAD7 -:105DD0002878D9E73800CCD0012000F017F800204F -:105DE000BDE8F28310B513461C4A5468A4F80900B4 -:105DF000E1720A46194604F10C00FBF76DFA164AE7 -:105E00001369BDE810400021002018471249096AB3 -:105E100082B008B921B101E011B1012002B00847F8 -:105E200002B0704710B50146487A0F2818BF0E28F7 -:105E300007D10B48FFF700FFBDE810400020FFF737 -:105E400002BC064C04F10800FFF7F6FE04F108005E -:105E5000BDE81040FFF7F3BBE416002084170020D4 -:105E600008170020234900200877002222480271E9 -:105E700000F044B820490A7941F822000879401C12 -:105E80000871704770B504466078FF2802BFB4F807 -:105E9000031001F47F41B1F5406F1FD10025154E6D -:105EA000317FE8B2884222D2E9B256F8211020466A -:105EB0008847002808BF6D1CF2D018E0761C2979AD -:105EC000F0B288420AD2F1B255F821102046884734 -:105ED0000100F3D002D0022805D006E02046BDE83C -:105EE0007040FFF7DCB9002070BD012070BD0026B6 -:105EF000014DE4E734170020E017002080B501F0E1 -:105F000059F801F058F801F057F801F056F801F08F -:105F100055F801F054F801F053F801F052F801F08F -:105F200051F801F050F801F04FF801F04EF801F08F -:105F30004DF801F04CF801F04BF801F04AF8BDE8DB -:105F4000014001F047B818B50C46C7B01146002211 -:105F50008DF800208DF81C008DF81D4022460DF1B3 -:105F60001E0001F038F800F03BF83F200C21ADF89E -:105F70000400ADF8061007A8012103900691A41CA7 -:105F8000049400F043F800284CBFFF209DF8000067 -:105F900048B010BD00B5C7B000F01BF80F2000F0EE -:105FA0002AF800284CBFFF209DF8000047B000BD34 -:105FB00000B5C7B00021ADF81C0000F016F818209D -:105FC00000F019F800284CBFFF209DF8000047B0F2 -:105FD00000BD00228DF800208DF81C008DF81D10EA -:105FE0001822002101A800F0FCBF8DF80010182233 -:105FF00001A800F0F6BFADF8060007A90220049042 -:106000003F22012003910690ADF80420CDF814D072 -:10601000002101A8FFF795BE80B50FF2B92200213B -:106020000420FDF70CFC0FF2792200210820FDF777 -:1060300006FCD34800210180C18081700121C1701C -:106040000021017101720FF24100FFF713FFBDE85B -:1060500002400FF2303000F023BB0278C84912B181 -:10606000012A03D070474088C88070470020C8804C -:10607000087A08B100220A720020FEF7D4BE00217F -:106080000820FDF7E9BB00002DE9F84F05466878C8 -:10609000FF2812D1BA4CB5F80300618940F60442DA -:1060A000801A00F08B80801E4DD0001F06D0401F4C -:1060B00000F0B780401E00F0DD80EBE0B5F8056031 -:1060C000207A58B10846FFF7BDF9217A062908BFA2 -:1060D0000028F2D120724FF6FF7060816681E87966 -:1060E000297A91FBF0F914285FFA89F9E5D14FF08C -:1060F000100A00270FF2A8284FF64066F8B248456C -:10610000DBDA05EB0A0B9BF809009BF80A1040EA62 -:106110000120B04211D16189404600F0C1FAABF1D3 -:1061200007000178427841EA0221A1818178C07894 -:1061300041EA0021E181082121720AF106005FFA9B -:1061400080FA7F1CDAE7B5F80500814202BF11260C -:10615000E87915283CD1297A0FF2B8290FF27C2B67 -:10616000481E28724FF6426A4FF64168287A002886 -:10617000A3D0A91905F10A02487A11F8057D925DAC -:10618000497840EA022047EA01276189404508D062 -:1061900050450CD1484600F083FA0A202072A782AD -:1061A00005E0584600F07CFA092020722782153657 -:1061B000287AA0F115012972F6B2D7E7B5F80500E3 -:1061C000814201BF95F808B04FF00008E879012836 -:1061D00060D100270FF2802942F6021AF8B2B0EB24 -:1061E0009B0F57DA05EB080005F10A01C27A467ADF -:1061F000007B11F8081042EA0022524546EA0126C7 -:1062000009D16189484600F04BFA207A0A2802D168 -:10621000E6820B21217208F104005FFA80F87F1CEE -:10622000DCE7B5F80500814202BFB5F80700A18A96 -:1062300088422FD1687A022802BFA87A60700128AC -:1062400028D1E87AA0704CA448B9FEF7ECFD0FF213 -:10625000802000F025FA204600F022FA1AE00FF222 -:10626000B02000F01DFA204600F01AFA0020FEF7D8 -:10627000D0FD0FE00FF2282000F012FA3FA000F04E -:106280000FFA6089B5F80510884203D10021042077 -:10629000FDF7E2FA0020BDE8F28F3948007A704736 -:1062A00010B50FF2AC20364C00F0FAF932A000F035 -:1062B000F7F92079401E8041C00F2071207A38B153 -:1062C000218A6089E31CBDE81040022200F0F9BA7F -:1062D00010BD00001CB50120ADF802000021284CC3 -:1062E000207AADF80010002844D0C01F052841D8FE -:1062F000DFE800F00308121823340FF2942000F0B6 -:10630000CFF913BD0FF2A02000F0CAF9E289A189EC -:10631000608900F082FA13BD0FF2B42000F0C0F9DA -:10632000218A04E00FF2E42000F0BAF9A18A608922 -:106330008A1C92B200F082FA13BD0FF2143000F002 -:10634000AFF9E18A60890DF10203022200F08CFAB4 -:10635000062020720220FEF766FD13BD0FF21830F2 -:1063600000F09EF9E18A60896B46022200F07CFA17 -:106370000620207213BD0000200A0D000A00000054 -:106380006C1700202D2D2050325020434C49454E93 -:106390005420494E495449414C495A4544200A0029 -:1063A0002D2D2047415454203A205032505F534500 -:1063B00052564943455F5555494420464F554E4432 -:1063C000202D20636F6E6E656374696F6E20686147 -:1063D0006E646C652030782578200A002D2D2047CA -:1063E000415454203A2057524954455F5555494429 -:1063F00020464F554E44202D20636F6E6E656374AA -:10640000696F6E2068616E646C6520307825780A4B -:10641000000000002D2D2047415454203A204E4FBB -:1064200054494649434154494F4E5F434841525FA6 -:106430005555494420464F554E4420202D20636F2A -:106440006E6E656374696F6E2068616E646C652042 -:10645000307825780A0000002D2D20474154542023 -:106460003A20434C49454E545F434841525F434FA5 -:106470004E4649475F44455343524950544F525F3B -:10648000555549442D20636F6E6E656374696F6E58 -:106490002068616E646C6520307825780A00000001 -:1064A0002D2D2047415454203A204143495F474114 -:1064B00054545F50524F435F434F4D504C455445E9 -:1064C0005F56534556545F434F4445200A00000031 -:1064D000202D2D20503250204150504C49434154E2 -:1064E000494F4E20434C49454E54203A204E4F547C -:1064F000494649434154494F4E2052454345495628 -:106500004544202D204C4544204F4646200A0D008E -:10651000202D2D20503250204150504C49434154A1 -:10652000494F4E20434C49454E54203A204E4F543B -:10653000494649434154494F4E20524543454956E7 -:106540004544202D204C4544204F4E0A0D000000AC -:106550002D2D20503250204150504C494341544938 -:106560004F4E20434C49454E5420203A204255542A -:10657000544F4E20505553484544202D20575249E2 -:10658000544520544F20534552564552200A20006E -:106590005032505F444953434F5645525F53455222 -:1065A00056494345530A00002A2047415454203A93 -:1065B00020446973636F76657220503250204368BF -:1065C000617261637465726973746963730A000050 -:1065D0002A2047415454203A20446973636F7665FA -:1065E000722044657363726970746F72206F6620E5 -:1065F0005458202D20577269746520436861726178 -:1066000063746572697469630A0000002A20474157 -:106610005454203A20446973636F76657220446550 -:106620007363726970746F72206F66205278202DC8 -:10663000204E6F74696669636174696F6E20436888 -:1066400061726163746572697469630A00000000B5 -:106650002A2047415454203A20456E61626C6520DF -:10666000536572766572204E6F74696669636174F2 -:10667000696F6E0A000000002A2047415454203AF6 -:106680002044697361626C6520536572766572207F -:106690004E6F74696669636174696F6E0A00000009 -:1066A0000EB4C0B5024603A800210190009101ABD1 -:1066B0000121044878440C30F9F740FD06BC5DF830 -:1066C00010FB00BFC31200002DE9F841C7B04FF026 -:1066D0000008ADF81C00DDF838C14F9E509F519D59 -:1066E000529C8DF8008007A800F01AF8A0F808C0A6 -:1066F000ADF8266087818DF82A508DF82B4000F088 -:1067000015F84FF4C17000F016F8102000F017F8DB -:1067100000284CBFFF209DF8000048B0BDE8F08184 -:106720004180ADF82020ADF82230704718220021BA -:1067300001A800F056BCADF8060007A97047049008 -:106740003F22012003910690ADF80420CDF814D02B -:10675000002101A8FFF7F5BA00B587B000208DF839 -:10676000000000F07CF840F20110ADF806003F2276 -:106770000120069000F0EDF800284CBFFF209DF8A6 -:10678000000007B000BD30B5C7B01C464A9B00F002 -:10679000C7F800258DF800508DF821402246194693 -:1067A0000DF1220000F017FC00F059F83F204FF4E3 -:1067B000837100F0BCF8A41D049400F0CCF800280C -:1067C0004CBFFF209DF8000047B030BD0023ADF85E -:1067D0001C008DF8003007A841808280002118221B -:1067E00001A800F0FEBB00B5C7B000F010F8FFF73D -:1067F000F6FF0F2102914FF48970022100F0A1F8F9 -:1068000000284CBFFF209DF8000047B000BD0021CC -:10681000ADF81C008DF80010704700B5C7B0FFF749 -:10682000D5FF0F21029140F2151000F089F80028E1 -:106830004CBFFF209DF8000047B000BD00B5C7B0B9 -:10684000FFF7C4FF0F21029140F2171000F078F813 -:1068500000284CBFFF209DF8000047B000BD182263 -:10686000002101A800F0BDBB18B5C7B000F011F8B9 -:1068700000F045F8FFF7F3FF40F2211100F013F8A4 -:1068800000F069F800284CBFFF209DF8000048B0D8 -:1068900010BD1446ADF81C00002207A88DF800209A -:1068A000418004717047ADF806103F2007A9ADF88C -:1068B000040003910F20012102900691641D0494AD -:1068C000704718B5C7B000F010F8FFF7C8FF3F20B9 -:1068D00040F2231100F019F800F03DF800284CBFF9 -:1068E000FF209DF8000048B010BD144600228DF82E -:1068F0000020ADF81C00ADF81E108DF82040224697 -:1069000019460DF1210000F066BBADF80400ADF8AA -:10691000061007A8012103900691641D0494704796 -:10692000ADF81C00ADF81E108DF820207047ADF8B2 -:106930000400ADF8061007A80121039006917047E6 -:106940000621ADF80600049107A801213F2203901B -:106950000691ADF80420CDF814D0002101A8FFF76E -:10696000F0B900B587B000F010F8012003220690BE -:10697000ADF80420ADF8062000F011F800284CBF57 -:10698000FF209DF8000007B000BD00208DF800003A -:106990001822002101A800F024BB03900691CDF835 -:1069A00014D0002101A8FFF7CCB900B5C7B000F0A2 -:1069B0000CF8852000F075F800F014F900284CBFA1 -:1069C000FF209DF8000047B000BD00218DF81C009D -:1069D0008DF80010182201A800F003BB2DE9F84142 -:1069E000C7B04FF0000800F026F80DF12300DDF8E5 -:1069F00044E14E9F4F9E509D529C8DF81F30C0F831 -:106A000000E08DF800808DF820708DF821608DF801 -:106A100022508DF8274000F087F88620ADF8060058 -:106A200007A90C2000F0DAF800284CBFFF209DF8E1 -:106A3000000000F0F2B88DF81C0007A841708270C9 -:106A40007047F8B5C8B005460E4617461C4600F01C -:106A500023F808A8467087708DF8205000F0D8F809 -:106A60008A21ADF80A103F20032100F0C4F8002865 -:106A700048BFFF200ED49DF8000058B94F994E989A -:106A8000BDF801202280BDF803200280BDF805007A -:106A90000880002049B0F0BD07220021684600F0C0 -:106AA000A0BAADF8060007A901203F220391049087 -:106AB000704700B587B000F013F800F035F8922069 -:106AC00000F009F800F08EF800284CBFFF209DF878 -:106AD000000007B000BDADF806003F22012070475E -:106AE00000208DF80000704718B5C7B000F011F80D -:106AF00000F01AF80F2102919720062100F065F8A6 -:106B000000F071F800284CBFFF209DF8000048B04D -:106B100010BD0024ADF81C008DF8213007A841807D -:106B200002718DF8004070471822002101A800F082 -:106B300058BA2DE9F04F0646C7B000F020F800F033 -:106B400012F8FFF7F1FF3F20ADF804009C2100F0A0 -:106B500030F800F04AF800284CBFFF209DF80000F4 -:106B600047B0BDE8F08F8DF82790B581ADF82AB019 -:106B70003782ADF82E80B482ADF832A07047084657 -:106B80001946559CDDF84091519DDDF848B1539F61 -:106B9000DDF85081DDF858A1ADF81C60002307AE88 -:106BA0008DF80030708032710DF12100062200F066 -:106BB00012BA0F200290ADF806101820049007A911 -:106BC00001200391069070470321ADF8060004915F -:106BD00007A801213F2203900691704704903F22AD -:106BE000012003910690ADF80420CDF814D00021C7 -:106BF00001A8FFF7A6B8ADF80800059108A807217D -:106C000004900791CDF818D0002102A8FFF799B899 -:106C10001822002102A800F0E4B948B0BDE8F081D4 -:106C200010B5029C016042600021C16001614161B8 -:106C300081610381A107047704D5008910B14FF069 -:106C4000FF3010BD002010BD2DE9F04F064685B085 -:106C500030890C460027BB4600287169DC460CBF12 -:106C60004FF00208D84681B168B930697768451C91 -:106C7000BD4228BFED1B3768385C7D5D00EB052702 -:106C8000BF1CBFB203E0074600E000B10246306916 -:106C9000F568A84223BF7568281AC01B0020154656 -:106CA00008EB050903FB09FE864532BF0020B0FB57 -:106CB000F9FA09FB1A00C0B2804509DA96F81C906F -:106CC0005FEAC97A48BF84465FEA897048BFC44614 -:106CD000100000F0B4807068714461448842C0F0D4 -:106CE000AE8008EB020080B20390D946100AADF8DE -:106CF00002000294ADF80020049359E0800740D5CB -:106D00003089002840F09B803268D018A34600F8F4 -:106D1000024C200A32681A4402F8010C22463068FC -:106D20001844FAF7D9FA706920187061B069019CAB -:106D3000401CB061200A31680C70316848701CE05A -:106D40008CB3307FC207D9D5308940B93168194436 -:106D5000FF2001F8020C3168194401F8010C4FF0D2 -:106D6000000B7069241874612C463089002340B9E7 -:106D700031680C70210A3068417002237069801CF0 -:106D8000706108EB04070021BFB231615CB1DA44E5 -:106D9000029800EB0A01306822461844FAF79CFA80 -:106DA00070692418746109F10109B069401CB0616F -:106DB000049A70683169914545D2791881422CBF97 -:106DC000081A0846306103463089A0B93068BDF81A -:106DD0000010C1545B1C70683168834228BF1B1AC5 -:106DE000BDF80200C8545B1C7068834228BF1B1AA0 -:106DF0007069801C706105FB09FA7468BDF80000B9 -:106E0000E41A844288BF0446029800EB0A01281B5A -:106E1000AC42019003D093D2307F002890D13768E4 -:106E20002246F818FAF758FA706920187061A346DC -:106E3000019C039F0023A9E73068404400E0002044 -:106E400005B0BDE8F08F88448045F5D3A8EB000875 -:106E5000F2E778B5028900230B80002A44690CBF51 -:106E600002250025002C4FD0028952B9C26846681D -:106E7000531CB34228BF9B1B0668B25CF35C02EB59 -:106E800003220A80027F02F00302012A25D10B8827 -:106E90004FF6FF72934204BF0289002A09D0C368EB -:106EA00002699A4219D20289BAB14668F31A93422A -:106EB00013D24368C268E41A14190022C260446104 -:106EC00002894AB902681478012B94BFC3F1010307 -:106ED0000123D25C04EB02220A80C468426806687F -:106EE0002B19934228BF9B1A33440E884169891B92 -:106EF000491B416105D034192D19954228BFAD1A9F -:106F0000C5608169491E8161184672BDF8B5028964 -:106F100000230B80002A42690CBF02240024002AAF -:106F20003BD0C56802892B464AB946686A1CB24202 -:106F300028BF921B0668775DB25C07EB02220A80CD -:106F4000067F06F00306012E20D10F884FF6FF7250 -:106F5000974204BF0289002A07D142680023012A10 -:106F600094BFC2F1010201220AE00269AA420DD2D5 -:106F700002895AB14668751B954207D2002304E086 -:106F800005682E78AA5C06EB02220A804168006838 -:106F9000E4188C4228BF641A03191846F2BD000099 -:106FA0000249016002490161704700BF274F000894 -:106FB0004D4F0008704770477047704770477047E3 -:106FC0007047704770477047704770477047704709 -:106FD00070477047704710B50446FAF77DF92046B0 -:106FE00010BD10B5044610460A460146204600F082 -:106FF00003F8204610BD000062F30F2262F31F4227 -:10700000401810F0030308D0C91A1FD3DB0748BF8C -:1070100000F8012D28BF20F8022D130030B41446CB -:107020001546103928BF20E93C00FAD8490728BF87 -:1070300020E90C0048BF40F8042D890028BF20F843 -:10704000022D48BF00F8012D30BC7047C91818BF89 -:1070500000F8012DCB0728BF00F8012D7047000074 -:1070600010B50446AFF30080204600F005F8044652 -:10707000AFF30080204610BD7CB500F10F06F60886 -:10708000F600B04240D2082E04D2082602E00830B2 -:1070900000F047F8DFF804512C68210005D10020EA -:1070A00007E00268B24221D2011D08680028F8D129 -:1070B0002068291D0A68824222D01368B34238BF73 -:1070C000111DF7D312E093190B60801B54685C60AC -:1070D0000B6818601660096800291DBF4868002801 -:1070E000081D0020286002F1080076BD61B10A6821 -:1070F0001068A0F10803B342E5D250680860EAE7DF -:1071000000F04EF80028C2D1002076BD10B5040072 -:1071100006D0AFF30080204600F003F8AFF3008004 -:1071200010BD002800D1704750B4A0F108021368C8 -:10713000072B2BD913F0070F28D1184C616809B120 -:107140008A4202D25160626013E0486800B3904204 -:1071500038BF0146F9D31BE0964203D11B180B60E0 -:107160000A4606E0486810B1134498420ED35060B6 -:107170004A60506850B11368D118814206D100218D -:1071800021600168CB1813604068506050BC7047A4 -:1071900008680E18B242DFD250BC7047D8170020E2 -:1071A0000749086808B1002070470648C008C000B9 -:1071B00008600549C908C900091A0160704700BF85 -:1071C000FC1700200F280020082C00201349002065 -:1071D00008604FF4E0221248016841F47001016038 -:1071E0004FF0B041086840F0010008608A600D4827 -:1071F0000A6802400C480A60036823F00503036034 -:10720000426852085200426000220848C860086183 -:10721000086820F4802008608A61704708ED00E06B -:1072200088ED00E0FBFEF6FA9400005800100422FE -:107230000100000003000000050000000100000044 -:1072400001000000060000000A000000200000000D -:107250000200000004000000080000001000000010 -:10726000400000008000000000010000000200005B -:10727000A0860100400D0300801A060000350C00B6 -:1072800040420F0080841E0000093D0000127A0079 -:107290000024F40000366E010048E801006CDC02B6 -:1072A00000000000000000000000000000000000DE -:1072B0002DE9F04107468846387810F0030F16464E -:1072C0001D4633D0384600F099F878BBB8F1000F6E -:1072D0001CBFD8E900018619012D2ED13888C104C0 -:1072E00015D5396A07F14402384600F0A3F83A6B25 -:1072F000044602B93A69F968384600F09BF8361B33 -:10730000341A7A69F968384600F094F8261A1EB9DA -:107310004DB916F1010F09D097F903002A463146FD -:1073200000F08EF8064616F1010F09D12320AFF3C5 -:1073300000804FF0FF30BDE8F081022DE8D1EBE78F -:10734000388810F4405F0ED07868F8603861786152 -:10735000B8617868F86107F14400386207F13000DD -:10736000786200203863B8F1000F05D0D8E9020137 -:1073700007F13402C2E9000139884CF6FF60014090 -:1073800039800020BDE8F08170B50546AFF300807C -:107390002888810415D56E680024EA6895F90300F1 -:1073A0003146914212D2521AFEF7EEFA10F1010F55 -:1073B0001CBF00283618F0D10FE04DF6FF700140D9 -:1073C00029802846AFF30080002070BD00220021F4 -:1073D000FEF7DAFA10F1010F00D101246868E860C5 -:1073E000A861E861002C2988E7D041F40071298068 -:1073F0002846AFF300804FF0FF3070BDF8B5A0B95C -:10740000AFF3008000250A4E08244FF0FF373068A4 -:1074100020B1FFF7B9FF002848BF3D46361D641E66 -:10742000F5D1AFF300802846F2BDBDE8F240ABE7EE -:10743000D0110020914234BF511A002108467047F4 -:107440003EB504000D00012A02D100F063F807E008 -:10745000022A07D100940020019069460C20ABBE9F -:107460002D1801E0002A0CD10094019569460A20EC -:10747000ABBE002805D100222100280000F027F82B -:1074800001E00020C04303B030BD000010B4314A19 -:10749000002113461C6884421EBF491C9C6884421C -:1074A0001EBF491C1C69844209D09C69491C844246 -:1074B00005D0491C20331029ECD310BC70470023A1 -:1074C00042F8313002EBC1014B6010BC704778B418 -:1074D000204C002325462E688E421EBF5B1CAE68E2 -:1074E0008E421EBF5B1C2E698E4209D0AE695B1CAA -:1074F0008E4205D05B1C2035102BECD372BC70473C -:10750000054604EBC303012A04BF59684D195D60A9 -:1075100072BC704710B40F4A002113461C688442A5 -:107520001EBF491C9C6884421EBF491C1C698442C2 -:107530000AD09C69491C844206D0491C203310297A -:10754000ECD310BC0020704702EBC100406810BCB7 -:1075500070470000A414002010B50446E068A1693B -:10756000884251D3218849F202030B40022B08D0F4 -:1075700008044CBF4FF400704FF484400143218055 -:107580003BE001F4C042B2F5C04F06D1A168884289 -:1075900003D32046FFF732FF78BB208810F4406FFA -:1075A00002BF606804F14401884217D14FF40070B3 -:1075B000FFF756FD606030B904F144006060E060A0 -:1075C000401CA0600AE0218841F040012180E06079 -:1075D000606100F500726068A260E061606820612F -:1075E000A068A061207841070AD502220021204628 -:1075F00000F00CF810F1010F02D14FF0FF3010BD78 -:10760000208840F4C0402080002010BD70B50446A2 -:107610000D461646AFF3008033462A460021204629 -:10762000FFF746FE05462046AFF30080284670BDB2 -:1076300038B504000ED0207810F0030F03D094F971 -:107640000300002809D5AFF30080204600F030F891 -:10765000AFF300804FF0FF3032BD2046FFF7CEFE83 -:107660000546AFF300802078410644BF606800F013 -:107670005DF80020606094F90300022804D900F04E -:1076800057F808B14FF0FF35E06B48B100F05CF8F7 -:1076900008B14FF0FF35E06B00F048F80020E063E0 -:1076A000204600F005F8AFF30080284632BD000008 -:1076B00001780A0626D51C4A13680021834203D1AB -:1076C000002342F821301BE05368012183421EBF92 -:1076D000022193688342F3D0D368032183421EBF03 -:1076E000042113698342EBD05369052183421EBFF5 -:1076F0000621936983421EBF0721D3698342DFD0ED -:1077000000F014B8002101804FF0FF31C17000F18A -:1077100044014160C160016141618161C1610162F7 -:1077200000F1300141627047D0110020FFF7EEBC3C -:107730001CB50200009269460220ABBE0400100096 -:10774000FFF7A4FE200016BDE0B50090F9F776FD26 -:10775000019069460E20ABBE03B000BD38B50C46A3 -:10776000C5B22046AFF30080E068A169884204D327 -:107770002046FFF7F1FE00280FD4E068401CE060CF -:1077800000F8015D2088010503D440050BD50A2DC2 -:1077900009D12046FFF732FE28B12046AFF3008022 -:1077A0004FF0FF3032BD2046AFF30080284632BD97 -:1077B0007047FEE7FEE7FEE7FEE770477047704759 -:1077C00000F020B80848FBF76BBD0848FCF7DCBAAE -:1077D0000748FCF7D9BAFEF72DB9FEF755B900F006 -:1077E00019B80448FBF75CBD841500208012002006 -:1077F000F0110020E41500201020FBF797BAFDF7E8 -:107800000CB800000248416802788918416070474E -:10781000501000200449C8680A6882430A60486022 -:1078200000F004B80000000000150058704719E08F -:1078300050F8042BD30744BFA9F101039A18091F7C -:107840000023042942F8043BF9D25FEA817C134605 -:1078500004D54FF0000CA2F800C09B1CC90744BF20 -:107860000021197050F8041B0029E1D17047000075 -:1078700038B50D4D0824286800281CBF017811F088 -:10788000030F05D090F90310002958BFFFF7D0FE71 -:107890002D1D641EEFD1BDE83840002200214FF0BD -:1078A000FF30FEF771B800BFD011002010B50749B6 -:1078B00079441831064C7C44163404E00A68081DEB -:1078C000114488470146A142F8D110BD2C000000A8 -:1078D000600000004EF68851CEF20001086840F4C6 -:1078E00070000860BFF34F8FBFF36F8F4FF00070D1 -:1078F000E1EE100A7047000037FFFFFF140600009A -:10790000F01100207008000030000320000000008B -:10791000C397FFFF900100009201000004000020C7 -:10792000B397FFFF49020000060000002800032073 -:107930000000000000000000000000000000000047 -:10794000010000000200000003000000040000002D -:1079500000F00DF8002801D0FFF7A8FFAFF300807A -:107960000020AFF30080FBF708FA00F002F80120D6 -:10797000704700F001B800000746FFF779FF38466E -:10798000FAF78EFAFBE738B504460D46284600F0B4 -:1079900005F8A84218BF0024204632BD0149FFF770 -:1079A000DDBE00BF4011002001488047014800476C -:1079B000CD710008B9790008AFF30080FFF78AFFA6 -:1079C000FFF7C6FF00002E004300FFF7FEBFFFF7E2 -:1079D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7DB -:1079E000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7CB -:1079F000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7BB -:107A0000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7AA -:107A1000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF79A -:107A2000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF78A -:107A3000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF77A -:107A4000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF76A -:107A5000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF75A -:107A6000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF74A -:107A7000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF73A -:107A8000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF72A -:107A9000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF71A -:107AA000FEBF0000F3FF010001F1FF01F1FF01F152 -:107AB000FF01F1FF01F1FF01F1FF01F1FF01F1FF12 -:107AC00001F1FF01F1FF01F1FF01F1FF01F1FF0100 -:107AD000F1FF01F1350152FF01AD3F106D4C102255 -:107AE0001008700104004804120804520C04F00548 -:107AF00007093D00C4790008046158F200C614105B -:107B0000010000C80C2164FC021778100020B71097 -:107B100013ED117E110143DB113C2101100701041B -:107B200000003C1100203D04523C04211BA108F33D -:107B30001128116410070204010194160020E404C6 -:107B400052940421346108128444F21370485002A4 -:107B500008020244405244042134610812CC44F229 -:107B600012B84816F818124028F206882C52000164 -:04000005080079B9BD +:1010D0003000B1F5807F02D34FF0FF3070470170D0 +:1010E000012070470078401E8041C043C00F704708 +:1010F0001B48704730B45368D418042B09DA41B147 +:10110000057804F8015B10F8015B15B15B1C491E02 +:10111000F3E7536030BC704738B514461D4661B1E3 +:10112000FFF7E8FF61686A6B204690476FF00102A5 +:10113000811A02D0491E03D005E06FF0010032BDD4 +:101140004FF0FF3032BD0021616032BDDA6B1047D5 +:10115000034BE1E7024BF9E702487047000000004B +:101160002C2400204C2500200278C9B28A421AB1F2 +:101170001CBF10F8012FF9E718BF00207047704717 +:1011800080B508B90FF21C0005490B681BB122227B +:101190000021984701E000F08EFD222002BD0000F2 +:1011A000FC2B0020636F6E73747261696E7420682B +:1011B000616E646C65723A20626164206D65737360 +:1011C0006167650000F10103810704D010F8011B7D +:1011D00089B18107FAD10268B2F10131914311F06E +:1011E000803F04BF50F8042FF6E710F8011B11B13F +:1011F00010F8011BFBE7C01A70477047C9B283079C +:1012000006D0521E22D310F8013B9942F7D11FE0BD +:10121000083A13D302F1040241EA012141EA0141F3 +:1012200050F8043B121F21BF4B40A3F1013C2CEAB4 +:10123000030C1CF0803FF3D0C9B2001F083210F835 +:10124000013B521E28BF91EA030FF8D818BF0120B6 +:10125000401E704780B5FFF74BFF006C02BD0000D9 +:1012600062B38B0708D0521E11F8013B00F8013B16 +:1012700000F024808B07F6D1830740F0208000BF68 +:10128000103A07D330B4B1E83810103AA0E838105B +:10129000F9D230BC530724BFB1E80810A0E8081009 +:1012A00044BF51F8043B40F8043BD20724BF31F857 +:1012B000022B20F8022B44BF0B7803707047121FDB +:1012C00017D35B0009D151F8043B20F8023B1B0CFB +:1012D000121F20F8023BF6D20BE051F8043B00F855 +:1012E000013B1B0A20F8023B1B0C121F00F8013BBC +:1012F000F3D238BF121D521E24BF11F8013B00F873 +:10130000013BF8D870470000B3BBD9B1B2F5803FBC +:101310007DD2022A1ED98C46B1FBF2F102FB11C329 +:101320001B0443EA1043B3FBF2FC02FB1C3380B204 +:1013300040EA0343B3FBF2F002FB103240EA0C40F8 +:1013400000237047022A05D98446B0FBF2F002FB65 +:1013500010C270474AB105D100F0010249085FEAA6 +:101360003000704700220023704700F0A7BC0B003C +:101370000200002100207047904271EB030CF6D36D +:10138000B3F5803F2FD2F0B5B3FA83F7B1FA81F409 +:10139000A7F10F0E3D1B5340CEF1200602FA0EF2CC +:1013A000F3415340B5F10F0746D80F3C2C44414060 +:1013B000C4F12006A040F1414140B1FBF3F603FB2C +:1013C0001611A2FB0645001BA94102D2761E801809 +:1013D000594180EA010221FA0EF362FA0EF200216D +:1013E0005A403046F0BD30B4B1FBF3FC03FB1C1196 +:1013F000A2FB0C45001BA94103D2ACF1010C8018E3 +:10140000594130BC02460B46604600217047B2F19C +:10141000807F65D3F0B5B2FA82F7B1FA81F4C7F1F3 +:101420000F063D1B22FA06F307F1110EF24120359B +:101430005A40B5F10F07B8D94140C4F12006A04089 +:10144000F1414140B1FBF3FC03FB1C11A2FB0C4535 +:10145000001BA94103D2BCF1010C801859410F2F88 +:1014600012D30F3FC90341EA5041B1FBF3F603FB2E +:101470001611A2FB0645D4EBC030A94102D2761E5C +:101480008018594146EACC3C07B34140C7F12006D9 +:10149000B840F1414140B1FBF3F603FB1611A2FB4A +:1014A0000645001BA94102D2761E8018594180EAE8 +:1014B000010221FA0EF3C7F1200462FA0EF20CFACF +:1014C00007F05A402CFA04F13043F0BD80EA0102E3 +:1014D00021FA0EF3002162FA0EF260465A40F0BD86 +:1014E0008C46B1FBF2F102FB11C31B0243EA10630D +:1014F000B3FBF2FC02FB1C331B024CEA002043EA64 +:101500001063B3FBF2FC02FB1C331B024CEA00200D +:1015100043EA1063B3FBF2FC02FB1C331B024CEAF0 +:10152000002043EA1063B3FBF2FC02FB1C324CEADE +:101530000020002370470000B0B581EA030C0CF0D6 +:10154000004C40F2FF7515EA11541DBF15EA135700 +:10155000AC42AF4239E0E41923EA455343F4801327 +:10156000C90241F0004141EA505EC7021100A7FBE9 +:10157000020200284FF00000EEFB01204FF00001B6 +:10158000E3FB072118BF42F0010240180021494146 +:10159000E3FB0E01A4F580640F0302D25200404128 +:1015A000494154F101046CDD470872F1004250F1E9 +:1015B000000051EB0451A1F580115CBF41EA0C0120 +:1015C000B0BD4CEA05510020B0BD05EA1357AC424E +:1015D00014BFAF4241E050EA410E1CBF52EA430E35 +:1015E00002E061460020B0BD24423C441BD15FEACA +:1015F000070EF6D0090302BF01460020AEF1140E1B +:10160000B1FA81F7AEEB070401FA07FE0C37C7F118 +:10161000200100FA07F7C8404EEA000E23EA4553BE +:1016200043F48013A2E733F00043B3FA83F704BF17 +:10163000B2FA82FE77440B3FE41BB7F1200E2FBFB6 +:1016400002FA0EF3BB40C7F1200E22FA0EFE38BF9D +:1016500043EA0E03BA40641C82E750EA410E14BF0D +:1016600052EA430E6FF000014FF4001717EB430FDF +:101670008ABF194617EB410FB5E74CEA0551002028 +:10168000B0BDD4F10104B4F120070FDAC4F1200792 +:10169000520828BF42F0010210FA07F501FA07F7D5 +:1016A000E1BF2A43E0403843E1400FE0352C98DCAD +:1016B000C7F1200452EA400220FA07F218BF42F0B4 +:1016C000010231FA07F0A1400A43002172F1004201 +:1016D00050F1000051EB0C01B0BD000010B51446F4 +:1016E00000F002F8226010BDC1F30A5343B14A0072 +:1016F00012F5001F28D2A3F2FE32A1EB025170476F +:1017000050EA410C20D001F0004C31EA0C01B1FA52 +:1017100081F204BFB0FA80F3D2180B3AB2F1200381 +:101720002CBF00FA03F1914041EA0C013EBFC2F127 +:10173000200C20FA0CF319439040524240F2FD3342 +:10174000D21A01EB03517047002270474FF4001C7E +:101750001CEB410F94BF1CEB430F09E041EA030C63 +:1017600050EA4C0C52EA0C0C03D2994208BF90424A +:10177000704714BF8B428242704700004FF4001C38 +:101780001CEB410F94BF1CEB430F09E041EA030C33 +:1017900050EA4C0C52EA0C0C03D28B4208BF824236 +:1017A000704714BF9942904270470000124254D4CF +:1017B00040F2FF7C1CEA11530FD0634531D09B18D7 +:1017C00063453CBF01EB0251704701F0004141EA23 +:1017D0000C510020AFF30080704750EA410320D045 +:1017E00001F0004C91EA0C011CD0B1FA81F30B3BE3 +:1017F0009A420DD9D21A994051EA0C01C3F1200C3A +:1018000020FA0CFC61449840531C40F2FF7CD7E75F +:10181000914041EA0C01C2F1200C20FA0CF319436B +:1018200090407047B0FA80F31533202BE0D3202A84 +:10183000EED3203A203B9A4209D9D21A00FA03F19A +:1018400041EA0C010020531C40F2FF7CB8E700FA8B +:1018500002F141EA0C0100207047524240F2FF7C45 +:101860001CEA11530DD06345DBD0B2EB030C3CBF37 +:10187000A1EB025170470CF1010221EA035141F43E +:10188000801150EA410CCCD001F0004C352A27DC05 +:1018900030B481EA0C01B2F1200309DAC2F120036D +:1018A000044601FA03F5D0402843D1409C400CE0A7 +:1018B000C3F12002450020FA03F418BF44F00104EC +:1018C00021FA03F091400C43002174F1004550F1DE +:1018D000000051EB0C01244230BC7FF47BAF704719 +:1018E0006146002076E70000C1F30A5340F2FE3261 +:1018F0009B1A14DDD3F120034FEAE17208DDC9021F +:1019000041EA505141F00040D840801850407047A3 +:1019100003F2E13010B1D24382F000407047002062 +:1019200070470000C11768B14840401AB0FA80F211 +:101930009040D21CC907C2F5846241EA025202EB10 +:10194000D02140057047000070B44FF0004591EA87 +:10195000030F40F1B5816B40841A71EB030603D28B +:10196000001BB141121973414FF4001C1CEB410FD5 +:1019700034BF7CEB430442E00C0DA4EB1356352E30 +:101980004FDC45EAC323DB0A45EAC121C912B6F19F +:1019900020050DDD63FA05F6EB4086EA03051242E9 +:1019A00018BF45F00105C01851F100010CD213E039 +:1019B00062FA06F5F2405540F3415A40B340F34015 +:1019C0005A408018594107D349085FEA30005FEA5E +:1019D000350528BF45F0010501F58011420875F174 +:1019E000004250F1000041EB04514E0016F5001F7B +:1019F00070BC38BF70470020090D090570471CEB0B +:101A0000410F10D252EA43060BD0BCEB410F05D870 +:101A10000C0DAB43661E342EB6DD02E0AB438018DE +:101A2000594170BC704770BC70470000F0B540F27F +:101A3000FF7581EA030C0CF0004C15EA11541DBF30 +:101A400015EA1357AC42AF42E5E0BC41C1F31301C4 +:101A5000C3F31303801A994143F4801304D2641E24 +:101A60004000494180185941C90241EA5051B1FB37 +:101A7000F3F603FB1611A2FB0675D7EBC020A941B4 +:101A800002D2761E80185941C90241EA5051B1FB79 +:101A9000F3FE03FB1E11A2FB0E75D7EBC020A9417C +:101AA00003D2AEF1010E80185941890241EA9051EA +:101AB000760546EA8E2EB1FBF3F603FB1611A2FB68 +:101AC0000675D7EB8020A94102D2761E80185941B5 +:101AD000C90241EA50514EEA060EB1FBF3F603FB90 +:101AE0001611A2FB0675D7EBC020A94102D2761EC3 +:101AF00080185941C90241EA5051B1FBF3F703FB89 +:101B00001711A2FB0735D3EBC020A94167F10007ED +:101B10000CBF004247F0010766F3D5274FEA1E319C +:101B2000B80814F5806412DDBD0775F1004250EB72 +:101B30000E5051EB045111F5801F5CBF41EA0C01BE +:101B4000F0BD4CF07F6141F0E0410020F0BDBD07E9 +:101B50006D0840EA0E5041F48011D4F10104B4F153 +:101B600020060ADAC4F120060200E04001FA06F37A +:101B7000E1401843B24015430EE0342C13DCC6F1AB +:101B8000200445EA40056D0820FA06F2154321FAC3 +:101B900006F0A1400D43002175F1004250F1000014 +:101BA00051EB0C01F0BD00205FEA0C01F0BDCFB994 +:101BB00092185B41B3FA83F704BFB2FA82F6BF19F9 +:101BC0000B3FB7F120062FBF02FA06F3BB40C7F167 +:101BD000200622FA06F638BF3343BA401CB1E41996 +:101BE000641E33E77F4231F00041B1FA81F404BF53 +:101BF000B0FA80F6A4190B3CB4F120062FBF00FA0E +:101C000006F1A140C4F1200620FA06F638BF3143A0 +:101C1000A0403C1B1AE7AC421ABF05EA1357AF427B +:101C200012E050EA41061CBF52EA4306BFE750EA01 +:101C30004107304661461CBF41EA0551F0BD52EAFA +:101C4000430C08BFC143F0BD00204FF4001616EB53 +:101C5000410F98BF16EB430F08BF16EB410F24BF8F +:101C6000C14305E016EB430F0CBF61464CEA05513A +:101C7000F0BD0000400D491840EA81200CD2490D0A +:101C8000A1F58061491C40F0004005DBD1F11F0146 +:101C900054BFC840C017704700207047014648B184 +:101CA000B0FA80F18840C91CC1F58461090501EBD7 +:101CB000D02140057047012000F0B6B87047000001 +:101CC000841A71EB030604D26E40001BB141121955 +:101CD00073414FF4001C1CEB410F34BF7CEB4306F7 +:101CE00082E00C0DA4EB1356362E7BDC012E45EA68 +:101CF000C32341DC43EA525312BFD20292025B0873 +:101D0000240545EAC12141EA5051D2EBC020994156 +:101D100025D407D1B0FA80F610FA06F162D000207F +:101D2000203608E0B1FA81F6B140C6F1200220FA6F +:101D300002F21143B0404FEAF474B4EB465434F06D +:101D400001064FEA74040AD8D6F50016760D04F0A1 +:101D50000044F04061FA06F25040F1404840C00AA9 +:101D600040EA415021F0004128BF5FEA500550F1A0 +:101D7000000044EBD12135E0DB0A45EAC121C90A64 +:101D8000B6F120050EDD42EA0242120CC5F1200632 +:101D900003FA06F6EB4042EA06056D42984161F10E +:101DA00000010DE062FA06F5F240554063FA06FCC8 +:101DB00082EA0C02F3405A406D42904161EB03010C +:101DC00011F4801F05D1641E620502D06D004041F0 +:101DD000494121F48011430875F1004350F100009E +:101DE00041EB045170BC70471CEB410F15D223F03E +:101DF000004352EA43060BD04FEA4C0CBCEB410FB8 +:101E000004D80C0D661E342EB7DDEBE7801A99411D +:101E100050EA410608BF0021E4E708BF1CEB430F6E +:101E200028BF6FF00001DDE780B5AFF30080024A04 +:101E300011001820ABBEFBE72600020038B50400F5 +:101E400009D004F18005686808B900F01EF800F0B8 +:101E500021F8012801D1012032BDA06A08B100F0AB +:101E60002AF800F00AF821F02A01FFE7816000F06B +:101E70001BF8BDE8324000F03EBB2068416821F409 +:101E80009041416020688168704700212970204698 +:101E900000F0AEBC24206860206801684908490051 +:101EA0000160204600F0BCB92068016841F00101E2 +:101EB000016020467047204600F0BABA70B504466B +:101EC00004F180051346686820283DD169B31800E5 +:101ED0002BD02878012837D001222A7004F154062B +:101EE0002165338073800020E86021206860706A7B +:101EF000E8B1DFF82013C162DFF81C03716A0863E0 +:101F0000716ADFF8180348630020716A88632068EB +:101F1000216D00F12802706A00F0C1FD38B1102077 +:101F2000E8600020287020206860012070BD2168D2 +:101F3000402008620020287000F008F841F080017D +:101F400000F061FBF8D170BD022070BD206800F187 +:101F5000080151E8001F00F108027047216851E8AC +:101F6000002F7047206800F1080151E8001F00F1C0 +:101F7000080221F0400142E8001000287047F8B53F +:101F8000044640F60F002668F1693268B3680840DD +:101F900004F15C050ED1880602D5900602D4D80063 +:101FA00040F181806969002900F029812046BDE85F +:101FB000F4400847DFF8E006034204BFDFF8DC76B0 +:101FC0003A4270D0CF0707D5D70505D5012737622C +:101FD0002E6B46F001062E638E0708D5DE0706D568 +:101FE000276802263E622E6B46F004062E634E07DB +:101FF00008D5DE0706D5276804263E622E6B46F01C +:1020000002062E630E070AD5960601D4034206D0B7 +:10201000266808203062286B40F008002863080515 +:1020200009D5500107D526684FF400603062286B4F +:1020300040F020002863286B002833D0890607D59C +:10204000900601D4D80003D5696909B120468847B4 +:10205000286B21688A68510602D410F0280F1CD022 +:10206000204600F0EFFA00F0D1F811D5FFF77AFF23 +:10207000FCD1286A60B10FF2B1618163286A00F077 +:1020800087FD00280ED0286A816BBDE8F440084720 +:102090002046BDE8F24000F06DBE204600F06AFE2A +:1020A00000202863F1BD286901286AD1CF0668D5D0 +:1020B000D00666D51020306200F0A8F82DD5296A28 +:1020C0000868406880B20028ECD02A889042E9DA9B +:1020D0006880086801688A061BD4FFF73FFF22F476 +:1020E000807200F08FF8F8D1206800F07DFAFBD103 +:1020F000FFF738FFFCD12020E86200202861FFF7BD +:102100002DFF22F0100200F07DF8F8D1286A00F0CF +:1021100009FD29886888091A2DE028886988411AEC +:10212000688800281CBF88B2002868D0226852E85E +:10213000003F23F4907342E800300028F6D1206875 +:1021400000F1080200F1080352E8002FDFF8C40292 +:10215000024043E800200028F1D12020E86200205E +:1021600028616861226852E8003F23F0100342E8CA +:1021700000300028F6D12046BDE8F44089B200F0D6 +:10218000FABDC80209D5580207D54FF48010306255 +:102190002046BDE8F24000F069BE080609D51006E9 +:1021A00001D4180205D5A96949B32046BDE8F44019 +:1021B0000847480611D550060FD5FFF7CFFE22F08D +:1021C000400200F01FF8F8D12020A8620020A8618A +:1021D0002046BDE8F24000F062BE080206D550007D +:1021E00004D52046BDE8F24000F06ABEC80148BFF1 +:1021F000002A04D52046BDE8F24000F062BEF1BDE1 +:1022000022F4F07241E800200028704720688168BD +:1022100048067047A5260008D7260008DD260008D6 +:10222000F8B50446DFF838052168DFF838C50A68D4 +:10223000DFF834750240A0680243206902436069F8 +:102240000243E06902430A6000254A68E06822F41C +:10225000405202434A60A369DFF8102591421CBF37 +:10226000206A03438E68DFF80805064033438B601D +:102270000FF2A416CB6A606A1B0940EA0313CB6213 +:102280006145DFF8F0044FF4004339D13F6807F0AF +:102290000307032F4DD8DFE807F0024643494FF00C +:1022A000010CE169B1F5004F4FF6F07740F0808006 +:1022B000BCF1010F09D0BCF1020F0AD0BCF1040F30 +:1022C00071D0BCF1080F71D099E001F0E8F9002855 +:1022D00015D0626A616836F81230B0FBF3F04A0834 +:1022E00002EB4002B2FBF1F080B2A0F11001B94262 +:1022F000EAD20740C0F3420007432068C7607FE08E +:10230000914216D13F6817F4406723D0B7F5806F2C +:1023100009D0B7F5006F03D0B7F5406F06D008E0DD +:102320004FF0020C07E04FF0040C04E04FF0080CF3 +:1023300001E04FF0100C9142B3D1BCF1000F09D075 +:10234000BCF1020F0AD0BCF1040F15D0BCF1080F8C +:1023500015D054E001F09BF9002851D0616A36F89D +:102360001120B0FBF2F6626802EB42018E4246D3C6 +:102370001103B14205D242E001F03FF9ECE7184603 +:10238000ECE75008002110EB062051EB166100230A +:10239000FEF7BAFFA0F54071DFF8DC2391422ED2A0 +:1023A0002268D0602CE001F028F990E7184690E709 +:1023B000BCF1010F09D0BCF1020F09D0BCF1040F30 +:1023C00018D0BCF1080F18D019E001F068F9B8B1C5 +:1023D000626A36F812306168B0FBF3F000EB51002E +:1023E000B0FBF1F080B2A0F11001B94207D2216830 +:1023F000C86005E001F001F9E9E71846E8E70125C2 +:1024000004F1680001214180018000218160C160E8 +:102410002846F2BDFEFFFFEF0100020004000600A7 +:1024200008000A000C00100020004000800000019D +:1024300090F82810CA0706D502685368C16A23F4C9 +:1024400000330B43536090F828108A0706D50268C2 +:102450005368016B23F480330B43536090F82810CA +:102460004A0706D502685368416B23F480230B4367 +:10247000536090F828100A0706D502685368816BEC +:1024800023F400430B43536090F82810CA0606D586 +:1024900002689368C16B23F480530B43936090F8F8 +:1024A00028108A0606D502689368016C23F400534D +:1024B0000B43936090F828104A0610D502685368C1 +:1024C000416C23F480130B435360416CB1F5801FC2 +:1024D00005D15368816C23F4C0030B43536090F81B +:1024E00028100A0606D501684A68C06C22F400224A +:1024F00002434A607047F8B5044604F180050020A5 +:10250000E8606FF07E4701F05BF9064620680168DD +:102510000A0708D50097334600224FF400112046E1 +:1025200000F017F860B9206801684A070AD50097DB +:10253000334600224FF48001204600F00AF808B12B +:102540000320F2BD20206860A8600020E0662870AB +:10255000F2BD2DE9F041069C05460E4690461F4609 +:102560002868C1693140B1420CBF012000204045BC +:1025700026D114F1010FF3D001F022F9C01B8442DF +:1025800000D33CB900F025F800F02DF8FCD100F0A4 +:102590001AF811E0286801684A07E1D5C1690A05FF +:1025A000DED54FF40062026200F013F800F01BF871 +:1025B000FCD100F008F8C16000210170032000E0A8 +:1025C0000020BDE8F08105F180002021416081609C +:1025D0007047296851E8002F22F4D07241E80020AA +:1025E0000028F6D17047286800F1080151E8001F63 +:1025F000490800F10802490042E80010002870472D +:10260000DFF87801014042E8001000287047000020 +:10261000026852E8003F23F0C00342E8003100297D +:10262000F6D1016801F1080252E8002F01F1080318 +:1026300022F4000243E800210029F2D12021C0F851 +:1026400084107047026852E8003F23F4907342E818 +:1026500000310029F6D1016801F1080201F10803F7 +:1026600052E8002F0E490A4043E800210029F2D128 +:10267000C16E012908D1026852E8003F23F010031F +:1026800042E800310029F6D12021C0F8881000214D +:10269000C1660167704700000100001020010004BE +:1026A000FEFFFFEF0146886A09680A68930610D4A6 +:1026B0000021A0F85610016801F1080252E8002F2D +:1026C00001F1080322F0800243E800210029F2D141 +:1026D0003BE000F0E4BB806A01F078B8F8B5846AAA +:1026E00004F1840504F1560728686E6821688A6839 +:1026F000110606D5212804D1002038802046FFF796 +:1027000087FFFFF783FD06D5222E04D100203881F4 +:102710002046FFF797FFA86840F01000A860204609 +:10272000BDE8F24000F026BB806A00F156010022AD +:102730000A810A8000F01EBB026852E8003F23F0C5 +:10274000800342E800310029F6D1026852E8003FD8 +:1027500043F0400342E800310029F6D17047000001 +:10276000F369FFCF00380140880000580080004026 +:10277000FFF4FF110024F40000FD0F00FEFF7FEFC7 +:10278000854900E0854981B00A6802430A6009680A +:1027900008400090009801B0704780B54FF40020C9 +:1027A000FFF7F0FF002200212E2001F02DF8BDE8F8 +:1027B00002402E2001F046B800687949884200D0D6 +:1027C000704780B54FF48010FFF7DCFF0022002136 +:1027D0002C2001F019F82C2001F034F800220021FF +:1027E0002D2001F011F8BDE802402D2001F02AB89B +:1027F00038B59EB004466846142101F079F80AA85D +:10280000502101F075F820686649674D884246D12D +:1028100002200A90002111910AA801F083F808B162 +:1028200001F0E7FA286840F00100286029685F4D50 +:1028300001F00101059105980120FFF7A1FF0C208F +:1028400000900221002001910290032108200391B1 +:10285000049069464FF0904001F0CCFA544828604B +:10286000112000F058F808B101F0C3FA4FF0885079 +:102870000690002101200791ADF82010099006A9CB +:10288000284601F09BFB08B101F0B3FAA567AC62E2 +:1028900000220021252000F0B7FF252037E0454920 +:1028A000884236D101200A90002110910AA801F037 +:1028B00039F808B101F09DFA686840F4804068601A +:1028C00068683D4D00F48040059005980220FFF7B0 +:1028D00057FFC020009002210120019102900321A6 +:1028E0000720039104906946344801F083FA344884 +:1028F00028600F2000F00FF808B101F07AFAA56700 +:10290000AC6200220021242000F07EFF242000F091 +:1029100099FF1FB030BD68601020A8600020E860FB +:102920008020286100206861A861E861286228464B +:1029300000F04CB818B595B0044601A8502100F03D +:10294000D7FF21681F4A914224D14FF400600190C3 +:102950004FF48071119101A800F0E4FF08B101F07B +:1029600048FA1948816B41F40041816300210268F3 +:1029700042F4806202600022006800F480600090EF +:102980000098032000F040FF032000F05BFF20468A +:1029900001F0D6FB16B010BD4C0000585000005896 +:1029A000000C0058008000405C000058882900207E +:1029B0004400024000380140E8290020000400489B +:1029C00044040240002800405800005838B5040074 +:1029D00001D1012032BD2168DFF87003814204F18A +:1029E000240500F044F8022068700A68A0686FF3BC +:1029F0000E120243E0680243206902436069024309 +:102A0000A0690243E0690243206A02430A6020464B +:102A100000F070F9A068B0F5804F04BF002161603C +:102A20002079696A00F03F0000F014F838B10528F9 +:102A300005D2204600F078F900F012F803E00020FB +:102A400028636863A8630020A861012068700020E3 +:102A5000287032BD0860A96AE86A486060687047FB +:102A6000296B00200860696BA86B486070470AD228 +:102A7000DFF8DC0242181423B2FBF3F292002A6260 +:102A8000DFF8D00209E0DFF8D00242181423B2FBCD +:102A9000F3F292002A62DFF8C402E8617047F8B5E9 +:102AA000044604F1240600253078012801D10220D3 +:102AB000F2BD01273770707801282FD10227777077 +:102AC000B561206807687F087F000760204600F036 +:102AD000F5F82168F06820B10A6842F00E020A6039 +:102AE00008E0086820F0040008602068016841F0F0 +:102AF0000A010160706A0168CA0303D5026842F4E2 +:102B000080720260306B18B1016841F4807101601D +:102B10002068026842F00102026001E0357002257F +:102B20002846F2BD81B040B100F124014A78022A62 +:102B300005D00420886100200870012026E002688A +:102B4000136823F00E0313604A6A136823F480733A +:102B5000136000680268520852000260012091F878 +:102B60002020CB6902F01C02904058608A6AC86A33 +:102B70005060086B30B1026822F4807202604A6BC8 +:102B8000886B5060012048700020087001B07047C9 +:102B900038B500F1240200245178022903D0042022 +:102BA0009061012428E001680B6823F00E030B609C +:102BB00001680D686D086D000D60516A0B6823F4A3 +:102BC00080730B60012192F82030D56903F01C035B +:102BD00099406960936AD16A5960116B31B10B6891 +:102BE00023F480730B60536B916B5960012151701A +:102BF0001470516901B18847204632BDF8B500F123 +:102C000024010423CA6914680268156891F82060D9 +:102C100006F01C0603FA06F73C4210D06F070ED5EB +:102C20001468A50603D4156825F00405156000F0A6 +:102C30003DF8C968002938D0BDE8F44008470223B0 +:102C400003FA06F73C4213D0AF0711D51468A50666 +:102C500005D4156825F00A05156001224A7000F0B8 +:102C600025F800220A708968F9B1BDE8F4400847E8 +:102C7000082303FA06F6344217D02B0715D513683C +:102C800023F00E031360012291F82030CC6903F089 +:102C90001C039A40626001228A614A7000220A7015 +:102CA000096911B1BDE8F4400847F1BD91F8202051 +:102CB000CC6902F01C0293406360704778B5C56C24 +:102CC000046D6C60446D14B1846DC56D6560012543 +:102CD00090F84440066C04F01C04A540756004683C +:102CE00063608068102802D1A260E16071BDA160BC +:102CF000E26071BD416C0268144B89089A4234BF8E +:102D0000174B184B03EB8101816402F0FF02083A74 +:102D10001421B2FBF1F1144AC26401F01F01012237 +:102D200002FA01F1016570470179104A01F03F0193 +:102D300002EB81024265491E0D4A826501F00301E2 +:102D400001228A40C265704700000000080402406A +:102D5000F8FFFDBF00000240F8FBFDBF0004024089 +:102D6000000802401C08024080080240FC080240A3 +:102D7000400902407047704710B500F180010A78A1 +:102D8000012A01D1022010BD01230B7024224A60C8 +:102D900002681368146864086400146000224266C4 +:102DA00023F0005300680360202048600020087072 +:102DB00010BD70B500F01EF801D1022070BD00F00A +:102DC0001FF822F0604209E070B500F013F801D15D +:102DD000022070BD00F014F822F06062114381609F +:102DE000204600F01AF82068066020206860002065 +:102DF000287070BD044604F18005287801287047CA +:102E000001222A702420686020680668026852083F +:102E10005200026020688268704730B5416E11B977 +:102E20000121012214E001680FF230048A688968E8 +:102E30000FF23003520E02F00702490F655CA45CEA +:102E4000595C9A5CED00E40095FBF1F194FBF2F221 +:102E500068304180028030BD0000000001010103A4 +:102E60000701000008040204080101017047000086 +:102E700010B5002488B9114803600E480E4B03605A +:102E8000FFF71CF8012805D007D3032804D038BF6A +:102E9000022402E0012400E00324204610BD006863 +:102EA0000549884204D105490868002818BF004731 +:102EB000704700008426002000380140F82B0020D5 +:102EC000704770474FF0B040006800F0F000B02845 +:102ED00088BFB02070472DE9F041040054D020781D +:102EE00081064FF0B04538D5A868E96810F00C00AD +:102EF00001F0030103D00C2808BF012946D128683E +:102F0000800702D5E06900283ED0FFF7DBFF616A49 +:102F1000884207D2084600F0D3FB002834D100F0E5 +:102F200075FA0FE0286820F0F00001432960696815 +:102F3000206A21F47F4141EA00216960606A00F063 +:102F4000BFFB08BB00F095FBDFF810180860DFF846 +:102F50001008006801F00CF9B0B92078C1070DD550 +:102F6000A868E96800F00C00082801F0030103D00C +:102F70000C2808BF03292DD12868800340F139812E +:102F80006068002840F03581012038E2E06980B1B6 +:102F9000296841F0010100F047FA064628688007D9 +:102FA00000F1248100F00CFC801B0328F6D30320E1 +:102FB00025E2286840084000286000F001FC064631 +:102FC000286800F01FFAC8D000F0FAFB801B032825 +:102FD000F6D3ECE76068B0F5803F04D1296841F48E +:102FE0008031296003E02A6822F480322A60606818 +:102FF00060B100F0E5FB06462868800300F1F98027 +:1030000000F0DEFB801B6528F6D3D0E700F0D8FB8C +:1030100006462868400C10F0010000F0EA8000F03D +:10302000CFFB801B6528F4D3C1E700F0C9FBC01BB0 +:103030000328C0F01281BAE7E06878B1296841F44A +:10304000807100F0F1F906462868400500F118810A +:1030500000F0B6FB801B0328F6D3A8E7286820F40D +:103060008070286000F0ACFB06462868800A10F0EB +:10307000010000F0DC8000F0A3FB801B0328F4D3E8 +:1030800095E700F09DFBC01B0328C0F00B818EE785 +:1030900040F0010000F0CEF907467068800700F1AB +:1030A0001C8100F08DFBC01B0328F6D37FE77068FE +:1030B00020F0040000F0BEF907467068C00810F068 +:1030C000010000F0198100F07BFBC01B0428F4D341 +:1030D0006DE70528306806D140F0040030603168A3 +:1030E00041F0010105E0400840003060316821F006 +:1030F00004013160A06841F2893768B100F060FBDB +:1031000080463068800700F10C8100F059FBA0EB8D +:103110000800B842F5D34AE700F052FB8046306819 +:1031200000F070F900F0FD8000F04AFBA0EB080011 +:10313000B842F4D33BE700F043FBC01B0328C0F0C8 +:10314000FE8034E7B06840084000B06000F038FB13 +:103150000746B06800F056F900F0F58000F030FB4B +:10316000C01B0328F5D322E700F02AFB801B0328AD +:10317000C0F01F811BE700F023FB001B0328C0F0F9 +:10318000398114E7286881010CD4296841F08071E5 +:103190002960E86840F08050E86000F011FB0446C8 +:1031A0002868810100F12A8100F00AFB001B032836 +:1031B000F6D3FCE60C2931D0286820F08070286016 +:1031C000E968DFF8A00589088900E960E96801403D +:1031D000E96000F0F5FA04462868810140F10E81AB +:1031E00000F0EEFA001B0328F6D3E0E600F00EF93B +:1031F000B3E6207881071AD5A868E96800F00C00CA +:10320000042801F0030104D00C2808BF02297FF430 +:1032100013AF2868400503D5E06800283FF4B4AE3A +:103220006968206921F0FE4141EA00616960216816 +:10323000DFF8346511F0180F38D0606900283FF4CA +:1032400036AFC90670687FF523AF800709D4706870 +:1032500040F0010000F0EEF80746706880077FF547 +:10326000E4AE706840F0040000F0E4F807467068CF +:1032700000070DD400F0A4FAC01B0428F7D396E68B +:103280006868216920F0FE4040EA01606860CEE78E +:103290007068A16920F4706040EA0120706000F05D +:1032A000C6F8074600F0ADF87FF4EBAE2078410792 +:1032B00037D5DFF8B8743868C10529D400F07AFF33 +:1032C00000F07EFA80463868C10521D400F078FA13 +:1032D000A0EB08000328F6D369E6706820F004002C +:1032E00070607068C00810F00100DFD000F068FA6C +:1032F000C01B0428F5D35AE600F099F8074600F001 +:1033000080F8D3D000F05CFAC01B0328F7D34EE658 +:10331000A06801287FF4DDAE306840F00100306025 +:10332000E8E6217848060ED5A06A00283FF40AAFE7 +:10333000B16841F00101B16000F042FA0746B0689F +:1033400080077FF5F8AEE06A002857D0A968EA68E0 +:10335000022801F00C017FF42DAF236B02F0030073 +:10336000984202BF02F07000636B984214D1A36BC5 +:10337000C2F30620984202BF02F47810E36B984231 +:103380000AD1236C02F06060984202BF02F06042F2 +:10339000606C82423FF4F6AE0C293FF4F5AD28682C +:1033A00041013FF5F1AD296821F0807100F03CF852 +:1033B0000646286881013FF5D7AEE968DFF8B0031B +:1033C000A26B0140206B0143606B0143E06B41EA5B +:1033D00002210143206C0143606C0143E9602868CD +:1033E00040F080702860E96841F08051E96000F0A9 +:1033F000E7F90446286881017FF5BDAE0020BDE8ED +:10340000F0817068400810F0010070472968606A18 +:1034100021F0F001014329606868216A20F47F40AF +:1034200040EA012068607047296000F0C9B97068FF +:1034300040084000706000F0C3B92DE9F843040073 +:10344000884644D0DFF82C6300F0CBF847D200F078 +:10345000CDF8074600F0C5F841D000F0B1F9C01B27 +:103460000228F7D90320BAE000F0AAF9401B02288D +:1034700043D9F7E700F0A4F9A0EB090002284CD9E2 +:10348000F0E700F09DF9A0EB0900022854D9E9E724 +:1034900000F096F9401B02285DD9E3E700F090F9AF +:1034A000401B022867D9DDE700F08AF9401B484538 +:1034B00077D3D7E7032802D13968890103E00028D0 +:1034C000396802D1890762D401E049055FD401203F +:1034D00085E000F075F9C01B022872D9C2E7207898 +:1034E00081074FF0B0470BD5B968A06821F0F00113 +:1034F0000143B96000F064F90546B868C003B3D56C +:103500002078DFF8545281060AD52968606921F0D5 +:10351000F0010143FFF788FF814628688003A9D5A1 +:10352000207841060BD52968A0690909090141EAFB +:103530001011FFF779FF81462868C003A1D52078D4 +:1035400041070BD5B968E06821F4E0610143B96037 +:1035500000F036F90546B868800399D52078010750 +:103560000CD5B868216920F4605040EAC100B86009 +:1035700000F026F90546B86840038FD52078C107CA +:1035800017D56068022895D1396889039FD5B96835 +:10359000890840EA8100B86041F2893900F010F9E9 +:1035A0000546B868616800F00C00B0EB810F7FF44D +:1035B0007BAF306800F00700804505D200F016F8B8 +:1035C000074600F00EF884D100F053F8DFF88C11B4 +:1035D000086000F00BFEBDE8F24300F0C9BDBDE895 +:1035E000F283306800F00700404570473168C90831 +:1035F00048EAC101316000F0E3B838B54FF0B0449B +:103600005E4DA16811F00C0106D1FFF75BFCC0F321 +:10361000031055F8200032BD0429594A05D0082965 +:10362000584804D12168C90222D5104632BDE1684C +:1036300001F00301022904D0032904D12168C90241 +:1036400007D5104605E0FFF73DFCC0F3031055F821 +:103650002000E168E268E368C1F306214843C2F351 +:103660000211491C5B0FB0FBF1F05B1CB0FBF3F0E7 +:1036700032BD80B5FFF7C1FF3F49FFE7424A096805 +:10368000C1F3031152F82110B0FBF1F002BD80B577 +:10369000FFF7EFFF00F010F8C1F3022106E080B55C +:1036A000FFF7E7FF00F008F8C1F3C22112F821107C +:1036B00001F01F01C84002BD2F49344A0968704714 +:1036C00070B52E49B1282EBFCC6AC0F3031051F853 +:1036D00020402148056800F0A3FD2B492C4A05F045 +:1036E0000F0551F82510B4FBF1F10024B1FBF2F104 +:1036F000B0F5007F0FF2B802204609D10FF2940313 +:1037000053F820508D4214D2401C0328F8D912E0FF +:103710000FF2900353F820508D420AD2401C032828 +:10372000F8D308E000F04CF8801B03280CD30320EA +:1037300070BD52F820400F4D2868C00844EAC00010 +:10374000286000F03DF80646296801F00701A14213 +:10375000E8D1002070BD000008010058F0250020CD +:10376000D4250020FFFFFEEE900000580004005812 +:103770008C80C111004000580800005810790008E2 +:103780000024F4000048E801D07800089080000888 +:1037900040420F001200000024000000360000002C +:1037A00040000000060000000C00000010000000B7 +:1037B0000000000001000000020000000300000003 +:1037C00001484068704700BFCC25002070470000CA +:1037D0000901020081B002D43C48815405E03C4814 +:1037E00002F00F02104400F8041C01B07047394A7F +:1037F00013684FF6FF0100020B4000F4E06018432D +:10380000354908431060704738B5324B1C68C4F323 +:103810000223C3F10704052C28BF04241D1D072D16 +:1038200034BF0023DB1E012505FA04F4641E214089 +:10383000994005FA03F35B1E1A401143BDE834407A +:10384000C6E70000010007D4012200F01F01234B4E +:103850008A40400943F82020704701000BD4012220 +:1038600000F01F011E4B8A40400943F82020BFF39F +:103870004F8FBFF36F8F704710B5401EB0F1807F40 +:1038800001D3012010BD174C60600F214FF0FF30B5 +:10389000FFF79EFF0022A26007202060002010BDDD +:1038A000010007D4012200F01F010F4B8A4040099C +:1038B00043F820207047010007D4012200F01F01C7 +:1038C0000A4B8A40400943F82020704700E400E09A +:1038D00018ED00E00CED00E00000FA0500E100E06A +:1038E00080E100E010E000E000E200E080E200E0C3 +:1038F000002200F09DBC0000DFF820130A680309D5 +:1039000003F47F2300019A4300F47F2000F082B982 +:10391000DFF808231368010C23EA014343EA00435C +:10392000136070472DE9F843054600242878DFF836 +:10393000EC624106A0464FF0B0472DD5286B70B120 +:10394000B0F5800F06D0B0F5000F18BFB0F5400FEE +:1039500017D01FE0F86840F48030F860EDE0386878 +:1039600020F080603860FFF72BFF81463868000147 +:1039700040F1D080FFF724FFA0EB09000228F5D921 +:103980000324D7E0FFF71CFFA0EB0900022840F258 +:10399000C980F5E70124A0462868010531D5B06843 +:1039A00000F44078286C80452AD000F003FCB8F180 +:1039B000000FB16805D1286C21F440710143B1605A +:1039C0001EE0B06840F48030B06021F44071B0680F +:1039D00020F48030B060286C0143B160B068C0074B +:1039E0000ED5FFF7EDFE804641F28939B0688007B9 +:1039F00006D4FFF7E5FEA0EB08004845F6D3032404 +:103A0000A0462878C10705D53168A869890840EA29 +:103A1000810131602878810705D53168E86921F492 +:103A20004061014331602878C10644BFA86AFFF7AE +:103A30006FFF2878810644BFE86AFFF769FF28789E +:103A4000410744BF286AFFF757FF2878010744BFA2 +:103A5000686AFFF751FF2868C1051BD53168686B9C +:103A600021F0406101433160686BB0F1006F00F0FC +:103A7000BDF8686BB0F1806F75D100F0BDF80446F9 +:103A80003868000160D5FFF79BFE001B0228F7D9BC +:103A90004FF0030867E0FFF793FE001B02285BD995 +:103AA000F6E7316821F04041316020F08050326803 +:103AB00022F0406210433060A86BB0F1C05F00F0AC +:103AC00095F8286841056DD53168E86B21F04051C3 +:103AD00001433160E86BB0F1005F03D1F96841F454 +:103AE0008031F960E86BB0F1805F5BD100F084F861 +:103AF00004463868000146D5FFF762FE001B022825 +:103B0000F7D94FF003084DE0FFF75AFE001B0228DB +:103B100041D9F6E700F061F8A86821F4781100F0C7 +:103B200071F88146386800017FF52CAF3969686902 +:103B300001433961002C7FF42EAF3168286B21F4EA +:103B400040010143316027E700F047F8E86821F0C1 +:103B5000606100F057F80446386800019BD5396968 +:103B600068690143396128688105AAD5A86BB0F15D +:103B7000804F1CBFB0F1004F002892D1316821F076 +:103B80004041084397E700F028F8286921F0604198 +:103B900000F038F8044638680001B5D5396968691D +:103BA000014339612868C10405D5F168686C21F4C6 +:103BB00040410143F160286881040BD5796AE86CC3 +:103BC00021F0300101437962796AA86C890840EAE2 +:103BD000810179624046BDE8F2833869696820F462 +:103BE000FE4040EA012038613969704703D1F96825 +:103BF00041F08071F9607047396821F08061396067 +:103C0000FFF7DEBD01433961386840F080603860FD +:103C1000FFF7D6BD104308607047000088000058C9 +:103C2000644900E0644981B00A6802430A60096897 +:103C300008400090009801B0704710B500F0C2FA3B +:103C400000F010FB00F046F800F082F85B4C5C4896 +:103C5000606204F1240000F0FDFD0420FFF7E2FFA4 +:103C60000120FFF7DFFF0220FFF7DCFF0420FFF752 +:103C7000D7FF0220FFF7D4FF0120FFF7D1FF00227A +:103C80000F210E20FFF7C0FD0E20FFF7DBFD002205 +:103C90000F213A20FFF7B8FD3A20FFF7D3FD49483E +:103CA0002060002060600F20A06047F6FF70E06099 +:103CB00000202061A061E0616061204600F002FE0A +:103CC00000220021204600F0ABF900F0F3FA00F0EA +:103CD0004BFCFCE780B59AB008A84821FFF708FE26 +:103CE00001A81C21FFF704FE00F064FA36480168C1 +:103CF00021F01801016007213448026822F4C062F3 +:103D000042F4007202604FF48032006800F4C06038 +:103D100000900098089101200A904FF480710B9157 +:103D200040200C9000210992139108A8FFF7D3F8C6 +:103D30006F200190022100200291039004900590D1 +:103D400006900790012101A8FFF777FB1BB000BD8B +:103D500010B594B068465021FFF7CAFD4FF480407B +:103D600011900221102013904FF4405412910094AE +:103D70006846FFF7D7FD14B010BD10B5144C1548B8 +:103D800000F02AF84FF40040E061002020626062F9 +:103D9000A0622046FEF752F800212046FFF709F8FE +:103DA00000212046FFF710F82046BDE81040FEF73E +:103DB000E3BF0000480000584C00005828290020AC +:103DC000000C0058002800409000005800040058E3 +:103DD000842600200038014020604FF4E13060600C +:103DE0000020A060E06020610C2060610020A061E4 +:103DF000704770472DE9F84F4FF00009674A684B4C +:103E00004FF00F0805460E4633E0664FBD4214BF23 +:103E1000072704278F4027434CF82E70C1431C68A6 +:103E200001EA040C7468E40248BF40EA0C0CC3F8D1 +:103E300000C05C6801EA040C7468A40248BF40EA50 +:103E40000C0CC3F804C0146801EA040C7468E403A1 +:103E500048BF40EA0C0CC2F800C0546801EA040CE8 +:103E60007168890348BF40EA0C0CC2F804C009F12C +:103E70000109316831FA09F000F07E80012404FA6A +:103E800009F414EA0100F2D04FEA490C032101FAC7 +:103E90000CF16FEA010E716801F00307012F1CBFDE +:103EA00001F00301022911D1A968F7680EEA0101A6 +:103EB00007FA0CF73943A960696821EA04047168BC +:103EC000C1F3001101FA09F10C436C604FEA89015A +:103ED000347904F00304032C1FD0EC68B7680EEAB1 +:103EE000040407FA0CF73C43EC60347904F0030453 +:103EF000022C12D14FEAD90705EB870401F01C0709 +:103F0000D4F820A008FA07FB2AEA0B0AD6F810B06A +:103F10000BFA07F747EA0A0727622C680EEA04073C +:103F2000347904F0030404FA0CF43C432C60746804 +:103F300014F4403F9BD0DFF870C04FEA990E5CF854 +:103F40002E7001F00C0108FA01F427EA0404B5F11F +:103F5000904F08BF00270ED0144FBD4208BF012765 +:103F600009D0134FBD4208BF022704D0114FBD42F4 +:103F70007FF44BAF03274DE7BDE8F18F81B0002AF6 +:103F800014BF8161816201B070470B4A136803421C +:103F90001CBF106000F0FABA70470000800800589B +:103FA00000080058001000480800014000040048C4 +:103FB00000080048000C00480C08005818B500F133 +:103FC0002402507801281BD11378012B01D1022043 +:103FD00012BD536A10701C680A4804400868044304 +:103FE000C868401E44EAC04448680443087A497AD5 +:103FF00044EA004444EA41241C600020107012BDD1 +:10400000012012BDFFFD00E08A60FF2102685162BD +:10401000012180F82110002180F820100020704735 +:104020002DE9F84300F065F808BF022038D000F011 +:1040300067F814D5FFF7C4FB07462068C168480736 +:104040000DD5FFF7BDFBC01B4845F6D300F039F88E +:1040500026E0FFF7B5FBC01B484507D3F6E700F0A5 +:104060002AF800F065F8FFF7ABFB07462068C16847 +:104070004A07EED5C0F81480206800F013F82A48EB +:10408000016841F4002101602848026842F40022DE +:1040900002602068816841F48041816000F01BF873 +:1040A000BDE8F2838168C908C90081602068816821 +:1040B0000D43856070472068816821F480618160CC +:1040C000704720684662032184F82110002084F89C +:1040D0002000032070472068816841F4806181607E +:1040E00001212068466284F82110002084F8200015 +:1040F00070470446884694F820000128154670470A +:10410000012184F82010022084F82100CA202168AF +:104110004862532022685062FF2620688168480563 +:1041200040F2E93970470000800800580008005844 +:104130002068C16801F0800161F49061C16070473E +:1041400090F82010012901D102207047012280F847 +:104150002020022180F82110CA21026851625321D7 +:104160000368596201688A6842F02002FFF74CBF79 +:1041700070B50F4E044630780025A8B1FFF779FAE4 +:1041800032784FF47A71B1FBF2F1B0FBF1F0FFF746 +:1041900073FB48B9102C07D2002221464FF0FF30A4 +:1041A000FFF732FBB46000E00125284670BD00BF78 +:1041B000CC2500200248016841F4807101607047FD +:1041C00000040058134810B5016841F48071016083 +:1041D0000320FFF70CFB0020FFF7CAFF0024002894 +:1041E00014BF0124FEF7D9FA204610BD0A488068A2 +:1041F0007047094800787047084805E0074801689B +:1042000041F0020101607047016841F00101016065 +:104210007047000000400058CC250020042004E036 +:10422000DFF80800006800F4C06070470004005820 +:1042300000B500BF130096469446103928BFA0E889 +:104240000C50FAD85FEA417C28BF0CC048BF40F848 +:10425000042BC90728BF20F8022B48BF00F8012B08 +:1042600000BD000010B5B249B24C4FF400400860E8 +:10427000606840010ED56068C0000BD4FFF79AFF5C +:10428000FFF798FF206840F480302060216821F417 +:104290008031216000F073F8002000F0B7FB40B1DE +:1042A0008079A549E160E16821F47C5141EA00216F +:1042B000E16010BD10B5A148A14C88B00168016053 +:1042C000CA21A048C1615321C161FF220168C90808 +:1042D000C9000160C2619C48016841F4004101606D +:1042E00000F0A6FB99480168C908C90041F0040123 +:1042F00001600020964900F02CFD00F076FE0121BF +:10430000012000F09AFB002000F0B7FF012000F030 +:10431000B4FF022000F0B1FF012000F0D6FF012120 +:10432000002000F0E6FF0121012000F0E2FF012162 +:10433000022000F0DEFF01F031F8864A00214FF440 +:10434000807001F082F904F23C500FF27901009084 +:10435000019169460FF2710001F0FAF904F254700C +:10436000029004F5C96140F23C5005900391049419 +:1043700002A801F09BF801F00FF808B010BD7648D4 +:1043800081B0016841F4801101603F21006800F4B0 +:10439000801000900098714841604161016841F4CB +:1043A0007C110160026942F47C120261016841F0F3 +:1043B0003F010160026942F03F02026101B07047B3 +:1043C000000000007047000038B5044688B06168FE +:1043D00001F10B05684601F07CFA9DF802309DF86A +:1043E00001209DF800100FF2C01001F0B1FA9DF805 +:1043F00004100FF2D81001F0ABFA9DF80C309DF8C4 +:104400000B209DF80A100FF2E01001F0A1FA2888A5 +:104410004FF41241401A0CD0401E3ED0401E4CD0EA +:10442000801E57D0401E5AD0401E5BD0401E60D028 +:1044300063E004A81021FFF75BFA60680D30007894 +:10444000F8B90FF2683001F083FA00F0DDFD0D20BD +:104450008DF810007F2142488DF8121004680FF289 +:104460007C30240C214601F073FAADF81C4004A8FE +:1044700001F028FA01F080FA0021012000F0DDFAB5 +:104480003BE0012806D10FF2743001F061FA002000 +:10449000207032E00FF290302DE0606800F10D04E2 +:1044A0000FF27020217801F053FA2078002814BF11 +:1044B0000FF2C4200FF288201DE00FF2441001F02B +:1044C00047FAD5F80620D5F802100FF2601001F077 +:1044D0003FFA12E0D5F802100FF2941006E00FF246 +:1044E000C41008E0D5F802100FF2D41001F030FA31 +:1044F00003E00FF2042001F02BFA09B030BD38B50B +:104500000446FFF75DF914F1010F054609D0FFF7E6 +:1045100070FE241805E01348016821F004010160D1 +:1045200030BFFFF74DF9401BA042F4D331BD00006E +:104530001040005890000058FECAFECA900800586B +:10454000300003200828004008000058800400586C +:10455000282900209357000850000058040C0058E8 +:10456000002004E010ED00E001E0704700BF4FF0D4 +:10457000FF3001F003B800214FF4807001F072B8F1 +:10458000022001F095B8022001F09AB8012805D068 +:10459000022805D0102805D101F011BB01F01EBB87 +:1045A00001F01DBB70470000576972656C6573733D +:1045B000204669726D776172652076657273696FE6 +:1045C0006E2025642E25642E25640A0057697265C5 +:1045D0006C657373204669726D77617265206275D0 +:1045E000696C642025640A00465553207665727311 +:1045F000696F6E2025642E25642E25640A0A00004A +:104600002D2D20424C45204E564D2052414D2048E4 +:104610004153204245454E20555044415445442085 +:10462000425920434D4F2B200A0000005348434974 +:104630005F5355425F4556545F424C455F4E564D61 +:104640005F52414D5F555044415445203A205374C8 +:1046500061727441646472657373203D20256C78C7 +:10466000202C2053697A65203D20256C640A0000C7 +:10467000534843495F5355425F4556545F4E564D2C +:104680005F53544152545F5752495445203A204E8B +:10469000756D6265724F66576F726473203D202599 +:1046A0006C640A00534843495F5355425F45565472 +:1046B0005F4E564D5F454E445F57524954450A0080 +:1046C000534843495F5355425F4556545F4E564DDC +:1046D0005F53544152545F4552415345203A204E56 +:1046E000756D6265724F66536563746F7273203DBA +:1046F00020256C640A000000534843495F5355422B +:104700005F4556545F4E564D5F454E445F4552419E +:1047100053450A00534843495F5355425F45565439 +:104720005F4552524F525F4E4F54494620574954AD +:104730004820524541534F4E202578200A00000062 +:10474000534843495F5355425F4556545F45525263 +:104750004F525F4E4F5449462057495448205245C6 +:1047600041534F4E202D204552525F424C455F49E8 +:104770004E4954200A000000534843495F535542B4 +:104780005F4556545F4552524F525F4E4F54494613 +:10479000205749544820524541534F4E202D204226 +:1047A0004C45204552524F52200A0000534843497D +:1047B0005F5355425F4556545F434F44455F5245F2 +:1047C000414459202D20574952454C4553535F468B +:1047D000575F52554E4E494E47200A004442474DBE +:1047E00043555F4765745265766973696F6E4944D6 +:1047F0003D20256C78200A0A0000000053484349F8 +:104800005F5355425F4556545F434F44455F5245A1 +:10481000414459202D204655535F46575F52554E0F +:104820004E494E47200A0000534843495F535542C2 +:104830005F4556545F434F44455F524541445920BC +:104840002D20554E4558504543544544204341532F +:1048500045200A00F8B504460025ACB104F1340641 +:10486000307910B92046FDF7A7FF0F4F384600F00A +:1048700021F8386840F001103860204600F007F851 +:1048800035600120307100E001252846F2BD10B5E9 +:104890000021064A064B00EB8104491C062963608F +:1048A000E261F8D310BD0000000C0058FB110008B5 +:1048B0007F110008002101604FF03F1141603F214E +:1048C0008160704738B5040044D094F8210028B9BD +:1048D000002184F820102046FEF72CF800F049F85B +:1048E000FF2510B100F03FF834E02168DFF8B00098 +:1048F0008A6802408A6021688A6863682069034385 +:10490000A06903431A438A602168E068086120684F +:104910000169A26841EA024101612068C16821F091 +:104920008001C1602068C16C89088900C164216868 +:10493000CA6CE369606903431A43CA6420688168EA +:10494000880609D400F020F830B1206845620421BF +:1049500000F01FF8012032BD20684562012184F873 +:104960002110002032BD20684562042184F8211006 +:104970007047022084F82100CA2021684862532031 +:1049800022685062204626E020460BE02068C0F8EE +:10499000248084F82110002084F820007047000053 +:1049A000BFFF8FFF70B5044640F2E9362068C1684A +:1049B00021F0A001C160FEF703FF05462068C16831 +:1049C000880606D4FEF7FCFE401BB042F6D3032057 +:1049D00070BD002070BD70B504462068C1684A06ED +:1049E00012D44FF0FF32C26040F2E936FEF7E8FE23 +:1049F00005462068C168480606D4FEF7E1FE401B64 +:104A0000B042F6D3032070BD002070BD01460648B9 +:104A1000064AC3798B4218BF904218BF0838F8D1B4 +:104A20008B4218BF00207047F873FF1F0070FF1FF4 +:104A30000C48002101604160704710B500F00CF88F +:104A40005C6819B1012904D1204301E024EA000087 +:104A5000586082F3108810BDEFF3108272B6014BDC +:104A600070470000BC2B0020DFF83C150A6892B2AA +:104A700000E00246086880B28242FAD170472DE910 +:104A8000FC4104461825DFF82485DFF824656843D7 +:104A900008EB00073078062808D13178717034703F +:104AA00078754FF0FF307060002039E000F077F843 +:104AB000B9680918B96008F10803B96832786A431F +:104AC0009A589142327813D308F1150315FB02FC72 +:104AD00013F80C30062B25D008F108066B43F35869 +:104AE000994222BF08F115036A439A5CEED219E09D +:104AF0001146337869439A420BD008F1140308F148 +:104B0000150C5B5C15FB03F50CF805407A753B75DD +:104B100000E07A7508F114025454317871703470E1 +:104B2000BDE8F6811146694308F115035B5C062B6D +:104B300004D008F1140615FB03F574557B753A751E +:104B400008F115025454EBE7F8B5DFF86434DFF8E8 +:104B50005C541E78182402466243B0422A4404D1B1 +:104B600018785870507D18700FE0167D507D92F8BF +:104B700015C005F115076643062807F806C004D0DE +:104B8000167D143514FB00F42E550120107318788F +:104B9000062802BF00294FF0FF315960F1BD10B562 +:104BA000DFF80C44606810F1010F0FD0FFF75CFFD5 +:104BB0006168DFF80024814261683CBF5388C918EE +:104BC000081A517848431178C84000E0002080B2AC +:104BD00010BD2DE9F84FDFF8DC53DFF8DCB3D5F872 +:104BE0000880D8F80000DBF800104A0500F090F9C2 +:104BF000DFF8BC63DFF8B4A321F4806181604FF07B +:104C0000180934780AF1080019FB04F14758FFF736 +:104C1000C6FF874217D200270121B170062C3DD074 +:104C200019FB04F40AF108010AF10802095981424A +:104C300023BF0AF108010959091A002111510AEB91 +:104C400004014C7DEAE7A9884118B94202D2AF8835 +:104C50000021E2E73F1ADFE7022802DA287801287C +:104C600000D07F1ED8F80000C1684A07FAD500F0CE +:104C700055F9DBF80C00000CBFB247EA0047CBF84F +:104C80000C70FFF7F1FE7060A8680068816841F45D +:104C900080618160AFF30080BDE8F18FB8B2002879 +:104CA000DAD1FFF7E1FE70600320BDE8F24FFEF7B6 +:104CB000F7BD2DE9F843EFF3108872B6BD4DBB4B3D +:104CC000A8680168CA224A6253204862B84A8868C4 +:104CD00020F48060886018201678374647431F44C8 +:104CE000387B022826D13C68D7F810909078F0B134 +:104CF0007A7B012A0AD101213046FFF725FF88F38C +:104D000010887968304600F016F904E088F31088BE +:104D1000304600F0C1F8A8680068CA214162224606 +:104D2000532141624846314600F050F90BE0FFF74D +:104D300050FF06E0C8684207FCD500F07EF89F49A6 +:104D4000086088F31088FF21A86802685162BDE8F6 +:104D5000F183F8B5974CA160CA2209684A625322D0 +:104D60004A62954A136843F020031360136803F006 +:104D70000703C3F10403237095682D0C05F07F052C +:104D80006D1C6570EDB29268C2F30E02521C628017 +:104D900092B2521E6A43A2F5A072DA404FF6FF7338 +:104DA0009A422CBFA380A280854A136843F4002353 +:104DB0001360844B1D6845F400251D6048BB7C488A +:104DC0007A4E0123837018254FF0FF334360002390 +:104DD0005FFA83FC06F10C0715FB0CFC4FF0000E8C +:104DE00007F80CE05B1CDFB2062FF1DB0623037033 +:104DF000886820F48060886000F01FF8D06003208D +:104E0000FEF759FDA1680868826842F4804282601A +:104E100005E0C868410544BF0320FEF741FDA168D5 +:104E20000A68FF205062002203210320FEF7ECFCF9 +:104E3000BDE8F2400320FEF705BDC86800F0800021 +:104E400060F49060C8604FF400207047F0B50446ED +:104E50000025EFF3108672B61827DFF850C10CF169 +:104E60000C0007FB05FE10F80E0010B16D1C062D9E +:104E7000F5DB062D0CD06F430CEB07000127077301 +:104E800086F310880461427303600D700020F0BD4A +:104E900086F310880120F0BDF8B50746EFF31084C3 +:104EA00072B60320FEF7D9FC424DAE683068CA21C5 +:104EB00041623A4653214162182043494243895C8A +:104EC00002291BD100213846FFF73EFE3848017801 +:104ED00006290ED1306838490A68530500F018F8E1 +:104EE00021F480618160C1684A07FCD500F016F8A2 +:104EF00004E04078884218BFFFF76BFEA9680A6893 +:104F0000FF2050620320FEF79DFC84F31088F1BD62 +:104F100002D5C1684A07FCD481687047C16801F0B6 +:104F2000800161F49061C1604FF400202349086062 +:104F30000320FEF7C0BC2DE9F04180460F464246F3 +:104F400018201A4942438C18207B022804BF40468F +:104F5000FFF7A2FFEFF3108572B60320FEF77DFC8A +:104F6000144EB0680068CA21416253214162022098 +:104F70002073A76067604046FFF781FD0C490A78FF +:104F80004978914202D0FFF724FE02E0A168081A96 +:104F9000A060FF20B1680A6850620320FEF752FC4F +:104FA00085F31088BDE8F0812828004014270020F0 +:104FB000EC2B0020A82B0020082800400C080058EB +:104FC00000080058800800582027002010470000E3 +:104FD000484900E0484981B00A6802430A6009680C +:104FE00008400090009801B0704780B5FFF704F9C1 +:104FF000FFF704F94148016841F48031016001F094 +:105000003AF8BDE801400EE000B587B068460FF2FF +:1050100038211C22FCF734F900F07DFA684600F0D4 +:1050200049FC07B000BDF0B585B068461421FEF715 +:105030005FFC00260025002400210FF2DC0000EBBD +:10504000C102907988B11368B3F1904F08D02C4F0A +:10505000BB4208D02B4FBB4204BF9088044304E0FE +:105060009088064301E090880543491C2629E4DB2B +:10507000002002900121032003900191B0B288B179 +:1050800000900120FFF7A4FF0120FFF7A3FF69466E +:105090004FF09040FEF7AEFE0022B1B24FF09040CC +:1050A000FEF76CFFA8B280B100900220FFF790FFDE +:1050B0000220FFF78FFF124E69463046FEF79AFE38 +:1050C0000022A9B23046FEF759FFA0B280B100908D +:1050D0000420FFF77DFF0420FFF77CFF094D6946A0 +:1050E0002846FEF787FE0022A1B22846FEF746FFBB +:1050F00005B0F0BD4C0000584C0100589008005815 +:105100000004004800080048FEF737BE13460A4670 +:1051100001460020FDF7ACBE000000480100000081 +:1051200000000048010000000000004801000000ED +:1051300000000048010000000000004801000000DD +:1051400000000048010000000000004801000000CD +:1051500000000048010000000000004801000000BD +:1051600000000048010000000000004801000000AD +:10517000000000480100000000000048010000009D +:10518000000000480100000000000048010000008D +:10519000000000480100000000000048010000007D +:1051A000000000480100000000000048010000006D +:1051B000000000480100000000000048010000005D +:1051C000000000480100000000000048010000004D +:1051D000000000480100000000000048010000003D +:1051E000000000480100000000000048010000002D +:1051F000000000480100000000000048010000001D +:10520000000000480100000000000048010000000C +:1052100000000048010000000000004801000000FC +:1052200000000048010000000000004801000000EC +:1052300000000048010000000000004801000000DC +:105240000000004801000000000000000000000015 +:105250000000000018510008280003202C00032043 +:1052600026040400444981B00A6802430A600968C0 +:1052700008400090009801B0704778B585B00446AA +:1052800068461421FEF734FB0220FFF7EBFF00F025 +:1052900010F8009501200190002102200390029156 +:1052A000694656F82400FEF7A5FD00F008F806B0A0 +:1052B00070BD0FF2D000314E30F81450704756F8E0 +:1052C000240000222946FEF759BE0FF2B8012B4BED +:1052D00031F8101053F820000122FEF74FBE0FF2F4 +:1052E000A401264B31F8101053F820000022FEF7DD +:1052F00045BEF0B585B005460C4668461421FEF75C +:10530000F7FA0DB9042004E0012D18BF022D02D1D7 +:105310000820FFF7A7FF2000194E0FF270070DD1EC +:1053200037F8150000900021019101200290022120 +:10533000039100F01CF80120FFF7E1F8012C14D1D3 +:1053400037F81500009001214FF4041001900291EC +:1053500000F00DF80FF23C00445D00220F2160B216 +:10536000FEF752FA60B2FEF76DFA05B0F0BD69467D +:1053700056F82500FEF73EBD4C000058D825002009 +:10538000E4250020200001000200000010000100C0 +:10539000020000000A06070000F01FBF6C486D49BC +:1053A000016001F12002426001F13002826001F1EE +:1053B0003C02026201F14402426201F14C02C2600D +:1053C00001F15402026101F17002426101F17402C3 +:1053D00082618031C16100F01EBF38B504465E4D68 +:1053E000284600F07BFF5A484068A1680160E168E8 +:1053F000C16085605949416000F029FF58482AE0A2 +:1054000080B553484268136801211972406800F062 +:1054100024FF002002BD38B5514C4F4D04E000F090 +:1054200041F8009821688847284600F05AFF002874 +:10543000F5D031BD4A484168084738B50446494D62 +:10544000284600F04BFF4248C068A16801604560F3 +:1054500000F008FF44482168016061684160002055 +:1054600032BD80B53A48C268136810211972C0680D +:1054700000F0FEFE002002BD35483B4AC168C1680D +:1054800013680868184738B5374C364D04E000F00B +:1054900009F8009861688847284600F022FF002834 +:1054A000F5D031BD6946284600F044BF38B5044602 +:1054B0002E4D284600F012FF2D4800F00FFF244823 +:1054C0000069A1688160E168C160056121680160CF +:1054D00061684160216941616169816131BD80B567 +:1054E0000146234800F010FFBDE802400FF205001E +:1054F00000F0C7BE38B5164C1D4D06E0FFF7D2FFD1 +:1055000000992069006900F0FFFE284600F0E9FEDE +:105510000028F3D031BD10B5164C204600F0DEFE59 +:105520000B4841690C60BDE8104000F0BEBE1CB5E0 +:10553000104C06E06946204600F0FCFE009800F0A2 +:105540001BF8204600F0CDFE0028F3D013BD00006C +:1055500000000320AC090320480A03209008032020 +:10556000CC2B0020500A0320D42B0020380A032023 +:10557000C42B0020400A0320704700002DE9FC479F +:10558000604CDFF88491A5692840A0614FF0FF3A94 +:1055900021694FF0010834E0521C54F8320061696F +:1055A00019400142F8D0616904EBC20608407168F5 +:1055B0001840014208BFC6F804A07768384000F0E0 +:1055C000A5F8606208FA00F087437760EFF3108176 +:1055D00072B6626A206908FA02F2D2431040206172 +:1055E000022004EBC00353F8086C1640401E43F839 +:1055F000086CF6D181F31088606A59F8201088474A +:105600002169A36960690140194205D0E069216AF6 +:10561000084208BF0022C0D0C4F824A000F09BFEBE +:10562000EFF3108972B6216960690140A0690142F7 +:1056300001BFE169206A0142FEF797FF89F31088F4 +:1056400000F08AFEA561BDE8F38738B51446EFF394 +:10565000108572B600F05AF82B4941F8204085F3C6 +:10566000108831BD10B500F00BF804431C6153F8ED +:105670003140204343F83100FFE782F3108810BD2A +:10568000EFF3108272B61F4B1C697047EFF3108165 +:1056900072B61C4A536923EA000005E0EFF310815B +:1056A00072B6184A53691843506181F310887047E5 +:1056B000EFF3108172B6134AD3691843D061F4E74F +:1056C000F8B5104C666A256A374616F1010F0EBF11 +:1056D0000026012101FA06F6206202E03046FEF7BC +:1056E00045FF216AE0690842F8D06762EFF3108154 +:1056F00072B6E269206A8243E26181F31088256212 +:10570000F1BD00008425002028280020024600204A +:10571000110C090404BF1020120412F07F4F04BFC3 +:10572000083012020FF2180112F0704F04BF001D72 +:105730001201120FC0F11F00895C401AC0B27047FD +:10574000040302020101010100000000000000004A +:105750007FB50C464D4D61684D4EE8612962284683 +:1057600000F0FCFD2468746006F1080000F0B6FD4E +:10577000012000F068F801203070296841B10FF273 +:10578000E9000FF2ED02009001920294684688470A +:105790007FBD1FB53E4C04F1080000F0A2FD00BB28 +:1057A0002178F1B1694604F1080000F0C3FD3748E3 +:1057B000C16949B10098029001228DF8042001A826 +:1057C00088479DF8040000E001202070207818B17F +:1057D0000098FFF784FE04E0009904F1080000F04F +:1057E00089FD04F1080000F07CFD28B9207818B18B +:1057F00004F10800FEF7BFFE1FBD2DE9F04105468C +:105800000E4690461C46002000F01DF8204F786898 +:10581000A0F80950C672324641460C30FBF720FD15 +:105820001A4A136900210020984748F2E800FEF761 +:10583000AAFE79688A78D21C04F10800FBF710FDF3 +:10584000BDE8F04101201CB51049124C096A20B98D +:1058500001B188470020207013BD0120207011B1D4 +:10586000BDE81C40084713BD0020FEF789BE0000BC +:1058700010B50146064C04F1080000F045FD04F1A6 +:105880000800BDE81040FEF776BE0000142B002093 +:10589000982B0020042C0020FFF7AFFF9DF80E008E +:1058A00005B000BDF8B500F10C026B4625214FF69E +:1058B0006640F1E7F8B500F10C026B460F214FF698 +:1058C0006840E9E7F8B502466B460E214FF6754091 +:1058D000E2E770B51B491C4B0A681C49C2F30D0274 +:1058E00001EB82010C6822689A4205D16569A169C1 +:1058F000E269E368246904E025696169A269636873 +:10590000A4682E0E067001722E0C467042722E0A8A +:105910008670C473C5F3031605F00F050571C670D4 +:105920000D0E45710D0C85710D0A190E8172C57130 +:10593000190CC1721B0A210E41730373210C817370 +:10594000002070BD3C400058B95646A90000032015 +:105950000EB4C0B5024603A800210190009101AB2E +:105960000121044878440C30FAF7E8FB06BC5DF8E6 +:1059700010FB00BF7327000018B58FB002A80FF20C +:105980008C61DFF800443422FBF77AFC0FF24540CB +:105990000190009469460FF2254000F0E9FC0121D6 +:1059A0000220FFF74AF8DFF8E02300211020FFF77C +:1059B0004CFE02A8FFF776FF08B1FEF71AFA00F0D6 +:1059C0000FF900F0B9FD0FF2293200210120FFF795 +:1059D0003CFE0FF2593200210220FFF736FEDFF8BD +:1059E000AC43002084F88000202000F04DFE00F041 +:1059F0007DFE0FF2AD33002204F181010020FFF79C +:105A000025FA10B010BD2DE9F043074685B078782F +:105A1000DFF87843DFF8786305284FF0000804F1D9 +:105A2000800554D03E2863D0FF280DD1012030726C +:105A3000B7F80300042842D040F20741884204D05E +:105A400040F60201884218D0A6E07879022804BF07 +:105A5000B9790029F8D10020FFF741FC0FF2883016 +:105A6000FFF776FFA878012806D12978062903D008 +:105A700000210220FFF7F6FD8EE0002000F004FE7A +:105A8000F879307301253889F08179893182BA89B2 +:105A90007282FB89B382388A04950090F082357B4C +:105AA000E08A039510260296019601F063F910B181 +:105AB0000220FFF70AFC202000F0E6FD6CE0012048 +:105AC000FFF703FC68780A21FFF735FA64E0B8882D +:105AD000E18A884260D1A4F8168085F800800FF230 +:105AE0003830FFF735FF0120307200F059F853E0ED +:105AF000F878012802D002281DD04DE0B7F8050043 +:105B0000E082062028700FF23830FFF721FF86F878 +:105B1000088000F045F8E08A01F0BBF930B90FF2D7 +:105B20004830FFF715FF0FF2743001E00FF29C30A0 +:105B3000FFF70EFF30E097F80D90787960BB29E011 +:105B400007EB0800847BC07BFF2821D1072C1FDBDB +:105B500007EB0800007C01281AD10FF2B030FFF7E4 +:105B6000F7FE07EB0800407C832811D10FF2BC3010 +:105B7000FFF7EEFE0120A870F8793070387A707067 +:105B8000787AB070B87AF070F87A3071387B7071CA +:105B9000641CA044C845D3DB012005B0BDE8F083F8 +:105BA000E08A708106F1080000F0C1BD7749CA8A19 +:105BB000824202D191F8800070470020704780B582 +:105BC00000F0D5FE062805D0BDE8044000210120E4 +:105BD000FFF748BDBDE8014000F0BBBD704770470E +:105BE00018B589B00020ADF81A0001F010FA694C20 +:105BF000216811F1010F0DD0674862680170120A27 +:105C0000090A417061688170C270110A120C017139 +:105C1000427105E00020FEF7F9FE08B90FF2C4302A +:105C200002460621002000F0FAFC4EF66E50089065 +:105C300007AA2068554C079006212E2000F0EFFCA3 +:105C40000FF2A8321021182000F0E9FC0FF2AC325C +:105C50001021082000F0E3FC1821012000F006FDCF +:105C600001F0D0F80DF1160006A90190009105ABE6 +:105C700007220021042001F03AFA0FF2D420BDF8E7 +:105C8000181000900523BDF81400002201F0D1F88F +:105C90000DF11A0000900223BDF81610BDF8140093 +:105CA000002201F0C6F80120207001F0D4F9012093 +:105CB0006070012108202071A17010206071002106 +:105CC0000120E070049110213448A0600390082264 +:105CD000012001910092029000230122012101F094 +:105CE000D3F9A07808B101F032FA0AB010BD000073 +:105CF000264890F88010062900D1704780B5002012 +:105D0000FFF7E3FA4FF4487101230022084601F03F +:105D100035FA10B90FF2402004E00220FFF7D5FA5F +:105D20000FF26420BDE80240FFF712BE18B587B03D +:105D30000FF28420154CFFF70BFE94F88000062824 +:105D40001DD01021069105914FF4FA700490502156 +:105D500000230291282200200393019200904FF427 +:105D600048710B4B0022084601F035FA08B90420AF +:105D700003E00220FFF7A9FA002084F8800008B0B1 +:105D800010BD0000A0080320AF630008A427002076 +:105D9000582B00208075FF1FB42B002007B2010094 +:105DA0000120FFF79CBA00211020FFF75BBC012007 +:105DB000FFF77EBC0120FFF783BC000010B504464E +:105DC000616801F1080000F0C7FB00B101202070FC +:105DD00010BD000010B1012803D07047FF20FFF76D +:105DE00055BCFF20FFF75ABC2D2D204741502047BE +:105DF000454E4552414C20444953434F5645525914 +:105E00002050524F4345445552455F434F4D504CEF +:105E1000455445440A0000000D0A0D2A2A20444931 +:105E200053434F4E4E454354494F4E204556454EE1 +:105E300054205749544820534552564552200A0091 +:105E40000D0A0D2A2A20434F4E4E454354494F4ECA +:105E5000204556454E5420574954482053455256E4 +:105E60004552200A000000000D0A0D2A2A20474151 +:105E70005454205345525649434553202620434805 +:105E80004152414354455249535449435320444994 +:105E900053434F5645525920200A00002A204741BB +:105EA0005454203A202053746172742053656172F7 +:105EB0006368696E67205072696D617279205365FD +:105EC000727669636573200D0A0D0000424C455FD0 +:105ED0004354524C5F4170705F4E6F7469666963E2 +:105EE0006174696F6E28292C20416C6C2073657277 +:105EF000766963657320646973636F766572792070 +:105F00004661696C6564200D0A0D00002D2D2D2061 +:105F10005354204D414E554641435455524552200D +:105F20004944202D2D2D200A000000002D2D205346 +:105F30004552564552204445544543544544202D2E +:105F40002D20564941204D414E2049440A00000071 +:105F50005032505F43000000200D0A0D2A2A2053C2 +:105F6000544152542047454E4552414C20444953D8 +:105F7000434F5645525920285343414E29202A2A3F +:105F800020200D0A0D0000002D2D20424C455F41C0 +:105F900070705F53746172745F4C696D697465648D +:105FA0005F446973635F5265712C204661696C655B +:105FB00064200D0A0D0000000D0A0D2A2A2043520C +:105FC0004541544520434F4E4E454354494F4E2082 +:105FD000544F20534552564552202A2A20200D0A5C +:105FE0000D0000006C7AD8AC57720000123456785D +:105FF0009ABCDEF0123456789ABCDEF0FEDCBA09A8 +:1060000087654321FEDCBA09876543210000000053 +:106010000000000000000000000000000000000080 +:10602000440008004005020112279C00F401000012 +:10603000FFFFFFFF480101000020000000000000FA +:1060400038B5EFF3108472B6284D6946281D01F06B +:106050004EFA6946281D01F0A8FA38B184F3108879 +:10606000BDF80010224AFFF751F831BD0120287019 +:1060700084F3108831BD80B5FFF746F80221009106 +:1060800000231A4800F124014FF48052001D01F052 +:1060900015F901BD00BFF8B514460026EFF31085D1 +:1060A00010F1010F1ED001281CBF02284FF0FF364F +:1060B00018D1BCB1264672B60C4F012392B2381DDE +:1060C00001F010F900281CBF3978002908D00022FF +:1060D0003A7085F31088A1B2054AFFF717F801E07E +:1060E00085F310883046F2BD00000000081400203F +:1060F00041600008C0680840884201D10120704713 +:1061000000207047C0690840884201D101207047D3 +:106110000020704710B5684C02212046FFF7F2FFBF +:1061200038B16068C043810703D5FFF7ACF902209E +:1061300018E001212046FFF7E5FF38B16068C04351 +:10614000C10703D5FFF767F901200BE008212046BE +:10615000FFF7D8FF38B16068C043010703D5FFF7E8 +:10616000E6F90820A06010BD10B5534C022120466E +:10617000FFF7C0FF58B96068C043810307D5606866 +:1061800040F400306060BDE81040FFF775B90821A9 +:106190002046FFF7AFFF70B96068C04301030AD51E +:1061A0006068464940F400206060086880474FF40A +:1061B0000020A06010BD20212046FFF79BFF58B9AA +:1061C0006068C043810207D5606840F400106060D9 +:1061D000BDE81040FFF72EB910BD394881B0016805 +:1061E00041F480110160006800F480100090009874 +:1061F0003448016841F4007101603348026842F498 +:106200000072026040BF20BF3048016841F4004185 +:10621000016001B0704780B52D48016841F48011DC +:106220000160006800F48010009000982248016826 +:1062300041F001010160026842F4803202602C20CA +:10624000FDF700FBBDE802402D20FDF7FBBA214819 +:10625000016849084900016070471F494FF48030C8 +:10626000086070471B48016821F002010160704717 +:1062700018484FF400314160016821F40031016099 +:10628000704738B504460C4D08212846FFF732FF09 +:1062900030B10A480460686820F40020686031BDAD +:1062A000A0474FF40021A96031BD0A48016821F0E0 +:1062B0000801016070470000000C0058F42B00201A +:1062C00050010058D4080058200800580C04005809 +:1062D00050000058040C0058080C00580060406042 +:1062E0007047EFF3108172B6026882420CBF012042 +:1062F00000201CE0EFF3108272B603680B60486068 +:1063000001600868416023E0EFF3108272B6086014 +:1063100043684B6041604868016019E0EFF3108109 +:1063200072B642680368136002684368536081F381 +:106330001088704710B5EFF3108472B602680A60D7 +:106340000068FFE7FFF7EAFF84F3108810BD0B60D9 +:1063500082F310887047704770470000024901605F +:1063600002490161704700BF3B54000863540008B4 +:106370007FB50C466D4D61686D4EE8612962284617 +:1063800001F05EF9246805F12400FFF7A7FF7460AF +:1063900006F10800FFF7A2FF01203070296829B13B +:1063A0000FF2551000900294684688477FBD1FB5D4 +:1063B0005F4C04F10800FFF794FF00BB2178F1B1B6 +:1063C000694604F10800FFF7B5FF5848C16949B1B3 +:1063D0000098029001228DF8042001A888479DF8BA +:1063E000040000E001202070207818B10098FFF729 +:1063F00076F804E0009904F10800FFF77BFF04F150 +:106400000800FFF76EFF28B9207818B104F10800E2 +:10641000FFF7C9FC1FBD2DE9F8430646002000F038 +:106420005FF874883088B268DFF80081C4F309042B +:1064300044EA8024F068A4B2C1B2204600F03CF8DF +:10644000002748F2E8094846FFF7B4FC08E06888EE +:10645000A04202D1316928780870687800B101271C +:1064600008F12400FFF73DFFF0B9694608F1240068 +:10647000FFF760FF009800F10B05407A0F28E6D087 +:10648000B5F80110A1420DD10098817AC81E71693A +:10649000C0B28842C8BF0846706102463069E91C34 +:1064A000FAF7DEFE2878D9E73800CCD0012000F0DA +:1064B00017F80020BDE8F28310B513461C4A546853 +:1064C000A4F80900E1720A46194604F10C00FAF733 +:1064D000C7FE164A1369BDE8104000210020184786 +:1064E0001249096A82B008B921B101E011B1012055 +:1064F00002B0084702B0704710B50146487A0F282D +:1065000018BF0E2807D10B48FFF7FEFEBDE810406C +:106510000020FFF74CBC064C04F10800FFF7F4FE26 +:1065200004F10800BDE81040FFF73DBCE82A002058 +:10653000882B00200C2B0020234900200877002204 +:106540002248027100F044B820490A7941F822003B +:106550000879401C0871704770B504466078FF28C0 +:1065600002BFB4F8031001F47F41B1F5406F1FD1B1 +:106570000025154E317FE8B2884222D2E9B256F8A2 +:10658000211020468847002808BF6D1CF2D018E073 +:10659000761C2979F0B288420AD2F1B255F821105E +:1065A000204688470100F3D002D0022805D006E03B +:1065B0002046BDE87040FFF726BA002070BD0120DC +:1065C00070BD0026014DE4E7382B0020E42B0020AD +:1065D00080B501F03FF801F03EF801F03DF801F020 +:1065E0003CF801F03BF801F03AF801F039F801F01D +:1065F00038F801F037F801F036F801F035F801F01D +:1066000034F801F033F801F032F801F031F801F01C +:1066100030F801F02FF8BDE8014001F02CB818B5B2 +:106620000C46C7B0114600228DF800208DF81C00E2 +:106630008DF81D4022460DF11E0001F01DF800F0FE +:106640003FF83F200C21ADF80400ADF8061007A874 +:10665000012103900691A41C049400F041F8002845 +:106660004CBFFF209DF8000048B010BD00B5C7B07A +:1066700000F01FF80F2000F028F800284CBFFF2082 +:106680009DF8000047B000BD00B5C7B00021ADF8CF +:106690001C008DF80010182201A800F0F3FF18204C +:1066A00000F013F800284CBFFF209DF8000047B011 +:1066B00000BD00228DF800208DF81C008DF81D1003 +:1066C0001822002101A800F0DDBFADF8060007A9DF +:1066D000022004903F22012003910690ADF804208F +:1066E000CDF814D0002101A8FFF795BE80B50FF2B8 +:1066F000B92200210420FEF7A8FF0FF27922002121 +:106700002020FEF7A2FFD34800210180C1808170C4 +:106710000121C1700021017101720FF24100FFF7E8 +:1067200013FFBDE802400FF23030FFF711B90278D5 +:10673000C84912B1012A03D070474088C880704709 +:106740000020C880087A08B100220A720020FEF7F3 +:10675000C6BD00212020FEF785BF00002DE9F84FBF +:1067600005466878FF2812D1BA4CB5F80300618954 +:1067700040F60442801A00F08B80801E4DD0001F2E +:1067800006D0401F00F0B780401E00F0DD80EBE037 +:10679000B5F80560207A58B10846FFF707FA217A64 +:1067A000062908BF0028F2D120724FF6FF706081E1 +:1067B0006681E879297A91FBF0F914285FFA89F962 +:1067C000E5D14FF0100A00270FF2A8284FF64066D7 +:1067D000F8B24845DBDA05EB0A0B9BF809009BF899 +:1067E0000A1040EA0120B04211D161894046FFF70A +:1067F000AFF8ABF107000178427841EA0221A181AC +:106800008178C07841EA0021E181082121720AF1F2 +:1068100006005FFA80FA7F1CDAE7B5F805008142CE +:1068200002BF1126E87915283CD1297A0FF2B82940 +:106830000FF27C2B481E28724FF6426A4FF64168D1 +:10684000287A0028A3D0A91905F10A02487A11F87C +:10685000057D925D497840EA022047EA0127618977 +:10686000404508D050450CD14846FFF771F80A2042 +:106870002072A78205E05846FFF76AF809202072C7 +:1068800027821536287AA0F115012972F6B2D7E7CA +:10689000B5F80500814201BF95F808B04FF0000837 +:1068A000E879012860D100270FF2802942F6021A08 +:1068B000F8B2B0EB9B0F57DA05EB080005F10A01BF +:1068C000C27A467A007B11F8081042EA002252454B +:1068D00046EA012609D161894846FFF739F8207A4E +:1068E0000A2802D1E6820B21217208F104005FFA26 +:1068F00080F87F1CDCE7B5F80500814202BFB5F8DF +:106900000700A18A88422FD1687A022802BFA87A9C +:106910006070012828D1E87AA0704CA448B9FEF72D +:10692000DEFC0FF28020FFF713F82046FFF710F887 +:106930001AE00FF2B020FFF70BF82046FFF708F837 +:106940000020FEF7C2FC0FE00FF22820FFF700F84E +:106950003FA0FEF7FDFF6089B5F80510884203D11E +:1069600000210420FEF77EFE0020BDE8F28F3948AA +:10697000007A704710B50FF2AC20364CFEF7E8FFF6 +:1069800032A0FEF7E5FF2079401E8041C00F207144 +:10699000207A38B1218A6089E31CBDE810400222C8 +:1069A00000F0E5BA10BD00001CB50120ADF80200F2 +:1069B0000021284C207AADF80010002844D0C01FD8 +:1069C000052841D8DFE800F00308121823340FF23D +:1069D0009420FEF7BDFF13BD0FF2A020FEF7B8FF15 +:1069E000E289A189608900F06EFA13BD0FF2B4202C +:1069F000FEF7AEFF218A04E00FF2E420FEF7A8FFC5 +:106A0000A18A60898A1C92B200F06EFA13BD0FF25F +:106A10001430FEF79DFFE18A60890DF10203022226 +:106A200000F078FA062020720220FEF758FC13BD11 +:106A30000FF21830FEF78CFFE18A60896B46022264 +:106A400000F068FA0620207213BD0000200A0D0035 +:106A50000A000000702B00202D2D205032502043C2 +:106A60004C49454E5420494E495449414C495A4598 +:106A700044200A002D2D2047415454203A20503202 +:106A8000505F534552564943455F5555494420464A +:106A90004F554E44202D20636F6E6E656374696F91 +:106AA0006E2068616E646C652030782578200A005D +:106AB0002D2D2047415454203A2057524954455FC8 +:106AC0005555494420464F554E44202D20636F6E46 +:106AD0006E656374696F6E2068616E646C652030EA +:106AE0007825780A000000002D2D204741545420BD +:106AF0003A204E4F54494649434154494F4E5F4313 +:106B00004841525F5555494420464F554E44202038 +:106B10002D20636F6E6E656374696F6E2068616EA1 +:106B2000646C6520307825780A0000002D2D204700 +:106B3000415454203A20434C49454E545F43484108 +:106B4000525F434F4E4649475F4445534352495075 +:106B5000544F525F555549442D20636F6E6E6563E7 +:106B600074696F6E2068616E646C6520307825787A +:106B70000A0000002D2D2047415454203A20414363 +:106B8000495F474154545F50524F435F434F4D500C +:106B90004C4554455F56534556545F434F4445203A +:106BA0000A000000202D2D20503250204150504C22 +:106BB00049434154494F4E20434C49454E54203A95 +:106BC000204E4F54494649434154494F4E20524567 +:106BD000434549564544202D204C4544204F4646C8 +:106BE000200A0D00202D2D20503250204150504CB5 +:106BF00049434154494F4E20434C49454E54203A55 +:106C0000204E4F54494649434154494F4E20524526 +:106C1000434549564544202D204C4544204F4E0ABB +:106C20000D0000002D2D20503250204150504C4975 +:106C3000434154494F4E20434C49454E5420203A3D +:106C400020425554544F4E20505553484544202D12 +:106C500020575249544520544F20534552564552CF +:106C6000200A20005032505F444953434F5645524A +:106C70005F53455256494345530A00002A20474175 +:106C80005454203A20446973636F76657220503201 +:106C900050204368617261637465726973746963DB +:106CA000730A00002A2047415454203A2044697353 +:106CB000636F7665722044657363726970746F7276 +:106CC000206F66205458202D205772697465204328 +:106CD0006861726163746572697469630A000000B7 +:106CE0002A2047415454203A20446973636F7665E3 +:106CF000722044657363726970746F72206F6620CE +:106D00005278202D204E6F74696669636174696FD3 +:106D10006E20436861726163746572697469630AA5 +:106D2000000000002A2047415454203A20456E615B +:106D3000626C6520536572766572204E6F74696669 +:106D400069636174696F6E0A000000002A20474180 +:106D50005454203A2044697361626C652053657213 +:106D6000766572204E6F74696669636174696F6ECF +:106D70000A0000002DE9F841C7B04FF00008ADF857 +:106D80001C00DDF838C14F9E509F519D529C8DF8DC +:106D9000008007A800F01AF8A0F808C0ADF8266037 +:106DA00087818DF82A508DF82B4000F015F84FF4AC +:106DB000C17000F016F8102000F017F800284CBF42 +:106DC000FF209DF8000048B0BDE8F0814180ADF89B +:106DD0002020ADF8223070471822002101A800F0D1 +:106DE00051BCADF8060007A9704704903F2201206E +:106DF00003910690ADF80420CDF814D0002101A82D +:106E0000FFF709BB00B587B000208DF8000000F047 +:106E10007CF840F20110ADF806003F2201200690F8 +:106E200000F0EDF800284CBFFF209DF8000007B0EF +:106E300000BD30B5C7B01C464A9B00F0C7F800251E +:106E40008DF800508DF82140224619460DF12200A0 +:106E500000F012FC00F059F83F204FF4837100F06D +:106E6000BCF8A41D049400F0CCF800284CBFFF200F +:106E70009DF8000047B030BD0023ADF81C008DF830 +:106E8000003007A8418082800021182201A800F06C +:106E9000F9BB00B5C7B000F010F8FFF7F6FF0F21FF +:106EA00002914FF48970022100F0A1F800284CBF34 +:106EB000FF209DF8000047B000BD0021ADF81C0088 +:106EC0008DF80010704700B5C7B0FFF7D5FF0F2150 +:106ED000029140F2151000F089F800284CBFFF2005 +:106EE0009DF8000047B000BD00B5C7B0FFF7C4FF74 +:106EF0000F21029140F2171000F078F800284CBFE3 +:106F0000FF209DF8000047B000BD1822002101A815 +:106F100000F0B8BB18B5C7B000F011F800F045F8A4 +:106F2000FFF7F3FF40F2211100F013F800F069F8C9 +:106F300000284CBFFF209DF8000048B010BD14464B +:106F4000ADF81C00002207A88DF8002041800471D4 +:106F50007047ADF806103F2007A9ADF80400039173 +:106F60000F20012102900691641D0494704718B50A +:106F7000C7B000F010F8FFF7C8FF3F2040F2231120 +:106F800000F019F800F03DF800284CBFFF209DF8F4 +:106F9000000048B010BD144600228DF80020ADF866 +:106FA0001C00ADF81E108DF82040224619460DF148 +:106FB000210000F061BBADF80400ADF8061007A891 +:106FC000012103900691641D04947047ADF81C00E4 +:106FD000ADF81E108DF820207047ADF80400ADF814 +:106FE000061007A801210390069170470621ADF80D +:106FF0000600049107A801213F2203900691ADF8F5 +:107000000420CDF814D0002101A8FFF704BA00B580 +:1070100087B000F010F8012003220690ADF804209C +:10702000ADF8062000F011F800284CBFFF209DF8B5 +:10703000000007B000BD00208DF8000018220021DC +:1070400001A800F01FBB03900691CDF814D00021D9 +:1070500001A8FFF7E0B900B5C7B000F00CF8852033 +:1070600000F0FCF800F0AEF800284CBFFF209DF8BF +:10707000000047B000BD00218DF81C008DF8001005 +:10708000182201A800F0FEBA2DE9F841C7B04FF070 +:10709000000800F026F80DF12300DDF844E14E9FD2 +:1070A0004F9E509D529C8DF81F30C0F800E08DF827 +:1070B00000808DF820708DF821608DF822508DF8B9 +:1070C000274000F0EFF88620ADF8060007A90C2055 +:1070D00000F074F800284CBFFF209DF8000000F07D +:1070E000E6B88DF81C0007A8417082707047F8B5AB +:1070F000C8B005460E4617461C4600F023F808A8FF +:10710000467087708DF8205000F0C7F88A21ADF8DE +:107110000A103F20032100F0B3F8002848BFFF20E9 +:107120000ED49DF8000058B94F994E98BDF8012033 +:107130002280BDF803200280BDF8050008800020F1 +:1071400049B0F0BD07220021684600F09BBA00B5A7 +:1071500087B000F0AFF800F0A5F8922000F009F831 +:1071600000F030F800284CBFFF209DF8000007B069 +:1071700000BDADF806003F220120704718B5C7B02A +:1071800000F011F800F08EF80F21029197200621EF +:1071900000F06DF800F017F800284CBFFF209DF8B4 +:1071A000000048B010BD0024ADF81C008DF821305F +:1071B00007A8418002718DF80040704704903F227B +:1071C000012003910690ADF80420CDF814D00021E1 +:1071D00001A8FFF720B92DE9F04F0646C7B00846D1 +:1071E0001946559CDDF84091519DDDF848B1539FFB +:1071F000DDF85081DDF858A1ADF81C60002307AE22 +:107200008DF80030708032710DF12100062200F0FF +:1072100033FA8DF82790B581ADF82AB03782ADF8F2 +:107220002E80B482ADF832A000F03CF83F20ADF8DB +:1072300004009C210F200290ADF806101820049045 +:1072400007A9012003910690FFF7BFFF00284CBF5C +:10725000FF209DF8000047B0BDE8F08FADF80600B4 +:1072600007A901203F220391049070470321ADF844 +:107270000600049107A801213F2203900691704760 +:10728000ADF80800059108A8072104900791CDF8F2 +:1072900018D0002102A8FFF7BEB81822002102A8CA +:1072A00000F0F0B91822002101A800F0EBB948B0B5 +:1072B000BDE8F08100208DF80000704710B5029CF9 +:1072C000016042600021C16001614161816103810F +:1072D000A107047704D5008910B14FF0FF3010BD2D +:1072E000002010BD2DE9F04F064685B030890C46D0 +:1072F0000027BB4600287169DC460CBF4FF002082E +:10730000D84681B168B930697768451CBD4228BF4D +:10731000ED1B3768385C7D5D00EB0527BF1CBFB2F5 +:1073200003E0074600E000B102463069F568A84274 +:1073300023BF7568281AC01B0020154608EB0509F5 +:1073400003FB09FE864532BF0020B0FBF9FA09FBBA +:107350001A00C0B2804509DA96F81C905FEAC97A33 +:1073600048BF84465FEA897048BFC446100000F0F9 +:10737000B4807068714461448842C0F0AE8008EB0C +:10738000020080B20390D946100AADF802000294C0 +:10739000ADF80020049359E0800740D530890028DB +:1073A00040F09B803268D018A34600F8024C200AB7 +:1073B00032681A4402F8010C224630681844F9F782 +:1073C0004FFF706920187061B069019C401CB0616A +:1073D000200A31680C70316848701CE08CB3307F33 +:1073E000C207D9D5308940B931681944FF2001F866 +:1073F000020C3168194401F8010C4FF0000B706960 +:10740000241874612C463089002340B931680C700F +:10741000210A3068417002237069801C706108EB9A +:1074200004070021BFB231615CB1DA44029800EB7D +:107430000A01306822461844F9F712FF70692418CF +:10744000746109F10109B069401CB061049A706867 +:107450003169914545D2791881422CBF081A0846F6 +:10746000306103463089A0B93068BDF80010C154BE +:107470005B1C70683168834228BF1B1ABDF802008C +:10748000C8545B1C7068834228BF1B1A7069801C3B +:10749000706105FB09FA7468BDF80000E41A8442C3 +:1074A00088BF0446029800EB0A01281BAC420190F9 +:1074B00003D093D2307F002890D137682246F81845 +:1074C000F9F7CEFE706920187061A346019C039FF6 +:1074D0000023A9E73068404400E0002005B0BDE883 +:1074E000F08F88448045F5D3A8EB0008F2E7F8B5A3 +:1074F000024600231089546900280CBF022500258C +:107500000026002C4DD060B9D36857685E1CBE427F +:1075100028BFF61B1768FB5CBE5D03EB0626B6B200 +:1075200000E00646137F03F00303012B23D14FF63F +:10753000FF77BE4208BF002808D0D36817699F4272 +:1075400019D2C0B15768FB1A834214D25668D36867 +:10755000A41B1C1900235461D36058B91068037828 +:10756000012E94BFC6F101060126805D03EB0026C3 +:10757000B6B200E00646D76854681368E819A0421E +:1075800028BF001B03445069801B401B506105D07D +:10759000F719ED19A54228BF2D1BD5609069401E33 +:1075A000906101B10E801846F2BDF8B50246002484 +:1075B0001089536900280CBF022500250026002BE6 +:1075C0003AD0D468234658B95768661CBE4228BFD3 +:1075D000F61B176817F804C0BE5D0CEB062600E02A +:1075E0000646177F07F00307012F1ED1B7B24FF6EB +:1075F000FF7C674508BF002807D150680023012899 +:1076000094BFC0F1010001200AE01769A7420CD223 +:1076100058B157683C1B844207D20023064604E059 +:1076200014682678205C06EB00265068ED18854229 +:1076300028BF2D1A1068441901B10E802046F2BDF2 +:107640000249016002490161704700BFDB53000835 +:107650000154000870477047704770477047704783 +:107660007047704770477047704770477047704762 +:10767000704770477047704710B50446F9F7F0FD42 +:10768000204610BD10B5044610460A460146204665 +:1076900000F002F8204610BD62F30F2262F31F4291 +:1076A000401810F0030308D0C91A1FD3DB0748BFE6 +:1076B00000F8012D28BF20F8022D130030B4144625 +:1076C0001546103928BF20E93C00FAD8490728BFE1 +:1076D00020E90C0048BF40F8042D890028BF20F89D +:1076E000022D48BF00F8012D30BC7047C91818BFE3 +:1076F00000F8012DCB0728BF00F8012D70470000CE +:1077000010B50446AFF30080204600F005F80446AB +:10771000AFF30080204610BD7CB500F10F06F608DF +:10772000F600B04240D2082E04D2082602E008300B +:1077300000F047F8DFF804512C68210005D1002043 +:1077400007E00268B24221D2011D08680028F8D182 +:107750002068291D0A68824222D01368B34238BFCC +:10776000111DF7D312E093190B60801B54685C6005 +:107770000B6818601660096800291DBF486800285A +:10778000081D0020286002F1080076BD61B10A687A +:107790001068A0F10803B342E5D250680860EAE738 +:1077A00000F04EF80028C2D1002076BD10B50400CC +:1077B00006D0AFF30080204600F003F8AFF300805E +:1077C00010BD002800D1704750B4A0F10802136822 +:1077D000072B2BD913F0070F28D1184C616809B17A +:1077E0008A4202D25160626013E0486800B390425E +:1077F00038BF0146F9D31BE0964203D11B180B603A +:107800000A4606E0486810B1134498420ED350600F +:107810004A60506850B11368D118814206D10021E6 +:1078200021600168CB1813604068506050BC7047FD +:1078300008680E18B242DFD250BC7047DC2B002023 +:107840000749086808B1002070470648C008C00012 +:1078500008600549C908C900091A0160704700BFDE +:10786000002C00200F1000200814002013490020D5 +:1078700008604FF4E0221248016841F47001016091 +:107880004FF0B041086840F0010008608A600D4880 +:107890000A6802400C480A60036823F0050303608D +:1078A000426852085200426000220848C8600861DD +:1078B000086820F4802008608A61704708ED00E0C5 +:1078C00088ED00E0FBFEF6FA940000580010042258 +:1078D000010000000300000005000000010000009E +:1078E00001000000060000000A0000002000000067 +:1078F000020000000400000008000000100000006A +:1079000040000000800000000001000000020000B4 +:10791000A0860100400D0300801A060000350C000F +:1079200040420F0080841E0000093D0000127A00D2 +:107930000024F40000366E010048E801006CDC020F +:107940000000000000000000000000000000000037 +:107950002DE9F04107468846387810F0030F1646A7 +:107960001D4633D0384600F099F878BBB8F1000FC7 +:107970001CBFD8E900018619012D2ED13888C10419 +:1079800015D5396A07F14402384600F0A3F83A6B7E +:10799000044602B93A69F968384600F09BF8361B8C +:1079A000341A7A69F968384600F094F8261A1EB934 +:1079B0004DB916F1010F09D097F903002A46314657 +:1079C00000F08EF8064616F1010F09D12320AFF31F +:1079D00000804FF0FF30BDE8F081022DE8D1EBE7E9 +:1079E000388810F4405F0ED07868F86038617861AC +:1079F000B8617868F86107F14400386207F1300037 +:107A0000786200203863B8F1000F05D0D8E9020190 +:107A100007F13402C2E9000139884CF6FF600140E9 +:107A200039800020BDE8F08170B50546AFF30080D5 +:107A30002888810415D56E680024EA6895F903004A +:107A40003146914212D2521AFEF724FB10F1010F77 +:107A50001CBF00283618F0D10FE04DF6FF70014032 +:107A600029802846AFF30080002070BD002200214D +:107A7000FEF710FB10F1010F00D101246868E860E7 +:107A8000A861E861002C2988E7D041F400712980C1 +:107A90002846AFF300804FF0FF3070BDF8B5A0B9B5 +:107AA000AFF3008000250A4E08244FF0FF373068FE +:107AB00020B1FFF7B9FF002848BF3D46361D641EC0 +:107AC000F5D1AFF300802846F2BDBDE8F240ABE748 +:107AD000AC250020914234BF511A0021084670475E +:107AE0003EB504000D00012A02D100F063F807E062 +:107AF000022A07D100940020019069460C20ABBEF9 +:107B00002D1801E0002A0CD10094019569460A2045 +:107B1000ABBE002805D100222100280000F027F884 +:107B200001E00020C04303B030BD000010B4314A72 +:107B3000002113461C6884421EBF491C9C68844275 +:107B40001EBF491C1C69844209D09C69491C84429F +:107B500005D0491C20331029ECD310BC70470023FA +:107B600042F8313002EBC1014B6010BC704778B471 +:107B7000204C002325462E688E421EBF5B1CAE683B +:107B80008E421EBF5B1C2E698E4209D0AE695B1C03 +:107B90008E4205D05B1C2035102BECD372BC704795 +:107BA000054604EBC303012A04BF59684D195D6003 +:107BB00072BC704710B40F4A002113461C688442FF +:107BC0001EBF491C9C6884421EBF491C1C6984421C +:107BD0000AD09C69491C844206D0491C20331029D4 +:107BE000ECD310BC0020704702EBC100406810BC11 +:107BF00070470000A828002010B50446E068A1697D +:107C0000884251D3218849F202030B40022B08D04D +:107C100008044CBF4FF400704FF4844001432180AE +:107C20003BE001F4C042B2F5C04F06D1A1688842E2 +:107C300003D32046FFF732FF78BB208810F4406F53 +:107C400002BF606804F14401884217D14FF400700C +:107C5000FFF756FD606030B904F144006060E060F9 +:107C6000401CA0600AE0218841F040012180E060D2 +:107C7000606100F500726068A260E0616068206188 +:107C8000A068A061207841070AD502220021204681 +:107C900000F00CF810F1010F02D14FF0FF3010BDD1 +:107CA000208840F4C0402080002010BD70B50446FC +:107CB0000D461646AFF3008033462A460021204683 +:107CC000FFF746FE05462046AFF30080284670BD0C +:107CD0002DE9FC4D016800F10805490805EBC102DA +:107CE000019200F10802406800F0010A02EBC108AD +:107CF000400808EBC00B00200021019A95422FD0CC +:107D00002A68AE186A68324400920835009A964292 +:107D1000F3D016F9014B009A964205D12A68AE18A5 +:107D20006A6832440092083516F8017B884210D107 +:107D3000D84508BFF9F7BFFFD8F80000D8F80410FD +:107D4000BAF1000F18BF48440144884208F10808FE +:107D5000EED0002C00F8017B05D5641CE6D1D5E7F8 +:107D60005846BDE8F68D641ED5D5CFE738B504007A +:107D70000ED0207810F0030F03D094F903000028F0 +:107D800009D5AFF30080204600F030F8AFF3008053 +:107D90004FF0FF3032BD2046FFF780FE0546AFF3BF +:107DA00000802078410644BF606800F05DF8002044 +:107DB000606094F90300022804D900F057F808B174 +:107DC0004FF0FF35E06B48B100F05CF808B14FF0C0 +:107DD000FF35E06B00F048F80020E063204600F03B +:107DE00005F8AFF30080284632BD000001780A068E +:107DF00026D51C4A13680021834203D1002342F890 +:107E000021301BE05368012183421EBF0221936889 +:107E10008342F3D0D368032183421EBF0421136938 +:107E20008342EBD05369052183421EBF062193692B +:107E300083421EBF0721D3698342DFD000F014B80C +:107E4000002101804FF0FF31C17000F14401416019 +:107E5000C160016141618161C161016200F1300174 +:107E600041627047AC250020FFF7A0BC1CB50200A2 +:107E7000009269460220ABBE04001000FFF756FED8 +:107E8000200016BDE0B50090F9F79CF90190694615 +:107E90000E20ABBE03B000BD7047FEE7FEE7FEE775 +:107EA000FEE770477047704700F026B8FCF701BF47 +:107EB0000848FAF7A3BE0848FAF761B80748FAF786 +:107EC0005EB8FEF727B9FEF74FB900F01DB80448B9 +:107ED000FAF794BE8829002084260020F42500208B +:107EE000E82900201020FCF750B80120FCF74DB81D +:107EF0000220FCF74AB8000002484168027889185D +:107F000041607047CC2500200449C8680A68824354 +:107F10000A60486000F004B8000000000015005836 +:107F2000704738B50C46C5B22046AFF30080E06814 +:107F3000A169884204D32046FFF75EFE00280FD4D3 +:107F4000E068401CE06000F8015D2088010503D472 +:107F500040050BD50A2D09D12046FFF79FFD28B11A +:107F60002046AFF300804FF0FF3032BD2046AFF324 +:107F70000080284632BD19E050F8042BD30744BFD7 +:107F8000A9F101039A18091F0023042942F8043BB0 +:107F9000F9D25FEA817C134604D54FF0000CA2F8B9 +:107FA00000C09B1CC90744BF0021197050F8041B76 +:107FB0000029E1D17047000038B50D4D082428682C +:107FC00000281CBF017811F0030F05D090F90310B1 +:107FD000002958BFFFF7CAFE2D1D641EEFD1BDE872 +:107FE0003840002200214FF0FF30FEF753B800BFA9 +:107FF000AC25002010B5074979441831064C7C4463 +:10800000163404E00A68081D114488470146A1425D +:10801000F8D110BD2C000000780000004EF6885109 +:10802000CEF20001086840F470000860BFF34F8F83 +:10803000BFF36F8F4FF00070E1EE100A7047000041 +:1080400037FFFFFF14060000F42500207008000031 +:10805000300003200000000079FCFFFF0200000058 +:108060000200000098010000020000002800032028 +:10807000080000005DFCFFFF02000000020000009D +:108080007E0100004301000008140020EC110000F4 +:1080900000000000000000000000000000000000E0 +:1080A00001000000020000000300000004000000C6 +:1080B00000F00DF8002801D0FFF79CFFAFF300801F +:1080C0000020AFF30080FBF7B8FD00F002F80120BC +:1080D000704700F001B800000746FFF76DFF384613 +:1080E000F9F7A2FEFBE738B504460D46284600F036 +:1080F00005F8A84218BF0024204632BD0149FFF709 +:1081000010BF00BFBC240020014880470148004741 +:108110006D78000819810008AFF30080FFF77EFF3B +:10812000FFF7C6FF00002E004300FFF7FEBFFFF77A +:10813000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF773 +:10814000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF763 +:10815000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF753 +:10816000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF743 +:10817000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF733 +:10818000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF723 +:10819000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF713 +:1081A000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF703 +:1081B000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7F3 +:1081C000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7E3 +:1081D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7D3 +:1081E000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7C3 +:1081F000FEBFFFF7FEBFFFF7FEBF0000F800000163 +:108200008100810081008100810081008100810066 +:108210008100810081008100810081008100810056 +:108220008100810081008100810081008100810046 +:108230008100810081008100810081008100810036 +:10824000BD00042881000801FD00034C250020D852 +:108250000003E5100008FC0004D310000801F90039 +:108260001301040000B8240020B9240020B8240021 +:1082700020B8240020FC0003B8240020FC0007B82C +:10828000240020A4240020E0001302040101982A05 +:108290000020E82A0020982A0020982A0020FC00CC +:1082A00003982A0020FB0006250020EC240020E093 +:1082B000001302080202482A0020982A0020482AB7 +:1082C0000020482A0020FC0003482A0020FC000768 +:1082D0004825002034250020E0001B2481000824CC +:1082E00081000824810008248100082481000824DA +:1082F00081000824810008F8FF0B268100082481F2 +:10830000000824810008FAFFEA00F8FFF4000B746B +:10831000240020BC24002004250020EC000001F9EA +:10832000000010FC001A040048000400480004008B +:108330004800080048000C0048000C004800093DB7 +:01834000003C +:040000050800811955 :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h index 50d8d9fce..d72bb2f03 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -252,6 +252,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -261,11 +265,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -273,6 +281,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -420,8 +440,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -540,11 +561,11 @@ typedef enum CFG_TASK_SEARCH_SERVICE_ID, CFG_TASK_CONN_UPDATE_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -553,11 +574,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -590,9 +612,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -603,5 +625,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h index 32ae2c824..44059d444 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -71,5 +70,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h index 7290a09a4..f5d6dac71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h index 2268a38f9..1ea7a0a20 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c index b6097bb64..945d4a7fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c index cda779bd7..47b3e45b3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -159,9 +162,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -356,12 +358,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -462,6 +603,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -506,4 +649,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/main.c index ebc550958..01e9dfbdd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,5 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c index 5321113d5..901abf2cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -363,4 +392,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c index a261d3dea..731cab145 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp index a21664e3c..b8bc7e457 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/BLE_p2pClient.ewp @@ -1111,6 +1111,12 @@                                                                   + + CMSIS + + $PROJ_DIR$/../Core/Src/system_stm32wbxx.c + + STM32WBxx_HAL_Driver @@ -1174,12 +1180,6 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - - CMSIS - - $PROJ_DIR$/../Core/Src/system_stm32wbxx.c - - Middlewares @@ -1206,9 +1206,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c @@ -1236,6 +1233,9 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 6dc0441bd..028c75075 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c index d4b808ea5..774fef6c8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -255,26 +254,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -982,13 +982,15 @@ static void BLE_UserEvtRx( void * pPayload ) svctl_return_status = SVCCTL_UserEvtRx((void *)&(pParam->pckt->evtserial)); if (svctl_return_status != SVCCTL_UserEvtFlowDisable) -{ + { pParam->status = HCI_TL_UserEventFlow_Enable; -} + } else -{ + { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1031,5 +1033,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h index 2abecfaec..9340b4ac6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -90,5 +89,3 @@ extern "C" { #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h index 182245ed4..33efb1779 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,4 +63,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h index 845d0f00d..85558e1b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c index 664a3bd11..c3f059a5c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file p2p_server_app.c - * @author MCD Application Team - * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file p2p_client_app.c + * @author MCD Application Team + * @brief peer to peer Client Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -120,7 +119,7 @@ typedef struct{ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonStatus; @@ -700,7 +699,7 @@ void Update_Service() aP2PClientContext[index].P2PServiceEndHandle); break; - case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No decriptor */ + case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No descriptor */ APP_DBG_MSG("* GATT : Discover Descriptor of TX - Write Characteritic\n"); aci_gatt_disc_all_char_desc(aP2PClientContext[index].connHandle, aP2PClientContext[index].P2PWriteToServerCharHdle, @@ -743,5 +742,3 @@ void Update_Service() return; } /* USER CODE END LF */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h index bbb0aaa39..7928f2575 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file p2p_server_app.h - * @author MCD Application Team - * @brief Header for p2p_server_app.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file p2p_client_app.h + * @author MCD Application Team + * @brief Header for p2p_client_app.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -79,5 +78,3 @@ void P2PC_APP_SW1_Button_Action(void); #endif #endif /*__P2P_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/readme.txt index 9b38836c7..3433ed9b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pClient/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pClient application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/BLE_p2pRouteur.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/BLE_p2pRouteur.ioc index 8ca36be30..0480719f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/BLE_p2pRouteur.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/BLE_p2pRouteur.ioc @@ -99,8 +99,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -181,6 +181,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_p2pRouteur +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -336,5 +338,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_p2pRouteur -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h index 519df34a1..ebcef08a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -265,6 +265,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -274,11 +278,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -286,6 +294,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -433,8 +453,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -560,11 +581,11 @@ typedef enum CFG_TASK_CONN_DEV_6_ID, CFG_TASK_SEARCH_SERVICE_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -573,11 +594,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -610,9 +632,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -623,5 +645,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h index ff084c8f2..c1ccd8d90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h index 7290a09a4..f5d6dac71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h index aca81fcf3..60bbdd235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h index dea48166c..890fff04c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c index 94d498fd3..e1ad5f57d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -159,9 +162,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -356,12 +358,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -462,6 +603,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -506,4 +649,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c index 7a73b7f68..212a35ac2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -78,6 +78,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -117,6 +118,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -196,19 +199,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1|RCC_PERIPHCLK_CLK48SEL - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -497,5 +504,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c index a86de2302..29e626def 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -359,11 +388,21 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -407,4 +446,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c index a261d3dea..731cab145 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/BLE_p2pRouteur.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/BLE_p2pRouteur.ewp index c46d0c4c2..633125079 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/BLE_p2pRouteur.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/BLE_p2pRouteur.ewp @@ -1,1262 +1,1263 @@ - 3 - - BLE_p2pRouteur - - ARM - + 3 + + BLE_p2pRouteur + + ARM + + 1 + + General + 3 + + 30 + 1 1 - - General - 3 - - 30 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 34 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 20 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application - Application + EWARM + + $PROJ_DIR$\startup_stm32wb55xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + + STM32_WPAN - EWARM - - $PROJ_DIR$\startup_stm32wb55xx_cm4.s - + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\App\p2p_routeur_app.c + - User - - Core - - $PROJ_DIR$\..\Core\Src\app_debug.c - - - $PROJ_DIR$\..\Core\Src\app_entry.c - - - $PROJ_DIR$\..\Core\Src\hw_timerserver.c - - - $PROJ_DIR$\..\Core\Src\hw_uart.c - - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c - - - - STM32_WPAN - - App - - $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c - - - $PROJ_DIR$\..\STM32_WPAN\App\p2p_routeur_app.c - - - - Target - - $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c - - - + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers - Doc + BSP + + P-NUCLEO-WB55.Nucleo - $PROJ_DIR$\..\readme.txt + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c + - Drivers - - BSP - - P-NUCLEO-WB55.Nucleo - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c - - - - - CMSIS - - $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c - - - - STM32WBxx_HAL_Driver - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c - - + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + - Middlewares - - STM32_WPAN - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\eds_stm.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\p2p_stm.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c - - + STM32WBxx_HAL_Driver + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + + Middlewares - Utilities - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c - - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c - + STM32_WPAN + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\eds_stm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\p2p_stm.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + + + + Utilities + + $PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + $PROJ_DIR$/../../../../../../Utilities/sequencer/stm32_seq.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c index d60190460..7b5d4e8ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -405,26 +404,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1951,6 +1951,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1993,4 +1995,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h index 0e08f6053..1885fa2f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -110,5 +109,3 @@ typedef struct #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h index ff9001303..9eefd989d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,4 +63,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h index 845d0f00d..85558e1b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c index 4c36471c1..c14e4f450 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file p2p_routeur_app.c - * @author MCD Application Team - * @brief P2P Routeur Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file p2p_routeur_app.c + * @author MCD Application Team + * @brief Peer to peer Router Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -93,15 +92,15 @@ typedef struct{ typedef struct { /** - * used to chek if Client (Smart Phone) can receive push button information + * used to check if Client (Smart Phone) can receive push button information */ uint8_t Notification_Button_Status; /** - * used to chek if Client (Smart Phone) can receive end device connection information + * used to check if Client (Smart Phone) can receive end device connection information */ uint8_t Notification_EndDevice_Status; /** - * provide end device Managment information + * provide end device Management information */ EDS_STM_Status_t EndDeviceStatus; /** @@ -480,7 +479,7 @@ static void Client_Update_Service( void ) switch(aP2PClientContext[index].state) { /* USER CODE BEGIN aP2PClientContext */ - case APP_BLE_DISCOVER_LED_CHAR_DESC: /* Not Used - No decriptor */ + case APP_BLE_DISCOVER_LED_CHAR_DESC: /* Not Used - No descriptor */ APP_DBG_MSG("* GATT : Discover Descriptor of Led Characteritic\n"); aci_gatt_disc_all_char_desc(aP2PClientContext[index].connHandle, aP2PClientContext[index].P2PLedCharHdle, @@ -917,4 +916,3 @@ static SVCCTL_EvtAckStatus_t Client_Event_Handler(void *Event) /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ /* USER CODE END FD_LOCAL_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h index 0d8ec9afc..4db646370 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file p2p_routeur_app.h - * @author MCD Application Team - * @brief Header for p2p routeur application module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file p2p_routeur_app.h + * @author MCD Application Team + * @brief Header for p2p_routeur_app.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void P2PR_APP_End_Device_Mgt_Connection_Update( P2PR_APP_Device_Status_t *p_devi #endif #endif /*__P2P_ROUTEUR_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/readme.txt index 17de46df1..b407ede5f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pRouteur/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pRouteur application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc index a1900eec8..b4edbb807 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/BLE_p2pServer.ioc @@ -99,8 +99,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true @@ -181,6 +181,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=BLE_p2pServer +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -336,5 +338,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=BLE_p2pServer -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex index c8240ae92..4c512c41c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:10000000F02700203D7E0008ED7B0008EF7B000814 -:10001000F17B0008F37B0008F57B0008000000007E -:10002000000000000000000000000000F77B000856 -:10003000F97B000800000000FB7B0008FD7B000846 -:100040005F7E0008637E0008677E0008417C000830 -:100050006B7E00086F7E00083B7C0008737E000802 -:10006000777E00087B7E0008357C00087F7E0008D4 -:10007000837E0008877E0008017C00088B7E0008D4 -:100080008F7E0008937E0008977E00089B7E000804 -:100090009F7E0008A37E0008A77E0008AB7E0008B4 -:1000A000AF7E0008B37E0008B77E0008BB7E000864 -:1000B000BF7E0008C37E0008C77E0008CB7E000814 -:1000C000CF7E0008D37E0008D77E0008DB7E0008C4 -:1000D000077C00080D7C0008DF7E0008E37E000836 -:1000E000E77E0008EB7E0008EF7E0008F37E000844 -:1000F000137C0008177C00081B7C0008F77E0008B2 -:10010000FB7E0008FF7E0008037F0008077F0008D1 -:100110000B7F00080F7F0008137F0008177F00087F -:100120001B7F00081F7F00081F7C0008237F00083A -:10013000277F00082B7F00082F7F00082DE9F84F4C +:100000000810002015860008A5830008A7830008B3 +:10001000A9830008AB830008AD830008000000003E +:10002000000000000000000000000000AF83000896 +:10003000B183000800000000B3830008B583000806 +:10004000378600083B8600083F860008B983000811 +:100050004386000847860008F7830008FD830008F0 +:100060004B8600084F860008F1830008538600087D +:10007000578600085B860008BD8300085F8600087D +:1000800063860008678600086B8600086F86000894 +:1000900073860008778600087B8600087F86000844 +:1000A00083860008878600088B8600088F860008F4 +:1000B00093860008978600089B8600089F860008A4 +:1000C000A3860008A7860008AB860008AF86000854 +:1000D000C3830008C9830008B3860008B7860008F8 +:1000E000BB860008BF860008C3860008C7860008D4 +:1000F000CF830008D3830008D7830008CB8600088D +:10010000CF860008D3860008D7860008DB86000863 +:10011000DF860008E3860008E7860008EB86000813 +:10012000EF860008F3860008DB830008F7860008E6 +:10013000FB860008FF860008038700082DE9F84FBA :100140000FF2D017A2B0D7E90045CDE900452C9EAB :10015000DFF82C7C04918DF8436000210FF2BC1471 :100160000D9112944FF0FF368246904699460FE06B @@ -26,7 +26,7 @@ :1001800000F0B2800D98401C641E0D90F2D1A8447E :1001900098F80000252807D10021079108910991BE :1001A0000A910B910C910DE06A463146404600F0F1 -:1001B000FDFF050001D10D98B4E0D9D50125E6E792 +:1001B000CFFF050001D10D98B4E0D9D50125E6E7C0 :1001C00041F0010118F8010F2028F9D023280CD0A4 :1001D0002B2804D02D2805D0302809D086E041F006 :1001E0000201EFE741F00401ECE741F00801E9E723 @@ -39,7 +39,7 @@ :10025000010B002000220E920BE040B90E9ABA4228 :1002600005DA02EB820403EB4403303B0E9308F102 :10027000010898F80030A3F130020A2AEDD3ADF856 -:100280004010129898F8001000F09CFF08B118F880 +:100280004010129898F8001000F06EFF08B118F8AE :10029000010B8DF842009DF84200682804BF98F8D1 :1002A0000010682903D162208DF8420008E06C2814 :1002B00004BF98F800006C2804D171218DF8421019 @@ -96,9 +96,9 @@ :1005E0000B6053F8042B0B6052BB4FF0FF340FF637 :1005F000AC200EE095F83A206C2AF0D0086808602C :1006000050F8044B0860EC603CB94FF0FF340FF633 -:10061000702000F0F1FD201A76BD2E6B002E04D55F -:10062000204600F00BFE044608E03246002120463A -:1006300000F020FE002814BF041B3446AC6117E014 +:10061000702000F0B5FD201A76BD2E6B002E04D59B +:10062000204600F0CFFD044608E032460021204677 +:1006300000F0E4FD002814BF041B3446AC6117E051 :10064000294600F092F8002812D54FF0FF3076BD11 :100650006869411C69612521315409E06969481CB8 :10066000686125227254210002D0411C6961345412 @@ -119,14 +119,14 @@ :1007500038B1F06A401C641EF062F5D10020BDE89B :10076000F0814FF0FF30BDE8F0812DE9F8470D46EC :10077000A3B02F6B002F8146904648BF6FF0004713 -:1007800000F0A4FD696B40180FF62C118128D1E907 +:1007800000F068FD696B40180FF62C118128D1E943 :100790000023CDE9012328BF4FF0FF303ED20024D3 -:1007A000002F2FDDD8F8001001AA684600F000FDE8 +:1007A000002F2FDDD8F8001001AA684600F0D2FC17 :1007B0000646002E35D4D8F8000008B9761E30D48D :1007C000B7421FDB6869301881280AD300206863AC :1007D00003AA29464846FFF74DFF040012D4002023 :1007E000686103A8D5F814A032466946504400F069 -:1007F00073FDB244C5F814A058F8040B002818BFC4 +:1007F00037FDB244C5F814A058F8040B002818BF00 :10080000BF1BCDD12CB903AA29464846FFF732FFBA :10081000044614B9002068616863204624B0BDE82E :10082000F0874FF0FF34F8E72DE9FC4707468A468A @@ -139,17 +139,17 @@ :1008900000280ED597F8380000F01400102808D171 :1008A0007A6B7869121A386A121A511A0029C8BF6D :1008B0003962BDE8F3878DF800A0404649462246DC -:1008C000E31700F05DFD3032D0B26D1E3A2801957D +:1008C000E31700F021FD3032D0B26D1E3A280195B9 :1008D00004DB9DF80000A0F151018A1872554046D2 -:1008E00049462246E31700F04BFD8046894600202A +:1008E00049462246E31700F00FFD80468946002066 :1008F000814508BF804503D0F86871198842DCD370 :10090000082C09D197F83800010705D5715D302909 :1009100002D06D1E30207055C5F13C01B9617019CF :10092000F860386B8142B3DA411A39624FF6EF70E2 :10093000398F01403987BDE8F3872DE9D04306465A :100940000F4614464FF00008DFF8389412E0E00735 -:1009500007D542464B463046394600F029FE06464A -:100960000F464046494642464B4600F021FE641081 +:1009500007D542464B463046394600F0EDFD064687 +:100960000F464046494642464B4600F0E5FD6410BE :1009700080468946002CEAD130463946BDE8D0830E :100980002DE9F34F054641F020048DB0D5E90089EB :10099000612C02AE09D0286B002848BF062003D482 @@ -158,27 +158,27 @@ :1009C000380061381A2802D20FF2F46111E00FF2F8 :1009D000F4610EE058004015401C0FD119030DD1F1 :1009E0000320A8619DF8380061381A2814D30FF24B -:1009F000DC61E868032200F06FFCD3E1194621F0C6 +:1009F000DC61E868032200F033FCD3E1194621F002 :100A00000043B3F5801F10460DD20027BB4208BF3C :100A1000BA42019703D111E00FF2AC61E9E701AAF4 -:100A200000F098FE0AE0DFF8607307EB1352DFF87E +:100A200000F05CFE0AE0DFF8607307EB1352DFF8BA :100A30005C3301921940DFF858331943C5E90001CE :100A4000612C0ED1E86830210170811CE9609DF8AD :100A5000381061290CBF7821582141706869801CC9 :100A60006861D5E900AB2BF0004300202AF00002BA :100A7000834204BF8242002300F05A81612C40F07F :100A8000A980286B00284CBF2120401C00904046C4 -:100A9000009F7F1C49460022002300F093FED946A8 +:100A9000009F7F1C49460022002300F057FED946E4 :100AA00001988DF8082038BF89F00049001F019097 :100AB000002FD0460DF1090040F3498140F2FF714B :100AC000DFF8D0B20C91064640464946002200238A -:100AD00000F090FE80F03A814800400D00F11C02C9 +:100AD00000F054FE80F03A814800400D00F11C0205 :100AE00010D0002A0EDD0C98824205DB09F0004090 :100AF00040EA0B01002013E0A448084040EA0251FC :100B000040460DE029F00043002028F00002834217 -:100B100008BF82420FBF40461C22404600F082FEC2 -:100B20008046894600F01CFFFF1F002F044609DDA8 -:100B300000F034FF02460B464046494600F040FFB5 +:100B100008BF82420FBF40461C22404600F046FEFE +:100B20008046894600F0E0FEFF1F002F044609DDE5 +:100B300000F0F8FE02460B464046494600F004FF2E :100B400080468946F01D072104E004F00F0200F8FA :100B5000012D2411002C01DD491EF6D5491E5CBF74 :100B6000002200F8012DF9D5ECE00020194602AA78 @@ -188,20 +188,20 @@ :100BA0009DF838007218147804F130085FFA88F460 :100BB000392CC4BFA0F13A04A044491E02F80189AF :100BC000F1D58DF83800286B002840F1B080591E0F -:100BD0002963ACE0404649460022002300F0F2FDC4 +:100BD0002963ACE0404649460022002300F0B6FD00 :100BE000019938BF89F0004947F2975041436A4A5A :100BF00091FBF2F20192D2F1070204DD4046494630 :100C0000FFF79BFE0AE0524200206449FFF795FE81 -:100C100002460B464046494600F044FF8046662C9B +:100C100002460B464046494600F008FF8046662CD7 :100C2000286BDFF87CB106BF019F0A3706273F1803 :100C3000142FC8BF142730208DF8080089460DF105 :100C4000090000E03046002F34DD064640464946A4 -:100C500001F04CF801460A4606F1080304200A2672 +:100C500001F010F801460A4606F1080304200A26AE :100C6000B2FBF6F606EB860EA2EB4E02303203F82C :100C7000012C0A22B6FBF2F202EB820EA6EB4E0624 :100C80003036401E03F8026DE9D1083F002F03F112 -:100C90000806D7DD084601F03DF802460B464046FF -:100CA000494600F08DFE00225B4600F081FC804644 +:100C90000806D7DD084601F001F802460B4640463B +:100CA000494600F051FE00225B4600F045FC8046BC :100CB0008946CBE70DF10901401A0DF1090604E060 :100CC0000199491E401E0191761C31783029F7D0D8 :100CD000662C02D10199491C03E0652C0CBF01214F @@ -218,7 +218,7 @@ :100D8000CBCCCC0C0000244002FCFFFFFFFF0F8007 :100D90000000E03F0000F07FA08601000000F03F6F :100DA00084D797410FB0BDE8F08F2DE9F84783B0A5 -:100DB00006468A461746984600F0FCF9B8F1000F3F +:100DB00006468A461746984600F0CEF9B8F1000F6D :100DC000406A356B90F8009003DC4FF001080FF299 :100DD0000037BDF930404AF02000662808BF641C87 :100DE00015D0672840F0848014F1040FC0F286808B @@ -229,14 +229,14 @@ :100E300000F80290521C15EB0A0FB8BF6C4220B2AA :100E4000441941424445B8BFA046B26171620FFAED :100E500088F5F561F068B3692A463946184400F010 -:100E60003BFA641BB462C4E022B29045084417DA2E -:100E70004246394600F030FAB0694044B061AAEB0E +:100E6000FFF9641BB462C4E022B29045084417DA6B +:100E70004246394600F0F4F9B0694044B061AAEB4B :100E80000801002D716203DC96F838100A0705D5B9 :100E9000F16801F80090F069401CF061B562A8E0CB -:100EA000394600F019FAB069002D5044A8EB040847 +:100EA000394600F0DDF9B069002D5044A8EB040884 :100EB00003DC96F838100A0703D5F16801F80090B2 :100EC000401CB0610FFA88F08542F068B369B8BF82 -:100ED000A8460FFA88F207EB0A01184400F0FCF963 +:100ED000A8460FFA88F207EB0A01184400F0C0F99F :100EE000B0690FFA88F10844B061681A706280E056 :100EF000BAF1610F14D14FF0700A16E0A84504DA78 :100F000096F838100A0758BF45466D1E48BF0025A1 @@ -245,7 +245,7 @@ :100F3000B061002D17F8012B5A5403DC96F83810D5 :100F40000A071BD5F168431CB36101F80090002D1E :100F500014DDA8F101080FFA88F08542F068B8BFE7 -:100F6000A8460FFA88F23946184400F0B5F9B0697E +:100F6000A8460FFA88F23946184400F079F9B069BA :100F70000FFA88F108446D1AB0617562F068B169C2 :100F80000844002C80F800A003D42B214170811C60 :100F900003E02D2141706442811C00206A460AE072 @@ -268,1786 +268,1918 @@ :1010A00074665F733A2062616420256C73206172FC :1010B00067756D656E7400000000000000000000A0 :1010C0006E616E004E414E00696E6600494E4600EC -:1010D0003000F0B40246106895681318506803EBAE -:1010E0005004C00721D54D441FE0F0BC02F10C00B4 -:1010F000704713F8017B05F8017B491EF9D1A0B1B7 -:10110000B60813F8011B06F00306032E08BF13F8F8 -:10111000016B01EB06214942801C294405D011F8DE -:10112000016B05F8016B401EF9D1A342DDD013F825 -:10113000016B16F0030104BF13F8011BC91C300931 -:101140000F28DAD113F8010B0F30D6E71B48704790 -:1011500030B45368D418042B09DA41B1057804F887 -:10116000015B10F8015B15B15B1C491EF3E753608E -:1011700030BC704738B514461D4661B1FFF7E8FF33 -:1011800061686A6B204690476FF00102811A02D0B5 -:10119000491E03D005E06FF0010032BD4FF0FF3073 -:1011A00032BD0021616032BDDA6B1047034BE1E7CD -:1011B000024BF9E70248704700000000D8100020F9 -:1011C000A01000200278C9B28A421AB11CBF10F8E0 -:1011D000012FF9E718BF00207047B1F5807F02D3D7 -:1011E0004FF0FF3070470170012070470078401EBB -:1011F0008041C043C00F704780B508B90FF21C0092 -:1012000005490B681BB122220021984701E000F03C -:101210008EFD222002BD0000E0170020636F6E7378 -:10122000747261696E742068616E646C65723A20D4 -:10123000626164206D6573736167650000F101038D -:10124000810704D010F8011B89B18107FAD1026827 -:10125000B2F10131914311F0803F04BF50F8042FE7 -:10126000F6E710F8011B11B110F8011BFBE7C01ADB -:1012700070477047C9B2830706D0521E22D310F8B8 -:10128000013B9942F7D11FE0083A13D302F104025F -:1012900041EA012141EA014150F8043B121F21BFFC -:1012A0004B40A3F1013C2CEA030C1CF0803FF3D02F -:1012B000C9B2001F083210F8013B521E28BF91EA44 -:1012C000030FF8D818BF0120401E704780B5FFF704 -:1012D0003DFF006C02BD704762B38B0708D0521E01 -:1012E00011F8013B00F8013B00F024808B07F6D198 -:1012F000830740F0208000BF103A07D330B4B1E834 -:101300003810103AA0E83810F9D230BC530724BF87 -:10131000B1E80810A0E8081044BF51F8043B40F8B9 -:10132000043BD20724BF31F8022B20F8022B44BF24 -:101330000B7803707047121F17D35B0009D151F867 -:10134000043B20F8023B1B0C121F20F8023BF6D294 -:101350000BE051F8043B00F8013B1B0A20F8023B6C -:101360001B0C121F00F8013BF3D238BF121D521E96 -:1013700024BF11F8013B00F8013BF8D8704700008A -:10138000B3BBD9B1B2F5803F7DD2022A1ED98C46BB -:10139000B1FBF2F102FB11C31B0443EA1043B3FBA0 -:1013A000F2FC02FB1C3380B240EA0343B3FBF2F0D1 -:1013B00002FB103240EA0C4000237047022A05D994 -:1013C0008446B0FBF2F002FB10C270474AB105D16F -:1013D00000F0010249085FEA300070470022002354 -:1013E000704700F0A7BC0B000200002100207047EE -:1013F000904271EB030CF6D3B3F5803F2FD2F0B5DA -:10140000B3FA83F7B1FA81F4A7F10F0E3D1B5340F5 -:10141000CEF1200602FA0EF2F3415340B5F10F0768 -:1014200046D80F3C2C444140C4F12006A040F14175 -:101430004140B1FBF3F603FB1611A2FB0645001B6E -:10144000A94102D2761E8018594180EA010221FA90 -:101450000EF362FA0EF200215A403046F0BD30B46D -:10146000B1FBF3FC03FB1C11A2FB0C45001BA941C3 -:1014700003D2ACF1010C8018594130BC02460B4636 -:10148000604600217047B2F1807F65D3F0B5B2FAB3 -:1014900082F7B1FA81F4C7F10F063D1B22FA06F379 -:1014A00007F1110EF24120355A40B5F10F07B8D9B6 -:1014B0004140C4F12006A040F1414140B1FBF3FCA2 -:1014C00003FB1C11A2FB0C45001BA94103D2BCF17C -:1014D000010C801859410F2F12D30F3FC90341EA65 -:1014E0005041B1FBF3F603FB1611A2FB0645D4EB0A -:1014F000C030A94102D2761E8018594146EACC3C40 -:1015000007B34140C7F12006B840F1414140B1FB6B -:10151000F3F603FB1611A2FB0645001BA94102D2FC -:10152000761E8018594180EA010221FA0EF3C7F1B4 -:10153000200462FA0EF20CFA07F05A402CFA04F179 -:101540003043F0BD80EA010221FA0EF3002162FA75 -:101550000EF260465A40F0BD8C46B1FBF2F102FB40 -:1015600011C31B0243EA1063B3FBF2FC02FB1C3302 -:101570001B024CEA002043EA1063B3FBF2FC02FBBF -:101580001C331B024CEA002043EA1063B3FBF2FC5D -:1015900002FB1C331B024CEA002043EA1063B3FB3E -:1015A000F2FC02FB1C324CEA0020002370470000D2 -:1015B000B0B581EA030C0CF0004C40F2FF7515EA5F -:1015C00011541DBF15EA1357AC42AF4239E0E4197C -:1015D00023EA455343F48013C90241F0004141EA34 -:1015E000505EC7021100A7FB020200284FF0000066 -:1015F000EEFB01204FF00001E3FB072118BF42F092 -:101600000102401800214941E3FB0E01A4F580646A -:101610000F0302D252004041494154F101046CDDF4 -:10162000470872F1004250F1000051EB0451A1F55E -:1016300080115CBF41EA0C01B0BD4CEA05510020AD -:10164000B0BD05EA1357AC4214BFAF4241E050EAC7 -:10165000410E1CBF52EA430E02E061460020B0BDBD -:1016600024423C441BD15FEA070EF6D0090302BFB7 -:1016700001460020AEF1140EB1FA81F7AEEB07047B -:1016800001FA07FE0C37C7F1200100FA07F7C8403E -:101690004EEA000E23EA455343F48013A2E733F0E9 -:1016A0000043B3FA83F704BFB2FA82FE77440B3FDC -:1016B000E41BB7F1200E2FBF02FA0EF3BB40C7F1B7 -:1016C000200E22FA0EFE38BF43EA0E03BA40641C15 -:1016D00082E750EA410E14BF52EA430E6FF0000158 -:1016E0004FF4001717EB430F8ABF194617EB410F52 -:1016F000B5E74CEA05510020B0BDD4F10104B4F1C6 -:1017000020070FDAC4F12007520828BF42F0010277 -:1017100010FA07F501FA07F7E1BF2A43E040384322 -:10172000E1400FE0352C98DCC7F1200452EA40027A -:1017300020FA07F218BF42F0010231FA07F0A14087 -:101740000A43002172F1004250F1000051EB0C01FC -:10175000B0BD000010B5144600F002F8226010BDC4 -:10176000C1F30A5343B14A0012F5001F28D2A3F275 -:10177000FE32A1EB0251704750EA410C20D001F03B -:10178000004C31EA0C01B1FA81F204BFB0FA80F3E7 -:10179000D2180B3AB2F120032CBF00FA03F19140AA -:1017A00041EA0C013EBFC2F1200C20FA0CF31943B0 -:1017B0009040524240F2FD33D21A01EB0351704780 -:1017C000002270474FF4001C1CEB410F94BF1CEB30 -:1017D000430F09E041EA030C50EA4C0C52EA0C0CAE -:1017E00003D2994208BF9042704714BF8B42824295 -:1017F000704700004FF4001C1CEB410F94BF1CEB22 -:10180000430F09E041EA030C50EA4C0C52EA0C0C7D -:1018100003D28B4208BF8242704714BF9942904264 -:1018200070470000124254D440F2FF7C1CEA11536E -:101830000FD0634531D09B1863453CBF01EB02518B -:10184000704701F0004141EA0C510020AFF30080E5 -:10185000704750EA410320D001F0004C91EA0C019E -:101860001CD0B1FA81F30B3B9A420DD9D21A9940A0 -:1018700051EA0C01C3F1200C20FA0CFC61449840A1 -:10188000531C40F2FF7CD7E7914041EA0C01C2F1C2 -:10189000200C20FA0CF3194390407047B0FA80F303 -:1018A0001533202BE0D3202AEED3203A203B9A4256 -:1018B00009D9D21A00FA03F141EA0C010020531CA5 -:1018C00040F2FF7CB8E700FA02F141EA0C01002087 -:1018D0007047524240F2FF7C1CEA11530DD0634521 -:1018E000DBD0B2EB030C3CBFA1EB025170470CF113 -:1018F000010221EA035141F4801150EA410CCCD09D -:1019000001F0004C352A27DC30B481EA0C01B2F139 -:10191000200309DAC2F12003044601FA03F5D0409E -:101920002843D1409C400CE0C3F12002450020FA3E -:1019300003F418BF44F0010421FA03F091400C4372 -:10194000002174F1004550F1000051EB0C012442DC -:1019500030BC7FF47BAF70476146002076E7000023 -:10196000C1F30A5340F2FE329B1A14DDD3F1200377 -:101970004FEAE17208DDC90241EA505141F00040EE -:10198000D84080185040704703F2E13010B1D24384 -:1019900082F000407047002070470000C11768B116 -:1019A0004840401AB0FA80F29040D21CC907C2F5F4 -:1019B000846241EA025202EBD021400570470000E8 -:1019C00070B44FF0004591EA030F40F1B5816B40D0 -:1019D000841A71EB030603D2001BB1411219734143 -:1019E0004FF4001C1CEB410F34BF7CEB430442E07E -:1019F0000C0DA4EB1356352E4FDC45EAC323DB0A4E -:101A000045EAC121C912B6F120050DDD63FA05F6DC -:101A1000EB4086EA0305124218BF45F00105C018E5 -:101A200051F100010CD213E062FA06F5F240554084 -:101A3000F3415A40B340F3405A408018594107D30C -:101A400049085FEA30005FEA350528BF45F0010527 -:101A500001F58011420875F1004250F1000041EBA0 -:101A600004514E0016F5001F70BC38BF70470020AF -:101A7000090D090570471CEB410F10D252EA4306CD -:101A80000BD0BCEB410F05D80C0DAB43661E342EBA -:101A9000B6DD02E0AB438018594170BC704770BCA2 -:101AA00070470000F0B540F2FF7581EA030C0CF0BE -:101AB000004C15EA11541DBF15EA1357AC42AF4252 -:101AC000E5E0BC41C1F31301C3F31303801A99414C -:101AD00043F4801304D2641E4000494180185941E8 -:101AE000C90241EA5051B1FBF3F603FB1611A2FB08 -:101AF0000675D7EBC020A94102D2761E8018594145 -:101B0000C90241EA5051B1FBF3FE03FB1E11A2FBD7 -:101B10000E75D7EBC020A94103D2AEF1010E80189B -:101B20005941890241EA9051760546EA8E2EB1FB71 -:101B3000F3F603FB1611A2FB0675D7EB8020A94133 -:101B400002D2761E80185941C90241EA50514EEA2C -:101B5000060EB1FBF3F603FB1611A2FB0675D7EBDD -:101B6000C020A94102D2761E80185941C90241EA1B -:101B70005051B1FBF3F703FB1711A2FB0735D3EB71 -:101B8000C020A94167F100070CBF004247F00107E0 -:101B900066F3D5274FEA1E31B80814F5806412DDCC -:101BA000BD0775F1004250EB0E5051EB045111F599 -:101BB000801F5CBF41EA0C01F0BD4CF07F6141F039 -:101BC000E0410020F0BDBD076D0840EA0E5041F431 -:101BD0008011D4F10104B4F120060ADAC4F1200620 -:101BE0000200E04001FA06F3E1401843B240154319 -:101BF0000EE0342C13DCC6F1200445EA40056D08E4 -:101C000020FA06F2154321FA06F0A1400D43002107 -:101C100075F1004250F1000051EB0C01F0BD0020C5 -:101C20005FEA0C01F0BDCFB992185B41B3FA83F7BC -:101C300004BFB2FA82F6BF190B3FB7F120062FBFDF -:101C400002FA06F3BB40C7F1200622FA06F638BFB7 -:101C50003343BA401CB1E419641E33E77F4231F0CC -:101C60000041B1FA81F404BFB0FA80F6A4190B3C2C -:101C7000B4F120062FBF00FA06F1A140C4F12006FE -:101C800020FA06F638BF3143A0403C1B1AE7AC42AD -:101C90001ABF05EA1357AF4212E050EA41061CBFD3 -:101CA00052EA4306BFE750EA4107304661461CBF8F -:101CB00041EA0551F0BD52EA430C08BFC143F0BDF3 -:101CC00000204FF4001616EB410F98BF16EB430FA0 -:101CD00008BF16EB410F24BFC14305E016EB430FCD -:101CE0000CBF61464CEA0551F0BD0000400D49189B -:101CF00040EA81200CD2490DA1F58061491C40F0D9 -:101D0000004005DBD1F11F0154BFC840C017704728 -:101D100000207047014648B1B0FA80F18840C91CE4 -:101D2000C1F58461090501EBD02140057047012010 -:101D300000F0B6B870470000841A71EB030604D2B5 -:101D40006E40001BB141121973414FF4001C1CEB93 -:101D5000410F34BF7CEB430682E00C0DA4EB13561D -:101D6000362E7BDC012E45EAC32341DC43EA525385 -:101D700012BFD20292025B08240545EAC12141EA62 -:101D80005051D2EBC020994125D407D1B0FA80F64A -:101D900010FA06F162D00020203608E0B1FA81F690 -:101DA000B140C6F1200220FA02F21143B0404FEADE -:101DB000F474B4EB465434F001064FEA74040AD8C4 -:101DC000D6F50016760D04F00044F04061FA06F2F4 -:101DD0005040F1404840C00A40EA415021F00041E3 -:101DE00028BF5FEA500550F1000044EBD12135E0F7 -:101DF000DB0A45EAC121C90AB6F120050EDD42EA37 -:101E00000242120CC5F1200603FA06F6EB4042EA44 -:101E100006056D42984161F100010DE062FA06F598 -:101E2000F240554063FA06FC82EA0C02F3405A4045 -:101E30006D42904161EB030111F4801F05D1641ED6 -:101E4000620502D06D004041494121F480114308F0 -:101E500075F1004350F1000041EB045170BC704734 -:101E60001CEB410F15D223F0004352EA43060BD07E -:101E70004FEA4C0CBCEB410F04D80C0D661E342EFF -:101E8000B7DDEBE7801A994150EA410608BF00210F -:101E9000E4E708BF1CEB430F28BF6FF00001DDE74C -:101EA00080B5AFF30080024A11001820ABBEFBE7FB -:101EB0002600020010B58EB002A80FF69C31DFF8A4 -:101EC0004C453022FFF718FA0FF291500190009420 -:101ED00069460FF2715000F0D7FD0121022000F099 -:101EE000BCFEDFF82C250021082000F032FF02A8FC -:101EF00000F0B0FF08B101F01DF900F023F901F086 -:101F00001BF9DFF810450FF24942002084F88000E9 -:101F100000214FF6FF70E082012000F01AFF0FF25F -:101F20007D420021042000F014FF062001F098F902 -:101F3000DFF8E404002101700121417001F025FA6D -:101F40000FF24943002204F18101002001F01AFD43 -:101F50000FF24143002204F18201002001F012FD42 -:101F6000002020838021DFF8B4040180A02141807B -:101F7000012000F083F90EB010BDF8B50746DFF878 -:101F800094447878DFF89054052804F1800604D052 -:101F90003E2812D0FF285FD0CBE0B888E18A884283 -:101FA00006D10020E08230700FF2C44001F0ACFD99 -:101FB000012000F063F9012047E0F87801282BD0D8 -:101FC000032802D00C2803D0B3E00FF2CC40A6E0E7 -:101FD0000FF2F04001F098FD387900280CBF0FF2A5 -:101FE00000500FF2245001F08FFDE08A6A460DF197 -:101FF000010101F0C7FD60B90FF2345001F084FD1A -:102000009DF800209DF801100FF2385001F07CFD82 -:102010008FE00FF24C5082E0707801F0D9FCB7F8F5 -:1020200005100FF2585001F06FFD307804280CBFF6 -:102030000620052030700021B7F80500E082E88016 -:102040002971281D01F09BF900202871E08AE880A1 -:10205000281D01F094F96CE0B7F80300001F61D06F -:102060004FF47F71401A18D0401E49D0401E17D03F -:10207000401E1CD0401E1DD0401E1ED0801E4CD0C5 -:10208000401E24D0401E28D0401E23D040F2F631FE -:10209000401A04BF012068704BE00FF224503EE06C -:1020A0000FF24C5001F030FD0FF26C5037E00FF2A0 -:1020B000885034E00FF2B05031E00FF2E05001F000 -:1020C00023FDE08A01F0DBFE0FF2F85027E00FF26B -:1020D000106024E00FF2386021E0D7F807100FF20B -:1020E000606001F011FDD7F807100FF26C6001F08D -:1020F0000BFDE08A012101F010FF0FF270600EE08D -:10210000F9790FF2A86001F0FFFCF879002814BFFC -:102110000FF20C700FF2F46001E00FF2187001F092 -:10212000F3FC06E0012001F046FFB0780A2101F03F -:102130009EFC0120F2BD01F042B90021042000F014 -:1021400015BE704778B589B00020ADF81A0001F0CF -:10215000EFFCB34DB34E286810F1010F0ED0696843 -:102160003074090A000A707406F110046868B074CB -:10217000F174080A090C3075717506E0002001F051 -:1021800083FF040008BF0FF6A004224606210020AA -:1021900001F031F86079307207AA20797072062157 -:1021A000E078B072A078F072607830732078994C43 -:1021B00070734EF66E500890286807902E2001F03C -:1021C0001AF80FF66C021021182001F014F80FF61F -:1021D00070021021082001F00EF81821012001F0F2 -:1021E00031F801F063FF0DF1160006A9019000918E -:1021F00005AB07220021012001F0CEFD0FF2606047 -:10220000BDF8181000900723BDF81400002202F05A -:102210000DF80DF11A0000900223BDF81610BDF85C -:102220001400002202F002F802220221002001F034 -:10223000DCFC0120207001F063FD012060700121B1 -:1022400008202071A1701020607100210020E07032 -:10225000049110217448A06003900822002002908D -:1022600001910092002301220121012001F061FD72 -:10227000A07808B101F0E8FD0AB070BD2DE9F84181 -:102280000446012C87B003D164480588478803E0E1 -:102290004FF4C8654FF47A67DFF8788108F180065B -:1022A000707801F095FB31780FF2BC5001F02CFCF6 -:1022B000022C11D13078012818BF02280CD101F06E -:1022C000C4FC010004D10FF2BC5001F01DFC03E07E -:1022D0000FF2D45001F018FC3470002006900590E5 -:1022E00008F119010491082298F818000FF26071A2 -:1022F000039002910192002300933A462946002060 -:1023000001F0B5FC47490E2001F076FD010013D124 -:10231000012C0AD10FF2B85001F0F6FB7078434956 -:1023200008B0BDE8F04101F0A2BB08B0BDE8F04143 -:102330000FF2C45001F0E8BB08B0012CBDE8F04139 -:102340000CBF0FF2E0500FF20C6001F0DDBB00009B -:1023500010B5012001F039FE2E4C94F880000528BC -:1023600012D001F072FC002184F8801030B90FF215 -:10237000186001F0C9FB0FF2186001E00FF22C6049 -:10238000BDE8104001F0C0BB10BD000000210120DD -:1023900000F0ECBC012001F018BE00001CB51D4C83 -:1023A00094F88000012818BF00282DD01A484178E1 -:1023B000012929D1002201784270491C01EBD17218 -:1023C0005210A1EB42010170F7EE040A017800EB14 -:1023D00081004FF4FA7190ED020AE08A0091C0EE9C -:1023E000200AFDEEE00A10EE902A92B20023114678 -:1023F00001F060FFBDE8164000280CBF0FF2D0507E -:102400000FF2FC5001F080BB13BD0000A0080320B8 -:10241000C72A0008C81300201C000020E81700206D -:102420008075FF1F0400002007B2010046E0010094 -:102430000021082000F09ABC012000F0BDBC012062 -:1024400000F0C2BC10B50446616801F1080000F05C -:1024500081FE00B10120207010BD000010B10128E4 -:1024600003D070470F2000F095BC0F2000F09ABCFD -:102470000D0A0D2A2A20444953434F4E4E454354DA -:10248000494F4E204556454E542057495448204305 -:102490004C49454E54200A000D0A0D2A2A20434F6C -:1024A0004E4E454354494F4E2055504441544520CB -:1024B0004556454E54205749544820434C49454EB3 -:1024C00054200A004556545F5550444154455F50CE -:1024D00048595F434F4D504C455445200A00000079 -:1024E0004556545F5550444154455F5048595F43E9 -:1024F0004F4D504C4554452C2073746174757320B6 -:102500006F6B200A000000004556545F555044414F -:1025100054455F5048595F434F4D504C4554452CEE -:1025200020737461747573206E6F6B200A00000055 -:10253000526561645F5048592073756363657373B6 -:10254000200A000050485920506172616D202054CB -:10255000583D2025642C2052583D202564200A0037 -:102560005265616420636F6E66206E6F74207375B0 -:10257000636365657373200A000000004843495F88 -:102580004C455F434F4E4E454354494F4E5F434F7A -:102590004D504C4554455F5355424556545F434F4B -:1025A000444520666F7220636F6E6E656374696F59 -:1025B0006E2068616E646C6520307825780A0000B2 -:1025C0000D0A0D2A2A204143495F4741505F4C497B -:1025D0004D495445445F444953434F564552414247 -:1025E0004C455F56534556545F434F4445200A00BF -:1025F0000D0A0D2A2A204143495F4741505F50414F -:1026000053535F4B45595F5245515F56534556549E -:102610005F434F4445200A000D0A0D2A2A206163BA -:10262000695F6761705F706173735F6B65795F721B -:10263000657370200A0000000D0A0D2A2A2041430C -:10264000495F4741505F415554484F52495A4154A0 -:10265000494F4E5F5245515F56534556545F434F65 -:102660004445200A000000000D0A0D2A2A2041439B -:10267000495F4741505F534C4156455F5345435571 -:10268000524954595F494E495449415445445F5653 -:10269000534556545F434F4445200A000D0A0D2A06 -:1026A0002A204143495F4741505F424F4E445F4CAF -:1026B0004F53545F56534556545F434F4445200A89 -:1026C000000000000D0A0D2A2A2053656E64206167 -:1026D0006C6C6F77207265626F6E64200A00000078 -:1026E0000D0A0D2A2A204143495F4741505F41446A -:1026F00044525F4E4F545F5245534F4C5645445FD2 -:1027000056534556545F434F4445200A000000008D -:102710000D0A0D2A2A204143495F4741505F4B452E -:102720005950524553535F4E4F54494649434154C3 -:10273000494F4E5F56534556545F434F44450A0038 -:102740006E756D657269635F76616C7565203D209D -:10275000256C640A000000004865785F76616C753E -:1027600065203D20256C780A000000000D0A0D2A26 -:102770002A206163695F6761705F6E756D6572695C -:10278000635F636F6D70617269736F6E5F76616CAA -:1027900075655F636F6E6669726D5F7965736E6F85 -:1027A0002D2D3E594553200A00000000424C455F44 -:1027B0004354524C5F4170705F4E6F746966696339 -:1027C0006174696F6E3A204143495F4741505F50E1 -:1027D000414952494E475F434F4D504C4554455F28 -:1027E00056534556545F434F44452C2070616972DF -:1027F000696E675F636F6D706C6574652D3E5374B1 -:1028000061747573203D2025640A00000D0A0D2AAD -:102810002A2050616972696E67204F4B200A0000C0 -:102820000D0A0D2A2A2050616972696E67204B4F8C -:10283000200A00000D0A0D2A2A204143495F474122 -:10284000505F50524F435F434F4D504C4554455F8E -:1028500056534556545F434F4445200A000000003C -:102860005032505352563100466972737420696E6B -:1028700064657820696E2025642073746174652016 -:102880000A0000005375636365737366756C6C7939 -:102890002053746F7070656420416476657274694A -:1028A00073696E67200A000053746F70204164766C -:1028B0006572746973696E67204661696C6564202E -:1028C0002C20726573756C743A202564200A000010 -:1028D0005375636365737366756C6C7920537461AB -:1028E00072742046617374204164766572746973F2 -:1028F000696E67200A000000537563636573736631 -:10290000756C6C79205374617274204C6F77205011 -:102910006F776572204164766572746973696E675A -:10292000200A000053746172742046617374204160 -:1029300064766572746973696E67204661696C6557 -:1029400064202C20726573756C743A202564200A0B -:10295000000000005374617274204C6F7720506F38 -:10296000776572204164766572746973696E672059 -:102970004661696C6564202C20726573756C743ACD -:10298000202564200A00000020200D0A0D00000010 -:102990002A2A2053544F50204144564552544953FB -:1029A000494E47202A2A20200D0A0D002A2A2053AA -:1029B000544F50204144564552544953494E4720A4 -:1029C0002A2A20204661696C6564200D0A0D0000EA -:1029D000424C455F5356435F4C324341505F436F17 -:1029E0006E6E5F55706461746528292C2053756381 -:1029F0006365737366756C6C79200D0A0D000000B9 -:102A0000424C455F5356435F4C324341505F436FE6 -:102A10006E6E5F55706461746528292C204661696B -:102A20006C6564200D0A0D006C7AD8AC57720000FA -:102A3000123456789ABCDEF0123456789ABCDEF026 -:102A4000FEDCBA0987654321FEDCBA0987654321AC -:102A5000095032505352563100000000000000006F -:102A6000000000000000000000000000440008001A -:102A70004005020112279C00F4010000FFFF000046 -:102A800048010100002000007FB50C466D4D6168D3 -:102A90006D4EE8612962284601F040FC246805F18A -:102AA000240001F045FC746006F1080001F040FCD0 -:102AB00001203070296829B10FF25510009002945E -:102AC000684688477FBD1FB55F4C04F1080001F0E0 -:102AD00032FC00BB2178F1B1694604F1080001F035 -:102AE00053FC5848C16949B10098029001228DF801 -:102AF000042001A888479DF8040000E00120207010 -:102B0000207818B1009801F0F4FC04E0009904F179 -:102B1000080001F019FC04F1080001F00CFC28B9D0 -:102B2000207818B104F10800FFF782FC1FBD2DE9E1 -:102B3000F8430646002000F05FF874883088B268D9 -:102B4000DFF80081C4F3090444EA8024F068A4B2E9 -:102B5000C1B2204600F03CF8002748F2E809484698 -:102B6000FFF76DFC08E06888A04202D1316928783F -:102B70000870687800B1012708F1240001F0DBFB40 -:102B8000F0B9694608F1240001F0FEFB009800F15D -:102B90000B05407A0F28E6D0B5F80110A1420DD1FF -:102BA0000098817AC81E7169C0B28842C8BF0846C1 -:102BB000706102463069E91CFEF78EFB2878D9E780 -:102BC0003800CCD0012000F017F80020BDE8F283D7 -:102BD00010B513461C4A5468A4F80900E1720A466D -:102BE000194604F10C00FEF777FB164A1369BDE89D -:102BF00010400021002018471249096A82B008B924 -:102C000021B101E011B1012002B0084702B07047C4 -:102C100010B50146487A0F2818BF0E2807D10B4877 -:102C200001F09CFBBDE810400020FFF705BC064CFE -:102C300004F1080001F092FB04F10800BDE8104027 -:102C4000FFF7F6BB0C1700205C17002030170020A0 -:102C50000C48002101604160704710B500F00CF88D -:102C60005C6819B1012904D1204301E024EA000085 -:102C7000586082F3108810BDEFF3108272B6014BDA -:102C8000704700009C1700202DE9FC475B4CDFF8E3 -:102C90007091A5692840A0614FF0FF3A4FF00108FC -:102CA00030E0491C54F831000642FAD004EBC1066A -:102CB000184071681040014208BFC6F804A0776848 -:102CC000384000F09FF8606208FA00F087437760B0 -:102CD000EFF3108172B6626A206908FA02F2D243F9 -:102CE00010402061022004EBC00353F8086C16402A -:102CF000401E43F8086CF6D181F31088606A59F8D9 -:102D00002010884763692069A2691840104207D0E3 -:102D1000E069216A084203D1002103EA0206C1E703 -:102D2000C4F824A001F033FCEFF3108972B62169D6 -:102D300060690140A069014201BFE169206A014266 -:102D400001F08FFC89F3108801F0A7FCA561BDE8B4 -:102D5000F38738B51446EFF3108572B600F052F8D9 -:102D6000274941F8204085F3108831BD10B500F0A7 -:102D70000BF804431C6153F83140204343F8310001 -:102D8000FFE782F3108810BDEFF3108272B61B4B81 -:102D90001C697047EFF3108172B6184A536923EA31 -:102DA000000005E0EFF3108172B6144A536918432E -:102DB000506181F310887047EFF3108172B60F4AAB -:102DC000D3691843D061F4E7F8B50C4C656A276AFB -:102DD0002E4615F1010F0EBF0025012101FA05F560 -:102DE000206202E0284601F03DFC216AE0690842C9 -:102DF000F8D088436662E0612762F1BD5010002080 -:102E00004C14002002460020110C090404BF1020BD -:102E1000120412F07F4F04BF083012020FF21801A3 -:102E200012F0704F04BF001D1201120FC0F11F00FD -:102E3000895C401AC0B2704704030202010101011B -:102E4000000000000000000001F07DFC9DF80E0075 -:102E500005B000BDF8B500F10C026B4624214FF619 -:102E60006640F1E7F8B500F10C026B460F214FF612 -:102E70006840E9E7A04900E0A04981B00A68024340 -:102E80000A60096808400090009801B0704738B5A2 -:102E90009B499C4C4FF40040086001F0A3FC606823 -:102EA00040010ED56068C0000BD401F0C9FC01F0F0 -:102EB000C7FC206840F480302060216821F4803114 -:102EC000216000F0DEF8002001F0DEF840B18079EA -:102ED0008D49E160E16821F47C5141EA0021E16023 -:102EE00000F053F8894C8A488A4D606204F124004E -:102EF00001F0AEFC8848016800220260026902F01D -:102F0000500202610420FFF7B7FF0120FFF7B4FF72 -:102F10000220FFF7B1FF0420FFF7ACFF0120FFF70D -:102F2000A9FF0220FFF7A6FF00220F210E2001F0CB -:102F3000E3FC0E2001F0FEFC00220F213A2001F0FC -:102F4000DBFC3A2001F0F6FC0020606025600F20D9 -:102F5000A06047F6FF70E06000202061A061E061A2 -:102F60006061204601F03CFDCA206862FF215320C9 -:102F70006862A868C008C000A860696201F008FB28 -:102F80004FF0FF30FFF780FEFAE710B5AEB01CA897 -:102F9000482101F0C9FD01A81C2101F0C5FD08A8C8 -:102FA000502101F0C1FD01F04BFC5648016821F0B1 -:102FB0001801016007215948026822F4C06242F4F6 -:102FC000007202604FF48032006800F4C06000902C -:102FD0004FF4807400981C9101201E900021402025 -:102FE00020901D9227911F941CA801F0AAFD6F202C -:102FF0000190022100200291039004900590069018 -:103000000790012101A802F04EF843F60300089052 -:1030100000214FF4804019900E910F911020022151 -:103020001B901A91189408A802F016FA2EB010BD41 -:1030300010B53B4C3B4800F017F84FF40040E061FE -:10304000002020626062A062204602F083FB002123 -:10305000204602F0BEFF0021204602F0C5FF2046B8 -:10306000BDE8104002F098BF20604FF4E13060608E -:103070000020A060E06020610C2060610020A06161 -:103080007047294881B0016841F4801101603F21F7 -:10309000006800F48010009000982448416041616D -:1030A000016841F47C110160026942F47C12026102 -:1030B000016841F03F010160026942F03F02026194 -:1030C00001B0704738B5044602F0E2FF14F1010F79 -:1030D000054609D001F09DFB241805E0144801685D -:1030E00021F00401016030BF02F0D2FF401BA0427A -:1030F000F4D331BD00000000480000584C000058D7 -:103100001040005890000058FECAFECA4C1500201E -:10311000000C0058002800408008005800040058A7 -:10312000A81200200038014050000058040C00583C -:1031300010ED00E0704700001B4800210171017292 -:1031400000F034B818490A7941F822000879401C87 -:103150000871704770B504466078FF2802BFB4F864 -:10316000031001F47F41B1F5406F12D100260E4DDE -:1031700000E0761C2979F0B288420AD2F1B255F803 -:103180002110204688470100F3D002D0022805D044 -:1031900006E02046BDE87040FEF7EFBE002070BD9F -:1031A000012070BD000000008817002080B502F0EB -:1031B00075FF02F074FF02F073FF02F072FF02F07D -:1031C00071FF02F070FF02F06FFF02F06EFF02F07D -:1031D0006DFF02F06CFF02F06BFF02F06AFF02F07D -:1031E0009FFF03F057F803F056F803F055F8BDE8D9 -:1031F000014003F052B818B50C46C7B01146002282 -:103200008DF800208DF81C008DF81D4022460DF130 -:103210001E0003F043F800F03BF83F200C21ADF80E -:103220000400ADF8061007A8012103900691A41C24 -:10323000049400F043F800284CBFFF209DF80000E4 -:1032400048B010BD00B5C7B000F01BF80F2000F06B -:103250002AF800284CBFFF209DF8000047B000BDB1 -:1032600000B5C7B00021ADF81C0000F016F818201A -:1032700000F019F800284CBFFF209DF8000047B06F -:1032800000BD00228DF800208DF81C008DF81D1067 -:103290001822002101A803F007B88DF800101822A9 -:1032A00001A803F001B8ADF8060007A902200490B8 -:1032B0003F22012003910690ADF80420CDF814D0F0 -:1032C000002101A8FFF733BC70B506464E4C30789C -:1032D0004CA520B1012807D0032810D070BD0120D3 -:1032E00020700FF2281003E0002121700FF250101F -:1032F00000F00AFC2846BDE8704000F005BC71688B -:103300000878C8B94978012909D100F054FE0FF2B4 -:10331000641000F0F9FB00F02FF80120A070716834 -:10332000487848B900F051FE0FF2701000F0ECFB45 -:1033300000F022F80020A0707068017801291AD1ED -:10334000407801280AD1002000F035FE0FF27410F9 -:1033500000F0DAFB00F010F80120A07071684878E6 -:1033600048B900F032FE0FF2841000F0CDFB00F0FF -:1033700003F80020A07070BD284600F0C5BB00789F -:10338000012808BF00F00DB8704780B50FF2390270 -:1033900000210220FFF7DDFC1B4900220A70BDE876 -:1033A000014080B5002000F010FE17480121417057 -:1033B000002181700121C1700021017101BD002136 -:1033C0000220FFF7D3BC000010B50F4C2079401E3F -:1033D0008041C00F2071207868B10FF2381000F0E2 -:1033E00093FB08A000F090FBE11CBDE810404FF6F5 -:1033F000426002F025BFBDE810400FF2581000F007 -:1034000083BB0000200A0D00C41700202D2D205082 -:103410003250204150504C49434154494F4E205363 -:103420004552564552203A204E4F54494649434151 -:1034300054494F4E20454E41424C45440A0000003D -:103440002D2D20503250204150504C494341544979 -:103450004F4E20534552564552203A204E4F544924 -:103460004649434154494F4E2044495341424C45FB -:10347000440A00002D2D20503250204150504C491C -:10348000434154494F4E2053455256455220203A0D -:10349000204C454431204F4E0A0000002D2D205075 -:1034A0003250204150504C49434154494F4E2053D3 -:1034B000455256455220203A204C454431204F4633 -:1034C000460A00002D2D20503250204150504C49CA -:1034D000434154494F4E20534552564552203120C6 -:1034E0003A204C454431204F4E0A00002D2D2050EB -:1034F0003250204150504C49434154494F4E205383 -:1035000045525645522031203A204C454431204FF7 -:1035100046460A002D2D20503250204150504C4933 -:10352000434154494F4E2053455256455220203A6C -:1035300020494E464F524D20434C49454E5420425F -:103540005554544F4E203120505553484544200A7D -:10355000200000002D2D20503250204150504C4969 -:10356000434154494F4E20534552564552203A202C -:1035700043414E275420494E464F524D20434C491B -:10358000454E54202D20204E4F5449464943415426 -:10359000494F4E2044495341424C45440A200000C3 -:1035A000DFF83C150A6892B200E00246086880B273 -:1035B0008242FAD170472DE9FC4104461825DFF814 -:1035C0002485DFF82465684308EB00073078062877 -:1035D00008D131787170347078754FF0FF307060B9 -:1035E000002039E000F077F8B9680918B96008F1EF -:1035F0000803B96832786A439A589142327813D3F3 -:1036000008F1150315FB02FC13F80C30062B25D02E -:1036100008F108066B43F358994222BF08F11503DD -:103620006A439A5CEED219E01146337869439A42B4 -:103630000BD008F1140308F1150C5B5C15FB03F5C6 -:103640000CF805407A753B7500E07A7508F11402B4 -:103650005454317871703470BDE8F6811146694375 -:1036600008F115035B5C062B04D008F1140615FB6A -:1036700003F574557B753A7508F115025454EBE760 -:10368000F8B5DFF86434DFF85C541E78182402467D -:103690006243B0422A4404D118785870507D1870A3 -:1036A0000FE0167D507D92F815C005F115076643B1 -:1036B000062807F806C004D0167D143514FB00F464 -:1036C0002E55012010731878062802BF00294FF0EC -:1036D000FF315960F1BD10B5DFF80C44606810F19E -:1036E000010F0FD0FFF75CFF6168DFF80024814213 -:1036F00061683CBF5388C918081A5178484311784B -:10370000C84000E0002080B210BD2DE9F84FDFF87E -:10371000DC53DFF8DCB3D5F80880D8F80000DBF81C -:1037200000104A0500F090F9DFF8BC63DFF8B4A39D -:1037300021F4806181604FF0180934780AF10800A3 -:1037400019FB04F14758FFF7C6FF874217D200273D -:103750000121B170062C3DD019FB04F40AF10801D7 -:103760000AF108020959814223BF0AF108010959E7 -:10377000091A002111510AEB04014C7DEAE7A988DE -:103780004118B94202D2AF880021E2E73F1ADFE7D1 -:10379000022802DA2878012800D07F1ED8F800001D -:1037A000C1684A07FAD500F055F9DBF80C00000CA7 -:1037B000BFB247EA0047CBF80C70FFF7F1FE70602C -:1037C000A8680068816841F480618160AFF300807F -:1037D000BDE8F18FB8B20028DAD1FFF7E1FE7060E2 -:1037E0000320BDE8F24F01F0D3B82DE9F843EFF321 -:1037F000108872B6BD4DBB4BA8680168CA224A62E8 -:1038000053204862B84A886820F480608860182095 -:103810001678374647431F44387B022826D13C6838 -:10382000D7F810909078F0B17A7B012A0AD1012163 -:103830003046FFF725FF88F310887968304600F09E -:1038400016F904E088F31088304600F0C1F8A86843 -:103850000068CA21416222465321416248463146EE -:1038600000F050F90BE0FFF750FF06E0C868420790 -:10387000FCD500F07EF89F49086088F31088FF218E -:10388000A86802685162BDE8F183F8B5974CA16061 -:10389000CA2209684A6253224A62954A136843F071 -:1038A00020031360136803F00703C3F104032370BC -:1038B00095682D0C05F07F056D1C6570EDB2926862 -:1038C000C2F30E02521C628092B2521E6A43A2F5EB -:1038D000A072DA404FF6FF739A422CBFA380A280F9 -:1038E000854A136843F400231360844B1D6845F434 -:1038F00000251D6048BB7C487A4E01238370182543 -:103900004FF0FF33436000235FFA83FC06F10C079E -:1039100015FB0CFC4FF0000E07F80CE05B1CDFB24F -:10392000062FF1DB06230370886820F4806088602E -:1039300000F01FF8D060032001F035F8A168086896 -:10394000826842F48042826005E0C868410544BF55 -:10395000032001F01DF8A1680A68FF2050620022D0 -:103960000321032000F0C8FFBDE8F240032000F06F -:10397000E1BFC86800F0800060F49060C8604FF458 -:1039800000207047F0B504460025EFF3108672B6AC -:103990001827DFF850C10CF10C0007FB05FE10F8EA -:1039A0000E0010B16D1C062DF5DB062D0CD06F43FB -:1039B0000CEB07000127077386F31088046142733C -:1039C00003600D700020F0BD86F310880120F0BD6B -:1039D000F8B50746EFF3108472B6032000F0B5FF88 -:1039E000424DAE683068CA2141623A465321416275 -:1039F000182043494243895C02291BD100213846E3 -:103A0000FFF73EFE3848017806290ED13068384964 -:103A10000A68530500F018F821F480618160C168DC -:103A20004A07FCD500F016F804E04078884218BF39 -:103A3000FFF76BFEA9680A68FF205062032000F0C0 -:103A400079FF84F31088F1BD02D5C1684A07FCD420 -:103A500081687047C16801F0800161F49061C160C4 -:103A60004FF4002023490860032000F09CBF2DE99B -:103A7000F04180460F46424618201A4942438C18AE -:103A8000207B022804BF4046FFF7A2FFEFF310851A -:103A900072B6032000F059FF144EB0680068CA21C6 -:103AA00041625321416202202073A7606760404653 -:103AB000FFF781FD0C490A784978914202D0FFF75F -:103AC00024FE02E0A168081AA060FF20B1680A681D -:103AD0005062032000F02EFF85F31088BDE8F081CE -:103AE0002828004038130020D41700207C1700201D -:103AF000082800400C0800580008005880080058AA -:103B000044130020104700000EB4C0B5024603A8BD -:103B100000210190009101AB0121044878440C3050 -:103B2000FCF70CFB06BC5DF810FB00BFEF42000089 -:103B300000B587B000F010F8012003220690ADF820 -:103B40000420ADF8062000F07AF800284CBFFF20D2 -:103B50009DF8000007B000BD00208DF8000018227D -:103B6000002101A802F0A0BB09220021684602F052 -:103B70009BBB1822002102A802F096BB182201A8C4 -:103B800002F092BB70B5C8B006460C461546052239 -:103B9000FFF7EBFFADF82060FFF7EBFF302100F0FF -:103BA00014F80521049000F019F8002848BFFF2000 -:103BB00009D49DF8000030B99DF8030020709DF8ED -:103BC00004002870002048B070BDADF80A1008202D -:103BD0000221ADF80800059108A870470791CDF8BB -:103BE00018D0002102A8FEF7A2BF00B5C7B000F0B0 -:103BF0000EF8FFF7C3FF312000F013F800F01FF8B4 -:103C000000284CBFFF209DF8000047B000BD0023F6 -:103C10008DF81C008DF8003007A8417082700021DB -:103C20007047ADF8060007A9032004900822012080 -:103C300003910690ADF80420704703900691CDF8EB -:103C400014D0002101A8FEF772BF00B587B000F0C4 -:103C500012F900F02EF9812000F008F900F036F991 -:103C600000284CBFFF209DF8000007B000BD2DE9E3 -:103C7000F84DC7B09446DDF840E1519A559D569EE7 -:103C8000DDF84CA1ADF81D108DF81C004FF0000BB5 -:103C9000ADF81FC08DF821308DF822E000F024F837 -:103CA00000F017F824F8095F668000F002F93F2061 -:103CB000832100F026F9574406910D37049700F050 -:103CC00008F900284CBFFF209DF8000048B0BDE86F -:103CD000F08D88F800A007AC5499E419524608F119 -:103CE0000100544402F0DABA8DF8232017465299A5 -:103CF0008DF800B00DF1240809A8B84402F0CEBA3E -:103D000000B5C7B000F00CF8852000F090F800F086 -:103D1000DDF800284CBFFF209DF8000047B000BD33 -:103D200000218DF81C008DF80010182201A802F067 -:103D3000BBBA2DE9F841C7B04FF0000800F026F8F3 -:103D40000DF12300DDF844E14E9F4F9E509D529CA3 -:103D50008DF81F30C0F800E08DF800808DF82070DD -:103D60008DF821608DF822508DF8274000F0A1F8E1 -:103D70008620ADF8060007A90C2000F0A3F8002863 -:103D80004CBFFF209DF8000000F0D5B88DF81C0056 -:103D900007A8417082707047F8B5C8B005460E4656 -:103DA00017461C4600F023F808A8467087708DF867 -:103DB000205000F0A1F88A21ADF80A103F2003211D -:103DC00000F08DF8002848BFFF200ED49DF80000B9 -:103DD00058B94F994E98BDF801202280BDF80320B4 -:103DE0000280BDF805000880002049B0F0BD072220 -:103DF0000021684602F058BA18B5C7B0044600F072 -:103E00003AF88DF81C40224600F083F800F051F893 -:103E10003F208E2100F092F8641C049400F059F8C1 -:103E200000284CBFFF209DF8000048B010BDADF841 -:103E3000060007A901203F22039104907047ADF8C6 -:103E4000060007A90220704700B587B000F013F8FC -:103E500000F02FF8922000F009F800F037F8002861 -:103E60004CBFFF209DF8000007B000BDADF8060074 -:103E70003F220120704700208DF80000704700B5F8 -:103E8000C7B00021ADF81C00FFF74DFF9520FFF7EC -:103E9000D6FF00F017F800284CBFFF209DF8000067 -:103EA00047B000BD00228DF80020ADF81C008DF851 -:103EB0001E101822002101A802F0F6B9ADF8060084 -:103EC00007A9032004903F22012003910690ADF83A -:103ED0000420CDF814D0002101A8FEF728BEADF8CB -:103EE0000800059108A8072104900791CDF818D083 -:103EF000002102A8FEF71BBE1822002102A802F032 -:103F0000D3B9ADF80400ADF8061007A8012103905D -:103F100070470DF11D0002F0C1B900B5C7B0FFF741 -:103F2000C1FFA520FFF7CAFF00284CBFFF209DF866 -:103F3000000047B000BD48B0BDE8F081ADF8040016 -:103F4000ADF8061007A80121039006917047000004 -:103F5000444981B00A6802430A6009680840009039 -:103F6000009801B0704778B585B0044668461421C2 -:103F700000F0DAFD0220FFF7EBFF00F010F80095EB -:103F8000012001900021022003900291694656F819 -:103F9000240002F093F900F008F806B070BD0FF2AB -:103FA000D400314E30F81450704756F824000022E7 -:103FB000294602F040BA0FF2BC012B4B31F8101029 -:103FC00053F82000012202F036BA0FF2A801264B66 -:103FD00031F8101053F82000002202F02CBAF0B58E -:103FE00085B005460C466846142100F09DFD0DB9CC -:103FF000042004E0012D18BF022D02D10820FFF794 -:10400000A7FF2000194E0FF274070DD137F81500E5 -:10401000009000210191012002900221039100F003 -:104020001BF80120FFF74EF8012C13D137F81500CB -:10403000009001210E480190029100F00DF80FF25E -:104040004400445D00220F2160B200F055FC60B2D4 -:1040500000F070FC05B0F0BD694656F8250002F08E -:104060002DB900004C000058841000209010002052 -:1040700000002110200001000200000010000100DB -:10408000020000000A06070001460648064AC379F6 -:104090008B4218BF904218BF0838F8D18B4218BF26 -:1040A00000207047F873FF1F0070FF1F00B587B036 -:1040B00000208DF8000000F0E0F840F20110ADF8AB -:1040C00006003F220120069000F0ECF800284CBFCB -:1040D000FF209DF8000007B000BD2DE9F84107461C -:1040E0000128C7B0884615461E4608BF022003D0E7 -:1040F00002280CBF102000200DF11D010C1800F04B -:1041000036F8012F8DF81C7002D0022F18D019E05C -:1041100002273A4641460DF11D0002F0BFF8257016 -:10412000667000F0AAF83F204FF4817100F016F895 -:10413000FF1C049700F0B8F8002805D5FF2009E01F -:104140001027E6E7472005E09DF8000010B94E98DB -:1041500000F067F8FFE748B0BDE8F081ADF8040073 -:10416000ADF8061007A803210390069170470322BB -:104170000021684602F098B82DE9F64F0C46054636 -:10418000012CC7B09B4608BF022003D0022C0CBFF5 -:10419000102000200DF11F010E18FFF7E8FF012C81 -:1041A000ADF81C508DF81E4002D0022C2CD02DE012 -:1041B0000227569C559DDDF85091DDF84CA1DDF8A5 -:1041C000488148993A4600F054F8A6F800B086F8BD -:1041D000028086F803A086F804907571B47100F02F -:1041E0004CF83F20ADF804004FF4827107A8ADF8F9 -:1041F0000610039003210A370497069100F054F843 -:10420000002805D5FF2009E01027D2E7472005E068 -:104210009DF8000010B9579800F003F849B0BDE8C8 -:10422000F08FBDF8011001800020704730B5C7B095 -:104230001C464A9B00F026F800258DF800508DF8AA -:104240002140224619460DF1220002F027F800F025 -:1042500014F83F204FF4837100F01BF8A41D049460 -:1042600000F022F800284CBFFF209DF8000047B066 -:1042700030BD0DF11F0002F011B81822002101A875 -:1042800002F012B8ADF81C00ADF81E108DF8202019 -:104290007047ADF80400ADF8061007A8012103909F -:1042A00006917047ADF80420CDF814D0002101A884 -:1042B000FEF73DBC30B5C7B00025ADF81C0007A81F -:1042C0004A9C41808280ADF8223004818DF80050F4 -:1042D00000F01EF80F21029140F281100A21ADF882 -:1042E0000600049107A801213F220390069100F0E7 -:1042F00007F800284CBFFF209DF8000047B030BDF4 -:10430000ADF80420CDF814D0002101A8FEF70FBCB1 -:104310001822002101A801F0C7BF00000249016076 -:1043200002490161704700BFEF43000815440008CF -:10433000006040607047EFF3108172B602688242FD -:104340000CBF012000201CE0EFF3108272B603685E -:104350000B60486001600868416023E0EFF3108261 -:1043600072B6086043684B6041604868016019E0BC -:10437000EFF3108172B64268036813600268436805 -:10438000536081F31088704710B5EFF3108472B654 -:1043900002680A600068FFE7FFF7EAFF84F310880D -:1043A00010BD0B6082F310887047000002F0D8B88F -:1043B0006C486D49016001F12002426001F1300258 -:1043C000826001F13C02026201F14402426201F1A9 -:1043D0004C02C26001F15402026101F170024261BB -:1043E00001F1740282618031C16102F0D7B838B541 -:1043F00004465E4D2846FFF79BFF5A484068A16877 -:104400000160E168C16085605949416002F0E2F8ED -:1044100058482AE080B55348426813680121197250 -:10442000406802F0DDF8002002BD38B5514C4F4D18 -:1044300004E000F041F80098216888472846FFF71B -:104440007AFF0028F5D031BD4A484168084738B5A1 -:104450000446494D2846FFF76BFF4248C068A168F3 -:104460000160456002F0C1F844482168016061685C -:104470004160002032BD80B53A48C26813681021FF -:104480001972C06802F0B7F8002002BD35483B4AF7 -:10449000C168C16813680868184738B5374C364D8D -:1044A00004E000F009F80098616888472846FFF7A3 -:1044B00042FF0028F5D031BD69462846FFF764BFAA -:1044C00038B504462E4D2846FFF732FF2D48FFF73A -:1044D0002FFF24480069A1688160E168C16005611F -:1044E00021680160616841602169416161698161A0 -:1044F00031BD80B501462348FFF730FFBDE80240DB -:104500000FF2050002F087B838B5164C1D4D06E0D5 -:10451000FFF7D2FF009920690069FFF71FFF2846C7 -:10452000FFF709FF0028F3D031BD10B5164C204627 -:10453000FFF7FEFE0B4841690C60BDE8104002F039 -:104540007EB81CB5104C06E069462046FFF71CFFFC -:10455000009800F01BF82046FFF7EDFE0028F3D08E -:1045600013BD000000000320AC090320480A03200B -:1045700090080320AC170020500A0320B417002035 -:10458000380A0320A4170020400A03207047704710 -:1045900010B52848284C88B0016841F400410160FA -:1045A000FEF756FB25480168C908C90041F004011F -:1045B000016000202249FFF768F902F066F8012146 -:1045C0000120FEF74AFB0020FFF7CDFC0120FFF79A -:1045D000CAFC0220FFF7C7FC0120FFF7ECFC012119 -:1045E0000020FFF7FCFC01210120FFF7F8FCFFF79A -:1045F000DFFE144A00211020FEF7ABFB04F23C5012 -:104600000FF245010090019169460FF2410000F060 -:1046100045F804F25470029004F5C96140F23C5030 -:1046200005900391049402A8FFF74AFFFFF7BEFE2E -:1046300008B010BD08000058300003208004005866 -:104640004C150020DF4600087047000080B502F0DE -:104650002BF8FDF72FFCBDE8044000210120FEF7F8 -:10466000FCBA70474FF0FF30FEF70EBB0021102060 -:10467000FEF77CBB0220FEF79FBB0220FEF7A4BB27 -:10468000012805D0022805D0102805D1FDF753BD1B -:10469000FDF753BDFDF755BD704770477FB50C461C -:1046A0004D4D61684D4EE8612962284602F01AF9C5 -:1046B0002468746006F10800FFF73AFE012000F05C -:1046C00068F801203070296841B10FF2E9000FF25B -:1046D000ED02009001920294684688477FBD1FB5A5 -:1046E0003E4C04F10800FFF726FE00BB2178F1B133 -:1046F000694604F10800FFF747FE3748C16949B130 -:104700000098029001228DF8042001A888479DF8A6 -:10471000040000E001202070207818B10098FFF715 -:10472000E8FE04E0009904F10800FFF70DFE04F133 -:104730000800FFF700FE28B9207818B104F108003E -:10474000FFF794FF1FBD2DE9F04105460E46904648 -:104750001C46002000F01DF8204F7868A0F8095092 -:10476000C672324641460C30FCF7B6FD1A4A136950 -:1047700000210020984748F2E800FFF77EFF7968A3 -:104780008A78D21C04F10800FCF7A6FDBDE8F041D0 -:1047900001201CB51049124C096A20B901B18847A3 -:1047A0000020207013BD0120207011B1BDE81C4015 -:1047B000084713BD0020FFF75DBF000010B501469C -:1047C000064C04F10800FFF7C9FD04F10800BDE83C -:1047D0001040FFF74BBF0000381700206C17002077 -:1047E00091170020134810B5016841F480710160F1 -:1047F000032000F074F8002002F07EF80024002866 -:1048000014BF012402F0A7F8204610BD0A488068B2 -:104810007047094800787047084805E00748016874 -:1048200041F0020101607047016841F0010101603F -:10483000704700000040005878100020042004E079 -:104840000248016841F4807101607047000400581B -:10485000F8B504460025ACB104F13406307910B93E -:10486000204602F087F80F4F384600F021F83868EC -:1048700040F001103860204600F007F83560012054 -:10488000307100E001252846F2BD10B50021064A2E -:10489000064B00EB8104491C06296360E261F8D3F2 -:1048A00010BD0000000C0058D71200087312000859 -:1048B000002101604FF03F1141603F21816070474E -:1048C0000901020081B002D43C48815405E03C4813 -:1048D00002F00F02104400F8041C01B07047394A7E -:1048E00013684FF6FF0100020B4000F4E06018432C -:1048F000354908431060704738B5324B1C68C4F323 -:104900000223C3F10704052C28BF04241D1D072D15 -:1049100034BF0023DB1E012505FA04F4641E214088 -:10492000994005FA03F35B1E1A401143BDE8344079 -:10493000C6E70000010007D4012200F01F01234B4D -:104940008A40400943F82020704701000BD401221F -:1049500000F01F011E4B8A40400943F82020BFF39E -:104960004F8FBFF36F8F704710B5401EB0F1807F3F -:1049700001D3012010BD174C60600F214FF0FF30B4 -:10498000FFF79EFF0022A26007202060002010BDDC -:10499000010007D4012200F01F010F4B8A4040099B -:1049A00043F820207047010007D4012200F01F01C6 -:1049B0000A4B8A40400943F82020704700E400E099 -:1049C00018ED00E00CED00E00000FA0500E100E069 -:1049D00080E100E010E000E000E200E080E200E0C2 -:1049E00038B5040044D094F8210028B9002184F897 -:1049F0002010204602F064F800F049F8FF2510B1BD -:104A000000F03FF834E02168DFF8B0008A68024027 -:104A10008A6021688A68636820690343A069034348 -:104A20001A438A602168E068086120680169A26809 -:104A300041EA024101612068C16821F08001C16042 -:104A40002068C16C89088900C1642168CA6CE36967 -:104A5000606903431A43CA6420688168880609D4E0 -:104A600000F020F830B120684562042100F01FF802 -:104A7000012032BD20684562012184F82110002008 -:104A800032BD20684562042184F82110704702205D -:104A900084F82100CA2021684862532022685062AD -:104AA000204626E020460BE02068C0F8248084F8E9 -:104AB0002110002084F8200070470000BFFF8FFF06 -:104AC00070B5044640F2E9362068C16821F0A001C3 -:104AD000C16001F0DDFA05462068C168880606D489 -:104AE00001F0D6FA401BB042F6D3032070BD00207F -:104AF00070BD70B504462068C1684A0612D44FF0F4 -:104B0000FF32C26040F2E93601F0C2FA0546206881 -:104B1000C168480606D401F0BBFA401BB042F6D388 -:104B2000032070BD002070BD002202F007B8000015 -:104B30004FF0B040006800F0F000B02888BFB0200F -:104B400070472DE9F041040054D0207881064FF0E1 -:104B5000B04538D5A868E96810F00C0001F00301F1 -:104B600003D00C2808BF012946D12868800702D548 -:104B7000E06900283ED0FFF7DBFF616A884207D278 -:104B8000084600F0D3FB002834D100F075FA0FE09E -:104B9000286820F0F000014329606968206A21F448 -:104BA0007F4141EA00216960606A00F0BFFB08BBF9 -:104BB00000F095FBDFF810180860DFF810080068B7 -:104BC00001F09AFEB0B92078C1070DD5A868E96850 -:104BD00000F00C00082801F0030103D00C2808BFE6 -:104BE00003292DD12868800340F1398160680028AD -:104BF00040F03581012038E2E06980B1296841F058 -:104C0000010100F047FA06462868800700F1248178 -:104C100001F03EFA801B0328F6D3032025E2286822 -:104C200040084000286001F033FA0646286800F08A -:104C30001FFAC8D001F02CFA801B0328F6D3ECE74A -:104C40006068B0F5803F04D1296841F48031296063 -:104C500003E02A6822F480322A60606860B101F0C3 -:104C600017FA06462868800300F1F98001F010FA6F -:104C7000801B6528F6D3D0E701F00AFA06462868BB -:104C8000400C10F0010000F0EA8001F001FA801BF6 -:104C90006528F4D3C1E701F0FBF9C01B0328C0F07D -:104CA0001281BAE7E06878B1296841F4807100F0B8 -:104CB000F1F906462868400500F1188101F0E8F98D -:104CC000801B0328F6D3A8E7286820F480702860AA -:104CD00001F0DEF906462868800A10F0010000F0B5 -:104CE000DC8001F0D5F9801B0328F4D395E701F0AF -:104CF000CFF9C01B0328C0F00B818EE740F0010004 -:104D000000F0CEF907467068800700F11C8101F0C1 -:104D1000BFF9C01B0328F6D37FE7706820F00400BA -:104D200000F0BEF907467068C00810F0010000F0FE -:104D3000198101F0ADF9C01B0428F4D36DE70528F3 -:104D4000306806D140F004003060316841F0010164 -:104D500005E0400840003060316821F00401316016 -:104D6000A06841F2893768B101F092F98046306855 -:104D7000800700F10C8101F08BF9A0EB0800B8422C -:104D8000F5D34AE701F084F98046306800F070F905 -:104D900000F0FD8001F07CF9A0EB0800B842F4D3EC -:104DA0003BE701F075F9C01B0328C0F0FE8034E733 -:104DB000B06840084000B06001F06AF90746B0688A -:104DC00000F056F900F0F58001F062F9C01B0328ED -:104DD000F5D322E701F05CF9801B0328C0F01F81A6 -:104DE0001BE701F055F9001B0328C0F0398114E7D7 -:104DF000286881010CD4296841F080712960E86835 -:104E000040F08050E86001F043F9044628688101D1 -:104E100000F12A8101F03CF9001B0328F6D3FCE6DF -:104E20000C2931D0286820F080702860E968DFF80C -:104E3000A00589088900E960E9680140E96001F09E -:104E400027F904462868810140F10E8101F020F91C -:104E5000001B0328F6D3E0E600F00EF9B3E6207855 -:104E600081071AD5A868E96800F00C00042801F051 -:104E7000030104D00C2808BF02297FF413AF28686F -:104E8000400503D5E06800283FF4B4AE69682069A6 -:104E900021F0FE4141EA006169602168DFF8346574 -:104EA00011F0180F38D0606900283FF436AFC906FA -:104EB00070687FF523AF800709D4706840F0010067 -:104EC00000F0EEF80746706880077FF5E4AE706882 -:104ED00040F0040000F0E4F80746706800070DD4C5 -:104EE00001F0D6F8C01B0428F7D396E6686821695C -:104EF00020F0FE4040EA01606860CEE77068A1697A -:104F000020F4706040EA0120706000F0C6F80746A7 -:104F100000F0ADF87FF4EBAE2078410737D5DFF82D -:104F2000B8743868C10529D4FFF78AFC01F0B0F8DD -:104F300080463868C10521D401F0AAF8A0EB08002A -:104F40000328F6D369E6706820F00400706070688A -:104F5000C00810F00100DFD001F09AF8C01B04284F -:104F6000F5D35AE600F099F8074600F080F8D3D060 -:104F700001F08EF8C01B0328F7D34EE6A068012885 -:104F80007FF4DDAE306840F001003060E8E6217863 -:104F900048060ED5A06A00283FF40AAFB16841F078 -:104FA0000101B16001F074F80746B06880077FF531 -:104FB000F8AEE06A002857D0A968EA68022801F034 -:104FC0000C017FF42DAF236B02F00300984202BF67 -:104FD00002F07000636B984214D1A36BC2F30620F9 -:104FE000984202BF02F47810E36B98420AD1236C16 -:104FF00002F06060984202BF02F06042606C824240 -:105000003FF4F6AE0C293FF4F5AD286841013FF5B9 -:10501000F1AD296821F0807100F03CF8064628685F -:1050200081013FF5D7AEE968DFF8B003A26B01401C -:10503000206B0143606B0143E06B41EA02210143B5 -:10504000206C0143606C0143E960286840F0807087 -:105050002860E96841F08051E96001F019F80446E0 -:10506000286881017FF5BDAE0020BDE8F081706841 -:10507000400810F0010070472968606A21F0F001D3 -:10508000014329606868216A20F47F4040EA0120DA -:1050900068607047296000F0FBBF706840084000FE -:1050A000706000F0F5BF2DE9F8430400884644D055 -:1050B000DFF82C6300F0CBF847D200F0CDF80746BC -:1050C00000F0C5F841D000F0E3FFC01B0228F7D97B -:1050D0000320BAE000F0DCFF401B022843D9F7E7C9 -:1050E00000F0D6FFA0EB090002284CD9F0E700F051 -:1050F000CFFFA0EB0900022854D9E9E700F0C8FF70 -:10510000401B02285DD9E3E700F0C2FF401B0228E4 -:1051100067D9DDE700F0BCFF401B484577D3D7E7F0 -:10512000032802D13968890103E00028396802D1D7 -:10513000890762D401E049055FD4012085E000F0D1 -:10514000A7FFC01B022872D9C2E7207881074FF061 -:10515000B0470BD5B968A06821F0F0010143B960F0 -:1051600000F096FF0546B868C003B3D52078DFF895 -:10517000545281060AD52968606921F0F001014383 -:10518000FFF788FF814628688003A9D5207841066B -:105190000BD52968A0690909090141EA1011FFF737 -:1051A00079FF81462868C003A1D5207841070BD537 -:1051B000B968E06821F4E0610143B96000F068FF7C -:1051C0000546B868800399D5207801070CD5B868E2 -:1051D000216920F4605040EAC100B86000F058FF37 -:1051E0000546B86840038FD52078C10717D5606899 -:1051F000022895D1396889039FD5B968890840EAA2 -:105200008100B86041F2893900F042FF0546B86874 -:10521000616800F00C00B0EB810F7FF47BAF306869 -:1052200000F00700804505D200F016F8074600F0B0 -:105230000EF884D100F053F8DFF88C110860FFF706 -:10524000E5FABDE8F24301F057BBBDE8F2833068F0 -:1052500000F00700404570473168C90848EAC101BD -:10526000316000F015BF38B54FF0B0445E4DA16815 -:1052700011F00C0106D1FFF75BFCC0F3031055F8E9 -:10528000200032BD0429594A05D00829584804D1C4 -:105290002168C90222D5104632BDE16801F0030140 -:1052A000022904D0032904D12168C90207D5104678 -:1052B00005E0FFF73DFCC0F3031055F82000E1685E -:1052C000E268E368C1F306214843C2F30211491CB6 -:1052D0005B0FB0FBF1F05B1CB0FBF3F032BD80B5AF -:1052E000FFF7C1FF3F49FFE7424A0968C1F30311D5 -:1052F00052F82110B0FBF1F002BD80B5FFF7EFFFCF -:1053000000F010F8C1F3022106E080B5FFF7E7FFD7 -:1053100000F008F8C1F3C22112F8211001F01F01BA -:10532000C84002BD2F49344A0968704770B52E49FC -:10533000B1282EBFCC6AC0F3031051F82040214899 -:10534000056801F015FC2B492C4A05F00F0551F8B2 -:105350002510B4FBF1F10024B1FBF2F1B0F5007FB0 -:105360000FF2B802204609D10FF2940353F82050EF -:105370008D4214D2401C0328F8D912E00FF290039A -:1053800053F820508D420AD2401C0328F8D308E07D -:1053900000F07EFE801B03280CD3032070BD52F862 -:1053A00020400F4D2868C00844EAC000286000F083 -:1053B0006FFE0646296801F00701A142E8D10020EE -:1053C00070BD0000080100589C10002080100020D3 -:1053D000FFFFFEEE90000058000400588C80C111C1 -:1053E0000040005808000058007700080024F4002E -:1053F0000048E801C0760008C47D000840420F0064 -:1054000012000000240000003600000040000000F0 -:10541000060000000C00000010000000000000006A -:10542000010000000200000003000000DFF820136C -:105430000A68030903F47F2300019A4300F47F20E4 -:1054400000F082B9DFF808231368010C23EA014356 -:1054500043EA0043136070472DE9F84305460024F2 -:105460002878DFF8EC624106A0464FF0B0472DD512 -:10547000286B70B1B0F5800F06D0B0F5000F18BFE3 -:10548000B0F5400F17D01FE0F86840F48030F860A6 -:10549000EDE0386820F08060386000F0F9FD81466A -:1054A0003868000140F1D08000F0F2FDA0EB090067 -:1054B0000228F5D90324D7E000F0EAFDA0EB0900AB -:1054C000022840F2C980F5E70124A04628680105BA -:1054D00031D5B06800F44078286C80452AD0FFF7B9 -:1054E000AFF9B8F1000FB16805D1286C21F4407113 -:1054F0000143B1601EE0B06840F48030B06021F438 -:105500004071B06820F48030B060286C0143B16015 -:10551000B068C0070ED500F0BBFD804641F2893966 -:10552000B068800706D400F0B3FDA0EB0800484542 -:10553000F6D30324A0462878C10705D53168A869A9 -:10554000890840EA810131602878810705D53168F2 -:10555000E86921F44061014331602878C10644BF05 -:10556000A86AFFF76FFF2878810644BFE86AFFF753 -:1055700069FF2878410744BF286AFFF757FF28785A -:10558000010744BF686AFFF751FF2868C1051BD5B2 -:105590003168686B21F0406101433160686BB0F1A4 -:1055A000006F00F0BDF8686BB0F1806F75D100F04E -:1055B000BDF804463868000160D500F069FD001BA5 -:1055C0000228F7D94FF0030867E000F061FD001BE7 -:1055D00002285BD9F6E7316821F04041316020F0C4 -:1055E0008050326822F0406210433060A86BB0F106 -:1055F000C05F00F095F8286841056DD53168E86B0B -:1056000021F0405101433160E86BB0F1005F03D1FC -:10561000F96841F48031F960E86BB0F1805F5BD1EB -:1056200000F084F804463868000146D500F030FDEB -:10563000001B0228F7D94FF003084DE000F028FDC9 -:10564000001B022841D9F6E700F061F8A86821F4B0 -:10565000781100F071F88146386800017FF52CAFB1 -:105660003969686901433961002C7FF42EAF3168D4 -:10567000286B21F440010143316027E700F047F82F -:10568000E86821F0606100F057F8044638680001CE -:105690009BD5396968690143396128688105AAD5B4 -:1056A000A86BB0F1804F1CBFB0F1004F002892D121 -:1056B000316821F04041084397E700F028F8286955 -:1056C00021F0604100F038F8044638680001B5D593 -:1056D00039696869014339612868C10405D5F168F1 -:1056E000686C21F440410143F160286881040BD5C6 -:1056F000796AE86C21F0300101437962796AA86C1B -:10570000890840EA810179624046BDE8F283386940 -:10571000696820F4FE4040EA012038613969704729 -:1057200003D1F96841F08071F9607047396821F060 -:105730008061396000F0ACBC01433961386840F0E9 -:105740008060386000F0A4BC10430860704700001F -:105750008800005838B5040009D004F18005686855 -:1057600008B900F01EF800F021F8012801D101204D -:1057700032BDA06A08B100F02AF800F00AF821F062 -:105780002A01FFE7816000F01BF8BDE8324000F01D -:1057900002BB2068416821F4904141602068816823 -:1057A000704700212970204601F000B9242068606C -:1057B00020680168490849000160204600F086B968 -:1057C0002068016841F001010160204670472046D1 -:1057D00000F07EBA70B5044604F18005134668688F -:1057E00020283CD169B318002BD02878012836D066 -:1057F00001222A7004F15406216533807380002051 -:10580000E86021206860706AE8B1DFF8B414C16212 -:10581000DFF8B004716A0863716ADFF8AC044863AA -:105820000020716A88632068216D00F12802706A87 -:1058300001F00FFA38B11020E86000202870202015 -:105840006860012070BD2168402008620020287037 -:105850002068816841F080018160002070BD0220D5 -:1058600070BD816821F040018160704720688168C7 -:105870004A0670472068016821F0100101607047F6 -:10588000F8B5044640F60F002668F1693268B3683F -:10589000084004F15C050ED1880602D5900602D4BA -:1058A000D80040F180806969002900F00E8120460F -:1058B000BDE8F4400847DFF80C06034204BFDFF8F8 -:1058C00008763A426FD0CF0707D5D70505D501270F -:1058D00037622E6B46F001062E638E0708D5DE0771 -:1058E00006D5276802263E622E6B46F004062E631C -:1058F0004E0708D5DE0706D5276804263E622E6BC4 -:1059000046F002062E630E070AD5960601D403421E -:1059100006D0266808203062286B40F00800286313 -:10592000080509D5500107D526684FF4006030629C -:10593000286B40F020002863286B002832D08906AD -:1059400007D5900601D4D80003D5696909B120466E -:105950008847286B21688A68510602D410F0280F06 -:105960001BD0204600F093FAFFF780FF10D5FFF719 -:1059700078FF286A60B10FF2DD518163286A01F077 -:10598000E1F900280ED0286A816BBDE8F440084791 -:105990002046BDE8F24001F0C7BA204601F0C4FA43 -:1059A00000202863F1BD2869012853D1CF0651D5C5 -:1059B000D0064FD51020306222689068410626D567 -:1059C000296A0868406880B20028EBD02B8898428A -:1059D0007BDA6880086801688B0614D4106820F4AC -:1059E00080701060206881684908490081602068E3 -:1059F000FFF737FF2020E86200202861FFF73AFF19 -:105A0000286A01F069F929886888091A1CE0288841 -:105A10006988411A688800281CBF88B2002854D0C1 -:105A20001368DFF8400523F49073136022689368CD -:105A3000034093602020E8620020286168612068AC -:105A4000026822F0100202602046BDE8F44089B2EC -:105A500001F06BBAC80209D5580207D54FF480107F -:105A600030622046BDE8F24000F010BB080609D5C0 -:105A7000100601D4180205D5A96931B32046BDE846 -:105A8000F440084748060ED550060CD5306820F083 -:105A9000400030602021A9620020A8612046BDE8B6 -:105AA000F24001F06CBA080206D5500004D5204639 -:105AB000BDE8F24001F080BAC80148BF002A04D511 -:105AC0002046BDE8F24001F078BAF1BDF8B50446D1 -:105AD000DFF894042168DFF894C40A68DFF8907452 -:105AE0000240A06802432069024360690243E06902 -:105AF00002430A6000254A68E06822F440520243EB -:105B00004A60A369714A91421CBF206A03438E68B0 -:105B1000DFF86004064033438B600FF26446CB6AC3 -:105B2000606A1B0940EA0313CB626145DFF8480451 -:105B30004FF4004339D13F6807F00307032F4DD8D6 -:105B4000DFE807F0024643494FF0010CE169B1F587 -:105B5000004F4FF6F07740F08080BCF1010F09D084 -:105B6000BCF1020F0AD0BCF1040F71D0BCF1080FD8 -:105B700071D099E0FFF7C9FB002815D0626A61680F -:105B800036F81230B0FBF3F04A0802EB4002B2FBE9 -:105B9000F1F080B2A0F11001B942EAD20740C0F39F -:105BA000420007432068C7607FE0914216D13F68FA -:105BB00017F4406723D0B7F5806F09D0B7F5006FB1 -:105BC00003D0B7F5406F06D008E04FF0020C07E0B5 -:105BD0004FF0040C04E04FF0080C01E04FF0100C03 -:105BE0009142B3D1BCF1000F09D0BCF1020F0AD031 -:105BF000BCF1040F15D0BCF1080F15D054E0FFF72D -:105C00007CFB002851D0616A36F81120B0FBF2F617 -:105C1000626802EB42018E4246D31103B14205D2C3 -:105C200042E0FFF720FBECE71846ECE750080021C4 -:105C300010EB062051EB16610023FBF7A1FBA0F54A -:105C40004071DFF8382391422ED22268D0602CE0D8 -:105C5000FFF709FB90E7184690E7BCF1010F09D068 -:105C6000BCF1020F09D0BCF1040F18D0BCF1080F31 -:105C700018D019E0FFF749FBB8B1626A36F8123064 -:105C80006168B0FBF3F000EB5100B0FBF1F080B2C3 -:105C9000A0F11001B94207D22168C86005E0FFF702 -:105CA000E2FAE9E71846E8E7012504F16800012176 -:105CB0004180018000218160C1602846F2BD000062 -:105CC000CD5E0008FB5E0008055F00080080004014 -:105CD00090F82810CA0706D502685368C16A23F4F1 -:105CE00000330B43536090F828108A0706D50268EA -:105CF0005368016B23F480330B43536090F82810F2 -:105D00004A0706D502685368416B23F480230B438E -:105D1000536090F828100A0706D502685368816B13 -:105D200023F400430B43536090F82810CA0606D5AD -:105D300002689368C16B23F480530B43936090F81F -:105D400028108A0606D502689368016C23F4005374 -:105D50000B43936090F828104A0610D502685368E8 -:105D6000416C23F480130B435360416CB1F5801FE9 -:105D700005D15368816C23F4C0030B43536090F842 -:105D800028100A0606D501684A68C06C22F4002271 -:105D900002434A607047F8B5044604F180050020CC -:105DA000E8606FF07E4700F073F9064620680168EE -:105DB0000A0708D50097334600224FF40011204609 -:105DC00000F017F860B9206801684A070AD5009703 -:105DD000334600224FF48001204600F00AF808B153 -:105DE0000320F2BD20206860A8600020E0662870D3 -:105DF000F2BD2DE9F041069C05460E4690461F4631 -:105E00002868C1693140B1420CBF012000204045E3 -:105E10001CD114F1010FF3D000F03AF9C01B8442F9 -:105E200000D314B900F015F80CE0286801684A079F -:105E3000E6D5C1690A05E3D54FF40062026200F0BD -:105E400008F8C16000210170032000E00020BDE8D7 -:105E5000F0812868016821F4D071016028688168A8 -:105E600049084900816005F180002021416081607E -:105E7000704701680A6822F0C0020A6001688A68F7 -:105E800022F400028A602021C0F884107047016863 -:105E90000A6822F490720A60DFF8C81002689368FA -:105EA0000B409360C16E012904D101680A6822F099 -:105EB00010020A602021C0F888100021C166016725 -:105EC000704700000100001020010004816A006892 -:105ED0000268930644BF084601F051B80020A1F8BB -:105EE00056000868826822F0800282600868FFE736 -:105EF000016841F0400101607047806A01F05EB8BE -:105F000000000000F8B5846A04F1840504F1560726 -:105F100028686E6821688A68110606D5212804D190 -:105F2000002038802046FFF7A4FF206881684806DB -:105F300006D5222E04D1002038812046FFF7A7FF86 -:105F4000A86840F01000A8602046BDE8F24000F0CC -:105F5000EBBF0000806A00F1560100220A810A802E -:105F600000F0E2BFFEFFFFEFF369FFCF0038014012 -:105F700088000058FFF4FF110024F40000FD0F001A -:105F8000010002000400060008000A000C001000D6 -:105F9000200040008000000110B500F180010A7867 -:105FA000012A01D1022010BD01230B7024224A6076 -:105FB0000268136814686408640014600022426672 -:105FC00023F0005300680360202048600020087020 -:105FD00010BD70B500F01EF801D1022070BD00F0B8 -:105FE0001FF822F0604209E070B500F013F801D10B -:105FF000022070BD00F014F822F06062114381604D -:10600000204600F01AF82068066020206860002012 -:10601000287070BD044604F1800528780128704777 -:1060200001222A70242068602068066802685208ED -:106030005200026020688268704730B5416E11B925 -:106040000121012214E001680FF230048A68896896 -:106050000FF23003520E02F00702490F655CA45C98 -:10606000595C9A5CED00E40095FBF1F194FBF2F2CF -:1060700068304180028030BD000000000101010352 -:106080000701000008040204080101017047000034 -:1060900001484068704700BF781000207047704783 -:1060A0007047704770477047704770477047704738 -:1060B0007047704738B5054684B068780024FF28DB -:1060C00002BFB5F8031040F60140814225D1654971 -:1060D0008A88B5F80700921C904209D1687B012498 -:1060E000C10752BF8DF8004000218DF8001011E06B -:1060F0004988491C884210D10FF27010FDF704FD49 -:1061000003208DF8000005F10D00B5F80B108DF897 -:10611000081001906846FDF7D7F8204605B030BD5D -:1061200010B58AB050484F4CFDF70CF88F218DF810 -:106130001810E520B3218DF819008DF81A10D5201C -:106140002E218DF81B008DF81C107F204A218DF820 -:106150001D008DF81E1098202A218DF81F008DF843 -:10616000201048207A218DF821008DF82210CC20B3 -:1061700040218DF823008DF82410FE2000218DF899 -:106180002500ADF8261000940823012206A902205C -:10619000FDF7A3FF00F032F8412000F023F8A01C27 -:1061A00000F010F8062100F015F800F027F8422062 -:1061B00000F018F8201D00F005F8102100F00AF892 -:1061C0000AB010BD059001210491029100200A221D -:1061D00001907047039200910223208806AA0221B1 -:1061E000FDF7CABF8E218DF824008DF82310002002 -:1061F000FE21ADF826008DF82510704719208DF886 -:106200001800ED2182208DF81A008DF81910ED206C -:10621000AE218DF81C008DF81B104C2021218DF82B -:106220001E008DF81D1041209D218DF820008DF855 -:106230001F10222045218DF822008DF82110704773 -:1062400080B542224FF64263984208D1054800913A -:106250000223818800880022FDF7E8FF02461046ED -:1062600002BD0000CC170020B56000082D2D20478E -:10627000415454203A204C454420434F4E46494710 -:1062800055524154494F4E20524543454956454485 -:106290000A000000704770477047704710B5044609 -:1062A000FBF71AF8204610BD10B5044610460A4602 -:1062B0000146204600F084FE204610BD2DE9F84F2F -:1062C0004FF00009644A654B4FF00F0805460E4633 -:1062D00033E0634FBD4214BF072704278F40274395 -:1062E0004CF82E70C1431C6801EA040C7468E40386 -:1062F00048BF40EA0C0CC3F800C05C6801EA040C1B -:106300007468A40348BF40EA0C0CC3F804C01468C6 -:1063100001EA040C7468E40248BF40EA0C0CC2F8BD -:1063200000C0546801EA040C7168890248BF40EA61 -:106330000C0CC2F804C009F10109316831FA09F006 -:1063400077D0012404FA09F414EA0100F3D04FEAEB -:10635000490C032101FA0CF16FEA010E7168012961 -:1063600018BF022903D0112918BF122911D1A96819 -:10637000F7680EEA010107FA0CF73943A96069686A -:1063800021EA04047168C1F3001101FA09F10C4318 -:106390006C60E968B4680EEA010104FA0CF4214368 -:1063A000E9604FEA89017468022C18BF122C12D1DF -:1063B0004FEAD90405EB840401F01C07D4F820A0AF -:1063C00008FA07FB2AEA0B0AD6F810B00BFA07F70F -:1063D00047EA0A0727622C680EEA0407347904F0BA -:1063E000030404FA0CF43C432C607468E400A2D566 -:1063F000DFF870C04FEA990E5CF82E7001F00C01C6 -:1064000008FA01F427EA0404B5F1904F08BF002709 -:106410000ED0154FBD4208BF012709D0134FBD4212 -:1064200008BF022704D0124FBD427FF452AF0327AA -:1064300054E7BDE8F18F81B0002A14BF8161816209 -:1064400001B070470B4A136803421CBF1060FEF78F -:1064500017B9704700000000000800588008005875 -:1064600000100048080001400004004800080048EF -:10647000000C00480C080058C0680840884201D150 -:106480000120704700207047C0690840884201D150 -:10649000012070470020704710B56C4C0221204647 -:1064A000FFF7F2FF38B16068C043810703D5FDF7FD -:1064B000F4FF022018E001212046FFF7E5FF38B184 -:1064C0006068C043C10703D5FDF7AFFF01200BE0B3 -:1064D00008212046FFF7D8FF38B16068C0430107A4 -:1064E00003D5FEF72EF80820A06010BD10B5574C5C -:1064F00000F033F818B96068C043810306D400F097 -:106500002CF830B96068C043810302D5BDE8104063 -:106510007AE0082100F022F870B96068C0430103F6 -:106520000AD560684A4940F40020606008688047E6 -:106530004FF40020A06010BD202100F00FF858B9E2 -:106540006068C043810207D5606840F40010606055 -:10655000BDE81040FDF778BF10BD022120468BE753 -:106560003C4881B0016841F480110160006800F48A -:106570008010009000983848016841F40071016073 -:106580003648026842F40072026040BF20BF3448BF -:10659000016841F40041016001B0704780B53148A5 -:1065A000016841F480110160006800F480100090DF -:1065B00000982648016841F001010160026842F438 -:1065C000803202602C20FEF7B5F9BDE802402D2094 -:1065D000FEF7B0B9244801684908490001607047D6 -:1065E00022494FF48030086070471F48016821F04D -:1065F0000201016070471C484FF40031416001689E -:1066000021F40031016070471748016841F40031FE -:106610000160FDF73BBF38B504460C4D0821284604 -:10662000FFF72AFF30B10A480460686820F40020B0 -:10663000686031BDA0474FF40021A96031BD0A4810 -:10664000016821F00801016070470000000C00584B -:10665000DC17002050010058D408005820080058CA -:106660000C04005850000058040C0058080C005846 -:10667000484900E0484981B00A6802430A60096855 -:1066800008400090009801B0704780B5FEF7C4F84C -:10669000FEF7C4F84148016841F48031016000F020 -:1066A000DEFCBDE801400EE000B587B068460FF2A1 -:1066B00018211C22FAF720FEFDF737FF6846FCF789 -:1066C000D1FB07B000BDF0B585B068461421FEF7D8 -:1066D0002BFA00260025002400210FF2DC0000EB3D -:1066E000C102907988B11368B3F1904F08D02C4F54 -:1066F000BB4208D02B4FBB4204BF9088044304E048 -:106700009088064301E090880543491C2229E4DB78 -:10671000002002900121032003900191B0B288B1C2 -:1067200000900120FFF7A4FF0120FFF7A3FF6946B7 -:106730004FF09040FFF7C2FD0022B1B24FF0904001 -:10674000FFF779FEA8B280B100900220FFF790FF1A -:106750000220FFF78FFF124E69463046FFF7AEFD6D -:106760000022A9B23046FFF766FEA0B280B10090C9 -:106770000420FFF77DFF0420FFF77CFF094D6946E9 -:106780002846FFF79BFD0022A1B22846FFF753FEE3 -:1067900005B0F0BD4C0000584C010058900800585E -:1067A0000004004800080048FCF742BC13460A46B3 -:1067B0000146002000F0C2BB0000004801000000BC -:1067C0000000004801000000000000480100000037 -:1067D0000000004801000000000000480100000027 -:1067E0000000004801000000000000480100000017 -:1067F0000000004801000000000000480100000007 -:1068000000000048010000000000004801000000F6 -:1068100000000048010000000000004801000000E6 -:1068200000000048010000000000004801000000D6 -:1068300000000048010000000000004801000000C6 -:1068400000000048010000000000004801000000B6 -:1068500000000048010000000000004801000000A6 -:106860000000004801000000000000480100000096 -:106870000000004801000000000000480100000086 -:106880000000004801000000000000480100000076 -:106890000000004801000000000000480100000066 -:1068A0000000004801000000000000480100000056 -:1068B0000000004801000000000000480100000046 -:1068C000000000480100000000000000000000007F -:1068D00000000000B8670008280003202C000320F7 -:1068E000220404000249016002490161704700BFAF -:1068F0004F4400087744000870B50F4E04463078C6 -:106900000025A8B1FEF7EBFC32784FF47A71B1FBA9 -:10691000F2F1B0FBF1F0FEF727F848B9102C07D2DE -:10692000002221464FF0FF30FDF7E6FFB46000E0A3 -:106930000125284670BD00BF78100020724900E094 -:10694000724981B00A6802430A60096808400090F1 -:10695000009801B0704780B54FF40020FFF7F0FFBA -:10696000002200212E20FDF7C7FFBDE802402E20A7 -:10697000FDF7E0BF00686649884200D0704780B5E7 -:106980004FF48010FFF7DCFF002200212C20FDF7E0 -:10699000B3FF2C20FDF7CEFF002200212D20FDF7B4 -:1069A000ABFFBDE802402D20FDF7C4BF38B58AB06B -:1069B000044668461421FEF7B7F82068554A564940 -:1069C00090423CD10868554D40F0010008600968CC -:1069D00001F00101059105980120FFF7AFFF0C20A0 -:1069E00000900221002001910290032108200391D0 -:1069F000049069464FF09040FFF760FC48482860DB -:106A0000112000F04EF808B1FCF794FB4FF08850CD -:106A10000690002101200791ADF82010099006A9E9 -:106A2000284600F05BFB08B1FCF784FBA567AC626D -:106A3000002200212520FDF75FFF25202DE0394AA7 -:106A400090422CD14868384D40F4804048604868F6 -:106A500000F48040059005980220FFF76FFFC020EA -:106A6000009002210120019102900321072003914F -:106A7000049069462D48FFF721FC2D4828600F201F -:106A800000F00FF808B1FCF755FBA567AC620022D7 -:106A900000212420FDF730FF2420FDF74BFF0BB031 -:106AA00030BD68601020A8600020E8608020286168 -:106AB00000206861A861E8612862284600F060B89B -:106AC0001CB504461B49206888421CD1FDF7B8FE5E -:106AD000FDF7B6FE1848816B21F4407141F48071D6 -:106AE0008163816B41F400418163026842F48062FA -:106AF0000260006800F48060009000982046BDE8C5 -:106B0000164000F01DBB13BD4C000058500000584B -:106B1000000C0058008000405C000058AC150020BC -:106B200044000240003801400C16002000040048D8 -:106B300044040240002800405800005800B500BF3F -:106B4000130096469446103928BFA0E80C50FAD896 -:106B50005FEA417C28BF0CC048BF40F8042BC9073E -:106B600028BF20F8022B48BF00F8012B00BD000011 -:106B7000DFF80800006800F4C060704700040058A7 -:106B800038B5040001D1012032BD2168DFF870035F -:106B9000814204F1240500F044F8022068700A687C -:106BA000A0686FF30E120243E068024320690243BB -:106BB00060690243A0690243E0690243206A02431C -:106BC0000A60204600F070F9A068B0F5804F04BF5D -:106BD000002161602079696A00F03F0000F014F83C -:106BE00038B1052805D2204600F078F900F012F8F7 -:106BF00003E0002028636863A8630020A8610120E7 -:106C000068700020287032BD0860A96AE86A486090 -:106C100060687047296B00200860696BA86B48604A -:106C200070470AD2DFF8DC0242181423B2FBF3F2F9 -:106C300092002A62DFF8D00209E0DFF8D0024218A1 -:106C40001423B2FBF3F292002A62DFF8C402E86177 -:106C50007047F8B5044604F1240600253078012871 -:106C600001D10220F2BD01273770707801282FD1A1 -:106C700002277770B561206807687F087F0007608A -:106C8000204600F0F5F82168F06820B10A6842F06B -:106C90000E020A6008E0086820F00400086020681E -:106CA000016841F00A010160706A0168CA0303D5F6 -:106CB000026842F480720260306B18B1016841F4DE -:106CC000807101602068026842F00102026001E008 -:106CD000357002252846F2BD81B040B100F1240193 -:106CE0004A78022A05D0042088610020087001201B -:106CF00026E00268136823F00E0313604A6A1368E3 -:106D000023F4807313600068026852085200026026 -:106D1000012091F82020CB6902F01C0290405860BD -:106D20008A6AC86A5060086B30B1026822F48072C7 -:106D300002604A6B886B5060012048700020087028 -:106D400001B0704738B500F12402002451780229BF -:106D500003D004209061012428E001680B6823F02F -:106D60000E030B6001680D686D086D000D60516ABF -:106D70000B6823F480730B60012192F82030D569F1 -:106D800003F01C0399406960936AD16A5960116BE2 -:106D900031B10B6823F480730B60536B916B5960B6 -:106DA000012151701470516901B18847204632BDEC -:106DB000F8B500F124010423CA6914680268156853 -:106DC00091F8206006F01C0603FA06F73C4210D04A -:106DD0006F070ED51468A50603D4156825F00405C1 -:106DE000156000F03DF8C968002938D0BDE8F440CE -:106DF0000847022303FA06F73C4213D0AF0711D528 -:106E00001468A50605D4156825F00A051560012249 -:106E10004A7000F025F800220A708968F9B1BDE8CF -:106E2000F4400847082303FA06F6344217D02B072C -:106E300015D5136823F00E031360012291F820305A -:106E4000CC6903F01C039A40626001228A614A7097 -:106E500000220A70096911B1BDE8F4400847F1BD8C -:106E600091F82020CC6902F01C02934063607047C7 -:106E700078B5C56C046D6C60446D14B1846DC56DDE -:106E80006560012590F84440066C04F01C04A540A0 -:106E90007560046863608068102802D1A260E160B8 -:106EA00071BDA160E26071BD416C0268144B89083C -:106EB0009A4234BF174B184B03EB8101816402F0F7 -:106EC000FF02083A1421B2FBF1F1144AC26401F046 -:106ED0001F01012202FA01F1016570470179104A90 -:106EE00001F03F0102EB81024265491E0D4A8265B5 -:106EF00001F0030101228A40C265704700000000D2 -:106F000008040240F8FFFDBF00000240F8FBFDBF8F -:106F100000040240000802401C08024080080240B1 -:106F2000FC080240400902407047704763601D48FA -:106F30001D4B704723601D481D4B704770B51C46A4 -:106F4000002300251B4E10B1022804D00AE0346053 -:106F5000FFF7F1FF02E07460FFF7E9FF0360FEF75F -:106F600039FC0346012B05D007D3032B04D038BFCF -:106F7000022502E0012500E00325284670BD82B00D -:106F80000068094A0B49904206D0094A904207D14D -:106F9000086828B102B00047486808B102B000474D -:106FA00002B070471812002000800040A812002094 -:106FB0000038014094170020704770477047000068 -:106FC00062F30F2262F31F42401810F0030308D04F -:106FD000C91A1FD3DB0748BF00F8012D28BF20F8CE -:106FE000022D130030B414461546103928BF20E98D -:106FF0003C00FAD8490728BF20E90C0048BF40F8F8 -:10700000042D890028BF20F8022D48BF00F8012D6B -:1070100030BC7047C91818BF00F8012DCB0728BF36 -:1070200000F8012D7047000038B5EFF3108472B6F8 -:10703000284D6946281D00F0B4F96946281D00F066 -:107040000DFA38B184F31088BDF80010224AFFF71A -:10705000ADFB31BD0120287084F3108831BD80B5AF -:10706000FFF7A2FB0221009100231A4800F124013E -:107070004FF48052001D00F07BF801BD00BFF8B551 -:1070800014460026EFF3108510F1010F1ED00128E1 -:107090001CBF02284FF0FF3618D1BCB1264672B68D -:1070A0000C4F012392B2381D00F076F800281CBF67 -:1070B0003978002908D000223A7085F31088A1B2EF -:1070C000054AFFF773FB01E085F310883046F2BDF7 -:1070D000000000002C0000202970000818B500F105 -:1070E0002402507801281BD11378012B01D10220F2 -:1070F00012BD536A10701C680A48044008680443B3 -:10710000C868401E44EAC04448680443087A497A83 -:1071100044EA004444EA41241C600020107012BD7F -:10712000012012BDFFFD00E08A60FF21026851626C -:10713000012180F82110002180F8201000207047E4 -:1071400090F82010012901D102207047012280F817 -:107150002020022180F82110CA21026851625321A7 -:107160000368596201688A6842F02002FFF7DCBFB9 -:1071700010B5029C016042600021C1600161416163 -:1071800081610381A107047704D5008910B14FF014 -:10719000FF3010BD002010BD2DE9F04F064685B030 -:1071A00030890C460027BB4600287169DC460CBFBD -:1071B0004FF00208D84681B168B930697768451C3C -:1071C000BD4228BFED1B3768385C7D5D00EB0527AD -:1071D000BF1CBFB203E0074600E000B102463069C1 -:1071E000F568A84223BF7568281AC01B0020154601 -:1071F00008EB050903FB09FE864532BF0020B0FB02 -:10720000F9FA09FB1A00C0B2804509DA96F81C9019 -:107210005FEAC97A48BF84465FEA897048BFC446BE -:10722000100000F0B4807068714461448842C0F07E -:10723000AE8008EB020080B20390D946100AADF888 -:1072400002000294ADF80020049359E0800740D575 -:107250003089002840F09B803268D018A34600F89F -:10726000024C200A32681A4402F8010C22463068A7 -:107270001844FAF731F8706920187061B069019C00 -:10728000401CB061200A31680C70316848701CE005 -:107290008CB3307FC207D9D5308940B931681944E1 -:1072A000FF2001F8020C3168194401F8010C4FF07D -:1072B000000B7069241874612C463089002340B992 -:1072C00031680C70210A3068417002237069801C9B -:1072D000706108EB04070021BFB231615CB1DA4490 -:1072E000029800EB0A01306822461844F9F7F4FFCF -:1072F00070692418746109F10109B069401CB0611A -:10730000049A70683169914545D2791881422CBF41 -:10731000081A0846306103463089A0B93068BDF8C4 -:107320000010C1545B1C70683168834228BF1B1A6F -:10733000BDF80200C8545B1C7068834228BF1B1A4A -:107340007069801C706105FB09FA7468BDF8000063 -:10735000E41A844288BF0446029800EB0A01281B05 -:10736000AC42019003D093D2307F002890D137688F -:107370002246F818F9F7B0FF706920187061A3462B -:10738000019C039F0023A9E73068404400E00020EF -:1073900005B0BDE8F08F88448045F5D3A8EB000820 -:1073A000F2E778B5028900230B80002A44690CBFFC -:1073B00002250025002C4FD0028952B9C2684668C8 -:1073C000531CB34228BF9B1B0668B25CF35C02EB04 -:1073D00003220A80027F02F00302012A25D10B88D2 -:1073E0004FF6FF72934204BF0289002A09D0C36896 -:1073F00002699A4219D20289BAB14668F31A9342D5 -:1074000013D24368C268E41A14190022C2604461AE -:1074100002894AB902681478012B94BFC3F10103B1 -:107420000123D25C04EB02220A80C4684268066829 -:107430002B19934228BF9B1A33440E884169891B3C -:10744000491B416105D034192D19954228BFAD1A49 -:10745000C5608169491E8161184672BDF8B502890F -:1074600000230B80002A42690CBF02240024002A5A -:107470003BD0C56802892B464AB946686A1CB242AD -:1074800028BF921B0668775DB25C07EB02220A8078 -:10749000067F06F00306012E20D10F884FF6FF72FB -:1074A000974204BF0289002A07D142680023012ABB -:1074B00094BFC2F1010201220AE00269AA420DD280 -:1074C00002895AB14668751B954207D2002304E031 -:1074D00005682E78AA5C06EB02220A8041680068E3 -:1074E000E4188C4228BF641A03191846F2BD000044 -:1074F00010B50446AFF30080204600F005F80446BE -:10750000AFF30080204610BD7CB500F10F06F608F1 -:10751000F600B04240D2082E04D2082602E008301D -:1075200000F047F8DFF804512C68210005D1002055 -:1075300007E00268B24221D2011D08680028F8D194 -:107540002068291D0A68824222D01368B34238BFDE -:10755000111DF7D312E093190B60801B54685C6017 -:107560000B6818601660096800291DBF486800286C -:10757000081D0020286002F1080076BD61B10A688C -:107580001068A0F10803B342E5D250680860EAE74A -:1075900000F04EF80028C2D1002076BD10B50400DE -:1075A00006D0AFF30080204600F003F8AFF3008070 -:1075B00010BD002800D1704750B4A0F10802136834 -:1075C000072B2BD913F0070F28D1184C616809B18C -:1075D0008A4202D25160626013E0486800B3904270 -:1075E00038BF0146F9D31BE0964203D11B180B604C -:1075F0000A4606E0486810B1134498420ED3506022 -:107600004A60506850B11368D118814206D10021F8 -:1076100021600168CB1813604068506050BC70470F -:1076200008680E18B242DFD250BC7047BC17002069 -:107630000749086808B1002070470648C008C00024 -:1076400008600549C908C900091A0160704700BFF0 -:10765000E4170020F7270020F02B0020134900201A -:1076600008604FF4E0221248016841F470010160A3 -:107670004FF0B041086840F0010008608A600D4892 -:107680000A6802400C480A60036823F0050303609F -:10769000426852085200426000220848C8600861EF -:1076A000086820F4802008608A61704708ED00E0D7 -:1076B00088ED00E0FBFEF6FA94000058001004226A -:1076C00001000000030000000500000001000000B0 -:1076D00001000000060000000A0000002000000079 -:1076E000020000000400000008000000100000007C -:1076F00040000000800000000001000000020000C7 -:10770000A0860100400D0300801A060000350C0021 -:1077100040420F0080841E0000093D0000127A00E4 -:107720000024F40000366E010048E801006CDC0221 -:107730000000000000000000000000000000000049 -:107740002DE9F04107468846387810F0030F1646B9 -:107750001D4633D0384600F099F878BBB8F1000FD9 -:107760001CBFD8E900018619012D2ED13888C1042B -:1077700015D5396A07F14402384600F0A3F83A6B90 -:10778000044602B93A69F968384600F09BF8361B9E -:10779000341A7A69F968384600F094F8261A1EB946 -:1077A0004DB916F1010F09D097F903002A46314669 -:1077B00000F08EF8064616F1010F09D12320AFF331 -:1077C00000804FF0FF30BDE8F081022DE8D1EBE7FB -:1077D000388810F4405F0ED07868F86038617861BE -:1077E000B8617868F86107F14400386207F1300049 -:1077F000786200203863B8F1000F05D0D8E90201A3 -:1078000007F13402C2E9000139884CF6FF600140FB -:1078100039800020BDE8F08170B50546AFF30080E7 -:107820002888810415D56E680024EA6895F903005C -:107830003146914212D2521AFFF720FC10F1010F8B -:107840001CBF00283618F0D10FE04DF6FF70014044 -:1078500029802846AFF30080002070BD002200215F -:10786000FFF70CFC10F1010F00D101246868E860FB -:10787000A861E861002C2988E7D041F400712980D3 -:107880002846AFF300804FF0FF3070BDF8B5A0B9C7 -:10789000AFF3008000250A4E08244FF0FF37306810 -:1078A00020B1FFF7B9FF002848BF3D46361D641ED2 -:1078B000F5D1AFF300802846F2BDBDE8F240ABE75A -:1078C000F8110020914234BF511A00210846704738 -:1078D0003EB504000D00012A02D100F063F807E074 -:1078E000022A07D100940020019069460C20ABBE0B -:1078F0002D1801E0002A0CD10094019569460A2058 -:10790000ABBE002805D100222100280000F027F896 -:1079100001E00020C04303B030BD000010B4314A84 -:10792000002113461C6884421EBF491C9C68844287 -:107930001EBF491C1C69844209D09C69491C8442B1 -:1079400005D0491C20331029ECD310BC704700230C -:1079500042F8313002EBC1014B6010BC704778B483 -:10796000204C002325462E688E421EBF5B1CAE684D -:107970008E421EBF5B1C2E698E4209D0AE695B1C15 -:107980008E4205D05B1C2035102BECD372BC7047A7 -:10799000054604EBC303012A04BF59684D195D6015 -:1079A00072BC704710B40F4A002113461C68844211 -:1079B0001EBF491C9C6884421EBF491C1C6984422E -:1079C0000AD09C69491C844206D0491C20331029E6 -:1079D000ECD310BC0020704702EBC100406810BC23 -:1079E00070470000CC14002010B50446E068A1697F -:1079F000884251D3218849F202030B40022B08D060 -:107A000008044CBF4FF400704FF4844001432180C0 -:107A10003BE001F4C042B2F5C04F06D1A1688842F4 -:107A200003D32046FFF732FF78BB208810F4406F65 -:107A300002BF606804F14401884217D14FF400701E -:107A4000FFF756FD606030B904F144006060E0600B -:107A5000401CA0600AE0218841F040012180E060E4 -:107A6000606100F500726068A260E061606820619A -:107A7000A068A061207841070AD502220021204693 -:107A800000F00CF810F1010F02D14FF0FF3010BDE3 -:107A9000208840F4C0402080002010BD70B504460E -:107AA0000D461646AFF3008033462A460021204695 -:107AB000FFF746FE05462046AFF30080284670BD1E -:107AC00038B504000ED0207810F0030F03D094F9DD -:107AD0000300002809D5AFF30080204600F030F8FD -:107AE000AFF300804FF0FF3032BD2046FFF7CEFEEF -:107AF0000546AFF300802078410644BF606800F07F -:107B00005DF80020606094F90300022804D900F0B9 -:107B100057F808B14FF0FF35E06B48B100F05CF862 -:107B200008B14FF0FF35E06B00F048F80020E0634B -:107B3000204600F005F8AFF30080284632BD000073 -:107B400001780A0626D51C4A13680021834203D116 -:107B5000002342F821301BE05368012183421EBFFD -:107B6000022193688342F3D0D368032183421EBF6E -:107B7000042113698342EBD05369052183421EBF60 -:107B80000621936983421EBF0721D3698342DFD058 -:107B900000F014B8002101804FF0FF31C17000F1F6 -:107BA00044014160C160016141618161C161016263 -:107BB00000F1300141627047F8110020FFF7EEBC80 -:107BC0001CB50200009269460220ABBE0400100002 -:107BD000FFF7A4FE200016BDE0B50090F9F72EFBDC -:107BE000019069460E20ABBE03B000BD7047FEE7B2 -:107BF000FEE7FEE7FEE770477047704700F022B8E7 -:107C00000848FFF7D5B80848FDF73ABE0748FDF722 -:107C100037BEFEF741BCFEF769BC00F01BB8044854 -:107C2000FFF7C6B8AC150020A812002018120020DB -:107C30000C1600201020FEF705BC0120FEF702BC48 -:107C4000FBF7D3BD0248416802788918416070474C -:107C5000781000200449C8680A6882430A604860B6 -:107C600000F004B80000000000150058704738B557 -:107C70000C46C5B22046AFF30080E068A169884297 -:107C800004D32046FFF7B0FE00280FD4E068401C64 -:107C9000E06000F8015D2088010503D440050BD5A4 -:107CA0000A2D09D12046FFF7F1FD28B12046AFF398 -:107CB00000804FF0FF3032BD2046AFF300802846F1 -:107CC00032BD19E050F8042BD30744BFA9F10103DA -:107CD0009A18091F0023042942F8043BF9D25FEAED -:107CE000817C134604D54FF0000CA2F800C09B1C09 -:107CF000C90744BF0021197050F8041B0029E1D1C5 -:107D00007047000038B50D4D0824286800281CBFB6 -:107D1000017811F0030F05D090F90310002958BF26 -:107D2000FFF7CEFE2D1D641EEFD1BDE838400022C6 -:107D300000214FF0FF30FFF7A1B900BFF81100207C -:107D400010B5074979441831064C7C44163404E0D8 -:107D50000A68081D114488470146A142F8D110BDA8 -:107D60002C000000600000004EF68851CEF20001A9 -:107D7000086840F470000860BFF34F8FBFF36F8F47 -:107D80004FF00070E1EE100A7047000037FFFFFF70 -:107D9000D4050000181200207008000030000320F5 -:107DA000000000002F93FFFF8C010000B6010000CF -:107DB000040000201F93FFFF570200000600000090 -:107DC0002800032000000000000000000000000068 -:107DD000000000000100000002000000030000009D -:107DE0000400000000F00DF8002801D0FFF7A8FF04 -:107DF000AFF300800020AFF30080FBF748F800F0FD -:107E000002F80120704700F001B800000746FFF7B4 -:107E100079FF3846FAF744F8FBE738B504460D46D3 -:107E2000284600F005F8A84218BF0024204632BDBD -:107E30000149FFF71CBF00BF6811002001488047BF -:107E4000014800475D7600084D7E0008AFF30080D2 -:107E5000FFF78AFFFFF7C6FF00002E004300FFF781 -:107E6000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF746 -:107E7000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF736 -:107E8000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF726 -:107E9000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF716 -:107EA000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF706 -:107EB000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7F6 -:107EC000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7E6 -:107ED000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7D6 -:107EE000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7C6 -:107EF000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7B6 -:107F0000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7A5 -:107F1000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF795 -:107F2000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF785 -:107F3000FEBF0000F0030C0DFF01830001F006FFFF -:107F4000484200007A44010001F1FF01F1FF01F114 -:107F5000FF01F1FF01F1FF01F1FF01F1FF01F1FF6D -:107F600001F1FF01F1FF01F1FF01F1FF01F1FF015B -:107F7000F1FF01F1350152FF01AD3F106D4C1022B0 -:107F80001008700104004804120804520C04F005A3 -:107F900007093D00587E0008046158F2005A141089 -:107FA0000100005C0C2164FC0217A0100020B71037 -:107FB00013ED117E110143DB113C21011007010477 -:107FC0000000641100206504526404211BA108F321 -:107FD00011501164200A02040101BC1600200C1784 -:107FE00000200821042134610812AC44F21398489F -:107FF00050020802026C40526C042134610812F4F1 -:1080000044F212E048122024126804F206B02C5206 -:0280100000016D -:0400000508007E4D24 +:1010D0003000B1F5807F02D34FF0FF3070470170D0 +:1010E000012070470078401E8041C043C00F704708 +:1010F0001B48704730B45368D418042B09DA41B147 +:10110000057804F8015B10F8015B15B15B1C491E02 +:10111000F3E7536030BC704738B514461D4661B1E3 +:10112000FFF7E8FF61686A6B204690476FF00102A5 +:10113000811A02D0491E03D005E06FF0010032BDD4 +:101140004FF0FF3032BD0021616032BDDA6B1047D5 +:10115000034BE1E7024BF9E702487047000000004B +:101160002C2400204C2500200278C9B28A421AB1F2 +:101170001CBF10F8012FF9E718BF00207047704717 +:1011800080B508B90FF21C0005490B681BB122227B +:101190000021984701E000F08EFD222002BD0000F2 +:1011A000F82B0020636F6E73747261696E7420682F +:1011B000616E646C65723A20626164206D65737360 +:1011C0006167650000F10103810704D010F8011B7D +:1011D00089B18107FAD10268B2F10131914311F06E +:1011E000803F04BF50F8042FF6E710F8011B11B13F +:1011F00010F8011BFBE7C01A70477047C9B283079C +:1012000006D0521E22D310F8013B9942F7D11FE0BD +:10121000083A13D302F1040241EA012141EA0141F3 +:1012200050F8043B121F21BF4B40A3F1013C2CEAB4 +:10123000030C1CF0803FF3D0C9B2001F083210F835 +:10124000013B521E28BF91EA030FF8D818BF0120B6 +:10125000401E704780B5FFF74BFF006C02BD0000D9 +:1012600062B38B0708D0521E11F8013B00F8013B16 +:1012700000F024808B07F6D1830740F0208000BF68 +:10128000103A07D330B4B1E83810103AA0E838105B +:10129000F9D230BC530724BFB1E80810A0E8081009 +:1012A00044BF51F8043B40F8043BD20724BF31F857 +:1012B000022B20F8022B44BF0B7803707047121FDB +:1012C00017D35B0009D151F8043B20F8023B1B0CFB +:1012D000121F20F8023BF6D20BE051F8043B00F855 +:1012E000013B1B0A20F8023B1B0C121F00F8013BBC +:1012F000F3D238BF121D521E24BF11F8013B00F873 +:10130000013BF8D870470000B3BBD9B1B2F5803FBC +:101310007DD2022A1ED98C46B1FBF2F102FB11C329 +:101320001B0443EA1043B3FBF2FC02FB1C3380B204 +:1013300040EA0343B3FBF2F002FB103240EA0C40F8 +:1013400000237047022A05D98446B0FBF2F002FB65 +:1013500010C270474AB105D100F0010249085FEAA6 +:101360003000704700220023704700F0A7BC0B003C +:101370000200002100207047904271EB030CF6D36D +:10138000B3F5803F2FD2F0B5B3FA83F7B1FA81F409 +:10139000A7F10F0E3D1B5340CEF1200602FA0EF2CC +:1013A000F3415340B5F10F0746D80F3C2C44414060 +:1013B000C4F12006A040F1414140B1FBF3F603FB2C +:1013C0001611A2FB0645001BA94102D2761E801809 +:1013D000594180EA010221FA0EF362FA0EF200216D +:1013E0005A403046F0BD30B4B1FBF3FC03FB1C1196 +:1013F000A2FB0C45001BA94103D2ACF1010C8018E3 +:10140000594130BC02460B46604600217047B2F19C +:10141000807F65D3F0B5B2FA82F7B1FA81F4C7F1F3 +:101420000F063D1B22FA06F307F1110EF24120359B +:101430005A40B5F10F07B8D94140C4F12006A04089 +:10144000F1414140B1FBF3FC03FB1C11A2FB0C4535 +:10145000001BA94103D2BCF1010C801859410F2F88 +:1014600012D30F3FC90341EA5041B1FBF3F603FB2E +:101470001611A2FB0645D4EBC030A94102D2761E5C +:101480008018594146EACC3C07B34140C7F12006D9 +:10149000B840F1414140B1FBF3F603FB1611A2FB4A +:1014A0000645001BA94102D2761E8018594180EAE8 +:1014B000010221FA0EF3C7F1200462FA0EF20CFACF +:1014C00007F05A402CFA04F13043F0BD80EA0102E3 +:1014D00021FA0EF3002162FA0EF260465A40F0BD86 +:1014E0008C46B1FBF2F102FB11C31B0243EA10630D +:1014F000B3FBF2FC02FB1C331B024CEA002043EA64 +:101500001063B3FBF2FC02FB1C331B024CEA00200D +:1015100043EA1063B3FBF2FC02FB1C331B024CEAF0 +:10152000002043EA1063B3FBF2FC02FB1C324CEADE +:101530000020002370470000B0B581EA030C0CF0D6 +:10154000004C40F2FF7515EA11541DBF15EA135700 +:10155000AC42AF4239E0E41923EA455343F4801327 +:10156000C90241F0004141EA505EC7021100A7FBE9 +:10157000020200284FF00000EEFB01204FF00001B6 +:10158000E3FB072118BF42F0010240180021494146 +:10159000E3FB0E01A4F580640F0302D25200404128 +:1015A000494154F101046CDD470872F1004250F1E9 +:1015B000000051EB0451A1F580115CBF41EA0C0120 +:1015C000B0BD4CEA05510020B0BD05EA1357AC424E +:1015D00014BFAF4241E050EA410E1CBF52EA430E35 +:1015E00002E061460020B0BD24423C441BD15FEACA +:1015F000070EF6D0090302BF01460020AEF1140E1B +:10160000B1FA81F7AEEB070401FA07FE0C37C7F118 +:10161000200100FA07F7C8404EEA000E23EA4553BE +:1016200043F48013A2E733F00043B3FA83F704BF17 +:10163000B2FA82FE77440B3FE41BB7F1200E2FBFB6 +:1016400002FA0EF3BB40C7F1200E22FA0EFE38BF9D +:1016500043EA0E03BA40641C82E750EA410E14BF0D +:1016600052EA430E6FF000014FF4001717EB430FDF +:101670008ABF194617EB410FB5E74CEA0551002028 +:10168000B0BDD4F10104B4F120070FDAC4F1200792 +:10169000520828BF42F0010210FA07F501FA07F7D5 +:1016A000E1BF2A43E0403843E1400FE0352C98DCAD +:1016B000C7F1200452EA400220FA07F218BF42F0B4 +:1016C000010231FA07F0A1400A43002172F1004201 +:1016D00050F1000051EB0C01B0BD000010B51446F4 +:1016E00000F002F8226010BDC1F30A5343B14A0072 +:1016F00012F5001F28D2A3F2FE32A1EB025170476F +:1017000050EA410C20D001F0004C31EA0C01B1FA52 +:1017100081F204BFB0FA80F3D2180B3AB2F1200381 +:101720002CBF00FA03F1914041EA0C013EBFC2F127 +:10173000200C20FA0CF319439040524240F2FD3342 +:10174000D21A01EB03517047002270474FF4001C7E +:101750001CEB410F94BF1CEB430F09E041EA030C63 +:1017600050EA4C0C52EA0C0C03D2994208BF90424A +:10177000704714BF8B428242704700004FF4001C38 +:101780001CEB410F94BF1CEB430F09E041EA030C33 +:1017900050EA4C0C52EA0C0C03D28B4208BF824236 +:1017A000704714BF9942904270470000124254D4CF +:1017B00040F2FF7C1CEA11530FD0634531D09B18D7 +:1017C00063453CBF01EB0251704701F0004141EA23 +:1017D0000C510020AFF30080704750EA410320D045 +:1017E00001F0004C91EA0C011CD0B1FA81F30B3BE3 +:1017F0009A420DD9D21A994051EA0C01C3F1200C3A +:1018000020FA0CFC61449840531C40F2FF7CD7E75F +:10181000914041EA0C01C2F1200C20FA0CF319436B +:1018200090407047B0FA80F31533202BE0D3202A84 +:10183000EED3203A203B9A4209D9D21A00FA03F19A +:1018400041EA0C010020531C40F2FF7CB8E700FA8B +:1018500002F141EA0C0100207047524240F2FF7C45 +:101860001CEA11530DD06345DBD0B2EB030C3CBF37 +:10187000A1EB025170470CF1010221EA035141F43E +:10188000801150EA410CCCD001F0004C352A27DC05 +:1018900030B481EA0C01B2F1200309DAC2F120036D +:1018A000044601FA03F5D0402843D1409C400CE0A7 +:1018B000C3F12002450020FA03F418BF44F00104EC +:1018C00021FA03F091400C43002174F1004550F1DE +:1018D000000051EB0C01244230BC7FF47BAF704719 +:1018E0006146002076E70000C1F30A5340F2FE3261 +:1018F0009B1A14DDD3F120034FEAE17208DDC9021F +:1019000041EA505141F00040D840801850407047A3 +:1019100003F2E13010B1D24382F000407047002062 +:1019200070470000C11768B14840401AB0FA80F211 +:101930009040D21CC907C2F5846241EA025202EB10 +:10194000D02140057047000070B44FF0004591EA87 +:10195000030F40F1B5816B40841A71EB030603D28B +:10196000001BB141121973414FF4001C1CEB410FD5 +:1019700034BF7CEB430442E00C0DA4EB1356352E30 +:101980004FDC45EAC323DB0A45EAC121C912B6F19F +:1019900020050DDD63FA05F6EB4086EA03051242E9 +:1019A00018BF45F00105C01851F100010CD213E039 +:1019B00062FA06F5F2405540F3415A40B340F34015 +:1019C0005A408018594107D349085FEA30005FEA5E +:1019D000350528BF45F0010501F58011420875F174 +:1019E000004250F1000041EB04514E0016F5001F7B +:1019F00070BC38BF70470020090D090570471CEB0B +:101A0000410F10D252EA43060BD0BCEB410F05D870 +:101A10000C0DAB43661E342EB6DD02E0AB438018DE +:101A2000594170BC704770BC70470000F0B540F27F +:101A3000FF7581EA030C0CF0004C15EA11541DBF30 +:101A400015EA1357AC42AF42E5E0BC41C1F31301C4 +:101A5000C3F31303801A994143F4801304D2641E24 +:101A60004000494180185941C90241EA5051B1FB37 +:101A7000F3F603FB1611A2FB0675D7EBC020A941B4 +:101A800002D2761E80185941C90241EA5051B1FB79 +:101A9000F3FE03FB1E11A2FB0E75D7EBC020A9417C +:101AA00003D2AEF1010E80185941890241EA9051EA +:101AB000760546EA8E2EB1FBF3F603FB1611A2FB68 +:101AC0000675D7EB8020A94102D2761E80185941B5 +:101AD000C90241EA50514EEA060EB1FBF3F603FB90 +:101AE0001611A2FB0675D7EBC020A94102D2761EC3 +:101AF00080185941C90241EA5051B1FBF3F703FB89 +:101B00001711A2FB0735D3EBC020A94167F10007ED +:101B10000CBF004247F0010766F3D5274FEA1E319C +:101B2000B80814F5806412DDBD0775F1004250EB72 +:101B30000E5051EB045111F5801F5CBF41EA0C01BE +:101B4000F0BD4CF07F6141F0E0410020F0BDBD07E9 +:101B50006D0840EA0E5041F48011D4F10104B4F153 +:101B600020060ADAC4F120060200E04001FA06F37A +:101B7000E1401843B24015430EE0342C13DCC6F1AB +:101B8000200445EA40056D0820FA06F2154321FAC3 +:101B900006F0A1400D43002175F1004250F1000014 +:101BA00051EB0C01F0BD00205FEA0C01F0BDCFB994 +:101BB00092185B41B3FA83F704BFB2FA82F6BF19F9 +:101BC0000B3FB7F120062FBF02FA06F3BB40C7F167 +:101BD000200622FA06F638BF3343BA401CB1E41996 +:101BE000641E33E77F4231F00041B1FA81F404BF53 +:101BF000B0FA80F6A4190B3CB4F120062FBF00FA0E +:101C000006F1A140C4F1200620FA06F638BF3143A0 +:101C1000A0403C1B1AE7AC421ABF05EA1357AF427B +:101C200012E050EA41061CBF52EA4306BFE750EA01 +:101C30004107304661461CBF41EA0551F0BD52EAFA +:101C4000430C08BFC143F0BD00204FF4001616EB53 +:101C5000410F98BF16EB430F08BF16EB410F24BF8F +:101C6000C14305E016EB430F0CBF61464CEA05513A +:101C7000F0BD0000400D491840EA81200CD2490D0A +:101C8000A1F58061491C40F0004005DBD1F11F0146 +:101C900054BFC840C017704700207047014648B184 +:101CA000B0FA80F18840C91CC1F58461090501EBD7 +:101CB000D02140057047012000F0B6B87047000001 +:101CC000841A71EB030604D26E40001BB141121955 +:101CD00073414FF4001C1CEB410F34BF7CEB4306F7 +:101CE00082E00C0DA4EB1356362E7BDC012E45EA68 +:101CF000C32341DC43EA525312BFD20292025B0873 +:101D0000240545EAC12141EA5051D2EBC020994156 +:101D100025D407D1B0FA80F610FA06F162D000207F +:101D2000203608E0B1FA81F6B140C6F1200220FA6F +:101D300002F21143B0404FEAF474B4EB465434F06D +:101D400001064FEA74040AD8D6F50016760D04F0A1 +:101D50000044F04061FA06F25040F1404840C00AA9 +:101D600040EA415021F0004128BF5FEA500550F1A0 +:101D7000000044EBD12135E0DB0A45EAC121C90A64 +:101D8000B6F120050EDD42EA0242120CC5F1200632 +:101D900003FA06F6EB4042EA06056D42984161F10E +:101DA00000010DE062FA06F5F240554063FA06FCC8 +:101DB00082EA0C02F3405A406D42904161EB03010C +:101DC00011F4801F05D1641E620502D06D004041F0 +:101DD000494121F48011430875F1004350F100009E +:101DE00041EB045170BC70471CEB410F15D223F03E +:101DF000004352EA43060BD04FEA4C0CBCEB410FB8 +:101E000004D80C0D661E342EB7DDEBE7801A99411D +:101E100050EA410608BF0021E4E708BF1CEB430F6E +:101E200028BF6FF00001DDE780B5AFF30080024A04 +:101E300011001820ABBEFBE72600020018B58FB0DA +:101E400002A80FF67C31DFF82C453422FFF718FA90 +:101E50000FF271500190009469460FF2515000F05A +:101E6000C9FD0121022000F0AEFEDFF80C250021A3 +:101E7000042000F026FF02A800F0ACFF08B101F03A +:101E8000F2F800F01EF901F0EFF8DFF8F0440FF27D +:101E90002942002084F8800000214FF6FF70E08284 +:101EA000012000F00EFF0FF25D420021022000F041 +:101EB00008FF062001F06EF9DFF8C404002101706C +:101EC0000121417001F0F9F90FF22943002204F1D8 +:101ED0008101002001F0EEFC0FF22143002204F109 +:101EE0008201002001F0E6FC002020838021DFF841 +:101EF00094040180A0214180012000F074F910B009 +:101F000010BDF8B50746DFF874447878DFF87054F0 +:101F1000052804F1800604D03E2814D0FF285AD0AA +:101F2000C6E0B888E18A884206D10020E08230709D +:101F30000FF2A44001F080FD012000F054F90120CF +:101F40002871E08A42E0F87801282BD0032802D0DB +:101F50000C2803D0ACE00FF2A8409FE00FF2CC4079 +:101F600001F06AFD387900280CBF0FF2DC400FF257 +:101F7000005001F061FDE08A6A460DF1010101F0B7 +:101F800099FD60B90FF2105001F056FD9DF8002048 +:101F90009DF801100FF2145001F04EFD88E00FF291 +:101FA00028507BE0707801F0ABFCB7F805100FF219 +:101FB000345001F041FD307804280CBF0620052084 +:101FC00030700021B7F80500E0822971E880281DF3 +:101FD00001F06DF96CE0B7F80300001F61D04FF419 +:101FE0007F71401A18D0401E49D0401E17D0401EA5 +:101FF0001CD0401E1DD0401E1ED0801E4CD0401E46 +:1020000024D0401E28D0401E23D040F2F631401A82 +:1020100004BF012068704BE00FF20C503EE00FF25D +:10202000385001F009FD0FF2585037E00FF27050B0 +:1020300034E00FF29C5031E00FF2C85001F0FCFC8C +:10204000E08A01F0A0FE0FF2E45027E00FF2F85012 +:1020500024E00FF2246021E0D7F807100FF2486067 +:1020600001F0EAFCD7F807100FF2546001F0E4FC2D +:10207000E08A012101F0D9FE0FF258600EE0F979F3 +:102080000FF2906001F0D8FCF879002814BF0FF22D +:10209000F8600FF2E06001E00FF2007001F0CCFC9C +:1020A00006E0012001F01FFFB0780A2101F077FC63 +:1020B0000120F2BD01F01BB90021022000F00EBE8C +:1020C000704730B587B00020ADF81A0001F0C8FCA9 +:1020D000AD48AE4D016811F1010F0ED04268297470 +:1020E000120A090A697405F110044068A874EA74B8 +:1020F000100A120C28756A7506E0002001F05AFFDC +:10210000040008BF0FF6880422460621002001F0D3 +:102110000CF860790FF6800228721021207968721D +:10212000E078A872A078E872607828732078934CE1 +:102130006873182000F0F9FF0FF66C0210210820D8 +:1021400000F0F3FF1821012001F016F801F044FF20 +:102150000DF1160006A90190009105AB07220021A0 +:10216000012001F0B1FD0FF26060BDF81810009081 +:102170000723BDF81400002201F0EEFF0DF11A0054 +:1021800000900223BDF81610BDF81400002201F0E3 +:10219000E3FF02220221002001F0BFFC0120207099 +:1021A00001F046FD01206070012108202071A1701E +:1021B0001020607100210020E0700491102174480B +:1021C000A060039008220020029001910092002359 +:1021D00001220121012001F044FDA07808B101F0A5 +:1021E000BBFD07B030BD2DE9F8410446012C87B096 +:1021F00003D164480588478803E04FF4C8654FF46D +:102200007A67DFF8788108F18006707801F078FB52 +:1022100031780FF2BC5001F00FFC022C11D1307854 +:10222000012818BF02280CD101F0A7FC010004D13D +:102230000FF2B85001F000FC03E00FF2D45001F0AF +:10224000FBFB347000200690059008F11901049101 +:10225000082298F818000FF2607103900291019221 +:10226000002300933A462946002001F098FC474994 +:102270000E2001F059FD010013D1012C0AD10FF2FB +:10228000B85001F0D9FB7078424908B0BDE8F04180 +:1022900001F085BB08B0BDE8F0410FF2C45001F079 +:1022A000CBBB08B0012CBDE8F0410CBF0FF2DC50F5 +:1022B0000FF2086001F0C0BB10B5012001F01DFE57 +:1022C0002E4C94F88000052812D001F056FC002115 +:1022D00084F8801030B90FF2186001F0ADFB0FF2F6 +:1022E000186001E00FF22C60BDE8104001F0A4BBC3 +:1022F00010BD00000021012000F0F0BC012001F021 +:10230000FCBD00001CB51D4C94F88000012818BFCE +:1023100000282DD01A484178012929D100220178BE +:102320004270491C01EBD1725210A1EB42010170C5 +:10233000F7EE040A017800EB81004FF4FA7190ED9A +:10234000020AE08A0091C0EE200AFDEEE00A10EEDB +:10235000902A92B20023114601F042FFBDE81640D8 +:1023600000280CBF0FF2D0500FF2FC5001F064BBFC +:1023700013BD0000A0080320332A0008CC2700204A +:10238000E4250020002C00208075FF1FCC250020B4 +:1023900007B2010046E001000021042000F09EBCCD +:1023A000012000F0C1BC012000F0C6BC10B50446FD +:1023B000616801F1080000F065FE00B101202070A5 +:1023C00010BD000010B1012803D070473F2000F07D +:1023D00099BC3F2000F09EBC0D0A0D2A2A204449DA +:1023E00053434F4E4E454354494F4E204556454E5C +:1023F00054205749544820434C49454E54200A0024 +:102400000D0A0D2A2A20434F4E4E454354494F4E44 +:1024100020555044415445204556454E5420574977 +:10242000544820434C49454E54200A004556545FB9 +:102430005550444154455F5048595F434F4D504CAF +:10244000455445200A0000004556545F555044410C +:1024500054455F5048595F434F4D504C4554452CAF +:1024600020737461747573206F6B200A0000000084 +:102470004556545F5550444154455F5048595F4359 +:102480004F4D504C4554452C207374617475732026 +:102490006E6F6B200A000000526561645F504859FE +:1024A0002073756363657373200A000050485920D8 +:1024B000506172616D202054583D2025642C2052BB +:1024C000583D202564200A005265616420636F6EC8 +:1024D00066206E6F74207375636365657373200A7D +:1024E000000000004843495F4C455F434F4E4E4556 +:1024F0004354494F4E5F434F4D504C4554455F53F5 +:1025000055424556545F434F444520666F722063E1 +:102510006F6E6E656374696F6E2068616E646C6562 +:1025200020307825780A00000D0A0D2A2A20414320 +:10253000495F4741505F4C494D495445445F4449C8 +:1025400053434F56455241424C455F5653455654AE +:102550005F434F4445200A000D0A0D2A2A204143BB +:10256000495F4741505F504153535F4B45595F525C +:1025700045515F56534556545F434F4445200A002A +:102580000D0A0D2A2A206163695F6761705F7061BF +:1025900073735F6B65795F72657370200A0000006A +:1025A0000D0A0D2A2A204143495F4741505F41559A +:1025B00054484F52495A4154494F4E5F5245515F1A +:1025C00056534556545F434F4445200A00000000CF +:1025D0000D0A0D2A2A204143495F4741505F534C61 +:1025E0004156455F53454355524954595F494E49F9 +:1025F0005449415445445F56534556545F434F44F4 +:1026000045200A000D0A0D2A2A204143495F47410F +:10261000505F424F4E445F4C4F53545F56534556A4 +:10262000545F434F4445200A000000000D0A0D2A64 +:102630002A2053656E6420616C6C6F77207265622E +:102640006F6E64200A0000000D0A0D2A2A20414303 +:10265000495F4741505F414444525F4E4F545F527F +:1026600045534F4C5645445F56534556545F434F70 +:102670004445200A000000000D0A0D2A2A2041438B +:10268000495F4741505F4B455950524553535F4E48 +:102690004F54494649434154494F4E5F565345565E +:1026A000545F434F44450A006E756D657269635F00 +:1026B00076616C7565203D20256C640A0000000081 +:1026C0004865785F76616C7565203D20256C780AD9 +:1026D000000000000D0A0D2A2A206163695F67610E +:1026E000705F6E756D657269635F636F6D70617247 +:1026F00069736F6E5F76616C75655F636F6E666937 +:10270000726D5F7965736E6F2D2D3E594553200AAA +:1027100000000000424C455F4354524C5F417070D2 +:102720005F4E6F74696669636174696F6E3A2041C8 +:1027300043495F4741505F50414952494E475F43CB +:102740004F4D504C4554455F56534556545F434F8B +:1027500044452C2070616972696E675F636F6D70AC +:102760006C6574652D3E537461747573203D20252E +:10277000640A00000D0A0D2A2A2050616972696EF0 +:1027800067204F4B200A00000D0A0D2A2A205061B5 +:102790006972696E67204B4F200A00000D0A0D2AEE +:1027A0002A204143495F4741505F50524F435F43A6 +:1027B0004F4D504C4554455F56534556545F434F1B +:1027C0004445200A00000000503250535256310058 +:1027D000466972737420696E64657820696E20257D +:1027E00064207374617465200A000000537563638C +:1027F00065737366756C6C792053746F7070656463 +:10280000204164766572746973696E67200A0000FE +:1028100053746F70204164766572746973696E6772 +:10282000204661696C6564202C20726573756C7438 +:102830003A202564200A000053756363657373664C +:10284000756C6C79205374617274204661737420C6 +:102850004164766572746973696E67200A000000CE +:102860005375636365737366756C6C79205374611B +:102870007274204C6F7720506F77657220416476B8 +:102880006572746973696E67200A0000537461721F +:10289000742046617374204164766572746973694B +:1028A0006E67204661696C6564202C2072657375C3 +:1028B0006C743A202564200A000000005374617291 +:1028C00074204C6F7720506F776572204164766575 +:1028D00072746973696E67204661696C6564202C47 +:1028E00020726573756C743A202564200A0000001C +:1028F00020200D0A0D0000002A2A2053544F50209A +:102900004144564552544953494E47202A2A2020D3 +:102910000D0A0D002A2A2053544F50204144564599 +:1029200052544953494E47202A2A20204661696C57 +:102930006564200D0A0D0000424C455F5356435F0D +:102940004C324341505F436F6E6E5F5570646174EB +:102950006528292C205375636365737366756C6CE9 +:1029600079200D0A0D000000424C455F5356435F2D +:102970004C324341505F436F6E6E5F5570646174BB +:102980006528292C204661696C6564200D0A0D00BC +:102990006C7AD8AC57720000123456789ABCDEF0CC +:1029A000123456789ABCDEF0FEDCBA098765432102 +:1029B000FEDCBA0987654321095032505352563123 +:1029C0000000000000000000000000000000000007 +:1029D00000000000440008004005020112279C008E +:1029E000F4010000FFFFFFFF48010100002000008C +:1029F000000000007FB50C466D4D61686D4EE861CA +:102A00002962284601F020FC246805F1240001F029 +:102A100025FC746006F1080001F020FC01203070F4 +:102A2000296829B10FF25510009002946846884732 +:102A30007FBD1FB55F4C04F1080001F012FC00BB24 +:102A40002178F1B1694604F1080001F033FC5848DF +:102A5000C16949B10098029001228DF8042001A8B3 +:102A600088479DF8040000E001202070207818B10C +:102A7000009801F0D4FC04E0009904F1080001F092 +:102A8000F9FB04F1080001F0ECFB28B9207818B13B +:102A900004F10800FFF780FC1FBD2DE9F84306464E +:102AA000002000F05FF874883088B268DFF8008199 +:102AB000C4F3090444EA8024F068A4B2C1B22046F9 +:102AC00000F03CF8002748F2E8094846FFF76BFCA5 +:102AD00008E06888A04202D13169287808706878D7 +:102AE00000B1012708F1240001F0BBFBF0B96946F1 +:102AF00008F1240001F0DEFB009800F10B05407A9C +:102B00000F28E6D0B5F80110A1420DD10098817AC6 +:102B1000C81E7169C0B28842C8BF084670610246CB +:102B20003069E91CFEF79CFB2878D9E73800CCD047 +:102B3000012000F017F80020BDE8F28310B513461D +:102B40001C4A5468A4F80900E1720A46194604F1C7 +:102B50000C00FEF785FB164A1369BDE81040002102 +:102B6000002018471249096A82B008B921B101E072 +:102B700011B1012002B0084702B0704710B50146FC +:102B8000487A0F2818BF0E2807D10B4801F07CFBAC +:102B9000BDE810400020FFF703BC064C04F108001C +:102BA00001F072FB04F10800BDE81040FFF7F4BB30 +:102BB000242B0020742B0020482B00200C480021DF +:102BC00001604160704710B500F00CF85C6819B105 +:102BD000012904D1204301E024EA0000586082F377 +:102BE000108810BDEFF3108272B6014B70470000E1 +:102BF000B42B00202DE9FC47604CDFF88491A569D7 +:102C00002840A0614FF0FF3A21694FF0010834E0FD +:102C1000521C54F83200616919400142F8D06169D0 +:102C200004EBC206084071681840014208BFC6F8AC +:102C300004A07768384000F0A5F8606208FA00F058 +:102C400087437760EFF3108172B6626A206908FAF1 +:102C500002F2D24310402061022004EBC00353F87B +:102C6000086C1640401E43F8086CF6D181F31088BA +:102C7000606A59F8201088472169A369606901409A +:102C8000194205D0E069216A084208BF0022C0D07D +:102C9000C4F824A001F011FCEFF3108972B6216989 +:102CA00060690140A069014201BFE169206A0142F7 +:102CB00001F085FD89F3108801F0F4FEA561BDE8FF +:102CC000F38738B51446EFF3108572B600F05AF862 +:102CD0002B4941F8204085F3108831BD10B500F034 +:102CE0000BF804431C6153F83140204343F8310092 +:102CF000FFE782F3108810BDEFF3108272B61F4B0E +:102D00001C697047EFF3108172B61C4A536923EABD +:102D1000000005E0EFF3108172B6184A53691843BA +:102D2000506181F310887047EFF3108172B6134A37 +:102D3000D3691843D061F4E7F8B5104C666A256A88 +:102D4000374616F1010F0EBF0026012101FA06F6E3 +:102D5000206202E0304601F033FD216AE06908425A +:102D6000F8D06762EFF3108172B6E269206A82439D +:102D7000E26181F310882562F1BD00008425002006 +:102D80005028002002460020110C090404BF102026 +:102D9000120412F07F4F04BF083012020FF2180124 +:102DA00012F0704F04BF001D1201120FC0F11F007E +:102DB000895C401AC0B2704704030202010101019C +:102DC000000000000000000001F0C3FE9DF80E00AE +:102DD00005B000BDF8B500F10C026B4625214FF699 +:102DE0006640F1E7F8B500F10C026B460F214FF693 +:102DF0006840E9E7F8B502466B460E214FF675408C +:102E0000E2E770B51B491C4B0A681C49C2F30D026E +:102E100001EB82010C6822689A4205D16569A169BB +:102E2000E269E368246904E025696169A26963686D +:102E3000A4682E0E067001722E0C467042722E0A85 +:102E40008670C473C5F3031605F00F050571C670CF +:102E50000D0E45710D0C85710D0A190E8172C5712B +:102E6000190CC1721B0A210E41730373210C81736B +:102E7000002070BD3C400058B95646A90000032010 +:102E8000684900E0684981B00A6802430A6009683D +:102E900008400090009801B0704710B501F0A8FEFE +:102EA00001F00CFB00F04EF800F08BF85F4C60482E +:102EB000A06304F1380001F0C9FE0420FFF7E2FF2F +:102EC0000120FFF7DFFF0220FFF7DCFF0420FFF700 +:102ED000D7FF0120FFF7D4FF0220FFF7D1FF002228 +:102EE0000F210E2001F006FF0E2001F021FF00222D +:102EF0000F213A2001F0FEFE3A2001F019FF4D4863 +:102F00002060002060600F20A06047F6FF70E06046 +:102F100000202061A061E0616061204601F05EFF59 +:102F200000220021204602F009F843486062002098 +:102F3000A06204F1240002F0A9F801F0E7FA01F020 +:102F40003DFCFCE780B59AB008A8482102F0BEF825 +:102F500001A81C2102F0BAF802F0BCF83748016859 +:102F600021F01801016047213548026822F4C0624F +:102F700042F4007202604FF48032006800F4C060D6 +:102F800000900098089101200A904FF480711290EF +:102F90000B9100204021139009920C9108A802F097 +:102FA000AAF86F2001900221002002910390049062 +:102FB000059006900790012101A802F04EFB1BB07E +:102FC00000BD10B594B06846502102F07FF84FF470 +:102FD000804011900221102013904FF44054129120 +:102FE0000094684602F012FD14B010BD10B5154CE7 +:102FF000154800F02BF84FF40040E06100202062FB +:103000006062A062204602F07FFE0021204603F0AD +:103010003AFB0021204603F041FB2046BDE810406A +:1030200003F014BB480000584C0000585029002001 +:10303000000C005800280040001000589000005874 +:1030400000040058AC2600200038014020604FF4F6 +:10305000E13060600020A060E06020610C206061D1 +:103060000020A061704770471B4800210171017268 +:1030700000F034B818490A7941F822000879401C58 +:103080000871704770B504466078FF2802BFB4F835 +:10309000031001F47F41B1F5406F12D100260E4DAF +:1030A00000E0761C2979F0B288420AD2F1B255F8D4 +:1030B0002110204688470100F3D002D0022805D015 +:1030C00006E02046BDE87040FEF71BBF002070BD43 +:1030D000012070BD00000000A02B002080B503F08F +:1030E00030FB03F02FFB03F02EFB03F02DFB03F06E +:1030F0002CFB03F02BFB03F02AFB03F029FB03F06E +:1031000028FB03F027FB03F026FB03F025FB03F06D +:103110005BFB03F013FC03F012FC03F011FC03F063 +:1031200010FCBDE8014003F00DBC18B50C46C7B05B +:10313000114600228DF800208DF81C008DF81D40EE +:1031400022460DF11E0003F0FEFB00F03FF83F2089 +:103150000C21ADF80400ADF8061007A8012103907A +:103160000691A41C049400F041F800284CBFFF20F5 +:103170009DF8000048B010BD00B5C7B000F01FF8C2 +:103180000F2000F028F800284CBFFF209DF8000019 +:1031900047B000BD00B5C7B00021ADF81C008DF8E8 +:1031A0000010182201A803F0D4FB182000F013F837 +:1031B00000284CBFFF209DF8000047B000BD002252 +:1031C0008DF800208DF81C008DF81D1018220021AC +:1031D00001A803F0BEBBADF8060007A902200490C9 +:1031E0003F22012003910690ADF80420CDF814D0C1 +:1031F000002101A8FFF751BC70B506464E4C30784F +:103200004CA520B1012807D0032810D070BD0120A3 +:1032100020700FF2281003E0002121700FF25010EF +:1032200000F00AFC2846BDE8704000F005BC71685B +:103230000878C8B94978012909D100F054FE0FF285 +:10324000641000F0F9FB00F02FF80120A070716805 +:10325000487848B900F051FE0FF2701000F0ECFB16 +:1032600000F022F80020A0707068017801291AD1BE +:10327000407801280AD1002000F035FE0FF27410CA +:1032800000F0DAFB00F010F80120A07071684878B7 +:1032900048B900F032FE0FF2841000F0CDFB00F0D0 +:1032A00003F80020A07070BD284600F0C5BB007870 +:1032B000012808BF00F00DB8704780B50FF2390241 +:1032C00000210820FFF7FDFC1B4900220A70BDE821 +:1032D000014080B5002000F010FE17480121417028 +:1032E000002181700121C1700021017101BD002107 +:1032F0000820FFF7F3BC000010B50F4C2079401EEA +:103300008041C00F2071207868B10FF2381000F0B2 +:1033100093FB08A000F090FBE11CBDE810404FF6C5 +:10332000426003F0E1BABDE810400FF2581000F01F +:1033300083BB0000200A0D00DC2B00202D2D205027 +:103340003250204150504C49434154494F4E205334 +:103350004552564552203A204E4F54494649434122 +:1033600054494F4E20454E41424C45440A0000000E +:103370002D2D20503250204150504C49434154494A +:103380004F4E20534552564552203A204E4F5449F5 +:103390004649434154494F4E2044495341424C45CC +:1033A000440A00002D2D20503250204150504C49ED +:1033B000434154494F4E2053455256455220203ADE +:1033C000204C454431204F4E0A0000002D2D205046 +:1033D0003250204150504C49434154494F4E2053A4 +:1033E000455256455220203A204C454431204F4604 +:1033F000460A00002D2D20503250204150504C499B +:10340000434154494F4E2053455256455220312096 +:103410003A204C454431204F4E0A00002D2D2050BB +:103420003250204150504C49434154494F4E205353 +:1034300045525645522031203A204C454431204FC8 +:1034400046460A002D2D20503250204150504C4904 +:10345000434154494F4E2053455256455220203A3D +:1034600020494E464F524D20434C49454E54204230 +:103470005554544F4E203120505553484544200A4E +:10348000200000002D2D20503250204150504C493A +:10349000434154494F4E20534552564552203A20FD +:1034A00043414E275420494E464F524D20434C49EC +:1034B000454E54202D20204E4F54494649434154F7 +:1034C000494F4E2044495341424C45440A20000094 +:1034D000DFF83C150A6892B200E00246086880B244 +:1034E0008242FAD170472DE9FC4104461825DFF8E5 +:1034F0002485DFF82465684308EB00073078062848 +:1035000008D131787170347078754FF0FF30706089 +:10351000002039E000F077F8B9680918B96008F1BF +:103520000803B96832786A439A589142327813D3C3 +:1035300008F1150315FB02FC13F80C30062B25D0FF +:1035400008F108066B43F358994222BF08F11503AE +:103550006A439A5CEED219E01146337869439A4285 +:103560000BD008F1140308F1150C5B5C15FB03F597 +:103570000CF805407A753B7500E07A7508F1140285 +:103580005454317871703470BDE8F6811146694346 +:1035900008F115035B5C062B04D008F1140615FB3B +:1035A00003F574557B753A7508F115025454EBE731 +:1035B000F8B5DFF86434DFF85C541E78182402464E +:1035C0006243B0422A4404D118785870507D187074 +:1035D0000FE0167D507D92F815C005F11507664382 +:1035E000062807F806C004D0167D143514FB00F435 +:1035F0002E55012010731878062802BF00294FF0BD +:10360000FF315960F1BD10B5DFF80C44606810F16E +:10361000010F0FD0FFF75CFF6168DFF800248142E3 +:1036200061683CBF5388C918081A5178484311781B +:10363000C84000E0002080B210BD2DE9F84FDFF84F +:10364000DC53DFF8DCB3D5F80880D8F80000DBF8ED +:1036500000104A0500F090F9DFF8BC63DFF8B4A36E +:1036600021F4806181604FF0180934780AF1080074 +:1036700019FB04F14758FFF7C6FF874217D200270E +:103680000121B170062C3DD019FB04F40AF10801A8 +:103690000AF108020959814223BF0AF108010959B8 +:1036A000091A002111510AEB04014C7DEAE7A988AF +:1036B0004118B94202D2AF880021E2E73F1ADFE7A2 +:1036C000022802DA2878012800D07F1ED8F80000EE +:1036D000C1684A07FAD500F055F9DBF80C00000C78 +:1036E000BFB247EA0047CBF80C70FFF7F1FE7060FD +:1036F000A8680068816841F480618160AFF3008050 +:10370000BDE8F18FB8B20028DAD1FFF7E1FE7060B2 +:103710000320BDE8F24F01F039BB2DE9F843EFF388 +:10372000108872B6BD4DBB4BA8680168CA224A62B8 +:1037300053204862B84A886820F480608860182066 +:103740001678374647431F44387B022826D13C6809 +:10375000D7F810909078F0B17A7B012A0AD1012134 +:103760003046FFF725FF88F310887968304600F06F +:1037700016F904E088F31088304600F0C1F8A86814 +:103780000068CA21416222465321416248463146BF +:1037900000F050F90BE0FFF750FF06E0C868420761 +:1037A000FCD500F07EF89F49086088F31088FF215F +:1037B000A86802685162BDE8F183F8B5974CA16032 +:1037C000CA2209684A6253224A62954A136843F042 +:1037D00020031360136803F00703C3F1040323708D +:1037E00095682D0C05F07F056D1C6570EDB2926833 +:1037F000C2F30E02521C628092B2521E6A43A2F5BC +:10380000A072DA404FF6FF739A422CBFA380A280C9 +:10381000854A136843F400231360844B1D6845F404 +:1038200000251D6048BB7C487A4E01238370182513 +:103830004FF0FF33436000235FFA83FC06F10C076F +:1038400015FB0CFC4FF0000E07F80CE05B1CDFB220 +:10385000062FF1DB06230370886820F480608860FF +:1038600000F01FF8D060032001F09BFAA1680868FF +:10387000826842F48042826005E0C868410544BF26 +:10388000032001F083FAA1680A68FF205062002239 +:103890000321032001F02EFABDE8F240032001F0DD +:1038A00047BAC86800F0800060F49060C8604FF4C8 +:1038B00000207047F0B504460025EFF3108672B67D +:1038C0001827DFF850C10CF10C0007FB05FE10F8BB +:1038D0000E0010B16D1C062DF5DB062D0CD06F43CC +:1038E0000CEB07000127077386F31088046142730D +:1038F00003600D700020F0BD86F310880120F0BD3C +:10390000F8B50746EFF3108472B6032001F01BFAF6 +:10391000424DAE683068CA2141623A465321416245 +:10392000182043494243895C02291BD100213846B3 +:10393000FFF73EFE3848017806290ED13068384935 +:103940000A68530500F018F821F480618160C168AD +:103950004A07FCD500F016F804E04078884218BF0A +:10396000FFF76BFEA9680A68FF205062032001F090 +:10397000DFF984F31088F1BD02D5C1684A07FCD491 +:1039800081687047C16801F0800161F49061C16095 +:103990004FF4002023490860032001F002BA2DE90A +:1039A000F04180460F46424618201A4942438C187F +:1039B000207B022804BF4046FFF7A2FFEFF31085EB +:1039C00072B6032001F0BFF9144EB0680068CA2136 +:1039D00041625321416202202073A7606760404624 +:1039E000FFF781FD0C490A784978914202D0FFF730 +:1039F00024FE02E0A168081AA060FF20B1680A68EE +:103A00005062032001F094F985F31088BDE8F0813D +:103A1000282800403C270020EC2B0020942B00207D +:103A2000082800400C08005800080058800800587A +:103A300048270020104700000EB4C0B5024603A876 +:103A400000210190009101AB0121044878440C3021 +:103A5000FCF774FB06BC5DF810FB00BF974B000041 +:103A600000B587B000F014F8012003220690ADF8ED +:103A70000420ADF8062000F07AF800284CBFFF20A3 +:103A80009DF8000007B000BD182201A802F061BF38 +:103A900000208DF800001822002101A802F059BF73 +:103AA00009220021684602F054BF1822002102A812 +:103AB00002F04FBF70B5C8B006460C461546052249 +:103AC000FFF7EFFFADF82060FFF7EFFF302100F0C8 +:103AD00014F80521049000F019F8002848BFFF20D1 +:103AE00009D49DF8000030B99DF8030020709DF8BE +:103AF00004002870002048B070BDADF80A100820FE +:103B00000221ADF80800059108A870470791CDF88B +:103B100018D0002102A8FEF7C0BF00B5C7B000F062 +:103B20000EF8FFF7B1FF312000F013F800F01FF896 +:103B300000284CBFFF209DF8000047B000BD0023C7 +:103B40008DF81C008DF8003007A8417082700021AC +:103B50007047ADF8060007A9032004900822012051 +:103B600003910690ADF80420704703900691CDF8BC +:103B700014D0002101A8FEF790BF00B587B000F077 +:103B800065F900F04DF9812000F0F8F800F016F921 +:103B900000284CBFFF209DF8000007B000BD2DE9B4 +:103BA000F84DC7B09446DDF840E1519A559D569EB8 +:103BB000DDF84CA1ADF81D108DF81C004FF0000B86 +:103BC000ADF81FC08DF821308DF822E000F024F808 +:103BD00000F017F824F8095F668000F021F93F2013 +:103BE000832100F00EF9574406910D37049700F039 +:103BF000E8F800284CBFFF209DF8000048B0BDE861 +:103C0000F08D88F800A007AC5499E419524608F1E9 +:103C10000100544402F097BE8DF8232017465299B4 +:103C20008DF800B00DF1240809A8B84402F08BBE4D +:103C300000B5C7B000F00CF8852000F0C8F800F01F +:103C4000BDF800284CBFFF209DF8000047B000BD24 +:103C500000218DF81C008DF80010182201A802F038 +:103C600078BE2DE9F841C7B04FF0000800F026F803 +:103C70000DF12300DDF844E14E9F4F9E509D529C74 +:103C80008DF81F30C0F800E08DF800808DF82070AE +:103C90008DF821608DF822508DF8274000F0C0F893 +:103CA0008620ADF8060007A90C2000F083F8002854 +:103CB0004CBFFF209DF8000000F0C5B88DF81C0037 +:103CC00007A8417082707047F8B5C8B005460E4627 +:103CD00017461C4600F023F808A8467087708DF838 +:103CE000205000F089F88A21ADF80A103F20032106 +:103CF00000F075F8002848BFFF200ED49DF80000A2 +:103D000058B94F994E98BDF801202280BDF8032084 +:103D10000280BDF805000880002049B0F0BD0722F0 +:103D20000021684602F015BE18B5C7B000F09DF836 +:103D300000F076F83F208E2100F08CF800F041F87A +:103D400000284CBFFF209DF8000048B010BDADF822 +:103D5000060007A90220704700B587B000F076F88A +:103D600000F05EF8922000F009F800F027F8002833 +:103D70004CBFFF209DF8000007B000BDADF8060065 +:103D80003F220120704700B5C7B00021ADF81C00EC +:103D9000FFF761FF9520FFF7DAFF00F00BF800282E +:103DA0004CBFFF209DF8000047B000BDADF80600F5 +:103DB00007A9032004903F22012003910690ADF84B +:103DC0000420CDF814D0002101A8FEF766BEADF89E +:103DD000060007A901203F22039104907047ADF827 +:103DE0000800059108A8072104900791CDF818D084 +:103DF000002102A8FEF751BE1822002102A802F0FD +:103E0000A8BDADF80400ADF8061007A80121039085 +:103E1000704700228DF80020ADF81C008DF81E10B0 +:103E20001822002101A802F094BD00B5C7B0FFF729 +:103E3000F0FFA520FFF7BAFF00284CBFFF209DF838 +:103E4000000047B000BD48B0BDE8F08100208DF80B +:103E500000007047ADF80400ADF8061007A8012176 +:103E600003900691641C04947047044600208DF86A +:103E700000008DF81C4022460DF11D0002F063BDCC +:103E8000444981B00A6802430A600968084000900A +:103E9000009801B0704778B585B004466846142193 +:103EA00001F014F90220FFF7EBFF00F010F8009585 +:103EB000012001900021022003900291694656F8EA +:103EC000240002F051FD00F008F806B070BD0FF2BA +:103ED000D000314E30F81450704756F824000022BC +:103EE000294602F005BE0FF2B8012B4B31F8101035 +:103EF00053F82000012202F0FBBD0FF2A401264B73 +:103F000031F8101053F82000002202F0F1BDF0B596 +:103F100085B005460C466846142101F0D7F80DB966 +:103F2000042004E0012D18BF022D02D10820FFF764 +:103F3000A7FF2000194E0FF270070DD137F81500BA +:103F4000009000210191012002900221039100F0D4 +:103F50001CF8012000F0FDFB012C14D137F81500EE +:103F6000009001214FF404100190029100F00DF82F +:103F70000FF23C00445D00220F2160B200F0BAFE57 +:103F800060B200F0D5FE05B0F0BD694656F82500D8 +:103F900002F0EABC4C000058002600200C2600204D +:103FA00020000100020000001000010002000000DB +:103FB0000A06070001460648064AC3798B4218BF25 +:103FC000904218BF0838F8D18B4218BF00207047C4 +:103FD000F873FF1F0070FF1F00B587B000208DF839 +:103FE000000000F0E0F840F20110ADF806003F22BA +:103FF0000120069000F0ECF800284CBFFF209DF84F +:10400000000007B000BD2DE9F84107460128C7B000 +:10401000884615461E4608BF022003D002280CBF62 +:10402000102000200DF11D010C1800F036F8012FB2 +:104030008DF81C7002D0022F18D019E002273A46E2 +:1040400041460DF11D0002F07EFC2570667000F007 +:10405000AAF83F204FF4817100F016F8FF1C049776 +:1040600000F0B8F8002805D5FF2009E01027E6E7A2 +:10407000972005E09DF8000010B94E9800F067F811 +:10408000FFE748B0BDE8F081ADF80400ADF80610D8 +:1040900007A8032103900691704703220021684678 +:1040A00002F057BC2DE9F64F0C460546012CC7B06F +:1040B0009B4608BF022003D0022C0CBF102000201A +:1040C0000DF11F010E18FFF7E8FF012CADF81C5091 +:1040D0008DF81E4002D0022C2CD02DE00227569CD9 +:1040E000559DDDF85091DDF84CA1DDF848814899E7 +:1040F0003A4600F054F8A6F800B086F8028086F838 +:1041000003A086F804907571B47100F04CF83F205C +:10411000ADF804004FF4827107A8ADF806100390C3 +:1041200003210A370497069100F054F8002805D5BA +:10413000FF2009E01027D2E7972005E09DF8000056 +:1041400010B9579800F003F849B0BDE8F08FBDF8FA +:10415000011001800020704730B5C7B01C464A9B53 +:1041600000F026F800258DF800508DF821402246F9 +:1041700019460DF1220002F0E6FB00F014F83F2092 +:104180004FF4837100F01BF8A41D049400F022F892 +:1041900000284CBFFF209DF8000047B030BD0DF156 +:1041A0001F0002F0D0BB1822002101A802F0D1BBF1 +:1041B000ADF81C00ADF81E108DF820207047ADF84A +:1041C0000400ADF8061007A801210390069170477E +:1041D000ADF80420CDF814D0002101A8FEF75DBC95 +:1041E00030B5C7B00025ADF81C0007A84A9C418037 +:1041F0008280ADF8223004818DF8005000F01EF866 +:104200000F21029140F281100A21ADF806000491BD +:1042100007A801213F220390069100F007F800282B +:104220004CBFFF209DF8000047B030BDADF8042022 +:10423000CDF814D0002101A8FEF72FBC18220021D0 +:1042400001A802F086BB0000024901600249016139 +:10425000704700BF1B4300084143000800604060F6 +:104260007047EFF3108172B6026882420CBF0120E2 +:1042700000201CE0EFF3108272B603680B60486008 +:1042800001600868416023E0EFF3108272B60860B5 +:1042900043684B6041604868016019E0EFF31081AA +:1042A00072B642680368136002684368536081F322 +:1042B0001088704710B5EFF3108472B602680A6078 +:1042C0000068FFE7FFF7EAFF84F3108810BD0B607A +:1042D00082F310887047000002F09DBC6C486D4965 +:1042E000016001F12002426001F13002826001F1BF +:1042F0003C02026201F14402426201F14C02C260DE +:1043000001F15402026101F17002426101F1740293 +:1043100082618031C16102F09CBC38B504465E4DBB +:104320002846FFF79BFF5A484068A1680160E16892 +:10433000C16085605949416002F0A7FC58482AE0F5 +:1043400080B553484268136801211972406802F031 +:10435000A2FC002002BD38B5514C4F4D04E000F0E6 +:1043600041F80098216888472846FFF77AFF00281F +:10437000F5D031BD4A484168084738B50446494D33 +:104380002846FFF76BFF4248C068A168016045609E +:1043900002F086FC444821680160616841600020A9 +:1043A00032BD80B53A48C268136810211972C068DE +:1043B00002F07CFC002002BD35483B4AC168C16860 +:1043C00013680868184738B5374C364D04E000F0DC +:1043D00009F80098616888472846FFF742FF0028DF +:1043E000F5D031BD69462846FFF764BF38B50446AD +:1043F0002E4D2846FFF732FF2D48FFF72FFF2448A8 +:104400000069A1688160E168C1600561216801609F +:1044100061684160216941616169816131BD80B537 +:1044200001462348FFF730FFBDE802400FF20500C8 +:1044300002F045BC38B5164C1D4D06E0FFF7D2FF23 +:10444000009920690069FFF71FFF2846FFF709FF61 +:104450000028F3D031BD10B5164C2046FFF7FEFE04 +:104460000B4841690C60BDE8104002F03CBC1CB533 +:10447000104C06E069462046FFF71CFF009800F04C +:104480001BF82046FFF7EDFE0028F3D013BD000017 +:1044900000000320AC090320480A032090080320F1 +:1044A000C42B0020500A0320CC2B0020380A032004 +:1044B000BC2B0020400A03207047704710B5B1495B +:1044C000B14C4FF400400860606840010ED5606850 +:1044D000C0000BD400F0FEFD00F0FCFD206840F4AD +:1044E00080302060216821F48031216000F072F872 +:1044F0000020FFF75FFD40B18079A449E160E168E9 +:1045000021F47C5141EA0021E16010BD10B5A048C2 +:10451000A04C88B001680160CA219F48C161532145 +:10452000C161FF220168C908C9000160C2619B48DE +:10453000016841F400410160FEF740FB98480168C2 +:10454000C908C90041F00401016000209549FFF746 +:1045500034F902F0EEFB01210120FEF734FB0020CC +:10456000FFF799FC0120FFF796FC0220FFF793FC70 +:104570000120FFF7B8FC01210020FFF7C8FC012152 +:104580000120FFF7C4FC01210220FFF7C0FCFFF768 +:10459000A5FE854A00214020FEF793FB04F23C5023 +:1045A0000FF275010090019169460FF2710000F061 +:1045B0007BFA04F25470029004F5C96140F23C5059 +:1045C00005900391049402A8FFF710FFFFF784FE03 +:1045D00008B010BD754881B0016841F480110160D8 +:1045E0003F21006800F480100090009870484160FE +:1045F0004161016841F47C110160026942F47C125E +:104600000261016841F03F010160026942F03F022E +:10461000026101B0704700007047000038B50446E1 +:1046200088B0616801F10B056846FEF7EAFB9DF86A +:1046300002309DF801209DF800100FF2BC10FFF72A +:10464000FBF99DF804100FF2D410FFF7F5F99DF86F +:104650000C309DF80B209DF80A100FF2DC10FFF7CC +:10466000EBF928884FF41241401A0CD0401E3ED07E +:10467000401E4CD0801E57D0401E5AD0401E5BD0EA +:10468000401E60D063E004A8102100F01FFD6068A8 +:104690000D300078F8B90FF26430FFF7CDF902F071 +:1046A00057FB0D208DF810007F2142488DF8121025 +:1046B00004680FF27830240C2146FFF7BDF9ADF8FD +:1046C0001C4004A8FEF796FBFDF7B8FB0021012073 +:1046D000FEF779FA3BE0012806D10FF27030FFF7C0 +:1046E000ABF90020207032E00FF28C302DE06068D2 +:1046F00000F10D040FF26C202178FFF79DF920786E +:10470000002814BF0FF2C0200FF284201DE00FF22A +:104710004010FFF791F9D5F80620D5F802100FF2F6 +:104720005C10FFF789F912E0D5F802100FF2901033 +:1047300006E00FF2C01008E0D5F802100FF2D0101A +:10474000FFF77AF903E00FF20020FFF775F909B0DF +:1047500030BD38B5044602F029FC14F1010F0546BE +:1047600009D000F05CFA241805E01348016821F034 +:104770000401016030BF02F019FC401BA042F4D3D9 +:1047800031BD00001040005890000058FECAFECA1B +:104790009008005830000320082800400800005806 +:1047A0008004005850290020EB4A000850000058AF +:1047B000040C0058002004E010ED00E001E0704718 +:1047C00000BF4FF0FF30FEF715BA00214020FEF782 +:1047D00085BA0220FEF7A8BA0220FEF7ADBA01287A +:1047E00005D0022805D0102805D1FDF763BCFDF7E0 +:1047F00063BCFDF765BC7047576972656C65737380 +:10480000204669726D776172652076657273696F93 +:104810006E2025642E25642E25640A005769726572 +:104820006C657373204669726D776172652062757D +:10483000696C642025640A004655532076657273BE +:10484000696F6E2025642E25642E25640A0A0000F7 +:104850002D2D20424C45204E564D2052414D204892 +:104860004153204245454E20555044415445442033 +:10487000425920434D4F2B200A0000005348434922 +:104880005F5355425F4556545F424C455F4E564D0F +:104890005F52414D5F555044415445203A20537476 +:1048A00061727441646472657373203D20256C7875 +:1048B000202C2053697A65203D20256C640A000075 +:1048C000534843495F5355425F4556545F4E564DDA +:1048D0005F53544152545F5752495445203A204E39 +:1048E000756D6265724F66576F726473203D202547 +:1048F0006C640A00534843495F5355425F45565420 +:104900005F4E564D5F454E445F57524954450A002D +:10491000534843495F5355425F4556545F4E564D89 +:104920005F53544152545F4552415345203A204E03 +:10493000756D6265724F66536563746F7273203D67 +:1049400020256C640A000000534843495F535542D8 +:104950005F4556545F4E564D5F454E445F4552414C +:1049600053450A00534843495F5355425F455654E7 +:104970005F4552524F525F4E4F544946205749545B +:104980004820524541534F4E202578200A00000010 +:10499000534843495F5355425F4556545F45525211 +:1049A0004F525F4E4F544946205749544820524574 +:1049B00041534F4E202D204552525F424C455F4996 +:1049C0004E4954200A000000534843495F53554262 +:1049D0005F4556545F4552524F525F4E4F544946C1 +:1049E000205749544820524541534F4E202D2042D4 +:1049F0004C45204552524F52200A0000534843492B +:104A00005F5355425F4556545F434F44455F52459F +:104A1000414459202D20574952454C4553535F4638 +:104A2000575F52554E4E494E47200A004442474D6B +:104A300043555F4765745265766973696F6E494483 +:104A40003D20256C78200A0A0000000053484349A5 +:104A50005F5355425F4556545F434F44455F52454F +:104A6000414459202D204655535F46575F52554EBD +:104A70004E494E47200A0000534843495F53554270 +:104A80005F4556545F434F44455F5245414459206A +:104A90002D20554E455850454354454420434153DD +:104AA00045200A00704700007FB50C464D4D6168F7 +:104AB0004D4EE8612962284602F07EFA246874604F +:104AC00006F10800FFF7CAFB012000F068F801209A +:104AD0003070296841B10FF2E9000FF2ED02009049 +:104AE00001920294684688477FBD1FB53E4C04F191 +:104AF0000800FFF7B6FB00BB2178F1B1694604F16D +:104B00000800FFF7D7FB3748C16949B10098029008 +:104B100001228DF8042001A888479DF8040000E0D8 +:104B200001202070207818B10098FFF778FC04E08D +:104B3000009904F10800FFF79DFB04F10800FFF75E +:104B400090FB28B9207818B104F10800FFF73DFE6A +:104B50001FBD2DE9F04105460E4690461C4600203B +:104B600000F01DF8204F7868A0F80950C672324650 +:104B700041460C30FCF774FB1A4A136900210020EF +:104B8000984748F2E800FFF727FE79688A78D21C38 +:104B900004F10800FCF764FBBDE8F04101201CB5FE +:104BA0001049124C096A20B901B1884700202070D1 +:104BB00013BD0120207011B1BDE81C40084713BD92 +:104BC0000020FFF706BE000010B50146064C04F1B8 +:104BD0000800FFF759FB04F10800BDE81040FFF79B +:104BE000F4BD0000502B0020842B0020A92B0020B6 +:104BF000134810B5016841F480710160032000F092 +:104C00006CF8002002F0E2F90024002814BF01240F +:104C100002F00BFA204610BD0A4880687047094828 +:104C200000787047084805E00748016841F0020134 +:104C300001607047016841F00101016070470000A8 +:104C400000400058F4250020042004E0F8B5044694 +:104C50000025ACB104F13406307910B9204602F0D9 +:104C6000F3F90F4F384600F021F8386840F0011092 +:104C70003860204600F007F835600120307100E010 +:104C800001252846F2BD10B50021064A064B00EB6F +:104C90008104491C06296360E261F8D310BD00005D +:104CA000000C0058FB1100087F1100080021016072 +:104CB0004FF03F1141603F218160704709010200C0 +:104CC00081B002D43C48815405E03C4802F00F0218 +:104CD000104400F8041C01B07047394A13684FF6BD +:104CE000FF0100020B4000F4E0601843354908431F +:104CF0001060704738B5324B1C68C4F30223C3F10F +:104D00000704052C28BF04241D1D072D34BF0023D4 +:104D1000DB1E012505FA04F4641E2140994005FAC2 +:104D200003F35B1E1A401143BDE83440C6E70000A0 +:104D3000010007D4012200F01F01234B8A404009E3 +:104D400043F82020704701000BD4012200F01F011E +:104D50001E4B8A40400943F82020BFF34F8FBFF31A +:104D60006F8F704710B5401EB0F1807F01D30120D6 +:104D700010BD174C60600F214FF0FF30FFF79EFF12 +:104D80000022A26007202060002010BD010007D48F +:104D9000012200F01F010F4B8A40400943F82020F8 +:104DA0007047010007D4012200F01F010A4B8A401E +:104DB000400943F82020704700E400E018ED00E0CF +:104DC0000CED00E00000FA0500E100E080E100E009 +:104DD00010E000E000E200E080E200E038B504000E +:104DE00044D094F8210028B9002184F820102046EE +:104DF00002F005FA00F049F8FF2510B100F03FF885 +:104E000034E02168DFF8B0008A6802408A602168D7 +:104E10008A68636820690343A06903431A438A6070 +:104E20002168E068086120680169A26841EA0241DE +:104E300001612068C16821F08001C1602068C16CF7 +:104E400089088900C1642168CA6CE3696069034309 +:104E50001A43CA6420688168880609D400F020F8E3 +:104E600030B120684562042100F01FF8012032BDF6 +:104E700020684562012184F82110002032BD20689D +:104E80004562042184F821107047022084F8210033 +:104E9000CA2021684862532022685062204626E0DA +:104EA00020460BE02068C0F8248084F82110002000 +:104EB00084F8200070470000BFFF8FFF70B50446E4 +:104EC00040F2E9362068C16821F0A001C16002F01B +:104ED0006DF805462068C168880606D402F066F8B9 +:104EE000401BB042F6D3032070BD002070BD70B5EA +:104EF00004462068C1684A0612D44FF0FF32C260EF +:104F000040F2E93602F052F805462068C1684806CA +:104F100006D402F04BF8401BB042F6D3032070BD1C +:104F2000002070BD8A60FF2102685162012180F873 +:104F30002110002180F82010002070472DE9F8434F +:104F400000F065F808BF022038D000F067F814D5EB +:104F500002F02CF807462068C16848070DD502F01A +:104F600025F8C01B4845F6D300F039F826E002F0DA +:104F70001DF8C01B484507D3F6E700F02AF800F0FB +:104F800065F802F013F807462068C1684A07EED5B5 +:104F9000C0F81480206800F013F82A48016841F432 +:104FA000002101602848026842F400220260206863 +:104FB000816841F48041816000F01BF8BDE8F28314 +:104FC0008168C908C9008160206881680D438560D7 +:104FD00070472068816821F4806181607047206893 +:104FE0004662032184F82110002084F82000032069 +:104FF00070472068816841F48061816001212068E8 +:10500000466284F82110002084F82000704704468E +:10501000884694F82000012815467047012184F83D +:105020002010022084F82100CA2021684862532001 +:1050300022685062FF2620688168480540F2E939FD +:105040007047000080080058000800582068C168B8 +:1050500001F0800161F49061C160704790F8201008 +:10506000012901D102207047012280F8202002216D +:1050700080F82110CA2102685162532103685962E5 +:1050800001688A6842F02002FFF74CBF10B50400A7 +:1050900001D1012010BD607A20B900212172204683 +:1050A00002F090F80220607221680A68606822F0BD +:1050B000200202430A602068016841F00401016097 +:1050C000012060720020E06010BD0000002202F0AC +:1050D000E5B800000248016841F480710160704742 +:1050E000000400584FF0B040006800F0F000B02815 +:1050F00088BFB02070472DE9F041040054D02078DB +:1051000081064FF0B04538D5A868E96810F00C006A +:1051100001F0030103D00C2808BF012946D12868FB +:10512000800702D5E06900283ED0FFF7DBFF616A07 +:10513000884207D2084600F0D3FB002834D100F0A3 +:1051400075FA0FE0286820F0F000014329606968D3 +:10515000206A21F47F4141EA00216960606A00F021 +:10516000BFFB08BB00F095FBDFF810180860DFF804 +:105170001008006801F02AFFB0B92078C1070DD5EA +:10518000A868E96800F00C00082801F0030103D0CA +:105190000C2808BF03292DD12868800340F13981EC +:1051A0006068002840F03581012038E2E06980B174 +:1051B000296841F0010100F047FA06462868800797 +:1051C00000F1248101F0F2FE801B0328F6D30320B6 +:1051D00025E2286840084000286001F0E7FE064606 +:1051E000286800F01FFAC8D001F0E0FE801B0328F9 +:1051F000F6D3ECE76068B0F5803F04D1296841F44C +:105200008031296003E02A6822F480322A606068D5 +:1052100060B101F0CBFE06462868800300F1F980FA +:1052200001F0C4FE801B6528F6D3D0E701F0BEFE76 +:1052300006462868400C10F0010000F0EA8001F0FA +:10524000B5FE801B6528F4D3C1E701F0AFFEC01B9B +:105250000328C0F01281BAE7E06878B1296841F408 +:10526000807100F0F1F906462868400500F11881C8 +:1052700001F09CFE801B0328F6D3A8E7286820F4E1 +:105280008070286001F092FE06462868800A10F0BF +:10529000010000F0DC8001F089FE801B0328F4D3BC +:1052A00095E701F083FEC01B0328C0F00B818EE759 +:1052B00040F0010000F0CEF907467068800700F169 +:1052C0001C8101F073FEC01B0328F6D37FE77068D2 +:1052D00020F0040000F0BEF907467068C00810F026 +:1052E000010000F0198101F061FEC01B0428F4D315 +:1052F0006DE70528306806D140F004003060316861 +:1053000041F0010105E0400840003060316821F0C3 +:1053100004013160A06841F2893768B101F046FEAE +:1053200080463068800700F10C8101F03FFEA0EB61 +:105330000800B842F5D34AE701F038FE80463068ED +:1053400000F070F900F0FD8001F030FEA0EB0800E5 +:10535000B842F4D33BE701F029FEC01B0328C0F09C +:10536000FE8034E7B06840084000B06001F01EFEE7 +:105370000746B06800F056F900F0F58001F016FE1F +:10538000C01B0328F5D322E701F010FE801B032881 +:10539000C0F01F811BE701F009FE001B0328C0F0CD +:1053A000398114E7286881010CD4296841F08071A3 +:1053B0002960E86840F08050E86001F0F7FD04469D +:1053C0002868810100F12A8101F0F0FD001B03280B +:1053D000F6D3FCE60C2931D0286820F080702860D4 +:1053E000E968DFF8A00589088900E960E9680140FB +:1053F000E96001F0DBFD04462868810140F10E817F +:1054000001F0D4FD001B0328F6D3E0E600F00EF90E +:10541000B3E6207881071AD5A868E96800F00C0087 +:10542000042801F0030104D00C2808BF02297FF4EE +:1054300013AF2868400503D5E06800283FF4B4AEF8 +:105440006968206921F0FE4141EA006169602168D4 +:10545000DFF8346511F0180F38D0606900283FF488 +:1054600036AFC90670687FF523AF800709D470682E +:1054700040F0010000F0EEF80746706880077FF505 +:10548000E4AE706840F0040000F0E4F8074670688D +:1054900000070DD401F08AFDC01B0428F7D396E65F +:1054A0006868216920F0FE4040EA01606860CEE74C +:1054B0007068A16920F4706040EA0120706000F01B +:1054C000C6F8074600F0ADF87FF4EBAE2078410750 +:1054D00037D5DFF8B8743868C10529D4FFF7FAFD6D +:1054E00001F064FD80463868C10521D401F05EFDFD +:1054F000A0EB08000328F6D369E6706820F00400EA +:1055000070607068C00810F00100DFD001F04EFD3F +:10551000C01B0428F5D35AE600F099F8074600F0BE +:1055200080F8D3D001F042FDC01B0328F7D34EE62C +:10553000A06801287FF4DDAE306840F001003060E3 +:10554000E8E6217848060ED5A06A00283FF40AAFA5 +:10555000B16841F00101B16001F028FD0746B06873 +:1055600080077FF5F8AEE06A002857D0A968EA689E +:10557000022801F00C017FF42DAF236B02F0030031 +:10558000984202BF02F07000636B984214D1A36B83 +:10559000C2F30620984202BF02F47810E36B9842EF +:1055A0000AD1236C02F06060984202BF02F06042B0 +:1055B000606C82423FF4F6AE0C293FF4F5AD2868EA +:1055C00041013FF5F1AD296821F0807100F03CF810 +:1055D0000646286881013FF5D7AEE968DFF8B003D9 +:1055E000A26B0140206B0143606B0143E06B41EA19 +:1055F00002210143206C0143606C0143E96028688B +:1056000040F080702860E96841F08051E96001F065 +:10561000CDFC0446286881017FF5BDAE0020BDE8C1 +:10562000F0817068400810F0010070472968606AD6 +:1056300021F0F001014329606868216A20F47F406D +:1056400040EA012068607047296001F0AFBC7068D3 +:1056500040084000706001F0A9BC2DE9F843040047 +:10566000884644D0DFF82C6300F0CBF847D200F036 +:10567000CDF8074600F0C5F841D001F097FCC01BFB +:105680000228F7D90320BAE001F090FC401B022861 +:1056900043D9F7E701F08AFCA0EB090002284CD9B6 +:1056A000F0E701F083FCA0EB0900022854D9E9E7F8 +:1056B00001F07CFC401B02285DD9E3E701F076FC99 +:1056C000401B022867D9DDE701F070FC401B48450C +:1056D00077D3D7E7032802D13968890103E000288E +:1056E000396802D1890762D401E049055FD40120FD +:1056F00085E001F05BFCC01B022872D9C2E720786C +:1057000081074FF0B0470BD5B968A06821F0F001D0 +:105710000143B96001F04AFC0546B868C003B3D53F +:105720002078DFF8545281060AD52968606921F093 +:10573000F0010143FFF788FF814628688003A9D55F +:10574000207841060BD52968A0690909090141EAB9 +:105750001011FFF779FF81462868C003A1D5207892 +:1057600041070BD5B968E06821F4E0610143B960F5 +:1057700001F01CFC0546B868800399D52078010724 +:105780000CD5B868216920F4605040EAC100B860C7 +:1057900001F00CFC0546B86840038FD52078C1079E +:1057A00017D56068022895D1396889039FD5B968F3 +:1057B000890840EA8100B86041F2893901F0F6FBBE +:1057C0000546B868616800F00C00B0EB810F7FF40B +:1057D0007BAF306800F00700804505D200F016F876 +:1057E000074600F00EF884D100F053F8DFF88C1172 +:1057F0000860FFF711FABDE8F24301F0E7BBBDE82E +:10580000F283306800F00700404570473168C908EE +:1058100048EAC101316001F0C9BB38B54FF0B0446E +:105820005E4DA16811F00C0106D1FFF75BFCC0F3DF +:10583000031055F8200032BD0429594A05D0082923 +:10584000584804D12168C90222D5104632BDE1680A +:1058500001F00301022904D0032904D12168C902FF +:1058600007D5104605E0FFF73DFCC0F3031055F8DF +:105870002000E168E268E368C1F306214843C2F30F +:105880000211491C5B0FB0FBF1F05B1CB0FBF3F0A5 +:1058900032BD80B5FFF7C1FF3F49FFE7424A0968C3 +:1058A000C1F3031152F82110B0FBF1F002BD80B535 +:1058B000FFF7EFFF00F010F8C1F3022106E080B51A +:1058C000FFF7E7FF00F008F8C1F3C22112F821103A +:1058D00001F01F01C84002BD2F49344A09687047D2 +:1058E00070B52E49B1282EBFCC6AC0F3031051F811 +:1058F00020402148056801F0EBFC2B492C4A05F0BB +:105900000F0551F82510B4FBF1F10024B1FBF2F1C1 +:10591000B0F5007F0FF2B802204609D10FF29403D0 +:1059200053F820508D4214D2401C0328F8D912E0BD +:105930000FF2900353F820508D420AD2401C0328E6 +:10594000F8D308E001F032FB801B03280CD30320BE +:1059500070BD52F820400F4D2868C00844EAC000CE +:10596000286001F023FB0646296801F00701A142E7 +:10597000E8D1002070BD0000080100581826002062 +:10598000FC250020FFFFFEEE9000005800040058A8 +:105990008C80C11100400058080000581C7E00088F +:1059A0000024F4000048E801DC7D00089C85000824 +:1059B00040420F00120000002400000036000000EA +:1059C00040000000060000000C0000001000000075 +:1059D00000000000010000000200000003000000C1 +:1059E000DFF820130A68030903F47F2300019A43B8 +:1059F00000F47F2000F082B9DFF808231368010C5F +:105A000023EA014343EA0043136070472DE9F8435A +:105A1000054600242878DFF8EC624106A0464FF0E6 +:105A2000B0472DD5286B70B1B0F5800F06D0B0F51A +:105A3000000F18BFB0F5400F17D01FE0F86840F412 +:105A40008030F860EDE0386820F08060386001F068 +:105A5000ADFA81463868000140F1D08001F0A6FA25 +:105A6000A0EB09000228F5D90324D7E001F09EFA43 +:105A7000A0EB0900022840F2C980F5E70124A04606 +:105A80002868010531D5B06800F44078286C80455D +:105A90002AD0FFF71FFBB8F1000FB16805D1286CC1 +:105AA00021F440710143B1601EE0B06840F48030E1 +:105AB000B06021F44071B06820F48030B060286C90 +:105AC0000143B160B068C0070ED501F06FFA80469F +:105AD00041F28939B068800706D401F067FAA0EB7B +:105AE00008004845F6D30324A0462878C10705D509 +:105AF0003168A869890840EA810131602878810706 +:105B000005D53168E86921F44061014331602878A6 +:105B1000C10644BFA86AFFF76FFF2878810644BF1B +:105B2000E86AFFF769FF2878410744BF286AFFF752 +:105B300057FF2878010744BF686AFFF751FF2868BC +:105B4000C1051BD53168686B21F0406101433160AC +:105B5000686BB0F1006F00F0BDF8686BB0F1806F5A +:105B600075D100F0BDF804463868000160D501F039 +:105B70001DFA001B0228F7D94FF0030867E001F077 +:105B800015FA001B02285BD9F6E7316821F0404185 +:105B9000316020F08050326822F040621043306063 +:105BA000A86BB0F1C05F00F095F8286841056DD58D +:105BB0003168E86B21F0405101433160E86BB0F18E +:105BC000005F03D1F96841F48031F960E86BB0F10E +:105BD000805F5BD100F084F804463868000146D548 +:105BE00001F0E4F9001B0228F7D94FF003084DE05B +:105BF00001F0DCF9001B022841D9F6E700F061F85A +:105C0000A86821F4781100F071F881463868000125 +:105C10007FF52CAF3969686901433961002C7FF445 +:105C20002EAF3168286B21F440010143316027E732 +:105C300000F047F8E86821F0606100F057F804468A +:105C4000386800019BD53969686901433961286862 +:105C50008105AAD5A86BB0F1804F1CBFB0F1004FF1 +:105C6000002892D1316821F04041084397E700F0C5 +:105C700028F8286921F0604100F038F804463868B7 +:105C80000001B5D539696869014339612868C104E3 +:105C900005D5F168686C21F440410143F160286842 +:105CA00081040BD5796AE86C21F0300101437962F7 +:105CB000796AA86C890840EA810179624046BDE8AA +:105CC000F2833869696820F4FE4040EA01203861B7 +:105CD0003969704703D1F96841F08071F960704704 +:105CE000396821F08061396001F060B901433961A0 +:105CF000386840F08060386001F058B9104308609F +:105D0000704700008800005838B5040009D004F13D +:105D10008005686808B900F01EF800F021F8012835 +:105D200001D1012032BDA06A08B100F02AF800F0CC +:105D30000AF821F02A01FFE7816000F01BF8BDE8B6 +:105D4000324000F03EBB2068416821F49041416040 +:105D500020688168704700212970204601F090B9C1 +:105D600024206860206801684908490001602046D5 +:105D700000F0BCB92068016841F0010101602046D3 +:105D80007047204600F0BABA70B5044604F18005A9 +:105D90001346686820283DD169B318002BD02878B5 +:105DA000012837D001222A7004F15406216533807E +:105DB00073800020E86021206860706AE8B1DFF835 +:105DC0002013C162DFF81C03716A0863716ADFF88F +:105DD000180348630020716A88632068216D00F110 +:105DE0002802706A01F0E5FA38B11020E86000205E +:105DF000287020206860012070BD21684020086262 +:105E00000020287000F008F841F0800100F061FBEC +:105E1000F8D170BD022070BD206800F1080151E882 +:105E2000001F00F108027047216851E8002F7047F9 +:105E3000206800F1080151E8001F00F1080221F07C +:105E4000400142E8001000287047F8B5044640F6CB +:105E50000F002668F1693268B368084004F15C05F8 +:105E60000ED1880602D5900602D4D80040F1818078 +:105E70006969002900F029812046BDE8F4400847FF +:105E8000DFF8E006034204BFDFF8DC763A4270D068 +:105E9000CF0707D5D70505D5012737622E6B46F00A +:105EA00001062E638E0708D5DE0706D52768022671 +:105EB0003E622E6B46F004062E634E0708D5DE07C1 +:105EC00006D5276804263E622E6B46F002062E6336 +:105ED0000E070AD5960601D4034206D0266808208C +:105EE0003062286B40F008002863080509D550018E +:105EF00007D526684FF400603062286B40F0200020 +:105F00002863286B002833D0890607D5900601D472 +:105F1000D80003D5696909B120468847286B2168F4 +:105F20008A68510602D410F0280F1CD0204600F0D9 +:105F3000EFFA00F0D1F811D5FFF77AFFFCD1286A0B +:105F400060B10FF2B1618163286A01F0ABFA0028F9 +:105F50000ED0286A816BBDE8F44008472046BDE8B2 +:105F6000F24001F091BB204601F08EFB0020286337 +:105F7000F1BD286901286AD1CF0668D5D00666D55B +:105F80001020306200F0A8F82DD5296A0868406812 +:105F900080B20028ECD02A889042E9DA688008684C +:105FA00001688A061BD4FFF73FFF22F4807200F0DD +:105FB0008FF8F8D1206800F07DFAFBD1FFF738FFA9 +:105FC000FCD12020E86200202861FFF72DFF22F09D +:105FD000100200F07DF8F8D1286A01F02DFA298826 +:105FE0006888091A2DE028886988411A688800287D +:105FF0001CBF88B2002868D0226852E8003F23F412 +:10600000907342E800300028F6D1206800F10802C1 +:1060100000F1080352E8002FDFF8C402024043E811 +:1060200000200028F1D12020E8620020286168616A +:10603000226852E8003F23F0100342E800300028B5 +:10604000F6D12046BDE8F44089B201F01EBBC8027B +:1060500009D5580207D54FF4801030622046BDE8BC +:10606000F24000F06DBB080609D5100601D41802F5 +:1060700005D5A96949B32046BDE8F440084748065C +:1060800011D550060FD5FFF7CFFE22F0400200F0E9 +:106090001FF8F8D12020A8620020A8612046BDE8A2 +:1060A000F24001F01CBB080206D5500004D5204682 +:1060B000BDE8F24001F030BBC80148BF002A04D55A +:1060C0002046BDE8F24001F028BBF1BD22F4F07299 +:1060D00041E8002000287047206881684806704722 +:1060E00071650008A3650008A9650008F8B50446B5 +:1060F000DFF838052168DFF838C50A68DFF834753D +:106100000240A06802432069024360690243E069DB +:1061100002430A6000254A68E06822F440520243C4 +:106120004A60A369DFF8102591421CBF206A03432F +:106130008E68DFF80805064033438B600FF2A41623 +:10614000CB6A606A1B0940EA0313CB626145DFF842 +:10615000F0044FF4004339D13F6807F00307032FE1 +:106160004DD8DFE807F0024643494FF0010CE169E2 +:10617000B1F5004F4FF6F07740F08080BCF1010F91 +:1061800009D0BCF1020F0AD0BCF1040F71D0BCF1F0 +:10619000080F71D099E0FFF792FB002815D0626AD2 +:1061A000616836F81230B0FBF3F04A0802EB4002A7 +:1061B000B2FBF1F080B2A0F11001B942EAD207407F +:1061C000C0F3420007432068C7607FE0914216D1C8 +:1061D0003F6817F4406723D0B7F5806F09D0B7F553 +:1061E000006F03D0B7F5406F06D008E04FF0020C07 +:1061F00007E04FF0040C04E04FF0080C01E04FF012 +:10620000100C9142B3D1BCF1000F09D0BCF1020FC8 +:106210000AD0BCF1040F15D0BCF1080F15D054E022 +:10622000FFF745FB002851D0616A36F81120B0FB1A +:10623000F2F6626802EB42018E4246D31103B1428C +:1062400005D242E0FFF7E9FAECE71846ECE7500820 +:10625000002110EB062051EB16610023FBF754F8E8 +:10626000A0F54071DFF8DC2391422ED22268D06085 +:106270002CE0FFF7D2FA90E7184690E7BCF1010F47 +:1062800009D0BCF1020F09D0BCF1040F18D0BCF149 +:10629000080F18D019E0FFF712FBB8B1626A36F8A0 +:1062A00012306168B0FBF3F000EB5100B0FBF1F08D +:1062B00080B2A0F11001B94207D22168C86005E0A0 +:1062C000FFF7ABFAE9E71846E8E7012504F16800B3 +:1062D00001214180018000218160C1602846F2BD1A +:1062E000FEFFFFEF010002000400060008000A00A4 +:1062F0000C001000200040008000000190F82810E1 +:10630000CA0706D502685368C16A23F400330B43F9 +:10631000536090F828108A0706D502685368016B0D +:1063200023F480330B43536090F828104A0706D5B6 +:1063300002685368416B23F480230B43536090F849 +:1063400028100A0706D502685368816B23F40043BE +:106350000B43536090F82810CA0606D5026893686C +:10636000C16B23F480530B43936090F828108A0686 +:1063700006D502689368016C23F400530B439360C5 +:1063800090F828104A0610D502685368416C23F42F +:1063900080130B435360416CB1F5801F05D15368E6 +:1063A000816C23F4C0030B43536090F828100A0655 +:1063B00006D501684A68C06C22F4002202434A6094 +:1063C0007047F8B5044604F180050020E8606FF0DE +:1063D0007E4700F0EBFD0646206801680A0708D5F5 +:1063E0000097334600224FF40011204600F017F8C2 +:1063F00060B9206801684A070AD500973346002231 +:106400004FF48001204600F00AF808B10320F2BDE5 +:1064100020206860A8600020E0662870F2BD2DE9A9 +:10642000F041069C05460E4690461F462868C16905 +:106430003140B1420CBF01200020404526D114F16B +:10644000010FF3D000F0B2FDC01B844200D33CB971 +:1064500000F025F800F02DF8FCD100F01AF811E05A +:10646000286801684A07E1D5C1690A05DED54FF4FD +:106470000062026200F013F800F01BF8FCD100F09B +:1064800008F8C16000210170032000E00020BDE891 +:10649000F08105F18000202141608160704729680A +:1064A00051E8002F22F4D07241E800200028F6D1F4 +:1064B0007047286800F1080151E8001F490800F101 +:1064C0000802490042E8001000287047DFF8780110 +:1064D000014042E80010002870470000026852E8BE +:1064E000003F23F0C00342E800310029F6D10168E3 +:1064F00001F1080252E8002F01F1080322F4000222 +:1065000043E800210029F2D12021C0F8841070470F +:10651000026852E8003F23F4907342E800310029FA +:10652000F6D1016801F1080201F1080352E8002FD9 +:106530000E490A4043E800210029F2D1C16E012929 +:1065400008D1026852E8003F23F0100342E800310E +:106550000029F6D12021C0F888100021C16601670A +:10656000704700000100001020010004FEFFFFEF53 +:106570000146886A09680A68930610D40021A0F8C9 +:106580005610016801F1080252E8002F01F10803DA +:1065900022F0800243E800210029F2D13BE001F023 +:1065A0009EB8806A01F0BAB8F8B5846A04F184052F +:1065B00004F1560728686E6821688A68110606D5B6 +:1065C000212804D1002038802046FFF787FFFFF7FD +:1065D00083FD06D5222E04D1002038812046FFF706 +:1065E00097FFA86840F01000A8602046BDE8F24080 +:1065F00001F04AB8806A00F1560100220A810A803F +:1066000001F042B8026852E8003F23F0800342E8FC +:1066100000310029F6D1026852E8003F43F0400300 +:1066200042E800310029F6D170470000F369FFCF3E +:10663000003801408800005800800040FFF4FF113E +:106640000024F40000FD0F00FEFF7FEF10B500F105 +:1066500080010A78012A01D1022010BD01230B70AC +:1066600024224A6002681368146864086400146095 +:106670000022426623F00053006803602020486037 +:106680000020087010BD70B500F01EF801D1022086 +:1066900070BD00F01FF822F0604209E070B500F014 +:1066A00013F801D1022070BD00F014F822F06062EE +:1066B00011438160204600F01AF82068066020200F +:1066C00068600020287070BD044604F180052878B9 +:1066D0000128704701222A7024206860206806681B +:1066E000026852085200026020688268704730B524 +:1066F000416E11B90121012214E001680FF230044A +:106700008A6889680FF23003520E02F00702490FBF +:10671000655CA45C595C9A5CED00E40095FBF1F1CA +:1067200094FBF2F268304180028030BD000000002E +:10673000010101030701000008040204080101012E +:106740007047704770477047704770477047704791 +:1067500070477047704770477047000038B505466E +:1067600084B068780024FF2802BFB5F8031040F613 +:106770000140814225D165498A88B5F80700921CFD +:10678000904209D1687B0124C10752BF8DF80040B7 +:1067900000218DF8001011E04988491C884210D171 +:1067A0000FF27010FDF748F903208DF8000005F195 +:1067B0000D00B5F80B108DF8081001906846FCF735 +:1067C0001BFD204605B030BD10B58AB050484F4C77 +:1067D000FCF750FC8F218DF81810E520B3218DF8BF +:1067E00019008DF81A10D5202E218DF81B008DF878 +:1067F0001C107F204A218DF81D008DF81E10982056 +:106800002A218DF81F008DF8201048207A218DF85C +:1068100021008DF82210CC2040218DF823008DF826 +:106820002410FE2000218DF82500ADF826100094DC +:106830000823012206A90220FDF7E5FB00F032F84B +:10684000412000F023F8A01C00F010F8062100F011 +:1068500015F800F027F8422000F018F8201D00F08D +:1068600005F8102100F00AF80AB010BD05900121CA +:106870000491029100200A22019070470392009136 +:106880000223208806AA0221FDF70CBC8E218DF878 +:1068900024008DF823100020FE21ADF826008DF88D +:1068A0002510704719208DF81800ED2182208DF8F1 +:1068B0001A008DF81910ED20AE218DF81C008DF80E +:1068C0001B104C2021218DF81E008DF81D10412039 +:1068D0009D218DF820008DF81F10222045218DF874 +:1068E00022008DF82110704780B592224FF6426346 +:1068F000984208D10548009102238188008800222F +:10690000FDF72AFC0246104602BD0000E42B0020E1 +:106910005D6700082D2D2047415454203A204C45F6 +:106920004420434F4E46494755524154494F4E200B +:1069300052454345495645440A0000007047704798 +:1069400070477047704710B50446FAF789FC204637 +:1069500010BD10B5044610460A460146204600F018 +:10696000DFFE204610BD00002DE9F84F4FF0000972 +:10697000674A684B4FF00F0805460E4633E0664FF6 +:10698000BD4214BF072704278F4027434CF82E70C1 +:10699000C1431C6801EA040C7468E40248BF40EA81 +:1069A0000C0CC3F800C05C6801EA040C7468A40213 +:1069B00048BF40EA0C0CC3F804C0146801EA040C98 +:1069C0007468E40348BF40EA0C0CC2F800C0546885 +:1069D00001EA040C7168890348BF40EA0C0CC2F854 +:1069E00004C009F10109316831FA09F000F07E8034 +:1069F000012404FA09F414EA0100F2D04FEA490C28 +:106A0000032101FA0CF16FEA010E716801F003072E +:106A1000012F1CBF01F00301022911D1A968F768F9 +:106A20000EEA010107FA0CF73943A960696821EA07 +:106A300004047168C1F3001101FA09F10C436C60A0 +:106A40004FEA8901347904F00304032C1FD0EC6869 +:106A5000B7680EEA040407FA0CF73C43EC6034799B +:106A600004F00304022C12D14FEAD90705EB870486 +:106A700001F01C07D4F820A008FA07FB2AEA0B0A49 +:106A8000D6F810B00BFA07F747EA0A0727622C6816 +:106A90000EEA0407347904F0030404FA0CF43C43CE +:106AA0002C60746814F4403F9BD0DFF870C04FEA4C +:106AB000990E5CF82E7001F00C0108FA01F427EA37 +:106AC0000404B5F1904F08BF00270ED0144FBD420B +:106AD00008BF012709D0134FBD4208BF022704D0C9 +:106AE000114FBD427FF44BAF03274DE7BDE8F18F57 +:106AF00081B0002A14BF8161816201B070470B4AE6 +:106B0000136803421CBF1060FDF769BE70470000A8 +:106B10008008005800080058001000480800014094 +:106B20000004004800080048000C00480C08005809 +:106B3000C0680840884201D101207047002070479A +:106B4000C0690840884201D1012070470020704789 +:106B500010B5684C02212046FFF7F2FF38B160689B +:106B6000C043810703D5FDF72EFC022018E0012168 +:106B70002046FFF7E5FF38B16068C043C10703D581 +:106B8000FDF7E9FB01200BE008212046FFF7D8FFC5 +:106B900038B16068C043010703D5FDF768FC0820E1 +:106BA000A06010BD10B5534C02212046FFF7C0FF76 +:106BB00058B96068C043810307D5606840F400306D +:106BC0006060BDE81040FDF7F7BB08212046FFF7E5 +:106BD000AFFF70B96068C04301030AD560684649D9 +:106BE00040F400206060086880474FF40020A060F7 +:106BF00010BD20212046FFF79BFF58B96068C043B5 +:106C0000810207D5606840F400106060BDE8104064 +:106C1000FDF7B0BB10BD394881B0016841F4801167 +:106C20000160006800F4801000900098344801680A +:106C300041F4007101603348026842F4007202605E +:106C400040BF20BF3048016841F40041016001B0FD +:106C5000704780B52D48016841F4801101600068DB +:106C600000F48010009000982248016841F0010172 +:106C70000160026842F4803202602C20FEF758F86E +:106C8000BDE802402D20FEF753B8214801684908AD +:106C90004900016070471F494FF480300860704719 +:106CA0001B48016821F002010160704718484FF449 +:106CB00000314160016821F400310160704738B54E +:106CC00004460C4D08212846FFF732FF30B10A4830 +:106CD0000460686820F40020686031BDA0474FF46C +:106CE0000021A96031BD0A48016821F00801016056 +:106CF00070470000000C0058F42B00205001005891 +:106D0000D4080058200800580C04005850000058BF +:106D1000040C0058080C0058484900E0484981B06C +:106D20000A6802430A60096808400090009801B0B0 +:106D3000704780B5FDF776FFFDF776FF41480168A3 +:106D400041F48031016000F03AFDBDE801400EE001 +:106D500000B587B068460FF238211C22FAF790FA86 +:106D6000FDF779FB6846FCF73DF807B000BDF0B5CC +:106D700085B068461421FEF7A9F9002600250024F5 +:106D800000210FF2DC0000EBC102907988B113689A +:106D9000B3F1904F08D02C4FBB4208D02B4FBB42D1 +:106DA00004BF9088044304E09088064301E0908883 +:106DB0000543491C2629E4DB002002900121032021 +:106DC00003900191B0B288B100900120FFF7A4FFB9 +:106DD0000120FFF7A3FF69464FF09040FFF7C4FD85 +:106DE0000022B1B24FF09040FFF782FEA8B280B10E +:106DF00000900220FFF790FF0220FFF78FFF124E56 +:106E000069463046FFF7B0FD0022A9B23046FFF7D1 +:106E10006FFEA0B280B100900420FFF77DFF042038 +:106E2000FFF77CFF094D69462846FFF79DFD0022CC +:106E3000A1B22846FFF75CFE05B0F0BD4C0000583B +:106E40004C01005890080058000400480008004811 +:106E5000FCF7CCB813460A460146002000F01EBCE1 +:106E60000000004801000000000000480100000090 +:106E70000000004801000000000000480100000080 +:106E80000000004801000000000000480100000070 +:106E90000000004801000000000000480100000060 +:106EA0000000004801000000000000480100000050 +:106EB0000000004801000000000000480100000040 +:106EC0000000004801000000000000480100000030 +:106ED0000000004801000000000000480100000020 +:106EE0000000004801000000000000480100000010 +:106EF0000000004801000000000000480100000000 +:106F000000000048010000000000004801000000EF +:106F100000000048010000000000004801000000DF +:106F200000000048010000000000004801000000CF +:106F300000000048010000000000004801000000BF +:106F400000000048010000000000004801000000AF +:106F5000000000480100000000000048010000009F +:106F6000000000480100000000000048010000008F +:106F7000000000480100000000000048010000007F +:106F8000000000480100000000000048010000006F +:106F9000000000000000000000000000606E00081B +:106FA000280003202C000320260404000148406828 +:106FB000704700BFF42500200249016002490161C9 +:106FC000704700BF7B430008A343000870B50F4E15 +:106FD000044630780025A8B1FEF75BFC32784FF408 +:106FE0007A71B1FBF2F1B0FBF1F0FDF7BBFE48B9ED +:106FF000102C07D2002221464FF0FF30FDF77AFE19 +:10700000B46000E00125284670BD00BFF4250020D3 +:10701000944900E0944981B00A6802430A60096813 +:1070200008400090009801B0704780B54FF40020F0 +:10703000FFF7F0FF002200212E20FDF75BFEBDE8E8 +:1070400002402E20FDF774BE00688849884200D0B7 +:10705000704780B54FF48010FFF7DCFF002200215D +:107060002C20FDF747FE2C20FDF762FE00220021B8 +:107070002D20FDF73FFEBDE802402D20FDF758BE54 +:1070800038B59EB0044668461421FEF71FF80AA8DA +:107090005021FEF71BF820687549764D884246D18D +:1070A00002200A90002111910AA8FEF7AFFC08B156 +:1070B000FBF7D9FF286840F00100286029686E4D71 +:1070C00001F00101059105980120FFF7A1FF0C20B7 +:1070D00000900221002001910290032108200391D9 +:1070E000049069464FF09040FFF73EFC63482860EB +:1070F000112000F058F808B1FBF7B5FF4FF08850A9 +:107100000690002101200791ADF82010099006A9F2 +:10711000284600F093FB08B1FBF7A5FFA567AC621A +:10712000002200212520FDF7E5FD252037E0544908 +:10713000884236D101200A90002110910AA8FEF75A +:1071400065FC08B1FBF78FFF686840F48040686019 +:1071500068684C4D00F48040059005980220FFF7C8 +:1071600057FFC020009002210120019102900321CD +:1071700007200391049069464348FFF7F5FB434815 +:1071800028600F2000F00FF808B1FBF76CFFA5672F +:10719000AC62002200212420FDF7ACFD2420FDF785 +:1071A000C7FD1FB030BD68601020A8600020E860F7 +:1071B0008020286100206861A861E8612862284673 +:1071C00000F08EB810B594B0044668465021FDF723 +:1071D0007DFF21682E4A91420FD14FF4007000903C +:1071E0004FF080510E916846FEF710FC08B1FBF796 +:1071F0003AFF4FF48020FFF70DFF14B010BD18B513 +:1072000095B0044601A85021FDF760FF2168214A8E +:10721000914224D14FF4006001904FF4807111919C +:1072200001A8FEF7F3FB08B1FBF71DFF1A48816BBD +:1072300041F4004181630021026842F480620260EF +:107240000022006800F48060009000980320FDF7A1 +:1072500051FD0320FDF76CFD2046FDF7FFFE16B043 +:1072600010BD00004C00005850000058000C0058A1 +:10727000008000405C000058C42900204400024007 +:1072800000380140242A0020000400484404024041 +:1072900000100058002800405800005800B500BFFA +:1072A000130096469446103928BFA0E80C50FAD82F +:1072B0005FEA417C28BF0CC048BF40F8042BC907D7 +:1072C00028BF20F8022B48BF00F8012B00BD0000AA +:1072D000DFF80800006800F4C06070470004005840 +:1072E00038B5040001D1012032BD2168DFF87003F8 +:1072F000814204F1240500F044F8022068700A6815 +:10730000A0686FF30E120243E06802432069024353 +:1073100060690243A0690243E0690243206A0243B4 +:107320000A60204600F070F9A068B0F5804F04BFF5 +:10733000002161602079696A00F03F0000F014F8D4 +:1073400038B1052805D2204600F078F900F012F88F +:1073500003E0002028636863A8630020A86101207F +:1073600068700020287032BD0860A96AE86A486029 +:1073700060687047296B00200860696BA86B4860E3 +:1073800070470AD2DFF8DC0242181423B2FBF3F292 +:1073900092002A62DFF8D00209E0DFF8D00242183A +:1073A0001423B2FBF3F292002A62DFF8C402E86110 +:1073B0007047F8B5044604F124060025307801280A +:1073C00001D10220F2BD01273770707801282FD13A +:1073D00002277770B561206807687F087F00076023 +:1073E000204600F0F5F82168F06820B10A6842F004 +:1073F0000E020A6008E0086820F0040008602068B7 +:10740000016841F00A010160706A0168CA0303D58E +:10741000026842F480720260306B18B1016841F476 +:10742000807101602068026842F00102026001E0A0 +:10743000357002252846F2BD81B040B100F124012B +:107440004A78022A05D004208861002008700120B3 +:1074500026E00268136823F00E0313604A6A13687B +:1074600023F48073136000680268520852000260BF +:10747000012091F82020CB6902F01C029040586056 +:107480008A6AC86A5060086B30B1026822F4807260 +:1074900002604A6B886B50600120487000200870C1 +:1074A00001B0704738B500F1240200245178022958 +:1074B00003D004209061012428E001680B6823F0C8 +:1074C0000E030B6001680D686D086D000D60516A58 +:1074D0000B6823F480730B60012192F82030D5698A +:1074E00003F01C0399406960936AD16A5960116B7B +:1074F00031B10B6823F480730B60536B916B59604F +:10750000012151701470516901B18847204632BD84 +:10751000F8B500F124010423CA69146802681568EB +:1075200091F8206006F01C0603FA06F73C4210D0E2 +:107530006F070ED51468A50603D4156825F0040559 +:10754000156000F03DF8C968002938D0BDE8F44066 +:107550000847022303FA06F73C4213D0AF0711D5C0 +:107560001468A50605D4156825F00A0515600122E2 +:107570004A7000F025F800220A708968F9B1BDE868 +:10758000F4400847082303FA06F6344217D02B07C5 +:1075900015D5136823F00E031360012291F82030F3 +:1075A000CC6903F01C039A40626001228A614A7030 +:1075B00000220A70096911B1BDE8F4400847F1BD25 +:1075C00091F82020CC6902F01C0293406360704760 +:1075D00078B5C56C046D6C60446D14B1846DC56D77 +:1075E0006560012590F84440066C04F01C04A54039 +:1075F0007560046863608068102802D1A260E16051 +:1076000071BDA160E26071BD416C0268144B8908D4 +:107610009A4234BF174B184B03EB8101816402F08F +:10762000FF02083A1421B2FBF1F1144AC26401F0DE +:107630001F01012202FA01F1016570470179104A28 +:1076400001F03F0102EB81024265491E0D4A82654D +:1076500001F0030101228A40C2657047000000006A +:1076600008040240F8FFFDBF00000240F8FBFDBF28 +:1076700000040240000802401C080240800802404A +:10768000FC080240400902407047704763601D4893 +:107690001D4B704723601D481D4B704770B51C463D +:1076A000002300251B4E10B1022804D00AE03460EC +:1076B000FFF7F1FF02E07460FFF7E9FF0360FEF7F8 +:1076C00063FB0346012B05D007D3032B04D038BF3F +:1076D000022502E0012500E00325284670BD82B0A6 +:1076E0000068094A0B49904206D0094A904207D1E6 +:1076F000086828B102B00047486808B102B00047E6 +:1077000002B070471C26002000800040AC260020FC +:1077100000380140AC2B00207047704770470000D4 +:1077200062F30F2262F31F42401810F0030308D0E7 +:10773000C91A1FD3DB0748BF00F8012D28BF20F866 +:10774000022D130030B414461546103928BF20E925 +:107750003C00FAD8490728BF20E90C0048BF40F890 +:10776000042D890028BF20F8022D48BF00F8012D04 +:1077700030BC7047C91818BF00F8012DCB0728BFCF +:1077800000F8012D7047000038B5EFF3108472B691 +:10779000284D6946281D00F090F96946281D00F023 +:1077A000EAF938B184F31088BDF80010224AFFF7D7 +:1077B00051FB31BD0120287084F3108831BD80B5A4 +:1077C000FFF746FB0221009100231A4800F1240133 +:1077D0004FF48052001D00F057F801BD00BFF8B50E +:1077E00014460026EFF3108510F1010F1ED001287A +:1077F0001CBF02284FF0FF3618D1BCB1264672B626 +:107800000C4F012392B2381D00F052F800281CBF23 +:107810003978002908D000223A7085F31088A1B287 +:10782000054AFFF717FB01E085F310883046F2BDEB +:1078300000000000081400208977000818B500F146 +:107840002402507801281BD11378012B01D102208A +:1078500012BD536A10701C680A480440086804434B +:10786000C868401E44EAC04448680443087A497A1C +:1078700044EA004444EA41241C600020107012BD18 +:10788000012012BDFFFD00E010B5029C01604260C6 +:107890000021C1600161416181610381A107047719 +:1078A00004D5008910B14FF0FF3010BD002010BD8D +:1078B0002DE9F04F064685B030890C460027BB46BF +:1078C00000287169DC460CBF4FF00208D84681B130 +:1078D00068B930697768451CBD4228BFED1B376821 +:1078E000385C7D5D00EB0527BF1CBFB203E0074697 +:1078F00000E000B102463069F568A84223BF756810 +:10790000281AC01B0020154608EB050903FB09FED9 +:10791000864532BF0020B0FBF9FA09FB1A00C0B25D +:10792000804509DA96F81C905FEAC97A48BF844618 +:107930005FEA897048BFC446100000F0B4807068E8 +:10794000714461448842C0F0AE8008EB020080B20E +:107950000390D946100AADF802000294ADF8002059 +:10796000049359E0800740D53089002840F09B807F +:107970003268D018A34600F8024C200A32681A4434 +:1079800002F8010C224630681844F9F769FC706966 +:1079900020187061B069019C401CB061200A3168F8 +:1079A0000C70316848701CE08CB3307FC207D9D5A9 +:1079B000308940B931681944FF2001F8020C316860 +:1079C000194401F8010C4FF0000B70692418746120 +:1079D0002C463089002340B931680C70210A306888 +:1079E000417002237069801C706108EB040700215C +:1079F000BFB231615CB1DA44029800EB0A01306831 +:107A000022461844F9F72CFC70692418746109F1B6 +:107A10000109B069401CB061049A706831699145F0 +:107A200045D2791881422CBF081A084630610346B6 +:107A30003089A0B93068BDF80010C1545B1C706873 +:107A40003168834228BF1B1ABDF80200C8545B1C72 +:107A50007068834228BF1B1A7069801C706105FB27 +:107A600009FA7468BDF80000E41A844288BF04462D +:107A7000029800EB0A01281BAC42019003D093D27C +:107A8000307F002890D137682246F818F9F7E8FBD4 +:107A9000706920187061A346019C039F0023A9E729 +:107AA0003068404400E0002005B0BDE8F08F884415 +:107AB0008045F5D3A8EB0008F2E7F8B502460023AD +:107AC0001089546900280CBF022500250026002CCF +:107AD0004DD060B9D36857685E1CBE4228BFF61B04 +:107AE0001768FB5CBE5D03EB0626B6B200E00646F7 +:107AF000137F03F00303012B23D14FF6FF77BE4220 +:107B000008BF002808D0D36817699F4219D2C0B1B6 +:107B10005768FB1A834214D25668D368A41B1C19F9 +:107B200000235461D36058B910680378012E94BFC4 +:107B3000C6F101060126805D03EB0026B6B200E027 +:107B40000646D76854681368E819A04228BF001B8E +:107B500003445069801B401B506105D0F719ED1993 +:107B6000A54228BF2D1BD5609069401E906101B1D0 +:107B70000E801846F2BDF8B50246002410895369FC +:107B800000280CBF022500250026002B3AD0D4681F +:107B9000234658B95768661CBE4228BFF61B1768B3 +:107BA00017F804C0BE5D0CEB062600E00646177F02 +:107BB00007F00307012F1ED1B7B24FF6FF7C6745D0 +:107BC00008BF002807D150680023012894BFC0F1E6 +:107BD000010001200AE01769A7420CD258B157688A +:107BE0003C1B844207D20023064604E01468267832 +:107BF000205C06EB00265068ED18854228BF2D1A40 +:107C00001068441901B10E802046F2BD10B504463B +:107C1000AFF30080204600F005F80446AFF3008083 +:107C2000204610BD7CB500F10F06F608F600B04204 +:107C300040D2082E04D2082602E0083000F047F8AF +:107C4000DFF804512C68210005D1002007E002680C +:107C5000B24221D2011D08680028F8D12068291DF0 +:107C60000A68824222D01368B34238BF111DF7D38D +:107C700012E093190B60801B54685C600B681860FD +:107C80001660096800291DBF48680028081D0020EB +:107C9000286002F1080076BD61B10A681068A0F1A1 +:107CA0000803B342E5D250680860EAE700F04EF8F6 +:107CB0000028C2D1002076BD10B5040006D0AFF375 +:107CC0000080204600F003F8AFF3008010BD0028CC +:107CD00000D1704750B4A0F108021368072B2BD9CC +:107CE00013F0070F28D1184C616809B18A4202D2FB +:107CF0005160626013E0486800B3904238BF0146AB +:107D0000F9D31BE0964203D11B180B600A4606E02C +:107D1000486810B1134498420ED350604A605068CE +:107D200050B11368D118814206D100212160016849 +:107D3000CB1813604068506050BC704708680E183C +:107D4000B242DFD250BC7047D42B002007490868EC +:107D500008B1002070470648C008C0000860054907 +:107D6000C908C900091A0160704700BFFC2B002038 +:107D70000F100020081400201349002008604FF461 +:107D8000E0221248016841F4700101604FF0B041F7 +:107D9000086840F0010008608A600D480A680240E7 +:107DA0000C480A60036823F0050303604268520828 +:107DB0005200426000220848C8600861086820F448 +:107DC000802008608A61704708ED00E088ED00E0DF +:107DD000FBFEF6FA94000058001004220100000097 +:107DE0000300000005000000010000000100000089 +:107DF000060000000A000000200000000200000051 +:107E00000400000008000000100000004000000016 +:107E1000800000000001000000020000A0860100B8 +:107E2000400D0300801A060000350C0040420F0090 +:107E300080841E0000093D0000127A000024F40036 +:107E400000366E010048E801006CDC020000000012 +:107E50000000000000000000000000002DE9F041DB +:107E600007468846387810F0030F16461D4633D073 +:107E7000384600F099F878BBB8F1000F1CBFD8E97C +:107E800000018619012D2ED13888C10415D5396A13 +:107E900007F14402384600F0A3F83A6B044602B9F1 +:107EA0003A69F968384600F09BF8361B341A7A694B +:107EB000F968384600F094F8261A1EB94DB916F143 +:107EC000010F09D097F903002A46314600F08EF8D9 +:107ED000064616F1010F09D12320AFF300804FF0C1 +:107EE000FF30BDE8F081022DE8D1EBE7388810F4CF +:107EF000405F0ED07868F86038617861B861786862 +:107F0000F86107F14400386207F130007862002020 +:107F10003863B8F1000F05D0D8E9020107F1340247 +:107F2000C2E9000139884CF6FF6001403980002029 +:107F3000BDE8F08170B50546AFF300802888810464 +:107F400015D56E680024EA6895F903003146914220 +:107F500012D2521AFFF742FC10F1010F1CBF002889 +:107F60003618F0D10FE04DF6FF7001402980284609 +:107F7000AFF30080002070BD00220021FFF72EFC2F +:107F800010F1010F00D101246868E860A861E86180 +:107F9000002C2988E7D041F4007129802846AFF3EE +:107FA00000804FF0FF3070BDF8B5A0B9AFF300808E +:107FB00000250A4E08244FF0FF37306820B1FFF744 +:107FC000B9FF002848BF3D46361D641EF5D1AFF30A +:107FD00000802846F2BDBDE8F240ABE7AC250020AA +:107FE000914234BF511A0021084670473EB5040043 +:107FF0000D00012A02D100F063F807E0022A07D140 +:1080000000940020019069460C20ABBE2D1801E0C1 +:10801000002A0CD10094019569460A20ABBE0028C5 +:1080200005D100222100280000F027F801E00020FF +:10803000C04303B030BD000010B4314A00211346E4 +:108040001C6884421EBF491C9C6884421EBF491C98 +:108050001C69844209D09C69491C844205D0491C92 +:1080600020331029ECD310BC7047002342F8313084 +:1080700002EBC1014B6010BC704778B4204C002368 +:1080800025462E688E421EBF5B1CAE688E421EBF08 +:108090005B1C2E698E4209D0AE695B1C8E4205D0F6 +:1080A0005B1C2035102BECD372BC7047054604EBEB +:1080B000C303012A04BF59684D195D6072BC704743 +:1080C00010B40F4A002113461C6884421EBF491C8D +:1080D0009C6884421EBF491C1C6984420AD09C696A +:1080E000491C844206D0491C20331029ECD310BC13 +:1080F0000020704702EBC100406810BC70470000D0 +:10810000D028002010B50446E068A169884251D308 +:10811000218849F202030B40022B08D008044CBF0F +:108120004FF400704FF48440014321803BE001F4A0 +:10813000C042B2F5C04F06D1A168884203D32046A1 +:10814000FFF732FF78BB208810F4406F02BF6068F1 +:1081500004F14401884217D14FF40070FFF756FD37 +:10816000606030B904F144006060E060401CA060D1 +:108170000AE0218841F040012180E060606100F563 +:1081800000726068A260E06160682061A068A06120 +:10819000207841070AD502220021204600F00CF881 +:1081A00010F1010F02D14FF0FF3010BD208840F4D4 +:1081B000C0402080002010BD70B504460D46164614 +:1081C000AFF3008033462A4600212046FFF746FEE3 +:1081D00005462046AFF30080284670BD2DE9FC4DD2 +:1081E000016800F10805490805EBC102019200F1A0 +:1081F0000802406800F0010A02EBC108400808EBE1 +:10820000C00B00200021019A95422FD02A68AE1899 +:108210006A68324400920835009A9642F3D016F903 +:10822000014B009A964205D12A68AE186A6832441A +:108230000092083516F8017B884210D1D84508BF56 +:10824000F9F739FDD8F80000D8F80410BAF1000F9A +:1082500018BF48440144884208F10808EED0002CB9 +:1082600000F8017B05D5641CE6D1D5E75846BDE88A +:10827000F68D641ED5D5CFE738B504000ED0207832 +:1082800010F0030F03D094F90300002809D5AFF3D1 +:108290000080204600F030F8AFF300804FF0FF3050 +:1082A00032BD2046FFF780FE0546AFF30080207800 +:1082B000410644BF606800F05DF80020606094F9FA +:1082C0000300022804D900F057F808B14FF0FF3539 +:1082D000E06B48B100F05CF808B14FF0FF35E06B9F +:1082E00000F048F80020E063204600F005F8AFF306 +:1082F0000080284632BD000001780A0626D51C4AB7 +:1083000013680021834203D1002342F821301BE08F +:108310005368012183421EBF022193688342F3D038 +:10832000D368032183421EBF042113698342EBD02B +:108330005369052183421EBF0621936983421EBFF4 +:108340000721D3698342DFD000F014B800210180F7 +:108350004FF0FF31C17000F144014160C160016123 +:1083600041618161C161016200F130014162704788 +:10837000AC250020FFF7A0BC1CB5020000926946A6 +:108380000220ABBE04001000FFF756FE200016BD11 +:10839000E0B50090F8F716FF019069460E20ABBEDD +:1083A00003B000BD7047FEE7FEE7FEE7FEE770475B +:1083B0007047704700F026B8FBF7AFB90848FFF7E1 +:1083C000A7B80848FDF741BD0748FDF73EBDFEF7D9 +:1083D000BFBBFEF7E7BB00F01DB80448FFF798B835 +:1083E000C4290020AC2600201C260020242A0020BE +:1083F0001020FEF784BB0120FEF781BB0220FEF7B0 +:108400007EBB0000024841680278891841607047CD +:10841000F42500200449C8680A6882430A6048605D +:1084200000F004B80000000000150058704738B58F +:108430000C46C5B22046AFF30080E068A1698842CF +:1084400004D32046FFF75EFE00280FD4E068401CEE +:10845000E06000F8015D2088010503D440050BD5DC +:108460000A2D09D12046FFF79FFD28B12046AFF322 +:1084700000804FF0FF3032BD2046AFF30080284629 +:1084800032BD19E050F8042BD30744BFA9F1010312 +:108490009A18091F0023042942F8043BF9D25FEA25 +:1084A000817C134604D54FF0000CA2F800C09B1C41 +:1084B000C90744BF0021197050F8041B0029E1D1FD +:1084C0007047000038B50D4D0824286800281CBFEF +:1084D000017811F0030F05D090F90310002958BF5F +:1084E000FFF7CAFE2D1D641EEFD1BDE83840002203 +:1084F00000214FF0FF30FFF771B900BFAC2500201D +:1085000010B5074979441831064C7C44163404E010 +:108510000A68081D114488470146A142F8D110BDE0 +:108520002C000000780000004EF68851CEF20001C9 +:10853000086840F470000860BFF34F8FBFF36F8F7F +:108540004FF00070E1EE100A7047000037FFFFFFA8 +:10855000E80500001C260020700800003000032001 +:108560000000000079FCFFFF020000000200000094 +:10857000980100000200000028000320080000000D +:108580005DFCFFFF02000000020000007E01000011 +:108590005001000008140020141200000000000028 +:1085A00000000000000000000000000001000000CA +:1085B00002000000030000000400000000F00DF8BD +:1085C000002801D0FFF79CFFAFF300800020AFF33D +:1085D0000080FAF762FC00F002F80120704700F01A +:1085E00001B800000746FFF76DFF3846F9F71CFC9D +:1085F000FBE738B504460D46284600F005F8A842CA +:1086000018BF0024204632BD0149FFF710BF00BF4C +:10861000BC2400200148804701480047797D0008BC +:1086200025860008AFF30080FFF77EFFFFF7C6FF47 +:1086300000002E004300FFF7FEBFFFF7FEBFFFF76D +:10864000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF75E +:10865000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF74E +:10866000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF73E +:10867000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF72E +:10868000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF71E +:10869000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF70E +:1086A000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7FE +:1086B000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7EE +:1086C000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7DE +:1086D000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7CE +:1086E000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7BE +:1086F000FEBFFFF7FEBFFFF7FEBFFFF7FEBFFFF7AE +:10870000FEBFFFF7FEBF0000F800000181008100FE +:108710008100810081008100810081008100810051 +:108720008100810081008100810081008100810041 +:108730008100810081008100810081008100810031 +:10874000810081008100810081008100BD0004342E +:1087500086000801FD00034C250020D80003E51029 +:108760000008FC0004D310000801F9001301040004 +:1087700000B8240020B9240020B8240020B8240028 +:1087800020FC0003B8240020FC0007B8240020A42B +:10879000240020E0001302040101D42A0020242B2D +:1087A0000020D42A0020D42A0020FC0003D42A0070 +:1087B00020FB0006250020EC240020E00013020826 +:1087C0000202842A0020D42A0020842A0020842A3D +:1087D0000020FC0003842A0020FC0007482500201C +:1087E00034250020E0001B30860008308600083069 +:1087F0008600083086000830860008308600083081 +:10880000860008F8FF0B32860008308600083086A4 +:108810000008FAFFEA00F8FFF4000B74240020BC03 +:1088200024002004250020EC00030DFF0183E2005A +:1088300006484200007A4401F9000010FC001A04C6 +:108840000048000400480004004800080048000CEC +:0A8850000048000C004800093D003C +:040000050800862544 :00000001FF diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h index 7758413a8..68fad0279 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -292,6 +292,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -301,11 +305,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -313,6 +321,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -460,8 +480,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -580,11 +601,11 @@ typedef enum CFG_TASK_CONN_UPDATE_REG_ID, #endif CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW1_BUTTON_PUSHED_ID, CFG_TASK_SW2_BUTTON_PUSHED_ID, CFG_TASK_SW3_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -593,11 +614,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -630,9 +652,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -643,5 +665,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h index ff084c8f2..c1ccd8d90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -70,5 +69,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h index fa15e73b5..4e33c550a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -255,5 +254,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/main.h index 7021f679b..cc5e9fe2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h index aca81fcf3..60bbdd235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h index dea48166c..890fff04c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c index 94d498fd3..e1ad5f57d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -77,6 +78,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); /* USER CODE BEGIN PFP */ @@ -159,9 +162,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -356,12 +358,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -462,6 +603,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -506,4 +649,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/main.c index 7af84a4ee..f7de13711 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -78,6 +78,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -117,6 +118,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -196,19 +199,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1|RCC_PERIPHCLK_CLK48SEL - |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -497,5 +504,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c index a86de2302..29e626def 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,11 +146,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -207,6 +216,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -315,11 +334,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RNG_MspInit(RNG_HandleTypeDef* hrng) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrng->Instance==RNG) { /* USER CODE BEGIN RNG_MspInit 0 */ /* USER CODE END RNG_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RNG; + PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RNG_CLK_ENABLE(); /* USER CODE BEGIN RNG_MspInit 1 */ @@ -359,11 +388,21 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -407,4 +446,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c index a261d3dea..731cab145 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -353,4 +352,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp index 788e64f28..90e967e14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/BLE_p2pServer.ewp @@ -1111,6 +1111,12 @@                                                                   + + CMSIS + + $PROJ_DIR$/../Core/Src/system_stm32wbxx.c + + STM32WBxx_HAL_Driver @@ -1161,15 +1167,15 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rng.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rng.c - $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c @@ -1177,12 +1183,6 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - - CMSIS - - $PROJ_DIR$/../Core/Src/system_stm32wbxx.c - - Middlewares @@ -1209,9 +1209,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c @@ -1242,6 +1239,9 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 6dc0441bd..028c75075 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c index 788034bad..957c7744b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -382,26 +381,27 @@ void APP_BLE_Init( void ) { {{0,0,0}}, /**< Header unused */ {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + 0, /** BleBufferSize not used */ + CFG_BLE_NUM_GATT_ATTRIBUTES, + CFG_BLE_NUM_GATT_SERVICES, + CFG_BLE_ATT_VALUE_ARRAY_SIZE, + CFG_BLE_NUM_LINK, + CFG_BLE_DATA_LENGTH_EXTENSION, + CFG_BLE_PREPARE_WRITE_LIST_SIZE, + CFG_BLE_MBLOCK_COUNT, + CFG_BLE_MAX_ATT_MTU, + CFG_BLE_SLAVE_SCA, + CFG_BLE_MASTER_SCA, + CFG_BLE_LSE_SOURCE, + CFG_BLE_MAX_CONN_EVENT_LENGTH, + CFG_BLE_HSE_STARTUP_TIME, + CFG_BLE_VITERBI_MODE, + CFG_BLE_OPTIONS, + 0, + CFG_BLE_MAX_COC_INITIATOR_NBR, + CFG_BLE_MIN_TX_POWER, + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1263,6 +1263,8 @@ static void BLE_UserEvtRx( void * pPayload ) { pParam->status = HCI_TL_UserEventFlow_Disable; } + + return; } static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) @@ -1305,4 +1307,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h index 2b742007f..ab883018e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h index 7d63f62fb..db4fb50f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,4 +68,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h index 3a868a150..235f405a5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,5 +196,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c index fd07d3d63..f3f0b9b5e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file p2p_server_app.c - * @author MCD Application Team - * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file p2p_server_app.c + * @author MCD Application Team + * @brief Peer to peer Server Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -46,7 +45,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -385,5 +384,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h index fd915159d..13c38df1d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * @file p2p_server_app.h + * @author MCD Application Team + * @brief PHeader for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +77,3 @@ typedef struct #endif #endif /*__P2P_SERVER_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..fa6454264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +667,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/readme.txt index ef59c96ce..2b44a1bb2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pServer application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin index 6346277ac..1b4246f63 100644 Binary files a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin and b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Binary/BLE_p2pServer_ota_reference.bin differ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h index 336526486..eb9290e34 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -292,6 +292,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -301,11 +305,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -313,6 +321,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -621,7 +642,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -640,5 +661,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h index bccc06db7..ba1c6fde8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,5 +271,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h index 3f5e33636..a1e5fa12e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h index 316f32ae3..1990a4ef1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h index eec6a770b..c7e221d07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c index a3cecdd9f..b9066f637 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c index a8dbcd8d6..bb8e4698f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,8 +29,12 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "otp.h" +#include "shci.h" +#include "dbg_trace.h" -/* Private includes -----------------------------------------------------------*/ +/* Private includes + -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ /* USER CODE END Includes */ @@ -69,6 +72,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); @@ -196,12 +201,149 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -307,4 +449,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c index 4e7a6ab5c..b582d6f8e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -672,5 +672,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c index bc34026dd..c51a70a3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -386,4 +385,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c index 4afccfa78..32ca22953 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -343,4 +342,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c index da850965c..80b59155f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -348,5 +349,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf index 4ab0df190..1ff6694e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/EWARM/stm32wb55xx_flash_cm4_ota.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define region OTA_TAG_region = mem:[from (__ICFEDIT_region_ROM_start__ + 0x140) to (__ICFEDIT_region_ROM_start__ + 0x140 + 4)]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; @@ -33,12 +34,13 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; keep { section TAG_OTA_START}; keep { section TAG_OTA_END }; -place in OTA_TAG_region { section TAG_OTA_START }; -place in ROM_region { readonly, last section TAG_OTA_END }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in OTA_TAG_region { section TAG_OTA_START }; +place in ROM_region { readonly, last section TAG_OTA_END }; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb55xx_cm4.s index ae8ea1d13..6b15e16b3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -366,4 +366,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct index bd5d6db03..d3f87e77c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,15 @@ LR_IROM1 0x08007000 0x260 { ; load region size_region RW_IRAM1 0x20000008 0x0002FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM2aRet_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) + + RW_RAM2aRet_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM2aRet_SHARED2 0x20030028 0x27D8 { ; RW data *(MB_MEM1) *(MB_MEM2) - } + .ANY (+RW +ZI) + } } LR_IROM3 0x08007260 0x78DA0 { diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 271d8e39d..3d37eafd6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -158,7 +142,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c index 869890a0c..3723430c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -394,7 +393,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1223,4 +1223,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h index 657ba432b..a3a0637b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Key_Button3_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h index e4e4af40b..611cad1de 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 1/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h index 926abb3f0..0f78a5a4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c index 5c95b3afe..7e3e501d4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -46,7 +45,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -385,5 +384,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h index ab5aaf17e..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/App/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/readme.txt index 2eef8f25b..c4231585c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_p2pServer_ota/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pServer_ota application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h index 5bb0f82f1..a49e4fde7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,4 +120,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h index 697f3841f..8bad72c0d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,8 +44,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -96,7 +96,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -300,7 +300,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -320,4 +320,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h index 23fdbeab6..018d0784a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h - * Description : Hardware configuration file for the application. + * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,4 +109,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h index edb1a92a6..72f6b9449 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void MX_UART_Deinit(hw_uart_id_t uart); #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h index 0c024028b..05a9002bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void SystemClock_Config_MSI(uint32_t usePLL); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h index dac7e2cbb..293e9912d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32_lpm_if.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_LPM_IF_H @@ -75,5 +74,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h index 365809937..f7f0c092e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h index f34e3a9d7..ca9fd56c1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h index 119d6e7a0..e60099e7c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/stm_logging.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c index 7e59c6279..84942ccd9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -415,4 +414,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c index 1ccb7b42f..2c64a7493 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2015 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +110,3 @@ void gpio_lld_lpuart_deInit(void) { } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c index 3c842b29a..a693ffc14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -439,4 +438,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c index 5ca59d21b..44e6ad3d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief RF LLD tests application * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -605,5 +605,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END assert_failed */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c index b783825ba..966f21306 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -282,5 +281,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c index e82f86f8a..7956983fa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -322,4 +321,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c index 791008e1d..1f4da1444 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -351,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb55xx_flash_cm4.icf index ddc12f77c..f9aff22d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,10 +32,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c index ea1573ea1..438c73df3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.c @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -387,4 +386,3 @@ void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h index 3bd87e32c..21899be1e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/app_ble_lld.h @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_BLE_LLD_H #define APP_BLE_LLD_H @@ -68,4 +67,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c index 3dffc5b0f..c993c80c0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : chat_app.c * Description : CHAT LLD BLE Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -354,4 +353,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h index 4a79927a7..fd6ea0f9b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/chat_app.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : chat_app.h * Description : Header for BLE LLD application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef CHAT_APP_H @@ -47,4 +46,3 @@ void Appli_TIM_PeriodElapsedCallback(void); #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c index 7ce3de621..bed7dfbd3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,10 +162,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -673,4 +669,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt index 2764c0537..6e7650c67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE LLD BLE_LLD_Chat application ****************************************************************************** * - * Copyright (c) 2021 STMicroelectronics. All rights reserved. + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_common.h new file mode 100644 index 000000000..a49e4fde7 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_common.h @@ -0,0 +1,122 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_common.h + * Description : App Common application configuration file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_COMMON_H +#define APP_COMMON_H + +#ifdef __cplusplus +extern "C"{ +#endif + +#include +#include +#include +#include +#include + +#include "main.h" +#include "app_conf.h" + + /* -------------------------------- * + * Basic definitions * + * -------------------------------- */ + +#undef NULL +#define NULL 0 + +#undef FALSE +#define FALSE 0 + +#undef TRUE +#define TRUE (!0) + + /* -------------------------------- * + * Critical Section definition * + * -------------------------------- */ +#define BACKUP_PRIMASK() uint32_t primask_bit= __get_PRIMASK() +#define DISABLE_IRQ() __disable_irq() +#define RESTORE_PRIMASK() __set_PRIMASK(primask_bit) + + /* -------------------------------- * + * Macro delimiters * + * -------------------------------- */ + +#define M_BEGIN do { + +#define M_END } while(0) + + /* -------------------------------- * + * Some useful macro definitions * + * -------------------------------- */ + +#ifndef MAX +#define MAX( x, y ) (((x)>(y))?(x):(y)) +#endif + +#ifndef MIN +#define MIN( x, y ) (((x)<(y))?(x):(y)) +#endif + +#define MODINC( a, m ) M_BEGIN (a)++; if ((a)>=(m)) (a)=0; M_END + +#define MODDEC( a, m ) M_BEGIN if ((a)==0) (a)=(m); (a)--; M_END + +#define MODADD( a, b, m ) M_BEGIN (a)+=(b); if ((a)>=(m)) (a)-=(m); M_END + +#define MODSUB( a, b, m ) MODADD( a, (m)-(b), m ) + +#define PAUSE( t ) M_BEGIN \ + __IO int _i; \ + for ( _i = t; _i > 0; _i -- ); \ + M_END + +#define DIVF( x, y ) ((x)/(y)) + +#define DIVC( x, y ) (((x)+(y)-1)/(y)) + +#define DIVR( x, y ) (((x)+((y)/2))/(y)) + +#define SHRR( x, n ) ((((x)>>((n)-1))+1)>>1) + +#define BITN( w, n ) (((w)[(n)/32] >> ((n)%32)) & 1) + +#define BITNSET( w, n, b ) M_BEGIN (w)[(n)/32] |= ((U32)(b))<<((n)%32); M_END + +#define CRITICAL_BEGIN( ) M_BEGIN BACKUP_PRIMASK(); DISABLE_IRQ() + +#define CRITICAL_END( ) RESTORE_PRIMASK(); M_END + + /* -------------------------------- * + * Compiler * + * -------------------------------- */ +#define PLACE_IN_SECTION( __x__ ) __attribute__((section (__x__))) + +#ifdef WIN32 +#define ALIGN(n) +#else +#define ALIGN(n) __attribute__((aligned(n))) +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_COMMON_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_conf.h new file mode 100644 index 000000000..3c4c5e787 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_conf.h @@ -0,0 +1,336 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_conf.h + * Description : Application configuration file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_CONF_H +#define APP_CONF_H + +#include "hw.h" +#include "hw_conf.h" +#include "hw_if.h" + +/****************************************************************************** + * Application Config + ******************************************************************************/ +#define CFG_HS_STARTUP_TIME 0x0099 /* Start up time of the high speed oscillator in system time units (625/256us) */ + +#define CFG_BACK2BACK_TIME 450 /* Back to back time (us) */ + +/****************************************************************************** + * Transport Layer + ******************************************************************************/ +/** + * Queue length of M0 traces/log messages + * This parameter defines the number of asynchronous events that can be stored in the M0 test FW before + * being reported to the M4 which will re-build traces/log messages before to send them to UART. + * This parameter is combined with the CFG_TL_MOST_EVENT_PAYLOAD_SIZE to calculate the queue size needed by M0 for traces. + */ +#define CFG_TL_EVT_QUEUE_LENGTH 20 +/** + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART + * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) + */ +#define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 + +#define TL_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TL_MOST_EVENT_PAYLOAD_SIZE ) + +/****************************************************************************** + * UART interfaces + ******************************************************************************/ +/** + * Select UART interfaces + */ +#define CFG_DEBUG_TRACE_UART hw_lpuart1 +#define CFG_UART hw_uart1 + +/****************************************************************************** + * USB interface + ******************************************************************************/ + +/** + * Enable/Disable USB interface + */ +#define CFG_USB_INTERFACE_ENABLE 0 + +/****************************************************************************** + * Low Power + * + * When BLE_LLD_LP is set to 1: + * the system is configured in low power mode CFG_LPM_SUPPORTED + * + * When BLE_LLD_LP is not set, the low power mode is not activated + * + ******************************************************************************/ +#define CFG_LPM_SUPPORTED 0 + +#ifdef BLE_LLD_LP +#undef CFG_LPM_SUPPORTED +#define CFG_LPM_SUPPORTED 1 +#endif + +#define CFG_PWR_MODE_STOP LL_PWR_MODE_STOP2 + +/****************************************************************************** + * Timer Server + ******************************************************************************/ +/** + * CFG_RTC_WUCKSEL_DIVIDER: This sets the RTCCLK divider to the wakeup timer. + * The higher is the value, the better is the power consumption and the accuracy of the timerserver + * The lower is the value, the finest is the granularity + * + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output + * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding + * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. + * + * CFG_RTC_SYNCH_PRESCALER: This sets the synchronous prescaler of the RTC. + * When the 1Hz calendar clock is required, it shall be sets according to other settings + * When the 1Hz calendar clock is not needed, CFG_RTC_SYNCH_PRESCALER should be set to 0x7FFF (MAX VALUE) + * + * CFG_RTCCLK_DIVIDER_CONF: + * Shall be set to either 0,2,4,8,16 + * When set to either 2,4,8,16, the 1Hhz calendar is supported + * When set to 0, the user sets its own configuration + * + * The following settings are computed with LSI as input to the RTC + */ +#define CFG_RTCCLK_DIVIDER_CONF 0 + +#if (CFG_RTCCLK_DIVIDER_CONF == 0) +/** + * Custom configuration + * It does not support 1Hz calendar + * It divides the RTC CLK by 16 + */ +#define CFG_RTCCLK_DIV (16) +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) +#define CFG_RTC_SYNCH_PRESCALER (0x7FFF) + +#else + +#if (CFG_RTCCLK_DIVIDER_CONF == 2) +/** + * It divides the RTC CLK by 2 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (3) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 4) +/** + * It divides the RTC CLK by 4 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (2) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 8) +/** + * It divides the RTC CLK by 8 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (1) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 16) +/** + * It divides the RTC CLK by 16 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#endif + +#define CFG_RTCCLK_DIV CFG_RTCCLK_DIVIDER_CONF +#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) +#define CFG_RTC_SYNCH_PRESCALER (DIVR( LSE_VALUE, (CFG_RTC_ASYNCH_PRESCALER+1) ) - 1 ) + +#endif + +/** tick timer value in us */ +#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) + +typedef enum +{ + CFG_TIM_PROC_ID_ISR, +} CFG_TimProcID_t; + +/****************************************************************************** + * Debug + ******************************************************************************/ +/** + * When set, this resets some hw resources to set the device in the same state than the power up + * The FW resets only register that may prevent the FW to run properly + * + * This shall be set to 0 in a final product + * + */ +#define CFG_HW_RESET_BY_FW 1 + +/** + * keep debugger enabled while in any low power mode when set to 1 + * should be set to 0 in production + */ +#define CFG_DEBUGGER_SUPPORTED 1 + +#if (CFG_LPM_SUPPORTED == 1) +#undef CFG_DEBUGGER_SUPPORTED +#define CFG_DEBUGGER_SUPPORTED 0 +#endif + +/***************************************************************************** + * Traces + * Enable or Disable traces in application + * When CFG_DEBUG_TRACE is set, traces are activated + * + * Note : Refer to utilities_conf.h file in order to details + * the level of traces : CFG_DEBUG_TRACE_FULL or CFG_DEBUG_TRACE_LIGHT + *****************************************************************************/ +#define CFG_DEBUG_TRACE 1 + +#if (CFG_LPM_SUPPORTED == 1) +#undef CFG_DEBUG_TRACE +#define CFG_DEBUG_TRACE 0 +#endif + +/** + * When CFG_DEBUG_TRACE_FULL is set to 1, the trace are output with the API name, the file name and the line number + * When CFG_DEBUG_TRACE_LIGHT is set to 1, only the debug message is output + * + * When both are set to 0, no trace are output + * When both are set to 1, CFG_DEBUG_TRACE_FULL is selected + */ +#define CFG_DEBUG_TRACE_LIGHT 1 +#define CFG_DEBUG_TRACE_FULL 0 + +#if (( CFG_DEBUG_TRACE != 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 ) && (CFG_DEBUG_TRACE_FULL == 0)) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 1 +#endif + +#if ( CFG_DEBUG_TRACE == 0 ) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 0 +#endif + +/** + * When not set, the traces is looping on sending the trace over UART + */ +#define DBG_TRACE_USE_CIRCULAR_QUEUE 1 + +/** + * max buffer Size to queue data traces and max data trace allowed. + * Only Used if DBG_TRACE_USE_CIRCULAR_QUEUE is defined + */ +#define DBG_TRACE_MSG_QUEUE_SIZE 4096 +#define MAX_DBG_TRACE_MSG_SIZE 1024 + +/****************************************************************************** + * Configure Log level for Application + ******************************************************************************/ +#define APPLI_CONFIG_LOG_LEVEL LOG_LEVEL_INFO +#define APPLI_PRINT_FILE_FUNC_LINE 0 + +/* USER CODE BEGIN Defines */ +/****************************************************************************** + * User interaction + * When CFG_LED_SUPPORTED is set, LEDS are activated if requested + * When CFG_BUTTON_SUPPORTED is set, the push button are activated if requested + ******************************************************************************/ +#if (CFG_LPM_SUPPORTED == 1) +#define CFG_LED_SUPPORTED 1 +#define CFG_BUTTON_SUPPORTED 1 +#else +#define CFG_LED_SUPPORTED 1 +#define CFG_BUTTON_SUPPORTED 1 +#endif + + +/* USER CODE END Defines */ + +/****************************************************************************** + * Scheduler + ******************************************************************************/ + /** + * This is the list of task id required by the application + * Each Id shall be in the range 0..31 + */ + +typedef enum +{ + CFG_TASK_CMD_FROM_M0_TO_M4, + CFG_TASK_SEND_CLI_TO_M0, + CFG_TASK_SEND_TO_M0, +/* USER CODE BEGIN IdleTask */ + CFG_TASK_BUTTON, +/* USER CODE END IdleTask */ + CFG_TASK_SYSTEM_HCI_ASYNCH_EVT, + CFG_TASK_PROCESS_UART_RX_BUFFER, + CFG_TASK_PROCESS_UART_RX_IT, + CFG_TASK_PROCESS_UART_TX_IT, + CFG_TASK_NBR /**< Shall be last in the list */ +} CFG_IdleTask_Id_t; + +/** + * This is the list of priority required by the application + * Each Id shall be in the range 0..31 + */ +typedef enum +{ + CFG_SCH_PRIO_0, + CFG_SCH_PRIO_1, + CFG_PRIO_NBR, +} CFG_SCH_Prio_Id_t; + +/** + * This is a bit mapping over 32bits listing all events id supported in the application + */ +typedef enum +{ + CFG_EVT_SYSTEM_HCI_CMD_EVT_RESP, + CFG_EVT_RECEIVE_RSPACKEVT, + CFG_EVT_RECEIVE_ENDPACKEVT, +} CFG_IdleEvt_Id_t; + +/****************************************************************************** + * LOW POWER + ******************************************************************************/ +/** + * Supported requester to the MCU Low Power Manager - can be increased up to 32 + * It lists a bit mapping of all user of the Low Power Manager + */ +typedef enum +{ + CFG_LPM_APP, + CFG_LPM_APP_BLE_LLD, + /* USER CODE BEGIN CFG_LPM_Id_t */ + + /* USER CODE END CFG_LPM_Id_t */ +} CFG_LPM_Id_t; + +/****************************************************************************** + * OTP manager + ******************************************************************************/ +#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE + +#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR + +#endif /*APP_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_entry.h new file mode 100644 index 000000000..1db7656d6 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_entry.h @@ -0,0 +1,66 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_ENTRY_H +#define APP_ENTRY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void APPE_Init( void ); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_ENTRY_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/gpio_lld.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/gpio_lld.h new file mode 100644 index 000000000..e9ceb78c0 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/gpio_lld.h @@ -0,0 +1,179 @@ +/* + * gpio_lld.h + * + */ + +#ifndef GPIO_LLD_H_ +#define GPIO_LLD_H_ + +#define GPIO_HARD_FAULT_PIN GPIO_PIN_4 +#define GPIO_HARD_FAULT_PORT GPIOA + +// External PA TX/RX pin is fixed by the chip +#define GPIO_EXT_PA_TX_PIN GPIO_PIN_0 +#define GPIO_EXT_PA_TX_PORT GPIOB +// External PA enable pin is chosen by user +#define GPIO_EXT_PA_EN_PIN GPIO_PIN_9 +#define GPIO_EXT_PA_EN_PORT GPIOB + +void gpio_lld_phy_init( void ); +void gpio_lld_phy_gpioTx_up(void); +void gpio_lld_phy_gpioTx_down(void); +void gpio_lld_phy_gpioHardFault_up(void); +void gpio_lld_phy_gpioHardFault_down(void); +void gpio_lld_phy_gpio1_up(void); +void gpio_lld_phy_gpio1_down(void); +void gpio_lld_phy_gpio2_up(void); +void gpio_lld_phy_gpio2_down(void); +void gpio_lld_phy_deInit(void); + +void gpio_lld_mco_init(uint32_t mcoSource, uint32_t mcoDiv); +void gpio_lld_mco_deInit(void); + +void gpio_lld_extPa_init(void); +void gpio_lld_extPa_deInit(void); + +#ifdef USE_SIMU +void gpio_lld_SimuMaster_init(void); +void gpio_lld_SimuSlave_init(void); +#endif + +void gpio_lld_lpuart_init(void); +void gpio_lld_lpuart_deInit(void); + +void gpio_lld_usart_init(void); +void gpio_lld_usart_deInit(void); + +#if !defined (USE_SIMU) && !defined(USE_FPGA) +void gpio_lld_pa2_init(uint8_t mode); +void gpio_lld_pa2_deInit(void); + +void gpio_lld_dtb_init(uint8_t dtbMode); +void gpio_lld_dtb_deInit(void); +#endif + +void gpio_lld_led1_toggle(void); +void gpio_lld_led2_toggle(void); +void gpio_lld_led3_toggle(void); + +#ifdef STM32WB15xx +#define BUTTON_SW1_EXTI_IRQHandler EXTI0_IRQHandler +#define BUTTON_SW2_EXTI_IRQHandler EXTI4_IRQHandler +#define BUTTON_SW3_EXTI_IRQHandler EXTI9_5_IRQHandler + +/** + * @brief USART pins + */ +#define USART_CLK_ENABLE() __HAL_RCC_USART1_CLK_ENABLE() + +#define USART_TX_AF GPIO_AF7_USART1 +#define USART_TX_GPIO_PORT GPIOA +#define USART_TX_PIN GPIO_PIN_9 +#define USART_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() +#define USART_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOA_CLK_DISABLE() + +#define USART_RX_AF GPIO_AF7_USART1 +#define USART_RX_GPIO_PORT GPIOA +#define USART_RX_PIN GPIO_PIN_10 +#define USART_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() +#define USART_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOA_CLK_DISABLE() + +/** + * @brief LPUART pins + */ +#define LPUART_CLK_ENABLE() __HAL_RCC_LPUART1_CLK_ENABLE() + +#define LPUART_TX_AF GPIO_AF8_LPUART1 +#define LPUART_TX_GPIO_PORT GPIOA +#define LPUART_TX_PIN GPIO_PIN_2 +#define LPUART_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() +#define LPUART_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOA_CLK_DISABLE() + +#define LPUART_RX_AF GPIO_AF8_LPUART1 +#define LPUART_RX_GPIO_PORT GPIOA +#define LPUART_RX_PIN GPIO_PIN_3 +#define LPUART_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() +#define LPUART_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOA_CLK_DISABLE() +#endif + +#ifdef STM32WB35xx +#define BUTTON_SW1_EXTI_IRQHandler EXTI0_IRQHandler +#define BUTTON_SW2_EXTI_IRQHandler EXTI4_IRQHandler +#define BUTTON_SW3_EXTI_IRQHandler EXTI9_5_IRQHandler + +/** + * @brief USART pins + */ +#define USART_CLK_ENABLE() __HAL_RCC_USART1_CLK_ENABLE() + +#define USART_TX_AF GPIO_AF7_USART1 +#define USART_TX_GPIO_PORT GPIOB +#define USART_TX_PIN GPIO_PIN_6 +#define USART_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define USART_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() + +#define USART_RX_AF GPIO_AF7_USART1 +#define USART_RX_GPIO_PORT GPIOB +#define USART_RX_PIN GPIO_PIN_7 +#define USART_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define USART_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() + +/** + * @brief LPUART pins + */ +#define LPUART_CLK_ENABLE() __HAL_RCC_LPUART1_CLK_ENABLE() + +#define LPUART_TX_AF GPIO_AF8_LPUART1 +#define LPUART_TX_GPIO_PORT GPIOB +#define LPUART_TX_PIN GPIO_PIN_5 +#define LPUART_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define LPUART_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() + +#define LPUART_RX_AF GPIO_AF8_LPUART1 +#define LPUART_RX_GPIO_PORT GPIOA +#define LPUART_RX_PIN GPIO_PIN_3 +#define LPUART_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOA_CLK_ENABLE() +#define LPUART_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOA_CLK_DISABLE() +#endif + +#ifdef STM32WB55xx +#define BUTTON_SW1_EXTI_IRQHandler EXTI4_IRQHandler +#define BUTTON_SW2_EXTI_IRQHandler EXTI0_IRQHandler +#define BUTTON_SW3_EXTI_IRQHandler EXTI1_IRQHandler + +/** + * @brief USART pins + */ +#define USART_CLK_ENABLE() __HAL_RCC_USART1_CLK_ENABLE() + +#define USART_TX_AF GPIO_AF7_USART1 +#define USART_TX_GPIO_PORT GPIOB +#define USART_TX_PIN GPIO_PIN_6 +#define USART_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define USART_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() + +#define USART_RX_AF GPIO_AF7_USART1 +#define USART_RX_GPIO_PORT GPIOB +#define USART_RX_PIN GPIO_PIN_7 +#define USART_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOB_CLK_ENABLE() +#define USART_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOB_CLK_DISABLE() + +/** + * @brief LPUART pins + */ +#define LPUART_CLK_ENABLE() __HAL_RCC_LPUART1_CLK_ENABLE() + +#define LPUART_TX_AF GPIO_AF8_LPUART1 +#define LPUART_TX_GPIO_PORT GPIOC +#define LPUART_TX_PIN GPIO_PIN_1 +#define LPUART_TX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOC_CLK_ENABLE() +#define LPUART_TX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOC_CLK_DISABLE() + +#define LPUART_RX_AF GPIO_AF8_LPUART1 +#define LPUART_RX_GPIO_PORT GPIOC +#define LPUART_RX_PIN GPIO_PIN_0 +#define LPUART_RX_GPIO_CLK_ENABLE() __HAL_RCC_GPIOC_CLK_ENABLE() +#define LPUART_RX_GPIO_CLK_DISABLE() __HAL_RCC_GPIOC_CLK_DISABLE() +#endif + +#endif /* GPIO_LLD_H_ */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_conf.h new file mode 100644 index 000000000..56e0228a8 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_conf.h @@ -0,0 +1,184 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : hw_conf.h + * Description : Hardware configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_CONF_H +#define HW_CONF_H + +/****************************************************************************** + * Semaphores + * THIS SHALL NO BE CHANGED AS THESE SEMAPHORES ARE USED AS WELL ON THE CM0+ + *****************************************************************************/ +/** +* The CPU2 may be configured to store the Thread persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* CFG_HW_THREAD_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_THREAD_NVM_SRAM_SEMID 9 + +/** +* The CPU2 may be configured to store the BLE persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* CFG_HW_BLE_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_BLE_NVM_SRAM_SEMID 8 + +/** +* Index of the semaphore used by CPU2 to prevent the CPU1 to either write or erase data in flash +* The CPU1 shall not either write or erase in flash when this semaphore is taken by the CPU2 +* When the CPU1 needs to either write or erase in flash, it shall first get the semaphore and release it just +* after writing a raw (64bits data) or erasing one sector. +* On v1.4.0 and older CPU2 wireless firmware, this semaphore is unused and CPU2 is using PES bit. +* By default, CPU2 is using the PES bit to protect its timing. The CPU1 may request the CPU2 to use the semaphore +* instead of the PES bit by sending the system command SHCI_C2_SetFlashActivityControl() +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID 7 + +/** +* Index of the semaphore used by CPU1 to prevent the CPU2 to either write or erase data in flash +* In order to protect its timing, the CPU1 may get this semaphore to prevent the CPU2 to either +* write or erase in flash (as this will stall both CPUs) +* The PES bit shall not be used as this may stall the CPU2 in some cases. +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID 6 + +/** +* Index of the semaphore used to manage the CLK48 clock configuration +* When the USB is required, this semaphore shall be taken before configuring te CLK48 for USB +* and should be released after the application switch OFF the clock when the USB is not used anymore +* When using the RNG, it is good enough to use CFG_HW_RNG_SEMID to control CLK48. +* More details in AN5289 +*/ +#define CFG_HW_CLK48_CONFIG_SEMID 5 + +/* Index of the semaphore used to manage the entry Stop Mode procedure */ +#define CFG_HW_ENTRY_STOP_MODE_SEMID 4 + +/* Index of the semaphore used to access the RCC */ +#define CFG_HW_RCC_SEMID 3 + +/* Index of the semaphore used to access the FLASH */ +#define CFG_HW_FLASH_SEMID 2 + +/* Index of the semaphore used to access the PKA */ +#define CFG_HW_PKA_SEMID 1 + +/* Index of the semaphore used to access the RNG */ +#define CFG_HW_RNG_SEMID 0 + +/****************************************************************************** + * HW TIMER SERVER + *****************************************************************************/ +/** + * The user may define the maximum number of virtual timers supported. + * It shall not exceed 255 + */ +#define CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER 6 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the preemptpriority part of the NVIC. + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO 3 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the subpriority part of the NVIC. It does not exist on all processors. When it is not supported + * on the CPU, the setting is ignored + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO 0 + +/** + * Define a critical section in the Timer server + * The Timer server does not support the API to be nested + * The Application shall either: + * a) Ensure this will never happen + * b) Define the critical section + * The default implementations is masking all interrupts using the PRIMASK bit + * The TimerServer driver uses critical sections to avoid context corruption. This is achieved with the macro + * TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION. When CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION is set + * to 1, all STM32 interrupts are masked with the PRIMASK bit of the CortexM CPU. It is possible to use the BASEPRI + * register of the CortexM CPU to keep allowed some interrupts with high priority. In that case, the user shall + * re-implement TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION and shall make sure that no TimerServer + * API are called when the TIMER critical section is entered + */ +#define CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION 1 + +/** + * This value shall reflect the maximum delay there could be in the application between the time the RTC interrupt + * is generated by the Hardware and the time when the RTC interrupt handler is called. This time is measured in + * number of RTCCLK ticks. + * A relaxed timing would be 10ms + * When the value is too short, the timerserver will not be able to count properly and all timeout may be random. + * When the value is too long, the device may wake up more often than the most optimal configuration. However, the + * impact on power consumption would be marginal (unless the value selected is extremely too long). It is strongly + * recommended to select a value large enough to make sure it is not too short to ensure reliability of the system + * as this will have marginal impact on low power mode + */ +#define CFG_HW_TS_RTC_HANDLER_MAX_DELAY ( 10 * (LSI_VALUE/1000) ) + + /** + * Interrupt ID in the NVIC of the RTC Wakeup interrupt handler + * It shall be type of IRQn_Type + */ +#define CFG_HW_TS_RTC_WAKEUP_HANDLER_ID RTC_WKUP_IRQn + + + +/****************************************************************************** + * HW UART + *****************************************************************************/ +#if (CFG_LPM_SUPPORTED == 0) +#define CFG_HW_LPUART1_ENABLED 1 +#define CFG_HW_LPUART1_DMA_TX_SUPPORTED 1 +#define CFG_HW_USART1_ENABLED 1 +#define CFG_HW_USART1_DMA_TX_SUPPORTED 1 + +#else +#define CFG_HW_LPUART1_ENABLED 0 +#define CFG_HW_LPUART1_DMA_TX_SUPPORTED 0 +#define CFG_HW_USART1_ENABLED 0 +#define CFG_HW_USART1_DMA_TX_SUPPORTED 0 +#endif +/****************************************************************************** + * External PA + *****************************************************************************/ + +#if (CFG_LPM_SUPPORTED == 0) +#define CFG_HW_EXTPA_ENABLED 1 +#else +#define CFG_HW_EXTPA_ENABLED 0 +#endif + +#endif /*HW_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_if.h new file mode 100644 index 000000000..b69817ff7 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_if.h @@ -0,0 +1,284 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_if.h + * @author MCD Application Team + * @brief Hardware Interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_IF_H +#define HW_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + + /* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx.h" +#include "stm32wbxx_ll_exti.h" +#include "stm32wbxx_ll_system.h" +#include "stm32wbxx_ll_rcc.h" +#include "stm32wbxx_ll_ipcc.h" +#include "stm32wbxx_ll_bus.h" +#include "stm32wbxx_ll_pwr.h" +#include "stm32wbxx_ll_cortex.h" +#include "stm32wbxx_ll_utils.h" +#include "stm32wbxx_ll_hsem.h" +#include "stm32wbxx_ll_gpio.h" +#include "stm32wbxx_ll_rtc.h" + +#ifdef USE_STM32WBXX_USB_DONGLE +#include "stm32wbxx_usb_dongle.h" +#endif + +#ifdef USE_STM32WBXX_NUCLEO + +#ifdef STM32WB15xx +#include "nucleo_wb15cc.h" +#endif + +#ifdef STM32WB35xx +#include "nucleo_wb35ce.h" +#endif + +#ifdef STM32WB55xx +#include "stm32wbxx_nucleo.h" +#endif + +#endif + +#ifdef USE_X_NUCLEO_EPD +#include "x_nucleo_epd.h" +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/****************************************************************************** + * HW UART + ******************************************************************************/ +typedef enum +{ + hw_uart1, + hw_uart2, + hw_lpuart1, +} hw_uart_id_t; + +typedef enum +{ + hw_uart_ok, + hw_uart_error, + hw_uart_busy, + hw_uart_to, +} hw_status_t; + +#if (CFG_HW_LPUART1_ENABLED == 1) +extern UART_HandleTypeDef hlpuart1; +extern DMA_HandleTypeDef hdma_lpuart1_tx; +#endif +#if (CFG_HW_USART1_ENABLED == 1) +extern UART_HandleTypeDef huart1; +extern DMA_HandleTypeDef hdma_usart1_tx; +#endif + +//void HW_UART_Init(hw_uart_id_t hw_uart_id); +hw_status_t HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); +hw_status_t HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); +hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout); +hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*Callback)(void)); +#if 0 +void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); +void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) +void MX_LPUART1_UART_Init(void); +void MX_LPUART1_UART_DeInit(void); +#endif +#if (CFG_HW_USART1_ENABLED == 1) +void MX_USART1_UART_Init(void); +void MX_USART1_UART_DeInit(void); +#endif + + /****************************************************************************** + * HW TimerServer + ******************************************************************************/ + /* Exported types ------------------------------------------------------------*/ + /** + * This setting is used when standby mode is supported. + * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does + * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured + * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. + */ + typedef enum + { + hw_ts_InitMode_Full, + hw_ts_InitMode_Limited, + } HW_TS_InitMode_t; + + /** + * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, + * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() + * + * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. + */ + typedef enum + { + hw_ts_SingleShot, + hw_ts_Repeated + } HW_TS_Mode_t; + + /** + * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed + * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a + * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased + */ + typedef enum + { + hw_ts_Successful, + hw_ts_Failed, + }HW_TS_ReturnStatus_t; + + typedef void (*HW_TS_pTimerCb_t)(void); + + /** + * @brief Initialize the timer server + * This API shall be called by the application before any timer is requested to the timer server. It + * configures the RTC module to be connected to the LSI input clock. + * + * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the + * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested + * @param hrtc: RTC Handle + * @retval None + */ + void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); + + /** + * @brief Interface to create a virtual timer + * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it + * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the + * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler + * which module is concerned. In return, the user gets a timer ID to handle it. + * + * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow + * identification of the requester + * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) + * @param TimerMode: Mode of the virtual timer (Single shot or repeated) + * @param pTimerCallBack: Callback when the virtual timer expires + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not + */ + HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Stop a virtual timer + * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. + * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. + * Nothing is done when it is called to stop a timer which has been already stopped + * + * @param TimerID: Id of the timer to stop + * @retval None + */ + void HW_TS_Stop(uint8_t TimerID); + + /** + * @brief Start a virtual timer + * This API shall be used to start a timer. The timeout value is specified and may be different each time. + * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may + * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always + * stay in the running state. When the timer expires, it will be restarted with the same timeout value. + * This API shall not be called on a running timer. + * + * @param TimerID: The ID Id of the timer to start + * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) + * @retval None + */ + void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); + + /** + * @brief Delete a virtual timer from the list + * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from + * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the + * creation of a new timer if required and may get a different timer id + * + * @param TimerID: The ID of the timer to remove from the list + * @retval None + */ + void HW_TS_Delete(uint8_t TimerID); + + /** + * @brief Schedule the timer list on the timer interrupt handler + * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes + * care of clearing all status flag required in the RTC and EXTI peripherals + * + * @param None + * @retval None + */ + void HW_TS_RTC_Wakeup_Handler(void); + + /** + * @brief Return the number of ticks to count before the interrupt + * This API returns the number of ticks left to be counted before an interrupt is generated by the + * Timer Server. This API may be used by the application for power management optimization. When the system + * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running + * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the + * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time + * versus time in low power mode is implementation specific + * When the timer is disabled (No timer in the list), it returns 0xFFFF + * + * @param None + * @retval The number of ticks left to count + */ + uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); + + /** + * @brief Notify the application that a registered timer has expired + * This API shall be implemented by the user application. + * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt + * context. The application may implement an Operating System to change the context priority where the timer + * callback may be handled. This API provides the module ID to identify which module is concerned and to allow + * sending the information to the correct task + * + * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created + * @param TimerID: The TimerID of the expired timer + * @param pTimerCallBack: The Callback associated with the timer when it has been created + * @retval None + */ + void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Notify the application that the wakeupcounter has been updated + * This API should be implemented by the user application + * This API notifies the application that the counter has been updated. This is expected to be used along + * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the + * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification + * provides a way to the application to solve that race condition to reevaluate the counter value before + * entering low power mode + * + * @param None + * @retval None + */ + void HW_TS_RTC_CountUpdated_AppNot(void); + +void MX_UART_Init(hw_uart_id_t uart); +void MX_UART_Deinit(hw_uart_id_t uart); + +#ifdef __cplusplus +} +#endif + +#endif /*HW_IF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/main.h new file mode 100644 index 000000000..05a9002bb --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/main.h @@ -0,0 +1,104 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file main.h + * @author MCD Application Team + * @brief Header for main.c module + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MAIN_H +#define __MAIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void Error_Handler(void); +void SystemClock_Config_HSE(uint32_t usePLL); +void SystemClock_Config_MSI(uint32_t usePLL); + +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +/* Private defines -----------------------------------------------------------*/ +/* USER CODE BEGIN Private defines */ + + +/* + In this example TIM2 input clock (TIM2CLK) is set to APB1 clock (PCLK1), + since APB1 prescaler is equal to 1. + TIM2CLK = PCLK1 + PCLK1 = HCLK + => TIM2CLK = HCLK = SystemCoreClock + To get TIM2 counter clock at 10 KHz, the Prescaler is computed as following: + Prescaler = (TIM2CLK / TIM2 counter clock) - 1 + Prescaler = (SystemCoreClock /10 KHz) - 1 + + Note: + SystemCoreClock variable holds HCLK frequency and is defined in system_stm32wbxx.c file. + Each time the core clock (HCLK) changes, user had to update SystemCoreClock + variable value. Otherwise, any configuration based on this variable will be incorrect. + This variable is updated in three ways: + 1) by calling CMSIS function SystemCoreClockUpdate() + 2) by calling HAL API function HAL_RCC_GetSysClockFreq() + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency + ----------------------------------------------------------------------- */ + +/* Compute the prescaler value to have TIMx counter clock equal to 10000 Hz */ + +#define PRESCALER_VALUE (uint32_t)(((SystemCoreClock) / (1000000)) - 1) + + /* Initialize TIMx peripheral as follows: + + Period = 10000 - 1 + + Prescaler = (SystemCoreClock/10000) - 1 + + ClockDivision = 0 + + Counter direction = Up + */ + +#define PERIOD_VALUE (1000000 - 1); + + +/* USER CODE END Private defines */ + +#ifdef __cplusplus +} +#endif + +#endif /* __MAIN_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32_lpm_if.h new file mode 100644 index 000000000..293e9912d --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32_lpm_if.h @@ -0,0 +1,76 @@ +/** + ****************************************************************************** + * @file stm32_lpm_if.h + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32_LPM_IF_H +#define __STM32_LPM_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ); +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ); + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ); +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ); + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ); + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ); + +#ifdef __cplusplus +} +#endif + +#endif /*__STM32_LPM_IF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_hal_conf.h new file mode 100644 index 000000000..f7f0c092e --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_hal_conf.h @@ -0,0 +1,352 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_conf.h + * @author MCD Application Team + * @brief HAL configuration file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef STM32WBxx_HAL_CONF_H +#define STM32WBxx_HAL_CONF_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ + +/* ########################## Module Selection ############################## */ +/** + * @brief This is the list of modules to be used in the HAL driver + */ +#define HAL_MODULE_ENABLED +/*#define HAL_ADC_MODULE_ENABLED */ +/*#define HAL_COMP_MODULE_ENABLED */ +#define HAL_CORTEX_MODULE_ENABLED +/*#define HAL_CRC_MODULE_ENABLED */ +/*#define HAL_CRYP_MODULE_ENABLED */ +#define HAL_DMA_MODULE_ENABLED +#define HAL_EXTI_MODULE_ENABLED +#define HAL_FLASH_MODULE_ENABLED +#define HAL_GPIO_MODULE_ENABLED +#define HAL_HSEM_MODULE_ENABLED +/*#define HAL_I2C_MODULE_ENABLED */ +/*#define HAL_IPCC_MODULE_ENABLED */ +/*#define HAL_IRDA_MODULE_ENABLED */ +/*#define HAL_IWDG_MODULE_ENABLED */ +/*#define HAL_LCD_MODULE_ENABLED */ +/*#define HAL_LPTIM_MODULE_ENABLED */ +/*#define HAL_PCD_MODULE_ENABLED */ +/*#define HAL_PKA_MODULE_ENABLED */ +#define HAL_PWR_MODULE_ENABLED +/*#define HAL_QSPI_MODULE_ENABLED */ +#define HAL_RCC_MODULE_ENABLED +/*#define HAL_RNG_MODULE_ENABLED */ +#define HAL_RTC_MODULE_ENABLED +/*#define HAL_SAI_MODULE_ENABLED */ +/*#define HAL_SMARTCARD_MODULE_ENABLED */ +/*#define HAL_SMBUS_MODULE_ENABLED */ +/*#define HAL_SPI_MODULE_ENABLED */ +#define HAL_TIM_MODULE_ENABLED +/*#define HAL_TSC_MODULE_ENABLED */ +#define HAL_UART_MODULE_ENABLED +/*#define HAL_USART_MODULE_ENABLED */ +/*#define HAL_WWDG_MODULE_ENABLED */ + +#define USE_HAL_ADC_REGISTER_CALLBACKS 0u +#define USE_HAL_COMP_REGISTER_CALLBACKS 0u +#define USE_HAL_CRYP_REGISTER_CALLBACKS 0u +#define USE_HAL_I2C_REGISTER_CALLBACKS 0u +#define USE_HAL_IRDA_REGISTER_CALLBACKS 0u +#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0u +#define USE_HAL_PCD_REGISTER_CALLBACKS 0u +#define USE_HAL_PKA_REGISTER_CALLBACKS 0u +#define USE_HAL_QSPI_REGISTER_CALLBACKS 0u +#define USE_HAL_RNG_REGISTER_CALLBACKS 0u +#define USE_HAL_RTC_REGISTER_CALLBACKS 0u +#define USE_HAL_SAI_REGISTER_CALLBACKS 0u +#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0u +#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0u +#define USE_HAL_SPI_REGISTER_CALLBACKS 0u +#define USE_HAL_TIM_REGISTER_CALLBACKS 0u +#define USE_HAL_TSC_REGISTER_CALLBACKS 0u +#define USE_HAL_UART_REGISTER_CALLBACKS 0u +#define USE_HAL_USART_REGISTER_CALLBACKS 0u +#define USE_HAL_WWDG_REGISTER_CALLBACKS 0u + +/* ########################## Oscillator Values adaptation ####################*/ +/** + * @brief Adjust the value of External High Speed oscillator (HSE) used in your application. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSE is used as system clock source, directly or through the PLL). + */ + +#if !defined (HSE_VALUE) + #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (HSE_STARTUP_TIMEOUT) + #define HSE_STARTUP_TIMEOUT (100UL) /*!< Time out for HSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief Internal Multiple Speed oscillator (MSI) default value. + * This value is the default MSI range value after Reset. + */ +#if !defined (MSI_VALUE) + #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +/** + * @brief Internal High Speed oscillator (HSI) value. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSI is used as system clock source, directly or through the PLL). + */ +#if !defined (HSI_VALUE) + #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +/** + * @brief Internal Low Speed oscillator (LSI1) value. + */ +#if !defined (LSI1_VALUE) + #define LSI1_VALUE (32000UL) /*!< LSI1 Typical Value in Hz*/ +#endif /* LSI1_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ +/** + * @brief Internal Low Speed oscillator (LSI2) value. + */ +#if !defined (LSI2_VALUE) + #define LSI2_VALUE (32000UL) /*!< LSI2 Typical Value in Hz*/ +#endif /* LSI2_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ + +/** + * @brief External Low Speed oscillator (LSE) value. + * This value is used by the UART, RTC HAL module to compute the system frequency + */ +#if !defined (LSE_VALUE) + #define LSE_VALUE (32768UL) /*!< Value of the External oscillator in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @brief Internal Multiple Speed oscillator (HSI48) default value. + * This value is the default HSI48 range value after Reset. + */ +#if !defined (HSI48_VALUE) + #define HSI48_VALUE (48000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI48_VALUE */ + +#if !defined (LSE_STARTUP_TIMEOUT) + #define LSE_STARTUP_TIMEOUT (5000UL) /*!< Time out for LSE start up, in ms */ +#endif /* LSE_STARTUP_TIMEOUT */ + +/** + * @brief External clock source for SAI1 peripheral + * This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source + * frequency. + */ +#if !defined (EXTERNAL_SAI1_CLOCK_VALUE) + #define EXTERNAL_SAI1_CLOCK_VALUE (48000UL) /*!< Value of the SAI1 External clock source in Hz*/ +#endif /* EXTERNAL_SAI1_CLOCK_VALUE */ + +/* Tip: To avoid modifying this file each time you need to use different HSE, + === you can define the HSE value in your toolchain compiler preprocessor. */ + +/* ########################### System Configuration ######################### */ +/** + * @brief This is the HAL system configuration section + */ +#define VDD_VALUE (3300UL) /*!< Value of VDD in mv */ +#define TICK_INT_PRIORITY ((1UL<<__NVIC_PRIO_BITS) - 1UL) /*!< tick interrupt priority (lowest by default) */ +#define USE_RTOS 0 +#define PREFETCH_ENABLE 0 +#define INSTRUCTION_CACHE_ENABLE 1 +#define DATA_CACHE_ENABLE 1 + +/* ########################## Assert Selection ############################## */ +/** + * @brief Uncomment the line below to expanse the "assert_param" macro in the + * HAL drivers code + */ +/* #define USE_FULL_ASSERT 1 */ + +/* ################## SPI peripheral configuration ########################## */ + +/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver + * Activated: CRC code is present inside driver + * Deactivated: CRC code cleaned from driver + */ + +#define USE_SPI_CRC 1U + +/* Includes ------------------------------------------------------------------*/ +/** + * @brief Include module's header file + */ +#ifdef HAL_DMA_MODULE_ENABLED + #include "stm32wbxx_hal_dma.h" +#endif /* HAL_DMA_MODULE_ENABLED */ + +#ifdef HAL_ADC_MODULE_ENABLED + #include "stm32wbxx_hal_adc.h" +#endif /* HAL_ADC_MODULE_ENABLED */ + +#ifdef HAL_COMP_MODULE_ENABLED + #include "stm32wbxx_hal_comp.h" +#endif /* HAL_COMP_MODULE_ENABLED */ + +#ifdef HAL_CORTEX_MODULE_ENABLED + #include "stm32wbxx_hal_cortex.h" +#endif /* HAL_CORTEX_MODULE_ENABLED */ + +#ifdef HAL_CRC_MODULE_ENABLED + #include "stm32wbxx_hal_crc.h" +#endif /* HAL_CRC_MODULE_ENABLED */ + +#ifdef HAL_CRYP_MODULE_ENABLED + #include "stm32wbxx_hal_cryp.h" +#endif /* HAL_CRYP_MODULE_ENABLED */ + +#ifdef HAL_EXTI_MODULE_ENABLED + #include "stm32wbxx_hal_exti.h" +#endif /* HAL_EXTI_MODULE_ENABLED */ + +#ifdef HAL_FLASH_MODULE_ENABLED + #include "stm32wbxx_hal_flash.h" +#endif /* HAL_FLASH_MODULE_ENABLED */ + +#ifdef HAL_GPIO_MODULE_ENABLED + #include "stm32wbxx_hal_gpio.h" +#endif /* HAL_GPIO_MODULE_ENABLED */ + +#ifdef HAL_HSEM_MODULE_ENABLED + #include "stm32wbxx_hal_hsem.h" +#endif /* HAL_HSEM_MODULE_ENABLED */ + +#ifdef HAL_I2C_MODULE_ENABLED + #include "stm32wbxx_hal_i2c.h" +#endif /* HAL_I2C_MODULE_ENABLED */ + +#ifdef HAL_IPCC_MODULE_ENABLED + #include "stm32wbxx_hal_ipcc.h" +#endif /* HAL_IPCC_MODULE_ENABLED */ + +#ifdef HAL_IRDA_MODULE_ENABLED + #include "stm32wbxx_hal_irda.h" +#endif /* HAL_IRDA_MODULE_ENABLED */ + +#ifdef HAL_IWDG_MODULE_ENABLED + #include "stm32wbxx_hal_iwdg.h" +#endif /* HAL_IWDG_MODULE_ENABLED */ + +#ifdef HAL_LCD_MODULE_ENABLED + #include "stm32wbxx_hal_lcd.h" +#endif /* HAL_LCD_MODULE_ENABLED */ + +#ifdef HAL_LPTIM_MODULE_ENABLED + #include "stm32wbxx_hal_lptim.h" +#endif /* HAL_LPTIM_MODULE_ENABLED */ + +#ifdef HAL_PCD_MODULE_ENABLED + #include "stm32wbxx_hal_pcd.h" +#endif /* HAL_PCD_MODULE_ENABLED */ + +#ifdef HAL_PKA_MODULE_ENABLED + #include "stm32wbxx_hal_pka.h" +#endif /* HAL_PKA_MODULE_ENABLED */ + +#ifdef HAL_PWR_MODULE_ENABLED + #include "stm32wbxx_hal_pwr.h" +#endif /* HAL_PWR_MODULE_ENABLED */ + +#ifdef HAL_QSPI_MODULE_ENABLED + #include "stm32wbxx_hal_qspi.h" +#endif /* HAL_QSPI_MODULE_ENABLED */ + +#ifdef HAL_RCC_MODULE_ENABLED + #include "stm32wbxx_hal_rcc.h" +#endif /* HAL_RCC_MODULE_ENABLED */ + +#ifdef HAL_RNG_MODULE_ENABLED + #include "stm32wbxx_hal_rng.h" +#endif /* HAL_RNG_MODULE_ENABLED */ + +#ifdef HAL_RTC_MODULE_ENABLED + #include "stm32wbxx_hal_rtc.h" +#endif /* HAL_RTC_MODULE_ENABLED */ + +#ifdef HAL_SAI_MODULE_ENABLED + #include "stm32wbxx_hal_sai.h" +#endif /* HAL_SAI_MODULE_ENABLED */ + +#ifdef HAL_SMARTCARD_MODULE_ENABLED + #include "stm32wbxx_hal_smartcard.h" +#endif /* HAL_SMARTCARD_MODULE_ENABLED */ + +#ifdef HAL_SMBUS_MODULE_ENABLED + #include "stm32wbxx_hal_smbus.h" +#endif /* HAL_SMBUS_MODULE_ENABLED */ + +#ifdef HAL_SPI_MODULE_ENABLED + #include "stm32wbxx_hal_spi.h" +#endif /* HAL_SPI_MODULE_ENABLED */ + +#ifdef HAL_TIM_MODULE_ENABLED + #include "stm32wbxx_hal_tim.h" +#endif /* HAL_TIM_MODULE_ENABLED */ + +#ifdef HAL_TSC_MODULE_ENABLED + #include "stm32wbxx_hal_tsc.h" +#endif /* HAL_TSC_MODULE_ENABLED */ + +#ifdef HAL_UART_MODULE_ENABLED + #include "stm32wbxx_hal_uart.h" +#endif /* HAL_UART_MODULE_ENABLED */ + +#ifdef HAL_USART_MODULE_ENABLED + #include "stm32wbxx_hal_usart.h" +#endif /* HAL_USART_MODULE_ENABLED */ + +#ifdef HAL_WWDG_MODULE_ENABLED + #include "stm32wbxx_hal_wwdg.h" +#endif /* HAL_WWDG_MODULE_ENABLED */ + +/* Exported macro ------------------------------------------------------------*/ +#ifdef USE_FULL_ASSERT +/** + * @brief The assert_param macro is used for function's parameters check. + * @param expr If expr is false, it calls assert_failed function + * which reports the name of the source file and the source + * line number of the call that failed. + * If expr is true, it returns no value. + * @retval None + */ + #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) +/* Exported functions ------------------------------------------------------- */ + void assert_failed(uint8_t* file, uint32_t line); +#else + #define assert_param(expr) ((void)0U) +#endif /* USE_FULL_ASSERT */ + +#ifdef __cplusplus +} +#endif + +#endif /* STM32WBxx_HAL_CONF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_it.h new file mode 100644 index 000000000..f2fcc305a --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_it.h @@ -0,0 +1,80 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.h + * @brief This file contains the headers of the interrupt handlers. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_IT_H +#define __STM32WBxx_IT_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "app_common.h" +#include "gpio_lld.h" +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void NMI_Handler(void); +void HardFault_Handler(void); +void MemManage_Handler(void); +void BusFault_Handler(void); +void UsageFault_Handler(void); +void SVC_Handler(void); +void DebugMon_Handler(void); +void PendSV_Handler(void); +void SysTick_Handler(void); +void DMA1_Channel4_IRQHandler(void); +void DMA1_Channel5_IRQHandler(void); +void USART1_IRQHandler(void); +void LPUART1_IRQHandler(void); +/* USER CODE BEGIN EFP */ +void RTC_WKUP_IRQHandler(void); + +void IPCC_C1_TX_IRQHandler(void); +void IPCC_C1_RX_IRQHandler(void); + +void BUTTON_SW1_EXTI_IRQHandler(void); +void BUTTON_SW2_EXTI_IRQHandler(void); +void BUTTON_SW3_EXTI_IRQHandler(void); +void TIM2_IRQHandler(void); + +/* USER CODE END EFP */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_IT_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm_logging.h new file mode 100644 index 000000000..e60099e7c --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm_logging.h @@ -0,0 +1,62 @@ +/** + ****************************************************************************** + * File Name : stm_logging.h + * Description : Application header file for logging + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +#ifndef STM_LOGGING_H_ +#define STM_LOGGING_H_ + +#define LOG_LEVEL_NONE 0 /* None */ +#define LOG_LEVEL_CRIT 1U /* Critical */ +#define LOG_LEVEL_WARN 2U /* Warning */ +#define LOG_LEVEL_INFO 3U /* Info */ +#define LOG_LEVEL_DEBG 4U /* Debug */ + +#define APP_DBG_FULL(level, region, ...) \ + { \ + if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ + { \ + printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ + } \ + logApplication(level, region, __VA_ARGS__); \ + } + +#define APP_DBG(...) \ + { \ + if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ + { \ + printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ + } \ + logApplication(LOG_LEVEL_NONE, APPLI_LOG_REGION_GENERAL, __VA_ARGS__); \ + } + +/** + * This enumeration represents log regions. + * + */ +typedef enum +{ + APPLI_LOG_REGION_GENERAL = 1U, /* General */ + APPLI_LOG_REGION_OPENTHREAD_API = 2U, /* OpenThread API */ + APPLI_LOG_REGION_OT_API_LINK = 3U, /* OpenThread Link API */ + APPLI_LOG_REGION_OT_API_INSTANCE = 4U, /* OpenThread Instance API */ + APPLI_LOG_REGION_OT_API_MESSAGE = 5U /* OpenThread Message API */ +} appliLogRegion_t; + +typedef uint8_t appliLogLevel_t; + +void logApplication(appliLogLevel_t aLogLevel, appliLogRegion_t aLogRegion, const char *aFormat, ...); + +#endif /* STM_LOGGING_H_ */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/utilities_conf.h new file mode 100644 index 000000000..fcab34b06 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Inc/utilities_conf.h @@ -0,0 +1,66 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : utilities_conf.h + * Description : Configuration file for STM32 Utilities. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef UTILITIES_CONF_H +#define UTILITIES_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "cmsis_compiler.h" +#include "string.h" + +/****************************************************************************** + * common + ******************************************************************************/ +#define UTILS_ENTER_CRITICAL_SECTION( ) uint32_t primask_bit = __get_PRIMASK( );\ + __disable_irq( ) + +#define UTILS_EXIT_CRITICAL_SECTION( ) __set_PRIMASK( primask_bit ) + +#define UTILS_MEMSET8( dest, value, size ) memset( dest, value, size); + +/****************************************************************************** + * tiny low power manager + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_LPM_INIT_CRITICAL_SECTION( ) +#define UTIL_LPM_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_LPM_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) + +/****************************************************************************** + * sequencer + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_SEQ_INIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_SEQ_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_CONF_TASK_NBR (32) +#define UTIL_SEQ_CONF_PRIO_NBR (2) +#define UTIL_SEQ_MEMSET8( dest, value, size ) UTILS_MEMSET8( dest, value, size ) + +#ifdef __cplusplus +} +#endif + +#endif /*UTILITIES_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/app_entry.c new file mode 100644 index 000000000..8d3ccb135 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/app_entry.c @@ -0,0 +1,419 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "app_entry.h" +#include "app_ble_lld.h" +#include "app_conf.h" +#include "hw_conf.h" +#include "stm32_seq.h" +#include "stm_logging.h" +#include "shci_tl.h" +#include "stm32_lpm.h" +#include "dbg_trace.h" +#include "shci.h" +#include "datarate_app.h" + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ +extern RTC_HandleTypeDef hrtc; + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +/* POOL_SIZE = 2(TL_PacketHeader_t) + 258 (3(TL_EVT_HDR_SIZE) + 255(Payload size)) */ +#define POOL_SIZE (CFG_TL_EVT_QUEUE_LENGTH * 4U * DIVC(( sizeof(TL_PacketHeader_t) + TL_EVENT_FRAME_SIZE ), 4U)) + +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Global function prototypes -----------------------------------------------*/ +#if(CFG_DEBUG_TRACE != 0) +size_t DbgTraceWrite(int handle, const unsigned char * buf, size_t bufSize); +#endif + +/* USER CODE BEGIN GFP */ + +/* USER CODE END GFP */ + +/* Private functions prototypes-----------------------------------------------*/ +static void SystemPower_Config( void ); +static void Init_Debug( void ); +static void appe_Tl_Init( void ); +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); +static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void ); +static void APPE_SysEvtError( SCHI_SystemErrCode_t ErrorCode); + +/* USER CODE BEGIN PFP */ +static void Led_Init( void ); +static void Button_Init( void ); +/* USER CODE END PFP */ + +/* Functions Definition ------------------------------------------------------*/ +void APPE_Init( void ) +{ + /**< Configure the system Power Mode */ + SystemPower_Config(); + + HW_TS_Init(hw_ts_InitMode_Full, &hrtc); /**< Initialize the TimerServer */ + +/* USER CODE BEGIN APPE_Init_1 */ + /* initialize debugger module if supported and debug trace if activated */ + Init_Debug(); + + Led_Init(); + Button_Init(); + +/* USER CODE END APPE_Init_1 */ + /* Initialize all transport layers and start CPU2 which will send back a ready event to CPU1 */ + appe_Tl_Init(); + + /** + * From now, the application is waiting for the ready event ( sub event : SHCI_SUB_EVT_CODE_READY / payload : WIRELESS_FW_RUNNING) + * received on the system channel before starting the LLD test appli using system message SHCI_OPCODE_C2_LLD_TESTS_INIT + * This system event is received with APPE_SysUserEvtRx() + */ +/* USER CODE BEGIN APPE_Init_2 */ + +/* USER CODE END APPE_Init_2 */ + return; +} +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void Init_Debug( void ) +{ +#if (CFG_DEBUGGER_SUPPORTED == 1) + /** + * Keep debugger enabled while in any low power mode + */ + HAL_DBGMCU_EnableDBGSleepMode(); + + /* Enable debugger EXTI lines */ + LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); + LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); + +#else + /* Disable debugger EXTI lines */ + LL_EXTI_DisableIT_32_63(LL_EXTI_LINE_48); + LL_C2_EXTI_DisableIT_32_63(LL_EXTI_LINE_48); + + /** + * Do not keep debugger enabled while in any low power mode + */ + HAL_DBGMCU_DisableDBGSleepMode(); + HAL_DBGMCU_DisableDBGStopMode(); + HAL_DBGMCU_DisableDBGStandbyMode(); +#endif /* (CFG_DEBUGGER_SUPPORTED == 1) */ + +#if(CFG_DEBUG_TRACE != 0) + DbgTraceInit(); +#endif + + /* Send a first trace to debug trace port to see that M4 is alive */ + APP_DBG("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + APP_DBG("traces init done on M4"); + APP_DBG("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + + return; +} + +/** + * @brief Configure the system for power optimization + * + * @note This API configures the system to be ready for low power mode + * + * @param None + * @retval None + */ +static void SystemPower_Config( void ) +{ + // Disable internal wake-up which is active by default and is for RTC wake-up + LL_PWR_DisableInternWU(); + + // Before going to stop or standby modes, do the settings so that system clock and IP80215.4 clock + // start on HSI automatically + LL_RCC_HSI_EnableAutoFromStop(); + + /** + * Select HSI as system clock source after Wake Up from Stop mode + */ + LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); + + /* Initialize low power manager */ + UTIL_LPM_Init( ); + + /* Disable low power mode until INIT is complete */ + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_DISABLE); + UTIL_LPM_SetStopMode(1 << CFG_LPM_APP, UTIL_LPM_DISABLE); + + return; +} + +static void appe_Tl_Init( void ) +{ + TL_MM_Config_t tl_mm_config; + SHCI_TL_HciInitConf_t SHci_Tl_Init_Conf; + + /**< Reference table initialization */ + TL_Init(); + + /**< System channel initialization */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_SYSTEM_HCI_ASYNCH_EVT, UTIL_SEQ_RFU, shci_user_evt_proc ); + SHci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&SystemCmdBuffer; + SHci_Tl_Init_Conf.StatusNotCallBack = APPE_SysStatusNot; + shci_init(APPE_SysUserEvtRx, (void*) &SHci_Tl_Init_Conf); + + /**< Memory Manager channel initialization */ + tl_mm_config.p_BleSpareEvtBuffer = 0; + tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer; + tl_mm_config.p_AsynchEvtPool = EvtPool; + tl_mm_config.AsynchEvtPoolSize = POOL_SIZE; + TL_MM_Init( &tl_mm_config ); + + /* Enable transport layer and start CPU2 */ + TL_Enable(); + + return; +} + +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) +{ + UNUSED(status); + return; +} + +/** + * The type of the payload for a system user event is tSHCI_UserEvtRxParam + * When the system event is both : + * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) + * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) + * The buffer shall not be released + * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) + * When the status is not filled, the buffer is released by default + */ +static void APPE_SysUserEvtRx( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + if (p_sys_event->payload[0] == WIRELESS_FW_RUNNING) + APPE_SysEvtReadyProcessing(); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError((SCHI_SystemErrCode_t) (p_sys_event->payload[0])); + break; + + default: + break; + } + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( SCHI_SystemErrCode_t ErrorCode) +{ + switch(ErrorCode) + { + case ERR_THREAD_LLD_FATAL_ERROR: + APP_DBG("** ERR_LLD_TESTS : LLD_FATAL_ERROR \n"); + break; + + case ERR_THREAD_UNKNOWN_CMD: + APP_DBG("** ERR_LLD_TESTS : UNKNOWN_CMD \n"); + break; + + default: + APP_DBG("** ERR_LLD_TESTS : ErroCode=%d \n",ErrorCode); + break; + } + return; +} + +static void APPE_SysEvtReadyProcessing( void ) +{ + /* Traces channel initialization */ + TL_TRACES_Init( ); + + /* Application specific init */ + DATARATE_APP_Init(); + +#if ( CFG_LPM_SUPPORTED == 1) + /* Thread stack is initialized, low power mode can be enabled */ + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + UTIL_LPM_SetStopMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +#endif + + return; +} + +/* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ +static void Led_Init( void ) +{ +#if (CFG_LED_SUPPORTED == 1U) + /** + * Leds Initialization + */ +#if (CFG_HW_LPUART1_ENABLED != 1) || ! defined (STM32WB35xx) + // On WB35, LED_BLUE share the GPIO PB5 with LPUART + BSP_LED_Init(LED_BLUE); +#endif + BSP_LED_Init(LED_GREEN); + BSP_LED_Init(LED_RED); +#endif + + return; +} + +static void Button_Init( void ) +{ +#if (CFG_BUTTON_SUPPORTED == 1U) + /** + * Button Initialization + */ + BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI); + BSP_PB_Init(BUTTON_SW3, BUTTON_MODE_EXTI); + +#endif + + return; +} + +/* USER CODE END FD_LOCAL_FUNCTIONS */ + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ + +void UTIL_SEQ_Idle( void ) +{ + /* Note that WFI (i.e. SLEEP mode) is required for SF timer tests but STOP or OFF mode will be managed by low-power test itself */ +#if ( CFG_LPM_SUPPORTED == 1) + UTIL_LPM_EnterLowPower( ); +#endif + return; +} + +void shci_notify_asynch_evt(void* pdata) +{ + UNUSED(pdata); + UTIL_SEQ_SetTask(1U << CFG_TASK_SYSTEM_HCI_ASYNCH_EVT, CFG_SCH_PRIO_0); + return; +} + +void shci_cmd_resp_release(uint32_t flag) +{ + UNUSED(flag); + UTIL_SEQ_SetEvt(1U << CFG_EVT_SYSTEM_HCI_CMD_EVT_RESP); + return; +} + +void shci_cmd_resp_wait(uint32_t timeout) +{ + UNUSED(timeout); + UTIL_SEQ_WaitEvt(1U << CFG_EVT_SYSTEM_HCI_CMD_EVT_RESP); + return; +} + +/* Received trace buffer from M0 */ +void TL_TRACES_EvtReceived( TL_EvtPacket_t * hcievt ) +{ +#if(CFG_DEBUG_TRACE != 0) + /* Call write/print function using DMA from dbg_trace */ + /* - Cast to TL_AsynchEvt_t* to get "real" payload (without Sub Evt code 2bytes), + - (-2) to size to remove Sub Evt Code */ + DbgTraceWrite(1U, (const unsigned char *) ((TL_AsynchEvt_t *)(hcievt->evtserial.evt.payload))->payload, hcievt->evtserial.evt.plen - 2U); +#endif /* CFG_DEBUG_TRACE */ + /* Release buffer */ + TL_MM_EvtDone( hcievt ); +} +/** + * @brief Initialisation of the trace mechanism + * @param None + * @retval None + */ +#if(CFG_DEBUG_TRACE != 0) +void DbgOutputInit( void ) +{ +/* USER CODE BEGIN DbgOutputInit */ +#ifdef CFG_DEBUG_TRACE_UART + MX_UART_Init(CFG_DEBUG_TRACE_UART); +#endif + return; +} + +/** + * @brief Management of the traces + * @param p_data : data + * @param size : size + * @param call-back : + * @retval None + */ +void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) +{ + HW_UART_Transmit_DMA(CFG_DEBUG_TRACE_UART, p_data, size, cb); + + return; +} +#endif + +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ + +/* USER CODE END FD_WRAP_FUNCTIONS */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/gpio_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/gpio_lld.c new file mode 100644 index 000000000..2c64a7493 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/gpio_lld.c @@ -0,0 +1,112 @@ +/** + ****************************************************************************** + * @file gpio_lld.c + * @author MCD Application Team + * @brief This file contains the init of all the GPIOs used by LLD tests. + * It is to be used on both M0 and M4. + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +// Be carrefull with the .h included as this file must be compilable on both M0 and M4 environments +#include "app_conf.h" +#include "gpio_lld.h" + +/* Set PHY GPIO_HARD_FAULT to '1' */ +void gpio_lld_phy_gpioHardFault_up(void) { + HAL_GPIO_WritePin(GPIO_HARD_FAULT_PORT, GPIO_HARD_FAULT_PIN, GPIO_PIN_SET); +} + +/* Set PHY GPIO_HARD_FAULT to '0' */ +void gpio_lld_phy_gpioHardFault_down(void) { + HAL_GPIO_WritePin(GPIO_HARD_FAULT_PORT, GPIO_HARD_FAULT_PIN, GPIO_PIN_RESET); +} + +/* Initialize GPIOs used by USART */ +void gpio_lld_usart_init(void) +{ + GPIO_InitTypeDef gpioinitstruct = {0}; + + /*** Configure the GPIOs ***/ + /* Enable GPIO clock */ + USART_TX_GPIO_CLK_ENABLE(); + USART_RX_GPIO_CLK_ENABLE(); + + /* Common configuration to Tx and Rx */ + gpioinitstruct.Mode = GPIO_MODE_AF_PP; + gpioinitstruct.Pull = GPIO_NOPULL; + gpioinitstruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + + /* Configure USART Tx */ + gpioinitstruct.Pin = USART_TX_PIN; + gpioinitstruct.Alternate = USART_TX_AF; + HAL_GPIO_Init(USART_TX_GPIO_PORT, &gpioinitstruct); + + /* Configure USART Rx */ + gpioinitstruct.Pin = USART_RX_PIN; + gpioinitstruct.Alternate = USART_RX_AF; + HAL_GPIO_Init(USART_RX_GPIO_PORT, &gpioinitstruct); + + /*** Configure the USART peripheral ***/ + /* Enable USART clock */ + USART_CLK_ENABLE(); +} + +/* De-initialize GPIOs used by USART */ +void gpio_lld_usart_deInit(void) { + HAL_GPIO_DeInit(USART_TX_GPIO_PORT, USART_TX_PIN); + HAL_GPIO_DeInit(USART_RX_GPIO_PORT, USART_RX_PIN); + /* Do not disable clocks as they could be used by others GPIOs and it seems + to not need power in STOP mode */ +} + +/* Initialize GPIOs used by LPUART */ +void gpio_lld_lpuart_init(void) +{ + GPIO_InitTypeDef gpioinitstruct = {0}; + + /*** Configure the GPIOs ***/ + /* Enable GPIO clock */ + LPUART_TX_GPIO_CLK_ENABLE(); + LPUART_RX_GPIO_CLK_ENABLE(); + + /* Common configuration to Tx and Rx */ + gpioinitstruct.Mode = GPIO_MODE_AF_PP; + gpioinitstruct.Pull = GPIO_NOPULL; + gpioinitstruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + + /* Configure LPUART Tx */ + gpioinitstruct.Pin = LPUART_TX_PIN; + gpioinitstruct.Alternate = LPUART_TX_AF; + HAL_GPIO_Init(LPUART_TX_GPIO_PORT, &gpioinitstruct); + + /* Configure LPUART Rx */ + gpioinitstruct.Pin = LPUART_RX_PIN; + gpioinitstruct.Alternate = LPUART_RX_AF; + HAL_GPIO_Init(LPUART_RX_GPIO_PORT, &gpioinitstruct); + + /*** Configure the LPUART peripheral ***/ + /* Enable LPUART clock */ + LPUART_CLK_ENABLE(); +} + +/* De-initialize GPIOs used by LPUART */ +void gpio_lld_lpuart_deInit(void) { + HAL_GPIO_DeInit(LPUART_TX_GPIO_PORT, LPUART_TX_PIN); + HAL_GPIO_DeInit(LPUART_RX_GPIO_PORT, LPUART_RX_PIN); + /* Do not disable clocks as they could be used by others GPIOs and it seems + to not need power in STOP mode */ +} + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_timerserver.c new file mode 100644 index 000000000..f1444495a --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_timerserver.c @@ -0,0 +1,891 @@ +/** + ****************************************************************************** + * File Name : hw_timerserver.c + * Description : Hardware timerserver source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "hw_conf.h" + +/* Private typedef -----------------------------------------------------------*/ +typedef enum +{ + TimerID_Free, + TimerID_Created, + TimerID_Running +}TimerIDStatus_t; + +typedef enum +{ + SSR_Read_Requested, + SSR_Read_Not_Requested +}RequestReadSSR_t; + +typedef enum +{ + WakeupTimerValue_Overpassed, + WakeupTimerValue_LargeEnough +}WakeupTimerLimitation_Status_t; + +typedef struct +{ + HW_TS_pTimerCb_t pTimerCallBack; + uint32_t CounterInit; + uint32_t CountLeft; + TimerIDStatus_t TimerIDStatus; + HW_TS_Mode_t TimerMode; + uint32_t TimerProcessID; + uint8_t PreviousID; + uint8_t NextID; +}TimerContext_t; + +/* Private defines -----------------------------------------------------------*/ +#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF +#define TIMER_LIST_EMPTY 0xFFFF + +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +/** + * START of Section TIMERSERVER_CONTEXT + */ + +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; + +/** + * END of Section TIMERSERVER_CONTEXT + */ + +static RTC_HandleTypeDef *phrtc; /**< RTC handle */ +static uint8_t WakeupTimerDivider; +static uint8_t AsynchPrescalerUserConfig; +static uint16_t SynchPrescalerUserConfig; +static volatile uint16_t MaxWakeupTimerSetup; + +/* Global variables ----------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +static void RestartWakeupCounter(uint16_t Value); +static uint16_t ReturnTimeElapsed(void); +static void RescheduleTimerList(void); +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); +static uint16_t linkTimer(uint8_t TimerID); +static uint32_t ReadRtcSsrValue(void); + +__weak void HW_TS_RTC_CountUpdated_AppNot(void); + +/* Functions Definition ------------------------------------------------------*/ + +/** + * @brief Read the RTC_SSR value + * As described in the reference manual, the RTC_SSR shall be read twice to ensure + * reliability of the value + * @param None + * @retval SSR value read + */ +static uint32_t ReadRtcSsrValue(void) +{ + uint32_t first_read; + uint32_t second_read; + + first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + while(first_read != second_read) + { + first_read = second_read; + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + } + + return second_read; +} + +/** + * @brief Insert a Timer in the list after the Timer ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked after + * @retval None + */ +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t next_id; + + next_id = aTimerContext[RefTimerID].NextID; + + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = TimerID; + } + aTimerContext[TimerID].NextID = next_id; + aTimerContext[TimerID].PreviousID = RefTimerID ; + aTimerContext[RefTimerID].NextID = TimerID; + + return; +} + +/** + * @brief Insert a Timer in the list before the ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked before + * @retval None + */ +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t previous_id; + + if(RefTimerID != CurrentRunningTimerID) + { + previous_id = aTimerContext[RefTimerID].PreviousID; + + aTimerContext[previous_id].NextID = TimerID; + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[TimerID].PreviousID = previous_id ; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + else + { + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + + return; +} + +/** + * @brief Insert a Timer in the list + * @param TimerID: The ID of the Timer + * @retval None + */ +static uint16_t linkTimer(uint8_t TimerID) +{ + uint32_t time_left; + uint16_t time_elapsed; + uint8_t timer_id_lookup; + uint8_t next_id; + + if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * No timer in the list + */ + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; + + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + time_elapsed = 0; + } + else + { + time_elapsed = ReturnTimeElapsed(); + + /** + * update count of the timer to be linked + */ + aTimerContext[TimerID].CountLeft += time_elapsed; + time_left = aTimerContext[TimerID].CountLeft; + + /** + * Search for index where the new timer shall be linked + */ + if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) + { + /** + * Search for the ID after the first one + */ + timer_id_lookup = CurrentRunningTimerID; + next_id = aTimerContext[timer_id_lookup].NextID; + while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) + { + timer_id_lookup = aTimerContext[timer_id_lookup].NextID; + next_id = aTimerContext[timer_id_lookup].NextID; + } + + /** + * Link after the ID + */ + LinkTimerAfter(TimerID, timer_id_lookup); + } + else + { + /** + * Link before the first ID + */ + LinkTimerBefore(TimerID, CurrentRunningTimerID); + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + } + } + + return time_elapsed; +} + +/** + * @brief Remove a Timer from the list + * @param TimerID: The ID of the Timer + * @param RequestReadSSR: Request to read the SSR register or not + * @retval None + */ +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) +{ + uint8_t previous_id; + uint8_t next_id; + + if(TimerID == CurrentRunningTimerID) + { + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = aTimerContext[TimerID].NextID; + } + else + { + previous_id = aTimerContext[TimerID].PreviousID; + next_id = aTimerContext[TimerID].NextID; + + aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; + } + } + + /** + * Timer is out of the list + */ + aTimerContext[TimerID].TimerIDStatus = TimerID_Created; + + if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) + { + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + } + + return; +} + +/** + * @brief Return the number of ticks counted by the wakeuptimer since it has been started + * @note The API is reading the SSR register to get how many ticks have been counted + * since the time the timer has been started + * @param None + * @retval Time expired in Ticks + */ +static uint16_t ReturnTimeElapsed(void) +{ + uint32_t return_value; + uint32_t wrap_counter; + + if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) + { + return_value = ReadRtcSsrValue(); /**< Read SSR register first */ + + if (SSRValueOnLastSetup >= return_value) + { + return_value = SSRValueOnLastSetup - return_value; + } + else + { + wrap_counter = SynchPrescalerUserConfig - return_value; + return_value = SSRValueOnLastSetup + wrap_counter; + } + + /** + * At this stage, ReturnValue holds the number of ticks counted by SSR + * Need to translate in number of ticks counted by the Wakeuptimer + */ + return_value = return_value*AsynchPrescalerUserConfig; + return_value = return_value >> WakeupTimerDivider; + } + else + { + return_value = 0; + } + + return (uint16_t)return_value; +} + +/** + * @brief Set the wakeup counter + * @note The API is writing the counter value so that the value is decreased by one to cope with the fact + * the interrupt is generated with 1 extra clock cycle (See RefManuel) + * It assumes all condition are met to be allowed to write the wakeup counter + * @param Value: Value to be written in the counter + * @retval None + */ +static void RestartWakeupCounter(uint16_t Value) +{ + /** + * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + */ + + if(Value == 0) + { + SSRValueOnLastSetup = ReadRtcSsrValue(); + + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + else + { + if((Value > 1) ||(WakeupTimerDivider != 1)) + { + Value -= 1; + } + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + + MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); + + /** + * Update the value here after the WUTWF polling that may take some time + */ + SSRValueOnLastSetup = ReadRtcSsrValue(); + + __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ + + HW_TS_RTC_CountUpdated_AppNot(); + } + + return ; +} + +/** + * @brief Reschedule the list of timer + * @note 1) Update the count left for each timer in the list + * 2) Setup the wakeuptimer + * @param None + * @retval None + */ +static void RescheduleTimerList(void) +{ + uint8_t localTimerID; + uint32_t timecountleft; + uint16_t wakeup_timer_value; + uint16_t time_elapsed; + + /** + * The wakeuptimer is disabled now to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + localTimerID = CurrentRunningTimerID; + + /** + * Calculate what will be the value to write in the wakeuptimer + */ + timecountleft = aTimerContext[localTimerID].CountLeft; + + /** + * Read how much has been counted + */ + time_elapsed = ReturnTimeElapsed(); + + if(timecountleft < time_elapsed ) + { + /** + * There is no tick left to count + */ + wakeup_timer_value = 0; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + else + { + if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) + { + /** + * The number of tick left is greater than the Wakeuptimer maximum value + */ + wakeup_timer_value = MaxWakeupTimerSetup; + + WakeupTimerLimitation = WakeupTimerValue_Overpassed; + } + else + { + wakeup_timer_value = timecountleft - time_elapsed; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + + } + + /** + * update ticks left to be counted for each timer + */ + while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + if (aTimerContext[localTimerID].CountLeft < time_elapsed) + { + aTimerContext[localTimerID].CountLeft = 0; + } + else + { + aTimerContext[localTimerID].CountLeft -= time_elapsed; + } + localTimerID = aTimerContext[localTimerID].NextID; + } + + /** + * Write next count + */ + RestartWakeupCounter(wakeup_timer_value); + + return ; +} + +/* Public functions ----------------------------------------------------------*/ + +/** + * For all public interface except that may need write access to the RTC, the RTC + * shall be unlock at the beginning and locked at the output + * In order to ease maintainability, the unlock is done at the top and the lock at then end + * in case some new implementation is coming in the future + */ + +void HW_TS_RTC_Wakeup_Handler(void) +{ + HW_TS_pTimerCb_t ptimer_callback; + uint32_t timer_process_id; + uint8_t local_current_running_timer_id; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + +/* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + /** + * Disable the Wakeup Timer + * This may speed up a bit the processing to wait the timer to be disabled + * The timer is still counting 2 RTCCLK + */ + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + + local_current_running_timer_id = CurrentRunningTimerID; + + if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) + { + ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; + timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; + + /** + * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted + * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick + * to be left whereas the count is over + * A more secure implementation has been done with a flag to state whereas the full count has been written + * in the wakeuptimer or not + */ + if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) + { + if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) + { + UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Stop(local_current_running_timer_id); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + + HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); + } + else + { + RescheduleTimerList(); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + } + else + { + /** + * We should never end up in this case + * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. + * We could just clean the interrupt flag and get out from this unexpected interrupt + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + return; +} + +void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) +{ + uint8_t loop; + uint32_t localmaxwakeuptimersetup; + + /** + * Get RTC handler + */ + phrtc = hrtc; + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + SET_BIT(RTC->CR, RTC_CR_BYPSHAD); + + /** + * Readout the user config + */ + WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); + + AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; + + SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; + + /** + * Margin is taken to avoid wrong calculation when the wrap around is there and some + * application interrupts may have delayed the reading + */ + localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); + + if(localmaxwakeuptimersetup >= 0xFFFF) + { + MaxWakeupTimerSetup = 0xFFFF; + } + else + { + MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; + } + + /** + * Configure EXTI module + */ + LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + + if(TimerInitMode == hw_ts_InitMode_Full) + { + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + + /** + * Initialize the timer server + */ + for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) + { + aTimerContext[loop].TimerIDStatus = TimerID_Free; + } + + CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ + + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ + } + else + { + if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) + { + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + + return; +} + +HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) +{ + HW_TS_ReturnStatus_t localreturnstatus; + uint8_t loop = 0; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) + { + loop++; + } + + if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[loop].TimerIDStatus = TimerID_Created; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + aTimerContext[loop].TimerProcessID = TimerProcessID; + aTimerContext[loop].TimerMode = TimerMode; + aTimerContext[loop].pTimerCallBack = pftimeout_handler; + *pTimerId = loop; + + localreturnstatus = hw_ts_Successful; + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + localreturnstatus = hw_ts_Failed; + } + + return(localreturnstatus); +} + +void HW_TS_Delete(uint8_t timer_id) +{ + HW_TS_Stop(timer_id); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ + + return; +} + +void HW_TS_Stop(uint8_t timer_id) +{ + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + UnlinkTimer(timer_id, SSR_Read_Requested); + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * List is empty + */ + + /** + * Disable the timer + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + } + else if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) +{ + uint16_t time_elapsed; + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + HW_TS_Stop( timer_id ); + } + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Running; + + aTimerContext[timer_id].CountLeft = timeout_ticks; + aTimerContext[timer_id].CounterInit = timeout_ticks; + + time_elapsed = linkTimer(timer_id); + + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + else + { + aTimerContext[timer_id].CountLeft -= time_elapsed; + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) +{ + uint32_t primask_bit; + uint16_t return_value, auro_reload_value, elapsed_time_value; + + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ + + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); + + elapsed_time_value = ReturnTimeElapsed(); + + if(auro_reload_value > elapsed_time_value) + { + return_value = auro_reload_value - elapsed_time_value; + } + else + { + return_value = 0; + } + } + else + { + return_value = TIMER_LIST_EMPTY; + } + + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + + return (return_value); +} + +__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) +{ + pTimerCallBack(); + + return; +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_uart.c new file mode 100644 index 000000000..a693ffc14 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_uart.c @@ -0,0 +1,440 @@ +/** + ****************************************************************************** + * File Name : Src/hw_uart.c + * Description : HW UART source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" + +/* Macros --------------------------------------------------------------------*/ +#define HW_UART_RX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##RxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + hal_status = HAL_UART_Receive_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##TxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + hal_status = HAL_UART_Transmit_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX(__HANDLE__, __USART_BASE__) \ + do{ \ + (__HANDLE__).Instance = (__USART_BASE__); \ + hal_status = HAL_UART_Transmit(&(__HANDLE__), p_data, size, timeout); \ + } while(0) + +/* Variables -----------------------------------------------------------------*/ +#if (CFG_HW_USART1_ENABLED == 1) +UART_HandleTypeDef huart1; +#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) +DMA_HandleTypeDef hdma_usart1_tx; +#endif +void (*HW_huart1RxCb)(void); +void (*HW_huart1TxCb)(void); +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) +UART_HandleTypeDef hlpuart1; +#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) +DMA_HandleTypeDef hdma_lpuart1_tx; +#endif +void (*HW_hlpuart1RxCb)(void); +void (*HW_hlpuart1TxCb)(void); +#endif + +/* Functions Definition ------------------------------------------------------*/ + +void MX_UART_Init(hw_uart_id_t uart) +{ + UART_HandleTypeDef *handle = NULL; + USART_TypeDef *instance = NULL; + switch(uart){ + case hw_uart1: +#if (CFG_HW_USART1_ENABLED != 1) + return; +#endif + handle = &huart1; + instance = USART1; + break; + case hw_lpuart1: +#if (CFG_HW_LPUART1_ENABLED != 1) + return; +#endif + handle = &hlpuart1; + instance = LPUART1; + break; + default: Error_Handler(); + } + handle->Instance = instance; + handle->Init.BaudRate = 115200; + handle->Init.WordLength = UART_WORDLENGTH_8B; + handle->Init.StopBits = UART_STOPBITS_1; + handle->Init.Parity = UART_PARITY_NONE; + handle->Init.Mode = UART_MODE_TX_RX; + handle->Init.HwFlowCtl = UART_HWCONTROL_NONE; + handle->Init.OverSampling = UART_OVERSAMPLING_16; + handle->Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; + handle->Init.ClockPrescaler = UART_PRESCALER_DIV1; + handle->AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; + handle->FifoMode = UART_FIFOMODE_DISABLE; + if (HAL_UART_Init(handle) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetTxFifoThreshold(handle, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetRxFifoThreshold(handle, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_DisableFifoMode(handle) != HAL_OK) + { + Error_Handler(); + } +} + +void MX_UART_Deinit(hw_uart_id_t uart) +{ + UART_HandleTypeDef *handle = NULL; + switch(uart){ + case hw_uart1: +#if (CFG_HW_USART1_ENABLED != 1) + return; +#endif + handle = &huart1; + break; + case hw_lpuart1: +#if (CFG_HW_LPUART1_ENABLED != 1) + return; +#endif + handle = &hlpuart1; + break; + default: Error_Handler(); + } + if (HAL_UART_DeInit(handle) != HAL_OK) + { + Error_Handler(); + } +} + +hw_status_t HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_RX_IT(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_RX_IT(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +hw_status_t HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_TX_IT(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_TX_IT(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_TX(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_TX(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_huart1TxCb = cb; + huart1.Instance = USART1; + hal_status = HAL_UART_Transmit_DMA(&huart1, p_data, size); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_hlpuart1TxCb = cb; + hlpuart1.Instance = LPUART1; + hal_status = HAL_UART_Transmit_DMA(&hlpuart1, p_data, size); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +#if 0 +void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HAL_UART_IRQHandler(&huart1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HAL_UART_IRQHandler(&hlpuart1); + break; +#endif + + default: + break; + } + + return; +} + +void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) + case hw_uart1: + HAL_DMA_IRQHandler(huart1.hdmatx); + break; +#endif + +#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) + case hw_lpuart1: + HAL_DMA_IRQHandler(hlpuart1.hdmatx); + break; +#endif + + default: + break; + } + + return; +} +#endif + +void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { +#if (CFG_HW_USART1_ENABLED == 1) + case (uint32_t)USART1: + if(HW_huart1RxCb) + { + HW_huart1RxCb(); + } + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case (uint32_t)LPUART1: + if(HW_hlpuart1RxCb) + { + HW_hlpuart1RxCb(); + } + break; +#endif + + default: + break; + } + + return; +} + +void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { +#if (CFG_HW_USART1_ENABLED == 1) + case (uint32_t)USART1: + if(HW_huart1TxCb) + { + HW_huart1TxCb(); + } + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case (uint32_t)LPUART1: + if(HW_hlpuart1TxCb) + { + HW_hlpuart1TxCb(); + } + break; +#endif + + default: + break; + } + + return; +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/main.c new file mode 100644 index 000000000..8ded8eaec --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/main.c @@ -0,0 +1,605 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file main.c + * @author MCD Application Team + * @brief RF LLD tests application + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @verbatim + ============================================================================== + ##### IMPORTANT NOTE ##### + ============================================================================== + + This application requests having a M0 LLD tests binary + flashed on the Wireless Coprocessor. + If it is not the case, you need to use STM32CubeProgrammer to load the appropriate + binary. + + All available binaries are located under following directory: + /Projects/STM32_Copro_Wireless_Binaries + + Refer to UM2237 to learn how to use/install STM32CubeProgrammer. + Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the + detailed procedure to change the Wireless Coprocessor binary. + + @endverbatim + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "app_entry.h" +#include "main.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "stm32_lpm.h" +#include "stm32_seq.h" +#include "dbg_trace.h" +#include "hw_conf.h" +#include "otp.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ +RTC_HandleTypeDef hrtc; + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +static void MX_DMA_Init(void); + static void MX_RTC_Init(void); + +/* USER CODE BEGIN PFP */ +static void SystemClock_Config(void); +static void PeriphClock_Config(void); +static void Reset_Device( void ); +static void Reset_IPCC( void ); +static void Reset_BackupDomain( void ); +static void Init_Exti( void ); +static void Config_HSE(void); +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ + +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/** + * @brief The application entry point. + * @retval int + */ +int main(void) +{ + /* USER CODE BEGIN 1 */ + + /** + * The OPTVERR flag is wrongly set at power on + * It shall be cleared before using any HAL_FLASH_xxx() api + */ + __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR); + + /* USER CODE END 1 */ + + /* MCU Configuration--------------------------------------------------------*/ + + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + HAL_Init(); + + /* USER CODE BEGIN Init */ + Reset_Device(); + Config_HSE(); + /* USER CODE END Init */ + + /* Configure the system clock on HSE without using PLL and the periph clock needed by this application */ + SystemClock_Config(); + + /* USER CODE BEGIN SysInit */ + PeriphClock_Config(); + Init_Exti(); + + /* USER CODE END SysInit */ + + /* Initialize all configured peripherals */ + MX_DMA_Init(); + MX_RTC_Init(); + + /* Init code for STM32_WPAN */ + APPE_Init(); + + /* Infinite loop */ + /* USER CODE BEGIN WHILE */ + while (1) + { + UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + /* USER CODE END WHILE */ + + /* USER CODE END WHILE */ + } + /* USER CODE BEGIN 3 */ + + /* USER CODE END 3 */ +} + +/** + * @brief System Clock Configuration : API to be called to use HSE (with or without PLL use) as 32Mhz system clock. + SystemClock_Config_HSE() must be called once just after boot (to go from default MSI to HSE). + Then application user can call both SystemClock_Config_HSE() and SystemClock_Config_MSI() at any time. + * @retval None + */ +void SystemClock_Config_HSE(uint32_t usePLL) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + + /* First, just set MSI ON (with the 32Mhz range) in case it was OFF, without any update on PLL */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_MSI; + RCC_OscInitStruct.MSIState = RCC_MSI_ON; + RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_10; + RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + /* Initialization Error */ + Error_Handler(); + } + /* Select MSI as system clock in order to be able to update HSE and PLL configuration */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI; + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + /* Initialization Error */ + Error_Handler(); + } + + /* Configure HSE and PLL if needed*/ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; + if (usePLL == 1) + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + else + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_OFF; + RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2; + RCC_OscInitStruct.PLL.PLLN = 8; + RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; + RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV4; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } + + /* Configure the system clock source and the dividers according to the fact that system clock source is 32Mhz */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK4 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK | + RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; + if (usePLL == 1) + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; + else + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSE; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.AHBCLK4Divider = RCC_SYSCLK_DIV1; + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + Error_Handler(); + } + + // Note that function UTILS_SetFlashLatency() could be used to set the correct Flash latency + // (with 32Mhz, 2WS are needed if the range is changed to 1V instead of 1.2V) + + /* Disable MSI Oscillator as the MSI is no more needed by the application */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_MSI; + RCC_OscInitStruct.MSIState = RCC_MSI_OFF; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* No update on PLL */ + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + /* Initialization Error */ + Error_Handler(); + } +} + +/** + * @brief System Clock Configuration : API to be called to use MSI (with or without PLL use) as 32Mhz system clock. + SystemClock_Config_HSE() must be called once just after boot (to go from default MSI to HSE). + Then application user can call both SystemClock_Config_HSE() and SystemClock_Config_MSI() at any time. + * @retval None + */ +void SystemClock_Config_MSI(uint32_t usePLL) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + + /* First, just set HSE ON (with the 32Mhz range) in case it was OFF, without any update on PLL */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + /* Initialization Error */ + Error_Handler(); + } + /* Select HSE as system clock in order to be able to update MSI and PLL configuration */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSE; + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + /* Initialization Error */ + Error_Handler(); + } + + /* Configure MSI and PLL if needed*/ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_MSI; + RCC_OscInitStruct.MSIState = RCC_MSI_ON; + RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_10; + RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_MSI; + if (usePLL == 1) + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + else + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_OFF; + RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2; + RCC_OscInitStruct.PLL.PLLN = 8; + RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; + RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV4; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + /* Initialization Error */ + Error_Handler(); + } + + /* Configure the system clock source and the dividers according to the fact that system clock source is 32Mhz */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK4 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK | + RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; + if (usePLL == 1) + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; + else + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.AHBCLK4Divider = RCC_SYSCLK_DIV1; + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + Error_Handler(); + } + +/* HSE cannot be stopped while using RF */ +#if 0 + /* Disable HSE Oscillator as the HSE is no more needed by the application */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.HSEState = RCC_HSE_OFF; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* No update on PLL */ + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + /* Initialization Error */ + Error_Handler(); + } +#endif +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief System Clock Configuration : must be called during application start-up + * @retval None + */ +static void SystemClock_Config(void) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + + /* Configure LSE Drive Capability */ + __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW); + #ifdef STM32WB15xx + #else + /* Configure the main internal regulator output voltage */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); + #endif + + /* Assuming that MSI is enabled by default after boot, lets go to HSE without using PLL */ + SystemClock_Config_HSE(0); + + /* Configure Others clock */ + #ifdef STM32WB15xx + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | + RCC_OSCILLATORTYPE_LSE | RCC_OSCILLATORTYPE_LSI2; + #else + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSI48 | + RCC_OSCILLATORTYPE_LSE | RCC_OSCILLATORTYPE_LSI2; + RCC_OscInitStruct.HSI48State = RCC_HSI48_OFF; + #endif + RCC_OscInitStruct.LSEState = RCC_LSE_ON; + RCC_OscInitStruct.HSIState = RCC_HSI_OFF; + RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; + RCC_OscInitStruct.LSIState = RCC_LSI_OFF; + RCC_OscInitStruct.LSI2CalibrationValue = 0; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } +} + +/** + * Enable DMA controller clock + */ +static void MX_DMA_Init(void) +{ + /* DMA controller clock enable */ + __HAL_RCC_DMAMUX1_CLK_ENABLE(); + __HAL_RCC_DMA1_CLK_ENABLE(); + + /* DMA interrupt init */ + /* DMA1_Channel4_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn); + /* DMA1_Channel5_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn); +} + +static void PeriphClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + +#if USE_SMPS_ENABLED_BY_DEFAULT + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS | RCC_PERIPHCLK_RFWAKEUP | RCC_PERIPHCLK_USART1 | RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; + PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; + PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + + /* Initialize SMPS here like in BLE applis */ + LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA); + LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40); + LL_PWR_SMPS_Enable(); +#else + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RFWAKEUP | RCC_PERIPHCLK_USART1 | RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } +#endif + + return; +} + +static void Config_HSE(void) +{ + OTP_ID0_t * p_otp; + + /** + * Read HSE_Tuning from OTP + */ + p_otp = (OTP_ID0_t *) OTP_Read(0); + if (p_otp) + { + LL_RCC_HSE_SetCapacitorTuning(p_otp->hse_tuning); + } + + return; +} + + +static void Reset_Device( void ) +{ +#if ( CFG_HW_RESET_BY_FW == 1 ) + Reset_BackupDomain(); + + Reset_IPCC(); +#endif + + return; +} + +static void Reset_IPCC( void ) +{ + LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_IPCC); + + LL_C1_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + return; +} + +static void Reset_BackupDomain( void ) +{ + if ((LL_RCC_IsActiveFlag_PINRST() != FALSE) && (LL_RCC_IsActiveFlag_SFTRST() == FALSE)) + { + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_BACKUPRESET_FORCE(); + __HAL_RCC_BACKUPRESET_RELEASE(); + } + + return; +} + +static void Init_Exti( void ) +{ + /**< Disable all wakeup interrupt on CPU1 except LPUART(25), IPCC(36), HSEM(38) */ + LL_EXTI_DisableIT_0_31( (~0) & (~(LL_EXTI_LINE_25)) ); + LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + + return; +} + +/** + * @brief RTC Initialization Function + * @param None + * @retval None + */ +static void MX_RTC_Init(void) +{ + + /* USER CODE BEGIN RTC_Init 0 */ + + /* USER CODE END RTC_Init 0 */ + + /* USER CODE BEGIN RTC_Init 1 */ + + /* USER CODE END RTC_Init 1 */ + /** Initialize RTC Only + */ + hrtc.Instance = RTC; + hrtc.Init.HourFormat = RTC_HOURFORMAT_24; + hrtc.Init.AsynchPrediv = CFG_RTC_ASYNCH_PRESCALER; + hrtc.Init.SynchPrediv = CFG_RTC_SYNCH_PRESCALER; + hrtc.Init.OutPut = RTC_OUTPUT_DISABLE; + hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH; + hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN; + hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE; + if (HAL_RTC_Init(&hrtc) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN RTC_Init 2 */ + /* Disable RTC registers write protection */ + LL_RTC_DisableWriteProtection(RTC); + + LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); + + /* Enable RTC registers write protection */ + LL_RTC_EnableWriteProtection(RTC); + /* USER CODE END RTC_Init 2 */ + +} + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void HAL_Delay(uint32_t Delay) +{ + uint32_t tickstart = HAL_GetTick(); + uint32_t wait = Delay; + + /* Add a freq to guarantee minimum wait */ + if (wait < HAL_MAX_DELAY) + { + wait += HAL_GetTickFreq(); + } + + while ((HAL_GetTick() - tickstart) < wait) + { + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ + #if defined ( __CC_ARM) + __force_stores(); + #endif + + __WFI( ); + } +} +/* USER CODE END 4 */ + +/** + * @brief This function is executed in case of error occurrence. + * @retval None + */ +void Error_Handler(void) +{ + BSP_LED_On(LED_BLUE); + /* USER CODE BEGIN Error_Handler */ + /* User can add his own implementation to report the HAL error return state */ + /* USER CODE END Error_Handler */ +} + +#ifdef USE_FULL_ASSERT +/** + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ +void assert_failed(uint8_t *file, uint32_t line) +{ + /* USER CODE BEGIN assert_failed */ + /* User can add his own implementation to report the file name and line number, + tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* USER CODE END assert_failed */ +} +#endif /* USE_FULL_ASSERT */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32_lpm_if.c new file mode 100644 index 000000000..fd5ffa733 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32_lpm_if.c @@ -0,0 +1,349 @@ +/* USER CODE BEGIN Header */ +/** + *************************************************************************************** + * File Name : stm32_lpm_if.c + * Description : Low layer function to enter/exit low power modes (stop, sleep). + *************************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32_lpm_if.h" +#include "stm32_lpm.h" +#include "app_conf.h" +/* USER CODE BEGIN include */ + +/* USER CODE END include */ + +/* Exported variables --------------------------------------------------------*/ +const struct UTIL_LPM_Driver_s UTIL_PowerDriver = +{ + PWR_EnterSleepMode, + PWR_ExitSleepMode, + + PWR_EnterStopMode, + PWR_ExitStopMode, + + PWR_EnterOffMode, + PWR_ExitOffMode, +}; + +/* Private function prototypes -----------------------------------------------*/ +static void Switch_On_HSI( void ); +static void EnterLowPower( void ); +static void ExitLowPower( void ); +/* USER CODE BEGIN Private_Function_Prototypes */ + +/* USER CODE END Private_Function_Prototypes */ +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN Private_Typedef */ + +/* USER CODE END Private_Typedef */ +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Define */ + +/* USER CODE END Private_Define */ +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Macro */ + +/* USER CODE END Private_Macro */ +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN Private_Variables */ + +/* USER CODE END Private_Variables */ + +/* Functions Definition ------------------------------------------------------*/ +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ) +{ +/* USER CODE BEGIN PWR_EnterOffMode_1 */ + +/* USER CODE END PWR_EnterOffMode_1 */ + /** + * The systick should be disabled for the same reason than when the device enters stop mode because + * at this time, the device may enter either OffMode or StopMode. + */ + HAL_SuspendTick(); + + EnterLowPower(); + + /************************************************************************************ + * ENTER OFF MODE + ***********************************************************************************/ + /* + * There is no risk to clear all the WUF here because in the current implementation, this API is called + * in critical section. If an interrupt occurs while in that critical section before that point, + * the flag is set and will be cleared here but the system will not enter Off Mode + * because an interrupt is pending in the NVIC. The ISR will be executed when moving out + * of this critical section + */ + LL_PWR_ClearFlag_WU( ); + + LL_PWR_SetPowerMode( LL_PWR_MODE_STANDBY ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterOffMode_2 */ + +/* USER CODE END PWR_EnterOffMode_2 */ + return; +} + +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ) +{ +/* USER CODE BEGIN PWR_ExitOffMode_1 */ + +/* USER CODE END PWR_ExitOffMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitOffMode_2 */ + +/* USER CODE END PWR_ExitOffMode_2 */ + return; +} + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ) +{ +/* USER CODE BEGIN PWR_EnterStopMode_1 */ + +/* USER CODE END PWR_EnterStopMode_1 */ + /** + * When HAL_DBGMCU_EnableDBGStopMode() is called to keep the debugger active in Stop Mode, + * the systick shall be disabled otherwise the cpu may crash when moving out from stop mode + * + * When in production, the HAL_DBGMCU_EnableDBGStopMode() is not called so that the device can reach best power consumption + * However, the systick should be disabled anyway to avoid the case when it is about to expire at the same time the device enters + * stop mode ( this will abort the Stop Mode entry ). + */ + HAL_SuspendTick(); + + /** + * This function is called from CRITICAL SECTION + */ + EnterLowPower(); + + /************************************************************************************ + * ENTER STOP MODE + ***********************************************************************************/ + LL_PWR_SetPowerMode( LL_PWR_MODE_STOP2 ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterStopMode_2 */ + +/* USER CODE END PWR_EnterStopMode_2 */ + return; +} + +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ) +{ +/* USER CODE BEGIN PWR_ExitStopMode_1 */ + +/* USER CODE END PWR_ExitStopMode_1 */ + /** + * This function is called from CRITICAL SECTION + */ + ExitLowPower(); + + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitStopMode_2 */ + +/* USER CODE END PWR_ExitStopMode_2 */ + return; +} + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ) +{ +/* USER CODE BEGIN PWR_EnterSleepMode_1 */ + +/* USER CODE END PWR_EnterSleepMode_1 */ + + HAL_SuspendTick(); + + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores(); +#endif + + __WFI( ); +/* USER CODE BEGIN PWR_EnterSleepMode_2 */ + +/* USER CODE END PWR_EnterSleepMode_2 */ + return; +} + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ) +{ +/* USER CODE BEGIN PWR_ExitSleepMode_1 */ + +/* USER CODE END PWR_ExitSleepMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitSleepMode_2 */ + +/* USER CODE END PWR_ExitSleepMode_2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief Setup the system to enter either stop or off mode + * @param none + * @retval none + */ +static void EnterLowPower( void ) +{ + /** + * This function is called from CRITICAL SECTION + */ + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if ( ! LL_HSEM_1StepLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID ) ) + { + if( LL_PWR_IsActiveFlag_C2DS() || LL_PWR_IsActiveFlag_C2SB() ) + { + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + Switch_On_HSI( ); + } + } + else + { + Switch_On_HSI( ); + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Restore the system to exit stop mode + * @param none + * @retval none + */ +static void ExitLowPower( void ) +{ + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if(LL_RCC_GetSysClkSource( ) == LL_RCC_SYS_CLKSOURCE_STATUS_HSI) + { +/* Restore the clock configuration of the application in this user section */ +/* USER CODE BEGIN ExitLowPower_1 */ + LL_RCC_HSE_Enable( ); + __HAL_FLASH_SET_LATENCY(FLASH_LATENCY_1); + while(!LL_RCC_HSE_IsReady( )); + LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSE); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSE); +/* USER CODE END ExitLowPower_1 */ + } + else + { +/* If the application is not running on HSE restore the clock configuration in this user section */ +/* USER CODE BEGIN ExitLowPower_2 */ + +/* USER CODE END ExitLowPower_2 */ + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Switch the system clock on HSI + * @param none + * @retval none + */ +static void Switch_On_HSI( void ) +{ + LL_RCC_HSI_Enable( ); + while(!LL_RCC_HSI_IsReady( )); + LL_RCC_SetSysClkSource( LL_RCC_SYS_CLKSOURCE_HSI ); + LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSI); + return; +} + +/* USER CODE BEGIN Private_Functions */ + +/* USER CODE END Private_Functions */ + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_hal_msp.c new file mode 100644 index 000000000..57bfb1d7c --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_hal_msp.c @@ -0,0 +1,329 @@ +/** + ****************************************************************************** + * @file stm32wbxx_hal_msp.c + * @author MCD Application Team + * @brief This file contains the HAL System and Peripheral (UARTs) MSP initialization + * and de-initialization functions. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" +#include "app_common.h" +#include "gpio_lld.h" + +/** @addtogroup STM32WBxx_HAL_Driver + * @{ + */ + +/** @defgroup HAL_MSP HAL MSP + * @brief HAL MSP module. + * @{ + */ + +/* Private typedef -----------------------------------------------------------*/ +/* Private define ------------------------------------------------------------*/ +/* Private macro -------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +/* Private functions ---------------------------------------------------------*/ + +/** @defgroup HAL_MSP_Private_Functions HAL MSP Private Functions + * @{ + */ + +/** + * @brief Initializes the Global MSP. + * @note This function is called from HAL_Init() function to perform system + * level initialization (GPIOs, clock, DMA, interrupt). + * @retval None + */ +void HAL_MspInit(void) +{ + +} + +/** + * @brief DeInitializes the Global MSP. + * @note This functiona is called from HAL_DeInit() function to perform system + * level de-initialization (GPIOs, clock, DMA, interrupt). + * @retval None + */ +void HAL_MspDeInit(void) +{ + +} + +/** + * @brief UART MSP Initialization + * This function configures the hardware resources used in this example + * @param huart: UART handle pointer + * @retval None + */ +void HAL_UART_MspInit(UART_HandleTypeDef* huart) +{ + HAL_DMA_MuxSyncConfigTypeDef pSyncConfig; + +#if (CFG_HW_LPUART1_ENABLED == 1) + if(huart->Instance == LPUART1) + { + /* USER CODE BEGIN LPUART1_MspInit 0 */ + + /* USER CODE END LPUART1_MspInit 0 */ + + /* GPIOs configuration */ + #if(CFG_DEBUG_TRACE != 0) + gpio_lld_lpuart_init(); + #endif + + + /* LPUART1 DMA Init */ + /* LPUART1_TX Init */ + hdma_lpuart1_tx.Instance = DMA1_Channel4; + hdma_lpuart1_tx.Init.Request = DMA_REQUEST_LPUART1_TX; + hdma_lpuart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; + hdma_lpuart1_tx.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_lpuart1_tx.Init.MemInc = DMA_MINC_ENABLE; + hdma_lpuart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; + hdma_lpuart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; + hdma_lpuart1_tx.Init.Mode = DMA_NORMAL; + hdma_lpuart1_tx.Init.Priority = DMA_PRIORITY_LOW; + if (HAL_DMA_Init(&hdma_lpuart1_tx) != HAL_OK) + { + Error_Handler(); + } + + pSyncConfig.SyncSignalID = HAL_DMAMUX1_SYNC_DMAMUX1_CH1_EVT; + pSyncConfig.SyncPolarity = HAL_DMAMUX_SYNC_NO_EVENT; + pSyncConfig.SyncEnable = DISABLE; + pSyncConfig.EventEnable = DISABLE; + pSyncConfig.RequestNumber = 1; + if (HAL_DMAEx_ConfigMuxSync(&hdma_lpuart1_tx, &pSyncConfig) != HAL_OK) + { + Error_Handler(); + } + + __HAL_LINKDMA(huart,hdmatx,hdma_lpuart1_tx); + + /* LPUART1 interrupt Init */ + HAL_NVIC_SetPriority(LPUART1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(LPUART1_IRQn); + /* USER CODE BEGIN LPUART1_MspInit 1 */ + + /* USER CODE END LPUART1_MspInit 1 */ + } +#endif +#if (CFG_HW_USART1_ENABLED == 1) + if(huart->Instance == USART1) + { + /* USER CODE BEGIN USART1_MspInit 0 */ + + /* USER CODE END USART1_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_USART1_CLK_ENABLE(); + + /* GPIOs configuration */ + #if(CFG_DEBUG_TRACE != 0) + gpio_lld_usart_init(); + #endif + + + /* USART1 DMA Init */ + /* USART1_TX Init */ + hdma_usart1_tx.Instance = DMA1_Channel5; + hdma_usart1_tx.Init.Request = DMA_REQUEST_USART1_TX; + hdma_usart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; + hdma_usart1_tx.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_usart1_tx.Init.MemInc = DMA_MINC_ENABLE; + hdma_usart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; + hdma_usart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; + hdma_usart1_tx.Init.Mode = DMA_NORMAL; + hdma_usart1_tx.Init.Priority = DMA_PRIORITY_LOW; + if (HAL_DMA_Init(&hdma_usart1_tx) != HAL_OK) + { + Error_Handler(); + } + + __HAL_LINKDMA(huart,hdmatx,hdma_usart1_tx); + + /* USART1 interrupt Init */ + HAL_NVIC_SetPriority(USART1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(USART1_IRQn); + /* USER CODE BEGIN USART1_MspInit 1 */ + + /* USER CODE END USART1_MspInit 1 */ + } +#endif +} + +/** + * @brief UART MSP De-Initialization + * This function freeze the hardware resources used in this example + * @param huart: UART handle pointer + * @retval None + */ +void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) +{ +#if (CFG_HW_LPUART1_ENABLED == 1) + if(huart->Instance == LPUART1) + { + /* USER CODE BEGIN LPUART1_MspDeInit 0 */ + + /* USER CODE END LPUART1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_LPUART1_CLK_DISABLE(); + + /* De-init GPIOs */ + gpio_lld_lpuart_deInit(); + + /* LPUART1 DMA DeInit */ + HAL_DMA_DeInit(huart->hdmatx); + + /* LPUART1 interrupt DeInit */ + HAL_NVIC_DisableIRQ(LPUART1_IRQn); + /* USER CODE BEGIN LPUART1_MspDeInit 1 */ + + /* USER CODE END LPUART1_MspDeInit 1 */ + } +#endif +#if (CFG_HW_USART1_ENABLED == 1) + if(huart->Instance == USART1) + { + /* USER CODE BEGIN USART1_MspDeInit 0 */ + + /* USER CODE END USART1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_USART1_CLK_DISABLE(); + + /* De-init GPIOs */ + gpio_lld_usart_deInit(); + + + /* USART1 DMA DeInit */ + HAL_DMA_DeInit(huart->hdmatx); + + /* USART1 interrupt DeInit */ + HAL_NVIC_DisableIRQ(USART1_IRQn); + /* USER CODE BEGIN USART1_MspDeInit 1 */ + + /* USER CODE END USART1_MspDeInit 1 */ + } +#endif +} + +/** + * @} + */ +/** +* @brief TIM_Base MSP Initialization +* This function configures the hardware resources used in this example +* @param htim_base: TIM_Base handle pointer +* @retval None +*/ +void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) +{ + if(htim_base->Instance==TIM2) + { + /* USER CODE BEGIN TIM2_MspInit 0 */ + + /* USER CODE END TIM2_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_TIM2_CLK_ENABLE(); + /* TIM2 interrupt Init */ + HAL_NVIC_SetPriority(TIM2_IRQn, 3, 0); + HAL_NVIC_EnableIRQ(TIM2_IRQn); + /* USER CODE BEGIN TIM2_MspInit 1 */ + + /* USER CODE END TIM2_MspInit 1 */ + } + +} + +/** +* @brief TIM_Base MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param htim_base: TIM_Base handle pointer +* @retval None +*/ +void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) +{ + if(htim_base->Instance==TIM2) + { + /* USER CODE BEGIN TIM2_MspDeInit 0 */ + + /* USER CODE END TIM2_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_TIM2_CLK_DISABLE(); + + /* TIM2 interrupt DeInit */ + HAL_NVIC_DisableIRQ(TIM2_IRQn); + /* USER CODE BEGIN TIM2_MspDeInit 1 */ + + /* USER CODE END TIM2_MspDeInit 1 */ + } + +} + +/** +* @brief RTC MSP Initialization +* This function configures the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspInit 0 */ + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ + /* USER CODE END RTC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_RTC_ENABLE(); + __HAL_RCC_RTCAPB_CLK_ENABLE(); + /* USER CODE BEGIN RTC_MspInit 1 */ + HAL_RTCEx_EnableBypassShadow(hrtc); + /* USER CODE END RTC_MspInit 1 */ + } + +} + +/** +* @brief RTC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspDeInit 0 */ + + /* USER CODE END RTC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_RTC_DISABLE(); + __HAL_RCC_RTCAPB_CLK_DISABLE(); + /* USER CODE BEGIN RTC_MspDeInit 1 */ + + /* USER CODE END RTC_MspDeInit 1 */ + } + +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_it.c new file mode 100644 index 000000000..556af7d2f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_it.c @@ -0,0 +1,321 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.c + * @brief Interrupt Service Routines. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "stm32wbxx_it.h" +#include "gpio_lld.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/******************************************************************************/ +/* Cortex Processor Interruption and Exception Handlers */ +/******************************************************************************/ +/** + * @brief This function handles Non maskable interrupt. + */ +void NMI_Handler(void) +{ + /* USER CODE BEGIN NonMaskableInt_IRQn 0 */ + + /* USER CODE END NonMaskableInt_IRQn 0 */ + /* USER CODE BEGIN NonMaskableInt_IRQn 1 */ + + /* USER CODE END NonMaskableInt_IRQn 1 */ +} + +/** + * @brief This function handles Hard fault interrupt. + */ +void HardFault_Handler(void) +{ + /* USER CODE BEGIN HardFault_IRQn 0 */ + gpio_lld_phy_gpioHardFault_up(); + + /* USER CODE END HardFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + /* USER CODE END W1_HardFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Memory management fault. + */ +void MemManage_Handler(void) +{ + /* USER CODE BEGIN MemoryManagement_IRQn 0 */ + + /* USER CODE END MemoryManagement_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */ + /* USER CODE END W1_MemoryManagement_IRQn 0 */ + } +} + +/** + * @brief This function handles Prefetch fault, memory access fault. + */ +void BusFault_Handler(void) +{ + /* USER CODE BEGIN BusFault_IRQn 0 */ + + /* USER CODE END BusFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_BusFault_IRQn 0 */ + /* USER CODE END W1_BusFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Undefined instruction or illegal state. + */ +void UsageFault_Handler(void) +{ + /* USER CODE BEGIN UsageFault_IRQn 0 */ + + /* USER CODE END UsageFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_UsageFault_IRQn 0 */ + /* USER CODE END W1_UsageFault_IRQn 0 */ + } +} + +/** + * @brief This function handles System service call via SWI instruction. + */ +void SVC_Handler(void) +{ + /* USER CODE BEGIN SVCall_IRQn 0 */ + + /* USER CODE END SVCall_IRQn 0 */ + /* USER CODE BEGIN SVCall_IRQn 1 */ + + /* USER CODE END SVCall_IRQn 1 */ +} + +/** + * @brief This function handles Debug monitor. + */ +void DebugMon_Handler(void) +{ + /* USER CODE BEGIN DebugMonitor_IRQn 0 */ + + /* USER CODE END DebugMonitor_IRQn 0 */ + /* USER CODE BEGIN DebugMonitor_IRQn 1 */ + + /* USER CODE END DebugMonitor_IRQn 1 */ +} + +/** + * @brief This function handles Pendable request for system service. + */ +void PendSV_Handler(void) +{ + /* USER CODE BEGIN PendSV_IRQn 0 */ + + /* USER CODE END PendSV_IRQn 0 */ + /* USER CODE BEGIN PendSV_IRQn 1 */ + + /* USER CODE END PendSV_IRQn 1 */ +} + +/** + * @brief This function handles System tick timer. + */ +void SysTick_Handler(void) +{ + /* USER CODE BEGIN SysTick_IRQn 0 */ + + /* USER CODE END SysTick_IRQn 0 */ + HAL_IncTick(); + /* USER CODE BEGIN SysTick_IRQn 1 */ + + /* USER CODE END SysTick_IRQn 1 */ +} + +/******************************************************************************/ +/* STM32WBxx Peripheral Interrupt Handlers */ +/* Add here the Interrupt Handlers for the used peripherals. */ +/* For the available peripheral interrupt handler names, */ +/* please refer to the startup file (startup_stm32wbxx.s). */ +/******************************************************************************/ +/** + * @brief This function handles DMA1 channel4 global interrupt. + */ +void DMA1_Channel4_IRQHandler(void) +{ + /* USER CODE BEGIN DMA1_Channel4_IRQn 0 */ + + /* USER CODE END DMA1_Channel4_IRQn 0 */ +#if (CFG_HW_LPUART1_ENABLED == 1) +#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) + HAL_DMA_IRQHandler(&hdma_lpuart1_tx); +#endif +#endif + /* USER CODE BEGIN DMA1_Channel4_IRQn 1 */ + + /* USER CODE END DMA1_Channel4_IRQn 1 */ +} + +/** + * @brief This function handles DMA2 channel4 global interrupt. + */ +void DMA1_Channel5_IRQHandler(void) +{ + /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */ + + /* USER CODE END DMA1_Channel5_IRQn 0 */ +#if (CFG_HW_USART1_ENABLED == 1) +#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) + HAL_DMA_IRQHandler(&hdma_usart1_tx); +#endif +#endif + /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */ + + /* USER CODE END DMA1_Channel5_IRQn 1 */ +} + +/** + * @brief This function handles USART1 global interrupt. + */ +void USART1_IRQHandler(void) +{ + /* USER CODE BEGIN USART1_IRQn 0 */ + + /* USER CODE END USART1_IRQn 0 */ +#if (CFG_HW_USART1_ENABLED == 1) + HAL_UART_IRQHandler(&huart1); +#endif + /* USER CODE BEGIN USART1_IRQn 1 */ + + /* USER CODE END USART1_IRQn 1 */ +} + +/** + * @brief This function handles LPUART1 global interrupt. + */ +void LPUART1_IRQHandler(void) +{ + /* USER CODE BEGIN LPUART1_IRQn 0 */ + + /* USER CODE END LPUART1_IRQn 0 */ +#if (CFG_HW_LPUART1_ENABLED == 1) + HAL_UART_IRQHandler(&hlpuart1); +#endif + /* USER CODE BEGIN LPUART1_IRQn 1 */ + + /* USER CODE END LPUART1_IRQn 1 */ +} + +/* USER CODE BEGIN 1 */ +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void BUTTON_SW1_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); +} + +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void BUTTON_SW2_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW2_PIN); +} + +/** + * @brief This function handles External line + * interrupt request. + * @param None + * @retval None + */ +void BUTTON_SW3_EXTI_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW3_PIN); +} + +void RTC_WKUP_IRQHandler(void) +{ + HW_TS_RTC_Wakeup_Handler(); +} + +void IPCC_C1_TX_IRQHandler(void) +{ + HW_IPCC_Tx_Handler(); + + return; +} + +void IPCC_C1_RX_IRQHandler(void) +{ + HW_IPCC_Rx_Handler(); + return; +} + +/* USER CODE END 1 */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm_logging.c new file mode 100644 index 000000000..36ad5be14 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/stm_logging.c @@ -0,0 +1,212 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : stm_logging.c + * Description : This file contains all the defines and functions used + * for logging on Application examples. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/** + * @file + * This file implements logging functions to be used in Application examples. + * + */ + +#include +#include +#include +#include +#include +#include + +#include "app_conf.h" +#include "stm_logging.h" + +#define LOG_PARSE_BUFFER_SIZE 256U + +#define LOG_TIMESTAMP_ENABLE 0 +#define LOG_REGION_ENABLE 1U +#define LOG_RTT_COLOR_ENABLE 1U + +#if (LOG_RTT_COLOR_ENABLE == 1U) +#define RTT_COLOR_CODE_DEFAULT "\x1b[0m" +#define RTT_COLOR_CODE_RED "\x1b[0;91m" +#define RTT_COLOR_CODE_GREEN "\x1b[0;92m" +#define RTT_COLOR_CODE_YELLOW "\x1b[0;93m" +#define RTT_COLOR_CODE_CYAN "\x1b[0;96m" + +#else /* LOG_RTT_COLOR_ENABLE == 1 */ +#define RTT_COLOR_CODE_DEFAULT "" +#define RTT_COLOR_CODE_RED "" +#define RTT_COLOR_CODE_GREEN "" +#define RTT_COLOR_CODE_YELLOW "" +#define RTT_COLOR_CODE_CYAN "" +#endif /* LOG_RTT_COLOR_ENABLE == 1 */ + +#if (CFG_DEBUG_TRACE != 0) +/** + * Function for outputting code region string. + * + * @param[inout] aLogString Pointer to log buffer. + * @param[in] aMaxSize Maximum size of log buffer. + * @param[in] otLogRegion The region ID. + * + * @returns String with a log level color value. + */ +static inline uint16_t logRegion(char *aLogString, uint16_t aMaxSize, + appliLogRegion_t aLogRegion) +{ + char logRegionString[30U]; + + switch (aLogRegion) + { + case APPLI_LOG_REGION_GENERAL: + strcpy(logRegionString, "[M4 APPLICATION]"); + break; + case APPLI_LOG_REGION_OPENTHREAD_API: + strcpy(logRegionString, "[M4 OPENTHREAD API]"); + break; + case APPLI_LOG_REGION_OT_API_LINK: + strcpy(logRegionString, "[M4 LINK API]"); + break; + case APPLI_LOG_REGION_OT_API_INSTANCE: + strcpy(logRegionString, "[M4 INSTANCE API]"); + break; + case APPLI_LOG_REGION_OT_API_MESSAGE: + strcpy(logRegionString, "[M4 MESSAGE API]"); + break; + default: + strcpy(logRegionString, "[M4]"); + break; + } + + return snprintf(aLogString, aMaxSize, "%s ", logRegionString); +} +#endif /* CFG_DEBUG_TRACE */ + +#if (LOG_RTT_COLOR_ENABLE == 1U) +#if (CFG_DEBUG_TRACE != 0) +/** + * Function for getting color of a given level log. + * + * @param[in] aLogLevel The log level. + * + * @returns String with a log level color value. + */ +static inline const char *levelToString(appliLogLevel_t aLogLevel) +{ + switch (aLogLevel) + { + case LOG_LEVEL_CRIT: + return RTT_COLOR_CODE_RED; + + case LOG_LEVEL_WARN: + return RTT_COLOR_CODE_YELLOW; + + case LOG_LEVEL_INFO: + return RTT_COLOR_CODE_GREEN; + + case LOG_LEVEL_DEBG: + default: + return RTT_COLOR_CODE_DEFAULT; + } +} +#endif /* CFG_DEBUG_TRACE */ + +#if (CFG_DEBUG_TRACE != 0) +/** + * Function for printing log level. + * + * @param[inout] aLogString Pointer to log buffer. + * @param[in] aMaxSize Maximum size of log buffer. + * @param[in] aLogLevel Log level. + * + * @returns Number of bytes successfully written to the log buffer. + */ +static inline uint16_t logLevel(char *aLogString, uint16_t aMaxSize, + appliLogLevel_t aLogLevel) +{ + return snprintf(aLogString, aMaxSize, "%s", levelToString(aLogLevel)); +} +#endif /* CFG_DEBUG_TRACE */ +#endif /* LOG_RTT_COLOR_ENABLE */ + +#if (LOG_TIMESTAMP_ENABLE == 1U) +/** + * Function for printing actual timestamp. + * + * @param[inout] aLogString Pointer to the log buffer. + * @param[in] aMaxSize Maximum size of the log buffer. + * + * @returns Number of bytes successfully written to the log buffer. + */ +static inline uint16_t logTimestamp(char *aLogString, uint16_t aMaxSize) +{ + return snprintf(aLogString, aMaxSize, "%s[%010ld]", RTT_COLOR_CODE_DEFAULT, + otPlatAlarmMilliGetNow()); +} +#endif /* LOG_TIMESTAMP_ENABLE */ + +/** + * Function for printing application log + * + * @param[in] aLogLevel Log level. + * @param[in] aLogRegion The region ID. + * @param[in] aFormat User string format. + * + * @returns Number of bytes successfully written to the log buffer. + */ +void logApplication(appliLogLevel_t aLogLevel, appliLogRegion_t aLogRegion, const char *aFormat, ...) +{ +#if (CFG_DEBUG_TRACE != 0) /* Since the traces are disabled, there is nothing to print */ + uint16_t length = 0; + char logString[LOG_PARSE_BUFFER_SIZE + 1U]; + +#if (LOG_TIMESTAMP_ENABLE == 1U) + length += logTimestamp(logString, LOG_PARSE_BUFFER_SIZE); +#endif + +#if (LOG_RTT_COLOR_ENABLE == 1U) + /* Add level information */ + length += logLevel(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), + aLogLevel); +#endif + +#if (LOG_REGION_ENABLE == 1U) + /* Add Region information */ + length += logRegion(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), + aLogRegion); +#endif + + /* Parse user string */ + va_list paramList; + va_start(paramList, aFormat); + length += vsnprintf(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), + aFormat, paramList); + logString[length++] = '\r'; + logString[length++] = '\n'; + logString[length++] = 0; + va_end(paramList); + + if (aLogLevel <= APPLI_CONFIG_LOG_LEVEL) + { + printf("%s", logString); + }else + { + /* Print nothing */ + } +#endif /* CFG_DEBUG_TRACE */ +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/system_stm32wbxx.c new file mode 100644 index 000000000..5b5c0ebdf --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/Core/Src/system_stm32wbxx.c @@ -0,0 +1,352 @@ +/** + ****************************************************************************** + * @file system_stm32wbxx.c + * @author MCD Application Team + * @brief CMSIS Cortex Device Peripheral Access Layer System Source File + * + * This file provides two functions and one global variable to be called from + * user application: + * - SystemInit(): This function is called at startup just after reset and + * before branch to main program. This call is made inside + * the "startup_stm32wbxx.s" file. + * + * - SystemCoreClock variable: Contains the core clock (HCLK), it can be used + * by the user application to setup the SysTick + * timer or configure other parameters. + * + * - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must + * be called whenever the core clock is changed + * during program execution. + * + * After each device reset the MSI (4 MHz) is used as system clock source. + * Then SystemInit() function is called, in "startup_stm32wbxx.s" file, to + * configure the system clock before to branch to main program. + * + * This file configures the system clock as follows: + *============================================================================= + *----------------------------------------------------------------------------- + * System Clock source | MSI + *----------------------------------------------------------------------------- + * SYSCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * HCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * AHB Prescaler | 1 + *----------------------------------------------------------------------------- + * APB1 Prescaler | 1 + *----------------------------------------------------------------------------- + * APB2 Prescaler | 1 + *----------------------------------------------------------------------------- + * PLL_M | 1 + *----------------------------------------------------------------------------- + * PLL_N | 8 + *----------------------------------------------------------------------------- + * PLL_P | 7 + *----------------------------------------------------------------------------- + * PLL_Q | 2 + *----------------------------------------------------------------------------- + * PLL_R | 2 + *----------------------------------------------------------------------------- + * PLLSAI1_P | NA + *----------------------------------------------------------------------------- + * PLLSAI1_Q | NA + *----------------------------------------------------------------------------- + * PLLSAI1_R | NA + *----------------------------------------------------------------------------- + * Require 48MHz for USB OTG FS, | Disabled + * SDIO and RNG clock | + *----------------------------------------------------------------------------- + *============================================================================= + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/** @addtogroup CMSIS + * @{ + */ + +/** @addtogroup stm32WBxx_system + * @{ + */ + +/** @addtogroup stm32WBxx_System_Private_Includes + * @{ + */ + +#include "stm32wbxx.h" + +#if !defined (HSE_VALUE) + #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (MSI_VALUE) + #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +#if !defined (HSI_VALUE) + #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +#if !defined (LSI_VALUE) + #define LSI_VALUE (32000UL) /*!< Value of LSI in Hz*/ +#endif /* LSI_VALUE */ + +#if !defined (LSE_VALUE) + #define LSE_VALUE (32768UL) /*!< Value of LSE in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_TypesDefinitions + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Defines + * @{ + */ + +/*!< Uncomment the following line if you need to relocate your vector Table in + Internal SRAM. */ +/* #define VECT_TAB_SRAM */ +#define VECT_TAB_OFFSET 0x0U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ + +#define VECT_TAB_BASE_ADDRESS SRAM1_BASE /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Macros + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Variables + * @{ + */ + /* The SystemCoreClock variable is updated in three ways: + 1) by calling CMSIS function SystemCoreClockUpdate() + 2) by calling HAL API function HAL_RCC_GetHCLKFreq() + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency + Note: If you use this function to configure the system clock; then there + is no need to call the 2 first functions listed above, since SystemCoreClock + variable is updated automatically. + */ + uint32_t SystemCoreClock = 4000000UL ; /*CPU1: M4 on MSI clock after startup (4MHz)*/ + + const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL}; + + const uint32_t APBPrescTable[8UL] = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL}; + + const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ + 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ + + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_FunctionPrototypes + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Functions + * @{ + */ + +/** + * @brief Setup the microcontroller system. + * @param None + * @retval None + */ +void SystemInit(void) +{ + /* Configure the Vector Table location add offset address ------------------*/ +#if defined(VECT_TAB_SRAM) && defined(VECT_TAB_BASE_ADDRESS) + /* program in SRAMx */ + SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAMx for CPU1 */ +#else /* program in FLASH */ + SCB->VTOR = VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */ +#endif + + /* FPU settings ------------------------------------------------------------*/ + #if (__FPU_PRESENT == 1) && (__FPU_USED == 1) + SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL))); /* set CP10 and CP11 Full Access */ + #endif + + /* Reset the RCC clock configuration to the default reset state ------------*/ + /* Set MSION bit */ + RCC->CR |= RCC_CR_MSION; + + /* Reset CFGR register */ + RCC->CFGR = 0x00070000U; + + /* Reset PLLSAI1ON, PLLON, HSECSSON, HSEON, HSION, and MSIPLLON bits */ + RCC->CR &= (uint32_t)0xFAF6FEFBU; + + /*!< Reset LSI1 and LSI2 bits */ + RCC->CSR &= (uint32_t)0xFFFFFFFAU; + + /*!< Reset HSI48ON bit */ + RCC->CRRCR &= (uint32_t)0xFFFFFFFEU; + + /* Reset PLLCFGR register */ + RCC->PLLCFGR = 0x22041000U; + +#if defined(STM32WB55xx) + /* Reset PLLSAI1CFGR register */ + RCC->PLLSAI1CFGR = 0x22041000U; +#endif + + /* Reset HSEBYP bit */ + RCC->CR &= 0xFFFBFFFFU; + + /* Disable all interrupts */ + RCC->CIER = 0x00000000; +} + +/** + * @brief Update SystemCoreClock variable according to Clock Register Values. + * The SystemCoreClock variable contains the core clock (HCLK), it can + * be used by the user application to setup the SysTick timer or configure + * other parameters. + * + * @note Each time the core clock (HCLK) changes, this function must be called + * to update SystemCoreClock variable value. Otherwise, any configuration + * based on this variable will be incorrect. + * + * @note - The system frequency computed by this function is not the real + * frequency in the chip. It is calculated based on the predefined + * constant and the selected clock source: + * + * - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*) + * + * - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**) + * + * - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***) + * + * - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***) + * or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors. + * + * (*) MSI_VALUE is a constant defined in stm32wbxx_hal.h file (default value + * 4 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (**) HSI_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 16 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (***) HSE_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 32 MHz), user has to ensure that HSE_VALUE is same as the real + * frequency of the crystal used. Otherwise, this function may + * have wrong result. + * + * - The result of this function could be not correct when using fractional + * value for HSE crystal. + * + * @param None + * @retval None + */ +void SystemCoreClockUpdate(void) +{ + uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm; + + /* Get MSI Range frequency--------------------------------------------------*/ + + /*MSI frequency range in Hz*/ + msirange = MSIRangeTable[(RCC->CR & RCC_CR_MSIRANGE) >> RCC_CR_MSIRANGE_Pos]; + + /* Get SYSCLK source -------------------------------------------------------*/ + switch (RCC->CFGR & RCC_CFGR_SWS) + { + case 0x00: /* MSI used as system clock source */ + SystemCoreClock = msirange; + break; + + case 0x04: /* HSI used as system clock source */ + /* HSI used as system clock source */ + SystemCoreClock = HSI_VALUE; + break; + + case 0x08: /* HSE used as system clock source */ + SystemCoreClock = HSE_VALUE; + break; + + case 0x0C: /* PLL used as system clock source */ + /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN + SYSCLK = PLL_VCO / PLLR + */ + pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC); + pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ; + + if(pllsource == 0x02UL) /* HSI used as PLL clock source */ + { + pllvco = (HSI_VALUE / pllm); + } + else if(pllsource == 0x03UL) /* HSE used as PLL clock source */ + { + pllvco = (HSE_VALUE / pllm); + } + else /* MSI used as PLL clock source */ + { + pllvco = (msirange / pllm); + } + + pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos); + pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL); + + SystemCoreClock = pllvco/pllr; + break; + + default: + SystemCoreClock = msirange; + break; + } + + /* Compute HCLK clock frequency --------------------------------------------*/ + /* Get HCLK1 prescaler */ + tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)]; + /* HCLK clock frequency */ + SystemCoreClock = SystemCoreClock / tmp; + +} + + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewd b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewd new file mode 100644 index 000000000..757485903 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewd @@ -0,0 +1,1419 @@ + + + 3 + + BLE_LLD + + ARM + + 1 + + C-SPY + 2 + + 29 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 1 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 1 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 1 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 1 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 1 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 1 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewp new file mode 100644 index 000000000..83270cc23 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.ewp @@ -0,0 +1,1229 @@ + + + 3 + + BLE_LLD + + ARM + + 1 + + General + 3 + + 30 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application + + EWARM + + $PROJ_DIR$\startup_stm32wb55xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\gpio_lld.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm_logging.c + + + + STM32_WPAN + + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble_lld.c + + + $PROJ_DIR$\..\STM32_WPAN\App\datarate_app.c + + + + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers + + BSP + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c + + + + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + + + + STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + + + + + Middlewares + + STM32_WPAN + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble_lld\hal\ble_hal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble_lld\lld\ble_lld.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + + + + + Utilities + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.eww b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.eww new file mode 100644 index 000000000..ae853c1e0 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/BLE_LLD_Datarate.eww @@ -0,0 +1,7 @@ + + + + $WS_DIR$\BLE_LLD_Datarate.ewp + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/startup_stm32wb55xx_cm4.s new file mode 100644 index 000000000..911641737 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/startup_stm32wb55xx_cm4.s @@ -0,0 +1,515 @@ +;****************************************************************************** +;* File Name : startup_stm32wb55xx_cm4.s +;* Author : MCD Application Team +;* Description : M4 core vector table of the STM32WB55xx devices for the +;* IAR (EWARM) toolchain. +;* +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == _iar_program_start, +;* - Set the vector table entries with the exceptions ISR +;* address. +;* - Branches to main in the C library (which eventually +;* calls main()). +;* After Reset the Cortex-M4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +; +; +; The modules in this file are included in the libraries, and may be replaced +; by any user-defined modules that define the PUBLIC symbol _program_start or +; a user defined start symbol. +; To override the cstartup defined in the library, simply add your modified +; version to the workbench project. +; +; The vector table is normally located at address 0. +; When debugging in RAM, it can be located in RAM, aligned to at least 2^6. +; The name "__vector_table" has special meaning for C-SPY: +; it is where the SP start value is found, and the NVIC vector +; table register (VTOR) is initialized to this address if != 0. +; +; Cortex-M version +; + + MODULE ?cstartup + + ;; Forward declaration of sections. + SECTION CSTACK:DATA:NOROOT(3) + + SECTION .intvec:CODE:NOROOT(2) + + EXTERN __iar_program_start + EXTERN SystemInit + PUBLIC __vector_table + + DATA +__vector_table + DCD sfe(CSTACK) + DCD Reset_Handler ; Reset Handler + + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM Interrupt + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper, TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD USB_HP_IRQHandler ; USB High Priority Interrupt + DCD USB_LP_IRQHandler ; USB Low Priority Interrupt + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts + DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt + DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD SPI2_IRQHandler ; SPI2 Interrupt + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD SAI1_IRQHandler ; SAI Interrupt + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD CRS_IRQHandler ; CRS interrupt + DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD LCD_IRQHandler ; LCD Interrupt + DCD QUADSPI_IRQHandler ; QUADSPI Interrupt + DCD AES1_IRQHandler ; AES1 Interrupt + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt + DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt + DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt + DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt + DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt + DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt + DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; Default interrupt handlers. +;; + THUMB + + PUBWEAK Reset_Handler + SECTION .text:CODE:NOROOT:REORDER(2) +Reset_Handler + LDR R0, =SystemInit + BLX R0 + LDR R0, =__iar_program_start + BX R0 + + PUBWEAK NMI_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +NMI_Handler + B NMI_Handler + + PUBWEAK HardFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +HardFault_Handler + B HardFault_Handler + + PUBWEAK MemManage_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +MemManage_Handler + B MemManage_Handler + + PUBWEAK BusFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +BusFault_Handler + B BusFault_Handler + + PUBWEAK UsageFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +UsageFault_Handler + B UsageFault_Handler + + PUBWEAK SVC_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SVC_Handler + B SVC_Handler + + PUBWEAK DebugMon_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +DebugMon_Handler + B DebugMon_Handler + + PUBWEAK PendSV_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +PendSV_Handler + B PendSV_Handler + + PUBWEAK SysTick_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SysTick_Handler + B SysTick_Handler + + PUBWEAK WWDG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +WWDG_IRQHandler + B WWDG_IRQHandler + + PUBWEAK PVD_PVM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PVD_PVM_IRQHandler + B PVD_PVM_IRQHandler + + PUBWEAK TAMP_STAMP_LSECSS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TAMP_STAMP_LSECSS_IRQHandler + B TAMP_STAMP_LSECSS_IRQHandler + + PUBWEAK RTC_WKUP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_WKUP_IRQHandler + B RTC_WKUP_IRQHandler + + PUBWEAK FLASH_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FLASH_IRQHandler + B FLASH_IRQHandler + + PUBWEAK RCC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RCC_IRQHandler + B RCC_IRQHandler + + PUBWEAK EXTI0_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI0_IRQHandler + B EXTI0_IRQHandler + + PUBWEAK EXTI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI1_IRQHandler + B EXTI1_IRQHandler + + PUBWEAK EXTI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI2_IRQHandler + B EXTI2_IRQHandler + + PUBWEAK EXTI3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI3_IRQHandler + B EXTI3_IRQHandler + + PUBWEAK EXTI4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI4_IRQHandler + B EXTI4_IRQHandler + + PUBWEAK DMA1_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel1_IRQHandler + B DMA1_Channel1_IRQHandler + + PUBWEAK DMA1_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel2_IRQHandler + B DMA1_Channel2_IRQHandler + + PUBWEAK DMA1_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel3_IRQHandler + B DMA1_Channel3_IRQHandler + + PUBWEAK DMA1_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel4_IRQHandler + B DMA1_Channel4_IRQHandler + + PUBWEAK DMA1_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel5_IRQHandler + B DMA1_Channel5_IRQHandler + + PUBWEAK DMA1_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel6_IRQHandler + B DMA1_Channel6_IRQHandler + + PUBWEAK DMA1_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel7_IRQHandler + B DMA1_Channel7_IRQHandler + + PUBWEAK ADC1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +ADC1_IRQHandler + B ADC1_IRQHandler + + PUBWEAK USB_HP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USB_HP_IRQHandler + B USB_HP_IRQHandler + + PUBWEAK USB_LP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USB_LP_IRQHandler + B USB_LP_IRQHandler + + PUBWEAK C2SEV_PWR_C2H_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +C2SEV_PWR_C2H_IRQHandler + B C2SEV_PWR_C2H_IRQHandler + + PUBWEAK COMP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +COMP_IRQHandler + B COMP_IRQHandler + + PUBWEAK EXTI9_5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI9_5_IRQHandler + B EXTI9_5_IRQHandler + + PUBWEAK TIM1_BRK_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_BRK_IRQHandler + B TIM1_BRK_IRQHandler + + PUBWEAK TIM1_UP_TIM16_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_UP_TIM16_IRQHandler + B TIM1_UP_TIM16_IRQHandler + + PUBWEAK TIM1_TRG_COM_TIM17_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_TRG_COM_TIM17_IRQHandler + B TIM1_TRG_COM_TIM17_IRQHandler + + PUBWEAK TIM1_CC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_CC_IRQHandler + B TIM1_CC_IRQHandler + + PUBWEAK TIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM2_IRQHandler + B TIM2_IRQHandler + + PUBWEAK PKA_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PKA_IRQHandler + B PKA_IRQHandler + + PUBWEAK I2C1_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_EV_IRQHandler + B I2C1_EV_IRQHandler + + PUBWEAK I2C1_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_ER_IRQHandler + B I2C1_ER_IRQHandler + + PUBWEAK I2C3_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C3_EV_IRQHandler + B I2C3_EV_IRQHandler + + PUBWEAK I2C3_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C3_ER_IRQHandler + B I2C3_ER_IRQHandler + + PUBWEAK SPI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI1_IRQHandler + B SPI1_IRQHandler + + PUBWEAK SPI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI2_IRQHandler + B SPI2_IRQHandler + + PUBWEAK USART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USART1_IRQHandler + B USART1_IRQHandler + + PUBWEAK LPUART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPUART1_IRQHandler + B LPUART1_IRQHandler + + PUBWEAK SAI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SAI1_IRQHandler + B SAI1_IRQHandler + + PUBWEAK TSC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TSC_IRQHandler + B TSC_IRQHandler + + PUBWEAK EXTI15_10_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI15_10_IRQHandler + B EXTI15_10_IRQHandler + + PUBWEAK RTC_Alarm_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_Alarm_IRQHandler + B RTC_Alarm_IRQHandler + + PUBWEAK CRS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +CRS_IRQHandler + B CRS_IRQHandler + + PUBWEAK PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + B PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + + PUBWEAK IPCC_C1_RX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_RX_IRQHandler + B IPCC_C1_RX_IRQHandler + + PUBWEAK IPCC_C1_TX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_TX_IRQHandler + B IPCC_C1_TX_IRQHandler + + PUBWEAK HSEM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +HSEM_IRQHandler + B HSEM_IRQHandler + + PUBWEAK LPTIM1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM1_IRQHandler + B LPTIM1_IRQHandler + + PUBWEAK LPTIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM2_IRQHandler + B LPTIM2_IRQHandler + + PUBWEAK LCD_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LCD_IRQHandler + B LCD_IRQHandler + + PUBWEAK QUADSPI_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +QUADSPI_IRQHandler + B QUADSPI_IRQHandler + + PUBWEAK AES1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES1_IRQHandler + B AES1_IRQHandler + + PUBWEAK AES2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES2_IRQHandler + B AES2_IRQHandler + + PUBWEAK RNG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RNG_IRQHandler + B RNG_IRQHandler + + PUBWEAK FPU_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FPU_IRQHandler + B FPU_IRQHandler + + PUBWEAK DMA2_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel1_IRQHandler + B DMA2_Channel1_IRQHandler + + PUBWEAK DMA2_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel2_IRQHandler + B DMA2_Channel2_IRQHandler + + PUBWEAK DMA2_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel3_IRQHandler + B DMA2_Channel3_IRQHandler + + PUBWEAK DMA2_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel4_IRQHandler + B DMA2_Channel4_IRQHandler + + PUBWEAK DMA2_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel5_IRQHandler + B DMA2_Channel5_IRQHandler + + PUBWEAK DMA2_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel6_IRQHandler + B DMA2_Channel6_IRQHandler + + PUBWEAK DMA2_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel7_IRQHandler + B DMA2_Channel7_IRQHandler + + PUBWEAK DMAMUX1_OVR_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMAMUX1_OVR_IRQHandler + B DMAMUX1_OVR_IRQHandler + + END + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/stm32wb55xx_flash_cm4.icf new file mode 100644 index 000000000..f9aff22d8 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/EWARM/stm32wb55xx_flash_cm4.icf @@ -0,0 +1,41 @@ +/*###ICF### Section handled by ICF editor, don't touch! ****/ +/*-Editor annotation file-*/ +/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ +/*-Specials-*/ +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +/*-Memory Regions-*/ +/***** FLASH Part dedicated to M4 *****/ +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x400; +/**** End of ICF editor section. ###ICF###*/ + +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; + +/* MB_MEM1 and MB_MEM2 are sections reserved to mailbox communication. It is placed in the shared memory */ +initialize by copy { readwrite }; +do not initialize { section .noinit, + section MAPPING_TABLE, + section MB_MEM1 }; + +place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; + +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvoptx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvoptx new file mode 100644 index 000000000..075c81f36 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvoptx @@ -0,0 +1,829 @@ + + + + 1.0 + +
                                                                  ### uVision Project, (C) Keil Software
                                                                  + + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc; *.md + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + BLE_LLD + 0x4 + ARM-ADS + + 12000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 18 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 6 + + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll + + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4 -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM)) + + + 0 + ST-LINKIII-KEIL_SWO + -U-O142 -O2254 -S0 -C0 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM) + + + + + 0 + + + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + + + Application/MDK-ARM + 0 + 0 + 0 + 0 + + 1 + 1 + 2 + 0 + 0 + 0 + startup_stm32wb55xx_cm4.s + startup_stm32wb55xx_cm4.s + 0 + 0 + + + + + Application/User/Core + 0 + 0 + 0 + 0 + + 2 + 2 + 1 + 0 + 0 + 0 + ../Core/Src/app_entry.c + app_entry.c + 0 + 0 + + + 2 + 3 + 1 + 0 + 0 + 0 + ../Core/Src/gpio_lld.c + gpio_lld.c + 0 + 0 + + + 2 + 4 + 1 + 0 + 0 + 0 + ../Core/Src/hw_uart.c + hw_uart.c + 0 + 0 + + + 2 + 5 + 1 + 0 + 0 + 0 + ../Core/Src/hw_timerserver.c + hw_timerserver.c + 0 + 0 + + + 2 + 6 + 1 + 0 + 0 + 0 + ../Core/Src/main.c + main.c + 0 + 0 + + + 2 + 7 + 1 + 0 + 0 + 0 + ../Core/Src/stm32_lpm_if.c + stm32_lpm_if.c + 0 + 0 + + + 2 + 8 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_hal_msp.c + stm32wbxx_hal_msp.c + 0 + 0 + + + 2 + 9 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_it.c + stm32wbxx_it.c + 0 + 0 + + + 2 + 10 + 1 + 0 + 0 + 0 + ../Core/Src/stm_logging.c + stm_logging.c + 0 + 0 + + + + + Application/User/STM32_WPAN/App + 0 + 0 + 0 + 0 + + 3 + 11 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/app_ble_lld.c + app_ble_lld.c + 0 + 0 + + + 3 + 12 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/datarate_app.c + datarate_app.c + 0 + 0 + + + + + Application/User/STM32_WPAN/Target + 0 + 0 + 0 + 0 + + 4 + 13 + 1 + 0 + 0 + 0 + ../STM32_WPAN/Target/hw_ipcc.c + hw_ipcc.c + 0 + 0 + + + + + Doc + 0 + 0 + 0 + 0 + + 5 + 14 + 5 + 0 + 0 + 0 + ../readme.txt + readme.txt + 0 + 0 + + + + + Drivers/BSP + 0 + 0 + 0 + 0 + + 6 + 15 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + stm32wbxx_nucleo.c + 0 + 0 + + + + + Drivers/CMSIS + 0 + 0 + 0 + 0 + + 7 + 16 + 1 + 0 + 0 + 0 + ../Core/Src/system_stm32wbxx.c + system_stm32wbxx.c + 0 + 0 + + + + + Drivers/STM32WBxx_HAL_Driver + 0 + 0 + 0 + 0 + + 8 + 17 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + stm32wbxx_hal.c + 0 + 0 + + + 8 + 18 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + stm32wbxx_hal_cortex.c + 0 + 0 + + + 8 + 19 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + stm32wbxx_hal_dma.c + 0 + 0 + + + 8 + 20 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + stm32wbxx_hal_dma_ex.c + 0 + 0 + + + 8 + 21 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + stm32wbxx_hal_exti.c + 0 + 0 + + + 8 + 22 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + stm32wbxx_hal_flash.c + 0 + 0 + + + 8 + 23 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + stm32wbxx_hal_flash_ex.c + 0 + 0 + + + 8 + 24 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + stm32wbxx_hal_gpio.c + 0 + 0 + + + 8 + 25 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + stm32wbxx_hal_hsem.c + 0 + 0 + + + 8 + 26 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + stm32wbxx_hal_pwr.c + 0 + 0 + + + 8 + 27 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + stm32wbxx_hal_pwr_ex.c + 0 + 0 + + + 8 + 28 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + stm32wbxx_hal_rcc.c + 0 + 0 + + + 8 + 29 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + stm32wbxx_hal_rcc_ex.c + 0 + 0 + + + 8 + 30 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + stm32wbxx_hal_tim.c + 0 + 0 + + + 8 + 31 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + stm32wbxx_hal_tim_ex.c + 0 + 0 + + + 8 + 32 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + stm32wbxx_hal_uart.c + 0 + 0 + + + 8 + 33 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + stm32wbxx_hal_uart_ex.c + 0 + 0 + + + 8 + 34 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + stm32wbxx_hal_rtc.c + 0 + 0 + + + 8 + 35 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + stm32wbxx_hal_rtc_ex.c + 0 + 0 + + + + + Middlewares/STM32_WPAN + 0 + 0 + 0 + 0 + + 9 + 36 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c + ble_hal.c + 0 + 0 + + + 9 + 37 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c + ble_lld.c + 0 + 0 + + + 9 + 38 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + dbg_trace.c + 0 + 0 + + + 9 + 39 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + otp.c + 0 + 0 + + + 9 + 40 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + shci.c + 0 + 0 + + + 9 + 41 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + shci_tl.c + 0 + 0 + + + 9 + 42 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + shci_tl_if.c + 0 + 0 + + + 9 + 43 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + stm_list.c + 0 + 0 + + + 9 + 44 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + stm_queue.c + 0 + 0 + + + 9 + 45 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + tl_mbox.c + 0 + 0 + + + + + Utilities + 0 + 0 + 0 + 0 + + 10 + 46 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + stm32_lpm.c + 0 + 0 + + + 10 + 47 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/sequencer/stm32_seq.c + stm32_seq.c + 0 + 0 + + + + + ::CMSIS + 0 + 0 + 0 + 1 + + +                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvprojx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvprojx new file mode 100644 index 000000000..b6d1006d6 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/BLE_LLD_Datarate.uvprojx @@ -0,0 +1,689 @@ + + + + 2.1 + +
                                                                  ### uVision Project, (C) Keil Software
                                                                  + + + + BLE_LLD + 0x4 + ARM-ADS + 5060960::V5.06 update 7 (build 960)::.\ARMCC + 0 + + + STM32WB55RGVx + STMicroelectronics + Keil.STM32WBxx_DFP.1.1.1 + http://www.keil.com/pack + IROM(0x08000000-0x807FFFF) IRAM(0x20000008-0x2002FC07) IRAM2(0x20030000-0x200327FF) CLOCK(8000000) FPU2 CPUTYPE("Cortex-M4") TZ + + + + 0 + + + + + + + + + + + $$Device:STM32WB55RGVx$CMSIS\SVD\STM32WB55_CM4.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + BLE_LLD\Exe\ + BLE_LLD_Datarate + 1 + 0 + 1 + 1 + 1 + + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 1 + 0 + fromelf #L --bin --output=$L@L.bin + + 0 + 0 + 0 + 0 + + 1 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 0 + + + SARMCM3.DLL + -REMAP -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 1 + 1 + 4101 + + 1 + BIN\UL2V8M.DLL + + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 2 + 0 + 0 + 1 + 0 + 8 + 1 + 0 + 0 + 0 + 3 + 4 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 1 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000008 + 0x2fc00 + + + 1 + 0x8000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8000000 + 0x80000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000008 + 0x2fc00 + + + 0 + 0x20030000 + 0x2800 + + + + + + 1 + 4 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + 1 + 0 + 0 + 5 + 3 + 1 + 1 + 0 + 0 + 0 + + + CORE_CM4,USE_HAL_DRIVER,STM32WB55xx,USE_STM32WBXX_NUCLEO,BLE_LLD_WB,BLE_LLD_LP + + ../Core/Inc;../STM32_WPAN/App;../STM32_WPAN/Target;../../../../../../Drivers/CMSIS/Device/ST/STM32WBxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/sequencer;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/ble_lld/hal;../../../../../../Middlewares/ST/STM32_WPAN/ble_lld/lld;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci;../../../../../../Middlewares/ST/STM32_WPAN/utilities + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + + + + + + + + + 0 + 0 + 0 + 0 + 1 + 0 + + + + stm32wb55xx_flash_cm4.sct + + + --diag_suppress L6314W +--diag_suppress 1296 + + + + + + + + Application/MDK-ARM + + + startup_stm32wb55xx_cm4.s + 2 + startup_stm32wb55xx_cm4.s + + + + + Application/User/Core + + + app_entry.c + 1 + ../Core/Src/app_entry.c + + + gpio_lld.c + 1 + ../Core/Src/gpio_lld.c + + + hw_uart.c + 1 + ../Core/Src/hw_uart.c + + + hw_timerserver.c + 1 + ../Core/Src/hw_timerserver.c + + + main.c + 1 + ../Core/Src/main.c + + + stm32_lpm_if.c + 1 + ../Core/Src/stm32_lpm_if.c + + + stm32wbxx_hal_msp.c + 1 + ../Core/Src/stm32wbxx_hal_msp.c + + + stm32wbxx_it.c + 1 + ../Core/Src/stm32wbxx_it.c + + + stm_logging.c + 1 + ../Core/Src/stm_logging.c + + + + + Application/User/STM32_WPAN/App + + + app_ble_lld.c + 1 + ../STM32_WPAN/App/app_ble_lld.c + + + datarate_app.c + 1 + ../STM32_WPAN/App/datarate_app.c + + + + + Application/User/STM32_WPAN/Target + + + hw_ipcc.c + 1 + ../STM32_WPAN/Target/hw_ipcc.c + + + + + Doc + + + readme.txt + 5 + ../readme.txt + + + + + Drivers/BSP + + + stm32wbxx_nucleo.c + 1 + ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + + + + + Drivers/CMSIS + + + system_stm32wbxx.c + 1 + ../Core/Src/system_stm32wbxx.c + + + + + Drivers/STM32WBxx_HAL_Driver + + + stm32wbxx_hal.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + stm32wbxx_hal_cortex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + stm32wbxx_hal_dma.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + stm32wbxx_hal_dma_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + stm32wbxx_hal_exti.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + stm32wbxx_hal_flash.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + stm32wbxx_hal_flash_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + stm32wbxx_hal_gpio.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + stm32wbxx_hal_hsem.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + stm32wbxx_hal_pwr.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + stm32wbxx_hal_pwr_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + stm32wbxx_hal_rcc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + stm32wbxx_hal_rcc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + stm32wbxx_hal_tim.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + stm32wbxx_hal_tim_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + stm32wbxx_hal_uart.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + stm32wbxx_hal_uart_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + stm32wbxx_hal_rtc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + stm32wbxx_hal_rtc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + + + Middlewares/STM32_WPAN + + + ble_hal.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c + + + ble_lld.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c + + + dbg_trace.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + otp.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + shci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + shci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + shci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + stm_list.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + stm_queue.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + tl_mbox.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + + + Utilities + + + stm32_lpm.c + 1 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + stm32_seq.c + 1 + ../../../../../../Utilities/sequencer/stm32_seq.c + + + + + ::CMSIS + + + + + + + + + + + + + + + + + + +                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/startup_stm32wb55xx_cm4.s new file mode 100644 index 000000000..f64d720d5 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -0,0 +1,367 @@ +;****************************************************************************** +;* File Name : startup_stm32wb55xx_cm4.s +;* Author : MCD Application Team +;* Description : STM32WB55xx devices vector table for MDK-ARM toolchain. +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == Reset_Handler +;* - Set the vector table entries with the exceptions ISR address +;* - Branches to __main in the C library (which eventually +;* calls main()). +;* After Reset the CortexM4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;* <<< Use Configuration Wizard in Context Menu >>> +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019-2021 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** + +; Amount of memory (in bytes) allocated for Stack +; Tailor this value to your application needs +; Stack Configuration +; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Stack_Size EQU 0x1000 + + AREA STACK, NOINIT, READWRITE, ALIGN=3 +Stack_Mem SPACE Stack_Size +__initial_sp + + +; Heap Configuration +; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Heap_Size EQU 0x400 + + AREA HEAP, NOINIT, READWRITE, ALIGN=3 +__heap_base +Heap_Mem SPACE Heap_Size +__heap_limit + + PRESERVE8 + THUMB + + +; Vector Table Mapped to Address 0 at Reset + AREA RESET, DATA, READONLY + EXPORT __Vectors + EXPORT __Vectors_End + EXPORT __Vectors_Size + +__Vectors DCD __initial_sp ; Top of Stack + DCD Reset_Handler ; Reset Handler + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM detector + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper and TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD USB_HP_IRQHandler ; USB High Priority Interrupt + DCD USB_LP_IRQHandler ; USB Low Priority Interrupt + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts + DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt + DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD SPI2_IRQHandler ; SPI2 Interrupt + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD SAI1_IRQHandler ; SAI Interrupt + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD CRS_IRQHandler ; CRS interrupt + DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD LCD_IRQHandler ; LCD Interrupt + DCD QUADSPI_IRQHandler ; QUADSPI Interrupt + DCD AES1_IRQHandler ; AES1 Interrupt + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt + DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt + DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt + DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt + DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt + DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt + DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +__Vectors_End + +__Vectors_Size EQU __Vectors_End - __Vectors + + AREA |.text|, CODE, READONLY + +; Reset handler +Reset_Handler PROC + EXPORT Reset_Handler [WEAK] + IMPORT SystemInit + IMPORT __main + + LDR R0, =SystemInit + BLX R0 + LDR R0, =__main + BX R0 + ENDP + +; Dummy Exception Handlers (infinite loops which can be modified) + +NMI_Handler PROC + EXPORT NMI_Handler [WEAK] + B . + ENDP +HardFault_Handler\ + PROC + EXPORT HardFault_Handler [WEAK] + B . + ENDP +MemManage_Handler\ + PROC + EXPORT MemManage_Handler [WEAK] + B . + ENDP +BusFault_Handler\ + PROC + EXPORT BusFault_Handler [WEAK] + B . + ENDP +UsageFault_Handler\ + PROC + EXPORT UsageFault_Handler [WEAK] + B . + ENDP +SVC_Handler PROC + EXPORT SVC_Handler [WEAK] + B . + ENDP +DebugMon_Handler\ + PROC + EXPORT DebugMon_Handler [WEAK] + B . + ENDP +PendSV_Handler PROC + EXPORT PendSV_Handler [WEAK] + B . + ENDP +SysTick_Handler PROC + EXPORT SysTick_Handler [WEAK] + B . + ENDP + +Default_Handler PROC + + EXPORT WWDG_IRQHandler [WEAK] + EXPORT PVD_PVM_IRQHandler [WEAK] + EXPORT TAMP_STAMP_LSECSS_IRQHandler [WEAK] + EXPORT RTC_WKUP_IRQHandler [WEAK] + EXPORT FLASH_IRQHandler [WEAK] + EXPORT RCC_IRQHandler [WEAK] + EXPORT EXTI0_IRQHandler [WEAK] + EXPORT EXTI1_IRQHandler [WEAK] + EXPORT EXTI2_IRQHandler [WEAK] + EXPORT EXTI3_IRQHandler [WEAK] + EXPORT EXTI4_IRQHandler [WEAK] + EXPORT DMA1_Channel1_IRQHandler [WEAK] + EXPORT DMA1_Channel2_IRQHandler [WEAK] + EXPORT DMA1_Channel3_IRQHandler [WEAK] + EXPORT DMA1_Channel4_IRQHandler [WEAK] + EXPORT DMA1_Channel5_IRQHandler [WEAK] + EXPORT DMA1_Channel6_IRQHandler [WEAK] + EXPORT DMA1_Channel7_IRQHandler [WEAK] + EXPORT ADC1_IRQHandler [WEAK] + EXPORT USB_HP_IRQHandler [WEAK] + EXPORT USB_LP_IRQHandler [WEAK] + EXPORT C2SEV_PWR_C2H_IRQHandler [WEAK] + EXPORT COMP_IRQHandler [WEAK] + EXPORT EXTI9_5_IRQHandler [WEAK] + EXPORT TIM1_BRK_IRQHandler [WEAK] + EXPORT TIM1_UP_TIM16_IRQHandler [WEAK] + EXPORT TIM1_TRG_COM_TIM17_IRQHandler [WEAK] + EXPORT TIM1_CC_IRQHandler [WEAK] + EXPORT TIM2_IRQHandler [WEAK] + EXPORT PKA_IRQHandler [WEAK] + EXPORT I2C1_EV_IRQHandler [WEAK] + EXPORT I2C1_ER_IRQHandler [WEAK] + EXPORT I2C3_EV_IRQHandler [WEAK] + EXPORT I2C3_ER_IRQHandler [WEAK] + EXPORT SPI1_IRQHandler [WEAK] + EXPORT SPI2_IRQHandler [WEAK] + EXPORT USART1_IRQHandler [WEAK] + EXPORT LPUART1_IRQHandler [WEAK] + EXPORT SAI1_IRQHandler [WEAK] + EXPORT TSC_IRQHandler [WEAK] + EXPORT EXTI15_10_IRQHandler [WEAK] + EXPORT RTC_Alarm_IRQHandler [WEAK] + EXPORT CRS_IRQHandler [WEAK] + EXPORT PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler [WEAK] + EXPORT IPCC_C1_RX_IRQHandler [WEAK] + EXPORT IPCC_C1_TX_IRQHandler [WEAK] + EXPORT HSEM_IRQHandler [WEAK] + EXPORT LPTIM1_IRQHandler [WEAK] + EXPORT LPTIM2_IRQHandler [WEAK] + EXPORT LCD_IRQHandler [WEAK] + EXPORT QUADSPI_IRQHandler [WEAK] + EXPORT AES1_IRQHandler [WEAK] + EXPORT AES2_IRQHandler [WEAK] + EXPORT RNG_IRQHandler [WEAK] + EXPORT FPU_IRQHandler [WEAK] + EXPORT DMA2_Channel1_IRQHandler [WEAK] + EXPORT DMA2_Channel2_IRQHandler [WEAK] + EXPORT DMA2_Channel3_IRQHandler [WEAK] + EXPORT DMA2_Channel4_IRQHandler [WEAK] + EXPORT DMA2_Channel5_IRQHandler [WEAK] + EXPORT DMA2_Channel6_IRQHandler [WEAK] + EXPORT DMA2_Channel7_IRQHandler [WEAK] + EXPORT DMAMUX1_OVR_IRQHandler [WEAK] + +WWDG_IRQHandler +PVD_PVM_IRQHandler +TAMP_STAMP_LSECSS_IRQHandler +RTC_WKUP_IRQHandler +FLASH_IRQHandler +RCC_IRQHandler +EXTI0_IRQHandler +EXTI1_IRQHandler +EXTI2_IRQHandler +EXTI3_IRQHandler +EXTI4_IRQHandler +DMA1_Channel1_IRQHandler +DMA1_Channel2_IRQHandler +DMA1_Channel3_IRQHandler +DMA1_Channel4_IRQHandler +DMA1_Channel5_IRQHandler +DMA1_Channel6_IRQHandler +DMA1_Channel7_IRQHandler +ADC1_IRQHandler +USB_HP_IRQHandler +USB_LP_IRQHandler +C2SEV_PWR_C2H_IRQHandler +COMP_IRQHandler +EXTI9_5_IRQHandler +TIM1_BRK_IRQHandler +TIM1_UP_TIM16_IRQHandler +TIM1_TRG_COM_TIM17_IRQHandler +TIM1_CC_IRQHandler +TIM2_IRQHandler +PKA_IRQHandler +I2C1_EV_IRQHandler +I2C1_ER_IRQHandler +I2C3_EV_IRQHandler +I2C3_ER_IRQHandler +SPI1_IRQHandler +SPI2_IRQHandler +USART1_IRQHandler +LPUART1_IRQHandler +SAI1_IRQHandler +TSC_IRQHandler +EXTI15_10_IRQHandler +RTC_Alarm_IRQHandler +CRS_IRQHandler +PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler +IPCC_C1_RX_IRQHandler +IPCC_C1_TX_IRQHandler +HSEM_IRQHandler +LPTIM1_IRQHandler +LPTIM2_IRQHandler +LCD_IRQHandler +QUADSPI_IRQHandler +AES1_IRQHandler +AES2_IRQHandler +RNG_IRQHandler +FPU_IRQHandler +DMA2_Channel1_IRQHandler +DMA2_Channel2_IRQHandler +DMA2_Channel3_IRQHandler +DMA2_Channel4_IRQHandler +DMA2_Channel5_IRQHandler +DMA2_Channel6_IRQHandler +DMA2_Channel7_IRQHandler +DMAMUX1_OVR_IRQHandler + + B . + + ENDP + + ALIGN + +;******************************************************************************* +; User Stack and Heap initialization +;******************************************************************************* + IF :DEF:__MICROLIB + + EXPORT __initial_sp + EXPORT __heap_base + EXPORT __heap_limit + + ELSE + + IMPORT __use_two_region_memory + EXPORT __user_initial_stackheap + +__user_initial_stackheap + + LDR R0, = Heap_Mem + LDR R1, =(Stack_Mem + Stack_Size) + LDR R2, = (Heap_Mem + Heap_Size) + LDR R3, = Stack_Mem + BX LR + + ALIGN + + ENDIF + + END + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/stm32wb55xx_flash_cm4.sct new file mode 100644 index 000000000..9d4d446ba --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -0,0 +1,21 @@ +; ************************************************************* +; *** Scatter-Loading Description File generated by uVision *** +; ************************************************************* + +LR_IROM1 0x08000000 0x00080000 { ; load region size_region + ER_IROM1 0x08000000 0x00080000 { ; load address = execution address + *.o (RESET, +First) + *(InRoot$$Sections) + .ANY (+RO) + } + RW_IRAM1 0x20000008 0x2FFF8 { ; RW data + .ANY (+RW +ZI) + } + RW_RAM_SHARED 0x20030000 0x2800 { ; RW data + *(MAPPING_TABLE) + *(MB_MEM1) + *(MB_MEM2) + } + } + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.cproject b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.cproject new file mode 100644 index 000000000..63e7a4eb3 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.cproject @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.project b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.project new file mode 100644 index 000000000..d42a3baf8 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/.project @@ -0,0 +1,264 @@ + + + BLE_LLD_Datarate + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.st.stm32cube.ide.mcu.MCUProjectNature + org.eclipse.cdt.core.cnature + com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature + com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature + com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature + com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature + com.st.stm32cube.ide.mcu.MCURootProjectNature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + Doc/readme.txt + 1 + PARENT-1-PROJECT_LOC/readme.txt + + + Utilities/stm32_lpm.c + 1 + PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c + + + Utilities/stm32_seq.c + 1 + PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c + + + Drivers/BSP/stm32wbxx_nucleo.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + + + Drivers/CMSIS/system_stm32wbxx.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/system_stm32wbxx.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_cortex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_exti.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_gpio.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_hsem.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart_ex.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + Middlewares/STM32_WPAN/ble_hal.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble_lld/hal/ble_hal.c + + + Middlewares/STM32_WPAN/ble_lld.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble_lld/lld/ble_lld.c + + + Middlewares/STM32_WPAN/dbg_trace.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + Middlewares/STM32_WPAN/otp.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/otp.c + + + Middlewares/STM32_WPAN/shci.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + Middlewares/STM32_WPAN/shci_tl.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + Middlewares/STM32_WPAN/shci_tl_if.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + Middlewares/STM32_WPAN/stm_list.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + Middlewares/STM32_WPAN/stm_queue.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + Middlewares/STM32_WPAN/tl_mbox.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + Application/User/Core/app_entry.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/app_entry.c + + + Application/User/Core/gpio_lld.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/gpio_lld.c + + + Application/User/Core/hw_timerserver.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/hw_timerserver.c + + + Application/User/Core/hw_uart.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/hw_uart.c + + + Application/User/Core/main.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/main.c + + + Application/User/Core/stm32_lpm_if.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c + + + Application/User/Core/stm32wbxx_hal_msp.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32wbxx_hal_msp.c + + + Application/User/Core/stm32wbxx_it.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm32wbxx_it.c + + + Application/User/Core/stm_logging.c + 1 + PARENT-1-PROJECT_LOC/Core/Src/stm_logging.c + + + Application/User/STM32_WPAN/App/app_ble_lld.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/app_ble_lld.c + + + Application/User/STM32_WPAN/App/datarate_app.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/App/datarate_app.c + + + Application/User/STM32_WPAN/Target/hw_ipcc.c + 1 + PARENT-1-PROJECT_LOC/STM32_WPAN/Target/hw_ipcc.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/syscalls.c new file mode 100644 index 000000000..c921fd873 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/syscalls.c @@ -0,0 +1,155 @@ +/** + ****************************************************************************** + * @file syscalls.c + * @author Auto-generated by STM32CubeIDE + * @brief STM32CubeIDE Minimal System calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include +#include +#include +#include +#include +#include +#include + + +/* Variables */ +extern int __io_putchar(int ch) __attribute__((weak)); +extern int __io_getchar(void) __attribute__((weak)); + + +char *__env[1] = { 0 }; +char **environ = __env; + + +/* Functions */ +void initialise_monitor_handles() +{ +} + +int _getpid(void) +{ + return 1; +} + +int _kill(int pid, int sig) +{ + errno = EINVAL; + return -1; +} + +void _exit (int status) +{ + _kill(status, -1); + while (1) {} /* Make sure we hang here */ +} + +__attribute__((weak)) int _read(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + *ptr++ = __io_getchar(); + } + +return len; +} + +__attribute__((weak)) int _write(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + __io_putchar(*ptr++); + } + return len; +} + +int _close(int file) +{ + return -1; +} + + +int _fstat(int file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _isatty(int file) +{ + return 1; +} + +int _lseek(int file, int ptr, int dir) +{ + return 0; +} + +int _open(char *path, int flags, ...) +{ + /* Pretend like we always fail */ + return -1; +} + +int _wait(int *status) +{ + errno = ECHILD; + return -1; +} + +int _unlink(char *name) +{ + errno = ENOENT; + return -1; +} + +int _times(struct tms *buf) +{ + return -1; +} + +int _stat(char *file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _link(char *old, char *new) +{ + errno = EMLINK; + return -1; +} + +int _fork(void) +{ + errno = EAGAIN; + return -1; +} + +int _execve(char *name, char **argv, char **env) +{ + errno = ENOMEM; + return -1; +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/sysmem.c new file mode 100644 index 000000000..dda5abe79 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Core/sysmem.c @@ -0,0 +1,79 @@ +/** + ****************************************************************************** + * @file sysmem.c + * @author Generated by STM32CubeIDE + * @brief STM32CubeIDE System Memory calls file + * + * For more information about which C functions + * need which of these lowlevel functions + * please consult the newlib libc manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include + +/** + * Pointer to the current high watermark of the heap usage + */ +static uint8_t *__sbrk_heap_end = NULL; + +/** + * @brief _sbrk() allocates memory to the newlib heap and is used by malloc + * and others from the C library + * + * @verbatim + * ############################################################################ + * # .data # .bss # newlib heap # MSP stack # + * # # # # Reserved by _Min_Stack_Size # + * ############################################################################ + * ^-- RAM start ^-- _end _estack, RAM end --^ + * @endverbatim + * + * This implementation starts allocating at the '_end' linker symbol + * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack + * The implementation considers '_estack' linker symbol to be RAM end + * NOTE: If the MSP stack, at any point during execution, grows larger than the + * reserved size, please increase the '_Min_Stack_Size'. + * + * @param incr Memory size + * @return Pointer to allocated memory + */ +void *_sbrk(ptrdiff_t incr) +{ + extern uint8_t _end; /* Symbol defined in the linker script */ + extern uint8_t _estack; /* Symbol defined in the linker script */ + extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */ + const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size; + const uint8_t *max_heap = (uint8_t *)stack_limit; + uint8_t *prev_heap_end; + + /* Initialize heap end at first call */ + if (NULL == __sbrk_heap_end) + { + __sbrk_heap_end = &_end; + } + + /* Protect heap from growing into the reserved MSP stack */ + if (__sbrk_heap_end + incr > max_heap) + { + errno = ENOMEM; + return (void *)-1; + } + + prev_heap_end = __sbrk_heap_end; + __sbrk_heap_end += incr; + + return (void *)prev_heap_end; +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s new file mode 100644 index 000000000..38161f8cc --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -0,0 +1,443 @@ +/** + ****************************************************************************** + * @file startup_stm32wb55xx_cm4.s + * @author MCD Application Team + * @brief STM32WB55xx devices vector table GCC toolchain. + * This module performs: + * - Set the initial SP + * - Set the initial PC == Reset_Handler, + * - Set the vector table entries with the exceptions ISR address + * - Branches to main in the C library (which eventually + * calls main()). + * After Reset the Cortex-M4 processor is in Thread mode, + * priority is Privileged, and the Stack is set to Main. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + + .syntax unified + .cpu cortex-m4 + .fpu softvfp + .thumb + +.global g_pfnVectors +.global Default_Handler + +/* start address for the initialization values of the .data section. +defined in linker script */ +.word _sidata +/* start address for the .data section. defined in linker script */ +.word _sdata +/* end address for the .data section. defined in linker script */ +.word _edata +/* start address for the .bss section. defined in linker script */ +.word _sbss +/* end address for the .bss section. defined in linker script */ +.word _ebss +/* start address for the .MB_MEM2 section. defined in linker script */ +.word _sMB_MEM2 +/* end address for the .MB_MEM2 section. defined in linker script */ +.word _eMB_MEM2 + +/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */ +.macro INIT_BSS start, end + ldr r0, =\start + ldr r1, =\end + movs r3, #0 + bl LoopFillZerobss +.endm + +/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */ +.macro INIT_DATA start, end, src + ldr r0, =\start + ldr r1, =\end + ldr r2, =\src + movs r3, #0 + bl LoopCopyDataInit +.endm + +.section .text.data_initializers +CopyDataInit: + ldr r4, [r2, r3] + str r4, [r0, r3] + adds r3, r3, #4 + +LoopCopyDataInit: + adds r4, r0, r3 + cmp r4, r1 + bcc CopyDataInit + bx lr + +FillZerobss: + str r3, [r0] + adds r0, r0, #4 + +LoopFillZerobss: + cmp r0, r1 + bcc FillZerobss + bx lr + + .section .text.Reset_Handler + .weak Reset_Handler + .type Reset_Handler, %function +Reset_Handler: + ldr r0, =_estack + mov sp, r0 /* set stack pointer */ +/* Call the clock system intitialization function.*/ + bl SystemInit + +/* Copy the data segment initializers from flash to SRAM */ + INIT_DATA _sdata, _edata, _sidata + +/* Zero fill the bss segments. */ + INIT_BSS _sbss, _ebss + INIT_BSS _sMB_MEM2, _eMB_MEM2 + +/* Call static constructors */ + bl __libc_init_array +/* Call the application s entry point.*/ + bl main + +LoopForever: + b LoopForever + +.size Reset_Handler, .-Reset_Handler + +/** + * @brief This is the code that gets called when the processor receives an + * unexpected interrupt. This simply enters an infinite loop, preserving + * the system state for examination by a debugger. + * + * @param None + * @retval None +*/ + .section .text.Default_Handler,"ax",%progbits +Default_Handler: +Infinite_Loop: + b Infinite_Loop + .size Default_Handler, .-Default_Handler +/****************************************************************************** +* +* The minimal vector table for a Cortex-M4. Note that the proper constructs +* must be placed on this to ensure that it ends up at physical address +* 0x0000.0000. +* +******************************************************************************/ + .section .isr_vector,"a",%progbits + .type g_pfnVectors, %object + .size g_pfnVectors, .-g_pfnVectors + + +g_pfnVectors: + .word _estack + .word Reset_Handler + .word NMI_Handler + .word HardFault_Handler + .word MemManage_Handler + .word BusFault_Handler + .word UsageFault_Handler + .word 0 + .word 0 + .word 0 + .word 0 + .word SVC_Handler + .word DebugMon_Handler + .word 0 + .word PendSV_Handler + .word SysTick_Handler + .word WWDG_IRQHandler + .word PVD_PVM_IRQHandler + .word TAMP_STAMP_LSECSS_IRQHandler + .word RTC_WKUP_IRQHandler + .word FLASH_IRQHandler + .word RCC_IRQHandler + .word EXTI0_IRQHandler + .word EXTI1_IRQHandler + .word EXTI2_IRQHandler + .word EXTI3_IRQHandler + .word EXTI4_IRQHandler + .word DMA1_Channel1_IRQHandler + .word DMA1_Channel2_IRQHandler + .word DMA1_Channel3_IRQHandler + .word DMA1_Channel4_IRQHandler + .word DMA1_Channel5_IRQHandler + .word DMA1_Channel6_IRQHandler + .word DMA1_Channel7_IRQHandler + .word ADC1_IRQHandler + .word USB_HP_IRQHandler + .word USB_LP_IRQHandler + .word C2SEV_PWR_C2H_IRQHandler + .word COMP_IRQHandler + .word EXTI9_5_IRQHandler + .word TIM1_BRK_IRQHandler + .word TIM1_UP_TIM16_IRQHandler + .word TIM1_TRG_COM_TIM17_IRQHandler + .word TIM1_CC_IRQHandler + .word TIM2_IRQHandler + .word PKA_IRQHandler + .word I2C1_EV_IRQHandler + .word I2C1_ER_IRQHandler + .word I2C3_EV_IRQHandler + .word I2C3_ER_IRQHandler + .word SPI1_IRQHandler + .word SPI2_IRQHandler + .word USART1_IRQHandler + .word LPUART1_IRQHandler + .word SAI1_IRQHandler + .word TSC_IRQHandler + .word EXTI15_10_IRQHandler + .word RTC_Alarm_IRQHandler + .word CRS_IRQHandler + .word PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + .word IPCC_C1_RX_IRQHandler + .word IPCC_C1_TX_IRQHandler + .word HSEM_IRQHandler + .word LPTIM1_IRQHandler + .word LPTIM2_IRQHandler + .word LCD_IRQHandler + .word QUADSPI_IRQHandler + .word AES1_IRQHandler + .word AES2_IRQHandler + .word RNG_IRQHandler + .word FPU_IRQHandler + .word DMA2_Channel1_IRQHandler + .word DMA2_Channel2_IRQHandler + .word DMA2_Channel3_IRQHandler + .word DMA2_Channel4_IRQHandler + .word DMA2_Channel5_IRQHandler + .word DMA2_Channel6_IRQHandler + .word DMA2_Channel7_IRQHandler + .word DMAMUX1_OVR_IRQHandler + +/******************************************************************************* +* +* Provide weak aliases for each Exception handler to the Default_Handler. +* As they are weak aliases, any function with the same name will override +* this definition. +* +*******************************************************************************/ + .weak NMI_Handler + .thumb_set NMI_Handler,Default_Handler + + .weak HardFault_Handler + .thumb_set HardFault_Handler,Default_Handler + + .weak MemManage_Handler + .thumb_set MemManage_Handler,Default_Handler + + .weak BusFault_Handler + .thumb_set BusFault_Handler,Default_Handler + + .weak UsageFault_Handler + .thumb_set UsageFault_Handler,Default_Handler + + .weak SVC_Handler + .thumb_set SVC_Handler,Default_Handler + + .weak DebugMon_Handler + .thumb_set DebugMon_Handler,Default_Handler + + .weak PendSV_Handler + .thumb_set PendSV_Handler,Default_Handler + + .weak SysTick_Handler + .thumb_set SysTick_Handler,Default_Handler + + .weak WWDG_IRQHandler + .thumb_set WWDG_IRQHandler,Default_Handler + + .weak PVD_PVM_IRQHandler + .thumb_set PVD_PVM_IRQHandler,Default_Handler + + .weak TAMP_STAMP_LSECSS_IRQHandler + .thumb_set TAMP_STAMP_LSECSS_IRQHandler,Default_Handler + + .weak RTC_WKUP_IRQHandler + .thumb_set RTC_WKUP_IRQHandler,Default_Handler + + .weak FLASH_IRQHandler + .thumb_set FLASH_IRQHandler,Default_Handler + + .weak RCC_IRQHandler + .thumb_set RCC_IRQHandler,Default_Handler + + .weak EXTI0_IRQHandler + .thumb_set EXTI0_IRQHandler,Default_Handler + + .weak EXTI1_IRQHandler + .thumb_set EXTI1_IRQHandler,Default_Handler + + .weak EXTI2_IRQHandler + .thumb_set EXTI2_IRQHandler,Default_Handler + + .weak EXTI3_IRQHandler + .thumb_set EXTI3_IRQHandler,Default_Handler + + .weak EXTI4_IRQHandler + .thumb_set EXTI4_IRQHandler,Default_Handler + + .weak DMA1_Channel1_IRQHandler + .thumb_set DMA1_Channel1_IRQHandler,Default_Handler + + .weak DMA1_Channel2_IRQHandler + .thumb_set DMA1_Channel2_IRQHandler,Default_Handler + + .weak DMA1_Channel3_IRQHandler + .thumb_set DMA1_Channel3_IRQHandler,Default_Handler + + .weak DMA1_Channel4_IRQHandler + .thumb_set DMA1_Channel4_IRQHandler,Default_Handler + + .weak DMA1_Channel5_IRQHandler + .thumb_set DMA1_Channel5_IRQHandler,Default_Handler + + .weak DMA1_Channel6_IRQHandler + .thumb_set DMA1_Channel6_IRQHandler,Default_Handler + + .weak DMA1_Channel7_IRQHandler + .thumb_set DMA1_Channel7_IRQHandler,Default_Handler + + .weak ADC1_IRQHandler + .thumb_set ADC1_IRQHandler,Default_Handler + + .weak USB_HP_IRQHandler + .thumb_set USB_HP_IRQHandler,Default_Handler + + .weak USB_LP_IRQHandler + .thumb_set USB_LP_IRQHandler,Default_Handler + + .weak C2SEV_PWR_C2H_IRQHandler + .thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler + + .weak COMP_IRQHandler + .thumb_set COMP_IRQHandler,Default_Handler + + .weak EXTI9_5_IRQHandler + .thumb_set EXTI9_5_IRQHandler,Default_Handler + + .weak TIM1_BRK_IRQHandler + .thumb_set TIM1_BRK_IRQHandler,Default_Handler + + .weak TIM1_UP_TIM16_IRQHandler + .thumb_set TIM1_UP_TIM16_IRQHandler,Default_Handler + + .weak TIM1_TRG_COM_TIM17_IRQHandler + .thumb_set TIM1_TRG_COM_TIM17_IRQHandler,Default_Handler + + .weak TIM1_CC_IRQHandler + .thumb_set TIM1_CC_IRQHandler,Default_Handler + + .weak TIM2_IRQHandler + .thumb_set TIM2_IRQHandler,Default_Handler + + .weak PKA_IRQHandler + .thumb_set PKA_IRQHandler,Default_Handler + + .weak I2C1_EV_IRQHandler + .thumb_set I2C1_EV_IRQHandler,Default_Handler + + .weak I2C1_ER_IRQHandler + .thumb_set I2C1_ER_IRQHandler,Default_Handler + + .weak I2C3_EV_IRQHandler + .thumb_set I2C3_EV_IRQHandler,Default_Handler + + .weak I2C3_ER_IRQHandler + .thumb_set I2C3_ER_IRQHandler,Default_Handler + + .weak SPI1_IRQHandler + .thumb_set SPI1_IRQHandler,Default_Handler + + .weak SPI2_IRQHandler + .thumb_set SPI2_IRQHandler,Default_Handler + + .weak USART1_IRQHandler + .thumb_set USART1_IRQHandler,Default_Handler + + .weak LPUART1_IRQHandler + .thumb_set LPUART1_IRQHandler,Default_Handler + + .weak SAI1_IRQHandler + .thumb_set SAI1_IRQHandler,Default_Handler + + .weak TSC_IRQHandler + .thumb_set TSC_IRQHandler,Default_Handler + + .weak EXTI15_10_IRQHandler + .thumb_set EXTI15_10_IRQHandler,Default_Handler + + .weak RTC_Alarm_IRQHandler + .thumb_set RTC_Alarm_IRQHandler,Default_Handler + + .weak CRS_IRQHandler + .thumb_set CRS_IRQHandler,Default_Handler + + .weak PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + .thumb_set PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler,Default_Handler + + .weak IPCC_C1_RX_IRQHandler + .thumb_set IPCC_C1_RX_IRQHandler,Default_Handler + + .weak IPCC_C1_TX_IRQHandler + .thumb_set IPCC_C1_TX_IRQHandler,Default_Handler + + .weak HSEM_IRQHandler + .thumb_set HSEM_IRQHandler,Default_Handler + + .weak LPTIM1_IRQHandler + .thumb_set LPTIM1_IRQHandler,Default_Handler + + .weak LPTIM2_IRQHandler + .thumb_set LPTIM2_IRQHandler,Default_Handler + + .weak LCD_IRQHandler + .thumb_set LCD_IRQHandler,Default_Handler + + .weak QUADSPI_IRQHandler + .thumb_set QUADSPI_IRQHandler,Default_Handler + + .weak AES1_IRQHandler + .thumb_set AES1_IRQHandler,Default_Handler + + .weak AES2_IRQHandler + .thumb_set AES2_IRQHandler,Default_Handler + + .weak RNG_IRQHandler + .thumb_set RNG_IRQHandler,Default_Handler + + .weak FPU_IRQHandler + .thumb_set FPU_IRQHandler,Default_Handler + + .weak DMA2_Channel1_IRQHandler + .thumb_set DMA2_Channel1_IRQHandler,Default_Handler + + .weak DMA2_Channel2_IRQHandler + .thumb_set DMA2_Channel2_IRQHandler,Default_Handler + + .weak DMA2_Channel3_IRQHandler + .thumb_set DMA2_Channel3_IRQHandler,Default_Handler + + .weak DMA2_Channel4_IRQHandler + .thumb_set DMA2_Channel4_IRQHandler,Default_Handler + + .weak DMA2_Channel5_IRQHandler + .thumb_set DMA2_Channel5_IRQHandler,Default_Handler + + .weak DMA2_Channel6_IRQHandler + .thumb_set DMA2_Channel6_IRQHandler,Default_Handler + + .weak DMA2_Channel7_IRQHandler + .thumb_set DMA2_Channel7_IRQHandler,Default_Handler + + .weak DMAMUX1_OVR_IRQHandler + .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld new file mode 100644 index 000000000..9ccf3d344 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -0,0 +1,171 @@ +/** +***************************************************************************** +** +** File : stm32wb55xx_flash_cm4.ld +** +** Abstract : STM32CubeIDE Minimal System calls file +** +** For more information about which c-functions +** need which of these lowlevel functions +** please consult the Newlib libc-manual +** +** Environment : STM32CubeIDE for MCU +** +** Distribution: The file is distributed as is, without any warranty +** of any kind. +** +***************************************************************************** +** @attention +** +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. +** +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x20030000; /* end of RAM */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K +RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FFF8 +RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM1 AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss secion */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(.bss*) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM1 + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM1 + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } + MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED + MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED + MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED +} + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.c new file mode 100644 index 000000000..438c73df3 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.c @@ -0,0 +1,388 @@ +/** + ****************************************************************************** + * File Name : app_ble_lld.c + * Description : application utilities. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/** + * This file provides low level utilities for application: + * - IPCC for communication with radio MCU + * - UART management + * - error handling + */ + +/* Includes ------------------------------------------------------------------*/ +#include +#include "app_common.h" +#include "utilities_common.h" +#include "app_entry.h" +#include "dbg_trace.h" +#include "tl.h" +#include "shci.h" +#include "stm_logging.h" +#include "stm32_lpm.h" +#include "stm32_seq.h" +#include "gpio_lld.h" +#include "stm_queue.h" +#include "ble_lld.h" +#include "app_ble_lld.h" + +/* Private includes ----------------------------------------------------------*/ + +/* Private typedef -----------------------------------------------------------*/ +/* + * List of all errors tracked by the application + * running on M4. Some of these errors may be fatal + * or just warnings + */ +typedef enum +{ + ERR_BLE_LLD_SET_STATE_CB, + ERR_BLE_LLD_ERASE_PERSISTENT_INFO, + ERR_BLE_LLD_CHECK_WIRELESS +} ErrAppBleLldIdEnum_t; + +/* Private defines -----------------------------------------------------------*/ +#define UART_BUFFER_SIZE 64 +#define TX_BUFFER_SIZE 268 +#define UART_TX_CHUNK_SIZE 16 +#define UART_LINE_END "\r\n" + +/* Private macros ------------------------------------------------------------*/ + +/* Private function prototypes -----------------------------------------------*/ +static void uartTxSendChunk(void); +static void uartRxCpltCallback(void); +static void m0CmdProcess(void); + +/* Private variables ---------------------------------------------------------*/ +static queue_t uartTxBuf; +static uint8_t uartTxBufData[TX_BUFFER_SIZE]; + +static bool txBusy = false; + +static char uartRxBuf; +static void(*uartRxUserCb)(char); + +// IPCC configuration +PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_BLE_LLD_Config_t BleLldConfigBuffer; + +// Shared memory used by IPCC to send/receive messages to/from M0 +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t BleLldM0CmdPacket; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t BleLldCmdRspPacket; + +/* Shared memory used to send/receive data and parameters to/from M0 because + IPCC messages have a limited size */ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static msg_BLE_LLD_t bleparam_BLE_LLD_Packet; + +// Shared buffers for packet transmission and reception, separate buffers are needed because radio +PLACE_IN_SECTION("MB_MEM2") static ipBLE_lld_txrxdata_Type txBuffer; +PLACE_IN_SECTION("MB_MEM2") static ipBLE_lld_txrxdata_Type rxBuffer; + + +/* Functions Definition ------------------------------------------------------*/ + +void APP_BLE_LLD_Init(void) +{ + uint32_t devId = HAL_GetDEVID(); + uint32_t revId = HAL_GetREVID(); + uint8_t param[8]; + SHCI_CmdStatus_t LldTestsInitStatus; + + /* Initialize transport layer */ + BleLldConfigBuffer.p_BleLldCmdRspBuffer = (uint8_t*)&BleLldCmdRspPacket; + BleLldConfigBuffer.p_BleLldM0CmdBuffer = (uint8_t*)&BleLldM0CmdPacket; + TL_BLE_LLD_Init(&BleLldConfigBuffer); + + APP_BLE_LLD_Init_UART(); + + /* Send LLD tests start information to UART */ + uartWrite(""); + uartWrite("================================"); + uartWrite("RF BLE LLD"); + uartWrite("================================"); +#if (CFG_DEBUGGER_SUPPORTED == 0U) + uartWrite("Debugger de-activated"); +#endif +#if (( CFG_DEBUG_TRACE_FULL == 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 )) + uartWrite("Trace is de-activated"); +#endif + + APP_DBG("Test appli initialized on M4, waiting for M0 initialization"); + + /* Send start cmd to M0 (with device and revision ID as parameters */ + memcpy(¶m[0], &devId, sizeof(devId)); + memcpy(¶m[4], &revId, sizeof(revId)); + LldTestsInitStatus = SHCI_C2_BLE_LLD_Init(sizeof(param), param); + if(LldTestsInitStatus != SHCI_Success){ + APP_DBG("!! ERROR during M0 init !!"); + }else{ + APP_DBG("M0 initialized"); + } + + UTIL_SEQ_RegTask( 1<StackType) + { + case INFO_STACK_TYPE_BLE_PHY_VALID : + APP_DBG(" M0 FW Type: BLE and radio PHY validation"); + break; + + default : + APP_DBG(" ERROR: incompatible firmware"); + APP_BLE_LLD_Error(ERR_BLE_LLD_CHECK_WIRELESS, 0); + break; + } + APP_DBG(" M0 FW VERSION: v%d.%d.%d", p_wireless_info->VersionMajor, p_wireless_info->VersionMinor, p_wireless_info->VersionSub); + APP_DBG("**********************************************************"); + } +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +/** + * @brief Perform initialization of UART. + * @param None + * @retval None + */ +void APP_BLE_LLD_Init_UART(void) +{ +#ifdef CFG_UART + MX_UART_Init(CFG_UART); +#endif + + CircularQueue_Init(&uartTxBuf, + uartTxBufData, + sizeof(uartTxBufData), + sizeof(char), + CIRCULAR_QUEUE_NO_FLAG); + txBusy = false; +} + +/** + * @brief Perform de-initialization of UART. + * @param None + * @retval None + */ +void APP_BLE_LLD_DeInit_UART(void) +{ +#ifdef CFG_UART + MX_UART_Deinit(CFG_UART); +#endif +} + +static void uartRxStart(void) +{ + if (HW_UART_Receive_IT(CFG_UART, (uint8_t *)&uartRxBuf, 1, uartRxCpltCallback) != hw_uart_ok){ + APP_DBG("ERROR returned by HW_UART_Receive_IT()"); + } +} + +void APP_BLE_LLD_uartRxStart(void(*callback)(char)) +{ + uartRxUserCb = callback; + uartRxStart(); +} + +static void uartRxCpltCallback(void) +{ + // No need to buffer uartRxBuf since the callback is called by value + uartRxUserCb(uartRxBuf); + // Since UART is in full duplex, receive can be always active without blocking send + uartRxStart(); +} + +void uartWrite(const char *format, ...) +{ + char out[UART_BUFFER_SIZE]; + int nbChar; + va_list argp; + va_start(argp, format); + nbChar = vsnprintf(out, sizeof(out), format, argp); + va_end(argp); + if (nbChar < 0){ + return; + } + if (nbChar > (sizeof(out) - ((strlen(UART_LINE_END) + 1)))){ + strcpy(&(out[sizeof(out) - (strlen(UART_LINE_END) + 1)]), UART_LINE_END); + }else{ + strcat(out, UART_LINE_END); + } + uartWriteRaw(out); +} + +void uartWriteRaw(const char *str) +{ + CRITICAL_BEGIN(); + while (*str != '\0'){ + CircularQueue_Add(&uartTxBuf, (uint8_t *)str, 0, 1); + str++; + } + if (! txBusy){ + uartTxSendChunk(); + } + CRITICAL_END(); +} + +// Send multiple chars through the UART +// must be called inside critical section +// loop on itself via the UART callback +static void uartTxSendChunk(void){ + static char hwBuf[UART_TX_CHUNK_SIZE]; + char *charPtr; + uint32_t count = 0; + + while ((charPtr = (char *)CircularQueue_Remove(&uartTxBuf, NULL)) != NULL){ + hwBuf[count] = *charPtr; + count++; + if (count >= UART_TX_CHUNK_SIZE){ + break; + } + } + if (count != 0){ + txBusy = true; + if (HW_UART_Transmit_IT(CFG_UART, (uint8_t *)hwBuf, count, uartTxSendChunk) != hw_uart_ok){ + APP_DBG("ERROR returned by HW_UART_Transmit_IT()"); + } + }else{ + txBusy = false; + } +} + +static void m0CmdProcess(void) +{ + BLE_LLD_PRX_EventProcessTask(); +} + +/** + * @brief Processes an event from radio CPU + * + * @param cmdBuffer : a pointer to TL_CmdPacket_t + * @return None + */ +void TL_BLE_LLD_ReceiveM0Cmd( TL_CmdPacket_t * cmdBuffer ) +{ + BLE_LLD_PRX_EventProcessInter((radioEventType)cmdBuffer->cmdserial.cmd.cmdcode); + UTIL_SEQ_SetTask(1U << CFG_TASK_CMD_FROM_M0_TO_M4, CFG_SCH_PRIO_0); + TL_BLE_LLD_SendM0CmdAck(); +} + +/** + * @brief Sends a command to radio CPU + * + * Waits for reply from radio CPU before returning (synchronous calls). + * + * @param[in] command BLE command already packed (by LLD) + */ +uint8_t APP_BLE_LLD_SendCmdM0(BLE_LLD_Code_t bleCmd) +{ + BleLldCmdRspPacket.cmdserial.cmd.cmdcode = bleCmd; + payload_BLE_LLD_t *payload = (payload_BLE_LLD_t *)&BleLldCmdRspPacket.cmdserial.cmd.payload; + payload->msg = &bleparam_BLE_LLD_Packet; + UTIL_SEQ_ClrEvt(1U << CFG_EVT_RECEIVE_RSPACKEVT); + TL_BLE_LLD_SendCmd(); + UTIL_SEQ_WaitEvt(1U << CFG_EVT_RECEIVE_RSPACKEVT); + + return bleparam_BLE_LLD_Packet.returnValue; +} + +/** + * @brief Processes a reply (to a command) from radio CPU + * + * Unlocks task waiting in APP_BLE_LLD_SendCmdM0(), this is used to make LLD + * API calls synchronous. + * + * @param Notbuffer : a pointer to TL_CmdPacket_t + * @return None + */ +void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) +{ + switch (Notbuffer->cmdserial.cmd.cmdcode){ + case BLE_LLD_RSP_END: + UTIL_SEQ_SetEvt(1U << CFG_EVT_RECEIVE_RSPACKEVT); + break; + default: + APP_DBG("WARNING: unknown response received %d", Notbuffer->cmdserial.cmd.cmdcode); + } + + /* This is just a trace from M0, write to UART */ + //uartWriteRaw(sourceBuf); + + TL_BLE_LLD_SendRspAck(); +} + +/* USER CODE END FD_WRAP_FUNCTIONS */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.h new file mode 100644 index 000000000..21899be1e --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.h @@ -0,0 +1,69 @@ +/** + ****************************************************************************** + * File Name : app_ble_lld.h + * Description : Header for BLE LLD application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_BLE_LLD_H +#define APP_BLE_LLD_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "ble_lld_transport.h" + +/* Private includes ----------------------------------------------------------*/ + +/* Exported types ------------------------------------------------------------*/ + +/* Exported constants --------------------------------------------------------*/ + +/* External variables --------------------------------------------------------*/ + +/* Exported macros ------------------------------------------------------------*/ + +/* Exported functions ------------------------------------------------------- */ +void APP_BLE_LLD_Init(void); +void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode); +void APP_BLE_LLD_Init_UART(void); +void APP_BLE_LLD_DeInit_UART(void); + +void APP_BLE_LLD_uartRxStart(void(*cb)(char)); + +void CheckWirelessFirmwareInfo(void); +void uartWrite(const char *format, ...); +void uartWriteRaw(const char *str); +uint8_t APP_BLE_LLD_SendCmdM0(BLE_LLD_Code_t bleCmd); + +/** + * @brief Active polling for a given delay + * @param microsec the delay in us unit + **/ +void us_delay_16m(uint32_t microsec); +void us_delay_32m(uint32_t microsec); +#ifdef USE_SYS_CLOCK_DIV_2 +#define us_delay us_delay_16m +#else +#define us_delay us_delay_32m +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + + +#endif /* APP_BLE_LLD_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.c new file mode 100644 index 000000000..eba9d980f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.c @@ -0,0 +1,374 @@ +/** + ****************************************************************************** + * File Name : datarate_app.c + * Description : BLE LLD simple demo to control LEDs remotely + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "stdbool.h" +#include "app_common.h" +#include "stm32_seq.h" +#include "stm32_lpm.h" +#include "stm_logging.h" +#include "dbg_trace.h" +#include "ble_hal.h" +#include "ipBLE_lld_public.h" +#include "app_ble_lld.h" +#include "datarate_app.h" + +/* Private includes -----------------------------------------------------------*/ + +/* Private typedef -----------------------------------------------------------*/ +// Allows to pack and unpack user data in payload (must not exceed 255 bytes) +typedef PACKED_STRUCT +{ + uint8_t led; +} userPayload; + +/* Private defines -----------------------------------------------------------*/ +#define CHANNEL 8 // radio channel +#define POWER TX_POW_PLUS_6_DB // Transmit power +#define NET_ID 0x5A964129 // network ID, both devices must use the same +#define WAKEUP_US 10000 // delay before starting radio operation +#define RX_TIMEOUT_US (1*1000*1000) // max delay radio will listen for a packet +#define DEBOUNCE_MS 250 // debouncing delay (ms) + +/* Private macros ------------------------------------------------------------*/ + +/* Private function prototypes -----------------------------------------------*/ +static void radioInit(void); +static void buttonStart(void); +static void receiveStart(void); +static void receiveCb(radioEventType cmd, ActionPacket *ap, void *data, uint8_t size); +static void transmitStart(void); +static void transmitCbMaster(radioEventType cmd, ActionPacket *ap, void *data, uint8_t size); +static void transmitCbSlave(radioEventType cmd, ActionPacket *ap, void *data, uint8_t size); + +/* Private variables -----------------------------------------------*/ +static ActionPacket apReceiver[ACTION_PACKET_NB]; +static ActionPacket apTransmit[ACTION_PACKET_NB]; + +uint8_t SwitchOffGPIO_timer_Id; +dataRate_t dataRateMode = dataRateOff; +/* Functions Definition ------------------------------------------------------*/ + +void DATARATE_APP_Init(void) +{ + CheckWirelessFirmwareInfo(); + + /* Disable low power */ + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP_BLE_LLD, UTIL_LPM_DISABLE); + UTIL_LPM_SetStopMode(1 << CFG_LPM_APP_BLE_LLD, UTIL_LPM_DISABLE ); + + /* Register tasks for event processing */ + UTIL_SEQ_RegTask(1<actionPacketNb = APACKET_1; + ap1->StateMachineNo = STATE_MACHINE_0; + ap1->ActionTag = TIMER_WAKEUP; + ap1->WakeupTime = wakeup_time; + ap1->ReceiveWindowLength = window_time1; +// ap1->data = &payload1; +// ap1->dataSize = sizeof(payload1); + ap1->nextTrue = APACKET_2; + ap1->nextFalse = APACKET_1; + ap1->callback = receiveCb; + BLE_LLD_SetReservedArea(ap1); + + ActionPacket *ap2; + // Packet to send + ap2 = &apReceiver[APACKET_2]; + ap2->actionPacketNb = APACKET_2; + ap2->StateMachineNo = STATE_MACHINE_0; + ap2->ActionTag = 0x0; //TIMER_WAKEUP; + ap2->WakeupTime = wakeup_time; + ap2->ReceiveWindowLength = window_time2; +// ap2->data = &payload2; +// ap2->dataSize = sizeof(payload2); + ap2->nextTrue = APACKET_3; + ap2->nextFalse = APACKET_3; + ap2->callback = receiveCb; + BLE_LLD_SetReservedArea(ap2); + + ActionPacket *ap3; + // Packet to send + ap3 = &apReceiver[APACKET_3]; + ap3->actionPacketNb = APACKET_3; + ap3->StateMachineNo = STATE_MACHINE_0; + ap3->ActionTag = 0x0; //TIMER_WAKEUP; + ap3->WakeupTime = wakeup_time; + ap3->ReceiveWindowLength = window_time2; +// ap3->data = &payload3; +// ap3->dataSize = sizeof(payload3); + ap3->nextTrue = APACKET_2; + ap3->nextFalse = APACKET_2; + ap3->callback = receiveCb; + BLE_LLD_SetReservedArea(ap3); + + // TRANSMISSION + ActionPacket *ap0; + // Packet to send + ap0 = &apTransmit[APACKET_0]; + ap0->actionPacketNb = APACKET_0; + ap0->StateMachineNo = STATE_MACHINE_0; + ap0->ActionTag = TIMER_WAKEUP; + ap0->WakeupTime = wakeup_time; + ap0->ReceiveWindowLength = window_time1; +// ap0->data = &payload0; +// ap0->dataSize = sizeof(payload0); + ap0->nextTrue = APACKET_4; + ap0->nextFalse = APACKET_6; + ap0->callback = transmitCbMaster; + BLE_LLD_SetReservedArea(ap0); + + // Slave LED3 + ActionPacket *ap4; + userPayload payload4; + payload4.led = LED3; + // Packet to transmit + ap4 = &apTransmit[APACKET_4]; + ap4->actionPacketNb = APACKET_4; + ap4->StateMachineNo = STATE_MACHINE_0; + ap4->ActionTag = TXRX ; //| TIMER_WAKEUP; + ap4->WakeupTime = (2*wakeup_time); + ap4->data = &payload4; + ap4->dataSize = sizeof(payload4); + ap4->nextTrue = APACKET_5; + ap4->nextFalse = APACKET_5; + ap4->callback = transmitCbSlave; + BLE_LLD_SetReservedArea(ap4); + + ActionPacket *ap5; + // Packet to transmit + ap5 = &apTransmit[APACKET_5]; + ap5->actionPacketNb = APACKET_5; + ap5->StateMachineNo = STATE_MACHINE_0; + ap5->ActionTag = 0x0; //TIMER_WAKEUP; + ap5->WakeupTime = wakeup_time; + ap5->ReceiveWindowLength = window_time3; +// ap5->data = &payload5; +// ap5->dataSize = sizeof(payload5); + ap5->nextTrue = APACKET_4; + ap5->nextFalse = APACKET_4; + ap5->callback = transmitCbSlave; + BLE_LLD_SetReservedArea(ap5); + + // Master LED2 + ActionPacket *ap6; + // Packet to send + ap6 = &apTransmit[APACKET_6]; + ap6->actionPacketNb = APACKET_6; + ap6->StateMachineNo = STATE_MACHINE_0; + ap6->ActionTag = 0x0; //TIMER_WAKEUP; + ap6->WakeupTime = wakeup_time; + ap6->ReceiveWindowLength = window_time3; +// ap6->data = &payload6; +// ap6->dataSize = sizeof(payload6); + ap6->nextTrue = APACKET_7; + ap6->nextFalse = APACKET_7; + ap6->callback = transmitCbMaster; + BLE_LLD_SetReservedArea(ap6); + + ActionPacket *ap7; + userPayload payload7; + payload7.led = LED2; + // Packet to send + ap7 = &apTransmit[APACKET_7]; + ap7->actionPacketNb = APACKET_7; + ap7->StateMachineNo = STATE_MACHINE_0; + ap7->ActionTag = TXRX; //| TIMER_WAKEUP; + ap7->WakeupTime = (2*wakeup_time); + ap7->data = &payload7; + ap7->dataSize = sizeof(payload7); + ap7->nextTrue = APACKET_6; + ap7->nextFalse = APACKET_6; + ap7->callback = transmitCbMaster; + BLE_LLD_SetReservedArea(ap7); + +} + +uint8_t led1Toggle=0; +uint8_t led2Toggle=0; +uint8_t led3Toggle=0; + +static void receiveStart(void) +{ + BLE_LLD_MakeActionPacketPending(&apReceiver[APACKET_1]); +} + +static void receiveCb(radioEventType cmd, ActionPacket *ap, void *data, uint8_t size) +{ + userPayload *payload = data; + Led_TypeDef led; + if ((cmd == RX_OK_READY) | (cmd == RX_OK_BUSY)){ + led = (Led_TypeDef)payload->led; + if (led != LED1 && led != LED2 && led != LED3){ + }else if (led==LED1){ + if(led1Toggle==100) + { + led1Toggle=0; + BSP_LED_Off(LED2); + BSP_LED_Toggle(LED1); + } else { + led1Toggle++; + } + }else if (led==LED2){ + if(led2Toggle==100) + { + led2Toggle=0; + BSP_LED_Off(LED1); + BSP_LED_Toggle(LED2); + } else { + led2Toggle++; + } + }else if (led==LED3){ + if(led3Toggle==100) + { + led3Toggle=0; + BSP_LED_Toggle(LED3); + } else { + led3Toggle++; + } + } + } +} + +int16_t ledChange=0; +Led_TypeDef ledSwap = LED1; + +static void transmitStart(void) +{ + BLE_LLD_MakeActionPacketPending(&apTransmit[APACKET_0]); +} + +static void transmitCbMaster(radioEventType cmd, ActionPacket *ap, void *data, uint8_t size) +{ + userPayload *payload = data; + Led_TypeDef led; + if ((cmd == RX_OK_READY) | (cmd == RX_OK_BUSY)){ + led = (Led_TypeDef)payload->led; + if (led != LED1 && led != LED2 && led != LED3){ + }else{ + if(led3Toggle==100) + { + led3Toggle=0; + BSP_LED_Toggle(LED3); + } else { + led3Toggle++; + } + } + } + if ((cmd == TX_OK_READY) | (cmd == TX_OK_BUSY)){ + if(ledChange==1000) + { + userPayload payloadSwap; + ledChange=0; + if (ledSwap == LED1){ + payloadSwap.led = LED2; + ledSwap = LED2; + } else { + payloadSwap.led = LED1; + ledSwap = LED1; + } + ap->data = &payloadSwap; + BLE_LLD_SetReservedArea(ap); + } + ledChange++; + } +} + +static void transmitCbSlave(radioEventType cmd, ActionPacket *ap, void *data, uint8_t size) +{ + userPayload *payload = data; + Led_TypeDef led; + if ((cmd == RX_OK_READY) | (cmd == RX_OK_BUSY)){ + led = (Led_TypeDef)payload->led; + if (led != LED1 && led != LED2 && led != LED3){ + }else if (led==LED1){ + if(led1Toggle==100) + { + led1Toggle=0; + BSP_LED_Off(LED2); + BSP_LED_Toggle(LED1); + } else { + led1Toggle++; + } + }else if (led==LED2){ + if(led2Toggle==100) + { + led2Toggle=0; + BSP_LED_Off(LED1); + BSP_LED_Toggle(LED2); + } else { + led2Toggle++; + } + } + } +} + +static void buttonStart(void) +{ + radioInit(); + if(dataRateMode==dataRateReceive) + { + receiveStart() ; + } else if (dataRateMode==dataRateTransmit) { + transmitStart() ; + } else { + UTIL_LPM_SetStopMode(1 << CFG_LPM_APP_BLE_LLD, UTIL_LPM_ENABLE ); // TO ENABLE + HW_TS_Start(SwitchOffGPIO_timer_Id, (uint32_t)RX_TIMEOUT_US); + } +} + +void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) +{ + BLE_LLD_StopActivity(); + switch (GPIO_Pin){ + case BUTTON_SW1_PIN: dataRateMode = dataRateReceive; break; + case BUTTON_SW2_PIN: dataRateMode = dataRateTransmit; break; + case BUTTON_SW3_PIN: dataRateMode = dataRateOff; break; + default: return; + } + UTIL_SEQ_SetTask(1U << CFG_TASK_BUTTON, CFG_SCH_PRIO_0); +} + +void Appli_TS_Callback(void) +{ + UTIL_SEQ_SetTask(1U << CFG_TASK_BUTTON, CFG_SCH_PRIO_0); +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.h new file mode 100644 index 000000000..ca4d553c0 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.h @@ -0,0 +1,53 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : datarate_app.h + * Description : Header for BLE LLD application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef DATARATE_APP_H +#define DATARATE_APP_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ + +/* Exported types ------------------------------------------------------------*/ +typedef enum +{ + dataRateOff, + dataRateReceive, + dataRateTransmit +}dataRate_t; +/* Exported constants --------------------------------------------------------*/ + +/* External variables --------------------------------------------------------*/ + +/* Exported macros ------------------------------------------------------------*/ + +/* Exported functions ------------------------------------------------------- */ +void DATARATE_APP_Init(void); +void Appli_TS_Callback(void); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/tl_dbg_conf.h new file mode 100644 index 000000000..d54b76ff0 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/tl_dbg_conf.h @@ -0,0 +1,124 @@ +/** + ****************************************************************************** + * File Name : tl_dbg_conf.h + * Description : Debug configuration file for stm32wpan transport layer interface. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __TL_DBG_CONF_H +#define __TL_DBG_CONF_H + +/* USER CODE BEGIN Tl_Conf */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" /* required as some configuration used in dbg_trace.h are set there */ +#include "dbg_trace.h" +#include "hw_if.h" + +/** + * Enable or Disable traces + * The raw data output is the hci binary packet format as specified by the BT specification * + */ +#define TL_SHCI_CMD_DBG_EN 0 /* Reports System commands sent to CPU2 and the command response */ +#define TL_SHCI_CMD_DBG_RAW_EN 0 /* Reports raw data System commands sent to CPU2 and the command response */ +#define TL_SHCI_EVT_DBG_EN 0 /* Reports System Asynchronous Events received from CPU2 */ +#define TL_SHCI_EVT_DBG_RAW_EN 0 /* Reports raw data System Asynchronous Events received from CPU2 */ + +#define TL_HCI_CMD_DBG_EN 0 /* Reports BLE command sent to CPU2 and the command response */ +#define TL_HCI_CMD_DBG_RAW_EN 0 /* Reports raw data BLE command sent to CPU2 and the command response */ +#define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ +#define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ + +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ + +/** + * Macro definition + */ + +/** + * System Transport Layer + */ +#if (TL_SHCI_CMD_DBG_EN != 0) +#define TL_SHCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_CMD_DBG_MSG(...) +#define TL_SHCI_CMD_DBG_BUF(...) +#endif + +#if (TL_SHCI_CMD_DBG_RAW_EN != 0) +#define TL_SHCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_CMD_DBG_RAW(...) +#endif + +#if (TL_SHCI_EVT_DBG_EN != 0) +#define TL_SHCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_EVT_DBG_MSG(...) +#define TL_SHCI_EVT_DBG_BUF(...) +#endif + +#if (TL_SHCI_EVT_DBG_RAW_EN != 0) +#define TL_SHCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_EVT_DBG_RAW(...) +#endif + +/** + * BLE Transport Layer + */ +#if (TL_HCI_CMD_DBG_EN != 0) +#define TL_HCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_CMD_DBG_MSG(...) +#define TL_HCI_CMD_DBG_BUF(...) +#endif + +#if (TL_HCI_CMD_DBG_RAW_EN != 0) +#define TL_HCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_CMD_DBG_RAW(...) +#endif + +#if (TL_HCI_EVT_DBG_EN != 0) +#define TL_HCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_EVT_DBG_MSG(...) +#define TL_HCI_EVT_DBG_BUF(...) +#endif + +#if (TL_HCI_EVT_DBG_RAW_EN != 0) +#define TL_HCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_EVT_DBG_RAW(...) +#endif + +/** + * Memory Manager - Released buffer tracing + */ +#if (TL_MM_DBG_EN != 0) +#define TL_MM_DBG_MSG PRINT_MESG_DBG +#else +#define TL_MM_DBG_MSG(...) +#endif + +/* USER CODE END Tl_Conf */ + +#endif /*__TL_DBG_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/Target/hw_ipcc.c new file mode 100644 index 000000000..bed7dfbd3 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/Target/hw_ipcc.c @@ -0,0 +1,671 @@ +/** + ****************************************************************************** + * File Name : Target/hw_ipcc.c + * Description : Hardware IPCC source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "mbox_def.h" + +/* Global variables ---------------------------------------------------------*/ +/* Private defines -----------------------------------------------------------*/ +#define HW_IPCC_TX_PENDING( channel ) ( !(LL_C1_IPCC_IsActiveFlag_CHx( IPCC, channel )) ) && (((~(IPCC->C1MR)) & (channel << 16U))) +#define HW_IPCC_RX_PENDING( channel ) (LL_C2_IPCC_IsActiveFlag_CHx( IPCC, channel )) && (((~(IPCC->C1MR)) & (channel << 0U))) + +/* Private macros ------------------------------------------------------------*/ +/* Private typedef -----------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static void (*FreeBufCb)( void ); + +/* Private function prototypes -----------------------------------------------*/ +static void HW_IPCC_BLE_EvtHandler( void ); +static void HW_IPCC_BLE_AclDataEvtHandler( void ); +static void HW_IPCC_MM_FreeBufHandler( void ); +static void HW_IPCC_SYS_CmdEvtHandler( void ); +static void HW_IPCC_SYS_EvtHandler( void ); +static void HW_IPCC_TRACES_EvtHandler( void ); + +#ifdef THREAD_WB +static void HW_IPCC_OT_CmdEvtHandler( void ); +static void HW_IPCC_THREAD_NotEvtHandler( void ); +static void HW_IPCC_THREAD_CliNotEvtHandler( void ); +#endif + +#ifdef LLD_TESTS_WB +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ); +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ); +#endif + +#ifdef BLE_LLD_WB +/*static void HW_IPCC_BLE_LLD_ReceiveCliRspHandler( void );*/ +static void HW_IPCC_BLE_LLD_ReceiveRspHandler( void ); +static void HW_IPCC_BLE_LLD_ReceiveM0CmdHandler( void ); +#endif + +#ifdef MAC_802_15_4_WB +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ); +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ); +#endif + +#ifdef ZIGBEE_WB +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ); +#endif + +/* Public function definition -----------------------------------------------*/ + +/****************************************************************************** + * INTERRUPT HANDLER + ******************************************************************************/ +void HW_IPCC_Rx_Handler( void ) +{ + if (HW_IPCC_RX_PENDING( HW_IPCC_SYSTEM_EVENT_CHANNEL )) + { + HW_IPCC_SYS_EvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_NotEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_NotEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_CliNotEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveCliRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_M0_CMD_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef BLE_LLD_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_LLD_RSP_CHANNEL )) + { + HW_IPCC_BLE_LLD_ReceiveRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_LLD_M0_CMD_CHANNEL )) + { + HW_IPCC_BLE_LLD_ReceiveM0CmdHandler(); + } +#endif /* BLE_LLD_WB */ +#ifdef ZIGBEE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackNotifEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackM0RequestHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL )) + { + HW_IPCC_BLE_EvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_TRACES_CHANNEL )) + { + HW_IPCC_TRACES_EvtHandler(); + } + + return; +} + +void HW_IPCC_Tx_Handler( void ) +{ + if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_CmdEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL )) + { + HW_IPCC_OT_CmdEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB +// No TX handler for LLD tests +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL )) + { + HW_IPCC_ZIGBEE_CmdEvtHandler(); + } +#endif /* ZIGBEE_WB */ + + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) + { + HW_IPCC_MM_FreeBufHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_HCI_ACL_DATA_CHANNEL )) + { + HW_IPCC_BLE_AclDataEvtHandler(); + } + + return; +} +/****************************************************************************** + * GENERAL + ******************************************************************************/ +void HW_IPCC_Enable( void ) +{ + /** + * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running + when FUS is running on CPU2 and CPU1 enters deep sleep mode + */ + LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC); + + /** + * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 + */ + LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); + + /** + * In case the SBSFU is implemented, it may have already set the C2BOOT bit to startup the CPU2. + * In that case, to keep the mechanism transparent to the user application, it shall call the system command + * SHCI_C2_Reinit( ) before jumping to the application. + * When the CPU2 receives that command, it waits for its event input to be set to restart the CPU2 firmware. + * This is required because once C2BOOT has been set once, a clear/set on C2BOOT has no effect. + * When SHCI_C2_Reinit( ) is not called, generating an event to the CPU2 does not have any effect + * So, by default, the application shall both set the event flag and set the C2BOOT bit. + */ + __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ + __WFE( ); /* Clear the internal event flag */ + LL_PWR_EnableBootC2( ); + + return; +} + +void HW_IPCC_Init( void ) +{ + LL_AHB3_GRP1_EnableClock( LL_AHB3_GRP1_PERIPH_IPCC ); + + LL_C1_IPCC_EnableIT_RXO( IPCC ); + LL_C1_IPCC_EnableIT_TXF( IPCC ); + + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + + return; +} + +/****************************************************************************** + * BLE + ******************************************************************************/ +void HW_IPCC_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_BLE_CMD_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_EvtHandler( void ) +{ + HW_IPCC_BLE_RxEvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendAclData( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_AclDataEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + HW_IPCC_BLE_AclDataAckNot(); + + return; +} + +__weak void HW_IPCC_BLE_AclDataAckNot( void ){}; +__weak void HW_IPCC_BLE_RxEvtNot( void ){}; + +/****************************************************************************** + * SYSTEM + ******************************************************************************/ +void HW_IPCC_SYS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_SYS_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + return; +} + +static void HW_IPCC_SYS_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + HW_IPCC_SYS_CmdEvtNot(); + + return; +} + +static void HW_IPCC_SYS_EvtHandler( void ) +{ + HW_IPCC_SYS_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +__weak void HW_IPCC_SYS_CmdEvtNot( void ){}; +__weak void HW_IPCC_SYS_EvtNot( void ){}; + +/****************************************************************************** + * MAC 802.15.4 + ******************************************************************************/ +#ifdef MAC_802_15_4_WB +void HW_IPCC_MAC_802_15_4_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + HW_IPCC_MAC_802_15_4_CmdEvtNot(); + + return; +} + +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_MAC_802_15_4_EvtNot(); + + return; +} +__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; +__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; +#endif + +/****************************************************************************** + * THREAD + ******************************************************************************/ +#ifdef THREAD_WB +void HW_IPCC_THREAD_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_OT_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_CLI_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_CMD_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_CliSendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_OT_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + HW_IPCC_OT_CmdEvtNot(); + + return; +} + +static void HW_IPCC_THREAD_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_EvtNot(); + + return; +} + +static void HW_IPCC_THREAD_CliNotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_CliEvtNot(); + + return; +} + +__weak void HW_IPCC_OT_CmdEvtNot( void ){}; +__weak void HW_IPCC_CLI_CmdEvtNot( void ){}; +__weak void HW_IPCC_THREAD_EvtNot( void ){}; + +#endif /* THREAD_WB */ + +/****************************************************************************** + * LLD TESTS + ******************************************************************************/ +#ifdef LLD_TESTS_WB +void HW_IPCC_LLDTESTS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLDTESTS_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveCliRsp(); + return; +} + +void HW_IPCC_LLDTESTS_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveM0Cmd(); + return; +} + + +void HW_IPCC_LLDTESTS_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLDTESTS_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void ){}; +#endif /* LLD_TESTS_WB */ + +/****************************************************************************** + * BLE LLD + ******************************************************************************/ +#ifdef BLE_LLD_WB +void HW_IPCC_BLE_LLD_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_BLE_LLD_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_BLE_LLD_CLI_CMD_CHANNEL ); + return; +} + +/*static void HW_IPCC_BLE_LLD_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_CLI_RSP_CHANNEL ); + HW_IPCC_BLE_LLD_ReceiveCliRsp(); + return; +}*/ + +void HW_IPCC_BLE_LLD_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_LLD_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_BLE_LLD_ReceiveM0CmdHandler( void ) +{ + //LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_M0_CMD_CHANNEL ); + HW_IPCC_BLE_LLD_ReceiveM0Cmd(); + return; +} + + +void HW_IPCC_BLE_LLD_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_LLD_M0_CMD_CHANNEL ); + //LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_BLE_LLD_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_BLE_LLD_ReceiveM0Cmd( void ){}; + +/* Transparent Mode */ +void HW_IPCC_BLE_LLD_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_BLE_LLD_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_BLE_LLD_ReceiveRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_RSP_CHANNEL ); + HW_IPCC_BLE_LLD_ReceiveRsp(); + return; +} + +void HW_IPCC_BLE_LLD_SendRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_LLD_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_LLD_RSP_CHANNEL ); + return; +} + +#endif /* BLE_LLD_WB */ + +/****************************************************************************** + * ZIGBEE + ******************************************************************************/ +#ifdef ZIGBEE_WB +void HW_IPCC_ZIGBEE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4RequestToM0( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvAppliAckFromM0(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0NotifyToM4(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0RequestToM4(); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){}; +#endif /* ZIGBEE_WB */ + +/****************************************************************************** + * MEMORY MANAGER + ******************************************************************************/ +void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) ) +{ + if ( LL_C1_IPCC_IsActiveFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ) ) + { + FreeBufCb = cb; + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + else + { + cb(); + + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + + return; +} + +static void HW_IPCC_MM_FreeBufHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + FreeBufCb(); + + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + return; +} + +/****************************************************************************** + * TRACES + ******************************************************************************/ +void HW_IPCC_TRACES_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +static void HW_IPCC_TRACES_EvtHandler( void ) +{ + HW_IPCC_TRACES_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +__weak void HW_IPCC_TRACES_EvtNot( void ){}; + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/readme.txt new file mode 100644 index 000000000..003420934 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate/readme.txt @@ -0,0 +1,137 @@ +/** + @page BLE_LLD_Datarate example + + @verbatim + ******************** (C) COPYRIGHT 2021 STMicroelectronics ******************* + * @file BLE_LLD/BLE_LLD_Datarate/readme.txt + * @author MCD Application Team + * @brief Description of the BLE LLD BLE_LLD_Datarate application + ****************************************************************************** + * + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @endverbatim + +@par Example Description + +How to send BLE LLD packets in high data rate. + +@note The objectives are to communicate using BLE_LLD between 3 boards, + in BLE Radio format not BLE Stack protocol. + Appli is based on Press button that send a payload that contains info to Toggle LED + It is launched after reset. + +@note BLE_LLD is a 2-level stack implemented just over the Hardware and Radio layer. + Lowest Layer also called Low Level or LL + It is just over the Hardware and Radio Layer. + It contains all the API to Set/Configure/Initialize all the parameters for Sending/receiving BLE Radio format packet data + Over LL layer there is HAL level + It contains a reduced number of API to Send/Receive BLE Radio format packet with predefined parameters + It works by calling a set of LL API + It make simple and fast to Send/Receive Packet + But It does allow the user to change all the Radio parameters + +@note LL is for user that want to customize the Radio and BLE parameters, it is more complex to implement + HAL is for user that want to Send/Receive in a very simple way less complex, without configuring LL + ble_lld module contains LLD API HAL and LL API + app_ble_lld module contains Transport Layer Command call from CPU1 to CPU2 + Buffer management + IT Radio management from CPU2 + +@par Keywords + +BLE_LLD, Connectivity, BLE, LLD, IPCC, HAL, Dual core, send and receive Packet + +@par Directory contents + + - BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.h Header for app_ble_lld.c module + - BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.h Header for Datarate Application datarate_app.c module + - BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/tl_dbg_conf.h Header for ble_lld debug module + - BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/app_ble_lld.c contains TL management and Buffer for BLE LLD Application + - BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/App/datarate_app.c Datarate program + - BLE_LLD/BLE_LLD_Datarate/STM32_WPAN/Target/hw_ipcc.c IPCC Driver + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_common.h Header for all modules with common definition + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_conf.h Parameters configuration file of the application + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/app_entry.h Parameters configuration file of the application + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/gpio_lld.h Parameters for gpio configuration file of the application + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_conf.h Configuration file of the HW + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/hw_if.h Configuration file of the HW + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/main.h Header for main.c module + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm_logging.h Header for stm_logging.c module + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32_lpm_if.h Header for stm32_lpm_if.c module + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/stm32wbxx_it.h Interrupt handlers header file + - BLE_LLD/BLE_LLD_Datarate/Core/Inc/utilities_conf.h Configuration file of the utilities + - BLE_LLD/BLE_LLD_Datarate/Core/Src/app_entry.c Initialization of the application + - BLE_LLD/BLE_LLD_Datarate/Core/Src/gpio_lld.c GPIO for application + - BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_timerserver.c TIMERSERVER for Datarate application + - BLE_LLD/BLE_LLD_Datarate/Core/Src/hw_uart.c UART Driver + - BLE_LLD/BLE_LLD_Datarate/Core/Src/main.c Main program + - BLE_LLD/BLE_LLD_Datarate/Core/Src/stm_logging.c Logging for application + - BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32_lpm_if.c Low Power Manager Interface + - BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_it.c Interrupt handlers + - BLE_LLD/BLE_LLD_Datarate/Core/Src/system_stm32wbxx.c stm32wbxx system source file + - BLE_LLD/BLE_LLD_Datarate/Core/Src/stm32wbxx_hal_msp.c HAL MPS for application + +@par Hardware and Software environment + + - This application uses two STM32WB55xx devices. + + - This example has been tested with an STMicroelectronics STM32WB55RG-Nucleo + board and can be easily tailored to any other supported device + and development board. + + - On STM32WB55RG-Nucleo, the jumpers must be configured as described + in this section. Starting from the top left position up to the bottom + right position, the jumpers on the Board must be set as follows: + + CN11: GND [OFF] + JP4: VDDRF [ON] + JP6: VC0 [ON] + JP2: +3V3 [ON] + JP1: USB_STL [ON] All others [OFF] + CN12: GND [OFF] + CN7: [OFF] + JP3: VDD_MCU [ON] + JP5: GND [OFF] All others [ON] + CN10: [OFF] + + +@par How to use it ? + +In order to make the program work, you must do the following: + - Connect 3 STM32WB55xx-Nucleo boards to your PC + - Open your preferred toolchain + - Rebuild all files and load your image into one target memory + - Rebuild all files of BLE_LLD/BLE_LLD_Datarate application + and load your image into the other target memory + + load stm32wb5x_BLE_LLD_fw.bin + - Run the application + + +You can control this application, after power and reset Pressing SW1 or SW2 to set respectively in Reception or Transmission the board +In this order and described into main.c: + +After power On or Reset (ALL the LED are OFF): + 1) Radio Init is done and the Action Packets are configured + 2) Press SW1 to set the first board in reception + 3) Press SW2 to set the second board in transmission, it will be master board + 4) Second board (master) Transmits to First board (reception) every 1500us a Payload containing the LED to Toggle (LED1 or LED2) + Alternativaly master board send 1000 first packets with LED1 into the payload and 1000 next packets with LED2 into the payload + Each time that reception board receive 100 packets it toggle the LED. Then the LED1 toggle 10 times and after this is the LED2 that toggle + 5) Press SW2 to set the last board in transmission, it will be slave board + 6) Last board (slave) Transmits to First board (reception) every 1500us a Payload containing the LED to Toggle (LED3) with a 750us delay shift compared to the master board + 7) master and slave are alternatively in transmission and reception + 8) When master transmits, slave receives (LED1 or LED2 also toggle). when slave transmits, master receives (LED3 also toggle) + 9) When master and slave are activated, every 750us a packet is send and it is received to the reception board + + +Serial Port Setup TERMINAL +Baud Rate:115200 / Data:8 bits / Parity:none / Stop:1bit / Flow Control:none + + *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  + */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h index 5bb0f82f1..a49e4fde7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,4 +120,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h index 01f3dea95..1af5db40a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,8 +44,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -96,7 +96,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -314,7 +314,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -334,4 +334,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h index cec656da9..56e0228a8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h - * Description : Hardware configuration file for the application. + * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -183,4 +182,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h index 3fd93b322..b69817ff7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -181,7 +180,7 @@ void MX_USART1_UART_DeInit(void); * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -283,5 +282,3 @@ void MX_UART_Deinit(hw_uart_id_t uart); #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h index 0c024028b..05a9002bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void SystemClock_Config_MSI(uint32_t usePLL); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h index dac7e2cbb..293e9912d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32_lpm_if.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_LPM_IF_H @@ -75,5 +74,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h index 365809937..f7f0c092e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h index fd3ff7829..f2fcc305a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h index 119d6e7a0..e60099e7c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/stm_logging.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c index a377e0f8a..bbe5b1355 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -418,4 +417,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c index 1ccb7b42f..2c64a7493 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2015 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +110,3 @@ void gpio_lld_lpuart_deInit(void) { } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c index 3c842b29a..a693ffc14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -439,4 +438,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c index 678b643b9..8ded8eaec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief RF LLD tests application * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -603,5 +603,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END assert_failed */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c index c789f48a8..57bfb1d7c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -328,5 +327,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) } } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c index 09fb8f08f..556af7d2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -320,4 +319,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c index 791008e1d..1f4da1444 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -351,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb55xx_flash_cm4.icf index ddc12f77c..f9aff22d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,10 +32,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c index ea1573ea1..438c73df3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.c @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -387,4 +386,3 @@ void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h index 3bd87e32c..21899be1e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/app_ble_lld.h @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_BLE_LLD_H #define APP_BLE_LLD_H @@ -68,4 +67,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c index 4063e0755..484545618 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.c @@ -1,17 +1,16 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : lowpower_app.c * Description : BLE LLD simple demo to control LEDs remotely ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,4 +163,3 @@ void Appli_TS_Callback(void) UTIL_SEQ_SetTask(1U << CFG_TASK_TIMER, CFG_SCH_PRIO_0); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h index 3024b6884..7f7ac8684 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/lowpower_app.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : lowpower_app.h * Description : Header for BLE LLD application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef LOWPOWER_APP_H @@ -47,4 +46,3 @@ void Appli_TS_Callback(void); #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c index 7ce3de621..bed7dfbd3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,10 +162,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -673,4 +669,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt index f1b750bc9..4cb0bce4e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Lowpower/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE LLD BLE_LLD_Lowpower application ****************************************************************************** * - * Copyright (c) 2021 STMicroelectronics. All rights reserved. + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h index 5bb0f82f1..a49e4fde7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,4 +120,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h index 27c0fa67b..7e6e3447d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,8 +44,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -96,7 +96,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -298,7 +298,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -318,4 +318,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h index 571f5d77a..de25f60a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h - * Description : Hardware configuration file for the application. + * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -183,4 +182,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h index 8ea9d9ba1..cf9135293 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void MX_UART_Deinit(hw_uart_id_t uart); * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -271,5 +270,3 @@ void MX_UART_Deinit(hw_uart_id_t uart); #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h index 0c024028b..05a9002bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void SystemClock_Config_MSI(uint32_t usePLL); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h index dac7e2cbb..293e9912d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32_lpm_if.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_LPM_IF_H @@ -75,5 +74,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h index 365809937..f7f0c092e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h index 485c7fc81..8710691e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h index 119d6e7a0..e60099e7c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/stm_logging.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c index 4a8eab1cd..6ab0e3050 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -415,4 +414,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c index 1ccb7b42f..2c64a7493 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2015 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +110,3 @@ void gpio_lld_lpuart_deInit(void) { } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c index 3c842b29a..a693ffc14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -439,4 +438,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c index d61a7ec40..3e594310e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief RF LLD tests application * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -554,5 +554,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END assert_failed */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c index b783825ba..966f21306 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -282,5 +281,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c index 3b91552d1..1ac915757 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -323,4 +322,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c index 791008e1d..1f4da1444 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -351,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb55xx_flash_cm4.icf index ddc12f77c..f9aff22d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,10 +32,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c index ea1573ea1..438c73df3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.c @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -387,4 +386,3 @@ void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h index 3bd87e32c..21899be1e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/app_ble_lld.h @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_BLE_LLD_H #define APP_BLE_LLD_H @@ -68,4 +67,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c index caa507a85..37a1be6fa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.c @@ -1,17 +1,16 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : pressbutton_app.c * Description : BLE LLD simple demo to control LEDs remotely ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,4 +157,3 @@ static inline uint32_t timeDifference(uint32_t old, uint32_t new){ } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h index 602d7c8c4..1d0de164b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/pressbutton_app.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : pressbutton_app.h * Description : Header for BLE LLD application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef PRESSBUTTON_APP_H @@ -46,4 +45,3 @@ void PRESSBUTTON_APP_Init(void); #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c index 7ce3de621..bed7dfbd3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,10 +162,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -673,4 +669,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt index 069dfb132..d3fa1dbdd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Pressbutton/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE LLD BLE_LLD_Pressbutton application ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_common.h index 5bb0f82f1..a49e4fde7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,4 +120,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_conf.h index 6dea428df..d28dcbc3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,8 +44,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -96,7 +96,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -302,7 +302,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -322,4 +322,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_conf.h index 571f5d77a..de25f60a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h - * Description : Hardware configuration file for the application. + * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -183,4 +182,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_if.h index c34fb4932..336c795cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -165,7 +164,7 @@ void MX_UART_Deinit(hw_uart_id_t uart); * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -265,5 +264,3 @@ void MX_UART_Deinit(hw_uart_id_t uart); #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/main.h index 0c024028b..05a9002bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void SystemClock_Config_MSI(uint32_t usePLL); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32_lpm_if.h index dac7e2cbb..293e9912d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32_lpm_if.h @@ -1,20 +1,19 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_LPM_IF_H @@ -75,5 +74,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_hal_conf.h index 365809937..f7f0c092e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_it.h index da3ff16c8..ee1ecd547 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm_logging.h index 119d6e7a0..e60099e7c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/stm_logging.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/app_entry.c index 4ceafd80d..c58968ef5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -415,4 +414,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/gpio_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/gpio_lld.c index 1ccb7b42f..2c64a7493 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/gpio_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2015 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +110,3 @@ void gpio_lld_lpuart_deInit(void) { } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/hw_uart.c index 3c842b29a..a693ffc14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -439,4 +438,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/main.c index 86e8cd86a..6bd28737e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief RF LLD tests application * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -605,5 +605,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END assert_failed */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_hal_msp.c index b783825ba..966f21306 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -282,5 +281,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_it.c index 43697aaa7..a40a4c652 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -330,4 +329,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/system_stm32wbxx.c index 791008e1d..1f4da1444 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -351,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/stm32wb55xx_flash_cm4.icf index ddc12f77c..f9aff22d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,10 +32,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.c index ea1573ea1..438c73df3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.c @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,7 +170,7 @@ void APP_BLE_LLD_Error(uint32_t ErrId, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -387,4 +386,3 @@ void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer ) /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.h index 3bd87e32c..21899be1e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/app_ble_lld.h @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_BLE_LLD_H #define APP_BLE_LLD_H @@ -68,4 +67,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_BLE_LLD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.c index 129e50b9e..a2fdbe828 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : proximity_app.c * Description : BLE LLD validation Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -234,4 +233,3 @@ static void peersPrint(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.h index 0a1b2d52e..092b59521 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/proximity_app.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : proximity_app.h * Description : Header for BLE LLD application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef PROXIMITY_APP_H @@ -47,4 +46,3 @@ void Appli_TIM_PeriodElapsedCallback(void); #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/Target/hw_ipcc.c index 7ce3de621..bed7dfbd3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,10 +162,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -673,4 +669,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/readme.txt index e7bddfb01..aec645814 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE LLD BLE_LLD_Proximity application ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -129,7 +129,7 @@ Follow this procedure to run the demo: (115200 bauds 8 bits no parity 1 stop bit) - Move boards relatively to each other to see updates -Exemple: +Example : @verbatim Device ID: 26321 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_common.h index 0d38b869d..51d374fa9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -120,5 +119,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_conf.h index 987a4a2f4..9b9e800e0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_conf.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -266,7 +265,7 @@ * (bit 2): 1: device name Read-Only * 0: device name R/W * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ #define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST @@ -352,7 +351,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -648,7 +647,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -683,13 +682,13 @@ typedef enum allocated size within the scatterfile in bytes CFG_NVM_BASE_ADDRESS : offset to add to the base flash address to get the - beginning of the NVM (shall be withon allocation range of scatterfile) + beginning of the NVM (shall be within allocation range of scatterfile) ST_PERSIST_MAX_ALLOC_SZ : max size of the RAM cache in bytes either an abitrary choice or the CFG_NVM_MAX_SIZE ST_PERSIST_FLASH_DATA_OFFSET : offset in bytes of zigbee data - (U8[4] for lenght - 1st data[]...) + (U8[4] for length - 1st data[]...) CFG_NB_OF_PAGE : Number of page of flash to use CFG_NVM_MAX_SIZE : Max allocable size in byte for NVM @@ -742,4 +741,3 @@ typedef enum #endif /* APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_entry.h index 23f19e122..5ce697612 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, syncro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -52,5 +51,3 @@ void APP_ScheduleError(uint32_t ErrId); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_conf.h index 3a86a4e83..af8a3ebde 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -245,5 +244,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*__HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/main.h index bbe71a4da..04821b234 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -34,5 +33,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_it.h index 46179c211..6b72635b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void DMA1_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm_logging.h index 6d2e9b01b..5f53a6165 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/app_entry.c index 2e4c9981f..90f8846ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -806,5 +805,3 @@ static void Receive_Notification_From_RFCore(void) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_uart.c index 7d28f9582..5ee54a536 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/main.c index 357cf030c..c144aea3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -324,4 +324,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32wbxx_it.c index 21d9b3cc1..72092bed9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -171,5 +170,3 @@ void RTC_WKUP_IRQHandler(void) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm_logging.c index cae3455ae..1a50ab315 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/stm_logging.c @@ -1,24 +1,23 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm_logging.c * @author MCD Application Team * @brief This file contains all the defines and functions used for logging * on Application examples. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/stm32wb55xx_flash_cm4.icf index 929735cb1..f35f820d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/EWARM/stm32wb55xx_flash_cm4.icf @@ -34,9 +34,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/MDK-ARM/startup_stm32wb55xx_cm4.s index 6049cb917..cee8f6677 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b19bef906..76da8bb3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.c index 8e8e26057..f84a42fd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1143,4 +1142,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.h index 565b6bf61..f03a2260d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -85,5 +84,3 @@ void APP_BLE_Stop(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.c index ef1ceae7e..be8b59b88 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_ffd_mac_802_15_4.c * @author MCD Application Team * @brief Application based on MAC 802.15.4 - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -373,5 +372,3 @@ static void APP_FFD_MAC_802_15_4_Config() */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.h index d7366fccb..c2c8dda78 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4.h @@ -6,17 +6,16 @@ * @brief Header for FFD MAC 802.15.4 Core Mac Device implementation ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_FFD_MAC_802_15_4_H @@ -96,5 +95,3 @@ void APP_FFD_parseClientReqResCmd ( const char * CommandString ); #endif #endif /* __APP_FFD_MAC_802_15_4_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c index 0d1efd1fe..2e81cfd70 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c @@ -1,22 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file app_mac_802-15-4_process.c * @author MDG-RF Team * @brief MAC Cli Implementation for Demo Purpose * -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "app_ffd_mac_802_15_4_process.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h index c67838353..af5b332b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h @@ -7,17 +7,16 @@ * MAC 802.15.4 Events and Notifications. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_FFD_MAC_802_15_4_PROCESS_H @@ -63,5 +62,3 @@ MAC_Status_t APP_MAC_mlmePollIndCb( const MAC_pollInd_t * pPollInd ); #endif #endif /* APP_FFD_MAC_802_15_4_PROCESS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_conf.h index 538713f85..14a542030 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_dbg_conf.h index bec936bbe..0f78a5a4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.c index bbd5177b6..a469c3e0f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -394,5 +393,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.h index 11e27d8a2..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/readme.txt index 170feb0f4..679cdcdf9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Mac/BLE_Mac_Static/readme.txt @@ -9,12 +9,12 @@ * concurrent mode. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -27,7 +27,7 @@ This use case requires one STM32WB55xx-Nucleo board with Static Concurrent Mode application running on it.Static mode means this application can perform alternatively BLE or Mac activities. -The idea is to present a demo with a device running the BLE/MAC concurent mode +The idea is to present a demo with a device running the BLE/MAC concurrent mode able to interact with a Phone (or the BLE p2p client application) and a device running the MAC RFD application. @@ -173,7 +173,7 @@ To get the traces in real time, you can connect an HyperTerminal to the STLink V ******************** **** START DEMO **** ******************** -By default, after a reset, the board [2] running the static concurent mode will start in BLE mode. +By default, after a reset, the board [2] running the static concurrent mode will start in BLE mode. This device will start advertising (during 1 minute) and the green led will blinks for each advertising event. * BLE mode diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_common.h index 0d38b869d..51d374fa9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -120,5 +119,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_conf.h index 5de72f894..22f292d47 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_conf.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -264,7 +263,7 @@ * (bit 2): 1: device name Read-Only * 0: device name R/W * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ #define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST @@ -350,7 +349,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -617,7 +616,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -644,4 +643,3 @@ typedef enum #endif /* APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_entry.h index 1e7fcbf1f..1fc8b14c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" { #endif #endif /* __APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_conf.h index a4bd00d79..e09d7bc61 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -257,5 +256,3 @@ #define GPIO_EXT_PA_TX_PIN GPIO_PIN_0 #define GPIO_EXT_PA_TX_PORT GPIOB #endif /*__HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/main.h index bbe71a4da..04821b234 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -34,5 +33,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_it.h index 46179c211..6b72635b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void DMA1_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm_logging.h index 9f95c06e6..373a97306 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/app_entry.c index e36fd65c6..46d5f8a82 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -553,4 +552,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_uart.c index 7d28f9582..5ee54a536 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/main.c index 552cf82d9..f3c646827 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -323,4 +323,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32wbxx_it.c index 8c7f63d4c..df58e6e90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -184,5 +183,3 @@ void RTC_WKUP_IRQHandler(void) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm_logging.c index 485e84742..4da03bc4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/stm_logging.c @@ -1,24 +1,23 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm_logging.c * @author MCD Application Team * @brief This file contains all the defines and functions used for logging * on Application examples. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/stm32wb55xx_flash_cm4.icf index c02e41d26..dac2f749d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.c index 9d74bdc51..5ea3cfe00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1152,4 +1151,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.h index 2daaab3d7..4dcef2e86 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -88,5 +87,3 @@ void APP_BLE_Stop(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.c index 88aa90276..228f03fff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -58,7 +57,7 @@ #define THREAD_CHANGE_MODE_TIMEOUT (1*1000*1000/CFG_TS_TICK_VAL) /**< 1s */ #define THREAD_LINK_POLL_PERIOD (5*1000*1000/CFG_TS_TICK_VAL) /**< 5s */ -#define OT_AUTOSTART_MODE 1 // Automatic OT start and COAP after reset, set it to 1 for GRL testing +#define OT_AUTOSTART_MODE 1 // Automatic OT start and COAP after reset, set it to 0 for GRL testing /* USER CODE END PD */ /* Private macros ------------------------------------------------------------*/ @@ -398,14 +397,18 @@ static void APP_THREAD_StateNotif(uint32_t NotifFlags, void *pContext) /* USER CODE BEGIN OT_DEVICE_ROLE_CHILD */ BSP_LED_Off(LED2); BSP_LED_On(LED3); +#if OT_AUTOSTART_MODE HW_TS_Start(sedCoapTimerID, (uint32_t)COAP_SEND_TIMEOUT); +#endif /* USER CODE END OT_DEVICE_ROLE_CHILD */ break; case OT_DEVICE_ROLE_ROUTER : /* USER CODE BEGIN OT_DEVICE_ROLE_ROUTER */ BSP_LED_Off(LED2); BSP_LED_On(LED3); +#if OT_AUTOSTART_MODE HW_TS_Start(sedCoapTimerID, (uint32_t)COAP_SEND_TIMEOUT); +#endif /* USER CODE END OT_DEVICE_ROLE_ROUTER */ break; case OT_DEVICE_ROLE_LEADER : @@ -453,7 +456,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1098,7 +1101,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1126,4 +1129,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.h index 462e69f21..b60adf892 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -135,4 +134,3 @@ void APP_THREAD_CleanCallbacks(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_conf.h index 538713f85..14a542030 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_dbg_conf.h index bec936bbe..0f78a5a4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.c index 7ca76bb29..c2633dd06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -394,5 +393,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.h index 11e27d8a2..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/readme.txt index a7057c142..e39060434 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn/readme.txt @@ -9,12 +9,12 @@ * Concurrent mode. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_common.h index 0d38b869d..51d374fa9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -120,5 +119,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_conf.h index 9f2317958..bc2869b69 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_conf.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -264,7 +263,7 @@ * (bit 2): 1: device name Read-Only * 0: device name R/W * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ #define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST @@ -350,7 +349,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -617,7 +616,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -644,4 +643,3 @@ typedef enum #endif /* APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_entry.h index 1e7fcbf1f..1fc8b14c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" { #endif #endif /* __APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_conf.h index a4bd00d79..e09d7bc61 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -257,5 +256,3 @@ #define GPIO_EXT_PA_TX_PIN GPIO_PIN_0 #define GPIO_EXT_PA_TX_PORT GPIOB #endif /*__HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/main.h index bbe71a4da..04821b234 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -34,5 +33,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_it.h index 46179c211..6b72635b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void DMA1_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm_logging.h index 9f95c06e6..373a97306 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/app_entry.c index ca5029278..6c85b9943 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -553,4 +552,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_uart.c index 7d28f9582..5ee54a536 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/main.c index 552cf82d9..f3c646827 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -323,4 +323,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32wbxx_it.c index 8c7f63d4c..df58e6e90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -184,5 +183,3 @@ void RTC_WKUP_IRQHandler(void) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm_logging.c index 485e84742..4da03bc4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/stm_logging.c @@ -1,24 +1,23 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm_logging.c * @author MCD Application Team * @brief This file contains all the defines and functions used for logging * on Application examples. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf index c02e41d26..dac2f749d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.c index 9d74bdc51..5ea3cfe00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1152,4 +1151,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.h index 2daaab3d7..4dcef2e86 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -88,5 +87,3 @@ void APP_BLE_Stop(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.c index adf1da964..ef6fd1307 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -467,7 +466,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1117,7 +1116,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1145,4 +1144,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.h index 462e69f21..b60adf892 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -135,4 +134,3 @@ void APP_THREAD_CleanCallbacks(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_conf.h index 538713f85..14a542030 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h index bec936bbe..0f78a5a4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.c index 7ca76bb29..c2633dd06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -394,5 +393,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.h index 11e27d8a2..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/readme.txt index d0bda7af7..fc83a1993 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Dyn_SED/readme.txt @@ -9,12 +9,12 @@ * in dynamic concurrent mode. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_common.h index 0d38b869d..51d374fa9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -120,5 +119,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_conf.h index 259768b70..312b7d53e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_conf.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -264,7 +263,7 @@ * (bit 2): 1: device name Read-Only * 0: device name R/W * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ #define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST @@ -350,7 +349,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -617,7 +616,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -644,4 +643,3 @@ typedef enum #endif /* APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_entry.h index 1e7fcbf1f..1fc8b14c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" { #endif #endif /* __APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_conf.h index 3a86a4e83..af8a3ebde 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -245,5 +244,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*__HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/main.h index bbe71a4da..04821b234 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -34,5 +33,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_it.h index 46179c211..6b72635b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void DMA1_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm_logging.h index 9f95c06e6..373a97306 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/app_entry.c index c3507867c..ed11b6a06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -585,4 +584,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_uart.c index 7d28f9582..5ee54a536 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/main.c index 552cf82d9..f3c646827 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -323,4 +323,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32wbxx_it.c index 8c7f63d4c..df58e6e90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -184,5 +183,3 @@ void RTC_WKUP_IRQHandler(void) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm_logging.c index 485e84742..4da03bc4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/stm_logging.c @@ -1,24 +1,23 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm_logging.c * @author MCD Application Team * @brief This file contains all the defines and functions used for logging * on Application examples. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/stm32wb55xx_flash_cm4.icf index c02e41d26..dac2f749d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.c index 7e266b635..32aa959a6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1140,4 +1139,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.h index f738ee83c..e13605f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -84,5 +83,3 @@ void APP_BLE_Stop(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.c index 7f94c8cb1..16a66733a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -455,7 +454,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1112,7 +1111,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1140,4 +1139,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.h index 8f090f815..cc3f0a312 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -130,4 +129,3 @@ void APP_THREAD_CleanCallbacks(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_conf.h index 538713f85..14a542030 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_dbg_conf.h index bec936bbe..0f78a5a4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.c index 7ca76bb29..c2633dd06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -394,5 +393,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.h index 11e27d8a2..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/readme.txt index e569d0bfa..b97c34601 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Thread/Ble_Thread_Static/readme.txt @@ -9,12 +9,12 @@ * Concurrent mode. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_common.h index 0d38b869d..51d374fa9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -120,5 +119,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_conf.h index 13ef60771..74fa175b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_conf.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -269,7 +268,7 @@ * (bit 2): 1: device name Read-Only * 0: device name R/W * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ #define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST @@ -352,7 +351,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -633,7 +632,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -659,4 +658,3 @@ typedef enum #endif /* APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_entry.h index 1e7fcbf1f..1fc8b14c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" { #endif #endif /* __APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_conf.h index ff0fdedf2..25d99934e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -243,5 +242,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*__HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/main.h index bbe71a4da..04821b234 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -34,5 +33,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_it.h index 46179c211..6b72635b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void DMA1_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm_logging.h index bea41334b..4e109242d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/app_entry.c index afd6ffc97..7aa7bf871 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -501,4 +500,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_uart.c index 7d28f9582..5ee54a536 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/main.c index 8b83c1b86..d8abf620c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -324,4 +324,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32wbxx_it.c index c29aafc7b..be749b11f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -181,5 +180,3 @@ void RTC_WKUP_IRQHandler(void) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm_logging.c index 485e84742..4da03bc4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/stm_logging.c @@ -1,24 +1,23 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm_logging.c * @author MCD Application Team * @brief This file contains all the defines and functions used for logging * on Application examples. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/stm32wb55xx_flash_cm4.icf index 36b3e9f26..9c7b744a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/EWARM/stm32wb55xx_flash_cm4.icf @@ -33,9 +33,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.c index f5346fe63..7079aefc4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1272,4 +1271,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.h index d0729f77d..f69fc0ae1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -86,5 +85,3 @@ void APP_BLE_Stop(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.c index 8276353b7..3cd53889c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -682,7 +681,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1023,7 +1022,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -1158,4 +1157,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.h index 88ad973f2..216915c23 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -63,4 +62,3 @@ bool APP_ZIGBEE_persist_save(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_conf.h index 538713f85..14a542030 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_dbg_conf.h index 1f9b21135..53062f6d3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.c index bde504398..b8b155048 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -393,5 +392,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.h index 11e27d8a2..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/readme.txt index c15005222..76628bb91 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn/readme.txt @@ -9,12 +9,12 @@ * dynamic concurrent mode. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_common.h index 0d38b869d..51d374fa9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -120,5 +119,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_conf.h index 5552295dd..388ec724a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_conf.h @@ -5,13 +5,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -269,7 +268,7 @@ * (bit 2): 1: device name Read-Only * 0: device name R/W * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ #define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST @@ -352,7 +351,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -633,7 +632,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -659,4 +658,3 @@ typedef enum #endif /* APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_entry.h index 1e7fcbf1f..1fc8b14c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" { #endif #endif /* __APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_conf.h index ff0fdedf2..25d99934e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -243,5 +242,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*__HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/main.h index bbe71a4da..04821b234 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/main.h @@ -5,17 +5,16 @@ * @brief Header for main.c module ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -34,5 +33,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_it.h index 46179c211..6b72635b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void DMA1_Channel4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm_logging.h index bea41334b..4e109242d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/app_entry.c index afd6ffc97..7aa7bf871 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -501,4 +500,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_uart.c index 7d28f9582..5ee54a536 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/main.c index 82c767a06..1336235ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -346,4 +346,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32wbxx_it.c index c29aafc7b..be749b11f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm32wbxx_it.c @@ -7,17 +7,16 @@ * peripherals interrupt service routine. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -181,5 +180,3 @@ void RTC_WKUP_IRQHandler(void) - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm_logging.c index 485e84742..4da03bc4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/stm_logging.c @@ -1,24 +1,23 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm_logging.c * @author MCD Application Team * @brief This file contains all the defines and functions used for logging * on Application examples. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf index 36b3e9f26..9c7b744a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/EWARM/stm32wb55xx_flash_cm4.icf @@ -33,9 +33,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.c index 196856044..4ff9fa428 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file app_ble.c * @author MCD Application Team * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -1270,4 +1269,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.h index d0729f77d..f69fc0ae1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -86,5 +85,3 @@ void APP_BLE_Stop(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.c index 6fb5f52b1..a4479f2bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -656,7 +655,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -811,7 +810,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -946,4 +945,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.h index 88ad973f2..216915c23 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -63,4 +62,3 @@ bool APP_ZIGBEE_persist_save(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_conf.h index 538713f85..14a542030 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_conf.h * Description : Configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,7 +53,7 @@ #define BLE_CFG_CLT_MAX_NBR_CB 0 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) @@ -67,4 +66,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h index 1f9b21135..53062f6d3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/ble_dbg_conf.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/ble_dbg_conf.h * Description : Debug configuration file for BLE Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ #endif /*__BLE_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.c index bde504398..b8b155048 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -45,7 +44,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -393,5 +392,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.h index 11e27d8a2..d49f68f59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c index 451ae9311..8867aef4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,10 +129,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -520,4 +516,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/readme.txt index 33b40b0cb..86074d81b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Dyn_SED/readme.txt @@ -9,12 +9,12 @@ * in dynamic concurrent mode. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_common.h deleted file mode 100644 index 0d38b869d..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_common.h +++ /dev/null @@ -1,124 +0,0 @@ -/** - ****************************************************************************** - * @file app_common.h - * @author MCD Application Team - * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __APP_COMMON_H -#define __APP_COMMON_H - -#ifdef __cplusplus -extern "C" -{ -#endif - -#include -#include -#include -#include -#include - -#include "app_conf.h" -#include "stm_logging.h" - -/* -------------------------------- * - * Basic definitions * - * -------------------------------- */ - -#undef NULL -#define NULL 0 - -#undef FALSE -#define FALSE 0 - -#undef TRUE -#define TRUE (!0) - - /* -------------------------------- * - * Critical Section definition * - * -------------------------------- */ -#define BACKUP_PRIMASK() uint32_t primask_bit= __get_PRIMASK() -#define DISABLE_IRQ() __disable_irq() -#define RESTORE_PRIMASK() __set_PRIMASK(primask_bit) - -/* -------------------------------- * - * Macro delimiters * - * -------------------------------- */ - -#define M_BEGIN do { - -#define M_END } while(0) - - -/* -------------------------------- * - * Some useful macro definitions * - * -------------------------------- */ - -#ifndef MAX -#define MAX( x, y ) (((x)>(y))?(x):(y)) -#endif - -#ifndef MIN -#define MIN( x, y ) (((x)<(y))?(x):(y)) -#endif - -#define MODINC( a, m ) M_BEGIN (a)++; if ((a)>=(m)) (a)=0; M_END - -#define MODDEC( a, m ) M_BEGIN if ((a)==0) (a)=(m); (a)--; M_END - -#define MODADD( a, b, m ) M_BEGIN (a)+=(b); if ((a)>=(m)) (a)-=(m); M_END - -#define MODSUB( a, b, m ) MODADD( a, (m)-(b), m ) - - -#define PAUSE( t ) M_BEGIN \ - volatile int _i; \ - for ( _i = t; _i > 0; _i -- ); \ - M_END - -#define DIVF( x, y ) ((x)/(y)) - -#define DIVC( x, y ) (((x)+(y)-1)/(y)) - -#define DIVR( x, y ) (((x)+((y)/2))/(y)) - -#define SHRR( x, n ) ((((x)>>((n)-1))+1)>>1) - -#define BITN( w, n ) (((w)[(n)/32] >> ((n)%32)) & 1) - -#define BITNSET( w, n, b ) M_BEGIN (w)[(n)/32] |= ((U32)(b))<<((n)%32); M_END - - /* -------------------------------- * - * Compiler * - * -------------------------------- */ -#define PLACE_IN_SECTION( __x__ ) __attribute__((section (__x__))) - -#ifdef WIN32 -#define ALIGN(n) -#else -#define ALIGN(n) __attribute__((aligned(n))) -#endif - - -#ifdef __cplusplus -} -#endif - -#endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_conf.h deleted file mode 100644 index 22c8b4676..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_conf.h +++ /dev/null @@ -1,652 +0,0 @@ -/** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN middleWare. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef APP_CONF_H -#define APP_CONF_H - - -#include "hw.h" -#include "hw_conf.h" -#include "hw_if.h" - -/****************************************************************************** - * Application Config - ******************************************************************************/ - -/**< generic parameters */ - -/** - * Define Tx Power - */ -#define CFG_TX_POWER (0x18) /**< 0dbm */ - -/** - * Define Advertising parameters - */ -#define CFG_ADV_BD_ADDRESS (0x7257acd87a6c) -#define CFG_FAST_CONN_ADV_INTERVAL_MIN (0x80) /**< 80ms */ -#define CFG_FAST_CONN_ADV_INTERVAL_MAX (0xa0) /**< 100ms */ -#define CFG_LP_CONN_ADV_INTERVAL_MIN (0x640) /**< 1s */ -#define CFG_LP_CONN_ADV_INTERVAL_MAX (0xfa0) /**< 2.5s */ - -/** - * Define IO Authentication - */ -#define CFG_BONDING_MODE (1) -#define CFG_FIXED_PIN (111111) -#define CFG_USED_FIXED_PIN (0) -#define CFG_ENCRYPTION_KEY_SIZE_MAX (16) -#define CFG_ENCRYPTION_KEY_SIZE_MIN (8) - -/** - * Define IO capabilities - */ -#define CFG_IO_CAPABILITY_DISPLAY_ONLY (0x00) -#define CFG_IO_CAPABILITY_DISPLAY_YES_NO (0x01) -#define CFG_IO_CAPABILITY_KEYBOARD_ONLY (0x02) -#define CFG_IO_CAPABILITY_NO_INPUT_NO_OUTPUT (0x03) -#define CFG_IO_CAPABILITY_KEYBOARD_DISPLAY (0x04) - -#define CFG_IO_CAPABILITY CFG_IO_CAPABILITY_DISPLAY_ONLY - -/** - * Define MITM modes - */ -#define CFG_MITM_PROTECTION_NOT_REQUIRED (0x00) -#define CFG_MITM_PROTECTION_REQUIRED (0x01) - -#define CFG_MITM_PROTECTION CFG_MITM_PROTECTION_REQUIRED - -/** - * Define PHY - */ -#define ALL_PHYS_PREFERENCE 0x00 -#define RX_2M_PREFERRED 0x02 -#define TX_2M_PREFERRED 0x02 -#define TX_1M 0x01 -#define TX_2M 0x02 -#define RX_1M 0x01 -#define RX_2M 0x02 - - -/** -* Identity root key used to derive LTK and CSRK -*/ -#define CFG_BLE_IRK {0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0} - -/** -* Encryption root key used to derive LTK and CSRK -*/ -#define CFG_BLE_ERK {0xfe,0xdc,0xba,0x09,0x87,0x65,0x43,0x21,0xfe,0xdc,0xba,0x09,0x87,0x65,0x43,0x21} - -/* USER CODE BEGIN Generic_Parameters */ -/** - * SMPS supply - * SMPS not used when Set to 0 - * SMPS used when Set to 1 - */ -#define CFG_USE_SMPS 1 -/* USER CODE END Generic_Parameters */ - -/**< specific parameters */ -/*****************************************************/ -#define CFG_LED_SUPPORTED 1 -#define CFG_BUTTON_SUPPORTED 1 - -#define PUSH_BUTTON_SW1_EXTI_IRQHandler EXTI4_IRQHandler -#define PUSH_BUTTON_SW2_EXTI_IRQHandler EXTI0_IRQHandler -#define PUSH_BUTTON_SW3_EXTI_IRQHandler EXTI1_IRQHandler - - -#define P2P_SERVER1 1 /*1 = Device is Peripherique*/ -#define P2P_SERVER2 0 -#define P2P_SERVER3 0 -#define P2P_SERVER4 0 -#define P2P_SERVER5 0 -#define P2P_SERVER6 0 - -#define CFG_DEV_ID_P2P_SERVER1 (0x83) -#define CFG_DEV_ID_P2P_SERVER2 (0x84) -#define CFG_DEV_ID_P2P_SERVER3 (0x87) -#define CFG_DEV_ID_P2P_SERVER4 (0x88) -#define CFG_DEV_ID_P2P_SERVER5 (0x89) -#define CFG_DEV_ID_P2P_SERVER6 (0x8A) -#define CFG_DEV_ID_P2P_ROUTER (0x85) - -#define RADIO_ACTIVITY_EVENT 1 /* 1 for OOB Demo */ - -/** -* AD Element - Group B Feature -*/ -/* LSB - First Byte */ -#define CFG_FEATURE_THREAD_SWITCH (0x40) - -/* LSB - Second Byte */ -#define CFG_FEATURE_OTA_REBOOT (0x20) - -#define CONN_L(x) ((int)((x)/0.625f)) -#define CONN_P(x) ((int)((x)/1.25f)) - - /* L2CAP Connection Update request parameters used for test only with smart Phone */ -#define L2CAP_REQUEST_NEW_CONN_PARAM 1 - -#define L2CAP_INTERVAL_MIN CONN_P(1000) /* 1s */ -#define L2CAP_INTERVAL_MAX CONN_P(1000) /* 1s */ -#define L2CAP_SLAVE_LATENCY 0x0000 -#define L2CAP_TIMEOUT_MULTIPLIER 0x1F4 - -/****************************************************************************** - * BLE Stack - ******************************************************************************/ -/** - * Maximum number of simultaneous connections that the device will support. - * Valid values are from 1 to 8 - */ -#define CFG_BLE_NUM_LINK 8 - -/** - * Maximum number of Services that can be stored in the GATT database. - * Note that the GAP and GATT services are automatically added so this parameter should be 2 plus the number of user services - */ -#define CFG_BLE_NUM_GATT_SERVICES 8 - -/** - * Maximum number of Attributes - * (i.e. the number of characteristic + the number of characteristic values + the number of descriptors, excluding the services) - * that can be stored in the GATT database. - * Note that certain characteristics and relative descriptors are added automatically during device initialization - * so this parameters should be 9 plus the number of user Attributes - */ -#define CFG_BLE_NUM_GATT_ATTRIBUTES 68 - -/** - * Maximum supported ATT_MTU size - */ -#define CFG_BLE_MAX_ATT_MTU (156) - -/** - * Size of the storage area for Attribute values - * This value depends on the number of attributes used by application. In particular the sum of the following quantities (in octets) should be made for each attribute: - * - attribute value length - * - 5, if UUID is 16 bit; 19, if UUID is 128 bit - * - 2, if server configuration descriptor is used - * - 2*DTM_NUM_LINK, if client configuration descriptor is used - * - 2, if extended properties is used - * The total amount of memory needed is the sum of the above quantities for each attribute. - */ -#define CFG_BLE_ATT_VALUE_ARRAY_SIZE (1344) - -/** - * Prepare Write List size in terms of number of packet with ATT_MTU=23 bytes - */ -#define CFG_BLE_PREPARE_WRITE_LIST_SIZE BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU) - -/** - * Number of allocated memory blocks - */ -#define CFG_BLE_MBLOCK_COUNT (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK)) - -/** - * Enable or disable the Extended Packet length feature. Valid values are 0 or 1. - */ -#define CFG_BLE_DATA_LENGTH_EXTENSION 1 - -/** - * Sleep clock accuracy in Slave mode (ppm value) - */ -#define CFG_BLE_SLAVE_SCA 500 - -/** - * Sleep clock accuracy in Master mode - * 0 : 251 ppm to 500 ppm - * 1 : 151 ppm to 250 ppm - * 2 : 101 ppm to 150 ppm - * 3 : 76 ppm to 100 ppm - * 4 : 51 ppm to 75 ppm - * 5 : 31 ppm to 50 ppm - * 6 : 21 ppm to 30 ppm - * 7 : 0 ppm to 20 ppm - */ -#define CFG_BLE_MASTER_SCA 0 - -/** - * Source for the 32 kHz slow speed clock - * 1 : internal RO - * 0 : external crystal ( no calibration ) - */ -#define CFG_BLE_LSE_SOURCE 0 - -/** - * Start up time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us) - */ -#define CFG_BLE_HSE_STARTUP_TIME 0x148 - -/** - * Maximum duration of the connection event when the device is in Slave mode in units of 625/256 us (~2.44 us) - */ -#define CFG_BLE_MAX_CONN_EVENT_LENGTH ( 0xFFFFFFFF ) - -/** - * Viterbi Mode - * 1 : enabled - * 0 : disabled - */ -#define CFG_BLE_VITERBI_MODE 1 - -/** - * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only - * 0: LL + host - * (bit 1): 1: no service change desc. - * 0: with service change desc. - * (bit 2): 1: device name Read-Only - * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 - * other bits: reserved (shall be set to 0) - */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - -#define CFG_BLE_MAX_COC_INITIATOR_NBR (32) - -#define CFG_BLE_MIN_TX_POWER (0) - -#define CFG_BLE_MAX_TX_POWER (0) -/****************************************************************************** - * Transport Layer - ******************************************************************************/ -/** - * Queue length of BLE Event - * This parameter defines the number of asynchronous events that can be stored in the HCI layer before - * being reported to the application. When a command is sent to the BLE core coprocessor, the HCI layer - * is waiting for the event with the Num_HCI_Command_Packets set to 1. The receive queue shall be large - * enough to store all asynchronous events received in between. - * When CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE is set to 27, this allow to store three 255 bytes long asynchronous events - * between the HCI command and its event. - * This parameter depends on the value given to CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE. When the queue size is to small, - * the system may hang if the queue is full with asynchronous events and the HCI layer is still waiting - * for a CC/CS event, In that case, the notification TL_BLE_HCI_ToNot() is called to indicate - * to the application a HCI command did not receive its command event within 30s (Default HCI Timeout). - */ -#define CFG_TLBLE_EVT_QUEUE_LENGTH 5 - -/** - * This parameter should be set to fit most events received by the HCI layer. It defines the buffer size of each element - * allocated in the queue of received events and can be used to optimize the amount of RAM allocated by the Memory Manager. - * It should not exceed 255 which is the maximum HCI packet payload size (a greater value is a lost of memory as it will - * never be used) - * It shall be at least 4 to receive the command status event in one frame. - * The default value is set to 27 to allow receiving an event of MTU size in a single buffer. This value maybe reduced - * further depending on the application. - * - */ -#define CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE 255 /**< Set to 255 with the memory manager and the mailbox */ - -#define TL_BLE_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE ) - -/****************************************************************************** - * UART interfaces - ******************************************************************************/ -#define CFG_DEBUG_TRACE_UART hw_uart1 -#define CFG_CLI_UART hw_lpuart1 - -/****************************************************************************** - * USB interface - ******************************************************************************/ - -/** - * Enable/Disable USB interface - */ -#define CFG_USB_INTERFACE_ENABLE 0 - -/****************************************************************************** - * Low Power - ******************************************************************************/ -/** - * When set to 1, the low power mode is enable - * When set to 0, the device stays in RUN mode - */ -#define CFG_LPM_SUPPORTED 0 - -/****************************************************************************** - * Timer Server - ******************************************************************************/ -/** - * CFG_RTC_WUCKSEL_DIVIDER: This sets the RTCCLK divider to the wakeup timer. - * The higher is the value, the better is the power consumption and the accuracy of the timerserver - * The lower is the value, the finest is the granularity - * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput - * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding - * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. - * - * CFG_RTC_SYNCH_PRESCALER: This sets the synchronous prescaler of the RTC. - * When the 1Hz calendar clock is required, it shall be sets according to other settings - * When the 1Hz calendar clock is not needed, CFG_RTC_SYNCH_PRESCALER should be set to 0x7FFF (MAX VALUE) - * - * CFG_RTCCLK_DIVIDER_CONF: - * Shall be set to either 0,2,4,8,16 - * When set to either 2,4,8,16, the 1Hhz calendar is supported - * When set to 0, the user sets its own configuration - * - * The following settings are computed with LSI as input to the RTC - */ -#define CFG_RTCCLK_DIVIDER_CONF 0 - -#if (CFG_RTCCLK_DIVIDER_CONF == 0) -/** - * Custom configuration - * It does not support 1Hz calendar - * It divides the RTC CLK by 16 - */ -#define CFG_RTCCLK_DIV (16) -#define CFG_RTC_WUCKSEL_DIVIDER (0) -#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) -#define CFG_RTC_SYNCH_PRESCALER (0x7FFF) - -#else - -#if (CFG_RTCCLK_DIVIDER_CONF == 2) -/** - * It divides the RTC CLK by 2 - */ -#define CFG_RTC_WUCKSEL_DIVIDER (3) -#endif - -#if (CFG_RTCCLK_DIVIDER_CONF == 4) -/** - * It divides the RTC CLK by 4 - */ -#define CFG_RTC_WUCKSEL_DIVIDER (2) -#endif - -#if (CFG_RTCCLK_DIVIDER_CONF == 8) -/** - * It divides the RTC CLK by 8 - */ -#define CFG_RTC_WUCKSEL_DIVIDER (1) -#endif - -#if (CFG_RTCCLK_DIVIDER_CONF == 16) -/** - * It divides the RTC CLK by 16 - */ -#define CFG_RTC_WUCKSEL_DIVIDER (0) -#endif - -#define CFG_RTCCLK_DIV CFG_RTCCLK_DIVIDER_CONF -#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) -#define CFG_RTC_SYNCH_PRESCALER (DIVR( LSE_VALUE, (CFG_RTC_ASYNCH_PRESCALER+1) ) - 1 ) - -#endif - -/** tick timer value in us */ -#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) - -typedef enum -{ - CFG_TIM_PROC_ID_ISR, - CFG_TIM_WAIT_BEFORE_SWITCH, - CFG_TIM_TEST -} CFG_TimProcID_t; - -/****************************************************************************** - * Debug - ******************************************************************************/ -/** - * When set, this resets some hw resources to set the device in the same state than the power up - * The FW resets only register that may prevent the FW to run properly - * - * This shall be set to 0 in a final product - * - */ -#define CFG_HW_RESET_BY_FW 1 - -/** - * keep debugger enabled while in any low power mode when set to 1 - * should be set to 0 in production - */ -#define CFG_DEBUGGER_SUPPORTED 1 - -/** - - * When set to 1, the traces are enabled in the BLE services - */ -#define CFG_DEBUG_BLE_TRACE 1 - -/** - * Enable or Disable traces in application - */ -#define CFG_DEBUG_APP_TRACE 1 - -#if (CFG_DEBUG_APP_TRACE != 0) -#define APP_DBG_MSG PRINT_MESG_DBG -#else -#define APP_DBG_MSG PRINT_NO_MESG -#endif - - -#if ( (CFG_DEBUG_BLE_TRACE != 0) || (CFG_DEBUG_APP_TRACE != 0) ) -#define CFG_DEBUG_TRACE 1 -#endif - -#if (CFG_DEBUG_TRACE != 0) -#undef CFG_LPM_SUPPORTED -#undef CFG_DEBUGGER_SUPPORTED -#define CFG_LPM_SUPPORTED 0 -#define CFG_DEBUGGER_SUPPORTED 1 -#endif - -/** - * When CFG_DEBUG_TRACE_FULL is set to 1, the trace are output with the API name, the file name and the line number - * When CFG_DEBUG_TRACE_LIGHT is set to 1, only the debug message is output - * - * When both are set to 0, no trace are output - * When both are set to 1, CFG_DEBUG_TRACE_FULL is selected - */ -#define CFG_DEBUG_TRACE_LIGHT 1 -#define CFG_DEBUG_TRACE_FULL 0 - -#if (( CFG_DEBUG_TRACE != 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 ) && (CFG_DEBUG_TRACE_FULL == 0)) -#undef CFG_DEBUG_TRACE_FULL -#undef CFG_DEBUG_TRACE_LIGHT -#define CFG_DEBUG_TRACE_FULL 0 -#define CFG_DEBUG_TRACE_LIGHT 1 -#endif - -#if ( CFG_DEBUG_TRACE == 0 ) -#undef CFG_DEBUG_TRACE_FULL -#undef CFG_DEBUG_TRACE_LIGHT -#define CFG_DEBUG_TRACE_FULL 0 -#define CFG_DEBUG_TRACE_LIGHT 0 -#endif - -/** - * When not set, the traces is looping on sending the trace over UART - */ -#define DBG_TRACE_USE_CIRCULAR_QUEUE 1 - -/** - * max buffer Size to queue data traces and max data trace allowed. - * Only Used if DBG_TRACE_USE_CIRCULAR_QUEUE is defined - */ -#define DBG_TRACE_MSG_QUEUE_SIZE 4096 -#define MAX_DBG_TRACE_MSG_SIZE 1024 - -/****************************************************************************** - * Scheduler - ******************************************************************************/ - -/** - * These are the lists of task id registered to the scheduler - * Each task id shall be in the range [0:31] - * This mechanism allows to implement a generic code in the API TL_BLE_HCI_StatusNot() to comply with - * the requirement that a HCI/ACI command shall never be sent if there is already one pending - */ - -/**< Add in that list all tasks that may send a ACI/HCI command */ -typedef enum -{ - /* BLE */ - CFG_TASK_ADV_CANCEL_ID, - CFG_TASK_SW1_BUTTON_PUSHED_ID, - CFG_TASK_HCI_ASYNCH_EVT_ID, - - /* Zigbee */ - CFG_TASK_NOTIFY_FROM_M0_TO_M4, - CFG_TASK_REQUEST_FROM_M0_TO_M4, - CFG_TASK_ZIGBEE_NETWORK_FORM, - CFG_TASK_BUTTON_SW1, - - /* Concurrent System */ - CFG_TASK_INIT_SWITCH_PROTOCOL, - CFG_TASK_ACTIVATE_PROTOCOL, - - CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ -} CFG_Task_Id_With_HCI_Cmd_t; - -/**< Add in that list all tasks that never send a ACI/HCI command */ -typedef enum -{ - CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ - - CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ - -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ - CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ -} CFG_Task_Id_With_NO_HCI_Cmd_t; -#define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD - -/** - * This is the list of priority required by the application - * Each Id shall be in the range 0..31 - */ -typedef enum -{ - CFG_SCH_PRIO_0, - CFG_SCH_PRIO_1, - CFG_PRIO_NBR, -} CFG_SCH_Prio_Id_t; - -#define TASK_COAP_MSG_BUTTON (1U << CFG_TASK_COAP_MSG_BUTTON) -#define TASK_MSG_FROM_M0_TO_M4 (1U << CFG_TASK_MSG_FROM_M0_TO_M4) -/** - * This is a bit mapping over 32bits listing all events id supported in the application - */ -typedef enum -{ - CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID, - CFG_IDLEEVT_SYSTEM_HCI_CMD_EVT_RSP_ID, - /* Zigbee */ - CFG_EVT_ACK_FROM_M0_EVT, - CFG_EVT_SYNCHRO_BYPASS_IDLE, - CFG_EVT_ZIGBEE_STOP, - CFG_EVT_ZIGBEE_STARTUP_ENDED, -} CFG_IdleEvt_Id_t; - -#define EVENT_ACK_FROM_M0_EVT (1U << CFG_EVT_ACK_FROM_M0_EVT) -#define EVENT_SYNCHRO_BYPASS_IDLE (1U << CFG_EVT_SYNCHRO_BYPASS_IDLE) -#define EVENT_ZIGBEE_STARTUP_ENDED (1U << CFG_EVT_ZIGBEE_STARTUP_ENDED) -#define EVENT_ZIGBEE_CONTINUE_INIT (1U << CFG_EVT_ZIGBEE_STARTUP_ENDED) -/****************************************************************************** - * Configure Log level for Application - ******************************************************************************/ -#define APPLI_CONFIG_LOG_LEVEL LOG_LEVEL_INFO -#define APPLI_PRINT_FILE_FUNC_LINE 0 - -/****************************************************************************** - * LOW POWER - ******************************************************************************/ -/** - * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager - */ -typedef enum -{ - CFG_LPM_APP, - CFG_LPM_APP_BLE - /* USER CODE BEGIN CFG_LPM_Id_t */ - - /* USER CODE END CFG_LPM_Id_t */ -} CFG_LPM_Id_t; - -/****************************************************************************** - * OTP manager - ******************************************************************************/ -#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE - -#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR - - -typedef enum -{ - BUTTON_1 = 0x1, -} button_type_t; - - -/****************************************************************************** - * NVM - ******************************************************************************/ - /** - NVM DEFINES - */ -/* CFG_EE_BANK0_SIZE is the size allocated for the EE bank0 it should be - the considered as the max Flash size for all computation and <= of the - allocated size within the scatterfile in bytes - - CFG_NVM_BASE_ADDRESS : offset to add to the base flash address to get the - beginning of the NVM (shall be withon allocation range of scatterfile) - - ST_PERSIST_MAX_ALLOC_SZ : max size of the RAM cache in bytes - either an abitrary choice or the CFG_NVM_MAX_SIZE - - ST_PERSIST_FLASH_DATA_OFFSET : offset in bytes of zigbee data - (U8[4] for lenght - 1st data[]...) - CFG_NB_OF_PAGE : Number of page of flash to use - - CFG_NVM_MAX_SIZE : Max allocable size in byte for NVM - Flash size/8 * (number of element by page in byte) - ZIGBEE_DB_START_ADDR: beginning of zigbee NVM - - CFG_EE_AUTO_CLEAN : Clean the flash automatically when needed -*/ - -#define CFG_NB_OF_PAGE (16U) -#define CFG_EE_BANK0_SIZE (CFG_NB_OF_PAGE * HW_FLASH_PAGE_SIZE) -#define CFG_NVM_BASE_ADDRESS ( 0x70000 ) -#define CFG_EE_BANK0_MAX_NB (1000U) // In U32 words -#define ST_PERSIST_MAX_ALLOC_SZ (4U*CFG_EE_BANK0_MAX_NB) // Max data in bytes -#define ST_PERSIST_FLASH_DATA_OFFSET (4U) -#define ZIGBEE_DB_START_ADDR (0U) -#define CFG_EE_AUTO_CLEAN (1U) - - -#endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_entry.h deleted file mode 100644 index 1e7fcbf1f..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/app_entry.h +++ /dev/null @@ -1,53 +0,0 @@ - -/** - ****************************************************************************** - * @file app_entry.h - * @author MCD Application Team - * @brief Interface to the application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __APP_ENTRY_H -#define __APP_ENTRY_H - -#include "stm32wbxx_hal.h" -#include "stm32_seq.h" -#include "tl.h" - -#ifdef __cplusplus -extern "C" { -#endif - - /* Includes ------------------------------------------------------------------*/ - /* Exported types ------------------------------------------------------------*/ - /* Exported constants --------------------------------------------------------*/ - /* External variables --------------------------------------------------------*/ - /* Exported macros -----------------------------------------------------------*/ - /* Exported functions ------------------------------------------------------- */ - void APPE_Init( void ); - void APP_ENTRY_RegisterCmdBuffer(TL_CmdPacket_t* p_buffer); - void APP_ENTRY_ProcessMsgM0ToM4(void); - void APP_ENTRY_Init_CFG_CLI_UART(void); - void APP_ENTRY_TL_THREAD_INIT(void); - void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ); - -#ifdef __cplusplus -} -#endif - -#endif /* __APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_conf.h deleted file mode 100644 index 3a86a4e83..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_conf.h +++ /dev/null @@ -1,249 +0,0 @@ -/** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __HW_CONF_H -#define __HW_CONF_H - -/****************************************************************************** -* Semaphores -* THIS SHALL NO BE CHANGED AS THESE SEMAPHORES ARE USED AS WELL ON THE CM0+ -*****************************************************************************/ -/** -* Index of the semaphore used by CPU2 to prevent the CPU1 to either write or erase data in flash -* The CPU1 shall not either write or erase in flash when this semaphore is taken by the CPU2 -* When the CPU1 needs to either write or erase in flash, it shall first get the semaphore and release it just -* after writing a raw (64bits data) or erasing one sector. -* On v1.4.0 and older CPU2 wireless firmware, this semaphore is unused and CPU2 is using PES bit. -* By default, CPU2 is using the PES bit to protect its timing. The CPU1 may request the CPU2 to use the semaphore -* instead of the PES bit by sending the system command SHCI_C2_SetFlashActivityControl() -*/ -#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID 7 - -/** -* Index of the semaphore used by CPU1 to prevent the CPU2 to either write or erase data in flash -* In order to protect its timing, the CPU1 may get this semaphore to prevent the CPU2 to either -* write or erase in flash (as this will stall both CPUs) -* The PES bit shall not be used as this may stall the CPU2 in some cases. -*/ -#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID 6 - -/** -* Index of the semaphore used to manage the CLK48 clock configuration -* When the USB is required, this semaphore shall be taken before configuring te CLK48 for USB -* and should be released after the application switch OFF the clock when the USB is not used anymore -* When using the RNG, it is good enough to use CFG_HW_RNG_SEMID to control CLK48. -* More details in AN5289 -*/ -#define CFG_HW_CLK48_CONFIG_SEMID 5 - -/* Index of the semaphore used to manage the entry Stop Mode procedure */ -#define CFG_HW_ENTRY_STOP_MODE_SEMID 4 - -/* Index of the semaphore used to access the RCC */ -#define CFG_HW_RCC_SEMID 3 - -/* Index of the semaphore used to access the FLASH */ -#define CFG_HW_FLASH_SEMID 2 - -/* Index of the semaphore used to access the PKA */ -#define CFG_HW_PKA_SEMID 1 - -/* Index of the semaphore used to access the RNG */ -#define CFG_HW_RNG_SEMID 0 - - -/****************************************************************************** - * HW TIMER SERVER - *****************************************************************************/ -/** - * The user may define the maximum number of virtual timers supported. - * It shall not exceed 255 - */ -#define CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER 6 - -/** - * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the - * wakeup timer. - * This setting is the preemptpriority part of the NVIC. - */ -#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO 3 - -/** - * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the - * wakeup timer. - * This setting is the subpriority part of the NVIC. It does not exist on all processors. When it is not supported - * on the CPU, the setting is ignored - */ -#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO 0 - -/** - * Define a critical section in the Timer server - * The Timer server does not support the API to be nested - * The Application shall either: - * a) Ensure this will never happen - * b) Define the critical section - * The default implementations is masking all interrupts using the PRIMASK bit - * The TimerServer driver uses critical sections to avoid context corruption. This is achieved with the macro - * TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION. When CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION is set - * to 1, all STM32 interrupts are masked with the PRIMASK bit of the CortexM CPU. It is possible to use the BASEPRI - * register of the CortexM CPU to keep allowed some interrupts with high priority. In that case, the user shall - * re-implement TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION and shall make sure that no TimerServer - * API are called when the TIMER critical section is entered - */ -#define CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION 1 - -/** - * This value shall reflect the maximum delay there could be in the application between the time the RTC interrupt - * is generated by the Hardware and the time when the RTC interrupt handler is called. This time is measured in - * number of RTCCLK ticks. - * A relaxed timing would be 10ms - * When the value is too short, the timerserver will not be able to count properly and all timeout may be random. - * When the value is too long, the device may wake up more often than the most optimal configuration. However, the - * impact on power consumption would be marginal (unless the value selected is extremely too long). It is strongly - * recommended to select a value large enough to make sure it is not too short to ensure reliability of the system - * as this will have marginal impact on low power mode - */ -#define CFG_HW_TS_RTC_HANDLER_MAX_DELAY ( 10 * (LSI_VALUE/1000) ) - -/** - * Interrupt ID in the NVIC of the RTC Wakeup interrupt handler - * It shall be type of IRQn_Type - */ -#define CFG_HW_TS_RTC_WAKEUP_HANDLER_ID RTC_WKUP_IRQn - - -/****************************************************************************** - * HW UART - *****************************************************************************/ -/* For release: set to 1 CFG_HW_LPUART1_ENABLED and CFG_HW_LPUART1_DMA_TX_SUPPORTED */ -#define CFG_HW_LPUART1_ENABLED 1 -#define CFG_HW_LPUART1_DMA_TX_SUPPORTED 1 - -#define CFG_HW_USART1_ENABLED 1 -#define CFG_HW_USART1_DMA_TX_SUPPORTED 1 - -/** - * LPUART1 - */ -#define CFG_HW_LPUART1_PREEMPTPRIORITY 0x0F -#define CFG_HW_LPUART1_SUBPRIORITY 0 - -/** < The application shall check the selected source clock is enable */ -#define CFG_HW_LPUART1_SOURCE_CLOCK RCC_LPUART1CLKSOURCE_SYSCLK - -#define CFG_HW_LPUART1_BAUDRATE 115200 -#define CFG_HW_LPUART1_WORDLENGTH UART_WORDLENGTH_8B -#define CFG_HW_LPUART1_STOPBITS UART_STOPBITS_1 -#define CFG_HW_LPUART1_PARITY UART_PARITY_NONE -#define CFG_HW_LPUART1_HWFLOWCTL UART_HWCONTROL_NONE -#define CFG_HW_LPUART1_MODE UART_MODE_TX_RX -#define CFG_HW_LPUART1_ADVFEATUREINIT UART_ADVFEATURE_NO_INIT -#define CFG_HW_LPUART1_OVERSAMPLING UART_OVERSAMPLING_8 - -#define CFG_HW_LPUART1_TX_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE -#define CFG_HW_LPUART1_TX_PORT GPIOA -#define CFG_HW_LPUART1_TX_PIN GPIO_PIN_2 -#define CFG_HW_LPUART1_TX_MODE GPIO_MODE_AF_PP -#define CFG_HW_LPUART1_TX_PULL GPIO_NOPULL -#define CFG_HW_LPUART1_TX_SPEED GPIO_SPEED_FREQ_VERY_HIGH -#define CFG_HW_LPUART1_TX_ALTERNATE GPIO_AF8_LPUART1 - -#define CFG_HW_LPUART1_RX_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE -#define CFG_HW_LPUART1_RX_PORT GPIOA -#define CFG_HW_LPUART1_RX_PIN GPIO_PIN_3 -#define CFG_HW_LPUART1_RX_MODE GPIO_MODE_AF_PP -#define CFG_HW_LPUART1_RX_PULL GPIO_NOPULL -#define CFG_HW_LPUART1_RX_SPEED GPIO_SPEED_FREQ_VERY_HIGH -#define CFG_HW_LPUART1_RX_ALTERNATE GPIO_AF8_LPUART1 - -#define CFG_HW_LPUART1_CTS_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE -#define CFG_HW_LPUART1_CTS_PORT GPIOA -#define CFG_HW_LPUART1_CTS_PIN GPIO_PIN_6 -#define CFG_HW_LPUART1_CTS_MODE GPIO_MODE_AF_PP -#define CFG_HW_LPUART1_CTS_PULL GPIO_PULLDOWN -#define CFG_HW_LPUART1_CTS_SPEED GPIO_SPEED_FREQ_VERY_HIGH -#define CFG_HW_LPUART1_CTS_ALTERNATE GPIO_AF8_LPUART1 - -#define CFG_HW_LPUART1_DMA_TX_PREEMPTPRIORITY 0x0F -#define CFG_HW_LPUART1_DMA_TX_SUBPRIORITY 0 - -#define CFG_HW_LPUART1_DMAMUX_CLK_ENABLE __HAL_RCC_DMAMUX1_CLK_ENABLE -#define CFG_HW_LPUART1_DMA_CLK_ENABLE __HAL_RCC_DMA1_CLK_ENABLE -#define CFG_HW_LPUART1_TX_DMA_REQ DMA_REQUEST_LPUART1_TX -#define CFG_HW_LPUART1_TX_DMA_CHANNEL DMA1_Channel4 -#define CFG_HW_LPUART1_TX_DMA_IRQn DMA1_Channel4_IRQn -#define CFG_HW_LPUART1_DMA_TX_IRQHandler DMA1_Channel4_IRQHandler - -/** - * UART1 - */ -#define CFG_HW_USART1_PREEMPTPRIORITY 0x0F -#define CFG_HW_USART1_SUBPRIORITY 0 - -/** < The application shall check the selected source clock is enable */ -#define CFG_HW_USART1_SOURCE_CLOCK RCC_USART1CLKSOURCE_SYSCLK - -#define CFG_HW_USART1_BAUDRATE 115200 -#define CFG_HW_USART1_WORDLENGTH UART_WORDLENGTH_8B -#define CFG_HW_USART1_STOPBITS UART_STOPBITS_1 -#define CFG_HW_USART1_PARITY UART_PARITY_NONE -#define CFG_HW_USART1_HWFLOWCTL UART_HWCONTROL_NONE -#define CFG_HW_USART1_MODE UART_MODE_TX_RX -#define CFG_HW_USART1_ADVFEATUREINIT UART_ADVFEATURE_NO_INIT -#define CFG_HW_USART1_OVERSAMPLING UART_OVERSAMPLING_8 - -#define CFG_HW_USART1_TX_PORT_CLK_ENABLE __HAL_RCC_GPIOB_CLK_ENABLE -#define CFG_HW_USART1_TX_PORT GPIOB -#define CFG_HW_USART1_TX_PIN GPIO_PIN_6 -#define CFG_HW_USART1_TX_MODE GPIO_MODE_AF_PP -#define CFG_HW_USART1_TX_PULL GPIO_NOPULL -#define CFG_HW_USART1_TX_SPEED GPIO_SPEED_FREQ_VERY_HIGH -#define CFG_HW_USART1_TX_ALTERNATE GPIO_AF7_USART1 - -#define CFG_HW_USART1_RX_PORT_CLK_ENABLE __HAL_RCC_GPIOB_CLK_ENABLE -#define CFG_HW_USART1_RX_PORT GPIOB -#define CFG_HW_USART1_RX_PIN GPIO_PIN_7 -#define CFG_HW_USART1_RX_MODE GPIO_MODE_AF_PP -#define CFG_HW_USART1_RX_PULL GPIO_NOPULL -#define CFG_HW_USART1_RX_SPEED GPIO_SPEED_FREQ_VERY_HIGH -#define CFG_HW_USART1_RX_ALTERNATE GPIO_AF7_USART1 - -#define CFG_HW_USART1_CTS_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE -#define CFG_HW_USART1_CTS_PORT GPIOA -#define CFG_HW_USART1_CTS_PIN GPIO_PIN_11 -#define CFG_HW_USART1_CTS_MODE GPIO_MODE_AF_PP -#define CFG_HW_USART1_CTS_PULL GPIO_PULLDOWN -#define CFG_HW_USART1_CTS_SPEED GPIO_SPEED_FREQ_VERY_HIGH -#define CFG_HW_USART1_CTS_ALTERNATE GPIO_AF7_USART1 - -#define CFG_HW_USART1_DMA_TX_PREEMPTPRIORITY 0x0F -#define CFG_HW_USART1_DMA_TX_SUBPRIORITY 0 - -#define CFG_HW_USART1_DMAMUX_CLK_ENABLE __HAL_RCC_DMAMUX1_CLK_ENABLE -#define CFG_HW_USART1_DMA_CLK_ENABLE __HAL_RCC_DMA2_CLK_ENABLE -#define CFG_HW_USART1_TX_DMA_REQ DMA_REQUEST_USART1_TX -#define CFG_HW_USART1_TX_DMA_CHANNEL DMA2_Channel4 -#define CFG_HW_USART1_TX_DMA_IRQn DMA2_Channel4_IRQn -#define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler - -#endif /*__HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_if.h deleted file mode 100644 index 271a222a9..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/hw_if.h +++ /dev/null @@ -1,250 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * @file hw_if.h - * @author MCD Application Team - * @brief Hardware Interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef HW_IF_H -#define HW_IF_H - -#ifdef __cplusplus -extern "C" { -#endif - - /* Includes ------------------------------------------------------------------*/ -#include "stm32wbxx.h" -#include "stm32wbxx_ll_exti.h" -#include "stm32wbxx_ll_system.h" -#include "stm32wbxx_ll_rcc.h" -#include "stm32wbxx_ll_ipcc.h" -#include "stm32wbxx_ll_bus.h" -#include "stm32wbxx_ll_pwr.h" -#include "stm32wbxx_ll_cortex.h" -#include "stm32wbxx_ll_utils.h" -#include "stm32wbxx_ll_hsem.h" -#include "stm32wbxx_ll_gpio.h" -#include "stm32wbxx_ll_rtc.h" - -#ifdef USE_STM32WBXX_USB_DONGLE -#include "stm32wbxx_usb_dongle.h" -#endif -#ifdef USE_STM32WBXX_NUCLEO -#include "stm32wbxx_nucleo.h" -#endif -#ifdef USE_X_NUCLEO_EPD -#include "x_nucleo_epd.h" -#endif - -/* Private includes ----------------------------------------------------------*/ -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - - /****************************************************************************** - * HW UART - ******************************************************************************/ - typedef enum - { - hw_uart1, - hw_uart2, - hw_lpuart1, - } hw_uart_id_t; - - typedef enum - { - hw_uart_ok, - hw_uart_error, - hw_uart_busy, - hw_uart_to, - } hw_status_t; - - void HW_UART_Init(hw_uart_id_t hw_uart_id); - void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); - void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); - hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout); - hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*Callback)(void)); - void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); - void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); - - /****************************************************************************** - * HW TimerServer - ******************************************************************************/ - /* Exported types ------------------------------------------------------------*/ - /** - * This setting is used when standby mode is supported. - * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does - * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured - * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. - */ - typedef enum - { - hw_ts_InitMode_Full, - hw_ts_InitMode_Limited, - } HW_TS_InitMode_t; - - /** - * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, - * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() - * - * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. - */ - typedef enum - { - hw_ts_SingleShot, - hw_ts_Repeated - } HW_TS_Mode_t; - - /** - * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed - * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a - * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased - */ - typedef enum - { - hw_ts_Successful, - hw_ts_Failed, - }HW_TS_ReturnStatus_t; - - typedef void (*HW_TS_pTimerCb_t)(void); - - /** - * @brief Initialize the timer server - * This API shall be called by the application before any timer is requested to the timer server. It - * configures the RTC module to be connected to the LSI input clock. - * - * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the - * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested - * @param hrtc: RTC Handle - * @retval None - */ - void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); - - /** - * @brief Interface to create a virtual timer - * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it - * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the - * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler - * which module is concerned. In return, the user gets a timer ID to handle it. - * - * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow - * identification of the requester - * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) - * @param TimerMode: Mode of the virtual timer (Single shot or repeated) - * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not - */ - HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); - - /** - * @brief Stop a virtual timer - * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. - * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. - * Nothing is done when it is called to stop a timer which has been already stopped - * - * @param TimerID: Id of the timer to stop - * @retval None - */ - void HW_TS_Stop(uint8_t TimerID); - - /** - * @brief Start a virtual timer - * This API shall be used to start a timer. The timeout value is specified and may be different each time. - * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may - * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always - * stay in the running state. When the timer expires, it will be restarted with the same timeout value. - * This API shall not be called on a running timer. - * - * @param TimerID: The ID Id of the timer to start - * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) - * @retval None - */ - void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); - - /** - * @brief Delete a virtual timer from the list - * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from - * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the - * creation of a new timer if required and may get a different timer id - * - * @param TimerID: The ID of the timer to remove from the list - * @retval None - */ - void HW_TS_Delete(uint8_t TimerID); - - /** - * @brief Schedule the timer list on the timer interrupt handler - * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes - * care of clearing all status flag required in the RTC and EXTI peripherals - * - * @param None - * @retval None - */ - void HW_TS_RTC_Wakeup_Handler(void); - - /** - * @brief Return the number of ticks to count before the interrupt - * This API returns the number of ticks left to be counted before an interrupt is generated by the - * Timer Server. This API may be used by the application for power management optimization. When the system - * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running - * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the - * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time - * versus time in low power mode is implementation specific - * When the timer is disabled (No timer in the list), it returns 0xFFFF - * - * @param None - * @retval The number of ticks left to count - */ - uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); - - /** - * @brief Notify the application that a registered timer has expired - * This API shall be implemented by the user application. - * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt - * context. The application may implement an Operating System to change the context priority where the timer - * callback may be handled. This API provides the module ID to identify which module is concerned and to allow - * sending the information to the correct task - * - * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created - * @param TimerID: The TimerID of the expired timer - * @param pTimerCallBack: The Callback associated with the timer when it has been created - * @retval None - */ - void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); - - /** - * @brief Notify the application that the wakeupcounter has been updated - * This API should be implemented by the user application - * This API notifies the application that the counter has been updated. This is expected to be used along - * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the - * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification - * provides a way to the application to solve that race condition to reevaluate the counter value before - * entering low power mode - * - * @param None - * @retval None - */ - void HW_TS_RTC_CountUpdated_AppNot(void); - -#ifdef __cplusplus -} -#endif - -#endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/main.h deleted file mode 100644 index bbe71a4da..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/main.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - ****************************************************************************** - * @file main.h - * @author MCD Application Team - * @brief Header for main.c module - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __MAIN_H -#define __MAIN_H - -/* Includes ------------------------------------------------------------------*/ -#include "stm32wbxx_hal.h" - -/* Exported types ------------------------------------------------------------*/ -/* Exported constants --------------------------------------------------------*/ -/* Exported variables --------------------------------------------------------*/ -extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ - -/* Exported macro ------------------------------------------------------------*/ -/* Exported functions ------------------------------------------------------- */ - -#endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32_lpm_if.h deleted file mode 100644 index d8e67947f..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32_lpm_if.h +++ /dev/null @@ -1,81 +0,0 @@ -/* USER CODE BEGIN Header */ -/** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ -/* USER CODE END Header */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __STM32_LPM_IF_H -#define __STM32_LPM_IF_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ - -/** - * @brief Enters Low Power Off Mode - * @param none - * @retval none - */ -void PWR_EnterOffMode( void ); -/** - * @brief Exits Low Power Off Mode - * @param none - * @retval none - */ -void PWR_ExitOffMode( void ); - -/** - * @brief Enters Low Power Stop Mode - * @note ARM exists the function when waking up - * @param none - * @retval none - */ -void PWR_EnterStopMode( void ); -/** - * @brief Exits Low Power Stop Mode - * @note Enable the pll at 32MHz - * @param none - * @retval none - */ -void PWR_ExitStopMode( void ); - -/** - * @brief Enters Low Power Sleep Mode - * @note ARM exits the function when waking up - * @param none - * @retval none - */ -void PWR_EnterSleepMode( void ); - -/** - * @brief Exits Low Power Sleep Mode - * @note ARM exits the function when waking up - * @param none - * @retval none - */ -void PWR_ExitSleepMode( void ); - -#ifdef __cplusplus -} -#endif - -#endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_hal_conf.h deleted file mode 100644 index 3b0f57321..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_hal_conf.h +++ /dev/null @@ -1,353 +0,0 @@ -/** - ****************************************************************************** - * @file stm32wbxx_hal_conf.h - * @author MCD Application Team - * @brief HAL configuration file. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __STM32WBxx_HAL_CONF_H -#define __STM32WBxx_HAL_CONF_H - -#ifdef __cplusplus - extern "C" { -#endif - -/* Exported types ------------------------------------------------------------*/ -/* Exported constants --------------------------------------------------------*/ - -/* ########################## Module Selection ############################## */ -/** - * @brief This is the list of modules to be used in the HAL driver - */ -#define HAL_MODULE_ENABLED -/*#define HAL_ADC_MODULE_ENABLED */ -/*#define HAL_CRYP_MODULE_ENABLED */ -/*#define HAL_COMP_MODULE_ENABLED */ -/*#define HAL_CRC_MODULE_ENABLED */ -#define HAL_HSEM_MODULE_ENABLED -/*#define HAL_I2C_MODULE_ENABLED */ -#define HAL_IPCC_MODULE_ENABLED -/*#define HAL_IRDA_MODULE_ENABLED */ -/*#define HAL_IWDG_MODULE_ENABLED */ -/*#define HAL_LCD_MODULE_ENABLED */ -/*#define HAL_LPTIM_MODULE_ENABLED */ -/*#define HAL_PCD_MODULE_ENABLED */ -/*#define HAL_PKA_MODULE_ENABLED */ -/*#define HAL_QSPI_MODULE_ENABLED */ -/*#define HAL_RNG_MODULE_ENABLED */ -#define HAL_RTC_MODULE_ENABLED -/*#define HAL_SAI_MODULE_ENABLED */ -/*#define HAL_SMBUS_MODULE_ENABLED */ -/*#define HAL_SMARTCARD_MODULE_ENABLED */ -/*#define HAL_SPI_MODULE_ENABLED */ -/*#define HAL_TIM_MODULE_ENABLED */ -/*#define HAL_TSC_MODULE_ENABLED */ -#define HAL_UART_MODULE_ENABLED -/*#define HAL_USART_MODULE_ENABLED */ -/*#define HAL_WWDG_MODULE_ENABLED */ -#define HAL_EXTI_MODULE_ENABLED -#define HAL_CORTEX_MODULE_ENABLED -#define HAL_DMA_MODULE_ENABLED -#define HAL_FLASH_MODULE_ENABLED -#define HAL_GPIO_MODULE_ENABLED -#define HAL_PWR_MODULE_ENABLED -#define HAL_RCC_MODULE_ENABLED - -#define USE_HAL_ADC_REGISTER_CALLBACKS 0u -#define USE_HAL_COMP_REGISTER_CALLBACKS 0u -#define USE_HAL_CRYP_REGISTER_CALLBACKS 0u -#define USE_HAL_I2C_REGISTER_CALLBACKS 0u -#define USE_HAL_IRDA_REGISTER_CALLBACKS 0u -#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0u -#define USE_HAL_PCD_REGISTER_CALLBACKS 0u -#define USE_HAL_PKA_REGISTER_CALLBACKS 0u -#define USE_HAL_QSPI_REGISTER_CALLBACKS 0u -#define USE_HAL_RNG_REGISTER_CALLBACKS 0u -#define USE_HAL_RTC_REGISTER_CALLBACKS 0u -#define USE_HAL_SAI_REGISTER_CALLBACKS 0u -#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0u -#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0u -#define USE_HAL_SPI_REGISTER_CALLBACKS 0u -#define USE_HAL_TIM_REGISTER_CALLBACKS 0u -#define USE_HAL_TSC_REGISTER_CALLBACKS 0u -#define USE_HAL_UART_REGISTER_CALLBACKS 0u -#define USE_HAL_USART_REGISTER_CALLBACKS 0u -#define USE_HAL_WWDG_REGISTER_CALLBACKS 0u - -/* ########################## Oscillator Values adaptation ####################*/ -/** - * @brief Adjust the value of External High Speed oscillator (HSE) used in your application. - * This value is used by the RCC HAL module to compute the system frequency - * (when HSE is used as system clock source, directly or through the PLL). - */ -#if !defined (HSE_VALUE) -#define HSE_VALUE 32000000U /*!< Value of the External oscillator in Hz */ -#endif /* HSE_VALUE */ - -#if !defined (HSE_STARTUP_TIMEOUT) - #define HSE_STARTUP_TIMEOUT ((uint32_t)100) /*!< Time out for HSE start up, in ms */ -#endif /* HSE_STARTUP_TIMEOUT */ - -/** - * @brief Internal Multiple Speed oscillator (MSI) default value. - * This value is the default MSI range value after Reset. - */ -#if !defined (MSI_VALUE) - #define MSI_VALUE ((uint32_t)4000000) /*!< Value of the Internal oscillator in Hz*/ -#endif /* MSI_VALUE */ - -/** - * @brief Internal High Speed oscillator (HSI) value. - * This value is used by the RCC HAL module to compute the system frequency - * (when HSI is used as system clock source, directly or through the PLL). - */ -#if !defined (HSI_VALUE) -#define HSI_VALUE 16000000U /*!< Value of the Internal oscillator in Hz*/ -#endif /* HSI_VALUE */ - -/** - * @brief Internal Low Speed oscillator (LSI1) value. - */ -#if !defined (LSI1_VALUE) - #define LSI1_VALUE ((uint32_t)32000) /*!< LSI1 Typical Value in Hz*/ -#endif /* LSI1_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz - The real value may vary depending on the variations - in voltage and temperature.*/ -/** - * @brief Internal Low Speed oscillator (LSI2) value. - */ -#if !defined (LSI2_VALUE) - #define LSI2_VALUE ((uint32_t)32000) /*!< LSI2 Typical Value in Hz*/ -#endif /* LSI2_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz - The real value may vary depending on the variations - in voltage and temperature.*/ - -/** - * @brief External Low Speed oscillator (LSE) value. - * This value is used by the UART, RTC HAL module to compute the system frequency - */ -#if !defined (LSE_VALUE) -#define LSE_VALUE 32768U /*!< Value of the External oscillator in Hz*/ -#endif /* LSE_VALUE */ - -/** - * @brief Internal Multiple Speed oscillator (HSI48) default value. - * This value is the default HSI48 range value after Reset. - */ -#if !defined (HSI48_VALUE) - #define HSI48_VALUE ((uint32_t)48000000) /*!< Value of the Internal oscillator in Hz*/ -#endif /* HSI48_VALUE */ - -#if !defined (LSE_STARTUP_TIMEOUT) -#define LSE_STARTUP_TIMEOUT 5000U /*!< Time out for LSE start up, in ms */ -#endif /* HSE_STARTUP_TIMEOUT */ - -/** - * @brief External clock source for SAI1 peripheral - * This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source - * frequency. - */ -#if !defined (EXTERNAL_SAI1_CLOCK_VALUE) - #define EXTERNAL_SAI1_CLOCK_VALUE ((uint32_t)2097000) /*!< Value of the SAI1 External clock source in Hz*/ -#endif /* EXTERNAL_SAI1_CLOCK_VALUE */ - -/* Tip: To avoid modifying this file each time you need to use different HSE, - === you can define the HSE value in your toolchain compiler preprocessor. */ - -/* ########################### System Configuration ######################### */ -/** - * @brief This is the HAL system configuration section - */ - -#define VDD_VALUE 3300U /*!< Value of VDD in mv */ -#define TICK_INT_PRIORITY 0U /*!< tick interrupt priority */ -#define USE_RTOS 0U -#define PREFETCH_ENABLE 1U -#define INSTRUCTION_CACHE_ENABLE 1U -#define DATA_CACHE_ENABLE 1U - -/* ########################## Assert Selection ############################## */ -/** - * @brief Uncomment the line below to expanse the "assert_param" macro in the - * HAL drivers code - */ -/* #define USE_FULL_ASSERT 1U */ - -/* ################## SPI peripheral configuration ########################## */ - -/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver - * Activated: CRC code is present inside driver - * Deactivated: CRC code cleaned from driver - */ - -#define USE_SPI_CRC 0U - -/* Includes ------------------------------------------------------------------*/ -/** - * @brief Include module's header file - */ -#ifdef HAL_DMA_MODULE_ENABLED - #include "stm32wbxx_hal_dma.h" -#endif /* HAL_DMA_MODULE_ENABLED */ - -#ifdef HAL_ADC_MODULE_ENABLED - #include "stm32wbxx_hal_adc.h" -#endif /* HAL_ADC_MODULE_ENABLED */ - -#ifdef HAL_COMP_MODULE_ENABLED - #include "stm32wbxx_hal_comp.h" -#endif /* HAL_COMP_MODULE_ENABLED */ - -#ifdef HAL_CORTEX_MODULE_ENABLED - #include "stm32wbxx_hal_cortex.h" -#endif /* HAL_CORTEX_MODULE_ENABLED */ - -#ifdef HAL_CRC_MODULE_ENABLED - #include "stm32wbxx_hal_crc.h" -#endif /* HAL_CRC_MODULE_ENABLED */ - -#ifdef HAL_CRYP_MODULE_ENABLED - #include "stm32wbxx_hal_cryp.h" -#endif /* HAL_CRYP_MODULE_ENABLED */ - -#ifdef HAL_EXTI_MODULE_ENABLED - #include "stm32wbxx_hal_exti.h" -#endif /* HAL_EXTI_MODULE_ENABLED */ - -#ifdef HAL_FLASH_MODULE_ENABLED - #include "stm32wbxx_hal_flash.h" -#endif /* HAL_FLASH_MODULE_ENABLED */ - -#ifdef HAL_GPIO_MODULE_ENABLED - #include "stm32wbxx_hal_gpio.h" -#endif /* HAL_GPIO_MODULE_ENABLED */ - -#ifdef HAL_HSEM_MODULE_ENABLED - #include "stm32wbxx_hal_hsem.h" -#endif /* HAL_HSEM_MODULE_ENABLED */ - -#ifdef HAL_I2C_MODULE_ENABLED - #include "stm32wbxx_hal_i2c.h" -#endif /* HAL_I2C_MODULE_ENABLED */ - -#ifdef HAL_IPCC_MODULE_ENABLED - #include "stm32wbxx_hal_ipcc.h" -#endif /* HAL_IPCC_MODULE_ENABLED */ - -#ifdef HAL_IRDA_MODULE_ENABLED - #include "stm32wbxx_hal_irda.h" -#endif /* HAL_IRDA_MODULE_ENABLED */ - -#ifdef HAL_IWDG_MODULE_ENABLED - #include "stm32wbxx_hal_iwdg.h" -#endif /* HAL_IWDG_MODULE_ENABLED */ - -#ifdef HAL_LCD_MODULE_ENABLED - #include "stm32wbxx_hal_lcd.h" -#endif /* HAL_LCD_MODULE_ENABLED */ - -#ifdef HAL_LPTIM_MODULE_ENABLED - #include "stm32wbxx_hal_lptim.h" -#endif /* HAL_LPTIM_MODULE_ENABLED */ - -#ifdef HAL_PCD_MODULE_ENABLED - #include "stm32wbxx_hal_pcd.h" -#endif /* HAL_PCD_MODULE_ENABLED */ - -#ifdef HAL_PKA_MODULE_ENABLED - #include "stm32wbxx_hal_pka.h" -#endif /* HAL_PKA_MODULE_ENABLED */ - -#ifdef HAL_PWR_MODULE_ENABLED - #include "stm32wbxx_hal_pwr.h" -#endif /* HAL_PWR_MODULE_ENABLED */ - -#ifdef HAL_QSPI_MODULE_ENABLED - #include "stm32wbxx_hal_qspi.h" -#endif /* HAL_QSPI_MODULE_ENABLED */ - -#ifdef HAL_RCC_MODULE_ENABLED - #include "stm32wbxx_hal_rcc.h" -#endif /* HAL_RCC_MODULE_ENABLED */ - -#ifdef HAL_RNG_MODULE_ENABLED - #include "stm32wbxx_hal_rng.h" -#endif /* HAL_RNG_MODULE_ENABLED */ - -#ifdef HAL_RTC_MODULE_ENABLED - #include "stm32wbxx_hal_rtc.h" -#endif /* HAL_RTC_MODULE_ENABLED */ - -#ifdef HAL_SAI_MODULE_ENABLED - #include "stm32wbxx_hal_sai.h" -#endif /* HAL_SAI_MODULE_ENABLED */ - -#ifdef HAL_SMARTCARD_MODULE_ENABLED - #include "stm32wbxx_hal_smartcard.h" -#endif /* HAL_SMARTCARD_MODULE_ENABLED */ - -#ifdef HAL_SMBUS_MODULE_ENABLED - #include "stm32wbxx_hal_smbus.h" -#endif /* HAL_SMBUS_MODULE_ENABLED */ - -#ifdef HAL_SPI_MODULE_ENABLED - #include "stm32wbxx_hal_spi.h" -#endif /* HAL_SPI_MODULE_ENABLED */ - -#ifdef HAL_TIM_MODULE_ENABLED - #include "stm32wbxx_hal_tim.h" -#endif /* HAL_TIM_MODULE_ENABLED */ - -#ifdef HAL_TSC_MODULE_ENABLED - #include "stm32wbxx_hal_tsc.h" -#endif /* HAL_TSC_MODULE_ENABLED */ - -#ifdef HAL_UART_MODULE_ENABLED - #include "stm32wbxx_hal_uart.h" -#endif /* HAL_UART_MODULE_ENABLED */ - -#ifdef HAL_USART_MODULE_ENABLED - #include "stm32wbxx_hal_usart.h" -#endif /* HAL_USART_MODULE_ENABLED */ - -#ifdef HAL_WWDG_MODULE_ENABLED - #include "stm32wbxx_hal_wwdg.h" -#endif /* HAL_WWDG_MODULE_ENABLED */ - -/* Exported macro ------------------------------------------------------------*/ -#ifdef USE_FULL_ASSERT -/** - * @brief The assert_param macro is used for function's parameters check. - * @param expr If expr is false, it calls assert_failed function - * which reports the name of the source file and the source - * line number of the call that failed. - * If expr is true, it returns no value. - * @retval None - */ - #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) -/* Exported functions ------------------------------------------------------- */ - void assert_failed(uint8_t* file, uint32_t line); -#else - #define assert_param(expr) ((void)0U) -#endif /* USE_FULL_ASSERT */ - -#ifdef __cplusplus -} -#endif - -#endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_it.h deleted file mode 100644 index 46179c211..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm32wbxx_it.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - ****************************************************************************** - * @file stm32wbxx_it.h - * @author MCD Application Team - * @brief This file contains the headers of the interrupt handlers. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __STM32WBxx_IT_H -#define __STM32WBxx_IT_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ -/* Exported types ------------------------------------------------------------*/ -/* Exported constants --------------------------------------------------------*/ -/* Exported macro ------------------------------------------------------------*/ -/* Exported functions ------------------------------------------------------- */ - -void NMI_Handler(void); -void HardFault_Handler(void); -void MemManage_Handler(void); -void BusFault_Handler(void); -void UsageFault_Handler(void); -void SVC_Handler(void); -void DebugMon_Handler(void); -void PendSV_Handler(void); -void SysTick_Handler(void); -void IPCC_C1_RX_IRQHandler(void); -void IPCC_C1_TX_IRQHandler(void); -void EXTI4_IRQHandler(void); -void EXTI0_IRQHandler(void); -void EXTI1_IRQHandler(void); -void USART1_IRQHandler(void); -void DMA2_Channel4_IRQHandler(void); -void CFG_HW_USART1_DMA_TX_IRQHandler( void ); -void RTC_WKUP_IRQHandler(void); -void LPUART1_IRQHandler(void); -void DMA1_Channel4_IRQHandler(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm_logging.h deleted file mode 100644 index 9f95c06e6..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/stm_logging.h +++ /dev/null @@ -1,68 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * File Name : stm_logging.h - * Description : Application header file for logging - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* USER CODE END Header */ - - -#ifndef STM_LOGGING_H_ -#define STM_LOGGING_H_ - -#define LOG_LEVEL_NONE 0 /* None */ -#define LOG_LEVEL_CRIT 1U /* Critical */ -#define LOG_LEVEL_WARN 2U /* Warning */ -#define LOG_LEVEL_INFO 3U /* Info */ -#define LOG_LEVEL_DEBG 4U /* Debug */ - - -#define APP_DBG_FULL(level, region, ...) \ - { \ - if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ - { \ - printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ - } \ - logApplication(level, region, __VA_ARGS__); \ - } - -#define APP_DBG(...) \ - { \ - if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ - { \ - printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ - } \ - logApplication(LOG_LEVEL_NONE, APPLI_LOG_REGION_GENERAL, __VA_ARGS__); \ - } - -/** - * This enumeration represents log regions. - * - */ -typedef enum -{ - APPLI_LOG_REGION_GENERAL = 1U, /* General */ - APPLI_LOG_REGION_OPENTHREAD_API = 2U, /* OpenThread API */ - APPLI_LOG_REGION_OT_API_LINK = 3U, /* OpenThread Link API */ - APPLI_LOG_REGION_OT_API_INSTANCE = 4U, /* OpenThread Instance API */ - APPLI_LOG_REGION_OT_API_MESSAGE = 5U /* OpenThread Message API */ -} appliLogRegion_t; - -typedef uint8_t appliLogLevel_t; - -void logApplication(appliLogLevel_t aLogLevel, appliLogRegion_t aLogRegion, const char *aFormat, ...); - -#endif /* STM_LOGGING_H_ */ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/utilities_conf.h deleted file mode 100644 index 4dde3509a..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Inc/utilities_conf.h +++ /dev/null @@ -1,68 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef UTILITIES_CONF_H -#define UTILITIES_CONF_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "cmsis_compiler.h" -#include "string.h" - -/****************************************************************************** - * common - ******************************************************************************/ -#define UTILS_ENTER_CRITICAL_SECTION( ) uint32_t primask_bit = __get_PRIMASK( );\ - __disable_irq( ) - -#define UTILS_EXIT_CRITICAL_SECTION( ) __set_PRIMASK( primask_bit ) - -#define UTILS_MEMSET8( dest, value, size ) memset( dest, value, size); - -/****************************************************************************** - * tiny low power manager - * (any macro that does not need to be modified can be removed) - ******************************************************************************/ -#define UTIL_LPM_INIT_CRITICAL_SECTION( ) -#define UTIL_LPM_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) -#define UTIL_LPM_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) - -/****************************************************************************** - * sequencer - * (any macro that does not need to be modified can be removed) - ******************************************************************************/ -#define UTIL_SEQ_INIT_CRITICAL_SECTION( ) -#define UTIL_SEQ_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) -#define UTIL_SEQ_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) -#define UTIL_SEQ_CONF_TASK_NBR (32) -#define UTIL_SEQ_CONF_PRIO_NBR (2) -#define UTIL_SEQ_MEMSET8( dest, value, size ) UTILS_MEMSET8( dest, value, size ) - -#ifdef __cplusplus -} -#endif - -#endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/app_entry.c deleted file mode 100644 index 7f5b48992..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/app_entry.c +++ /dev/null @@ -1,503 +0,0 @@ -/** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "main.h" -#include "app_entry.h" -#include "app_zigbee.h" -#include "app_conf.h" -#include "hw_conf.h" -#include "stm32_seq.h" -#include "stm_logging.h" -#include "dbg_trace.h" -#include "shci_tl.h" -#include "stm32_lpm.h" -#include "app_ble.h" -#include "shci.h" - - -/* External definition */ -extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ - -/* Private defines -----------------------------------------------------------*/ -/* POOL_SIZE */ -#define POOL_SIZE (CFG_TLBLE_EVT_QUEUE_LENGTH*4*DIVC(( sizeof(TL_PacketHeader_t) + TL_BLE_EVENT_FRAME_SIZE ), 4)) -/* Switch timeout */ -#define SWITCH_TMO 3*1000*1000/CFG_TS_TICK_VAL - -PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE]; -PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer; -PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255]; -PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t BleSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255]; - -static SHCI_C2_CONCURRENT_Mode_Param_t ConcurrentMode = BLE_ENABLE; -static uint8_t TS_ID1; -static int NbTotalSwitch = 0; -static int FlagSwitchingOnGoing = 0; - -/* Global functions prototypes -----------------------------------------------*/ -size_t DbgTraceWrite(int handle, const unsigned char * buf, size_t bufSize); -SHCI_C2_CONCURRENT_Mode_Param_t APP_GetCurrentProtocolMode(void); - -/* Private function prototypes -----------------------------------------------*/ -static void SystemPower_Config( void ); -static void Init_Debug( void ); -static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); -static void APPE_SysUserEvtRx( void * pPayload ); - -static void appe_Tl_Init( void ); -static void Led_Init( void ); -static void Button_Init( void ); - -static void Process_InitiateSwitchProtocol(void); -static void Process_ActivateNewProtocol(void); -static void ScheduleProcessSwitchProtocol(void); - -/* Functions Definition ------------------------------------------------------*/ -void APPE_Init( void ) -{ - SystemPower_Config(); /**< Configure the system Power Mode */ - - HW_TS_Init(hw_ts_InitMode_Full, &hrtc); /**< Initialize the TimerServer */ - - Init_Debug(); - - APP_DBG("ConcurrentMode = %d", ConcurrentMode); - - /* Task common to Zigbee and BLE */ - UTIL_SEQ_RegTask( 1U < ZIGBEE */ - if (FlagSwitchingOnGoing == 1) - return; - FlagSwitchingOnGoing = 1; - - if(ConcurrentMode == ZIGBEE_ENABLE) - { - APP_DBG("STOP ZIGBEE"); - APP_ZIGBEE_Stop(); - - /* start a timer */ - HW_TS_Create(CFG_TIM_WAIT_BEFORE_SWITCH, &TS_ID1, hw_ts_SingleShot, ScheduleProcessSwitchProtocol); - - HW_TS_Start(TS_ID1, SWITCH_TMO); - APP_DBG("SWITCH PROTOCOL TO BLE"); - } - else - { - APP_DBG("STOP BLE"); - APP_BLE_Stop(); - APP_DBG("SWITCH PROTOCOL TO Zigbee"); - ScheduleProcessSwitchProtocol(); - } -} - -/** - * @brief Schedule the process used to switch protocol - * @param None - * @retval None - */ -static void ScheduleProcessSwitchProtocol(void) -{ - UTIL_SEQ_SetTask(1 << CFG_TASK_ACTIVATE_PROTOCOL,CFG_SCH_PRIO_0); -} - -/** - * @brief Process the activation of the new protocol - * @param None - * @retval None - */ -static void Process_ActivateNewProtocol(void) -{ - APP_DBG("Process_ActivateNewProtocol"); - - /* Toggle Mode flag */ - if(ConcurrentMode == ZIGBEE_ENABLE){ - ConcurrentMode = BLE_ENABLE; - }else{ - ConcurrentMode = ZIGBEE_ENABLE; - } - - /* Once Switch has been acknowledged from M0, starts appropriate Protocol Init */ - if(ConcurrentMode == ZIGBEE_ENABLE) - { - APP_DBG("INIT ZIGBEE"); - APP_ZIGBEE_Init(); - } - else - { - APP_DBG("INIT BLE"); - APP_BLE_Init( ); - } - FlagSwitchingOnGoing = 0; -} - - -/************************************************************* - * - * LOCAL FUNCTIONS - * - *************************************************************/ -static void Init_Debug( void ) -{ -#if (CFG_DEBUGGER_SUPPORTED == 1) - /** - * Keep debugger enabled while in any low power mode - */ - HAL_DBGMCU_EnableDBGSleepMode(); - - /***************** ENABLE DEBUGGER *************************************/ - LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); - LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); - -#else - - GPIO_InitTypeDef gpio_config = {0}; - - gpio_config.Pull = GPIO_NOPULL; - gpio_config.Mode = GPIO_MODE_ANALOG; - - gpio_config.Pin = GPIO_PIN_15 | GPIO_PIN_14 | GPIO_PIN_13; - __HAL_RCC_GPIOA_CLK_ENABLE(); - HAL_GPIO_Init(GPIOA, &gpio_config); - __HAL_RCC_GPIOA_CLK_DISABLE(); - - gpio_config.Pin = GPIO_PIN_4 | GPIO_PIN_3; - __HAL_RCC_GPIOB_CLK_ENABLE(); - HAL_GPIO_Init(GPIOB, &gpio_config); - __HAL_RCC_GPIOB_CLK_DISABLE(); - - HAL_DBGMCU_DisableDBGSleepMode(); - HAL_DBGMCU_DisableDBGStopMode(); - HAL_DBGMCU_DisableDBGStandbyMode(); - -#endif /* (CFG_DEBUGGER_SUPPORTED == 1) */ - -#if(CFG_DEBUG_TRACE != 0) - DbgTraceInit(); -#endif - - return; -} - -/** - * @brief Configure the system for power optimization - * - * @note This API configures the system to be ready for low power mode - * - * @param None - * @retval None - */ -static void SystemPower_Config(void) -{ - - /** - * Select HSI as system clock source after Wake Up from Stop mode - */ - LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); - - /* Initialize low power manager */ - UTIL_LPM_Init(); - /* Initialize the CPU2 reset value before starting CPU2 with C2BOOT */ - LL_C2_PWR_SetPowerMode(LL_PWR_MODE_SHUTDOWN); - -#if (CFG_USB_INTERFACE_ENABLE != 0) - /** - * Enable USB power - */ - HAL_PWREx_EnableVddUSB(); -#endif - - return; -} - -static void appe_Tl_Init( void ) -{ - TL_MM_Config_t tl_mm_config; - SHCI_TL_HciInitConf_t SHci_Tl_Init_Conf; - - /**< Reference table initialization */ - TL_Init(); - - /**< System channel initialization */ - UTIL_SEQ_RegTask( 1<< CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, UTIL_SEQ_RFU, shci_user_evt_proc ); - SHci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&SystemCmdBuffer; - SHci_Tl_Init_Conf.StatusNotCallBack = APPE_SysStatusNot; - shci_init(APPE_SysUserEvtRx, (void*) &SHci_Tl_Init_Conf); - - /**< Memory Manager channel initialization */ - tl_mm_config.p_BleSpareEvtBuffer = BleSpareEvtBuffer; - tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer; - tl_mm_config.p_AsynchEvtPool = EvtPool; - tl_mm_config.AsynchEvtPoolSize = POOL_SIZE; - TL_MM_Init( &tl_mm_config ); - - TL_Enable(); - - return; -} - -static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) -{ - UNUSED(status); - return; -} - -/** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ -static void APPE_SysUserEvtRx( void * pPayload ) -{ - UNUSED(pPayload); - /* Traces channel initialization */ - TL_TRACES_Init( ); - - if(ConcurrentMode == ZIGBEE_ENABLE){ - APP_ZIGBEE_Init(); - }else{ - APP_BLE_Init(); - } - - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); - - return; -} - -static void Led_Init( void ) -{ -#if (CFG_LED_SUPPORTED == 1U) - /** - * Leds Initialization - */ - - BSP_LED_Init(LED_BLUE); - BSP_LED_Init(LED_GREEN); - BSP_LED_Init(LED_RED); - -#endif - - return; -} - -static void Button_Init( void ) -{ - -#if (CFG_BUTTON_SUPPORTED == 1U) - /** - * Button Initialization - */ - - BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI); - BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI); - BSP_PB_Init(BUTTON_SW3, BUTTON_MODE_EXTI); -#endif - - return; -} - -/************************************************************* - * - * WRAP FUNCTIONS - * - *************************************************************/ - -void UTIL_SEQ_Idle( void ) -{ -#if ( CFG_LPM_SUPPORTED == 1) - UTIL_LPM_EnterLowPower( ); -#endif - - return; -} - -/** - * @brief This function is called by the scheduler each time an event - * is pending. - * - * @param evt_waited_bm : Event pending. - * @retval None - */ -void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) -{ - switch (evt_waited_bm) { - case EVENT_ACK_FROM_M0_EVT: - /* Run only the task CFG_TASK_REQUEST_FROM_M0_TO_M4 to process - * direct requests from the M0 (e.g. ZbMalloc), but no stack notifications - * until we're done the request to the M0. */ - UTIL_SEQ_Run((1U << CFG_TASK_REQUEST_FROM_M0_TO_M4)); - break; - - case EVENT_SYNCHRO_BYPASS_IDLE: - UTIL_SEQ_SetEvt(EVENT_SYNCHRO_BYPASS_IDLE); - /* Process notifications and requests from the M0 */ - UTIL_SEQ_Run((1U << CFG_TASK_NOTIFY_FROM_M0_TO_M4) | (1U << CFG_TASK_REQUEST_FROM_M0_TO_M4)); - break; - - default: - /* default case */ - UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); - break; - } -} - -void shci_notify_asynch_evt(void* pdata) -{ - UNUSED(pdata); - UTIL_SEQ_SetTask(1U << CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, CFG_SCH_PRIO_0); - return; -} - -void shci_cmd_resp_release(uint32_t flag) -{ - UNUSED(flag); - UTIL_SEQ_SetEvt(1U << CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID); - return; -} - -void shci_cmd_resp_wait(uint32_t timeout) -{ - UNUSED(timeout); - UTIL_SEQ_WaitEvt(1U << CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID); - return; -} - -/* Received trace buffer from M0 */ -void TL_TRACES_EvtReceived( TL_EvtPacket_t * hcievt ) -{ -#if(CFG_DEBUG_TRACE != 0) - /* Call write/print function using DMA from dbg_trace */ - /* - Cast to TL_AsynchEvt_t* to get "real" payload (without Sub Evt code 2bytes), - - (-2) to size to remove Sub Evt Code */ - DbgTraceWrite(1U, (const unsigned char *) ((TL_AsynchEvt_t *)(hcievt->evtserial.evt.payload))->payload, hcievt->evtserial.evt.plen - 2U); -#endif /* CFG_DEBUG_TRACE */ - /* Release buffer */ - TL_MM_EvtDone( hcievt ); -} -/** - * @brief Initialization of the trace mechanism - * @param None - * @retval None - */ -#if(CFG_DEBUG_TRACE != 0) -void DbgOutputInit( void ) -{ - HW_UART_Init(CFG_DEBUG_TRACE_UART); - return; -} - -/** - * @brief Management of the traces - * @param p_data : data - * @param size : size - * @param call-back : - * @retval None - */ -void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) -{ - HW_UART_Transmit_DMA(CFG_DEBUG_TRACE_UART, p_data, size, cb); - - return; -} -#endif - -/** - * @brief This function manage the Push button action - * @param GPIO_Pin : GPIO pin which has been activated - * @retval None - */ -void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) -{ - switch (GPIO_Pin) - { - case BUTTON_SW1_PIN: - if(ConcurrentMode == ZIGBEE_ENABLE){ - APP_DBG("BUTTON 1 PUSHED ! : ZIGBEE MESSAGE SENDING"); - UTIL_SEQ_SetTask(1U << CFG_TASK_BUTTON_SW1,CFG_SCH_PRIO_1); - } else{ - APP_BLE_Key_Button1_Action(); - } - break; - - case BUTTON_SW2_PIN: - APP_DBG("BUTTON 2 PUSHED ! : SWITCHING PROTOCOL"); - UTIL_SEQ_PauseTask(1U << CFG_TASK_ZIGBEE_NETWORK_FORM); - UTIL_SEQ_SetTask(1U << CFG_TASK_INIT_SWITCH_PROTOCOL,CFG_SCH_PRIO_0); - break; - - case BUTTON_SW3_PIN: - APP_DBG("BUTTON 3 PUSHED ! : NO ACTION MAPPED ON SW3"); - APP_BLE_Key_Button3_Action(); - break; - - default: - break; - } - return; -} - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_timerserver.c deleted file mode 100644 index c842ba55e..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_timerserver.c +++ /dev/null @@ -1,893 +0,0 @@ -/** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "hw_conf.h" - -/* Private typedef -----------------------------------------------------------*/ -typedef enum -{ - TimerID_Free, - TimerID_Created, - TimerID_Running -}TimerIDStatus_t; - -typedef enum -{ - SSR_Read_Requested, - SSR_Read_Not_Requested -}RequestReadSSR_t; - -typedef enum -{ - WakeupTimerValue_Overpassed, - WakeupTimerValue_LargeEnough -}WakeupTimerLimitation_Status_t; - -typedef struct -{ - HW_TS_pTimerCb_t pTimerCallBack; - uint32_t CounterInit; - uint32_t CountLeft; - TimerIDStatus_t TimerIDStatus; - HW_TS_Mode_t TimerMode; - uint32_t TimerProcessID; - uint8_t PreviousID; - uint8_t NextID; -}TimerContext_t; - -/* Private defines -----------------------------------------------------------*/ -#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF -#define TIMER_LIST_EMPTY 0xFFFF - -/* Private macros ------------------------------------------------------------*/ -/* Private variables ---------------------------------------------------------*/ - -/** - * START of Section TIMERSERVER_CONTEXT - */ - -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; -PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; - -/** - * END of Section TIMERSERVER_CONTEXT - */ - -static RTC_HandleTypeDef *phrtc; /**< RTC handle */ -static uint8_t WakeupTimerDivider; -static uint8_t AsynchPrescalerUserConfig; -static uint16_t SynchPrescalerUserConfig; -static volatile uint16_t MaxWakeupTimerSetup; - -/* Global variables ----------------------------------------------------------*/ -/* Private function prototypes -----------------------------------------------*/ -static void RestartWakeupCounter(uint16_t Value); -static uint16_t ReturnTimeElapsed(void); -static void RescheduleTimerList(void); -static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); -static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); -static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); -static uint16_t linkTimer(uint8_t TimerID); -static uint32_t ReadRtcSsrValue(void); - -__weak void HW_TS_RTC_CountUpdated_AppNot(void); - -/* Functions Definition ------------------------------------------------------*/ - -/** - * @brief Read the RTC_SSR value - * As described in the reference manual, the RTC_SSR shall be read twice to ensure - * reliability of the value - * @param None - * @retval SSR value read - */ -static uint32_t ReadRtcSsrValue(void) -{ - uint32_t first_read; - uint32_t second_read; - - first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - - while(first_read != second_read) - { - first_read = second_read; - - second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); - } - - return second_read; -} - -/** - * @brief Insert a Timer in the list after the Timer ID specified - * @param TimerID: The ID of the Timer - * @param RefTimerID: The ID of the Timer to be linked after - * @retval None - */ -static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) -{ - uint8_t next_id; - - next_id = aTimerContext[RefTimerID].NextID; - - if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[next_id].PreviousID = TimerID; - } - aTimerContext[TimerID].NextID = next_id; - aTimerContext[TimerID].PreviousID = RefTimerID ; - aTimerContext[RefTimerID].NextID = TimerID; - - return; -} - -/** - * @brief Insert a Timer in the list before the ID specified - * @param TimerID: The ID of the Timer - * @param RefTimerID: The ID of the Timer to be linked before - * @retval None - */ -static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) -{ - uint8_t previous_id; - - if(RefTimerID != CurrentRunningTimerID) - { - previous_id = aTimerContext[RefTimerID].PreviousID; - - aTimerContext[previous_id].NextID = TimerID; - aTimerContext[TimerID].NextID = RefTimerID; - aTimerContext[TimerID].PreviousID = previous_id ; - aTimerContext[RefTimerID].PreviousID = TimerID; - } - else - { - aTimerContext[TimerID].NextID = RefTimerID; - aTimerContext[RefTimerID].PreviousID = TimerID; - } - - return; -} - -/** - * @brief Insert a Timer in the list - * @param TimerID: The ID of the Timer - * @retval None - */ -static uint16_t linkTimer(uint8_t TimerID) -{ - uint32_t time_left; - uint16_t time_elapsed; - uint8_t timer_id_lookup; - uint8_t next_id; - - if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - /** - * No timer in the list - */ - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = TimerID; - aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; - - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - time_elapsed = 0; - } - else - { - time_elapsed = ReturnTimeElapsed(); - - /** - * update count of the timer to be linked - */ - aTimerContext[TimerID].CountLeft += time_elapsed; - time_left = aTimerContext[TimerID].CountLeft; - - /** - * Search for index where the new timer shall be linked - */ - if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) - { - /** - * Search for the ID after the first one - */ - timer_id_lookup = CurrentRunningTimerID; - next_id = aTimerContext[timer_id_lookup].NextID; - while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) - { - timer_id_lookup = aTimerContext[timer_id_lookup].NextID; - next_id = aTimerContext[timer_id_lookup].NextID; - } - - /** - * Link after the ID - */ - LinkTimerAfter(TimerID, timer_id_lookup); - } - else - { - /** - * Link before the first ID - */ - LinkTimerBefore(TimerID, CurrentRunningTimerID); - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = TimerID; - } - } - - return time_elapsed; -} - -/** - * @brief Remove a Timer from the list - * @param TimerID: The ID of the Timer - * @param RequestReadSSR: Request to read the SSR register or not - * @retval None - */ -static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) -{ - uint8_t previous_id; - uint8_t next_id; - - if(TimerID == CurrentRunningTimerID) - { - PreviousRunningTimerID = CurrentRunningTimerID; - CurrentRunningTimerID = aTimerContext[TimerID].NextID; - } - else - { - previous_id = aTimerContext[TimerID].PreviousID; - next_id = aTimerContext[TimerID].NextID; - - aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; - if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; - } - } - - /** - * Timer is out of the list - */ - aTimerContext[TimerID].TimerIDStatus = TimerID_Created; - - if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) - { - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - } - - return; -} - -/** - * @brief Return the number of ticks counted by the wakeuptimer since it has been started - * @note The API is reading the SSR register to get how many ticks have been counted - * since the time the timer has been started - * @param None - * @retval Time expired in Ticks - */ -static uint16_t ReturnTimeElapsed(void) -{ - uint32_t return_value; - uint32_t wrap_counter; - - if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) - { - return_value = ReadRtcSsrValue(); /**< Read SSR register first */ - - if (SSRValueOnLastSetup >= return_value) - { - return_value = SSRValueOnLastSetup - return_value; - } - else - { - wrap_counter = SynchPrescalerUserConfig - return_value; - return_value = SSRValueOnLastSetup + wrap_counter; - } - - /** - * At this stage, ReturnValue holds the number of ticks counted by SSR - * Need to translate in number of ticks counted by the Wakeuptimer - */ - return_value = return_value*AsynchPrescalerUserConfig; - return_value = return_value >> WakeupTimerDivider; - } - else - { - return_value = 0; - } - - return (uint16_t)return_value; -} - -/** - * @brief Set the wakeup counter - * @note The API is writing the counter value so that the value is decreased by one to cope with the fact - * the interrupt is generated with 1 extra clock cycle (See RefManuel) - * It assumes all condition are met to be allowed to write the wakeup counter - * @param Value: Value to be written in the counter - * @retval None - */ -static void RestartWakeupCounter(uint16_t Value) -{ - /** - * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF - * FLAG when the new value will have to be written - * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); - */ - - if(Value == 0) - { - SSRValueOnLastSetup = ReadRtcSsrValue(); - - /** - * Simulate that the Timer expired - */ - HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); - } - else - { - if((Value > 1) ||(WakeupTimerDivider != 1)) - { - Value -= 1; - } - - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - - MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); - - /** - * Update the value here after the WUTWF polling that may take some time - */ - SSRValueOnLastSetup = ReadRtcSsrValue(); - - __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ - - HW_TS_RTC_CountUpdated_AppNot(); - } - - return ; -} - -/** - * @brief Reschedule the list of timer - * @note 1) Update the count left for each timer in the list - * 2) Setup the wakeuptimer - * @param None - * @retval None - */ -static void RescheduleTimerList(void) -{ - uint8_t localTimerID; - uint32_t timecountleft; - uint16_t wakeup_timer_value; - uint16_t time_elapsed; - - /** - * The wakeuptimer is disabled now to reduce the time to poll the WUTWF - * FLAG when the new value will have to be written - */ - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - /** - * Wait for the flag to be back to 0 when the wakeup timer is enabled - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); - } - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - - localTimerID = CurrentRunningTimerID; - - /** - * Calculate what will be the value to write in the wakeuptimer - */ - timecountleft = aTimerContext[localTimerID].CountLeft; - - /** - * Read how much has been counted - */ - time_elapsed = ReturnTimeElapsed(); - - if(timecountleft < time_elapsed ) - { - /** - * There is no tick left to count - */ - wakeup_timer_value = 0; - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - } - else - { - if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) - { - /** - * The number of tick left is greater than the Wakeuptimer maximum value - */ - wakeup_timer_value = MaxWakeupTimerSetup; - - WakeupTimerLimitation = WakeupTimerValue_Overpassed; - } - else - { - wakeup_timer_value = timecountleft - time_elapsed; - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - } - - } - - /** - * update ticks left to be counted for each timer - */ - while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - if (aTimerContext[localTimerID].CountLeft < time_elapsed) - { - aTimerContext[localTimerID].CountLeft = 0; - } - else - { - aTimerContext[localTimerID].CountLeft -= time_elapsed; - } - localTimerID = aTimerContext[localTimerID].NextID; - } - - /** - * Write next count - */ - RestartWakeupCounter(wakeup_timer_value); - - return ; -} - -/* Public functions ----------------------------------------------------------*/ - -/** - * For all public interface except that may need write access to the RTC, the RTC - * shall be unlock at the beginning and locked at the output - * In order to ease maintainability, the unlock is done at the top and the lock at then end - * in case some new implementation is coming in the future - */ - -void HW_TS_RTC_Wakeup_Handler(void) -{ - HW_TS_pTimerCb_t ptimer_callback; - uint32_t timer_process_id; - uint8_t local_current_running_timer_id; -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - -/* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - /** - * Disable the Wakeup Timer - * This may speed up a bit the processing to wait the timer to be disabled - * The timer is still counting 2 RTCCLK - */ - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); - - local_current_running_timer_id = CurrentRunningTimerID; - - if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) - { - ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; - timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; - - /** - * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted - * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick - * to be left whereas the count is over - * A more secure implementation has been done with a flag to state whereas the full count has been written - * in the wakeuptimer or not - */ - if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) - { - if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) - { - UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - } - else - { -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - HW_TS_Stop(local_current_running_timer_id); - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - } - - HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); - } - else - { - RescheduleTimerList(); -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - } - } - else - { - /** - * We should never end up in this case - * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. - * We could just clean the interrupt flag and get out from this unexpected interrupt - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - return; -} - -void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) -{ - uint8_t loop; - uint32_t localmaxwakeuptimersetup; - - /** - * Get RTC handler - */ - phrtc = hrtc; - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - SET_BIT(RTC->CR, RTC_CR_BYPSHAD); - - /** - * Readout the user config - */ - WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); - - AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; - - SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; - - /** - * Margin is taken to avoid wrong calculation when the wrap around is there and some - * application interrupts may have delayed the reading - */ - localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); - - if(localmaxwakeuptimersetup >= 0xFFFF) - { - MaxWakeupTimerSetup = 0xFFFF; - } - else - { - MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; - } - - /** - * Configure EXTI module - */ - LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); - LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); - - if(TimerInitMode == hw_ts_InitMode_Full) - { - WakeupTimerLimitation = WakeupTimerValue_LargeEnough; - SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; - - /** - * Initialize the timer server - */ - for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) - { - aTimerContext[loop].TimerIDStatus = TimerID_Free; - } - - CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ - - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ - } - else - { - if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) - { - /** - * Simulate that the Timer expired - */ - HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); - } - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - - return; -} - -HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) -{ - HW_TS_ReturnStatus_t localreturnstatus; - uint8_t loop = 0; -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) - { - loop++; - } - - if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - aTimerContext[loop].TimerIDStatus = TimerID_Created; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - aTimerContext[loop].TimerProcessID = TimerProcessID; - aTimerContext[loop].TimerMode = TimerMode; - aTimerContext[loop].pTimerCallBack = pftimeout_handler; - *pTimerId = loop; - - localreturnstatus = hw_ts_Successful; - } - else - { -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - localreturnstatus = hw_ts_Failed; - } - - return(localreturnstatus); -} - -void HW_TS_Delete(uint8_t timer_id) -{ - HW_TS_Stop(timer_id); - - aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ - - return; -} - -void HW_TS_Stop(uint8_t timer_id) -{ - uint8_t localcurrentrunningtimerid; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) - { - UnlinkTimer(timer_id, SSR_Read_Requested); - localcurrentrunningtimerid = CurrentRunningTimerID; - - if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) - { - /** - * List is empty - */ - - /** - * Disable the timer - */ - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - /** - * Wait for the flag to be back to 0 when the wakeup timer is enabled - */ - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); - } - __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ - - while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); - - /** - * make sure to clear the flags after checking the WUTWF. - * It takes 2 RTCCLK between the time the WUTE bit is disabled and the - * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable - * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between - * due to the autoreload feature - */ - __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ - __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ - HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ - } - else if(PreviousRunningTimerID != localcurrentrunningtimerid) - { - RescheduleTimerList(); - } - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - return; -} - -void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) -{ - uint16_t time_elapsed; - uint8_t localcurrentrunningtimerid; - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - uint32_t primask_bit; -#endif - - if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) - { - HW_TS_Stop( timer_id ); - } - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ -#endif - - HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ - - /* Disable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); - - aTimerContext[timer_id].TimerIDStatus = TimerID_Running; - - aTimerContext[timer_id].CountLeft = timeout_ticks; - aTimerContext[timer_id].CounterInit = timeout_ticks; - - time_elapsed = linkTimer(timer_id); - - localcurrentrunningtimerid = CurrentRunningTimerID; - - if(PreviousRunningTimerID != localcurrentrunningtimerid) - { - RescheduleTimerList(); - } - else - { - aTimerContext[timer_id].CountLeft -= time_elapsed; - } - - /* Enable the write protection for RTC registers */ - __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); - - HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ - -#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ -#endif - - return; -} - -uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) -{ - uint32_t primask_bit; - uint16_t return_value, auro_reload_value, elapsed_time_value; - - primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ - __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ - - if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) - { - auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); - - elapsed_time_value = ReturnTimeElapsed(); - - if(auro_reload_value > elapsed_time_value) - { - return_value = auro_reload_value - elapsed_time_value; - } - else - { - return_value = 0; - } - } - else - { - return_value = TIMER_LIST_EMPTY; - } - - __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ - - return (return_value); -} - -__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) -{ - pTimerCallBack(); - - return; -} - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_uart.c deleted file mode 100644 index 7d28f9582..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/hw_uart.c +++ /dev/null @@ -1,465 +0,0 @@ -/** - ****************************************************************************** - * @file hw_uart.c - * @author MCD Application Team - * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "hw_conf.h" - -/* Macros --------------------------------------------------------------------*/ -#define HW_UART_INIT(__HANDLE__, __USART_BASE__) \ - do{ \ - (__HANDLE__).Instance = (__USART_BASE__); \ - (__HANDLE__).Init.BaudRate = CFG_HW_##__USART_BASE__##_BAUDRATE; \ - (__HANDLE__).Init.WordLength = CFG_HW_##__USART_BASE__##_WORDLENGTH; \ - (__HANDLE__).Init.StopBits = CFG_HW_##__USART_BASE__##_STOPBITS; \ - (__HANDLE__).Init.Parity = CFG_HW_##__USART_BASE__##_PARITY; \ - (__HANDLE__).Init.HwFlowCtl = CFG_HW_##__USART_BASE__##_HWFLOWCTL; \ - (__HANDLE__).Init.Mode = CFG_HW_##__USART_BASE__##_MODE; \ - (__HANDLE__).Init.OverSampling = CFG_HW_##__USART_BASE__##_OVERSAMPLING; \ - (__HANDLE__).AdvancedInit.AdvFeatureInit = CFG_HW_##__USART_BASE__##_ADVFEATUREINIT; \ - HAL_UART_Init(&(__HANDLE__)); \ - } while(0) - -#define HW_UART_RX_IT(__HANDLE__, __USART_BASE__) \ - do{ \ - HW_##__HANDLE__##RxCb = cb; \ - (__HANDLE__).Instance = (__USART_BASE__); \ - HAL_UART_Receive_IT(&(__HANDLE__), p_data, size); \ - } while(0) - -#define HW_UART_TX_IT(__HANDLE__, __USART_BASE__) \ - do{ \ - HW_##__HANDLE__##TxCb = cb; \ - (__HANDLE__).Instance = (__USART_BASE__); \ - HAL_UART_Transmit_IT(&(__HANDLE__), p_data, size); \ - } while(0) - -#define HW_UART_TX(__HANDLE__, __USART_BASE__) \ - do{ \ - (__HANDLE__).Instance = (__USART_BASE__); \ - hal_status = HAL_UART_Transmit(&(__HANDLE__), p_data, size, timeout); \ - } while(0) - -#define HW_UART_MSP_UART_INIT(__HANDLE__, __USART_BASE__) \ - do{ \ - /* Enable GPIO clock */ \ - CFG_HW_##__USART_BASE__##_TX_PORT_CLK_ENABLE(); \ - \ - /* Enable USART clock */ \ - __HAL_RCC_##__USART_BASE__##_CLK_ENABLE(); \ - \ - GPIO_InitStruct.Pin = CFG_HW_##__USART_BASE__##_TX_PIN ; \ - GPIO_InitStruct.Mode = CFG_HW_##__USART_BASE__##_TX_MODE; \ - GPIO_InitStruct.Pull = CFG_HW_##__USART_BASE__##_TX_PULL; \ - GPIO_InitStruct.Speed = CFG_HW_##__USART_BASE__##_TX_SPEED; \ - GPIO_InitStruct.Alternate = CFG_HW_##__USART_BASE__##_TX_ALTERNATE; \ - \ - HAL_GPIO_Init(CFG_HW_##__USART_BASE__##_TX_PORT, &GPIO_InitStruct); \ - \ - CFG_HW_##__USART_BASE__##_RX_PORT_CLK_ENABLE(); \ - \ - GPIO_InitStruct.Pin = CFG_HW_##__USART_BASE__##_RX_PIN; \ - GPIO_InitStruct.Mode = CFG_HW_##__USART_BASE__##_RX_MODE; \ - GPIO_InitStruct.Pull = CFG_HW_##__USART_BASE__##_RX_PULL; \ - GPIO_InitStruct.Speed = CFG_HW_##__USART_BASE__##_RX_SPEED; \ - GPIO_InitStruct.Alternate = CFG_HW_##__USART_BASE__##_RX_ALTERNATE; \ - \ - HAL_GPIO_Init(CFG_HW_##__USART_BASE__##_RX_PORT, &GPIO_InitStruct); \ - \ - CFG_HW_##__USART_BASE__##_CTS_PORT_CLK_ENABLE(); \ - \ - GPIO_InitStruct.Pin = CFG_HW_##__USART_BASE__##_CTS_PIN; \ - GPIO_InitStruct.Mode = CFG_HW_##__USART_BASE__##_CTS_MODE; \ - GPIO_InitStruct.Pull = CFG_HW_##__USART_BASE__##_CTS_PULL; \ - GPIO_InitStruct.Speed = CFG_HW_##__USART_BASE__##_CTS_SPEED; \ - GPIO_InitStruct.Alternate = CFG_HW_##__USART_BASE__##_CTS_ALTERNATE; \ - \ - HAL_GPIO_Init(CFG_HW_##__USART_BASE__##_CTS_PORT, &GPIO_InitStruct); \ - \ - HAL_NVIC_SetPriority(__USART_BASE__##_IRQn, CFG_HW_##__USART_BASE__##_PREEMPTPRIORITY, CFG_HW_##__USART_BASE__##_SUBPRIORITY); \ - HAL_NVIC_EnableIRQ(__USART_BASE__##_IRQn); \ - } while(0) - -#define HW_UART_MSP_TX_DMA_INIT(__HANDLE__, __USART_BASE__) \ - do{ \ - /* Configure the DMA handler for Transmission process */ \ - /* Enable DMA clock */ \ - CFG_HW_##__USART_BASE__##_DMA_CLK_ENABLE(); \ - /* Enable DMA MUX clock */ \ - CFG_HW_##__USART_BASE__##_DMAMUX_CLK_ENABLE(); \ - \ - HW_hdma_##__HANDLE__##_tx.Instance = CFG_HW_##__USART_BASE__##_TX_DMA_CHANNEL; \ - HW_hdma_##__HANDLE__##_tx.Init.Request = CFG_HW_##__USART_BASE__##_TX_DMA_REQ; \ - HW_hdma_##__HANDLE__##_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; \ - HW_hdma_##__HANDLE__##_tx.Init.PeriphInc = DMA_PINC_DISABLE; \ - HW_hdma_##__HANDLE__##_tx.Init.MemInc = DMA_MINC_ENABLE; \ - HW_hdma_##__HANDLE__##_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; \ - HW_hdma_##__HANDLE__##_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; \ - HW_hdma_##__HANDLE__##_tx.Init.Mode = DMA_NORMAL; \ - HW_hdma_##__HANDLE__##_tx.Init.Priority = DMA_PRIORITY_LOW; \ - \ - HAL_DMA_Init(&HW_hdma_##__HANDLE__##_tx); \ - \ - /* Associate the initialized DMA handle to the UART handle */ \ - __HAL_LINKDMA(huart, hdmatx, HW_hdma_##__HANDLE__##_tx); \ - \ - /* NVIC configuration for DMA transfer complete interrupt */ \ - HAL_NVIC_SetPriority(CFG_HW_##__USART_BASE__##_TX_DMA_IRQn, CFG_HW_##__USART_BASE__##_DMA_TX_PREEMPTPRIORITY, CFG_HW_##__USART_BASE__##_DMA_TX_SUBPRIORITY); \ - HAL_NVIC_EnableIRQ(CFG_HW_##__USART_BASE__##_TX_DMA_IRQn); \ - } while(0) - -/* Variables ------------------------------------------------------------------*/ -#if (CFG_HW_USART1_ENABLED == 1) -UART_HandleTypeDef huart1 = {0}; -#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) -DMA_HandleTypeDef HW_hdma_huart1_tx ={0}; -#endif -void (*HW_huart1RxCb)(void); -void (*HW_huart1TxCb)(void); -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) -UART_HandleTypeDef lpuart1 = {0}; -#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) -DMA_HandleTypeDef HW_hdma_lpuart1_tx ={0}; -#endif -void (*HW_lpuart1RxCb)(void); -void (*HW_lpuart1TxCb)(void); -#endif - -void HW_UART_Init(hw_uart_id_t hw_uart_id) -{ - switch (hw_uart_id) - { -#if (CFG_HW_USART1_ENABLED == 1) - case hw_uart1: - HW_UART_INIT(huart1, USART1); - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case hw_lpuart1: - HW_UART_INIT(lpuart1, LPUART1); - break; -#endif - - default: - break; - } - - return; -} - -void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) -{ - switch (hw_uart_id) - { -#if (CFG_HW_USART1_ENABLED == 1) - case hw_uart1: - HW_UART_RX_IT(huart1, USART1); - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case hw_lpuart1: - HW_UART_RX_IT(lpuart1, LPUART1); - break; -#endif - - default: - break; - } - - return; -} - -void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) -{ - switch (hw_uart_id) - { -#if (CFG_HW_USART1_ENABLED == 1) - case hw_uart1: - HW_UART_TX_IT(huart1, USART1); - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case hw_lpuart1: - HW_UART_TX_IT(lpuart1, LPUART1); - break; -#endif - - default: - break; - } - - return; -} - -hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout) -{ - HAL_StatusTypeDef hal_status = HAL_OK; - hw_status_t hw_status = hw_uart_ok; - - switch (hw_uart_id) - { -#if (CFG_HW_USART1_ENABLED == 1) - case hw_uart1: - HW_UART_TX(huart1, USART1); - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case hw_lpuart1: - HW_UART_TX(lpuart1, LPUART1); - break; -#endif - - default: - break; - } - - switch (hal_status) - { - case HAL_OK: - hw_status = hw_uart_ok; - break; - - case HAL_ERROR: - hw_status = hw_uart_error; - break; - - case HAL_BUSY: - hw_status = hw_uart_busy; - break; - - case HAL_TIMEOUT: - hw_status = hw_uart_to; - break; - - default: - break; - } - - return hw_status; -} - -hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) -{ - HAL_StatusTypeDef hal_status = HAL_OK; - hw_status_t hw_status = hw_uart_ok; - - switch (hw_uart_id) - { -#if (CFG_HW_USART1_ENABLED == 1) - case hw_uart1: - HW_huart1TxCb = cb; - huart1.Instance = USART1; - hal_status = HAL_UART_Transmit_DMA(&huart1, p_data, size); - break; -#endif - -#if (CFG_HW_USART2_ENABLED == 1) - case hw_uart2: - HW_huart2TxCb = cb; - huart2.Instance = USART2; - hal_status = HAL_UART_Transmit_DMA(&huart2, p_data, size); - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case hw_lpuart1: - HW_lpuart1TxCb = cb; - lpuart1.Instance = LPUART1; - hal_status = HAL_UART_Transmit_DMA(&lpuart1, p_data, size); - break; -#endif - - default: - break; - } - - switch (hal_status) - { - case HAL_OK: - hw_status = hw_uart_ok; - break; - - case HAL_ERROR: - hw_status = hw_uart_error; - break; - - case HAL_BUSY: - hw_status = hw_uart_busy; - break; - - case HAL_TIMEOUT: - hw_status = hw_uart_to; - break; - - default: - break; - } - - return hw_status; -} - -void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id) -{ - switch (hw_uart_id) - { -#if (CFG_HW_USART1_ENABLED == 1) - case hw_uart1: - HAL_UART_IRQHandler(&huart1); - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case hw_lpuart1: - HAL_UART_IRQHandler(&lpuart1); - break; -#endif - - default: - break; - } - - return; -} - -void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id) -{ - switch (hw_uart_id) - { -#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) - case hw_uart1: - HAL_DMA_IRQHandler(huart1.hdmatx); - break; -#endif - -#if (CFG_HW_USART2_DMA_TX_SUPPORTED == 1) - case hw_uart2: - HAL_DMA_IRQHandler(huart2.hdmatx); - break; -#endif - -#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) - case hw_lpuart1: - HAL_DMA_IRQHandler(lpuart1.hdmatx); - break; -#endif - - default: - break; - } - - return; -} - -void HAL_UART_MspInit(UART_HandleTypeDef *huart) -{ - GPIO_InitTypeDef GPIO_InitStruct = {0}; - - switch ((uint32_t)huart->Instance) - { -#if (CFG_HW_USART1_ENABLED == 1) - case (uint32_t)USART1: - HW_UART_MSP_UART_INIT( huart1, USART1 ); -#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) - HW_UART_MSP_TX_DMA_INIT( huart1, USART1 ); -#endif - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case (uint32_t)LPUART1: - HW_UART_MSP_UART_INIT( lpuart1, LPUART1 ); -#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) - HW_UART_MSP_TX_DMA_INIT( lpuart1, LPUART1 ); -#endif - break; -#endif - - default: - break; - } - - return; -} - -void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) -{ - switch ((uint32_t)huart->Instance) - { -#if (CFG_HW_USART1_ENABLED == 1) - case (uint32_t)USART1: - if(HW_huart1RxCb) - { - HW_huart1RxCb(); - } - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case (uint32_t)LPUART1: - if(HW_lpuart1RxCb) - { - HW_lpuart1RxCb(); - } - break; -#endif - - default: - break; - } - - return; -} - -void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) -{ - switch ((uint32_t)huart->Instance) - { -#if (CFG_HW_USART1_ENABLED == 1) - case (uint32_t)USART1: - if(HW_huart1TxCb) - { - HW_huart1TxCb(); - } - break; -#endif - -#if (CFG_HW_LPUART1_ENABLED == 1) - case (uint32_t)LPUART1: - if(HW_lpuart1TxCb) - { - HW_lpuart1TxCb(); - } - break; -#endif - - default: - break; - } - - return; -} - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/main.c deleted file mode 100644 index 6b4fab717..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/main.c +++ /dev/null @@ -1,326 +0,0 @@ -/** - ****************************************************************************** - * @file : main.c - * @brief : Main program body - * - @verbatim - ============================================================================== - ##### IMPORTANT NOTE ##### - ============================================================================== - - This application requests having the stm32wb5x_BLE_Thread_fw.bin binary - flashed on the Wireless Coprocessor. - If it is not the case, you need to use STM32CubeProgrammer to load the appropriate - binary. - - All available binaries are located under following directory: - /Projects/STM32_Copro_Wireless_Binaries - - Refer to UM2237 to learn how to use/install STM32CubeProgrammer. - Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the - detailed procedure to change the Wireless Coprocessor binary. - - @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * - ****************************************************************************** - */ - - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" - -#include "app_entry.h" -#include "stm32_lpm.h" -#include "stm32_seq.h" -#include "dbg_trace.h" - -/* Private typedef -----------------------------------------------------------*/ -/* Private defines -----------------------------------------------------------*/ -/* Private macros ------------------------------------------------------------*/ -/* Global variables ---------------------------------------------------------*/ -RTC_HandleTypeDef hrtc = { 0 }; /**< RTC handler declaration */ - -/* Private variables ---------------------------------------------------------*/ -/* Private function prototypes -----------------------------------------------*/ -static void Reset_BackupDomain( void ); -static void Init_RTC( void ); -static void SystemClock_Config( void ); -static void Reset_Device( void ); -static void Reset_IPCC( void ); -static void Init_Exti( void ); - -/* Functions Definition ------------------------------------------------------*/ - -/** - * @brief Main program - * @param None - * @retval None - */ -int main( void ) -{ - /** - * The OPTVERR flag is wrongly set at power on - * It shall be cleared before using any HAL_FLASH_xxx() api - */ - __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR); - - HAL_Init(); - - Reset_Device(); - - /** - * When the application is expected to run at higher speed, it should be better to set the correct system clock - * in system_stm32yyxx.c so that the initialization phase is running at max speed. - */ - SystemClock_Config(); /**< Configure the system clock */ - - Init_Exti( ); - - Init_RTC(); - - APPE_Init( ); - - while(1) - { - UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); - } -} - -/************************************************************* - * - * LOCAL FUNCTIONS - * - *************************************************************/ -static void Init_Exti( void ) -{ - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); - - return; -} - -static void Reset_Device( void ) -{ -#if ( CFG_HW_RESET_BY_FW == 1 ) - Reset_BackupDomain(); - - Reset_IPCC(); -#endif - - return; -} - -static void Reset_IPCC( void ) -{ - LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_IPCC); - - LL_C1_IPCC_ClearFlag_CHx( - IPCC, - LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 - | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); - - LL_C2_IPCC_ClearFlag_CHx( - IPCC, - LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 - | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); - - LL_C1_IPCC_DisableTransmitChannel( - IPCC, - LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 - | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); - - LL_C2_IPCC_DisableTransmitChannel( - IPCC, - LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 - | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); - - LL_C1_IPCC_DisableReceiveChannel( - IPCC, - LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 - | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); - - LL_C2_IPCC_DisableReceiveChannel( - IPCC, - LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 - | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); - - return; -} - -static void Reset_BackupDomain( void ) -{ - if ((LL_RCC_IsActiveFlag_PINRST() != FALSE) && (LL_RCC_IsActiveFlag_SFTRST() == FALSE)) - { - HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ - - /** - * Write twice the value to flush the APB-AHB bridge - * This bit shall be written in the register before writing the next one - */ - HAL_PWR_EnableBkUpAccess(); - - __HAL_RCC_BACKUPRESET_FORCE(); - __HAL_RCC_BACKUPRESET_RELEASE(); - } - - return; -} - -static void Init_RTC( void ) -{ - HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ - - /** - * Write twice the value to flush the APB-AHB bridge - * This bit shall be written in the register before writing the next one - */ - HAL_PWR_EnableBkUpAccess(); - - __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ - - __HAL_RCC_RTC_ENABLE(); /**< Enable RTC */ - - hrtc.Instance = RTC; /**< Define instance */ - - /** - * Set the Asynchronous prescaler - */ - hrtc.Init.AsynchPrediv = CFG_RTC_ASYNCH_PRESCALER; - hrtc.Init.SynchPrediv = CFG_RTC_SYNCH_PRESCALER; - HAL_RTC_Init(&hrtc); - - /* Disable RTC registers write protection */ - LL_RTC_DisableWriteProtection(RTC); - - LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); - - /* Enable RTC registers write protection */ - LL_RTC_EnableWriteProtection(RTC); - - return; -} - -/** - * @brief Configure the system clock - * - * @note This API configures - * - The system clock source - * - The AHBCLK, APBCLK dividers - * - The flash latency - * - The PLL settings (when required) - * - * @param None - * @retval None - */ -void SystemClock_Config( void ) -{ -#if (CFG_USB_INTERFACE_ENABLE != 0) - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = { 0 }; - RCC_CRSInitTypeDef RCC_CRSInitStruct = { 0 }; - - /** - * This prevents the CPU2 to disable the HSI48 oscillator when - * it does not use anymore the RNG IP - */ - LL_HSEM_1StepLock( HSEM, 5 ); - - LL_RCC_HSI48_Enable(); - - while(!LL_RCC_HSI48_IsReady()); - - /* Select HSI48 as USB clock source */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB; - PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_HSI48; - HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct); - - /*Configure the clock recovery system (CRS)**********************************/ - - /* Enable CRS Clock */ - __HAL_RCC_CRS_CLK_ENABLE(); - - /* Default Synchro Signal division factor (not divided) */ - RCC_CRSInitStruct.Prescaler = RCC_CRS_SYNC_DIV1; - - /* Set the SYNCSRC[1:0] bits according to CRS_Source value */ - RCC_CRSInitStruct.Source = RCC_CRS_SYNC_SOURCE_USB; - - /* HSI48 is synchronized with USB SOF at 1KHz rate */ - RCC_CRSInitStruct.ReloadValue = RCC_CRS_RELOADVALUE_DEFAULT; - RCC_CRSInitStruct.ErrorLimitValue = RCC_CRS_ERRORLIMIT_DEFAULT; - - RCC_CRSInitStruct.Polarity = RCC_CRS_SYNC_POLARITY_RISING; - - /* Set the TRIM[5:0] to the default value*/ - RCC_CRSInitStruct.HSI48CalibrationValue = RCC_CRS_HSI48CALIBRATION_DEFAULT; - - /* Start automatic synchronization */ - HAL_RCCEx_CRSConfig(&RCC_CRSInitStruct); -#endif - - /** - * Write twice the value to flush the APB-AHB bridge to ensure the bit is written - */ - HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ - HAL_PWR_EnableBkUpAccess(); - - /** - * Select LSE clock - */ - LL_RCC_LSE_Enable(); - while(!LL_RCC_LSE_IsReady()); - - /** - * Select wakeup source of BLE RF - */ - LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_LSE); - - return; -} - -/************************************************************* - * - * WRAP FUNCTIONS - * - *************************************************************/ -void HAL_Delay(uint32_t Delay) -{ - uint32_t tickstart = HAL_GetTick(); - uint32_t wait = Delay; - - /* Add a freq to guarantee minimum wait */ - if (wait < HAL_MAX_DELAY) - { - wait += HAL_GetTickFreq(); - } - - while ((HAL_GetTick() - tickstart) < wait) - { - /************************************************************************************ - * ENTER SLEEP MODE - ***********************************************************************************/ - LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ - - /** - * This option is used to ensure that store operations are completed - */ - #if defined ( __CC_ARM) - __force_stores(); - #endif - - __WFI( ); - } -} - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32_lpm_if.c deleted file mode 100644 index fba978d88..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32_lpm_if.c +++ /dev/null @@ -1,359 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Includes ------------------------------------------------------------------*/ -#include "stm32_lpm_if.h" -#include "stm32_lpm.h" -#include "app_conf.h" -/* USER CODE BEGIN include */ - -/* USER CODE END include */ - -/* Exported variables --------------------------------------------------------*/ -const struct UTIL_LPM_Driver_s UTIL_PowerDriver = -{ - PWR_EnterSleepMode, - PWR_ExitSleepMode, - - PWR_EnterStopMode, - PWR_ExitStopMode, - - PWR_EnterOffMode, - PWR_ExitOffMode, -}; - -/* Private function prototypes -----------------------------------------------*/ -static void Switch_On_HSI( void ); -static void EnterLowPower( void ); -static void ExitLowPower( void ); -/* USER CODE BEGIN Private_Function_Prototypes */ - -/* USER CODE END Private_Function_Prototypes */ -/* Private typedef -----------------------------------------------------------*/ -/* USER CODE BEGIN Private_Typedef */ - -/* USER CODE END Private_Typedef */ -/* Private define ------------------------------------------------------------*/ -/* USER CODE BEGIN Private_Define */ - -/* USER CODE END Private_Define */ -/* Private macro -------------------------------------------------------------*/ -/* USER CODE BEGIN Private_Macro */ - -/* USER CODE END Private_Macro */ -/* Private variables ---------------------------------------------------------*/ -/* USER CODE BEGIN Private_Variables */ - -/* USER CODE END Private_Variables */ - -/* Functions Definition ------------------------------------------------------*/ -/** - * @brief Enters Low Power Off Mode - * @param none - * @retval none - */ -void PWR_EnterOffMode( void ) -{ -/* USER CODE BEGIN PWR_EnterOffMode_1 */ - -/* USER CODE END PWR_EnterOffMode_1 */ - /** - * The systick should be disabled for the same reason than when the device enters stop mode because - * at this time, the device may enter either OffMode or StopMode. - */ - HAL_SuspendTick(); - - EnterLowPower(); - - /************************************************************************************ - * ENTER OFF MODE - ***********************************************************************************/ - /* - * There is no risk to clear all the WUF here because in the current implementation, this API is called - * in critical section. If an interrupt occurs while in that critical section before that point, - * the flag is set and will be cleared here but the system will not enter Off Mode - * because an interrupt is pending in the NVIC. The ISR will be executed when moving out - * of this critical section - */ - LL_PWR_ClearFlag_WU( ); - - LL_PWR_SetPowerMode( LL_PWR_MODE_STANDBY ); - - LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ - - /** - * This option is used to ensure that store operations are completed - */ -#if defined ( __CC_ARM) - __force_stores( ); -#endif - - __WFI(); - -/* USER CODE BEGIN PWR_EnterOffMode_2 */ - -/* USER CODE END PWR_EnterOffMode_2 */ - return; -} - -/** - * @brief Exits Low Power Off Mode - * @param none - * @retval none - */ -void PWR_ExitOffMode( void ) -{ -/* USER CODE BEGIN PWR_ExitOffMode_1 */ - -/* USER CODE END PWR_ExitOffMode_1 */ - HAL_ResumeTick(); -/* USER CODE BEGIN PWR_ExitOffMode_2 */ - -/* USER CODE END PWR_ExitOffMode_2 */ - return; -} - -/** - * @brief Enters Low Power Stop Mode - * @note ARM exists the function when waking up - * @param none - * @retval none - */ -void PWR_EnterStopMode( void ) -{ -/* USER CODE BEGIN PWR_EnterStopMode_1 */ - -/* USER CODE END PWR_EnterStopMode_1 */ - /** - * When HAL_DBGMCU_EnableDBGStopMode() is called to keep the debugger active in Stop Mode, - * the systick shall be disabled otherwise the cpu may crash when moving out from stop mode - * - * When in production, the HAL_DBGMCU_EnableDBGStopMode() is not called so that the device can reach best power consumption - * However, the systick should be disabled anyway to avoid the case when it is about to expire at the same time the device enters - * stop mode ( this will abort the Stop Mode entry ). - */ - HAL_SuspendTick(); - - /** - * This function is called from CRITICAL SECTION - */ - EnterLowPower(); - - /************************************************************************************ - * ENTER STOP MODE - ***********************************************************************************/ - LL_PWR_SetPowerMode( LL_PWR_MODE_STOP2 ); - - LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ - - /** - * This option is used to ensure that store operations are completed - */ -#if defined ( __CC_ARM) - __force_stores( ); -#endif - - __WFI(); - -/* USER CODE BEGIN PWR_EnterStopMode_2 */ - -/* USER CODE END PWR_EnterStopMode_2 */ - return; -} - -/** - * @brief Exits Low Power Stop Mode - * @note Enable the pll at 32MHz - * @param none - * @retval none - */ -void PWR_ExitStopMode( void ) -{ -/* USER CODE BEGIN PWR_ExitStopMode_1 */ - -/* USER CODE END PWR_ExitStopMode_1 */ - /** - * This function is called from CRITICAL SECTION - */ - ExitLowPower(); - - HAL_ResumeTick(); -/* USER CODE BEGIN PWR_ExitStopMode_2 */ - -/* USER CODE END PWR_ExitStopMode_2 */ - return; -} - -/** - * @brief Enters Low Power Sleep Mode - * @note ARM exits the function when waking up - * @param none - * @retval none - */ -void PWR_EnterSleepMode( void ) -{ -/* USER CODE BEGIN PWR_EnterSleepMode_1 */ - -/* USER CODE END PWR_EnterSleepMode_1 */ - - HAL_SuspendTick(); - - /************************************************************************************ - * ENTER SLEEP MODE - ***********************************************************************************/ - LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ - - /** - * This option is used to ensure that store operations are completed - */ -#if defined ( __CC_ARM) - __force_stores(); -#endif - - __WFI( ); -/* USER CODE BEGIN PWR_EnterSleepMode_2 */ - -/* USER CODE END PWR_EnterSleepMode_2 */ - return; -} - -/** - * @brief Exits Low Power Sleep Mode - * @note ARM exits the function when waking up - * @param none - * @retval none - */ -void PWR_ExitSleepMode( void ) -{ -/* USER CODE BEGIN PWR_ExitSleepMode_1 */ - -/* USER CODE END PWR_ExitSleepMode_1 */ - HAL_ResumeTick(); -/* USER CODE BEGIN PWR_ExitSleepMode_2 */ - -/* USER CODE END PWR_ExitSleepMode_2 */ - return; -} - -/************************************************************* - * - * LOCAL FUNCTIONS - * - *************************************************************/ -/** - * @brief Setup the system to enter either stop or off mode - * @param none - * @retval none - */ -static void EnterLowPower( void ) -{ - /** - * This function is called from CRITICAL SECTION - */ - - while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); - - if ( ! LL_HSEM_1StepLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID ) ) - { - if( LL_PWR_IsActiveFlag_C2DS() || LL_PWR_IsActiveFlag_C2SB() ) - { - /* Release ENTRY_STOP_MODE semaphore */ - LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ - Switch_On_HSI( ); - } - } - else - { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ - Switch_On_HSI( ); - } - - /* Release RCC semaphore */ - LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); - - return; -} - -/** - * @brief Restore the system to exit stop mode - * @param none - * @retval none - */ -static void ExitLowPower( void ) -{ - /* Release ENTRY_STOP_MODE semaphore */ - LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - - while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); - - if(LL_RCC_GetSysClkSource( ) == LL_RCC_SYS_CLKSOURCE_STATUS_HSI) - { -/* Restore the clock configuration of the application in this user section */ -/* USER CODE BEGIN ExitLowPower_1 */ - LL_RCC_HSE_Enable( ); - __HAL_FLASH_SET_LATENCY(FLASH_LATENCY_1); - while(!LL_RCC_HSE_IsReady( )); - LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSE); - while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSE); -/* USER CODE END ExitLowPower_1 */ - } - else - { -/* If the application is not running on HSE restore the clock configuration in this user section */ -/* USER CODE BEGIN ExitLowPower_2 */ - -/* USER CODE END ExitLowPower_2 */ - } - - /* Release RCC semaphore */ - LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); - - return; -} - -/** - * @brief Switch the system clock on HSI - * @param none - * @retval none - */ -static void Switch_On_HSI( void ) -{ - LL_RCC_HSI_Enable( ); - while(!LL_RCC_HSI_IsReady( )); - LL_RCC_SetSysClkSource( LL_RCC_SYS_CLKSOURCE_HSI ); - LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); - while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSI); - return; -} - -/* USER CODE BEGIN Private_Functions */ - -/* USER CODE END Private_Functions */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32wbxx_it.c deleted file mode 100644 index 8c7f63d4c..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm32wbxx_it.c +++ /dev/null @@ -1,188 +0,0 @@ -/** - ****************************************************************************** - * @file stm32wbxx_it.c - * @author MCD Application Team - * @brief Main Interrupt Service Routines. - * This file provides template for all exceptions handler and - * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - - -/* Includes ------------------------------------------------------------------*/ -#include "stm32wbxx_it.h" -#include "app_common.h" - -/* CONCURRENT MODE BLE/THREAD */ -/* External variables -----------------------------------------------------------*/ -extern uint8_t ThreadEnable; - -/* /THREAD */ - -/* Private typedef -----------------------------------------------------------*/ -/* Private define ------------------------------------------------------------*/ -/* Private macro -------------------------------------------------------------*/ -/* Private variables ---------------------------------------------------------*/ -/* Private function prototypes -----------------------------------------------*/ -/* Private functions ---------------------------------------------------------*/ - -/******************************************************************************/ -/* Cortex-M4 Processor Exceptions Handlers */ -/******************************************************************************/ - -/** - * @brief This function handles NMI exception. - * @param None - * @retval None - */ -void NMI_Handler(void) -{ -} - -/** - * @brief This function handles Hard Fault exception. - * @param None - * @retval None - */ -void HardFault_Handler(void) -{ - /* Go to infinite loop when Hard Fault exception occurs */ - while (1) - { - } -} - -/** - * @brief This function handles SVCall exception. - * @param None - * @retval None - */ -void SVC_Handler(void) -{ -} - -/** - * @brief This function handles Debug Monitor exception. - * @param None - * @retval None - */ -void DebugMon_Handler(void) -{ -} - -/** - * @brief This function handles PendSVC exception. - * @param None - * @retval None - */ -void PendSV_Handler(void) -{ -} - -/** - * @brief This function handles SysTick Handler. - * @param None - * @retval None - */ -void SysTick_Handler(void) -{ - HAL_IncTick(); -} - - void IPCC_C1_TX_IRQHandler(void) -{ - HW_IPCC_Tx_Handler(); - - return; -} - -void IPCC_C1_RX_IRQHandler(void) -{ - HW_IPCC_Rx_Handler(); - return; -} - -/** - * @brief This function handles External line - * interrupt request. - * @param None - * @retval None - */ -void PUSH_BUTTON_SW1_EXTI_IRQHandler(void) -{ - HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); -} - -void PUSH_BUTTON_SW2_EXTI_IRQHandler(void) -{ - HAL_GPIO_EXTI_IRQHandler(BUTTON_SW2_PIN); -} - -void PUSH_BUTTON_SW3_EXTI_IRQHandler(void) -{ - HAL_GPIO_EXTI_IRQHandler(BUTTON_SW3_PIN); -} - -#if(CFG_HW_USART1_ENABLED == 1) -void USART1_IRQHandler(void) -{ - HW_UART_Interrupt_Handler(hw_uart1); -} -#endif - -#if(CFG_HW_USART1_DMA_TX_SUPPORTED == 1) -void CFG_HW_USART1_DMA_TX_IRQHandler( void ) -{ - HW_UART_DMA_Interrupt_Handler(hw_uart1); -} -#endif - -#if(CFG_HW_LPUART1_ENABLED == 1) -void LPUART1_IRQHandler(void) -{ - HW_UART_Interrupt_Handler(hw_lpuart1); -} -#endif - -#if(CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) -void CFG_HW_LPUART1_DMA_TX_IRQHandler( void ) -{ - HW_UART_DMA_Interrupt_Handler(hw_lpuart1); -} -#endif - - -/******************************************************************************/ -/* STM32L0xx Peripherals Interrupt Handlers */ -/* Add here the Interrupt Handler for the used peripheral(s) (PPP), for the */ -/* available peripheral interrupt handler's name please refer to the startup */ -/* file (startup_stm32l0xx.s). */ -/******************************************************************************/ -/** - * @brief This function handles RTC Auto wake-up interrupt request. - * @param None - * @retval None - */ -void RTC_WKUP_IRQHandler(void) -{ - HW_TS_RTC_Wakeup_Handler(); -} - - - - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm_logging.c deleted file mode 100644 index 485e84742..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/stm_logging.c +++ /dev/null @@ -1,213 +0,0 @@ - -/** - ****************************************************************************** - * @file stm_logging.c - * @author MCD Application Team - * @brief This file contains all the defines and functions used for logging - * on Application examples. - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/** - * @file - * This file implements logging functions to used in Application examples. - * - */ - -#include -#include -#include -#include -#include -#include - -#include "app_conf.h" -#include "stm_logging.h" - -#define LOG_PARSE_BUFFER_SIZE 256U - -#define LOG_TIMESTAMP_ENABLE 0 -#define LOG_REGION_ENABLE 1U -#define LOG_RTT_COLOR_ENABLE 1U - -#if (LOG_RTT_COLOR_ENABLE == 1U) -#define RTT_COLOR_CODE_DEFAULT "\x1b[0m" -#define RTT_COLOR_CODE_RED "\x1b[0;91m" -#define RTT_COLOR_CODE_GREEN "\x1b[0;92m" -#define RTT_COLOR_CODE_YELLOW "\x1b[0;93m" -#define RTT_COLOR_CODE_CYAN "\x1b[0;96m" - -#else /* LOG_RTT_COLOR_ENABLE == 1 */ -#define RTT_COLOR_CODE_DEFAULT "" -#define RTT_COLOR_CODE_RED "" -#define RTT_COLOR_CODE_GREEN "" -#define RTT_COLOR_CODE_YELLOW "" -#define RTT_COLOR_CODE_CYAN "" -#endif /* LOG_RTT_COLOR_ENABLE == 1 */ - -#if (CFG_DEBUG_TRACE != 0) -/** - * Function for outputting code region string. - * - * @param[inout] aLogString Pointer to log buffer. - * @param[in] aMaxSize Maximum size of log buffer. - * @param[in] otLogRegion The region ID. - * - * @returns String with a log level color value. - */ -static inline uint16_t logRegion(char *aLogString, uint16_t aMaxSize, - appliLogRegion_t aLogRegion) -{ - char logRegionString[30U]; - - switch (aLogRegion) - { - case APPLI_LOG_REGION_GENERAL: - strcpy(logRegionString, "[M4 APPLICATION]"); - break; - case APPLI_LOG_REGION_OPENTHREAD_API: - strcpy(logRegionString, "[M4 OPENTHREAD API]"); - break; - case APPLI_LOG_REGION_OT_API_LINK: - strcpy(logRegionString, "[M4 LINK API]"); - break; - case APPLI_LOG_REGION_OT_API_INSTANCE: - strcpy(logRegionString, "[M4 INSTANCE API]"); - break; - case APPLI_LOG_REGION_OT_API_MESSAGE: - strcpy(logRegionString, "[M4 MESSAGE API]"); - break; - default: - strcpy(logRegionString, "[M4]"); - break; - } - - return snprintf(aLogString, aMaxSize, "%s ", logRegionString); -} -#endif /* CFG_DEBUG_TRACE */ - -#if (LOG_RTT_COLOR_ENABLE == 1U) -#if (CFG_DEBUG_TRACE != 0) -/** - * Function for getting color of a given level log. - * - * @param[in] aLogLevel The log level. - * - * @returns String with a log level color value. - */ -static inline const char *levelToString(appliLogLevel_t aLogLevel) -{ - switch (aLogLevel) - { - case LOG_LEVEL_CRIT: - return RTT_COLOR_CODE_RED; - - case LOG_LEVEL_WARN: - return RTT_COLOR_CODE_YELLOW; - - case LOG_LEVEL_INFO: - return RTT_COLOR_CODE_GREEN; - - case LOG_LEVEL_DEBG: - default: - return RTT_COLOR_CODE_DEFAULT; - } -} -#endif /* CFG_DEBUG_TRACE */ - -#if (CFG_DEBUG_TRACE != 0) -/** - * Function for printing log level. - * - * @param[inout] aLogString Pointer to log buffer. - * @param[in] aMaxSize Maximum size of log buffer. - * @param[in] aLogLevel Log level. - * - * @returns Number of bytes successfully written to the log buffer. - */ -static inline uint16_t logLevel(char *aLogString, uint16_t aMaxSize, - appliLogLevel_t aLogLevel) -{ - return snprintf(aLogString, aMaxSize, "%s", levelToString(aLogLevel)); -} -#endif /* CFG_DEBUG_TRACE */ -#endif /* LOG_RTT_COLOR_ENABLE */ - -#if (LOG_TIMESTAMP_ENABLE == 1U) -/** - * Function for printing actual timestamp. - * - * @param[inout] aLogString Pointer to the log buffer. - * @param[in] aMaxSize Maximum size of the log buffer. - * - * @returns Number of bytes successfully written to the log buffer. - */ -static inline uint16_t logTimestamp(char *aLogString, uint16_t aMaxSize) -{ - return snprintf(aLogString, aMaxSize, "%s[%010ld]", RTT_COLOR_CODE_DEFAULT, - otPlatAlarmMilliGetNow()); -} -#endif /* LOG_TIMESTAMP_ENABLE */ - -/** - * Function for printing application log - * - * @param[in] aLogLevel Log level. - * @param[in] aLogRegion The region ID. - * @param[in] aFormat User string format. - * - * @returns Number of bytes successfully written to the log buffer. - */ -void logApplication(appliLogLevel_t aLogLevel, appliLogRegion_t aLogRegion, const char *aFormat, ...) -{ -#if (CFG_DEBUG_TRACE != 0) /* Since the traces are disabled, there is nothing to print */ - uint16_t length = 0; - char logString[LOG_PARSE_BUFFER_SIZE + 1U]; - -#if (LOG_TIMESTAMP_ENABLE == 1U) - length += logTimestamp(logString, LOG_PARSE_BUFFER_SIZE); -#endif - -#if (LOG_RTT_COLOR_ENABLE == 1U) - /* Add level information */ - length += logLevel(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), - aLogLevel); -#endif - -#if (LOG_REGION_ENABLE == 1U) - /* Add Region information */ - length += logRegion(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), - aLogRegion); -#endif - - /* Parse user string */ - va_list paramList; - va_start(paramList, aFormat); - length += vsnprintf(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), - aFormat, paramList); - logString[length++] = '\r'; - logString[length++] = '\n'; - logString[length++] = 0; - va_end(paramList); - - if (aLogLevel <= APPLI_CONFIG_LOG_LEVEL) - { - printf("%s", logString); - }else - { - /* Print nothing */ - } -#endif /* CFG_DEBUG_TRACE */ -} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/system_stm32wbxx.c deleted file mode 100644 index f24d74b56..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/Core/Src/system_stm32wbxx.c +++ /dev/null @@ -1,343 +0,0 @@ -/** - ****************************************************************************** - * @file system_stm32wbxx.c - * @author MCD Application Team - * @brief CMSIS Cortex Device Peripheral Access Layer System Source File - * - * This file provides two functions and one global variable to be called from - * user application: - * - SystemInit(): This function is called at startup just after reset and - * before branch to main program. This call is made inside - * the "startup_stm32wbxx.s" file. - * - * - SystemCoreClock variable: Contains the core clock (HCLK), it can be used - * by the user application to setup the SysTick - * timer or configure other parameters. - * - * - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must - * be called whenever the core clock is changed - * during program execution. - * - * After each device reset the MSI (4 MHz) is used as system clock source. - * Then SystemInit() function is called, in "startup_stm32wbxx.s" file, to - * configure the system clock before to branch to main program. - * - * This file configures the system clock as follows: - *============================================================================= - *----------------------------------------------------------------------------- - * System Clock source | MSI - *----------------------------------------------------------------------------- - * SYSCLK(Hz) | 4000000 - *----------------------------------------------------------------------------- - * HCLK(Hz) | 4000000 - *----------------------------------------------------------------------------- - * AHB Prescaler | 1 - *----------------------------------------------------------------------------- - * APB1 Prescaler | 1 - *----------------------------------------------------------------------------- - * APB2 Prescaler | 1 - *----------------------------------------------------------------------------- - * PLL_M | 1 - *----------------------------------------------------------------------------- - * PLL_N | 8 - *----------------------------------------------------------------------------- - * PLL_P | 7 - *----------------------------------------------------------------------------- - * PLL_Q | 2 - *----------------------------------------------------------------------------- - * PLL_R | 2 - *----------------------------------------------------------------------------- - * PLLSAI1_P | NA - *----------------------------------------------------------------------------- - * PLLSAI1_Q | NA - *----------------------------------------------------------------------------- - * PLLSAI1_R | NA - *----------------------------------------------------------------------------- - * Require 48MHz for USB OTG FS, | Disabled - * SDIO and RNG clock | - *----------------------------------------------------------------------------- - *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32WBxx_system - * @{ - */ - -/** @addtogroup stm32WBxx_System_Private_Includes - * @{ - */ - -#include "app_common.h" -#include "otp.h" - -#if !defined (HSE_VALUE) - #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ -#endif /* HSE_VALUE */ - -#if !defined (MSI_VALUE) - #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ -#endif /* MSI_VALUE */ - -#if !defined (HSI_VALUE) - #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ -#endif /* HSI_VALUE */ - -#if !defined (LSI_VALUE) - #define LSI_VALUE (32000UL) /*!< Value of LSI in Hz*/ -#endif /* LSI_VALUE */ - -#if !defined (LSE_VALUE) - #define LSE_VALUE (32768UL) /*!< Value of LSE in Hz*/ -#endif /* LSE_VALUE */ - -/** - * @} - */ - -/** @addtogroup STM32WBxx_System_Private_TypesDefinitions - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32WBxx_System_Private_Defines - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32WBxx_System_Private_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32WBxx_System_Private_Variables - * @{ - */ -/* The SystemCoreClock variable is updated in three ways: - 1) by calling CMSIS function SystemCoreClockUpdate() - 2) by calling HAL API function HAL_RCC_GetHCLKFreq() - 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency - Note: If you use this function to configure the system clock; then there - is no need to call the 2 first functions listed above, since SystemCoreClock - variable is updated automatically. - */ - uint32_t SystemCoreClock = 4000000UL ; /*CPU1: M4 on MSI clock after startup (4MHz)*/ - - const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL}; - - const uint32_t APBPrescTable[8UL] = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL}; - -const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ - 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ - - const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ - {2UL,6UL,4UL,3UL,2UL,4UL}, \ - {4UL,12UL,8UL,6UL,4UL,8UL}, \ - {4UL,12UL,8UL,6UL,4UL,8UL}}; - -/** - * @} - */ - - /** @addtogroup STM32WBxx_System_Private_FunctionPrototypes - * @{ - */ - - /** - * @} - */ - - /** @addtogroup STM32WBxx_System_Private_Functions - * @{ - */ - -/** - * @brief Setup the microcontroller system. - * @param None - * @retval None - */ -void SystemInit(void) -{ - OTP_ID0_t * p_otp; - - /* FPU settings ------------------------------------------------------------*/ -#if (__FPU_PRESENT == 1) && (__FPU_USED == 1) - SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL))); /* set CP10 and CP11 Full Access */ -#endif - - /** - * Read HSE_Tuning from OTP - */ - p_otp = (OTP_ID0_t *) OTP_Read(0); - if (p_otp) - { - LL_RCC_HSE_SetCapacitorTuning(p_otp->hse_tuning); - } - - LL_RCC_HSE_Enable(); - - /** - * Set FLASH latency to 1WS - */ - LL_FLASH_SetLatency( LL_FLASH_LATENCY_1 ); - while( LL_FLASH_GetLatency() != LL_FLASH_LATENCY_1 ); - - /** - * Switch to HSE - * - */ - while(!LL_RCC_HSE_IsReady()); - LL_RCC_SetSysClkSource( LL_RCC_SYS_CLKSOURCE_HSE ); - while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSE); - - /** - * Switch OFF MSI - */ - LL_RCC_MSI_Disable(); -} - -/** - * @brief Update SystemCoreClock variable according to Clock Register Values. - * The SystemCoreClock variable contains the core clock (HCLK), it can - * be used by the user application to setup the SysTick timer or configure - * other parameters. - * - * @note Each time the core clock (HCLK) changes, this function must be called - * to update SystemCoreClock variable value. Otherwise, any configuration - * based on this variable will be incorrect. - * - * @note - The system frequency computed by this function is not the real - * frequency in the chip. It is calculated based on the predefined - * constant and the selected clock source: - * - * - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*) - * - * - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**) - * - * - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***) - * - * - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***) - * or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors. - * - * (*) MSI_VALUE is a constant defined in stm32wbxx_hal.h file (default value - * 4 MHz) but the real value may vary depending on the variations - * in voltage and temperature. - * - * (**) HSI_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value - * 16 MHz) but the real value may vary depending on the variations - * in voltage and temperature. - * - * (***) HSE_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value - * 32 MHz), user has to ensure that HSE_VALUE is same as the real - * frequency of the crystal used. Otherwise, this function may - * have wrong result. - * - * - The result of this function could be not correct when using fractional - * value for HSE crystal. - * - * @param None - * @retval None - */ -void SystemCoreClockUpdate(void) -{ - uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm; - - /* Get MSI Range frequency--------------------------------------------------*/ - - /*MSI frequency range in Hz*/ - msirange = MSIRangeTable[(RCC->CR & RCC_CR_MSIRANGE) >> RCC_CR_MSIRANGE_Pos]; - - /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/ - /* Get SYSCLK source -------------------------------------------------------*/ - switch (RCC->CFGR & RCC_CFGR_SWS) - { - case 0x00: /* MSI used as system clock source */ - SystemCoreClock = msirange; - break; - - case 0x04: /* HSI used as system clock source */ - /* HSI used as system clock source */ - SystemCoreClock = HSI_VALUE; - break; - - case 0x08: /* HSE used as system clock source */ - SystemCoreClock = HSE_VALUE; - break; - - case 0x0C: /* PLL used as system clock source */ - /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN - SYSCLK = PLL_VCO / PLLR - */ - pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC); - pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ; - - if(pllsource == 0x02UL) /* HSI used as PLL clock source */ - { - pllvco = (HSI_VALUE / pllm); - } - else if(pllsource == 0x03UL) /* HSE used as PLL clock source */ - { - pllvco = (HSE_VALUE / pllm); - } - else /* MSI used as PLL clock source */ - { - pllvco = (msirange / pllm); - } - - pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos); - pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL); - - SystemCoreClock = pllvco/pllr; - break; - - default: - SystemCoreClock = msirange; - break; - } - - /* Compute HCLK clock frequency --------------------------------------------*/ - /* Get HCLK1 prescaler */ - tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)]; - /* HCLK clock frequency */ - SystemCoreClock = SystemCoreClock / tmp; - -} - - -/** - * @} - */ - -/** - * @} - */ - -/** - * @} - */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewd b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewd deleted file mode 100644 index e003f2767..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewd +++ /dev/null @@ -1,1419 +0,0 @@ - - - 3 - - ble_zigbee_static - - ARM - - 0 - - C-SPY - 2 - - 29 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ARMSIM_ID - 2 - - 1 - 1 - 0 - - - - - - - - CADI_ID - 2 - - 0 - 1 - 0 - - - - - - - - - CMSISDAP_ID - 2 - - 4 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GDBSERVER_ID - 2 - - 0 - 1 - 0 - - - - - - - - - - - IJET_ID - 2 - - 8 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JLINK_ID - 2 - - 16 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LMIFTDI_ID - 2 - - 2 - 1 - 0 - - - - - - - - - - PEMICRO_ID - 2 - - 3 - 1 - 0 - - - - - - - - STLINK_ID - 2 - - 4 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - THIRDPARTY_ID - 2 - - 0 - 1 - 0 - - - - - - - - TIFET_ID - 2 - - 1 - 1 - 0 - - - - - - - - - - - - - - - - - - - XDS100_ID - 2 - - 6 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin - 0 - - - $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin - 1 - - - $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin - 0 - - - $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin - 0 - - - $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin - 0 - - - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewp deleted file mode 100644 index bd2aeffc9..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.ewp +++ /dev/null @@ -1,1325 +0,0 @@ - - - 3 - - ble_zigbee_static - - ARM - - 0 - - General - 3 - - 30 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 34 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 0 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 20 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 0 - - - - - - - BILINK - 0 - - - - - Application - - EWARM - - $PROJ_DIR$\startup_stm32wb55xx_cm4.s - - - - User - - Core - - src - - $PROJ_DIR$\..\Core\Src\app_entry.c - - - $PROJ_DIR$\..\Core\Src\hw_timerserver.c - - - $PROJ_DIR$\..\Core\Src\hw_uart.c - - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c - - - $PROJ_DIR$\..\Core\Src\stm_logging.c - - - $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c - - - - - STM32_WPAN - - app - - $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c - - - $PROJ_DIR$\..\STM32_WPAN\App\app_zigbee.c - - - $PROJ_DIR$\..\STM32_WPAN\App\p2p_server_app.c - - - - target - - $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c - - - - - - - Doc - - $PROJ_DIR$\..\readme.txt - - - - Drivers - - BSP - - P-NUCLEO-WB55.Nucleo - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c - - - - - CMSIS - - - STM32WBxx_HAL_Driver - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c - - - - - Middlewares - - STM32_WPAN - - ble - - blesvc - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\p2p_stm.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c - - - - core - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c - - - - - interface - - patterns - - ble_thread - - shci - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c - - - - tl - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_zigbee_hci.c - - - - - - - utilities - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c - - - - zigbee - - core - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\zigbee\core\src\zigbee_core_wb.c - - - - platform - - - stack - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\zigbee\lib\stm32wb_zigbee_wb_lib.a - - - - - - - Utilities - - lpm - - tiny_lpm - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c - - - - - sequencer - - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c - - - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.eww b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.eww deleted file mode 100644 index b569c9a9d..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/ble_zigbee_static.eww +++ /dev/null @@ -1,7 +0,0 @@ - - - - $WS_DIR$\ble_zigbee_static.ewp - - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/startup_stm32wb55xx_cm4.s deleted file mode 100644 index 79b0e7edd..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/startup_stm32wb55xx_cm4.s +++ /dev/null @@ -1,528 +0,0 @@ -;/********************* COPYRIGHT(c) 2019 STMicroelectronics ******************** -;* File Name : startup_stm32wb55xx_cm4.s -;* Author : MCD Application Team -;* Description : M4 core vector table of the STM32WB55xx devices for the -;* IAR (EWARM) toolchain. -;* -;* This module performs: -;* - Set the initial SP -;* - Set the initial PC == _iar_program_start, -;* - Set the vector table entries with the exceptions ISR -;* address. -;* - Branches to main in the C library (which eventually -;* calls main()). -;* After Reset the Cortex-M4 processor is in Thread mode, -;* priority is Privileged, and the Stack is set to Main. -;******************************************************************************** -;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. -;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;* -;******************************************************************************* -; -; -; The modules in this file are included in the libraries, and may be replaced -; by any user-defined modules that define the PUBLIC symbol _program_start or -; a user defined start symbol. -; To override the cstartup defined in the library, simply add your modified -; version to the workbench project. -; -; The vector table is normally located at address 0. -; When debugging in RAM, it can be located in RAM, aligned to at least 2^6. -; The name "__vector_table" has special meaning for C-SPY: -; it is where the SP start value is found, and the NVIC vector -; table register (VTOR) is initialized to this address if != 0. -; -; Cortex-M version -; - - MODULE ?cstartup - - ;; Forward declaration of sections. - SECTION CSTACK:DATA:NOROOT(3) - - SECTION .intvec:CODE:NOROOT(2) - - EXTERN __iar_program_start - EXTERN SystemInit - PUBLIC __vector_table - - DATA -__vector_table - DCD sfe(CSTACK) - DCD Reset_Handler ; Reset Handler - - DCD NMI_Handler ; NMI Handler - DCD HardFault_Handler ; Hard Fault Handler - DCD MemManage_Handler ; MPU Fault Handler - DCD BusFault_Handler ; Bus Fault Handler - DCD UsageFault_Handler ; Usage Fault Handler - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD SVC_Handler ; SVCall Handler - DCD DebugMon_Handler ; Debug Monitor Handler - DCD 0 ; Reserved - DCD PendSV_Handler ; PendSV Handler - DCD SysTick_Handler ; SysTick Handler - - ; External Interrupts - DCD WWDG_IRQHandler ; Window WatchDog - DCD PVD_PVM_IRQHandler ; PVD and PVM detector - DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper and TimeStamp Interrupts and LSECSS Interrupts - DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt - DCD FLASH_IRQHandler ; FLASH global Interrupt - DCD RCC_IRQHandler ; RCC Interrupt - DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt - DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt - DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup - DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt - DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt - DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt - DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt - DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt - DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt - DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt - DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt - DCD ADC1_IRQHandler ; ADC1 Interrupt - DCD USB_HP_IRQHandler ; USB High Priority Interrupt - DCD USB_LP_IRQHandler ; USB Low Priority Interrupt - DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt - DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts - DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt - DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt - DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts - DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts - DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt - DCD TIM2_IRQHandler ; TIM2 Global Interrupt - DCD PKA_IRQHandler ; PKA Interrupt - DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt - DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt - DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt - DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt - DCD SPI1_IRQHandler ; SPI1 Interrupt - DCD SPI2_IRQHandler ; SPI2 Interrupt - DCD USART1_IRQHandler ; USART1 Interrupt - DCD LPUART1_IRQHandler ; LPUART1 Interrupt - DCD SAI1_IRQHandler ; SAI Interrupt - DCD TSC_IRQHandler ; TSC Interrupt - DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts - DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt - DCD USB_FS_WKUP_CRS_IRQHandler ; USB Full speed wakeup - DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR - DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt - DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt - DCD HSEM_IRQHandler ; HSEM0 Interrupt - DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt - DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt - DCD LCD_IRQHandler ; LCD Interrupt - DCD QUADSPI_IRQHandler ; QUADSPI Interrupt - DCD AES1_IRQHandler ; AES1 Interrupt - DCD AES2_IRQHandler ; AES2 Interrupt - DCD RNG_IRQHandler ; RNG1 Interrupt - DCD FPU_IRQHandler ; FPU Interrupt - DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt - DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt - DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt - DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt - DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt - DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt - DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt - DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;; Default interrupt handlers. -;; - THUMB - PUBWEAK Reset_Handler - SECTION .text:CODE:NOROOT:REORDER(2) -Reset_Handler - LDR R0, =SystemInit - BLX R0 - LDR R0, =__iar_program_start - BX R0 - - PUBWEAK NMI_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -NMI_Handler - B NMI_Handler - - PUBWEAK HardFault_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -HardFault_Handler - B HardFault_Handler - - PUBWEAK MemManage_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -MemManage_Handler - B MemManage_Handler - - PUBWEAK BusFault_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -BusFault_Handler - B BusFault_Handler - - PUBWEAK UsageFault_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -UsageFault_Handler - B UsageFault_Handler - - PUBWEAK SVC_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -SVC_Handler - B SVC_Handler - - PUBWEAK DebugMon_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -DebugMon_Handler - B DebugMon_Handler - - PUBWEAK PendSV_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -PendSV_Handler - B PendSV_Handler - - PUBWEAK SysTick_Handler - SECTION .text:CODE:NOROOT:REORDER(1) -SysTick_Handler - B SysTick_Handler - - PUBWEAK WWDG_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -WWDG_IRQHandler - B WWDG_IRQHandler - - PUBWEAK PVD_PVM_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -PVD_PVM_IRQHandler - B PVD_PVM_IRQHandler - - PUBWEAK TAMP_STAMP_LSECSS_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -TAMP_STAMP_LSECSS_IRQHandler - B TAMP_STAMP_LSECSS_IRQHandler - - PUBWEAK RTC_WKUP_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -RTC_WKUP_IRQHandler - B RTC_WKUP_IRQHandler - - PUBWEAK FLASH_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -FLASH_IRQHandler - B FLASH_IRQHandler - - PUBWEAK RCC_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -RCC_IRQHandler - B RCC_IRQHandler - - PUBWEAK EXTI0_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -EXTI0_IRQHandler - B EXTI0_IRQHandler - - PUBWEAK EXTI1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -EXTI1_IRQHandler - B EXTI1_IRQHandler - - PUBWEAK EXTI2_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -EXTI2_IRQHandler - B EXTI2_IRQHandler - - PUBWEAK EXTI3_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -EXTI3_IRQHandler - B EXTI3_IRQHandler - - PUBWEAK EXTI4_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -EXTI4_IRQHandler - B EXTI4_IRQHandler - - PUBWEAK DMA1_Channel1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA1_Channel1_IRQHandler - B DMA1_Channel1_IRQHandler - - PUBWEAK DMA1_Channel2_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA1_Channel2_IRQHandler - B DMA1_Channel2_IRQHandler - - PUBWEAK DMA1_Channel3_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA1_Channel3_IRQHandler - B DMA1_Channel3_IRQHandler - - PUBWEAK DMA1_Channel4_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA1_Channel4_IRQHandler - B DMA1_Channel4_IRQHandler - - PUBWEAK DMA1_Channel5_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA1_Channel5_IRQHandler - B DMA1_Channel5_IRQHandler - - PUBWEAK DMA1_Channel6_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA1_Channel6_IRQHandler - B DMA1_Channel6_IRQHandler - - PUBWEAK DMA1_Channel7_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA1_Channel7_IRQHandler - B DMA1_Channel7_IRQHandler - - PUBWEAK ADC1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -ADC1_IRQHandler - B ADC1_IRQHandler - - PUBWEAK USB_HP_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -USB_HP_IRQHandler - B USB_HP_IRQHandler - - PUBWEAK USB_LP_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -USB_LP_IRQHandler - B USB_LP_IRQHandler - - PUBWEAK C2SEV_PWR_C2H_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -C2SEV_PWR_C2H_IRQHandler - B C2SEV_PWR_C2H_IRQHandler - - PUBWEAK COMP_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -COMP_IRQHandler - B COMP_IRQHandler - - PUBWEAK EXTI9_5_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -EXTI9_5_IRQHandler - B EXTI9_5_IRQHandler - - PUBWEAK TIM1_BRK_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -TIM1_BRK_IRQHandler - B TIM1_BRK_IRQHandler - - PUBWEAK TIM1_UP_TIM16_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -TIM1_UP_TIM16_IRQHandler - B TIM1_UP_TIM16_IRQHandler - - PUBWEAK TIM1_TRG_COM_TIM17_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -TIM1_TRG_COM_TIM17_IRQHandler - B TIM1_TRG_COM_TIM17_IRQHandler - - PUBWEAK TIM1_CC_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -TIM1_CC_IRQHandler - B TIM1_CC_IRQHandler - - PUBWEAK TIM2_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -TIM2_IRQHandler - B TIM2_IRQHandler - - PUBWEAK PKA_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -PKA_IRQHandler - B PKA_IRQHandler - - PUBWEAK I2C1_EV_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -I2C1_EV_IRQHandler - B I2C1_EV_IRQHandler - - PUBWEAK I2C1_ER_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -I2C1_ER_IRQHandler - B I2C1_ER_IRQHandler - - PUBWEAK I2C3_EV_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -I2C3_EV_IRQHandler - B I2C3_EV_IRQHandler - - PUBWEAK I2C3_ER_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -I2C3_ER_IRQHandler - B I2C3_ER_IRQHandler - - PUBWEAK SPI1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -SPI1_IRQHandler - B SPI1_IRQHandler - - PUBWEAK SPI2_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -SPI2_IRQHandler - B SPI2_IRQHandler - - PUBWEAK USART1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -USART1_IRQHandler - B USART1_IRQHandler - - PUBWEAK LPUART1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -LPUART1_IRQHandler - B LPUART1_IRQHandler - - PUBWEAK SAI1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -SAI1_IRQHandler - B SAI1_IRQHandler - - PUBWEAK TSC_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -TSC_IRQHandler - B TSC_IRQHandler - - PUBWEAK EXTI15_10_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -EXTI15_10_IRQHandler - B EXTI15_10_IRQHandler - - PUBWEAK RTC_Alarm_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -RTC_Alarm_IRQHandler - B RTC_Alarm_IRQHandler - - PUBWEAK USB_FS_WKUP_CRS_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -USB_FS_WKUP_CRS_IRQHandler - B USB_FS_WKUP_CRS_IRQHandler - - PUBWEAK PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler - B PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler - - PUBWEAK IPCC_C1_RX_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -IPCC_C1_RX_IRQHandler - B IPCC_C1_RX_IRQHandler - - PUBWEAK IPCC_C1_TX_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -IPCC_C1_TX_IRQHandler - B IPCC_C1_TX_IRQHandler - - PUBWEAK HSEM_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -HSEM_IRQHandler - B HSEM_IRQHandler - - PUBWEAK LPTIM1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -LPTIM1_IRQHandler - B LPTIM1_IRQHandler - - PUBWEAK LPTIM2_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -LPTIM2_IRQHandler - B LPTIM2_IRQHandler - - PUBWEAK LCD_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -LCD_IRQHandler - B LCD_IRQHandler - - PUBWEAK QUADSPI_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -QUADSPI_IRQHandler - B QUADSPI_IRQHandler - - PUBWEAK AES1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -AES1_IRQHandler - B AES1_IRQHandler - - PUBWEAK AES2_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -AES2_IRQHandler - B AES2_IRQHandler - - PUBWEAK RNG_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -RNG_IRQHandler - B RNG_IRQHandler - - PUBWEAK FPU_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -FPU_IRQHandler - B FPU_IRQHandler - - PUBWEAK DMA2_Channel1_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA2_Channel1_IRQHandler - B DMA2_Channel1_IRQHandler - - PUBWEAK DMA2_Channel2_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA2_Channel2_IRQHandler - B DMA2_Channel2_IRQHandler - - PUBWEAK DMA2_Channel3_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA2_Channel3_IRQHandler - B DMA2_Channel3_IRQHandler - - PUBWEAK DMA2_Channel4_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA2_Channel4_IRQHandler - B DMA2_Channel4_IRQHandler - - PUBWEAK DMA2_Channel5_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA2_Channel5_IRQHandler - B DMA2_Channel5_IRQHandler - - PUBWEAK DMA2_Channel6_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA2_Channel6_IRQHandler - B DMA2_Channel6_IRQHandler - - PUBWEAK DMA2_Channel7_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMA2_Channel7_IRQHandler - B DMA2_Channel7_IRQHandler - - PUBWEAK DMAMUX1_OVR_IRQHandler - SECTION .text:CODE:NOROOT:REORDER(1) -DMAMUX1_OVR_IRQHandler - B DMAMUX1_OVR_IRQHandler - END - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/stm32wb55xx_flash_cm4.icf deleted file mode 100644 index 929735cb1..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/EWARM/stm32wb55xx_flash_cm4.icf +++ /dev/null @@ -1,42 +0,0 @@ -/*###ICF### Section handled by ICF editor, don't touch! ****/ -/*-Editor annotation file-*/ -/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ -/*-Specials-*/ -define symbol __ICFEDIT_intvec_start__ = 0x08000000; -/*-Memory Regions-*/ -/***** FLASH Part dedicated to M4 *****/ -define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; -define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; -define symbol __ICFEDIT_region_RAM_end__ = 0x20025FFF; - -/*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 138400; -/* 102400; Heap increased for Zigbee */ -/**** End of ICF editor section. ###ICF###*/ - -define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; - -define memory mem with size = 4G; -define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; -define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; - -define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; -define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; - -/* MB_MEM1 and MB_MEM2 are sections reserved to mailbox communication. It is placed in the shared memory */ -initialize by copy { readwrite }; -do not initialize { section .noinit, - section MAPPING_TABLE, - section MB_MEM1 }; - -place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; - -place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; -place in RAM_SHARED_region { section MB_MEM1}; -place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvoptx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvoptx deleted file mode 100644 index adab50113..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvoptx +++ /dev/null @@ -1,985 +0,0 @@ - - - - 1.0 - -
                                                                  ### uVision Project, (C) Keil Software
                                                                  - - - *.c - *.s*; *.src; *.a* - *.obj; *.o - *.lib - *.txt; *.h; *.inc - *.plm - *.cpp - 0 - - - - 0 - 0 - - - - ble_zigbee_static - 0x4 - ARM-ADS - - 12000000 - - 1 - 1 - 0 - 1 - 0 - - - 1 - 65535 - 0 - 0 - 0 - - - 79 - 66 - 8 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - 0 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - - - 1 - 0 - 1 - - 18 - - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - 1 - 0 - 0 - 6 - - - - - - - - - - - STLink\ST-LINKIII-KEIL_SWO.dll - - - - 0 - UL2CM3 - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4 -FS08000000 -FL01000000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM)) - - - 0 - ST-LINKIII-KEIL_SWO - -U-O142 -O2254 -S0 -C0 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM) - - - - - 0 - - - 0 - 1 - 1 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - - - - 0 - 0 - 0 - - - - - - - - - - - - - Application/MDK-ARM - 0 - 0 - 0 - 0 - - 1 - 1 - 2 - 0 - 0 - 0 - startup_stm32wb55xx_cm4.s - startup_stm32wb55xx_cm4.s - 0 - 0 - - - - - Application/User/Core/src - 0 - 0 - 0 - 0 - - 2 - 2 - 1 - 0 - 0 - 0 - ../Core/Src/app_entry.c - app_entry.c - 0 - 0 - - - 2 - 3 - 1 - 0 - 0 - 0 - ../Core/Src/hw_timerserver.c - hw_timerserver.c - 0 - 0 - - - 2 - 4 - 1 - 0 - 0 - 0 - ../Core/Src/hw_uart.c - hw_uart.c - 0 - 0 - - - 2 - 5 - 1 - 0 - 0 - 0 - ../Core/Src/main.c - main.c - 0 - 0 - - - 2 - 6 - 1 - 0 - 0 - 0 - ../Core/Src/stm32_lpm_if.c - stm32_lpm_if.c - 0 - 0 - - - 2 - 7 - 1 - 0 - 0 - 0 - ../Core/Src/stm32wbxx_it.c - stm32wbxx_it.c - 0 - 0 - - - 2 - 8 - 1 - 0 - 0 - 0 - ../Core/Src/stm_logging.c - stm_logging.c - 0 - 0 - - - 2 - 9 - 1 - 0 - 0 - 0 - ../Core/Src/system_stm32wbxx.c - system_stm32wbxx.c - 0 - 0 - - - - - Application/User/STM32_WPAN/app - 0 - 0 - 0 - 0 - - 3 - 10 - 1 - 0 - 0 - 0 - ../STM32_WPAN/App/app_ble.c - app_ble.c - 0 - 0 - - - 3 - 11 - 1 - 0 - 0 - 0 - ../STM32_WPAN/App/app_zigbee.c - app_zigbee.c - 0 - 0 - - - 3 - 12 - 1 - 0 - 0 - 0 - ../STM32_WPAN/App/p2p_server_app.c - p2p_server_app.c - 0 - 0 - - - - - Application/User/STM32_WPAN/target - 0 - 0 - 0 - 0 - - 4 - 13 - 1 - 0 - 0 - 0 - ../STM32_WPAN/Target/hw_ipcc.c - hw_ipcc.c - 0 - 0 - - - - - Doc - 0 - 0 - 0 - 0 - - 5 - 14 - 5 - 0 - 0 - 0 - ../readme.txt - readme.txt - 0 - 0 - - - - - Drivers/BSP/P-NUCLEO-WB55.Nucleo - 0 - 0 - 0 - 0 - - 6 - 15 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c - stm32wbxx_nucleo.c - 0 - 0 - - - - - Drivers/STM32WBxx_HAL_Driver - 0 - 0 - 0 - 0 - - 7 - 16 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c - stm32wbxx_hal.c - 0 - 0 - - - 7 - 17 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c - stm32wbxx_hal_cortex.c - 0 - 0 - - - 7 - 18 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c - stm32wbxx_hal_dma.c - 0 - 0 - - - 7 - 19 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c - stm32wbxx_hal_gpio.c - 0 - 0 - - - 7 - 20 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c - stm32wbxx_hal_i2c.c - 0 - 0 - - - 7 - 21 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c_ex.c - stm32wbxx_hal_i2c_ex.c - 0 - 0 - - - 7 - 22 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c - stm32wbxx_hal_ipcc.c - 0 - 0 - - - 7 - 23 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c - stm32wbxx_hal_pwr.c - 0 - 0 - - - 7 - 24 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c - stm32wbxx_hal_pwr_ex.c - 0 - 0 - - - 7 - 25 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c - stm32wbxx_hal_rcc.c - 0 - 0 - - - 7 - 26 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c - stm32wbxx_hal_rcc_ex.c - 0 - 0 - - - 7 - 27 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c - stm32wbxx_hal_rtc.c - 0 - 0 - - - 7 - 28 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c - stm32wbxx_hal_rtc_ex.c - 0 - 0 - - - 7 - 29 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c - stm32wbxx_hal_uart.c - 0 - 0 - - - 7 - 30 - 1 - 0 - 0 - 0 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c - stm32wbxx_hal_uart_ex.c - 0 - 0 - - - 7 - 31 - 1 - 0 - 0 - 0 - ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_adc.c - stm32wbxx_hal_adc.c - 0 - 0 - - - 7 - 32 - 1 - 0 - 0 - 0 - ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_adc_ex.c - stm32wbxx_hal_adc_ex.c - 0 - 0 - - - 7 - 33 - 1 - 0 - 0 - 0 - ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_spi.c - stm32wbxx_hal_spi.c - 0 - 0 - - - - - Middlewares/STM32_WPAN/ble/blesvc - 0 - 0 - 0 - 0 - - 8 - 34 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c - p2p_stm.c - 0 - 0 - - - 8 - 35 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - svc_ctl.c - 0 - 0 - - - - - Middlewares/STM32_WPAN/ble/core - 0 - 0 - 0 - 0 - - 9 - 36 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c - ble_gap_aci.c - 0 - 0 - - - 9 - 37 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c - ble_gatt_aci.c - 0 - 0 - - - 9 - 38 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c - ble_hal_aci.c - 0 - 0 - - - 9 - 39 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c - ble_hci_le.c - 0 - 0 - - - 9 - 40 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c - ble_l2cap_aci.c - 0 - 0 - - - 9 - 41 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - osal.c - 0 - 0 - - - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci - 0 - 0 - 0 - 0 - - 10 - 42 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c - shci.c - 0 - 0 - - - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl - 0 - 0 - 0 - 0 - - 11 - 43 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c - hci_tl.c - 0 - 0 - - - 11 - 44 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c - hci_tl_if.c - 0 - 0 - - - 11 - 45 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c - shci_tl.c - 0 - 0 - - - 11 - 46 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - shci_tl_if.c - 0 - 0 - - - 11 - 47 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c - tl_mbox.c - 0 - 0 - - - 11 - 48 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c - tl_zigbee_hci.c - 0 - 0 - - - - - Middlewares/STM32_WPAN/utilities - 0 - 0 - 0 - 0 - - 12 - 49 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c - dbg_trace.c - 0 - 0 - - - 12 - 50 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c - otp.c - 0 - 0 - - - 12 - 51 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c - stm_list.c - 0 - 0 - - - 12 - 52 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c - stm_queue.c - 0 - 0 - - - - - Middlewares/STM32_WPAN/zigbee/core - 0 - 0 - 0 - 0 - - 13 - 53 - 1 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c - zigbee_core_wb.c - 0 - 0 - - - - - Middlewares/STM32_WPAN/zigbee/stack - 0 - 0 - 0 - 0 - - 14 - 54 - 4 - 0 - 0 - 0 - ../../../../../../Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib_keil.lib - stm32wb_zigbee_wb_lib_keil.lib - 0 - 0 - - - - - Utilities/lpm/tiny_lpm - 0 - 0 - 0 - 0 - - 15 - 55 - 1 - 0 - 0 - 0 - ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c - stm32_lpm.c - 0 - 0 - - - - - Utilities/sequencer - 0 - 0 - 0 - 0 - - 16 - 56 - 1 - 0 - 0 - 0 - ../../../../../../Utilities/sequencer/stm32_seq.c - stm32_seq.c - 0 - 0 - - - - - ::CMSIS - 0 - 0 - 0 - 1 - - -                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvprojx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvprojx deleted file mode 100644 index 67771b177..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/ble_zigbee_static.uvprojx +++ /dev/null @@ -1,778 +0,0 @@ - - - - 2.1 - -
                                                                  ### uVision Project, (C) Keil Software
                                                                  - - - - ble_zigbee_static - 0x4 - ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC - 0 - - - STM32WB55RGVx - STMicroelectronics - Keil.STM32WBxx_DFP.1.0.0 - http://www.keil.com/pack - IROM(0x08000000-0x807FFFF) IRAM(0x20000004-0x20025C03) IRAM2(0x20030000-0x200327FF) CLOCK(8000000) FPU2 CPUTYPE("Cortex-M4") TZ - - - - 0 - - - - - - - - - - - $$Device:STM32WB55RGVx$CMSIS\SVD\STM32WBxx_CM4.svd - 0 - 0 - - - - - - - 0 - 0 - 0 - 0 - 1 - - P-NUCLEO-WB55.Nucleo\Exe\ - Project - 1 - 0 - 1 - 1 - 1 - - 1 - 0 - 0 - - 0 - 0 - - - 0 - 0 - 0 - 0 - - - 0 - 0 - - - 0 - 0 - 0 - 0 - - - 1 - 0 - fromelf #L --bin --output=$L@L.bin - - 0 - 0 - 0 - 0 - - 1 - - - - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 3 - - - 0 - - - SARMCM3.DLL - -REMAP -MPU - DCM.DLL - -pCM4 - SARMCM3.DLL - -MPU - TCM.DLL - -pCM4 - - - - 1 - 0 - 0 - 0 - 16 - - - - - 1 - 0 - 0 - 1 - 1 - 4101 - - 1 - BIN\UL2V8M.DLL - - - - - - 0 - - - - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - "Cortex-M4" - - 0 - 0 - 0 - 1 - 1 - 0 - 0 - 2 - 0 - 0 - 1 - 0 - 8 - 1 - 0 - 0 - 0 - 3 - 4 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 1 - 1 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x20000004 - 0x25c00 - - - 1 - 0x8000000 - 0x80000 - - - 0 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x8000000 - 0x80000 - - - 1 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x20000004 - 0x25c00 - - - 0 - 0x20030000 - 0x2800 - - - - - - 1 - 4 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 2 - 0 - 0 - 1 - 0 - 0 - 5 - 3 - 0 - 0 - 0 - 0 - 0 - - - STM32WB55xx,USE_HAL_DRIVER,USE_STM32WBXX_NUCLEO,STATIC_MODE,ZIGBEE_WB - - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WBxx/Include;../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo;../Core/Inc;../STM32_WPAN/app;../STM32_WPAN/Target;../../../../../../Middlewares/ST/STM32_WPAN/zigbee/core/Inc;../../../../../../Middlewares/ST/STM32_WPAN/zigbee/stack;../../../../../../Middlewares/ST/STM32_WPAN/zigbee/stack/include;../../../../../../Middlewares/ST/STM32_WPAN/zigbee/stack/include/mac;../../../../../../Middlewares/ST/STM32_WPAN/zigbee/stack/include/M4;../../../../../../Middlewares/ST/STM32_WPAN/zigbee/stack/include/extras;../../../../../../Middlewares/ST/STM32_WPAN/zigbee/platform;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/Inc;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../../../../../../Middlewares/ST/STM32_WPAN/ble;../../../../../../Middlewares/ST/STM32_WPAN/utilities;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/sequencer - - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 4 - - - - - - - - - 0 - 0 - 0 - 0 - 1 - 0 - - - - stm32wb55xx_flash_cm4.sct - - - - - - - - - - - Application/MDK-ARM - - - startup_stm32wb55xx_cm4.s - 2 - startup_stm32wb55xx_cm4.s - - - - - Application/User/Core/src - - - app_entry.c - 1 - ../Core/Src/app_entry.c - - - hw_timerserver.c - 1 - ../Core/Src/hw_timerserver.c - - - hw_uart.c - 1 - ../Core/Src/hw_uart.c - - - main.c - 1 - ../Core/Src/main.c - - - stm32_lpm_if.c - 1 - ../Core/Src/stm32_lpm_if.c - - - stm32wbxx_it.c - 1 - ../Core/Src/stm32wbxx_it.c - - - stm_logging.c - 1 - ../Core/Src/stm_logging.c - - - system_stm32wbxx.c - 1 - ../Core/Src/system_stm32wbxx.c - - - - - Application/User/STM32_WPAN/app - - - app_ble.c - 1 - ../STM32_WPAN/App/app_ble.c - - - app_zigbee.c - 1 - ../STM32_WPAN/App/app_zigbee.c - - - p2p_server_app.c - 1 - ../STM32_WPAN/App/p2p_server_app.c - - - - - Application/User/STM32_WPAN/target - - - hw_ipcc.c - 1 - ../STM32_WPAN/Target/hw_ipcc.c - - - - - Doc - - - readme.txt - 5 - ../readme.txt - - - - - Drivers/BSP/P-NUCLEO-WB55.Nucleo - - - stm32wbxx_nucleo.c - 1 - ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c - - - - - Drivers/STM32WBxx_HAL_Driver - - - stm32wbxx_hal.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c - - - stm32wbxx_hal_cortex.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c - - - stm32wbxx_hal_dma.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c - - - stm32wbxx_hal_gpio.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c - - - stm32wbxx_hal_i2c.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c - - - stm32wbxx_hal_i2c_ex.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c_ex.c - - - stm32wbxx_hal_ipcc.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c - - - stm32wbxx_hal_pwr.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c - - - stm32wbxx_hal_pwr_ex.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c - - - stm32wbxx_hal_rcc.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c - - - stm32wbxx_hal_rcc_ex.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c - - - stm32wbxx_hal_rtc.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c - - - stm32wbxx_hal_rtc_ex.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c - - - stm32wbxx_hal_uart.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c - - - stm32wbxx_hal_uart_ex.c - 1 - ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c - - - stm32wbxx_hal_adc.c - 1 - ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_adc.c - - - stm32wbxx_hal_adc_ex.c - 1 - ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_adc_ex.c - - - stm32wbxx_hal_spi.c - 1 - ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_spi.c - - - - - Middlewares/STM32_WPAN/ble/blesvc - - - p2p_stm.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c - - - svc_ctl.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - - - - - Middlewares/STM32_WPAN/ble/core - - - ble_gap_aci.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c - - - ble_gatt_aci.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c - - - ble_hal_aci.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c - - - ble_hci_le.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c - - - ble_l2cap_aci.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c - - - osal.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci - - - shci.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c - - - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl - - - hci_tl.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c - - - hci_tl_if.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c - - - shci_tl.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c - - - shci_tl_if.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - - tl_mbox.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c - - - tl_zigbee_hci.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c - - - - - Middlewares/STM32_WPAN/utilities - - - dbg_trace.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c - - - otp.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c - - - stm_list.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c - - - stm_queue.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c - - - - - Middlewares/STM32_WPAN/zigbee/core - - - zigbee_core_wb.c - 1 - ../../../../../../Middlewares/ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c - - - - - Middlewares/STM32_WPAN/zigbee/stack - - - stm32wb_zigbee_wb_lib_keil.lib - 4 - ../../../../../../Middlewares/ST/STM32_WPAN/zigbee/lib/stm32wb_zigbee_wb_lib_keil.lib - - - - - Utilities/lpm/tiny_lpm - - - stm32_lpm.c - 1 - ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c - - - - - Utilities/sequencer - - - stm32_seq.c - 1 - ../../../../../../Utilities/sequencer/stm32_seq.c - - - - - ::CMSIS - - - - - - - - - - - - - - - - - - - - - - <Project Info> - - - - - - 0 - 1 - - - - -                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/startup_stm32wb55xx_cm4.s deleted file mode 100644 index 6049cb917..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/startup_stm32wb55xx_cm4.s +++ /dev/null @@ -1,368 +0,0 @@ -;****************************************************************************** -;* File Name : startup_stm32wb55xx_cm4.s -;* Author : MCD Application Team -;* Description : STM32WB55xx devices vector table for MDK-ARM toolchain. -;* This module performs: -;* - Set the initial SP -;* - Set the initial PC == Reset_Handler -;* - Set the vector table entries with the exceptions ISR address -;* - Branches to __main in the C library (which eventually -;* calls main()). -;* After Reset the CortexM4 processor is in Thread mode, -;* priority is Privileged, and the Stack is set to Main. -;* <<< Use Configuration Wizard in Context Menu >>> -;****************************************************************************** -;* @attention -;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. -;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 -;* -;****************************************************************************** - -; Amount of memory (in bytes) allocated for Stack -; Tailor this value to your application needs -; Stack Configuration -; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> -; - -Stack_Size EQU 0x1000 - - AREA STACK, NOINIT, READWRITE, ALIGN=3 -Stack_Mem SPACE Stack_Size -__initial_sp - - -; Heap Configuration -; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> -; - -Heap_Size EQU 138400 - - AREA HEAP, NOINIT, READWRITE, ALIGN=3 -__heap_base -Heap_Mem SPACE Heap_Size -__heap_limit - - PRESERVE8 - THUMB - - -; Vector Table Mapped to Address 0 at Reset - AREA RESET, DATA, READONLY - EXPORT __Vectors - EXPORT __Vectors_End - EXPORT __Vectors_Size - -__Vectors DCD __initial_sp ; Top of Stack - DCD Reset_Handler ; Reset Handler - DCD NMI_Handler ; NMI Handler - DCD HardFault_Handler ; Hard Fault Handler - DCD MemManage_Handler ; MPU Fault Handler - DCD BusFault_Handler ; Bus Fault Handler - DCD UsageFault_Handler ; Usage Fault Handler - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD 0 ; Reserved - DCD SVC_Handler ; SVCall Handler - DCD DebugMon_Handler ; Debug Monitor Handler - DCD 0 ; Reserved - DCD PendSV_Handler ; PendSV Handler - DCD SysTick_Handler ; SysTick Handler - - ; External Interrupts - DCD WWDG_IRQHandler ; Window WatchDog - DCD PVD_PVM_IRQHandler ; PVD and PVM detector - DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper and TimeStamp Interrupts and LSECSS Interrupts - DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt - DCD FLASH_IRQHandler ; FLASH global Interrupt - DCD RCC_IRQHandler ; RCC Interrupt - DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt - DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt - DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup - DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt - DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt - DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt - DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt - DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt - DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt - DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt - DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt - DCD ADC1_IRQHandler ; ADC1 Interrupt - DCD USB_HP_IRQHandler ; USB High Priority Interrupt - DCD USB_LP_IRQHandler ; USB Low Priority Interrupt - DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt - DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts - DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt - DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt - DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts - DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts - DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt - DCD TIM2_IRQHandler ; TIM2 Global Interrupt - DCD PKA_IRQHandler ; PKA Interrupt - DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt - DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt - DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt - DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt - DCD SPI1_IRQHandler ; SPI1 Interrupt - DCD SPI2_IRQHandler ; SPI2 Interrupt - DCD USART1_IRQHandler ; USART1 Interrupt - DCD LPUART1_IRQHandler ; LPUART1 Interrupt - DCD SAI1_IRQHandler ; SAI Interrupt - DCD TSC_IRQHandler ; TSC Interrupt - DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts - DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt - DCD CRS_IRQHandler ; CRS interrupt - DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR - DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt - DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt - DCD HSEM_IRQHandler ; HSEM0 Interrupt - DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt - DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt - DCD LCD_IRQHandler ; LCD Interrupt - DCD QUADSPI_IRQHandler ; QUADSPI Interrupt - DCD AES1_IRQHandler ; AES1 Interrupt - DCD AES2_IRQHandler ; AES2 Interrupt - DCD RNG_IRQHandler ; RNG1 Interrupt - DCD FPU_IRQHandler ; FPU Interrupt - DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt - DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt - DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt - DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt - DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt - DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt - DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt - DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt - -__Vectors_End - -__Vectors_Size EQU __Vectors_End - __Vectors - - AREA |.text|, CODE, READONLY - -; Reset handler -Reset_Handler PROC - EXPORT Reset_Handler [WEAK] - IMPORT SystemInit - IMPORT __main - - LDR R0, =SystemInit - BLX R0 - LDR R0, =__main - BX R0 - ENDP - -; Dummy Exception Handlers (infinite loops which can be modified) - -NMI_Handler PROC - EXPORT NMI_Handler [WEAK] - B . - ENDP -HardFault_Handler\ - PROC - EXPORT HardFault_Handler [WEAK] - B . - ENDP -MemManage_Handler\ - PROC - EXPORT MemManage_Handler [WEAK] - B . - ENDP -BusFault_Handler\ - PROC - EXPORT BusFault_Handler [WEAK] - B . - ENDP -UsageFault_Handler\ - PROC - EXPORT UsageFault_Handler [WEAK] - B . - ENDP -SVC_Handler PROC - EXPORT SVC_Handler [WEAK] - B . - ENDP -DebugMon_Handler\ - PROC - EXPORT DebugMon_Handler [WEAK] - B . - ENDP -PendSV_Handler PROC - EXPORT PendSV_Handler [WEAK] - B . - ENDP -SysTick_Handler PROC - EXPORT SysTick_Handler [WEAK] - B . - ENDP - -Default_Handler PROC - - EXPORT WWDG_IRQHandler [WEAK] - EXPORT PVD_PVM_IRQHandler [WEAK] - EXPORT TAMP_STAMP_LSECSS_IRQHandler [WEAK] - EXPORT RTC_WKUP_IRQHandler [WEAK] - EXPORT FLASH_IRQHandler [WEAK] - EXPORT RCC_IRQHandler [WEAK] - EXPORT EXTI0_IRQHandler [WEAK] - EXPORT EXTI1_IRQHandler [WEAK] - EXPORT EXTI2_IRQHandler [WEAK] - EXPORT EXTI3_IRQHandler [WEAK] - EXPORT EXTI4_IRQHandler [WEAK] - EXPORT DMA1_Channel1_IRQHandler [WEAK] - EXPORT DMA1_Channel2_IRQHandler [WEAK] - EXPORT DMA1_Channel3_IRQHandler [WEAK] - EXPORT DMA1_Channel4_IRQHandler [WEAK] - EXPORT DMA1_Channel5_IRQHandler [WEAK] - EXPORT DMA1_Channel6_IRQHandler [WEAK] - EXPORT DMA1_Channel7_IRQHandler [WEAK] - EXPORT ADC1_IRQHandler [WEAK] - EXPORT USB_HP_IRQHandler [WEAK] - EXPORT USB_LP_IRQHandler [WEAK] - EXPORT C2SEV_PWR_C2H_IRQHandler [WEAK] - EXPORT COMP_IRQHandler [WEAK] - EXPORT EXTI9_5_IRQHandler [WEAK] - EXPORT TIM1_BRK_IRQHandler [WEAK] - EXPORT TIM1_UP_TIM16_IRQHandler [WEAK] - EXPORT TIM1_TRG_COM_TIM17_IRQHandler [WEAK] - EXPORT TIM1_CC_IRQHandler [WEAK] - EXPORT TIM2_IRQHandler [WEAK] - EXPORT PKA_IRQHandler [WEAK] - EXPORT I2C1_EV_IRQHandler [WEAK] - EXPORT I2C1_ER_IRQHandler [WEAK] - EXPORT I2C3_EV_IRQHandler [WEAK] - EXPORT I2C3_ER_IRQHandler [WEAK] - EXPORT SPI1_IRQHandler [WEAK] - EXPORT SPI2_IRQHandler [WEAK] - EXPORT USART1_IRQHandler [WEAK] - EXPORT LPUART1_IRQHandler [WEAK] - EXPORT SAI1_IRQHandler [WEAK] - EXPORT TSC_IRQHandler [WEAK] - EXPORT EXTI15_10_IRQHandler [WEAK] - EXPORT RTC_Alarm_IRQHandler [WEAK] - EXPORT CRS_IRQHandler [WEAK] - EXPORT PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler [WEAK] - EXPORT IPCC_C1_RX_IRQHandler [WEAK] - EXPORT IPCC_C1_TX_IRQHandler [WEAK] - EXPORT HSEM_IRQHandler [WEAK] - EXPORT LPTIM1_IRQHandler [WEAK] - EXPORT LPTIM2_IRQHandler [WEAK] - EXPORT LCD_IRQHandler [WEAK] - EXPORT QUADSPI_IRQHandler [WEAK] - EXPORT AES1_IRQHandler [WEAK] - EXPORT AES2_IRQHandler [WEAK] - EXPORT RNG_IRQHandler [WEAK] - EXPORT FPU_IRQHandler [WEAK] - EXPORT DMA2_Channel1_IRQHandler [WEAK] - EXPORT DMA2_Channel2_IRQHandler [WEAK] - EXPORT DMA2_Channel3_IRQHandler [WEAK] - EXPORT DMA2_Channel4_IRQHandler [WEAK] - EXPORT DMA2_Channel5_IRQHandler [WEAK] - EXPORT DMA2_Channel6_IRQHandler [WEAK] - EXPORT DMA2_Channel7_IRQHandler [WEAK] - EXPORT DMAMUX1_OVR_IRQHandler [WEAK] - -WWDG_IRQHandler -PVD_PVM_IRQHandler -TAMP_STAMP_LSECSS_IRQHandler -RTC_WKUP_IRQHandler -FLASH_IRQHandler -RCC_IRQHandler -EXTI0_IRQHandler -EXTI1_IRQHandler -EXTI2_IRQHandler -EXTI3_IRQHandler -EXTI4_IRQHandler -DMA1_Channel1_IRQHandler -DMA1_Channel2_IRQHandler -DMA1_Channel3_IRQHandler -DMA1_Channel4_IRQHandler -DMA1_Channel5_IRQHandler -DMA1_Channel6_IRQHandler -DMA1_Channel7_IRQHandler -ADC1_IRQHandler -USB_HP_IRQHandler -USB_LP_IRQHandler -C2SEV_PWR_C2H_IRQHandler -COMP_IRQHandler -EXTI9_5_IRQHandler -TIM1_BRK_IRQHandler -TIM1_UP_TIM16_IRQHandler -TIM1_TRG_COM_TIM17_IRQHandler -TIM1_CC_IRQHandler -TIM2_IRQHandler -PKA_IRQHandler -I2C1_EV_IRQHandler -I2C1_ER_IRQHandler -I2C3_EV_IRQHandler -I2C3_ER_IRQHandler -SPI1_IRQHandler -SPI2_IRQHandler -USART1_IRQHandler -LPUART1_IRQHandler -SAI1_IRQHandler -TSC_IRQHandler -EXTI15_10_IRQHandler -RTC_Alarm_IRQHandler -CRS_IRQHandler -PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler -IPCC_C1_RX_IRQHandler -IPCC_C1_TX_IRQHandler -HSEM_IRQHandler -LPTIM1_IRQHandler -LPTIM2_IRQHandler -LCD_IRQHandler -QUADSPI_IRQHandler -AES1_IRQHandler -AES2_IRQHandler -RNG_IRQHandler -FPU_IRQHandler -DMA2_Channel1_IRQHandler -DMA2_Channel2_IRQHandler -DMA2_Channel3_IRQHandler -DMA2_Channel4_IRQHandler -DMA2_Channel5_IRQHandler -DMA2_Channel6_IRQHandler -DMA2_Channel7_IRQHandler -DMAMUX1_OVR_IRQHandler - - B . - - ENDP - - ALIGN - -;******************************************************************************* -; User Stack and Heap initialization -;******************************************************************************* - IF :DEF:__MICROLIB - - EXPORT __initial_sp - EXPORT __heap_base - EXPORT __heap_limit - - ELSE - - IMPORT __use_two_region_memory - EXPORT __user_initial_stackheap - -__user_initial_stackheap - - LDR R0, = Heap_Mem - LDR R1, =(Stack_Mem + Stack_Size) - LDR R2, = (Heap_Mem + Heap_Size) - LDR R3, = Stack_Mem - BX LR - - ALIGN - - ENDIF - - END - -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/stm32wb55xx_flash_cm4.sct deleted file mode 100644 index 9d4d446ba..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ /dev/null @@ -1,21 +0,0 @@ -; ************************************************************* -; *** Scatter-Loading Description File generated by uVision *** -; ************************************************************* - -LR_IROM1 0x08000000 0x00080000 { ; load region size_region - ER_IROM1 0x08000000 0x00080000 { ; load address = execution address - *.o (RESET, +First) - *(InRoot$$Sections) - .ANY (+RO) - } - RW_IRAM1 0x20000008 0x2FFF8 { ; RW data - .ANY (+RW +ZI) - } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } - } - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.cproject b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.cproject deleted file mode 100644 index 8c4eb647f..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.cproject +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.project b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.project deleted file mode 100644 index 4b7734dc7..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/.project +++ /dev/null @@ -1,314 +0,0 @@ - - - BLE_Zigbee_Static - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - com.st.stm32cube.ide.mcu.MCUProjectNature - org.eclipse.cdt.core.cnature - com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature - com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature - com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature - com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature - com.st.stm32cube.ide.mcu.MCURootProjectNature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - - - Doc/readme.txt - 1 - PARENT-1-PROJECT_LOC/readme.txt - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_cortex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma_ex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_exti.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash_ex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_gpio.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_hsem.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_ipcc.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr_ex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc_ex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc_ex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim_ex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c - - - Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart_ex.c - 1 - PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c - - - Utilities/sequencer/stm32_seq.c - 1 - PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c - - - Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c - 1 - PARENT-6-PROJECT_LOC/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c - - - Middlewares/STM32_WPAN/utilities/dbg_trace.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c - - - Middlewares/STM32_WPAN/utilities/otp.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/otp.c - - - Middlewares/STM32_WPAN/utilities/stm_list.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_list.c - - - Middlewares/STM32_WPAN/utilities/stm_queue.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c - - - Utilities/lpm/tiny_lpm/stm32_lpm.c - 1 - PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c - - - Application/User/Core/src/app_entry.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/app_entry.c - - - Application/User/Core/src/hw_timerserver.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/hw_timerserver.c - - - Application/User/Core/src/hw_uart.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/hw_uart.c - - - Application/User/Core/src/main.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/main.c - - - Application/User/Core/src/stm32_lpm_if.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c - - - Application/User/Core/src/stm32wbxx_it.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/stm32wbxx_it.c - - - Application/User/Core/src/stm_logging.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/stm_logging.c - - - Application/User/Core/src/system_stm32wbxx.c - 1 - PARENT-1-PROJECT_LOC/Core/Src/system_stm32wbxx.c - - - Application/User/STM32_WPAN/app/app_ble.c - 1 - PARENT-1-PROJECT_LOC/STM32_WPAN/App/app_ble.c - - - Application/User/STM32_WPAN/app/app_zigbee.c - 1 - PARENT-1-PROJECT_LOC/STM32_WPAN/App/app_zigbee.c - - - Application/User/STM32_WPAN/app/p2p_server_app.c - 1 - PARENT-1-PROJECT_LOC/STM32_WPAN/App/p2p_server_app.c - - - Application/User/STM32_WPAN/target/hw_ipcc.c - 1 - PARENT-1-PROJECT_LOC/STM32_WPAN/Target/hw_ipcc.c - - - Middlewares/STM32_WPAN/ble/blesvc/p2p_stm.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/svc/Src/p2p_stm.c - - - Middlewares/STM32_WPAN/ble/blesvc/svc_ctl.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/svc/Src/svc_ctl.c - - - Middlewares/STM32_WPAN/ble/core/ble_gap_aci.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gap_aci.c - - - Middlewares/STM32_WPAN/ble/core/ble_gatt_aci.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_gatt_aci.c - - - Middlewares/STM32_WPAN/ble/core/ble_hal_aci.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hal_aci.c - - - Middlewares/STM32_WPAN/ble/core/ble_hci_le.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_hci_le.c - - - Middlewares/STM32_WPAN/ble/core/ble_l2cap_aci.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/auto/ble_l2cap_aci.c - - - Middlewares/STM32_WPAN/ble/core/osal.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/ble/core/template/osal.c - - - Middlewares/STM32_WPAN/zigbee/core/zigbee_core_wb.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/zigbee/core/src/zigbee_core_wb.c - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl.c - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/hci_tl_if.c - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c - - - Middlewares/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c - 1 - PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_zigbee_hci.c - - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s deleted file mode 100644 index fa06d93d7..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ /dev/null @@ -1,445 +0,0 @@ -/** - ****************************************************************************** - * @file startup_stm32wb55xx_cm4.s - * @author MCD Application Team - * @brief STM32WB55xx devices vector table GCC toolchain. - * This module performs: - * - Set the initial SP - * - Set the initial PC == Reset_Handler, - * - Set the vector table entries with the exceptions ISR address - * - Branches to main in the C library (which eventually - * calls main()). - * After Reset the Cortex-M4 processor is in Thread mode, - * priority is Privileged, and the Stack is set to Main. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ - - .syntax unified - .cpu cortex-m4 - .fpu softvfp - .thumb - -.global g_pfnVectors -.global Default_Handler - -/* start address for the initialization values of the .data section. -defined in linker script */ -.word _sidata -/* start address for the .data section. defined in linker script */ -.word _sdata -/* end address for the .data section. defined in linker script */ -.word _edata -/* start address for the .bss section. defined in linker script */ -.word _sbss -/* end address for the .bss section. defined in linker script */ -.word _ebss -/* start address for the .MB_MEM2 section. defined in linker script */ -.word _sMB_MEM2 -/* end address for the .MB_MEM2 section. defined in linker script */ -.word _eMB_MEM2 - -/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */ -.macro INIT_BSS start, end - ldr r0, =\start - ldr r1, =\end - movs r3, #0 - bl LoopFillZerobss -.endm - -/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */ -.macro INIT_DATA start, end, src - ldr r0, =\start - ldr r1, =\end - ldr r2, =\src - movs r3, #0 - bl LoopCopyDataInit -.endm - -.section .text.data_initializers -CopyDataInit: - ldr r4, [r2, r3] - str r4, [r0, r3] - adds r3, r3, #4 - -LoopCopyDataInit: - adds r4, r0, r3 - cmp r4, r1 - bcc CopyDataInit - bx lr - -FillZerobss: - str r3, [r0] - adds r0, r0, #4 - -LoopFillZerobss: - cmp r0, r1 - bcc FillZerobss - bx lr - - .section .text.Reset_Handler - .weak Reset_Handler - .type Reset_Handler, %function -Reset_Handler: - ldr r0, =_estack - mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ - bl SystemInit - -/* Copy the data segment initializers from flash to SRAM */ - INIT_DATA _sdata, _edata, _sidata - -/* Zero fill the bss segments. */ - INIT_BSS _sbss, _ebss - INIT_BSS _sMB_MEM2, _eMB_MEM2 - -/* Call static constructors */ - bl __libc_init_array -/* Call the application s entry point.*/ - bl main - -LoopForever: - b LoopForever - -.size Reset_Handler, .-Reset_Handler - -/** - * @brief This is the code that gets called when the processor receives an - * unexpected interrupt. This simply enters an infinite loop, preserving - * the system state for examination by a debugger. - * - * @param None - * @retval None -*/ - .section .text.Default_Handler,"ax",%progbits -Default_Handler: -Infinite_Loop: - b Infinite_Loop - .size Default_Handler, .-Default_Handler -/****************************************************************************** -* -* The minimal vector table for a Cortex-M4. Note that the proper constructs -* must be placed on this to ensure that it ends up at physical address -* 0x0000.0000. -* -******************************************************************************/ - .section .isr_vector,"a",%progbits - .type g_pfnVectors, %object - .size g_pfnVectors, .-g_pfnVectors - - -g_pfnVectors: - .word _estack - .word Reset_Handler - .word NMI_Handler - .word HardFault_Handler - .word MemManage_Handler - .word BusFault_Handler - .word UsageFault_Handler - .word 0 - .word 0 - .word 0 - .word 0 - .word SVC_Handler - .word DebugMon_Handler - .word 0 - .word PendSV_Handler - .word SysTick_Handler - .word WWDG_IRQHandler - .word PVD_PVM_IRQHandler - .word TAMP_STAMP_LSECSS_IRQHandler - .word RTC_WKUP_IRQHandler - .word FLASH_IRQHandler - .word RCC_IRQHandler - .word EXTI0_IRQHandler - .word EXTI1_IRQHandler - .word EXTI2_IRQHandler - .word EXTI3_IRQHandler - .word EXTI4_IRQHandler - .word DMA1_Channel1_IRQHandler - .word DMA1_Channel2_IRQHandler - .word DMA1_Channel3_IRQHandler - .word DMA1_Channel4_IRQHandler - .word DMA1_Channel5_IRQHandler - .word DMA1_Channel6_IRQHandler - .word DMA1_Channel7_IRQHandler - .word ADC1_IRQHandler - .word USB_HP_IRQHandler - .word USB_LP_IRQHandler - .word C2SEV_PWR_C2H_IRQHandler - .word COMP_IRQHandler - .word EXTI9_5_IRQHandler - .word TIM1_BRK_IRQHandler - .word TIM1_UP_TIM16_IRQHandler - .word TIM1_TRG_COM_TIM17_IRQHandler - .word TIM1_CC_IRQHandler - .word TIM2_IRQHandler - .word PKA_IRQHandler - .word I2C1_EV_IRQHandler - .word I2C1_ER_IRQHandler - .word I2C3_EV_IRQHandler - .word I2C3_ER_IRQHandler - .word SPI1_IRQHandler - .word SPI2_IRQHandler - .word USART1_IRQHandler - .word LPUART1_IRQHandler - .word SAI1_IRQHandler - .word TSC_IRQHandler - .word EXTI15_10_IRQHandler - .word RTC_Alarm_IRQHandler - .word CRS_IRQHandler - .word PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler - .word IPCC_C1_RX_IRQHandler - .word IPCC_C1_TX_IRQHandler - .word HSEM_IRQHandler - .word LPTIM1_IRQHandler - .word LPTIM2_IRQHandler - .word LCD_IRQHandler - .word QUADSPI_IRQHandler - .word AES1_IRQHandler - .word AES2_IRQHandler - .word RNG_IRQHandler - .word FPU_IRQHandler - .word DMA2_Channel1_IRQHandler - .word DMA2_Channel2_IRQHandler - .word DMA2_Channel3_IRQHandler - .word DMA2_Channel4_IRQHandler - .word DMA2_Channel5_IRQHandler - .word DMA2_Channel6_IRQHandler - .word DMA2_Channel7_IRQHandler - .word DMAMUX1_OVR_IRQHandler - -/******************************************************************************* -* -* Provide weak aliases for each Exception handler to the Default_Handler. -* As they are weak aliases, any function with the same name will override -* this definition. -* -*******************************************************************************/ - .weak NMI_Handler - .thumb_set NMI_Handler,Default_Handler - - .weak HardFault_Handler - .thumb_set HardFault_Handler,Default_Handler - - .weak MemManage_Handler - .thumb_set MemManage_Handler,Default_Handler - - .weak BusFault_Handler - .thumb_set BusFault_Handler,Default_Handler - - .weak UsageFault_Handler - .thumb_set UsageFault_Handler,Default_Handler - - .weak SVC_Handler - .thumb_set SVC_Handler,Default_Handler - - .weak DebugMon_Handler - .thumb_set DebugMon_Handler,Default_Handler - - .weak PendSV_Handler - .thumb_set PendSV_Handler,Default_Handler - - .weak SysTick_Handler - .thumb_set SysTick_Handler,Default_Handler - - .weak WWDG_IRQHandler - .thumb_set WWDG_IRQHandler,Default_Handler - - .weak PVD_PVM_IRQHandler - .thumb_set PVD_PVM_IRQHandler,Default_Handler - - .weak TAMP_STAMP_LSECSS_IRQHandler - .thumb_set TAMP_STAMP_LSECSS_IRQHandler,Default_Handler - - .weak RTC_WKUP_IRQHandler - .thumb_set RTC_WKUP_IRQHandler,Default_Handler - - .weak FLASH_IRQHandler - .thumb_set FLASH_IRQHandler,Default_Handler - - .weak RCC_IRQHandler - .thumb_set RCC_IRQHandler,Default_Handler - - .weak EXTI0_IRQHandler - .thumb_set EXTI0_IRQHandler,Default_Handler - - .weak EXTI1_IRQHandler - .thumb_set EXTI1_IRQHandler,Default_Handler - - .weak EXTI2_IRQHandler - .thumb_set EXTI2_IRQHandler,Default_Handler - - .weak EXTI3_IRQHandler - .thumb_set EXTI3_IRQHandler,Default_Handler - - .weak EXTI4_IRQHandler - .thumb_set EXTI4_IRQHandler,Default_Handler - - .weak DMA1_Channel1_IRQHandler - .thumb_set DMA1_Channel1_IRQHandler,Default_Handler - - .weak DMA1_Channel2_IRQHandler - .thumb_set DMA1_Channel2_IRQHandler,Default_Handler - - .weak DMA1_Channel3_IRQHandler - .thumb_set DMA1_Channel3_IRQHandler,Default_Handler - - .weak DMA1_Channel4_IRQHandler - .thumb_set DMA1_Channel4_IRQHandler,Default_Handler - - .weak DMA1_Channel5_IRQHandler - .thumb_set DMA1_Channel5_IRQHandler,Default_Handler - - .weak DMA1_Channel6_IRQHandler - .thumb_set DMA1_Channel6_IRQHandler,Default_Handler - - .weak DMA1_Channel7_IRQHandler - .thumb_set DMA1_Channel7_IRQHandler,Default_Handler - - .weak ADC1_IRQHandler - .thumb_set ADC1_IRQHandler,Default_Handler - - .weak USB_HP_IRQHandler - .thumb_set USB_HP_IRQHandler,Default_Handler - - .weak USB_LP_IRQHandler - .thumb_set USB_LP_IRQHandler,Default_Handler - - .weak C2SEV_PWR_C2H_IRQHandler - .thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler - - .weak COMP_IRQHandler - .thumb_set COMP_IRQHandler,Default_Handler - - .weak EXTI9_5_IRQHandler - .thumb_set EXTI9_5_IRQHandler,Default_Handler - - .weak TIM1_BRK_IRQHandler - .thumb_set TIM1_BRK_IRQHandler,Default_Handler - - .weak TIM1_UP_TIM16_IRQHandler - .thumb_set TIM1_UP_TIM16_IRQHandler,Default_Handler - - .weak TIM1_TRG_COM_TIM17_IRQHandler - .thumb_set TIM1_TRG_COM_TIM17_IRQHandler,Default_Handler - - .weak TIM1_CC_IRQHandler - .thumb_set TIM1_CC_IRQHandler,Default_Handler - - .weak TIM2_IRQHandler - .thumb_set TIM2_IRQHandler,Default_Handler - - .weak PKA_IRQHandler - .thumb_set PKA_IRQHandler,Default_Handler - - .weak I2C1_EV_IRQHandler - .thumb_set I2C1_EV_IRQHandler,Default_Handler - - .weak I2C1_ER_IRQHandler - .thumb_set I2C1_ER_IRQHandler,Default_Handler - - .weak I2C3_EV_IRQHandler - .thumb_set I2C3_EV_IRQHandler,Default_Handler - - .weak I2C3_ER_IRQHandler - .thumb_set I2C3_ER_IRQHandler,Default_Handler - - .weak SPI1_IRQHandler - .thumb_set SPI1_IRQHandler,Default_Handler - - .weak SPI2_IRQHandler - .thumb_set SPI2_IRQHandler,Default_Handler - - .weak USART1_IRQHandler - .thumb_set USART1_IRQHandler,Default_Handler - - .weak LPUART1_IRQHandler - .thumb_set LPUART1_IRQHandler,Default_Handler - - .weak SAI1_IRQHandler - .thumb_set SAI1_IRQHandler,Default_Handler - - .weak TSC_IRQHandler - .thumb_set TSC_IRQHandler,Default_Handler - - .weak EXTI15_10_IRQHandler - .thumb_set EXTI15_10_IRQHandler,Default_Handler - - .weak RTC_Alarm_IRQHandler - .thumb_set RTC_Alarm_IRQHandler,Default_Handler - - .weak CRS_IRQHandler - .thumb_set CRS_IRQHandler,Default_Handler - - .weak PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler - .thumb_set PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler,Default_Handler - - .weak IPCC_C1_RX_IRQHandler - .thumb_set IPCC_C1_RX_IRQHandler,Default_Handler - - .weak IPCC_C1_TX_IRQHandler - .thumb_set IPCC_C1_TX_IRQHandler,Default_Handler - - .weak HSEM_IRQHandler - .thumb_set HSEM_IRQHandler,Default_Handler - - .weak LPTIM1_IRQHandler - .thumb_set LPTIM1_IRQHandler,Default_Handler - - .weak LPTIM2_IRQHandler - .thumb_set LPTIM2_IRQHandler,Default_Handler - - .weak LCD_IRQHandler - .thumb_set LCD_IRQHandler,Default_Handler - - .weak QUADSPI_IRQHandler - .thumb_set QUADSPI_IRQHandler,Default_Handler - - .weak AES1_IRQHandler - .thumb_set AES1_IRQHandler,Default_Handler - - .weak AES2_IRQHandler - .thumb_set AES2_IRQHandler,Default_Handler - - .weak RNG_IRQHandler - .thumb_set RNG_IRQHandler,Default_Handler - - .weak FPU_IRQHandler - .thumb_set FPU_IRQHandler,Default_Handler - - .weak DMA2_Channel1_IRQHandler - .thumb_set DMA2_Channel1_IRQHandler,Default_Handler - - .weak DMA2_Channel2_IRQHandler - .thumb_set DMA2_Channel2_IRQHandler,Default_Handler - - .weak DMA2_Channel3_IRQHandler - .thumb_set DMA2_Channel3_IRQHandler,Default_Handler - - .weak DMA2_Channel4_IRQHandler - .thumb_set DMA2_Channel4_IRQHandler,Default_Handler - - .weak DMA2_Channel5_IRQHandler - .thumb_set DMA2_Channel5_IRQHandler,Default_Handler - - .weak DMA2_Channel6_IRQHandler - .thumb_set DMA2_Channel6_IRQHandler,Default_Handler - - .weak DMA2_Channel7_IRQHandler - .thumb_set DMA2_Channel7_IRQHandler,Default_Handler - - .weak DMAMUX1_OVR_IRQHandler - .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c deleted file mode 100644 index 4ec95844d..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ /dev/null @@ -1,159 +0,0 @@ -/** - ****************************************************************************** - * @file syscalls.c - * @author Auto-generated by STM32CubeIDE - * @brief STM32CubeIDE Minimal System calls file - * - * For more information about which c-functions - * need which of these lowlevel functions - * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ - -/* Includes */ -#include -#include -#include -#include -#include -#include -#include -#include - - -/* Variables */ -//#undef errno -extern int errno; -extern int __io_putchar(int ch) __attribute__((weak)); -extern int __io_getchar(void) __attribute__((weak)); - -register char * stack_ptr asm("sp"); - -char *__env[1] = { 0 }; -char **environ = __env; - - -/* Functions */ -void initialise_monitor_handles() -{ -} - -int _getpid(void) -{ - return 1; -} - -int _kill(int pid, int sig) -{ - errno = EINVAL; - return -1; -} - -void _exit (int status) -{ - _kill(status, -1); - while (1) {} /* Make sure we hang here */ -} - -__attribute__((weak)) int _read(int file, char *ptr, int len) -{ - int DataIdx; - - for (DataIdx = 0; DataIdx < len; DataIdx++) - { - *ptr++ = __io_getchar(); - } - -return len; -} - -__attribute__((weak)) int _write(int file, char *ptr, int len) -{ - int DataIdx; - - for (DataIdx = 0; DataIdx < len; DataIdx++) - { - __io_putchar(*ptr++); - } - return len; -} - -int _close(int file) -{ - return -1; -} - - -int _fstat(int file, struct stat *st) -{ - st->st_mode = S_IFCHR; - return 0; -} - -int _isatty(int file) -{ - return 1; -} - -int _lseek(int file, int ptr, int dir) -{ - return 0; -} - -int _open(char *path, int flags, ...) -{ - /* Pretend like we always fail */ - return -1; -} - -int _wait(int *status) -{ - errno = ECHILD; - return -1; -} - -int _unlink(char *name) -{ - errno = ENOENT; - return -1; -} - -int _times(struct tms *buf) -{ - return -1; -} - -int _stat(char *file, struct stat *st) -{ - st->st_mode = S_IFCHR; - return 0; -} - -int _link(char *old, char *new) -{ - errno = EMLINK; - return -1; -} - -int _fork(void) -{ - errno = EAGAIN; - return -1; -} - -int _execve(char *name, char **argv, char **env) -{ - errno = ENOMEM; - return -1; -} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c deleted file mode 100644 index d7cc52cd4..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ /dev/null @@ -1,80 +0,0 @@ -/** - ****************************************************************************** - * @file sysmem.c - * @author Generated by STM32CubeIDE - * @brief STM32CubeIDE System Memory calls file - * - * For more information about which C functions - * need which of these lowlevel functions - * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ - -/* Includes */ -#include -#include - -/** - * Pointer to the current high watermark of the heap usage - */ -static uint8_t *__sbrk_heap_end = NULL; - -/** - * @brief _sbrk() allocates memory to the newlib heap and is used by malloc - * and others from the C library - * - * @verbatim - * ############################################################################ - * # .data # .bss # newlib heap # MSP stack # - * # # # # Reserved by _Min_Stack_Size # - * ############################################################################ - * ^-- RAM start ^-- _end _estack, RAM end --^ - * @endverbatim - * - * This implementation starts allocating at the '_end' linker symbol - * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack - * The implementation considers '_estack' linker symbol to be RAM end - * NOTE: If the MSP stack, at any point during execution, grows larger than the - * reserved size, please increase the '_Min_Stack_Size'. - * - * @param incr Memory size - * @return Pointer to allocated memory - */ -void *_sbrk(ptrdiff_t incr) -{ - extern uint8_t _end; /* Symbol defined in the linker script */ - extern uint8_t _estack; /* Symbol defined in the linker script */ - extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */ - const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size; - const uint8_t *max_heap = (uint8_t *)stack_limit; - uint8_t *prev_heap_end; - - /* Initialize heap end at first call */ - if (NULL == __sbrk_heap_end) - { - __sbrk_heap_end = &_end; - } - - /* Protect heap from growing into the reserved MSP stack */ - if (__sbrk_heap_end + incr > max_heap) - { - errno = ENOMEM; - return (void *)-1; - } - - prev_heap_end = __sbrk_heap_end; - __sbrk_heap_end += incr; - - return (void *)prev_heap_end; -} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld deleted file mode 100644 index b19bef906..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ /dev/null @@ -1,187 +0,0 @@ -/** -***************************************************************************** -** -** File : stm32wb55xx_flash_cm4.ld -** -** Abstract : STM32CubeIDE Minimal System calls file -** -** For more information about which c-functions -** need which of these lowlevel functions -** please consult the Newlib libc-manual -** -** Environment : STM32CubeIDE for MCU -** -** Distribution: The file is distributed as is, without any warranty -** of any kind. -** -***************************************************************************** -** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  -** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** -***************************************************************************** -*/ - -/* Entry Point */ -ENTRY(Reset_Handler) - -/* Highest address of the user mode stack */ -_estack = 0x20030000; /* end of RAM */ -/* Generate a link error if heap and stack don't fit into RAM */ -_Min_Heap_Size = 0x21ca0 ; /* required amount of heap */ -_Min_Stack_Size = 0x1000 ; /* required amount of stack */ - -/* Specify the memory areas */ -MEMORY -{ -FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K -RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FFF8 -RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K -} - -/* Define output sections */ -SECTIONS -{ - /* The startup code goes first into FLASH */ - .isr_vector : - { - . = ALIGN(4); - KEEP(*(.isr_vector)) /* Startup code */ - . = ALIGN(4); - } >FLASH - - /* The program code and other data goes into FLASH */ - .text : - { - . = ALIGN(4); - *(.text) /* .text sections (code) */ - *(.text*) /* .text* sections (code) */ - *(.glue_7) /* glue arm to thumb code */ - *(.glue_7t) /* glue thumb to arm code */ - *(.eh_frame) - - KEEP (*(.init)) - KEEP (*(.fini)) - - . = ALIGN(4); - _etext = .; /* define a global symbols at end of code */ - } >FLASH - - /* Constant data goes into FLASH */ - .rodata : - { - . = ALIGN(4); - *(.rodata) /* .rodata sections (constants, strings, etc.) */ - *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ - . = ALIGN(4); - } >FLASH - - .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH - .ARM : { - __exidx_start = .; - *(.ARM.exidx*) - __exidx_end = .; - } >FLASH - - .preinit_array : - { - PROVIDE_HIDDEN (__preinit_array_start = .); - KEEP (*(.preinit_array*)) - PROVIDE_HIDDEN (__preinit_array_end = .); - } >FLASH - .init_array : - { - PROVIDE_HIDDEN (__init_array_start = .); - KEEP (*(SORT(.init_array.*))) - KEEP (*(.init_array*)) - PROVIDE_HIDDEN (__init_array_end = .); - } >FLASH - .fini_array : - { - PROVIDE_HIDDEN (__fini_array_start = .); - KEEP (*(SORT(.fini_array.*))) - KEEP (*(.fini_array*)) - PROVIDE_HIDDEN (__fini_array_end = .); - } >FLASH - - /* used by the startup to initialize data */ - _sidata = LOADADDR(.data); - - /* Initialized data sections goes into RAM, load LMA copy after code */ - .data : - { - . = ALIGN(4); - _sdata = .; /* create a global symbol at data start */ - *(.data) /* .data sections */ - *(.data*) /* .data* sections */ - - . = ALIGN(4); - _edata = .; /* define a global symbol at data end */ - } >RAM1 AT> FLASH - - - /* Uninitialized data section */ - . = ALIGN(4); - .bss : - { - /* This is used by the startup in order to initialize the .bss secion */ - _sbss = .; /* define a global symbol at bss start */ - __bss_start__ = _sbss; - *(.bss) - *(.bss*) - *(COMMON) - - . = ALIGN(4); - _ebss = .; /* define a global symbol at bss end */ - __bss_end__ = _ebss; - } >RAM1 - - /* User_heap_stack section, used to check that there is enough RAM left */ - ._user_heap_stack : - { - . = ALIGN(8); - PROVIDE ( end = . ); - PROVIDE ( _end = . ); - . = . + _Min_Heap_Size; - . = . + _Min_Stack_Size; - . = ALIGN(8); - } >RAM1 - - - - /* Remove information from the standard libraries */ - /DISCARD/ : - { - libc.a ( * ) - libm.a ( * ) - libgcc.a ( * ) - } - - .ARM.attributes 0 : { *(.ARM.attributes) } - MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED - MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED - MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED -} - - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.c deleted file mode 100644 index 7e266b635..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.c +++ /dev/null @@ -1,1143 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" - -#include "dbg_trace.h" -#include "ble.h" -#include "tl.h" -#include "app_ble.h" - -#include "stm32_seq.h" -#include "shci.h" -#include "stm32_lpm.h" -#include "otp.h" -#include "p2p_server_app.h" - -/* Private includes ----------------------------------------------------------*/ -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - -/* Private typedef -----------------------------------------------------------*/ - -/** - * security parameters structure - */ -typedef struct _tSecurityParams -{ - /** - * IO capability of the device - */ - uint8_t ioCapability; - - /** - * Authentication requirement of the device - * Man In the Middle protection required? - */ - uint8_t mitm_mode; - - /** - * bonding mode of the device - */ - uint8_t bonding_mode; - - /** - * Flag to tell whether OOB data has - * to be used during the pairing process - */ - uint8_t OOB_Data_Present; - - /** - * OOB data to be used in the pairing process if - * OOB_Data_Present is set to TRUE - */ - uint8_t OOB_Data[16]; - - /** - * this variable indicates whether to use a fixed pin - * during the pairing process or a passkey has to be - * requested to the application during the pairing process - * 0 implies use fixed pin and 1 implies request for passkey - */ - uint8_t Use_Fixed_Pin; - - /** - * minimum encryption key size requirement - */ - uint8_t encryptionKeySizeMin; - - /** - * maximum encryption key size requirement - */ - uint8_t encryptionKeySizeMax; - - /** - * fixed pin to be used in the pairing process if - * Use_Fixed_Pin is set to 1 - */ - uint32_t Fixed_Pin; - - /** - * this flag indicates whether the host has to initiate - * the security, wait for pairing or does not have any security - * requirements.\n - * 0x00 : no security required - * 0x01 : host should initiate security by sending the slave security - * request command - * 0x02 : host need not send the clave security request but it - * has to wait for paiirng to complete before doing any other - * processing - */ - uint8_t initiateSecurity; -}tSecurityParams; - -/** - * global context - * contains the variables common to all - * services - */ -typedef struct _tBLEProfileGlobalContext -{ - - /** - * security requirements of the host - */ - tSecurityParams bleSecurityParam; - - /** - * gap service handle - */ - uint16_t gapServiceHandle; - - /** - * device name characteristic handle - */ - uint16_t devNameCharHandle; - - /** - * appearance characteristic handle - */ - uint16_t appearanceCharHandle; - - /** - * connection handle of the current active connection - * When not in connection, the handle is set to 0xFFFF - */ - uint16_t connectionHandle; - - /** - * length of the UUID list to be used while advertising - */ - uint8_t advtServUUIDlen; - - /** - * the UUID list to be used while advertising - */ - uint8_t advtServUUID[100]; - -}BleGlobalContext_t; - -typedef struct -{ - BleGlobalContext_t BleApplicationContext_legacy; - APP_BLE_ConnStatus_t Device_Connection_Status; - /** - * ID of the Advertising Timeout - */ - uint8_t Advertising_mgr_timer_Id; - - uint8_t SwitchOffGPIO_timer_Id; -}BleApplicationContext_t; -/* USER CODE BEGIN PTD */ - -/* USER CODE END PTD */ - -/* Private defines -----------------------------------------------------------*/ -#define APPBLE_GAP_DEVICE_NAME_LENGTH 7 -#define FAST_ADV_TIMEOUT (30*1000*1000/CFG_TS_TICK_VAL) /**< 30s */ -#define INITIAL_ADV_TIMEOUT (60*1000*1000/CFG_TS_TICK_VAL) /**< 60s */ - -#define BD_ADDR_SIZE_LOCAL 6 - -/* USER CODE BEGIN PD */ -#define LED_ON_TIMEOUT (0.005*1000*1000/CFG_TS_TICK_VAL) /**< 5ms */ -/* USER CODE END PD */ - -/* Private macro -------------------------------------------------------------*/ -/* USER CODE BEGIN PM */ - -/* USER CODE END PM */ - -/* Private variables ---------------------------------------------------------*/ -PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer; - -static const uint8_t M_bd_addr[BD_ADDR_SIZE_LOCAL] = - { - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000000000FF)), - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00000000FF00) >> 8), - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x000000FF0000) >> 16), - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x0000FF000000) >> 24), - (uint8_t)((CFG_ADV_BD_ADDRESS & 0x00FF00000000) >> 32), - (uint8_t)((CFG_ADV_BD_ADDRESS & 0xFF0000000000) >> 40) - }; -static uint8_t bd_addr_udn[BD_ADDR_SIZE_LOCAL]; - -/** -* Identity root key used to derive LTK and CSRK -*/ -static const uint8_t BLE_CFG_IR_VALUE[16] = CFG_BLE_IRK; - -/** -* Encryption root key used to derive LTK and CSRK -*/ -static const uint8_t BLE_CFG_ER_VALUE[16] = CFG_BLE_ERK; - -PLACE_IN_SECTION("BLE_APP_CONTEXT") static BleApplicationContext_t BleApplicationContext; -PLACE_IN_SECTION("BLE_APP_CONTEXT") static uint16_t AdvIntervalMin, AdvIntervalMax; - -P2PS_APP_ConnHandle_Not_evt_t handleNotification; - -#if L2CAP_REQUEST_NEW_CONN_PARAM != 0 -#define SIZE_TAB_CONN_INT 2 -float tab_conn_interval[SIZE_TAB_CONN_INT] = {50, 1000} ; /* ms */ -uint8_t index_con_int, mutex; -#endif - -/** - * Advertising Data - */ -#if (P2P_SERVER1 != 0) -static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME ,'P','2','P','S','R','V','1'}; -uint8_t manuf_data[14] = { - sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, - 0x01/*SKD version */, - CFG_DEV_ID_P2P_SERVER1 /* STM32WB - P2P Server 1*/, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP A Feature */, - CFG_FEATURE_THREAD_SWITCH /* GROUP B Feature */, - 0x00 /* GROUP B Feature */, - 0x00, /* BLE MAC start -MSB */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, /* BLE MAC stop */ -}; -#endif -/** - * Advertising Data - */ -#if (P2P_SERVER2 != 0) -static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '2'}; -uint8_t manuf_data[14] = { - sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, - 0x01/*SKD version */, - CFG_DEV_ID_P2P_SERVER2 /* STM32WB - P2P Server 2*/, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP B Feature */, - 0x00 /* GROUP B Feature */, - 0x00, /* BLE MAC start -MSB */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, /* BLE MAC stop */ -}; - -#endif - -#if (P2P_SERVER3 != 0) -static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '3'}; -uint8_t manuf_data[14] = { - sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, - 0x01/*SKD version */, - CFG_DEV_ID_P2P_SERVER3 /* STM32WB - P2P Server 3*/, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP B Feature */, - 0x00 /* GROUP B Feature */, - 0x00, /* BLE MAC start -MSB */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, /* BLE MAC stop */ -}; -#endif - -#if (P2P_SERVER4 != 0) -static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '4'}; -uint8_t manuf_data[14] = { - sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, - 0x01/*SKD version */, - CFG_DEV_ID_P2P_SERVER4 /* STM32WB - P2P Server 4*/, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP B Feature */, - 0x00 /* GROUP B Feature */, - 0x00, /* BLE MAC start -MSB */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, /* BLE MAC stop */ -}; -#endif - -#if (P2P_SERVER5 != 0) -static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '5'}; -uint8_t manuf_data[14] = { - sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, - 0x01/*SKD version */, - CFG_DEV_ID_P2P_SERVER5 /* STM32WB - P2P Server 5*/, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP B Feature */, - 0x00 /* GROUP B Feature */, - 0x00, /* BLE MAC start -MSB */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, /* BLE MAC stop */ -}; -#endif - -#if (P2P_SERVER6 != 0) -static const char local_name[] = { AD_TYPE_COMPLETE_LOCAL_NAME, 'P', '2', 'P', 'S', 'R', 'V', '6'}; -uint8_t manuf_data[14] = { - sizeof(manuf_data)-1, AD_TYPE_MANUFACTURER_SPECIFIC_DATA, - 0x01/*SKD version */, - CFG_DEV_ID_P2P_SERVER6 /* STM32WB - P2P Server 1*/, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP A Feature */, - 0x00 /* GROUP B Feature */, - 0x00 /* GROUP B Feature */, - 0x00, /* BLE MAC start -MSB */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, /* BLE MAC stop */ -}; -#endif - -/* USER CODE BEGIN PV */ - -/* USER CODE END PV */ - -/* Private function prototypes -----------------------------------------------*/ -static void BLE_UserEvtRx( void * pPayload ); -static void BLE_StatusNot( HCI_TL_CmdStatus_t status ); -static void Ble_Tl_Init( void ); -static void Ble_Hci_Gap_Gatt_Init(void); -static const uint8_t* BleGetBdAddress( void ); -static void Adv_Request( APP_BLE_ConnStatus_t New_Status ); -static void Adv_Cancel( void ); -static void Adv_Cancel_Req( void ); -static void Switch_OFF_GPIO( void ); -#if(L2CAP_REQUEST_NEW_CONN_PARAM != 0) -static void BLE_SVC_L2CAP_Conn_Update(uint16_t Connection_Handle); -#endif - -/* USER CODE BEGIN PFP */ - -/* USER CODE END PFP */ - -/* Functions Definition ------------------------------------------------------*/ -void APP_BLE_Init( void ) -{ -/* USER CODE BEGIN APP_BLE_Init_1 */ - -/* USER CODE END APP_BLE_Init_1 */ - SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = - { - {{0,0,0}}, /**< Header unused */ - {0, /** pBleBufferAddress not used */ - 0, /** BleBufferSize not used */ - CFG_BLE_NUM_GATT_ATTRIBUTES, - CFG_BLE_NUM_GATT_SERVICES, - CFG_BLE_ATT_VALUE_ARRAY_SIZE, - CFG_BLE_NUM_LINK, - CFG_BLE_DATA_LENGTH_EXTENSION, - CFG_BLE_PREPARE_WRITE_LIST_SIZE, - CFG_BLE_MBLOCK_COUNT, - CFG_BLE_MAX_ATT_MTU, - CFG_BLE_SLAVE_SCA, - CFG_BLE_MASTER_SCA, - CFG_BLE_LSE_SOURCE, - CFG_BLE_MAX_CONN_EVENT_LENGTH, - CFG_BLE_HSE_STARTUP_TIME, - CFG_BLE_VITERBI_MODE, - CFG_BLE_OPTIONS, - 0, - CFG_BLE_MAX_COC_INITIATOR_NBR, - CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} - }; - - /** - * Initialize Ble Transport Layer - */ - Ble_Tl_Init( ); - - /** - * Do not allow standby in the application - */ - UTIL_LPM_SetOffMode(1 << CFG_LPM_APP_BLE, UTIL_LPM_DISABLE); - - /** - * Register the hci transport layer to handle BLE User Asynchronous Events - */ - UTIL_SEQ_RegTask( 1<data; - - switch (event_pckt->evt) - { - case EVT_DISCONN_COMPLETE: - { - hci_disconnection_complete_event_rp0 *disconnection_complete_event; - disconnection_complete_event = (hci_disconnection_complete_event_rp0 *) event_pckt->data; - - if (disconnection_complete_event->Connection_Handle == BleApplicationContext.BleApplicationContext_legacy.connectionHandle) - { - BleApplicationContext.BleApplicationContext_legacy.connectionHandle = 0; - BleApplicationContext.Device_Connection_Status = APP_BLE_IDLE; - APP_DBG_MSG("\r\n\r** DISCONNECTION EVENT WITH CLIENT \n"); - } - /* restart advertising */ - Adv_Request(APP_BLE_FAST_ADV); - /* -* SPECIFIC to P2P Server APP -*/ - handleNotification.P2P_Evt_Opcode = PEER_DISCON_HANDLE_EVT; - handleNotification.ConnectionHandle = BleApplicationContext.BleApplicationContext_legacy.connectionHandle; - P2PS_APP_Notification(&handleNotification); - - /* USER CODE BEGIN EVT_DISCONN_COMPLETE */ - - /* USER CODE END EVT_DISCONN_COMPLETE */ - } - - break; /* EVT_DISCONN_COMPLETE */ - - case EVT_LE_META_EVENT: - { - meta_evt = (evt_le_meta_event*) event_pckt->data; - /* USER CODE BEGIN EVT_LE_META_EVENT */ - - /* USER CODE END EVT_LE_META_EVENT */ - switch (meta_evt->subevent) - { - case EVT_LE_CONN_UPDATE_COMPLETE: - APP_DBG_MSG("\r\n\r** CONNECTION UPDATE EVENT WITH CLIENT \n"); - break; - case EVT_LE_CONN_COMPLETE: - { - hci_le_connection_complete_event_rp0 *connection_complete_event; - - /** - * The connection is done, there is no need anymore to schedule the LP ADV - */ - connection_complete_event = (hci_le_connection_complete_event_rp0 *) meta_evt->data; - - HW_TS_Stop(BleApplicationContext.Advertising_mgr_timer_Id); - - APP_DBG_MSG("EVT_LE_CONN_COMPLETE for connection handle 0x%x\n", - connection_complete_event->Connection_Handle); - - if (BleApplicationContext.Device_Connection_Status == APP_BLE_LP_CONNECTING) - { - /* Connection as client */ - BleApplicationContext.Device_Connection_Status = APP_BLE_CONNECTED_CLIENT; - } - else - { - /* Connection as server */ - BleApplicationContext.Device_Connection_Status = APP_BLE_CONNECTED_SERVER; - } - - BleApplicationContext.BleApplicationContext_legacy.connectionHandle = - connection_complete_event->Connection_Handle; - /* -* SPECIFIC to P2P Server APP -*/ - handleNotification.P2P_Evt_Opcode = PEER_CONN_HANDLE_EVT; - handleNotification.ConnectionHandle = BleApplicationContext.BleApplicationContext_legacy.connectionHandle; - P2PS_APP_Notification(&handleNotification); - /* USER CODE BEGIN HCI_EVT_LE_CONN_COMPLETE */ - /* -* SPECIFIC to P2P Server APP -*/ - handleNotification.P2P_Evt_Opcode = PEER_CONN_HANDLE_EVT; - handleNotification.ConnectionHandle = BleApplicationContext.BleApplicationContext_legacy.connectionHandle; - P2PS_APP_Notification(&handleNotification); -/**/ - /* USER CODE END HCI_EVT_LE_CONN_COMPLETE */ - } - break; /* HCI_EVT_LE_CONN_COMPLETE */ - - default: - /* USER CODE BEGIN SUBEVENT_DEFAULT */ - - /* USER CODE END SUBEVENT_DEFAULT */ - break; - } - } - break; /* HCI_EVT_LE_META_EVENT */ - - case EVT_VENDOR: - blue_evt = (evt_blue_aci*) event_pckt->data; - /* USER CODE BEGIN EVT_VENDOR */ - - /* USER CODE END EVT_VENDOR */ - switch (blue_evt->ecode) - { - /* USER CODE BEGIN ecode */ - - /* USER CODE END ecode */ -/* -* SPECIFIC to P2P Server APP -*/ - case EVT_BLUE_L2CAP_CONNECTION_UPDATE_RESP: -#if (L2CAP_REQUEST_NEW_CONN_PARAM != 0 ) - mutex = 1; -#endif - /* USER CODE BEGIN EVT_BLUE_L2CAP_CONNECTION_UPDATE_RESP */ - - /* USER CODE END EVT_BLUE_L2CAP_CONNECTION_UPDATE_RESP */ - break; - case EVT_BLUE_GAP_PROCEDURE_COMPLETE: - APP_DBG_MSG("\r\n\r** EVT_BLUE_GAP_PROCEDURE_COMPLETE \n"); - /* USER CODE BEGIN EVT_BLUE_GAP_PROCEDURE_COMPLETE */ - - /* USER CODE END EVT_BLUE_GAP_PROCEDURE_COMPLETE */ - break; /* EVT_BLUE_GAP_PROCEDURE_COMPLETE */ -#if(RADIO_ACTIVITY_EVENT != 0) - case 0x0004: - /* USER CODE BEGIN RADIO_ACTIVITY_EVENT*/ - BSP_LED_On(LED_GREEN); - HW_TS_Start(BleApplicationContext.SwitchOffGPIO_timer_Id, (uint32_t)LED_ON_TIMEOUT); - /* USER CODE END RADIO_ACTIVITY_EVENT*/ - break; /* RADIO_ACTIVITY_EVENT */ -#endif - } - break; /* EVT_VENDOR */ - - default: - /* USER CODE BEGIN ECODE_DEFAULT*/ - - /* USER CODE END ECODE_DEFAULT*/ - break; - } - - return (SVCCTL_UserEvtFlowEnable); -} - -APP_BLE_ConnStatus_t APP_BLE_Get_Server_Connection_Status(void) -{ - return BleApplicationContext.Device_Connection_Status; -} - -/* USER CODE BEGIN FD*/ -void APP_BLE_Key_Button1_Action(void) -{ - P2PS_APP_SW1_Button_Action(); -} - -void APP_BLE_Key_Button2_Action(void) -{ -#if (L2CAP_REQUEST_NEW_CONN_PARAM != 0 ) - if (BleApplicationContext.Device_Connection_Status != APP_BLE_FAST_ADV && BleApplicationContext.Device_Connection_Status != APP_BLE_IDLE) - { - BLE_SVC_L2CAP_Conn_Update(BleApplicationContext.BleApplicationContext_legacy.connectionHandle); - - } - return; -#endif -} - -void APP_BLE_Key_Button3_Action(void) -{ -} - -void APP_BLE_Stop(void) -{ - /* Stop Advertising Timer */ - HW_TS_Stop(BleApplicationContext.Advertising_mgr_timer_Id); - HW_TS_Delete(BleApplicationContext.Advertising_mgr_timer_Id); - - /* BLE STOP Procedure */ - aci_hal_stack_reset(); -} -/* USER CODE END FD*/ -/************************************************************* - * - * LOCAL FUNCTIONS - * - *************************************************************/ -static void Ble_Tl_Init( void ) -{ - HCI_TL_HciInitConf_t Hci_Tl_Init_Conf; - - Hci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&BleCmdBuffer; - Hci_Tl_Init_Conf.StatusNotCallBack = BLE_StatusNot; - hci_init(BLE_UserEvtRx, (void*) &Hci_Tl_Init_Conf); - - return; -} - - static void Ble_Hci_Gap_Gatt_Init(void){ - - uint8_t role; - uint8_t index; - uint16_t gap_service_handle, gap_dev_name_char_handle, gap_appearance_char_handle; - const uint8_t *bd_addr; - uint32_t srd_bd_addr[2]; - uint16_t appearance[1] = { BLE_CFG_GAP_APPEARANCE }; - - /** - * Initialize HCI layer - */ - /*HCI Reset to synchronise BLE Stack*/ - hci_reset(); - - /** - * Write the BD Address - */ - - bd_addr = BleGetBdAddress(); - aci_hal_write_config_data(CONFIG_DATA_PUBADDR_OFFSET, - CONFIG_DATA_PUBADDR_LEN, - (uint8_t*) bd_addr); - - /* BLE MAC in ADV Packet */ - manuf_data[ sizeof(manuf_data)-6] = bd_addr[5]; - manuf_data[ sizeof(manuf_data)-5] = bd_addr[4]; - manuf_data[ sizeof(manuf_data)-4] = bd_addr[3]; - manuf_data[ sizeof(manuf_data)-3] = bd_addr[2]; - manuf_data[ sizeof(manuf_data)-2] = bd_addr[1]; - manuf_data[ sizeof(manuf_data)-1] = bd_addr[0]; - - /** - * Static random Address - * The two upper bits shall be set to 1 - * The lowest 32bits is read from the UDN to differentiate between devices - * The RNG may be used to provide a random number on each power on - */ - srd_bd_addr[1] = 0x0000ED6E; - srd_bd_addr[0] = LL_FLASH_GetUDN( ); - aci_hal_write_config_data( CONFIG_DATA_RANDOM_ADDRESS_OFFSET, CONFIG_DATA_RANDOM_ADDRESS_LEN, (uint8_t*)srd_bd_addr ); - - /** - * Write Identity root key used to derive LTK and CSRK - */ - aci_hal_write_config_data( CONFIG_DATA_IR_OFFSET, CONFIG_DATA_IR_LEN, (uint8_t*)BLE_CFG_IR_VALUE ); - - /** - * Write Encryption root key used to derive LTK and CSRK - */ - aci_hal_write_config_data( CONFIG_DATA_ER_OFFSET, CONFIG_DATA_ER_LEN, (uint8_t*)BLE_CFG_ER_VALUE ); - - /** - * Set TX Power to 0dBm. - */ - aci_hal_set_tx_power_level(1, CFG_TX_POWER); - - /** - * Initialize GATT interface - */ - aci_gatt_init(); - - /** - * Initialize GAP interface - */ - role = 0; - -#if (BLE_CFG_PERIPHERAL == 1) - role |= GAP_PERIPHERAL_ROLE; -#endif - -#if (BLE_CFG_CENTRAL == 1) - role |= GAP_CENTRAL_ROLE; -#endif - - if (role > 0) - { - const char *name = "STM32WB"; - aci_gap_init(role, 0, - APPBLE_GAP_DEVICE_NAME_LENGTH, - &gap_service_handle, &gap_dev_name_char_handle, &gap_appearance_char_handle); - - if (aci_gatt_update_char_value(gap_service_handle, gap_dev_name_char_handle, 0, strlen(name), (uint8_t *) name)) - { - BLE_DBG_SVCCTL_MSG("Device Name aci_gatt_update_char_value failed.\n"); - } - } - - if(aci_gatt_update_char_value(gap_service_handle, - gap_appearance_char_handle, - 0, - 2, - (uint8_t *)&appearance)) - { - BLE_DBG_SVCCTL_MSG("Appearance aci_gatt_update_char_value failed.\n"); - } -/** - * Initialize Default PHY - */ - hci_le_set_default_phy(ALL_PHYS_PREFERENCE,TX_2M_PREFERRED,RX_2M_PREFERRED); - - /** - * Initialize IO capability - */ - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.ioCapability = CFG_IO_CAPABILITY; - aci_gap_set_io_capability(BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.ioCapability); - - /** - * Initialize authentication - */ - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.mitm_mode = CFG_MITM_PROTECTION; - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.OOB_Data_Present = 0; - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMin = 8; - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMax = 16; - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Use_Fixed_Pin = 1; - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Fixed_Pin = 111111; - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.bonding_mode = 1; - for (index = 0; index < 16; index++) - { - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.OOB_Data[index] = (uint8_t) index; - } - - aci_gap_set_authentication_requirement(BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.bonding_mode, - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.mitm_mode, - 0, - 0, - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMin, - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMax, - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Use_Fixed_Pin, - BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Fixed_Pin, - 0 - ); - - /** - * Initialize whitelist - */ - if (BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.bonding_mode) - { - aci_gap_configure_whitelist(); - } -} - -static void Adv_Request(APP_BLE_ConnStatus_t New_Status) -{ - tBleStatus ret = BLE_STATUS_INVALID_PARAMS; - uint16_t Min_Inter, Max_Inter; - - if (New_Status == APP_BLE_FAST_ADV) - { - Min_Inter = AdvIntervalMin; - Max_Inter = AdvIntervalMax; - } - else - { - Min_Inter = CFG_LP_CONN_ADV_INTERVAL_MIN; - Max_Inter = CFG_LP_CONN_ADV_INTERVAL_MAX; - } - - /** - * Stop the timer, it will be restarted for a new shot - * It does not hurt if the timer was not running - */ - HW_TS_Stop(BleApplicationContext.Advertising_mgr_timer_Id); - - APP_DBG_MSG("First index in %d state \n", - BleApplicationContext.Device_Connection_Status); - - if ((New_Status == APP_BLE_LP_ADV) - && ((BleApplicationContext.Device_Connection_Status == APP_BLE_FAST_ADV) - || (BleApplicationContext.Device_Connection_Status == APP_BLE_LP_ADV))) - { - /* Connection in ADVERTISE mode have to stop the current advertising */ - ret = aci_gap_set_non_discoverable(); - if (ret == BLE_STATUS_SUCCESS) - { - APP_DBG_MSG("Successfully Stopped Advertising"); - } - else - { - APP_DBG_MSG("Stop Advertising Failed , result: %d \n", ret); - } - } - - BleApplicationContext.Device_Connection_Status = New_Status; - /* Start Fast or Low Power Advertising */ - ret = aci_gap_set_discoverable( - ADV_IND, - Min_Inter, - Max_Inter, - PUBLIC_ADDR, - NO_WHITE_LIST_USE, /* use white list */ - sizeof(local_name), - (uint8_t*) &local_name, - BleApplicationContext.BleApplicationContext_legacy.advtServUUIDlen, - BleApplicationContext.BleApplicationContext_legacy.advtServUUID, - 0, - 0); - /* Update Advertising data */ - ret = aci_gap_update_adv_data(sizeof(manuf_data), (uint8_t*) manuf_data); - - if (ret == BLE_STATUS_SUCCESS) - { - if (New_Status == APP_BLE_FAST_ADV) - { - APP_DBG_MSG("Successfully Start Fast Advertising \n" ); - /* Start Timer to STOP ADV - TIMEOUT */ - HW_TS_Start(BleApplicationContext.Advertising_mgr_timer_Id, INITIAL_ADV_TIMEOUT); - } - else - { - APP_DBG_MSG("Successfully Start Low Power Advertising \n"); - } - } - else - { - if (New_Status == APP_BLE_FAST_ADV) - { - APP_DBG_MSG("Start Fast Advertising Failed , result: %d \n", ret); - } - else - { - APP_DBG_MSG("Start Low Power Advertising Failed , result: %d \n", ret); - } - } - - return; -} - -const uint8_t* BleGetBdAddress( void ) -{ - uint8_t *otp_addr; - const uint8_t *bd_addr; - uint32_t udn; - uint32_t company_id; - uint32_t device_id; - - udn = LL_FLASH_GetUDN(); - - if(udn != 0xFFFFFFFF) - { - company_id = LL_FLASH_GetSTCompanyID(); - device_id = LL_FLASH_GetDeviceID(); - -/** - * Public Address with the ST company ID - * bit[47:24] : 24bits (OUI) equal to the company ID - * bit[23:16] : Device ID. - * bit[15:0] : The last 16bits from the UDN - * Note: In order to use the Public Address in a final product, a dedicated - * 24bits company ID (OUI) shall be bought. - */ - bd_addr_udn[0] = (uint8_t)(udn & 0x000000FF); - bd_addr_udn[1] = (uint8_t)( (udn & 0x0000FF00) >> 8 ); - bd_addr_udn[2] = (uint8_t)device_id; - bd_addr_udn[3] = (uint8_t)(company_id & 0x000000FF);; - bd_addr_udn[4] = (uint8_t)( (company_id & 0x0000FF00) >> 8 ); - bd_addr_udn[5] = (uint8_t)( (company_id & 0x00FF0000) >> 16 ); - - bd_addr = (const uint8_t *)bd_addr_udn; - } - else - { - otp_addr = OTP_Read(0); - if(otp_addr) - { - bd_addr = ((OTP_ID0_t*)otp_addr)->bd_address; - } - else - { - bd_addr = M_bd_addr; - } - } - - return bd_addr; -} - -/* USER CODE BEGIN FD_LOCAL_FUNCTION */ - -/* USER CODE END FD_LOCAL_FUNCTION */ - -/************************************************************* - * - *SPECIFIC FUNCTIONS FOR P2P SERVER - * - *************************************************************/ -static void Adv_Cancel( void ) -{ -/* USER CODE BEGIN Adv_Cancel_1 */ - BSP_LED_Off(LED_GREEN); -/* USER CODE END Adv_Cancel_1 */ - - if (BleApplicationContext.Device_Connection_Status != APP_BLE_CONNECTED_SERVER) - - { - - tBleStatus result = 0x00; - - result = aci_gap_set_non_discoverable(); - - BleApplicationContext.Device_Connection_Status = APP_BLE_IDLE; - if (result == BLE_STATUS_SUCCESS) - { - APP_DBG_MSG(" \r\n\r");APP_DBG_MSG("** STOP ADVERTISING ** \r\n\r"); - } - else - { - APP_DBG_MSG("** STOP ADVERTISING ** Failed \r\n\r"); - } - - } - -/* USER CODE BEGIN Adv_Cancel_2 */ - -/* USER CODE END Adv_Cancel_2 */ - return; -} - -static void Adv_Cancel_Req( void ) -{ -/* USER CODE BEGIN Adv_Cancel_Req_1 */ - -/* USER CODE END Adv_Cancel_Req_1 */ - UTIL_SEQ_SetTask(1 << CFG_TASK_ADV_CANCEL_ID, CFG_SCH_PRIO_0); -/* USER CODE BEGIN Adv_Cancel_Req_2 */ - -/* USER CODE END Adv_Cancel_Req_2 */ - return; -} - -static void Switch_OFF_GPIO(){ -/* USER CODE BEGIN Switch_OFF_GPIO */ - BSP_LED_Off(LED_GREEN); -/* USER CODE END Switch_OFF_GPIO */ -} - -#if(L2CAP_REQUEST_NEW_CONN_PARAM != 0) -void BLE_SVC_L2CAP_Conn_Update(uint16_t Connection_Handle) -{ -/* USER CODE BEGIN BLE_SVC_L2CAP_Conn_Update_1 */ - -/* USER CODE END BLE_SVC_L2CAP_Conn_Update_1 */ - if(mutex == 1) { - mutex = 0; - index_con_int = (index_con_int + 1)%SIZE_TAB_CONN_INT; - uint16_t interval_min = CONN_P(tab_conn_interval[index_con_int]); - uint16_t interval_max = CONN_P(tab_conn_interval[index_con_int]); - uint16_t slave_latency = L2CAP_SLAVE_LATENCY; - uint16_t timeout_multiplier = L2CAP_TIMEOUT_MULTIPLIER; - tBleStatus result; - - result = aci_l2cap_connection_parameter_update_req(BleApplicationContext.BleApplicationContext_legacy.connectionHandle, - interval_min, interval_max, - slave_latency, timeout_multiplier); - if( result == BLE_STATUS_SUCCESS ) - { - APP_DBG_MSG("BLE_SVC_L2CAP_Conn_Update(), Successfully \r\n\r"); - } - else - { - APP_DBG_MSG("BLE_SVC_L2CAP_Conn_Update(), Failed \r\n\r"); - } - } -/* USER CODE BEGIN BLE_SVC_L2CAP_Conn_Update_2 */ - -/* USER CODE END BLE_SVC_L2CAP_Conn_Update_2 */ - return; -} -#endif - -/* USER CODE BEGIN FD_SPECIFIC_FUNCTIONS */ - -/* USER CODE END FD_SPECIFIC_FUNCTIONS */ -/************************************************************* - * - * WRAP FUNCTIONS - * - *************************************************************/ -void hci_notify_asynch_evt(void* pdata) -{ - UTIL_SEQ_SetTask(1 << CFG_TASK_HCI_ASYNCH_EVT_ID, CFG_SCH_PRIO_0); - return; -} - -void hci_cmd_resp_release(uint32_t flag) -{ - UTIL_SEQ_SetEvt(1 << CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID); - return; -} - -void hci_cmd_resp_wait(uint32_t timeout) -{ - UTIL_SEQ_WaitEvt(1 << CFG_IDLEEVT_HCI_CMD_EVT_RSP_ID); - return; -} - -static void BLE_UserEvtRx( void * pPayload ) -{ - SVCCTL_UserEvtFlowStatus_t svctl_return_status; - tHCI_UserEvtRxParam *pParam; - - pParam = (tHCI_UserEvtRxParam *)pPayload; - - svctl_return_status = SVCCTL_UserEvtRx((void *)&(pParam->pckt->evtserial)); - if (svctl_return_status != SVCCTL_UserEvtFlowDisable) - { - pParam->status = HCI_TL_UserEventFlow_Enable; - } - else - { - pParam->status = HCI_TL_UserEventFlow_Disable; - } -} - -static void BLE_StatusNot( HCI_TL_CmdStatus_t status ) -{ - uint32_t task_id_list; - switch (status) - { - case HCI_TL_CmdBusy: - /** - * All tasks that may send an aci/hci commands shall be listed here - * This is to prevent a new command is sent while one is already pending - */ - task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; - UTIL_SEQ_PauseTask(task_id_list); - - break; - - case HCI_TL_CmdAvailable: - /** - * All tasks that may send an aci/hci commands shall be listed here - * This is to prevent a new command is sent while one is already pending - */ - task_id_list = (1 << CFG_LAST_TASK_ID_WITH_HCICMD) - 1; - UTIL_SEQ_ResumeTask(task_id_list); - - break; - - default: - break; - } - return; -} - -void SVCCTL_ResumeUserEventFlow( void ) -{ - hci_resume_flow(); - return; -} - -/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ - -/* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.h deleted file mode 100644 index f738ee83c..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_ble.h +++ /dev/null @@ -1,88 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * @file app_ble.h - * @author MCD Application Team - * @brief Header for ble application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef APP_BLE_H -#define APP_BLE_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ -#include "hci_tl.h" - -/* Private includes ----------------------------------------------------------*/ -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - -/* Exported types ------------------------------------------------------------*/ - - typedef enum - { - APP_BLE_IDLE, - APP_BLE_FAST_ADV, - APP_BLE_LP_ADV, - APP_BLE_SCAN, - APP_BLE_LP_CONNECTING, - APP_BLE_CONNECTED_SERVER, - APP_BLE_CONNECTED_CLIENT - } APP_BLE_ConnStatus_t; - -/* USER CODE BEGIN ET */ - -/* USER CODE END ET */ - -/* Exported constants --------------------------------------------------------*/ -/* USER CODE BEGIN EC */ - -/* USER CODE END EC */ - -/* External variables --------------------------------------------------------*/ -/* USER CODE BEGIN EV */ - -/* USER CODE END EV */ - -/* Exported macro ------------------------------------------------------------*/ -/* USER CODE BEGIN EM */ - -/* USER CODE END EM */ - -/* Exported functions ---------------------------------------------*/ - void APP_BLE_Init( void ); - - APP_BLE_ConnStatus_t APP_BLE_Get_Server_Connection_Status(void); - -/* USER CODE BEGIN EF */ -void APP_BLE_Key_Button1_Action(void); -void APP_BLE_Key_Button2_Action(void); -void APP_BLE_Key_Button3_Action(void); -void APP_BLE_Stop(void); -/* USER CODE END EF */ - -#ifdef __cplusplus -} -#endif - -#endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.c deleted file mode 100644 index c4252cb15..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.c +++ /dev/null @@ -1,845 +0,0 @@ -/** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "app_entry.h" -#include "dbg_trace.h" -#include "app_zigbee.h" -#include "zigbee_interface.h" -#include "shci.h" -#include "stm_logging.h" -#include "app_conf.h" -#include "stm32wbxx_core_interface_def.h" -#include "zigbee_types.h" -#include "stm32_seq.h" - -#include -#include "zcl/zcl.h" -#include "zcl/general/zcl.onoff.h" -#include "zcl/general/zcl.identify.h" - - -/* Private defines -----------------------------------------------------------*/ -#define APP_ZIGBEE_STARTUP_FAIL_DELAY 500U -#define SW1_ENDPOINT 17U -#define SW1_GROUP_ADDR 0x0001 -#define CHANNEL 13U - -#define HW_TS_SERVER_1S_NB_TICKS (1*1000*1000/CFG_TS_TICK_VAL) /* 1s */ -#define HW_TS_SERVER_10S_NB_TICKS (10*1000*1000/CFG_TS_TICK_VAL) /* 5s */ - - -/* external definition */ -extern const uint8_t sec_key_ha[ZB_SEC_KEYSIZE]; -extern SHCI_C2_CONCURRENT_Mode_Param_t APP_GetCurrentProtocolMode(void); - -/* Private function prototypes -----------------------------------------------*/ -static void APP_ZIGBEE_StackLayersInit(void); -static void APP_ZIGBEE_ConfigEndpoints(void); -static void APP_ZIGBEE_FreeEndpoints(void); -static void APP_ZIGBEE_SW1_Process(void); -static void APP_ZIGBEE_NwkForm(void); -static void APP_ZIGBEE_ConfigGroupAddr(void); - -static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode); -static void APP_ZIGBEE_CheckWirelessFirmwareInfo(void); -static void APP_ZIGBEE_persist_delete(void); - -static void Wait_Getting_Ack_From_M0(void); -static void Receive_Ack_From_M0(void); -static void Receive_Notification_From_M0(void); - -static enum ZbStatusCodeT APP_ZIGBEE_ZbStartupPersist(struct ZigBeeT* zb); -static void APP_ZIGBEE_persist_notify_cb(struct ZigBeeT *zb, void *cbarg); -static bool APP_ZIGBEE_persist_save(void); -static bool APP_ZIGBEE_persist_load(void); - -static uint32_t APP_ZIGBEE_GetCompleteJoinCpt(void); -static void APP_ZIGBEE_IncrCompleteJoinCpt(void); -static void APP_ZIGBEE_ResetCompleteJoinCpt(void); - -/* Private variables -----------------------------------------------*/ -static TL_CmdPacket_t *p_ZIGBEE_otcmdbuffer; -static TL_EvtPacket_t *p_ZIGBEE_notif_M0_to_M4; -static TL_EvtPacket_t *p_ZIGBEE_request_M0_to_M4; -static __IO uint32_t CptReceiveNotifyFromM0 = 0; -static __IO uint32_t CptReceiveRequestFromM0 = 0; - -PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_ZIGBEE_Config_t ZigbeeConfigBuffer; -PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t ZigbeeOtCmdBuffer; -PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t ZigbeeNotifRspEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; -PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t ZigbeeNotifRequestBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; - -struct zigbee_app_info { - bool has_init; - struct ZigBeeT *zb; - enum ZbStartType startupControl; - enum ZbStatusCodeT join_status; - uint32_t join_delay; - bool init_after_join; - uint32_t persistNumWrites; - - struct ZbZclClusterT *onoff_client_1; -}; - -/* NVM variables */ -/* cache in uninit RAM to store/retrieve persistent data */ -union cache -{ - uint8_t U8_data[ST_PERSIST_MAX_ALLOC_SZ]; // in bytes - uint32_t U32_data[ST_PERSIST_MAX_ALLOC_SZ/4U]; // in U32 words -}; -__attribute__ ((section(".noinit"))) union cache cache_persistent_data; - -static struct zigbee_app_info zigbee_app_info; -static uint32_t join_start_time; -static double join_time_duration; -static uint8_t zigbee_complete_join_cpt = 1U; - -/* Functions Definition ------------------------------------------------------*/ -/* external definition */ -enum ZbStatusCodeT ZbStartupWait(struct ZigBeeT *zb, struct ZbStartupT *config); - -void APP_ZIGBEE_Init(void) -{ - SHCI_CmdStatus_t ZigbeeInitStatus; - - APP_DBG("APP_ZIGBEE_Init"); - APP_DBG("STARTING ON CHANNEL = %d", CHANNEL); - - /* Check the compatibility with the Coprocessor Wireless Firmware loaded */ - APP_ZIGBEE_CheckWirelessFirmwareInfo(); - - /* Register cmdbuffer */ - APP_ZIGBEE_RegisterCmdBuffer(&ZigbeeOtCmdBuffer); - - /* Init config buffer and call TL_ZIGBEE_Init */ - APP_ZIGBEE_TL_INIT(); - - /* Register task */ - /* Create the different tasks */ - UTIL_SEQ_RegTask(1U << (uint32_t)CFG_TASK_NOTIFY_FROM_M0_TO_M4, UTIL_SEQ_RFU, APP_ZIGBEE_ProcessNotifyM0ToM4); - UTIL_SEQ_RegTask(1U << (uint32_t)CFG_TASK_REQUEST_FROM_M0_TO_M4, UTIL_SEQ_RFU, APP_ZIGBEE_ProcessRequestM0ToM4); - - /* Task associated with network creation process */ - UTIL_SEQ_RegTask(1U << CFG_TASK_ZIGBEE_NETWORK_FORM, UTIL_SEQ_RFU, APP_ZIGBEE_NwkForm); - - /* Task associated with push button SW1 */ - UTIL_SEQ_RegTask(1U << CFG_TASK_BUTTON_SW1, UTIL_SEQ_RFU, APP_ZIGBEE_SW1_Process); - - /* Start the Zigbee on the CPU2 side */ - ZigbeeInitStatus = SHCI_C2_ZIGBEE_Init(); - /* Prevent unused argument(s) compilation warning */ - UNUSED(ZigbeeInitStatus); - - /* Initialize Zigbee stack layers */ - APP_ZIGBEE_StackLayersInit(); - -} /* APP_ZIGBEE_Init */ - -void APP_ZIGBEE_Stop(void) -{ - APP_DBG("APP_ZIGBEE_Stop"); - - BSP_LED_Off(LED_RED); - BSP_LED_Off(LED_GREEN); - BSP_LED_Off(LED_BLUE); - - /* Free endpoints */ - APP_ZIGBEE_FreeEndpoints(); - - - UTIL_SEQ_PauseTask(1U << CFG_TASK_ZIGBEE_NETWORK_FORM); - - /* Save Persistent data */ - APP_DBG("Save persistent data"); - APP_ZIGBEE_persist_save(); - - /* Zigbee STOP Procedure */ - /* Free memory allocated by Zigbee stack */ - if (zigbee_app_info.zb == NULL) { - return; - } - ZbDestroy(zigbee_app_info.zb); - zigbee_app_info.zb = NULL; -} - -/** - * @brief Initialize Zigbee stack layers - * @param None - * @retval None - */ -static void APP_ZIGBEE_StackLayersInit(void) -{ - HAL_Delay(1000); - APP_DBG("APP_ZIGBEE_StackLayersInit"); - - zigbee_app_info.zb = ZbInit(0U, NULL, NULL); - assert(zigbee_app_info.zb != NULL); - - /* Create the endpoint and cluster(s) */ - APP_ZIGBEE_ConfigEndpoints(); - - BSP_LED_Off(LED_RED); - BSP_LED_Off(LED_GREEN); - BSP_LED_Off(LED_BLUE); - - /* Configure the joining parameters */ - zigbee_app_info.join_status = (enum ZbStatusCodeT) 0x01; /* init to error status */ - zigbee_app_info.join_delay = HAL_GetTick(); /* now */ - zigbee_app_info.startupControl = ZbStartTypeJoin; - - /* Initialization Complete */ - zigbee_app_info.has_init = true; - - join_start_time = HAL_GetTick(); - UTIL_SEQ_SetTask(1U << CFG_TASK_ZIGBEE_NETWORK_FORM, CFG_SCH_PRIO_0); -} - -/** - * @brief Configuration of the end points - * @param None - * @retval None - */ - -static void APP_ZIGBEE_ConfigEndpoints(void) -{ - struct ZbApsmeAddEndpointReqT req; - struct ZbApsmeAddEndpointConfT conf; - - memset(&req, 0, sizeof(req)); - req.profileId = ZCL_PROFILE_HOME_AUTOMATION; - req.deviceId = ZCL_DEVICE_ONOFF_SWITCH; - - /* Endpoint: SW1_ENDPOINT */ - req.endpoint = SW1_ENDPOINT; - ZbZclAddEndpoint(zigbee_app_info.zb, &req, &conf); - assert(conf.status == ZB_STATUS_SUCCESS); - - /* OnOff Client */ - zigbee_app_info.onoff_client_1 = ZbZclOnOffClientAlloc(zigbee_app_info.zb, SW1_ENDPOINT); - assert(zigbee_app_info.onoff_client_1 != NULL); - ZbZclClusterEndpointRegister(zigbee_app_info.onoff_client_1); - -} /* config_endpoints */ - -/** - * @brief Release the end points - * @param None - * @retval None - */ - -static void APP_ZIGBEE_FreeEndpoints(void) -{ - /* Free OnOff Client */ - ZbZclClusterFree(zigbee_app_info.onoff_client_1); -} /* APP_ZIGBEE_FreeEndpoints */ - -/** - * @brief Handle Zigbee network forming and joining - * @param None - * @retval None - */ -static void APP_ZIGBEE_NwkForm(void) -{ - if ((zigbee_app_info.join_status != ZB_STATUS_SUCCESS) && (HAL_GetTick() >= zigbee_app_info.join_delay)) - { - struct ZbStartupT config; - enum ZbStatusCodeT status; - - /* Configure Zigbee Logging (only need to do this once, but this is a good place to put it) */ - ZbSetLogging(zigbee_app_info.zb, ZB_LOG_MASK_LEVEL_5, NULL); - - /* Attempt to join a zigbee network */ - ZbStartupConfigGetProDefaults(&config); - - APP_DBG("Network config : APP_STARTUP_CENTRALIZED_ROUTER"); - zigbee_app_info.startupControl = ZbStartTypeJoin; - config.startupControl = zigbee_app_info.startupControl; - - /* Using the default HA preconfigured Link Key */ - memcpy(config.security.preconfiguredLinkKey, sec_key_ha, ZB_SEC_KEYSIZE); - config.channelList.count = 1; - config.channelList.list[0].page = 0; - config.channelList.list[0].channelMask = 1 << CHANNEL; /* Channel in use*/ - - APP_DBG("*** zigbee_complete_join_cpt value = %d ***", APP_ZIGBEE_GetCompleteJoinCpt()); - - ZbPersistNotifyRegister(zigbee_app_info.zb,NULL,NULL); - - if(APP_ZIGBEE_GetCompleteJoinCpt() < 2U) - { - /* Clear the persistemt data before starting a complete join */ - APP_ZIGBEE_persist_delete(); - /* Using ZbStartupWait (blocking) here instead of ZbStartup, in order to demonstrate how to do - * a blocking call on the M4. */ - status = ZbStartupWait(zigbee_app_info.zb, &config); - - APP_DBG("ZbStartup Callback (status = 0x%02x)", status); - zigbee_app_info.join_status = status; - - if (status == ZB_STATUS_SUCCESS) { - join_time_duration = (double)(HAL_GetTick() - join_start_time)/1000; - APP_DBG("JOIN SUCCESS, Duration = (%.2f seconds)", join_time_duration); - zigbee_app_info.join_delay = 0U; - zigbee_app_info.init_after_join = true; - APP_ZIGBEE_IncrCompleteJoinCpt(); - BSP_LED_On(LED_BLUE); - } - else - { - APP_DBG("Startup failed, attempting again after a short delay (%d ms)", APP_ZIGBEE_STARTUP_FAIL_DELAY); - zigbee_app_info.join_delay = HAL_GetTick() + APP_ZIGBEE_STARTUP_FAIL_DELAY; - } - } - else - { - /* Disabling of the notification */ - ZbPersistNotifyRegister(zigbee_app_info.zb,NULL,NULL); - - /* Restart from persistence */ - if (APP_ZIGBEE_ZbStartupPersist(zigbee_app_info.zb) == ZB_STATUS_SUCCESS) - { - APP_DBG("APP_ZIGBEE_ZbStartupPersist SUCCESS!"); - zigbee_app_info.join_status = ZB_STATUS_SUCCESS; - - /* Register Persistent data change notification */ - ZbPersistNotifyRegister(zigbee_app_info.zb,APP_ZIGBEE_persist_notify_cb,NULL); - /* Call the callback once here to save persistence data */ - APP_ZIGBEE_persist_notify_cb(zigbee_app_info.zb,NULL); - - BSP_LED_On(LED_BLUE); - } - else - { - APP_DBG("APP_ZIGBEE_ZbStartupPersist FAILED!"); - APP_ZIGBEE_ResetCompleteJoinCpt(); - } - } - } - /* If Network forming/joining was not successful reschedule the current task to retry the process */ - if ((zigbee_app_info.join_status != ZB_STATUS_SUCCESS) && (APP_GetCurrentProtocolMode() == ZIGBEE_ENABLE)) - { - UTIL_SEQ_SetTask(1U << CFG_TASK_ZIGBEE_NETWORK_FORM, CFG_SCH_PRIO_0); - } - else - { - zigbee_app_info.init_after_join = false; - - /* Do it only first time */ - if(APP_ZIGBEE_GetCompleteJoinCpt() == 2U) - { - /* Assign ourselves to the group addresses */ - APP_ZIGBEE_ConfigGroupAddr(); - - /* Since we're using group addressing (broadcast), shorten the broadcast timeout */ - uint32_t bcast_timeout = 3; - ZbNwkSet(zigbee_app_info.zb, ZB_NWK_NIB_ID_NetworkBroadcastDeliveryTime, &bcast_timeout, sizeof(bcast_timeout)); - } - } -} - -/** - * @brief Set group addressing mode - * @param None - * @retval None - */ -static void APP_ZIGBEE_ConfigGroupAddr(void) -{ - struct ZbApsmeAddGroupReqT req; - struct ZbApsmeAddGroupConfT conf; - - memset(&req, 0, sizeof(req)); - req.endpt = SW1_ENDPOINT; - req.groupAddr = SW1_GROUP_ADDR; - ZbApsmeAddGroupReq(zigbee_app_info.zb, &req, &conf); - -} /* APP_ZIGBEE_ConfigGroupAddr */ - -/************************************************************* - * ZbStartupWait Blocking Call - *************************************************************/ -struct ZbStartupWaitInfo { - bool active; - enum ZbStatusCodeT status; -}; - - -static void ZbStartupWaitCb(enum ZbStatusCodeT status, void *cb_arg) -{ - struct ZbStartupWaitInfo *info = cb_arg; - - info->status = status; - info->active = false; - UTIL_SEQ_SetEvt(EVENT_ZIGBEE_STARTUP_ENDED); -} /* ZbStartupWaitCb */ - -enum ZbStatusCodeT ZbStartupWait(struct ZigBeeT *zb, struct ZbStartupT *config) -{ - struct ZbStartupWaitInfo *info; - enum ZbStatusCodeT status; - - info = malloc(sizeof(struct ZbStartupWaitInfo)); - if (info == NULL) { - return ZB_STATUS_ALLOC_FAIL; - } - memset(info, 0, sizeof(struct ZbStartupWaitInfo)); - - info->active = true; - status = ZbStartup(zb, config, ZbStartupWaitCb, info); - if (status != ZB_STATUS_SUCCESS) { - info->active = false; - return status; - } - UTIL_SEQ_WaitEvt(EVENT_ZIGBEE_STARTUP_ENDED); - status = info->status; - free(info); - return status; -} /* ZbStartupWait */ - - -/** - * @brief Increment counter - * @param None - * @retval None - */ -static void APP_ZIGBEE_IncrCompleteJoinCpt(void) -{ - zigbee_complete_join_cpt ++; -} - -/** - * @brief Return counter value - * @param None - * @retval Counter value - */ -static uint32_t APP_ZIGBEE_GetCompleteJoinCpt(void) -{ - return zigbee_complete_join_cpt; -} - -/** - * @brief Reset counter value - * @param None - * @retval None - */ -static void APP_ZIGBEE_ResetCompleteJoinCpt(void) -{ - zigbee_complete_join_cpt = 1; -} - -/** - * @brief Start Zigbee Network from persistent data - * @param zb: Zigbee device object pointer - * @retval Zigbee stack Status code - */ -static enum ZbStatusCodeT APP_ZIGBEE_ZbStartupPersist(struct ZigBeeT* zb) -{ - bool read_status; - enum ZbStatusCodeT status = ZB_STATUS_SUCCESS; - - /* Restore persistence */ - read_status = APP_ZIGBEE_persist_load(); - - if (read_status) - { - /* Make sure the EPID is cleared, before we are allowed to restore persistence */ - uint64_t epid = 0U; - ZbNwkSet(zb, ZB_NWK_NIB_ID_ExtendedPanId, &epid, sizeof(uint64_t)); - - /* Start-up from persistence */ - APP_DBG("APP_ZIGBEE_ZbStartupPersist: restoring stack persistence"); - status = ZbStartupPersist(zb, &cache_persistent_data.U8_data[4], cache_persistent_data.U32_data[0],NULL,NULL,NULL); - } - else - { - /* Failed to restart from persistence */ - APP_DBG("APP_ZIGBEE_ZbStartupPersist: no persistence data to restore"); - status = ZB_STATUS_ALLOC_FAIL; - } - - return status; -}/* APP_ZIGBEE_ZbStartupPersist */ - -/** - * @brief notify to save persitent data callback - * @param zb: Zigbee device object pointer, cbarg: callback arg pointer - * @retval None - */ -static void APP_ZIGBEE_persist_notify_cb(struct ZigBeeT *zb, void *cbarg) -{ - APP_DBG("Notification to save persistent data requested from stack"); - /* Save the persistent data */ - APP_ZIGBEE_persist_save(); -} - - -/** - * @brief Load persitent data - * @param None - * @retval true if sucess, false if fail - */ -static bool APP_ZIGBEE_persist_load() -{ - /* Check length range */ - if ((cache_persistent_data.U32_data[0] == 0) || - (cache_persistent_data.U32_data[0] > ST_PERSIST_MAX_ALLOC_SZ)) - { - APP_DBG("No data or too large lenght : %d",cache_persistent_data.U32_data[0]); - return false; - } - return true; -} /* APP_ZIGBEE_persist_load */ - -/** - * @brief Save persistent data - * @param None - * @retval true if success , false if fail - */ -static bool APP_ZIGBEE_persist_save(void) -{ - uint32_t len; - - /* Clear the RAM cache before saving */ - memset(cache_persistent_data.U8_data, 0x00, ST_PERSIST_MAX_ALLOC_SZ); - - len = ZbPersistGet(zigbee_app_info.zb, 0, 0); - /* Check Length range */ - if (len == 0U) - { - /* If the persistence length was zero then no data available. */ - APP_DBG("APP_ZIGBEE_persist_save: no persistence data to save !"); - return false; - } - if (len > ST_PERSIST_MAX_ALLOC_SZ) - { - /* if persistence length to big to store */ - APP_DBG("APP_ZIGBEE_persist_save: persist size too large for storage (%d)", len); - return false; - } - - /* Store in cache the persistent data */ - len = ZbPersistGet(zigbee_app_info.zb, &cache_persistent_data.U8_data[ST_PERSIST_FLASH_DATA_OFFSET], len); - - /* Store in cache the persistent data length */ - cache_persistent_data.U32_data[0] = len; - - zigbee_app_info.persistNumWrites++; - APP_DBG("APP_ZIGBEE_persist_save: Persistence written in cache RAM (num writes = %d) len=%d", - zigbee_app_info.persistNumWrites, cache_persistent_data.U32_data[0]); - - return true; -} /* APP_ZIGBEE_persist_save */ - - -/** - * @brief Trace the error or the warning reported. - * @param ErrId : - * @param ErrCode - * @retval None - */ -void APP_ZIGBEE_Error(uint32_t ErrId, uint32_t ErrCode) -{ - switch (ErrId) { - default: - APP_ZIGBEE_TraceError("ERROR Unknown ", 0); - break; - } -} /* APP_ZIGBEE_Error */ - -/************************************************************* - * - * LOCAL FUNCTIONS - * - *************************************************************/ - -/** - * @brief Warn the user that an error has occurred.In this case, - * the LEDs on the Board will start blinking. - * - * @param pMess : Message associated to the error. - * @param ErrCode: Error code associated to the module (Zigbee or other module if any) - * @retval None - */ -static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) -{ - APP_DBG("**** Fatal error = %s (Err = %d)", pMess, ErrCode); - while (1U == 1U) { - BSP_LED_Toggle(LED1); - HAL_Delay(500U); - BSP_LED_Toggle(LED2); - HAL_Delay(500U); - BSP_LED_Toggle(LED3); - HAL_Delay(500U); - } -} /* APP_ZIGBEE_TraceError */ - -/** - * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations - * @param None - * @retval None - */ -static void APP_ZIGBEE_CheckWirelessFirmwareInfo(void) -{ - WirelessFwInfo_t wireless_info_instance; - WirelessFwInfo_t *p_wireless_info = &wireless_info_instance; - - if (SHCI_GetWirelessFwInfo(p_wireless_info) != SHCI_Success) { - APP_ZIGBEE_Error((uint32_t)ERR_ZIGBEE_CHECK_WIRELESS, (uint32_t)ERR_INTERFACE_FATAL); - } - else { - APP_DBG("**********************************************************"); - APP_DBG("WIRELESS COPROCESSOR FW:"); - /* Print version */ - APP_DBG("VERSION ID = %d.%d.%d", p_wireless_info->VersionMajor, p_wireless_info->VersionMinor, p_wireless_info->VersionSub); - - switch (p_wireless_info->StackType) { - case INFO_STACK_TYPE_BLE_ZIGBEE_FFD_STATIC: - APP_DBG("FW Type : STACK_TYPE_BLE_ZIGBEE_FFD_STATIC"); - break; - case INFO_STACK_TYPE_BLE_ZIGBEE_RFD_STATIC: - APP_DBG("FW Type : STACK_TYPE_BLE_ZIGBEE_RFD_STATIC"); - break; - default: - /* No Zigbee device supported ! */ - APP_ZIGBEE_Error((uint32_t)ERR_ZIGBEE_CHECK_WIRELESS, (uint32_t)ERR_INTERFACE_FATAL); - break; - } - APP_DBG("**********************************************************"); - } -} /* APP_ZIGBEE_CheckWirelessFirmwareInfo */ - -static void APP_ZIGBEE_SW1_Process() -{ - struct ZbApsAddrT dst; - - memset(&dst, 0, sizeof(dst)); - dst.mode = ZB_APSDE_ADDRMODE_GROUP; - dst.endpoint = SW1_ENDPOINT; - dst.nwkAddr = SW1_GROUP_ADDR; - - APP_DBG("SW1 PUSHED (SENDING TOGGLE TO GROUP 0x0001)"); - if (ZbZclOnOffClientToggleReq(zigbee_app_info.onoff_client_1, &dst, NULL, NULL) != ZCL_STATUS_SUCCESS) { - APP_DBG("Error, ZbZclOnOffClientToggleReq failed (SW1_ENDPOINT)"); - } -} - -/************************************************************* - * - * WRAP FUNCTIONS - * - *************************************************************/ - -void APP_ZIGBEE_RegisterCmdBuffer(TL_CmdPacket_t *p_buffer) -{ - p_ZIGBEE_otcmdbuffer = p_buffer; -} /* APP_ZIGBEE_RegisterCmdBuffer */ - -Zigbee_Cmd_Request_t * ZIGBEE_Get_OTCmdPayloadBuffer(void) -{ - return (Zigbee_Cmd_Request_t *)p_ZIGBEE_otcmdbuffer->cmdserial.cmd.payload; -} /* ZIGBEE_Get_OTCmdPayloadBuffer */ - -Zigbee_Cmd_Request_t * ZIGBEE_Get_OTCmdRspPayloadBuffer(void) -{ - return (Zigbee_Cmd_Request_t *)((TL_EvtPacket_t *)p_ZIGBEE_otcmdbuffer)->evtserial.evt.payload; -} /* ZIGBEE_Get_OTCmdRspPayloadBuffer */ - -Zigbee_Cmd_Request_t * ZIGBEE_Get_NotificationPayloadBuffer(void) -{ - return (Zigbee_Cmd_Request_t *)(p_ZIGBEE_notif_M0_to_M4)->evtserial.evt.payload; -} /* ZIGBEE_Get_NotificationPayloadBuffer */ - -Zigbee_Cmd_Request_t * ZIGBEE_Get_M0RequestPayloadBuffer(void) -{ - return (Zigbee_Cmd_Request_t *)(p_ZIGBEE_request_M0_to_M4)->evtserial.evt.payload; -} - -/** - * @brief This function is used to transfer the commands from the M4 to the M0. - * - * @param None - * @return None - */ -void ZIGBEE_CmdTransfer(void) -{ - Zigbee_Cmd_Request_t *cmd_req = (Zigbee_Cmd_Request_t *)p_ZIGBEE_otcmdbuffer->cmdserial.cmd.payload; - - /* Zigbee OT command cmdcode range 0x280 .. 0x3DF = 352 */ - p_ZIGBEE_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; - /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) - * + ID (4 bytes) + Size (4 bytes) */ - p_ZIGBEE_otcmdbuffer->cmdserial.cmd.plen = 8U + (cmd_req->Size * 4U); - - TL_ZIGBEE_SendM4RequestToM0(); - - /* Wait completion of cmd */ - Wait_Getting_Ack_From_M0(); -} /* ZIGBEE_CmdTransfer */ - -/** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd - * - * - * @param Otbuffer : a pointer to TL_EvtPacket_t - * @return None - */ -void TL_ZIGBEE_CmdEvtReceived(TL_EvtPacket_t *Otbuffer) -{ - /* Prevent unused argument(s) compilation warning */ - UNUSED(Otbuffer); - - Receive_Ack_From_M0(); -} /* TL_ZIGBEE_CmdEvtReceived */ - -/** - * @brief This function is called when notification from M0+ is received. - * - * @param Notbuffer : a pointer to TL_EvtPacket_t - * @return None - */ -void TL_ZIGBEE_NotReceived(TL_EvtPacket_t *Notbuffer) -{ - p_ZIGBEE_notif_M0_to_M4 = Notbuffer; - - Receive_Notification_From_M0(); -} /* TL_ZIGBEE_NotReceived */ - -/** - * @brief This function is called before sending any ot command to the M0 - * core. The purpose of this function is to be able to check if - * there are no notifications coming from the M0 core which are - * pending before sending a new ot command. - * @param None - * @retval None - */ -void Pre_ZigbeeCmdProcessing(void) -{ - UTIL_SEQ_WaitEvt(EVENT_SYNCHRO_BYPASS_IDLE); -} /* Pre_ZigbeeCmdProcessing */ - -/** - * @brief This function waits for getting an acknowledgment from the M0. - * - * @param None - * @retval None - */ -static void Wait_Getting_Ack_From_M0(void) -{ - UTIL_SEQ_WaitEvt(EVENT_ACK_FROM_M0_EVT); -} /* Wait_Getting_Ack_From_M0 */ - -/** - * @brief Receive an acknowledgment from the M0+ core. - * Each command send by the M4 to the M0 are acknowledged. - * This function is called under interrupt. - * @param None - * @retval None - */ -static void Receive_Ack_From_M0(void) -{ - UTIL_SEQ_SetEvt(EVENT_ACK_FROM_M0_EVT); -} /* Receive_Ack_From_M0 */ - -/** - * @brief Receive a notification from the M0+ through the IPCC. - * This function is called under interrupt. - * @param None - * @retval None - */ -static void Receive_Notification_From_M0(void) -{ - CptReceiveNotifyFromM0++; - UTIL_SEQ_SetTask(1U << (uint32_t)CFG_TASK_NOTIFY_FROM_M0_TO_M4, CFG_SCH_PRIO_0); -} - -/** - * @brief This function is called when a request from M0+ is received. - * - * @param Notbuffer : a pointer to TL_EvtPacket_t - * @return None - */ -void TL_ZIGBEE_M0RequestReceived(TL_EvtPacket_t *Reqbuffer) -{ - p_ZIGBEE_request_M0_to_M4 = Reqbuffer; - - CptReceiveRequestFromM0++; - UTIL_SEQ_SetTask(1U << (uint32_t)CFG_TASK_REQUEST_FROM_M0_TO_M4, CFG_SCH_PRIO_0); -} - -/** - * @brief Perform initialization of TL for Zigbee. - * @param None - * @retval None - */ -void APP_ZIGBEE_TL_INIT(void) -{ - ZigbeeConfigBuffer.p_ZigbeeOtCmdRspBuffer = (uint8_t *)&ZigbeeOtCmdBuffer; - ZigbeeConfigBuffer.p_ZigbeeNotAckBuffer = (uint8_t *)ZigbeeNotifRspEvtBuffer; - ZigbeeConfigBuffer.p_ZigbeeNotifRequestBuffer = (uint8_t *)ZigbeeNotifRequestBuffer; - TL_ZIGBEE_Init(&ZigbeeConfigBuffer); -} - -/** - * @brief Process the messages coming from the M0. - * @param None - * @retval None - */ -void APP_ZIGBEE_ProcessNotifyM0ToM4(void) -{ - if (CptReceiveNotifyFromM0 != 0) { - /* If CptReceiveNotifyFromM0 is > 1. it means that we did not serve all the events from the radio */ - if (CptReceiveNotifyFromM0 > 1U) { - APP_ZIGBEE_Error(ERR_REC_MULTI_MSG_FROM_M0, 0); - } - else { - Zigbee_CallBackProcessing(); - } - /* Reset counter */ - CptReceiveNotifyFromM0 = 0; - } -} - -/** - * @brief Process the requests coming from the M0. - * @param - * @return - */ -void APP_ZIGBEE_ProcessRequestM0ToM4(void) -{ - if (CptReceiveRequestFromM0 != 0) { - Zigbee_M0RequestProcessing(); - CptReceiveRequestFromM0 = 0; - } -} - -/** - * @brief Delete persistent data - * @param None - * @retval None - */ -static void APP_ZIGBEE_persist_delete(void) -{ - /* Clear RAM cache */ - memset(cache_persistent_data.U8_data, 0x00, ST_PERSIST_MAX_ALLOC_SZ); - APP_DBG("Persistent Data RAM cache cleared"); - -} /* APP_ZIGBEE_persist_delete */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.h deleted file mode 100644 index 98dde7f17..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/app_zigbee.h +++ /dev/null @@ -1,64 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * File Name : app_zigbee.h - * Description : Header for Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef APP_ZIGBEE_H -#define APP_ZIGBEE_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ -/* Private includes ----------------------------------------------------------*/ -#include "tl.h" -#include "tl_zigbee_hci.h" -#include "zigbee.h" - -/* Exported types ------------------------------------------------------------*/ - -/* - * List of all errors tracked by the Thread application - * running on M4. Some of these errors may be fatal - * or just warnings - */ -typedef enum { - ERR_REC_MULTI_MSG_FROM_M0, - ERR_ZIGBE_CMD_TO_M0, - ERR_ZIGBEE_CHECK_WIRELESS -} ErrAppliIdEnum_t; - -/* Exported constants --------------------------------------------------------*/ - -/* Exported functions ------------------------------------------------------- */ -void APP_ZIGBEE_Init(void); -void APP_ZIGBEE_Error(uint32_t ErrId, uint32_t ErrCode); -void APP_ZIGBEE_RegisterCmdBuffer(TL_CmdPacket_t *p_buffer); -void APP_ZIGBEE_ProcessNotifyM0ToM4(void); -void APP_ZIGBEE_ProcessRequestM0ToM4(void); -void APP_ZIGBEE_TL_INIT(void); -void Pre_ZigbeeCmdProcessing(void); -void APP_ZIGBEE_Stop(void); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_conf.h deleted file mode 100644 index 538713f85..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_conf.h +++ /dev/null @@ -1,70 +0,0 @@ -/** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef BLE_CONF_H -#define BLE_CONF_H - -#include "app_conf.h" - -/****************************************************************************** - * - * BLE SERVICES CONFIGURATION - * blesvc - * - ******************************************************************************/ - - /** - * This setting shall be set to '1' if the device needs to support the Peripheral Role - * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' - */ -#define BLE_CFG_PERIPHERAL 1 - -/** - * This setting shall be set to '1' if the device needs to support the Central Role - * In the MS configuration, both BLE_CFG_PERIPHERAL and BLE_CFG_CENTRAL shall be set to '1' - */ -#define BLE_CFG_CENTRAL 0 - -/** - * There is one handler per service enabled - * Note: There is no handler for the Device Information Service - * - * This shall take into account all registered handlers - * (from either the provided services or the custom services) - */ -#define BLE_CFG_SVC_MAX_NBR_CB 1 - -#define BLE_CFG_CLT_MAX_NBR_CB 0 - -/****************************************************************************** - * GAP Service - Apprearance - ******************************************************************************/ - -#define BLE_CFG_UNKNOWN_APPEARANCE (0) -#define BLE_CFG_HR_SENSOR_APPEARANCE (832) -#define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) - -/****************************************************************************** - * Over The Air Feature (OTA) - STM Proprietary - ******************************************************************************/ -#define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ - -#endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_dbg_conf.h deleted file mode 100644 index bec936bbe..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/ble_dbg_conf.h +++ /dev/null @@ -1,199 +0,0 @@ -/** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __BLE_DBG_CONF_H -#define __BLE_DBG_CONF_H - -/** - * Enable or Disable traces from BLE - */ - -#define BLE_DBG_APP_EN 0 -#define BLE_DBG_DIS_EN 0 -#define BLE_DBG_HRS_EN 0 -#define BLE_DBG_SVCCTL_EN 0 -#define BLE_DBG_BLS_EN 0 -#define BLE_DBG_HTS_EN 0 -#define BLE_DBG_P2P_STM_EN 1 - -/** - * Macro definition - */ -#if ( BLE_DBG_APP_EN != 0 ) -#define BLE_DBG_APP_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_APP_MSG PRINT_NO_MESG -#endif - -#if ( BLE_DBG_DIS_EN != 0 ) -#define BLE_DBG_DIS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_DIS_MSG PRINT_NO_MESG -#endif - -#if ( BLE_DBG_HRS_EN != 0 ) -#define BLE_DBG_HRS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_HRS_MSG PRINT_NO_MESG -#endif - -#if ( BLE_DBG_P2P_STM_EN != 0 ) -#define BLE_DBG_P2P_STM_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_P2P_STM_MSG PRINT_NO_MESG -#endif - -#if ( BLE_DBG_TEMPLATE_STM_EN != 0 ) -#define BLE_DBG_TEMPLATE_STM_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_TEMPLATE_STM_MSG PRINT_NO_MESG -#endif - -#if ( BLE_DBG_EDS_STM_EN != 0 ) -#define BLE_DBG_EDS_STM_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_EDS_STM_MSG PRINT_NO_MESG -#endif - -#if ( BLE_DBG_LBS_STM_EN != 0 ) -#define BLE_DBG_LBS_STM_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_LBS_STM_MSG PRINT_NO_MESG -#endif - -#if ( BLE_DBG_SVCCTL_EN != 0 ) -#define BLE_DBG_SVCCTL_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_SVCCTL_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_CTS_EN != 0) -#define BLE_DBG_CTS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_CTS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_HIDS_EN != 0) -#define BLE_DBG_HIDS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_HIDS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_PASS_EN != 0) -#define BLE_DBG_PASS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_PASS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_BLS_EN != 0) -#define BLE_DBG_BLS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_BLS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_HTS_EN != 0) -#define BLE_DBG_HTS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_HTS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_ANS_EN != 0) -#define BLE_DBG_ANS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_ANS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_ESS_EN != 0) -#define BLE_DBG_ESS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_ESS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_GLS_EN != 0) -#define BLE_DBG_GLS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_GLS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_BAS_EN != 0) -#define BLE_DBG_BAS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_BAS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_RTUS_EN != 0) -#define BLE_DBG_RTUS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_RTUS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_HPS_EN != 0) -#define BLE_DBG_HPS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_HPS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_TPS_EN != 0) -#define BLE_DBG_TPS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_TPS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_LLS_EN != 0) -#define BLE_DBG_LLS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_LLS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_IAS_EN != 0) -#define BLE_DBG_IAS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_IAS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_WSS_EN != 0) -#define BLE_DBG_WSS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_WSS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_LNS_EN != 0) -#define BLE_DBG_LNS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_LNS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_SCPS_EN != 0) -#define BLE_DBG_SCPS_MSG PRINT_MESG_DBG -#else -#define BLE_DBG_SCPS_MSG PRINT_NO_MESG -#endif - -#if (BLE_DBG_DTS_EN != 0) -#define BLE_DBG_DTS_MSG PRINT_MESG_DBG -#define BLE_DBG_DTS_BUF PRINT_LOG_BUFF_DBG -#else -#define BLE_DBG_DTS_MSG PRINT_NO_MESG -#define BLE_DBG_DTS_BUF PRINT_NO_MESG -#endif - -#endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/p2p_server_app.c deleted file mode 100644 index 3161fa059..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/p2p_server_app.c +++ /dev/null @@ -1,398 +0,0 @@ -/* USER CODE BEGIN Header */ -/** - ****************************************************************************** - * @file p2p_server_app.c - * @author MCD Application Team - * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "dbg_trace.h" -#include "ble.h" -#include "p2p_server_app.h" -#include "stm32_seq.h" - -/* Private includes ----------------------------------------------------------*/ -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - -/* Private typedef -----------------------------------------------------------*/ -/* USER CODE BEGIN PTD */ - typedef struct{ - uint8_t Device_Led_Selection; - uint8_t Led1; - }P2P_LedCharValue_t; - - typedef struct{ - uint8_t Device_Button_Selection; - uint8_t ButtonStatus; - }P2P_ButtonCharValue_t; - -typedef struct -{ - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ - P2P_LedCharValue_t LedControl; - P2P_ButtonCharValue_t ButtonControl; - uint16_t ConnectionHandle; -} P2P_Server_App_Context_t; -/* USER CODE END PTD */ - -/* Private defines ------------------------------------------------------------*/ -/* USER CODE BEGIN PD */ - -/* USER CODE END PD */ - -/* Private macros -------------------------------------------------------------*/ -/* USER CODE BEGIN PM */ - -/* USER CODE END PM */ - -/* Private variables ---------------------------------------------------------*/ -/* USER CODE BEGIN PV */ -/** - * START of Section BLE_APP_CONTEXT - */ - -PLACE_IN_SECTION("BLE_APP_CONTEXT") static P2P_Server_App_Context_t P2P_Server_App_Context; - -/** - * END of Section BLE_APP_CONTEXT - */ -/* USER CODE END PV */ - -/* Private function prototypes -----------------------------------------------*/ -/* USER CODE BEGIN PFP */ -static void P2PS_Send_Notification(void); -static void P2PS_APP_LED_BUTTON_context_Init(void); -/* USER CODE END PFP */ - -/* Functions Definition ------------------------------------------------------*/ -void P2PS_STM_App_Notification(P2PS_STM_App_Notification_evt_t *pNotification) -{ -/* USER CODE BEGIN P2PS_STM_App_Notification_1 */ - -/* USER CODE END P2PS_STM_App_Notification_1 */ - switch(pNotification->P2P_Evt_Opcode) - { -/* USER CODE BEGIN P2PS_STM_App_Notification_P2P_Evt_Opcode */ -#if(BLE_CFG_OTA_REBOOT_CHAR != 0) - case P2PS_STM_BOOT_REQUEST_EVT: - APP_DBG_MSG("-- P2P APPLICATION SERVER : BOOT REQUESTED\n"); - APP_DBG_MSG(" \n\r"); - - *(uint32_t*)SRAM1_BASE = *(uint32_t*)pNotification->DataTransfered.pPayload; - NVIC_SystemReset(); - break; -#endif -/* USER CODE END P2PS_STM_App_Notification_P2P_Evt_Opcode */ - - case P2PS_STM__NOTIFY_ENABLED_EVT: -/* USER CODE BEGIN P2PS_STM__NOTIFY_ENABLED_EVT */ - P2P_Server_App_Context.Notification_Status = 1; - APP_DBG_MSG("-- P2P APPLICATION SERVER : NOTIFICATION ENABLED\n"); - APP_DBG_MSG(" \n\r"); -/* USER CODE END P2PS_STM__NOTIFY_ENABLED_EVT */ - break; - - case P2PS_STM_NOTIFY_DISABLED_EVT: -/* USER CODE BEGIN P2PS_STM_NOTIFY_DISABLED_EVT */ - P2P_Server_App_Context.Notification_Status = 0; - APP_DBG_MSG("-- P2P APPLICATION SERVER : NOTIFICATION DISABLED\n"); - APP_DBG_MSG(" \n\r"); -/* USER CODE END P2PS_STM_NOTIFY_DISABLED_EVT */ - break; - - case P2PS_STM_WRITE_EVT: -/* USER CODE BEGIN P2PS_STM_WRITE_EVT */ - if(pNotification->DataTransfered.pPayload[0] == 0x00){ /* ALL Deviceselected - may be necessary as LB Routeur informs all connection */ - if(pNotification->DataTransfered.pPayload[1] == 0x01) - { - BSP_LED_On(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER : LED1 ON\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ - } - if(pNotification->DataTransfered.pPayload[1] == 0x00) - { - BSP_LED_Off(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER : LED1 OFF\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ - } - } -#if(P2P_SERVER1 != 0) - if(pNotification->DataTransfered.pPayload[0] == 0x01){ /* end device 1 selected - may be necessary as LB Routeur informs all connection */ - if(pNotification->DataTransfered.pPayload[1] == 0x01) - { - BSP_LED_On(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 1 : LED1 ON\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ - } - if(pNotification->DataTransfered.pPayload[1] == 0x00) - { - BSP_LED_Off(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 1 : LED1 OFF\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ - } - /* Switch to Zigbee */ - if(pNotification->DataTransfered.pPayload[1] == 0x02) - { - BSP_LED_Off(LED_BLUE); - APP_DBG("SYSTEM: SWITCH TO THREAD"); - APP_DBG_MSG("-- P2P APPLICATION SERVER 1 : SWITCH TO ZIGBEE\n"); - APP_DBG_MSG(" \n\r"); - /* Set "Switch Protocol" Task */ - UTIL_SEQ_SetTask(1<DataTransfered.pPayload[0] == 0x02){ /* end device 2 selected */ - if(pNotification->DataTransfered.pPayload[1] == 0x01) - { - BSP_LED_On(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 ON\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ - } - if(pNotification->DataTransfered.pPayload[1] == 0x00) - { - BSP_LED_Off(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 OFF\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ - } - } -#endif -#if(P2P_SERVER3 != 0) - if(pNotification->DataTransfered.pPayload[0] == 0x03){ /* end device 3 selected - may be necessary as LB Routeur informs all connection */ - if(pNotification->DataTransfered.pPayload[1] == 0x01) - { - BSP_LED_On(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 3 : LED1 ON\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ - } - if(pNotification->DataTransfered.pPayload[1] == 0x00) - { - BSP_LED_Off(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 3 : LED1 OFF\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ - } - } -#endif -#if(P2P_SERVER4 != 0) - if(pNotification->DataTransfered.pPayload[0] == 0x04){ /* end device 4 selected */ - if(pNotification->DataTransfered.pPayload[1] == 0x01) - { - BSP_LED_On(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 ON\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ - } - if(pNotification->DataTransfered.pPayload[1] == 0x00) - { - BSP_LED_Off(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 2 : LED1 OFF\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ - } - } -#endif -#if(P2P_SERVER5 != 0) - if(pNotification->DataTransfered.pPayload[0] == 0x05){ /* end device 5 selected - may be necessary as LB Routeur informs all connection */ - if(pNotification->DataTransfered.pPayload[1] == 0x01) - { - BSP_LED_On(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 5 : LED1 ON\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ - } - if(pNotification->DataTransfered.pPayload[1] == 0x00) - { - BSP_LED_Off(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 5 : LED1 OFF\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ - } - } -#endif -#if(P2P_SERVER6 != 0) - if(pNotification->DataTransfered.pPayload[0] == 0x06){ /* end device 6 selected */ - if(pNotification->DataTransfered.pPayload[1] == 0x01) - { - BSP_LED_On(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 6 : LED1 ON\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x01; /* LED1 ON */ - } - if(pNotification->DataTransfered.pPayload[1] == 0x00) - { - BSP_LED_Off(LED_BLUE); - APP_DBG_MSG("-- P2P APPLICATION SERVER 6 : LED1 OFF\n"); - APP_DBG_MSG(" \n\r"); - P2P_Server_App_Context.LedControl.Led1=0x00; /* LED1 OFF */ - } - } -#endif -/* USER CODE END P2PS_STM_WRITE_EVT */ - break; - - default: -/* USER CODE BEGIN P2PS_STM_App_Notification_default */ - -/* USER CODE END P2PS_STM_App_Notification_default */ - break; - } -/* USER CODE BEGIN P2PS_STM_App_Notification_2 */ - -/* USER CODE END P2PS_STM_App_Notification_2 */ - return; -} - -void P2PS_APP_Notification(P2PS_APP_ConnHandle_Not_evt_t *pNotification) -{ -/* USER CODE BEGIN P2PS_APP_Notification_1 */ - -/* USER CODE END P2PS_APP_Notification_1 */ - switch(pNotification->P2P_Evt_Opcode) - { -/* USER CODE BEGIN P2PS_APP_Notification_P2P_Evt_Opcode */ - -/* USER CODE END P2PS_APP_Notification_P2P_Evt_Opcode */ - case PEER_CONN_HANDLE_EVT : -/* USER CODE BEGIN PEER_CONN_HANDLE_EVT */ - -/* USER CODE END PEER_CONN_HANDLE_EVT */ - break; - - case PEER_DISCON_HANDLE_EVT : -/* USER CODE BEGIN PEER_DISCON_HANDLE_EVT */ - P2PS_APP_LED_BUTTON_context_Init(); -/* USER CODE END PEER_DISCON_HANDLE_EVT */ - break; - - default: -/* USER CODE BEGIN P2PS_APP_Notification_default */ - -/* USER CODE END P2PS_APP_Notification_default */ - break; - } -/* USER CODE BEGIN P2PS_APP_Notification_2 */ - -/* USER CODE END P2PS_APP_Notification_2 */ - return; -} - -void P2PS_APP_Init(void) -{ -/* USER CODE BEGIN P2PS_APP_Init */ - UTIL_SEQ_RegTask( 1<< CFG_TASK_SW1_BUTTON_PUSHED_ID, UTIL_SEQ_RFU, P2PS_Send_Notification ); - - /** - * Initialize LedButton Service - */ - P2P_Server_App_Context.Notification_Status=0; - P2PS_APP_LED_BUTTON_context_Init(); -/* USER CODE END P2PS_APP_Init */ - return; -} - -/* USER CODE BEGIN FD */ -void P2PS_APP_LED_BUTTON_context_Init(void){ - - BSP_LED_Off(LED_BLUE); - - #if(P2P_SERVER1 != 0) - P2P_Server_App_Context.LedControl.Device_Led_Selection=0x01; /* Device1 */ - P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ - P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x01;/* Device1 */ - P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; -#endif -#if(P2P_SERVER2 != 0) - P2P_Server_App_Context.LedControl.Device_Led_Selection=0x02; /* Device2 */ - P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ - P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x02;/* Device2 */ - P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; -#endif -#if(P2P_SERVER3 != 0) - P2P_Server_App_Context.LedControl.Device_Led_Selection=0x03; /* Device3 */ - P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ - P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x03; /* Device3 */ - P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; -#endif -#if(P2P_SERVER4 != 0) - P2P_Server_App_Context.LedControl.Device_Led_Selection=0x04; /* Device4 */ - P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ - P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x04; /* Device4 */ - P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; -#endif - #if(P2P_SERVER5 != 0) - P2P_Server_App_Context.LedControl.Device_Led_Selection=0x05; /* Device5 */ - P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ - P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x05; /* Device5 */ - P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; -#endif -#if(P2P_SERVER6 != 0) - P2P_Server_App_Context.LedControl.Device_Led_Selection=0x06; /* device6 */ - P2P_Server_App_Context.LedControl.Led1=0x00; /* led OFF */ - P2P_Server_App_Context.ButtonControl.Device_Button_Selection=0x06; /* Device6 */ - P2P_Server_App_Context.ButtonControl.ButtonStatus=0x00; -#endif -} - -void P2PS_APP_SW1_Button_Action(void) -{ - UTIL_SEQ_SetTask( 1<
                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.
                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ -/* USER CODE END Header */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __P2P_SERVER_APP_H -#define __P2P_SERVER_APP_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* Includes ------------------------------------------------------------------*/ - -/* Private includes ----------------------------------------------------------*/ -/* USER CODE BEGIN Includes */ - -/* USER CODE END Includes */ - -/* Exported types ------------------------------------------------------------*/ -typedef enum -{ - PEER_CONN_HANDLE_EVT, - PEER_DISCON_HANDLE_EVT, -} P2PS_APP__Opcode_Notification_evt_t; - -typedef struct -{ - P2PS_APP__Opcode_Notification_evt_t P2P_Evt_Opcode; - uint16_t ConnectionHandle; -}P2PS_APP_ConnHandle_Not_evt_t; -/* USER CODE BEGIN ET */ - -/* USER CODE END ET */ - -/* Exported constants --------------------------------------------------------*/ -/* USER CODE BEGIN EC */ - -/* USER CODE END EC */ - -/* External variables --------------------------------------------------------*/ -/* USER CODE BEGIN EV */ - -/* USER CODE END EV */ - -/* Exported macros ------------------------------------------------------------*/ -/* USER CODE BEGIN EM */ - -/* USER CODE END EM */ - -/* Exported functions ---------------------------------------------*/ - void P2PS_APP_Init( void ); - void P2PS_APP_Notification( P2PS_APP_ConnHandle_Not_evt_t *pNotification ); -/* USER CODE BEGIN EF */ - void P2PS_APP_SW1_Button_Action( void ); - -/* USER CODE END EF */ - -#ifdef __cplusplus -} -#endif - -#endif /*__P2P_SERVER_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/tl_dbg_conf.h deleted file mode 100644 index b468b2863..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/App/tl_dbg_conf.h +++ /dev/null @@ -1,126 +0,0 @@ -/** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __TL_DBG_CONF_H -#define __TL_DBG_CONF_H - -/* USER CODE BEGIN Tl_Conf */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_conf.h" /* required as some configuration used in dbg_trace.h are set there */ -#include "dbg_trace.h" -#include "hw_if.h" - -/** - * Enable or Disable traces - * The raw data output is the hci binary packet format as specified by the BT specification * - */ -#define TL_SHCI_CMD_DBG_EN 0 /* Reports System commands sent to CPU2 and the command response */ -#define TL_SHCI_CMD_DBG_RAW_EN 0 /* Reports raw data System commands sent to CPU2 and the command response */ -#define TL_SHCI_EVT_DBG_EN 0 /* Reports System Asynchronous Events received from CPU2 */ -#define TL_SHCI_EVT_DBG_RAW_EN 0 /* Reports raw data System Asynchronous Events received from CPU2 */ - -#define TL_HCI_CMD_DBG_EN 0 /* Reports BLE command sent to CPU2 and the command response */ -#define TL_HCI_CMD_DBG_RAW_EN 0 /* Reports raw data BLE command sent to CPU2 and the command response */ -#define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ -#define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ - -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ - -/** - * Macro definition - */ - -/** - * System Transport Layer - */ -#if (TL_SHCI_CMD_DBG_EN != 0) -#define TL_SHCI_CMD_DBG_MSG PRINT_MESG_DBG -#define TL_SHCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG -#else -#define TL_SHCI_CMD_DBG_MSG(...) -#define TL_SHCI_CMD_DBG_BUF(...) -#endif - -#if (TL_SHCI_CMD_DBG_RAW_EN != 0) -#define TL_SHCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) -#else -#define TL_SHCI_CMD_DBG_RAW(...) -#endif - -#if (TL_SHCI_EVT_DBG_EN != 0) -#define TL_SHCI_EVT_DBG_MSG PRINT_MESG_DBG -#define TL_SHCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG -#else -#define TL_SHCI_EVT_DBG_MSG(...) -#define TL_SHCI_EVT_DBG_BUF(...) -#endif - -#if (TL_SHCI_EVT_DBG_RAW_EN != 0) -#define TL_SHCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) -#else -#define TL_SHCI_EVT_DBG_RAW(...) -#endif - -/** - * BLE Transport Layer - */ -#if (TL_HCI_CMD_DBG_EN != 0) -#define TL_HCI_CMD_DBG_MSG PRINT_MESG_DBG -#define TL_HCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG -#else -#define TL_HCI_CMD_DBG_MSG(...) -#define TL_HCI_CMD_DBG_BUF(...) -#endif - -#if (TL_HCI_CMD_DBG_RAW_EN != 0) -#define TL_HCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) -#else -#define TL_HCI_CMD_DBG_RAW(...) -#endif - -#if (TL_HCI_EVT_DBG_EN != 0) -#define TL_HCI_EVT_DBG_MSG PRINT_MESG_DBG -#define TL_HCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG -#else -#define TL_HCI_EVT_DBG_MSG(...) -#define TL_HCI_EVT_DBG_BUF(...) -#endif - -#if (TL_HCI_EVT_DBG_RAW_EN != 0) -#define TL_HCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) -#else -#define TL_HCI_EVT_DBG_RAW(...) -#endif - -/** - * Memory Manager - Released buffer tracing - */ -#if (TL_MM_DBG_EN != 0) -#define TL_MM_DBG_MSG PRINT_MESG_DBG -#else -#define TL_MM_DBG_MSG(...) -#endif - -/* USER CODE END Tl_Conf */ - -#endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/Target/hw_ipcc.c deleted file mode 100644 index e7049681d..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/STM32_WPAN/Target/hw_ipcc.c +++ /dev/null @@ -1,675 +0,0 @@ -/** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ - -/* Includes ------------------------------------------------------------------*/ -#include "app_common.h" -#include "mbox_def.h" - -/* Global variables ---------------------------------------------------------*/ -/* Private defines -----------------------------------------------------------*/ -#define HW_IPCC_TX_PENDING( channel ) ( !(LL_C1_IPCC_IsActiveFlag_CHx( IPCC, channel )) ) && (((~(IPCC->C1MR)) & (channel << 16U))) -#define HW_IPCC_RX_PENDING( channel ) (LL_C2_IPCC_IsActiveFlag_CHx( IPCC, channel )) && (((~(IPCC->C1MR)) & (channel << 0U))) - -/* Private macros ------------------------------------------------------------*/ -/* Private typedef -----------------------------------------------------------*/ -/* Private variables ---------------------------------------------------------*/ -static void (*FreeBufCb)( void ); - -/* Private function prototypes -----------------------------------------------*/ -static void HW_IPCC_BLE_EvtHandler( void ); -static void HW_IPCC_BLE_AclDataEvtHandler( void ); -static void HW_IPCC_MM_FreeBufHandler( void ); -static void HW_IPCC_SYS_CmdEvtHandler( void ); -static void HW_IPCC_SYS_EvtHandler( void ); -static void HW_IPCC_TRACES_EvtHandler( void ); - -#ifdef THREAD_WB -static void HW_IPCC_OT_CmdEvtHandler( void ); -static void HW_IPCC_THREAD_NotEvtHandler( void ); -static void HW_IPCC_THREAD_CliNotEvtHandler( void ); -#endif - -#ifdef LLD_TESTS_WB -static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ); -static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ); -#endif -#ifdef LLD_BLE_WB -/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void );*/ -static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ); -static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ); -#endif - -#ifdef MAC_802_15_4_WB -static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ); -static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ); -#endif - -#ifdef ZIGBEE_WB -static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ); -static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ); -static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ); -#endif - -/* Public function definition -----------------------------------------------*/ - -/****************************************************************************** - * INTERRUPT HANDLER - ******************************************************************************/ -void HW_IPCC_Rx_Handler( void ) -{ - if (HW_IPCC_RX_PENDING( HW_IPCC_SYSTEM_EVENT_CHANNEL )) - { - HW_IPCC_SYS_EvtHandler(); - } -#ifdef MAC_802_15_4_WB - else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL )) - { - HW_IPCC_MAC_802_15_4_NotEvtHandler(); - } -#endif /* MAC_802_15_4_WB */ -#ifdef THREAD_WB - else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL )) - { - HW_IPCC_THREAD_NotEvtHandler(); - } - else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL )) - { - HW_IPCC_THREAD_CliNotEvtHandler(); - } -#endif /* THREAD_WB */ -#ifdef LLD_TESTS_WB - else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL )) - { - HW_IPCC_LLDTESTS_ReceiveCliRspHandler(); - } - else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_M0_CMD_CHANNEL )) - { - HW_IPCC_LLDTESTS_ReceiveM0CmdHandler(); - } -#endif /* LLD_TESTS_WB */ -#ifdef LLD_BLE_WB - else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_RSP_CHANNEL )) - { - HW_IPCC_LLD_BLE_ReceiveRspHandler(); - } - else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_M0_CMD_CHANNEL )) - { - HW_IPCC_LLD_BLE_ReceiveM0CmdHandler(); - } -#endif /* LLD_TESTS_WB */ -#ifdef ZIGBEE_WB - else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL )) - { - HW_IPCC_ZIGBEE_StackNotifEvtHandler(); - } - else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL )) - { - HW_IPCC_ZIGBEE_StackM0RequestHandler(); - } -#endif /* ZIGBEE_WB */ - else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL )) - { - HW_IPCC_BLE_EvtHandler(); - } - else if (HW_IPCC_RX_PENDING( HW_IPCC_TRACES_CHANNEL )) - { - HW_IPCC_TRACES_EvtHandler(); - } - - return; -} - -void HW_IPCC_Tx_Handler( void ) -{ - if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } -#ifdef MAC_802_15_4_WB - else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL )) - { - HW_IPCC_MAC_802_15_4_CmdEvtHandler(); - } -#endif /* MAC_802_15_4_WB */ -#ifdef THREAD_WB - else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL )) - { - HW_IPCC_OT_CmdEvtHandler(); - } -#endif /* THREAD_WB */ -#ifdef LLD_TESTS_WB -// No TX handler for LLD tests -#endif /* LLD_TESTS_WB */ -#ifdef ZIGBEE_WB - if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL )) - { - HW_IPCC_ZIGBEE_CmdEvtHandler(); - } -#endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } - else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) - { - HW_IPCC_MM_FreeBufHandler(); - } - else if (HW_IPCC_TX_PENDING( HW_IPCC_HCI_ACL_DATA_CHANNEL )) - { - HW_IPCC_BLE_AclDataEvtHandler(); - } - - return; -} -/****************************************************************************** - * GENERAL - ******************************************************************************/ -void HW_IPCC_Enable( void ) -{ - /** - * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running - when FUS is running on CPU2 and CPU1 enters deep sleep mode - */ - LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC); - - /** - * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 - */ - LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); - LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); - - /** - * In case the SBSFU is implemented, it may have already set the C2BOOT bit to startup the CPU2. - * In that case, to keep the mechanism transparent to the user application, it shall call the system command - * SHCI_C2_Reinit( ) before jumping to the application. - * When the CPU2 receives that command, it waits for its event input to be set to restart the CPU2 firmware. - * This is required because once C2BOOT has been set once, a clear/set on C2BOOT has no effect. - * When SHCI_C2_Reinit( ) is not called, generating an event to the CPU2 does not have any effect - * So, by default, the application shall both set the event flag and set the C2BOOT bit. - */ - __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ - __WFE( ); /* Clear the internal event flag */ - LL_PWR_EnableBootC2( ); - - return; -} - -void HW_IPCC_Init( void ) -{ - LL_AHB3_GRP1_EnableClock( LL_AHB3_GRP1_PERIPH_IPCC ); - - LL_C1_IPCC_EnableIT_RXO( IPCC ); - LL_C1_IPCC_EnableIT_TXF( IPCC ); - - HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); - HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); - - return; -} - -/****************************************************************************** - * BLE - ******************************************************************************/ -void HW_IPCC_BLE_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); - - return; -} - -void HW_IPCC_BLE_SendCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_BLE_CMD_CHANNEL ); - - return; -} - -static void HW_IPCC_BLE_EvtHandler( void ) -{ - HW_IPCC_BLE_RxEvtNot(); - - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); - - return; -} - -void HW_IPCC_BLE_SendAclData( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); - LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); - - return; -} - -static void HW_IPCC_BLE_AclDataEvtHandler( void ) -{ - LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); - - HW_IPCC_BLE_AclDataAckNot(); - - return; -} - -__weak void HW_IPCC_BLE_AclDataAckNot( void ){}; -__weak void HW_IPCC_BLE_RxEvtNot( void ){}; - -/****************************************************************************** - * SYSTEM - ******************************************************************************/ -void HW_IPCC_SYS_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); - - return; -} - -void HW_IPCC_SYS_SendCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); - LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); - - return; -} - -static void HW_IPCC_SYS_CmdEvtHandler( void ) -{ - LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); - - HW_IPCC_SYS_CmdEvtNot(); - - return; -} - -static void HW_IPCC_SYS_EvtHandler( void ) -{ - HW_IPCC_SYS_EvtNot(); - - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); - - return; -} - -__weak void HW_IPCC_SYS_CmdEvtNot( void ){}; -__weak void HW_IPCC_SYS_EvtNot( void ){}; - -/****************************************************************************** - * MAC 802.15.4 - ******************************************************************************/ -#ifdef MAC_802_15_4_WB -void HW_IPCC_MAC_802_15_4_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); - - return; -} - -void HW_IPCC_MAC_802_15_4_SendCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); - LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); - - return; -} - -void HW_IPCC_MAC_802_15_4_SendAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); - - return; -} - -static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ) -{ - LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); - - HW_IPCC_MAC_802_15_4_CmdEvtNot(); - - return; -} - -static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); - - HW_IPCC_MAC_802_15_4_EvtNot(); - - return; -} -__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; -__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; -#endif - -/****************************************************************************** - * THREAD - ******************************************************************************/ -#ifdef THREAD_WB -void HW_IPCC_THREAD_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); - - return; -} - -void HW_IPCC_OT_SendCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); - LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); - - return; -} - -void HW_IPCC_CLI_SendCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_CMD_CHANNEL ); - - return; -} - -void HW_IPCC_THREAD_SendAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); - - return; -} - -void HW_IPCC_THREAD_CliSendAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); - - return; -} - -static void HW_IPCC_OT_CmdEvtHandler( void ) -{ - LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); - - HW_IPCC_OT_CmdEvtNot(); - - return; -} - -static void HW_IPCC_THREAD_NotEvtHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); - - HW_IPCC_THREAD_EvtNot(); - - return; -} - -static void HW_IPCC_THREAD_CliNotEvtHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); - - HW_IPCC_THREAD_CliEvtNot(); - - return; -} - -__weak void HW_IPCC_OT_CmdEvtNot( void ){}; -__weak void HW_IPCC_CLI_CmdEvtNot( void ){}; -__weak void HW_IPCC_THREAD_EvtNot( void ){}; - -#endif /* THREAD_WB */ - -/****************************************************************************** - * LLD TESTS - ******************************************************************************/ -#ifdef LLD_TESTS_WB -void HW_IPCC_LLDTESTS_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); - return; -} - -void HW_IPCC_LLDTESTS_SendCliCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL ); - return; -} - -static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); - HW_IPCC_LLDTESTS_ReceiveCliRsp(); - return; -} - -void HW_IPCC_LLDTESTS_SendCliRspAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); - return; -} - -static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); - HW_IPCC_LLDTESTS_ReceiveM0Cmd(); - return; -} - - -void HW_IPCC_LLDTESTS_SendM0CmdAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); - return; -} -__weak void HW_IPCC_LLDTESTS_ReceiveCliRsp( void ){}; -__weak void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void ){}; -#endif /* LLD_TESTS_WB */ - -/****************************************************************************** - * LLD BLE - ******************************************************************************/ -#ifdef LLD_BLE_WB -void HW_IPCC_LLD_BLE_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); - return; -} - -void HW_IPCC_LLD_BLE_SendCliCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_CMD_CHANNEL ); - return; -} - -/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); - HW_IPCC_LLD_BLE_ReceiveCliRsp(); - return; -}*/ - -void HW_IPCC_LLD_BLE_SendCliRspAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); - return; -} - -static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ) -{ - //LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); - HW_IPCC_LLD_BLE_ReceiveM0Cmd(); - return; -} - - -void HW_IPCC_LLD_BLE_SendM0CmdAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); - //LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); - return; -} -__weak void HW_IPCC_LLD_BLE_ReceiveCliRsp( void ){}; -__weak void HW_IPCC_LLD_BLE_ReceiveM0Cmd( void ){}; - -/* Transparent Mode */ -void HW_IPCC_LLD_BLE_SendCmd( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CMD_CHANNEL ); - return; -} - -static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); - HW_IPCC_LLD_BLE_ReceiveRsp(); - return; -} - -void HW_IPCC_LLD_BLE_SendRspAck( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); - return; -} - -#endif /* LLD_BLE_WB */ - -/****************************************************************************** - * ZIGBEE - ******************************************************************************/ -#ifdef ZIGBEE_WB -void HW_IPCC_ZIGBEE_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); - - return; -} - -void HW_IPCC_ZIGBEE_SendM4RequestToM0( void ) -{ - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); - LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); - - return; -} - -void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); - - return; -} - -static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ) -{ - LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); - - HW_IPCC_ZIGBEE_RecvAppliAckFromM0(); - - return; -} - -static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); - - HW_IPCC_ZIGBEE_RecvM0NotifyToM4(); - - return; -} - -static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ) -{ - LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); - - HW_IPCC_ZIGBEE_RecvM0RequestToM4(); - - return; -} - -void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void ) -{ - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); - - return; -} - -__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){}; -__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){}; -__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){}; -#endif /* ZIGBEE_WB */ - -/****************************************************************************** - * MEMORY MANAGER - ******************************************************************************/ -void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) ) -{ - if ( LL_C1_IPCC_IsActiveFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ) ) - { - FreeBufCb = cb; - LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); - } - else - { - cb(); - - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); - } - - return; -} - -static void HW_IPCC_MM_FreeBufHandler( void ) -{ - LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); - - FreeBufCb(); - - LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); - - return; -} - -/****************************************************************************** - * TRACES - ******************************************************************************/ -void HW_IPCC_TRACES_Init( void ) -{ - LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_TRACES_CHANNEL ); - - return; -} - -static void HW_IPCC_TRACES_EvtHandler( void ) -{ - HW_IPCC_TRACES_EvtNot(); - - LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_TRACES_CHANNEL ); - - return; -} - -__weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/readme.txt deleted file mode 100644 index 900fd9575..000000000 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE_Zigbee/BLE_Zigbee_Static/readme.txt +++ /dev/null @@ -1,132 +0,0 @@ -/** - @page BLE_Zigbee_Static example - - @verbatim - ****************************************************************************** - * @file BLE_Zigbee/BLE_Zigbee_Static/readme.txt - * @author MCD Application Team - * @brief Example of application using BLE and Zigbee protocols in Static - * Concurrent mode. - ****************************************************************************** - * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - @endverbatim - -@par Application Description - -How to use BLE application and Zigbee application in static concurrent mode. - -This application requires one STM32WB55xx-Nucleo board with Static Concurrent Mode Application. -Static means that application can perform alternatively BLE or Zigbee activities. - -The idea is to present a demo with a Zigbee Network (at least 2 Nucleo Boards -running Zigbee_OnOff_Server_Coord and Zigbee_OnOff_Client_Router application) and a BLE connection between 1 Nucleo -board running BLE_Zigbee_Static application with a smartphone running -"ST BLE Sensor" Application (available on App Store and Google Play) -The STM32WB55xx-Nucleo board running BLE_Zigbee_Static application is capable -of switching from BLE network to Zigbee network and vice-versa. - -@par Keywords - -Zigbee, BLE - -@par Directory contents - - - -@par Hardware and Software environment - - - This example runs on STM32WB55xx devices. - - - This example has been tested with an STMicroelectronics STM32WB55RG-Nucleo - board and can be easily tailored to any other supported device - and development board. - - - On STM32WB55RG-Nucleo, the jumpers must be configured as described - in this section. Starting from the top left position up to the bottom - right position, the jumpers on the Board must be set as follows: - - CN11: GND [OFF] - JP4: VDDRF [ON] - JP6: VC0 [ON] - JP2: +3V3 [ON] - JP1: USB_STL [ON] All others [OFF] - CN12: GND [OFF] - CN7: [OFF] - JP3: VDD_MCU [ON] - JP5: GND [OFF] All others [ON] - CN10: [OFF] - - -@par How to use it ? - -This application requests having the stm32wb5x_BLE_Zigbee_FFD_static_fw.bin -(or the stm32wb5x_BLE_Zigbee_RFD_dynamic_fw.bin) binary flashed on the Wireless Coprocessor. -If it is not the case, you need to use STM32CubeProgrammer to load the appropriate binary. -All available binaries are located under /Projects/STM32_Copro_Wireless_Binaries directory. -Refer to UM2237 to learn how to use/install STM32CubeProgrammer. -Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the -Wireless Coprocessor binary. - - -Minimum requirements for the demo: -- 1 STM32WB55xx-Nucleo board in BLE Zigbee Static Concurrent mode - (This device will be referred as NODE1) -- 2 STM32WB55xx-Nucleo board or more for creating Zigbee Network - (see example Zigbee_OnOff_Server_Coord and Zigbee_OnOff_Client_Router for more details on how to use it) -- 1 Smartphone (Android/IOS) with "ST BLE Sensor" Phone Application (available on App Store and Google Play) - Install the "ST BLE Sensor" application on the ios/android device - https://play.google.com/store/apps/details?id=com.st.bluems - https://itunes.apple.com/us/App/st-bluems/id993670214?mt=8 - -In order to make the program work, you must do the following: - - Connect 1 STM32WB55xx-Nucleo boards to your PC - - Open your preferred toolchain - - Rebuild all files and load your image into target memory - - Run the example - -To get the traces in real time, you can connect an HyperTerminal to the STLink Virtual Com Port. - -**** START DEMO **** -By default, after a reset, the board will start in BLE mode. - -The BLE example is to demonstrate Point-to-Point communication using BLE component. -The Peripheral device (P2P Server) starts advertising, -ST BLE Sensor smart Phone Application) scans and can connect to the P2P Server -by selecting = "P2P_SERVER1" entry. -Once connected, the application starts to search the P2P Services & Characteristics. -Led Button service, Led Characteristic and Button Characteristic are discovered at this stage -(this service is ST specific). -Once the smartphone is connected, the user can interact with the board by pressing -"LED1 CONTROL" field which toggles LED1 on the board. - -**** SWITCHING TO ZIGBEE ***** -This can be done in different ways: - - By sending (WRITE) "0x0102" command to the board via BLE. (Switch to Thread button in the smartphone application) - - By pressing SW2 Button on the STM32WB55xx-Nucleo board - -**** ZIGBEE MODE **** -Then the board switch to Zigbee protocol and corresponding application. -The node will then attach the existing Zigbee network (at least 2 boards running -Zigbee_OnOff_Server_Coord and Zigbee_OnOff_Client_Router application). - -The concurrent node is now running Zigbee stack and on top of it the OnOff Client cluster can be used. -Press SW1 button to send OnOff Toggle request to the server (board running Zigbee_OnOff_Server_Coord). -The RED LED will toggle on the server side. - -**** SWITCHING BACK TO BLE ***** -This is done by pressing SW2 Button on the STM32WB55xx-Nucleo board. - -The STM32WB55xx-Nucleo board will restart in BLE mode, and start advertising. - - - *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  - */ - \ No newline at end of file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_cks.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_cks.h index 70e39ab57..52a56a971 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_cks.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_cks.h @@ -6,17 +6,16 @@ * @brief Header for cks application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +39,3 @@ HAL_StatusTypeDef CKS_Test (void); #endif #endif /*APP_CKS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_common.h index ba1e34dbc..5609fcbb2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_common.h @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : app_common.h * Description : App Common application configuration file for BLE * middleWare. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_conf.h index 3c52a988b..118ebd7b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_conf.h @@ -1,17 +1,17 @@ /** ****************************************************************************** * File Name : app_conf.h - * Description : Application configuration file for BLE middleWare. - ****************************************************************************** + * Description : Application configuration file for STM32WPAN Middleware. + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,7 +272,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -498,7 +498,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -519,4 +519,3 @@ typedef enum #endif /*APP_CONFIG_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_conf.h index 7fcd60664..d9a1bf3bd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/main.h index e2348bf32..a648c033a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ extern "C" { #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_hal_conf.h index 5f038af10..836f8cece 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_it.h index bec3abfb4..8e5f495e7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void PUSH_BUTTON_SW2_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/app_cks.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/app_cks.c index df7830162..d2335330b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/app_cks.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/app_cks.c @@ -1,25 +1,24 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file CRYP_CKS/src/app_cks.c * @author MCD Application Team * @brief This example provides an example of CKS feature. * This feature allows to store AES keys in CPU2 area. Keys cannot be accessed by user application running on CPU1 They are loaded when requested by CPU2 in the unreadable key register of AES1 IP -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -204,7 +203,7 @@ static HAL_StatusTypeDef CKS_SimpleKeys(void) #endif /* CKS_LOCK_TEST */ /* Decryption */ - /* Start decrypting aCyphertext, the decrypted data is available in aDecryptedtext */ + /* Start decrypting aCiphertext, the decrypted data is available in aDecryptedtext */ if (HAL_CRYP_Decrypt(&hcryp1, aEncryptedtextCBC128, AES_TEXT_SIZE, aDecryptedtext, TIMEOUT_VALUE) != HAL_OK) { /* Processing Error */ @@ -253,7 +252,7 @@ static HAL_StatusTypeDef CKS_SimpleKeys(void) return HAL_ERROR; } } - /* Start decrypting aCyphertext, the decrypted data is available in aDecryptedtext */ + /* Start decrypting aCiphertext, the decrypted data is available in aDecryptedtext */ if (HAL_CRYP_Decrypt(&hcryp1, aEncryptedtextCBC256, AES_TEXT_SIZE, aDecryptedtext, TIMEOUT_VALUE) != HAL_OK) { /* Processing Error */ @@ -350,7 +349,7 @@ static HAL_StatusTypeDef CKS_EncryptedKeys(void) } } /* Decryption */ - /* Start decrypting aCyphertext, the decrypted data is available in aDecryptedtext */ + /* Start decrypting aCiphertext, the decrypted data is available in aDecryptedtext */ if (HAL_CRYP_Decrypt(&hcryp1, aEncryptedtextCBC128, AES_TEXT_SIZE, aDecryptedtext, TIMEOUT_VALUE) != HAL_OK) { /* Processing Error */ @@ -403,7 +402,7 @@ static HAL_StatusTypeDef CKS_EncryptedKeys(void) return HAL_ERROR; } } - /* Start decrypting aCyphertext, the decrypted data is available in aDecryptedtext */ + /* Start decrypting aCiphertext, the decrypted data is available in aDecryptedtext */ if (HAL_CRYP_Decrypt(&hcryp1, aEncryptedtextCBC256, AES_TEXT_SIZE, aDecryptedtext, TIMEOUT_VALUE) != HAL_OK) { /* Processing Error */ @@ -448,5 +447,3 @@ static int data_cmp(uint32_t *EncryptedText, uint32_t *RefText, uint8_t Size) } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/main.c index 6f45902af..dc751855b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/main.c @@ -1,23 +1,22 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file CRYP_CKS/src/main.c * @author MCD Application Team * @brief CKS examples * -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" #include "app_common.h" @@ -234,5 +233,3 @@ static void Error_Handler(void) { while(1); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_hal_msp.c index edae3b811..d632ada59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_hal_msp.c @@ -1,49 +1,19 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : stm32wbxx_hal_msp.c - * Description : This file provides code for the MSP Initialization + * @file CKS/CKS_Crypt/Src/stm32wbxx_hal_msp.c + * @author MCD Application Team + * @brief This file provides code for the MSP Initialization * and de-Initialization codes. ****************************************************************************** - * This notice applies to any and all portions of this file - * that are not between comment pairs USER CODE BEGIN and - * USER CODE END. Other portions of this file, whether - * inserted by the user or by software development tools - * are owned by their respective copyright owners. + * @attention * - * Copyright (c) 2019 STMicroelectronics International N.V. + * Copyright (c) 2019-2021 STMicroelectronics. * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -288,4 +258,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_it.c index 87c86ddc7..85efc0247 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -220,4 +219,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/MDK-ARM/startup_stm32wb55xx_cm4.s index eafc092bb..d2f21f2ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/readme.txt index 2bb00fd35..b31a2c3a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/CKS/CKS_Crypt/readme.txt @@ -8,12 +8,12 @@ * @brief Example of CKS feature usage. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -71,7 +71,7 @@ In order to make the program work, you must do the following: - Flash the board with the executable file - Power on the Nucleo board with the CRYP_CKS application -If all test are passed, LED1 is swithed On. +If all test are passed, LED1 is switched On. It one test fails, LED3 is switched On note: Access to Bootloader USB Interface (system flash) with Boot mode selected by Boot0 pin set to VDD diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/FreeRTOS_Mail.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/FreeRTOS_Mail.ioc index 226d0dead..31c4bdd06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/FreeRTOS_Mail.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/FreeRTOS_Mail.ioc @@ -66,8 +66,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -85,6 +85,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -146,14 +157,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/main.h index 38cf9e65d..1563d02c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_it.h index b13a41fde..8973772f8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/app_freertos.c index c9bf67be4..bb5971e90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/main.c index 876d70105..ca8d6715c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -200,6 +173,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -213,7 +189,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -234,11 +210,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -338,7 +309,7 @@ void MailQueueConsumer(void const * argument) /* USER CODE END MailQueueConsumer */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -392,4 +363,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_msp.c index be6b662b5..3c6547951 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_it.c index b9e8ddde4..4bad6d64e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -177,4 +176,4 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/readme.txt index 067d2788b..696a4da0b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mail/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS Mail example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc index 8ef3775a1..d798e9129 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/FreeRTOS_Mutexes.ioc @@ -66,8 +66,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -85,6 +85,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -146,14 +157,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h index 677f9a293..38a47869b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h index 8f6e938dd..c8b23b338 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c index 07c05d753..96e013127 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c index c8d2502d4..389eb3fc6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -201,6 +174,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -214,7 +190,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -235,11 +211,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -437,7 +408,7 @@ void MutexLowPriorityThread(void const * argument) /* USER CODE END MutexLowPriorityThread */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -491,4 +462,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c index 46b813070..ee1138012 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c index c5395a4f6..58edac12b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,4 +177,4 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt index 235756607..fce1e3c69 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Mutexes/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS Mutexes example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc index 43f1293a9..c53859836 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc @@ -67,8 +67,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -86,6 +86,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -147,14 +158,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/main.h index 2dd2542b4..fe7417ebc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_it.h index 2a4c885c8..b2b4bc011 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/app_freertos.c index 9aa84ded6..ae12a5ff3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/main.c index 061f14da8..9ae3a8b65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -192,6 +165,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -205,7 +181,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -226,11 +202,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -311,7 +282,7 @@ void MessageQueueConsumer(void const * argument) /* USER CODE END MessageQueueConsumer */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -365,4 +336,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_msp.c index c814675bd..b76ad5d56 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_it.c index fa6f628b7..c14ba4e9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,4 +177,4 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/readme.txt index bea985427..5807b0c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Queues/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS Queues example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc index ef1bde527..eeddb788b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc @@ -66,8 +66,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -85,6 +85,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -146,14 +157,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/main.h index 50eab321d..1b3ed8b76 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_it.h index 85a731c4f..3bc7240c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/app_freertos.c index 4046d9f40..d4324c6a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/main.c index bfaf9456c..56316ee01 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -190,6 +163,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -203,7 +179,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -224,11 +200,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -326,7 +297,7 @@ void SemaphoreThread2(void const * argument) /* USER CODE END SemaphoreThread2 */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -380,4 +351,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_msp.c index ed6bde5ff..c8535aabb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_it.c index c38a61c99..fd0ef9dac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,4 +177,4 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/readme.txt index cf3aa039f..809b28b4f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Semaphore/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS Semaphore example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/FreeRTOS_SemaphoreFromISR.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/FreeRTOS_SemaphoreFromISR.ioc index 27a122568..446a8c50f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/FreeRTOS_SemaphoreFromISR.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/FreeRTOS_SemaphoreFromISR.ioc @@ -68,8 +68,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -87,6 +87,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -148,14 +159,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/main.h index e61393118..028268b82 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_it.h index 12c3457f9..73b935404 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/app_freertos.c index 8820d4cc2..b9eb263db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/main.c index 221e27603..f5156b203 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -187,6 +160,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -200,7 +176,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -221,11 +197,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -268,7 +239,7 @@ void SemaphoreTest(void const * argument) /* USER CODE END 5 */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -322,4 +293,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_msp.c index 2924e4511..235b2419d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_it.c index 2ac8c766d..93b170fcd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/readme.txt index c27034c22..18519b836 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SemaphoreFromISR/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS semaphore from ISR example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/FreeRTOS_Signal.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/FreeRTOS_Signal.ioc index 18064cd61..b4599e66a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/FreeRTOS_Signal.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/FreeRTOS_Signal.ioc @@ -71,8 +71,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -90,6 +90,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -151,14 +162,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/main.h index af668d162..bf3ccdb36 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_it.h index 394e82e0c..75c258a1d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/app_freertos.c index 5c0b3f8cb..d0f4c564c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/main.c index d18ea264f..4ff8b8d48 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -192,6 +165,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -205,7 +181,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -226,11 +202,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -307,7 +278,7 @@ void Signal_Gen_Thread(void const * argument) /* USER CODE END Signal_Gen_Thread */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -361,4 +332,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_msp.c index 76a74746b..d35346035 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_it.c index 6a51b491d..d891dea0b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,4 +177,4 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/readme.txt index 2fc4b6ecb..0926b0ce2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Signal/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS Signal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/FreeRTOS_SignalFromISR.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/FreeRTOS_SignalFromISR.ioc index 6864c4311..9d6657f05 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/FreeRTOS_SignalFromISR.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/FreeRTOS_SignalFromISR.ioc @@ -71,8 +71,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -90,6 +90,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -151,14 +162,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/main.h index d986b2829..d555287c9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_it.h index cbdd2ebb4..13e8d9bbb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/app_freertos.c index 0265092da..f4c09b984 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/main.c index 94cbe1a72..93b2f9235 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -182,6 +155,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -195,7 +171,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -216,11 +192,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -255,7 +226,7 @@ void ToggleLEDsThread(void const * argument) /* USER CODE END 5 */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -309,4 +280,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_msp.c index 1158d4db7..abf05d2d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_it.c index 2b8e8e76e..e1132dcea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -186,4 +185,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/readme.txt index d4056db6b..70f339ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_SignalFromISR/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS Signal from ISR example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc index 9daa8c562..1c7f212bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc @@ -65,8 +65,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -84,6 +84,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -145,14 +156,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/main.h index 111b59c1b..48728e152 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_it.h index 81abdf4c2..f5e5b5d88 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/app_freertos.c index 31042bf15..8c0fd8d1d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/main.c index d0183ab2b..fe4f62ccd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -182,6 +155,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -195,7 +171,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -216,11 +192,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -311,7 +282,7 @@ void LED_Thread2(void const * argument) /* USER CODE END LED_Thread2 */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -365,4 +336,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_msp.c index 14bdd2677..81d1eaee0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_it.c index fc1cac075..dc421732c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,4 +177,4 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/readme.txt index 15e1902a4..bc1abb079 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_ThreadCreation/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS Thread Creation example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc index eca1f5714..50c15e941 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc @@ -71,8 +71,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -90,6 +90,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -151,14 +162,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=16000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/main.h index cb2a2f073..109e46dcc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/main.h @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -94,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_it.h index cb146e6de..47c830c27 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/app_freertos.c index df2d08c8b..331c68ba1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/app_freertos.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +58,3 @@ /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/main.c index c6492fb9a..84257703a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/main.c @@ -7,39 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -184,6 +157,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -197,7 +173,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -218,11 +194,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -266,7 +237,7 @@ void osTimerCallback(void const * argument) /* USER CODE END osTimerCallback */ } - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -320,4 +291,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_msp.c index 857c82e9c..d25db07e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_msp.c @@ -8,39 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics International N.V. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +80,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -88,6 +89,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -112,6 +114,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -146,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_it.c index 3a23dd51b..680b33fcc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,4 +177,4 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/readme.txt index f818124e3..2f64637d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/FreeRTOS/FreeRTOS_Timers/readme.txt @@ -8,38 +8,12 @@ * @brief Description of the FreeRTOS timers example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics International N.V. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: - * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_common.h index 780a38902..e054ff93a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" { #endif #endif /* APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_conf.h index 1c88219ba..84a9d1f5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -149,5 +148,3 @@ #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_entry.h index bf5f7802e..4f1a7439c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, syncro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -53,5 +52,3 @@ void SEQ_EvtIdle( uint32_t evt_waited_bm ); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_conf.h index 098970e0a..ab150fb3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -191,5 +190,3 @@ #endif /* HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/main.h index 8fd8c6255..3f516c07b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/main.h @@ -1,19 +1,20 @@ - /* @file main.h +/** + ****************************************************************************** + * @file main.h * @author MCD Application Team * @brief This file contains all the functions prototypes for the main.c * file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -44,5 +45,3 @@ extern "C" { #endif /* MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_hal_conf.h index 2114081a5..2e94c5f74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -347,5 +348,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_it.h index 6692f4c13..8ee0e6a96 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -62,12 +61,9 @@ void USB_HP_IRQHandler(void); void USB_FS_WKUP_IRQHandler(void); #endif /* USAGE_OF_VCP */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - #ifdef __cplusplus } /* extern "C" */ #endif #endif /* STM32WB_IT_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm_logging.h index 43e91360b..1ce105125 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/app_entry.c index 91e591703..f4370fe4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -427,5 +426,3 @@ static void Receive_Notification_From_RFCore(void) UTIL_SEQ_SetTask(TASK_MSG_FROM_RF_CORE,CFG_SCH_PRIO_0); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/hw_uart.c index 7a795592b..37df9a774 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/main.c index 0884ef997..09385368b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -299,4 +299,3 @@ static void Init_Debug( void ) return; } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32wbxx_it.c index 559db6ba2..ec650d7ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm32wbxx_it.c @@ -1,23 +1,22 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32xx_it.c * @author MCD Application Team * @brief Main Interrupt Service Routines. * This file provides template for all exceptions handler and * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -190,5 +189,3 @@ void USB_FS_WKUP_IRQHandler(void) HAL_PCD_IRQHandler(&hpcd); } #endif /* USAGE_OF_VCP */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm_logging.c index 37a2a0f8b..351bd5fc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/stm_logging.c @@ -1,5 +1,5 @@ - /** +/** ****************************************************************************** * @file stm_logging.c * @author MCD Application Team @@ -8,17 +8,16 @@ * ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/system_stm32wbxx.c index 9ea1e29cd..cd5dde924 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/Core/Src/system_stm32wbxx.c @@ -59,17 +59,16 @@ *============================================================================= ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS @@ -161,11 +160,12 @@ const uint32_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4}; const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ - -const uint32_t SmpsPrescalerTable[4][6]={{1,3,2,2,1,2}, \ - {2,6,4,3,2,4}, \ - {4,12,8,6,4,8}, \ - {4,12,8,6,4,8}}; +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -358,5 +358,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/stm32wb55xx_flash_cm4.icf index 4a1fe32a2..46d984c98 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20020000; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20020000; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x20033FFF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20033FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.c index ebe19bf94..113cbb396 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_ffd_mac_802_15_4.c * @author MCD Application Team * @brief Application based on MAC 802.15.4 - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -403,5 +402,3 @@ static void APP_FFD_MAC_802_15_4_TraceError(char * pMess, uint32_t ErrCode) */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.h index 8b638de2e..6a770a855 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4.h @@ -6,17 +6,16 @@ * @brief Header for FFD MAC 802.15.4 Core Mac Device implementation ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_FFD_MAC_802_15_4_H @@ -187,5 +186,3 @@ void APP_FFD_parseClientReqResCmd ( const char * CommandString ); #endif #endif /* __APP_FFD_MAC_802_15_4_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c index e7505cddd..aa862a071 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.c @@ -1,22 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file app_mac_802-15-4_process.c * @author MDG-RF Team * @brief MAC Cli Implementation for Demo Purpose * -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "app_ffd_mac_802_15_4_process.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h index c67838353..af5b332b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/app_ffd_mac_802_15_4_process.h @@ -7,17 +7,16 @@ * MAC 802.15.4 Events and Notifications. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_FFD_MAC_802_15_4_PROCESS_H @@ -63,5 +62,3 @@ MAC_Status_t APP_MAC_mlmePollIndCb( const MAC_pollInd_t * pPollInd ); #endif #endif /* APP_FFD_MAC_802_15_4_PROCESS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/readme.txt index e923c2108..2a4f107c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_FFD/readme.txt @@ -9,12 +9,12 @@ light 802.15.4 Coordinator services - FFD ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_common.h index e6e423501..3f0be0ef3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -106,5 +105,3 @@ extern "C" { #endif #endif /* APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_conf.h index 1e4435131..2354be0a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -55,7 +54,7 @@ ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -124,5 +123,3 @@ extern LPTIM_HandleTypeDef hlptim1; #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_entry.h index aa17bd9df..a0808da59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, syncro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -53,5 +52,3 @@ void SEQ_EvtIdle( uint32_t evt_waited_bm ); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_conf.h index 098970e0a..ab150fb3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -191,5 +190,3 @@ #endif /* HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/main.h index 4d6c32bbe..4d9d15b17 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/main.h @@ -1,19 +1,20 @@ - /* @file main.h +/** + ****************************************************************************** + * @file main.h * @author MCD Application Team * @brief This file contains all the functions prototypes for the main.c * file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -73,5 +74,3 @@ void Error_Handler(void); #endif /* MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_hal_conf.h index b9b36e879..31666ccc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -347,5 +348,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_it.h index 480f3e7be..d727f492b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -58,5 +57,3 @@ void EXTI1_IRQHandler(void); #endif #endif /* STM32WB_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm_logging.h index 43e91360b..1ce105125 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/app_entry.c index c14385640..1146ae3bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -379,5 +378,3 @@ void UTIL_SEQ_Idle( void ) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/main.c index a72fb2fd8..4df04ebb6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -477,4 +477,3 @@ static void Init_Exti( void ) return; } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_hal_msp.c index 391d219eb..15f8f8c12 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -195,4 +194,3 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* hlptim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_it.c index fcec2df30..24bc4bb21 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/stm32wbxx_it.c @@ -1,23 +1,22 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32xx_it.c * @author MCD Application Team * @brief Main Interrupt Service Routines. * This file provides template for all exceptions handler and * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -131,4 +130,3 @@ void LPTIM1_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/system_stm32wbxx.c index fdf1bfe96..f156295c1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/Core/src/system_stm32wbxx.c @@ -59,17 +59,16 @@ *============================================================================= ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS @@ -164,7 +163,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB35xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -398,5 +397,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/stm32wb55xx_flash_cm4.icf index 436cf0d93..fd559a821 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20020000; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20020000; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x200327FF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.c index f5cd8c846..9f7e0f470 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.c @@ -1,22 +1,21 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_lpm_transmit_mac_802_15_4.c * @author MCD Application Connectivity Team * @brief Application implementing periodic data transmission using the * Proxy MAC interfacing 802.15.4 RF core. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -192,7 +191,7 @@ void APP_LPM_TRANSMIT_MAC_802_15_4_SendData(const char * data) memcpy(&rfBuffer,data,strlen(data)); - /* Xor Data to potentialy verified data paylaod on receiver side */ + /* Xor Data to potentially verified data paylaod on receiver side */ rfBuffer[strlen(data)] = xorSign(data,strlen(data)); @@ -356,7 +355,7 @@ void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim) /** - * @brief comptue simple xor signature of the data to transmit + * @brief compute simple xor signature of the data to transmit * * @param pmessage : Message to sign. * @param message_len: Message Len @@ -395,5 +394,3 @@ uint8_t xorSign( const char * pmessage, uint8_t message_len) */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.h index c3be76249..34bbb507d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4.h @@ -6,17 +6,16 @@ * @brief Header for Application implementing periodic data transmit ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_LPM_TRANSMIT_MAC_802_15_4_H @@ -164,5 +163,3 @@ void APP_LPM_TRANSMIT_parseClientReqResCmd ( const char * CommandString ); #endif #endif /* _APP_LPM_TRANSMIT_MAC_802_15_4_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.c index 0c1cb67ba..3de56441c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.c @@ -1,5 +1,5 @@ /** -****************************************************************************** + ****************************************************************************** * @file app_lpm_transmit_mac_802_15_4_process.c * @author MCD Application Connectivity Team * @brief Proxy MAC Callback Implementation for Demo Purpose @@ -7,19 +7,18 @@ * Up to the user to update/implement his owns callbacks to match * to his application. * -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "app_common.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.h index 5e29b46d6..f0ddbccbf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/app_lpm_transmit_mac_802_15_4_process.h @@ -6,17 +6,16 @@ * @brief Header for Proxy MAC Callback Implementations. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_RFD_MAC_802_15_4_PROCESS_H @@ -80,5 +79,3 @@ MAC_Status_t APP_MAC_mlmeGtsIndCb( const MAC_GtsInd_t * pGtsInd ); #endif #endif /* APP_RFD_MAC_802_15_4_PROCESS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/app/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/STM32_WPAN/target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/readme.txt index b3a1779b5..8ed015379 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_LPM_Periodic_Transmit/readme.txt @@ -10,12 +10,12 @@ power mode activated ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_common.h index 780a38902..e054ff93a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" { #endif #endif /* APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_conf.h index 98d0ae83d..66bfd0318 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -149,5 +148,3 @@ #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_entry.h index aa17bd9df..a0808da59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, syncro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -53,5 +52,3 @@ void SEQ_EvtIdle( uint32_t evt_waited_bm ); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_conf.h index 098970e0a..ab150fb3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -191,5 +190,3 @@ #endif /* HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/main.h index 8fd8c6255..3f516c07b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/main.h @@ -1,19 +1,20 @@ - /* @file main.h +/** + ****************************************************************************** + * @file main.h * @author MCD Application Team * @brief This file contains all the functions prototypes for the main.c * file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -44,5 +45,3 @@ extern "C" { #endif /* MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_hal_conf.h index 2114081a5..2e94c5f74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -347,5 +348,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_it.h index 9f3152b2e..f45e52e4f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void EXTI1_IRQHandler(void); #endif #endif /* STM32WB_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm_logging.h index 43e91360b..1ce105125 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/app_entry.c index 3a868ccce..7cf10614d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -417,5 +416,3 @@ static void Receive_Notification_From_RFCore(void) UTIL_SEQ_SetTask(TASK_MSG_FROM_RF_CORE,CFG_SCH_PRIO_0); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/hw_uart.c index 7a795592b..37df9a774 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/hw_uart.c @@ -5,17 +5,16 @@ * @brief hardware access ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -461,5 +460,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/main.c index b98a4946a..9f03e8577 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -316,4 +316,3 @@ static void Init_Debug( void ) return; } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32wbxx_it.c index fab2bd355..c442cdcb0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm32wbxx_it.c @@ -1,23 +1,22 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32xx_it.c * @author MCD Application Team * @brief Main Interrupt Service Routines. * This file provides template for all exceptions handler and * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -228,4 +227,3 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm_logging.c index 37a2a0f8b..351bd5fc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/stm_logging.c @@ -1,5 +1,5 @@ - /** +/** ****************************************************************************** * @file stm_logging.c * @author MCD Application Team @@ -8,17 +8,16 @@ * ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** * @file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/system_stm32wbxx.c index 9ea1e29cd..cd5dde924 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/Core/Src/system_stm32wbxx.c @@ -59,17 +59,16 @@ *============================================================================= ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS @@ -161,11 +160,12 @@ const uint32_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4}; const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ - -const uint32_t SmpsPrescalerTable[4][6]={{1,3,2,2,1,2}, \ - {2,6,4,3,2,4}, \ - {4,12,8,6,4,8}, \ - {4,12,8,6,4,8}}; +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -358,5 +358,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/stm32wb55xx_flash_cm4.icf index 4a1fe32a2..46d984c98 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20020000; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20020000; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x20033FFF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20033FFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.c index 9af2a069f..ef8af88e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_rfd_mac_802_15_4.c * @author MCD Application Team * @brief Application based on MAC 802.15.4 - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -338,7 +337,7 @@ static void APP_RFD_MAC_802_15_4_TraceError(char * pMess, uint32_t ErrCode) /** - * @brief comptue simple xor signature of the data to transmit + * @brief compute simple xor signature of the data to transmit * * @param pmessage : Message to sign. * @param message_len: Message Len @@ -377,5 +376,3 @@ uint8_t xorSign( const char * pmessage, uint8_t message_len) */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.h index 6e8281dd3..2de1337a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4.h @@ -6,17 +6,16 @@ * @brief Header for RFD MAC 802.15.4 demo ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_RFD_MAC_802_15_4_H @@ -186,5 +185,3 @@ void APP_RFD_parseClientReqResCmd ( const char * CommandString ); #endif #endif /* __APP_RFD_MAC_802_15_4_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.c index 19721841f..6e2672aaa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.c @@ -1,22 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file app_mac_802-15-4_process.c * @author MDG-RF Team * @brief MAC Cli Implementation for Demo Purpose * -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "app_rfd_mac_802_15_4_process.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.h index 3df0f55f1..6580e1c09 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/app_rfd_mac_802_15_4_process.h @@ -6,17 +6,16 @@ * @brief Header for RFD MAC 802.15.4 processing activtities ****************************************************************************** * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_RFD_MAC_802_15_4_PROCESS_H @@ -80,5 +79,3 @@ MAC_Status_t APP_MAC_mlmeGtsIndCb( const MAC_GtsInd_t * pGtsInd ); #endif #endif /* APP_RFD_MAC_802_15_4_PROCESS_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/readme.txt index 8f242a915..cc2bc3387 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Mac_802_15_4/Mac_802_15_4_RFD/readme.txt @@ -9,12 +9,12 @@ light 802.15.4 Coordinator services - RFD ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -130,7 +130,7 @@ To get the traces in real time, you can connect an HyperTerminal to the STLink V - Parity = none - Flow control = none - You can also use an MAC 802.15.4 other the air sniffer on channel 21 to spy + You can also use an MAC 802.15.4 over the air sniffer on channel 21 to spy MAC 802.15.4 frames exchanged between the devices. **** START DEMO **** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_common.h index 2ea61770a..e055a407c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,4 +116,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_conf.h index 048581eb1..2401a831f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -40,8 +40,8 @@ */ #define CFG_TL_EVT_QUEUE_LENGTH 20 /** - * TL_EVENT_FRAME_SIZE is the size of the packets transfered between M0 and M4 through IPCC. - * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before beeing sent to UART + * TL_EVENT_FRAME_SIZE is the size of the packets transferred between M0 and M4 through IPCC. + * Note 1 : thoose packets are first put in a trace queue (see DBG_TRACE_MSG_QUEUE_SIZE) before being sent to UART * Note 2 : Queue size must be higher than a M0 trace buffer max size (see LOG_BUFFER_SIZE_MAX in M0 FW) */ #define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 @@ -95,7 +95,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -324,7 +324,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -355,4 +355,3 @@ extern LPM_lowPower_mode_t M4_LPM_mode; #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_lld_tests.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_lld_tests.h index 548953297..aaaa4434a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_lld_tests.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/app_lld_tests.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : app_lld_tests.h * Description : Header for RF LLDs tests application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_LLD_TESTS_H @@ -95,4 +94,3 @@ void us_delay_32m(uint32_t microsec); #endif /* APP_LLD_TESTS_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/gpio_lld.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/gpio_lld.h index 5a9f0a790..a25a523fa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/gpio_lld.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/gpio_lld.h @@ -7,7 +7,7 @@ #define GPIO_LLD_H_ #if defined (USE_SIMU) || defined (USE_FPGA) -/* Be carefull with GPIO used on SIMU plateform */ +/* Be careful with GPIO used on SIMU plateform */ // GPIOA port is used for CRC management on MASTER only // GPIOC ad GPIOD ports are used to send messages between the 2 DORYs #define GPIO_TX_PIN GPIO_PIN_8 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_conf.h index fe8d1fd89..789e32073 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -113,4 +112,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_if.h index 8cfe37eed..6a82394ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -96,5 +95,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/main.h index 1d459daaf..e33444868 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,5 +97,3 @@ void MX_USART1_UART_DeInit(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32_lpm_if.h index 70abecaa9..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* - *

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_hal_conf.h index 1484e8f53..2eccef4f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_it.h index 9244f937e..2297cb68d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,5 +82,3 @@ void PUSH_BUTTON_SW3_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm_logging.h index 187649d1d..e8e8ac6ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_entry.c index a36cacba3..dd9d1bba1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -438,4 +437,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_lld_tests.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_lld_tests.c index 471a55835..26f02bbcd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_lld_tests.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/app_lld_tests.c @@ -4,18 +4,17 @@ * File Name : app_lld_tests.c * Description : RF LLDs tests Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -46,7 +45,7 @@ #define CLI_CMD_BUFFER_SIZE 1024U #define CLI_CMD_HISTORY_LENGTH 10U #define UART_TX_BUFFER_SIZE 4096U -// Delay to let M4 flushing traces or CLI printf : a delay is already set on M0 side and seems enougth +// Delay to let M4 flushing traces or CLI printf : a delay is already set on M0 side and seems enough #define DELAY_BEFORE_WFI_ON_M4 10U /* USER CODE BEGIN PD */ @@ -262,7 +261,7 @@ void APP_LLDTESTS_Init( void ) /* Set corresponding task to send this command to M0 */ UTIL_SEQ_SetTask(1U << CFG_TASK_SEND_CLI_TO_M0, CFG_SCH_PRIO_0); - /* Activate UART RX buffer processing task to allow USER command comming from UART */ + /* Activate UART RX buffer processing task to allow USER command coming from UART */ UTIL_SEQ_SetTask(1U << CFG_TASK_PROCESS_UART_RX_BUFFER, CFG_SCH_PRIO_0); /* USER CODE BEGIN APP_LLDTESTS_INIT_2 */ @@ -337,7 +336,7 @@ static void APP_LLDTESTS_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -433,7 +432,7 @@ static void uartRxCpltCallback(void) /* This callback is called : - during RX isr (huart->RxISR) - after bytes copy in buffer specified in last call to HW_UART_Receive_IT() - - when number of bytes specified in last call to HW_UART_Receive_IT() is acheived */ + - when number of bytes specified in last call to HW_UART_Receive_IT() is achieved */ /* Prepare buffer to receive next character */ if ( rxCmdAllowed ) { @@ -471,7 +470,7 @@ static void uartRxBufferProcess( void ) static int8_t escape = -1; static uint8_t escape_seq[3] = {0}; - /* Ensure that last_char buffer contains a string with the char and a \0 (usefull to send echo or CHAR_DEL to UART) */ + /* Ensure that last_char buffer contains a string with the char and a \0 (useful to send echo or CHAR_DEL to UART) */ last_char[1] = 0; /* Interpret the character reception from UART (only if rxCmdAllowed is activated and read pointer reached write one)*/ @@ -580,7 +579,7 @@ static void uartTxBufferAdd(const char * str) while ((remainingBytesToWrite > 0) && (txBufferFull == 0)) { if ((txBuffer_rdPtr == (currentWrPtr + 1)) || ((txBuffer_rdPtr == 0) && (currentWrPtr == (UART_TX_BUFFER_SIZE - 1)))) { - /* If there is not enougth place (i.e. write pointer is just behind read pointer in the circular buffer), + /* If there is not enough place (i.e. write pointer is just behind read pointer in the circular buffer), buffer is full, so do not consider new string */ /* !! No trace here as it is under CRITICAL section */ txBufferFull = 1; @@ -1103,4 +1102,3 @@ void TL_LLDTESTS_ReceiveM0Cmd( TL_CmdPacket_t * cmdBuffer ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/gpio_lld.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/gpio_lld.c index fe5788ff9..00255848d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/gpio_lld.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/gpio_lld.c @@ -2,36 +2,18 @@ ****************************************************************************** * @file gpio_lld.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the init of all the GPIOs used by LLD tests. * It is to be used on both M0 and M4. ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2015 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,7 +58,7 @@ void gpio_lld_phy_init(void) { #if defined (USE_SIMU) // Initialize GPIO used to detect if current DORY is master or slave - // 4 GPIOs are needed while only one is enougth but this must be kept as it is + // 4 GPIOs are needed while only one is enough but this must be kept as it is // because this is also used by tests which are not managed by MDG-RF GPIO_InitStruct.Pin = (GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3); GPIO_InitStruct.Mode = GPIO_MODE_INPUT; @@ -722,5 +704,3 @@ void gpio_lld_phy_pc5_down(void) { HAL_GPIO_WritePin(GPIOC, GPIO_PIN_5, GPIO_PIN_RESET); } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_uart.c index f6c490fd1..a60145e7e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -384,4 +383,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/main.c index 292919c2b..2d4d426cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -793,4 +793,3 @@ void Config_HSE_tuning(const uint32_t hse_tuning) APP_DBG("New HSE tuning operation failed"); } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32_lpm_if.c index 367e663a1..dd0c5d92e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,19 +261,11 @@ static void Enter_Low_Power( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI(); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI(); } @@ -330,5 +321,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_hal_msp.c index b6210573a..ea9ada3b6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -252,4 +251,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_it.c index 44f6810d9..3ad8efd37 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -364,4 +363,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/system_stm32wbxx.c index 907706bad..4bd06b0b0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB35xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/app_lld_tests_iar_asm.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/app_lld_tests_iar_asm.s index 987eb201e..d2c3f8ae9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/app_lld_tests_iar_asm.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/app_lld_tests_iar_asm.s @@ -1,12 +1,17 @@ ;/** ; ****************************************************************************** ; * @file app_lld_tests_iar_asm.s -; * @brief Common functionnalities for RF LLD tests that must be writen +; * @brief Common functionalities for RF LLD tests that must be written ; * in assembler for IAR compilator ; ****************************************************************************** ; * @attention ; * -; *

                                                                  © COPYRIGHT 2018 STMicroelectronics

                                                                  +; * Copyright (c) 2019 STMicroelectronics. +; * All rights reserved. +; * +; * This software is licensed under terms that can be found in the LICENSE file +; * in the root directory of this software component. +; * If no LICENSE file comes with this software, it is provided AS-IS. ; * ; ****************************************************************************** ; */ @@ -19,7 +24,7 @@ ; * - This function has been implemented for system clock set to 16MHz. It must ; * be rewiewed (twice more NOP) for 32Mhz config. ; * - This function can be interrupted if used in interruptible part of code. -; * - Be carefull with the use of critical section that can interrupt the reel +; * - Be careful with the use of critical section that can interrupt the reel ; * time during input microsec value. ; * - If 0 is given as input ; */ @@ -82,5 +87,4 @@ loop_32m: END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/app_lld_tests_arm_asm.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/app_lld_tests_arm_asm.s index 14781e3d6..64cd1004d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/app_lld_tests_arm_asm.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/app_lld_tests_arm_asm.s @@ -1,12 +1,17 @@ ;/** ; ****************************************************************************** ; * @file app_lld_tests_iar_asm.s -; * @brief Common functionnalities for RF LLD tests that must be writen +; * @brief Common functionalities for RF LLD tests that must be written ; * in assembler for IAR compilator ; ****************************************************************************** ; * @attention ; * -; *

                                                                  © COPYRIGHT 2018 STMicroelectronics

                                                                  +; * Copyright (c) 2019 STMicroelectronics. +; * All rights reserved. +; * +; * This software is licensed under terms that can be found in the LICENSE file +; * in the root directory of this software component. +; * If no LICENSE file comes with this software, it is provided AS-IS. ; * ; ****************************************************************************** ; */ @@ -19,7 +24,7 @@ ; * - This function has been implemented for system clock set to 16MHz. It must ; * be rewiewed (twice more NOP) for 32Mhz config. ; * - This function can be interrupted if used in interruptible part of code. -; * - Be carefull with the use of critical section that can interrupt the reel +; * - Be careful with the use of critical section that can interrupt the reel ; * time during input microsec value. ; * - If 0 is given as input ; */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/app_lld_tests_iar_asm.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/app_lld_tests_iar_asm.s index b770df4df..3da84c917 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/app_lld_tests_iar_asm.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/app_lld_tests_iar_asm.s @@ -1,12 +1,17 @@ ;/** ; ****************************************************************************** ; * @file app_lld_tests_iar_asm.s -; * @brief Common functionnalities for RF LLD tests that must be writen +; * @brief Common functionalities for RF LLD tests that must be written ; * in assembler for IAR compilator ; ****************************************************************************** ; * @attention ; * -; *

                                                                  © COPYRIGHT 2018 STMicroelectronics

                                                                  +; * Copyright (c) 2019 STMicroelectronics. +; * All rights reserved. +; * +; * This software is licensed under terms that can be found in the LICENSE file +; * in the root directory of this software component. +; * If no LICENSE file comes with this software, it is provided AS-IS. ; * ; ****************************************************************************** ; */ @@ -19,7 +24,7 @@ ; * - This function has been implemented for system clock set to 16MHz. It must ; * be rewiewed (twice more NOP) for 32Mhz config. ; * - This function can be interrupted if used in interruptible part of code. -; * - Be carefull with the use of critical section that can interrupt the reel +; * - Be careful with the use of critical section that can interrupt the reel ; * time during input microsec value. ; * - If 0 is given as input ; */ @@ -80,5 +85,3 @@ us_delay_32m: BX LR - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/readme.txt index ba879f816..a56b5fd9b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Phy_802_15_4/Phy_802_15_4_Cli/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Phy_802_15_4_Cli application ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h index 031521939..bce4553f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -361,9 +362,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -375,4 +376,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h index 4e3c7adb7..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h index 6cefe665f..66f39b187 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -254,5 +253,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h index 499b11976..f190fee2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c index 292ff1056..23172d419 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -174,9 +173,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -654,4 +652,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c index cc77d87dc..b5efb11f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,4 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c index e66973b44..72d8166e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -322,11 +341,21 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -370,4 +399,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c index 277c528ea..70d9636e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -409,4 +408,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/Thread_Cli_Cmd.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/Thread_Cli_Cmd.ewp index a179023a3..4e2dd2f2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/Thread_Cli_Cmd.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/Thread_Cli_Cmd.ewp @@ -1137,6 +1137,12 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pcd_ex.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c @@ -1191,12 +1197,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c -                                                                   @@ -1371,6 +1371,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1398,9 +1401,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c index 4d7e48239..7962c530b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/app_thread.c - * Description : Thread Application. - ****************************************************************************** + * File Name : App/app_thread.c + * Description : Thread Application. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -388,6 +387,7 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -399,6 +399,7 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + } /** @@ -743,4 +744,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h index b5a20ccc3..1f9102803 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -101,5 +100,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Thread_Cli_Cmd.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Thread_Cli_Cmd.ioc index 3dcdb2f6a..af8b5be54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Thread_Cli_Cmd.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/Thread_Cli_Cmd.ioc @@ -81,8 +81,8 @@ Mcu.PinsNb=19 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -149,6 +149,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Thread_Cli_Cmd +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -263,5 +265,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Thread_Cli_Cmd -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/readme.txt index 6a240f43f..0c6491f52 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Cli_Cmd/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread Cli command application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -160,7 +160,7 @@ Wireless Coprocessor binary. In order to make the program work, you must do the following: - Connect an STM32WB55xx_Nucleo board to your PC - Open your preferred toolchain - - Rebuild all files and load your image OR use the Thread_Cli_Cmd_reference.hex from Binary directory + - Rebuild all files and load your image - Connect one HyperTerminal (ST_Link) to be able to control the Thread stack via Cli commands - Connect a second HyperTerminal as described below to get the traces (optional) - Run the example and use the HyperTerminal to interact with the Board via the Cli commands diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h index eb6645627..85dee251c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -363,9 +364,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -377,4 +378,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h index 4e3c7adb7..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h index 3294c8281..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h index 499b11976..f190fee2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h index 66e0e60c6..a3fc2fb4f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c index 135992710..0798e3a87 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -174,9 +173,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -646,4 +644,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c index cc77d87dc..b5efb11f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,4 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_hal_msp.c index 45f221e40..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c index 277c528ea..70d9636e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -409,4 +408,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/Thread_Coap_DataTransfer.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/Thread_Coap_DataTransfer.ewp index 18d369e73..266cdab3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/Thread_Coap_DataTransfer.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/Thread_Coap_DataTransfer.ewp @@ -1187,6 +1187,12 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_ll_usb.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c @@ -1241,12 +1247,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - @@ -1421,6 +1421,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1448,9 +1451,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c index 096c7749e..0587b7cb2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -579,9 +578,9 @@ static void APP_THREAD_SendNextBuffer(void) } else { - /* Buffer transfer has been successfully transfered */ + /* Buffer transfer has been successfully transferred */ BSP_LED_On(LED1); - APP_DBG("********* BUFFER HAS BEEN TRANFERED *********"); + APP_DBG("********* BUFFER HAS BEEN TRANSFERRED *********"); } } @@ -991,6 +990,7 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -1002,6 +1002,7 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + } /** @@ -1346,4 +1347,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h index 99f5eceac..e945a6180 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -136,5 +135,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h index ef2e4b2ae..0144924d0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file data_transfer.h * @author MCD Application Team - * @brief data to be transfered - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @brief data to be transferred + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #ifndef DATA_TRANSFER_H_ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Thread_Coap_DataTransfer.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Thread_Coap_DataTransfer.ioc index 6322b1dd6..7ea64614d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Thread_Coap_DataTransfer.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/Thread_Coap_DataTransfer.ioc @@ -82,8 +82,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/readme.txt index 66aef9d29..c37424df8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_DataTransfer/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread_Coap_DataTransfer application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -52,7 +52,7 @@ After the reset of the 2 boards, one board will be in Leader mode (Green LED2 ON the other one will be in Child mode (Red LED3 ON) Once the child mode is established for one of the devices, it starts the provisioning procedure in multicast mode in order to probe the IP address of the leader device. Then this is used to start the File transfer procedure -in unicast mode, which success is marked by the lightening of the blue LED. +in unicast mode, which success is marked by the lightning of the blue LED. ___________________________ ___________________________ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h index 5b95e9a55..9e01e04b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -361,9 +362,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -375,4 +376,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h index 4e3c7adb7..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h index 3294c8281..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h index 499b11976..f190fee2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c index 2a8bfbc0d..27e022d9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -174,9 +173,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -663,4 +661,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c index cc77d87dc..b5efb11f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,4 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_hal_msp.c index 45f221e40..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c index 277c528ea..70d9636e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -409,4 +408,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/Thread_Coap_Generic.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/Thread_Coap_Generic.ewp index 48c07130e..11926dfd9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/Thread_Coap_Generic.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/Thread_Coap_Generic.ewp @@ -1115,6 +1115,12 @@ STM32WBxx_HAL_Driver + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c @@ -1169,18 +1175,15 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c - - - $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c - Middlewares STM32_WPAN + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1208,9 +1211,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c index ccbdbe267..cf8f269d0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -774,6 +773,7 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -785,6 +785,7 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + } /** @@ -1129,4 +1130,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h index 7f95a252b..02c30b58b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -126,5 +125,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Thread_Coap_Generic.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Thread_Coap_Generic.ioc index d82faa315..1ddf1b17b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Thread_Coap_Generic.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/Thread_Coap_Generic.ioc @@ -82,8 +82,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -152,6 +152,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Thread_Coap_Generic +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -268,5 +270,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Thread_Coap_Generic -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/readme.txt index 231114840..3e333838d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic/readme.txt @@ -8,12 +8,12 @@ * @brief Description of Coap Generic Application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_common.h index c3499322e..c4faddbb8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_common.h @@ -1,17 +1,16 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,4 +113,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_conf.h index 20648bce6..9d417bd74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -337,7 +336,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -367,4 +366,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_conf.h index 71290de64..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/main.h index 68182bc5a..e224de7a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_hal_conf.h index 7f1537260..bc169a6e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_it.h index fd0e7d1bc..26a07fa6b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm_logging.h index 187649d1d..e8e8ac6ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/app_entry.c index dc51eea1c..108d85b03 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -466,4 +465,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/main.c index 433eb08f3..049c99f96 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -620,5 +620,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_hal_msp.c index 9c338486d..d211eac2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_it.c index b0026e595..7b3baf779 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -379,4 +378,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm_logging.c index a4b8b375a..1bd7bcb80 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/system_stm32wbxx.c index da850965c..80b59155f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -348,5 +349,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf index 92d78fb04..0a27b9c02 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf @@ -33,12 +33,12 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; keep { section TAG_OTA_START}; keep { section TAG_OTA_END }; place in OTA_TAG_region { section TAG_OTA_START }; place in ROM_region { readonly, last section TAG_OTA_END }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s index fa73d9738..883e488f7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,13 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2018 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +83,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -370,4 +369,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index c0a4d3140..04c412290 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -158,7 +142,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.c index 543231d84..554582531 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -63,7 +62,7 @@ PLACE_IN_SECTION("TAG_OTA_START") const uint32_t MagicKeywordAddress = (uint32_t #define C_RESSOURCE "light" -/* Following CoAP ressource is requested to reboot on Thread_Ota application */ +/* Following CoAP resource is requested to reboot on Thread_Ota application */ #define C_RESSOURCE_FUOTA_REBOOT "FUOTA_REBOOT" #define COAP_PAYLOAD_LENGTH 2 @@ -455,7 +454,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1173,7 +1172,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1201,4 +1200,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.h index 7f95a252b..2c515c2bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -127,4 +126,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/readme.txt index a3000c944..5c2c42b78 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Generic_Ota/readme.txt @@ -8,19 +8,19 @@ * @brief Description of Coap Generic Application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to build Thread application based on Coap messages. +How to build Thread application based on Coap messages (OTA mode). This application requires two STM32WB55xx boards. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_conf.h index 84bf5c5a1..b3223bc6a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -367,9 +368,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -381,4 +382,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_entry.h index 4e3c7adb7..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_conf.h index 3294c8281..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_it.h index 7f2705fac..a27e93745 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ void EXTI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/app_entry.c index b1919fb55..ea4294de0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -174,9 +173,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -670,4 +668,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/main.c index cc77d87dc..b5efb11f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,4 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_hal_msp.c index 45f221e40..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_it.c index 30a4095d0..61ba1b3b3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -418,4 +417,4 @@ void EXTI1_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW3_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/Thread_Coap_MultiBoard.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/Thread_Coap_MultiBoard.ewp index 213a8f6cd..0e43eaa63 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/Thread_Coap_MultiBoard.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/Thread_Coap_MultiBoard.ewp @@ -1186,6 +1186,12 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_ll_usb.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c @@ -1240,12 +1246,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c -                                                                   @@ -1420,6 +1420,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1447,9 +1450,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Core/User/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 4bcf1e5a4..91051b4be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,7 +82,7 @@ LoopFillZerobss: cmp r2, r4 bcc FillZerobss -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -424,4 +423,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5a50c0714..1cdba029b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 Ac6

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of Ac6 nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.c index 3ce3538a7..a077f47df 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -859,6 +858,7 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -870,6 +870,7 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + } /** @@ -1214,4 +1215,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.h index acd067ef8..ccc63ce62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -131,5 +130,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Thread_Coap_Multiboard.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Thread_Coap_Multiboard.ioc index 0fc813b9e..213733e3b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Thread_Coap_Multiboard.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/Thread_Coap_Multiboard.ioc @@ -82,8 +82,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -152,6 +152,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Thread_Coap_Multiboard +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -268,5 +270,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Thread_Coap_Multiboard -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/readme.txt index de92bb700..c7ea9c624 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_MultiBoard/readme.txt @@ -9,13 +9,12 @@ ******************************************************************************* * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_conf.h index dbfb1c245..36b4aee43 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,7 +104,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -339,7 +339,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -359,4 +359,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_conf.h index 278c34a32..baf4e006a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -270,4 +269,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/main.h index 68182bc5a..e224de7a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_hal_conf.h index 8535755d8..c930e2bc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_it.h index 007570152..2c0f46c5b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/utilities_conf.h index 92a5d07a3..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/app_entry.c index 813000311..756ee5842 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -456,4 +455,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/main.c index bc26f37d2..512f2e470 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -616,5 +616,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_hal_msp.c index 20ff7a299..01808348e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -333,4 +332,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_it.c index 60caa009c..369165b57 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -380,4 +379,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..a90777127 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 4bcf1e5a4..91051b4be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,7 +82,7 @@ LoopFillZerobss: cmp r2, r4 bcc FillZerobss -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -424,4 +423,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.c index 5ed7112cf..0e6cc4826 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -489,7 +488,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1425,7 +1424,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1453,4 +1452,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.h index 2ffdc05ec..a4999a529 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -133,4 +132,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/Target/hw_ipcc.c index 451ae9311..8867aef4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,10 +129,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -520,4 +516,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/readme.txt index 80c20c602..191022e71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Coap_Secure/readme.txt @@ -8,12 +8,12 @@ * @brief Description of Coap Generic Application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_conf.h index c41dbc4ec..131bc4c6a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -363,9 +364,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -377,4 +378,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_entry.h index 4e3c7adb7..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_conf.h index 3294c8281..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_it.h index 7f2705fac..a27e93745 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ void EXTI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/app_entry.c index 02b9201bc..ad693dff9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -174,9 +173,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -667,4 +665,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/main.c index cc77d87dc..b5efb11f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,4 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_hal_msp.c index 45f221e40..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_it.c index 30a4095d0..61ba1b3b3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -418,4 +417,4 @@ void EXTI1_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW3_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/Thread_Commissioning.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/Thread_Commissioning.ewp index d9cd784c9..946e59dfa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/Thread_Commissioning.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/Thread_Commissioning.ewp @@ -1186,6 +1186,12 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_ll_usb.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c @@ -1240,12 +1246,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - @@ -1420,6 +1420,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1447,9 +1450,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Core/User/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.c index 2b69cd2e3..baa94030b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/app_thread.c - * Description : Thread Application. - ****************************************************************************** + * File Name : App/app_thread.c + * Description : Thread Application. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -642,6 +641,7 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -653,6 +653,7 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + } /** @@ -997,4 +998,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.h index d0462d3ab..53496cfac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -110,5 +109,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Thread_Commissioning.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Thread_Commissioning.ioc index dc6c0b483..af5be84b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Thread_Commissioning.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/Thread_Commissioning.ioc @@ -82,8 +82,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -152,6 +152,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Thread_Commissioning +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -268,5 +270,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Thread_Commissioning -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/readme.txt index 85dbabe32..1bf11e2f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Commissioning/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread Commissioning application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h index d8d945fa3..e8a58ebd8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -374,9 +375,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -388,4 +389,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h index 4e3c7adb7..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h index 6cefe665f..66f39b187 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -254,5 +253,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h index 499b11976..f190fee2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c index c533f49b3..e33bb68fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -180,9 +179,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -701,4 +699,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c index cc77d87dc..b5efb11f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,4 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c index 72e52147b..19292b68c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -322,6 +341,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -336,6 +356,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -380,4 +409,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c index 277c528ea..70d9636e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -409,4 +408,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/Thread_FTD_Coap_Multicast.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/Thread_FTD_Coap_Multicast.ewp index bd9407cc1..b254565be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/Thread_FTD_Coap_Multicast.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/Thread_FTD_Coap_Multicast.ewp @@ -1137,6 +1137,12 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pcd_ex.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c @@ -1191,12 +1197,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - @@ -1371,6 +1371,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1398,9 +1401,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c index 356afaf32..6d7a34969 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -655,6 +654,7 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -666,6 +666,7 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + } /** @@ -1010,4 +1011,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h index b5e5a0fb3..54bf28054 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -122,5 +121,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Thread_FTD_Coap_Multicast.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Thread_FTD_Coap_Multicast.ioc index e2cf386a4..0059b66a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Thread_FTD_Coap_Multicast.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/Thread_FTD_Coap_Multicast.ioc @@ -81,8 +81,8 @@ Mcu.PinsNb=19 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -149,6 +149,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Thread_FTD_Coap_Multicast +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -265,5 +267,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Thread_FTD_Coap_Multicast -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt index efe80873b..857825921 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt @@ -9,12 +9,12 @@ * application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_common.h index c3499322e..c4faddbb8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_common.h @@ -1,17 +1,16 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,4 +113,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_conf.h index bc909731d..0a13133b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -335,7 +334,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -372,4 +371,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_conf.h index 71290de64..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/main.h index 68182bc5a..e224de7a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_hal_conf.h index 7f1537260..bc169a6e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_it.h index fd0e7d1bc..26a07fa6b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm_logging.h index 187649d1d..e8e8ac6ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/app_entry.c index ff82c53a7..6493780fa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -576,4 +575,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/main.c index 433eb08f3..049c99f96 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -620,5 +620,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_hal_msp.c index 9c338486d..d211eac2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_it.c index b0026e595..7b3baf779 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -379,4 +378,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm_logging.c index a4b8b375a..1bd7bcb80 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/system_stm32wbxx.c index 2fe1b955d..af3a608a9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ typedef void (*fct_t)(void); const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -546,5 +547,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index f27c7aae1..b0e2a439a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.c index eb813feb0..3e56c2c7b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -461,7 +460,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -589,7 +588,7 @@ static void APP_THREAD_CoapReqHandlerFuotaProvisioning( otMessage * pMessage, const otMessageInfo * pMessageInfo) { - APP_DBG(" Received CoAP request on FUOTA_PROVISIONING ressource"); + APP_DBG(" Received CoAP request on FUOTA_PROVISIONING resource"); if (otCoapMessageGetType(pMessage) == OT_COAP_TYPE_CONFIRMABLE) { @@ -613,7 +612,7 @@ static otError APP_THREAD_ProvisioningRespSend(otMessage * pMessage, otError error = OT_ERROR_NONE; do{ - APP_DBG("Provisiong: Send CoAP response"); + APP_DBG("Provisioning: Send CoAP response"); pOT_MessageResponse = otCoapNewMessage(NULL, NULL); if (pOT_MessageResponse == NULL) @@ -1327,7 +1326,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1355,4 +1354,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.h index 3f8f60a78..c013593a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -152,4 +151,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/readme.txt index 22c9d81bd..b6b6a0f84 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota/readme.txt @@ -8,19 +8,19 @@ * @brief Description of Thread Ota Application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread. +How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread (Client side). This application requires two STM32WB55xx boards. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_common.h index c3499322e..c4faddbb8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_common.h @@ -1,17 +1,16 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,4 +113,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_conf.h index 37cc15fd6..504345d73 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -349,7 +348,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -385,4 +384,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_conf.h index 71290de64..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/main.h index 68182bc5a..e224de7a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_hal_conf.h index 7f1537260..bc169a6e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_it.h index e80726d02..d259bf7b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm_logging.h index 187649d1d..e8e8ac6ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/app_entry.c index c69ad105d..1aa16fffe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -465,4 +464,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/main.c index 433eb08f3..049c99f96 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -620,5 +620,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_hal_msp.c index 9c338486d..d211eac2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_it.c index 150f4e248..673b60ec0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -400,4 +399,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm_logging.c index a4b8b375a..1bd7bcb80 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index f27c7aae1..b0e2a439a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.c index 0b1449fdb..3dc67b1d4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -63,7 +62,7 @@ typedef enum #define C_RESSOURCE_FUOTA_PARAMETERS "FUOTA_PARAMETERS" #define C_RESSOURCE_FUOTA_SEND "FUOTA_SEND" -/* Following CoAP ressource is requested to reboot on Thread_Ota application */ +/* Following CoAP resource is requested to reboot on Thread_Ota application */ #define C_RESSOURCE_FUOTA_REBOOT "FUOTA_REBOOT" /* Keyword found at the end of Thread Ota compatible application binaries */ @@ -478,7 +477,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -643,7 +642,7 @@ static void APP_THREAD_ProvisioningRespHandler( { APP_THREAD_Error(ERR_THREAD_MESSAGE_READ, 0); } - APP_DBG("\r -> Succesfully retrieved Remote device address \n"); + APP_DBG("\r -> Successfully retrieved Remote device address \n"); /* Notify provisioning OK */ UTIL_SEQ_SetTask(TASK_FUOTA_PARAMETERS, CFG_SCH_PRIO_1); @@ -1460,7 +1459,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1488,4 +1487,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.h index c08272e6a..301d8c5ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -150,4 +149,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/readme.txt index e482ac52f..adeff9abe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Ota_Server/readme.txt @@ -8,19 +8,19 @@ * @brief Description of Thread Ota Server Application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread. +How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread (Server side). This application requires two STM32WB55xx boards. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_conf.h index d793810ee..27d0d727b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -376,4 +376,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_conf.h index 6cefe665f..4ca3bbb1b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -255,4 +254,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_it.h index 007570152..2c0f46c5b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm_logging.h index 948bfb5c5..cdd22fb5f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -31,7 +30,7 @@ { \ if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ { \ - printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ + printf("[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ } \ logApplication(level, region, __VA_ARGS__); \ } @@ -39,7 +38,7 @@ { \ if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ { \ - printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ + printf("[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ } \ logApplication(LOG_LEVEL_NONE, APPLI_LOG_REGION_GENERAL, __VA_ARGS__); \ } diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/utilities_conf.h index 92a5d07a3..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/app_entry.c index 72fb961be..63944ad76 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -452,4 +451,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_timerserver.c index c0af6a14a..3d44a3caf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -892,4 +891,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_uart.c index 6ae6ff9f9..166acccd5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -317,4 +316,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/main.c index a997812a2..86c5d7a8f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -650,5 +650,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_hal_msp.c index 4a1674c66..3d838a044 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -364,4 +363,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_it.c index 378be2ceb..a0bfc98a6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -397,4 +396,3 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm_logging.c index 22ff8adac..ce2ca5a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -200,8 +199,8 @@ void logApplication(appliLogLevel_t aLogLevel, appliLogRegion_t aLogRegion, cons va_start(paramList, aFormat); length += vsnprintf(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), aFormat, paramList); - logString[length++] = '\r'; - logString[length++] = '\n'; + //logString[length++] = '\r'; + //logString[length++] = '\n'; logString[length++] = 0; va_end(paramList); diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..a90777127 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.c index 846afccc8..214318c05 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/app_thread.c - * Description : Thread Application. - ****************************************************************************** + * File Name : App/app_thread.c + * Description : Thread Application. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -99,10 +98,13 @@ static uint8_t VcpTxBuffer[sizeof(TL_EvtPacket_t) + 254U]; /* Transmit buffer ov static uint8_t aRxBuffer[C_SIZE_CMD_STRING]; #define HDLC_MAX_RECEIVED_FRAME_LENGTH 128 #define HDLC_MAX_APPENDED_FRAME_NUMBER 8 +#define HDLC_FRAMING_CHECK 0 /* Set to 1 to enable M4 HDLC Framing check before sending it over uart */ +#if HDLC_FRAMING_CHECK static uint8_t HdlcAppendBuffer[HDLC_MAX_RECEIVED_FRAME_LENGTH * HDLC_MAX_APPENDED_FRAME_NUMBER]; uint16_t HdlcAppendBufferLength = 0; static bool HdlcFrameReadyToBeSent = TRUE; static uint8_t HdlcFrameCounter = 0; +#endif bool hdlc_Flag = FALSE; #endif /* (CFG_FULL_LOW_POWER == 0) */ #endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ @@ -761,7 +763,7 @@ void RCP_PacketFromM0_Processing() { switch (p_RCPPacket->RCP_packetPayload[0]) { case 'R' : APP_DBG("[M4 SPINEL] : Received a Reset Command from M0..."); - /* Perform an NVIC Reset in order to reinitalize the device */ + /* Perform an NVIC Reset in order to reinitialize the device */ HAL_NVIC_SystemReset(); break; default: @@ -770,6 +772,11 @@ void RCP_PacketFromM0_Processing() { } } +#if !HDLC_FRAMING_CHECK + // Just send received buffer on UART without checking HDLC framing + HW_UART_Transmit_IT(CFG_CLI_UART, p_RCPPacket->RCP_packetPayload, p_RCPPacket->RCP_packetLength, TL_THREAD_SendAck); + APP_DBG("<-M4(%d)\n\r", p_RCPPacket->RCP_packetLength); +#else // First copy received HDLC frame at its right place if (HdlcFrameCounter < HDLC_MAX_APPENDED_FRAME_NUMBER) { @@ -777,7 +784,7 @@ void RCP_PacketFromM0_Processing() { HdlcAppendBufferLength += p_RCPPacket->RCP_packetLength; if (p_RCPPacket->RCP_packetLength == 128) { - // In that case, wether we have a well formated HDLC frame of 128 bytes, so ending with a 0x7E, + // In that case, whether we have a well formatted HDLC frame of 128 bytes, so ending with a 0x7E, // or we are in the middle os a HDLC frame and we need to append it with the coming buffer... // buffer is coming... if (p_RCPPacket->RCP_packetPayload[127] == 0x7E) { @@ -789,7 +796,7 @@ void RCP_PacketFromM0_Processing() { // Need to append to save part of HDLC frame into a buffer HdlcFrameCounter++; HdlcFrameReadyToBeSent = FALSE; - APP_DBG("%d-M4(%03d)", HdlcFrameCounter, HdlcAppendBufferLength); + APP_DBG("%d-M4 ", HdlcFrameCounter); } } else { @@ -799,10 +806,13 @@ void RCP_PacketFromM0_Processing() { // Send to LPUART if (HdlcAppendBufferLength && HdlcFrameReadyToBeSent) { - APP_DBG("<-M4(%03d)", HdlcAppendBufferLength); - HW_UART_Transmit_IT(CFG_CLI_UART, HdlcAppendBuffer, HdlcAppendBufferLength, HostTxCb); - HdlcFrameCounter = 0; - HdlcAppendBufferLength = 0; + APP_DBG("<-M4\n\r"); + HW_UART_Transmit_IT(CFG_CLI_UART, HdlcAppendBuffer, HdlcAppendBufferLength, /*HostTxCb*/TL_THREAD_SendAck); + HdlcFrameCounter = 0; + HdlcAppendBufferLength = 0; + } else { + // bytes copied into HdlcAppendBuffer, ready to receive more... + TL_THREAD_SendAck(); } } else { @@ -811,7 +821,8 @@ void RCP_PacketFromM0_Processing() { HdlcAppendBufferLength = 0; HdlcFrameReadyToBeSent = TRUE; } - TL_THREAD_SendAck(); +#endif + } #if (CFG_USB_INTERFACE_ENABLE != 0) @@ -858,4 +869,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.h index 57a68af2a..1cbc1cab7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -103,4 +102,3 @@ void RCP_PacketFromM0_Processing(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/Target/hw_ipcc.c index afa62b179..85606fda2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/readme.txt index bd077110c..d303ed403 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP/readme.txt @@ -8,25 +8,25 @@ * @brief Description of the Thread RCP application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description - This application is used to demonstrate the OpenThread Border router feature using an STM32WB device. -To play with the demo, you need a Raspberry Pi 3B (RPi) to perform the link with Wi-Fi/Ethernet networks -The full setup and the associated documentations can be requested to ST on demand - +To play with the demo, you need a Raspberry Pi 3B (RPi) to perform the link with Ethernet network. +The full setup and the associated documentations can be requested to ST on demand. +@par Keywords +THREAD, RCP *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  */ \ No newline at end of file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_common.h new file mode 100644 index 000000000..7197b3388 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_common.h @@ -0,0 +1,117 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_common.h + * Description : App Common application configuration file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_COMMON_H +#define APP_COMMON_H + +#ifdef __cplusplus +extern "C"{ +#endif + +#include +#include +#include +#include +#include + +#include "app_conf.h" + + /* -------------------------------- * + * Basic definitions * + * -------------------------------- */ + +#undef NULL +#define NULL 0 + +#undef FALSE +#define FALSE 0 + +#undef TRUE +#define TRUE (!0) + + /* -------------------------------- * + * Critical Section definition * + * -------------------------------- */ +#define BACKUP_PRIMASK() uint32_t primask_bit= __get_PRIMASK() +#define DISABLE_IRQ() __disable_irq() +#define RESTORE_PRIMASK() __set_PRIMASK(primask_bit) + + /* -------------------------------- * + * Macro delimiters * + * -------------------------------- */ + +#define M_BEGIN do { + +#define M_END } while(0) + + /* -------------------------------- * + * Some useful macro definitions * + * -------------------------------- */ + +#ifndef MAX +#define MAX( x, y ) (((x)>(y))?(x):(y)) +#endif + +#ifndef MIN +#define MIN( x, y ) (((x)<(y))?(x):(y)) +#endif + +#define MODINC( a, m ) M_BEGIN (a)++; if ((a)>=(m)) (a)=0; M_END + +#define MODDEC( a, m ) M_BEGIN if ((a)==0) (a)=(m); (a)--; M_END + +#define MODADD( a, b, m ) M_BEGIN (a)+=(b); if ((a)>=(m)) (a)-=(m); M_END + +#define MODSUB( a, b, m ) MODADD( a, (m)-(b), m ) + +#define PAUSE( t ) M_BEGIN \ + __IO int _i; \ + for ( _i = t; _i > 0; _i -- ); \ + M_END + +#define DIVF( x, y ) ((x)/(y)) + +#define DIVC( x, y ) (((x)+(y)-1)/(y)) + +#define DIVR( x, y ) (((x)+((y)/2))/(y)) + +#define SHRR( x, n ) ((((x)>>((n)-1))+1)>>1) + +#define BITN( w, n ) (((w)[(n)/32] >> ((n)%32)) & 1) + +#define BITNSET( w, n, b ) M_BEGIN (w)[(n)/32] |= ((U32)(b))<<((n)%32); M_END + + /* -------------------------------- * + * Compiler * + * -------------------------------- */ +#define PLACE_IN_SECTION( __x__ ) __attribute__((section (__x__))) + +#ifdef WIN32 +#define ALIGN(n) +#else +#define ALIGN(n) __attribute__((aligned(n))) +#endif + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_COMMON_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_conf.h new file mode 100644 index 000000000..b97b155a7 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_conf.h @@ -0,0 +1,379 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_conf.h + * Description : Application configuration file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_CONF_H +#define APP_CONF_H + +#include "hw.h" +#include "hw_conf.h" +#include "hw_if.h" + +/****************************************************************************** + * Application Config + ******************************************************************************/ +/****************************************************************************** + * Transport Layer + ******************************************************************************/ +/** + * Queue length of BLE Event + * This parameter defines the number of asynchronous events that can be stored in the HCI layer before + * being reported to the application. When a command is sent to the BLE core coprocessor, the HCI layer + * is waiting for the event with the Num_HCI_Command_Packets set to 1. The receive queue shall be large + * enough to store all asynchronous events received in between. + * When CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE is set to 27, this allow to store three 255 bytes long asynchronous events + * between the HCI command and its event. + * This parameter depends on the value given to CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE. When the queue size is to small, + * the system may hang if the queue is full with asynchronous events and the HCI layer is still waiting + * for a CC/CS event, In that case, the notification TL_BLE_HCI_ToNot() is called to indicate + * to the application a HCI command did not receive its command event within 30s (Default HCI Timeout). + */ +#define CFG_TL_EVT_QUEUE_LENGTH 5 +/** + * This parameter should be set to fit most events received by the HCI layer. It defines the buffer size of each element + * allocated in the queue of received events and can be used to optimize the amount of RAM allocated by the Memory Manager. + * It should not exceed 255 which is the maximum HCI packet payload size (a greater value is a lost of memory as it will + * never be used) + * It shall be at least 4 to receive the command status event in one frame. + * The default value is set to 27 to allow receiving an event of MTU size in a single buffer. This value maybe reduced + * further depending on the application. + */ +#define CFG_TL_MOST_EVENT_PAYLOAD_SIZE 255 /**< Set to 255 with the memory manager and the mailbox */ + +#define TL_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TL_MOST_EVENT_PAYLOAD_SIZE ) +/****************************************************************************** + * UART interfaces + ******************************************************************************/ + +/** + * Select UART interfaces + */ +#define CFG_DEBUG_TRACE_UART hw_lpuart1 +#define CFG_CONSOLE_MENU +#define CFG_CLI_UART hw_uart1 +/****************************************************************************** + * USB interface + ******************************************************************************/ + +/** + * Enable/Disable USB interface + */ +#define CFG_USB_INTERFACE_ENABLE 0 + +/****************************************************************************** + * IPCC interface + ******************************************************************************/ + +/** + * The IPCC is dedicated to the communication between the CPU2 and the CPU1 + * and shall not be modified by the application + * The two following definitions shall not be modified + */ +#define HAL_IPCC_TX_IRQHandler(...) HW_IPCC_Tx_Handler( ) +#define HAL_IPCC_RX_IRQHandler(...) HW_IPCC_Rx_Handler( ) + +/****************************************************************************** + * Low Power + * + * When CFG_FULL_LOW_POWER is set to 1, the system is configured in full + * low power mode. It means that all what can have an impact on the consumptions + * are powered down.(For instance LED, Access to Debugger, Etc.) + * + * When CFG_FULL_LOW_POWER is set to 0, the low power mode is not activated + * + ******************************************************************************/ + +#define CFG_FULL_LOW_POWER 0 + +#if (CFG_FULL_LOW_POWER == 1) +#undef CFG_LPM_SUPPORTED +#define CFG_LPM_SUPPORTED 1 +#endif /* CFG_FULL_LOW_POWER */ +/****************************************************************************** + * RTC interface + ******************************************************************************/ +#define HAL_RTCEx_WakeUpTimerIRQHandler(...) HW_TS_RTC_Wakeup_Handler( ) + +/****************************************************************************** + * Timer Server + ******************************************************************************/ +/** + * CFG_RTC_WUCKSEL_DIVIDER: This sets the RTCCLK divider to the wakeup timer. + * The lower is the value, the better is the power consumption and the accuracy of the timerserver + * The higher is the value, the finest is the granularity + * + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output + * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding + * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. + * + * CFG_RTC_SYNCH_PRESCALER: This sets the synchronous prescaler of the RTC. + * When the 1Hz calendar clock is required, it shall be sets according to other settings + * When the 1Hz calendar clock is not needed, CFG_RTC_SYNCH_PRESCALER should be set to 0x7FFF (MAX VALUE) + * + * CFG_RTCCLK_DIVIDER_CONF: + * Shall be set to either 0,2,4,8,16 + * When set to either 2,4,8,16, the 1Hhz calendar is supported + * When set to 0, the user sets its own configuration + * + * The following settings are computed with LSI as input to the RTC + */ + +#define CFG_RTCCLK_DIVIDER_CONF 0 + +#if (CFG_RTCCLK_DIVIDER_CONF == 0) +/** + * Custom configuration + * It does not support 1Hz calendar + * It divides the RTC CLK by 16 + */ + +#define CFG_RTCCLK_DIV (16) +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#define CFG_RTC_ASYNCH_PRESCALER (0x0F) +#define CFG_RTC_SYNCH_PRESCALER (0x7FFF) + +#else + +#if (CFG_RTCCLK_DIVIDER_CONF == 2) +/** + * It divides the RTC CLK by 2 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (3) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 4) +/** + * It divides the RTC CLK by 4 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (2) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 8) +/** + * It divides the RTC CLK by 8 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (1) +#endif + +#if (CFG_RTCCLK_DIVIDER_CONF == 16) +/** + * It divides the RTC CLK by 16 + */ +#define CFG_RTC_WUCKSEL_DIVIDER (0) +#endif + +#define CFG_RTCCLK_DIV CFG_RTCCLK_DIVIDER_CONF +#define CFG_RTC_ASYNCH_PRESCALER (CFG_RTCCLK_DIV - 1) +#define CFG_RTC_SYNCH_PRESCALER (DIVR( LSE_VALUE, (CFG_RTC_ASYNCH_PRESCALER+1) ) - 1 ) + +#endif + +/** tick timer value in us */ +#define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) + +typedef enum +{ + CFG_TIM_PROC_ID_ISR, + /* USER CODE BEGIN CFG_TimProcID_t */ + + /* USER CODE END CFG_TimProcID_t */ +} CFG_TimProcID_t; + +/****************************************************************************** + * Debug + ******************************************************************************/ +/** + * When set, this resets some hw resources to set the device in the same state than the power up + * The FW resets only register that may prevent the FW to run properly + * + * This shall be set to 0 in a final product + * + */ +#define CFG_HW_RESET_BY_FW 1 + +/** + * keep debugger enabled while in any low power mode when set to 1 + * should be set to 0 in production + */ +#define CFG_DEBUGGER_SUPPORTED 1 + +#if (CFG_FULL_LOW_POWER == 1) +#undef CFG_DEBUGGER_SUPPORTED +#define CFG_DEBUGGER_SUPPORTED 0 +#endif /* CFG_FULL_LOW_POWER */ + +/***************************************************************************** + * Traces + * Enable or Disable traces in application + * When CFG_DEBUG_TRACE is set, traces are activated + * + * Note : Refer to utilities_conf.h file in order to details + * the level of traces : CFG_DEBUG_TRACE_FULL or CFG_DEBUG_TRACE_LIGHT + *****************************************************************************/ +#define CFG_DEBUG_TRACE 1 + +#if (CFG_FULL_LOW_POWER == 1) +#undef CFG_DEBUG_TRACE +#define CFG_DEBUG_TRACE 0 +#endif /* CFG_FULL_LOW_POWER */ + +/** + * When CFG_DEBUG_TRACE_FULL is set to 1, the trace are output with the API name, the file name and the line number + * When CFG_DEBUG_TRACE_LIGHT is set to 1, only the debug message is output + * + * When both are set to 0, no trace are output + * When both are set to 1, CFG_DEBUG_TRACE_FULL is selected + */ +#define CFG_DEBUG_TRACE_LIGHT 1 +#define CFG_DEBUG_TRACE_FULL 0 + +#if (( CFG_DEBUG_TRACE != 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 ) && (CFG_DEBUG_TRACE_FULL == 0)) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 1 +#endif + +#if ( CFG_DEBUG_TRACE == 0 ) +#undef CFG_DEBUG_TRACE_FULL +#undef CFG_DEBUG_TRACE_LIGHT +#define CFG_DEBUG_TRACE_FULL 0 +#define CFG_DEBUG_TRACE_LIGHT 0 +#endif + +/** + * When not set, the traces is looping on sending the trace over UART + */ +#define DBG_TRACE_USE_CIRCULAR_QUEUE 1 + +/** + * max buffer Size to queue data traces and max data trace allowed. + * Only Used if DBG_TRACE_USE_CIRCULAR_QUEUE is defined + */ +#define DBG_TRACE_MSG_QUEUE_SIZE 4096 +#define MAX_DBG_TRACE_MSG_SIZE 1024 + +/****************************************************************************** + * Configure Log level for Application + ******************************************************************************/ +#define APPLI_CONFIG_LOG_LEVEL LOG_LEVEL_INFO +#define APPLI_PRINT_FILE_FUNC_LINE 0 + +/* USER CODE BEGIN Defines */ +/****************************************************************************** + * User interaction + * When CFG_LED_SUPPORTED is set, LEDS are activated if requested + * When CFG_BUTTON_SUPPORTED is set, the push button are activated if requested + ******************************************************************************/ +#if (CFG_FULL_LOW_POWER == 1) +#define CFG_LED_SUPPORTED 0 +#define CFG_BUTTON_SUPPORTED 0 +#else +#define CFG_LED_SUPPORTED 1 +#define CFG_BUTTON_SUPPORTED 1 +#endif /* CFG_FULL_LOW_POWER */ +/* USER CODE END Defines */ + +/****************************************************************************** + * Scheduler + ******************************************************************************/ + /** + * This is the list of task id required by the application + * Each Id shall be in the range 0..31 + */ + +typedef enum +{ + CFG_TASK_MSG_FROM_M0_TO_M4, + CFG_TASK_SEND_CLI_TO_M0, + CFG_TASK_SYSTEM_HCI_ASYNCH_EVT, +#if (CFG_USB_INTERFACE_ENABLE != 0) + CFG_TASK_VCP_SEND_DATA, +#endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ + /* USER CODE BEGIN CFG_IdleTask_Id_t */ + CFG_TASK_JOIN_BUTTON, + /* USER CODE END CFG_IdleTask_Id_t */ + CFG_TASK_NBR /**< Shall be last in the list */ +} CFG_IdleTask_Id_t; + +/* Scheduler types and defines */ +/*------------------------------------*/ +#define TASK_MSG_FROM_M0_TO_M4 (1U << CFG_TASK_MSG_FROM_M0_TO_M4) + +/* USER CODE BEGIN DEFINE_TASK */ +#define TASK_JOIN_BUTTON (1U << CFG_TASK_JOIN_BUTTON) +/* USER CODE END DEFINE_TASK */ + +/** + * This is the list of priority required by the application + * Each Id shall be in the range 0..31 + */ +typedef enum +{ + CFG_SCH_PRIO_0, + CFG_SCH_PRIO_1, + CFG_PRIO_NBR, +} CFG_SCH_Prio_Id_t; + + /** + * This is a bit mapping over 32bits listing all events id supported in the application + */ +typedef enum +{ + CFG_EVT_SYSTEM_HCI_CMD_EVT_RESP, + CFG_EVT_ACK_FROM_M0_EVT, + CFG_EVT_SYNCHRO_BYPASS_IDLE, + /* USER CODE BEGIN CFG_IdleEvt_Id_t */ + + /* USER CODE END CFG_IdleEvt_Id_t */ +} CFG_IdleEvt_Id_t; + +#define EVENT_ACK_FROM_M0_EVT (1U << CFG_EVT_ACK_FROM_M0_EVT) +#define EVENT_SYNCHRO_BYPASS_IDLE (1U << CFG_EVT_SYNCHRO_BYPASS_IDLE) +/* USER CODE BEGIN DEFINE_EVENT */ + +/* USER CODE END DEFINE_EVENT */ + +/****************************************************************************** + * LOW POWER + ******************************************************************************/ +/** + * Supported requester to the MCU Low Power Manager - can be increased up to 32 + * It list a bit mapping of all user of the Low Power Manager + */ +typedef enum +{ + CFG_LPM_APP, + CFG_LPM_APP_THREAD, + /* USER CODE BEGIN CFG_LPM_Id_t */ + + /* USER CODE END CFG_LPM_Id_t */ +} CFG_LPM_Id_t; + + +/****************************************************************************** + * OTP manager + ******************************************************************************/ +#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE + +#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR + +#endif /*APP_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_entry.h new file mode 100644 index 000000000..aeb4dcc27 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_entry.h @@ -0,0 +1,71 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_entry.h + * Description : App entry configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_ENTRY_H +#define APP_ENTRY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ---------------------------------------------*/ + void MX_APPE_Config( void ); + void MX_APPE_Init( void ); + void MX_APPE_Process( void ); + void Init_Exti( void ); + void Init_Smps( void ); + +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*APP_ENTRY_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_conf.h new file mode 100644 index 000000000..4ca3bbb1b --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_conf.h @@ -0,0 +1,256 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : hw_conf.h + * Description : Hardware configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_CONF_H +#define HW_CONF_H + +/****************************************************************************** + * Semaphores + * THIS SHALL NO BE CHANGED AS THESE SEMAPHORES ARE USED AS WELL ON THE CM0+ + *****************************************************************************/ +/** +* The CPU2 may be configured to store the Thread persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_THREAD_NVM_SRAM_SEMID semaphore +* CFG_HW_THREAD_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_THREAD_NVM_SRAM_SEMID 9 + +/** +* The CPU2 may be configured to store the BLE persistent data either in internal NVM storage on CPU2 or in +* SRAM2 buffer provided by the user application. This can be configured with the system command SHCI_C2_Config() +* When the CPU2 is requested to store persistent data in SRAM2, it can write data in this buffer at any time when needed. +* In order to read consistent data with the CPU1 from the SRAM2 buffer, the flow should be: +* + CPU1 takes CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* + CPU1 reads all persistent data from SRAM2 (most of the time, the goal is to write these data into an NVM managed by CPU1) +* + CPU1 releases CFG_HW_BLE_NVM_SRAM_SEMID semaphore +* CFG_HW_BLE_NVM_SRAM_SEMID semaphore makes sure CPU2 does not update the persistent data in SRAM2 at the same time CPU1 is reading them. +* There is no timing constraint on how long this semaphore can be kept. +*/ +#define CFG_HW_BLE_NVM_SRAM_SEMID 8 + +/** +* Index of the semaphore used by CPU2 to prevent the CPU1 to either write or erase data in flash +* The CPU1 shall not either write or erase in flash when this semaphore is taken by the CPU2 +* When the CPU1 needs to either write or erase in flash, it shall first get the semaphore and release it just +* after writing a raw (64bits data) or erasing one sector. +* Once the Semaphore has been released, there shall be at least 1us before it can be taken again. This is required +* to give the opportunity to CPU2 to take it. +* On v1.4.0 and older CPU2 wireless firmware, this semaphore is unused and CPU2 is using PES bit. +* By default, CPU2 is using the PES bit to protect its timing. The CPU1 may request the CPU2 to use the semaphore +* instead of the PES bit by sending the system command SHCI_C2_SetFlashActivityControl() +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU2_SEMID 7 + +/** +* Index of the semaphore used by CPU1 to prevent the CPU2 to either write or erase data in flash +* In order to protect its timing, the CPU1 may get this semaphore to prevent the CPU2 to either +* write or erase in flash (as this will stall both CPUs) +* The PES bit shall not be used as this may stall the CPU2 in some cases. +*/ +#define CFG_HW_BLOCK_FLASH_REQ_BY_CPU1_SEMID 6 + +/** +* Index of the semaphore used to manage the CLK48 clock configuration +* When the USB is required, this semaphore shall be taken before configuring te CLK48 for USB +* and should be released after the application switch OFF the clock when the USB is not used anymore +* When using the RNG, it is good enough to use CFG_HW_RNG_SEMID to control CLK48. +* More details in AN5289 +*/ +#define CFG_HW_CLK48_CONFIG_SEMID 5 + +/* Index of the semaphore used to manage the entry Stop Mode procedure */ +#define CFG_HW_ENTRY_STOP_MODE_SEMID 4 + +/* Index of the semaphore used to access the RCC */ +#define CFG_HW_RCC_SEMID 3 + +/* Index of the semaphore used to access the FLASH */ +#define CFG_HW_FLASH_SEMID 2 + +/* Index of the semaphore used to access the PKA */ +#define CFG_HW_PKA_SEMID 1 + +/* Index of the semaphore used to access the RNG */ +#define CFG_HW_RNG_SEMID 0 + +/****************************************************************************** + * HW TIMER SERVER + *****************************************************************************/ +/** + * The user may define the maximum number of virtual timers supported. + * It shall not exceed 255 + */ +#define CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER 6 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the preemptpriority part of the NVIC. + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO 3 + +/** + * The user may define the priority in the NVIC of the RTC_WKUP interrupt handler that is used to manage the + * wakeup timer. + * This setting is the subpriority part of the NVIC. It does not exist on all processors. When it is not supported + * on the CPU, the setting is ignored + */ +#define CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO 0 + +/** + * Define a critical section in the Timer server + * The Timer server does not support the API to be nested + * The Application shall either: + * a) Ensure this will never happen + * b) Define the critical section + * The default implementations is masking all interrupts using the PRIMASK bit + * The TimerServer driver uses critical sections to avoid context corruption. This is achieved with the macro + * TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION. When CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION is set + * to 1, all STM32 interrupts are masked with the PRIMASK bit of the CortexM CPU. It is possible to use the BASEPRI + * register of the CortexM CPU to keep allowed some interrupts with high priority. In that case, the user shall + * re-implement TIMER_ENTER_CRITICAL_SECTION and TIMER_EXIT_CRITICAL_SECTION and shall make sure that no TimerServer + * API are called when the TIMER critical section is entered + */ +#define CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION 1 + +/** + * This value shall reflect the maximum delay there could be in the application between the time the RTC interrupt + * is generated by the Hardware and the time when the RTC interrupt handler is called. This time is measured in + * number of RTCCLK ticks. + * A relaxed timing would be 10ms + * When the value is too short, the timerserver will not be able to count properly and all timeout may be random. + * When the value is too long, the device may wake up more often than the most optimal configuration. However, the + * impact on power consumption would be marginal (unless the value selected is extremely too long). It is strongly + * recommended to select a value large enough to make sure it is not too short to ensure reliability of the system + * as this will have marginal impact on low power mode + */ +#define CFG_HW_TS_RTC_HANDLER_MAX_DELAY ( 10 * (LSI_VALUE/1000) ) + + /** + * Interrupt ID in the NVIC of the RTC Wakeup interrupt handler + * It shall be type of IRQn_Type + */ +#define CFG_HW_TS_RTC_WAKEUP_HANDLER_ID RTC_WKUP_IRQn + +/****************************************************************************** + * HW UART + *****************************************************************************/ +#define CFG_HW_LPUART1_ENABLED 1 +#define CFG_HW_LPUART1_DMA_TX_SUPPORTED 1 + +#define CFG_HW_USART1_ENABLED 1 +#define CFG_HW_USART1_DMA_TX_SUPPORTED 1 + +/** + * LPUART1 + */ +#define CFG_HW_LPUART1_PREEMPTPRIORITY 0x0F +#define CFG_HW_LPUART1_SUBPRIORITY 0 + +/** < The application shall check the selected source clock is enable */ +#define CFG_HW_LPUART1_SOURCE_CLOCK RCC_LPUART1CLKSOURCE_SYSCLK + +#define CFG_HW_LPUART1_BAUDRATE 115200 +#define CFG_HW_LPUART1_WORDLENGTH UART_WORDLENGTH_8B +#define CFG_HW_LPUART1_STOPBITS UART_STOPBITS_1 +#define CFG_HW_LPUART1_PARITY UART_PARITY_NONE +#define CFG_HW_LPUART1_HWFLOWCTL UART_HWCONTROL_NONE +#define CFG_HW_LPUART1_MODE UART_MODE_TX_RX +#define CFG_HW_LPUART1_ADVFEATUREINIT UART_ADVFEATURE_NO_INIT +#define CFG_HW_LPUART1_OVERSAMPLING UART_OVERSAMPLING_8 + +#define CFG_HW_LPUART1_TX_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE +#define CFG_HW_LPUART1_TX_PORT GPIOA +#define CFG_HW_LPUART1_TX_PIN GPIO_PIN_2 +#define CFG_HW_LPUART1_TX_MODE GPIO_MODE_AF_PP +#define CFG_HW_LPUART1_TX_PULL GPIO_NOPULL +#define CFG_HW_LPUART1_TX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_LPUART1_TX_ALTERNATE GPIO_AF8_LPUART1 + +#define CFG_HW_LPUART1_RX_PORT_CLK_ENABLE __HAL_RCC_GPIOA_CLK_ENABLE +#define CFG_HW_LPUART1_RX_PORT GPIOA +#define CFG_HW_LPUART1_RX_PIN GPIO_PIN_3 +#define CFG_HW_LPUART1_RX_MODE GPIO_MODE_AF_PP +#define CFG_HW_LPUART1_RX_PULL GPIO_NOPULL +#define CFG_HW_LPUART1_RX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_LPUART1_RX_ALTERNATE GPIO_AF8_LPUART1 + +#define CFG_HW_LPUART1_DMA_TX_PREEMPTPRIORITY 0x0F +#define CFG_HW_LPUART1_DMA_TX_SUBPRIORITY 0 + +#define CFG_HW_LPUART1_DMAMUX_CLK_ENABLE __HAL_RCC_DMAMUX1_CLK_ENABLE +#define CFG_HW_LPUART1_DMA_CLK_ENABLE __HAL_RCC_DMA1_CLK_ENABLE +#define CFG_HW_LPUART1_TX_DMA_REQ DMA_REQUEST_LPUART1_TX +#define CFG_HW_LPUART1_TX_DMA_CHANNEL DMA1_Channel1 +#define CFG_HW_LPUART1_TX_DMA_IRQn DMA1_Channel1_IRQn +#define CFG_HW_LPUART1_DMA_TX_IRQHandler DMA1_Channel1_IRQHandler + +/** + * UART1 + */ +#define CFG_HW_USART1_PREEMPTPRIORITY 0x0F +#define CFG_HW_USART1_SUBPRIORITY 0 + +/** < The application shall check the selected source clock is enable */ +#define CFG_HW_USART1_SOURCE_CLOCK RCC_USART1CLKSOURCE_SYSCLK + +#define CFG_HW_USART1_BAUDRATE 115200 +#define CFG_HW_USART1_WORDLENGTH UART_WORDLENGTH_8B +#define CFG_HW_USART1_STOPBITS UART_STOPBITS_1 +#define CFG_HW_USART1_PARITY UART_PARITY_NONE +#define CFG_HW_USART1_HWFLOWCTL UART_HWCONTROL_NONE +#define CFG_HW_USART1_MODE UART_MODE_TX_RX +#define CFG_HW_USART1_ADVFEATUREINIT UART_ADVFEATURE_NO_INIT +#define CFG_HW_USART1_OVERSAMPLING UART_OVERSAMPLING_8 + +#define CFG_HW_USART1_TX_PORT_CLK_ENABLE __HAL_RCC_GPIOB_CLK_ENABLE +#define CFG_HW_USART1_TX_PORT GPIOB +#define CFG_HW_USART1_TX_PIN GPIO_PIN_6 +#define CFG_HW_USART1_TX_MODE GPIO_MODE_AF_PP +#define CFG_HW_USART1_TX_PULL GPIO_NOPULL +#define CFG_HW_USART1_TX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_USART1_TX_ALTERNATE GPIO_AF7_USART1 + +#define CFG_HW_USART1_RX_PORT_CLK_ENABLE __HAL_RCC_GPIOB_CLK_ENABLE +#define CFG_HW_USART1_RX_PORT GPIOB +#define CFG_HW_USART1_RX_PIN GPIO_PIN_7 +#define CFG_HW_USART1_RX_MODE GPIO_MODE_AF_PP +#define CFG_HW_USART1_RX_PULL GPIO_NOPULL +#define CFG_HW_USART1_RX_SPEED GPIO_SPEED_FREQ_VERY_HIGH +#define CFG_HW_USART1_RX_ALTERNATE GPIO_AF7_USART1 + +#define CFG_HW_USART1_DMA_TX_PREEMPTPRIORITY 0x0F +#define CFG_HW_USART1_DMA_TX_SUBPRIORITY 0 + +#define CFG_HW_USART1_DMAMUX_CLK_ENABLE __HAL_RCC_DMAMUX1_CLK_ENABLE +#define CFG_HW_USART1_DMA_CLK_ENABLE __HAL_RCC_DMA1_CLK_ENABLE +#define CFG_HW_USART1_TX_DMA_REQ DMA_REQUEST_USART1_TX +#define CFG_HW_USART1_TX_DMA_CHANNEL DMA1_Channel2 +#define CFG_HW_USART1_TX_DMA_IRQn DMA1_Channel2_IRQn +#define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler + +#endif /*HW_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_if.h new file mode 100644 index 000000000..5dfe0e735 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_if.h @@ -0,0 +1,247 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file hw_if.h + * @author MCD Application Team + * @brief Hardware Interface + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef HW_IF_H +#define HW_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + + /* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx.h" +#include "stm32wbxx_ll_exti.h" +#include "stm32wbxx_ll_system.h" +#include "stm32wbxx_ll_rcc.h" +#include "stm32wbxx_ll_ipcc.h" +#include "stm32wbxx_ll_bus.h" +#include "stm32wbxx_ll_pwr.h" +#include "stm32wbxx_ll_cortex.h" +#include "stm32wbxx_ll_utils.h" +#include "stm32wbxx_ll_hsem.h" +#include "stm32wbxx_ll_gpio.h" +#include "stm32wbxx_ll_rtc.h" + +#ifdef USE_STM32WBXX_USB_DONGLE +#include "stm32wbxx_usb_dongle.h" +#endif +#ifdef USE_STM32WBXX_NUCLEO +#include "stm32wbxx_nucleo.h" +#endif +#ifdef USE_X_NUCLEO_EPD +#include "x_nucleo_epd.h" +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + + /****************************************************************************** + * HW UART + ******************************************************************************/ + typedef enum + { + hw_uart1, + hw_uart2, + hw_lpuart1, + } hw_uart_id_t; + + typedef enum + { + hw_uart_ok, + hw_uart_error, + hw_uart_busy, + hw_uart_to, + } hw_status_t; + + void HW_UART_Init(hw_uart_id_t hw_uart_id); + void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *pData, uint16_t Size, void (*Callback)(void)); + hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout); + hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*Callback)(void)); + void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id); + void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id); + + /****************************************************************************** + * HW TimerServer + ******************************************************************************/ + /* Exported types ------------------------------------------------------------*/ + /** + * This setting is used when standby mode is supported. + * hw_ts_InitMode_Limited should be used when the device restarts from Standby Mode. In that case, the Timer Server does + * not re-initialized its context. Only the Hardware register which content has been lost is reconfigured + * Otherwise, hw_ts_InitMode_Full should be requested (Start from Power ON) and everything is re-initialized. + */ + typedef enum + { + hw_ts_InitMode_Full, + hw_ts_InitMode_Limited, + } HW_TS_InitMode_t; + + /** + * When a Timer is created as a SingleShot timer, it is not automatically restarted when the timeout occurs. However, + * the timer is kept reserved in the list and could be restarted at anytime with HW_TS_Start() + * + * When a Timer is created as a Repeated timer, it is automatically restarted when the timeout occurs. + */ + typedef enum + { + hw_ts_SingleShot, + hw_ts_Repeated + } HW_TS_Mode_t; + + /** + * hw_ts_Successful is returned when a Timer has been successfully created with HW_TS_Create(). Otherwise, hw_ts_Failed + * is returned. When hw_ts_Failed is returned, that means there are not enough free slots in the list to create a + * Timer. In that case, CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER should be increased + */ + typedef enum + { + hw_ts_Successful, + hw_ts_Failed, + }HW_TS_ReturnStatus_t; + + typedef void (*HW_TS_pTimerCb_t)(void); + + /** + * @brief Initialize the timer server + * This API shall be called by the application before any timer is requested to the timer server. It + * configures the RTC module to be connected to the LSI input clock. + * + * @param TimerInitMode: When the device restarts from Standby, it should request hw_ts_InitMode_Limited so that the + * Timer context is not re-initialized. Otherwise, hw_ts_InitMode_Full should be requested + * @param hrtc: RTC Handle + * @retval None + */ + void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc); + + /** + * @brief Interface to create a virtual timer + * The user shall call this API to create a timer. Once created, the timer is reserved to the module until it + * has been deleted. When creating a timer, the user shall specify the mode (single shot or repeated), the + * callback to be notified when the timer expires and a module ID to identify in the timer interrupt handler + * which module is concerned. In return, the user gets a timer ID to handle it. + * + * @param TimerProcessID: This is an identifier provided by the user and returned in the callback to allow + * identification of the requester + * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) + * @param TimerMode: Mode of the virtual timer (Single shot or repeated) + * @param pTimerCallBack: Callback when the virtual timer expires + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not + */ + HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Stop a virtual timer + * This API may be used to stop a running timer. A timer which is stopped is move to the pending state. + * A pending timer may be restarted at any time with a different timeout value but the mode cannot be changed. + * Nothing is done when it is called to stop a timer which has been already stopped + * + * @param TimerID: Id of the timer to stop + * @retval None + */ + void HW_TS_Stop(uint8_t TimerID); + + /** + * @brief Start a virtual timer + * This API shall be used to start a timer. The timeout value is specified and may be different each time. + * When the timer is in the single shot mode, it will move to the pending state when it expires. The user may + * restart it at any time with a different timeout value. When the timer is in the repeated mode, it always + * stay in the running state. When the timer expires, it will be restarted with the same timeout value. + * This API shall not be called on a running timer. + * + * @param TimerID: The ID Id of the timer to start + * @param timeout_ticks: Number of ticks of the virtual timer (Maximum value is (0xFFFFFFFF-0xFFFF = 0xFFFF0000) + * @retval None + */ + void HW_TS_Start(uint8_t TimerID, uint32_t timeout_ticks); + + /** + * @brief Delete a virtual timer from the list + * This API should be used when a timer is not needed anymore by the user. A deleted timer is removed from + * the timer list managed by the timer server. It cannot be restarted again. The user has to go with the + * creation of a new timer if required and may get a different timer id + * + * @param TimerID: The ID of the timer to remove from the list + * @retval None + */ + void HW_TS_Delete(uint8_t TimerID); + + /** + * @brief Schedule the timer list on the timer interrupt handler + * This interrupt handler shall be called by the application in the RTC interrupt handler. This handler takes + * care of clearing all status flag required in the RTC and EXTI peripherals + * + * @param None + * @retval None + */ + void HW_TS_RTC_Wakeup_Handler(void); + + /** + * @brief Return the number of ticks to count before the interrupt + * This API returns the number of ticks left to be counted before an interrupt is generated by the + * Timer Server. This API may be used by the application for power management optimization. When the system + * enters low power mode, the mode selection is a tradeoff between the wakeup time where the CPU is running + * and the time while the CPU will be kept in low power mode before next wakeup. The deeper is the + * low power mode used, the longer is the wakeup time. The low power mode management considering wakeup time + * versus time in low power mode is implementation specific + * When the timer is disabled (No timer in the list), it returns 0xFFFF + * + * @param None + * @retval The number of ticks left to count + */ + uint16_t HW_TS_RTC_ReadLeftTicksToCount(void); + + /** + * @brief Notify the application that a registered timer has expired + * This API shall be implemented by the user application. + * This API notifies the application that a timer expires. This API is running in the RTC Wakeup interrupt + * context. The application may implement an Operating System to change the context priority where the timer + * callback may be handled. This API provides the module ID to identify which module is concerned and to allow + * sending the information to the correct task + * + * @param TimerProcessID: The TimerProcessId associated with the timer when it has been created + * @param TimerID: The TimerID of the expired timer + * @param pTimerCallBack: The Callback associated with the timer when it has been created + * @retval None + */ + void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack); + + /** + * @brief Notify the application that the wakeupcounter has been updated + * This API should be implemented by the user application + * This API notifies the application that the counter has been updated. This is expected to be used along + * with the HW_TS_RTC_ReadLeftTicksToCount () API. It could be that the counter has been updated since the + * last call of HW_TS_RTC_ReadLeftTicksToCount () and before entering low power mode. This notification + * provides a way to the application to solve that race condition to reevaluate the counter value before + * entering low power mode + * + * @param None + * @retval None + */ + void HW_TS_RTC_CountUpdated_AppNot(void); + +#ifdef __cplusplus +} +#endif + +#endif /*HW_IF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/main.h new file mode 100644 index 000000000..56638ded0 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/main.h @@ -0,0 +1,73 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.h + * @brief : Header for main.c file. + * This file contains the common defines of the application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __MAIN_H +#define __MAIN_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "stm32wbxx_hal.h" +#include "app_conf.h" +#include "app_entry.h" +#include "app_common.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void Error_Handler(void); + +/* USER CODE BEGIN EFP */ + +/* USER CODE END EFP */ + +/* Private defines -----------------------------------------------------------*/ +void MX_LPUART1_UART_Init(void); +void MX_USART1_UART_Init(void); +/* USER CODE BEGIN Private defines */ + +/* USER CODE END Private defines */ + +#ifdef __cplusplus +} +#endif + +#endif /* __MAIN_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32_lpm_if.h new file mode 100644 index 000000000..49bc3661f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32_lpm_if.h @@ -0,0 +1,78 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** +* @file stm32_lpm_if.h +* @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32_LPM_IF_H +#define __STM32_LPM_IF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ + +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ); +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ); + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ); +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ); + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ); + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ); + +#ifdef __cplusplus +} +#endif + +#endif /*__STM32_LPM_IF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h new file mode 100644 index 000000000..de913bf72 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h @@ -0,0 +1,352 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_hal_conf.h + * @author MCD Application Team + * @brief HAL configuration file. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_HAL_CONF_H +#define __STM32WBxx_HAL_CONF_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Exported types ------------------------------------------------------------*/ +/* Exported constants --------------------------------------------------------*/ + +/* ########################## Module Selection ############################## */ +/** + * @brief This is the list of modules to be used in the HAL driver + */ +#define HAL_MODULE_ENABLED +/*#define HAL_ADC_MODULE_ENABLED */ +/*#define HAL_CRYP_MODULE_ENABLED */ +/*#define HAL_COMP_MODULE_ENABLED */ +/*#define HAL_CRC_MODULE_ENABLED */ +#define HAL_HSEM_MODULE_ENABLED +/*#define HAL_I2C_MODULE_ENABLED */ +#define HAL_IPCC_MODULE_ENABLED +/*#define HAL_IRDA_MODULE_ENABLED */ +/*#define HAL_IWDG_MODULE_ENABLED */ +/*#define HAL_LCD_MODULE_ENABLED */ +/*#define HAL_LPTIM_MODULE_ENABLED */ +/*#define HAL_PCD_MODULE_ENABLED */ +/*#define HAL_PKA_MODULE_ENABLED */ +/*#define HAL_QSPI_MODULE_ENABLED */ +/*#define HAL_RNG_MODULE_ENABLED */ +#define HAL_RTC_MODULE_ENABLED +/*#define HAL_SAI_MODULE_ENABLED */ +/*#define HAL_SMBUS_MODULE_ENABLED */ +/*#define HAL_SMARTCARD_MODULE_ENABLED */ +/*#define HAL_SPI_MODULE_ENABLED */ +/*#define HAL_TIM_MODULE_ENABLED */ +/*#define HAL_TSC_MODULE_ENABLED */ +#define HAL_UART_MODULE_ENABLED +/*#define HAL_USART_MODULE_ENABLED */ +/*#define HAL_WWDG_MODULE_ENABLED */ +#define HAL_EXTI_MODULE_ENABLED +#define HAL_CORTEX_MODULE_ENABLED +#define HAL_DMA_MODULE_ENABLED +#define HAL_FLASH_MODULE_ENABLED +#define HAL_GPIO_MODULE_ENABLED +#define HAL_PWR_MODULE_ENABLED +#define HAL_RCC_MODULE_ENABLED + +#define USE_HAL_ADC_REGISTER_CALLBACKS 0u +#define USE_HAL_COMP_REGISTER_CALLBACKS 0u +#define USE_HAL_CRYP_REGISTER_CALLBACKS 0u +#define USE_HAL_I2C_REGISTER_CALLBACKS 0u +#define USE_HAL_IRDA_REGISTER_CALLBACKS 0u +#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0u +#define USE_HAL_PCD_REGISTER_CALLBACKS 0u +#define USE_HAL_PKA_REGISTER_CALLBACKS 0u +#define USE_HAL_QSPI_REGISTER_CALLBACKS 0u +#define USE_HAL_RNG_REGISTER_CALLBACKS 0u +#define USE_HAL_RTC_REGISTER_CALLBACKS 0u +#define USE_HAL_SAI_REGISTER_CALLBACKS 0u +#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0u +#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0u +#define USE_HAL_SPI_REGISTER_CALLBACKS 0u +#define USE_HAL_TIM_REGISTER_CALLBACKS 0u +#define USE_HAL_TSC_REGISTER_CALLBACKS 0u +#define USE_HAL_UART_REGISTER_CALLBACKS 0u +#define USE_HAL_USART_REGISTER_CALLBACKS 0u +#define USE_HAL_WWDG_REGISTER_CALLBACKS 0u + +/* ########################## Oscillator Values adaptation ####################*/ +/** + * @brief Adjust the value of External High Speed oscillator (HSE) used in your application. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSE is used as system clock source, directly or through the PLL). + */ +#if !defined (HSE_VALUE) +#define HSE_VALUE 32000000U /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (HSE_STARTUP_TIMEOUT) + #define HSE_STARTUP_TIMEOUT ((uint32_t)100) /*!< Time out for HSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief Internal Multiple Speed oscillator (MSI) default value. + * This value is the default MSI range value after Reset. + */ +#if !defined (MSI_VALUE) + #define MSI_VALUE ((uint32_t)4000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +/** + * @brief Internal High Speed oscillator (HSI) value. + * This value is used by the RCC HAL module to compute the system frequency + * (when HSI is used as system clock source, directly or through the PLL). + */ +#if !defined (HSI_VALUE) +#define HSI_VALUE 16000000U /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +/** + * @brief Internal Low Speed oscillator (LSI1) value. + */ +#if !defined (LSI1_VALUE) + #define LSI1_VALUE ((uint32_t)32000) /*!< LSI1 Typical Value in Hz*/ +#endif /* LSI1_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ +/** + * @brief Internal Low Speed oscillator (LSI2) value. + */ +#if !defined (LSI2_VALUE) + #define LSI2_VALUE ((uint32_t)32000) /*!< LSI2 Typical Value in Hz*/ +#endif /* LSI2_VALUE */ /*!< Value of the Internal Low Speed oscillator in Hz + The real value may vary depending on the variations + in voltage and temperature.*/ + +/** + * @brief External Low Speed oscillator (LSE) value. + * This value is used by the UART, RTC HAL module to compute the system frequency + */ +#if !defined (LSE_VALUE) +#define LSE_VALUE 32768U /*!< Value of the External oscillator in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @brief Internal Multiple Speed oscillator (HSI48) default value. + * This value is the default HSI48 range value after Reset. + */ +#if !defined (HSI48_VALUE) + #define HSI48_VALUE ((uint32_t)48000000) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI48_VALUE */ + +#if !defined (LSE_STARTUP_TIMEOUT) +#define LSE_STARTUP_TIMEOUT 5000U /*!< Time out for LSE start up, in ms */ +#endif /* HSE_STARTUP_TIMEOUT */ + +/** + * @brief External clock source for SAI1 peripheral + * This value is used by the RCC HAL module to compute the SAI1 & SAI2 clock source + * frequency. + */ +#if !defined (EXTERNAL_SAI1_CLOCK_VALUE) + #define EXTERNAL_SAI1_CLOCK_VALUE ((uint32_t)2097000) /*!< Value of the SAI1 External clock source in Hz*/ +#endif /* EXTERNAL_SAI1_CLOCK_VALUE */ + +/* Tip: To avoid modifying this file each time you need to use different HSE, + === you can define the HSE value in your toolchain compiler preprocessor. */ + +/* ########################### System Configuration ######################### */ +/** + * @brief This is the HAL system configuration section + */ + +#define VDD_VALUE 3300U /*!< Value of VDD in mv */ +#define TICK_INT_PRIORITY 0U /*!< tick interrupt priority */ +#define USE_RTOS 0U +#define PREFETCH_ENABLE 1U +#define INSTRUCTION_CACHE_ENABLE 1U +#define DATA_CACHE_ENABLE 1U + +/* ########################## Assert Selection ############################## */ +/** + * @brief Uncomment the line below to expanse the "assert_param" macro in the + * HAL drivers code + */ +/* #define USE_FULL_ASSERT 1U */ + +/* ################## SPI peripheral configuration ########################## */ + +/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver + * Activated: CRC code is present inside driver + * Deactivated: CRC code cleaned from driver + */ + +#define USE_SPI_CRC 0U + +/* Includes ------------------------------------------------------------------*/ +/** + * @brief Include module's header file + */ +#ifdef HAL_DMA_MODULE_ENABLED + #include "stm32wbxx_hal_dma.h" +#endif /* HAL_DMA_MODULE_ENABLED */ + +#ifdef HAL_ADC_MODULE_ENABLED + #include "stm32wbxx_hal_adc.h" +#endif /* HAL_ADC_MODULE_ENABLED */ + +#ifdef HAL_COMP_MODULE_ENABLED + #include "stm32wbxx_hal_comp.h" +#endif /* HAL_COMP_MODULE_ENABLED */ + +#ifdef HAL_CORTEX_MODULE_ENABLED + #include "stm32wbxx_hal_cortex.h" +#endif /* HAL_CORTEX_MODULE_ENABLED */ + +#ifdef HAL_CRC_MODULE_ENABLED + #include "stm32wbxx_hal_crc.h" +#endif /* HAL_CRC_MODULE_ENABLED */ + +#ifdef HAL_CRYP_MODULE_ENABLED + #include "stm32wbxx_hal_cryp.h" +#endif /* HAL_CRYP_MODULE_ENABLED */ + +#ifdef HAL_EXTI_MODULE_ENABLED + #include "stm32wbxx_hal_exti.h" +#endif /* HAL_EXTI_MODULE_ENABLED */ + +#ifdef HAL_FLASH_MODULE_ENABLED + #include "stm32wbxx_hal_flash.h" +#endif /* HAL_FLASH_MODULE_ENABLED */ + +#ifdef HAL_GPIO_MODULE_ENABLED + #include "stm32wbxx_hal_gpio.h" +#endif /* HAL_GPIO_MODULE_ENABLED */ + +#ifdef HAL_HSEM_MODULE_ENABLED + #include "stm32wbxx_hal_hsem.h" +#endif /* HAL_HSEM_MODULE_ENABLED */ + +#ifdef HAL_I2C_MODULE_ENABLED + #include "stm32wbxx_hal_i2c.h" +#endif /* HAL_I2C_MODULE_ENABLED */ + +#ifdef HAL_IPCC_MODULE_ENABLED + #include "stm32wbxx_hal_ipcc.h" +#endif /* HAL_IPCC_MODULE_ENABLED */ + +#ifdef HAL_IRDA_MODULE_ENABLED + #include "stm32wbxx_hal_irda.h" +#endif /* HAL_IRDA_MODULE_ENABLED */ + +#ifdef HAL_IWDG_MODULE_ENABLED + #include "stm32wbxx_hal_iwdg.h" +#endif /* HAL_IWDG_MODULE_ENABLED */ + +#ifdef HAL_LCD_MODULE_ENABLED + #include "stm32wbxx_hal_lcd.h" +#endif /* HAL_LCD_MODULE_ENABLED */ + +#ifdef HAL_LPTIM_MODULE_ENABLED + #include "stm32wbxx_hal_lptim.h" +#endif /* HAL_LPTIM_MODULE_ENABLED */ + +#ifdef HAL_PCD_MODULE_ENABLED + #include "stm32wbxx_hal_pcd.h" +#endif /* HAL_PCD_MODULE_ENABLED */ + +#ifdef HAL_PKA_MODULE_ENABLED + #include "stm32wbxx_hal_pka.h" +#endif /* HAL_PKA_MODULE_ENABLED */ + +#ifdef HAL_PWR_MODULE_ENABLED + #include "stm32wbxx_hal_pwr.h" +#endif /* HAL_PWR_MODULE_ENABLED */ + +#ifdef HAL_QSPI_MODULE_ENABLED + #include "stm32wbxx_hal_qspi.h" +#endif /* HAL_QSPI_MODULE_ENABLED */ + +#ifdef HAL_RCC_MODULE_ENABLED + #include "stm32wbxx_hal_rcc.h" +#endif /* HAL_RCC_MODULE_ENABLED */ + +#ifdef HAL_RNG_MODULE_ENABLED + #include "stm32wbxx_hal_rng.h" +#endif /* HAL_RNG_MODULE_ENABLED */ + +#ifdef HAL_RTC_MODULE_ENABLED + #include "stm32wbxx_hal_rtc.h" +#endif /* HAL_RTC_MODULE_ENABLED */ + +#ifdef HAL_SAI_MODULE_ENABLED + #include "stm32wbxx_hal_sai.h" +#endif /* HAL_SAI_MODULE_ENABLED */ + +#ifdef HAL_SMARTCARD_MODULE_ENABLED + #include "stm32wbxx_hal_smartcard.h" +#endif /* HAL_SMARTCARD_MODULE_ENABLED */ + +#ifdef HAL_SMBUS_MODULE_ENABLED + #include "stm32wbxx_hal_smbus.h" +#endif /* HAL_SMBUS_MODULE_ENABLED */ + +#ifdef HAL_SPI_MODULE_ENABLED + #include "stm32wbxx_hal_spi.h" +#endif /* HAL_SPI_MODULE_ENABLED */ + +#ifdef HAL_TIM_MODULE_ENABLED + #include "stm32wbxx_hal_tim.h" +#endif /* HAL_TIM_MODULE_ENABLED */ + +#ifdef HAL_TSC_MODULE_ENABLED + #include "stm32wbxx_hal_tsc.h" +#endif /* HAL_TSC_MODULE_ENABLED */ + +#ifdef HAL_UART_MODULE_ENABLED + #include "stm32wbxx_hal_uart.h" +#endif /* HAL_UART_MODULE_ENABLED */ + +#ifdef HAL_USART_MODULE_ENABLED + #include "stm32wbxx_hal_usart.h" +#endif /* HAL_USART_MODULE_ENABLED */ + +#ifdef HAL_WWDG_MODULE_ENABLED + #include "stm32wbxx_hal_wwdg.h" +#endif /* HAL_WWDG_MODULE_ENABLED */ + +/* Exported macro ------------------------------------------------------------*/ +#ifdef USE_FULL_ASSERT +/** + * @brief The assert_param macro is used for function's parameters check. + * @param expr If expr is false, it calls assert_failed function + * which reports the name of the source file and the source + * line number of the call that failed. + * If expr is true, it returns no value. + * @retval None + */ + #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) +/* Exported functions ------------------------------------------------------- */ + void assert_failed(uint8_t* file, uint32_t line); +#else + #define assert_param(expr) ((void)0U) +#endif /* USE_FULL_ASSERT */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_HAL_CONF_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_it.h new file mode 100644 index 000000000..f190fee2c --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_it.h @@ -0,0 +1,80 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.h + * @brief This file contains the headers of the interrupt handlers. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STM32WBxx_IT_H +#define __STM32WBxx_IT_H + +#ifdef __cplusplus + extern "C" { +#endif + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "app_common.h" +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* Exported macro ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions prototypes ---------------------------------------------*/ +void NMI_Handler(void); +void HardFault_Handler(void); +void MemManage_Handler(void); +void BusFault_Handler(void); +void UsageFault_Handler(void); +void SVC_Handler(void); +void DebugMon_Handler(void); +void PendSV_Handler(void); +void SysTick_Handler(void); +void PVD_PVM_IRQHandler(void); +void RTC_WKUP_IRQHandler(void); +void FLASH_IRQHandler(void); +void RCC_IRQHandler(void); +void DMA1_Channel1_IRQHandler(void); +void DMA1_Channel2_IRQHandler(void); +void C2SEV_PWR_C2H_IRQHandler(void); +void USART1_IRQHandler(void); +void LPUART1_IRQHandler(void); +void PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler(void); +void IPCC_C1_RX_IRQHandler(void); +void IPCC_C1_TX_IRQHandler(void); +void HSEM_IRQHandler(void); +void FPU_IRQHandler(void); +/* USER CODE BEGIN EFP */ +void EXTI4_IRQHandler(void); +/* USER CODE END EFP */ + +#ifdef __cplusplus +} +#endif + +#endif /* __STM32WBxx_IT_H */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm_logging.h new file mode 100644 index 000000000..6a811f7ab --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm_logging.h @@ -0,0 +1,62 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : stm_logging.h + * Description : Application header file for logging + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +#ifndef STM_LOGGING_H_ +#define STM_LOGGING_H_ + +#define LOG_LEVEL_NONE 0 /* None */ +#define LOG_LEVEL_CRIT 1U /* Critical */ +#define LOG_LEVEL_WARN 2U /* Warning */ +#define LOG_LEVEL_INFO 3U /* Info */ +#define LOG_LEVEL_DEBG 4U /* Debug */ + +#define APP_DBG_FULL(level, region, ...) \ + { \ + if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ + { \ + printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ + } \ + logApplication(level, region, __VA_ARGS__); \ + } +#define APP_DBG(...) \ + { \ + if (APPLI_PRINT_FILE_FUNC_LINE == 1U) \ + { \ + printf("\r\n[%s][%s][%d] ", DbgTraceGetFileName(__FILE__),__FUNCTION__,__LINE__); \ + } \ + logApplication(LOG_LEVEL_NONE, APPLI_LOG_REGION_GENERAL, __VA_ARGS__); \ + } +/** + * This enumeration represents log regions. + * + */ +typedef enum +{ + APPLI_LOG_REGION_GENERAL = 1U, /* General */ + APPLI_LOG_REGION_OPENTHREAD_API = 2U, /* OpenThread API */ + APPLI_LOG_REGION_OT_API_LINK = 3U, /* OpenThread Link API */ + APPLI_LOG_REGION_OT_API_INSTANCE = 4U, /* OpenThread Instance API */ + APPLI_LOG_REGION_OT_API_MESSAGE = 5U /* OpenThread Message API */ +} appliLogRegion_t; + +typedef uint8_t appliLogLevel_t; + +void logApplication(appliLogLevel_t aLogLevel, appliLogRegion_t aLogRegion, const char *aFormat, ...); + +#endif /* STM_LOGGING_H_ */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/utilities_conf.h new file mode 100644 index 000000000..8aacfd97f --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Inc/utilities_conf.h @@ -0,0 +1,66 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : utilities_conf.h + * Description : Configuration file for STM32 Utilities. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef UTILITIES_CONF_H +#define UTILITIES_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "cmsis_compiler.h" +#include "string.h" + +/****************************************************************************** + * common + ******************************************************************************/ +#define UTILS_ENTER_CRITICAL_SECTION( ) uint32_t primask_bit = __get_PRIMASK( );\ + __disable_irq( ) + +#define UTILS_EXIT_CRITICAL_SECTION( ) __set_PRIMASK( primask_bit ) + +#define UTILS_MEMSET8( dest, value, size ) memset( dest, value, size); + +/****************************************************************************** + * tiny low power manager + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_LPM_INIT_CRITICAL_SECTION( ) +#define UTIL_LPM_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_LPM_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) + +/****************************************************************************** + * sequencer + * (any macro that does not need to be modified can be removed) + ******************************************************************************/ +#define UTIL_SEQ_INIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_ENTER_CRITICAL_SECTION( ) UTILS_ENTER_CRITICAL_SECTION( ) +#define UTIL_SEQ_EXIT_CRITICAL_SECTION( ) UTILS_EXIT_CRITICAL_SECTION( ) +#define UTIL_SEQ_CONF_TASK_NBR (32) +#define UTIL_SEQ_CONF_PRIO_NBR (2) +#define UTIL_SEQ_MEMSET8( dest, value, size ) UTILS_MEMSET8( dest, value, size ) + +#ifdef __cplusplus +} +#endif + +#endif /*UTILITIES_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/app_entry.c new file mode 100644 index 000000000..1f1662da3 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/app_entry.c @@ -0,0 +1,677 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : app_entry.c + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "main.h" +#include "app_entry.h" +#include "app_thread.h" +#include "app_conf.h" +#include "hw_conf.h" +#include "stm32_seq.h" +#include "stm_logging.h" +#include "shci_tl.h" +#include "stm32_lpm.h" +#include "dbg_trace.h" +#include "shci.h" +#include "otp.h" + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +extern RTC_HandleTypeDef hrtc; +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +/* POOL_SIZE = 2(TL_PacketHeader_t) + 258 (3(TL_EVT_HDR_SIZE) + 255(Payload size)) */ +#define POOL_SIZE (CFG_TL_EVT_QUEUE_LENGTH * 4U * DIVC(( sizeof(TL_PacketHeader_t) + TL_EVENT_FRAME_SIZE ), 4U)) + +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; +uint8_t g_ot_notification_allowed = 0U; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Global function prototypes -----------------------------------------------*/ +#if(CFG_DEBUG_TRACE != 0) +size_t DbgTraceWrite(int handle, const unsigned char * buf, size_t bufSize); +#endif + +/* USER CODE BEGIN GFP */ + +/* USER CODE END GFP */ + +/* Private functions prototypes-----------------------------------------------*/ +static void Config_HSE(void); +static void Reset_Device( void ); +#if ( CFG_HW_RESET_BY_FW == 1 ) +static void Reset_IPCC( void ); +static void Reset_BackupDomain( void ); +#endif /* CFG_HW_RESET_BY_FW */ +static void System_Init( void ); +static void SystemPower_Config( void ); +static void Init_Debug( void ); +static void appe_Tl_Init( void ); +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); +static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void ); +static void APPE_SysEvtError( SCHI_SystemErrCode_t ErrorCode); + +#if (CFG_HW_LPUART1_ENABLED == 1) +extern void MX_LPUART1_UART_Init(void); +#endif +#if (CFG_HW_USART1_ENABLED == 1) +extern void MX_USART1_UART_Init(void); +#endif +static void Init_Rtc( void ); + +/* USER CODE BEGIN PFP */ +static void Led_Init( void ); +static void Button_Init( void ); +extern uint8_t JoinerState; +/* USER CODE END PFP */ + + +/* Functions Definition ------------------------------------------------------*/ +void MX_APPE_Config( void ) +{ + /** + * The OPTVERR flag is wrongly set at power on + * It shall be cleared before using any HAL_FLASH_xxx() api + */ + __HAL_FLASH_CLEAR_FLAG( FLASH_FLAG_OPTVERR ); + + /** + * Reset some configurations so that the system behave in the same way + * when either out of nReset or Power On + */ + Reset_Device( ); + + /* Configure HSE Tuning */ + Config_HSE(); + + return; +} + +void MX_APPE_Init( void ) +{ + System_Init( ); /**< System initialization */ + + SystemPower_Config(); /**< Configure the system Power Mode */ + + HW_TS_Init(hw_ts_InitMode_Full, &hrtc); /**< Initialize the TimerServer */ + +/* USER CODE BEGIN APPE_Init_1 */ + Init_Debug(); + + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP, UTIL_LPM_DISABLE); + Led_Init(); + Button_Init(); +/* USER CODE END APPE_Init_1 */ + appe_Tl_Init(); /* Initialize all transport layers */ + + /** + * From now, the application is waiting for the ready event ( VS_HCI_C2_Ready ) + * received on the system channel before starting the Stack + * This system event is received with APPE_SysUserEvtRx() + */ +/* USER CODE BEGIN APPE_Init_2 */ + +/* USER CODE END APPE_Init_2 */ + return; +} + +void Init_Smps( void ) +{ +#if (CFG_USE_SMPS != 0) + /** + * Configure and enable SMPS + * + * The SMPS configuration is not yet supported by CubeMx + * when SMPS output voltage is set to 1.4V, the RF output power is limited to 3.7dBm + * the SMPS output voltage shall be increased for higher RF output power + */ + LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA); + LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40); + LL_PWR_SMPS_Enable(); +#endif + + return; +} + +void Init_Exti( void ) +{ + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); + + return; +} + +/* USER CODE BEGIN FD */ + +/* USER CODE END FD */ + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +static void Init_Debug( void ) +{ +#if (CFG_DEBUGGER_SUPPORTED == 1) + /** + * Keep debugger enabled while in any low power mode + */ + HAL_DBGMCU_EnableDBGSleepMode(); + + /***************** ENABLE DEBUGGER *************************************/ + LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); + LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_48); + +#else + + GPIO_InitTypeDef gpio_config = {0}; + + gpio_config.Pull = GPIO_NOPULL; + gpio_config.Mode = GPIO_MODE_ANALOG; + + gpio_config.Pin = GPIO_PIN_15 | GPIO_PIN_14 | GPIO_PIN_13; + __HAL_RCC_GPIOA_CLK_ENABLE(); + HAL_GPIO_Init(GPIOA, &gpio_config); + __HAL_RCC_GPIOA_CLK_DISABLE(); + + gpio_config.Pin = GPIO_PIN_4 | GPIO_PIN_3; + __HAL_RCC_GPIOB_CLK_ENABLE(); + HAL_GPIO_Init(GPIOB, &gpio_config); + __HAL_RCC_GPIOB_CLK_DISABLE(); + + HAL_DBGMCU_DisableDBGSleepMode(); + HAL_DBGMCU_DisableDBGStopMode(); + HAL_DBGMCU_DisableDBGStandbyMode(); + +#endif /* (CFG_DEBUGGER_SUPPORTED == 1) */ + +#if(CFG_DEBUG_TRACE != 0) + DbgTraceInit(); +#endif + + return; +} +static void Reset_Device( void ) +{ +#if ( CFG_HW_RESET_BY_FW == 1 ) + Reset_BackupDomain(); + + Reset_IPCC(); +#endif /* CFG_HW_RESET_BY_FW */ + + return; +} + +#if ( CFG_HW_RESET_BY_FW == 1 ) +static void Reset_BackupDomain( void ) +{ + if ((LL_RCC_IsActiveFlag_PINRST() != FALSE) && (LL_RCC_IsActiveFlag_SFTRST() == FALSE)) + { + HAL_PWR_EnableBkUpAccess(); /**< Enable access to the RTC registers */ + + /** + * Write twice the value to flush the APB-AHB bridge + * This bit shall be written in the register before writing the next one + */ + HAL_PWR_EnableBkUpAccess(); + + __HAL_RCC_BACKUPRESET_FORCE(); + __HAL_RCC_BACKUPRESET_RELEASE(); + } + + return; +} + +static void Reset_IPCC( void ) +{ + LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_IPCC); + + LL_C1_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_ClearFlag_CHx( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableTransmitChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C1_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + LL_C2_IPCC_DisableReceiveChannel( + IPCC, + LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 + | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6); + + return; +} +#endif /* CFG_HW_RESET_BY_FW */ + +static void Config_HSE(void) +{ + OTP_ID0_t * p_otp; + + /** + * Read HSE_Tuning from OTP + */ + p_otp = (OTP_ID0_t *) OTP_Read(0); + if (p_otp) + { + LL_RCC_HSE_SetCapacitorTuning(p_otp->hse_tuning); + } + + return; +} + +static void System_Init( void ) +{ + Init_Smps( ); + + Init_Exti( ); + + Init_Rtc( ); + + return; +} + +static void Init_Rtc( void ) +{ + /* Disable RTC registers write protection */ + LL_RTC_DisableWriteProtection(RTC); + + LL_RTC_WAKEUP_SetClock(RTC, CFG_RTC_WUCKSEL_DIVIDER); + + /* Enable RTC registers write protection */ + LL_RTC_EnableWriteProtection(RTC); + + return; +} + +/** + * @brief Configure the system for power optimization + * + * @note This API configures the system to be ready for low power mode + * + * @param None + * @retval None + */ +static void SystemPower_Config(void) +{ + /** + * Select HSI as system clock source after Wake Up from Stop mode + */ + LL_RCC_SetClkAfterWakeFromStop(LL_RCC_STOP_WAKEUPCLOCK_HSI); + + /* Initialize low power manager */ + UTIL_LPM_Init(); + /* Initialize the CPU2 reset value before starting CPU2 with C2BOOT */ + LL_C2_PWR_SetPowerMode(LL_PWR_MODE_SHUTDOWN); + +#if (CFG_USB_INTERFACE_ENABLE != 0) + /** + * Enable USB power + */ + HAL_PWREx_EnableVddUSB(); +#endif + + return; +} + +static void appe_Tl_Init( void ) +{ + TL_MM_Config_t tl_mm_config; + SHCI_TL_HciInitConf_t SHci_Tl_Init_Conf; + /**< Reference table initialization */ + TL_Init(); + + /**< System channel initialization */ + UTIL_SEQ_RegTask( 1<< CFG_TASK_SYSTEM_HCI_ASYNCH_EVT, UTIL_SEQ_RFU, shci_user_evt_proc ); + SHci_Tl_Init_Conf.p_cmdbuffer = (uint8_t*)&SystemCmdBuffer; + SHci_Tl_Init_Conf.StatusNotCallBack = APPE_SysStatusNot; + shci_init(APPE_SysUserEvtRx, (void*) &SHci_Tl_Init_Conf); + + /**< Memory Manager channel initialization */ + tl_mm_config.p_BleSpareEvtBuffer = 0; + tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer; + tl_mm_config.p_AsynchEvtPool = EvtPool; + tl_mm_config.AsynchEvtPoolSize = POOL_SIZE; + TL_MM_Init( &tl_mm_config ); + + TL_Enable(); + + return; +} + +static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) +{ + UNUSED(status); + return; +} + +/** + * The type of the payload for a system user event is tSHCI_UserEvtRxParam + * When the system event is both : + * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) + * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) + * The buffer shall not be released + * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) + * When the status is not filled, the buffer is released by default + */ +static void APPE_SysUserEvtRx( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(); + break; + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError((SCHI_SystemErrCode_t) (p_sys_event->payload[0])); + break; + default: + break; + } + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( SCHI_SystemErrCode_t ErrorCode) +{ + switch(ErrorCode) + { + case ERR_THREAD_LLD_FATAL_ERROR: + APP_DBG("** ERR_THREAD : LLD_FATAL_ERROR \n"); + break; + case ERR_THREAD_UNKNOWN_CMD: + APP_DBG("** ERR_THREAD : UNKNOWN_CMD \n"); + break; + default: + APP_DBG("** ERR_THREAD : ErroCode=%d \n",ErrorCode); + break; + } + return; +} + +static void APPE_SysEvtReadyProcessing( void ) +{ + /* Traces channel initialization */ + TL_TRACES_Init( ); + + APP_THREAD_Init(); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + return; +} + +/* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ +static void Led_Init( void ) +{ +#if (CFG_LED_SUPPORTED == 1U) + /** + * Leds Initialization + */ +#if (CFG_HW_LPUART1_ENABLED != 1) || ! defined (STM32WB35xx) + // On Little DORY, LED_BLUE share the GPIO PB5 with LPUART + BSP_LED_Init(LED_BLUE); +#endif + +#if (CFG_HW_EXTPA_ENABLED != 1) + BSP_LED_Init(LED_GREEN); +#endif + + BSP_LED_Init(LED_RED); + +#endif + + return; +} + +static void Button_Init( void ) +{ +#if (CFG_BUTTON_SUPPORTED == 1U) + /** + * Button Initialization + */ + + BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI); +#endif + + return; +} + + +/* USER CODE END FD_LOCAL_FUNCTIONS */ + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ +void HAL_Delay(uint32_t Delay) +{ + uint32_t tickstart = HAL_GetTick(); + uint32_t wait = Delay; + + /* Add a freq to guarantee minimum wait */ + if (wait < HAL_MAX_DELAY) + { + wait += HAL_GetTickFreq(); + } + + while ((HAL_GetTick() - tickstart) < wait) + { + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ + #if defined ( __CC_ARM) + __force_stores(); + #endif + + __WFI( ); + } +} + +void MX_APPE_Process(void) +{ + /* USER CODE BEGIN MX_APPE_Process_1 */ + + /* USER CODE END MX_APPE_Process_1 */ + UTIL_SEQ_Run(UTIL_SEQ_DEFAULT); + /* USER CODE BEGIN MX_APPE_Process_2 */ + + /* USER CODE END MX_APPE_Process_2 */ +} + +void UTIL_SEQ_Idle( void ) +{ +#if ( CFG_LPM_SUPPORTED == 1) + UTIL_LPM_EnterLowPower( ); +#endif + return; +} + +/** + * @brief This function is called by the scheduler each time an event + * is pending. + * + * @param evt_waited_bm : Event pending. + * @retval None + */ +void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) +{ + switch(evt_waited_bm) + { + case EVENT_ACK_FROM_M0_EVT: + if(g_ot_notification_allowed == 1U) + { + /* Some OT API send M0 to M4 notifications so allow notifications when waiting for OT Cmd response */ + UTIL_SEQ_Run(TASK_MSG_FROM_M0_TO_M4); + } + else + { + /* Does not allow other tasks when waiting for OT Cmd response */ + UTIL_SEQ_Run(0); + } + break; + case EVENT_SYNCHRO_BYPASS_IDLE: + UTIL_SEQ_SetEvt(EVENT_SYNCHRO_BYPASS_IDLE); + /* Run only the task CFG_TASK_MSG_FROM_M0_TO_M4 */ + UTIL_SEQ_Run(TASK_MSG_FROM_M0_TO_M4); + break; + default : + /* default case */ + UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + break; + } +} + +void shci_notify_asynch_evt(void* pdata) +{ + UNUSED(pdata); + UTIL_SEQ_SetTask(1U << CFG_TASK_SYSTEM_HCI_ASYNCH_EVT, CFG_SCH_PRIO_0); + return; +} + +void shci_cmd_resp_release(uint32_t flag) +{ + UNUSED(flag); + UTIL_SEQ_SetEvt(1U << CFG_EVT_SYSTEM_HCI_CMD_EVT_RESP); + return; +} + +void shci_cmd_resp_wait(uint32_t timeout) +{ + UNUSED(timeout); + UTIL_SEQ_WaitEvt(1U << CFG_EVT_SYSTEM_HCI_CMD_EVT_RESP); + return; +} + +/* Received trace buffer from M0 */ +void TL_TRACES_EvtReceived( TL_EvtPacket_t * hcievt ) +{ +#if(CFG_DEBUG_TRACE != 0) + /* Call write/print function using DMA from dbg_trace */ + /* - Cast to TL_AsynchEvt_t* to get "real" payload (without Sub Evt code 2bytes), + - (-2) to size to remove Sub Evt Code */ + DbgTraceWrite(1U, (const unsigned char *) ((TL_AsynchEvt_t *)(hcievt->evtserial.evt.payload))->payload, hcievt->evtserial.evt.plen - 2U); +#endif /* CFG_DEBUG_TRACE */ + /* Release buffer */ + TL_MM_EvtDone( hcievt ); +} +/** + * @brief Initialisation of the trace mechanism + * @param None + * @retval None + */ +#if(CFG_DEBUG_TRACE != 0) +void DbgOutputInit( void ) +{ +#ifdef CFG_DEBUG_TRACE_UART + MX_LPUART1_UART_Init(); + return; +#endif +} + +/** + * @brief Management of the traces + * @param p_data : data + * @param size : size + * @param call-back : + * @retval None + */ +void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) +{ + HW_UART_Transmit_DMA(CFG_DEBUG_TRACE_UART, p_data, size, cb); + + return; +} +#endif + + + +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ +/** + * @brief This function manage the Push button action + * @param GPIO_Pin : GPIO pin which has been activated + * @retval None + */ +void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) +{ + switch (GPIO_Pin) + { + case BUTTON_SW1_PIN: + APP_DBG("BUTTON 1 PUSHED ! : ifconfig up / joiner start STM32WB"); + JoinerState = 0; + UTIL_SEQ_SetTask(TASK_JOIN_BUTTON,CFG_SCH_PRIO_0); + break; + + default: + break; + } + return; +} +/* USER CODE END FD_WRAP_FUNCTIONS */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_timerserver.c new file mode 100644 index 000000000..3d44a3caf --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_timerserver.c @@ -0,0 +1,893 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : hw_timerserver.c + * Description : Hardware timerserver source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "hw_conf.h" + +/* Private typedef -----------------------------------------------------------*/ +typedef enum +{ + TimerID_Free, + TimerID_Created, + TimerID_Running +}TimerIDStatus_t; + +typedef enum +{ + SSR_Read_Requested, + SSR_Read_Not_Requested +}RequestReadSSR_t; + +typedef enum +{ + WakeupTimerValue_Overpassed, + WakeupTimerValue_LargeEnough +}WakeupTimerLimitation_Status_t; + +typedef struct +{ + HW_TS_pTimerCb_t pTimerCallBack; + uint32_t CounterInit; + uint32_t CountLeft; + TimerIDStatus_t TimerIDStatus; + HW_TS_Mode_t TimerMode; + uint32_t TimerProcessID; + uint8_t PreviousID; + uint8_t NextID; +}TimerContext_t; + +/* Private defines -----------------------------------------------------------*/ +#define SSR_FORBIDDEN_VALUE 0xFFFFFFFF +#define TIMER_LIST_EMPTY 0xFFFF + +/* Private macros ------------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ + +/** + * START of Section TIMERSERVER_CONTEXT + */ + +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile TimerContext_t aTimerContext[CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER]; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t CurrentRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint8_t PreviousRunningTimerID; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile uint32_t SSRValueOnLastSetup; +PLACE_IN_SECTION("TIMERSERVER_CONTEXT") static volatile WakeupTimerLimitation_Status_t WakeupTimerLimitation; + +/** + * END of Section TIMERSERVER_CONTEXT + */ + +static RTC_HandleTypeDef *phrtc; /**< RTC handle */ +static uint8_t WakeupTimerDivider; +static uint8_t AsynchPrescalerUserConfig; +static uint16_t SynchPrescalerUserConfig; +static volatile uint16_t MaxWakeupTimerSetup; + +/* Global variables ----------------------------------------------------------*/ +/* Private function prototypes -----------------------------------------------*/ +static void RestartWakeupCounter(uint16_t Value); +static uint16_t ReturnTimeElapsed(void); +static void RescheduleTimerList(void); +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR); +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID); +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID); +static uint16_t linkTimer(uint8_t TimerID); +static uint32_t ReadRtcSsrValue(void); + +__weak void HW_TS_RTC_CountUpdated_AppNot(void); + +/* Functions Definition ------------------------------------------------------*/ + +/** + * @brief Read the RTC_SSR value + * As described in the reference manual, the RTC_SSR shall be read twice to ensure + * reliability of the value + * @param None + * @retval SSR value read + */ +static uint32_t ReadRtcSsrValue(void) +{ + uint32_t first_read; + uint32_t second_read; + + first_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + + while(first_read != second_read) + { + first_read = second_read; + + second_read = (uint32_t)(READ_BIT(RTC->SSR, RTC_SSR_SS)); + } + + return second_read; +} + +/** + * @brief Insert a Timer in the list after the Timer ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked after + * @retval None + */ +static void LinkTimerAfter(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t next_id; + + next_id = aTimerContext[RefTimerID].NextID; + + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = TimerID; + } + aTimerContext[TimerID].NextID = next_id; + aTimerContext[TimerID].PreviousID = RefTimerID ; + aTimerContext[RefTimerID].NextID = TimerID; + + return; +} + +/** + * @brief Insert a Timer in the list before the ID specified + * @param TimerID: The ID of the Timer + * @param RefTimerID: The ID of the Timer to be linked before + * @retval None + */ +static void LinkTimerBefore(uint8_t TimerID, uint8_t RefTimerID) +{ + uint8_t previous_id; + + if(RefTimerID != CurrentRunningTimerID) + { + previous_id = aTimerContext[RefTimerID].PreviousID; + + aTimerContext[previous_id].NextID = TimerID; + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[TimerID].PreviousID = previous_id ; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + else + { + aTimerContext[TimerID].NextID = RefTimerID; + aTimerContext[RefTimerID].PreviousID = TimerID; + } + + return; +} + +/** + * @brief Insert a Timer in the list + * @param TimerID: The ID of the Timer + * @retval None + */ +static uint16_t linkTimer(uint8_t TimerID) +{ + uint32_t time_left; + uint16_t time_elapsed; + uint8_t timer_id_lookup; + uint8_t next_id; + + if(CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * No timer in the list + */ + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + aTimerContext[TimerID].NextID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; + + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + time_elapsed = 0; + } + else + { + time_elapsed = ReturnTimeElapsed(); + + /** + * update count of the timer to be linked + */ + aTimerContext[TimerID].CountLeft += time_elapsed; + time_left = aTimerContext[TimerID].CountLeft; + + /** + * Search for index where the new timer shall be linked + */ + if(aTimerContext[CurrentRunningTimerID].CountLeft <= time_left) + { + /** + * Search for the ID after the first one + */ + timer_id_lookup = CurrentRunningTimerID; + next_id = aTimerContext[timer_id_lookup].NextID; + while((next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[next_id].CountLeft <= time_left)) + { + timer_id_lookup = aTimerContext[timer_id_lookup].NextID; + next_id = aTimerContext[timer_id_lookup].NextID; + } + + /** + * Link after the ID + */ + LinkTimerAfter(TimerID, timer_id_lookup); + } + else + { + /** + * Link before the first ID + */ + LinkTimerBefore(TimerID, CurrentRunningTimerID); + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = TimerID; + } + } + + return time_elapsed; +} + +/** + * @brief Remove a Timer from the list + * @param TimerID: The ID of the Timer + * @param RequestReadSSR: Request to read the SSR register or not + * @retval None + */ +static void UnlinkTimer(uint8_t TimerID, RequestReadSSR_t RequestReadSSR) +{ + uint8_t previous_id; + uint8_t next_id; + + if(TimerID == CurrentRunningTimerID) + { + PreviousRunningTimerID = CurrentRunningTimerID; + CurrentRunningTimerID = aTimerContext[TimerID].NextID; + } + else + { + previous_id = aTimerContext[TimerID].PreviousID; + next_id = aTimerContext[TimerID].NextID; + + aTimerContext[previous_id].NextID = aTimerContext[TimerID].NextID; + if(next_id != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[next_id].PreviousID = aTimerContext[TimerID].PreviousID; + } + } + + /** + * Timer is out of the list + */ + aTimerContext[TimerID].TimerIDStatus = TimerID_Created; + + if((CurrentRunningTimerID == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (RequestReadSSR == SSR_Read_Requested)) + { + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + } + + return; +} + +/** + * @brief Return the number of ticks counted by the wakeuptimer since it has been started + * @note The API is reading the SSR register to get how many ticks have been counted + * since the time the timer has been started + * @param None + * @retval Time expired in Ticks + */ +static uint16_t ReturnTimeElapsed(void) +{ + uint32_t return_value; + uint32_t wrap_counter; + + if(SSRValueOnLastSetup != SSR_FORBIDDEN_VALUE) + { + return_value = ReadRtcSsrValue(); /**< Read SSR register first */ + + if (SSRValueOnLastSetup >= return_value) + { + return_value = SSRValueOnLastSetup - return_value; + } + else + { + wrap_counter = SynchPrescalerUserConfig - return_value; + return_value = SSRValueOnLastSetup + wrap_counter; + } + + /** + * At this stage, ReturnValue holds the number of ticks counted by SSR + * Need to translate in number of ticks counted by the Wakeuptimer + */ + return_value = return_value*AsynchPrescalerUserConfig; + return_value = return_value >> WakeupTimerDivider; + } + else + { + return_value = 0; + } + + return (uint16_t)return_value; +} + +/** + * @brief Set the wakeup counter + * @note The API is writing the counter value so that the value is decreased by one to cope with the fact + * the interrupt is generated with 1 extra clock cycle (See RefManuel) + * It assumes all condition are met to be allowed to write the wakeup counter + * @param Value: Value to be written in the counter + * @retval None + */ +static void RestartWakeupCounter(uint16_t Value) +{ + /** + * The wakeuptimer has been disabled in the calling function to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + * __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + */ + + if(Value == 0) + { + SSRValueOnLastSetup = ReadRtcSsrValue(); + + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + else + { + if((Value > 1) ||(WakeupTimerDivider != 1)) + { + Value -= 1; + } + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + + MODIFY_REG(RTC->WUTR, RTC_WUTR_WUT, Value); + + /** + * Update the value here after the WUTWF polling that may take some time + */ + SSRValueOnLastSetup = ReadRtcSsrValue(); + + __HAL_RTC_WAKEUPTIMER_ENABLE(phrtc); /**< Enable the Wakeup Timer */ + + HW_TS_RTC_CountUpdated_AppNot(); + } + + return ; +} + +/** + * @brief Reschedule the list of timer + * @note 1) Update the count left for each timer in the list + * 2) Setup the wakeuptimer + * @param None + * @retval None + */ +static void RescheduleTimerList(void) +{ + uint8_t localTimerID; + uint32_t timecountleft; + uint16_t wakeup_timer_value; + uint16_t time_elapsed; + + /** + * The wakeuptimer is disabled now to reduce the time to poll the WUTWF + * FLAG when the new value will have to be written + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + localTimerID = CurrentRunningTimerID; + + /** + * Calculate what will be the value to write in the wakeuptimer + */ + timecountleft = aTimerContext[localTimerID].CountLeft; + + /** + * Read how much has been counted + */ + time_elapsed = ReturnTimeElapsed(); + + if(timecountleft < time_elapsed ) + { + /** + * There is no tick left to count + */ + wakeup_timer_value = 0; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + else + { + if(timecountleft > (time_elapsed + MaxWakeupTimerSetup)) + { + /** + * The number of tick left is greater than the Wakeuptimer maximum value + */ + wakeup_timer_value = MaxWakeupTimerSetup; + + WakeupTimerLimitation = WakeupTimerValue_Overpassed; + } + else + { + wakeup_timer_value = timecountleft - time_elapsed; + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + } + + } + + /** + * update ticks left to be counted for each timer + */ + while(localTimerID != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + if (aTimerContext[localTimerID].CountLeft < time_elapsed) + { + aTimerContext[localTimerID].CountLeft = 0; + } + else + { + aTimerContext[localTimerID].CountLeft -= time_elapsed; + } + localTimerID = aTimerContext[localTimerID].NextID; + } + + /** + * Write next count + */ + RestartWakeupCounter(wakeup_timer_value); + + return ; +} + +/* Public functions ----------------------------------------------------------*/ + +/** + * For all public interface except that may need write access to the RTC, the RTC + * shall be unlock at the beginning and locked at the output + * In order to ease maintainability, the unlock is done at the top and the lock at then end + * in case some new implementation is coming in the future + */ + +void HW_TS_RTC_Wakeup_Handler(void) +{ + HW_TS_pTimerCb_t ptimer_callback; + uint32_t timer_process_id; + uint8_t local_current_running_timer_id; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + +/* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + /** + * Disable the Wakeup Timer + * This may speed up a bit the processing to wait the timer to be disabled + * The timer is still counting 2 RTCCLK + */ + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); + + local_current_running_timer_id = CurrentRunningTimerID; + + if(aTimerContext[local_current_running_timer_id].TimerIDStatus == TimerID_Running) + { + ptimer_callback = aTimerContext[local_current_running_timer_id].pTimerCallBack; + timer_process_id = aTimerContext[local_current_running_timer_id].TimerProcessID; + + /** + * It should be good to check whether the TimeElapsed is greater or not than the tick left to be counted + * However, due to the inaccuracy of the reading of the time elapsed, it may return there is 1 tick + * to be left whereas the count is over + * A more secure implementation has been done with a flag to state whereas the full count has been written + * in the wakeuptimer or not + */ + if(WakeupTimerLimitation != WakeupTimerValue_Overpassed) + { + if(aTimerContext[local_current_running_timer_id].TimerMode == hw_ts_Repeated) + { + UnlinkTimer(local_current_running_timer_id, SSR_Read_Not_Requested); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Start(local_current_running_timer_id, aTimerContext[local_current_running_timer_id].CounterInit); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + HW_TS_Stop(local_current_running_timer_id); + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + } + + HW_TS_RTC_Int_AppNot(timer_process_id, local_current_running_timer_id, ptimer_callback); + } + else + { + RescheduleTimerList(); +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + } + else + { + /** + * We should never end up in this case + * However, if due to any bug in the timer server this is the case, the mistake may not impact the user. + * We could just clean the interrupt flag and get out from this unexpected interrupt + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + return; +} + +void HW_TS_Init(HW_TS_InitMode_t TimerInitMode, RTC_HandleTypeDef *hrtc) +{ + uint8_t loop; + uint32_t localmaxwakeuptimersetup; + + /** + * Get RTC handler + */ + phrtc = hrtc; + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + SET_BIT(RTC->CR, RTC_CR_BYPSHAD); + + /** + * Readout the user config + */ + WakeupTimerDivider = (4 - ((uint32_t)(READ_BIT(RTC->CR, RTC_CR_WUCKSEL)))); + + AsynchPrescalerUserConfig = (uint8_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_A) >> (uint32_t)POSITION_VAL(RTC_PRER_PREDIV_A)) + 1; + + SynchPrescalerUserConfig = (uint16_t)(READ_BIT(RTC->PRER, RTC_PRER_PREDIV_S)) + 1; + + /** + * Margin is taken to avoid wrong calculation when the wrap around is there and some + * application interrupts may have delayed the reading + */ + localmaxwakeuptimersetup = ((((SynchPrescalerUserConfig - 1)*AsynchPrescalerUserConfig) - CFG_HW_TS_RTC_HANDLER_MAX_DELAY) >> WakeupTimerDivider); + + if(localmaxwakeuptimersetup >= 0xFFFF) + { + MaxWakeupTimerSetup = 0xFFFF; + } + else + { + MaxWakeupTimerSetup = (uint16_t)localmaxwakeuptimersetup; + } + + /** + * Configure EXTI module + */ + LL_EXTI_EnableRisingTrig_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + LL_EXTI_EnableIT_0_31(RTC_EXTI_LINE_WAKEUPTIMER_EVENT); + + if(TimerInitMode == hw_ts_InitMode_Full) + { + WakeupTimerLimitation = WakeupTimerValue_LargeEnough; + SSRValueOnLastSetup = SSR_FORBIDDEN_VALUE; + + /** + * Initialize the timer server + */ + for(loop = 0; loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; loop++) + { + aTimerContext[loop].TimerIDStatus = TimerID_Free; + } + + CurrentRunningTimerID = CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER; /**< Set ID to non valid value */ + + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + __HAL_RTC_WAKEUPTIMER_ENABLE_IT(phrtc, RTC_IT_WUT); /**< Enable interrupt in RTC module */ + } + else + { + if(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTF) != RESET) + { + /** + * Simulate that the Timer expired + */ + HAL_NVIC_SetPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_SetPriority(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_PREEMPTPRIO, CFG_HW_TS_NVIC_RTC_WAKEUP_IT_SUBPRIO); /**< Set NVIC priority */ + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + + return; +} + +HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pftimeout_handler) +{ + HW_TS_ReturnStatus_t localreturnstatus; + uint8_t loop = 0; +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + while((loop < CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) && (aTimerContext[loop].TimerIDStatus != TimerID_Free)) + { + loop++; + } + + if(loop != CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + aTimerContext[loop].TimerIDStatus = TimerID_Created; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + aTimerContext[loop].TimerProcessID = TimerProcessID; + aTimerContext[loop].TimerMode = TimerMode; + aTimerContext[loop].pTimerCallBack = pftimeout_handler; + *pTimerId = loop; + + localreturnstatus = hw_ts_Successful; + } + else + { +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + localreturnstatus = hw_ts_Failed; + } + + return(localreturnstatus); +} + +void HW_TS_Delete(uint8_t timer_id) +{ + HW_TS_Stop(timer_id); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Free; /**< release ID */ + + return; +} + +void HW_TS_Stop(uint8_t timer_id) +{ + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + UnlinkTimer(timer_id, SSR_Read_Requested); + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(localcurrentrunningtimerid == CFG_HW_TS_MAX_NBR_CONCURRENT_TIMER) + { + /** + * List is empty + */ + + /** + * Disable the timer + */ + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + /** + * Wait for the flag to be back to 0 when the wakeup timer is enabled + */ + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == SET); + } + __HAL_RTC_WAKEUPTIMER_DISABLE(phrtc); /**< Disable the Wakeup Timer */ + + while(__HAL_RTC_WAKEUPTIMER_GET_FLAG(phrtc, RTC_FLAG_WUTWF) == RESET); + + /** + * make sure to clear the flags after checking the WUTWF. + * It takes 2 RTCCLK between the time the WUTE bit is disabled and the + * time the timer is disabled. The WUTWF bit somehow guarantee the system is stable + * Otherwise, when the timer is periodic with 1 Tick, it may generate an extra interrupt in between + * due to the autoreload feature + */ + __HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(phrtc, RTC_FLAG_WUTF); /**< Clear flag in RTC module */ + __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG(); /**< Clear flag in EXTI module */ + HAL_NVIC_ClearPendingIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Clear pending bit in NVIC */ + } + else if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +void HW_TS_Start(uint8_t timer_id, uint32_t timeout_ticks) +{ + uint16_t time_elapsed; + uint8_t localcurrentrunningtimerid; + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + uint32_t primask_bit; +#endif + + if(aTimerContext[timer_id].TimerIDStatus == TimerID_Running) + { + HW_TS_Stop( timer_id ); + } + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ +#endif + + HAL_NVIC_DisableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Disable NVIC */ + + /* Disable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_DISABLE( phrtc ); + + aTimerContext[timer_id].TimerIDStatus = TimerID_Running; + + aTimerContext[timer_id].CountLeft = timeout_ticks; + aTimerContext[timer_id].CounterInit = timeout_ticks; + + time_elapsed = linkTimer(timer_id); + + localcurrentrunningtimerid = CurrentRunningTimerID; + + if(PreviousRunningTimerID != localcurrentrunningtimerid) + { + RescheduleTimerList(); + } + else + { + aTimerContext[timer_id].CountLeft -= time_elapsed; + } + + /* Enable the write protection for RTC registers */ + __HAL_RTC_WRITEPROTECTION_ENABLE( phrtc ); + + HAL_NVIC_EnableIRQ(CFG_HW_TS_RTC_WAKEUP_HANDLER_ID); /**< Enable NVIC */ + +#if (CFG_HW_TS_USE_PRIMASK_AS_CRITICAL_SECTION == 1) + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ +#endif + + return; +} + +uint16_t HW_TS_RTC_ReadLeftTicksToCount(void) +{ + uint32_t primask_bit; + uint16_t return_value, auro_reload_value, elapsed_time_value; + + primask_bit = __get_PRIMASK(); /**< backup PRIMASK bit */ + __disable_irq(); /**< Disable all interrupts by setting PRIMASK bit on Cortex*/ + + if((READ_BIT(RTC->CR, RTC_CR_WUTE) == (RTC_CR_WUTE)) == SET) + { + auro_reload_value = (uint32_t)(READ_BIT(RTC->WUTR, RTC_WUTR_WUT)); + + elapsed_time_value = ReturnTimeElapsed(); + + if(auro_reload_value > elapsed_time_value) + { + return_value = auro_reload_value - elapsed_time_value; + } + else + { + return_value = 0; + } + } + else + { + return_value = TIMER_LIST_EMPTY; + } + + __set_PRIMASK(primask_bit); /**< Restore PRIMASK bit*/ + + return (return_value); +} + +__weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS_pTimerCb_t pTimerCallBack) +{ + pTimerCallBack(); + + return; +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_uart.c new file mode 100644 index 000000000..166acccd5 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_uart.c @@ -0,0 +1,318 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : Src/hw_uart.c + * Description : HW UART source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "hw_conf.h" +#if (CFG_HW_LPUART1_ENABLED == 1) +extern UART_HandleTypeDef hlpuart1; +#endif +#if (CFG_HW_USART1_ENABLED == 1) +extern UART_HandleTypeDef huart1; +#endif + +/* Macros --------------------------------------------------------------------*/ +#define HW_UART_RX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##RxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Receive_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX_IT(__HANDLE__, __USART_BASE__) \ + do{ \ + HW_##__HANDLE__##TxCb = cb; \ + (__HANDLE__).Instance = (__USART_BASE__); \ + HAL_UART_Transmit_IT(&(__HANDLE__), p_data, size); \ + } while(0) + +#define HW_UART_TX(__HANDLE__, __USART_BASE__) \ + do{ \ + (__HANDLE__).Instance = (__USART_BASE__); \ + hal_status = HAL_UART_Transmit(&(__HANDLE__), p_data, size, timeout); \ + } while(0) + +/* Variables -----------------------------------------------------------------*/ +#if (CFG_HW_USART1_ENABLED == 1) +#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) + DMA_HandleTypeDef HW_hdma_huart1_tx ={0}; +#endif + void (*HW_huart1RxCb)(void); + void (*HW_huart1TxCb)(void); +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) +#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) + DMA_HandleTypeDef HW_hdma_hlpuart1_tx ={0}; +#endif + void (*HW_hlpuart1RxCb)(void); + void (*HW_hlpuart1TxCb)(void); +#endif + +void HW_UART_Receive_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_RX_IT(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_RX_IT(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + return; +} + +void HW_UART_Transmit_IT(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_TX_IT(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_TX_IT(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + return; +} + +hw_status_t HW_UART_Transmit(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, uint32_t timeout) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_UART_TX(huart1, USART1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_UART_TX(hlpuart1, LPUART1); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +hw_status_t HW_UART_Transmit_DMA(hw_uart_id_t hw_uart_id, uint8_t *p_data, uint16_t size, void (*cb)(void)) +{ + HAL_StatusTypeDef hal_status = HAL_OK; + hw_status_t hw_status = hw_uart_ok; + + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HW_huart1TxCb = cb; + huart1.Instance = USART1; + hal_status = HAL_UART_Transmit_DMA(&huart1, p_data, size); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HW_hlpuart1TxCb = cb; + hlpuart1.Instance = LPUART1; + hal_status = HAL_UART_Transmit_DMA(&hlpuart1, p_data, size); + break; +#endif + + default: + break; + } + + switch (hal_status) + { + case HAL_OK: + hw_status = hw_uart_ok; + break; + + case HAL_ERROR: + hw_status = hw_uart_error; + break; + + case HAL_BUSY: + hw_status = hw_uart_busy; + break; + + case HAL_TIMEOUT: + hw_status = hw_uart_to; + break; + + default: + break; + } + + return hw_status; +} + +void HW_UART_Interrupt_Handler(hw_uart_id_t hw_uart_id) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_ENABLED == 1) + case hw_uart1: + HAL_UART_IRQHandler(&huart1); + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case hw_lpuart1: + HAL_UART_IRQHandler(&hlpuart1); + break; +#endif + + default: + break; + } + + return; +} + +void HW_UART_DMA_Interrupt_Handler(hw_uart_id_t hw_uart_id) +{ + switch (hw_uart_id) + { +#if (CFG_HW_USART1_DMA_TX_SUPPORTED == 1) + case hw_uart1: + HAL_DMA_IRQHandler(huart1.hdmatx); + break; +#endif + +#if (CFG_HW_LPUART1_DMA_TX_SUPPORTED == 1) + case hw_lpuart1: + HAL_DMA_IRQHandler(hlpuart1.hdmatx); + break; +#endif + + default: + break; + } + + return; +} + +void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { +#if (CFG_HW_USART1_ENABLED == 1) + case (uint32_t)USART1: + if(HW_huart1RxCb) + { + HW_huart1RxCb(); + } + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case (uint32_t)LPUART1: + if(HW_hlpuart1RxCb) + { + HW_hlpuart1RxCb(); + } + break; +#endif + + default: + break; + } + + return; +} + +void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) +{ + switch ((uint32_t)huart->Instance) + { +#if (CFG_HW_USART1_ENABLED == 1) + case (uint32_t)USART1: + if(HW_huart1TxCb) + { + HW_huart1TxCb(); + } + break; +#endif + +#if (CFG_HW_LPUART1_ENABLED == 1) + case (uint32_t)LPUART1: + if(HW_hlpuart1TxCb) + { + HW_hlpuart1TxCb(); + } + break; +#endif + + default: + break; + } + + return; +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/main.c new file mode 100644 index 000000000..abffc37ec --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/main.c @@ -0,0 +1,464 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.c + * @brief : Main program body + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @verbatim + ============================================================================== + ##### IMPORTANT NOTE ##### + ============================================================================== + + This application requests having the stm32wb5x_Thread_FTD_fw.bin binary + flashed on the Wireless Coprocessor. + If it is not the case, you need to use STM32CubeProgrammer to load the appropriate + binary. + + All available binaries are located under following directory: + /Projects/STM32_Copro_Wireless_Binaries + + Refer to UM2237 to learn how to use/install STM32CubeProgrammer. + Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the + detailed procedure to change the Wireless Coprocessor binary. + + @endverbatim + ****************************************************************************** + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +IPCC_HandleTypeDef hipcc; + +UART_HandleTypeDef hlpuart1; +UART_HandleTypeDef huart1; +DMA_HandleTypeDef hdma_lpuart1_tx; +DMA_HandleTypeDef hdma_usart1_tx; + +RTC_HandleTypeDef hrtc; + +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +void SystemClock_Config(void); +static void MX_GPIO_Init(void); +static void MX_DMA_Init(void); +static void MX_RF_Init(void); +static void MX_RTC_Init(void); +static void MX_IPCC_Init(void); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/** + * @brief The application entry point. + * @retval int + */ +int main(void) +{ + /* USER CODE BEGIN 1 */ + + /* USER CODE END 1 */ + + /* MCU Configuration--------------------------------------------------------*/ + + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + HAL_Init(); + /* Config code for STM32_WPAN (HSE Tuning must be done before system clock configuration) */ + MX_APPE_Config(); + + /* USER CODE BEGIN Init */ + + /* USER CODE END Init */ + + /* Configure the system clock */ + SystemClock_Config(); + + /* IPCC initialisation */ + MX_IPCC_Init(); + + /* USER CODE BEGIN SysInit */ + + /* USER CODE END SysInit */ + + /* Initialize all configured peripherals */ + MX_GPIO_Init(); + MX_DMA_Init(); + MX_RF_Init(); + MX_RTC_Init(); + /* USER CODE BEGIN 2 */ + + /* USER CODE END 2 */ + + /* Init code for STM32_WPAN */ + MX_APPE_Init(); + /* Infinite loop */ + /* USER CODE BEGIN WHILE */ + while (1) + { + /* USER CODE END WHILE */ + MX_APPE_Process(); + + /* USER CODE BEGIN 3 */ + } + /* USER CODE END 3 */ +} + +/** + * @brief System Clock Configuration + * @retval None + */ +void SystemClock_Config(void) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Configure LSE Drive Capability + */ + HAL_PWR_EnableBkUpAccess(); + __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW); + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); + /** Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSE + |RCC_OSCILLATORTYPE_LSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.LSEState = RCC_LSE_ON; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } + /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK4|RCC_CLOCKTYPE_HCLK2 + |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK + |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSE; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.AHBCLK4Divider = RCC_SYSCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + Error_Handler(); + } + /** Initializes the peripherals clocks + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP + |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 + |RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; + PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; + PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN Smps */ + + /* USER CODE END Smps */ +} + +/** + * @brief IPCC Initialization Function + * @param None + * @retval None + */ +static void MX_IPCC_Init(void) +{ + + /* USER CODE BEGIN IPCC_Init 0 */ + + /* USER CODE END IPCC_Init 0 */ + + /* USER CODE BEGIN IPCC_Init 1 */ + + /* USER CODE END IPCC_Init 1 */ + hipcc.Instance = IPCC; + if (HAL_IPCC_Init(&hipcc) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN IPCC_Init 2 */ + + /* USER CODE END IPCC_Init 2 */ + +} + +/** + * @brief LPUART1 Initialization Function + * @param None + * @retval None + */ +void MX_LPUART1_UART_Init(void) +{ + + /* USER CODE BEGIN LPUART1_Init 0 */ + + /* USER CODE END LPUART1_Init 0 */ + + /* USER CODE BEGIN LPUART1_Init 1 */ + + /* USER CODE END LPUART1_Init 1 */ + hlpuart1.Instance = LPUART1; + hlpuart1.Init.BaudRate = 115200; + hlpuart1.Init.WordLength = UART_WORDLENGTH_8B; + hlpuart1.Init.StopBits = UART_STOPBITS_1; + hlpuart1.Init.Parity = UART_PARITY_NONE; + hlpuart1.Init.Mode = UART_MODE_TX_RX; + hlpuart1.Init.HwFlowCtl = UART_HWCONTROL_NONE; + hlpuart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; + hlpuart1.Init.ClockPrescaler = UART_PRESCALER_DIV1; + hlpuart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; + hlpuart1.FifoMode = UART_FIFOMODE_DISABLE; + if (HAL_UART_Init(&hlpuart1) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetTxFifoThreshold(&hlpuart1, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetRxFifoThreshold(&hlpuart1, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_DisableFifoMode(&hlpuart1) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN LPUART1_Init 2 */ + + /* USER CODE END LPUART1_Init 2 */ + +} + +/** + * @brief USART1 Initialization Function + * @param None + * @retval None + */ +void MX_USART1_UART_Init(void) +{ + + /* USER CODE BEGIN USART1_Init 0 */ + + /* USER CODE END USART1_Init 0 */ + + /* USER CODE BEGIN USART1_Init 1 */ + + /* USER CODE END USART1_Init 1 */ + huart1.Instance = USART1; + huart1.Init.BaudRate = 115200; + huart1.Init.WordLength = UART_WORDLENGTH_8B; + huart1.Init.StopBits = UART_STOPBITS_1; + huart1.Init.Parity = UART_PARITY_NONE; + huart1.Init.Mode = UART_MODE_TX_RX; + huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE; + huart1.Init.OverSampling = UART_OVERSAMPLING_8; + huart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; + huart1.Init.ClockPrescaler = UART_PRESCALER_DIV1; + huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; + if (HAL_UART_Init(&huart1) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetTxFifoThreshold(&huart1, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_SetRxFifoThreshold(&huart1, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK) + { + Error_Handler(); + } + if (HAL_UARTEx_DisableFifoMode(&huart1) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN USART1_Init 2 */ + + /* USER CODE END USART1_Init 2 */ + +} + +/** + * @brief RF Initialization Function + * @param None + * @retval None + */ +static void MX_RF_Init(void) +{ + + /* USER CODE BEGIN RF_Init 0 */ + + /* USER CODE END RF_Init 0 */ + + /* USER CODE BEGIN RF_Init 1 */ + + /* USER CODE END RF_Init 1 */ + /* USER CODE BEGIN RF_Init 2 */ + + /* USER CODE END RF_Init 2 */ + +} + +/** + * @brief RTC Initialization Function + * @param None + * @retval None + */ +static void MX_RTC_Init(void) +{ + + /* USER CODE BEGIN RTC_Init 0 */ + + /* USER CODE END RTC_Init 0 */ + + /* USER CODE BEGIN RTC_Init 1 */ + + /* USER CODE END RTC_Init 1 */ + /** Initialize RTC Only + */ + hrtc.Instance = RTC; + hrtc.Init.HourFormat = RTC_HOURFORMAT_24; + hrtc.Init.AsynchPrediv = CFG_RTC_ASYNCH_PRESCALER; + hrtc.Init.SynchPrediv = CFG_RTC_SYNCH_PRESCALER; + hrtc.Init.OutPut = RTC_OUTPUT_DISABLE; + hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH; + hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN; + hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE; + if (HAL_RTC_Init(&hrtc) != HAL_OK) + { + Error_Handler(); + } + /** Enable the WakeUp + */ + if (HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, 0, RTC_WAKEUPCLOCK_RTCCLK_DIV16) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN RTC_Init 2 */ + + /* USER CODE END RTC_Init 2 */ + +} + +/** + * Enable DMA controller clock + */ +static void MX_DMA_Init(void) +{ + + /* DMA controller clock enable */ + __HAL_RCC_DMAMUX1_CLK_ENABLE(); + __HAL_RCC_DMA1_CLK_ENABLE(); + + /* DMA interrupt init */ + /* DMA1_Channel1_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn); + /* DMA1_Channel2_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA1_Channel2_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA1_Channel2_IRQn); + +} + +/** + * @brief GPIO Initialization Function + * @param None + * @retval None + */ +static void MX_GPIO_Init(void) +{ + + /* GPIO Ports Clock Enable */ + __HAL_RCC_GPIOC_CLK_ENABLE(); + __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); + +} + +/* USER CODE BEGIN 4 */ + +/* USER CODE END 4 */ + +/** + * @brief This function is executed in case of error occurrence. + * @retval None + */ +void Error_Handler(void) +{ + /* USER CODE BEGIN Error_Handler_Debug */ + /* User can add his own implementation to report the HAL error return state */ + + /* USER CODE END Error_Handler_Debug */ +} + +#ifdef USE_FULL_ASSERT +/** + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ +void assert_failed(uint8_t *file, uint32_t line) +{ + /* USER CODE BEGIN 6 */ + /* User can add his own implementation to report the file name and line number, + ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* USER CODE END 6 */ +} +#endif /* USE_FULL_ASSERT */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32_lpm_if.c new file mode 100644 index 000000000..fd5ffa733 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32_lpm_if.c @@ -0,0 +1,349 @@ +/* USER CODE BEGIN Header */ +/** + *************************************************************************************** + * File Name : stm32_lpm_if.c + * Description : Low layer function to enter/exit low power modes (stop, sleep). + *************************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "stm32_lpm_if.h" +#include "stm32_lpm.h" +#include "app_conf.h" +/* USER CODE BEGIN include */ + +/* USER CODE END include */ + +/* Exported variables --------------------------------------------------------*/ +const struct UTIL_LPM_Driver_s UTIL_PowerDriver = +{ + PWR_EnterSleepMode, + PWR_ExitSleepMode, + + PWR_EnterStopMode, + PWR_ExitStopMode, + + PWR_EnterOffMode, + PWR_ExitOffMode, +}; + +/* Private function prototypes -----------------------------------------------*/ +static void Switch_On_HSI( void ); +static void EnterLowPower( void ); +static void ExitLowPower( void ); +/* USER CODE BEGIN Private_Function_Prototypes */ + +/* USER CODE END Private_Function_Prototypes */ +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN Private_Typedef */ + +/* USER CODE END Private_Typedef */ +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Define */ + +/* USER CODE END Private_Define */ +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Private_Macro */ + +/* USER CODE END Private_Macro */ +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN Private_Variables */ + +/* USER CODE END Private_Variables */ + +/* Functions Definition ------------------------------------------------------*/ +/** + * @brief Enters Low Power Off Mode + * @param none + * @retval none + */ +void PWR_EnterOffMode( void ) +{ +/* USER CODE BEGIN PWR_EnterOffMode_1 */ + +/* USER CODE END PWR_EnterOffMode_1 */ + /** + * The systick should be disabled for the same reason than when the device enters stop mode because + * at this time, the device may enter either OffMode or StopMode. + */ + HAL_SuspendTick(); + + EnterLowPower(); + + /************************************************************************************ + * ENTER OFF MODE + ***********************************************************************************/ + /* + * There is no risk to clear all the WUF here because in the current implementation, this API is called + * in critical section. If an interrupt occurs while in that critical section before that point, + * the flag is set and will be cleared here but the system will not enter Off Mode + * because an interrupt is pending in the NVIC. The ISR will be executed when moving out + * of this critical section + */ + LL_PWR_ClearFlag_WU( ); + + LL_PWR_SetPowerMode( LL_PWR_MODE_STANDBY ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterOffMode_2 */ + +/* USER CODE END PWR_EnterOffMode_2 */ + return; +} + +/** + * @brief Exits Low Power Off Mode + * @param none + * @retval none + */ +void PWR_ExitOffMode( void ) +{ +/* USER CODE BEGIN PWR_ExitOffMode_1 */ + +/* USER CODE END PWR_ExitOffMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitOffMode_2 */ + +/* USER CODE END PWR_ExitOffMode_2 */ + return; +} + +/** + * @brief Enters Low Power Stop Mode + * @note ARM exists the function when waking up + * @param none + * @retval none + */ +void PWR_EnterStopMode( void ) +{ +/* USER CODE BEGIN PWR_EnterStopMode_1 */ + +/* USER CODE END PWR_EnterStopMode_1 */ + /** + * When HAL_DBGMCU_EnableDBGStopMode() is called to keep the debugger active in Stop Mode, + * the systick shall be disabled otherwise the cpu may crash when moving out from stop mode + * + * When in production, the HAL_DBGMCU_EnableDBGStopMode() is not called so that the device can reach best power consumption + * However, the systick should be disabled anyway to avoid the case when it is about to expire at the same time the device enters + * stop mode ( this will abort the Stop Mode entry ). + */ + HAL_SuspendTick(); + + /** + * This function is called from CRITICAL SECTION + */ + EnterLowPower(); + + /************************************************************************************ + * ENTER STOP MODE + ***********************************************************************************/ + LL_PWR_SetPowerMode( LL_PWR_MODE_STOP2 ); + + LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores( ); +#endif + + __WFI(); + +/* USER CODE BEGIN PWR_EnterStopMode_2 */ + +/* USER CODE END PWR_EnterStopMode_2 */ + return; +} + +/** + * @brief Exits Low Power Stop Mode + * @note Enable the pll at 32MHz + * @param none + * @retval none + */ +void PWR_ExitStopMode( void ) +{ +/* USER CODE BEGIN PWR_ExitStopMode_1 */ + +/* USER CODE END PWR_ExitStopMode_1 */ + /** + * This function is called from CRITICAL SECTION + */ + ExitLowPower(); + + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitStopMode_2 */ + +/* USER CODE END PWR_ExitStopMode_2 */ + return; +} + +/** + * @brief Enters Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_EnterSleepMode( void ) +{ +/* USER CODE BEGIN PWR_EnterSleepMode_1 */ + +/* USER CODE END PWR_EnterSleepMode_1 */ + + HAL_SuspendTick(); + + /************************************************************************************ + * ENTER SLEEP MODE + ***********************************************************************************/ + LL_LPM_EnableSleep( ); /**< Clear SLEEPDEEP bit of Cortex System Control Register */ + + /** + * This option is used to ensure that store operations are completed + */ +#if defined ( __CC_ARM) + __force_stores(); +#endif + + __WFI( ); +/* USER CODE BEGIN PWR_EnterSleepMode_2 */ + +/* USER CODE END PWR_EnterSleepMode_2 */ + return; +} + +/** + * @brief Exits Low Power Sleep Mode + * @note ARM exits the function when waking up + * @param none + * @retval none + */ +void PWR_ExitSleepMode( void ) +{ +/* USER CODE BEGIN PWR_ExitSleepMode_1 */ + +/* USER CODE END PWR_ExitSleepMode_1 */ + HAL_ResumeTick(); +/* USER CODE BEGIN PWR_ExitSleepMode_2 */ + +/* USER CODE END PWR_ExitSleepMode_2 */ + return; +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ +/** + * @brief Setup the system to enter either stop or off mode + * @param none + * @retval none + */ +static void EnterLowPower( void ) +{ + /** + * This function is called from CRITICAL SECTION + */ + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if ( ! LL_HSEM_1StepLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID ) ) + { + if( LL_PWR_IsActiveFlag_C2DS() || LL_PWR_IsActiveFlag_C2SB() ) + { + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + Switch_On_HSI( ); + } + } + else + { + Switch_On_HSI( ); + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Restore the system to exit stop mode + * @param none + * @retval none + */ +static void ExitLowPower( void ) +{ + /* Release ENTRY_STOP_MODE semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); + + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RCC_SEMID ) ); + + if(LL_RCC_GetSysClkSource( ) == LL_RCC_SYS_CLKSOURCE_STATUS_HSI) + { +/* Restore the clock configuration of the application in this user section */ +/* USER CODE BEGIN ExitLowPower_1 */ + LL_RCC_HSE_Enable( ); + __HAL_FLASH_SET_LATENCY(FLASH_LATENCY_1); + while(!LL_RCC_HSE_IsReady( )); + LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSE); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSE); +/* USER CODE END ExitLowPower_1 */ + } + else + { +/* If the application is not running on HSE restore the clock configuration in this user section */ +/* USER CODE BEGIN ExitLowPower_2 */ + +/* USER CODE END ExitLowPower_2 */ + } + + /* Release RCC semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RCC_SEMID, 0 ); + + return; +} + +/** + * @brief Switch the system clock on HSI + * @param none + * @retval none + */ +static void Switch_On_HSI( void ) +{ + LL_RCC_HSI_Enable( ); + while(!LL_RCC_HSI_IsReady( )); + LL_RCC_SetSysClkSource( LL_RCC_SYS_CLKSOURCE_HSI ); + LL_RCC_SetSMPSClockSource(LL_RCC_SMPS_CLKSOURCE_HSI); + while (LL_RCC_GetSysClkSource( ) != LL_RCC_SYS_CLKSOURCE_STATUS_HSI); + return; +} + +/* USER CODE BEGIN Private_Functions */ + +/* USER CODE END Private_Functions */ + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c new file mode 100644 index 000000000..dfdb36038 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c @@ -0,0 +1,371 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : stm32wbxx_hal_msp.c + * Description : This file provides code for the MSP Initialization + * and de-Initialization codes. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ +extern DMA_HandleTypeDef hdma_lpuart1_tx; + +extern DMA_HandleTypeDef hdma_usart1_tx; + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN Define */ + +/* USER CODE END Define */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN Macro */ + +/* USER CODE END Macro */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* External functions --------------------------------------------------------*/ +/* USER CODE BEGIN ExternalFunctions */ + +/* USER CODE END ExternalFunctions */ + +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ +/** + * Initializes the Global MSP. + */ +void HAL_MspInit(void) +{ + /* USER CODE BEGIN MspInit 0 */ + + /* USER CODE END MspInit 0 */ + + __HAL_RCC_HSEM_CLK_ENABLE(); + + /* System interrupt init*/ + + /* Peripheral interrupt init */ + /* PVD_PVM_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(PVD_PVM_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(PVD_PVM_IRQn); + /* FLASH_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(FLASH_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(FLASH_IRQn); + /* RCC_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(RCC_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(RCC_IRQn); + /* C2SEV_PWR_C2H_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(C2SEV_PWR_C2H_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(C2SEV_PWR_C2H_IRQn); + /* PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQn); + /* HSEM_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(HSEM_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(HSEM_IRQn); + /* FPU_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(FPU_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(FPU_IRQn); + + /* USER CODE BEGIN MspInit 1 */ + + /* USER CODE END MspInit 1 */ +} + +/** +* @brief IPCC MSP Initialization +* This function configures the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspInit 0 */ + + /* USER CODE END IPCC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_IPCC_CLK_ENABLE(); + /* IPCC interrupt Init */ + HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspInit 1 */ + + /* USER CODE END IPCC_MspInit 1 */ + } + +} + +/** +* @brief IPCC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hipcc: IPCC handle pointer +* @retval None +*/ +void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) +{ + if(hipcc->Instance==IPCC) + { + /* USER CODE BEGIN IPCC_MspDeInit 0 */ + + /* USER CODE END IPCC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_IPCC_CLK_DISABLE(); + + /* IPCC interrupt DeInit */ + HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn); + /* USER CODE BEGIN IPCC_MspDeInit 1 */ + + /* USER CODE END IPCC_MspDeInit 1 */ + } + +} + +/** +* @brief UART MSP Initialization +* This function configures the hardware resources used in this example +* @param huart: UART handle pointer +* @retval None +*/ +void HAL_UART_MspInit(UART_HandleTypeDef* huart) +{ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + if(huart->Instance==LPUART1) + { + /* USER CODE BEGIN LPUART1_MspInit 0 */ + + /* USER CODE END LPUART1_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_LPUART1_CLK_ENABLE(); + + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**LPUART1 GPIO Configuration + PA2 ------> LPUART1_TX + PA3 ------> LPUART1_RX + */ + GPIO_InitStruct.Pin = GPIO_PIN_2|GPIO_PIN_3; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF8_LPUART1; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + + /* LPUART1 DMA Init */ + /* LPUART1_TX Init */ + hdma_lpuart1_tx.Instance = DMA1_Channel1; + hdma_lpuart1_tx.Init.Request = DMA_REQUEST_LPUART1_TX; + hdma_lpuart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; + hdma_lpuart1_tx.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_lpuart1_tx.Init.MemInc = DMA_MINC_ENABLE; + hdma_lpuart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; + hdma_lpuart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; + hdma_lpuart1_tx.Init.Mode = DMA_NORMAL; + hdma_lpuart1_tx.Init.Priority = DMA_PRIORITY_LOW; + if (HAL_DMA_Init(&hdma_lpuart1_tx) != HAL_OK) + { + Error_Handler(); + } + + __HAL_LINKDMA(huart,hdmatx,hdma_lpuart1_tx); + + /* LPUART1 interrupt Init */ + HAL_NVIC_SetPriority(LPUART1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(LPUART1_IRQn); + /* USER CODE BEGIN LPUART1_MspInit 1 */ + + /* USER CODE END LPUART1_MspInit 1 */ + } + else if(huart->Instance==USART1) + { + /* USER CODE BEGIN USART1_MspInit 0 */ + + /* USER CODE END USART1_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_USART1_CLK_ENABLE(); + + __HAL_RCC_GPIOB_CLK_ENABLE(); + /**USART1 GPIO Configuration + PB6 ------> USART1_TX + PB7 ------> USART1_RX + */ + GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF7_USART1; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + + /* USART1 DMA Init */ + /* USART1_TX Init */ + hdma_usart1_tx.Instance = DMA1_Channel2; + hdma_usart1_tx.Init.Request = DMA_REQUEST_USART1_TX; + hdma_usart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; + hdma_usart1_tx.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_usart1_tx.Init.MemInc = DMA_MINC_ENABLE; + hdma_usart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; + hdma_usart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; + hdma_usart1_tx.Init.Mode = DMA_NORMAL; + hdma_usart1_tx.Init.Priority = DMA_PRIORITY_LOW; + if (HAL_DMA_Init(&hdma_usart1_tx) != HAL_OK) + { + Error_Handler(); + } + + __HAL_LINKDMA(huart,hdmatx,hdma_usart1_tx); + + /* USART1 interrupt Init */ + HAL_NVIC_SetPriority(USART1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(USART1_IRQn); + /* USER CODE BEGIN USART1_MspInit 1 */ + + /* USER CODE END USART1_MspInit 1 */ + } + +} + +/** +* @brief UART MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param huart: UART handle pointer +* @retval None +*/ +void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) +{ + if(huart->Instance==LPUART1) + { + /* USER CODE BEGIN LPUART1_MspDeInit 0 */ + + /* USER CODE END LPUART1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_LPUART1_CLK_DISABLE(); + + /**LPUART1 GPIO Configuration + PA2 ------> LPUART1_TX + PA3 ------> LPUART1_RX + */ + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3); + + /* LPUART1 DMA DeInit */ + HAL_DMA_DeInit(huart->hdmatx); + + /* LPUART1 interrupt DeInit */ + HAL_NVIC_DisableIRQ(LPUART1_IRQn); + /* USER CODE BEGIN LPUART1_MspDeInit 1 */ + + /* USER CODE END LPUART1_MspDeInit 1 */ + } + else if(huart->Instance==USART1) + { + /* USER CODE BEGIN USART1_MspDeInit 0 */ + + /* USER CODE END USART1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_USART1_CLK_DISABLE(); + + /**USART1 GPIO Configuration + PB6 ------> USART1_TX + PB7 ------> USART1_RX + */ + HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6|GPIO_PIN_7); + + /* USART1 DMA DeInit */ + HAL_DMA_DeInit(huart->hdmatx); + + /* USART1 interrupt DeInit */ + HAL_NVIC_DisableIRQ(USART1_IRQn); + /* USER CODE BEGIN USART1_MspDeInit 1 */ + + /* USER CODE END USART1_MspDeInit 1 */ + } + +} + +/** +* @brief RTC MSP Initialization +* This function configures the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspInit 0 */ + + /* USER CODE END RTC_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_RTC_ENABLE(); + __HAL_RCC_RTCAPB_CLK_ENABLE(); + /* RTC interrupt Init */ + HAL_NVIC_SetPriority(RTC_WKUP_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(RTC_WKUP_IRQn); + /* USER CODE BEGIN RTC_MspInit 1 */ + + /* USER CODE END RTC_MspInit 1 */ + } + +} + +/** +* @brief RTC MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param hrtc: RTC handle pointer +* @retval None +*/ +void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) +{ + if(hrtc->Instance==RTC) + { + /* USER CODE BEGIN RTC_MspDeInit 0 */ + + /* USER CODE END RTC_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_RTC_DISABLE(); + __HAL_RCC_RTCAPB_CLK_DISABLE(); + + /* RTC interrupt DeInit */ + HAL_NVIC_DisableIRQ(RTC_WKUP_IRQn); + /* USER CODE BEGIN RTC_MspDeInit 1 */ + + /* USER CODE END RTC_MspDeInit 1 */ + } + +} + +/* USER CODE BEGIN 1 */ + +/* USER CODE END 1 */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_it.c new file mode 100644 index 000000000..ba0d29946 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_it.c @@ -0,0 +1,410 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file stm32wbxx_it.c + * @brief Interrupt Service Routines. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "stm32wbxx_it.h" +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "hw.h" +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN TD */ + +/* USER CODE END TD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ +/* USER CODE BEGIN PV */ + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/* External variables --------------------------------------------------------*/ +extern IPCC_HandleTypeDef hipcc; +extern DMA_HandleTypeDef hdma_lpuart1_tx; +extern DMA_HandleTypeDef hdma_usart1_tx; +extern UART_HandleTypeDef hlpuart1; +extern UART_HandleTypeDef huart1; +extern RTC_HandleTypeDef hrtc; +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/******************************************************************************/ +/* Cortex Processor Interruption and Exception Handlers */ +/******************************************************************************/ +/** + * @brief This function handles Non maskable interrupt. + */ +void NMI_Handler(void) +{ + /* USER CODE BEGIN NonMaskableInt_IRQn 0 */ + + /* USER CODE END NonMaskableInt_IRQn 0 */ + /* USER CODE BEGIN NonMaskableInt_IRQn 1 */ + + /* USER CODE END NonMaskableInt_IRQn 1 */ +} + +/** + * @brief This function handles Hard fault interrupt. + */ +void HardFault_Handler(void) +{ + /* USER CODE BEGIN HardFault_IRQn 0 */ + + /* USER CODE END HardFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + /* USER CODE END W1_HardFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Memory management fault. + */ +void MemManage_Handler(void) +{ + /* USER CODE BEGIN MemoryManagement_IRQn 0 */ + + /* USER CODE END MemoryManagement_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */ + /* USER CODE END W1_MemoryManagement_IRQn 0 */ + } +} + +/** + * @brief This function handles Prefetch fault, memory access fault. + */ +void BusFault_Handler(void) +{ + /* USER CODE BEGIN BusFault_IRQn 0 */ + + /* USER CODE END BusFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_BusFault_IRQn 0 */ + /* USER CODE END W1_BusFault_IRQn 0 */ + } +} + +/** + * @brief This function handles Undefined instruction or illegal state. + */ +void UsageFault_Handler(void) +{ + /* USER CODE BEGIN UsageFault_IRQn 0 */ + + /* USER CODE END UsageFault_IRQn 0 */ + while (1) + { + /* USER CODE BEGIN W1_UsageFault_IRQn 0 */ + /* USER CODE END W1_UsageFault_IRQn 0 */ + } +} + +/** + * @brief This function handles System service call via SWI instruction. + */ +void SVC_Handler(void) +{ + /* USER CODE BEGIN SVCall_IRQn 0 */ + + /* USER CODE END SVCall_IRQn 0 */ + /* USER CODE BEGIN SVCall_IRQn 1 */ + + /* USER CODE END SVCall_IRQn 1 */ +} + +/** + * @brief This function handles Debug monitor. + */ +void DebugMon_Handler(void) +{ + /* USER CODE BEGIN DebugMonitor_IRQn 0 */ + + /* USER CODE END DebugMonitor_IRQn 0 */ + /* USER CODE BEGIN DebugMonitor_IRQn 1 */ + + /* USER CODE END DebugMonitor_IRQn 1 */ +} + +/** + * @brief This function handles Pendable request for system service. + */ +void PendSV_Handler(void) +{ + /* USER CODE BEGIN PendSV_IRQn 0 */ + + /* USER CODE END PendSV_IRQn 0 */ + /* USER CODE BEGIN PendSV_IRQn 1 */ + + /* USER CODE END PendSV_IRQn 1 */ +} + +/** + * @brief This function handles System tick timer. + */ +void SysTick_Handler(void) +{ + /* USER CODE BEGIN SysTick_IRQn 0 */ + + /* USER CODE END SysTick_IRQn 0 */ + HAL_IncTick(); + /* USER CODE BEGIN SysTick_IRQn 1 */ + + /* USER CODE END SysTick_IRQn 1 */ +} + +/******************************************************************************/ +/* STM32WBxx Peripheral Interrupt Handlers */ +/* Add here the Interrupt Handlers for the used peripherals. */ +/* For the available peripheral interrupt handler names, */ +/* please refer to the startup file (startup_stm32wbxx.s). */ +/******************************************************************************/ + +/** + * @brief This function handles PVD/PVM0/PVM2 interrupts through EXTI lines 16/31/33. + */ +void PVD_PVM_IRQHandler(void) +{ + /* USER CODE BEGIN PVD_PVM_IRQn 0 */ + + /* USER CODE END PVD_PVM_IRQn 0 */ + HAL_PWREx_PVD_PVM_IRQHandler(); + /* USER CODE BEGIN PVD_PVM_IRQn 1 */ + + /* USER CODE END PVD_PVM_IRQn 1 */ +} + +/** + * @brief This function handles RTC wake-up interrupt through EXTI line 19. + */ +void RTC_WKUP_IRQHandler(void) +{ + /* USER CODE BEGIN RTC_WKUP_IRQn 0 */ + + /* USER CODE END RTC_WKUP_IRQn 0 */ + HAL_RTCEx_WakeUpTimerIRQHandler(&hrtc); + /* USER CODE BEGIN RTC_WKUP_IRQn 1 */ + + /* USER CODE END RTC_WKUP_IRQn 1 */ +} + +/** + * @brief This function handles Flash global interrupt. + */ +void FLASH_IRQHandler(void) +{ + /* USER CODE BEGIN FLASH_IRQn 0 */ + + /* USER CODE END FLASH_IRQn 0 */ + HAL_FLASH_IRQHandler(); + /* USER CODE BEGIN FLASH_IRQn 1 */ + + /* USER CODE END FLASH_IRQn 1 */ +} + +/** + * @brief This function handles RCC global interrupt. + */ +void RCC_IRQHandler(void) +{ + /* USER CODE BEGIN RCC_IRQn 0 */ + + /* USER CODE END RCC_IRQn 0 */ + /* USER CODE BEGIN RCC_IRQn 1 */ + + /* USER CODE END RCC_IRQn 1 */ +} + +/** + * @brief This function handles DMA1 channel1 global interrupt. + */ +void DMA1_Channel1_IRQHandler(void) +{ + /* USER CODE BEGIN DMA1_Channel1_IRQn 0 */ + + /* USER CODE END DMA1_Channel1_IRQn 0 */ + HAL_DMA_IRQHandler(&hdma_lpuart1_tx); + /* USER CODE BEGIN DMA1_Channel1_IRQn 1 */ + + /* USER CODE END DMA1_Channel1_IRQn 1 */ +} + +/** + * @brief This function handles DMA1 channel2 global interrupt. + */ +void DMA1_Channel2_IRQHandler(void) +{ + /* USER CODE BEGIN DMA1_Channel2_IRQn 0 */ + + /* USER CODE END DMA1_Channel2_IRQn 0 */ + HAL_DMA_IRQHandler(&hdma_usart1_tx); + /* USER CODE BEGIN DMA1_Channel2_IRQn 1 */ + + /* USER CODE END DMA1_Channel2_IRQn 1 */ +} + +/** + * @brief This function handles CPU2 SEV interrupt through EXTI line 40 and PWR CPU2 HOLD wake-up interrupt. + */ +void C2SEV_PWR_C2H_IRQHandler(void) +{ + /* USER CODE BEGIN C2SEV_PWR_C2H_IRQn 0 */ + + /* USER CODE END C2SEV_PWR_C2H_IRQn 0 */ + /* USER CODE BEGIN C2SEV_PWR_C2H_IRQn 1 */ + + /* USER CODE END C2SEV_PWR_C2H_IRQn 1 */ +} + +/** + * @brief This function handles USART1 global interrupt. + */ +void USART1_IRQHandler(void) +{ + /* USER CODE BEGIN USART1_IRQn 0 */ + + /* USER CODE END USART1_IRQn 0 */ + HAL_UART_IRQHandler(&huart1); + /* USER CODE BEGIN USART1_IRQn 1 */ + + /* USER CODE END USART1_IRQn 1 */ +} + +/** + * @brief This function handles LPUART1 global interrupt. + */ +void LPUART1_IRQHandler(void) +{ + /* USER CODE BEGIN LPUART1_IRQn 0 */ + + /* USER CODE END LPUART1_IRQn 0 */ + HAL_UART_IRQHandler(&hlpuart1); + /* USER CODE BEGIN LPUART1_IRQn 1 */ + + /* USER CODE END LPUART1_IRQn 1 */ +} + +/** + * @brief This function handles PWR switching on the fly, end of BLE activity, end of 802.15.4 activity, end of critical radio phase interrupt. + */ +void PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler(void) +{ + /* USER CODE BEGIN PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQn 0 */ + + /* USER CODE END PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQn 0 */ + /* USER CODE BEGIN PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQn 1 */ + + /* USER CODE END PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQn 1 */ +} + +/** + * @brief This function handles IPCC RX occupied interrupt. + */ +void IPCC_C1_RX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */ + + /* USER CODE END IPCC_C1_RX_IRQn 0 */ + HAL_IPCC_RX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */ + + /* USER CODE END IPCC_C1_RX_IRQn 1 */ +} + +/** + * @brief This function handles IPCC TX free interrupt. + */ +void IPCC_C1_TX_IRQHandler(void) +{ + /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */ + + /* USER CODE END IPCC_C1_TX_IRQn 0 */ + HAL_IPCC_TX_IRQHandler(&hipcc); + /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */ + + /* USER CODE END IPCC_C1_TX_IRQn 1 */ +} + +/** + * @brief This function handles HSEM global interrupt. + */ +void HSEM_IRQHandler(void) +{ + /* USER CODE BEGIN HSEM_IRQn 0 */ + + /* USER CODE END HSEM_IRQn 0 */ + HAL_HSEM_IRQHandler(); + /* USER CODE BEGIN HSEM_IRQn 1 */ + + /* USER CODE END HSEM_IRQn 1 */ +} + +/** + * @brief This function handles FPU global interrupt. + */ +void FPU_IRQHandler(void) +{ + /* USER CODE BEGIN FPU_IRQn 0 */ + + /* USER CODE END FPU_IRQn 0 */ + /* USER CODE BEGIN FPU_IRQn 1 */ + + /* USER CODE END FPU_IRQn 1 */ +} + +/* USER CODE BEGIN 1 */ + + +/** + * @brief This function handles EXTI4_IRQ Handler. + * @param None + * @retval None + */ +void EXTI4_IRQHandler(void) +{ + HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); +} + +/* USER CODE END 1 */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm_logging.c new file mode 100644 index 000000000..aacc61283 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/stm_logging.c @@ -0,0 +1,212 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : stm_logging.c + * Description : This file contains all the defines and functions used + * for logging on Application examples. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/** + * @file + * This file implements logging functions to be used in Application examples. + * + */ + +#include +#include +#include +#include +#include +#include + +#include "app_conf.h" +#include "stm_logging.h" + +#define LOG_PARSE_BUFFER_SIZE 256U + +#define LOG_TIMESTAMP_ENABLE 0 +#define LOG_REGION_ENABLE 1U +#define LOG_RTT_COLOR_ENABLE 1U + +#if (LOG_RTT_COLOR_ENABLE == 1U) +#define RTT_COLOR_CODE_DEFAULT "\x1b[0m" +#define RTT_COLOR_CODE_RED "\x1b[0;91m" +#define RTT_COLOR_CODE_GREEN "\x1b[0;92m" +#define RTT_COLOR_CODE_YELLOW "\x1b[0;93m" +#define RTT_COLOR_CODE_CYAN "\x1b[0;96m" + +#else /* LOG_RTT_COLOR_ENABLE == 1 */ +#define RTT_COLOR_CODE_DEFAULT "" +#define RTT_COLOR_CODE_RED "" +#define RTT_COLOR_CODE_GREEN "" +#define RTT_COLOR_CODE_YELLOW "" +#define RTT_COLOR_CODE_CYAN "" +#endif /* LOG_RTT_COLOR_ENABLE == 1 */ + +#if (CFG_DEBUG_TRACE != 0) +/** + * Function for outputting code region string. + * + * @param[input] aLogString Pointer to log buffer. + * @param[in] aMaxSize Maximum size of log buffer. + * @param[in] otLogRegion The region ID. + * + * @returns String with a log level color value. + */ +static inline uint16_t logRegion(char *aLogString, uint16_t aMaxSize, + appliLogRegion_t aLogRegion) +{ + char logRegionString[30U]; + + switch (aLogRegion) + { + case APPLI_LOG_REGION_GENERAL: + strcpy(logRegionString, "[M4 APPLICATION]"); + break; + case APPLI_LOG_REGION_OPENTHREAD_API: + strcpy(logRegionString, "[M4 OPENTHREAD API]"); + break; + case APPLI_LOG_REGION_OT_API_LINK: + strcpy(logRegionString, "[M4 LINK API]"); + break; + case APPLI_LOG_REGION_OT_API_INSTANCE: + strcpy(logRegionString, "[M4 INSTANCE API]"); + break; + case APPLI_LOG_REGION_OT_API_MESSAGE: + strcpy(logRegionString, "[M4 MESSAGE API]"); + break; + default: + strcpy(logRegionString, "[M4]"); + break; + } + + return snprintf(aLogString, aMaxSize, "%s ", logRegionString); +} +#endif /* CFG_DEBUG_TRACE */ + +#if (LOG_RTT_COLOR_ENABLE == 1U) +#if (CFG_DEBUG_TRACE != 0) +/** + * Function for getting color of a given level log. + * + * @param[in] aLogLevel The log level. + * + * @returns String with a log level color value. + */ +static inline const char *levelToString(appliLogLevel_t aLogLevel) +{ + switch (aLogLevel) + { + case LOG_LEVEL_CRIT: + return RTT_COLOR_CODE_RED; + + case LOG_LEVEL_WARN: + return RTT_COLOR_CODE_YELLOW; + + case LOG_LEVEL_INFO: + return RTT_COLOR_CODE_GREEN; + + case LOG_LEVEL_DEBG: + default: + return RTT_COLOR_CODE_DEFAULT; + } +} +#endif /* CFG_DEBUG_TRACE */ + +#if (CFG_DEBUG_TRACE != 0) +/** + * Function for printing log level. + * + * @param[input] aLogString Pointer to log buffer. + * @param[in] aMaxSize Maximum size of log buffer. + * @param[in] aLogLevel Log level. + * + * @returns Number of bytes successfully written to the log buffer. + */ +static inline uint16_t logLevel(char *aLogString, uint16_t aMaxSize, + appliLogLevel_t aLogLevel) +{ + return snprintf(aLogString, aMaxSize, "%s", levelToString(aLogLevel)); +} +#endif /* CFG_DEBUG_TRACE */ +#endif /* LOG_RTT_COLOR_ENABLE */ + +#if (LOG_TIMESTAMP_ENABLE == 1U) +/** + * Function for printing actual timestamp. + * + * @param[input] aLogString Pointer to the log buffer. + * @param[in] aMaxSize Maximum size of the log buffer. + * + * @returns Number of bytes successfully written to the log buffer. + */ +static inline uint16_t logTimestamp(char *aLogString, uint16_t aMaxSize) +{ + return snprintf(aLogString, aMaxSize, "%s[%010ld]", RTT_COLOR_CODE_DEFAULT, + otPlatAlarmMilliGetNow()); +} +#endif /* LOG_TIMESTAMP_ENABLE */ + +/** + * Function for printing application log + * + * @param[in] aLogLevel Log level. + * @param[in] aLogRegion The region ID. + * @param[in] aFormat User string format. + * + * @returns Number of bytes successfully written to the log buffer. + */ +void logApplication(appliLogLevel_t aLogLevel, appliLogRegion_t aLogRegion, const char *aFormat, ...) +{ +#if (CFG_DEBUG_TRACE != 0) /* Since the traces are disabled, there is nothing to print */ + uint16_t length = 0; + char logString[LOG_PARSE_BUFFER_SIZE + 1U]; + +#if (LOG_TIMESTAMP_ENABLE == 1U) + length += logTimestamp(logString, LOG_PARSE_BUFFER_SIZE); +#endif + +#if (LOG_RTT_COLOR_ENABLE == 1U) + /* Add level information */ + length += logLevel(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), + aLogLevel); +#endif + +#if (LOG_REGION_ENABLE == 1U) + /* Add Region information */ + length += logRegion(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), + aLogRegion); +#endif + + /* Parse user string */ + va_list paramList; + va_start(paramList, aFormat); + length += vsnprintf(&logString[length], (LOG_PARSE_BUFFER_SIZE - length), + aFormat, paramList); + logString[length++] = '\r'; + logString[length++] = '\n'; + logString[length++] = 0; + va_end(paramList); + + if (aLogLevel <= APPLI_CONFIG_LOG_LEVEL) + { + printf("%s", logString); + }else + { + /* Print nothing */ + } +#endif /* CFG_DEBUG_TRACE */ +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/system_stm32wbxx.c new file mode 100644 index 000000000..ff7fcaf3b --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/Core/Src/system_stm32wbxx.c @@ -0,0 +1,350 @@ +/** + ****************************************************************************** + * @file system_stm32wbxx.c + * @author MCD Application Team + * @brief CMSIS Cortex Device Peripheral Access Layer System Source File + * + * This file provides two functions and one global variable to be called from + * user application: + * - SystemInit(): This function is called at startup just after reset and + * before branch to main program. This call is made inside + * the "startup_stm32wbxx.s" file. + * + * - SystemCoreClock variable: Contains the core clock (HCLK), it can be used + * by the user application to setup the SysTick + * timer or configure other parameters. + * + * - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must + * be called whenever the core clock is changed + * during program execution. + * + * After each device reset the MSI (4 MHz) is used as system clock source. + * Then SystemInit() function is called, in "startup_stm32wbxx.s" file, to + * configure the system clock before to branch to main program. + * + * This file configures the system clock as follows: + *============================================================================= + *----------------------------------------------------------------------------- + * System Clock source | MSI + *----------------------------------------------------------------------------- + * SYSCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * HCLK(Hz) | 4000000 + *----------------------------------------------------------------------------- + * AHB Prescaler | 1 + *----------------------------------------------------------------------------- + * APB1 Prescaler | 1 + *----------------------------------------------------------------------------- + * APB2 Prescaler | 1 + *----------------------------------------------------------------------------- + * PLL_M | 1 + *----------------------------------------------------------------------------- + * PLL_N | 8 + *----------------------------------------------------------------------------- + * PLL_P | 7 + *----------------------------------------------------------------------------- + * PLL_Q | 2 + *----------------------------------------------------------------------------- + * PLL_R | 2 + *----------------------------------------------------------------------------- + * PLLSAI1_P | NA + *----------------------------------------------------------------------------- + * PLLSAI1_Q | NA + *----------------------------------------------------------------------------- + * PLLSAI1_R | NA + *----------------------------------------------------------------------------- + * Require 48MHz for USB OTG FS, | Disabled + * SDIO and RNG clock | + *----------------------------------------------------------------------------- + *============================================================================= + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/** @addtogroup CMSIS + * @{ + */ + +/** @addtogroup stm32WBxx_system + * @{ + */ + +/** @addtogroup stm32WBxx_System_Private_Includes + * @{ + */ + +#include "stm32wbxx.h" + +#if !defined (HSE_VALUE) + #define HSE_VALUE (32000000UL) /*!< Value of the External oscillator in Hz */ +#endif /* HSE_VALUE */ + +#if !defined (MSI_VALUE) + #define MSI_VALUE (4000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* MSI_VALUE */ + +#if !defined (HSI_VALUE) + #define HSI_VALUE (16000000UL) /*!< Value of the Internal oscillator in Hz*/ +#endif /* HSI_VALUE */ + +#if !defined (LSI_VALUE) + #define LSI_VALUE (32000UL) /*!< Value of LSI in Hz*/ +#endif /* LSI_VALUE */ + +#if !defined (LSE_VALUE) + #define LSE_VALUE (32768UL) /*!< Value of LSE in Hz*/ +#endif /* LSE_VALUE */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_TypesDefinitions + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Defines + * @{ + */ + +/*!< Uncomment the following line if you need to relocate your vector Table in + Internal SRAM. */ +/* #define VECT_TAB_SRAM */ +#define VECT_TAB_OFFSET 0x0U /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ + +#define VECT_TAB_BASE_ADDRESS SRAM1_BASE /*!< Vector Table base offset field. + This value must be a multiple of 0x200. */ +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Macros + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Variables + * @{ + */ + /* The SystemCoreClock variable is updated in three ways: + 1) by calling CMSIS function SystemCoreClockUpdate() + 2) by calling HAL API function HAL_RCC_GetHCLKFreq() + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency + Note: If you use this function to configure the system clock; then there + is no need to call the 2 first functions listed above, since SystemCoreClock + variable is updated automatically. + */ + uint32_t SystemCoreClock = 4000000UL ; /*CPU1: M4 on MSI clock after startup (4MHz)*/ + + const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL}; + + const uint32_t APBPrescTable[8UL] = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL}; + + const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ + 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ + + const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ + {2UL,6UL,4UL,3UL,2UL,4UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}, \ + {4UL,12UL,8UL,6UL,4UL,8UL}}; + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_FunctionPrototypes + * @{ + */ + +/** + * @} + */ + +/** @addtogroup STM32WBxx_System_Private_Functions + * @{ + */ + +/** + * @brief Setup the microcontroller system. + * @param None + * @retval None + */ +void SystemInit(void) +{ + /* Configure the Vector Table location add offset address ------------------*/ +#if defined(VECT_TAB_SRAM) && defined(VECT_TAB_BASE_ADDRESS) + /* program in SRAMx */ + SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAMx for CPU1 */ +#else /* program in FLASH */ + SCB->VTOR = VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */ +#endif + + /* FPU settings ------------------------------------------------------------*/ + #if (__FPU_PRESENT == 1) && (__FPU_USED == 1) + SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL))); /* set CP10 and CP11 Full Access */ + #endif + + /* Reset the RCC clock configuration to the default reset state ------------*/ + /* Set MSION bit */ + RCC->CR |= RCC_CR_MSION; + + /* Reset CFGR register */ + RCC->CFGR = 0x00070000U; + + /* Reset PLLSAI1ON, PLLON, HSECSSON, HSEON, HSION, and MSIPLLON bits */ + RCC->CR &= (uint32_t)0xFAF6FEFBU; + + /*!< Reset LSI1 and LSI2 bits */ + RCC->CSR &= (uint32_t)0xFFFFFFFAU; + + /*!< Reset HSI48ON bit */ + RCC->CRRCR &= (uint32_t)0xFFFFFFFEU; + + /* Reset PLLCFGR register */ + RCC->PLLCFGR = 0x22041000U; + + /* Reset PLLSAI1CFGR register */ + RCC->PLLSAI1CFGR = 0x22041000U; + + /* Reset HSEBYP bit */ + RCC->CR &= 0xFFFBFFFFU; + + /* Disable all interrupts */ + RCC->CIER = 0x00000000; +} + +/** + * @brief Update SystemCoreClock variable according to Clock Register Values. + * The SystemCoreClock variable contains the core clock (HCLK), it can + * be used by the user application to setup the SysTick timer or configure + * other parameters. + * + * @note Each time the core clock (HCLK) changes, this function must be called + * to update SystemCoreClock variable value. Otherwise, any configuration + * based on this variable will be incorrect. + * + * @note - The system frequency computed by this function is not the real + * frequency in the chip. It is calculated based on the predefined + * constant and the selected clock source: + * + * - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*) + * + * - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**) + * + * - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***) + * + * - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***) + * or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors. + * + * (*) MSI_VALUE is a constant defined in stm32wbxx_hal.h file (default value + * 4 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (**) HSI_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 16 MHz) but the real value may vary depending on the variations + * in voltage and temperature. + * + * (***) HSE_VALUE is a constant defined in stm32wbxx_hal_conf.h file (default value + * 32 MHz), user has to ensure that HSE_VALUE is same as the real + * frequency of the crystal used. Otherwise, this function may + * have wrong result. + * + * - The result of this function could be not correct when using fractional + * value for HSE crystal. + * + * @param None + * @retval None + */ +void SystemCoreClockUpdate(void) +{ + uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm; + + /* Get MSI Range frequency--------------------------------------------------*/ + + /*MSI frequency range in Hz*/ + msirange = MSIRangeTable[(RCC->CR & RCC_CR_MSIRANGE) >> RCC_CR_MSIRANGE_Pos]; + + /* Get SYSCLK source -------------------------------------------------------*/ + switch (RCC->CFGR & RCC_CFGR_SWS) + { + case 0x00: /* MSI used as system clock source */ + SystemCoreClock = msirange; + break; + + case 0x04: /* HSI used as system clock source */ + /* HSI used as system clock source */ + SystemCoreClock = HSI_VALUE; + break; + + case 0x08: /* HSE used as system clock source */ + SystemCoreClock = HSE_VALUE; + break; + + case 0x0C: /* PLL used as system clock source */ + /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN + SYSCLK = PLL_VCO / PLLR + */ + pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC); + pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ; + + if(pllsource == 0x02UL) /* HSI used as PLL clock source */ + { + pllvco = (HSI_VALUE / pllm); + } + else if(pllsource == 0x03UL) /* HSE used as PLL clock source */ + { + pllvco = (HSE_VALUE / pllm); + } + else /* MSI used as PLL clock source */ + { + pllvco = (msirange / pllm); + } + + pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos); + pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL); + + SystemCoreClock = pllvco/pllr; + break; + + default: + SystemCoreClock = msirange; + break; + } + + /* Compute HCLK clock frequency --------------------------------------------*/ + /* Get HCLK1 prescaler */ + tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)]; + /* HCLK clock frequency */ + SystemCoreClock = SystemCoreClock / tmp; + +} + + +/** + * @} + */ + +/** + * @} + */ + +/** + * @} + */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Project.eww b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Project.eww new file mode 100644 index 000000000..90f4ecfd3 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Project.eww @@ -0,0 +1,7 @@ + + + + $WS_DIR$\Thread_RCP_Cli_Cmd.ewp + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewd b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewd new file mode 100644 index 000000000..df2d80cca --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewd @@ -0,0 +1,1419 @@ + + + 3 + + Thread_RCP_Cli_Cmd + + ARM + + 0 + + C-SPY + 2 + + 29 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 0 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 0 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 0 + + + + + + + + + + + IJET_ID + 2 + + 8 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 2 + 1 + 0 + + + + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 0 + + + + + + + + STLINK_ID + 2 + + 4 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 0 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 6 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewp new file mode 100644 index 000000000..dc58bd2dc --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/Thread_RCP_Cli_Cmd.ewp @@ -0,0 +1,1527 @@ + + + 3 + + Thread_RCP_Cli_Cmd + + ARM + + 0 + + General + 3 + + 30 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 0 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 0 + + + + + + + BILINK + 0 + + + + + Application + + EWARM + + $PROJ_DIR$\startup_stm32wb55xx_cm4.s + + + + User + + Core + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\main.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\stm_logging.c + + + + STM32_WPAN + + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_thread.c + + + + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers + + BSP + + P-NUCLEO-WB55.Nucleo + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\P-NUCLEO-WB55.Nucleo\stm32wbxx_nucleo.c + + + + + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + + + + STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_adc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_adc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pcd.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pcd_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + + + + + Middlewares + + STM32_WPAN + + interface + + patterns + + ble_thread + + shci + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + + + + tl + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_thread_hci.c + + + + + + + thread + + openthread + + core + + openthread_api + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\border_agent.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\border_router.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\channel_manager.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\channel_monitor.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\child_supervision.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\coap.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\coap_secure.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\commissioner.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\crypto.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\dataset.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\dataset_ftd.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\diag.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\dns.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\entropy.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\errors.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\icmp6.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\instance.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\ip6.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\jam_detection.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\joiner.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\link.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\link_raw.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\logging.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\message.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\netdata.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\network_time.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\openthread.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\openthread_api_wb.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\radio.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\random_crypto.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\random_noncrypto.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\server.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\sntp.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\tasklet.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\thread.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\thread_ftd.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\udp.c + + + + + + + utilities + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_router.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/entropy.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/errors.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/logging.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/network_time.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_crypto.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_noncrypto.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/sntp.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c + + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c + + + + + Utilities + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s new file mode 100644 index 000000000..911641737 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s @@ -0,0 +1,515 @@ +;****************************************************************************** +;* File Name : startup_stm32wb55xx_cm4.s +;* Author : MCD Application Team +;* Description : M4 core vector table of the STM32WB55xx devices for the +;* IAR (EWARM) toolchain. +;* +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == _iar_program_start, +;* - Set the vector table entries with the exceptions ISR +;* address. +;* - Branches to main in the C library (which eventually +;* calls main()). +;* After Reset the Cortex-M4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** +; +; +; The modules in this file are included in the libraries, and may be replaced +; by any user-defined modules that define the PUBLIC symbol _program_start or +; a user defined start symbol. +; To override the cstartup defined in the library, simply add your modified +; version to the workbench project. +; +; The vector table is normally located at address 0. +; When debugging in RAM, it can be located in RAM, aligned to at least 2^6. +; The name "__vector_table" has special meaning for C-SPY: +; it is where the SP start value is found, and the NVIC vector +; table register (VTOR) is initialized to this address if != 0. +; +; Cortex-M version +; + + MODULE ?cstartup + + ;; Forward declaration of sections. + SECTION CSTACK:DATA:NOROOT(3) + + SECTION .intvec:CODE:NOROOT(2) + + EXTERN __iar_program_start + EXTERN SystemInit + PUBLIC __vector_table + + DATA +__vector_table + DCD sfe(CSTACK) + DCD Reset_Handler ; Reset Handler + + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM Interrupt + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper, TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD USB_HP_IRQHandler ; USB High Priority Interrupt + DCD USB_LP_IRQHandler ; USB Low Priority Interrupt + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts + DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt + DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD SPI2_IRQHandler ; SPI2 Interrupt + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD SAI1_IRQHandler ; SAI Interrupt + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD CRS_IRQHandler ; CRS interrupt + DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD LCD_IRQHandler ; LCD Interrupt + DCD QUADSPI_IRQHandler ; QUADSPI Interrupt + DCD AES1_IRQHandler ; AES1 Interrupt + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt + DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt + DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt + DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt + DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt + DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt + DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; Default interrupt handlers. +;; + THUMB + + PUBWEAK Reset_Handler + SECTION .text:CODE:NOROOT:REORDER(2) +Reset_Handler + LDR R0, =SystemInit + BLX R0 + LDR R0, =__iar_program_start + BX R0 + + PUBWEAK NMI_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +NMI_Handler + B NMI_Handler + + PUBWEAK HardFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +HardFault_Handler + B HardFault_Handler + + PUBWEAK MemManage_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +MemManage_Handler + B MemManage_Handler + + PUBWEAK BusFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +BusFault_Handler + B BusFault_Handler + + PUBWEAK UsageFault_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +UsageFault_Handler + B UsageFault_Handler + + PUBWEAK SVC_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SVC_Handler + B SVC_Handler + + PUBWEAK DebugMon_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +DebugMon_Handler + B DebugMon_Handler + + PUBWEAK PendSV_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +PendSV_Handler + B PendSV_Handler + + PUBWEAK SysTick_Handler + SECTION .text:CODE:NOROOT:REORDER(1) +SysTick_Handler + B SysTick_Handler + + PUBWEAK WWDG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +WWDG_IRQHandler + B WWDG_IRQHandler + + PUBWEAK PVD_PVM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PVD_PVM_IRQHandler + B PVD_PVM_IRQHandler + + PUBWEAK TAMP_STAMP_LSECSS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TAMP_STAMP_LSECSS_IRQHandler + B TAMP_STAMP_LSECSS_IRQHandler + + PUBWEAK RTC_WKUP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_WKUP_IRQHandler + B RTC_WKUP_IRQHandler + + PUBWEAK FLASH_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FLASH_IRQHandler + B FLASH_IRQHandler + + PUBWEAK RCC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RCC_IRQHandler + B RCC_IRQHandler + + PUBWEAK EXTI0_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI0_IRQHandler + B EXTI0_IRQHandler + + PUBWEAK EXTI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI1_IRQHandler + B EXTI1_IRQHandler + + PUBWEAK EXTI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI2_IRQHandler + B EXTI2_IRQHandler + + PUBWEAK EXTI3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI3_IRQHandler + B EXTI3_IRQHandler + + PUBWEAK EXTI4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI4_IRQHandler + B EXTI4_IRQHandler + + PUBWEAK DMA1_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel1_IRQHandler + B DMA1_Channel1_IRQHandler + + PUBWEAK DMA1_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel2_IRQHandler + B DMA1_Channel2_IRQHandler + + PUBWEAK DMA1_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel3_IRQHandler + B DMA1_Channel3_IRQHandler + + PUBWEAK DMA1_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel4_IRQHandler + B DMA1_Channel4_IRQHandler + + PUBWEAK DMA1_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel5_IRQHandler + B DMA1_Channel5_IRQHandler + + PUBWEAK DMA1_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel6_IRQHandler + B DMA1_Channel6_IRQHandler + + PUBWEAK DMA1_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA1_Channel7_IRQHandler + B DMA1_Channel7_IRQHandler + + PUBWEAK ADC1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +ADC1_IRQHandler + B ADC1_IRQHandler + + PUBWEAK USB_HP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USB_HP_IRQHandler + B USB_HP_IRQHandler + + PUBWEAK USB_LP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USB_LP_IRQHandler + B USB_LP_IRQHandler + + PUBWEAK C2SEV_PWR_C2H_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +C2SEV_PWR_C2H_IRQHandler + B C2SEV_PWR_C2H_IRQHandler + + PUBWEAK COMP_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +COMP_IRQHandler + B COMP_IRQHandler + + PUBWEAK EXTI9_5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI9_5_IRQHandler + B EXTI9_5_IRQHandler + + PUBWEAK TIM1_BRK_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_BRK_IRQHandler + B TIM1_BRK_IRQHandler + + PUBWEAK TIM1_UP_TIM16_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_UP_TIM16_IRQHandler + B TIM1_UP_TIM16_IRQHandler + + PUBWEAK TIM1_TRG_COM_TIM17_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_TRG_COM_TIM17_IRQHandler + B TIM1_TRG_COM_TIM17_IRQHandler + + PUBWEAK TIM1_CC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM1_CC_IRQHandler + B TIM1_CC_IRQHandler + + PUBWEAK TIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TIM2_IRQHandler + B TIM2_IRQHandler + + PUBWEAK PKA_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PKA_IRQHandler + B PKA_IRQHandler + + PUBWEAK I2C1_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_EV_IRQHandler + B I2C1_EV_IRQHandler + + PUBWEAK I2C1_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C1_ER_IRQHandler + B I2C1_ER_IRQHandler + + PUBWEAK I2C3_EV_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C3_EV_IRQHandler + B I2C3_EV_IRQHandler + + PUBWEAK I2C3_ER_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +I2C3_ER_IRQHandler + B I2C3_ER_IRQHandler + + PUBWEAK SPI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI1_IRQHandler + B SPI1_IRQHandler + + PUBWEAK SPI2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SPI2_IRQHandler + B SPI2_IRQHandler + + PUBWEAK USART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +USART1_IRQHandler + B USART1_IRQHandler + + PUBWEAK LPUART1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPUART1_IRQHandler + B LPUART1_IRQHandler + + PUBWEAK SAI1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +SAI1_IRQHandler + B SAI1_IRQHandler + + PUBWEAK TSC_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +TSC_IRQHandler + B TSC_IRQHandler + + PUBWEAK EXTI15_10_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +EXTI15_10_IRQHandler + B EXTI15_10_IRQHandler + + PUBWEAK RTC_Alarm_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RTC_Alarm_IRQHandler + B RTC_Alarm_IRQHandler + + PUBWEAK CRS_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +CRS_IRQHandler + B CRS_IRQHandler + + PUBWEAK PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + B PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + + PUBWEAK IPCC_C1_RX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_RX_IRQHandler + B IPCC_C1_RX_IRQHandler + + PUBWEAK IPCC_C1_TX_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +IPCC_C1_TX_IRQHandler + B IPCC_C1_TX_IRQHandler + + PUBWEAK HSEM_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +HSEM_IRQHandler + B HSEM_IRQHandler + + PUBWEAK LPTIM1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM1_IRQHandler + B LPTIM1_IRQHandler + + PUBWEAK LPTIM2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LPTIM2_IRQHandler + B LPTIM2_IRQHandler + + PUBWEAK LCD_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +LCD_IRQHandler + B LCD_IRQHandler + + PUBWEAK QUADSPI_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +QUADSPI_IRQHandler + B QUADSPI_IRQHandler + + PUBWEAK AES1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES1_IRQHandler + B AES1_IRQHandler + + PUBWEAK AES2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +AES2_IRQHandler + B AES2_IRQHandler + + PUBWEAK RNG_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +RNG_IRQHandler + B RNG_IRQHandler + + PUBWEAK FPU_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +FPU_IRQHandler + B FPU_IRQHandler + + PUBWEAK DMA2_Channel1_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel1_IRQHandler + B DMA2_Channel1_IRQHandler + + PUBWEAK DMA2_Channel2_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel2_IRQHandler + B DMA2_Channel2_IRQHandler + + PUBWEAK DMA2_Channel3_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel3_IRQHandler + B DMA2_Channel3_IRQHandler + + PUBWEAK DMA2_Channel4_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel4_IRQHandler + B DMA2_Channel4_IRQHandler + + PUBWEAK DMA2_Channel5_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel5_IRQHandler + B DMA2_Channel5_IRQHandler + + PUBWEAK DMA2_Channel6_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel6_IRQHandler + B DMA2_Channel6_IRQHandler + + PUBWEAK DMA2_Channel7_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMA2_Channel7_IRQHandler + B DMA2_Channel7_IRQHandler + + PUBWEAK DMAMUX1_OVR_IRQHandler + SECTION .text:CODE:NOROOT:REORDER(1) +DMAMUX1_OVR_IRQHandler + B DMAMUX1_OVR_IRQHandler + + END + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf new file mode 100644 index 000000000..a90777127 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf @@ -0,0 +1,40 @@ +/*###ICF### Section handled by ICF editor, don't touch! ****/ +/*-Editor annotation file-*/ +/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ +/*-Specials-*/ +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +/*-Memory Regions-*/ +/***** FLASH Part dedicated to M4 *****/ +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x400; +/**** End of ICF editor section. ###ICF###*/ + +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; + +/* MB_MEM1 and MB_MEM2 are sections reserved to mailbox communication. It is placed in the shared memory */ +initialize by copy { readwrite }; +do not initialize { section .noinit, + section MAPPING_TABLE, + section MB_MEM1 }; + +place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; + +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvoptx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvoptx new file mode 100644 index 000000000..7fe137d89 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvoptx @@ -0,0 +1,1229 @@ + + + + 1.0 + +
                                                                  ### uVision Project, (C) Keil Software
                                                                  + + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + Thread_RCP_Cli_Cmd + 0x4 + ARM-ADS + + 8000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 18 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 6 + + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll + + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4 -FS08000000 -FL01000000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM)) + + + 0 + ST-LINKIII-KEIL_SWO + -U-O142 -O2254 -S0 -C0 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WB_M4.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32WB55RGVx$CMSIS\Flash\STM32WB_M4.FLM) + + + + + 0 + + + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + + + Application/MDK-ARM + 0 + 0 + 0 + 0 + + 1 + 1 + 2 + 0 + 0 + 0 + startup_stm32wb55xx_cm4.s + startup_stm32wb55xx_cm4.s + 0 + 0 + + + + + Application/User/Core + 0 + 0 + 0 + 0 + + 2 + 2 + 1 + 0 + 0 + 0 + ../Core/Src/main.c + main.c + 0 + 0 + + + 2 + 3 + 1 + 0 + 0 + 0 + ../Core/Src/stm_logging.c + stm_logging.c + 0 + 0 + + + 2 + 4 + 1 + 0 + 0 + 0 + ../Core/Src/app_entry.c + app_entry.c + 0 + 0 + + + 2 + 5 + 1 + 0 + 0 + 0 + ../Core/Src/stm32_lpm_if.c + stm32_lpm_if.c + 0 + 0 + + + 2 + 6 + 1 + 0 + 0 + 0 + ../Core/Src/hw_timerserver.c + hw_timerserver.c + 0 + 0 + + + 2 + 7 + 1 + 0 + 0 + 0 + ../Core/Src/hw_uart.c + hw_uart.c + 0 + 0 + + + 2 + 8 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_it.c + stm32wbxx_it.c + 0 + 0 + + + 2 + 9 + 1 + 0 + 0 + 0 + ../Core/Src/stm32wbxx_hal_msp.c + stm32wbxx_hal_msp.c + 0 + 0 + + + + + Application/User/STM32_WPAN/Target + 0 + 0 + 0 + 0 + + 3 + 10 + 1 + 0 + 0 + 0 + ../STM32_WPAN/Target/hw_ipcc.c + hw_ipcc.c + 0 + 0 + + + + + Application/User/STM32_WPAN/App + 0 + 0 + 0 + 0 + + 4 + 11 + 1 + 0 + 0 + 0 + ../STM32_WPAN/App/app_thread.c + app_thread.c + 0 + 0 + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + 0 + 0 + 0 + 0 + + 5 + 12 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + stm32wbxx_nucleo.c + 0 + 0 + + + + + Drivers/CMSIS + 0 + 0 + 0 + 0 + + 6 + 13 + 1 + 0 + 0 + 0 + ../Core/Src/system_stm32wbxx.c + system_stm32wbxx.c + 0 + 0 + + + + + Drivers/STM32WBxx_HAL_Driver + 1 + 0 + 0 + 0 + + 7 + 14 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + stm32wbxx_hal_gpio.c + 0 + 0 + + + 7 + 15 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + stm32wbxx_hal_uart.c + 0 + 0 + + + 7 + 16 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + stm32wbxx_hal_uart_ex.c + 0 + 0 + + + 7 + 17 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + stm32wbxx_hal_rtc.c + 0 + 0 + + + 7 + 18 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + stm32wbxx_hal_rtc_ex.c + 0 + 0 + + + 7 + 19 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + stm32wbxx_hal_tim.c + 0 + 0 + + + 7 + 20 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + stm32wbxx_hal_tim_ex.c + 0 + 0 + + + 7 + 21 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + stm32wbxx_hal_rcc.c + 0 + 0 + + + 7 + 22 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + stm32wbxx_hal_rcc_ex.c + 0 + 0 + + + 7 + 23 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + stm32wbxx_hal_flash.c + 0 + 0 + + + 7 + 24 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + stm32wbxx_hal_flash_ex.c + 0 + 0 + + + 7 + 25 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + stm32wbxx_hal_hsem.c + 0 + 0 + + + 7 + 26 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + stm32wbxx_hal_dma.c + 0 + 0 + + + 7 + 27 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + stm32wbxx_hal_dma_ex.c + 0 + 0 + + + 7 + 28 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + stm32wbxx_hal_pwr.c + 0 + 0 + + + 7 + 29 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + stm32wbxx_hal_pwr_ex.c + 0 + 0 + + + 7 + 30 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + stm32wbxx_hal_cortex.c + 0 + 0 + + + 7 + 31 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + stm32wbxx_hal.c + 0 + 0 + + + 7 + 32 + 1 + 0 + 0 + 0 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + stm32wbxx_hal_exti.c + 0 + 0 + + + 7 + 33 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + stm32wbxx_hal_ipcc.c + 0 + 0 + + + + + Middlewares/STM32_WPAN + 1 + 0 + 0 + 0 + + 8 + 34 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + shci_tl_if.c + 0 + 0 + + + 8 + 35 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + tl_mbox.c + 0 + 0 + + + 8 + 36 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + shci.c + 0 + 0 + + + 8 + 37 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + dbg_trace.c + 0 + 0 + + + 8 + 38 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + otp.c + 0 + 0 + + + 8 + 39 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + stm_list.c + 0 + 0 + + + 8 + 40 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + stm_queue.c + 0 + 0 + + + 8 + 41 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c + tl_thread_hci.c + 0 + 0 + + + 8 + 42 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + shci_tl.c + 0 + 0 + + + 8 + 43 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c + channel_manager.c + 0 + 0 + + + 8 + 44 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c + channel_monitor.c + 0 + 0 + + + 8 + 45 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c + child_supervision.c + 0 + 0 + + + 8 + 46 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c + coap.c + 0 + 0 + + + 8 + 47 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c + coap_secure.c + 0 + 0 + + + 8 + 48 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c + commissioner.c + 0 + 0 + + + 8 + 49 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c + crypto.c + 0 + 0 + + + 8 + 50 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c + dataset.c + 0 + 0 + + + 8 + 51 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c + dataset_ftd.c + 0 + 0 + + + 8 + 52 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c + diag.c + 0 + 0 + + + 8 + 53 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c + dns.c + 0 + 0 + + + 8 + 54 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c + icmp6.c + 0 + 0 + + + 8 + 55 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c + instance.c + 0 + 0 + + + 8 + 56 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c + ip6.c + 0 + 0 + + + 8 + 57 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c + jam_detection.c + 0 + 0 + + + 8 + 58 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c + joiner.c + 0 + 0 + + + 8 + 59 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c + link.c + 0 + 0 + + + 8 + 60 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c + link_raw.c + 0 + 0 + + + 8 + 61 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c + message.c + 0 + 0 + + + 8 + 62 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c + netdata.c + 0 + 0 + + + 8 + 63 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c + openthread.c + 0 + 0 + + + 8 + 64 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c + openthread_api_wb.c + 0 + 0 + + + 8 + 65 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c + server.c + 0 + 0 + + + 8 + 66 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c + tasklet.c + 0 + 0 + + + 8 + 67 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c + thread.c + 0 + 0 + + + 8 + 68 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c + thread_ftd.c + 0 + 0 + + + 8 + 69 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c + udp.c + 0 + 0 + + + 8 + 70 + 1 + 0 + 0 + 0 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c + radio.c + 0 + 0 + + + 8 + 71 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\border_agent.c + border_agent.c + 0 + 0 + + + 8 + 72 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\border_router.c + border_router.c + 0 + 0 + + + 8 + 73 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\entropy.c + entropy.c + 0 + 0 + + + 8 + 74 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\errors.c + errors.c + 0 + 0 + + + 8 + 75 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\logging.c + logging.c + 0 + 0 + + + 8 + 76 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\network_time.c + network_time.c + 0 + 0 + + + 8 + 77 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\random_crypto.c + random_crypto.c + 0 + 0 + + + 8 + 78 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\random_noncrypto.c + random_noncrypto.c + 0 + 0 + + + 8 + 79 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\sntp.c + sntp.c + 0 + 0 + + + + + Utilities + 0 + 0 + 0 + 0 + + 9 + 80 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + stm32_lpm.c + 0 + 0 + + + 9 + 81 + 1 + 0 + 0 + 0 + ../../../../../../Utilities/sequencer/stm32_seq.c + stm32_seq.c + 0 + 0 + + + + + ::CMSIS + 0 + 0 + 0 + 1 + + +                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvprojx b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvprojx new file mode 100644 index 000000000..634c4dd67 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/Thread_RCP_Cli_Cmd.uvprojx @@ -0,0 +1,852 @@ + + + + 2.1 + +
                                                                  ### uVision Project, (C) Keil Software
                                                                  + + + + Thread_RCP_Cli_Cmd + 0x4 + ARM-ADS + 5060750::V5.06 update 6 (build 750)::ARMCC + 0 + + + STM32WB55RGVx + STMicroelectronics + Keil.STM32WBxx_DFP.1.0.0 + http://www.keil.com/pack + IROM(0x08000000-0x807FFFF) IRAM(0x20000004-0x2002FC03) CLOCK(8000000) FPU2 CPUTYPE("Cortex-M4") + + + + + + + + + + + + + + + $$Device:STM32WB55RGVx$CMSIS\SVD\STM32WBxx_CM4.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + Thread_RCP_Cli_Cmd\Exe\ + Thread_RCP_Cli_Cmd + 1 + 0 + 0 + 1 + 0 + + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 1 + 0 + fromelf #L --bin --output=$L@L.bin + + 0 + 0 + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 0 + + + SARMCM3.DLL + -REMAP -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 1 + 1 + 4107 + + 1 + STLink\ST-LINKIII-KEIL_SWO.dll + + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 2 + 0 + 0 + 0 + 8 + 1 + 0 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000004 + 0x2fc00 + + + 1 + 0x8000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8000000 + 0x80000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000004 + 0x2fc00 + + + 0 + 0x0 + 0x0 + + + + + + 1 + 4 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + + + OPENTHREAD_CONFIG_FILE=<openthread_api_config_ftd.h>,USE_HAL_DRIVER,STM32WB55xx,USE_STM32WBXX_NUCLEO,THREAD_WB + + ../Core/Inc;../STM32_WPAN/App;../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc/Legacy;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci;../../../../../../Middlewares/ST/STM32_WPAN/utilities;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/sequencer;../../../../../../Drivers/CMSIS/Device/ST/STM32WBxx/Include;../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api;../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/include;../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/include/openthread;../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/include/openthread/platform;../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include;../../../../../../Drivers/CMSIS/Include + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + 0 + 1 + 0 + 0x08000000 + 0x20000000 + + .\stm32wb55xx_flash_cm4.sct + + + + + + + + + + + Application/MDK-ARM + + + startup_stm32wb55xx_cm4.s + 2 + startup_stm32wb55xx_cm4.s + + + + + Application/User/Core + + + main.c + 1 + ../Core/Src/main.c + + + stm_logging.c + 1 + ../Core/Src/stm_logging.c + + + app_entry.c + 1 + ../Core/Src/app_entry.c + + + stm32_lpm_if.c + 1 + ../Core/Src/stm32_lpm_if.c + + + hw_timerserver.c + 1 + ../Core/Src/hw_timerserver.c + + + hw_uart.c + 1 + ../Core/Src/hw_uart.c + + + stm32wbxx_it.c + 1 + ../Core/Src/stm32wbxx_it.c + + + stm32wbxx_hal_msp.c + 1 + ../Core/Src/stm32wbxx_hal_msp.c + + + + + Application/User/STM32_WPAN/Target + + + hw_ipcc.c + 1 + ../STM32_WPAN/Target/hw_ipcc.c + + + + + Application/User/STM32_WPAN/App + + + app_thread.c + 1 + ../STM32_WPAN/App/app_thread.c + + + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo + + + stm32wbxx_nucleo.c + 1 + ../../../../../../Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + + + + + Drivers/CMSIS + + + system_stm32wbxx.c + 1 + ../Core/Src/system_stm32wbxx.c + + + + + Drivers/STM32WBxx_HAL_Driver + + + stm32wbxx_hal_gpio.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + stm32wbxx_hal_uart.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + stm32wbxx_hal_uart_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + stm32wbxx_hal_rtc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + stm32wbxx_hal_rtc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + stm32wbxx_hal_tim.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + stm32wbxx_hal_tim_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + stm32wbxx_hal_rcc.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + stm32wbxx_hal_rcc_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + stm32wbxx_hal_flash.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + stm32wbxx_hal_flash_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + stm32wbxx_hal_hsem.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + stm32wbxx_hal_dma.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + stm32wbxx_hal_dma_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + stm32wbxx_hal_pwr.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + stm32wbxx_hal_pwr_ex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + stm32wbxx_hal_cortex.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + stm32wbxx_hal.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + stm32wbxx_hal_exti.c + 1 + ../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + stm32wbxx_hal_ipcc.c + 1 + ..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + + + Middlewares/STM32_WPAN + + + shci_tl_if.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + tl_mbox.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + shci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + dbg_trace.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + otp.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/otp.c + + + stm_list.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + stm_queue.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + tl_thread_hci.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c + + + shci_tl.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + channel_manager.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c + + + channel_monitor.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c + + + child_supervision.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c + + + coap.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c + + + coap_secure.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c + + + commissioner.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c + + + crypto.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c + + + dataset.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c + + + dataset_ftd.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c + + + diag.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c + + + dns.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c + + + icmp6.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c + + + instance.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c + + + ip6.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c + + + jam_detection.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c + + + joiner.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c + + + link.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c + + + link_raw.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c + + + message.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c + + + netdata.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c + + + openthread.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c + + + openthread_api_wb.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c + + + server.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c + + + tasklet.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c + + + thread.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c + + + thread_ftd.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c + + + udp.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c + + + radio.c + 1 + ../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c + + + border_agent.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\border_agent.c + + + border_router.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\border_router.c + + + entropy.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\entropy.c + + + errors.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\errors.c + + + logging.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\logging.c + + + network_time.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\network_time.c + + + random_crypto.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\random_crypto.c + + + random_noncrypto.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\random_noncrypto.c + + + sntp.c + 1 + ..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\thread\openthread\core\openthread_api\sntp.c + + + + + Utilities + + + stm32_lpm.c + 1 + ../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c + + + stm32_seq.c + 1 + ../../../../../../Utilities/sequencer/stm32_seq.c + + + + + ::CMSIS + + + + + + + + + + + + + + + + + + +                                                                   diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s new file mode 100644 index 000000000..90bedbb4d --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -0,0 +1,367 @@ +;****************************************************************************** +;* File Name : startup_stm32wb55xx_cm4.s +;* Author : MCD Application Team +;* Description : STM32WB55xx devices vector table for MDK-ARM toolchain. +;* This module performs: +;* - Set the initial SP +;* - Set the initial PC == Reset_Handler +;* - Set the vector table entries with the exceptions ISR address +;* - Branches to __main in the C library (which eventually +;* calls main()). +;* After Reset the CortexM4 processor is in Thread mode, +;* priority is Privileged, and the Stack is set to Main. +;* <<< Use Configuration Wizard in Context Menu >>> +;****************************************************************************** +;* @attention +;* +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. +;* +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. +;* +;****************************************************************************** + +; Amount of memory (in bytes) allocated for Stack +; Tailor this value to your application needs +; Stack Configuration +; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Stack_Size EQU 0x1000 + + AREA STACK, NOINIT, READWRITE, ALIGN=3 +Stack_Mem SPACE Stack_Size +__initial_sp + + +; Heap Configuration +; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> +; + +Heap_Size EQU 0x400 + + AREA HEAP, NOINIT, READWRITE, ALIGN=3 +__heap_base +Heap_Mem SPACE Heap_Size +__heap_limit + + PRESERVE8 + THUMB + + +; Vector Table Mapped to Address 0 at Reset + AREA RESET, DATA, READONLY + EXPORT __Vectors + EXPORT __Vectors_End + EXPORT __Vectors_Size + +__Vectors DCD __initial_sp ; Top of Stack + DCD Reset_Handler ; Reset Handler + DCD NMI_Handler ; NMI Handler + DCD HardFault_Handler ; Hard Fault Handler + DCD MemManage_Handler ; MPU Fault Handler + DCD BusFault_Handler ; Bus Fault Handler + DCD UsageFault_Handler ; Usage Fault Handler + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD 0 ; Reserved + DCD SVC_Handler ; SVCall Handler + DCD DebugMon_Handler ; Debug Monitor Handler + DCD 0 ; Reserved + DCD PendSV_Handler ; PendSV Handler + DCD SysTick_Handler ; SysTick Handler + + ; External Interrupts + DCD WWDG_IRQHandler ; Window WatchDog + DCD PVD_PVM_IRQHandler ; PVD and PVM detector + DCD TAMP_STAMP_LSECSS_IRQHandler ; RTC Tamper and TimeStamp Interrupts and LSECSS Interrupts + DCD RTC_WKUP_IRQHandler ; RTC Wakeup Interrupt + DCD FLASH_IRQHandler ; FLASH global Interrupt + DCD RCC_IRQHandler ; RCC Interrupt + DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt + DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt + DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt + DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt + DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt + DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt + DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3 Interrupt + DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4 Interrupt + DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5 Interrupt + DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6 Interrupt + DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7 Interrupt + DCD ADC1_IRQHandler ; ADC1 Interrupt + DCD USB_HP_IRQHandler ; USB High Priority Interrupt + DCD USB_LP_IRQHandler ; USB Low Priority Interrupt + DCD C2SEV_PWR_C2H_IRQHandler ; CPU M0+ SEV Interrupt + DCD COMP_IRQHandler ; COMP1 and COMP2 Interrupts + DCD EXTI9_5_IRQHandler ; EXTI Lines [9:5] Interrupt + DCD TIM1_BRK_IRQHandler ; TIM1 Break Interrupt + DCD TIM1_UP_TIM16_IRQHandler ; TIM1 Update and TIM16 global Interrupts + DCD TIM1_TRG_COM_TIM17_IRQHandler ; TIM1 Trigger and Communication and TIM17 global Interrupts + DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare Interrupt + DCD TIM2_IRQHandler ; TIM2 Global Interrupt + DCD PKA_IRQHandler ; PKA Interrupt + DCD I2C1_EV_IRQHandler ; I2C1 Event Interrupt + DCD I2C1_ER_IRQHandler ; I2C1 Error Interrupt + DCD I2C3_EV_IRQHandler ; I2C3 Event Interrupt + DCD I2C3_ER_IRQHandler ; I2C3 Error Interrupt + DCD SPI1_IRQHandler ; SPI1 Interrupt + DCD SPI2_IRQHandler ; SPI2 Interrupt + DCD USART1_IRQHandler ; USART1 Interrupt + DCD LPUART1_IRQHandler ; LPUART1 Interrupt + DCD SAI1_IRQHandler ; SAI Interrupt + DCD TSC_IRQHandler ; TSC Interrupt + DCD EXTI15_10_IRQHandler ; EXTI Lines1[15:10 ]Interrupts + DCD RTC_Alarm_IRQHandler ; RTC Alarms (A and B) Interrupt + DCD CRS_IRQHandler ; CRS interrupt + DCD PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler ; WKUP Interrupt from PWR + DCD IPCC_C1_RX_IRQHandler ; IPCC CPU1 RX occupied interrupt + DCD IPCC_C1_TX_IRQHandler ; IPCC CPU1 RX free interrupt + DCD HSEM_IRQHandler ; HSEM0 Interrupt + DCD LPTIM1_IRQHandler ; LPTIM1 Interrupt + DCD LPTIM2_IRQHandler ; LPTIM2 Interrupt + DCD LCD_IRQHandler ; LCD Interrupt + DCD QUADSPI_IRQHandler ; QUADSPI Interrupt + DCD AES1_IRQHandler ; AES1 Interrupt + DCD AES2_IRQHandler ; AES2 Interrupt + DCD RNG_IRQHandler ; RNG1 Interrupt + DCD FPU_IRQHandler ; FPU Interrupt + DCD DMA2_Channel1_IRQHandler ; DMA2 Channel 1 Interrupt + DCD DMA2_Channel2_IRQHandler ; DMA2 Channel 2 Interrupt + DCD DMA2_Channel3_IRQHandler ; DMA2 Channel 3 Interrupt + DCD DMA2_Channel4_IRQHandler ; DMA2 Channel 4 Interrupt + DCD DMA2_Channel5_IRQHandler ; DMA2 Channel 5 Interrupt + DCD DMA2_Channel6_IRQHandler ; DMA2 Channel 6 Interrupt + DCD DMA2_Channel7_IRQHandler ; DMA2 Channel 7 Interrupt + DCD DMAMUX1_OVR_IRQHandler ; DMAMUX overrun Interrupt + +__Vectors_End + +__Vectors_Size EQU __Vectors_End - __Vectors + + AREA |.text|, CODE, READONLY + +; Reset handler +Reset_Handler PROC + EXPORT Reset_Handler [WEAK] + IMPORT SystemInit + IMPORT __main + + LDR R0, =SystemInit + BLX R0 + LDR R0, =__main + BX R0 + ENDP + +; Dummy Exception Handlers (infinite loops which can be modified) + +NMI_Handler PROC + EXPORT NMI_Handler [WEAK] + B . + ENDP +HardFault_Handler\ + PROC + EXPORT HardFault_Handler [WEAK] + B . + ENDP +MemManage_Handler\ + PROC + EXPORT MemManage_Handler [WEAK] + B . + ENDP +BusFault_Handler\ + PROC + EXPORT BusFault_Handler [WEAK] + B . + ENDP +UsageFault_Handler\ + PROC + EXPORT UsageFault_Handler [WEAK] + B . + ENDP +SVC_Handler PROC + EXPORT SVC_Handler [WEAK] + B . + ENDP +DebugMon_Handler\ + PROC + EXPORT DebugMon_Handler [WEAK] + B . + ENDP +PendSV_Handler PROC + EXPORT PendSV_Handler [WEAK] + B . + ENDP +SysTick_Handler PROC + EXPORT SysTick_Handler [WEAK] + B . + ENDP + +Default_Handler PROC + + EXPORT WWDG_IRQHandler [WEAK] + EXPORT PVD_PVM_IRQHandler [WEAK] + EXPORT TAMP_STAMP_LSECSS_IRQHandler [WEAK] + EXPORT RTC_WKUP_IRQHandler [WEAK] + EXPORT FLASH_IRQHandler [WEAK] + EXPORT RCC_IRQHandler [WEAK] + EXPORT EXTI0_IRQHandler [WEAK] + EXPORT EXTI1_IRQHandler [WEAK] + EXPORT EXTI2_IRQHandler [WEAK] + EXPORT EXTI3_IRQHandler [WEAK] + EXPORT EXTI4_IRQHandler [WEAK] + EXPORT DMA1_Channel1_IRQHandler [WEAK] + EXPORT DMA1_Channel2_IRQHandler [WEAK] + EXPORT DMA1_Channel3_IRQHandler [WEAK] + EXPORT DMA1_Channel4_IRQHandler [WEAK] + EXPORT DMA1_Channel5_IRQHandler [WEAK] + EXPORT DMA1_Channel6_IRQHandler [WEAK] + EXPORT DMA1_Channel7_IRQHandler [WEAK] + EXPORT ADC1_IRQHandler [WEAK] + EXPORT USB_HP_IRQHandler [WEAK] + EXPORT USB_LP_IRQHandler [WEAK] + EXPORT C2SEV_PWR_C2H_IRQHandler [WEAK] + EXPORT COMP_IRQHandler [WEAK] + EXPORT EXTI9_5_IRQHandler [WEAK] + EXPORT TIM1_BRK_IRQHandler [WEAK] + EXPORT TIM1_UP_TIM16_IRQHandler [WEAK] + EXPORT TIM1_TRG_COM_TIM17_IRQHandler [WEAK] + EXPORT TIM1_CC_IRQHandler [WEAK] + EXPORT TIM2_IRQHandler [WEAK] + EXPORT PKA_IRQHandler [WEAK] + EXPORT I2C1_EV_IRQHandler [WEAK] + EXPORT I2C1_ER_IRQHandler [WEAK] + EXPORT I2C3_EV_IRQHandler [WEAK] + EXPORT I2C3_ER_IRQHandler [WEAK] + EXPORT SPI1_IRQHandler [WEAK] + EXPORT SPI2_IRQHandler [WEAK] + EXPORT USART1_IRQHandler [WEAK] + EXPORT LPUART1_IRQHandler [WEAK] + EXPORT SAI1_IRQHandler [WEAK] + EXPORT TSC_IRQHandler [WEAK] + EXPORT EXTI15_10_IRQHandler [WEAK] + EXPORT RTC_Alarm_IRQHandler [WEAK] + EXPORT CRS_IRQHandler [WEAK] + EXPORT PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler [WEAK] + EXPORT IPCC_C1_RX_IRQHandler [WEAK] + EXPORT IPCC_C1_TX_IRQHandler [WEAK] + EXPORT HSEM_IRQHandler [WEAK] + EXPORT LPTIM1_IRQHandler [WEAK] + EXPORT LPTIM2_IRQHandler [WEAK] + EXPORT LCD_IRQHandler [WEAK] + EXPORT QUADSPI_IRQHandler [WEAK] + EXPORT AES1_IRQHandler [WEAK] + EXPORT AES2_IRQHandler [WEAK] + EXPORT RNG_IRQHandler [WEAK] + EXPORT FPU_IRQHandler [WEAK] + EXPORT DMA2_Channel1_IRQHandler [WEAK] + EXPORT DMA2_Channel2_IRQHandler [WEAK] + EXPORT DMA2_Channel3_IRQHandler [WEAK] + EXPORT DMA2_Channel4_IRQHandler [WEAK] + EXPORT DMA2_Channel5_IRQHandler [WEAK] + EXPORT DMA2_Channel6_IRQHandler [WEAK] + EXPORT DMA2_Channel7_IRQHandler [WEAK] + EXPORT DMAMUX1_OVR_IRQHandler [WEAK] + +WWDG_IRQHandler +PVD_PVM_IRQHandler +TAMP_STAMP_LSECSS_IRQHandler +RTC_WKUP_IRQHandler +FLASH_IRQHandler +RCC_IRQHandler +EXTI0_IRQHandler +EXTI1_IRQHandler +EXTI2_IRQHandler +EXTI3_IRQHandler +EXTI4_IRQHandler +DMA1_Channel1_IRQHandler +DMA1_Channel2_IRQHandler +DMA1_Channel3_IRQHandler +DMA1_Channel4_IRQHandler +DMA1_Channel5_IRQHandler +DMA1_Channel6_IRQHandler +DMA1_Channel7_IRQHandler +ADC1_IRQHandler +USB_HP_IRQHandler +USB_LP_IRQHandler +C2SEV_PWR_C2H_IRQHandler +COMP_IRQHandler +EXTI9_5_IRQHandler +TIM1_BRK_IRQHandler +TIM1_UP_TIM16_IRQHandler +TIM1_TRG_COM_TIM17_IRQHandler +TIM1_CC_IRQHandler +TIM2_IRQHandler +PKA_IRQHandler +I2C1_EV_IRQHandler +I2C1_ER_IRQHandler +I2C3_EV_IRQHandler +I2C3_ER_IRQHandler +SPI1_IRQHandler +SPI2_IRQHandler +USART1_IRQHandler +LPUART1_IRQHandler +SAI1_IRQHandler +TSC_IRQHandler +EXTI15_10_IRQHandler +RTC_Alarm_IRQHandler +CRS_IRQHandler +PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler +IPCC_C1_RX_IRQHandler +IPCC_C1_TX_IRQHandler +HSEM_IRQHandler +LPTIM1_IRQHandler +LPTIM2_IRQHandler +LCD_IRQHandler +QUADSPI_IRQHandler +AES1_IRQHandler +AES2_IRQHandler +RNG_IRQHandler +FPU_IRQHandler +DMA2_Channel1_IRQHandler +DMA2_Channel2_IRQHandler +DMA2_Channel3_IRQHandler +DMA2_Channel4_IRQHandler +DMA2_Channel5_IRQHandler +DMA2_Channel6_IRQHandler +DMA2_Channel7_IRQHandler +DMAMUX1_OVR_IRQHandler + + B . + + ENDP + + ALIGN + +;******************************************************************************* +; User Stack and Heap initialization +;******************************************************************************* + IF :DEF:__MICROLIB + + EXPORT __initial_sp + EXPORT __heap_base + EXPORT __heap_limit + + ELSE + + IMPORT __use_two_region_memory + EXPORT __user_initial_stackheap + +__user_initial_stackheap + + LDR R0, = Heap_Mem + LDR R1, =(Stack_Mem + Stack_Size) + LDR R2, = (Heap_Mem + Heap_Size) + LDR R3, = Stack_Mem + BX LR + + ALIGN + + ENDIF + + END + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/stm32wb55xx_flash_cm4.sct new file mode 100644 index 000000000..9d4d446ba --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -0,0 +1,21 @@ +; ************************************************************* +; *** Scatter-Loading Description File generated by uVision *** +; ************************************************************* + +LR_IROM1 0x08000000 0x00080000 { ; load region size_region + ER_IROM1 0x08000000 0x00080000 { ; load address = execution address + *.o (RESET, +First) + *(InRoot$$Sections) + .ANY (+RO) + } + RW_IRAM1 0x20000008 0x2FFF8 { ; RW data + .ANY (+RW +ZI) + } + RW_RAM_SHARED 0x20030000 0x2800 { ; RW data + *(MAPPING_TABLE) + *(MB_MEM1) + *(MB_MEM2) + } + } + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.cproject b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.cproject new file mode 100644 index 000000000..6a0349f22 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.cproject @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.project b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.project new file mode 100644 index 000000000..3b8636ca9 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/.project @@ -0,0 +1,441 @@ + + + Thread_RCP_Cli_Cmd + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.st.stm32cube.ide.mcu.MCUProjectNature + org.eclipse.cdt.core.cnature + com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAProjectNature + com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature + com.st.stm32cube.ide.mcu.MCUCubeProjectNature + com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature + com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature + com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature + com.st.stm32cube.ide.mcu.MCURootProjectNature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + + Doc/readme.txt + 1 + PARENT-1-PROJECT_LOC/readme.txt + + + Utilities/dbg_trace.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/dbg_trace.c + + + Utilities/otp.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/otp.c + + + Utilities/stm32_lpm.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c + + + Utilities/stm32_seq.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c + + + Utilities/stm_list.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/stm_list.c + + + Utilities/stm_queue.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/utilities/stm_queue.c + + + Application/User/app_entry.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/app_entry.c + + + Application/User/hw_timerserver.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_timerserver.c + + + Application/User/hw_uart.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/hw_uart.c + + + Application/User/main.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c + + + Application/User/stm32_lpm_if.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c + + + Application/User/stm32wbxx_hal_msp.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wbxx_hal_msp.c + + + Application/User/stm32wbxx_it.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wbxx_it.c + + + Application/User/stm_logging.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm_logging.c + + + Drivers/CMSIS/system_stm32wbxx.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wbxx.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_cortex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_cortex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_dma_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_dma_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_exti.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_exti.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_flash_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_gpio.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_hsem.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_ipcc.c + 1 + PARENT-6-PROJECT_LOC/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_ipcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_pwr_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pwr_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rcc_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_rtc_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rtc_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_tim_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_tim_ex.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart.c + + + Drivers/STM32WBxx_HAL_Driver/stm32wbxx_hal_uart_ex.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_uart_ex.c + + + Middlewares/STM32_WPAN/border_agent.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c + + + Middlewares/STM32_WPAN/border_router.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_router.c + + + Middlewares/STM32_WPAN/channel_manager.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_manager.c + + + Middlewares/STM32_WPAN/channel_monitor.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/channel_monitor.c + + + Middlewares/STM32_WPAN/child_supervision.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/child_supervision.c + + + Middlewares/STM32_WPAN/coap.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap.c + + + Middlewares/STM32_WPAN/coap_secure.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/coap_secure.c + + + Middlewares/STM32_WPAN/commissioner.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/commissioner.c + + + Middlewares/STM32_WPAN/crypto.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/crypto.c + + + Middlewares/STM32_WPAN/dataset.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset.c + + + Middlewares/STM32_WPAN/dataset_ftd.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dataset_ftd.c + + + Middlewares/STM32_WPAN/diag.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/diag.c + + + Middlewares/STM32_WPAN/dns.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/dns.c + + + Middlewares/STM32_WPAN/entropy.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/entropy.c + + + Middlewares/STM32_WPAN/errors.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/errors.c + + + Middlewares/STM32_WPAN/icmp6.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/icmp6.c + + + Middlewares/STM32_WPAN/instance.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/instance.c + + + Middlewares/STM32_WPAN/ip6.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/ip6.c + + + Middlewares/STM32_WPAN/jam_detection.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/jam_detection.c + + + Middlewares/STM32_WPAN/joiner.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/joiner.c + + + Middlewares/STM32_WPAN/link.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link.c + + + Middlewares/STM32_WPAN/link_raw.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/link_raw.c + + + Middlewares/STM32_WPAN/logging.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/logging.c + + + Middlewares/STM32_WPAN/message.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/message.c + + + Middlewares/STM32_WPAN/netdata.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/netdata.c + + + Middlewares/STM32_WPAN/network_time.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/network_time.c + + + Middlewares/STM32_WPAN/openthread.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread.c + + + Middlewares/STM32_WPAN/openthread_api_wb.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/openthread_api_wb.c + + + Middlewares/STM32_WPAN/radio.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/radio.c + + + Middlewares/STM32_WPAN/random_crypto.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_crypto.c + + + Middlewares/STM32_WPAN/random_noncrypto.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/random_noncrypto.c + + + Middlewares/STM32_WPAN/server.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/server.c + + + Middlewares/STM32_WPAN/shci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci/shci.c + + + Middlewares/STM32_WPAN/shci_tl.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl.c + + + Middlewares/STM32_WPAN/shci_tl_if.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c + + + Middlewares/STM32_WPAN/sntp.c + 1 + PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/sntp.c + + + Middlewares/STM32_WPAN/tasklet.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/tasklet.c + + + Middlewares/STM32_WPAN/thread.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread.c + + + Middlewares/STM32_WPAN/thread_ftd.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/thread_ftd.c + + + Middlewares/STM32_WPAN/tl_mbox.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c + + + Middlewares/STM32_WPAN/tl_thread_hci.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_thread_hci.c + + + Middlewares/STM32_WPAN/udp.c + 1 + $%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/udp.c + + + Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + 1 + PARENT-6-PROJECT_LOC/Drivers/BSP/P-NUCLEO-WB55.Nucleo/stm32wbxx_nucleo.c + + + Application/User/STM32_WPAN/App/app_thread.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/App/app_thread.c + + + Application/User/STM32_WPAN/Target/hw_ipcc.c + 1 + $%7BPARENT-1-PROJECT_LOC%7D/STM32_WPAN/Target/hw_ipcc.c + + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s new file mode 100644 index 000000000..78680e0ea --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -0,0 +1,443 @@ +/** + ****************************************************************************** + * @file startup_stm32wb55xx_cm4.s + * @author MCD Application Team + * @brief STM32WB55xx devices vector table GCC toolchain. + * This module performs: + * - Set the initial SP + * - Set the initial PC == Reset_Handler, + * - Set the vector table entries with the exceptions ISR address + * - Branches to main in the C library (which eventually + * calls main()). + * After Reset the Cortex-M4 processor is in Thread mode, + * priority is Privileged, and the Stack is set to Main. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + + .syntax unified + .cpu cortex-m4 + .fpu softvfp + .thumb + +.global g_pfnVectors +.global Default_Handler + +/* start address for the initialization values of the .data section. +defined in linker script */ +.word _sidata +/* start address for the .data section. defined in linker script */ +.word _sdata +/* end address for the .data section. defined in linker script */ +.word _edata +/* start address for the .bss section. defined in linker script */ +.word _sbss +/* end address for the .bss section. defined in linker script */ +.word _ebss +/* start address for the .MB_MEM2 section. defined in linker script */ +.word _sMB_MEM2 +/* end address for the .MB_MEM2 section. defined in linker script */ +.word _eMB_MEM2 + +/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */ +.macro INIT_BSS start, end + ldr r0, =\start + ldr r1, =\end + movs r3, #0 + bl LoopFillZerobss +.endm + +/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */ +.macro INIT_DATA start, end, src + ldr r0, =\start + ldr r1, =\end + ldr r2, =\src + movs r3, #0 + bl LoopCopyDataInit +.endm + +.section .text.data_initializers +CopyDataInit: + ldr r4, [r2, r3] + str r4, [r0, r3] + adds r3, r3, #4 + +LoopCopyDataInit: + adds r4, r0, r3 + cmp r4, r1 + bcc CopyDataInit + bx lr + +FillZerobss: + str r3, [r0] + adds r0, r0, #4 + +LoopFillZerobss: + cmp r0, r1 + bcc FillZerobss + bx lr + + .section .text.Reset_Handler + .weak Reset_Handler + .type Reset_Handler, %function +Reset_Handler: + ldr r0, =_estack + mov sp, r0 /* set stack pointer */ +/* Call the clock system initialization function.*/ + bl SystemInit + +/* Copy the data segment initializers from flash to SRAM */ + INIT_DATA _sdata, _edata, _sidata + +/* Zero fill the bss segments. */ + INIT_BSS _sbss, _ebss + INIT_BSS _sMB_MEM2, _eMB_MEM2 + +/* Call static constructors */ + bl __libc_init_array +/* Call the application s entry point.*/ + bl main + +LoopForever: + b LoopForever + +.size Reset_Handler, .-Reset_Handler + +/** + * @brief This is the code that gets called when the processor receives an + * unexpected interrupt. This simply enters an infinite loop, preserving + * the system state for examination by a debugger. + * + * @param None + * @retval None +*/ + .section .text.Default_Handler,"ax",%progbits +Default_Handler: +Infinite_Loop: + b Infinite_Loop + .size Default_Handler, .-Default_Handler +/****************************************************************************** +* +* The minimal vector table for a Cortex-M4. Note that the proper constructs +* must be placed on this to ensure that it ends up at physical address +* 0x0000.0000. +* +******************************************************************************/ + .section .isr_vector,"a",%progbits + .type g_pfnVectors, %object + .size g_pfnVectors, .-g_pfnVectors + + +g_pfnVectors: + .word _estack + .word Reset_Handler + .word NMI_Handler + .word HardFault_Handler + .word MemManage_Handler + .word BusFault_Handler + .word UsageFault_Handler + .word 0 + .word 0 + .word 0 + .word 0 + .word SVC_Handler + .word DebugMon_Handler + .word 0 + .word PendSV_Handler + .word SysTick_Handler + .word WWDG_IRQHandler + .word PVD_PVM_IRQHandler + .word TAMP_STAMP_LSECSS_IRQHandler + .word RTC_WKUP_IRQHandler + .word FLASH_IRQHandler + .word RCC_IRQHandler + .word EXTI0_IRQHandler + .word EXTI1_IRQHandler + .word EXTI2_IRQHandler + .word EXTI3_IRQHandler + .word EXTI4_IRQHandler + .word DMA1_Channel1_IRQHandler + .word DMA1_Channel2_IRQHandler + .word DMA1_Channel3_IRQHandler + .word DMA1_Channel4_IRQHandler + .word DMA1_Channel5_IRQHandler + .word DMA1_Channel6_IRQHandler + .word DMA1_Channel7_IRQHandler + .word ADC1_IRQHandler + .word USB_HP_IRQHandler + .word USB_LP_IRQHandler + .word C2SEV_PWR_C2H_IRQHandler + .word COMP_IRQHandler + .word EXTI9_5_IRQHandler + .word TIM1_BRK_IRQHandler + .word TIM1_UP_TIM16_IRQHandler + .word TIM1_TRG_COM_TIM17_IRQHandler + .word TIM1_CC_IRQHandler + .word TIM2_IRQHandler + .word PKA_IRQHandler + .word I2C1_EV_IRQHandler + .word I2C1_ER_IRQHandler + .word I2C3_EV_IRQHandler + .word I2C3_ER_IRQHandler + .word SPI1_IRQHandler + .word SPI2_IRQHandler + .word USART1_IRQHandler + .word LPUART1_IRQHandler + .word SAI1_IRQHandler + .word TSC_IRQHandler + .word EXTI15_10_IRQHandler + .word RTC_Alarm_IRQHandler + .word CRS_IRQHandler + .word PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + .word IPCC_C1_RX_IRQHandler + .word IPCC_C1_TX_IRQHandler + .word HSEM_IRQHandler + .word LPTIM1_IRQHandler + .word LPTIM2_IRQHandler + .word LCD_IRQHandler + .word QUADSPI_IRQHandler + .word AES1_IRQHandler + .word AES2_IRQHandler + .word RNG_IRQHandler + .word FPU_IRQHandler + .word DMA2_Channel1_IRQHandler + .word DMA2_Channel2_IRQHandler + .word DMA2_Channel3_IRQHandler + .word DMA2_Channel4_IRQHandler + .word DMA2_Channel5_IRQHandler + .word DMA2_Channel6_IRQHandler + .word DMA2_Channel7_IRQHandler + .word DMAMUX1_OVR_IRQHandler + +/******************************************************************************* +* +* Provide weak aliases for each Exception handler to the Default_Handler. +* As they are weak aliases, any function with the same name will override +* this definition. +* +*******************************************************************************/ + .weak NMI_Handler + .thumb_set NMI_Handler,Default_Handler + + .weak HardFault_Handler + .thumb_set HardFault_Handler,Default_Handler + + .weak MemManage_Handler + .thumb_set MemManage_Handler,Default_Handler + + .weak BusFault_Handler + .thumb_set BusFault_Handler,Default_Handler + + .weak UsageFault_Handler + .thumb_set UsageFault_Handler,Default_Handler + + .weak SVC_Handler + .thumb_set SVC_Handler,Default_Handler + + .weak DebugMon_Handler + .thumb_set DebugMon_Handler,Default_Handler + + .weak PendSV_Handler + .thumb_set PendSV_Handler,Default_Handler + + .weak SysTick_Handler + .thumb_set SysTick_Handler,Default_Handler + + .weak WWDG_IRQHandler + .thumb_set WWDG_IRQHandler,Default_Handler + + .weak PVD_PVM_IRQHandler + .thumb_set PVD_PVM_IRQHandler,Default_Handler + + .weak TAMP_STAMP_LSECSS_IRQHandler + .thumb_set TAMP_STAMP_LSECSS_IRQHandler,Default_Handler + + .weak RTC_WKUP_IRQHandler + .thumb_set RTC_WKUP_IRQHandler,Default_Handler + + .weak FLASH_IRQHandler + .thumb_set FLASH_IRQHandler,Default_Handler + + .weak RCC_IRQHandler + .thumb_set RCC_IRQHandler,Default_Handler + + .weak EXTI0_IRQHandler + .thumb_set EXTI0_IRQHandler,Default_Handler + + .weak EXTI1_IRQHandler + .thumb_set EXTI1_IRQHandler,Default_Handler + + .weak EXTI2_IRQHandler + .thumb_set EXTI2_IRQHandler,Default_Handler + + .weak EXTI3_IRQHandler + .thumb_set EXTI3_IRQHandler,Default_Handler + + .weak EXTI4_IRQHandler + .thumb_set EXTI4_IRQHandler,Default_Handler + + .weak DMA1_Channel1_IRQHandler + .thumb_set DMA1_Channel1_IRQHandler,Default_Handler + + .weak DMA1_Channel2_IRQHandler + .thumb_set DMA1_Channel2_IRQHandler,Default_Handler + + .weak DMA1_Channel3_IRQHandler + .thumb_set DMA1_Channel3_IRQHandler,Default_Handler + + .weak DMA1_Channel4_IRQHandler + .thumb_set DMA1_Channel4_IRQHandler,Default_Handler + + .weak DMA1_Channel5_IRQHandler + .thumb_set DMA1_Channel5_IRQHandler,Default_Handler + + .weak DMA1_Channel6_IRQHandler + .thumb_set DMA1_Channel6_IRQHandler,Default_Handler + + .weak DMA1_Channel7_IRQHandler + .thumb_set DMA1_Channel7_IRQHandler,Default_Handler + + .weak ADC1_IRQHandler + .thumb_set ADC1_IRQHandler,Default_Handler + + .weak USB_HP_IRQHandler + .thumb_set USB_HP_IRQHandler,Default_Handler + + .weak USB_LP_IRQHandler + .thumb_set USB_LP_IRQHandler,Default_Handler + + .weak C2SEV_PWR_C2H_IRQHandler + .thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler + + .weak COMP_IRQHandler + .thumb_set COMP_IRQHandler,Default_Handler + + .weak EXTI9_5_IRQHandler + .thumb_set EXTI9_5_IRQHandler,Default_Handler + + .weak TIM1_BRK_IRQHandler + .thumb_set TIM1_BRK_IRQHandler,Default_Handler + + .weak TIM1_UP_TIM16_IRQHandler + .thumb_set TIM1_UP_TIM16_IRQHandler,Default_Handler + + .weak TIM1_TRG_COM_TIM17_IRQHandler + .thumb_set TIM1_TRG_COM_TIM17_IRQHandler,Default_Handler + + .weak TIM1_CC_IRQHandler + .thumb_set TIM1_CC_IRQHandler,Default_Handler + + .weak TIM2_IRQHandler + .thumb_set TIM2_IRQHandler,Default_Handler + + .weak PKA_IRQHandler + .thumb_set PKA_IRQHandler,Default_Handler + + .weak I2C1_EV_IRQHandler + .thumb_set I2C1_EV_IRQHandler,Default_Handler + + .weak I2C1_ER_IRQHandler + .thumb_set I2C1_ER_IRQHandler,Default_Handler + + .weak I2C3_EV_IRQHandler + .thumb_set I2C3_EV_IRQHandler,Default_Handler + + .weak I2C3_ER_IRQHandler + .thumb_set I2C3_ER_IRQHandler,Default_Handler + + .weak SPI1_IRQHandler + .thumb_set SPI1_IRQHandler,Default_Handler + + .weak SPI2_IRQHandler + .thumb_set SPI2_IRQHandler,Default_Handler + + .weak USART1_IRQHandler + .thumb_set USART1_IRQHandler,Default_Handler + + .weak LPUART1_IRQHandler + .thumb_set LPUART1_IRQHandler,Default_Handler + + .weak SAI1_IRQHandler + .thumb_set SAI1_IRQHandler,Default_Handler + + .weak TSC_IRQHandler + .thumb_set TSC_IRQHandler,Default_Handler + + .weak EXTI15_10_IRQHandler + .thumb_set EXTI15_10_IRQHandler,Default_Handler + + .weak RTC_Alarm_IRQHandler + .thumb_set RTC_Alarm_IRQHandler,Default_Handler + + .weak CRS_IRQHandler + .thumb_set CRS_IRQHandler,Default_Handler + + .weak PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler + .thumb_set PWR_SOTF_BLEACT_802ACT_RFPHASE_IRQHandler,Default_Handler + + .weak IPCC_C1_RX_IRQHandler + .thumb_set IPCC_C1_RX_IRQHandler,Default_Handler + + .weak IPCC_C1_TX_IRQHandler + .thumb_set IPCC_C1_TX_IRQHandler,Default_Handler + + .weak HSEM_IRQHandler + .thumb_set HSEM_IRQHandler,Default_Handler + + .weak LPTIM1_IRQHandler + .thumb_set LPTIM1_IRQHandler,Default_Handler + + .weak LPTIM2_IRQHandler + .thumb_set LPTIM2_IRQHandler,Default_Handler + + .weak LCD_IRQHandler + .thumb_set LCD_IRQHandler,Default_Handler + + .weak QUADSPI_IRQHandler + .thumb_set QUADSPI_IRQHandler,Default_Handler + + .weak AES1_IRQHandler + .thumb_set AES1_IRQHandler,Default_Handler + + .weak AES2_IRQHandler + .thumb_set AES2_IRQHandler,Default_Handler + + .weak RNG_IRQHandler + .thumb_set RNG_IRQHandler,Default_Handler + + .weak FPU_IRQHandler + .thumb_set FPU_IRQHandler,Default_Handler + + .weak DMA2_Channel1_IRQHandler + .thumb_set DMA2_Channel1_IRQHandler,Default_Handler + + .weak DMA2_Channel2_IRQHandler + .thumb_set DMA2_Channel2_IRQHandler,Default_Handler + + .weak DMA2_Channel3_IRQHandler + .thumb_set DMA2_Channel3_IRQHandler,Default_Handler + + .weak DMA2_Channel4_IRQHandler + .thumb_set DMA2_Channel4_IRQHandler,Default_Handler + + .weak DMA2_Channel5_IRQHandler + .thumb_set DMA2_Channel5_IRQHandler,Default_Handler + + .weak DMA2_Channel6_IRQHandler + .thumb_set DMA2_Channel6_IRQHandler,Default_Handler + + .weak DMA2_Channel7_IRQHandler + .thumb_set DMA2_Channel7_IRQHandler,Default_Handler + + .weak DMAMUX1_OVR_IRQHandler + .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c new file mode 100644 index 000000000..0a2679a25 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/syscalls.c @@ -0,0 +1,158 @@ +/** + ****************************************************************************** + * @file syscalls.c + * @author Auto-generated by STM32CubeIDE + * @brief STM32CubeIDE Minimal System calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include +#include +#include +#include +#include +#include +#include + + +/* Variables */ +//#undef errno +extern int errno; +extern int __io_putchar(int ch) __attribute__((weak)); +extern int __io_getchar(void) __attribute__((weak)); + +register char * stack_ptr asm("sp"); + +char *__env[1] = { 0 }; +char **environ = __env; + + +/* Functions */ +void initialise_monitor_handles() +{ +} + +int _getpid(void) +{ + return 1; +} + +int _kill(int pid, int sig) +{ + errno = EINVAL; + return -1; +} + +void _exit (int status) +{ + _kill(status, -1); + while (1) {} /* Make sure we hang here */ +} + +__attribute__((weak)) int _read(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + *ptr++ = __io_getchar(); + } + +return len; +} + +__attribute__((weak)) int _write(int file, char *ptr, int len) +{ + int DataIdx; + + for (DataIdx = 0; DataIdx < len; DataIdx++) + { + __io_putchar(*ptr++); + } + return len; +} + +int _close(int file) +{ + return -1; +} + + +int _fstat(int file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _isatty(int file) +{ + return 1; +} + +int _lseek(int file, int ptr, int dir) +{ + return 0; +} + +int _open(char *path, int flags, ...) +{ + /* Pretend like we always fail */ + return -1; +} + +int _wait(int *status) +{ + errno = ECHILD; + return -1; +} + +int _unlink(char *name) +{ + errno = ENOENT; + return -1; +} + +int _times(struct tms *buf) +{ + return -1; +} + +int _stat(char *file, struct stat *st) +{ + st->st_mode = S_IFCHR; + return 0; +} + +int _link(char *old, char *new) +{ + errno = EMLINK; + return -1; +} + +int _fork(void) +{ + errno = EAGAIN; + return -1; +} + +int _execve(char *name, char **argv, char **env) +{ + errno = ENOMEM; + return -1; +} diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c new file mode 100644 index 000000000..e5f94e4e1 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/Application/User/sysmem.c @@ -0,0 +1,57 @@ +/** + ****************************************************************************** + * @file sysmem.c + * @author Auto-generated by STM32CubeIDE + * @brief STM32CubeIDE Minimal System Memory calls file + * + * For more information about which c-functions + * need which of these lowlevel functions + * please consult the Newlib libc-manual + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ + +/* Includes */ +#include +#include + +/* Variables */ +extern int errno; +register char * stack_ptr asm("sp"); + +/* Functions */ + +/** + _sbrk + Increase program data space. Malloc and related functions depend on this +**/ +caddr_t _sbrk(int incr) +{ + extern char end asm("end"); + static char *heap_end; + char *prev_heap_end; + + if (heap_end == 0) + heap_end = &end; + + prev_heap_end = heap_end; + if (heap_end + incr > stack_ptr) + { + errno = ENOMEM; + return (caddr_t) -1; + } + + heap_end += incr; + + return (caddr_t) prev_heap_end; +} + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld new file mode 100644 index 000000000..001a31233 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -0,0 +1,171 @@ +/** +***************************************************************************** +** +** File : stm32wb55xx_flash_cm4.ld +** +** Abstract : STM32CubeIDE Minimal System calls file +** +** For more information about which c-functions +** need which of these lowlevel functions +** please consult the Newlib libc-manual +** +** Environment : STM32CubeIDE for MCU +** +** Distribution: The file is distributed as is, without any warranty +** of any kind. +** +***************************************************************************** +** @attention +** +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. +** +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x20030000; /* end of RAM */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x400 ; /* required amount of heap */ +_Min_Stack_Size = 0x1000 ; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K +RAM1 (xrw) : ORIGIN = 0x20000008, LENGTH = 0x2FFF8 +RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM1 AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss section */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(.bss*) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM1 + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM1 + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } + MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED + MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED + MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED +} + + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.c new file mode 100644 index 000000000..d48d1753e --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.c @@ -0,0 +1,854 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/app_thread.c + * Description : Thread Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "utilities_common.h" +#include "app_entry.h" +#include "dbg_trace.h" +#include "app_thread.h" +#include "stm32wbxx_core_interface_def.h" +#include "openthread_api_wb.h" +#include "shci.h" +#include "stm_logging.h" +#include "app_conf.h" +#include "stm32_lpm.h" +#include "stm32_seq.h" +#if (CFG_USB_INTERFACE_ENABLE != 0) +#include "vcp.h" +#include "vcp_conf.h" +#endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ + +/* Private includes -----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private defines -----------------------------------------------------------*/ +#define C_SIZE_CMD_STRING 256U + +/* USER CODE BEGIN PD */ + +/* USER CODE END PD */ + +/* Private macros ------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ + +/* USER CODE END PM */ + +/* Private function prototypes -----------------------------------------------*/ +static void APP_THREAD_CheckWirelessFirmwareInfo(void); +static void APP_THREAD_DeviceConfig(void); +static void APP_THREAD_StateNotif(uint32_t NotifFlags, void *pContext); +static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode); +#if (CFG_FULL_LOW_POWER == 0) +static void Send_CLI_To_M0(void); +#endif /* (CFG_FULL_LOW_POWER == 0) */ +static void Send_CLI_Ack_For_OT(void); +static void HostTxCb( void ); +static void Wait_Getting_Ack_From_M0(void); +static void Receive_Ack_From_M0(void); +static void Receive_Notification_From_M0(void); +#if (CFG_HW_LPUART1_ENABLED == 1) +extern void MX_LPUART1_UART_Init(void); +#endif +#if (CFG_HW_USART1_ENABLED == 1) +extern void MX_USART1_UART_Init(void); +#endif +#if (CFG_USB_INTERFACE_ENABLE != 0) +static uint32_t ProcessCmdString(uint8_t* buf , uint32_t len); +#else +#if (CFG_FULL_LOW_POWER == 0) +static void RxCpltCallback(void); +#endif /* (CFG_FULL_LOW_POWER == 0) */ +#endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ + +/* USER CODE BEGIN PFP */ +static void APP_THREAD_joinerTimingElapsed(void); +/* USER CODE END PFP */ + +/* Private variables -----------------------------------------------*/ +#if (CFG_USB_INTERFACE_ENABLE != 0) +static uint8_t TmpString[C_SIZE_CMD_STRING]; +static uint8_t VcpRxBuffer[sizeof(TL_CmdSerial_t)]; /* Received Data over USB are stored in this buffer */ +static uint8_t VcpTxBuffer[sizeof(TL_EvtPacket_t) + 254U]; /* Transmit buffer over USB */ +#else +#if (CFG_FULL_LOW_POWER == 0) +static uint8_t aRxBuffer[C_SIZE_CMD_STRING]; +#endif /* (CFG_FULL_LOW_POWER == 0) */ +#endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ + +#if (CFG_FULL_LOW_POWER == 0) +static uint8_t CommandString[C_SIZE_CMD_STRING]; +#endif /* (CFG_FULL_LOW_POWER == 0) */ +static __IO uint16_t indexReceiveChar = 0; +static __IO uint16_t CptReceiveCmdFromUser = 0; + +static TL_CmdPacket_t *p_thread_otcmdbuffer; +static TL_EvtPacket_t *p_thread_notif_M0_to_M4; +static __IO uint32_t CptReceiveMsgFromM0 = 0; +PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_TH_Config_t ThreadConfigBuffer; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t ThreadOtCmdBuffer; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t ThreadNotifRspEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255U]; +PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t ThreadCliCmdBuffer; +extern uint8_t g_ot_notification_allowed; + +/* USER CODE BEGIN PV */ +uint8_t JoinerState = 0; /* 0 : Default, 1 : ifconfig in progress, 2 : joining in progress, 3 : joining over */ +static uint8_t joinerTimerID; +static bool joinerIPv6IfUp = FALSE; +#define SLOW_BLINK_TIMEOUT (5*100*1000/CFG_TS_TICK_VAL) /** .5s */ +/* USER CODE END PV */ + +/* Functions Definition ------------------------------------------------------*/ + +void APP_THREAD_Init( void ) +{ + /* USER CODE BEGIN APP_THREAD_INIT_1 */ + + /* USER CODE END APP_THREAD_INIT_1 */ + + SHCI_CmdStatus_t ThreadInitStatus; + + /* Check the compatibility with the Coprocessor Wireless Firmware loaded */ + APP_THREAD_CheckWirelessFirmwareInfo(); + +#if (CFG_USB_INTERFACE_ENABLE != 0) + VCP_Init(&VcpTxBuffer[0], &VcpRxBuffer[0]); +#endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ + + /* Register cmdbuffer */ + APP_THREAD_RegisterCmdBuffer(&ThreadOtCmdBuffer); + + /** + * Do not allow standby in the application + */ + UTIL_LPM_SetOffMode(1 << CFG_LPM_APP_THREAD, UTIL_LPM_DISABLE); + + /* Init config buffer and call TL_THREAD_Init */ + APP_THREAD_TL_THREAD_INIT(); + + /* Configure UART for sending CLI command from M4 */ + APP_THREAD_Init_UART_CLI(); + + /* Send Thread start system cmd to M0 */ + ThreadInitStatus = SHCI_C2_THREAD_Init(); + + /* Prevent unused argument(s) compilation warning */ + UNUSED(ThreadInitStatus); + + /* Register task */ + /* Create the different tasks */ + UTIL_SEQ_RegTask( 1<<(uint32_t)CFG_TASK_MSG_FROM_M0_TO_M4, UTIL_SEQ_RFU, APP_THREAD_ProcessMsgM0ToM4); + + /* USER CODE BEGIN INIT TASKS */ + UTIL_SEQ_RegTask( 1<<(uint32_t)CFG_TASK_JOIN_BUTTON, UTIL_SEQ_RFU, APP_THREAD_CommissioningJoin); + HW_TS_Create(CFG_TIM_PROC_ID_ISR, &joinerTimerID, hw_ts_Repeated, APP_THREAD_joinerTimingElapsed); + /* USER CODE END INIT TASKS */ + + /* Initialize and configure the Thread device*/ + APP_THREAD_DeviceConfig(); + + /* USER CODE BEGIN APP_THREAD_INIT_2 */ + + /* USER CODE END APP_THREAD_INIT_2 */ +} + +/** + * @brief Trace the error or the warning reported. + * @param ErrId : + * @param ErrCode + * @retval None + */ +void APP_THREAD_Error(uint32_t ErrId, uint32_t ErrCode) +{ + /* USER CODE BEGIN APP_THREAD_Error_1 */ + + /* USER CODE END APP_THREAD_Error_1 */ + switch(ErrId) + { + case ERR_REC_MULTI_MSG_FROM_M0 : + APP_THREAD_TraceError("ERROR : ERR_REC_MULTI_MSG_FROM_M0 ", ErrCode); + break; + case ERR_THREAD_SET_STATE_CB : + APP_THREAD_TraceError("ERROR : ERR_THREAD_SET_STATE_CB ",ErrCode); + break; + case ERR_THREAD_ERASE_PERSISTENT_INFO : + APP_THREAD_TraceError("ERROR : ERR_THREAD_ERASE_PERSISTENT_INFO ",ErrCode); + break; + case ERR_THREAD_CHECK_WIRELESS : + APP_THREAD_TraceError("ERROR : ERR_THREAD_CHECK_WIRELESS ",ErrCode); + break; + /* USER CODE BEGIN APP_THREAD_Error_2 */ + + /* USER CODE END APP_THREAD_Error_2 */ + default : + APP_THREAD_TraceError("ERROR Unknown ", 0); + break; + } +} + +/************************************************************* + * + * LOCAL FUNCTIONS + * + *************************************************************/ + +/** + * @brief Thread initialization. + * @param None + * @retval None + */ +static void APP_THREAD_DeviceConfig(void) +{ + otError error; + error = otSetStateChangedCallback(NULL, APP_THREAD_StateNotif, NULL); + if (error != OT_ERROR_NONE) + { + APP_THREAD_Error((uint32_t)ERR_THREAD_SET_STATE_CB, (uint32_t)ERR_INTERFACE_FATAL); + } + + /* USER CODE BEGIN DEVICECONFIG */ + + /* USER CODE END DEVICECONFIG */ +} + +/** + * @brief Thread notification when the state changes. + * @param aFlags : Define the item that has been modified + * aContext: Context + * + * @retval None + */ +static void APP_THREAD_StateNotif(uint32_t NotifFlags, void *pContext) +{ + /* Prevent unused argument(s) compilation warning */ + UNUSED(pContext); + + /* USER CODE BEGIN APP_THREAD_STATENOTIF */ + + /* USER CODE END APP_THREAD_STATENOTIF */ + + if ((NotifFlags & (uint32_t)OT_CHANGED_THREAD_ROLE) == (uint32_t)OT_CHANGED_THREAD_ROLE) + { + switch (otThreadGetDeviceRole(NULL)) + { + case OT_DEVICE_ROLE_DISABLED: + /* USER CODE BEGIN OT_DEVICE_ROLE_DISABLED */ + BSP_LED_Off(LED2); + BSP_LED_Off(LED3); + /* USER CODE END OT_DEVICE_ROLE_DISABLED */ + break; + case OT_DEVICE_ROLE_DETACHED: + /* USER CODE BEGIN OT_DEVICE_ROLE_DETACHED */ + BSP_LED_Off(LED2); + BSP_LED_Off(LED3); + /* USER CODE END OT_DEVICE_ROLE_DETACHED */ + break; + case OT_DEVICE_ROLE_CHILD: + /* USER CODE BEGIN OT_DEVICE_ROLE_CHILD */ + BSP_LED_Off(LED2); + BSP_LED_On(LED3); + /* USER CODE END OT_DEVICE_ROLE_CHILD */ + break; + case OT_DEVICE_ROLE_ROUTER : + /* USER CODE BEGIN OT_DEVICE_ROLE_ROUTER */ + BSP_LED_Off(LED2); + BSP_LED_On(LED3); + /* USER CODE END OT_DEVICE_ROLE_ROUTER */ + break; + case OT_DEVICE_ROLE_LEADER : + /* USER CODE BEGIN OT_DEVICE_ROLE_LEADER */ + BSP_LED_On(LED2); + BSP_LED_Off(LED3); + /* USER CODE END OT_DEVICE_ROLE_LEADER */ + break; + default: + /* USER CODE BEGIN DEFAULT */ + BSP_LED_Off(LED2); + BSP_LED_Off(LED3); + /* USER CODE END DEFAULT */ + break; + } + } +} + +/** + * @brief Warn the user that an error has occurred.In this case, + * the LEDs on the Board will start blinking. + * + * @param pMess : Message associated to the error. + * @param ErrCode: Error code associated to the module (OpenThread or other module if any) + * @retval None + */ +static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) +{ + /* USER CODE BEGIN TRACE_ERROR */ + APP_DBG("**** Fatal error = %s (Err = %d)", pMess, ErrCode); + while(1U == 1U) + { + BSP_LED_Toggle(LED1); + HAL_Delay(500U); + BSP_LED_Toggle(LED2); + HAL_Delay(500U); + BSP_LED_Toggle(LED3); + HAL_Delay(500U); + } + /* USER CODE END TRACE_ERROR */ +} + +/** + * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread + * and display associated information + * @param None + * @retval None + */ +static void APP_THREAD_CheckWirelessFirmwareInfo(void) +{ + WirelessFwInfo_t wireless_info_instance; + WirelessFwInfo_t* p_wireless_info = &wireless_info_instance; + + if (SHCI_GetWirelessFwInfo(p_wireless_info) != SHCI_Success) + { + APP_THREAD_Error((uint32_t)ERR_THREAD_CHECK_WIRELESS, (uint32_t)ERR_INTERFACE_FATAL); + } + else + { + APP_DBG("**********************************************************"); + APP_DBG("WIRELESS COPROCESSOR FW:"); + /* Print version */ + APP_DBG("VERSION ID = %d.%d.%d", p_wireless_info->VersionMajor, p_wireless_info->VersionMinor, p_wireless_info->VersionSub); + + switch(p_wireless_info->StackType) + { + case INFO_STACK_TYPE_THREAD_FTD : + APP_DBG("FW Type : Thread FTD"); + break; + case INFO_STACK_TYPE_THREAD_MTD : + APP_DBG("FW Type : Thread MTD"); + break; + case INFO_STACK_TYPE_BLE_THREAD_FTD_STATIC : + APP_DBG("FW Type : Static Concurrent Mode BLE/Thread"); + break; + default : + /* No Thread device supported ! */ + APP_THREAD_Error((uint32_t)ERR_THREAD_CHECK_WIRELESS, (uint32_t)ERR_INTERFACE_FATAL); + break; + } + APP_DBG("**********************************************************"); + } +} +/* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ + +/* USER CODE END FD_LOCAL_FUNCTIONS */ + +/************************************************************* + * + * WRAP FUNCTIONS + * + *************************************************************/ + +void APP_THREAD_RegisterCmdBuffer(TL_CmdPacket_t* p_buffer) +{ + p_thread_otcmdbuffer = p_buffer; +} + +Thread_OT_Cmd_Request_t* THREAD_Get_OTCmdPayloadBuffer(void) +{ + return (Thread_OT_Cmd_Request_t*)p_thread_otcmdbuffer->cmdserial.cmd.payload; +} + +Thread_OT_Cmd_Request_t* THREAD_Get_OTCmdRspPayloadBuffer(void) +{ + return (Thread_OT_Cmd_Request_t*)((TL_EvtPacket_t *)p_thread_otcmdbuffer)->evtserial.evt.payload; +} + +Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) +{ + return (Thread_OT_Cmd_Request_t*)(p_thread_notif_M0_to_M4)->evtserial.evt.payload; +} + +static void Ot_Cmd_Transfer_Common(void) +{ + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ + p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; + /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) + * + ID (4 bytes) + Size (4 bytes) */ + uint32_t l_size = ((Thread_OT_Cmd_Request_t*)(p_thread_otcmdbuffer->cmdserial.cmd.payload))->Size * 4U + 8U; + p_thread_otcmdbuffer->cmdserial.cmd.plen = l_size; + + TL_OT_SendCmd(); + + /* Wait completion of cmd */ + Wait_Getting_Ack_From_M0(); +} + +/** + * @brief This function is used to transfer the Ot commands from the + * M4 to the M0. + * + * @param None + * @return None + */ +void Ot_Cmd_Transfer(void) +{ + Ot_Cmd_Transfer_Common(); +} + +/** + * @brief This function is used to transfer the Ot commands from the + * M4 to the M0 with Notification M0 to M4 allowed. + * + * @param None + * @return None + */ +void Ot_Cmd_TransferWithNotif(void) +{ + /* Flag to specify to UTIL_SEQ_EvtIdle that M0 to M4 notifications are allowed */ + g_ot_notification_allowed = 1U; + + Ot_Cmd_Transfer_Common(); +} + +/** + * @brief This function is called when acknowledge from OT command is received from the M0+. + * + * @param Otbuffer : a pointer to TL_EvtPacket_t + * @return None + */ +void TL_OT_CmdEvtReceived( TL_EvtPacket_t * Otbuffer ) +{ + /* Prevent unused argument(s) compilation warning */ + UNUSED(Otbuffer); + + Receive_Ack_From_M0(); + + /* Does not allow OpenThread M0 to M4 notification */ + g_ot_notification_allowed = 0U; +} + +/** + * @brief This function is called when notification from M0+ is received. + * + * @param Notbuffer : a pointer to TL_EvtPacket_t + * @return None + */ +void TL_THREAD_NotReceived( TL_EvtPacket_t * Notbuffer ) +{ + p_thread_notif_M0_to_M4 = Notbuffer; + + Receive_Notification_From_M0(); +} + +/** + * @brief This function is called before sending any ot command to the M0 + * core. The purpose of this function is to be able to check if + * there are no notifications coming from the M0 core which are + * pending before sending a new ot command. + * @param None + * @retval None + */ +void Pre_OtCmdProcessing(void) +{ + UTIL_SEQ_WaitEvt(EVENT_SYNCHRO_BYPASS_IDLE); +} + +/** + * @brief This function waits for getting an acknowledgment from the M0. + * + * @param None + * @retval None + */ +static void Wait_Getting_Ack_From_M0(void) +{ + UTIL_SEQ_WaitEvt(EVENT_ACK_FROM_M0_EVT); +} + +/** + * @brief Receive an acknowledgment from the M0+ core. + * Each command send by the M4 to the M0 are acknowledged. + * This function is called under interrupt. + * @param None + * @retval None + */ +static void Receive_Ack_From_M0(void) +{ + UTIL_SEQ_SetEvt(EVENT_ACK_FROM_M0_EVT); +} + +/** + * @brief Receive a notification from the M0+ through the IPCC. + * This function is called under interrupt. + * @param None + * @retval None + */ +static void Receive_Notification_From_M0(void) +{ + CptReceiveMsgFromM0++; + UTIL_SEQ_SetTask(TASK_MSG_FROM_M0_TO_M4,CFG_SCH_PRIO_0); +} + +#if (CFG_USB_INTERFACE_ENABLE != 0) +#else +#if (CFG_FULL_LOW_POWER == 0) +static void RxCpltCallback(void) +{ + /* Filling buffer and wait for '\r' char */ + if (indexReceiveChar < C_SIZE_CMD_STRING) + { + CommandString[indexReceiveChar++] = aRxBuffer[0]; + if (aRxBuffer[0] == '\r') + { + CptReceiveCmdFromUser = 1U; + + /* UART task scheduling*/ + UTIL_SEQ_SetTask(1U << CFG_TASK_SEND_CLI_TO_M0, CFG_SCH_PRIO_0); + } + } + + /* Once a character has been sent, put back the device in reception mode */ + HW_UART_Receive_IT(CFG_CLI_UART, aRxBuffer, 1U, RxCpltCallback); +} +#endif /* (CFG_FULL_LOW_POWER == 0) */ +#endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ + +#if (CFG_USB_INTERFACE_ENABLE != 0) +/** + * @brief Process the command strings. + * As soon as a complete command string has been received, the task + * in charge of sending the command to the M0 is scheduled + * @param None + * @retval None + */ +static uint32_t ProcessCmdString( uint8_t* buf , uint32_t len ) +{ + uint32_t i,j,tmp_start; + tmp_start = 0; + uint32_t res = 0; + + i= 0; + while ((buf[i] != '\r') && (i < len)) + { + i++; + } + + if (i != len) + { + memcpy(CommandString, buf,(i+1)); + indexReceiveChar = i + 1U; /* Length of the buffer containing the command string */ + UTIL_SEQ_SetTask(1U << CFG_TASK_SEND_CLI_TO_M0, CFG_SCH_PRIO_0); + tmp_start = i; + for (j = 0; j < (len - tmp_start - 1U) ; j++) + { + buf[j] = buf[tmp_start + j + 1U]; + } + res = len - tmp_start - 1U; + } + else + { + res = len; + } + return res; /* Remaining characters in the temporary buffer */ +} +#endif/* (CFG_USB_INTERFACE_ENABLE != 0) */ + +#if (CFG_FULL_LOW_POWER == 0) +/** + * @brief Process sends receive CLI command to M0. + * @param None + * @retval None + */ +static void Send_CLI_To_M0(void) +{ + memset(ThreadCliCmdBuffer.cmdserial.cmd.payload, 0x0U, 255U); + memcpy(ThreadCliCmdBuffer.cmdserial.cmd.payload, CommandString, indexReceiveChar); + ThreadCliCmdBuffer.cmdserial.cmd.plen = indexReceiveChar; + ThreadCliCmdBuffer.cmdserial.cmd.cmdcode = 0x0; + + /* Clear receive buffer, character counter and command complete */ + CptReceiveCmdFromUser = 0; + indexReceiveChar = 0; + memset(CommandString, 0, C_SIZE_CMD_STRING); + + TL_CLI_SendCmd(); +} +#endif /* (CFG_FULL_LOW_POWER == 0) */ + +/** + * @brief Send notification for CLI TL Channel. + * @param None + * @retval None + */ +static void Send_CLI_Ack_For_OT(void) +{ + + /* Notify M0 that characters have been sent to UART */ + TL_THREAD_CliSendAck(); +} + +/** + * @brief Perform initialization of CLI UART interface. + * @param None + * @retval None + */ +void APP_THREAD_Init_UART_CLI(void) +{ +#if (CFG_FULL_LOW_POWER == 0) + UTIL_SEQ_RegTask( 1<cmdserial.cmd.plen; + + /* WORKAROUND: if string to output is "> " then respond directly to M0 and do not output it */ + if (strcmp((const char *)l_CliBuffer->cmdserial.cmd.payload, "> ") != 0) + { + /* Write to CLI UART */ +#if (CFG_USB_INTERFACE_ENABLE != 0) + VCP_SendData( l_CliBuffer->cmdserial.cmd.payload, l_size, HostTxCb); +#else + HW_UART_Transmit_IT(CFG_CLI_UART, l_CliBuffer->cmdserial.cmd.payload, l_size, HostTxCb); + if (JoinerState) { + if (strstr((const char *)l_CliBuffer->cmdserial.cmd.payload, "failed")) { + JoinerState = 0x0F; /*i.e. Error in commissioning */ + UTIL_SEQ_SetTask(TASK_JOIN_BUTTON,CFG_SCH_PRIO_0); + } else if (strstr((const char *)l_CliBuffer->cmdserial.cmd.payload, "success")) { + JoinerState = 3; + UTIL_SEQ_SetTask(TASK_JOIN_BUTTON,CFG_SCH_PRIO_0); + } + } +#endif /*USAGE_OF_VCP */ + } + else + { + Send_CLI_Ack_For_OT(); + } +} +/* USER CODE END COMMISSIONING_FUNCTIONS */ +/** + * @brief End of transfer callback for CLI UART sending. + * + * @param Notbuffer : a pointer to TL_EvtPacket_t + * @return None + */ +void HostTxCb(void) +{ + Send_CLI_Ack_For_OT(); +} + +/** + * @brief Process the messages coming from the M0. + * @param None + * @retval None + */ +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ +void APP_THREAD_ProcessMsgM0ToM4(void) +{ + if (CptReceiveMsgFromM0 != 0) + { + /* If CptReceiveMsgFromM0 is > 1. it means that we did not serve all the events from the radio */ + if (CptReceiveMsgFromM0 > 1U) + { + APP_THREAD_Error(ERR_REC_MULTI_MSG_FROM_M0, 0); + } + else + { + OpenThread_CallBack_Processing(); + } + /* Reset counter */ + CptReceiveMsgFromM0 = 0; + } + + if (JoinerState || joinerIPv6IfUp) { + UTIL_SEQ_SetTask(TASK_JOIN_BUTTON,CFG_SCH_PRIO_0); + } + +} +/* USER CODE END FD_WRAP_FUNCTIONS */ + + +static void APP_THREAD_joinerTimingElapsed( void ) +{ + UTIL_SEQ_SetTask(TASK_JOIN_BUTTON,CFG_SCH_PRIO_0); +} + +#if (CFG_USB_INTERFACE_ENABLE != 0) +/** + * @brief This function is called when thereare some data coming + * from the Hyperterminal via the USB port + * Data received over USB OUT endpoint are sent over CDC interface + * through this function. + * @param Buf: Buffer of data received + * @param Len: Number of data received (in bytes) + * @retval Number of characters remaining in the buffer and not yet processed + */ +void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) +{ + uint32_t i,flag_continue_checking = TRUE; + uint32_t char_remaining = 0; + static uint32_t len_total = 0; + + /* Copy the characters in the temporary buffer */ + for (i = 0; i < *Len; i++) + { + TmpString[len_total++] = Buf[i]; + } + + /* Process the buffer commands one by one */ + /* A command is limited by a \r caracaters */ + while (flag_continue_checking == TRUE) + { + char_remaining = ProcessCmdString(TmpString,len_total); + /* If char_remaining is equal to len_total, it means that the command string is not yet + * completed. + * If char_remaining is equal to 0, it means that the command string has + * been entirely processed. + */ + if ((char_remaining == 0) || (char_remaining == len_total)) + { + flag_continue_checking = FALSE; + } + len_total = char_remaining; + } +} +#endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ + +/* USER CODE BEGIN FD_WRAP_FUNCTIONS */ +/** + * @brief Handles joiner commissioning + * @param None + * @retval None + */ +void APP_THREAD_CommissioningJoin(void) { +uint8_t l_BlinkCpt = 30; + + if (JoinerState & 0xF0) { + // Slow Blinking on going + BSP_LED_Toggle(LED1); + } + + switch (JoinerState & 0x0F) { + case 0 : /* Default */ + BSP_LED_Off(LED1); + + if (joinerIPv6IfUp) { + joinerIPv6IfUp = FALSE; + /* First set ifconfig down*/ + memset(ThreadCliCmdBuffer.cmdserial.cmd.payload, 0x0U, 255U); + memcpy(ThreadCliCmdBuffer.cmdserial.cmd.payload, "ifconfig down\n\r", 15); + ThreadCliCmdBuffer.cmdserial.cmd.plen = 15; + ThreadCliCmdBuffer.cmdserial.cmd.cmdcode = 0x0; + /* Clear receive buffer, character counter and command complete */ + CptReceiveCmdFromUser = 0; + indexReceiveChar = 0; + TL_CLI_SendCmd(); + + break; + } + + + memset(ThreadCliCmdBuffer.cmdserial.cmd.payload, 0x0U, 255U); + memcpy(ThreadCliCmdBuffer.cmdserial.cmd.payload, "ifconfig up\n\r", 13); + ThreadCliCmdBuffer.cmdserial.cmd.plen = 13; + ThreadCliCmdBuffer.cmdserial.cmd.cmdcode = 0x0; + + /* Clear receive buffer, character counter and command complete */ + CptReceiveCmdFromUser = 0; + indexReceiveChar = 0; + JoinerState = 1; + + TL_CLI_SendCmd(); + break; + + case 1 : /* ifconfig in progress */ + joinerIPv6IfUp = TRUE; + memset(ThreadCliCmdBuffer.cmdserial.cmd.payload, 0x0U, 255U); + memcpy(ThreadCliCmdBuffer.cmdserial.cmd.payload, "joiner start STM32WB\n\r", 22); + ThreadCliCmdBuffer.cmdserial.cmd.plen = 22; + ThreadCliCmdBuffer.cmdserial.cmd.cmdcode = 0x0; + + /* Clear receive buffer, character counter and command complete */ + CptReceiveCmdFromUser = 0; + indexReceiveChar = 0; + JoinerState = 0xF2; + + TL_CLI_SendCmd(); + + /* Start slow Blinking */ + HW_TS_Start(joinerTimerID, (uint32_t)SLOW_BLINK_TIMEOUT); + + break; + case 2 : /* joining in progress */ + break; + case 3 : /* joining over and OK */ + BSP_LED_On(LED1); + JoinerState = 4; + break; + case 0x0F : /* joining Error case */ + HW_TS_Stop(joinerTimerID); + while(l_BlinkCpt--) { + BSP_LED_Toggle(LED1); + HAL_Delay(50U); + } + BSP_LED_Off(LED1); + JoinerState = 0; + break; + + default : + break; + } //switch +} +/* USER CODE END FD_WRAP_FUNCTIONS */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.h new file mode 100644 index 000000000..01f9ec8f2 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.h @@ -0,0 +1,104 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : App/app_thread.h + * Description : Header for Thread Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef APP_THREAD_H +#define APP_THREAD_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +/* Private includes ----------------------------------------------------------*/ +#include "tl.h" +#include "stm32wbxx_core_interface_def.h" +#include "tl_thread_hci.h" + +/* OpenThread Library */ +#include OPENTHREAD_CONFIG_FILE + +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* Exported types ------------------------------------------------------------*/ + +/* Thread application generic defines */ +/*------------------------------------*/ +typedef enum +{ + APP_THREAD_LIMITED, + APP_THREAD_FULL, +} APP_THREAD_InitMode_t; + +/* Application errors */ +/*------------------------------------*/ + +/* + * List of all errors tracked by the Thread application + * running on M4. Some of these errors may be fatal + * or just warnings + */ +typedef enum +{ + ERR_REC_MULTI_MSG_FROM_M0, + ERR_THREAD_SET_STATE_CB, + ERR_THREAD_ERASE_PERSISTENT_INFO, +/* USER CODE BEGIN ERROR_APPLI_ENUM */ + +/* USER CODE END ERROR_APPLI_ENUM */ + ERR_THREAD_CHECK_WIRELESS + } ErrAppliIdEnum_t; +/* USER CODE BEGIN ET */ + +/* USER CODE END ET */ + +/* Exported constants --------------------------------------------------------*/ +/* USER CODE BEGIN EC */ + +/* USER CODE END EC */ + +/* External variables --------------------------------------------------------*/ +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + +/* Exported macros ------------------------------------------------------------*/ +/* USER CODE BEGIN EM */ + +/* USER CODE END EM */ + +/* Exported functions ------------------------------------------------------- */ +void APP_THREAD_Init( void ); +void APP_THREAD_Error(uint32_t ErrId, uint32_t ErrCode); +void APP_THREAD_RegisterCmdBuffer(TL_CmdPacket_t* p_buffer); +void APP_THREAD_ProcessMsgM0ToM4(void); +void APP_THREAD_Init_UART_CLI(void); +void APP_THREAD_TL_THREAD_INIT(void); +void APP_THREAD_CommissioningJoin(void); +/* USER CODE BEGIN EF */ + +/* USER CODE END EF */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* APP_THREAD_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h new file mode 100644 index 000000000..b2b3b4354 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h @@ -0,0 +1,134 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : tl_dbg_conf.h + * Description : Debug configuration file for stm32wpan transport layer interface. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __TL_DBG_CONF_H +#define __TL_DBG_CONF_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* USER CODE BEGIN Tl_Conf */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_conf.h" /* required as some configuration used in dbg_trace.h are set there */ +#include "dbg_trace.h" +#include "hw_if.h" + +/** + * Enable or Disable traces + * The raw data output is the hci binary packet format as specified by the BT specification * + */ +#define TL_SHCI_CMD_DBG_EN 0 /* Reports System commands sent to CPU2 and the command response */ +#define TL_SHCI_CMD_DBG_RAW_EN 0 /* Reports raw data System commands sent to CPU2 and the command response */ +#define TL_SHCI_EVT_DBG_EN 0 /* Reports System Asynchronous Events received from CPU2 */ +#define TL_SHCI_EVT_DBG_RAW_EN 0 /* Reports raw data System Asynchronous Events received from CPU2 */ + +#define TL_HCI_CMD_DBG_EN 0 /* Reports BLE command sent to CPU2 and the command response */ +#define TL_HCI_CMD_DBG_RAW_EN 0 /* Reports raw data BLE command sent to CPU2 and the command response */ +#define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ +#define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ + +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ + +/** + * Macro definition + */ + +/** + * System Transport Layer + */ +#if (TL_SHCI_CMD_DBG_EN != 0) +#define TL_SHCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_CMD_DBG_MSG(...) +#define TL_SHCI_CMD_DBG_BUF(...) +#endif + +#if (TL_SHCI_CMD_DBG_RAW_EN != 0) +#define TL_SHCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_CMD_DBG_RAW(...) +#endif + +#if (TL_SHCI_EVT_DBG_EN != 0) +#define TL_SHCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_SHCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_SHCI_EVT_DBG_MSG(...) +#define TL_SHCI_EVT_DBG_BUF(...) +#endif + +#if (TL_SHCI_EVT_DBG_RAW_EN != 0) +#define TL_SHCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_SHCI_EVT_DBG_RAW(...) +#endif + +/** + * BLE Transport Layer + */ +#if (TL_HCI_CMD_DBG_EN != 0) +#define TL_HCI_CMD_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_CMD_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_CMD_DBG_MSG(...) +#define TL_HCI_CMD_DBG_BUF(...) +#endif + +#if (TL_HCI_CMD_DBG_RAW_EN != 0) +#define TL_HCI_CMD_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_CMD_DBG_RAW(...) +#endif + +#if (TL_HCI_EVT_DBG_EN != 0) +#define TL_HCI_EVT_DBG_MSG PRINT_MESG_DBG +#define TL_HCI_EVT_DBG_BUF PRINT_LOG_BUFF_DBG +#else +#define TL_HCI_EVT_DBG_MSG(...) +#define TL_HCI_EVT_DBG_BUF(...) +#endif + +#if (TL_HCI_EVT_DBG_RAW_EN != 0) +#define TL_HCI_EVT_DBG_RAW(_PDATA_, _SIZE_) HW_UART_Transmit(hw_uart1, (uint8_t*)_PDATA_, _SIZE_, (~0)) +#else +#define TL_HCI_EVT_DBG_RAW(...) +#endif + +/** + * Memory Manager - Released buffer tracing + */ +#if (TL_MM_DBG_EN != 0) +#define TL_MM_DBG_MSG PRINT_MESG_DBG +#else +#define TL_MM_DBG_MSG(...) +#endif + +/* USER CODE END Tl_Conf */ + +#ifdef __cplusplus +} +#endif + +#endif /*__TL_DBG_CONF_H */ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c new file mode 100644 index 000000000..85606fda2 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c @@ -0,0 +1,670 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * File Name : Target/hw_ipcc.c + * Description : Hardware IPCC source file for STM32WPAN Middleware. + * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Includes ------------------------------------------------------------------*/ +#include "app_common.h" +#include "mbox_def.h" + +/* Global variables ---------------------------------------------------------*/ +/* Private defines -----------------------------------------------------------*/ +#define HW_IPCC_TX_PENDING( channel ) ( !(LL_C1_IPCC_IsActiveFlag_CHx( IPCC, channel )) ) && (((~(IPCC->C1MR)) & (channel << 16U))) +#define HW_IPCC_RX_PENDING( channel ) (LL_C2_IPCC_IsActiveFlag_CHx( IPCC, channel )) && (((~(IPCC->C1MR)) & (channel << 0U))) + +/* Private macros ------------------------------------------------------------*/ +/* Private typedef -----------------------------------------------------------*/ +/* Private variables ---------------------------------------------------------*/ +static void (*FreeBufCb)( void ); + +/* Private function prototypes -----------------------------------------------*/ +static void HW_IPCC_BLE_EvtHandler( void ); +static void HW_IPCC_BLE_AclDataEvtHandler( void ); +static void HW_IPCC_MM_FreeBufHandler( void ); +static void HW_IPCC_SYS_CmdEvtHandler( void ); +static void HW_IPCC_SYS_EvtHandler( void ); +static void HW_IPCC_TRACES_EvtHandler( void ); + +#ifdef THREAD_WB +static void HW_IPCC_OT_CmdEvtHandler( void ); +static void HW_IPCC_THREAD_NotEvtHandler( void ); +static void HW_IPCC_THREAD_CliNotEvtHandler( void ); +#endif + +#ifdef LLD_TESTS_WB +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ); +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ); +#endif +#ifdef LLD_BLE_WB +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void );*/ +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ); +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ); +#endif + +#ifdef MAC_802_15_4_WB +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ); +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ); +#endif + +#ifdef ZIGBEE_WB +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ); +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ); +#endif + +/* Public function definition -----------------------------------------------*/ + +/****************************************************************************** + * INTERRUPT HANDLER + ******************************************************************************/ +void HW_IPCC_Rx_Handler( void ) +{ + if (HW_IPCC_RX_PENDING( HW_IPCC_SYSTEM_EVENT_CHANNEL )) + { + HW_IPCC_SYS_EvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_NotEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_NotEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL )) + { + HW_IPCC_THREAD_CliNotEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveCliRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_M0_CMD_CHANNEL )) + { + HW_IPCC_LLDTESTS_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef LLD_BLE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_RSP_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveRspHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_M0_CMD_CHANNEL )) + { + HW_IPCC_LLD_BLE_ReceiveM0CmdHandler(); + } +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackNotifEvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL )) + { + HW_IPCC_ZIGBEE_StackM0RequestHandler(); + } +#endif /* ZIGBEE_WB */ + else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL )) + { + HW_IPCC_BLE_EvtHandler(); + } + else if (HW_IPCC_RX_PENDING( HW_IPCC_TRACES_CHANNEL )) + { + HW_IPCC_TRACES_EvtHandler(); + } + + return; +} + +void HW_IPCC_Tx_Handler( void ) +{ + if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) + { + HW_IPCC_SYS_CmdEvtHandler(); + } +#ifdef MAC_802_15_4_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL )) + { + HW_IPCC_MAC_802_15_4_CmdEvtHandler(); + } +#endif /* MAC_802_15_4_WB */ +#ifdef THREAD_WB + else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL )) + { + HW_IPCC_OT_CmdEvtHandler(); + } +#endif /* THREAD_WB */ +#ifdef LLD_TESTS_WB +// No TX handler for LLD tests +#endif /* LLD_TESTS_WB */ +#ifdef ZIGBEE_WB + if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL )) + { + HW_IPCC_ZIGBEE_CmdEvtHandler(); + } +#endif /* ZIGBEE_WB */ + + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) + { + HW_IPCC_MM_FreeBufHandler(); + } + else if (HW_IPCC_TX_PENDING( HW_IPCC_HCI_ACL_DATA_CHANNEL )) + { + HW_IPCC_BLE_AclDataEvtHandler(); + } + + return; +} +/****************************************************************************** + * GENERAL + ******************************************************************************/ +void HW_IPCC_Enable( void ) +{ + /** + * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running + when FUS is running on CPU2 and CPU1 enters deep sleep mode + */ + LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC); + + /** + * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2 + */ + LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 ); + LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 ); + + /** + * In case the SBSFU is implemented, it may have already set the C2BOOT bit to startup the CPU2. + * In that case, to keep the mechanism transparent to the user application, it shall call the system command + * SHCI_C2_Reinit( ) before jumping to the application. + * When the CPU2 receives that command, it waits for its event input to be set to restart the CPU2 firmware. + * This is required because once C2BOOT has been set once, a clear/set on C2BOOT has no effect. + * When SHCI_C2_Reinit( ) is not called, generating an event to the CPU2 does not have any effect + * So, by default, the application shall both set the event flag and set the C2BOOT bit. + */ + __SEV( ); /* Set the internal event flag and send an event to the CPU2 */ + __WFE( ); /* Clear the internal event flag */ + LL_PWR_EnableBootC2( ); + + return; +} + +void HW_IPCC_Init( void ) +{ + LL_AHB3_GRP1_EnableClock( LL_AHB3_GRP1_PERIPH_IPCC ); + + LL_C1_IPCC_EnableIT_RXO( IPCC ); + LL_C1_IPCC_EnableIT_TXF( IPCC ); + + HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn); + HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn); + + return; +} + +/****************************************************************************** + * BLE + ******************************************************************************/ +void HW_IPCC_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_BLE_CMD_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_EvtHandler( void ) +{ + HW_IPCC_BLE_RxEvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_BLE_SendAclData( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + return; +} + +static void HW_IPCC_BLE_AclDataEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL ); + + HW_IPCC_BLE_AclDataAckNot(); + + return; +} + +__weak void HW_IPCC_BLE_AclDataAckNot( void ){}; +__weak void HW_IPCC_BLE_RxEvtNot( void ){}; + +/****************************************************************************** + * SYSTEM + ******************************************************************************/ +void HW_IPCC_SYS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +void HW_IPCC_SYS_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + return; +} + +static void HW_IPCC_SYS_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ); + + HW_IPCC_SYS_CmdEvtNot(); + + return; +} + +static void HW_IPCC_SYS_EvtHandler( void ) +{ + HW_IPCC_SYS_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL ); + + return; +} + +__weak void HW_IPCC_SYS_CmdEvtNot( void ){}; +__weak void HW_IPCC_SYS_EvtNot( void ){}; + +/****************************************************************************** + * MAC 802.15.4 + ******************************************************************************/ +#ifdef MAC_802_15_4_WB +void HW_IPCC_MAC_802_15_4_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_MAC_802_15_4_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ); + + HW_IPCC_MAC_802_15_4_CmdEvtNot(); + + return; +} + +static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_MAC_802_15_4_EvtNot(); + + return; +} +__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; +__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; +#endif + +/****************************************************************************** + * THREAD + ******************************************************************************/ +#ifdef THREAD_WB +void HW_IPCC_THREAD_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_OT_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + return; +} + +void HW_IPCC_CLI_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_CMD_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_SendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +void HW_IPCC_THREAD_CliSendAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_OT_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ); + + HW_IPCC_OT_CmdEvtNot(); + + return; +} + +static void HW_IPCC_THREAD_NotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_EvtNot(); + + return; +} + +static void HW_IPCC_THREAD_CliNotEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ); + + HW_IPCC_THREAD_CliEvtNot(); + + return; +} + +__weak void HW_IPCC_OT_CmdEvtNot( void ){}; +__weak void HW_IPCC_CLI_CmdEvtNot( void ){}; +__weak void HW_IPCC_THREAD_EvtNot( void ){}; + +#endif /* THREAD_WB */ + +/****************************************************************************** + * LLD TESTS + ******************************************************************************/ +#ifdef LLD_TESTS_WB +void HW_IPCC_LLDTESTS_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLDTESTS_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveCliRsp(); + return; +} + +void HW_IPCC_LLDTESTS_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + HW_IPCC_LLDTESTS_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLDTESTS_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLDTESTS_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void ){}; +#endif /* LLD_TESTS_WB */ + +/****************************************************************************** + * LLD BLE + ******************************************************************************/ +#ifdef LLD_BLE_WB +void HW_IPCC_LLD_BLE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} + +void HW_IPCC_LLD_BLE_SendCliCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_CMD_CHANNEL ); + return; +} + +/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveCliRsp(); + return; +}*/ + +void HW_IPCC_LLD_BLE_SendCliRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void ) +{ + //LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveM0Cmd(); + return; +} + +void HW_IPCC_LLD_BLE_SendM0CmdAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + //LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ); + return; +} +__weak void HW_IPCC_LLD_BLE_ReceiveCliRsp( void ){}; +__weak void HW_IPCC_LLD_BLE_ReceiveM0Cmd( void ){}; + +/* Transparent Mode */ +void HW_IPCC_LLD_BLE_SendCmd( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CMD_CHANNEL ); + return; +} + +static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + HW_IPCC_LLD_BLE_ReceiveRsp(); + return; +} + +void HW_IPCC_LLD_BLE_SendRspAck( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL ); + return; +} + +#endif /* LLD_BLE_WB */ + +/****************************************************************************** + * ZIGBEE + ******************************************************************************/ +#ifdef ZIGBEE_WB +void HW_IPCC_ZIGBEE_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4RequestToM0( void ) +{ + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + return; +} + +static void HW_IPCC_ZIGBEE_CmdEvtHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvAppliAckFromM0(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0NotifyToM4(); + + return; +} + +static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void ) +{ + LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + HW_IPCC_ZIGBEE_RecvM0RequestToM4(); + + return; +} + +void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void ) +{ + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ); + + return; +} + +__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){}; +__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){}; +#endif /* ZIGBEE_WB */ + +/****************************************************************************** + * MEMORY MANAGER + ******************************************************************************/ +void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) ) +{ + if ( LL_C1_IPCC_IsActiveFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ) ) + { + FreeBufCb = cb; + LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + else + { + cb(); + + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + } + + return; +} + +static void HW_IPCC_MM_FreeBufHandler( void ) +{ + LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + FreeBufCb(); + + LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ); + + return; +} + +/****************************************************************************** + * TRACES + ******************************************************************************/ +void HW_IPCC_TRACES_Init( void ) +{ + LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +static void HW_IPCC_TRACES_EvtHandler( void ) +{ + HW_IPCC_TRACES_EvtNot(); + + LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_TRACES_CHANNEL ); + + return; +} + +__weak void HW_IPCC_TRACES_EvtNot( void ){}; + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/readme.txt new file mode 100644 index 000000000..2c299b313 --- /dev/null +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd/readme.txt @@ -0,0 +1,192 @@ +/** + @page Thread_RCP_Cli_Cmd application + + @verbatim + ****************************************************************************** + * @file Thread/Thread_RCP_Cli_Cmd/readme.txt + * @author MCD Application Team + * @brief Description of the Thread RCP Cli command application + ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + @endverbatim + +@par Application Description + +How to control the Thread stack via Cli commands and trigger an automatic commissioning joiner sequence from a press button. + +The Cli (Command Line Interface) commands are sent via an UART from an HyperTerminal (PC) +to the STM32WB55RG_Nucleo Board. + + ___________________________ + | | + | ________________| _____________________________________ + | |USART1 | | HyperTerminal 1 | + | | | |=> Used to ctrl the stack via Cli Cmd| + | | | | | + | | | | | + | | |______________________| | + | | |______________________| ST_Link virtual port | + | | | ST_Link Cable | | + | | | | | + | | | | | + | | | | | + | |________________| |_____________________________________| + | | + | _______________ | ______________________________________ + | |LPUART1 | | HyperTerminal 2 (Optional) | + | | | |=> Used to display traces | + | | | | | + | |CN10(Pin37) TX |______________________|RX | + | | | | | + | | | RS232 Cable | | + | | | | | + | |CN10(Pin35 )RX |______________________|TX | + | | | | | + | |________________| |______________________________________| + | | + | | + | | + |_STM32WB55RG_Nucleo________| + + + +- Through the Cli commands, it is possible to control and configure the Thread +stack. +- On the HyperTerminal, the user can type the command 'help' in order to display the list of +all available cli commands. Additional information can be found looking at the OpenThread +web site: https://openthread.io/guides/ + +- As an example, the user can play the following scenario in order to properly initiate the Thread +mesh network by typing the following commands: + + >panid 0x1234 + Done + >channel 12 + Done + >ifconfig up + Done + >thread start + Done + +At this point, the user can check the state of its device by using the cli command 'state' + >state + Leader + +- When running on two STM32WB55RG_Nucleo boards the same Thread_RCP_Cli_Cmd application, and by playing the + same scenario as described above on both boards, the first board should reach the state 'leader' + while the second one should reach the state 'child'. + +- When the Thread device changes state, a specific LED color is being displayed. + LED2 ON (Green) means that the device is in "Leader" mode. + LED3 ON (Red) means that the device is in "Router" or "Child" mode. + LED2 OFF and LED3 OFF means that the device is disabled or detached. + +- When all LEDS are blinking, it means that a fatal error has been detected. + + +@note The application needs to ensure that the SysTick time base is always set to 1 millisecond + to have correct HAL operation. + +@par Keywords + +THREAD + +@par Directory contents + + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_common.h Header for all modules with common definition + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_conf.h Parameters configuration file of the application + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/app_entry.h Parameters configuration file of the application + - Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.h Header for app_thread.c module + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/hw_conf.h Configuration file of the HW + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/main.h Header for main.c module + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm_logging.h Header for stm_logging.c module + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file + - Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32wbxx_it.h Interrupt header file + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/system_infra.h System infrastructure header file + - Thread/Thread_RCP_Cli_Cmd/Core/Inc/utilities_conf.h Configuration file of the utilities + - Thread/Thread_RCP_Cli_Cmd/Core/Src/app_entry.c Initialization of the application + - Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/App/app_thread.c Thread application implementation + - Thread/Thread_RCP_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c IPCC Driver + - Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32_lpm_if.c Low Power Manager Interface + - Thread/Thread_RCP_Cli_Cmd/Core/Src/hw_uart.c UART driver + - Thread/Thread_RCP_Cli_Cmd/Core/Src/main.c Main program + - Thread/Thread_RCP_Cli_Cmd/Core/Src/stm_logging.c Logging module for traces + - Thread/Thread_RCP_Cli_Cmd/Core/Src/stm32xx_it.c Interrupt handlers + - Thread/Thread_RCP_Cli_Cmd/Core/Src/system_stm32wbxx.c stm32wbxx system source file + + +@par Hardware and Software environment + + - This example runs on STM32WB55xx devices (Nucleo board and dongle) + + - This example has been tested with an STMicroelectronics STM32WB55RG_Nucleo + board and can be easily tailored to any other supported device + and development board. + + - On STM32WB55RG_Nucleo, the jumpers must be configured as described + in this section. Starting from the top left position up to the bottom + right position, the jumpers on the Board must be set as follows: + + CN11: GND [OFF] + JP4: VDDRF [ON] + JP6: VC0 [ON] + JP2: +3V3 [ON] + JP1: USB_STL [ON] All others [OFF] + CN12: GND [OFF] + CN7: [OFF] + JP3: VDD_MCU [ON] + JP5: GND [OFF] All others [ON] + CN10: [OFF] + + +@par How to use it ? + +This application requests having the stm32wb5x_Thread_FTD_fw.bin binary flashed on the Wireless Coprocessor. +If it is not the case, you need to use STM32CubeProgrammer to load the appropriate binary. +All available binaries are located under /Projects/STM32_Copro_Wireless_Binaries directory. +Refer to UM2237 to learn how to use/install STM32CubeProgrammer. +Refer to /Projects/STM32_Copro_Wireless_Binaries/ReleaseNote.html for the detailed procedure to change the +Wireless Coprocessor binary. + + +In order to make the program work, you must do the following: + - Connect an STM32WB55xx_Nucleo board to your PC + - Open your preferred toolchain + - Rebuild all files and load your image + - Connect one HyperTerminal (ST_Link) to be able to control the Thread stack via Cli commands + - Connect a second HyperTerminal as described below to get the traces (optional) + - Run the example and use the HyperTerminal to interact with the Board via the Cli commands + +Note: when LED1, LED2 and LED3 are toggling it is indicating an error has occurred on application. + +For the Cli control and for the traces, the UART must be configured as follows: + - BaudRate = 115200 baud + - Word Length = 8 Bits + - Stop Bit = 1 bit + - Parity = none + - Flow control = none + + +@par How to use this application as a joiner which triggers a commissioning process thanks to ST Border Router. + +This Application is providing a One press button feature to start joiner commissioning process. +Please Refer to RCP application readme to get the big picture of the commissioning process. +Once the joiner device (running RCP_Cli_Cmd application) is ready to be commissioned into a Thread Network (thanks to ST Border Router), +just press Button SW1. +The Blue LED starts blinking at a slow pace, indicating that the commissioning is in progress. +If the commissioning process end with a success, the Blue LED gets solid indicating that the node as joined the network. +If the commissioning process end with a failure, the Blue LED gets a fast blinking pace then switch off. + + + + + *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  + */ \ No newline at end of file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_conf.h index fd44a5ab0..b65783f6a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -347,9 +348,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -361,4 +362,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_entry.h index e3a3cec76..4e4542a43 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_conf.h index a50b7db2f..cb1630340 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -256,5 +255,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/main.h index 0ddad10dd..8db15f15a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h index a6579e973..0d4f7d477 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_it.h index de508ed7b..1bd898afe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void FPU_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_entry.c index e4663831e..612b0a5b6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -652,4 +650,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_freertos.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_freertos.c index 33518a6d1..f7bbac97b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_freertos.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/app_freertos.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,4 +66,3 @@ __weak void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime ) /* USER CODE END Application */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/freertos_port.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/freertos_port.c index 2a6bf7141..477274cbe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/freertos_port.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/freertos_port.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : freertos_port.c - * Description : Custom porting of FreeRTOS functionalities - * - ****************************************************************************** + ****************************************************************************** + * File Name : freertos_port.c + * Description : Custom porting of FreeRTOS functionalities + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -25,11 +24,11 @@ #include "FreeRTOS.h" #include "task.h" #include "stm32_lpm.h" +#include /* Private typedef -----------------------------------------------------------*/ typedef struct { - uint64_t LpTimeDiffVal; uint32_t LpTimeLeftOnEntry; uint8_t LpTimerFreeRTOS_Id; } LpTimerContext_t; @@ -201,7 +200,6 @@ void vPortSetupTimerInterrupt( void ) static void LpTimerInit( void ) { ( void ) HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(LpTimerContext.LpTimerFreeRTOS_Id), hw_ts_SingleShot, LpTimerCb); - LpTimerContext.LpTimeDiffVal = 0; return; } @@ -236,13 +234,15 @@ static void LpTimerStart( uint32_t time_to_sleep ) uint64_t time; /* Converts the number of FreeRTOS ticks into hw timer tick */ - - time = (time_to_sleep * 1000LL * 1000LL ); - time = time / ( CFG_TS_TICK_VAL * configTICK_RATE_HZ ); - - if(time > 0xFFFF0000) + if (time_to_sleep > (ULLONG_MAX / 1e12)) /* Prevent overflow in else statement */ { - time = 0xFFFF0000; /* maximum value */ + time = 0xFFFF0000; /* Maximum value equal to 24 days */ + } + else + { + /* The result always fits in uint32_t and is always less than 0xFFFF0000 */ + time = time_to_sleep * 1000000000000ULL; + time = (uint64_t)( time / ( CFG_TS_TICK_VAL_PS * configTICK_RATE_HZ )); } HW_TS_Start(LpTimerContext.LpTimerFreeRTOS_Id, (uint32_t)time); @@ -284,31 +284,30 @@ static void LpEnter( void ) #if ( CFG_LPM_SUPPORTED != 0) static uint32_t LpGetElapsedTime( void ) { - uint64_t val_ticks, time_us, diff_ps; - uint32_t LpTimeLeftOnExit, time2_us; + uint64_t val_ticks, time_ps; + uint32_t LpTimeLeftOnExit; LpTimeLeftOnExit = HW_TS_RTC_ReadLeftTicksToCount(); - time_us = (CFG_TS_TICK_VAL) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Corrects the time precision lost in CFG_TS_TICK_VAL computation */ - - /* Compute the amount of pico seconds lost at each TS ticks */ - diff_ps = DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1000000 * 1000000), (uint64_t)LSE_VALUE ); - diff_ps -= DIVF( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) * 1000000; - /* Compute the total amount of time shift */ - diff_ps *= (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Save the time shift for next time */ - LpTimerContext.LpTimeDiffVal += diff_ps; - - /* Reports the time difference into returned time elapsed value */ - time2_us = LpTimerContext.LpTimeDiffVal / (1000ULL * 1000ULL); - LpTimerContext.LpTimeDiffVal = LpTimerContext.LpTimeDiffVal - time2_us * (1000ULL * 1000ULL); - time_us += time2_us; - - /* Convert uS time into OS ticks */ - val_ticks = time_us * configTICK_RATE_HZ; - val_ticks = val_ticks / (1000 * 1000); + /* This cannot overflow. Max result is ~ 1.6e13 */ + time_ps = (uint64_t)((CFG_TS_TICK_VAL_PS) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit)); + + /* time_ps can be less than 1 RTOS tick in following situations + * a) MCU didn't go to STOP2 due to wake-up unrelated to Timer Server or woke up from STOP2 very shortly after. + * Advancing RTOS clock by 1 FreeRTOS tick doesn't hurt in this case. + * b) vPortSuppressTicksAndSleep(xExpectedIdleTime) was called with xExpectedIdleTime = 2 which is minimum value defined by configEXPECTED_IDLE_TIME_BEFORE_SLEEP. + * The xExpectedIdleTime is decremented by one RTOS tick to wake-up in advance. + * Ex: RTOS tick is 1ms, the timer Server wakes the MCU in ~977 us. RTOS clock should be advanced by 1 ms. + * */ + if(time_ps <= (1e12 / configTICK_RATE_HZ)) /* time_ps < RTOS tick */ + { + val_ticks = 1; + } + else + { + /* Convert pS time into OS ticks */ + val_ticks = time_ps * configTICK_RATE_HZ; /* This cannot overflow. Max result is ~ 1.6e16 */ + val_ticks = (uint64_t)(val_ticks / (1e12)); /* The result always fits in uint32_t */ + } /** * The system may have been out from another reason than the timer @@ -321,5 +320,3 @@ static uint32_t LpGetElapsedTime( void ) return (uint32_t)val_ticks; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/main.c index 088c56ecc..8b631a2b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -84,6 +84,7 @@ const osThreadAttr_t defaultTask_attributes = { /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -124,6 +125,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -196,7 +200,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -235,17 +238,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -546,4 +555,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c index c878b0e00..5468e45f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -167,11 +166,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -217,6 +226,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -325,6 +344,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -339,6 +359,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -383,4 +412,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c index b15349521..5ee79fe54 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -148,4 +149,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_it.c index a5cc7e80e..1834b3041 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -375,4 +374,4 @@ void FPU_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/Thread_SED_Coap_FreeRTOS.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/Thread_SED_Coap_FreeRTOS.ewp index 8db6b1a66..a4ca365e5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/Thread_SED_Coap_FreeRTOS.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/Thread_SED_Coap_FreeRTOS.ewp @@ -1154,6 +1154,12 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c @@ -1205,12 +1211,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - @@ -1421,6 +1421,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1448,9 +1451,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 4bcf1e5a4..91051b4be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,7 +82,7 @@ LoopFillZerobss: cmp r2, r4 bcc FillZerobss -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -424,4 +423,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5a50c0714..1cdba029b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 Ac6

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of Ac6 nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.c index d48546a58..6c93c26f3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -51,6 +50,8 @@ #define C_PANID 0x2222U #define C_CHANNEL_NB 12U +osMutexId_t MtxOtCmdId; + /* FreeRtos stacks attributes */ const osThreadAttr_t ThreadMsgM0ToM4Process_attr = { .name = CFG_THREAD_MSG_M0_TO_M4_PROCESS_NAME, @@ -72,6 +73,12 @@ const osThreadAttr_t ThreadCliProcess_attr = { .stack_size = CFG_THREAD_CLI_PROCESS_STACK_SIZE }; +typedef enum +{ + ot_TL_CmdBusy, + ot_TL_CmdAvailable +} ot_TL_CmdStatus_t; + /* USER CODE BEGIN PD */ #define C_RESSOURCE "light" @@ -119,6 +126,7 @@ static void HostTxCb( void ); static void Wait_Getting_Ack_From_M0(void); static void Receive_Ack_From_M0(void); static void Receive_Notification_From_M0(void); +static void ot_StatusNot(ot_TL_CmdStatus_t status); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -895,6 +903,8 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + ot_StatusNot(ot_TL_CmdBusy); + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -906,6 +916,8 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + + ot_StatusNot(ot_TL_CmdAvailable); } /** @@ -1016,6 +1028,24 @@ static void Receive_Notification_From_M0(void) osThreadFlagsSet(OsTaskMsgM0ToM4Id,1); } +static void ot_StatusNot( ot_TL_CmdStatus_t status ) +{ + switch (status) + { + case ot_TL_CmdBusy: + osMutexAcquire( MtxOtCmdId, osWaitForever ); + break; + + case ot_TL_CmdAvailable: + osMutexRelease( MtxOtCmdId ); + break; + + default: + break; + } + return; +} + #if (CFG_USB_INTERFACE_ENABLE != 0) #else #if (CFG_FULL_LOW_POWER == 0) @@ -1253,4 +1283,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.h index b25276d5b..ccf7cabc9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -124,5 +123,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Thread_SED_Coap_FreeRTOS.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Thread_SED_Coap_FreeRTOS.ioc index 5225e1cd7..de9bb09a5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Thread_SED_Coap_FreeRTOS.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/Thread_SED_Coap_FreeRTOS.ioc @@ -85,8 +85,8 @@ Mcu.PinsNb=17 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true @@ -155,6 +155,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Thread_SED_Coap_FreeRTOS +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -273,5 +275,3 @@ VP_SYS_VS_tim17.Signal=SYS_VS_tim17 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Thread_SED_Coap_FreeRTOS -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/readme.txt index da8ccc31f..99309b881 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_FreeRTOS/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread Coap Multicast FreeRTOS application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h index 4d4be6767..c34c6135f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -376,9 +377,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_THREAD, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -390,4 +391,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h index 4e3c7adb7..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h index 6cefe665f..66f39b187 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -254,5 +253,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h index ba0174513..bb8200829 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void FPU_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h index 92a5d07a3..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c index 7e47e9b62..96baf155e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -179,9 +178,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -682,4 +680,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c index cc77d87dc..b5efb11f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -76,6 +76,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -114,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -152,7 +156,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -191,17 +194,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -463,4 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c index 72e52147b..19292b68c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -322,6 +341,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -336,6 +356,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -380,4 +409,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c index 2a9dba290..e52a4ef1d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -398,4 +397,4 @@ void FPU_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/Thread_SED_Coap_Multicast.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/Thread_SED_Coap_Multicast.ewp index 39905ae10..d3e83ea31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/Thread_SED_Coap_Multicast.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/Thread_SED_Coap_Multicast.ewp @@ -1137,6 +1137,12 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pcd_ex.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c @@ -1191,12 +1197,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - @@ -1371,6 +1371,9 @@ $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt + $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/tl_mbox.c @@ -1398,9 +1401,6 @@ $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl/shci_tl_if.c - - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/stack/third_party/mbedtls/repo/include/CMakeLists.txt - $PROJ_DIR$/../../../../../../Middlewares/ST/STM32_WPAN/thread/openthread/core/openthread_api/border_agent.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..d36c693a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Core/User/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c index f1369f0ec..8ce54b9b6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -766,6 +765,7 @@ Thread_OT_Cmd_Request_t* THREAD_Get_NotificationPayloadBuffer(void) static void Ot_Cmd_Transfer_Common(void) { + /* OpenThread OT command cmdcode range 0x280 .. 0x3DF = 352 */ p_thread_otcmdbuffer->cmdserial.cmd.cmdcode = 0x280U; /* Size = otCmdBuffer->Size (Number of OT cmd arguments : 1 arg = 32bits so multiply by 4 to get size in bytes) @@ -777,6 +777,7 @@ static void Ot_Cmd_Transfer_Common(void) /* Wait completion of cmd */ Wait_Getting_Ack_From_M0(); + } /** @@ -1121,4 +1122,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h index b25276d5b..ccf7cabc9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -124,5 +123,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif #endif /* APP_THREAD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Thread_SED_Coap_Multicast.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Thread_SED_Coap_Multicast.ioc index 27efb1e9f..66e8a41e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Thread_SED_Coap_Multicast.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/Thread_SED_Coap_Multicast.ioc @@ -79,8 +79,8 @@ Mcu.PinsNb=17 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -143,6 +143,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Thread_SED_Coap_Multicast +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x400 @@ -260,5 +262,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Thread_SED_Coap_Multicast -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt index 5e399d598..4d7d7821c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread Coap Multicast application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_conf.h index 323df0f3a..888d84716 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,7 +104,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -335,7 +335,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -355,4 +355,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_conf.h index 278c34a32..baf4e006a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -270,4 +269,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/main.h index 68182bc5a..e224de7a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_hal_conf.h index 316f32ae3..1990a4ef1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_it.h index fd0e7d1bc..26a07fa6b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm_logging.h index 187649d1d..e8e8ac6ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/vcp_conf.h index 66e0e60c6..a3fc2fb4f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/app_entry.c index 11d297aa6..5b626bf9c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -438,4 +437,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/main.c index 4790426f6..be5cd2c22 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -618,5 +618,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_hal_msp.c index 6fdb80557..32b973bab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -333,4 +332,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_it.c index 636b316a4..3acf40885 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -380,4 +379,3 @@ void IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/stm32wb55xx_flash_cm4.icf index 6a7a123fc..a90777127 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/EWARM/stm32wb55xx_flash_cm4.icf @@ -32,9 +32,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.c index 03934cbfa..d98c9d493 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -356,7 +355,7 @@ static void APP_THREAD_DeviceConfig(void) } /* USER CODE BEGIN DEVICECONFIG */ - /* Initialiaze socket */ + /* Initialize socket */ memset(&mSocket, 0, sizeof(mSocket)); /* Open socket */ @@ -458,7 +457,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -958,7 +957,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -986,4 +985,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.h index 7ce237d59..9ffab7c82 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -134,4 +133,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/readme.txt index a963109d8..1edc3c997 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_Udp/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread_Udp application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/TouchSensing/TouchSensing_1touchKey/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/TouchSensing/TouchSensing_1touchKey/readme.txt index 269cab81d..182f5b5e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/TouchSensing/TouchSensing_1touchKey/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/TouchSensing/TouchSensing_1touchKey/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TouchSensing 1 touchkey sensor example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -44,6 +44,10 @@ The required adaptation from STM32L476G-EVAL project, given as information: Copy the stm32wbxx_hal_conf_template.h from Drivers\STM32WBxx_HAL_Driver\Inc to Inc\stm32wbxx_hal_conf.h. Adapt the main.c/SystemClock_Config(void) function to your board. Adapt the GPIO initialization to your board. + +@par Keywords + + Touch sensing, TouchSensing, TSC *

                                                                  © COPYRIGHT STMicroelectronics

                                                                  */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/CDC_Standalone.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/CDC_Standalone.ioc index 7c5279f8d..6954b173f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/CDC_Standalone.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/CDC_Standalone.ioc @@ -137,7 +137,7 @@ USB_DEVICE.USBD_MAX_NUM_CONFIGURATION=1 ProjectManager.ComputerToolchain=false RCC.HSI_VALUE=16000000 RCC.PLLP=RCC_PLLP_DIV5 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 USB.DeviceSpeed=PCD_SPEED_FULL NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 RCC.PLLN=32 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/main.h index 8ce2961e6..e060a75a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_hal_conf.h index b472ee707..d43314326 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_it.h index 28d8293ad..982c5fab8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Inc/stm32wbxx_it.h @@ -7,15 +7,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -70,5 +69,3 @@ void TIMx_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/main.c index f3b32fdc1..e2abdd4b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -113,6 +112,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -126,7 +128,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -147,11 +149,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ /** Enable MSI Auto calibration */ HAL_RCCEx_EnableMSIPLLMode(); @@ -222,4 +219,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_hal_msp.c index 572ecd609..cee31e437 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_hal_msp.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,4 +196,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_it.c index c877a23c7..caf3c6570 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -253,4 +252,4 @@ void USARTx_IRQHandler(void) HAL_UART_IRQHandler(&UartHandle); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/system_stm32wbxx.c index dde9bf5bc..f53552c59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -355,5 +354,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/stm32wb55xx_flash_cm4.icf index da280d0ae..14cb5946a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x1000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 6ad386c00..da4d4de2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.c index ee4c426e9..8ec03cdf3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -136,4 +135,3 @@ void MX_USB_Device_Init(void) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.h index 42ed4598a..b25262648 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usb_device.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,4 +101,3 @@ void MX_USB_Device_Init(void); #endif /* __USB_DEVICE__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.c index 74d1a0199..e8852014d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -604,5 +603,3 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.h index 0aff6f00b..5e25c5d40 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_cdc_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -179,4 +178,3 @@ uint8_t CDC_Transmit_FS(uint8_t* Buf, uint16_t Len); #endif /* __USBD_CDC_IF_H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.c index 80e495342..d5e294654 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -393,4 +392,3 @@ static void IntToUnicode(uint32_t value, uint8_t * pbuf, uint8_t len) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.h index e58d7c46a..1883d33ca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/App/usbd_desc.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,4 +141,3 @@ extern USBD_DescriptorsTypeDef CDC_Desc; #endif /* __USBD_DESC__C__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.c index aa14f8096..7e5d8d831 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.c * @author MCD Application Team * @brief This file implements the board support package for the USB device library ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,11 +66,11 @@ extern void SystemClock_Config(void); *******************************************************************************/ /* MSP Init */ -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { GPIO_InitTypeDef GPIO_InitStruct = {0}; if(pcdHandle->Instance==USB) @@ -104,11 +103,11 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) } } -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { if(pcdHandle->Instance==USB) { @@ -767,4 +766,3 @@ USBD_StatusTypeDef USBD_Get_USB_Status(HAL_StatusTypeDef hal_status) } return usb_status; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.h index 156e1c111..5fe50ce06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/USB_Device/Target/usbd_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,4 +172,3 @@ void USBD_static_free(void *p); #endif /* __USBD_CONF__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/readme.txt index d52369fd5..c4736a75c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/CDC_Standalone/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USB Device CDC application. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt index a9bbacb6d..9664ff8c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USB DFU application binary file. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h index 54be711f9..af5ff4acb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h index fc39592af..c56c4cff2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h index c4de8a115..cd028bd1f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h @@ -7,15 +7,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/main.c index e94f1dcd2..b343b4fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,6 +133,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -147,7 +149,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -168,11 +170,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ /** Enable MSI Auto calibration */ HAL_RCCEx_EnableMSIPLLMode(); @@ -244,4 +241,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c index 15bd366e1..8e3c27cba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +79,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c index 6ce0e0781..857e31074 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -223,4 +222,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_KEY_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c index dde9bf5bc..f53552c59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -355,5 +354,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc index 51d75269a..b3c73e63a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc @@ -140,7 +140,7 @@ USB_DEVICE.USBD_MAX_NUM_CONFIGURATION=1 ProjectManager.ComputerToolchain=false RCC.HSI_VALUE=16000000 RCC.PLLP=RCC_PLLP_DIV5 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 USB.DeviceSpeed=PCD_SPEED_FULL NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 RCC.PLLN=32 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf index da280d0ae..14cb5946a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x1000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s index 874f408c5..83743c348 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 6ad386c00..da4d4de2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c index bdf094275..beaa7a685 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,4 +129,3 @@ void MX_USB_Device_Init(void) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h index 6127af195..818427984 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,4 +101,3 @@ void MX_USB_Device_Init(void); #endif /* __USB_DEVICE__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c index 90f8015f7..15b4fb769 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -395,4 +394,3 @@ static void IntToUnicode(uint32_t value, uint8_t * pbuf, uint8_t len) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h index f006bf50a..2de0da10d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,4 +141,3 @@ extern USBD_DescriptorsTypeDef DFU_Desc; #endif /* __USBD_DESC__C__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c index 060c96a0a..52803df37 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -336,5 +335,3 @@ static uint32_t GetPage(uint32_t Address) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h index 188a63d07..ef74ed949 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,4 +125,3 @@ extern USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops; #endif /* __USBD_DFU_FLASH_H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c index df1fed066..3c15e9914 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,11 +66,11 @@ extern void SystemClock_Config(void); *******************************************************************************/ /* MSP Init */ -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { GPIO_InitTypeDef GPIO_InitStruct = {0}; if(pcdHandle->Instance==USB) @@ -104,11 +103,11 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) } } -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { if(pcdHandle->Instance==USB) { @@ -761,4 +760,3 @@ USBD_StatusTypeDef USBD_Get_USB_Status(HAL_StatusTypeDef hal_status) } return usb_status; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h index 2d5202dea..275fb37e6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -181,4 +180,3 @@ void USBD_static_free(void *p); #endif /* __USBD_CONF__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/readme.txt index 17a6c0f70..40897d804 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/DFU_Standalone/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USB DFU application. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/main.h index 9a88dd90c..63ccc948e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h index fc39592af..c56c4cff2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h index 3ef57a3b7..fbb02bd9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h @@ -7,15 +7,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/main.c index 3bf9a1fb9..f6e465271 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,6 +114,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -128,7 +130,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -149,11 +151,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ /** Enable MSI Auto calibration */ HAL_RCCEx_EnableMSIPLLMode(); @@ -229,4 +226,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c index 46bd0a85e..ebcc6960f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +79,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c index f23da7375..b4dc48d37 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,4 +227,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_KEY1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c index dde9bf5bc..f53552c59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -355,5 +354,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf index da280d0ae..14cb5946a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x1000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc index e88b4bc89..53055b989 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc @@ -137,7 +137,7 @@ USB_DEVICE.USBD_MAX_NUM_CONFIGURATION=1 ProjectManager.ComputerToolchain=false RCC.HSI_VALUE=16000000 RCC.PLLP=RCC_PLLP_DIV5 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 USB.DeviceSpeed=PCD_SPEED_FULL NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 RCC.PLLN=32 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 6ad386c00..da4d4de2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c index abf8d6b36..0481dd7c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -207,4 +206,3 @@ void MX_USB_Device_Init(void) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h index 57fb199fe..bfb4ea6b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,4 +101,3 @@ void MX_USB_Device_Init(void); #endif /* __USB_DEVICE__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c index 4e5304622..5473567c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -393,4 +392,3 @@ static void IntToUnicode(uint32_t value, uint8_t * pbuf, uint8_t len) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h index bb1f857b9..4a9202123 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,4 +141,3 @@ extern USBD_DescriptorsTypeDef HID_Desc; #endif /* __USBD_DESC__C__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c index 22740d2b0..0b8c3d65a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,11 +66,11 @@ extern void SystemClock_Config(void); *******************************************************************************/ /* MSP Init */ -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { GPIO_InitTypeDef GPIO_InitStruct = {0}; if(pcdHandle->Instance==USB) @@ -104,11 +103,11 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) } } -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { if(pcdHandle->Instance==USB) { @@ -770,4 +769,3 @@ USBD_StatusTypeDef USBD_Get_USB_Status(HAL_StatusTypeDef hal_status) } return usb_status; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h index 468592084..46982eb11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,4 +174,3 @@ void USBD_static_free(void *p); #endif /* __USBD_CONF__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/readme.txt index 69b3da164..8cf383a60 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/USB_Device/HID_Standalone/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USB HID application. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_conf.h index 3c00a8e5e..1c42db380 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -333,7 +332,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -348,4 +347,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/app_entry.c index 75b934fcb..53c0b1adc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -503,4 +502,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.c index bd2a66d11..2cb6e2724 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -435,7 +434,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -523,7 +522,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -658,4 +657,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/readme.txt index 6cf02e731..4987d4004 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Coord/readme.txt @@ -6,22 +6,22 @@ * @file Zigbee/Zigbee_APS_Coord/readme.txt * @author MCD Application Team * @brief Description of the Zigbee APS application using a - * centralized network. + * centralized network and acting as a Coordinator. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use the APS layer in an application with a centralized Zigbee network. +How to use the APS layer in an application acting as a Zigbee Coordinator within a centralized network. The purpose of this application is to show how to create a Zigbee centralized network, and how use the APSDE interface to the Zigbee stack directly, to send and receive raw @@ -80,9 +80,8 @@ To setup the application : To run the application : a) Start the first board. It must be the coordinator of the Zigbee network so in this demo application it is - the device running Zigbee_APS_Coord application (Device2 in the above diagram). - Wait for the Blue LED (LED1) ON. - Start the second board. This board is configured as Zigbee router and will attached to the network created + the device running Zigbee_APS_Coord application (Device2 in the above diagram). + Start immediately after, the second board. This board is configured as Zigbee router and will attached to the network created by the coordinator. Do the same for the other boards if applicable. b) At this stage, the Zigbee network is automatically created and BLUE LED (LED1) is ON on all devices. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_conf.h index d4e203dd2..8212aa447 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -334,7 +333,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -349,4 +348,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/app_entry.c index b50efa68a..2cc7da720 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.c index cb9588683..13c3ea28e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -466,7 +465,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -583,7 +582,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -718,4 +717,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/readme.txt index b2fdf0d3e..38690fcc8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_APS_Router/readme.txt @@ -6,22 +6,22 @@ * @file Zigbee/Zigbee_APS_Router/readme.txt * @author MCD Application Team * @brief Description of the Zigbee APS application using a - * centralized network. + * centralized network and acting as a Router. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use the APS layer in an application with a centralized Zigbee network. +How to use the APS layer in an application acting as a Router within a centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how use the APSDE interface to the Zigbee stack directly, to send and receive raw @@ -81,8 +81,7 @@ To setup the application : a) Start the first board. It must be the coordinator of the Zigbee network so in this demo application it is the device running Zigbee_APS_Coord application (Device2 in the above diagram). - Wait for the Blue LED (LED1) ON. - Start the second board. This board is configured as Zigbee router and will attached to the network created + Start immediately after, the second board. This board is configured as Zigbee router and will attached to the network created by the coordinator. Do the same for the other boards if applicable. b) At this stage, the Zigbee network is automatically created and BLUE LED (LED1) is ON on all devices. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_conf.h index 07fea7d30..59f3e0763 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -337,7 +336,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -352,4 +351,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_conf.h index e1aa59531..c95e085b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -242,4 +241,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/app_entry.c index b50efa68a..2cc7da720 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.c index 36eae5ca8..d5385470b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -207,7 +206,7 @@ static void APP_ZIGBEE_Commissioning_Cmd_Rsp_Mgmt(struct ZbZclCommandRspT *zcl_r /* Commissioning restart device cmd response */ APP_DBG("RestartDevice response received from server."); if(rsp_status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error, server did not handle the request successfuly. Error code 0x%2x", rsp_status); + APP_DBG("Error, server did not handle the request successfully. Error code 0x%2x", rsp_status); return; } break; @@ -216,7 +215,7 @@ static void APP_ZIGBEE_Commissioning_Cmd_Rsp_Mgmt(struct ZbZclCommandRspT *zcl_r /* Commissioning save startup cmd response */ APP_DBG("SaveStartup response received from server."); if(rsp_status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error, server did not handle the request successfuly. Error code 0x%2x", rsp_status); + APP_DBG("Error, server did not handle the request successfully. Error code 0x%2x", rsp_status); return; } break; @@ -225,7 +224,7 @@ static void APP_ZIGBEE_Commissioning_Cmd_Rsp_Mgmt(struct ZbZclCommandRspT *zcl_r /* Commissioning restore startup cmd response */ APP_DBG("RestoreStartup response received from server."); if(rsp_status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error, server did not handle the request successfuly. Error code 0x%2x", rsp_status); + APP_DBG("Error, server did not handle the request successfully. Error code 0x%2x", rsp_status); return; } break; @@ -234,7 +233,7 @@ static void APP_ZIGBEE_Commissioning_Cmd_Rsp_Mgmt(struct ZbZclCommandRspT *zcl_r /* Commissioning reset startup cmd response */ APP_DBG("ResetStartup response received from server."); if(rsp_status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error, server did not handle the request successfuly. Error code 0x%2x", rsp_status); + APP_DBG("Error, server did not handle the request successfully. Error code 0x%2x", rsp_status); return; } break; @@ -267,7 +266,7 @@ static void APP_ZIGBEE_Commissioning_Client_SetNwkCfg_cmd(uint8_t config_num, st uint32_t channelMask; uint16_t nwk_addr; - /* Reseting Commissioning client nwk configuration */ + /* Resetting Commissioning client nwk configuration */ APP_DBG("Sending ResetStartup request."); memset(&ResetStartupReq, 0, sizeof(ResetStartupReq)); status = ZbZclCommissionClientSendResetStartup(zigbee_app_info.commissioning_client, ZR_EXT_ADDR, COMMISSIONING_DEST_ENDPOINT ,&ResetStartupReq, @@ -290,7 +289,7 @@ static void APP_ZIGBEE_Commissioning_Client_SetNwkCfg_cmd(uint8_t config_num, st RemoteWriteReq.dst.endpoint = ZB_ENDPOINT_INTERPAN; RemoteWriteReq.count = 8; - APP_DBG("Remotely writting Commissioning server attributes."); + APP_DBG("Remotely writing Commissioning server attributes."); /* NWK address attribute */ APP_DBG("Modifying NKK address."); @@ -369,10 +368,10 @@ static void APP_ZIGBEE_Commissioning_Client_SetNwkCfg_cmd(uint8_t config_num, st RemoteWriteReq.dst.endpoint = ZB_ENDPOINT_INTERPAN; RemoteWriteReq.count = 1; - APP_DBG("Remotely writting Commissioning server attributes."); + APP_DBG("Remotely writing Commissioning server attributes."); - /* Scan attemps attribute */ - APP_DBG("Modifying scan attemps."); + /* Scan attempts attribute */ + APP_DBG("Modifying scan attempts."); RemoteWriteReq.attr[0].attrId = ZCL_COMMISSION_SVR_ATTR_SCANATTEMPTS; RemoteWriteReq.attr[0].type = ZCL_DATATYPE_UNSIGNED_8BIT; RemoteWriteReq.attr[0].value = (uint8_t const*)¶ms->scan_count; @@ -400,7 +399,7 @@ static void APP_ZIGBEE_Commissioning_Client_SetNwkCfg_cmd(uint8_t config_num, st /* Waiting the successful server response */ UTIL_SEQ_WaitEvt(EVENT_ZIGBEE_CONTINUE_INIT); - /* Reseting Commissioning client nwk configuration */ + /* Resetting Commissioning client nwk configuration */ APP_DBG("Sending ResetStartup request."); memset(&ResetStartupReq, 0, sizeof(ResetStartupReq)); status = ZbZclCommissionClientSendResetStartup(zigbee_app_info.commissioning_client, ZR_EXT_ADDR, COMMISSIONING_DEST_ENDPOINT,&ResetStartupReq, @@ -480,7 +479,7 @@ static void APP_ZIGBEE_NwkInfo(void){ /* Current channel */ while (!(ZbNlmeConf.channelInUse & 1)) { - /* Iterate through bits untill we find the only set bit */ + /* Iterate through bits until we find the only set bit */ ZbNlmeConf.channelInUse = ZbNlmeConf.channelInUse >> 1; ++channelInUse; } @@ -758,7 +757,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -872,7 +871,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -1007,4 +1006,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/readme.txt index d3072335e..6ca3d5fa6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Client_Coord/readme.txt @@ -5,23 +5,23 @@ ****************************************************************************** * @file Zigbee/Zigbee_Commissioning_Client_Coord/readme.txt * @author MCD Application Team - * @brief Description of the Zigbee Commissioning Cluster application as a - * client using a centralized network. + * @brief Description of the Zigbee Commissioning Cluster application + * (Coordinator part) acting as a Client using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Commissioning cluster as a client on a centralized Zigbee network. +How to use the Commissioning cluster on a device acting as a Client with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to operate a commissioning process using the Commissioning cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_conf.h index 55e131007..ec6d64997 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -340,7 +339,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -355,4 +354,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_conf.h index e1aa59531..c95e085b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -242,4 +241,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/app_entry.c index b50efa68a..2cc7da720 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.c index f17554028..0c53436ff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -127,7 +126,7 @@ static void APP_ZIGBEE_RestartDevice(void){ * @brief Restart Device Commissioning client request callback * @param clusterPtr: ZCL cluster pointer * @param req: Commissioning Restart Device client command - * @param srcInfo: src address informations + * @param srcInfo: src address information * @param arg: passed argument * @retval ZCL status code */ @@ -174,7 +173,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_Commissioning_RestartDevice_cb(struct ZbZc * @brief Save Startup Parameters Commissioning client request callback * @param clusterPtr: ZCL cluster pointer * @param req: Commissioning Save Startup Parameters client command - * @param srcInfo: src address informations + * @param srcInfo: src address information * @param arg: passed argument * @retval ZCL status code */ @@ -215,7 +214,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_Commissioning_SaveStartup_cb(struct ZbZclC * @brief Restore Startup Parameters Commissioning client request callback * @param clusterPtr: ZCL cluster pointer * @param req: Commissioning Restore Startup Parameters client command - * @param srcInfo: src address informations + * @param srcInfo: src address information * @param arg: passed argument * @retval ZCL status code */ @@ -250,7 +249,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_Commissioning_RestoreStartup_cb(struct ZbZ * @brief Reset Startup Parameters Commissioning client request callback * @param clusterPtr: ZCL cluster pointer * @param req: Commissioning Reset Startup Parameters client command - * @param srcInfo: src address informations + * @param srcInfo: src address information * @param arg: passed argument * @retval ZCL status code */ @@ -656,7 +655,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -778,7 +777,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -913,4 +912,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/readme.txt index 0a5ea219e..5ce313129 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Commissioning_Server_Router/readme.txt @@ -5,23 +5,23 @@ ****************************************************************************** * @file Zigbee/Zigbee_Commissioning_Server_Router/readme.txt * @author MCD Application Team - * @brief Description of the Zigbee Commissioning Cluster application as a - * client using a centralized network. + * @brief Description of the Zigbee Commissioning Cluster application + * (Router part) acting as a Server using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Commissioning cluster as a client on a centralized Zigbee network. +How to use the Commissioning cluster on a device acting as a Server with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to operate a commissioning process using the Commissioning cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_conf.h index dbc4506b6..d4cf4aa53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -333,7 +332,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -348,4 +347,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/app_entry.c index 1edfb47a0..3f73f035c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.c index 51dc3abc1..523a08d39 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -344,7 +343,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -517,7 +516,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -652,4 +651,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/readme.txt index 3bd2efbf9..e81d62728 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Client_Router/readme.txt @@ -5,24 +5,24 @@ ****************************************************************************** * @file Zigbee/Zigbee_DevTemp_Client_Router/readme.txt * @author MCD Application Team - * @brief Description of the Zigbee Device Temperature Cluster application using a - * centralized network. This application concerns only the - * router role. + * @brief Description of a Zigbee Device Temperature Cluster application on + * the device acting as a Client with Router role on a Centralized + * Zigbee network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use DevTemp cluster on a Centralized Zigbee network with device acting as router. +How to use the Device Temperature cluster on a device acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the DevTemp cluster. Once the Zigbee mesh network is created, the diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_conf.h index 2853b8b33..b5aa48493 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -337,7 +336,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -352,4 +351,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/app_entry.c index d670a91e0..93a48eace 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.c index 88540dc63..292ff31d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -372,7 +371,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -573,7 +572,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -708,4 +707,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/readme.txt index 2a543410c..c83f39e6f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DevTemp_Server_Coord/readme.txt @@ -5,24 +5,24 @@ ****************************************************************************** * @file Zigbee/Zigbee_DevTemp_Server_Coord/readme.txt * @author MCD Application Team - * @brief Description of the Zigbee Device Temperature Cluster application using a - * centralized network. This application concerns only the - * router role. + * @brief Description of a Zigbee Device Temperature Cluster application on + * a device acting as a Server with Coordinator role on a Centralized + * Zigbee network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use DevTemp cluster on a Centralized Zigbee network with device acting as server. +How to use the Device Temperature cluster on a device acting as a Server with Coordinator role on a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the DevTemp cluster. Once the Zigbee mesh network is created, the diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_conf.h index 4113b5e39..fe1720066 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -335,7 +334,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -350,4 +349,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/app_entry.c index 998032400..568bb98e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.c index 149be5a88..18c0c1966 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -141,7 +140,7 @@ static void APP_ZIGBEE_Diagnostic_Client_Read_attr_cb(const ZbZclReadRspT *rsp, break; case ZCL_DIAG_SVR_ATTR_APS_TX_UCAST_SUCCESS: - APP_DBG("[DIAGNOSTIC] The Diagnostic server device APS layer successfuly sent %d unicasts", *val); + APP_DBG("[DIAGNOSTIC] The Diagnostic server device APS layer successfully sent %d unicasts", *val); APP_DBG("[DIAGNOSTIC] (including +1 for the remote reading).\n"); break; @@ -424,7 +423,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -577,7 +576,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -712,4 +711,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/readme.txt index c9303b950..34386ea3b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Client_Router/readme.txt @@ -5,23 +5,24 @@ ****************************************************************************** * @file Zigbee/Zigbee_Diagnostic_Client_Router/readme.txt * @author MCD Application Team - * @brief Description of the Zigbee Diagnostic Cluster application as a client - * using a centralized network. + * @brief Description of the Zigbee Diagnostic Cluster application on a device + * acting as a client with Router role within a Centralized Zigbee network + * ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Diagnostic cluster as a client on a centralized Zigbee network. +How to use the Diagnostic cluster on a device acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Diagnostic cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_conf.h index 3c00a8e5e..1c42db380 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -333,7 +332,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -348,4 +347,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/app_entry.c index 75b934fcb..53c0b1adc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -503,4 +502,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.c index 3f679b451..2ac6a239c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -392,7 +391,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -480,7 +479,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -615,4 +614,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/readme.txt index f2c26871d..650b8ca28 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Diagnostic_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Diagnostic cluster as a server on a centralized Zigbee network. +How to use the Diagnostic cluster as a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Diagnostic cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_conf.h index 138ddef99..f537c46c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -336,7 +335,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -351,4 +350,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/app_entry.c index 8b56617dc..d4de5ed79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -506,4 +505,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.c index d126929a6..8cb99ddca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -623,7 +622,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -783,7 +782,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -918,4 +917,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/readme.txt index 918621b2c..74d008de1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Client_Router/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Door Lock cluster as a client on a centralized Zigbee network. +How to use the Door Lock cluster on a device acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Door Lock cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_conf.h index 86af6a3ae..a2bfa81c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -341,7 +340,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -356,4 +355,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/app_entry.c index d670a91e0..93a48eace 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/app_zigbee.c index 85e4b59c0..3c9891653 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -309,7 +308,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_AttrNotify_cb(struct ZbZcl /* setting door state to closed */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_DOORSTATE, DOORLOCK_DOORSTATE_CLOSE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute."); + APP_DBG("Error writing local attribute."); assert(0); } return ZCL_STATUS_SUCCESS; @@ -323,7 +322,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_AttrNotify_cb(struct ZbZcl * @brief DoorLock server lock command callback * @param clusterPtr: ZCL cluster pointer * @param cmd_req: ZCL DoorLock cluster Lock Door request - * @param srcInfo: Src address informations + * @param srcInfo: Src address information * @param arg: passed arguments * @retval ZCL status code */ @@ -369,7 +368,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_Lock_cb(struct ZbZclCluste /* Lock is unlocked -> locked it */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_LOCKSTATE, ZCL_DRLK_LOCKSTATE_LOCKED); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set lock state to 'locked'.\n"); + APP_DBG("Error writing local attribute: cannot set lock state to 'locked'.\n"); (void) ZbZclDoorLockServerSendLockRsp(clusterPtr, srcInfo, &rsp, NULL, NULL); return ZCL_STATUS_SUCCESS_NO_DEFAULT_RESPONSE; } @@ -404,7 +403,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_Lock_cb(struct ZbZclCluste /* Lock is unlocked -> locked it */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_LOCKSTATE, ZCL_DRLK_LOCKSTATE_LOCKED); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set lock state to 'unlocked'.\n"); + APP_DBG("Error writing local attribute: cannot set lock state to 'unlocked'.\n"); (void) ZbZclDoorLockServerSendLockRsp(clusterPtr, srcInfo, &rsp, NULL, NULL); return ZCL_STATUS_SUCCESS_NO_DEFAULT_RESPONSE; } @@ -426,7 +425,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_Lock_cb(struct ZbZclCluste * @brief DoorLock server lock command callback * @param clusterPtr: ZCL cluster pointer * @param cmd_req: ZCL DoorLock cluster Unlock Door request - * @param srcInfo: Src address informations + * @param srcInfo: Src address information * @param arg: passed arguments * @retval ZCL status code */ @@ -473,7 +472,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_Unlock_cb(struct ZbZclClus /* Lock is locked -> unlocked it */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_LOCKSTATE, ZCL_DRLK_LOCKSTATE_UNLOCKED); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set lock state to 'unlocked'.\n"); + APP_DBG("Error writing local attribute: cannot set lock state to 'unlocked'.\n"); (void) ZbZclDoorLockServerSendUnlockRsp(clusterPtr, srcInfo, &rsp, NULL, NULL); return ZCL_STATUS_SUCCESS_NO_DEFAULT_RESPONSE; } @@ -508,7 +507,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_Unlock_cb(struct ZbZclClus /* Lock is locked -> unlocked it */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_LOCKSTATE, ZCL_DRLK_LOCKSTATE_UNLOCKED); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set lock state to 'unlocked'.\n"); + APP_DBG("Error writing local attribute: cannot set lock state to 'unlocked'.\n"); (void) ZbZclDoorLockServerSendUnlockRsp(clusterPtr, srcInfo, &rsp, NULL, NULL); return ZCL_STATUS_SUCCESS_NO_DEFAULT_RESPONSE; } @@ -538,7 +537,7 @@ static enum ZclStatusCodeT APP_ZIGBEE_DoorLock_Server_Unlock_cb(struct ZbZclClus * @brief DoorLock server set pin command callback * @param clusterPtr: ZCL cluster pointer * @param cmd_req: ZCL DoorLock cluster Unlock Door request - * @param srcInfo: Src address informations + * @param srcInfo: Src address information * @param arg: passed arguments * @retval ZCL status code */ @@ -640,7 +639,7 @@ static void APP_ZIGBEE_DoorLock_Server_PassageMode(void){ /* Activate passage mode */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_MODE, DOORLOCK_PASSAGE_MODE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set operating mode."); + APP_DBG("Error writing local attribute: cannot set operating mode."); } /* Start passage mode duration timer */ @@ -672,7 +671,7 @@ static void APP_ZIGBEE_DoorLock_Server_PassageMode_Ended(void){ /* Operating mode set to normal */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_MODE, DOORLOCK_NORMAL_MODE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set operating mode."); + APP_DBG("Error writing local attribute: cannot set operating mode."); } APP_DBG("Passage mode ended."); @@ -703,7 +702,7 @@ static void APP_ZIGBEE_DoorLock_Server_AutoRelockTime(void){ /* Lock the door */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_LOCKSTATE, ZCL_DRLK_LOCKSTATE_LOCKED); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set lock state to 'unlocked'.\n"); + APP_DBG("Error writing local attribute: cannot set lock state to 'unlocked'.\n"); return; } @@ -826,14 +825,14 @@ static void APP_ZIGBEE_DoorLock_Server_Init(void){ /* At startup, the lock is locked */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_LOCKSTATE, ZCL_DRLK_LOCKSTATE_LOCKED); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set lock state to 'locked'."); + APP_DBG("Error writing local attribute: cannot set lock state to 'locked'."); assert(0); } /* Door state is closed */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_DOORSTATE, DOORLOCK_DOORSTATE_CLOSE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute."); + APP_DBG("Error writing local attribute."); assert(0); } @@ -841,28 +840,28 @@ static void APP_ZIGBEE_DoorLock_Server_Init(void){ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_SUPPORTED_MODES, (uint16_t)DOORLOCK_NORMAL_MODE_SUPPORTED|DOORLOCK_PASSAGE_MODE_SUPPORTED); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set supported mode."); + APP_DBG("Error writing local attribute: cannot set supported mode."); assert(0); } /* Setting up operating mode attribute */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_MODE, DOORLOCK_NORMAL_MODE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set operating mode."); + APP_DBG("Error writing local attribute: cannot set operating mode."); assert(0); } /* Setting up auto relock time attribute */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_AUTO_RELOCK, DOORLOCK_AUTO_RELOCK_TIME); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("Error writting local attribute: cannot set operating mode."); + APP_DBG("Error writing local attribute: cannot set operating mode."); assert(0); } /* Setting up alarm bitmap */ status = ZbZclAttrIntegerWrite(zigbee_app_info.doorlock_server, ZCL_DRLK_ATTR_ALARM_MASK, 1<
                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.
                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/readme.txt index 21767db3b..d3de2064f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_DoorLock_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Door Lock cluster as a client on a centralized Zigbee network. +ow to use the Door Lock cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Door Lock cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_conf.h index acc39fb10..1fa3a3b69 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,7 +104,7 @@ * The lower is the value, the better is the power consumption and the accuracy of the timerserver * The higher is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -345,7 +345,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -364,4 +364,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_conf.h index 40107e081..e936a94fb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -270,4 +269,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/main.h index df4e52577..9126380a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_hal_conf.h index 7cf636d09..bebc6e6bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/utilities_conf.h index d0169780c..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/app_entry.c index 5a470bea2..877f63730 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -531,4 +530,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/main.c index df5c7047a..af18b307b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -625,5 +625,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_hal_msp.c index 0b544f840..01808348e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -333,4 +332,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_it.c index 1034a7996..eb8f4ff3f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -403,4 +402,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm_logging.c index e975d7cf5..21be8c85a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.c index 01ec8ac6d..cac102ee6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.c @@ -2,19 +2,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -637,7 +636,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -725,7 +724,7 @@ void ZIGBEE_CmdTransfer(void) } /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -951,5 +950,4 @@ static void APP_ZIGBEE_SW2_Process() /* USER CODE END FD_LOCAL_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..1df3e744e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -89,4 +88,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/Target/hw_ipcc.c index c9e07fdb9..a5c0bd43f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -670,4 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/readme.txt index 1252e4d1c..80f1f4583 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_Coord/readme.txt @@ -1,4 +1,4 @@ -/* Copyright [2020 - 2020] Exegin Technologies Limited. All rights reserved. */ +/* Copyright [2020 - 2020] Exegin Technologies Limited. All rights reserved. */ /** @page Zigbee_Find_Bind_Coord application @@ -11,19 +11,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Finding and Binding on a centralized Zigbee network. +How to use the Finding and Binding feature on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how Finding and Binding (F&B) works on a Zigbee centralized network. This will demonstrate how F&B initiator will automatically create bindings to bindable clusters on the @@ -242,7 +242,7 @@ On ZC, the user can press the following button at any time after successful netw NOTE: This command will fail unless the messaging server is bound to a client. *Step 6* -Via application specific means, ZR2 will “knowâ€� that it has successfully performed F&B from previous steps. +Via application specific means, ZR2 will “knowâ€? that it has successfully performed F&B from previous steps. Pressing BUTTON 3 again will allocate the ZCL IAS Warning Device Server cluster on endpoint 12, and will re-perform Finding and Binding as an Initiator. The GREEN LED will stay on if the F&B procedure is successful. Otherwise the GREEN LED will turn off, and the user can press BUTTON 3 again to reattempt F&B. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_conf.h index 4fd5f4703..6c6ddb888 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,7 +104,7 @@ * The lower is the value, the better is the power consumption and the accuracy of the timerserver * The higher is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -345,7 +345,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -364,4 +364,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_conf.h index 40107e081..e936a94fb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -270,4 +269,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/main.h index df4e52577..9126380a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_hal_conf.h index 7cf636d09..bebc6e6bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/utilities_conf.h index d0169780c..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/app_entry.c index 8abf347ed..03050d377 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -532,4 +531,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/main.c index df5c7047a..af18b307b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -625,5 +625,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_hal_msp.c index 0b544f840..01808348e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -333,4 +332,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_it.c index 1034a7996..eb8f4ff3f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -403,4 +402,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm_logging.c index e975d7cf5..21be8c85a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.c index 69ac4bbde..694682dca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.c @@ -2,19 +2,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -393,7 +392,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -481,7 +480,7 @@ void ZIGBEE_CmdTransfer(void) } /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -832,5 +831,4 @@ allocate_IAS_client() /* USER CODE END FD_LOCAL_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..1df3e744e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -89,4 +88,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/Target/hw_ipcc.c index c9e07fdb9..a5c0bd43f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -670,4 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/readme.txt index c0fcda555..3bcd619a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_IAS_Router2/readme.txt @@ -11,19 +11,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Finding and Binding on a centralized Zigbee network. +How to use the Finding and Binding feature on a device using IAS cluster, acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how Finding and Binding (F&B) works on a Zigbee centralized network. This will demonstrate how F&B initiator will automatically create bindings to bindable clusters on the @@ -242,7 +242,7 @@ On ZC, the user can press the following button at any time after successful netw NOTE: This command will fail unless the messaging server is bound to a client. *Step 6* -Via application specific means, ZR2 will “know� that it has successfully performed F&B from previous steps. +Via application specific means, ZR2 will “know� that it has successfully performed F&B from previous steps. Pressing BUTTON 3 again will allocate the ZCL IAS Warning Device Server cluster on endpoint 12, and will re-perform Finding and Binding as an Initiator. The GREEN LED will stay on if the F&B procedure is successful. Otherwise the GREEN LED will turn off, and the user can press BUTTON 3 again to reattempt F&B. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_conf.h index 864d09084..90dd1b956 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,7 +104,7 @@ * The lower is the value, the better is the power consumption and the accuracy of the timerserver * The higher is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -344,7 +344,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -363,4 +363,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_conf.h index 40107e081..e936a94fb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -270,4 +269,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/main.h index df4e52577..9126380a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_hal_conf.h index 7cf636d09..bebc6e6bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -351,5 +352,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/utilities_conf.h index d0169780c..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/app_entry.c index 8abf347ed..03050d377 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -532,4 +531,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/main.c index df5c7047a..af18b307b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -625,5 +625,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_hal_msp.c index 0b544f840..01808348e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -333,4 +332,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_it.c index 1034a7996..eb8f4ff3f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -403,4 +402,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm_logging.c index e975d7cf5..21be8c85a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.c index 0210b0458..68e62bb74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.c @@ -2,19 +2,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -407,7 +406,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -495,7 +494,7 @@ void ZIGBEE_CmdTransfer(void) } /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -775,6 +774,5 @@ static int numOfBindings() /* USER CODE END FD_LOCAL_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..1df3e744e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -89,4 +88,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/Target/hw_ipcc.c index c9e07fdb9..a5c0bd43f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -670,4 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/readme.txt index 9b064b5a3..ab2030ae2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_Find_Bind_OnOff_Router1/readme.txt @@ -11,19 +11,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Finding and Binding on a centralized Zigbee network. +How to use the Finding and Binding feature on a device using OnOff cluster, acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how Finding and Binding (F&B) works on a Zigbee centralized network. This will demonstrate how F&B initiator will automatically create bindings to bindable clusters on the @@ -242,7 +242,7 @@ On ZC, the user can press the following button at any time after successful netw NOTE: This command will fail unless the messaging server is bound to a client. *Step 6* -Via application specific means, ZR2 will “know� that it has successfully performed F&B from previous steps. +Via application specific means, ZR2 will “know� that it has successfully performed F&B from previous steps. Pressing BUTTON 3 again will allocate the ZCL IAS Warning Device Server cluster on endpoint 12, and will re-perform Finding and Binding as an Initiator. The GREEN LED will stay on if the F&B procedure is successful. Otherwise the GREEN LED will turn off, and the user can press BUTTON 3 again to reattempt F&B. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_conf.h index 4113b5e39..fe1720066 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -335,7 +334,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -350,4 +349,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/app_entry.c index 998032400..568bb98e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.c index da3ca596b..487665403 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -514,7 +513,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -651,7 +650,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -786,4 +785,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/readme.txt index 38fbe48c8..f677ed37d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Client_Router/readme.txt @@ -9,19 +9,20 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use IAS WD cluster as a client on a centralized Zigbee network. +How to use the IAS WD (Intruder Alarm System Warning Device) cluster on a device acting as a Client with Router role within a Centralized Zigbee network. + The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the IAS WD cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_conf.h index e76520369..5f93be13d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -335,7 +334,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -350,4 +349,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/app_entry.c index 75b934fcb..53c0b1adc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -503,4 +502,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_it.c index fa960f7bd..c24807043 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.c index fcb88487b..d1652fb57 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -468,7 +467,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -556,7 +555,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -691,4 +690,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/readme.txt index 45a743b5e..aa2323d31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_IAS_WD_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use IAS WD cluster as a server on a centralized Zigbee network. +How to use the IAS WD (Intruder Alarm System Warning Device) cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the IAS WD cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_conf.h index 934da367e..159c074a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -366,9 +367,9 @@ typedef enum typedef enum { CFG_LPM_APP, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -380,4 +381,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_entry.h index 196e280a8..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_conf.h index b89794bf3..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_it.h index f3b35c796..bb8dbb475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/utilities_conf.h index d0169780c..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/app_entry.c index 5de8a7296..ced56c7d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -736,4 +734,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/main.c index 7b225fe81..12ef9b929 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -80,6 +80,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -118,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -195,17 +198,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,4 +476,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_hal_msp.c index 2dee621bb..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_it.c index 734436c3e..782994448 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -429,4 +428,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/Zigbee_MeterId_Client_Router.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/Zigbee_MeterId_Client_Router.ewp index 6dc37d3f8..32e40cd92 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/Zigbee_MeterId_Client_Router.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/Zigbee_MeterId_Client_Router.ewp @@ -1127,6 +1127,12 @@ STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c @@ -1181,12 +1187,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..96cbbb7d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,8 +17,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; * 0x20000004-------------------------------------- | /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; /* 4K */ -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index 4ef0aee51..c98c9f053 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5d7dda9f8..f3c39513a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.c index 4a70a69d8..43d0bbd1c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -763,6 +762,3 @@ static void APP_ZIGBEE_SW2_Process(void) } /* APP_ZIGBEE_SW2_Process */ /* USER CODE END FD_LOCAL_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..b49554352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,5 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif #endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Zigbee_MeterId_Client_Router.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Zigbee_MeterId_Client_Router.ioc index b53ae83d2..6b05d8f66 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Zigbee_MeterId_Client_Router.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/Zigbee_MeterId_Client_Router.ioc @@ -83,8 +83,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -153,6 +153,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Zigbee_MeterId_Client_Router +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x19000 @@ -263,5 +265,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Zigbee_MeterId_Client_Router -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/readme.txt index 1c2de614c..787b8b670 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Client_Router/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Meter Identification cluster as a client on a centralized Zigbee network. +How to use the Meter Identification cluster on a device acting as a client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Meter Identification cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h index e8094a9e1..baf712724 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -364,9 +365,9 @@ typedef enum typedef enum { CFG_LPM_APP, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -378,4 +379,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h index 196e280a8..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h index b89794bf3..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h index f3b35c796..bb8dbb475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h index d0169780c..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c index d32e7fbfc..82f1e852b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -734,4 +732,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c index 7b225fe81..12ef9b929 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -80,6 +80,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -118,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -195,17 +198,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,4 +476,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index 2dee621bb..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c index 734436c3e..782994448 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -429,4 +428,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/Zigbee_MeterId_Server_Coord.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/Zigbee_MeterId_Server_Coord.ewp index 7784596dc..a00172367 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/Zigbee_MeterId_Server_Coord.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/Zigbee_MeterId_Server_Coord.ewp @@ -1127,6 +1127,12 @@                                                                   STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c @@ -1181,12 +1187,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..96cbbb7d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,8 +17,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; * 0x20000004-------------------------------------- | /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; /* 4K */ -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index 4ef0aee51..c98c9f053 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5d7dda9f8..f3c39513a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c index dbc2f2e9e..ca9762a39 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -632,7 +631,7 @@ static void APP_ZIGBEE_MeterId_Server_Init(void){ APP_DBG("[METER ID] Writing Company Name attribute."); status = ZbZclAttrStringWriteShort(zigbee_app_info.meter_id_server_1, ZCL_METER_ID_ATTR_COMPANY_NAME, (const uint8_t*)&ZCL_company_mame_string); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[METER ID] Error writting local attribute."); + APP_DBG("[METER ID] Error writing local attribute."); assert(0); } @@ -640,7 +639,7 @@ static void APP_ZIGBEE_MeterId_Server_Init(void){ APP_DBG("[METER ID] Writing Meter Type ID attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.meter_id_server_1, ZCL_METER_ID_ATTR_METER_TYPE_ID, METER_TYPE_ID); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[METER ID] Error writting local attribute."); + APP_DBG("[METER ID] Error writing local attribute."); assert(0); } @@ -649,6 +648,3 @@ static void APP_ZIGBEE_MeterId_Server_Init(void){ /* USER CODE END FD_LOCAL_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..b49554352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,5 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif #endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Zigbee_MeterId_Server_Coord.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Zigbee_MeterId_Server_Coord.ioc index 46af93ea3..5aed99330 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Zigbee_MeterId_Server_Coord.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Zigbee_MeterId_Server_Coord.ioc @@ -83,8 +83,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -153,6 +153,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Zigbee_MeterId_Server_Coord +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x19000 @@ -263,5 +265,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Zigbee_MeterId_Server_Coord -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt index 3e99fe84d..c5e976dbc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Meter Identification cluster as a server on a centralized Zigbee network. +How to use the Meter Identification cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Meter Identification cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_conf.h index 4795544d7..82724a8cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,13 +70,13 @@ allocated size within the scatterfile in bytes CFG_NVM_BASE_ADDRESS : offset to add to the base flash address to get the - beginning of the NVM (shall be withon allocation range of scatterfile) + beginning of the NVM (shall be within allocation range of scatterfile) ST_PERSIST_MAX_ALLOC_SZ : max size of the RAM cache in bytes either an abitrary choice or the CFG_NVM_MAX_SIZE ST_PERSIST_FLASH_DATA_OFFSET : offset in bytes of zigbee data - (U8[4] for lenght - 1st data[]...) + (U8[4] for length - 1st data[]...) CFG_NB_OF_PAGE : Number of page of flash to use CFG_NVM_MAX_SIZE : Max allocable size in byte for NVM @@ -142,7 +141,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -380,7 +379,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -411,4 +410,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/app_entry.c index 572ee4f60..214ffe881 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -622,4 +621,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/system_stm32wbxx.c index cf4d2b4c1..51f5d6a8b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ typedef void (*fct_t)(void); const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -546,5 +547,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index 6f3a09dc4..8a0246d21 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.c index 051df854f..f0983cc0a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -820,7 +819,7 @@ static void APP_ZIGBEE_PersistCompleted_callback(void) /** * @brief Load persitent data * @param None - * @retval true if sucess, false if fail + * @retval true if success, false if fail */ static bool APP_ZIGBEE_persist_load(void) { @@ -1432,7 +1431,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1521,7 +1520,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -1656,4 +1655,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.h index 74980ed3b..6ddc05f0f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -132,4 +131,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/readme.txt index 799f75111..6eaea8b7a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Client_Router/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OTA cluster as a client on a centralized Zigbee network. +How to use the OTA cluster on a device acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to operate a firmware upgrade using the OTA cluster. Once the Zigbee mesh network is created, @@ -198,6 +198,11 @@ at running time during the data transfer (ZCL OTA block request/response sequenc or - An Encrypted Coprocessor Wireless binary (For example : stm32wb5x_Zigbee_RFD_fw.bin) + Note : To ensure a correct match between the Coprocessor Wireless and the Application, both binaries must be based + on the same firmware package release. It is not possible to use an Application based on a firmware package version N + with a Coprocessor Wireless binary based on firmware package version N+1 or N-1. + + b) Start the first board. It must be the coordinator of the Zigbee network so in this demo application it is the device running Zigbee_OTA_Server_Coord application (Device 1 in the above diagram). diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_conf.h index 53514fc5e..637dd9dd0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -338,7 +337,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -362,4 +361,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/app_entry.c index 3fcf4db5e..73e64cd36 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index 5f3a484ee..60c6cda19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.c index e7aa13a6c..2180a7c3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -1013,7 +1012,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1175,7 +1174,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -1310,4 +1309,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.h index d8cf7e274..794437a78 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -117,4 +116,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/readme.txt index 21b8f0cf8..8b767770f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OTA_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OTA cluster as a server on a centralized Zigbee network. +How to use the OTA cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to operate a firmware upgrade using the OTA cluster. Once the Zigbee mesh network is created, @@ -198,6 +198,13 @@ To setup the application : or - An Encrypted Coprocessor Wireless binary (For example : stm32wb5x_Zigbee_RFD_fw.bin) + Note : To ensure a correct match between the Coprocessor Wireless and the Application, both binaries must be based + on the same firmware package release. It is not possible to use an Application based on a firmware package version N + with a Coprocessor Wireless binary based on firmware package version N+1 or N-1. + + + + b) Start the first board. It must be the coordinator of the Zigbee network so in this demo application it is the device running Zigbee_OTA_Server_Coord application (Device 1 in the above diagram). diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_conf.h index 73a0b2ee7..adf10205e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -364,9 +365,9 @@ typedef enum typedef enum { CFG_LPM_APP, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -378,4 +379,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_entry.h index 196e280a8..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_conf.h index ee2d39f9a..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_it.h index f3b35c796..bb8dbb475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/utilities_conf.h index d0169780c..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/app_entry.c index a291376f4..27780f081 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -735,4 +733,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/main.c index 7b225fe81..12ef9b929 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -80,6 +80,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -118,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -195,17 +198,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,4 +476,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_hal_msp.c index 2dee621bb..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_it.c index 734436c3e..782994448 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -429,4 +428,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/Zigbee_OnOff_Client_Distrib.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/Zigbee_OnOff_Client_Distrib.ewp index a6dd4775e..02e0f2c51 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/Zigbee_OnOff_Client_Distrib.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/Zigbee_OnOff_Client_Distrib.ewp @@ -1127,6 +1127,12 @@                                                                   STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c @@ -1181,12 +1187,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..96cbbb7d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,8 +17,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; * 0x20000004-------------------------------------- | /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; /* 4K */ -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5d7dda9f8..f3c39513a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.c index 4126e185f..2724fd294 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -644,6 +643,3 @@ static void APP_ZIGBEE_SW1_Process() } /* USER CODE END FD_LOCAL_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..b49554352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,5 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif #endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Zigbee_OnOff_Client_Distrib.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Zigbee_OnOff_Client_Distrib.ioc index 15c3258d7..a469410c6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Zigbee_OnOff_Client_Distrib.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/Zigbee_OnOff_Client_Distrib.ioc @@ -83,8 +83,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -153,6 +153,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Zigbee_OnOff_Client_Distrib +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x19000 @@ -264,5 +266,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Zigbee_OnOff_Client_Distrib -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/readme.txt index f774bba68..e3932f3eb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Distrib/readme.txt @@ -9,19 +9,19 @@ * using a distributed network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a client on a distributed Zigbee network. +How to use the OnOff cluster on a device acting as a Client within a distributed Zigbee network. The purpose of this application is to show how to create a Zigbee distributed network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h index 73a0b2ee7..adf10205e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -364,9 +365,9 @@ typedef enum typedef enum { CFG_LPM_APP, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -378,4 +379,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h index 196e280a8..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h index b89794bf3..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h index f3b35c796..bb8dbb475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h index d0169780c..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c index a291376f4..27780f081 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -735,4 +733,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c index 7b225fe81..12ef9b929 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -80,6 +80,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -118,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -195,17 +198,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,4 +476,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c index 2dee621bb..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c index 734436c3e..782994448 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -429,4 +428,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/Zigbee_OnOff_Client_Router.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/Zigbee_OnOff_Client_Router.ewp index f372d10a8..60e0b6398 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/Zigbee_OnOff_Client_Router.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/Zigbee_OnOff_Client_Router.ewp @@ -1127,6 +1127,12 @@                                                                   STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c @@ -1181,12 +1187,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..96cbbb7d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,8 +17,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; * 0x20000004-------------------------------------- | /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; /* 4K */ -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5d7dda9f8..f3c39513a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c index 3f44e37ea..8bbc2356f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -640,6 +639,3 @@ static void APP_ZIGBEE_SW1_Process() } /* USER CODE END FD_LOCAL_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..b49554352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,5 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif #endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Zigbee_OnOff_Client_Router.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Zigbee_OnOff_Client_Router.ioc index ccd9f5e0c..f64b8327f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Zigbee_OnOff_Client_Router.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/Zigbee_OnOff_Client_Router.ioc @@ -83,8 +83,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -153,6 +153,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Zigbee_OnOff_Client_Router +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x19000 @@ -263,5 +265,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Zigbee_OnOff_Client_Router -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt index 47aabec30..60dc948de 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a client on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/FreeRTOSConfig.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/FreeRTOSConfig.h index 3d7ed8868..8200396a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/FreeRTOSConfig.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/FreeRTOSConfig.h @@ -67,7 +67,7 @@ #define configTICK_RATE_HZ ((TickType_t)1000) #define configMAX_PRIORITIES ( 56 ) #define configMINIMAL_STACK_SIZE ((uint16_t)128) -#define configTOTAL_HEAP_SIZE ((size_t)20000) +#define configTOTAL_HEAP_SIZE ((size_t)20480) #define configMAX_TASK_NAME_LEN ( 16 ) #define configUSE_TRACE_FACILITY 1 #define configUSE_16_BIT_TICKS 0 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_conf.h index b7951c820..8cf230f3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -337,4 +337,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_conf.h index 78bec073e..dad46bd9b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -265,4 +264,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h index fc4a470ae..3d144bf42 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_it.h index ac1e3db9c..50d459ec7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/utilities_conf.h index d0169780c..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/app_entry.c index 390f354ef..de8f3a226 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -544,4 +543,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/freertos_port.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/freertos_port.c index e96637686..8be354ec1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/freertos_port.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/freertos_port.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : freertos_port.c - * Description : Custom porting of FreeRTOS functionalities - * - ****************************************************************************** + ****************************************************************************** + * File Name : freertos_port.c + * Description : Custom porting of FreeRTOS functionalities + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -25,11 +24,11 @@ #include "FreeRTOS.h" #include "task.h" #include "stm32_lpm.h" +#include /* Private typedef -----------------------------------------------------------*/ typedef struct { - uint64_t LpTimeDiffVal; uint32_t LpTimeLeftOnEntry; uint8_t LpTimerFreeRTOS_Id; } LpTimerContext_t; @@ -201,7 +200,6 @@ void vPortSetupTimerInterrupt( void ) static void LpTimerInit( void ) { ( void ) HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(LpTimerContext.LpTimerFreeRTOS_Id), hw_ts_SingleShot, LpTimerCb); - LpTimerContext.LpTimeDiffVal = 0; return; } @@ -236,9 +234,16 @@ static void LpTimerStart( uint32_t time_to_sleep ) uint64_t time; /* Converts the number of FreeRTOS ticks into hw timer tick */ - - time = (time_to_sleep * 1000 * 1000 ); - time = time / ( CFG_TS_TICK_VAL * configTICK_RATE_HZ ); + if (time_to_sleep > (ULLONG_MAX / 1e12)) /* Prevent overflow in else statement */ + { + time = 0xFFFF0000; /* Maximum value equal to 24 days */ + } + else + { + /* The result always fits in uint32_t and is always less than 0xFFFF0000 */ + time = time_to_sleep * 1000000000000ULL; + time = (uint64_t)( time / ( CFG_TS_TICK_VAL_PS * configTICK_RATE_HZ )); + } HW_TS_Start(LpTimerContext.LpTimerFreeRTOS_Id, (uint32_t)time); @@ -279,33 +284,30 @@ static void LpEnter( void ) #if ( CFG_LPM_SUPPORTED != 0) static uint32_t LpGetElapsedTime( void ) { - uint64_t val_ticks, time_us, diff_ps; + uint64_t val_ticks, time_ps; uint32_t LpTimeLeftOnExit; LpTimeLeftOnExit = HW_TS_RTC_ReadLeftTicksToCount(); - time_us = (CFG_TS_TICK_VAL) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Corrects the time precision lost in CFG_TS_TICK_VAL computation */ - - /* Compute the amount of pico seconds lost at each TS ticks */ - diff_ps = DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1000000 * 1000000), (uint64_t)LSE_VALUE ); - diff_ps -= DIVF( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) * 1000000; - /* Compute the total amount of time shift */ - diff_ps *= (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Save the time shift for next time */ - LpTimerContext.LpTimeDiffVal += diff_ps; - - while(LpTimerContext.LpTimeDiffVal >= (uint64_t)(1000 * 1000)) + /* This cannot overflow. Max result is ~ 1.6e13 */ + time_ps = (uint64_t)((CFG_TS_TICK_VAL_PS) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit)); + + /* time_ps can be less than 1 RTOS tick in following situations + * a) MCU didn't go to STOP2 due to wake-up unrelated to Timer Server or woke up from STOP2 very shortly after. + * Advancing RTOS clock by 1 FreeRTOS tick doesn't hurt in this case. + * b) vPortSuppressTicksAndSleep(xExpectedIdleTime) was called with xExpectedIdleTime = 2 which is minimum value defined by configEXPECTED_IDLE_TIME_BEFORE_SLEEP. + * The xExpectedIdleTime is decremented by one RTOS tick to wake-up in advance. + * Ex: RTOS tick is 1ms, the timer Server wakes the MCU in ~977 us. RTOS clock should be advanced by 1 ms. + * */ + if(time_ps <= (1e12 / configTICK_RATE_HZ)) /* time_ps < RTOS tick */ { - /* Reports the time difference into returned time elapsed value */ - time_us++; - LpTimerContext.LpTimeDiffVal -= (uint64_t)(1000 * 1000); + val_ticks = 1; + } + else + { + /* Convert pS time into OS ticks */ + val_ticks = time_ps * configTICK_RATE_HZ; /* This cannot overflow. Max result is ~ 1.6e16 */ + val_ticks = (uint64_t)(val_ticks / (1e12)); /* The result always fits in uint32_t */ } - - /* Convert uS time into OS ticks */ - val_ticks = time_us * configTICK_RATE_HZ; - val_ticks = val_ticks / (1000 * 1000); /** * The system may have been out from another reason than the timer @@ -319,4 +321,3 @@ static uint32_t LpGetElapsedTime( void ) } #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_timerserver.c index c0af6a14a..3d44a3caf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -892,4 +891,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_uart.c index 6ae6ff9f9..166acccd5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -317,4 +316,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/main.c index 324eea6ea..85b220ca4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -745,5 +745,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c index a0fe542c9..511734ae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -388,4 +387,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..3f92f07b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -145,5 +146,3 @@ void HAL_ResumeTick(void) /* Enable TIM17 Update interrupt */ __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_it.c index b7f474aa8..7c7778410 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -393,4 +392,3 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.c index 232fad86f..d8a732959 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -748,5 +747,4 @@ static void APP_ZIGBEE_SW1_Process(void) /* USER CODE END FD_LOCAL_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.h index ac5481224..747b4e55b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,4 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c index afa62b179..85606fda2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/readme.txt index 74aa3931a..da38fb3b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_FreeRTOS/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a client on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Client with Router role within a Centralized Zigbee network using FreeRTOS. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_conf.h index cf6d1fad8..480dff078 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,13 +70,13 @@ allocated size within the scatterfile in bytes CFG_NVM_BASE_ADDRESS : offset to add to the base flash address to get the - beginning of the NVM (shall be withon allocation range of scatterfile) + beginning of the NVM (shall be within allocation range of scatterfile) ST_PERSIST_MAX_ALLOC_SZ : max size of the RAM cache in bytes either an abitrary choice or the CFG_NVM_MAX_SIZE ST_PERSIST_FLASH_DATA_OFFSET : offset in bytes of zigbee data - (U8[4] for lenght - 1st data[]...) + (U8[4] for length - 1st data[]...) CFG_NB_OF_PAGE : Number of page of flash to use CFG_NVM_MAX_SIZE : Max allocable size in byte for NVM @@ -142,7 +141,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -376,7 +375,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -401,4 +400,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/app_entry.c index d4bccec3c..c89a479e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -506,4 +505,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/system_stm32wbxx.c index cbe7cb1ea..3b2c3eaa6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf index 3832cdee1..0e8413037 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/EWARM/stm32wb55xx_flash_cm4_ota.icf @@ -9,9 +9,16 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08030000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; + + /*0x2002FFFF---------------------------------------| + * | Emulation Flash | + * 0x2002F000-------------------------------------- | + * | Region_RAM | + * 0x20000004-------------------------------------- | + /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -33,12 +40,12 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; keep { section TAG_OTA_START}; keep { section TAG_OTA_END }; place in OTA_TAG_region { section TAG_OTA_START }; place in ROM_region { readonly, last section TAG_OTA_END }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; \ No newline at end of file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 271d8e39d..3d37eafd6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -158,7 +142,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.c index c59fbcd20..440e76192 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -539,7 +538,7 @@ static void APP_ZIGBEE_PersistCompleted_callback(void) /** * @brief Load persitent data * @param None - * @retval true if sucess, false if fail + * @retval true if success, false if fail */ static bool APP_ZIGBEE_persist_load(void) { @@ -885,7 +884,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1031,7 +1030,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * @param Otbuffer : a pointer to TL_EvtPacket_t * @return None */ @@ -1161,4 +1160,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/readme.txt index a8858fc64..54cfdc189 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_Router_Ota/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a client on a centralized Zigbee network. +How to use an updated OnOff cluster Zigbee application previously downloaded via OTA. @note This application is not supported by CubeMx but has been copied from the project Zigbee_OnOff_Client_Router generated by CubeMx with some modifications in order to be able to download it with the Zigbee_OTA_Client_Router application. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_conf.h index 7111bf2ed..25e3a0a9d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -364,9 +365,9 @@ typedef enum typedef enum { CFG_LPM_APP, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -378,4 +379,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_entry.h index 196e280a8..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_conf.h index c8f2dc947..66f39b187 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -254,5 +253,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_it.h index f3b35c796..bb8dbb475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/utilities_conf.h index d0169780c..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/app_entry.c index 637d04925..b7723955a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -742,4 +740,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/main.c index 7b225fe81..12ef9b929 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -80,6 +80,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -118,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -195,17 +198,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,4 +476,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_hal_msp.c index 951a0da9e..19292b68c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -322,6 +341,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -336,6 +356,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -380,4 +409,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_it.c index 734436c3e..782994448 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -429,4 +428,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/Zigbee_OnOff_Client_SED.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/Zigbee_OnOff_Client_SED.ewp index 85b0c9503..bafbc3473 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/Zigbee_OnOff_Client_SED.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/Zigbee_OnOff_Client_SED.ewp @@ -1127,6 +1127,12 @@                                                                   STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c @@ -1181,12 +1187,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..96cbbb7d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,8 +17,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; * 0x20000004-------------------------------------- | /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; /* 4K */ -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/MDK-ARM/startup_stm32wb55xx_cm4.s index 4ef0aee51..c98c9f053 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5d7dda9f8..f3c39513a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.c index 6135758d4..3dce5df84 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -652,6 +651,3 @@ static void APP_ZIGBEE_OnOff_Toogle(void){ /* USER CODE END FD_LOCAL_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..b49554352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,5 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif #endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Zigbee_OnOff_Client_SED.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Zigbee_OnOff_Client_SED.ioc index 2336ec23d..4446bf949 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Zigbee_OnOff_Client_SED.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/Zigbee_OnOff_Client_SED.ioc @@ -82,8 +82,8 @@ Mcu.PinsNb=19 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -150,6 +150,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Zigbee_OnOff_Client_SED +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x19000 @@ -262,5 +264,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Zigbee_OnOff_Client_SED -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/readme.txt index adab3a7d7..2dc22279a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Client_SED/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim -@par Application Description - -How to use OnOff cluster as a client on a centralized Zigbee network. +@par Application Description + +How to use the OnOff cluster on a Sleepy End Device acting as a Client within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh @@ -30,7 +30,7 @@ OnOff server (1 second delay). Zigbee_OnOff_Client_SED application is configured to enter Stop mode 2 on IDLE state. When coupled to a Zigbee RFD wireless coprocessor binary, the board is able to reach -a 3μA consuption when IDLE. +a 3uA consuption when IDLE. Important note: In order to use low power mode with Zigbee on STM32WB only wireless coprocessor binary stm32wb5x_Zigbee_RFD_fw.bin can be used. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_conf.h index c6c58eb6e..5087b5645 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,13 +69,13 @@ allocated size within the scatterfile in bytes CFG_NVM_BASE_ADDRESS : offset to add to the base flash address to get the - beginning of the NVM (shall be withon allocation range of scatterfile) + beginning of the NVM (shall be within allocation range of scatterfile) ST_PERSIST_MAX_ALLOC_SZ : max size of the RAM cache in bytes either an abitrary choice or the CFG_NVM_MAX_SIZE ST_PERSIST_FLASH_DATA_OFFSET : offset in bytes of zigbee data - (U8[4] for lenght - 1st data[]...) + (U8[4] for length - 1st data[]...) CFG_NB_OF_PAGE : Number of page of flash to use CFG_NVM_MAX_SIZE : Max allocable size in byte for NVM @@ -141,7 +140,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -377,7 +376,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -392,4 +391,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee.h index 2be1fc4dd..d6ea1d082 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee.h @@ -1,21 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file ee.h * @author MCD Application Team - * @brief This file contains the interface of the EEPROM emulator - * for Dory platform. - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #ifndef EE_H__ #define EE_H__ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee_cfg.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee_cfg.h index 891b81f2c..5b321eed1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee_cfg.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/ee_cfg.h @@ -1,22 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file ee_cfg.h * @author MCD Application Team - * @brief This file contains the configuration of the EEPROM emulator - * for Dory platform. - * This file must be customized: see "ee.h" for details. - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #ifndef EE_CFG_H__ #define EE_CFG_H__ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_flash.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_flash.h index 1f489676f..2003608f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_flash.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_flash.h @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.h * @author MCD Application Team - * @brief This file contains the FLASH driver - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __HW_FLASH_H @@ -99,5 +98,3 @@ uint32_t HW_FLASH_OB_GetSNBRSA(void); #endif #endif /*__HW_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/app_entry.c index 1877a59c2..783fb171e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -506,4 +505,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/ee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/ee.c index 0b74a0fea..d29ed2fd5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/ee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/ee.c @@ -1,21 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file ee.c * @author MCD Application Team - * @brief This file contains the implementation of the EEPROM emulator - * for Dory platform. - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "ee_cfg.h" #include "ee.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_flash.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_flash.c index 487ee14c8..197fc4e74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_flash.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_flash.c @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ //#include "common.h" #include "stm32_seq.h" @@ -124,5 +123,3 @@ static void HW_FLASH_PageErase(uint32_t Page) // DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.c index c29139d81..155310ac6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -549,7 +548,7 @@ static void APP_ZIGBEE_PersistCompleted_callback(enum ZbStatusCodeT status,void /** * @brief Load persitent data * @param None - * @retval true if sucess, false if fail + * @retval true if success, false if fail */ static bool APP_ZIGBEE_persist_load(void) { @@ -928,7 +927,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1219,7 +1218,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * @param Otbuffer : a pointer to TL_EvtPacket_t * @return None */ @@ -1349,4 +1348,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/readme.txt index 327b00afa..418ffeaeb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Coord_NVM/readme.txt @@ -5,23 +5,23 @@ ****************************************************************************** * @file Zigbee/Zigbee_OnOff_Coord_NVM/readme.txt * @author MCD Application Team - * @brief Description of the Zigbee OnOff Cluster application as a client - * using a centralized network. + * @brief Description of the Zigbee OnOff Cluster application using + * persistent data and acting as Coordinator. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster with persistent data on a centralized Zigbee network. +How to use the OnOff cluster with persistent data activated on a device acting as Coordinator within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_conf.h index c6c58eb6e..5087b5645 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,13 +69,13 @@ allocated size within the scatterfile in bytes CFG_NVM_BASE_ADDRESS : offset to add to the base flash address to get the - beginning of the NVM (shall be withon allocation range of scatterfile) + beginning of the NVM (shall be within allocation range of scatterfile) ST_PERSIST_MAX_ALLOC_SZ : max size of the RAM cache in bytes either an abitrary choice or the CFG_NVM_MAX_SIZE ST_PERSIST_FLASH_DATA_OFFSET : offset in bytes of zigbee data - (U8[4] for lenght - 1st data[]...) + (U8[4] for length - 1st data[]...) CFG_NB_OF_PAGE : Number of page of flash to use CFG_NVM_MAX_SIZE : Max allocable size in byte for NVM @@ -141,7 +140,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -377,7 +376,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -392,4 +391,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee.h index 2be1fc4dd..d6ea1d082 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee.h @@ -1,21 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file ee.h * @author MCD Application Team - * @brief This file contains the interface of the EEPROM emulator - * for Dory platform. - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #ifndef EE_H__ #define EE_H__ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee_cfg.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee_cfg.h index 891b81f2c..5b321eed1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee_cfg.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/ee_cfg.h @@ -1,22 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file ee_cfg.h * @author MCD Application Team - * @brief This file contains the configuration of the EEPROM emulator - * for Dory platform. - * This file must be customized: see "ee.h" for details. - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #ifndef EE_CFG_H__ #define EE_CFG_H__ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_flash.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_flash.h index 1f489676f..2003608f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_flash.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_flash.h @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.h * @author MCD Application Team - * @brief This file contains the FLASH driver - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __HW_FLASH_H @@ -99,5 +98,3 @@ uint32_t HW_FLASH_OB_GetSNBRSA(void); #endif #endif /*__HW_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/app_entry.c index 4533af8ba..0efa2840f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -506,4 +505,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/ee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/ee.c index 0b74a0fea..d29ed2fd5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/ee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/ee.c @@ -1,21 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file ee.c * @author MCD Application Team - * @brief This file contains the implementation of the EEPROM emulator - * for Dory platform. - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "ee_cfg.h" #include "ee.h" diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_flash.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_flash.c index 487ee14c8..197fc4e74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_flash.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_flash.c @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module - ***************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ //#include "common.h" #include "stm32_seq.h" @@ -124,5 +123,3 @@ static void HW_FLASH_PageErase(uint32_t Page) // DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/stm32wb55xx_flash_cm4.icf index 94bafdcc7..865c675a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.c index da0773f03..974666146 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -551,7 +550,7 @@ static void APP_ZIGBEE_PersistCompleted_callback(enum ZbStatusCodeT status,void /** * @brief Load persitent data * @param None - * @retval true if sucess, false if fail + * @retval true if success, false if fail */ static bool APP_ZIGBEE_persist_load(void) { @@ -928,7 +927,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1219,7 +1218,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * @param Otbuffer : a pointer to TL_EvtPacket_t * @return None */ @@ -1349,4 +1348,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/readme.txt index 1581a7833..4c49001be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Router_NVM/readme.txt @@ -5,23 +5,23 @@ ****************************************************************************** * @file Zigbee/Zigbee_OnOff_Router_NVM/readme.txt * @author MCD Application Team - * @brief Description of the Zigbee OnOff Cluster application as a client - * using a centralized network. + * @brief Description of the Zigbee OnOff Cluster application using + * persistent data and acting as Router. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster with persistent data on a centralized Zigbee network. +How to use the OnOff cluster with persistent data activated on a device acting as Router within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h index 11012852b..e664b3c47 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -364,9 +365,9 @@ typedef enum typedef enum { CFG_LPM_APP, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -378,4 +379,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h index 196e280a8..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h index b89794bf3..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h index f3b35c796..bb8dbb475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h index d0169780c..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c index d32e7fbfc..82f1e852b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -734,4 +732,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c index 7b225fe81..12ef9b929 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -80,6 +80,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -118,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -195,17 +198,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,4 +476,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index 2dee621bb..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c index 734436c3e..782994448 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -429,4 +428,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/Zigbee_OnOff_Server_Coord.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/Zigbee_OnOff_Server_Coord.ewp index 4e462936f..daa7764a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/Zigbee_OnOff_Server_Coord.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/Zigbee_OnOff_Server_Coord.ewp @@ -1127,6 +1127,12 @@                                                                   STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c @@ -1181,12 +1187,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..96cbbb7d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,8 +17,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; * 0x20000004-------------------------------------- | /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; /* 4K */ -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5d7dda9f8..f3c39513a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c index 594718011..a59458031 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -676,6 +675,3 @@ static void APP_ZIGBEE_ConfigGroupAddr(void) } /* APP_ZIGBEE_ConfigGroupAddr */ /* USER CODE END FD_LOCAL_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..b49554352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,5 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif #endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Zigbee_OnOff_Server_Coord.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Zigbee_OnOff_Server_Coord.ioc index 21b7d8b0f..55ce6584f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Zigbee_OnOff_Server_Coord.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Zigbee_OnOff_Server_Coord.ioc @@ -83,8 +83,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -153,6 +153,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Zigbee_OnOff_Server_Coord +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x19000 @@ -262,5 +264,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Zigbee_OnOff_Server_Coord -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt index a057081c7..b15ef2dd6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a server on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/FreeRTOSConfig.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/FreeRTOSConfig.h index 3d7ed8868..8200396a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/FreeRTOSConfig.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/FreeRTOSConfig.h @@ -67,7 +67,7 @@ #define configTICK_RATE_HZ ((TickType_t)1000) #define configMAX_PRIORITIES ( 56 ) #define configMINIMAL_STACK_SIZE ((uint16_t)128) -#define configTOTAL_HEAP_SIZE ((size_t)20000) +#define configTOTAL_HEAP_SIZE ((size_t)20480) #define configMAX_TASK_NAME_LEN ( 16 ) #define configUSE_TRACE_FACILITY 1 #define configUSE_16_BIT_TICKS 0 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_conf.h index 9b606b0b2..a8db91844 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -335,4 +335,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_conf.h index 78bec073e..dad46bd9b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -265,4 +264,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h index fc4a470ae..3d144bf42 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_it.h index e66a97572..e26fa5705 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,5 +78,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/utilities_conf.h index d0169780c..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/app_entry.c index be55ad5a2..ec5254dcd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -540,4 +539,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/freertos_port.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/freertos_port.c index e96637686..8be354ec1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/freertos_port.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/freertos_port.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : freertos_port.c - * Description : Custom porting of FreeRTOS functionalities - * - ****************************************************************************** + ****************************************************************************** + * File Name : freertos_port.c + * Description : Custom porting of FreeRTOS functionalities + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -25,11 +24,11 @@ #include "FreeRTOS.h" #include "task.h" #include "stm32_lpm.h" +#include /* Private typedef -----------------------------------------------------------*/ typedef struct { - uint64_t LpTimeDiffVal; uint32_t LpTimeLeftOnEntry; uint8_t LpTimerFreeRTOS_Id; } LpTimerContext_t; @@ -201,7 +200,6 @@ void vPortSetupTimerInterrupt( void ) static void LpTimerInit( void ) { ( void ) HW_TS_Create(CFG_TIM_PROC_ID_ISR, &(LpTimerContext.LpTimerFreeRTOS_Id), hw_ts_SingleShot, LpTimerCb); - LpTimerContext.LpTimeDiffVal = 0; return; } @@ -236,9 +234,16 @@ static void LpTimerStart( uint32_t time_to_sleep ) uint64_t time; /* Converts the number of FreeRTOS ticks into hw timer tick */ - - time = (time_to_sleep * 1000 * 1000 ); - time = time / ( CFG_TS_TICK_VAL * configTICK_RATE_HZ ); + if (time_to_sleep > (ULLONG_MAX / 1e12)) /* Prevent overflow in else statement */ + { + time = 0xFFFF0000; /* Maximum value equal to 24 days */ + } + else + { + /* The result always fits in uint32_t and is always less than 0xFFFF0000 */ + time = time_to_sleep * 1000000000000ULL; + time = (uint64_t)( time / ( CFG_TS_TICK_VAL_PS * configTICK_RATE_HZ )); + } HW_TS_Start(LpTimerContext.LpTimerFreeRTOS_Id, (uint32_t)time); @@ -279,33 +284,30 @@ static void LpEnter( void ) #if ( CFG_LPM_SUPPORTED != 0) static uint32_t LpGetElapsedTime( void ) { - uint64_t val_ticks, time_us, diff_ps; + uint64_t val_ticks, time_ps; uint32_t LpTimeLeftOnExit; LpTimeLeftOnExit = HW_TS_RTC_ReadLeftTicksToCount(); - time_us = (CFG_TS_TICK_VAL) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Corrects the time precision lost in CFG_TS_TICK_VAL computation */ - - /* Compute the amount of pico seconds lost at each TS ticks */ - diff_ps = DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1000000 * 1000000), (uint64_t)LSE_VALUE ); - diff_ps -= DIVF( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) * 1000000; - /* Compute the total amount of time shift */ - diff_ps *= (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit); - - /* Save the time shift for next time */ - LpTimerContext.LpTimeDiffVal += diff_ps; - - while(LpTimerContext.LpTimeDiffVal >= (uint64_t)(1000 * 1000)) + /* This cannot overflow. Max result is ~ 1.6e13 */ + time_ps = (uint64_t)((CFG_TS_TICK_VAL_PS) * (uint64_t)(LpTimerContext.LpTimeLeftOnEntry - LpTimeLeftOnExit)); + + /* time_ps can be less than 1 RTOS tick in following situations + * a) MCU didn't go to STOP2 due to wake-up unrelated to Timer Server or woke up from STOP2 very shortly after. + * Advancing RTOS clock by 1 FreeRTOS tick doesn't hurt in this case. + * b) vPortSuppressTicksAndSleep(xExpectedIdleTime) was called with xExpectedIdleTime = 2 which is minimum value defined by configEXPECTED_IDLE_TIME_BEFORE_SLEEP. + * The xExpectedIdleTime is decremented by one RTOS tick to wake-up in advance. + * Ex: RTOS tick is 1ms, the timer Server wakes the MCU in ~977 us. RTOS clock should be advanced by 1 ms. + * */ + if(time_ps <= (1e12 / configTICK_RATE_HZ)) /* time_ps < RTOS tick */ { - /* Reports the time difference into returned time elapsed value */ - time_us++; - LpTimerContext.LpTimeDiffVal -= (uint64_t)(1000 * 1000); + val_ticks = 1; + } + else + { + /* Convert pS time into OS ticks */ + val_ticks = time_ps * configTICK_RATE_HZ; /* This cannot overflow. Max result is ~ 1.6e16 */ + val_ticks = (uint64_t)(val_ticks / (1e12)); /* The result always fits in uint32_t */ } - - /* Convert uS time into OS ticks */ - val_ticks = time_us * configTICK_RATE_HZ; - val_ticks = val_ticks / (1000 * 1000); /** * The system may have been out from another reason than the timer @@ -319,4 +321,3 @@ static uint32_t LpGetElapsedTime( void ) } #endif -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_timerserver.c index c0af6a14a..3d44a3caf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -892,4 +891,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_uart.c index 6ae6ff9f9..166acccd5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -317,4 +316,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/main.c index a402eab1b..83f2db6c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -746,5 +746,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c index a0fe542c9..511734ae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -388,4 +387,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c index 5dbb88409..3f92f07b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_hal_timebase_tim.c @@ -7,9 +7,21 @@ * * This file overrides the native HAL time base functions (defined as weak) * the TIM time base: - * + Intializes the TIM peripheral to generate a Period elapsed Event each 1ms + * + Initializes the TIM peripheral to generate a Period elapsed Event each 1ms * + HAL_IncTick is called inside HAL_TIM_PeriodElapsedCallback ie each 1ms * + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -26,17 +38,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -145,5 +146,3 @@ void HAL_ResumeTick(void) /* Enable TIM17 Update interrupt */ __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_it.c index b7f474aa8..7c7778410 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -393,4 +392,3 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.c index 9c0db09c2..69026a404 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -753,5 +752,4 @@ static void APP_ZIGBEE_ConfigGroupAddr(void) /* USER CODE END FD_LOCAL_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.h index 09a1aa9c1..943ec7497 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -87,4 +86,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c index afa62b179..85606fda2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/readme.txt index 9d97facca..72d7ad8d1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Coord_FreeRTOS/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a server on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network using FreeRTOS. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_common.h index cf8a5baa6..645be99d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_conf.h index 11012852b..e664b3c47 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,8 +185,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -364,9 +365,9 @@ typedef enum typedef enum { CFG_LPM_APP, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -378,4 +379,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_entry.h index 196e280a8..d6c5b0eee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_conf.h index b89794bf3..08f585560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,5 +261,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA1_Channel2_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_if.h index 55312b1c3..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/main.h index e08aa2180..1c1e5ebdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32_lpm_if.h index d8e67947f..d9737fb07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -78,4 +77,3 @@ void PWR_ExitSleepMode( void ); #endif /*__STM32_LPM_IF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_hal_conf.h index 3b0f57321..de913bf72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_it.h index f3b35c796..bb8dbb475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm_logging.h index a48a6398f..0d2b1c641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/utilities_conf.h index d0169780c..018f921b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/app_entry.c index d32e7fbfc..82f1e852b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/app_entry.c @@ -2,20 +2,19 @@ /** ****************************************************************************** * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + * Description : Entry application source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -190,9 +189,8 @@ void Init_Smps( void ) void Init_Exti( void ) { - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); return; } @@ -734,4 +732,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_timerserver.c index c0af6a14a..b7b508fea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_uart.c index 6ae6ff9f9..99eb4dda5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/main.c index 7b225fe81..12ef9b929 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,17 +34,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** */ /* USER CODE END Header */ @@ -80,6 +80,7 @@ RTC_HandleTypeDef hrtc; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -118,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -156,7 +160,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -195,17 +198,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_LPUART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,4 +476,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32_lpm_if.c index fba978d88..c00fd1931 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_hal_msp.c index 2dee621bb..5b807647d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,11 +163,21 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==LPUART1) { /* USER CODE BEGIN LPUART1_MspInit 0 */ /* USER CODE END LPUART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1; + PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LPUART1_CLK_ENABLE(); @@ -214,6 +223,16 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -334,6 +353,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -348,6 +368,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSE as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -392,4 +421,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_it.c index 734436c3e..782994448 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -429,4 +428,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm_logging.c index efde60287..4201102b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/Zigbee_OnOff_Server_Distrib.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/Zigbee_OnOff_Server_Distrib.ewp index c9acf00e1..6dc9c0e91 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/Zigbee_OnOff_Server_Distrib.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/Zigbee_OnOff_Server_Distrib.ewp @@ -1127,6 +1127,12 @@                                                                   STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c @@ -1181,12 +1187,6 @@ $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..96cbbb7d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,8 +17,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2002F000; * 0x20000004-------------------------------------- | /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; /* 4K */ -define symbol __ICFEDIT_size_heap__ = 102400; /* was 4K */ +define symbol __ICFEDIT_size_cstack__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x19000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 5d7dda9f8..f3c39513a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.c index 74cf50389..4107aa024 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : App/app_zigbee.c * Description : Zigbee Application. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -680,6 +679,3 @@ static void APP_ZIGBEE_ConfigGroupAddr(void) } /* APP_ZIGBEE_ConfigGroupAddr */ /* USER CODE END FD_LOCAL_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.h index 7cfd8d187..b49554352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H @@ -88,5 +87,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif #endif /* APP_ZIGBEE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..d63994ea3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/Target/hw_ipcc.c index afa62b179..730c4ab3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,6 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -671,5 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) } __weak void HW_IPCC_TRACES_EvtNot( void ){}; - -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Zigbee_OnOff_Server_Distrib.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Zigbee_OnOff_Server_Distrib.ioc index 608d330de..c6ffd9eca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Zigbee_OnOff_Server_Distrib.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/Zigbee_OnOff_Server_Distrib.ioc @@ -83,8 +83,8 @@ Mcu.PinsNb=20 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.C2SEV_PWR_C2H_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -153,6 +153,8 @@ ProjectManager.ComputerToolchain=false ProjectManager.CoupleFile=false ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32WB55RGVx +ProjectManager.Example=Zigbee_OnOff_Server_Distrib +ProjectManager.ExampleSource=CubeFw ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x19000 @@ -263,5 +265,3 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM board=custom -ProjectManager.Example=Zigbee_OnOff_Server_Distrib -ProjectManager.ExampleSource=CubeFw diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/readme.txt index ee1a47640..266c7d7b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_OnOff_Server_Distrib/readme.txt @@ -9,19 +9,19 @@ * using a distributed network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a server on a distributed Zigbee network. +How to use the OnOff cluster on a device acting as a Server within a distributed Zigbee network. The purpose of this application is to show how to create a Zigbee distributed network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_conf.h index b55e5ff4e..e81a80c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -339,7 +338,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -354,4 +353,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/app_entry.c index b50efa68a..2cc7da720 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.c index 058784471..a5ffe5df4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -253,7 +252,7 @@ static void APP_ZIGBEE_PollControl_Client_OperateOnRemoteServer(void){ status = ZbZclWriteReq(zigbee_app_info.pollcontrol_client, &RemoteWriteReq, APP_ZIGBEE_Remote_Write_cb, NULL); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POLL CONTROL] Error writting remote attribute."); + APP_DBG("[POLL CONTROL] Error writing remote attribute."); return; } @@ -586,7 +585,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -699,7 +698,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -834,4 +833,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/readme.txt index 21cd390de..680cefd84 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Client_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Poll Control cluster as a client on a centralized Zigbee network. +How to use the Poll Control cluster on a device acting as a client with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Poll Control cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_conf.h index 0024b5d21..616e79595 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -336,7 +335,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -351,4 +350,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/app_entry.c index b50efa68a..2cc7da720 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.c index 49adabd1c..b885efa5b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -119,7 +118,7 @@ static void APP_ZIGBEE_PollControl_Server_CheckinRsp_cb(struct ZbZclClusterT *cl return; } - APP_DBG("[POLL CONTROL] Checkin response recieved."); + APP_DBG("[POLL CONTROL] Checkin response received."); if(rsp_info->start_fast_poll){ APP_DBG("[POLL CONTROL] Fast Poll enabled for %d seconds.\n", rsp_info->fast_poll_timeout/4); @@ -229,7 +228,7 @@ static void APP_ZIGBEE_PollControl_Server_Init(void){ APP_DBG("[POLL CONTROL] Writing Check-in Interval attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.pollcontrol_server, ZCL_POLL_CHECK_IN_INTERVAL, CHECKIN_INTERVAL); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POLL CONTROL] Error writting local attribute."); + APP_DBG("[POLL CONTROL] Error writing local attribute."); assert(0); } @@ -510,7 +509,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -623,7 +622,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -758,4 +757,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/readme.txt index c990247b3..5f9cfd21b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PollControl_Server_SED/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Poll Control cluster as a server on a centralized Zigbee network. +How to use the Poll Control cluster on a Sleepy End Device (SED) acting as a Server within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Poll Control cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_conf.h index 3c00a8e5e..1c42db380 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -333,7 +332,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -348,4 +347,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/app_entry.c index af9caa480..28c2d9dfe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -503,4 +502,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.c index 61cfed24e..1c288d671 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -423,7 +422,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -511,7 +510,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -646,4 +645,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/readme.txt index 1c6ec5067..92ff9d198 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Client_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Power Profile cluster as a client on a centralized Zigbee network. +How to use the Power Profile cluster on a device acting as a Client with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Power Profile cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h index d1fc852fc..a49a2ac2a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -341,7 +340,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -356,4 +355,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c index 1edfb47a0..3f73f035c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c index f6881f373..5379509b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -38,6 +37,7 @@ #define SW1_ENDPOINT 17 #define CHANNEL 19 #define HW_TS_SERVER_1S_NB_TICKS (1*1000*1000/CFG_TS_TICK_VAL) /* 1s */ +#define APP_LED_STROKE_CNT 20 /* 10 seconds */ /* Power Profile specific defines -------------------------------------------------*/ #define TOTAL_PROFILENUM 0x01 @@ -49,6 +49,8 @@ /* external definition */ enum ZbStatusCodeT ZbStartupWait(struct ZigBeeT *zb, struct ZbStartupT *config); +static uint8_t app_led_sw_cnt = 0; + /* Private function prototypes -----------------------------------------------*/ static void APP_ZIGBEE_StackLayersInit(void); static void APP_ZIGBEE_ConfigEndpoints(void); @@ -131,7 +133,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Total Profile Number attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_TOTAL_PROFILENUM, TOTAL_PROFILENUM); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -139,7 +141,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Multiple Scheduling attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_MULTIPLE_SCHED, MULTIPLE_SCHEDULING); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -147,7 +149,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Energy Formating attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_ENERGY_FORMAT, ENERGY_FORMATING); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -155,7 +157,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Energy Remote attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_ENERGY_REMOTE, ENERGY_REMOTE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -163,7 +165,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Schedule Mode attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_SCHEDULE_MODE, SCHEDULE_MODE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -316,34 +318,46 @@ static void APP_ZIGBEE_PowerProfile_Processing(void){ struct ZbApsAddrT dst; struct ZbZclPowerProfSvrStateRsp state_notify; - /* Setting up the addressing mode */ - memset(&dst, 0, sizeof(dst)); - dst.mode = ZB_APSDE_ADDRMODE_SHORT; - dst.endpoint = SW1_ENDPOINT; - dst.nwkAddr = 0x0; - - /* Point 8: Wait 10 seconds while LED_GREEN is blinking */ - for(unsigned int cpt=0 ; cpt<10 ; cpt++){ - BSP_LED_On(LED_GREEN); - HAL_Delay(500); + /* Point 8: Wait 10 seconds while LED_GREEN is blinking */ + if(app_led_sw_cnt % 2) + { BSP_LED_Off(LED_GREEN); - HAL_Delay(500); } + else + { + BSP_LED_On(LED_GREEN); + } + + app_led_sw_cnt++; - /* Point 9: Power Profile State Notification (Ended, no remote control) is sent by Server */ - memset(&state_notify, 0, sizeof(state_notify)); - state_notify.profile_count = TOTAL_PROFILENUM; - state_notify.record_list[0].remote_control = ENERGY_REMOTE; /* no remote control */ - state_notify.record_list[0].state = ZCL_PWR_PROF_STATE_PROFILE_ENDED; - - APP_DBG("[POWER PROFILE] Sending Power Profile state notification: Ended.\n"); - APP_ZIGBEE_PowerProfile_Send_StateNotification(&dst, &state_notify); - UTIL_SEQ_WaitEvt(EVENT_ZIGBEE_APP_POWER_PROFILE_NOTIFY_RSP_RECEIVED); - UTIL_SEQ_ClrEvt(EVENT_ZIGBEE_APP_POWER_PROFILE_NOTIFY_RSP_RECEIVED); - - HW_TS_Stop(TS_ID1); - HW_TS_Stop(TS_ID2); - pending_operation = false; + if(app_led_sw_cnt < APP_LED_STROKE_CNT) + { + /* Toggle Green LED every 500 ms */ + HW_TS_Start(TS_ID2, HW_TS_SERVER_1S_NB_TICKS/2); + } + else + { + /* Setting up the addressing mode */ + memset(&dst, 0, sizeof(dst)); + dst.mode = ZB_APSDE_ADDRMODE_SHORT; + dst.endpoint = SW1_ENDPOINT; + dst.nwkAddr = 0x0; + + /* Point 9: Power Profile State Notification (Ended, no remote control) is sent by Server */ + memset(&state_notify, 0, sizeof(state_notify)); + state_notify.profile_count = TOTAL_PROFILENUM; + state_notify.record_list[0].remote_control = ENERGY_REMOTE; /* no remote control */ + state_notify.record_list[0].state = ZCL_PWR_PROF_STATE_PROFILE_ENDED; + + APP_DBG("[POWER PROFILE] Sending Power Profile state notification: Ended.\n"); + APP_ZIGBEE_PowerProfile_Send_StateNotification(&dst, &state_notify); + UTIL_SEQ_WaitEvt(EVENT_ZIGBEE_APP_POWER_PROFILE_NOTIFY_RSP_RECEIVED); + UTIL_SEQ_ClrEvt(EVENT_ZIGBEE_APP_POWER_PROFILE_NOTIFY_RSP_RECEIVED); + + HW_TS_Stop(TS_ID1); + HW_TS_Stop(TS_ID2); + pending_operation = false; + } } /** @@ -688,7 +702,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -803,7 +817,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -938,4 +952,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt index 28a76455a..adf8a698f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Power Profile cluster as a server on a centralized Zigbee network. +How to use the Power Profile cluster on a device acting as a Server with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Power Profile cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_conf.h index dbc4506b6..d4cf4aa53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -333,7 +332,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -348,4 +347,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/app_entry.c index 1edfb47a0..3f73f035c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -504,4 +503,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.c index 7b5d7b47b..52f892314 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -181,12 +180,12 @@ static void zcl_press_meas_press_client_report(struct ZbZclClusterT *clusterPtr, struct ZbApsdeDataIndT *dataIndPtr, uint16_t attributeId, enum ZclDataTypeT dataType, const uint8_t *in_payload, uint16_t in_len) { - - APP_DBG("[PRESS MEAS] Received a report from Server"); int attrLen; int16_t attr_val; float pressure; + + /* Verify the source of the reported attribute. */ if(dataIndPtr->src.nwkAddr!=0x0000) { @@ -198,20 +197,24 @@ zcl_press_meas_press_client_report(struct ZbZclClusterT *clusterPtr, struct ZbAp APP_DBG("[PRESS MEAS] Report error wrong endpoint"); return; } + if (attributeId == ZCL_PRESS_MEAS_ATTR_MEAS_VAL) + { - attrLen = ZbZclAttrParseLength(dataType, in_payload, dataIndPtr->asduLength, 0); - if (attrLen < 0) { - return; - } - if (attrLen > (int)in_len) { - return; - } + APP_DBG("[PRESS MEAS] Received a report from Server"); + attrLen = ZbZclAttrParseLength(dataType, in_payload, dataIndPtr->asduLength, 0); + if (attrLen < 0) { + return; + } + if (attrLen > (int)in_len) { + return; + } - attr_val= pletoh16(in_payload); - pressure = (float)attr_val/10; + attr_val= pletoh16(in_payload); + pressure = (float)attr_val/10; - APP_DBG("[PRESS MEAS] Reported pressure from server %.1f kPa",pressure); - APP_DBG(""); + APP_DBG("[PRESS MEAS] Reported pressure from server %.1f kPa",pressure); + APP_DBG(""); + } } /* zcl_press_meas_client_report */ @@ -310,11 +313,12 @@ static void APP_ZIGBEE_ReportConfig(void) report.dst.endpoint = SW1_ENDPOINT; report.dst.mode = ZB_APSDE_ADDRMODE_SHORT; report.dst.nwkAddr = 0x0000; - report.min = ZCL_MIN_REPORT; - report.max = ZCL_MAX_REPORT; - report.attr_id = ZCL_PRESS_MEAS_ATTR_MEAS_VAL; - report.attr_type = ZCL_DATATYPE_SIGNED_16BIT; - report.change.epsilon.integer = 0; + report.num_records = 1; + report.record_list[0].min = ZCL_MIN_REPORT; + report.record_list[0].max = ZCL_MAX_REPORT; + report.record_list[0].attr_id = ZCL_PRESS_MEAS_ATTR_MEAS_VAL; + report.record_list[0].attr_type = ZCL_DATATYPE_SIGNED_16BIT; + report.record_list[0].change = 0; ZbZclAttrReportConfigReq(zigbee_app_info.press_meas_client,&report,&report_cb,(void*)&rep_change); } @@ -328,7 +332,7 @@ static void report_cb(struct ZbZclCommandRspT *cmd_rsp,void *arg) } else { - APP_DBG("[PRESS MEAS] Report Config set with sucess"); + APP_DBG("[PRESS MEAS] Report Config set with success"); } } /************************************************************* @@ -715,4 +719,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/readme.txt index 73dff2683..5892d0c00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Client_Router/readme.txt @@ -10,19 +10,19 @@ * router role. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Pressure Measurement cluster on a Centralized Zigbee network with device acting as router. +How to use the Pressure Measurement cluster on a device acting as a client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the Pressure Measurement cluster. Once the Zigbee mesh network is created, the @@ -72,8 +72,8 @@ To run the application : b) Wait for a few seconds (around 5 sec), in order to let the zigbee mesh network being created. c) At this stage, a Zigbee network is automatically created and an initial pressure is set and GREEN LED is ON. - pressing on the SW1 push button increase the pressure by 2C. - pressing on the SW2 push button decrease the pressure by 2C. + pressing on the SW1 push button increase the pressure. + pressing on the SW2 push button decrease the pressure. Once pressure is above a limit, GREEN LED is OFF and RED LED is ON. If pressure is set back under the limit GREEN LED is ON and RED LED is OFF. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_conf.h index 2853b8b33..b5aa48493 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -337,7 +336,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -352,4 +351,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/app_entry.c index d670a91e0..93a48eace 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.c index ab898f656..cbfefbc53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -376,7 +375,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -577,7 +576,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -712,4 +711,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/readme.txt index ef61a2633..5abc9c14d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_PressMeas_Server_Coord/readme.txt @@ -10,19 +10,19 @@ * router role. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Pressure Measurement cluster on a Centralized Zigbee network with device acting as server. +How to use the Pressure Measurement cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the Pressure Measurement cluster. Once the Zigbee mesh network is created, the @@ -74,8 +74,8 @@ To run the application : b) Wait for a few seconds (around 5 sec), in order to let the zigbee mesh network being created. c) At this stage, a Zigbee network is automatically created and an initial pressure is set and GREEN LED is ON. - pressing on the SW1 push button increase the pressure by 2C. - pressing on the SW2 push button decrease the pressure by 2C. + pressing on the SW1 push button increase the pressure. + pressing on the SW2 push button decrease the pressure. Once pressure is above a limit, GREEN LED is OFF and RED LED is ON. If pressure is set back under the limit GREEN LED is ON and RED LED is OFF. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_conf.h index aed6bdcf5..49b35ab67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -332,7 +331,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -347,4 +346,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/app_entry.c index af9caa480..28c2d9dfe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -503,4 +502,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.c index b9ff8d45d..df37391bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -360,7 +359,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -448,7 +447,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -583,4 +582,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/readme.txt index 7d2d5cd94..65c917161 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Client_Coord/readme.txt @@ -10,19 +10,19 @@ * coordinator role. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use SE Messaging cluster on a Centralized Zigbee network with device acting as coordinator (Client). +How to use the Smart Energy Messaging cluster on a device acting as a client with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the SE Messaging cluster. Once the Zigbee mesh network is created, the diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_conf.h index 4b9ab0087..9fc2ca4bc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -334,7 +333,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -349,4 +348,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_hal_conf.h index dd0b63d0f..543f4aae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_it.h index e81dbb18b..0f2edcacb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/app_entry.c index f052c8d9a..61ab1d21b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/main.c index 5da487953..3a684c334 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_it.c index d4c0fcf5d..33e6a3f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.c index e3064eeb7..8b277776b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -437,7 +436,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -526,7 +525,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -661,4 +660,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/readme.txt index 45472174e..cde9f5ad3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_SE_Msg_Server_Router/readme.txt @@ -10,19 +10,19 @@ * router role. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use SE Messaging cluster on a Centralized Zigbee network with device acting as router (Server). +How to use the Smart Energy Messaging cluster on a device acting as a Server with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the SE Messaging cluster. Once the Zigbee mesh network is created, the diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_common.h index 4defc5d7a..41e20de79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,4 +110,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_conf.h index 6a7c9e3e0..9fc2ca4bc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -334,7 +333,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -349,4 +348,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_conf.h index 71290de64..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/main.h index 68182bc5a..e224de7a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index ea9aa40d0..b96e483f0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_it.h index e80726d02..d259bf7b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/app_entry.c index d670a91e0..93a48eace 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -505,4 +504,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/main.c index 80ad1ad58..69021dc6b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -517,5 +517,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_hal_msp.c index 9c338486d..d211eac2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_it.c index 7c5536dfc..1bbd54832 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -408,4 +407,3 @@ IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.c index 4599a54dc..0c64d1b7b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -387,7 +386,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -520,7 +519,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -655,4 +654,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.h index 79d9b1eae..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/Target/hw_ipcc.c index f0038ab55..dd64a6553 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -130,10 +129,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -510,4 +506,3 @@ __weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; __weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; #endif -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/readme.txt index 7dd0e8f10..99a1e3934 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Client_Router/readme.txt @@ -10,20 +10,19 @@ * coordinator role (Server). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Custom long string cluster on a Centralized Zigbee network with device -acting as coordinator (Server) +How to use the Custom long string cluster on a device acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the custom long string cluster. Once the Zigbee mesh network is created, the diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_common.h index 4defc5d7a..41e20de79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,4 +110,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_conf.h index 505faeb58..49b35ab67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -332,7 +331,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -347,4 +346,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_conf.h index 71290de64..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/main.h index 68182bc5a..e224de7a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                  © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                  -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index ea9aa40d0..b96e483f0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_it.h index e80726d02..d259bf7b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/app_entry.c index 370df5e88..10f7614a1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -425,4 +424,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_uart.c index 9a553610d..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/main.c index 80ad1ad58..69021dc6b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -517,5 +517,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index 9c338486d..d211eac2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_it.c index 3fd003847..e40f205ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,4 +405,3 @@ void IPCC_C1_RX_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.c index aa7259150..6c52aa824 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -390,7 +389,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -478,7 +477,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -614,4 +613,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.h index 79d9b1eae..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index f0038ab55..dd64a6553 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -130,10 +129,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -510,4 +506,3 @@ __weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){}; __weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){}; #endif -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/readme.txt index 2c94e8201..335a45a27 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/Zigbee/Zigbee_custom_ls_Server_Coord/readme.txt @@ -10,20 +10,19 @@ * coordinator role (Server). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Custom long string cluster on a Centralized Zigbee network with device -acting as coordinator (Server) +How to use the Custom long string cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate from one node to another one using the custom long string cluster. Once the Zigbee mesh network is created, the diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc index 2e0a37c82..cc83d1ab6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc @@ -52,8 +52,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -68,6 +68,17 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA1.Signal=ADCx_IN6 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -129,14 +140,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/main.h index 38bb6d565..8a9c2b74d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_hal_conf.h index 807e061bd..0d33c993f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_it.h index 2d30dc20c..ee09f3b48 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/main.c index cc4aa9827..33718cd05 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -191,6 +190,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -204,7 +206,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -225,11 +227,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -395,4 +392,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_hal_msp.c index df385bd96..c1bbd8156 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -166,4 +165,3 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_it.c index 4fcf493e2..5c2888a32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -157,4 +156,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/readme.txt index 1c1f91df9..16160fdc1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_AnalogWatchdog/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_AnalogWatchdog example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc index 7dafd56a4..33c50fea9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc @@ -71,8 +71,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -87,6 +87,17 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PC3.Signal=ADCx_IN4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -148,14 +159,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h index 5055d76dd..db50c8d9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h index 807e061bd..0d33c993f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h index d98136491..13940c4c1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,5 +62,3 @@ void ADCx_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c index 5ac5ae725..4465c18e8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -231,6 +230,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -244,7 +246,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -265,11 +267,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -481,4 +478,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c index a408eeed1..4fecdf4b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -166,4 +165,3 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c index 485e0b13e..b37cd3e7b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,4 +155,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt index 8a4b24237..7666cf186 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_MultiChannelSingleConversion/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_MultiChannelSingleConversion example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc index b5a00d6e5..32444983e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc @@ -27,8 +27,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -42,6 +42,17 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA1.Signal=ADCx_IN6 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -103,14 +114,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/main.h index 79c765930..ad57c8ee7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -122,5 +121,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_hal_conf.h index 807e061bd..0d33c993f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_it.h index a6265f38f..41f08ffcb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/main.c index a61d27f67..470e3acb0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -187,6 +186,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -200,7 +202,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -221,11 +223,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -357,4 +354,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_hal_msp.c index 34bf35815..1eaeb69f0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -144,4 +143,3 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_it.c index 57bb7a549..2e718493c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,4 +133,4 @@ void ADC1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/readme.txt index 5146f98f7..f58485f2a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_Oversampling/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_Oversampling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc index e95e8ae1c..11f402fcb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc @@ -24,8 +24,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -39,6 +39,17 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA1.Signal=ADCx_IN6 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -100,14 +111,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h index 6e08896b4..3341c0da6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -120,5 +119,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h index 807e061bd..0d33c993f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h index ded277e70..8a8c8c3f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c index 469537b17..a06ab8eb8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -187,6 +186,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -200,7 +202,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -221,11 +223,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -379,4 +376,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c index afbe72913..2bb01f802 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -144,4 +143,3 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c index 936b2e09c..2840af765 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -133,4 +132,4 @@ void ADC1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt index 8bd587db5..52a168df0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerSW_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc index 6a94b01a3..7c09d4e75 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc @@ -48,8 +48,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -65,6 +65,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA1.Signal=ADCx_IN6 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -126,14 +137,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h index fa588e07f..2d5ce98e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -137,5 +136,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h index e6b079bf1..3df8f63c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h index 80fce2458..bac79e766 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,5 +62,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c index f31fa7195..937799760 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -188,6 +187,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -201,7 +203,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -222,11 +224,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -473,4 +470,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c index 63611dc97..283c8642d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -216,4 +215,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c index ac6dd8604..b50f2fd02 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,4 +162,4 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt index ad8e6b396..aa913db36 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerTimer_DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/BSP_Example.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/BSP_Example.ioc index 62f3aff42..36e7483d3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/BSP_Example.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/BSP_Example.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/stm32wb55xx_flash_cm4.icf index abbe0da9b..236863e25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/main.h index 8a350dfd2..24d0de8e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h index 99e6eef70..e9de6d5ae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void EXTI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index abc6fff10..1621799b2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/main.c index 8fa8649f0..40c0b481f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -135,6 +134,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -148,7 +150,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -169,11 +171,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -235,4 +232,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c index 98847aee6..967e70e13 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,4 +227,4 @@ void EXTI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/readme.txt index 675f86c13..311304944 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/BSP/BSP_Example/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BSP example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc index a54c6dbcf..e98e50d25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.COMP_IRQn=true\:3\:0\:true\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -38,6 +38,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false PA1.Mode=INP PA1.Signal=COMP1_INP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -99,14 +110,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h index 12cc656ac..d038845eb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h index f9eb4d927..8a96428a1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h index 562d26c3c..a3169e096 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void COMP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c index c52bc392b..624c80f3c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -148,6 +147,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -161,7 +163,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -182,11 +184,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -358,4 +355,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c index 8eb24e073..131c5bd70 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -140,4 +139,3 @@ void HAL_COMP_MspDeInit(COMP_HandleTypeDef* hcomp) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c index 40fc587eb..a1a44ad0f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -205,4 +204,4 @@ void COMP_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt index 4c9c79fd0..7076cafb8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the COMP_CompareGpioVsVrefInt_IT Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc index bc26def04..a858969f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc @@ -32,8 +32,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.COMP_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false @@ -48,6 +48,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false PA1.Mode=INP PA1.Signal=COMP1_INP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,14 +120,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/main.h index 660b71a42..c44ba9c52 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_hal_conf.h index f9eb4d927..8a96428a1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_it.h index 7480bba30..79a9ee04e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void COMP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/main.c index ce71ec786..b33c97324 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -209,6 +208,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -222,7 +224,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -243,11 +245,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -481,4 +478,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_hal_msp.c index 178e876e4..f32bb99f3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,4 +177,3 @@ void HAL_COMP_MspDeInit(COMP_HandleTypeDef* hcomp) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_it.c index f183d6852..952f53fe8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -220,4 +219,4 @@ void COMP_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/readme.txt index e1cc1412e..1e55f7713 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the COMP_CompareGpioVsVrefInt_Window_IT Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/CRC_Example.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/CRC_Example.ioc index 9029526e4..7f40575af 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/CRC_Example.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/CRC_Example.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -34,6 +34,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -95,14 +106,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/main.h index ab890ae14..202b9791a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h index 18b8d1816..23ed29d2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h index 71ec15999..d2665e35f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/main.c index 500fe0c81..e20e23b2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -169,6 +168,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -182,7 +184,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -203,11 +205,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -276,4 +273,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c index 07690d3f7..77f3d1c70 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -122,4 +121,3 @@ void HAL_CRC_MspDeInit(CRC_HandleTypeDef* hcrc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c index 443947b7a..3e19adcd3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -119,4 +118,4 @@ void SysTick_Handler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/readme.txt index 84baf752f..1af0a3745 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_Example/readme.txt @@ -8,12 +8,12 @@ * @brief Description of Cyclic Redundancy Check Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc index a0ea78c3f..314438d5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc @@ -23,8 +23,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -36,6 +36,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -97,14 +108,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/main.h index bdeba3bfa..22781eaaa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_hal_conf.h index 18b8d1816..23ed29d2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h index 7550aef3c..8dcc713a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/main.c index 0332dc61b..fe65fee60 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -153,6 +152,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -166,7 +168,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -187,11 +189,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -262,4 +259,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_hal_msp.c index 70d5f558d..b4554cde8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -122,4 +121,3 @@ void HAL_CRC_MspDeInit(CRC_HandleTypeDef* hcrc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c index 84bfb532e..5a747d616 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,4 +125,4 @@ void SysTick_Handler(void) }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/readme.txt index 9371dffaf..d16ea65e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRC/CRC_UserDefinedPolynomial/readme.txt @@ -8,12 +8,12 @@ * @brief Description of CRC Example with user-defined generating polynomial. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc index f7913c4b8..f19aec4fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc @@ -58,8 +58,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:true NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:false\:false\:true @@ -73,6 +73,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -134,14 +145,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/main.h index 8fcbbf670..c7ad46727 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_hal_conf.h index 48af9c792..ffeccfbe5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_it.h index d7ceb658a..653251be0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void AES1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/MDK-ARM/startup_stm32wb55xx_cm4.s index 9f3be83cc..dbecaa8a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/main.c index 4d1c496cb..8f5fe4920 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -406,7 +405,7 @@ int main(void) Error_Handler(); } - /* Start decrypting aCyphertext, the decrypted data is available in aDecryptedtext */ + /* Start decrypting aCiphertext, the decrypted data is available in aDecryptedtext */ if (HAL_CRYP_Decrypt(&hcryp1, aEncryptedtextECB128, AES_TEXT_SIZE, aDecryptedtext, TIMEOUT_VALUE) == HAL_OK) { /* Display decrypted Data */ @@ -541,7 +540,7 @@ int main(void) Error_Handler(); } - /* Start decrypting aCyphertext, the decrypted data is available in aDecryptedtext */ + /* Start decrypting aCiphertext, the decrypted data is available in aDecryptedtext */ if (HAL_CRYP_Decrypt(&hcryp1, aEncryptedtextCBC128, AES_TEXT_SIZE, aDecryptedtext, TIMEOUT_VALUE) == HAL_OK) { /* Display decrypted Data */ @@ -678,7 +677,7 @@ int main(void) } - /* Start decrypting aCyphertext, the decrypted data is available in aDecryptedtext */ + /* Start decrypting aCiphertext, the decrypted data is available in aDecryptedtext */ if (HAL_CRYP_Decrypt(&hcryp1, aEncryptedtextCTR128, AES_TEXT_SIZE, aDecryptedtext, TIMEOUT_VALUE) == HAL_OK) { /* Display decrypted Data */ @@ -753,6 +752,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -766,7 +768,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -787,11 +789,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -1134,4 +1131,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_hal_msp.c index 4fe4ca71b..db43561c5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -167,4 +166,3 @@ void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef* hcryp) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_it.c index 577f42e8f..849484908 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,4 @@ void AES1_IRQHandler(void) HAL_CRYP_IRQHandler(&hcryp1); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/readme.txt index 79711b13f..40c9f0a45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_AESModes/readme.txt @@ -10,12 +10,12 @@ Example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc index c2f51512f..186c9e4da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc @@ -58,8 +58,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:true NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:false\:false\:true @@ -73,6 +73,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -134,14 +145,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/main.h index 9f32b5169..e04f07420 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h index 48af9c792..ffeccfbe5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h index 6f463e562..a0ad0a8d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void DMA1_Channel2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s index f22316cba..d2f21f2ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/main.c index 03a392f03..7236b429f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,7 +153,7 @@ uint32_t aPlaintext[AES_TEXT_SIZE] = 0xF69F2445 ,0xDF4F9B17 ,0xAD2B417B ,0xE66C3710}; -/* Cyphertext */ +/* Ciphertext */ uint32_t aEncryptedtextExpected[AES_TEXT_SIZE] = {0x3AD77BB4 ,0x0D7A3660 ,0xA89ECAF3 ,0x2466EF97 , 0xF5D3D585 ,0x03B9699D ,0xE785895A ,0x96FDBAAF , @@ -374,6 +373,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -387,7 +389,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -408,11 +410,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -624,4 +621,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c index 2157f2489..d22fea3da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -165,4 +164,3 @@ void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef* hcryp) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c index b406d82a8..b20c95edc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -231,4 +230,4 @@ void DMA1_Channel2_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/readme.txt index 1bccab892..cec8e1b16 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/CRYP/CRYP_DMA/readme.txt @@ -9,12 +9,12 @@ * @brief Description of the CRYP AES Algorithm in ECB mode with DMA Example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,12 +46,6 @@ data are displayed on debugger as follows: View --> Serial Viewer --> Debug (pr When all ciphering and deciphering operations are successful, LED2 is turned on. In case of ciphering or deciphering issue, LED3 toggle each 200ms. - -@par Keywords - -Security, Cryptography, CRYPT, AES, ECB, DMA, cipher, UART - - @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from a peripheral ISR process, then @@ -62,6 +56,10 @@ Security, Cryptography, CRYPT, AES, ECB, DMA, cipher, UART @note The application need to ensure that the SysTick time base is always set to 1 millisecond to have correct HAL operation. +@par Keywords + +Security, Cryptography, CRYPT, AES, ECB, DMA, cipher, UART + @par Directory contents - CRYP/CRYP_DMA/Inc/stm32wbxx_hal_conf.h HAL configuration file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/CORTEXM_MPU.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/CORTEXM_MPU.ioc index af5c55e28..5b3f4a118 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/CORTEXM_MPU.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/CORTEXM_MPU.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/main.h index 98904c91e..52edb2bf7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32_mpu.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32_mpu.h index 7d2ecb47f..abcc3cdab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32_mpu.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32_mpu.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,5 +45,3 @@ void MPU_Config(void); void MPU_AccessPermConfig(void); #endif /* __STM32_MPU_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_it.h index e1a3f450a..66d86d8b2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/main.c index fe2d2931b..f5abcdd3c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,6 +130,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -144,7 +146,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -165,11 +167,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -212,4 +209,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32_mpu.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32_mpu.c index ca8c91d1b..be5d88fb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32_mpu.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32_mpu.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,5 +144,3 @@ void MPU_AccessPermConfig(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_hal_msp.c index 2fd28f331..c512e17b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_it.c index 31aa5eee9..3d1a86713 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -190,4 +189,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/readme.txt index c8cd22419..2d2526bb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_MPU/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CortexM MPU example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc index 63d76cb3f..4661d67e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/main.h index 09a59d9c2..345f179a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_it.h index 6b72082d0..33aefd5fa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/main.c index 67ddf120d..81cab07aa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -218,6 +217,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -231,7 +233,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -252,11 +254,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -299,4 +296,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_hal_msp.c index 783aeebe0..e230211bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_it.c index 5026057bc..be158fe95 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -188,4 +187,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/readme.txt index 93f5e0351..019c0093a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_ModePrivilege/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Cortex-M4 Mode Privilege example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/CORTEXM_SysTick.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/CORTEXM_SysTick.ioc index 968d7b6a9..d5b913bad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/CORTEXM_SysTick.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/CORTEXM_SysTick.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/main.h index b6fc6d217..2666ac2e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_it.h index 9e0184c37..ea9677fa2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/main.c index 58336c680..1ccdb7779 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -160,6 +159,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -173,7 +175,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -194,11 +196,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -239,4 +236,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c index 8efc7d79c..48f1e3e98 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_it.c index 04dd72fc0..c81cb9744 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,4 +145,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/readme.txt index e8a94f11e..a97b9ad1d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/Cortex/CORTEXM_SysTick/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CortexM SysTick example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc index e3dd366d3..58840d7d9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc @@ -33,8 +33,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -47,6 +47,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -108,14 +119,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/main.h index bd58be6a9..fcc36767a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h index b80608160..d941efbf3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/main.c index ed11b15a0..01fd2440a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,6 +174,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -188,7 +190,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -209,11 +211,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -312,4 +309,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c index f9463e6fe..6f2583fcb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c index abb2534e1..0eba0fd53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void DMA1_Channel1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/readme.txt index cb60584ef..ae0f469d5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_FLASHToRAM/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA FLASH to RAM example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc index d2a3a9d75..aa8e4137c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc @@ -43,8 +43,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMAMUX1_OVR_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -71,6 +71,17 @@ PB7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PB7.Locked=true PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -132,14 +143,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/main.h index 3c4f21963..e53bcda17 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/main.h @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,5 +101,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h index 0249ed7ea..ef0c93ae2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h index 3ec3c3a0a..5bd1ec95e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void DMAMUX1_OVR_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/main.c index 9db5a5ceb..a4733622c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -180,6 +179,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -193,7 +195,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -214,11 +216,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -400,4 +397,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c index 137647d45..14ef9d6de 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -225,4 +224,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c index bdd1f953f..76e0f602c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -246,4 +245,4 @@ void DMAMUX1_OVR_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/readme.txt index f7304fdb8..48b1d0419 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUXSYNC/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA & DMAMUX Synchronization Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc index a310339e1..fd89ee01e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false PB4.Locked=true PB4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h index ee237bf97..d2ee26f2b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h index 7d8a9735f..5a2249b0d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void DMAMUX1_OVR_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/main.c index 3f77e4b7c..d1c1768ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/main.c @@ -8,16 +8,15 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -172,6 +171,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -185,7 +187,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -206,11 +208,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -282,4 +279,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c index a44a9a3c6..22237d6af 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_hal_msp.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +79,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c index 439e9a75b..84417b613 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -210,4 +209,4 @@ void DMAMUX1_OVR_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/readme.txt index 564bff645..adff12ea4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/DMA/DMA_MUX_RequestGen/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA & request generator Example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc index 331a9fadb..b6d9237fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/main.h index 4890cfff6..536bfc021 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -325,5 +324,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h index 2f93cc2e1..574bc866b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/main.c index f7db7a5f7..88b50b636 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -234,6 +233,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -247,7 +249,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -268,11 +270,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -328,4 +325,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c index bbd5520b1..bd6506ddc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c index 56a9e76d9..262584f5a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/readme.txt index 6fa4a62a0..55b654ae2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_EraseProgram/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the FLASH Erase and Program example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc index 847a42dad..2d488c126 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/main.h index dd72ce48a..85da0cd0d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -326,5 +325,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h index 8daac8538..e3cba24f2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/main.c index 09a8325da..3f13d5a32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -493,6 +492,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -506,7 +508,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -527,11 +529,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -597,4 +594,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c index 00262ec15..023a1ed35 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c index e63677736..15813b2e6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/readme.txt index f59a4946a..d04522cd2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/FLASH/FLASH_WriteProtection/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the FLASH write protection example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc index 7c54ef317..1812978b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:true\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/main.h index b79be5456..589482fbd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h index ce317e7c4..5d270010c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/main.c index 2fdedd0b9..910eeafb6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -125,6 +124,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -138,7 +140,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -159,11 +161,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -245,4 +242,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c index f61c3c512..86a55d994 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c index 4208ee805..d6de7e220 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -184,4 +183,4 @@ void EXTI4_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/readme.txt index 0bee7c90c..fb47ecb89 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_EXTI/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the GPIO EXTI example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc index 5f3f9bc4f..6637a9985 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:true\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/main.h index 0abd9d7da..c30d13c5e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h index 98da6a49d..a816e5381 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/main.c index 689b3ba73..928455716 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -141,6 +140,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -154,7 +156,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -175,11 +177,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -221,4 +218,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c index 1d6bb7052..210eca2c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c index e7191b6fc..fd63934f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file GPIO/GPIO_IOToggle/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -173,4 +172,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/readme.txt index a525d412d..88e2c74f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/GPIO/GPIO_IOToggle/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the GPIO IO Toggle example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc index 415f869de..b655efbaa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/main.h index 7afc138cd..5853d81a1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h index 68ee5ac82..efc762f2b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/main.c index 8e621885f..e979f48f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/main.c @@ -8,29 +8,13 @@ ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -138,6 +122,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -151,7 +138,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -172,11 +159,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -354,4 +336,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c index 81561dbb6..ed4891fc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,4 +153,4 @@ void EXTI4_IRQHandler(void) }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/readme.txt index 818c77524..e850fd113 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HAL time base example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc index c9a22e259..612857fb4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/main.h index ff8ce90a0..9ea80ec02 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_it.h index cccb82b6a..8490ee94b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/main.c index 37a062799..f00c2470f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,6 +123,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -137,7 +139,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -158,11 +160,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -224,4 +221,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_timebase_rtc_alarm.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_timebase_rtc_alarm.c index 2eb21dae3..b55962f96 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_timebase_rtc_alarm.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_hal_timebase_rtc_alarm.c @@ -6,10 +6,21 @@ * * This file override the native HAL time base functions (defined as weak) * to use the RTC ALARM for time base generation: - * + Intializes the RTC peripheral to increment the seconds registers each 1ms + * + Initializes the RTC peripheral to increment the seconds registers each 1ms * + The alarm is configured to assert an interrupt when the RTC reaches 1ms * + HAL_IncTick is called at each Alarm event and the time is reset to 00:00:00 * + HSE (default), LSE or LSI can be selected as RTC clock source + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -30,17 +41,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -297,5 +297,3 @@ void RTC_Alarm_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_it.c index f585223fb..b931017d1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,4 +133,4 @@ void EXTI4_IRQHandler(void) }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/readme.txt index c23f1e4ba..443aa5743 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_ALARM/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HAL TimeBase RTC Alarm example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc index 4ae6ae5c2..d590e076b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h index 26a56f181..4437d4d5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h index bc8c0c2d4..d54e3b0fb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c index 85e9a6c1c..b6a65b5f0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,6 +123,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -137,7 +139,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -158,11 +160,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -224,4 +221,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c index 705d1d32c..abe650e24 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_hal_timebase_rtc_wakeup.c @@ -6,11 +6,22 @@ * * This file overrides the native HAL time base functions (defined as weak) * to use the RTC WAKEUP for the time base generation: - * + Intializes the RTC peripheral and configures the wakeup timer to be + * + Initializes the RTC peripheral and configures the wakeup timer to be * incremented each 1ms * + The wakeup feature is configured to assert an interrupt each 1ms * + HAL_IncTick is called inside the HAL_RTCEx_WakeUpTimerEventCallback * + HSE (default), LSE or LSI can be selected as RTC clock source + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### How to use this driver ##### @@ -31,17 +42,6 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ @@ -275,5 +275,3 @@ void RTC_WKUP_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c index a3cf93abc..3f795e870 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,4 +133,4 @@ void EXTI4_IRQHandler(void) }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt index b1648ce1a..b87ab4052 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_RTC_WKUP/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HAL TimeBase RTC WakeUp example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc index 2bd91f232..b2ee978f8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.TIM1_TRG_COM_TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.TimeBase=TIM1_TRG_COM_TIM17_IRQn NVIC.TimeBaseIP=TIM17 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h index 0226610ed..816d3b72e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h index 8f4b79cf7..8608135c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/main.c index 6451a1a29..095df8b11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,6 +131,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -145,7 +147,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -166,11 +168,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -205,7 +202,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) /* USER CODE END 4 */ - /** +/** * @brief Period elapsed callback in non blocking mode * @note This function is called when TIM17 interrupt took place, inside * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment @@ -257,4 +254,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c index eaa85b174..0a195f75b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_hal_timebase_tim.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,6 +49,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) /* Enable the TIM17 global Interrupt */ HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn); + /* Enable TIM17 clock */ __HAL_RCC_TIM17_CLK_ENABLE(); @@ -74,6 +74,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) htim17.Init.Prescaler = uwPrescalerValue; htim17.Init.ClockDivision = 0; htim17.Init.CounterMode = TIM_COUNTERMODE_UP; + if(HAL_TIM_Base_Init(&htim17) == HAL_OK) { /* Start the TIM time Base generation in interrupt mode */ @@ -108,4 +109,3 @@ void HAL_ResumeTick(void) __HAL_TIM_ENABLE_IT(&htim17, TIM_IT_UPDATE); } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c index d5046faa1..b5041c28f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -155,4 +154,4 @@ void EXTI4_IRQHandler(void) { }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/readme.txt index bfc8a740b..8ede36fdd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HAL/HAL_TimeBase_TIM/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HAL time base example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc index a415a3e02..c8c6329e6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/main.h index 953a13e30..3e8675262 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_hal_conf.h index 6009f797a..2b3a946ba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_it.h index 5eb632496..12882c09c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/main.c index 0c151140d..9eb459102 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,6 +144,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -158,7 +160,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -179,11 +181,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -263,4 +260,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_hal_msp.c index dd7e8e1d8..c1f84f7e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +84,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_it.c index 28e603a96..ee5381806 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -226,4 +225,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/readme.txt index 15dfcb9c3..6867f8166 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ProcessSync/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HSEM Process Sync example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc index a17423815..63beeae25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/main.h index 95ef020de..a2936a9bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_hal_conf.h index 6009f797a..2b3a946ba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_it.h index f851491f9..be391d9fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void HSEM_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/main.c index 5d462a30a..b41335868 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -170,6 +169,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -183,7 +185,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -204,11 +206,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -251,4 +248,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_hal_msp.c index 4795e824c..b44e279b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,4 +84,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_it.c index 3a66f92cb..58cc47c0c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/stm32wbxx_it.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -216,4 +215,4 @@ void HSEM_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/readme.txt index 213742d12..64d549ba9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/HSEM/HSEM_ReadLock/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HSEM ReadLock example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/I2C_TwoBoards_AdvComIT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/I2C_TwoBoards_AdvComIT.ioc index caa42daf8..2146ca8f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/I2C_TwoBoards_AdvComIT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/I2C_TwoBoards_AdvComIT.ioc @@ -29,8 +29,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x1F Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -44,10 +44,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,14 +124,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/main.h index d86d85341..7cdcc9bef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_it.h index 930bdbaae..175028b07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/main.c index 17648edc5..cb3b1f471 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ int main(void) } /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -185,7 +184,7 @@ int main(void) } /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -209,7 +208,7 @@ int main(void) } /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -236,7 +235,7 @@ int main(void) } /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -260,7 +259,7 @@ int main(void) } /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -284,7 +283,7 @@ int main(void) } /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -327,7 +326,7 @@ int main(void) } /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -343,7 +342,7 @@ int main(void) while(HAL_I2C_Slave_Receive_IT(&hi2c1, (uint8_t*)&hRxNumData, 2)!= HAL_OK); /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -356,7 +355,7 @@ int main(void) while(HAL_I2C_Slave_Receive_IT(&hi2c1, (uint8_t*)aRxBuffer, hRxNumData)!= HAL_OK); /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -385,7 +384,7 @@ int main(void) while(HAL_I2C_Slave_Receive_IT(&hi2c1, (uint8_t*)&hTxNumData, 2)!= HAL_OK); /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -398,7 +397,7 @@ int main(void) while(HAL_I2C_Slave_Transmit_IT(&hi2c1, (uint8_t*)aTxBuffer, RXBUFFERSIZE)!= HAL_OK); /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -425,6 +424,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -438,7 +440,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -459,11 +461,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -622,4 +619,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_hal_msp.c index 335d717f0..7e0458a5f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,4 +157,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_it.c index abc5ae2d7..290b587e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,4 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/readme.txt index 8b90ff059..652a6703b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_AdvComIT/readme.txt @@ -9,12 +9,12 @@ * Interrupt example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc index abcb92223..dded2f344 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc @@ -67,8 +67,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x30F Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -84,10 +84,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -149,14 +164,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h index e6e8d2135..79f9213f3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h index a73301693..ef430b409 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c index 31a5f03af..e4bdb7df9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -153,7 +152,7 @@ int main(void) /*##- Wait for the end of the transfer #################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -191,7 +190,7 @@ int main(void) /*##- Wait for the end of the transfer #################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -218,7 +217,7 @@ int main(void) /*##- Wait for the end of the transfer ###################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -240,7 +239,7 @@ int main(void) /*##- Wait for the end of the transfer ###################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -276,6 +275,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -289,7 +291,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -310,11 +312,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -527,4 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c index bc26e2301..7984f327c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -201,4 +200,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c index 70cc050c3..8d109ed4e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,4 +174,4 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt index 3457f5d70..d9048e3b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComDMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C Two Boards Communication DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc index 9bc0b9a9d..3e3981623 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc @@ -29,8 +29,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x30F Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -44,10 +44,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,14 +124,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h index 0581d4475..15e153d75 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h index 998ee3792..f1cafb0df 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c index 1a3349619..424894cb5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -266,6 +265,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -279,7 +281,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -300,11 +302,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -488,4 +485,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c index beb9ba625..2d1bcfcee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,4 +157,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c index 3b727cb3f..b13f634c9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,4 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt index e50463495..b47ca6e69 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComIT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C Two Boards Communication IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc index 8c8f660bd..4a173503c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc @@ -29,8 +29,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x30F Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -42,10 +42,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -107,14 +122,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/main.h index baf94dc0c..470b592bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_it.h index d71c5db37..51d29196e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/main.c index 268acace5..15c46cee0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -233,6 +232,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -246,7 +248,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -267,11 +269,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -395,4 +392,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c index cfbd66eaa..e19293443 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -150,4 +149,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_it.c index 682238074..f21d1e3ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,4 +116,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/readme.txt index cc63a98d6..180acca44 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_ComPolling/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C Two Boards Communication Polling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc index 342063178..d65732b53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc @@ -29,8 +29,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x3C Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -44,10 +44,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,14 +124,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/main.h index 589f29ad8..ef5dc28ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_hal_conf.h index 7f3a1e970..f0c8412f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_it.h index 8df0b6168..83e8b3983 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s index eafc092bb..d2f21f2ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c index 3408cb0b7..38f14aa8f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,7 +210,7 @@ int main(void) /*##-3- Wait for the end of the transfer #################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -251,7 +250,7 @@ int main(void) /*##-3- Wait for the end of the transfer #################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -279,7 +278,7 @@ int main(void) /*##-5- Wait for the end of the transfer #################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -370,6 +369,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -383,7 +385,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -404,11 +406,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -666,4 +663,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_hal_msp.c index 3a743ffc2..ed0a98505 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,4 +157,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_it.c index 9a20c3572..ab1396fac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,4 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/readme.txt index 82116048e..c0f3223d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_RestartAdvComIT I2C example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -57,7 +57,7 @@ The User push-button (SW1) is used to initiate a communication between Master de User can initiate a new communication after each previous transfer completed. The I2C communication is then initiated. -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board The HAL_I2C_Master_Sequential_Transmit_IT() and the HAL_I2C_Master_Sequential_Receive_IT() functions allow respectively the transmission and the reception of a predefined data buffer diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc index 4cee08a68..d6a97cac2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc @@ -29,8 +29,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0x30F Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -44,10 +44,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,14 +124,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/main.h index b676bffa5..b0ea9e737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_it.h index aa3c17c1e..701a7c608 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c index 574e327a2..7a682fd97 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -149,7 +148,7 @@ int main(void) /*##- Wait for the end of the transfer #################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -184,7 +183,7 @@ int main(void) /*##- Wait for the end of the transfer #################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -226,7 +225,7 @@ int main(void) /*##- Wait for the end of the transfer ###################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -256,7 +255,7 @@ int main(void) /*##- Wait for the end of the transfer ###################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -294,6 +293,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -307,7 +309,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -328,11 +330,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -550,4 +547,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_hal_msp.c index 66e50f6a1..d169a6f4a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,4 +157,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_it.c index dcf95f916..f0c8466f0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,4 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/readme.txt index 4d82881dc..87bc34016 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_TwoBoards_RestartComIT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C Two Boards IT Communication with Restart condition example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -53,7 +53,7 @@ the configuration of the needed I2C resources according to the used hardware (CL GPIO and NVIC). You may update this function to change I2C configuration. The I2C communication is then initiated. -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board The HAL_I2C_Master_Sequential_Transmit_IT() and the HAL_I2C_Master_Sequential_Receive_IT() functions allow respectively the transmission and the reception of a predefined data buffer diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc index be84799ee..04a62dbbb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc @@ -29,8 +29,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0xCA Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -44,10 +44,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -110,14 +125,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/main.h index 4b7463f5c..2e968faf8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_it.h index 0a8be8468..9ea307c67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/main.c index 58f3c9211..50e36092e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ uint8_t aRxBuffer[RXBUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); /* USER CODE BEGIN PFP */ @@ -91,6 +91,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -283,7 +286,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -315,12 +317,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_I2C1; - PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -550,5 +562,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_hal_msp.c index cb9aeaf0d..212dee04c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,6 +82,7 @@ void HAL_MspInit(void) void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hi2c->Instance==I2C1) { /* USER CODE BEGIN I2C1_MspInit 0 */ @@ -104,6 +104,14 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) RCC_PeriphCLKInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI; HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct); /* USER CODE END I2C1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_I2C1; + PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOB_CLK_ENABLE(); /**I2C1 GPIO Configuration @@ -168,5 +176,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_it.c index bf017d15f..c37a47cc1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,3 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/readme.txt index 6dafeb00c..bccbfb29e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Wake Up from Stop mode example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -54,7 +54,7 @@ the configuration of the needed I2C resources according to the used hardware (CL GPIO and NVIC). You may update this function to change I2C configuration. The I2C communication is then initiated. -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board The HAL_I2C_Master_Receive_IT() and the HAL_I2C_Master_Transmit_IT() functions allow respectively the reception and the transmission of a predefined data buffer diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc index 847b92939..3deb07b5a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc @@ -28,8 +28,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_ADDRESS,0xCA Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -43,10 +43,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PC0.GPIOParameters=GPIO_Pu +PC0.GPIO_Pu=GPIO_PULLUP PC0.Mode=I2C PC0.Signal=I2C3_SCL +PC1.GPIOParameters=GPIO_Pu +PC1.GPIO_Pu=GPIO_PULLUP PC1.Mode=I2C PC1.Signal=I2C3_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,14 +124,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/main.h index 39a2db25d..4bb05050b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_it.h index 457e4c361..7158af8b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void I2C3_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/main.c index a7ba46d12..6785f26f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ uint8_t aRxBuffer[RXBUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C3_Init(void); /* USER CODE BEGIN PFP */ @@ -92,6 +92,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -277,7 +280,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -309,12 +311,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_I2C3; - PeriphClkInitStruct.I2c3ClockSelection = RCC_I2C3CLKSOURCE_HSI; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -541,5 +553,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_hal_msp.c index b9a0f8680..09e1ef4d1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,6 +82,7 @@ void HAL_MspInit(void) void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hi2c->Instance==I2C3) { /* USER CODE BEGIN I2C3_MspInit 0 */ @@ -98,6 +98,14 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) HAL_RCCEx_WakeUpStopCLKConfig(RCC_STOP_WAKEUPCLOCK_HSI); /* USER CODE END I2C3_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_I2C3; + PeriphClkInitStruct.I2c3ClockSelection = RCC_I2C3CLKSOURCE_HSI; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOC_CLK_ENABLE(); /**I2C3 GPIO Configuration @@ -162,5 +170,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_it.c index d0282d54e..b39f82a94 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,4 +145,3 @@ void I2C3_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/readme.txt index f8d6ca08f..c78ddb576 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/I2C/I2C_WakeUpFromStop2/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Wake Up from Stop 2 mode example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -53,7 +53,7 @@ the configuration of the needed I2C resources according to the used hardware (CL GPIO and NVIC). You may update this function to change I2C configuration. The I2C communication is then initiated. -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board The HAL_I2C_Master_Receive_IT() and the HAL_I2C_Master_Transmit_IT() functions allow respectively the reception and the transmission of a predefined data buffer diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc index 9062a3523..2bec63100 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc @@ -20,8 +20,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -94,14 +105,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/main.h index 21ffc1ad1..01b8c4177 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_hal_conf.h index 0c9a07f34..1d828d6f7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_it.h index 30ede71fa..f28cf099f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void TIM1_UP_TIM16_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/main.c index 93ee0b0d8..28d2eca53 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,6 +161,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -175,7 +177,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -196,11 +198,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -357,4 +354,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_hal_msp.c index 3398f65a1..b01f8c59a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,4 +111,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_it.c index aecab5e8f..deb097cc1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -231,4 +230,4 @@ void TIM1_UP_TIM16_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/readme.txt index 2a9663e8f..f829678c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_Reset/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the IWDG Reset. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc index 070f5801b..418580cb0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc @@ -20,8 +20,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -94,14 +105,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/main.h index 3c203ee12..86a66096c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h index 0c9a07f34..1d828d6f7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h index b1e42d304..369527c85 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/main.c index 488ec3a82..48038a537 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,6 +155,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -169,7 +171,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -190,11 +192,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -280,4 +277,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c index 2cf71720e..7528b65c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -212,4 +211,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/readme.txt index 2d52c08e7..5fcbc8a9b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/IWDG/IWDG_WindowMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the IWDG Reset with window mode. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_sram_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_sram_cm4.icf index 26935db61..f31c06d32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_sram_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/EWARM/stm32wb55xx_sram_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/main.h index b1e24a102..9f15066cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_hal_conf.h index 7877b8269..f82184702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_it.h index 11adc0a74..1a955dee1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -66,5 +65,3 @@ void LCD_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_nucleo_glass_lcd.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_nucleo_glass_lcd.h index 2026347c3..e98aec728 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_nucleo_glass_lcd.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Inc/stm32wbxx_nucleo_glass_lcd.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32wbxx_nucleo_glass_lcd.h * @author MCD Application Team * @brief Header file for stm32wbxx_nucleo_glass_lcd.c module. - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBXX_NUCLEO_GLASS_LCD_H @@ -465,5 +464,3 @@ void BSP_LCD_GLASS_Clear(LCD_HandleTypeDef *hlcd); #endif #endif /* __STM32WBXX_NUCLEO_GLASS_LCD_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/LCD_SegmentsDrive.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/LCD_SegmentsDrive.ioc index 851df17d7..94d7d891b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/LCD_SegmentsDrive.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/LCD_SegmentsDrive.ioc @@ -56,8 +56,8 @@ Mcu.PinsNb=40 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -156,6 +156,17 @@ PC5.Mode=SEG23 PC5.Signal=LCD_SEG23 PC6.Mode=SEG24 PC6.Signal=LCD_SEG24 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -221,7 +232,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=976.5625 +RCC.RFWKPFreq_Value=31250 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/main.c index b19228549..fb263947b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,6 +48,7 @@ LCD_HandleTypeDef hlcd; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LCD_Init(void); /* USER CODE BEGIN PFP */ @@ -82,6 +82,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED1 */ @@ -190,7 +193,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -233,12 +235,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RTC; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -333,5 +345,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_hal_msp.c index feb64b0ea..e08c3dc74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,11 +82,21 @@ void HAL_MspInit(void) void HAL_LCD_MspInit(LCD_HandleTypeDef* hlcd) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hlcd->Instance==LCD) { /* USER CODE BEGIN LCD_MspInit 0 */ /* USER CODE END LCD_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_LCD_CLK_ENABLE(); @@ -236,4 +245,3 @@ void HAL_LCD_MspDeInit(LCD_HandleTypeDef* hlcd) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_it.c index c3f9a7fd3..912777bad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,3 @@ void LCD_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_nucleo_glass_lcd.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_nucleo_glass_lcd.c index 0256f7f08..139a25381 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_nucleo_glass_lcd.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/stm32wbxx_nucleo_glass_lcd.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,7 +59,7 @@ ================================================================================ GLASS LCD MAPPING ================================================================================ -LCD allows to display informations on six 14-segment digits and 4 bars: +LCD allows to display information on six 14-segment digits and 4 bars: 1 2 3 4 5 6 ----- ----- ----- ----- ----- ----- @@ -613,5 +612,3 @@ static void WriteChar(LCD_HandleTypeDef *hlcd, uint8_t *ch, Point_Typedef Point, /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/readme.txt index b689bcbb1..06d9e67c1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LCD/LCD_SegmentsDrive/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LCD Glass example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -36,7 +36,7 @@ It is a LCD with 24 segments and 4 commons able to display 14-segments digits an The following manual connections are required: (refer to P-NUCLEO-WB55 schematics (MB1355) for STM32WB55RGVx GPIOs physical connections on Morpho connector) - (refer to 32L152CDISCOVERY (UM1079) for LCDGlass connections and for more informations on each segment and common usage) + (refer to 32L152CDISCOVERY (UM1079) for LCDGlass connections and for more information on each segment and common usage) STM32WB55RGVx LCDGlass GPIO AF11 PIN FUNCTION diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h index 2d54063b7..f7e9f4dc0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h index dc58a1912..031a7661b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h index 8a563266c..a9f1f7497 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc index 9077bbcfd..bfb534b01 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc @@ -23,8 +23,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -43,6 +43,17 @@ PC1.GPIO_PuPd=GPIO_PULLUP PC1.GPIO_Speed=GPIO_SPEED_FREQ_LOW PC1.Mode=WaveformGeneration PC1.Signal=LPTIM1_OUT +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -104,14 +115,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c index bfbf02ff9..ee79fa850 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,6 +153,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -167,7 +169,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -188,11 +190,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -285,4 +282,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c index fe6ffb032..2ec4ea95e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -151,4 +150,3 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* hlptim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c index bea0e38b9..61d24a050 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file LPTIM/LPTIM_PWMExternalClock/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt index 825a1edcd..9574a5476 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWMExternalClock/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM PWM with an External clock example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/main.h index 68abc0202..36dbf7231 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_hal_conf.h index dc58a1912..031a7661b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_it.h index d8a4227a6..e97ffecc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc index a3993c687..08d0635bd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -36,6 +36,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false PC1.Mode=WaveformGeneration PC1.Signal=LPTIM1_OUT +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -97,14 +108,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c index 3069d0698..e20b7079a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -153,6 +152,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -166,7 +168,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -187,11 +189,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -281,4 +278,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_hal_msp.c index d62636f0e..3f80923ba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_hal_msp.c @@ -1,20 +1,19 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_hal_msp.c + * File Name : LPTIM/LPTIM_Timeout/Src/stm32wbxx_hal_msp.c * @author : MCD Application Team * Description : This file provides code for the MSP Initialization * and de-Initialization codes. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -186,4 +185,3 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* hlptim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_it.c index a26bc9824..dc70bda45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file LPTIM/LPTIM_PWM_LSE/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/readme.txt index 52f745e14..c5797f3f2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PWM_LSE/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM PWM LSE example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h index c3ca9989c..391926eba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h index dc58a1912..031a7661b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h index 2e7c1babc..e70c6d9ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void LPTIM1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc index e363cf605..5ea9d83b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc @@ -20,8 +20,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -36,6 +36,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false PC0.Mode=Counts_external_clock_with_synchro_01_occur1 PC0.Signal=LPTIM1_IN1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -97,14 +108,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c index c038e8673..51d728846 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -144,6 +143,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -157,7 +159,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -178,11 +180,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -286,4 +283,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c index 6eb4c0765..9425c98fd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -193,4 +192,3 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* hlptim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c index c8811b104..ce4f64cb4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,4 @@ void LPTIM1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/readme.txt index 883e7574d..3a334bdb1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_PulseCounter/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM Pulse counter example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/main.h index edaddc568..cbef79f6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_hal_conf.h index dc58a1912..031a7661b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_it.h index e7d8aba2a..e116b278b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void LPTIM1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc index a0e2e5347..8b564fbf4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -38,6 +38,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false PC3.Mode=ExternalTrigger PC3.Signal=LPTIM1_ETR +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -99,14 +110,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/main.c index 0ab1bc8f2..3c3c2122c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,6 +141,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -155,7 +157,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -176,11 +178,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -281,4 +278,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_hal_msp.c index a816d3691..7b2081803 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -191,4 +190,3 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* hlptim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_it.c index e4c370621..d92ba8cc3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file LPTIM/LPTIM_Timeout/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,4 @@ void LPTIM1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/readme.txt index 110625753..be3e0c2db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/LPTIM/LPTIM_Timeout/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM Timeout example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/ecdsa_priv_prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/ecdsa_priv_prime256v1.h index 7c210e7b7..60d1eeeec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/ecdsa_priv_prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/ecdsa_priv_prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -39,5 +38,3 @@ extern const uint32_t ecdsa_priv_prime256v1_pubY_len; #endif #endif /* __ECDSA_PRIV_PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/main.h index 67bfec8a7..3857bbcdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/prime256v1.h index 1e31ca4a2..0a739370a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_it.h index f07d4b662..e8b838300 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc index 5320ab96e..3af0edf73 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,7 +103,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/ecdsa_priv_prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/ecdsa_priv_prime256v1.c index 5965e74ea..3da1c1e1f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/ecdsa_priv_prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/ecdsa_priv_prime256v1.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * ecdsa_priv_prime256v1.pem provided as an example of private and - * public key pair to demonstrate functionnality of PKA. + * public key pair to demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ const uint8_t ecdsa_priv_prime256v1_pubY[] = { 0x99, 0x82 }; const uint32_t ecdsa_priv_prime256v1_pubY_len = 32; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/main.c index d1b824a8c..4e86684fd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,6 +53,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -95,6 +95,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -168,7 +171,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -209,11 +211,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -292,5 +305,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/prime256v1.c index a03b9587c..eaea4245c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_hal_msp.c index f0f2385da..10c29faaa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,5 +123,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_it.c index f508b4f25..60e5ef2da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/readme.txt index 2bcc189da..6d3c9a79d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECC scalar multiplication example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/ecdsa_priv_prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/ecdsa_priv_prime256v1.h index bef1178cc..a354de40b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/ecdsa_priv_prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/ecdsa_priv_prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -39,5 +38,3 @@ extern const uint32_t ecdsa_priv_prime256v1_pubY_len; #endif #endif /* __ECDSA_PRIV_PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/main.h index 8e5590fc9..9df5b1bf1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/prime256v1.h index 86719c917..00d968309 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_it.h index 8e095e68b..3158de172 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc index f9300e504..02c77fb1c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -93,7 +104,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/ecdsa_priv_prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/ecdsa_priv_prime256v1.c index c748bc9b8..d783be9ca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/ecdsa_priv_prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/ecdsa_priv_prime256v1.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * ecdsa_priv_prime256v1.pem provided as an example of private and - * public key pair to demonstrate functionnality of PKA. + * public key pair to demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,5 +79,3 @@ const uint8_t ecdsa_priv_prime256v1_pubY[] = { 0x99, 0x82 }; const uint32_t ecdsa_priv_prime256v1_pubY_len = 32; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/main.c index 196f57e31..585beded7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,6 +52,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -172,7 +175,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -213,11 +215,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -314,5 +327,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/prime256v1.c index 35ccdfd88..12b52063d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_hal_msp.c index 4de00ab86..e8f4afe58 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_it.c index 9c7642a9b..97f30732f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void PKA_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/readme.txt index 875655731..e8de60f7e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECCscalarMultiplication_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECC scalar multiplication example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h index 8309ef30d..8df540ad6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/SigGen.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,3 @@ extern const uint32_t SigGen_S_len; #endif #endif /* __SIGGEN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h index dcada04f4..de6fca43e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h index de2fff994..68e2b9a4e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h index 34ee8556a..8273ad59b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc index d940b9885..c7ef4b7aa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,7 +103,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c index 17e05c36c..48dadb33d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/SigGen.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ const uint8_t SigGen_S[] = { 0xef, 0x97, 0xb2, 0x18, 0xe9, 0x6f, 0x17, 0x5a, 0x3c, 0xcd, 0xda, 0x2a, 0xcc, 0x05, 0x89, 0x03 }; const uint32_t SigGen_S_len = 32; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/main.c index 3a1ec6d00..75238bc72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,6 +52,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -178,7 +181,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -219,11 +221,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -302,5 +315,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c index ce2dc5e3c..c3c2dd671 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c index a87ebeab0..a333a5cae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,5 +123,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c index 17aac81a1..c06e07fdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/readme.txt index 0d6958531..a5606b69f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECDSA signature example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,8 +28,8 @@ For this example, a test vector have been extracted from National Institute of S This reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (SigGen.txt)" -This test vector has been choosen to demonstrate how to sign a message. The inputs and outputs definitions are included -in SigGen.c. The output signature is composed of two parts called "R" and "S". You can refer to this file for more informations. +This test vector has been chosen to demonstrate how to sign a message. The inputs and outputs definitions are included +in SigGen.c. The output signature is composed of two parts called "R" and "S". You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/PKA_ECDSA_Sign_IT.ewp b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/PKA_ECDSA_Sign_IT.ewp index 3a4544718..ce50180b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/PKA_ECDSA_Sign_IT.ewp +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/PKA_ECDSA_Sign_IT.ewp @@ -1071,9 +1071,6 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_pka.c - - $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c - $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_rcc.c @@ -1086,6 +1083,9 @@ $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_gpio.c + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_hsem.c diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/SigGen.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/SigGen.h index e22234024..1036da7ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/SigGen.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/SigGen.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,3 @@ extern const uint32_t SigGen_S_len; #endif #endif /* __SIGGEN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/main.h index e1eb13c7d..0d02e7213 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/prime256v1.h index 9bc783ef7..fded7d7fd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_it.h index 19b611bdb..93c545462 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc index fe3fb52e1..f2b65f9b0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.1.0 -MxDb.Version=DB.6.0.10 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -32,8 +32,15 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false PCC.Ble.ConnectionInterval=1000.0 PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false PCC.Ble.Mode=NOT_SELECTED PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -97,7 +104,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/SigGen.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/SigGen.c index 96168a473..a725d46a6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/SigGen.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/SigGen.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ const uint8_t SigGen_S[] = { 0xef, 0x97, 0xb2, 0x18, 0xe9, 0x6f, 0x17, 0x5a, 0x3c, 0xcd, 0xda, 0x2a, 0xcc, 0x05, 0x89, 0x03 }; const uint32_t SigGen_S_len = 32; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/main.c index 61de0bbc7..9651bb357 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,6 +52,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -184,7 +187,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -225,11 +227,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -326,5 +339,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/prime256v1.c index 0f23b2429..2965b60c1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_hal_msp.c index 840690003..9c7098560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_it.c index 4d0f835f3..04ca8070a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void PKA_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/readme.txt index 70ca1669b..966996a1b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Sign_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECDSA signature example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,8 +28,8 @@ For this example, a test vector have been extracted from National Institute of S This reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (SigGen.txt)" -This test vector has been choosen to demonstrate how to sign a message. The inputs and outputs definitions are included -in SigGen.c. The output signature is composed of two parts called "R" and "S". You can refer to this file for more informations. +This test vector has been chosen to demonstrate how to sign a message. The inputs and outputs definitions are included +in SigGen.c. The output signature is composed of two parts called "R" and "S". You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/SigVer.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/SigVer.h index 8f97f271c..437bcbdcd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/SigVer.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/SigVer.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -45,5 +44,3 @@ extern const uint32_t SigVer_Result; #endif #endif /* __SIGVER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/main.h index 292005163..3f63e2e32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/prime256v1.h index 9bc85faef..cab9ca379 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_it.h index 7bb4103d1..ef7d156f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc index 649e626cf..97664404a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,7 +103,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/SigVer.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/SigVer.c index 79f007d34..b07ae37b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/SigVer.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/SigVer.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -90,5 +89,3 @@ const uint8_t SigVer_S[] = { const uint32_t SigVer_S_len = 32; const uint32_t SigVer_Result = SET; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/main.c index 13ab44e26..09172905a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -177,7 +180,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -218,11 +220,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -301,5 +314,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/prime256v1.c index bd86af8f3..3de96aaef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_hal_msp.c index e626b287e..6c1abedd0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,5 +123,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_it.c index b4e861eaf..d24f2caa4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/readme.txt index b09211730..114d4e812 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECDSA verification example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,10 +28,10 @@ For this example, a test vector have been extracted from National Institute of S This reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (ZIP SigGen.rsp)" -This test vector has been choosen to demonstrate the behavior in a case where the input signature +This test vector has been chosen to demonstrate the behavior in a case where the input signature is valid. A second input is provided where one element of the hash message has been modified to demonstrate the behavior in a case where the signature is invalid. Their definitions are included -in SigVer.c. You can refer to this file for more informations. +in SigVer.c. You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h index c83985dd5..cebf00d75 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/SigVer.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -45,5 +44,3 @@ extern const uint32_t SigVer_Result; #endif #endif /* __SIGVER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h index 922db2147..85d874676 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h index 44394c803..ca1e1f507 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h index bf9a57808..0129a7ed4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc index 32d6e518c..bf7da45e5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -93,7 +104,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c index 0da224a1a..1b640e7dc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/SigVer.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -90,5 +89,3 @@ const uint8_t SigVer_S[] = { const uint32_t SigVer_S_len = 32; const uint32_t SigVer_Result = SET; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c index c059fcea2..28953bf71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -187,7 +190,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -228,11 +230,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -329,5 +342,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c index 90f329ea7..5b92870a6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c index 144882c1f..d98e89b8a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c index 5f94f4f1b..1d4360e13 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void PKA_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt index bb2b3acbe..4db00d0b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ECDSA_Verify_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ECDSA verification example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,10 +28,10 @@ For this example, a test vector have been extracted from National Institute of S This reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (ZIP SigGen.rsp)" -This test vector has been choosen to demonstrate the behavior in a case where the input signature +This test vector has been chosen to demonstrate the behavior in a case where the input signature is valid. A second input is provided where one element of the hash message has been modified to demonstrate the behavior in a case where the signature is invalid. Their definitions are included -in SigVer.c. You can refer to this file for more informations. +in SigVer.c. You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/ciphertext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/ciphertext.h index 94fa8fa92..56fbf01a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/ciphertext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/ciphertext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t ciphertext_bin_len; #endif #endif /* __CIPHERTEXT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/main.h index b601b43d8..f0fa53430 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/plaintext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/plaintext.h index 000fd244b..610560350 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/plaintext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/plaintext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t plaintext_bin_len; #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h index b198860ad..328896a31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,5 +45,3 @@ extern const uint32_t rsa_priv_2048_coefficient_len; #endif #endif /* __RSA_PRIV_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h index d52f73be1..0a574b339 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -35,5 +34,3 @@ extern const uint32_t rsa_pub_2048_publicExponent_len; #endif #endif /* __RSA_PUB_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h index 867fcd3e5..0263c5155 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc index 3a406f0d6..7597c2003 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,7 +103,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/ciphertext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/ciphertext.c index 0a541dc5b..6f208c084 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/ciphertext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/ciphertext.c @@ -6,19 +6,18 @@ * It has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i ciphertext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,4 +56,3 @@ const uint8_t ciphertext_bin[] = { 0x85, 0xeb, 0xae, 0x23 }; const uint32_t ciphertext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/main.c index af6cad975..d5f969be9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,6 +53,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -95,6 +95,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -179,7 +182,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -220,11 +222,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -303,5 +316,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/plaintext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/plaintext.c index 7a932cf74..a91b55fe4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/plaintext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/plaintext.c @@ -9,19 +9,18 @@ * plaintext.c has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i plaintext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,4 +53,3 @@ const uint8_t plaintext_bin[] = { 0x6d, 0xc5, 0xfc, 0x93 }; const uint32_t plaintext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c index fc4803e4e..45aa37221 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_priv_2048.pem provided as an example of private key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -238,5 +237,3 @@ const uint8_t rsa_priv_2048_coefficient[] = { 0x36, 0x4f, 0x36, 0x76, 0xbe, 0x3d, 0xc6, 0x50, 0x7a }; const uint32_t rsa_priv_2048_coefficient_len = 128; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c index a2d4b82f7..1c553598e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_pub_2048.pem provided as an example of public key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,5 +84,3 @@ const uint8_t rsa_pub_2048_publicExponent[] = {0x00, 0x1, 0x00, 0x01};/* 65537; const uint32_t rsa_pub_2048_publicExponent_len = 4; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_hal_msp.c index 8339a3749..6b6ba2641 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,5 +123,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c index 54529ebae..96711781a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/readme.txt index be7c70a0e..668125bc7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the modular exponentiation example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/ciphertext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/ciphertext.h index d3b2fb514..853729559 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/ciphertext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/ciphertext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t ciphertext_bin_len; #endif #endif /* __CIPHERTEXT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/main.h index 5e87c0465..daebfa186 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/plaintext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/plaintext.h index b9a3879c1..fbe55e04b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/plaintext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/plaintext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t plaintext_bin_len; #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_priv_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_priv_2048.h index 1ba314b80..663352b08 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_priv_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_priv_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,5 +45,3 @@ extern const uint32_t rsa_priv_2048_coefficient_len; #endif #endif /* __RSA_PRIV_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_pub_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_pub_2048.h index e2f50cb54..5b1498d9a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_pub_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/rsa_pub_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -35,5 +34,3 @@ extern const uint32_t rsa_pub_2048_publicExponent_len; #endif #endif /* __RSA_PUB_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_it.h index 37d70dc5a..138e4dc00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc index ae1200c38..f4cfd572f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,7 +103,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/ciphertext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/ciphertext.c index d99d4444b..17a9547b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/ciphertext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/ciphertext.c @@ -6,19 +6,18 @@ * It has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i ciphertext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,4 +56,3 @@ const uint8_t ciphertext_bin[] = { 0x85, 0xeb, 0xae, 0x23 }; const uint32_t ciphertext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/main.c index 46ec979c4..b10f5a039 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,6 +52,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -159,7 +162,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -200,11 +202,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -283,5 +296,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/plaintext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/plaintext.c index 05b9b0e94..dc839c2a9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/plaintext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/plaintext.c @@ -9,19 +9,18 @@ * plaintext.c has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i plaintext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,4 +53,3 @@ const uint8_t plaintext_bin[] = { 0x6d, 0xc5, 0xfc, 0x93 }; const uint32_t plaintext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_priv_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_priv_2048.c index d964c86de..ce6a04678 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_priv_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_priv_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_priv_2048.pem provided as an example of private key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -238,5 +237,3 @@ const uint8_t rsa_priv_2048_coefficient[] = { 0x36, 0x4f, 0x36, 0x76, 0xbe, 0x3d, 0xc6, 0x50, 0x7a }; const uint32_t rsa_priv_2048_coefficient_len = 128; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_pub_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_pub_2048.c index ff6d9c1db..fdd374fa3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_pub_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/rsa_pub_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_pub_2048.pem provided as an example of public key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,5 +84,3 @@ const uint8_t rsa_pub_2048_publicExponent[] = {0x00, 0x1, 0x00, 0x01};/* 65537; const uint32_t rsa_pub_2048_publicExponent_len = 4; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_hal_msp.c index 803e41edd..1a7837327 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,5 +123,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_it.c index d11cf00c9..42b5690a1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/readme.txt index 8b82de45a..28a3d3ff5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the modular exponentiation (CRT) example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/ciphertext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/ciphertext.h index e12927af1..0f2028383 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/ciphertext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/ciphertext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t ciphertext_bin_len; #endif #endif /* __CIPHERTEXT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/main.h index 1a6948ee8..0d2bded45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/plaintext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/plaintext.h index 555b9aca0..d5263226b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/plaintext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/plaintext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t plaintext_bin_len; #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_priv_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_priv_2048.h index d84405856..01efa0d70 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_priv_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_priv_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,5 +45,3 @@ extern const uint32_t rsa_priv_2048_coefficient_len; #endif #endif /* __RSA_PRIV_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_pub_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_pub_2048.h index b8e8a1bea..08de9253c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_pub_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/rsa_pub_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -35,5 +34,3 @@ extern const uint32_t rsa_pub_2048_publicExponent_len; #endif #endif /* __RSA_PUB_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_it.h index 5a81340f5..ef14c33b2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc index 9128a6994..74c8145b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -93,7 +104,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/ciphertext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/ciphertext.c index 8248160ec..78656b341 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/ciphertext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/ciphertext.c @@ -6,19 +6,18 @@ * It has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i ciphertext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,4 +56,3 @@ const uint8_t ciphertext_bin[] = { 0x85, 0xeb, 0xae, 0x23 }; const uint32_t ciphertext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/main.c index bfa087b1c..1a9d70af2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,6 +52,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -162,7 +165,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -203,11 +205,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -304,5 +317,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/plaintext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/plaintext.c index e4a3b96e2..6bf4e4a64 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/plaintext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/plaintext.c @@ -9,19 +9,18 @@ * plaintext.c has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i plaintext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,4 +53,3 @@ const uint8_t plaintext_bin[] = { 0x6d, 0xc5, 0xfc, 0x93 }; const uint32_t plaintext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_priv_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_priv_2048.c index 84ea0b1c0..546ab3920 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_priv_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_priv_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_priv_2048.pem provided as an example of private key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -238,5 +237,3 @@ const uint8_t rsa_priv_2048_coefficient[] = { 0x36, 0x4f, 0x36, 0x76, 0xbe, 0x3d, 0xc6, 0x50, 0x7a }; const uint32_t rsa_priv_2048_coefficient_len = 128; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_pub_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_pub_2048.c index 4ba9c9288..ed415b80e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_pub_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/rsa_pub_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_pub_2048.pem provided as an example of public key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,5 +84,3 @@ const uint8_t rsa_pub_2048_publicExponent[] = {0x00, 0x1, 0x00, 0x01};/* 65537; const uint32_t rsa_pub_2048_publicExponent_len = 4; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_hal_msp.c index 0fb92f855..72524961c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_it.c index b28058090..564e7b092 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void PKA_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/readme.txt index 485902e00..27da4a7b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiationCRT_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the modular exponentiation (CRT) example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/ciphertext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/ciphertext.h index c22c52f69..b638da9b8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/ciphertext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/ciphertext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t ciphertext_bin_len; #endif #endif /* __CIPHERTEXT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/main.h index 4b5d2c2ea..b12efadfc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/plaintext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/plaintext.h index 2e5c754b3..52d8c3736 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/plaintext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/plaintext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t plaintext_bin_len; #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_priv_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_priv_2048.h index a56e12e38..37e781652 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_priv_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_priv_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,5 +45,3 @@ extern const uint32_t rsa_priv_2048_coefficient_len; #endif #endif /* __RSA_PRIV_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_pub_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_pub_2048.h index 72bb53959..c8a29f985 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_pub_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/rsa_pub_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -35,5 +34,3 @@ extern const uint32_t rsa_pub_2048_publicExponent_len; #endif #endif /* __RSA_PUB_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_it.h index 1b6e887bb..cf24524a5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc index 83a4e1758..2dc6c6a08 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -93,7 +104,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/ciphertext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/ciphertext.c index 5fceed55a..942032c0a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/ciphertext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/ciphertext.c @@ -6,19 +6,18 @@ * It has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i ciphertext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,4 +56,3 @@ const uint8_t ciphertext_bin[] = { 0x85, 0xeb, 0xae, 0x23 }; const uint32_t ciphertext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/main.c index 15b6f07f7..3dd8f5f56 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,6 +53,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -95,6 +95,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -187,7 +190,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -228,11 +230,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -329,5 +342,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/plaintext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/plaintext.c index 7bcd2b230..e0bca2820 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/plaintext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/plaintext.c @@ -9,19 +9,18 @@ * plaintext.c has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i plaintext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,4 +53,3 @@ const uint8_t plaintext_bin[] = { 0x6d, 0xc5, 0xfc, 0x93 }; const uint32_t plaintext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_priv_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_priv_2048.c index ffcf1ce9c..000851723 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_priv_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_priv_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_priv_2048.pem provided as an example of private key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -238,5 +237,3 @@ const uint8_t rsa_priv_2048_coefficient[] = { 0x36, 0x4f, 0x36, 0x76, 0xbe, 0x3d, 0xc6, 0x50, 0x7a }; const uint32_t rsa_priv_2048_coefficient_len = 128; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_pub_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_pub_2048.c index 2faac9fbc..03c83ab96 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_pub_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/rsa_pub_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_pub_2048.pem provided as an example of public key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,5 +84,3 @@ const uint8_t rsa_pub_2048_publicExponent[] = {0x00, 0x1, 0x00, 0x01};/* 65537; const uint32_t rsa_pub_2048_publicExponent_len = 4; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_hal_msp.c index 3f436d70e..43adc6954 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_it.c index 20050df5c..beef7d55e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void PKA_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/readme.txt index 39c20d086..dff990e10 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_ModularExponentiation_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the modular exponentiation example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/PKV.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/PKV.h index adab9a28d..2ac676fe4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/PKV.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/PKV.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -41,5 +40,3 @@ extern const uint32_t PKV2_Result; #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/main.h index 1287232f8..92500dc01 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/prime256v1.h index 1f524ea67..67487439e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_it.h index dc2ff0415..d2be59342 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc index e7684cad3..4a1aaf6d5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,7 +103,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/PKV.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/PKV.c index 077562507..b17ae4ebb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/PKV.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/PKV.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,4 +62,3 @@ const uint8_t PKV2_Qy[] = { const uint32_t PKV2_Qy_len = 32; const uint32_t PKV2_Result = RESET; /* PKV.rsp mentions "F (2 - Point not on curve)" result, PKA returns 1 in this case (Only different from 0 is meaningfull) */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/main.c index 2ada2aafe..d2e671775 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -183,7 +186,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -224,11 +226,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -307,5 +320,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/prime256v1.c index 0efab7adc..52a3e60b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_hal_msp.c index 403d3db66..cad9e1ff4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,5 +123,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_it.c index 685466daa..d3bc108fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/readme.txt index dc0ef38d9..6b76c718f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the modular exponentiation example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,9 +28,9 @@ For this example, 2 test vector have been extracted from National Institute of S Those reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (ZIP PKV.rsp)" -Those two test vectors have been choosen to demonstrate the behavior in a case where the input point validates +Those two test vectors have been chosen to demonstrate the behavior in a case where the input point validates the curve equation and in a case where the input point does not verify the curve equation. Their definition -is included in PKV.c. You can refer to this file for more informations. +is included in PKV.c. You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/PKV.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/PKV.h index 53fe4fd6a..ef3c73b41 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/PKV.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/PKV.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -41,5 +40,3 @@ extern const uint32_t PKV2_Result; #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/main.h index 410da471c..c98402528 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/prime256v1.h index fb46003ef..f85dfd3b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_hal_conf.h index 443d093aa..cf1003609 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_it.h index 9abf57886..6655d9a7e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc index e3a772f8c..dc47185be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -93,7 +104,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/PKV.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/PKV.c index 27e879417..18f0507ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/PKV.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/PKV.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,4 +62,3 @@ const uint8_t PKV2_Qy[] = { const uint32_t PKV2_Qy_len = 32; const uint32_t PKV2_Result = RESET; /* PKV.rsp mentions "F (2 - Point not on curve)" result, PKA returns 1 in this case (Only different from 0 is meaningfull) */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/main.c index 09f3e0cbe..b11e007e0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ __IO uint32_t operationComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Configure LED2 */ BSP_LED_Init(LED2); @@ -182,7 +185,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -223,11 +225,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -324,5 +337,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/prime256v1.c index 97f7bb992..afe12bae0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_hal_msp.c index 5a381a76a..3b478f14d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,3 @@ void HAL_PKA_MspDeInit(PKA_HandleTypeDef* hpka) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_it.c index 688f179f3..4fe4d8300 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -217,4 +216,3 @@ void PKA_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/readme.txt index a9580780a..1b759da7d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PKA/PKA_PointCheck_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the modular exponentiation example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -28,9 +28,9 @@ For this example, 2 test vector have been extracted from National Institute of S Those reference files can be found under: "http://csrc.nist.gov/groups/STM/cavp/documents/dss/186-3ecdsatestvectors.zip (ZIP PKV.rsp)" -Those two test vectors have been choosen to demonstrate the behavior in a case where the input point validates +Those two test vectors have been chosen to demonstrate the behavior in a case where the input point validates the curve equation and in a case where the input point does not verify the curve equation. Their definition -is included in PKV.c. You can refer to this file for more informations. +is included in PKV.c. You can refer to this file for more information. The selected curve for this example is P-256 (ECDSA-256) published by NIST in Federal Information Processing Standards Publication FIPS PUB 186-4. The description diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/main.h index f6a0f548b..1df7f8be0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h index a3f15e861..750dbb9da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Inc/stm32wbxx_it.h @@ -3,19 +3,16 @@ ****************************************************************************** * @file PWR/PWR_LPRUN/Inc/stm32wbxx_it.h * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc index 6aa72c64c..22df5b2fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/main.c index 341a7303c..aa8b35a67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -151,6 +150,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -164,7 +166,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -185,11 +187,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -289,4 +286,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c index cc52264ba..e388f4c0a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c @@ -3,19 +3,16 @@ ****************************************************************************** * @file PWR/PWR_LPRUN/Src/stm32wbxx_hal_msp.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief HAL MSP module. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c index 13b06458e..515ddda51 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/readme.txt index 754187acf..15b249944 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPRUN/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Low Power Run Mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/main.h index 3c34ddf71..42dfaf24e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h index d81b07885..f9d5bab07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc index a8999705e..b53281d47 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/main.c index 0967bc9c6..6f924c321 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,6 +160,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -174,7 +176,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -195,11 +197,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -300,4 +297,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c index 02ae5b10a..be73517a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_hal_msp.c @@ -3,19 +3,16 @@ ****************************************************************************** * @file PWR/PWR_LPSLEEPS/Src/stm32wbxx_hal_msp.c * @author MCD Application Team - * @version $VERSION$ - * @date $DATE$ * @brief HAL MSP module. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c index 29dcdcaf0..b102ade82 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/readme.txt index 2119b8643..3e386cfa4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_LPSLEEP/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Low Power Sleep Mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/main.h index febeb4e82..edccf6db4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h index 4b6b81db9..577b23557 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void PVD_PVM_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/PWR_PVD.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/PWR_PVD.ioc index b48a887d9..511ad1835 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/PWR_PVD.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/PWR_PVD.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/main.c index 04ca774ad..e45ad3c85 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,6 +125,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -139,7 +141,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -160,11 +162,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -176,7 +173,7 @@ void SystemClock_Config(void) static void PVD_Config(void) { /*##-1- Enable Power Clock #################################################*/ - /* Note: On this STM32 serie, Power Clock is enabled automatically */ + /* Note: On this STM32 series, Power Clock is enabled automatically */ /*##-2- Configure the NVIC for PVD #########################################*/ HAL_NVIC_SetPriority(PVD_PVM_IRQn, 0, 0); @@ -246,4 +243,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c index c9282fd07..8150d0156 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c index 2b7051f00..42152bae1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -212,4 +211,4 @@ void PVD_PVM_IRQHandler(void) HAL_PWREx_PVD_PVM_IRQHandler(); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/readme.txt index cc008730a..0b061ad86 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_PVD/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Programmable Voltage Detector (PVD) example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h index 3c43ab09c..879c9d71b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h index 5ef1cec09..461f9a6e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void RTC_WKUP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc index 36c467794..64be27d4a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.ForceEnableDMAVector=true @@ -28,6 +28,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -89,14 +100,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/main.c index ebed128c0..8f5ca93ac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/main.c @@ -1,7 +1,6 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * @file PWR/PWR_STANDBY_RTC/Src/main.c * @author MCD Application Team * @brief This sample code shows how to use STM32WBxx PWR HAL API to enter @@ -9,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -215,6 +213,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -228,7 +229,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -249,11 +250,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -353,4 +349,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c index 55332e45d..f02489376 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -157,4 +156,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c index f86b33710..3fef6205a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,4 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/readme.txt index 25a39aa4b..442d6cf83 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STANDBY_RTC/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Standby RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/main.h index 44cdba2a9..ec73a0536 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_it.h index 96b7648ff..ea3038b3f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void RTC_WKUP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc index ff8056fa2..e00798600 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -28,6 +28,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -89,14 +100,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/main.c index d7ee5c475..bcd75e3d8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,6 +210,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -224,7 +226,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -245,11 +247,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -383,4 +380,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_hal_msp.c index 91e773ada..eaf824de8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,4 +155,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_it.c index 6069c1b59..2b30e4e95 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,4 +127,4 @@ void RTC_WKUP_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/readme.txt index 7faa5a5ba..95548052e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/PWR/PWR_STOP2_RTC/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Power Stop 2 RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_flash_cm4.icf index 6e92b7695..a09e0d5b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_flash_cm4.icf @@ -13,7 +13,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_sram_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_sram_cm4.icf index 66c4656a6..9ff857a87 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_sram_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/EWARM/stm32wb55xx_sram_cm4.icf @@ -18,7 +18,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/main.h index 5c70d622b..07442fa78 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,5 +155,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_hal_conf.h index c57f294a0..9ec25461d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_it.h index e9fa5efd2..5c74bf4dd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void QUADSPI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/QSPI_ExecuteInPlace.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/QSPI_ExecuteInPlace.ioc index 06b095fce..c5e7f7997 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/QSPI_ExecuteInPlace.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/QSPI_ExecuteInPlace.ioc @@ -61,8 +61,8 @@ Mcu.PinsNb=25 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -165,6 +165,17 @@ PC4.GPIOParameters=GPIO_Label PC4.GPIO_Label=B1 [Push Button] PC4.Locked=true PC4.Signal=GPIO_Input +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PD0.GPIOParameters=GPIO_Label PD0.GPIO_Label=B2 [Push Button] PD0.Locked=true @@ -242,7 +253,7 @@ RCC.PLLSAI1PoutputFreq_Value=48000000 RCC.PLLSAI1QoutputFreq_Value=48000000 RCC.PLLSAI1RoutputFreq_Value=48000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=976.5625 +RCC.RFWKPFreq_Value=31250 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=48000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fccdc9335..96823cf78 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 3b14c66d8..422e2e492 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -160,7 +144,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/main.c index e1f9735b2..dfcbd259a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,6 +66,7 @@ __IO uint8_t CmdCplt, RxCplt, TxCplt, StatusMatch; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_QUADSPI_Init(void); @@ -113,6 +113,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ BSP_LED_Init(LED1); BSP_LED_Init(LED2); @@ -313,7 +316,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -361,19 +363,25 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks + /** Enable MSI Auto calibration + */ + HAL_RCCEx_EnableMSIPLLMode(); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_USB; - PeriphClkInitStruct.PLLSAI1.PLLN = 24; - PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -381,9 +389,6 @@ void SystemClock_Config(void) /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ - /** Enable MSI Auto calibration - */ - HAL_RCCEx_EnableMSIPLLMode(); } /** @@ -786,5 +791,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_hal_msp.c index e7e55a63d..fe46526a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -200,11 +199,21 @@ void HAL_QSPI_MspDeInit(QSPI_HandleTypeDef* hqspi) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -265,11 +274,25 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hpcd->Instance==USB) { /* USER CODE BEGIN USB_MspInit 0 */ /* USER CODE END USB_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB; + PeriphClkInitStruct.PLLSAI1.PLLN = 24; + PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; + PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOA_CLK_ENABLE(); /**USB GPIO Configuration @@ -324,5 +347,3 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_it.c index 8009bff78..d0b36aac4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,4 +231,3 @@ void QUADSPI_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/readme.txt index d02aeedfb..e7a4d8b03 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ExecuteInPlace/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the code execution from QSPI memory example. ****************************************************************************** * - * Copyright (c) 2018 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -44,7 +44,7 @@ QSPI prescaler is set to 2, so QSPI frequency is = HCLK/(QSPI_Prescaler+1) = 64 @par Keywords -Memory, QSPI, Erase, Write, Execute, Mapped +Memory, QUADSPI, Erase, Write, Execute, Mapped @par Directory contents @@ -71,7 +71,7 @@ Memory, QSPI, Erase, Write, Execute, Mapped - Connect PB9 to DQ0 (Serial Data) - Connect PB8 to DQ1 (Serial Data) - Connect PA7 to DQ2 (DQ2) - - Connect PA8 to DQ3 (DQ3) + - Connect PA6 to DQ3 (DQ3) - Connect NRST to RESET# (Reset) - A specific region for the QSPI memory has been added in the scatter file diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_sram_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_sram_cm4.icf index 26935db61..f31c06d32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_sram_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/EWARM/stm32wb55xx_sram_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/main.h index 72e5f7aca..88646147c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,5 +155,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_hal_conf.h index c57f294a0..9ec25461d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_it.h index 32c7d4dfd..292da5c07 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void QUADSPI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/QSPI_MemoryMapped.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/QSPI_MemoryMapped.ioc index 5d12e14e6..d63787855 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/QSPI_MemoryMapped.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/QSPI_MemoryMapped.ioc @@ -60,8 +60,8 @@ Mcu.PinsNb=25 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -164,6 +164,17 @@ PC4.GPIOParameters=GPIO_Label PC4.GPIO_Label=B1 [Push Button] PC4.Locked=true PC4.Signal=GPIO_Input +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PD0.GPIOParameters=GPIO_Label PD0.GPIO_Label=B2 [Push Button] PD0.Locked=true @@ -241,7 +252,7 @@ RCC.PLLSAI1PoutputFreq_Value=48000000 RCC.PLLSAI1QoutputFreq_Value=48000000 RCC.PLLSAI1RoutputFreq_Value=48000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=976.5625 +RCC.RFWKPFreq_Value=31250 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=48000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/main.c index 3ac3f2a3a..3f0454735 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -59,6 +58,7 @@ uint8_t aTxBuffer[] = " ****Memory-mapped QSPI communication**** ****Memory-map /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_QUADSPI_Init(void); @@ -103,6 +103,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ BSP_LED_Init(LED_GREEN); BSP_LED_Init(LED_RED); @@ -273,7 +276,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -321,19 +323,25 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks + /** Enable MSI Auto calibration + */ + HAL_RCCEx_EnableMSIPLLMode(); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_USB; - PeriphClkInitStruct.PLLSAI1.PLLN = 24; - PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -341,9 +349,6 @@ void SystemClock_Config(void) /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ - /** Enable MSI Auto calibration - */ - HAL_RCCEx_EnableMSIPLLMode(); } /** @@ -719,5 +724,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_hal_msp.c index 04fc8bf82..e38d0a987 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -200,11 +199,21 @@ void HAL_QSPI_MspDeInit(QSPI_HandleTypeDef* hqspi) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -265,11 +274,25 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hpcd->Instance==USB) { /* USER CODE BEGIN USB_MspInit 0 */ /* USER CODE END USB_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB; + PeriphClkInitStruct.PLLSAI1.PLLN = 24; + PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; + PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOA_CLK_ENABLE(); /**USB GPIO Configuration @@ -324,5 +347,3 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_it.c index 2fdf61c36..6c4679c08 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,4 +231,3 @@ void QUADSPI_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/readme.txt index 1e1f6eec8..35d7690ef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_MemoryMapped/readme.txt @@ -8,12 +8,12 @@ * @brief QSPI memory mapped mode example. ****************************************************************************** * - * Copyright (c) 2018 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -41,7 +41,7 @@ QSPI prescaler is set to 2, so QSPI frequency is = HCLK/(QSPI_Prescaler+1) = 64 @par Keywords -Memory, QSPI, Erase, Read, Write, Mapped +Memory, QUADSPI, Erase, Read, Write, Mapped @par Directory contents @@ -68,7 +68,7 @@ Memory, QSPI, Erase, Read, Write, Mapped - Connect PB9 to DQ0 (Serial Data) - Connect PB8 to DQ1 (Serial Data) - Connect PA7 to DQ2 (DQ2) - - Connect PA8 to DQ3 (DQ3) + - Connect PA6 to DQ3 (DQ3) - Connect NRST to RESET# (Reset) @par How to use it ? diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_sram_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_sram_cm4.icf index 26935db61..f31c06d32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_sram_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/EWARM/stm32wb55xx_sram_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/main.h index 4e75f3728..da42087f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,5 +155,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_hal_conf.h index c57f294a0..9ec25461d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_it.h index e8aec3116..be09c30b0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void QUADSPI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/QSPI_ReadWrite_DMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/QSPI_ReadWrite_DMA.ioc index 56ee58509..f16798526 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/QSPI_ReadWrite_DMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/QSPI_ReadWrite_DMA.ioc @@ -60,8 +60,8 @@ Mcu.PinsNb=25 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -164,6 +164,17 @@ PC4.GPIOParameters=GPIO_Label PC4.GPIO_Label=B1 [Push Button] PC4.Locked=true PC4.Signal=GPIO_Input +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PD0.GPIOParameters=GPIO_Label PD0.GPIO_Label=B2 [Push Button] PD0.Locked=true @@ -241,7 +252,7 @@ RCC.PLLSAI1PoutputFreq_Value=48000000 RCC.PLLSAI1QoutputFreq_Value=48000000 RCC.PLLSAI1RoutputFreq_Value=48000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=976.5625 +RCC.RFWKPFreq_Value=31250 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=48000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/main.c index 0672a95f2..f9b3d38a8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ uint8_t aRxBuffer[BUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_QUADSPI_Init(void); @@ -105,6 +105,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ BSP_LED_Init(LED_GREEN); BSP_LED_Init(LED_RED); @@ -284,7 +287,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -332,19 +334,25 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks + /** Enable MSI Auto calibration + */ + HAL_RCCEx_EnableMSIPLLMode(); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_USB; - PeriphClkInitStruct.PLLSAI1.PLLN = 24; - PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -352,9 +360,6 @@ void SystemClock_Config(void) /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ - /** Enable MSI Auto calibration - */ - HAL_RCCEx_EnableMSIPLLMode(); } /** @@ -730,5 +735,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_hal_msp.c index 59437e81d..fe1b643a9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -200,11 +199,21 @@ void HAL_QSPI_MspDeInit(QSPI_HandleTypeDef* hqspi) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -265,11 +274,25 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hpcd->Instance==USB) { /* USER CODE BEGIN USB_MspInit 0 */ /* USER CODE END USB_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB; + PeriphClkInitStruct.PLLSAI1.PLLN = 24; + PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; + PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOA_CLK_ENABLE(); /**USB GPIO Configuration @@ -324,5 +347,3 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_it.c index 87869c956..31cef77d1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,4 +231,3 @@ void QUADSPI_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/readme.txt index a253ec4bf..b7985786f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_DMA/readme.txt @@ -8,12 +8,12 @@ * @brief QSPI Read/Write in DMA mode example. ****************************************************************************** * - * Copyright (c) 2018 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -41,7 +41,7 @@ QSPI prescaler is set to 2, so QSPI frequency is = HCLK/(QSPI_Prescaler+1) = 64 @par Keywords -Memory, QSPI, Erase, Read, Write, DMA +Memory, QUADSPI, Erase, Read, Write, DMA @par Directory contents @@ -68,7 +68,7 @@ Memory, QSPI, Erase, Read, Write, DMA - Connect PB9 to DQ0 (Serial Data) - Connect PB8 to DQ1 (Serial Data) - Connect PA7 to DQ2 (DQ2) - - Connect PA8 to DQ3 (DQ3) + - Connect PA6 to DQ3 (DQ3) - Connect NRST to RESET# (Reset) @par How to use it ? diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_sram_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_sram_cm4.icf index 26935db61..f31c06d32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_sram_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/EWARM/stm32wb55xx_sram_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/main.h index 93a6345bb..3b8d6dd87 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,5 +155,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_hal_conf.h index c57f294a0..9ec25461d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_it.h index 77025848a..f4d0c8f41 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -66,5 +65,3 @@ void QUADSPI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/QSPI_ReadWrite_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/QSPI_ReadWrite_IT.ioc index 3eded0409..1029dde45 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/QSPI_ReadWrite_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/QSPI_ReadWrite_IT.ioc @@ -40,8 +40,8 @@ Mcu.PinsNb=25 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -143,6 +143,17 @@ PC4.GPIOParameters=GPIO_Label PC4.GPIO_Label=B1 [Push Button] PC4.Locked=true PC4.Signal=GPIO_Input +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PD0.GPIOParameters=GPIO_Label PD0.GPIO_Label=B2 [Push Button] PD0.Locked=true @@ -220,7 +231,7 @@ RCC.PLLSAI1PoutputFreq_Value=48000000 RCC.PLLSAI1QoutputFreq_Value=48000000 RCC.PLLSAI1RoutputFreq_Value=48000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=976.5625 +RCC.RFWKPFreq_Value=31250 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=48000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/main.c index ef2611f76..df6f7ad7d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -59,6 +58,7 @@ uint8_t aRxBuffer[BUFFERSIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_QUADSPI_Init(void); static void MX_USART1_UART_Init(void); @@ -100,6 +100,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ BSP_LED_Init(LED_GREEN); BSP_LED_Init(LED_RED); @@ -278,7 +281,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -326,19 +328,25 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks + /** Enable MSI Auto calibration + */ + HAL_RCCEx_EnableMSIPLLMode(); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_USB; - PeriphClkInitStruct.PLLSAI1.PLLN = 24; - PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; - PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -346,9 +354,6 @@ void SystemClock_Config(void) /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ - /** Enable MSI Auto calibration - */ - HAL_RCCEx_EnableMSIPLLMode(); } /** @@ -708,5 +713,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_hal_msp.c index 9fa9be668..ebe05c104 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -178,11 +177,21 @@ void HAL_QSPI_MspDeInit(QSPI_HandleTypeDef* hqspi) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -243,11 +252,25 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hpcd->Instance==USB) { /* USER CODE BEGIN USB_MspInit 0 */ /* USER CODE END USB_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB; + PeriphClkInitStruct.PLLSAI1.PLLN = 24; + PeriphClkInitStruct.PLLSAI1.PLLP = RCC_PLLP_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLQ = RCC_PLLQ_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLR = RCC_PLLR_DIV2; + PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_USBCLK; + PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLLSAI1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } __HAL_RCC_GPIOA_CLK_ENABLE(); /**USB GPIO Configuration @@ -303,4 +326,3 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_it.c index f1afb34f5..09b703660 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -214,4 +213,3 @@ void QUADSPI_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/readme.txt index de1c31da1..a590006f7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/QSPI/QSPI_ReadWrite_IT/readme.txt @@ -8,12 +8,12 @@ * @brief QSPI Read/Write in interrupt mode example. ****************************************************************************** * - * Copyright (c) 2018 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -41,7 +41,7 @@ QSPI prescaler is set to 2, so QSPI frequency is = HCLK/(QSPI_Prescaler+1) = 64 @par Keywords -Memory, QSPI, Erase, Read, Write, IT +Memory, QUADSPI, Erase, Read, Write, IT @par Directory contents @@ -68,7 +68,7 @@ Memory, QSPI, Erase, Read, Write, IT - Connect PB9 to DQ0 (Serial Data) - Connect PB8 to DQ1 (Serial Data) - Connect PA7 to DQ2 (DQ2) - - Connect PA8 to DQ3 (DQ3) + - Connect PA6 to DQ3 (DQ3) - Connect NRST to RESET# (Reset) @par How to use it ? diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/main.h index 6dd3d11e8..dac24715a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_it.h index 3907ca1e2..e46d02e4c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void CRS_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/RCC_CRS_Synchronization_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/RCC_CRS_Synchronization_IT.ioc index a1dc48d01..f56783aff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/RCC_CRS_Synchronization_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/RCC_CRS_Synchronization_IT.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA8.Mode=Clock-out PA8.Signal=RCC_MCO +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/main.c index 576151bbb..f1a061d27 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -225,6 +224,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -238,7 +240,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -259,11 +261,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -411,4 +408,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_hal_msp.c index 8f7ee7880..1e9988e0a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_it.c index f9da97f04..356a9d261 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,4 +127,4 @@ void CRS_IRQHandler(void) /* USER CODE END RCC_IRQn 1 */ } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/readme.txt index d3bcc6aad..78b374b2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC Clock Recovery Service example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/main.h index 5a787d244..9c39f2c93 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_it.h index 46f6af2ff..2470cfe73 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/RCC_CRS_Synchronization_Polling.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/RCC_CRS_Synchronization_Polling.ioc index 1eaffbf07..0ae9fd8c5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/RCC_CRS_Synchronization_Polling.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/RCC_CRS_Synchronization_Polling.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA8.Mode=Clock-out PA8.Signal=RCC_MCO +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/main.c index dba8dcc8b..b811e52bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -165,6 +164,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -178,7 +180,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -199,11 +201,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -299,4 +296,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_hal_msp.c index 3edef7fb6..e73ef7830 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_it.c index e9a8d9c6c..b273d58f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -118,4 +117,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/readme.txt index d68173d8b..725418d74 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_CRS_Synchronization_Polling/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC Clock Recovery Service example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/main.h index ccbfab9b5..97923535e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h index 667f5a838..7847bc098 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc index 379f0f70c..096f20e18 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/main.c index 917eb9838..792cc0ec2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -136,6 +135,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -149,7 +151,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -170,11 +172,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -485,4 +482,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c index 26322c832..904299717 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c index fb3347219..3f9c6b3b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,4 +125,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/readme.txt index e916f1004..241b1e9b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RCC/RCC_ClockConfig/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC Clock Config example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/main.h index 7ee19c07e..1c5a2d445 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h index c6300c3ed..54d118fa8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h index 730db7700..097dff154 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc index b1dd991f5..ac175c9bb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -28,6 +28,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -89,14 +100,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/main.c index 2fd7df02a..7c23130e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,6 +153,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -167,7 +169,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -188,11 +190,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -274,4 +271,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c index 307ed7cbb..ebadd267e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -150,4 +149,3 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c index 361cdf146..f11261a0c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,4 +125,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/readme.txt index f83aa8dc7..740de5d52 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG/readme.txt @@ -8,12 +8,12 @@ * @brief Description of multiple random numbers generation example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/main.h index 4fab679b7..a7221e5e7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_hal_conf.h index c6300c3ed..54d118fa8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_it.h index 8454debfe..2439fcfdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ void RNG_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc index 449be65fc..e288f86d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.RNG_IRQn=true\:15\:0\:true\:false\:true\:true\:true NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/main.c index 988d1a287..97e859f79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,6 +162,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -176,7 +178,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -197,11 +199,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -315,4 +312,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_hal_msp.c index c1e10a253..3a191af68 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -148,4 +147,3 @@ void HAL_RNG_MspDeInit(RNG_HandleTypeDef* hrng) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_it.c index 78c9ecdee..f7d178d8b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -139,4 +138,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/readme.txt index feb3bc8a0..bae52994b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RNG/RNG_MultiRNG_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of multiple random numbers generation under interruption example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/main.h index da3a6c656..541969e3a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,5 +81,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h index b61ac55b6..480faa028 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -59,5 +58,3 @@ void RTC_Alarm_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc index c367aca2a..280fb8eb1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,14 +103,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/main.c index 4e2037db8..519baf69e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,6 +128,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -142,7 +144,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -163,11 +165,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -320,4 +317,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c index a476c38bd..0e99a2b1f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -192,4 +191,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c index 3dc5fc874..785d911f8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -106,4 +105,4 @@ void RTC_Alarm_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/readme.txt index bf69ae039..61c3379e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Alarm/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC Alarm example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/main.h index 24872bbbc..54ad79304 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_it.h index 2dc2d62ae..ce826f691 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -58,5 +57,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc index 6771b15e4..3c398946c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/main.c index 7eed0532a..c2f4e39b0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -137,6 +136,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -150,7 +152,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -171,11 +173,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -325,4 +322,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_hal_msp.c index dd92c13c9..7e5cda660 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,4 +157,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_it.c index 9b7c3520e..59ab4cca7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,4 @@ void SysTick_Handler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/readme.txt index 33388719d..9e74d3850 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Calendar/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC Calendar example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/main.h index 88dc4ad87..6dea20b5b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_hal_conf.h index 2e6af7ff1..6c527d7c9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_it.h index b94ea8c17..50cc6b359 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void TIM1_UP_TIM16_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/RTC_LSI.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/RTC_LSI.ioc index 278fb1e3c..97236d659 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/RTC_LSI.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/RTC_LSI.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -35,6 +35,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.TIM1_UP_TIM16_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA6.Signal=S_TIM16_CH1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -96,14 +107,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/main.c index eda76fe11..c7af3d1ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,6 +174,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -188,7 +190,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -209,11 +211,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -443,4 +440,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_hal_msp.c index 4dc324775..c67720b12 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -281,4 +280,3 @@ void HAL_TIM_IC_MspDeInit(TIM_HandleTypeDef *htim) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_it.c index d89523a7f..a6f68d1a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,4 +146,4 @@ void TIM1_UP_TIM16_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/readme.txt index 81b4e60dc..8795e924c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_LSI/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC prescaler adjustment with LSI Measurements example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/main.h index 7cc00cfaa..bcff2167c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,5 +81,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h index 2eb5f379a..d8c26472b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -59,5 +58,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc index fa35ff626..02cc9d6cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,17 @@ NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PC13.Locked=true PC13.Mode=Tamper 1 enabled - Input Enabled to TAMP1 PC13.Signal=RTC_TAMP1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -94,14 +105,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/main.c index 89c6f58ad..bc444a394 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -195,6 +194,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -208,7 +210,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -229,11 +231,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -351,4 +348,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c index 2e718ffaf..7df0d7ca0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c index 545354219..5ddc97eb2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -109,4 +108,4 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/readme.txt index bdddf0ded..f479bc57e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_Tamper/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC Tamper example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/main.h index 454e97f78..974dac0c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,5 +84,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_hal_conf.h index b843d296b..bd82b8ecc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_it.h index 097d56aa7..496332a0e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -59,5 +58,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc index e32ccb679..af4955e3d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,17 @@ NVIC.TAMP_STAMP_LSECSS_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PC13.Mode=Timestamp enabled - Input Enabled to TS PC13.Signal=RTC_TS +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -94,14 +105,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/main.c index 14d38c67a..f1490c9ff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -137,6 +136,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -150,7 +152,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -171,11 +173,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -345,4 +342,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_hal_msp.c index 8bcb27226..faf5f8fca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -195,4 +194,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_it.c index 91d8b0a65..905f873d9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,4 +106,4 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/readme.txt index 7bbde97f6..cf8f51552 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/RTC/RTC_TimeStamp/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC time stamp example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h index c03a1e660..fc308c647 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h index 9d8dc5f28..36dbddae7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void DMA1_Channel3_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc index 6fb3b08e6..fcc7cb171 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc @@ -55,8 +55,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -78,6 +78,17 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Master PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -139,14 +150,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c index ff5ebec0c..a2d8d4cf0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -192,6 +191,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -205,7 +207,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -226,11 +228,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -394,4 +391,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c index 85ef7844d..623520a58 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c index 0dea1c220..c5d307309 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,4 +145,4 @@ void DMA1_Channel3_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt index 331d6ac44..3c2ef01cf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Master/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h index 15ff9b8ce..efe68b81a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h index b10a34d09..b5356577d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void DMA1_Channel3_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc index 6e318bd10..5100d6a79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc @@ -55,8 +55,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -78,6 +78,17 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Slave PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -139,14 +150,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c index b6045aac9..19e2fcc62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -182,6 +181,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -195,7 +197,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -216,11 +218,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -383,4 +380,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c index 05b42a3a8..369c39ba4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -196,4 +195,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c index b20e358e3..245fda54c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,4 +145,4 @@ void DMA1_Channel3_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt index aaebd133f..45d73685c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/main.h index c4a518ed4..65d220478 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_it.h index b0841d970..f4e9796e8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void SPI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc index 6d9d04dd0..9c1e1ca7b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,17 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Master PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -100,14 +111,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/main.c index 50e2b0785..5adec2046 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -188,6 +187,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -201,7 +203,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -222,11 +224,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -368,4 +365,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_hal_msp.c index ec552a135..c555bbefa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -160,4 +159,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_it.c index c724498ba..02fa149dd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void SPI1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/readme.txt index 8d0411763..a388f1cb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Master/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/main.h index 172c90947..a0cf23177 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_it.h index a316afbdb..080c028ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void SPI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc index 4b0e6f234..e35e3f507 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,17 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Slave PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -100,14 +111,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/main.c index 51eb020ff..e61b65566 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -179,6 +178,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -192,7 +194,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -213,11 +215,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -358,4 +355,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_hal_msp.c index 439df22a5..4bc0254c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -160,4 +159,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_it.c index 4b8e1cac4..65c47aa98 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void SPI1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/readme.txt index d656aed8f..8824e15a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComIT_Slave/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h index 85e1d9104..14805850e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h index 6ac2997c4..b437cd140 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc index 1d9f31c98..debc2e4e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -38,6 +38,17 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Master PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -99,14 +110,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c index 4200fde4a..362907a94 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -183,6 +182,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -196,7 +198,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -217,11 +219,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -353,4 +350,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c index 773030f20..123daa602 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -155,4 +154,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c index 69b2499b0..ff19ea9a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,4 +116,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt index 3b1dfd51e..2e88f8a8e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex Polling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h index 68fdde408..ec2b45574 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h index 2d151def4..d9053dca5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc index 3fa17557f..db756e411 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -38,6 +38,17 @@ PA7.GPIOParameters=GPIO_PuPd PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.Mode=Full_Duplex_Slave PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -99,14 +110,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c index f8cb9b898..4b6d46f48 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -172,6 +171,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -185,7 +187,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -206,11 +208,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -341,4 +338,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c index e33684ab0..b88674d6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -155,4 +154,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c index 83bfa9030..82e256f8a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,4 +116,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt index d52dba8ff..d41427d38 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex Polling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/main.h index 83619978b..e46805fa0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_it.h index cd7f7f818..3146e1543 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void DMA1_Channel7_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/main.c index 272f859ec..6ff837b28 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,6 +184,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -198,7 +200,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -219,11 +221,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -370,4 +367,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_hal_msp.c index 73b954f75..caa3fd55b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_hal_msp.c @@ -1,20 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : TIM/TIM_DMA/Src/stm32wbxx_hal_msp.c - * @author : MCD Application Team + * File Name : stm32wbxx_hal_msp.c * Description : This file provides code for the MSP Initialization * and de-Initialization codes. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -174,4 +172,3 @@ void HAL_TIM_PWM_MspDeInit(TIM_HandleTypeDef* htim_pwm) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_it.c index 7c004b3d7..db3790e7e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_DMA/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void DMA1_Channel7_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/TIM_DMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/TIM_DMA.ioc index fa43751e8..229dd41d5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/TIM_DMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/TIM_DMA.ioc @@ -35,8 +35,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -53,6 +53,17 @@ PA10.GPIOParameters=GPIO_Speed,GPIO_PuPd PA10.GPIO_PuPd=GPIO_PULLUP PA10.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA10.Signal=S_TIM1_CH3 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -114,14 +125,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/readme.txt index 18eb37e99..618d012c8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/main.h index 18f83f573..deb29a547 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_it.h index d3b159b92..199aa1877 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void DMA1_Channel2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/main.c index 4de1fd78c..f5b3dcc3c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -174,6 +173,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -187,7 +189,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -208,11 +210,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -336,4 +333,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_hal_msp.c index 0d6dc1015..5210e6d2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -174,4 +173,3 @@ void HAL_TIM_PWM_MspDeInit(TIM_HandleTypeDef* htim_pwm) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_it.c index a8294b06b..4565a7f6f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_DMABurst/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void DMA1_Channel2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc index 79e029e3d..d9212fdc7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc @@ -35,8 +35,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false @@ -50,6 +50,17 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA0.Signal=S_TIM2_CH1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -111,14 +122,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/readme.txt index be90986e5..aac494264 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_DMABurst/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM DMA Burst example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/main.h index 5f6708a6e..123ec1bad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_it.h index 450e65905..bda14eb43 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/main.c index acccaf82f..8098a7886 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -151,6 +150,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -164,7 +166,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -185,11 +187,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -338,4 +335,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_hal_msp.c index 013d1faf4..1a612f76e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,4 +146,3 @@ void HAL_TIM_IC_MspDeInit(TIM_HandleTypeDef* htim_ic) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_it.c index b582a99c6..0b7731c1e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_InputCapture/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc index cc3262934..a08ef22fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -30,6 +30,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA1.Signal=S_TIM2_CH2 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -91,14 +102,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/readme.txt index 27c7f1670..f9007e004 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_InputCapture/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_InputCapture example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/main.h index 4a395ab06..dcd565a72 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h index 6d6a1f2da..ffb120259 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/main.c index 6680301d5..0670def59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -158,6 +157,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -171,7 +173,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -192,11 +194,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -318,4 +315,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c index 9a7f98d3d..6c4e931b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,4 +153,3 @@ void HAL_TIM_OC_MspDeInit(TIM_HandleTypeDef* htim_oc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c index 77152999d..c145a6c8e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_OCActive/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,4 +116,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc index 7af8c45f5..d60bffce1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -47,6 +47,17 @@ PA3.GPIOParameters=GPIO_Speed,GPIO_PuPd PA3.GPIO_PuPd=GPIO_PULLUP PA3.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA3.Signal=S_TIM2_CH4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -108,14 +119,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/readme.txt index 7be150f51..6d68bb3eb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCActive/readme.txt @@ -9,12 +9,12 @@ * delayed signals. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/main.h index 79cef023f..b4d7ab566 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_it.h index 697c90f20..daf1c0af6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/main.c index c15771484..7d5c591bd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,6 +155,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -169,7 +171,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -190,11 +192,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -354,4 +351,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_hal_msp.c index 6b9e823f7..e7e857b3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -160,4 +159,3 @@ void HAL_TIM_OC_MspDeInit(TIM_HandleTypeDef* htim_oc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_it.c index 2dcf92f11..f7a6ec7c5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_OCInactive/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc index b4c215c64..4db2c8622 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=9 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -68,6 +68,17 @@ PC3.GPIOParameters=GPIO_Speed,GPIO_PuPd PC3.GPIO_PuPd=GPIO_PULLUP PC3.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC3.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -129,14 +140,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/readme.txt index 688da4a77..ebf5dbba9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCInactive/readme.txt @@ -9,12 +9,12 @@ * delayed signals. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/main.h index faff758dc..c75f88258 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_it.h index 5f2b746f6..da228488b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/main.c index 03e68fbd6..7e1cbca8a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,6 +153,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -167,7 +169,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -188,11 +190,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -391,4 +388,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_hal_msp.c index 3a1cfc40f..d84862b31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -160,4 +159,3 @@ void HAL_TIM_OC_MspDeInit(TIM_HandleTypeDef* htim_oc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_it.c index 3d6690476..e83daf054 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_OCToggle/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,4 +130,4 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc index 9b8265a95..fcb68fe82 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -48,6 +48,17 @@ PA3.GPIOParameters=GPIO_Speed,GPIO_PuPd PA3.GPIO_PuPd=GPIO_PULLUP PA3.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA3.Signal=S_TIM2_CH4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,14 +120,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/readme.txt index f22381cc8..d7b96dbcf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OCToggle/readme.txt @@ -9,12 +9,12 @@ * signals with four different frequencies. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/main.h index 66cadc2dc..01d4747ab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -45,5 +44,3 @@ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_hal_conf.h index a72f3d14b..22f16a1f8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32WBxx_HAL_CONF_H @@ -344,5 +345,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h index 49a2e8bdd..0583f235c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/main.c index 2a01a77b5..cf022582f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -268,5 +267,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_hal_msp.c index f1fd7b57f..7cb1852db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_hal_msp.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -87,5 +86,3 @@ void HAL_TIM_OnePulse_MspInit(TIM_HandleTypeDef *htim) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_it.c index ea6423657..4d5934f32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -165,5 +164,3 @@ void SysTick_Handler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/readme.txt index bbda296fd..e660de6fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_OnePulse/readme.txt @@ -2,33 +2,18 @@ @page TIM_OnePulse TIM One Pulse example @verbatim - ******************** (C) COPYRIGHT 2019 STMicroelectronics ******************* + ****************************************************************************** * @file TIM/TIM_OnePulse/readme.txt * @author MCD Application Team * @brief Description of the TIM One Pulse example. ****************************************************************************** * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/main.h index 62d82a03c..dd783d63f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h index 2a01e7758..409329beb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,5 +62,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/main.c index 85c01ad5d..278b1b75a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,6 +160,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -174,7 +176,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -195,11 +197,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -353,4 +350,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c index 022962439..9010e1d75 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,4 +146,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c index 4355cc31e..d8849584d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_PWMInput/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -159,4 +158,4 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc index 569fb85b7..f69e63159 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false PA1.Signal=S_TIM2_CH2 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -92,14 +103,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/readme.txt index 0569dfa3b..e870e26ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMInput/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM PWM_Input example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/main.h index 75d558b53..13700d6a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,5 +115,3 @@ TIM2 Configuration: generate 4 PWM signals with 4 different duty cycles. #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h index 451b794d6..cafdb5fac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,5 +61,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/main.c index 86639a399..7924d8bd6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -155,6 +154,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -168,7 +170,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -189,11 +191,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -314,4 +311,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c index c8ccadc59..a27c827b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,4 +153,3 @@ void HAL_TIM_PWM_MspDeInit(TIM_HandleTypeDef* htim_pwm) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c index 122b8a1b2..ecf6f21d0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_PWMOutput/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc index 4ecbdcd98..f0a3f2d51 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -47,6 +47,17 @@ PA3.GPIOParameters=GPIO_Speed,GPIO_PuPd PA3.GPIO_PuPd=GPIO_PULLUP PA3.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA3.Signal=S_TIM2_CH4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -108,14 +119,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/readme.txt index 117e77fe5..088f04741 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_PWMOutput/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWM signals generation using TIM2 ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/main.h index 4878cb1fc..a59fc0e0c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -99,5 +98,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_it.h index 27fcefcb1..4a19a8930 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,5 +62,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/main.c index 80732f2ad..4faa85761 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -136,6 +135,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -149,7 +151,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -170,11 +172,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -271,4 +268,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_hal_msp.c index 6955e27b3..0ac4c5809 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,4 +128,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_it.c index e8e945799..e1c17e9da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file TIM/TIM_TimeBase/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -159,4 +158,4 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc index f5f978a49..30cef8ce9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -29,6 +29,17 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.TIM2_IRQn=true\:3\:0\:true\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,14 +101,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/readme.txt index 9f48c4b64..b775bfa6d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TIM/TIM_TimeBase/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM Time Base example ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TSC/TSC_BasicAcquisition_Interrupt/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TSC/TSC_BasicAcquisition_Interrupt/readme.txt index e5825af2b..e45b70e76 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/TSC/TSC_BasicAcquisition_Interrupt/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/TSC/TSC_BasicAcquisition_Interrupt/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TSC basic acquisition interrupt example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_sram_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_sram_cm4.icf index 26935db61..f31c06d32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_sram_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/EWARM/stm32wb55xx_sram_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/main.h index cf6ace55f..da5bfc02e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_it.h index 7209aef77..c98b81370 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/MDK-ARM/startup_stm32wb55xx_cm4.s index eafc092bb..d2f21f2ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 1ffb49470..46d0a744f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/main.c index 53c4de0ce..0771d0302 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -157,6 +156,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -170,7 +172,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -191,11 +193,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -327,4 +324,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_hal_msp.c index ff6f45cb2..f8fca0747 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -144,4 +143,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_it.c index 66f0c61f8..fa543e052 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/system_stm32wbxx.c index c0af3469e..68ad72806 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/UART_Console.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/UART_Console.ioc index 80d091ea5..97856249f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/UART_Console.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/UART_Console.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -40,6 +40,17 @@ PB7.GPIO_PuPd=GPIO_PULLUP PB7.Locked=true PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -101,14 +112,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/readme.txt index 245740f51..8f973847d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Console/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Console example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h index d6802a055..003a93f55 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h index 7f35004f7..f9b168fa7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,5 +62,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/main.c index be3b27989..23f7af37b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -198,6 +197,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -211,7 +213,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -232,11 +234,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -395,4 +392,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c index 2fe55415e..ac8bfabbb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -191,4 +190,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c index 9b9fab34c..fb5239715 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,4 +161,4 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc index d2e59e49f..f190a78c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc @@ -54,8 +54,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -78,6 +78,17 @@ PB7.GPIOParameters=GPIO_PuPd PB7.GPIO_PuPd=GPIO_PULLUP PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -139,14 +150,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/readme.txt index 11af1a0b6..ecd94b27e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_DMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Hyperterminal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/main.h index c5df4f445..479cafce1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h index 8f989198c..db3a90430 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/main.c index 33589e26d..80f4f4c0a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,7 +130,7 @@ int main(void) /*##-3- Wait for the end of the transfer ###################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -149,7 +148,7 @@ int main(void) /*##-5- Wait for the end of the transfer ###################################*/ /* Before starting a new communication transfer, you need to check the current - state of the peripheral; if its busy you need to wait for the end of current + state of the peripheral; if it's busy you need to wait for the end of current transfer before starting a new one. For simplicity reasons, this example is just waiting till the end of the transfer, but application may perform other tasks while transfer operation @@ -196,6 +195,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -209,7 +211,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -230,11 +232,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -375,4 +372,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c index 14fbdaa09..7f12b8c23 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -151,4 +150,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c index c6f572232..4a6acedbc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -132,4 +131,4 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc index 917fb7d8e..807d6a7d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -38,6 +38,17 @@ PB7.GPIOParameters=GPIO_PuPd PB7.GPIO_PuPd=GPIO_PULLUP PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -99,14 +110,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/readme.txt index 780d4c67a..ccc897f2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_HyperTerminal_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Hyperterminal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/main.h index bd706b1a1..65617d70d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h index 37de6f98c..9fde8efe5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/main.c index 6f1114e8a..2d09b2f75 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -135,6 +134,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -148,7 +150,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -169,11 +171,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -290,4 +287,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c index af6770c95..b9342f715 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -144,4 +143,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_it.c index 773ffa032..77f0ba30b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -118,4 +117,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/UART_Printf.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/UART_Printf.ioc index a8b582bef..655a34290 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/UART_Printf.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/UART_Printf.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,17 @@ PB7.GPIO_PuPd=GPIO_PULLUP PB7.Locked=true PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -100,14 +111,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/readme.txt index 64c165738..38553792e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_Printf/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Printf example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_sram_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_sram_cm4.icf index 26935db61..f31c06d32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_sram_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/EWARM/stm32wb55xx_sram_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/main.h index b42b5bb0e..b1efa0d5b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_it.h index 4e5d8708a..fc66ca7e5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/MDK-ARM/startup_stm32wb55xx_cm4.s index eafc092bb..d2f21f2ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index fa06d93d7..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * -* This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/syscalls.c index bc0dd6c06..c921fd873 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/sysmem.c index d7cc52cd4..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 1ffb49470..46d0a744f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -136,7 +135,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/main.c index 91f39bc93..a3357f159 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,6 +65,7 @@ uint8_t *pBufferReadyForReception; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_USART1_UART_Init(void); @@ -112,6 +112,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -146,7 +149,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure the main internal regulator output voltage */ @@ -187,12 +189,22 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_USART1; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSI; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE1; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -467,5 +479,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_hal_msp.c index ef131bb87..27678530f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,11 +83,21 @@ void HAL_MspInit(void) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -170,4 +179,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_it.c index acd44b3f2..773bf3e4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,4 +231,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/system_stm32wbxx.c index c0af3469e..68ad72806 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,7 +160,7 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ -#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx) +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ @@ -353,5 +352,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc index ff11b2ceb..10cc2ee37 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc @@ -37,8 +37,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -62,6 +62,17 @@ PB7.GPIO_PuPd=GPIO_PULLUP PB7.Locked=true PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -125,7 +136,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/readme.txt index 470b73ff6..69d446bd9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_ReceptionToIdle_CircularDMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Reception To IDLE Event using DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/main.h index 26ce235bc..17bd32373 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_it.h index 8617bcae6..a5eb6c4ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/main.c index 5fe06e54a..e619958d0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -243,6 +242,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -256,7 +258,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -277,11 +279,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -482,4 +479,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c index e5a405d40..31c73d9c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -192,4 +191,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_it.c index 417c41517..4f023ec0a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,4 +196,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc index aaf4c855f..71ae811df 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc @@ -54,8 +54,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -78,6 +78,17 @@ PB7.GPIOParameters=GPIO_PuPd PB7.GPIO_PuPd=GPIO_PULLUP PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -139,14 +150,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/readme.txt index 02debb768..2318e6eaf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComDMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Two Boards Communication DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/main.h index b02575ee2..7cdfaff2a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_it.h index 065ae4d93..6a279a76e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,5 +60,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/main.c index 732674b97..15819c41f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/main.c @@ -1,5 +1,6 @@ /* USER CODE BEGIN Header */ /** + ****************************************************************************** * @file UART/UART_TwoBoards_ComIT/Src/main.c * @author MCD Application Team * @brief This sample code shows how to use UART HAL API to transmit @@ -9,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,6 +232,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -245,7 +248,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -266,11 +269,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -448,4 +446,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c index b5ea6cb43..a17e8b209 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -150,4 +149,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_it.c index bfc69c55b..48f63256d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -139,4 +138,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc index 50d1e11bf..5afb85323 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -38,6 +38,17 @@ PB7.GPIOParameters=GPIO_PuPd PB7.GPIO_PuPd=GPIO_PULLUP PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -99,14 +110,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/readme.txt index e50f2d723..eaaea06ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComIT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Two Boards Communication IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/main.h index d214d35fb..e15a87fa2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_it.h index cea315456..1b59be84b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/main.c index 42a4985b9..ef6aab1bc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -197,6 +196,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -210,7 +212,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -231,11 +233,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -387,4 +384,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c index 84904c462..5c0c5fd40 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -145,4 +144,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_it.c index 952227c28..f464e94c9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -125,4 +124,4 @@ void EXTI4_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc index 7113b5115..2a7490cfa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false NVIC.ForceEnableDMAVector=true @@ -37,6 +37,17 @@ PB7.GPIOParameters=GPIO_PuPd PB7.GPIO_PuPd=GPIO_PULLUP PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -98,14 +109,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/readme.txt index aba3936d5..88cefda8e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/UART/UART_TwoBoards_ComPolling/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART Two Boards Communication Polling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/main.h index 3e3f03022..b6decbc2a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h index b8c2c9811..24baa4f5a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h index 39cffc6e8..0c235f8aa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/main.c index 69cafc088..346261a28 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -166,6 +165,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -179,7 +181,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -200,11 +202,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -311,4 +308,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c index a6955784e..3db86e2b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,4 +97,3 @@ void HAL_WWDG_MspInit(WWDG_HandleTypeDef* hwwdg) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c index 93dadf45c..d20304999 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -219,4 +218,4 @@ void EXTI4_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/WWDG_Example.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/WWDG_Example.ioc index bb92d2023..87307c04f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/WWDG_Example.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/WWDG_Example.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -28,6 +28,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -89,14 +100,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/readme.txt index 34d610d79..859bddc5e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples/WWDG/WWDG_Example/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Window Watchdog example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc index c7058c8e9..ba2eb2d77 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc @@ -44,8 +44,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -69,6 +69,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -136,7 +147,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/main.h index 93ac5e734..a4ca69da3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void AdcAnalogWatchdog1_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32wbxx_it.h index 3f28e5bce..7e07480af 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/main.c index 7ca6f981d..21ce27967 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,6 +97,7 @@ __IO uint8_t ubAnalogWatchdog1Status = 0U; /* Variable set into analog watchdo /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -139,6 +139,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -165,7 +168,7 @@ int main(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -244,6 +247,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -422,7 +433,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -652,5 +663,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/stm32wbxx_it.c index 8e796d948..10655a670 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -245,4 +244,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/readme.txt index a1b07946b..6bc06b99e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_AnalogWatchdog_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_AnalogWatchdog_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/main.h index c9c213238..23631d63b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,5 +75,3 @@ void UserButton_Callback(void); void AdcGrpRegularOverrunError_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32wbxx_it.h index 4e025d60f..0b910c2e9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,5 +51,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/main.c index 529c8c4f1..5c82a911c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -278,7 +277,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* All ADC instances of the ADC common group must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -302,7 +301,7 @@ void Configure_ADC(void) /*## Configuration of ADC hierarchical scope: multimode ####################*/ - /* Note: Feature not available on this STM32 serie */ + /* Note: Feature not available on this STM32 series */ } @@ -311,7 +310,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ if (LL_ADC_IsEnabled(ADC1) == 0) @@ -339,7 +338,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled or enabled without conversion on going */ /* on group regular. */ @@ -362,7 +361,7 @@ void Configure_ADC(void) LL_ADC_REG_SetOverrun(ADC1, LL_ADC_REG_OVR_DATA_OVERWRITTEN); /* Set ADC group regular sequencer */ - /* Note: On this STM32 serie, ADC group regular sequencer is */ + /* Note: On this STM32 series, ADC group regular sequencer is */ /* fully configurable: sequencer length and each rank */ /* affectation to a channel are configurable. */ /* Refer to description of function */ @@ -383,7 +382,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled or enabled without conversion on going */ /* on group injected. */ @@ -409,7 +408,7 @@ void Configure_ADC(void) // LL_ADC_INJ_SetQueueMode(ADC1, LL_ADC_INJ_QUEUE_DISABLE); /* Set ADC group injected sequencer */ - /* Note: On this STM32 serie, ADC group injected sequencer is */ + /* Note: On this STM32 series, ADC group injected sequencer is */ /* fully configurable: sequencer length and each rank */ /* affectation to a channel are configurable. */ /* Refer to description of function */ @@ -430,7 +429,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled or enabled without conversion on going */ /* on either groups regular or injected. */ @@ -504,7 +503,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -630,7 +629,7 @@ void ConversionStartPoll_ADC_GrpRegular(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -894,5 +893,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/stm32wbxx_it.c index 4706baf5d..89a71b9d5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -191,5 +190,3 @@ void ADC1_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/readme.txt index a53d3b5a6..965dbf3d2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_ContinuousConversion_TriggerSW example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc index fccfab274..92d76eed9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc @@ -39,8 +39,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -64,6 +64,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -131,7 +142,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/main.h index feca9960c..633e2b144 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -118,5 +117,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32wbxx_it.h index a10e4b546..277aa6b5c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/main.c index 5c0618f4e..277bcaeb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,6 +110,7 @@ __IO uint8_t ubAdcGrpRegularUnitaryConvStatus = 2; /* Variable set into ADC inte /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -152,6 +152,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -287,6 +290,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -454,7 +465,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -580,7 +591,7 @@ void ConversionStartPoll_ADC_GrpRegular(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -746,5 +757,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/stm32wbxx_it.c index d64c1e7e1..a8e9d9e2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -245,4 +244,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/readme.txt index 9d25a019a..73ac4ecba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_ContinuousConversion_TriggerSW_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc index ebf870693..e647fcc41 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc @@ -39,8 +39,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -64,6 +64,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -131,7 +142,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/main.h index baa10ca41..f7d0b5e48 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -118,5 +117,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32wbxx_it.h index 13c5d0037..9e0dbfc12 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/main.c index 5c36752b9..499730bc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/main.c @@ -16,13 +16,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,6 +113,7 @@ __IO uint8_t ubAdcGrpRegularUnitaryConvStatus = 2; /* Variable set into ADC inte /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -155,6 +155,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -329,6 +332,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -496,7 +507,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -622,7 +633,7 @@ void ConversionStartPoll_ADC_GrpRegular(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -787,5 +798,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/stm32wbxx_it.c index bd29ef969..8facda21e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -245,4 +244,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/readme.txt index feab15d8e..31f4754e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_ContinuousConversion_TriggerSW_LowPower_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/ADC_GroupsRegularInjected_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/ADC_GroupsRegularInjected_Init.ioc index b2e74d9bb..250f682d1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/ADC_GroupsRegularInjected_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/ADC_GroupsRegularInjected_Init.ioc @@ -55,8 +55,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -75,6 +75,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -140,7 +151,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/main.h index f0beeefb4..62bc95af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -140,5 +139,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32wbxx_it.h index 2f2b870a8..78abf0be8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/main.c index baf60e2c3..610e2c770 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/main.c @@ -15,13 +15,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -124,6 +123,7 @@ __IO uint8_t ubAdcGrpInjectedUnitaryConvStatus = 2U; /* Variable set into ADC in /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_ADC1_Init(void); @@ -167,6 +167,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -198,7 +201,7 @@ int main(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -291,6 +294,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -617,7 +628,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -833,7 +844,7 @@ void UserButton_Callback(void) /* Start ADC group injected conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group injected, */ /* without ADC disable command on going. */ @@ -977,5 +988,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/stm32wbxx_it.c index 89d201225..2386cbd48 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -297,4 +296,3 @@ void ADC1_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/readme.txt index 05a7aa887..ab593df33 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_GroupsRegularInjected_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_GroupsRegularInjected_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc index ead6dc7c7..8b5b6dcd0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc @@ -42,8 +42,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -67,6 +67,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -134,7 +145,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/main.h index 510bf0994..38952686e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32wbxx_it.h index e7b6b08d3..40b56e003 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/main.c index d04d18a48..f5ec8484c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/main.c @@ -17,13 +17,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,6 +116,7 @@ __IO float fConvertedData_OVS_EquivalentValue12bits = 4.4f; /* Calculation of /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -159,6 +159,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -360,6 +363,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -532,7 +543,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -658,7 +669,7 @@ void ConversionStartPoll_ADC_GrpRegular(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -823,5 +834,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/stm32wbxx_it.c index 86b37a13b..2ecedda39 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -245,4 +244,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/readme.txt index 0d8250d51..18e625d20 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_Oversampling_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_Oversampling_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc index 2a52cdac0..a3454cc55 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc @@ -58,8 +58,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:1\:0\:true\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -77,6 +77,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -144,7 +155,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/main.h index 37ac64f32..f74e680f8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -125,5 +124,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32wbxx_it.h index a79d6531a..674f3abf2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/main.c index e712aa699..00105b775 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,6 +106,7 @@ __IO uint8_t ubDmaTransferStatus = 2U; /* Variable set into DMA interruption cal /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_ADC1_Init(void); @@ -153,6 +153,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ @@ -256,6 +259,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -473,7 +484,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -674,7 +685,7 @@ void UserButton_Callback(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -819,5 +830,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wbxx_it.c index 79e10d4f8..c114e4283 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -288,4 +287,3 @@ void ADC1_IRQHandler(void) } } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/readme.txt index 9bb2a34cc..165cace5c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerSW_DMA_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc index 4b0961a36..266137161 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc @@ -39,8 +39,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -64,6 +64,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -131,7 +142,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h index 0c49491c2..d96b91456 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h index 504b25445..883068b26 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c index 72f2376ee..20064bcad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,6 +103,7 @@ __IO uint8_t ubAdcGrpRegularUnitaryConvStatus = 2U; /* Variable set into ADC int /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -144,6 +144,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -234,6 +237,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -406,7 +417,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -591,7 +602,7 @@ void UserButton_Callback(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -696,5 +707,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c index 493984bd2..c4392e648 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -255,4 +254,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt index 03a5deb95..7a2b51732 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerSW_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc index 5647aebc5..1c8cdda7a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc @@ -39,8 +39,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -64,6 +64,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -131,7 +142,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/main.h index 3c3b8c823..6471f3e57 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32wbxx_it.h index ce79ef8e7..d5d749236 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/main.c index 1e7ff23bb..07a1d97a9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,6 +110,7 @@ __IO uint8_t ubAdcGrpRegularUnitaryConvStatus = 2U; /* Variable set into ADC int /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -152,6 +152,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -292,6 +295,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -459,7 +470,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -585,7 +596,7 @@ void ConversionStartPoll_ADC_GrpRegular(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -751,5 +762,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/stm32wbxx_it.c index 9531b8b3b..fc7109a67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -245,4 +244,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/readme.txt index 1f3584a85..deca938d7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerSW_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc index 8aec809db..10c6790c0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc @@ -49,8 +49,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:1\:0\:true\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -68,6 +68,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -135,7 +146,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h index c5bf42de3..1d8fdb855 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -127,5 +126,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h index b3760dadb..2bba95194 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c index bae337174..f5e78c5e0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,6 +115,7 @@ __IO uint8_t ubDmaTransferStatus = 2U; /* Variable set into DMA interruption cal /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_ADC1_Init(void); @@ -161,6 +161,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Init variable containing ADC conversion data */ @@ -264,6 +267,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -551,7 +562,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -749,7 +760,7 @@ void UserButton_Callback(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -895,5 +906,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c index 3a26fc61a..da4434dd9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -283,4 +282,3 @@ void ADC1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt index fffa3b218..a77d58105 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerTimer_DMA_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/EWARM/startup_stm32wb55xx_cm4.s index e8dbfa8cd..afae393bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -527,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/main.h index c78951e0b..d81d54f8e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void UserButton_Callback(void); void AdcGrpRegularOverrunError_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32_assert.h index 54d0e6cc5..682270f63 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32wbxx_it.h index c75edc229..3ef246fb4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,5 +51,3 @@ void ADC1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/main.c index 840909954..b194e7c80 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -278,7 +277,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* All ADC instances of the ADC common group must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -317,7 +316,7 @@ void Configure_ADC(void) /*## Configuration of ADC hierarchical scope: multimode ####################*/ - /* Note: Feature not available on this STM32 serie */ + /* Note: Feature not available on this STM32 series */ } @@ -326,7 +325,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ if (LL_ADC_IsEnabled(ADC1) == 0) @@ -354,7 +353,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled or enabled without conversion on going */ /* on group regular. */ @@ -377,7 +376,7 @@ void Configure_ADC(void) LL_ADC_REG_SetOverrun(ADC1, LL_ADC_REG_OVR_DATA_OVERWRITTEN); /* Set ADC group regular sequencer */ - /* Note: On this STM32 serie, ADC group regular sequencer is */ + /* Note: On this STM32 series, ADC group regular sequencer is */ /* fully configurable: sequencer length and each rank */ /* affectation to a channel are configurable. */ /* Refer to description of function */ @@ -398,7 +397,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled or enabled without conversion on going */ /* on group injected. */ @@ -424,7 +423,7 @@ void Configure_ADC(void) // LL_ADC_INJ_SetQueueMode(ADC1, LL_ADC_INJ_QUEUE_DISABLE); /* Set ADC group injected sequencer */ - /* Note: On this STM32 serie, ADC group injected sequencer is */ + /* Note: On this STM32 series, ADC group injected sequencer is */ /* fully configurable: sequencer length and each rank */ /* affectation to a channel are configurable. */ /* Refer to description of function */ @@ -445,7 +444,7 @@ void Configure_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled or enabled without conversion on going */ /* on either groups regular or injected. */ @@ -522,7 +521,7 @@ void Activate_ADC(void) /* Note: Hardware constraint (refer to description of the functions */ /* below): */ - /* On this STM32 serie, setting of these features is conditioned to */ + /* On this STM32 series, setting of these features is conditioned to */ /* ADC state: */ /* ADC must be disabled. */ /* Note: In this example, all these checks are not necessary but are */ @@ -648,7 +647,7 @@ void ConversionStartPoll_ADC_GrpRegular(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without ADC disable command on going. */ @@ -912,5 +911,3 @@ void assert_failed(uint8_t* file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/stm32wbxx_it.c index 24dc266fa..4f9dfb5e6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/ADC/ADC_TemperatureSensor/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -191,5 +190,3 @@ void ADC1_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/readme.txt index 08d8bf5c9..4f968d175 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/ADC/ADC_TemperatureSensor/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_TemperatureSensor example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h index c1e5e4061..5aebdb085 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ void ComparatorTrigger_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h index 9c730f0d9..e11a4d319 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ void COMP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c index 19bf9d0b8..b8242fdfd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -343,5 +342,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c index 182cd6f57..64b750836 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,5 +170,3 @@ void COMP_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt index 738012fdb..a95a7aa30 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the COMP_CompareGpioVsVrefInt_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc index f87ee60fa..99fe7ebca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc @@ -23,8 +23,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.COMP_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -44,6 +44,17 @@ PB0.Signal=GPIO_Output PC5.Locked=true PC5.Mode=INP PC5.Signal=COMP1_INP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -109,7 +120,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/main.h index 6eea87091..db506a390 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -97,5 +96,3 @@ void ComparatorTrigger_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32wbxx_it.h index 5074081ed..5441c585f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void COMP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/main.c index c8786cc88..6d1359d1f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/main.c @@ -12,13 +12,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,6 +53,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_COMP1_Init(void); /* USER CODE BEGIN PFP */ @@ -92,6 +92,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -159,6 +162,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -361,5 +372,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/stm32wbxx_it.c index 7e3570be8..ad6548667 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -226,4 +225,3 @@ void COMP_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/readme.txt index 40b5bbf90..81a3d8a47 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the COMP_CompareGpioVsVrefInt_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc index 96304eed8..7cd5a4475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc @@ -23,8 +23,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -43,6 +43,17 @@ PB0.Signal=GPIO_Output PC5.Locked=true PC5.Mode=INP PC5.Signal=COMP1_INP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -108,7 +119,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/main.h index 8fded9ee4..220c79b16 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -95,5 +94,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32wbxx_it.h index 25ef03db7..2d02992a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/main.c index 0d0fcf08e..2e6efc9cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/main.c @@ -12,13 +12,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,6 +53,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_COMP1_Init(void); /* USER CODE BEGIN PFP */ @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -171,6 +174,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -358,5 +369,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/stm32wbxx_it.c index 58b9e9b1a..f4b647ee1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/readme.txt index a18a981c9..89b566736 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the COMP_CompareGpioVsVrefInt_OutputGpio_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc index 1ba9fec1b..62b05b648 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc @@ -33,8 +33,8 @@ Mcu.PinsNb=6 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.COMP_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -54,6 +54,17 @@ PB0.Signal=GPIO_Output PC5.Locked=true PC5.Mode=INP PC5.Signal=COMP1_INP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -119,7 +130,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/main.h index 6a37389a3..227ff4fdc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -96,5 +95,3 @@ void ComparatorTrigger_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32wbxx_it.h index 886a6efa8..4d8c29077 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void COMP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/main.c index db8825aa5..e53d25e44 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -55,6 +54,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_COMP1_Init(void); static void MX_COMP2_Init(void); @@ -95,6 +95,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -166,6 +169,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -440,5 +451,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/stm32wbxx_it.c index 6c9c86246..ac98a23df 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -230,4 +229,3 @@ void COMP_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/readme.txt index e39f8f914..59e302000 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the COMP_CompareGpioVsVrefInt_Window_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc index ad77026f0..09a0e7323 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -39,6 +39,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -106,7 +117,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/startup_stm32wb55xx_cm4.s index e8dbfa8cd..afae393bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -527,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/main.h index 4a1b1cb3c..ebf54fb02 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,5 +125,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32wbxx_it.h index 357c50e0d..0b609ffb6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c index d86a8c191..3452bb5ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,6 +79,7 @@ __IO uint32_t accessPermitted = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -121,6 +121,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -186,6 +189,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -387,5 +398,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/stm32wbxx_it.c index 008087f7b..16fcc6333 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -230,4 +229,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/readme.txt index 52a9eb3d5..649825e29 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CORTEX/CORTEX_MPU/readme.txt @@ -2,33 +2,18 @@ @page CORTEX_MPU CORTEX example @verbatim - ******************** (C) COPYRIGHT 2019 STMicroelectronics ******************* + ****************************************************************************** * @file Examples_LL/CORTEX/CORTEX_MPU/readme.txt * @author MCD Application Team * @brief Description of the CORTEX_MPU example. ****************************************************************************** * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc index f30f187db..fcd4841a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -104,7 +115,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h index 0d447bf51..18dd4642c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -106,5 +105,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h index 18188579e..1c0da3418 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c index 97e338687..d103b4d86 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,6 +65,7 @@ uint32_t uwExpectedCRCValue = 0xA9866043; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_CRC_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -169,6 +172,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -355,5 +366,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c index 969869e4e..b55ee9ba8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt index 844b9307c..54e6f58fb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_CalculateAndCheck/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CRC_CalculateAndCheck example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc index 6a7ee8a15..e61d81a7f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc @@ -22,8 +22,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -39,6 +39,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -104,7 +115,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/main.h index ca143ec1d..97d32e3dd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -106,5 +105,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h index 4155c2dbd..7ceb489e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/main.c index 4df76176c..92b0144d3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ uint8_t ubExpectedCRCValue = 0xA6; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_CRC_Init(void); /* USER CODE BEGIN PFP */ @@ -112,6 +112,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -177,6 +180,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -369,5 +380,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c index 2f74de1cf..1a1de5ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/readme.txt index 44c023571..136de103b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRC/CRC_UserDefinedPolynomial/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CRC_UserDefinedPolynomial example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/CRS_Synchronization_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/CRS_Synchronization_IT.ioc index 39efea137..b3ac4be6f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/CRS_Synchronization_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/CRS_Synchronization_IT.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -49,6 +49,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -113,7 +124,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/main.h index 53005e44a..fd2385865 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,5 +130,3 @@ void CRS_Handler_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32wbxx_it.h index 4c521759c..5ed4d627a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void CRS_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/main.c index d440e5a9d..4d0a1ad1a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,6 +67,7 @@ uint32_t Timeout = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -115,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -279,6 +282,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -678,5 +689,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/stm32wbxx_it.c index ba190125a..c64c0e7ee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ void CRS_IRQHandler(void) */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/readme.txt index c1b17bc93..1e55a63ef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CRS_Synchronization_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/CRS_Synchronization_Polling.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/CRS_Synchronization_Polling.ioc index 91d962f3d..e2cd213c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/CRS_Synchronization_Polling.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/CRS_Synchronization_Polling.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -39,6 +39,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -103,7 +114,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/main.h index 141f43604..3988c6f9c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,5 +109,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32wbxx_it.h index 77f9dfc3d..45301798e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/main.c index 8c940d8fa..dc4c0de1b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,6 +64,7 @@ uint32_t Timeout = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -115,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -233,6 +236,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -626,5 +637,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/stm32wbxx_it.c index 392d6e932..0c7ab63ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/readme.txt index b7963b7f9..cf356dbcf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/CRS/CRS_Synchronization_Polling/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the CRS_Synchronization_Polling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/main.h index 903b4d96d..c8406ff7c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,5 +59,3 @@ void TransferComplete(void); void TransferError(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32wbxx_it.h index aaedccf6a..6716544a8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/main.c index ef827e98a..d2809caac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -298,14 +297,14 @@ void SystemClock_Config(void) void TransferComplete() { /* DMA transfer completed */ - /* Verify the data transfered */ + /* Verify the data transferred */ if (Buffercmp((uint32_t*)aSRC_Const_Buffer, (uint32_t*)aDST_Buffer, BUFFER_SIZE) == 1) { - /* DMA data transfered not consistency */ + /* DMA data transferred not consistency */ LED_Blinking(LED_BLINK_ERROR); } - /* DMA data transfered consistency */ + /* DMA data transferred consistency */ LED_On(); } @@ -349,5 +348,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/stm32wbxx_it.c index 2c181aab6..19eb0f527 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -170,5 +169,3 @@ void DMA1_Channel1_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/readme.txt index 7aac7d8bd..c39876f11 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc index 7d8120c77..ded06aa37 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc @@ -34,8 +34,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -52,6 +52,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -116,7 +127,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h index 6eda44124..82d5fac63 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,5 +97,3 @@ void TransferError(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h index c9db63451..d635f3611 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c index 398afde2a..46b8c5a88 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ static uint32_t aDST_Buffer[BUFFER_SIZE]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); /* USER CODE BEGIN PFP */ @@ -112,6 +112,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -200,6 +203,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -344,14 +355,14 @@ void LED_Blinking(uint32_t Period) void TransferComplete() { /* DMA transfer completed */ - /* Verify the data transfered */ + /* Verify the data transferred */ if (Buffercmp((uint32_t*)aSRC_Const_Buffer, (uint32_t*)aDST_Buffer, BUFFER_SIZE) == 1) { - /* DMA data transfered not consistency */ + /* DMA data transferred not consistency */ LED_Blinking(LED_BLINK_ERROR); } - /* DMA data transfered consistency */ + /* DMA data transferred consistency */ LED_On(); } @@ -397,5 +408,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c index 8dae09652..4b6cc2d48 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -226,4 +225,3 @@ void DMA1_Channel1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt index 362c2460a..a2bf1f41c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/main.h index 60e508a6d..0685b0203 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void UserButton_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32wbxx_it.h index c9e19a95c..dbaf20f4a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/main.c index 87cc04dc1..af43b88b9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -210,5 +209,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/stm32wbxx_it.c index e923825f6..60d9e0b82 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -170,5 +169,3 @@ void USER_BUTTON_IRQHANDLER(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/readme.txt index 34c375003..29c4cb437 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the EXTI example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc index 457473249..b082149d3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -39,6 +39,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -104,7 +115,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h index 9a4c1910e..e4027243e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -100,5 +99,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h index 702a6da33..534fa53c6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c index 3542d72fb..8cb75602e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -85,6 +85,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -143,6 +146,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -241,5 +252,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c index c7767566b..59826193a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt index 0b7ce29ac..8d8b7e286 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the EXTI example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/main.h index 7cc953a9b..ed71c0611 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -45,5 +44,3 @@ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32wbxx_it.h index 529c4e356..ea9f1a04b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,5 +47,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/main.c index 04a5d3513..16b2b2063 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -174,5 +173,3 @@ void assert_failed(uint8_t *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/stm32wbxx_it.c index 7807a3133..cae64b339 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -153,5 +152,3 @@ void SysTick_Handler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/readme.txt index 1fbafbd27..cfa6f66da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the GPIO example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc index 7fbbf776e..4e0966c27 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -96,7 +107,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h index 5aa29b35d..28d705a5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -98,5 +97,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h index d7ce588ac..b5a4d539f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c index 68c4f7564..9b1dddfa7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -86,6 +86,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -148,6 +151,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -216,5 +227,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c index f5a188088..787c8f74c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt index 9e8544c29..d7b93cc0d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the GPIO example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc index 07374d3fe..50ec1baab 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -32,6 +32,17 @@ PB0.GPIO_Label=LED2 PB0.GPIO_PuPd=GPIO_NOPULL PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -97,7 +108,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/main.h index dc41760ac..cd1746908 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32wbxx_it.h index 884986521..53b674ab6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/main.c index d71e8615e..bb069c4c5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -95,6 +95,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -207,6 +210,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -321,5 +332,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/stm32wbxx_it.c index a429ceeff..72b41d8e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/readme.txt index 52974023c..b8687f270 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HSEM_DualProcess example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -40,15 +40,15 @@ PROCESS_A releases the semaphore with success. After successful sequence, LED2 is turned On. In case of errors, LED2 is slowly blinking (1sec period). -Additionnaly, this example demonstrate how to: - Retreive the current process locking a semaphore. - Retreive the current core locking a semaphore. +Additionally, this example demonstrate how to: + Retrieve the current process locking a semaphore. + Retrieve the current core locking a semaphore. Remarks: As this example uses two processes to demonstrate the lock/unlock mechanism, it is not possible to use the function LL_HSEM_1StepLock which does not use process identifier. Those identifier are set to 0. This function is only interesting in the context of multicore where - the core identifers are used to determine the owner of the semaphore. + the core identifiers are used to determine the owner of the semaphore. @par Keywords diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc index 7ca41689e..94cece0cb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -96,7 +107,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h index e05036a38..b6af6838a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h index 7c3c78ec8..e008c318f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void HSEM_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c index 7186e776d..bff46e439 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -180,6 +183,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -296,5 +307,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c index 05b85a41c..b94cd4e2b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -218,4 +217,3 @@ void HSEM_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt index 1eb853f6d..ee3ac9d9c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/HSEM/HSEM_DualProcess_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the HSEM_DualProcess_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -40,15 +40,15 @@ PROCESS_B releases the semaphore with success. After successful sequence, LED2 is turned On. In case of errors, LED2 is slowly blinking (1sec period). -Additionnaly, this example demonstrate how to: - Retreive the current process locking a semaphore. - Retreive the current core locking a semaphore. +Additionally, this example demonstrate how to: + Retrieve the current process locking a semaphore. + Retrieve the current core locking a semaphore. Remarks: As this example uses two processes to demonstrate the lock/unlock mechanism, it is not possible to use the function LL_HSEM_1StepLock which does not use process identifier. Those identifier are set to 0. This function is only interesting in the context of multicore where - the core identifers are used to determine the owner of the semaphore. + the core identifiers are used to determine the owner of the semaphore. @par Keywords diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc index bd9bcccb0..7d9f1a3e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc @@ -81,8 +81,8 @@ Mcu.PinsNb=7 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -101,21 +101,25 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed,GPIO_FM8 +PB8.GPIOParameters=GPIO_Speed,GPIO_FM8,GPIO_Pu PB8.GPIO_FM8=SYSCFG_FASTMODEPLUS_PB8 +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed,GPIO_FM9 +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu,GPIO_FM9 PB9.GPIO_FM9=SYSCFG_FASTMODEPLUS_PB9 +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA -PC0.GPIOParameters=GPIO_Speed +PC0.GPIOParameters=GPIO_Speed,GPIO_Pu +PC0.GPIO_Pu=GPIO_PULLUP PC0.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC0.Mode=I2C PC0.Signal=I2C3_SCL -PC1.GPIOParameters=GPIO_Speed +PC1.GPIOParameters=GPIO_Speed,GPIO_Pu +PC1.GPIO_Pu=GPIO_PULLUP PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC1.Mode=I2C PC1.Signal=I2C3_SDA @@ -125,6 +129,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -186,14 +201,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h index 333018411..f01c5406f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -123,5 +122,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32wbxx_it.h index 60024bc38..6ff334096 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void DMA1_Channel3_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/main.c index 5355dd141..d417f31a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,6 +110,7 @@ __IO uint8_t ubSlaveReceiveComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_I2C1_Init(void); @@ -160,6 +160,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -262,6 +265,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -986,5 +997,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wbxx_it.c index fe547ae90..54ea49e6a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -377,4 +376,3 @@ void I2C1_ER_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/readme.txt index fbea29972..d3a0f90b1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_OneBoard_AdvCommunication_DMAAndIT_Init I2C example (Master DMA Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc index 1d7886eab..0567f0462 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc @@ -67,8 +67,8 @@ Mcu.PinsNb=7 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -86,19 +86,23 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA -PC0.GPIOParameters=GPIO_Speed +PC0.GPIOParameters=GPIO_Speed,GPIO_Pu +PC0.GPIO_Pu=GPIO_PULLUP PC0.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC0.Mode=I2C PC0.Signal=I2C3_SCL -PC1.GPIOParameters=GPIO_Speed +PC1.GPIOParameters=GPIO_Speed,GPIO_Pu +PC1.GPIO_Pu=GPIO_PULLUP PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC1.Mode=I2C PC1.Signal=I2C3_SDA @@ -108,6 +112,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -169,14 +184,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h index 3d9a41d80..28ac38906 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -123,5 +122,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32wbxx_it.h index 46d0e0a5f..02bce6076 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void DMA1_Channel2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/main.c index 85c0b9925..a20ff67ef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -86,6 +85,7 @@ __IO uint8_t ubReceiveIndex = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_I2C1_Init(void); @@ -131,6 +131,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -209,6 +212,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -617,7 +628,7 @@ void Slave_Reception_Callback(void) */ void Slave_Complete_Callback(void) { - /* Check if datas request to turn on the LED2 */ + /* Check if data request to turn on the LED2 */ if(Buffercmp8((uint8_t*)aReceiveBuffer, (uint8_t*)aLedOn, (ubReceiveIndex-1)) == 0) { /* Turn LED2 On: @@ -706,5 +717,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wbxx_it.c index f4914da58..603f73e67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -328,4 +327,3 @@ void I2C1_ER_IRQHandler(void) */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/readme.txt index 8bea02c5a..1f5cc6ae4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_OneBoard_Communication_DMAAndIT_Init I2C example (Master DMA Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/main.h index b6bbb267d..27265a6f4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,5 +83,3 @@ void Master_Reception_Callback(void); void Master_Complete_Callback(void); void Error_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32wbxx_it.h index 6802cbad1..ccefb560f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -53,5 +52,3 @@ void I2C3_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/main.c index c90d8a2c9..84e255679 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -684,5 +683,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/stm32wbxx_it.c index c2d3795d6..f70fc78d4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -300,5 +299,3 @@ void I2C3_ER_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/readme.txt index 4fc07d561..478ec01ae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_OneBoard_Communication_IT I2C example (IT Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc index 47406a615..64529cfd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc @@ -47,8 +47,8 @@ Mcu.PinsNb=7 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -65,19 +65,23 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA -PC0.GPIOParameters=GPIO_Speed +PC0.GPIOParameters=GPIO_Speed,GPIO_Pu +PC0.GPIO_Pu=GPIO_PULLUP PC0.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC0.Mode=I2C PC0.Signal=I2C3_SCL -PC1.GPIOParameters=GPIO_Speed +PC1.GPIOParameters=GPIO_Speed,GPIO_Pu +PC1.GPIO_Pu=GPIO_PULLUP PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC1.Mode=I2C PC1.Signal=I2C3_SDA @@ -87,6 +91,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -148,14 +163,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h index e57aa3c8d..c979da640 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -118,5 +117,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32wbxx_it.h index df4cf4511..6fda2bdea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void I2C3_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/main.c index abf910183..6cfd11c67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,6 +66,7 @@ __IO uint8_t ubReceiveIndex = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); static void MX_I2C3_Init(void); @@ -109,6 +109,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ @@ -187,6 +190,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -617,5 +628,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/stm32wbxx_it.c index 0a3d57090..76c8f7c49 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -370,4 +369,3 @@ void I2C3_ER_IRQHandler(void) */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/readme.txt index a6fa05009..85e31db3b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_OneBoard_Communication_IT_Init I2C example (IT Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc index ea4e25537..de6d65864 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc @@ -44,8 +44,8 @@ Mcu.PinsNb=7 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -64,20 +64,23 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed,GPIO_PuPdOD -PB8.GPIO_PuPdOD=GPIO_PULLUP +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA -PC0.GPIOParameters=GPIO_Speed +PC0.GPIOParameters=GPIO_Speed,GPIO_Pu +PC0.GPIO_Pu=GPIO_PULLUP PC0.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC0.Mode=I2C PC0.Signal=I2C3_SCL -PC1.GPIOParameters=GPIO_Speed +PC1.GPIOParameters=GPIO_Speed,GPIO_Pu +PC1.GPIO_Pu=GPIO_PULLUP PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC1.Mode=I2C PC1.Signal=I2C3_SDA @@ -87,6 +90,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -152,7 +166,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h index 282aca930..0afa37a12 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,5 +115,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32wbxx_it.h index 022a14fef..94cdb746d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/main.c index 17d09af5f..46874f874 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,6 +77,7 @@ uint8_t *pTransmitBuffer = (uint8_t *)aLedOn; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); static void MX_I2C3_Init(void); @@ -120,6 +120,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -189,6 +192,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -554,7 +565,7 @@ void Slave_Reception_Callback(void) */ void Slave_Complete_Callback(void) { - /* Check if datas request to turn on the LED2 */ + /* Check if data request to turn on the LED2 */ if (Buffercmp8((uint8_t *)aReceiveBuffer, (uint8_t *)aLedOn, (ubReceiveIndex - 1)) == 0) { /* Turn LED2 On */ @@ -616,5 +627,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/stm32wbxx_it.c index 6d56b3d67..8ff26cf99 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -308,4 +307,3 @@ void I2C1_ER_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/readme.txt index 176f0e7fd..67f64ff31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_OneBoard_Communication_PollingAndIT_Init I2C example (Master Polling Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc index 5d27d0ee5..5141f8717 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc @@ -31,8 +31,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -49,11 +49,13 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA @@ -63,6 +65,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -128,7 +141,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h index ffb0df344..85f7bf2c8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -125,5 +124,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h index b6e5f6bca..259c557f2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c index 61e1904ba..20b4c4e5e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ __IO uint8_t ubButtonPress = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); /* USER CODE BEGIN PFP */ @@ -115,6 +115,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -185,6 +188,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -546,5 +557,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c index d64a312d7..a8310d660 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -362,4 +361,3 @@ void I2C1_ER_IRQHandler(void) #endif /* SLAVE_BOARD */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt index 099f8b0e4..67aceb34f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_MasterRx_SlaveTx_IT_Init I2C example (IT Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,7 +46,7 @@ SDA Pin: PB.9 (CN10, pin 5) | USER GND|_____________________|GND USER | |___P-NUCLEO-WB55.Nucleo___| |___P-NUCLEO-WB55.Nucleo___| -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board I2C1 Peripheral is configured in Master mode with EXTI (Fast Mode @400kHz). And GPIO associated to User push-button (SW1) is linked with EXTI. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc index 142cd7985..fea9764f6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc @@ -69,8 +69,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -89,11 +89,13 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Mode=I2C PB9.Signal=I2C1_SDA @@ -103,6 +105,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -168,7 +181,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h index 3341b0fb3..488daaf06 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -127,5 +126,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h index 42c21173c..b30324ab6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void DMA1_Channel2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c index 50685ff16..1c07a96a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,6 +91,7 @@ __IO uint8_t ubButtonPress = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_I2C1_Init(void); @@ -141,6 +141,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -217,6 +220,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -544,7 +555,7 @@ void Handle_I2C_Slave(void) /* End of I2C_SlaveReceiver_MasterTransmitter_DMA Process */ LL_I2C_ClearFlag_STOP(I2C1); - /* Check if datas request to turn on the LED2 */ + /* Check if data request to turn on the LED2 */ if(Buffercmp8((uint8_t*)aReceiveBuffer, (uint8_t*)aLedOn, (ubNbDataToReceive-1)) == 0) { /* Turn LED2 On: @@ -800,5 +811,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c index 26a6ca3fd..bdb4f056b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -276,4 +275,3 @@ void DMA1_Channel3_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt index 8f25e307f..94b4f4b33 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init I2C example (DMA Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -45,7 +45,7 @@ SDA Pin: PB.9 (CN10, pin 5) | USER GND|_____________________|GND USER | |___P-NUCLEO-WB55.Nucleo___| |___P-NUCLEO-WB55.Nucleo___| -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board I2C1 Peripheral is configured in Master mode with DMA (Clock 400Khz). And GPIO associated to User push-button (SW1) is linked with EXTI. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc index f2ab6fc1c..8a5fd8874 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc @@ -31,8 +31,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -49,8 +49,12 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA PC4.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI @@ -59,6 +63,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -124,7 +139,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h index 70dbfee0e..7ac8792a7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -122,5 +121,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32wbxx_it.h index d0740cf0a..787300823 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/main.c index 720ebeab4..e9cccb8e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -97,6 +96,7 @@ __IO uint8_t ubButtonPress = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); /* USER CODE BEGIN PFP */ @@ -147,6 +147,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -222,6 +225,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -464,7 +475,7 @@ void Handle_I2C_Slave(void) /* End of I2C_SlaveReceiver_MasterTransmitter_DMA Process */ LL_I2C_ClearFlag_STOP(I2C1); - /* Check if datas request to turn on the LED2 */ + /* Check if data request to turn on the LED2 */ if(Buffercmp8((uint8_t*)aReceiveBuffer, (uint8_t*)aLedOn, (ubReceiveIndex-1)) == 0) { /* Turn LED2 On: @@ -651,5 +662,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/stm32wbxx_it.c index 056d24914..dd8dbe3c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -230,4 +229,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/readme.txt index 28c8428f1..54a59f7eb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_MasterTx_SlaveRx_Init I2C example (Polling Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -45,7 +45,7 @@ SDA Pin: PB.9 (CN10, pin 5) | USER GND|_____________________|GND USER | |___P-NUCLEO-WB55.Nucleo___| |___P-NUCLEO-WB55.Nucleo___| -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board I2C1 Peripheral is configured in Master mode (Clock 400Khz). And GPIO associated to User push-button (SW1) is linked with EXTI. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc index 09239a1ee..fd51555f4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc @@ -33,8 +33,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -51,11 +51,13 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PC0.GPIOParameters=GPIO_Speed +PC0.GPIOParameters=GPIO_Speed,GPIO_Pu +PC0.GPIO_Pu=GPIO_PULLUP PC0.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC0.Mode=I2C PC0.Signal=I2C3_SCL -PC1.GPIOParameters=GPIO_Speed +PC1.GPIOParameters=GPIO_Speed,GPIO_Pu +PC1.GPIO_Pu=GPIO_PULLUP PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC1.Mode=I2C PC1.Signal=I2C3_SDA @@ -65,6 +67,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -130,7 +143,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h index e238b51af..4d896a923 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -123,5 +122,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32wbxx_it.h index a1dea9882..ec114eb09 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void I2C3_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/main.c index 542ace787..d721ff266 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ __IO uint8_t ubButtonPress = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C3_Init(void); /* USER CODE BEGIN PFP */ @@ -117,6 +117,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -193,6 +196,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -608,5 +619,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/stm32wbxx_it.c index 1504ce241..a222794ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -362,4 +361,3 @@ void I2C3_ER_IRQHandler(void) #endif /* SLAVE_BOARD */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/readme.txt index 9372fcfac..60c153b05 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_WakeUpFromStop2_IT_Init I2C example (IT Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,7 +46,7 @@ SDA Pin: PC.1 (CN7, pin 30) | USER GND|_____________________|GND USER | |___P-NUCLEO-WB55.Nucleo___| |___P-NUCLEO-WB55.Nucleo___| -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board I2C3 Peripheral is configured in Master mode with EXTI (Clock 100Khz). And GPIO associated to User push-button (SW1) is linked with EXTI. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc index 2369a8660..906f03a17 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc @@ -30,8 +30,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -48,12 +48,14 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output -PB8.GPIOParameters=GPIO_Speed +PB8.GPIOParameters=GPIO_Speed,GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB8.Locked=true PB8.Mode=I2C PB8.Signal=I2C1_SCL -PB9.GPIOParameters=GPIO_Speed +PB9.GPIOParameters=GPIO_Speed,GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB9.Locked=true PB9.Mode=I2C @@ -64,6 +66,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -129,7 +142,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h index bbc2cf3a4..8058a5690 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -122,5 +121,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32wbxx_it.h index d15a755f5..ee4926cdd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void I2C1_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/main.c index 1e5b239b2..07be97e0d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,6 +67,7 @@ __IO uint8_t ubButtonPress = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); /* USER CODE BEGIN PFP */ @@ -117,6 +117,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -194,6 +197,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -615,5 +626,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/stm32wbxx_it.c index 7f9a7bdf8..5c717f1e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -367,4 +366,3 @@ void I2C1_ER_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/readme.txt index 27399980e..963a22591 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the I2C_TwoBoards_WakeUpFromStop_IT_Init I2C example (IT Mode). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,7 +46,7 @@ SDA Pin: PB.9 (CN10, pin 5) | USER GND|_____________________|GND USER | |___P-NUCLEO-WB55.Nucleo___| |___P-NUCLEO-WB55.Nucleo___| -The project is splitted in two parts the Master Board and the Slave Board +The project is split in two parts the Master Board and the Slave Board - Master Board I2C1 Peripheral is configured in Master mode with EXTI (Clock 100Khz). And GPIO associated to User push-button (SW1) is linked with EXTI. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc index cc6d4da31..44019de71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -45,6 +45,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -110,7 +121,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h index 0205b738e..97d25764a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,5 +109,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h index e8d45613b..b3a8c602a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void UserButton_Callback(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c index 6ab20ffe9..414fe8fbd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ static __IO uint8_t ubKeyPressed = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_IWDG_Init(void); /* USER CODE BEGIN PFP */ @@ -87,6 +87,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Check if the system has resumed from IWDG reset */ @@ -162,6 +165,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -330,5 +341,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c index 5f2dca029..051d1e182 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt index f3c1897cc..8d0961590 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the IWDG_RefreshUntilUserEvent_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/main.h index 0f7e07bcc..ae3c5f413 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ void LPTimerAutoreloadMatch_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h index 387908317..053a18388 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,3 @@ void LPTIM1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/main.c index d5a8ba8c2..3d31207b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -311,5 +310,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c index 50e3c95c3..631a1191d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/LPTIM/LPTIM_PulseCounter/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -171,5 +170,3 @@ void LPTIM1_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/readme.txt index 5ebe730f1..0a93b697c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM_PulseCounter example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h index 88941d4e0..46d400c05 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -96,5 +95,3 @@ void LPTimerAutoreloadMatch_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h index cbab43966..d43204176 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void LPTIM1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc index 89c584c85..5e1d8d7f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -44,6 +44,17 @@ PC0.GPIO_PuPd=GPIO_PULLDOWN PC0.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC0.Mode=Counts_external_clock_with_synchro_01_occur1 PC0.Signal=LPTIM1_IN1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -108,7 +119,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c index 3543f2e16..7d7ecd6cf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LPTIM1_Init(void); /* USER CODE BEGIN PFP */ @@ -88,6 +88,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Enable the LSI Clock */ @@ -163,6 +166,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -343,5 +354,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c index 8579abe1b..64af8b6b4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void LPTIM1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt index d211a2bdc..1acf53270 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPTIM_PulseCounter_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/main.h index b20ea542c..505a3c90e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32wbxx_it.h index 063217e6f..8624ba1e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void LPUART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc index 9cf323a49..31b5ee387 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc @@ -35,8 +35,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -61,6 +61,17 @@ PC1.GPIOParameters=GPIO_Speed PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC1.Mode=Asynchronous PC1.Signal=LPUART1_TX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -126,7 +137,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index eafc092bb..d2f21f2ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/main.c index 7f5c2d133..3bcd150db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,6 +60,7 @@ uint8_t aTextInfo[] = "\r\nLPUART Example : MCU will now enter in Stop 2 mode.\n /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LPUART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -187,6 +190,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -533,5 +544,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/stm32wbxx_it.c index 93a5771df..12281952f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -234,4 +233,3 @@ void LPUART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/readme.txt index 8c90ded93..33d80d9ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPUART_WakeUpFromStop2_Init LPUART example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h index 97fc36e44..7cababffb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h index 4f3d4a4f3..6ed5d87b6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void LPUART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc index 410b5726f..7ca42cc6c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc @@ -35,8 +35,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -61,6 +61,17 @@ PC1.GPIOParameters=GPIO_Speed PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PC1.Mode=Asynchronous PC1.Signal=LPUART1_TX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -126,7 +137,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index eafc092bb..d2f21f2ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c index 8bc98fc66..fb81f88e6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,6 +60,7 @@ uint8_t aTextInfo[] = "\r\nLPUART Example : MCU will now enter in Stop 0 mode.\n /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_LPUART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -187,6 +190,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -533,5 +544,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c index 692a5d03d..b4252eead 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -233,4 +232,3 @@ void LPUART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt index 91dc590d4..de2d7be29 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the LPUART_WakeUpFromStop_Init LPUART example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h index 8309ef30d..8df540ad6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/SigGen.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,3 @@ extern const uint32_t SigGen_S_len; #endif #endif /* __SIGGEN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h index 61ad1aeb9..bc3fa1233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -105,5 +104,3 @@ void PKA_PROCEND_callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h index de2fff994..68e2b9a4e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/prime256v1.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ extern const uint32_t prime256v1_Seed_len; #endif #endif /* __PRIME256V1_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h index 5c928b14d..299c3ee47 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc index 67b6cf43b..d36cdf749 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -98,7 +109,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c index 17e05c36c..48dadb33d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/SigGen.c @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ const uint8_t SigGen_S[] = { 0xef, 0x97, 0xb2, 0x18, 0xe9, 0x6f, 0x17, 0x5a, 0x3c, 0xcd, 0xda, 0x2a, 0xcc, 0x05, 0x89, 0x03 }; const uint32_t SigGen_S_len = 32; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c index d0d6a227a..aeadd6e3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -55,6 +54,7 @@ uint8_t SBuffer[32] = {0}; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -99,6 +99,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -157,7 +160,7 @@ int main(void) /* Wait for the interrupt callback */ while(endOfProcess != 1); - /* Retreive the result and output buffer */ + /* Retrieve the result and output buffer */ result = PKA->RAM[PKA_ECDSA_SIGN_OUT_ERROR]; PKA_Memcpy_u32_to_u8(RBuffer, &PKA->RAM[PKA_ECDSA_SIGN_OUT_SIGNATURE_R], prime256v1_Prime_len / 4); PKA_Memcpy_u32_to_u8(SBuffer, &PKA->RAM[PKA_ECDSA_SIGN_OUT_SIGNATURE_S], prime256v1_Prime_len / 4); @@ -232,6 +235,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -433,5 +444,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c index ce2dc5e3c..c3c2dd671 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/prime256v1.c @@ -5,17 +5,16 @@ * @brief This file contains reference buffers containing the description of * nist P-256 (ECDSA-256) published by NIST in Federal Information * Processing Standards Publication FIPS PUB 186-4. - * Additionnal buffer are provided to be used with PKA like abs(A) + * Additional buffer are provided to be used with PKA like abs(A) ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ const uint8_t prime256v1_Seed[] = { 0xb7, 0x81, 0x9f, 0x7e, 0x90 }; const uint32_t prime256v1_Seed_len = 20; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c index 231a39769..39d03ffc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,4 +231,3 @@ void PKA_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt index ad9d5cc3b..5e7a811c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ECDSA_Sign/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PKA_ECDSA_Sign example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -37,7 +37,7 @@ The example: Loads the input buffers to PKA RAM. Launch the computation in interrupt mode. Wait for the interrupt callback. - Retreive the output buffer. + Retrieve the output buffer. Compare to expected results. After successful sequence, LED2 is turned On. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/ciphertext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/ciphertext.h index 94fa8fa92..56fbf01a4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/ciphertext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/ciphertext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t ciphertext_bin_len; #endif #endif /* __CIPHERTEXT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/main.h index d79d02198..f1ecc4f30 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void PKA_PROCEND_callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/plaintext.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/plaintext.h index 000fd244b..610560350 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/plaintext.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/plaintext.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -33,5 +32,3 @@ extern const uint32_t plaintext_bin_len; #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h index b198860ad..328896a31 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_priv_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -46,5 +45,3 @@ extern const uint32_t rsa_priv_2048_coefficient_len; #endif #endif /* __RSA_PRIV_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h index d52f73be1..0a574b339 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/rsa_pub_2048.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -35,5 +34,3 @@ extern const uint32_t rsa_pub_2048_publicExponent_len; #endif #endif /* __RSA_PUB_2048_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h index 897bc7bee..cf82ff4cf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void PKA_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc index 62e4d1625..febed3a16 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -98,7 +109,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/ciphertext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/ciphertext.c index 0a541dc5b..6f208c084 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/ciphertext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/ciphertext.c @@ -6,19 +6,18 @@ * It has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i ciphertext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,4 +56,3 @@ const uint8_t ciphertext_bin[] = { 0x85, 0xeb, 0xae, 0x23 }; const uint32_t ciphertext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/main.c index 3f448a983..28348b8e7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,6 +53,7 @@ uint8_t buffer[256] = {0}; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_PKA_Init(void); /* USER CODE BEGIN PFP */ @@ -101,6 +101,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -128,7 +131,7 @@ int main(void) while(endOfProcess != 1); endOfProcess = 0; - /* Retreive the result and output buffer */ + /* Retrieve the result and output buffer */ PKA_Memcpy_u32_to_u8(buffer, &PKA->RAM[PKA_MODULAR_EXP_OUT_SM_ALGO_ACC1], rsa_pub_2048_modulus_len / 4); /* Compare to expected results */ @@ -150,7 +153,7 @@ int main(void) while(endOfProcess != 1); endOfProcess = 0; - /* Retreive the result and output buffer */ + /* Retrieve the result and output buffer */ PKA_Memcpy_u32_to_u8(buffer, &PKA->RAM[PKA_MODULAR_EXP_OUT_SM_ALGO_ACC1], rsa_pub_2048_modulus_len / 4); /* Compare to expected results */ @@ -212,6 +215,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -466,5 +477,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/plaintext.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/plaintext.c index 7a932cf74..a91b55fe4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/plaintext.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/plaintext.c @@ -9,19 +9,18 @@ * plaintext.c has been created using xxd external tool in version V1.10 27oct98. * Command line: * xxd -i plaintext.bin - * Additionnal modification for easier usage: + * Additional modification for easier usage: * Replaced unsigned char by const uint8_t * Replaced unsigned int by const uin32_t ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -54,4 +53,3 @@ const uint8_t plaintext_bin[] = { 0x6d, 0xc5, 0xfc, 0x93 }; const uint32_t plaintext_bin_len = 256; -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c index fc4803e4e..45aa37221 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_priv_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_priv_2048.pem provided as an example of private key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -238,5 +237,3 @@ const uint8_t rsa_priv_2048_coefficient[] = { 0x36, 0x4f, 0x36, 0x76, 0xbe, 0x3d, 0xc6, 0x50, 0x7a }; const uint32_t rsa_priv_2048_coefficient_len = 128; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c index a2d4b82f7..1c553598e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/rsa_pub_2048.c @@ -4,17 +4,16 @@ * @author MCD Application Team * @brief This file contains buffers reflecting the content of the file * rsa_pub_2048.pem provided as an example of public key to - * demonstrate functionnality of PKA. + * demonstrate functionality of PKA. ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,5 +84,3 @@ const uint8_t rsa_pub_2048_publicExponent[] = {0x00, 0x1, 0x00, 0x01};/* 65537; const uint32_t rsa_pub_2048_publicExponent_len = 4; - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c index c17bc74f9..8553e6769 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -232,4 +231,3 @@ void PKA_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/readme.txt index e38cff106..ecb18cbda 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PKA/PKA_ModularExponentiation/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PKA_ModularExponentiation example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h index c39dec691..1630166c8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -120,5 +119,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h index aacde0e97..6bf7de9ca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc index 7998e3dab..535c44115 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -96,7 +107,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c index 5da72dc1d..fbc883c77 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -55,6 +54,7 @@ uint32_t LedSpeed = LED_BLINK_FAST; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -97,6 +97,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Initialize User push-button (SW1) in GPIO mode */ UserButton_Init(BUTTON_MODE_GPIO); @@ -165,6 +168,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -424,5 +435,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c index 8a94a6228..af2ef6636 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -219,4 +218,3 @@ void USER_BUTTON_IRQHANDLER(void) } } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt index 97bbfbd20..6387b2a84 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStandbyMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR STANDBY mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h index 4729ed29a..dd67d270a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -95,5 +94,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h index 292455e67..498989de3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc index 04f2368cc..3ce0fa57b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.1.0 -MxDb.Version=DB.6.0.10 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -33,8 +33,15 @@ PB0.Locked=true PB0.Signal=GPIO_Output PCC.Ble.ConnectionInterval=1000.0 PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false PCC.Ble.Mode=NOT_SELECTED PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -100,7 +107,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c index e419dc3d8..0f8956324 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,6 +49,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -92,6 +92,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -165,6 +168,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -337,5 +348,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c index 35102f52d..63349834c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/readme.txt index 4f35e16ab..837eaf3fc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_EnterStopMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Stop 2 mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h index f93ef44da..5b319c325 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h index 724511177..6348fc653 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc index 725ab7ee3..603f4bc44 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -34,6 +34,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -98,7 +109,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c index db54dfc70..0fc783ad8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,6 +64,7 @@ __IO uint16_t uhLedBlinkSpeed = LED_BLINK_FAST; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -111,6 +111,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -199,6 +202,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -555,5 +566,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c index fc66a55c9..419701bda 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,4 +227,3 @@ void EXTI4_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt index 7acec2589..2bf26594c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_OptimizedRunMode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR Optimized Run Mode example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/main.h index a3971ea75..64b7b75c1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +127,3 @@ void PWR_BORH_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32wbxx_it.h index 891896c6a..5fcf464be 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void PWR_BORH_SMPSFB_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/PWR_SMPS_16MHZ_HSI.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/PWR_SMPS_16MHZ_HSI.ioc index c4d5b1417..2063d3976 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/PWR_SMPS_16MHZ_HSI.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/PWR_SMPS_16MHZ_HSI.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -96,7 +107,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/main.c index 4b50dbd32..df808c9c6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,6 +55,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -96,6 +96,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -181,6 +184,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -491,5 +502,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/stm32wbxx_it.c index 81d80e332..48a1a379f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -248,4 +247,3 @@ void PWR_BORH_SMPSFB_IRQHANDLER(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/readme.txt index a903c43a5..b82455959 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_16MHZ_HSI/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR SMPS example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -30,7 +30,7 @@ User can act on 2 parameters to use power converters of STM32WB: The recommended BOR level is level 1: BOR1 voltage rising edge 2.1V, falling edge 2.0V (refer to device datasheet for more information). To change BOR level, use tool ST-Link utility to update option bytes. User must apply a variation of Vdd: Remove jumper JP2 and supply JP2 pin "VDD" by an external voltage. - This is the use case, for exemple, of a battery voltage variation depending on lifetime or current load. + This is the use case, for example , of a battery voltage variation depending on lifetime or current load. - If Vdd > BOR level: Vcore is supplied by SMPS + LDO SMPS is in mode step-down and is converting power for the main LDO. The transition of SMPS mode bypass to step-down is not done automatically by HW. This example performs it by SW. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/main.h index f93c9011c..2c80338f0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +127,3 @@ void PWR_BORH_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32wbxx_it.h index 8168de268..51412a22b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void PWR_BORH_SMPSFB_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/PWR_SMPS_64MHZ_MSI_PLL.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/PWR_SMPS_64MHZ_MSI_PLL.ioc index cbcc63b7f..c90b93333 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/PWR_SMPS_64MHZ_MSI_PLL.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/PWR_SMPS_64MHZ_MSI_PLL.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -95,7 +106,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/main.c index 7707652fb..6b83f0a92 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,6 +55,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -96,6 +96,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -192,6 +195,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -500,5 +511,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/stm32wbxx_it.c index ed6c35ee9..1c80321b2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -248,4 +247,3 @@ void PWR_BORH_SMPSFB_IRQHANDLER(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/readme.txt index 1e9683af0..71c1283e7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/PWR/PWR_SMPS_64MHZ_MSI_PLL/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR SMPS example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -30,7 +30,7 @@ User can act on 2 parameters to use power converters of STM32WB: The recommended BOR level is level 1: BOR1 voltage rising edge 2.1V, falling edge 2.0V (refer to device datasheet for more information). To change BOR level, use tool ST-Link utility to update option bytes. User must apply a variation of Vdd: Remove jumper JP2 and supply JP2 pin "VDD" by an external voltage. - This is the use case, for exemple, of a battery voltage variation depending on lifetime or current load. + This is the use case, for example , of a battery voltage variation depending on lifetime or current load. - If Vdd > BOR level: Vcore is supplied by SMPS + LDO SMPS is in mode step-down and is converting power for the main LDO. The transition of SMPS mode bypass to step-down is not done automatically by HW. This example performs it by SW. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/main.h index 0e4aa0d81..40fb91dc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -131,5 +130,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32wbxx_it.h index b3877222a..ff323100b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -70,5 +69,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc index 7ebb0a775..471cc4ae8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -46,6 +46,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -110,7 +121,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/main.c index f202edbbb..ff904b036 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,6 +59,7 @@ uint32_t Timeout = 0; /* Variable used for Timeout management */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -105,6 +105,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -180,6 +183,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -393,5 +404,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/stm32wbxx_it.c index 1a889a6a4..64801bbf5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/readme.txt index bc23dfaec..ac02698c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_HWAutoMSICalibration/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/main.h index 0ff69deb1..6c83a5560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -121,5 +120,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32wbxx_it.h index 1dc9c398a..3f83ff50a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc index f25798bea..592d84e67 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -46,6 +46,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -110,7 +121,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/main.c index 17bf92879..8572899e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,6 +70,7 @@ __IO uint8_t bMCOIndex = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -108,6 +108,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -179,6 +182,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -307,5 +318,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/stm32wbxx_it.c index 72a04e809..f82f2743f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -225,4 +224,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/readme.txt index d829f44cf..bf1070486 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/main.h index 327d5cd28..9ce5fb9bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -127,5 +126,3 @@ void HSEFailureDetection_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32wbxx_it.h index c85ec19b4..639278601 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void RCC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc index fb084ba0f..165aa7e39 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc @@ -14,8 +14,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -31,6 +31,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -95,7 +106,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/main.c index 88087eccc..077a51eea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -55,6 +54,7 @@ __IO uint8_t ubReadyState = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -97,6 +97,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -186,6 +189,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -361,5 +372,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/stm32wbxx_it.c index 32c3f58aa..a1ab2f937 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -223,4 +222,3 @@ void RCC_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/readme.txt index a0c09ffeb..a1ac8bf61 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSEasSystemClock/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC HSE start example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h index 6558cb305..ca4ca0799 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -133,5 +132,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h index 27ffcb273..ca63ca567 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc index 97aab6c2b..8ed362863 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -39,6 +39,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -103,7 +114,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c index d1d0ec94d..393032d9d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -90,6 +89,7 @@ uint32_t Timeout = 0; /* Variable used for Timeout management */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ @@ -130,6 +130,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -227,6 +230,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -561,5 +572,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c index be41b2c9a..3034ee661 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -228,4 +227,3 @@ void EXTI4_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt index b8143534d..c046e3693 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RCC_UseHSI_PLLasSystemClock example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/main.h index 0af8a6c3d..06fae27a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32wbxx_it.h index c09f77c6d..a14f55a42 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc index 4d1b344a1..3cac2cbaf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -44,8 +44,15 @@ PC4.Locked=true PC4.Signal=GPXTI4 PCC.Ble.ConnectionInterval=1000.0 PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false PCC.Ble.Mode=NOT_SELECTED PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/main.c index 3c1a88c1c..848958f09 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ __IO uint32_t aRandom32bit[NB_OF_GENERATED_RANDOM_NUMBERS]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RNG_Init(void); /* USER CODE BEGIN PFP */ @@ -105,6 +105,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -169,6 +172,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -429,5 +440,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/stm32wbxx_it.c index 62b6d781c..498076ee1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/readme.txt index 63532460b..aa1b90b9c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RNG_GenerateRandomNumbers example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h index b26cd5952..50950b768 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,5 +116,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h index 227dd1d8e..386e51885 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void RNG_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc index 5261b9e10..878b4b039 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.3.0 -MxDb.Version=DB.6.0.30 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -44,8 +44,15 @@ PC4.Locked=true PC4.Signal=GPXTI4 PCC.Ble.ConnectionInterval=1000.0 PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false PCC.Ble.Mode=NOT_SELECTED PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c index 67867ec99..56e4d208b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,6 +66,7 @@ __IO uint32_t aRandom32bit[NB_OF_GENERATED_RANDOM_NUMBERS]; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RNG_Init(void); /* USER CODE BEGIN PFP */ @@ -109,6 +109,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -174,6 +177,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -460,5 +471,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c index 42a5006fa..24e358ee8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -254,4 +253,3 @@ void RNG_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt index dac7bfb3d..2ae44ee95 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RNG_GenerateRandomNumbers_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/main.h index 632c20c67..d88e541d3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Alarm_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32wbxx_it.h index 2c48a1f24..02e8b73ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,3 @@ void RTC_Alarm_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/main.c index b43b86fd4..83b4c8f0c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -550,5 +549,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/stm32wbxx_it.c index 424e4f56a..a23716320 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -177,5 +176,3 @@ void RTC_Alarm_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/readme.txt index 0bd224860..659e2d444 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/main.h index 2080d099f..f87b8d72e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -109,5 +108,3 @@ void Alarm_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32wbxx_it.h index fedbc6d8c..faa038bd9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void RTC_Alarm_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc index 337f3f5be..6522ddd42 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -35,6 +35,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -100,7 +111,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/main.c index dd923c748..d9c21d266 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,6 +78,7 @@ uint32_t Timeout = 0; /* Variable used for Timeout management */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RTC_Init(void); /* USER CODE BEGIN PFP */ @@ -119,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /*##-1- Enables the PWR Clock and Enables access to the backup domain #######*/ @@ -246,6 +249,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -450,5 +461,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/stm32wbxx_it.c index 7d28a594d..ef72726e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -226,4 +225,3 @@ void RTC_Alarm_IRQHandler(void) LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_17); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/readme.txt index c43120d77..b5c83406d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Alarm_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/main.h index 5b39ca1fd..f57e36a2f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32wbxx_it.h index a3299f46b..a784344d4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/RTC_Calendar_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/RTC_Calendar_Init.ioc index fbe7d5503..1930b63df 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/RTC_Calendar_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/RTC_Calendar_Init.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -34,6 +34,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -99,7 +110,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/main.c index ae4936260..031203078 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,6 +84,7 @@ uint32_t Timeout = 0; /* Variable used for Timeout management */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RTC_Init(void); /* USER CODE BEGIN PFP */ @@ -128,6 +128,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Enables the PWR Clock and Enables access to the backup domain #######*/ @@ -262,6 +265,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -532,5 +543,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/stm32wbxx_it.c index 49ad49258..a86c17e89 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/readme.txt index 14420b5d4..7bf5d98dc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Calendar_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/main.h index 106ab41fb..406edb520 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,5 +109,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32wbxx_it.h index 3139bd076..d7ee44376 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void USER_BUTTON_IRQHANDLER(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc index a2c6e3254..1d89c1729 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc @@ -15,8 +15,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -39,6 +39,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -104,7 +115,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/main.c index 6de3466a0..fa0fa534b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -83,6 +82,7 @@ uint32_t Timeout = 0; /* Variable used for Timeout management */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); /* USER CODE BEGIN PFP */ void Configure_RTC(void); @@ -120,6 +120,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -206,6 +209,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -524,5 +535,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/stm32wbxx_it.c index 863972e64..e79c376ee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/readme.txt index 56af0b35a..eef189cb3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/main.h index 08965baaf..11cab62d0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,5 +103,3 @@ void Tamper_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32wbxx_it.h index 547697740..8ce0fd15d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc index eaff2dd55..af55bb6cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -37,6 +37,17 @@ PB0.Signal=GPIO_Output PC13.Locked=true PC13.Mode=Tamper 1 enabled - Input Enabled to TAMP1 PC13.Signal=RTC_TAMP1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -102,7 +113,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/main.c index 2735fc2e5..865bf0085 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,6 +65,7 @@ uint32_t aBKPDataReg[BACKUP_COUNT] = /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RTC_Init(void); /* USER CODE BEGIN PFP */ @@ -106,6 +106,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -190,6 +193,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -369,5 +380,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/stm32wbxx_it.c index c0825d5ce..9c4e84131 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -235,4 +234,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/readme.txt index b74164c3d..578402149 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_Tamper_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/main.h index 27187ee2e..9162ae6a0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -123,5 +122,3 @@ void TimeStampEvent_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32wbxx_it.h index 3bc65ce5c..013c9629e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc index 3d9cd3ed2..27159fa5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -41,6 +41,17 @@ PC4.GPIO_Label=USER_BUTTON PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPIO_Input +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -106,7 +117,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/main.c index 6e956abc9..debbb5887 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,6 +81,7 @@ uint32_t Timeout = 0; /* Variable used for Timeout management */ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_RTC_Init(void); /* USER CODE BEGIN PFP */ @@ -119,6 +119,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /*## Enables the PWR Clock and Enables access to the backup domain #######*/ @@ -243,6 +246,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -473,5 +484,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/stm32wbxx_it.c index 94b235099..8b05d85d9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -229,4 +228,3 @@ void TAMP_STAMP_LSECSS_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/readme.txt index e6a22f629..673a4082b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/RTC/RTC_TimeStamp_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the RTC example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/main.h index 8047767cb..2e5afdf7e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void DMA2_ReceiveComplete_Callback(void); void SPI_TransferError_Callback(void); void UserButton_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32wbxx_it.h index d0ec94f10..59aad0abd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,5 +50,3 @@ void DMA2_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/main.c index 6e3554f45..878ca0f30 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -602,5 +601,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/stm32wbxx_it.c index 15cb1a112..5725a1dbb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -210,5 +209,3 @@ void DMA2_Channel1_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/readme.txt index 52c2972ac..d56a77428 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_OneBoard_HalfDuplex_DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/main.h index 214187a6c..303cf77dd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32wbxx_it.h index daf7cc703..0d801132d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void DMA2_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc index 134cb9f5c..d9c6a6fa3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc @@ -59,8 +59,8 @@ Mcu.PinsNb=7 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMA2_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -108,6 +108,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -172,7 +183,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/main.c index 2b53c6dc3..37191105b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -61,6 +60,7 @@ __IO uint8_t ubReceptionComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_SPI1_Init(void); @@ -107,6 +107,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -235,6 +238,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -688,5 +699,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wbxx_it.c index e7273a489..5fcaa7212 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -276,4 +275,3 @@ void DMA2_Channel1_IRQHandler(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/readme.txt index 68e10a937..5fc31e252 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_OneBoard_HalfDuplex_DMA_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/main.h index 240b9e06b..e3f42bea8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32wbxx_it.h index 61a6cea0c..6cf884066 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void SPI2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc index 83dc2a7b6..e8db8e848 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=7 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -70,6 +70,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -134,7 +145,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/main.c index 5446faab8..b53c8dc1b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ __IO uint8_t ubReceiveIndex = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_SPI1_Init(void); static void MX_SPI2_Init(void); @@ -108,6 +108,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -206,6 +209,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -604,5 +615,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/stm32wbxx_it.c index bb62684ce..2ec5c88e3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -269,4 +268,3 @@ void SPI2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/readme.txt index bee6c3720..7caa3c0b2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_OneBoard_HalfDuplex_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h index 99b9e1f18..c93ee1990 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h index 4c5a2820f..d91ea1917 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc index e6fa941e9..f9ef54dc5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc @@ -57,8 +57,8 @@ Mcu.PinsNb=6 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:false\:false\:true @@ -98,6 +98,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -162,7 +173,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c index e358b42d5..709343c33 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ __IO uint8_t ubReceptionComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_SPI1_Init(void); @@ -108,6 +108,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -231,6 +234,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -624,5 +635,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c index e52745b92..61a295538 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -266,4 +265,3 @@ void DMA1_Channel1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt index eab5b3ee1..a89e7a31e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_TwoBoards_FullDuplex_DMA_Master_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h index b4b3bbaac..6a0902446 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h index b50e87719..607eb94ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc index 72d40fea6..0895bf8e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc @@ -57,8 +57,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:false\:true NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:false\:false\:true @@ -92,6 +92,17 @@ PB0.GPIOParameters=GPIO_Label PB0.GPIO_Label=LED2 PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -156,7 +167,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c index 9a0428d84..bed49e2fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ __IO uint8_t ubReceptionComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_SPI1_Init(void); @@ -106,6 +106,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -226,6 +229,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -558,5 +569,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c index 9d209a79c..60c292bf6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -245,4 +244,3 @@ void DMA1_Channel1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt index b7464699a..a63a6b0e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_TwoBoards_FullDuplex_DMA_Slave_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/main.h index 84e975fe5..434ef4cb0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32wbxx_it.h index 24e8b804b..3a7a0105e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void SPI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc index 577a3b537..0144028f2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=6 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -60,6 +60,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -124,7 +135,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/main.c index 35c5281fa..4d769648c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,6 +61,7 @@ __IO uint8_t ubReceiveIndex = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_SPI1_Init(void); /* USER CODE BEGIN PFP */ @@ -103,6 +103,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -193,6 +196,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -523,5 +534,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/stm32wbxx_it.c index 4d2abc2b2..f5ac6feba 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -253,4 +252,3 @@ void SPI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/readme.txt index 63eaa083c..8fd7508e6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_TwoBoards_FullDuplex_IT_Master_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,7 +46,7 @@ The communication is done with 2 boards through SPI. This example shows how to configure GPIO and SPI peripherals to use a Full-Duplex communication using IT mode through the STM32WBxx COM_INSTANCE1_TYPE LL API. -This example is splitted in two projects, Master board and Slave board: +This example is split in two projects, Master board and Slave board: - Master Board SPI1 Peripheral is configured in Master mode. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/main.h index e8fd127da..ea1cf0b04 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -114,5 +113,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32wbxx_it.h index b574ea897..08594cea0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void SPI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc index 0c35887d2..bf6b6ca7e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=6 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:0\:0\:false\:false\:true\:true\:true @@ -60,6 +60,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -124,7 +135,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/main.c index 032aed027..04ad1f061 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -62,6 +61,7 @@ __IO uint8_t ubReceiveIndex = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_SPI1_Init(void); /* USER CODE BEGIN PFP */ @@ -102,6 +102,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -189,6 +192,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -490,5 +501,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/stm32wbxx_it.c index f4387ef95..b27b6396d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -253,4 +252,3 @@ void SPI1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/readme.txt index 244d97d35..2a874d288 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI_TwoBoards_FullDuplex_IT_Slave_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -46,7 +46,7 @@ The communication is done with 2 boards through SPI. This example shows how to configure GPIO and SPI peripherals to use a Full-Duplex communication using IT mode through the STM32WBxx COM_INSTANCE1_TYPE LL API. -This example is splitted in two projects, Master board and Slave board: +This example is split in two projects, Master board and Slave board: - Master Board SPI1 Peripheral is configured in Master mode. diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/EWARM/startup_stm32wb55xx_cm4.s index e8dbfa8cd..afae393bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -527,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/main.h index b8aad8a5b..e48aa0008 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -38,5 +37,3 @@ /* Exported macro ------------------------------------------------------------*/ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32_assert.h index 54d0e6cc5..682270f63 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32wbxx_it.h index 8c55b2ca8..c7c3fac78 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/main.c index 1da3222c1..d24a7c701 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) PWM(-2021) STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -314,5 +313,3 @@ void assert_failed(uint8_t* file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/stm32wbxx_it.c index e66efbae8..a12a60760 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_BreakAndDeadtime/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -156,5 +155,3 @@ void SysTick_Handler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/readme.txt index d913a5804..2dcf0229c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_BreakAndDeadtime/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_BreakAndDeadtime example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/main.h index 659b01a16..3ce7921d6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -105,5 +104,3 @@ void TransferError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32wbxx_it.h index a95bedc45..5fa92fbde 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void TIM1_UP_TIM16_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/main.c index 639385e0e..4da99d77c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ static uint32_t tim_autoreload = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_TIM1_Init(void); @@ -93,6 +93,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /***************************/ @@ -224,6 +227,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -478,5 +489,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wbxx_it.c index 13440fa2e..4920fdccc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_DMA_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -249,4 +248,3 @@ void TIM1_UP_TIM16_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc index f6255c066..ab93d2560 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc @@ -36,8 +36,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -61,6 +61,17 @@ PB0.GPIO_PuPd=GPIO_NOPULL PB0.GPIO_Speed=GPIO_SPEED_FREQ_LOW PB0.Locked=true PB0.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -125,7 +136,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/readme.txt index c57f49f68..f7d8dff8e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_DMA_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/main.h index 43fd1b0f8..633ac289b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -117,5 +116,3 @@ void TimerCaptureCompare_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32wbxx_it.h index abe1a9271..553b8caff 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void TIM1_CC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/main.c index a47a2d172..d1ec481c6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -76,6 +75,7 @@ static uint32_t tim_pulse_value = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM1_Init(void); static void MX_TIM2_Init(void); @@ -114,6 +114,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Set the auto-reload value to have a counter frequency of 2 kHz */ @@ -222,6 +225,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -560,5 +571,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/stm32wbxx_it.c index fd3d06fda..d8be1df28 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_InputCapture_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,3 @@ void TIM1_CC_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc index 388f5d105..9e64ac7d5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc @@ -19,8 +19,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -49,6 +49,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -113,7 +124,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/readme.txt index 1843ca522..65d243769 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_InputCapture_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_InputCapture_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/main.h index 727e3111b..49e172ad7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void UserButton_Callback(void); void TimerCaptureCompare_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32_assert.h index 54d0e6cc5..682270f63 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h index b33bf64aa..5d4488a62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,3 @@ void TIM1_CC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/main.c index deb579646..17520a8b6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -441,5 +440,3 @@ void assert_failed(uint8_t* file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/stm32wbxx_it.c index 049d18d51..c872558f2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_OnePulse/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -188,5 +187,3 @@ void USER_BUTTON_IRQHANDLER(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/readme.txt index c19967511..2f93ab68a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OnePulse/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_OnePulse example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/main.h index 5068bc2c9..adacc2b5c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,5 +103,3 @@ void TimerCaptureCompare_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32wbxx_it.h index 32a738f16..480d09bae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/main.c index 039bb7258..0dd939fac 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,6 +68,7 @@ static uint32_t tim_pulse_value = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM2_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Set the pre-scaler value to have TIM2 counter clock equal to 10 kHz */ @@ -199,6 +202,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -408,5 +419,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/stm32wbxx_it.c index cf57141a2..f0fd4b8cc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_OutputCompare_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,3 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc index 511e6dbb7..2d0017089 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -41,6 +41,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -105,7 +116,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/readme.txt index 0d314ff71..322ce72d9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_OutputCompare_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_OutputCompare_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/main.h index f93c53bc7..3eafcb520 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void UserButton_Callback(void); void TimerCaptureCompare_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h index 425ea5c8b..f508b4768 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/main.c index f4607448a..82db37805 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -387,5 +386,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c index 2031f20ca..125891ed6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_PWMOutput/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -187,5 +186,3 @@ void USER_BUTTON_IRQHANDLER(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/readme.txt index de5092a22..078a8cfb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_PWMOutput example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/main.h index dde935d7b..32de86fd7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,5 +101,3 @@ void TimerCaptureCompare_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32wbxx_it.h index 1c6fd50c5..10a809004 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void TIM2_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/main.c index 61ea0419a..dcf27edde 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,6 +80,7 @@ uint32_t timxPeriod = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM2_Init(void); /* USER CODE BEGIN PFP */ @@ -117,6 +117,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* - Set the pre-scaler value to have TIM2 counter clock equal to 10 kHz */ /* - Set the auto-reload value to have a counter frequency of 100 Hz */ @@ -209,6 +212,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -401,5 +412,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/stm32wbxx_it.c index cb68a28a0..7d2bdd9f7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_PWMOutput_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -248,4 +247,3 @@ void TIM2_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc index ad4d24ce4..65c8d7753 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -42,6 +42,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -106,7 +117,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/readme.txt index ea3f1a496..202f362a5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_PWMOutput_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_PWMOutput_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h index f68c0c720..bc208e4bf 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,5 +101,3 @@ void TimerUpdate_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h index 66f919cff..b09bd115e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void TIM1_UP_TIM16_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c index 159cf2ea6..74f53da09 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -57,6 +56,7 @@ static uint8_t AutoreloadMult = 1; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_TIM1_Init(void); /* USER CODE BEGIN PFP */ @@ -91,6 +91,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Set the pre-scaler value to have TIM1 counter clock equal to 10 kHz */ /* @@ -179,6 +182,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -340,5 +351,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c index ee7f05599..0b9c701c6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Examples_LL/TIM/TIM_TimeBase_Init/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,4 +261,3 @@ void TIM1_UP_TIM16_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc index 560ea4ce7..2a9d2f6f5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -43,6 +43,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -107,7 +118,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt index 3cd2f2884..73cba6352 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/TIM/TIM_TimeBase_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM_TimeBase_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/main.h index f1bbabce2..a72156da2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,3 @@ void USART_CharReception_Callback(void); void Error_Callback(void); #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32_assert.h index 690992ab8..2ee688af3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -8,16 +9,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef STM32_ASSERT_H @@ -53,5 +54,3 @@ #endif /* STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32wbxx_it.h index c7f6d2c86..c233b16e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -50,5 +49,3 @@ void USARTx_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/main.c index d41ff3d36..d4077e29f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -416,5 +415,3 @@ void assert_failed(char *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/stm32wbxx_it.c index 2aaefc36b..9a0b7a897 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file Examples_LL/USART/USART_Communication_Rx_IT/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -192,5 +191,3 @@ void USARTx_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/readme.txt index a5ce08d51..72ea2eea6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Rx_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/main.h index b30ef5766..622ab74ee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/main.h @@ -5,35 +5,14 @@ * @brief : Header for main.c file. * This file contains the common defines of the application. ****************************************************************************** - ** This notice applies to any and all portions of this file - * that are not between comment pairs USER CODE BEGIN and - * USER CODE END. Other portions of this file, whether - * inserted by the user or by software development tools - * are owned by their respective copyright owners. + * @attention * - * COPYRIGHT(c) 2019 STMicroelectronics + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -128,5 +107,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32wbxx_it.h index 42e9d0e72..9a7ee9f3e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/main.c index 4dcc4380d..615d39c29 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ uint8_t *pBufferReadyForReception; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -114,6 +114,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -199,6 +202,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -562,5 +573,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/stm32wbxx_it.c index e78ea8dc4..f306e3588 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc index 050682be6..1b32de046 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -56,6 +56,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -120,7 +131,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/readme.txt index 7952f9c67..568cbc575 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Rx_IT_Continuous_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/main.h index f8fb5523c..5d96389a8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32wbxx_it.h index 9aefb0b93..5ee540672 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/main.c index 1bb0143e3..09769873f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,6 +71,7 @@ uint8_t *pBufferReadyForReception; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -114,6 +114,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -199,6 +202,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -561,5 +572,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/stm32wbxx_it.c index 9c0d42c9b..3e03f4017 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc index 52cf37c42..f2805f15f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -54,6 +54,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -118,7 +129,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/readme.txt index 98a32d06b..0b9e4412c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Rx_IT_Continuous_VCP_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h index d6528b197..70e630444 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -108,5 +107,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h index 91e24cd34..17ece92eb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c index 607576120..39c252090 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -89,6 +89,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -170,6 +173,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -434,5 +445,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c index 52e54dcb9..f0108d8b5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc index 66a9bfc32..39e8bfad7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -56,6 +56,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -120,7 +131,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt index 227bab2f4..0a40bd831 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Rx_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/main.h index 89f7fe272..26bc261b6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32wbxx_it.h index 02ddafd1f..e3b6c38ad 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/main.c index 5b76bff5b..672daf2e5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -52,6 +51,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -89,6 +89,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -170,6 +173,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -433,5 +444,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/stm32wbxx_it.c index 267753dc4..f9bb94406 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc index 878b83d27..41622a85a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -54,6 +54,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -118,7 +129,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/readme.txt index eaf7a9ebd..481cd0df2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Rx_IT_VCP_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/main.h index c2b553d3c..aaaaaf51f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -120,5 +119,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32wbxx_it.h index 5011368e7..05bc6b7ed 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void DMA1_Channel7_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/main.c index 25d0f6fc6..0f56c3e16 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,6 +63,7 @@ __IO uint8_t ubReceptionComplete = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_USART1_UART_Init(void); @@ -109,6 +109,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* Initialize User push-button (SW1) in EXTI mode */ UserButton_Init(); @@ -188,6 +191,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -609,5 +620,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wbxx_it.c index c20612269..c903ec75a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -284,4 +283,3 @@ void USER_BUTTON_IRQHANDLER(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc index eb80d4eb2..6c5ec592b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc @@ -55,8 +55,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel6_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMA1_Channel7_IRQn=true\:0\:0\:false\:false\:true\:false\:true @@ -86,6 +86,17 @@ PB7.GPIO_PuPd=GPIO_PULLUP PB7.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -150,7 +161,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/readme.txt index 02c28f234..39578d8a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_TxRx_DMA_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/main.h index c7e458b39..0f4cd32bc 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -112,5 +111,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32wbxx_it.h index 25f816d03..98769d8b0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/main.c index f7f090656..f73227ff9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,6 +55,7 @@ uint8_t ubSizeToSend = sizeof(aStringToSend); /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -175,6 +178,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -461,5 +472,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/stm32wbxx_it.c index b0f894607..75e7bacde 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -260,4 +259,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc index 4f58b6301..cf440d129 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -56,6 +56,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -120,7 +131,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/readme.txt index 521a2da1b..af1e93258 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Tx_IT_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/main.h index 595142924..3f4c452fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32wbxx_it.h index 1e0d1ee75..434ce81e2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/main.c index f706958d5..1d2ec8b57 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,6 +55,7 @@ uint8_t ubSizeToSend = sizeof(aStringToSend); /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -94,6 +94,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -175,6 +178,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -460,5 +471,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/stm32wbxx_it.c index 553fef643..3f4ca269f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -260,4 +259,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc index d19fd32e6..368e968a6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -54,6 +54,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -118,7 +129,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/readme.txt index 462555dea..589c0ac5a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Tx_IT_VCP_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h index 20bbf295c..63a8885f2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -111,5 +110,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h index 624f04f64..f60d7fd90 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c index 292ee769c..1abf60241 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ const uint8_t aStringToSend[] = "STM32WBxx USART LL API Example : TX in Polling /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -186,6 +189,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -478,5 +489,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c index 6b69b6406..2bd13c5c7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -226,4 +225,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc index d884acdb0..31026cf6f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -55,6 +55,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -119,7 +130,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt index 823289da2..3b74dc5ec 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Tx_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/main.h index 946351e0c..06eb93ac8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,5 +109,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32wbxx_it.h index e93d7733b..270d53f61 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/main.c index baefeb9a3..de1027480 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ const uint8_t aStringToSend[] = "STM32WBxx USART LL API Example : TX in Polling /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -104,6 +104,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -186,6 +189,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(64000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -481,5 +492,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/stm32wbxx_it.c index 95174ba6e..f5f89596f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -239,4 +238,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc index 56c892f54..f837445c8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -54,6 +54,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -118,7 +129,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/readme.txt index dbd3dae9f..62f6762c5 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_Communication_Tx_VCP_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_Communication_Tx_VCP_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/main.h index 7d3deea36..679b20e29 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,5 +103,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32wbxx_it.h index e299f2448..455a56b25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/main.c index 8d7d1d07c..678db15a2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ uint8_t aTextInfo[] = "\r\nUSART1 Example : MCU will now enter in Stop 1 mode.\n /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -108,6 +108,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -193,6 +196,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -560,5 +571,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/stm32wbxx_it.c index d304f1cf3..cee5c0e2a 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -256,4 +255,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc index 2350676e4..13bf15004 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -52,6 +52,17 @@ PB0.Locked=true PB0.Signal=GPIO_Output PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -117,7 +128,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/readme.txt index 44feb5904..05a632812 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop1_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_WakeUpFromStop1_Init USART example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/main.h index a0ed6d1a7..52497ec4b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,5 +103,3 @@ void Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h index 888043a34..6cb668c81 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/main.c index 7cdb6f0fe..66e00e8e8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,6 +62,7 @@ uint8_t aTextInfo[] = "\r\nUSART1 Example : MCU will now enter in Stop 0 mode.\n /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_USART1_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -108,6 +108,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -193,6 +196,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -560,5 +571,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/stm32wbxx_it.c index 65b114246..f5fa64831 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -256,4 +255,3 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc index 889394816..e1e7b8f8d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:15\:0\:true\:false\:true\:true\:true @@ -52,6 +52,17 @@ PB0.Locked=true PB0.Signal=GPIO_Output PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -117,7 +128,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/readme.txt index 54a0bf0e6..18dc77b48 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/USART/USART_WakeUpFromStop_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USART_WakeUpFromStop_Init USART example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/main.h index be98c9554..1c1604260 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -99,5 +98,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32wbxx_it.h index 7bbf50c43..2a5061c00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/main.c index 05c23776b..b02007659 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,6 +59,7 @@ LL_UTILS_ClkInitTypeDef sUTILS_ClkInitStruct = {LL_RCC_SYSCLK_DIV_2, LL_RCC_SYSC /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ void LED_Init(void); void MCO_ConfigGPIO(void); @@ -95,6 +95,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -173,6 +176,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -256,5 +267,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/stm32wbxx_it.c index ea1cb4b59..f40c99166 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc index bdaf5f37c..7abd5caee 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -91,7 +102,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/readme.txt index f459ceddb..85cbeac68 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ConfigureSystemClock/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UTILS example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h index a3c7b1574..8551ce2f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,5 +92,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h index 75bbd9fb5..0fce6a845 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c index c27e2d658..c04492753 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -56,6 +55,7 @@ uint8_t aShowLotNumber[30] = {0}; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ void GetMCUInfo(void); /* USER CODE END PFP */ @@ -90,6 +90,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -148,6 +151,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -212,5 +223,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c index 7b74f9c66..fbfb0738d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -204,4 +203,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc index 20b1e0c40..e6cd9d5da 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -91,7 +102,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt index b0ade70be..7c70687d0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/UTILS/UTILS_ReadDeviceInfo/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UTILS example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h index 8bda36d88..fec3bb005 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -110,5 +109,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h index 0b6caf6bf..96e86ee73 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void UserButton_Callback(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c index aaef778fa..6bf1f836b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -51,6 +50,7 @@ static __IO uint8_t KeyPressed = 0; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_WWDG_Init(void); /* USER CODE BEGIN PFP */ @@ -88,6 +88,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -155,6 +158,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(2000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -327,5 +338,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c index 05157683d..3b81fe27c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,3 @@ void EXTI4_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc index f55a6fac7..923e9db8e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.EXTI4_IRQn=true\:3\:0\:true\:false\:true\:true\:true @@ -41,6 +41,17 @@ PC4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING PC4.GPIO_PuPd=GPIO_PULLUP PC4.Locked=true PC4.Signal=GPXTI4 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -107,7 +118,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt index 1904c5a07..db9085c0d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the WWDG_RefreshUntilUserEvent_Init example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc index b048f71bf..f68772a39 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc @@ -24,8 +24,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.ADC1_IRQn=true\:0\:0\:false\:false\:true\:true\:false NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -39,6 +39,17 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false PA1.Signal=ADCx_IN6 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -103,7 +114,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h index d7deabe98..953681fb6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,5 +102,3 @@ void AdcGrpRegularOverrunError_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h index e6b079bf1..3df8f63c3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h index 9545c7077..6eb4bb3b2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c index c091e4154..82a9703d0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/main.c @@ -13,13 +13,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -214,7 +213,7 @@ int main(void) /* Start ADC group regular conversion */ /* Note: Hardware constraint (refer to description of the function */ /* below): */ - /* On this STM32 serie, setting of this feature is conditioned to */ + /* On this STM32 series, setting of this feature is conditioned to */ /* ADC state: */ /* ADC must be enabled without conversion on going on group regular, */ /* without conversion stop command on going on group regular. */ @@ -261,6 +260,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -295,11 +297,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -531,4 +528,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c index a16118ccc..3cc7bbe8f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -183,4 +182,3 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c index baf32cd8b..14c95e475 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -260,4 +259,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt index 8916faa83..8c4aecc8c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the ADC_SingleConversion_TriggerSW_IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc index 675732d40..29aacb375 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc @@ -21,8 +21,8 @@ Mcu.PinsNb=2 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -34,6 +34,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -95,14 +106,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/main.h index 0939876c4..6d83a0800 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_hal_conf.h index 18b8d1816..23ed29d2e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_it.h index c361c15a8..ae4684430 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/main.c index 166eecad9..49823caae 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,6 +226,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -240,7 +242,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -261,11 +263,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -343,4 +340,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_hal_msp.c index 3f35dbaff..e4045091d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -122,4 +121,3 @@ void HAL_CRC_MspDeInit(CRC_HandleTypeDef* hcrc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_it.c index 09345724a..87db2beb8 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -212,4 +211,4 @@ void SysTick_Handler(void) }*/ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/readme.txt index 30bb8711e..5f05ed251 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/CRC/CRC_PolynomialUpdate/readme.txt @@ -8,12 +8,12 @@ * @brief Description of CRC operation including user updates on generating polynomial. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc index 4aa74f67d..eecd63f99 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc @@ -33,8 +33,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:false\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -47,6 +47,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -108,14 +119,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h index 3f098a49d..ca1148e6f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -73,5 +72,3 @@ void TransferError(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h index a5fe643dc..b8640e68e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void DMA1_Channel1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c index 0db953bfa..f1dcca195 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/main.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -194,6 +193,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -207,7 +209,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -228,11 +230,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -328,4 +325,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c index f9463e6fe..6f2583fcb 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c index b6b12448a..27cbccb92 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -235,4 +234,4 @@ void DMA1_Channel1_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt index 63640a1d4..e7b301c83 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/DMA/DMA_FLASHToRAM/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the DMA example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc index 4a3d86574..0cff214e4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc @@ -45,8 +45,8 @@ Mcu.PinsNb=5 Mcu.ThirdPartyNb=0 Mcu.UserConstants=I2C_SLAVE_ADDRESS1,0x13E;I2C_SLAVE_ADDRESS2,0x64;I2C_TIMING,0x00A00F1B Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -58,14 +58,33 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PB8.GPIOParameters=GPIO_Pu +PB8.GPIO_Pu=GPIO_PULLUP PB8.Mode=I2C PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Pu +PB9.GPIO_Pu=GPIO_PULLUP PB9.Mode=I2C PB9.Signal=I2C1_SDA +PC0.GPIOParameters=GPIO_Pu +PC0.GPIO_Pu=GPIO_PULLUP PC0.Mode=I2C PC0.Signal=I2C3_SCL +PC1.GPIOParameters=GPIO_Pu +PC1.GPIO_Pu=GPIO_PULLUP PC1.Mode=I2C PC1.Signal=I2C3_SDA +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -131,7 +150,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/main.h index 642c07f48..d0a3f1056 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/main.h @@ -7,29 +7,13 @@ ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -108,5 +92,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_hal_conf.h index 011c0bf7f..c3c6d4ed7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_it.h index 720d01013..2c12bb46c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Inc/stm32wbxx_it.h @@ -7,29 +7,13 @@ ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -85,5 +69,3 @@ void I2Cx_SLAVE_ER_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c index 0653c5631..75c8aa05f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c @@ -10,29 +10,13 @@ ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -274,6 +258,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -300,11 +287,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -507,4 +489,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_hal_msp.c index 465b61358..75ef8f106 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_hal_msp.c @@ -7,32 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -218,4 +202,3 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_it.c index b72158643..dee85509b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/stm32wbxx_it.c @@ -9,29 +9,13 @@ ****************************************************************************** * @attention * - *

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -265,4 +249,4 @@ void I2Cx_SLAVE_ER_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/readme.txt index d15b15af8..926999095 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/readme.txt @@ -10,13 +10,12 @@ * a Slave 10-Bit address then a Slave 7-Bit address example. ****************************************************************************** * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/main.h index 452df7c44..5e30e0537 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -81,5 +80,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h index d676563bf..e516d8181 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc index 85dd3984a..eae1750db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -90,7 +101,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/main.c index 775d4d96c..8e65796c2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -104,7 +103,7 @@ int main(void) /* USER CODE BEGIN SysInit */ /* Set low-power mode of CPU2 */ - /* Note: Typically, action peformed by CPU2 on a dual core application. + /* Note: Typically, action performed by CPU2 on a dual core application. Since this example is single core, perform it by CPU1. */ /* Note: On STM32WB, both CPU1 and CPU2 must be in low-power mode to set the entire System in low-power mode, corresponding to @@ -196,6 +195,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -230,11 +232,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -341,4 +338,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c index 88e676a14..dff820efa 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c index 8374fc53f..9fe841b12 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -213,4 +212,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/readme.txt index 19c46707b..5e9099f56 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/PWR/PWR_STOP1/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the PWR_STOP1 example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h index 9212b2e28..1585b4e09 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h index 49246eb4b..a76aceb70 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc index 2ad98c61a..7e294b8a3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -46,6 +46,17 @@ PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA7.Mode=Full_Duplex_Master PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -107,14 +118,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c index 59cc39096..bb0e6f792 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -186,6 +185,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -199,7 +201,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -220,11 +222,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -338,4 +335,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c index accd1a209..1f9083357 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -148,4 +147,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c index a2bfd59ad..851cf1b73 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,4 +202,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt index 0a8161bfd..3037eaced 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex Polling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h index e3a820a85..ae882c0f9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h index 720ebb48f..e86476db9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc index b53e0794e..5d7351bb7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc @@ -17,8 +17,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -46,6 +46,17 @@ PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA7.Mode=Full_Duplex_Slave PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -107,14 +118,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c index c5877c046..d330ce623 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -177,6 +176,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -190,7 +192,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -211,11 +213,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -328,4 +325,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c index a2f562bc1..fa8adcf00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -148,4 +147,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c index f163d66d6..77c1c2acd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,4 +202,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt index 960432b84..5d38fe9ca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Full Duplex Polling example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h index 236f7c147..a2eed787c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h index d814ca29a..e72091e71 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc index 6ad72f8b1..252bd61db 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -40,6 +40,17 @@ PA7.GPIO_PuPd=GPIO_PULLDOWN PA7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA7.Mode=Simplex_Bidirectional_Master PA7.Signal=SPI1_MOSI +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -101,14 +112,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c index 2c14114f8..472c41cdd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,6 +184,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -198,7 +200,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -219,11 +221,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -314,4 +311,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c index 8fdc863ce..940d10e39 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -146,4 +145,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c index 1315043a3..1c0117b73 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -202,4 +201,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt index 2b04c0b13..3e9713445 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Half Duplex IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h index f74342b57..afdb6a614 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,5 +68,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h index cc400ab6b..d3dd070cd 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h index b11c268d2..8c630643e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void SPI1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc index d3bce590a..25a922e65 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -41,6 +41,17 @@ PA6.GPIO_PuPd=GPIO_PULLDOWN PA6.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA6.Mode=Simplex_Bidirectional_Slave PA6.Signal=SPI1_MISO +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -102,14 +113,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                  © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                  +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c index cac218856..789cc6f5d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/main.c @@ -10,13 +10,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -184,6 +183,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -197,7 +199,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -218,11 +220,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -362,4 +359,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c index c2104efef..e20dc3e63 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -151,4 +150,3 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c index 186988cf1..264ab4f77 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -216,4 +215,4 @@ void SPI1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt index 2018a8107..00e716306 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the SPI Half Duplex IT example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h index 84fd4c7b5..1debad1de 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -74,5 +73,3 @@ void UserButton_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h index 3ca54b394..d9b2303b7 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h index 0ce2a47b7..066bdbaf2 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void EXTI4_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/main.c index a2fbc934c..92fb4653b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/main.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -185,6 +184,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -198,7 +200,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -219,11 +221,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -461,4 +458,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c index 31dcf4344..3fc151889 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -220,4 +219,3 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c index 895536af7..91cec04c9 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -212,4 +211,4 @@ void EXTI4_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc index c72ee73ec..b790f2e12 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -33,6 +33,17 @@ NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false PA1.Signal=S_TIM2_CH2 PA8.Signal=S_TIM1_CH1 +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -94,14 +105,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/readme.txt index 1b0e902fb..9d7c2c193 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/TIM/TIM_PWMInput/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the TIM PWM_Input example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h index 839d38227..d7e28e6d3 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -84,5 +83,3 @@ void UART_Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h index 5053e8434..d520a0fb6 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c index 571f92bfd..08cc2e5f1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/main.c @@ -11,13 +11,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -194,6 +193,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -207,7 +209,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -228,11 +230,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -421,4 +418,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c index 0abd6f0f8..1542bb70b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -148,4 +147,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c index 5be0db3e7..3313102ca 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,4 +249,4 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc index 6db5f93fc..b463f90c0 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -40,6 +40,17 @@ PB7.GPIO_PuPd=GPIO_PULLUP PB7.Locked=true PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -101,14 +112,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt index 83e2f95b6..0c0df520b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_IT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART HAL/LL mixed Hyperterminal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                  © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                  +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/stm32wb55xx_flash_cm4.icf index 6c149ad25..b2399a702 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/main.h index 2f3704fd4..d0b229a2c 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -82,5 +81,3 @@ void UART_Error_Callback(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_hal_conf.h index 4c1e7dfb3..feb24a585 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_it.h index e347596d7..bc1d67521 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void USART1_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                  © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                  - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                  © COPYRIGHT(c) 2019 STMicroelectronics

                                                                  +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/main.c index 7841d0da4..0c3a39805 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/main.c @@ -12,13 +12,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -191,6 +190,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -204,7 +206,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -225,11 +227,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /** @@ -388,4 +385,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_hal_msp.c index b17005f10..ca30b7504 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -148,4 +147,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_it.c index b539f30ac..b746e2044 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -233,4 +232,4 @@ void USART1_IRQHandler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                  © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                  + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc index 228e68f75..7b7d3c965 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc @@ -16,8 +16,8 @@ Mcu.PinsNb=3 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -40,6 +40,17 @@ PB7.GPIO_PuPd=GPIO_PULLUP PB7.Locked=true PB7.Mode=Asynchronous PB7.Signal=USART1_RX +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -101,14 +112,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/readme.txt index 84a56e21f..8daab32ce 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the UART HAL/LL mixed Hyperterminal example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Release_Notes.html b/Projects/P-NUCLEO-WB55.Nucleo/Release_Notes.html index 9fcec6a68..600250f85 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Release_Notes.html +++ b/Projects/P-NUCLEO-WB55.Nucleo/Release_Notes.html @@ -45,7 +45,7 @@

                                                                  Update History

                                                                  - +

                                                                  Main Changes

                                                                  Maintenance

                                                                  @@ -53,6 +53,24 @@
                                                                • Update of FW projects following changes in latest version of HAL/LL and Middlewares
                                                                • Add support of new applications:
                                                                    +
                                                                  • /P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_AT_Server
                                                                    • +
                                                                  • /P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Datarate
                                                                    • +
                                                                  • /P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP_Cli_Cmd
                                                                    • +
                                                                  • +
                                                                +


                                                                +

                                                                +
                                                                +
                                                                +
                                                                + +
                                                                +

                                                                Main Changes

                                                                +

                                                                Maintenance

                                                                +
                                                                  +
                                                                • Update of FW projects following changes in latest version of HAL/LL and Middlewares
                                                                  • +
                                                                • Add support of new applications: +
                                                                  • /P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Chat
                                                                  • /P-NUCLEO-WB55.Nucleo/Applications/BLE_LLD/BLE_LLD_Proximity
                                                                  • /P-NUCLEO-WB55.Nucleo/Applications/Thread/Thread_RCP
                                                                    • @@ -70,8 +88,8 @@
                                                                    -

                                                                    Main Changes

                                                                    -

                                                                    Maintenance

                                                                    +

                                                                    Main Changes

                                                                    +

                                                                    Maintenance

                                                                    • Update BLE applications:
                                                                        @@ -100,8 +118,8 @@
                                                                        -

                                                                        Main Changes

                                                                        -

                                                                        Maintenance

                                                                        +

                                                                        Main Changes

                                                                        +

                                                                        Maintenance

                                                                        • Ensure the option “required prototype” is enabled in all IAR projects.
                                                                        • Following deprecation of Adafruit shield, the following projects are removed: @@ -119,8 +137,8 @@
                                                                          -

                                                                          Main Changes

                                                                          -

                                                                          Maintenance

                                                                          +

                                                                          Main Changes

                                                                          +

                                                                          Maintenance

                                                                          • Ensure compatibility with STM32CubeMX 6.1.0
                                                                          @@ -129,7 +147,7 @@
                                                                          -

                                                                          Main Changes

                                                                          +

                                                                          Main Changes

                                                                          Introduce BLE/Thread and BLE/Zigbee dynamic concurrent mode, the support of LLD BLE and PHY_802.15.4 CLI application

                                                                          • Update Thread, BLE, BLE Mesh, LLD BLE, MAC 802.15.4and zigbee application.
                                                                            • @@ -149,7 +167,7 @@
                                                                            -

                                                                            Main Changes

                                                                            +

                                                                            Main Changes

                                                                            Replace SW4STM32 by STM32CubeIDE projects files for all examples and application

                                                                            • Add new application “BLE_custom” to demonstrate how to create a BLE_Custom application using STM32CubeMX 6.0.0
                                                                              • @@ -160,7 +178,7 @@
                                                                              -

                                                                              Main Changes

                                                                              +

                                                                              Main Changes

                                                                              BLE

                                                                              • Add BLE Mesh split of BLE_MeshLightingDemo project in: @@ -209,8 +227,8 @@
                                                                                -

                                                                                Main Changes

                                                                                -

                                                                                Add BLE/Zigbee static concurrent mode support and additionnal zigbee applications

                                                                                +

                                                                                Main Changes

                                                                                +

                                                                                Add BLE/Zigbee static concurrent mode support and additional zigbee applications

                                                                                • Add BLE/Zigbee static concurrent mode support
                                                                                    @@ -244,8 +262,8 @@
                                                                                    -

                                                                                    Main Changes

                                                                                    -

                                                                                    Maintenance

                                                                                    +

                                                                                    Main Changes

                                                                                    +

                                                                                    Maintenance

                                                                                    • Add SW4STM32 and MDK-ARM IDE files for:
                                                                                        @@ -258,7 +276,7 @@
                                                                                        -

                                                                                        Main Changes

                                                                                        +

                                                                                        Main Changes

                                                                                        Introduction of ZIGBEE support

                                                                                        • Ensure compatibility with STM32CubeMX V5.4.
                                                                                          • @@ -288,7 +306,7 @@
                                                                                          -

                                                                                          Main Changes

                                                                                          +

                                                                                          Main Changes

                                                                                          Addition of new application

                                                                                          Add CKS (Customer Key Storage) application

                                                                                            @@ -303,7 +321,7 @@
                                                                                            -

                                                                                            Main Changes

                                                                                            +

                                                                                            Main Changes

                                                                                            Remove binaries, Addition of new examples

                                                                                            Change directory name to reflect board RPN: P-NUCLEO-WB55

                                                                                            Add QSPI examples:

                                                                                            @@ -326,7 +344,7 @@
                                                                                            -

                                                                                            Main Changes

                                                                                            +

                                                                                            Main Changes

                                                                                            First release

                                                                                            First official release.

                                                                                            diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/stm32wb55xx_flash_cm4.icf index ac8883bd6..b7307178e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/EWARM/stm32wb55xx_flash_cm4.icf @@ -17,7 +17,7 @@ define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/main.h index 998309615..2bf5ca843 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_hal_conf.h index 5a9a9142a..2a9ebd726 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_it.h index 1870498aa..a04428149 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Templates/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                                            © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                                            +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/main.c index 1da0c7502..d71925d30 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -109,6 +108,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -122,7 +124,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -143,11 +145,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ } /* USER CODE BEGIN 4 */ @@ -190,4 +187,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_hal_msp.c index 5c745f47f..ab90383fe 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_hal_msp.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_it.c index fb5c488ac..0afd02a59 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Templates/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,4 +202,4 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Templates.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Templates.ioc index ade2b7127..6a6ff8c8b 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/Templates.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/Templates.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -87,14 +98,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Templates/readme.txt index a3e1987f4..14417f6c4 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Templates example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/stm32wb55xx_flash_cm4.icf index bdfb4aa0b..b2654ef9e 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x400; -define symbol __ICFEDIT_size_heap__ = 0x200; +define symbol __ICFEDIT_size_heap__ = 0x200; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/main.h b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/main.h index 2c798ed09..547820c62 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32_assert.h b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32_assert.h index f086878e3..1b4b5fbd1 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32_assert.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32_assert.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32_assert.h @@ -5,16 +6,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32_ASSERT_H @@ -49,5 +50,3 @@ #endif #endif /* __STM32_ASSERT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32wbxx_it.h index 5c636ed88..8ec686eef 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void SysTick_Handler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/syscalls.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/sysmem.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/Application/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index e762bab6f..1b4f7b72d 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -22,13 +22,12 @@ ***************************************************************************** ** @attention ** -**

                                                                                            © Copyright (c) 2020 STMicroelectronics. -** All rights reserved.

                                                                                            +** Copyright (c) 2020 STMicroelectronics. +** All rights reserved. ** -** This software component is licensed by ST under BSD 3-Clause license, -** the "License"; You may not use this file except in compliance with the -** License. You may obtain a copy of the License at: -** opensource.org/licenses/BSD-3-Clause +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -134,7 +133,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/main.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/main.c index 1f1c8d332..decfd7742 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/main.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,6 +48,7 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -83,6 +83,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* USER CODE BEGIN SysInit */ /* USER CODE END SysInit */ @@ -140,6 +143,14 @@ void SystemClock_Config(void) /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */ LL_SetSystemCoreClock(16000000); +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ /* USER CODE BEGIN Smps */ /* USER CODE END Smps */ @@ -184,5 +195,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/stm32wbxx_it.c index 2bb60bc75..0f48c9e50 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/stm32wbxx_it.c @@ -1,5 +1,5 @@ /* USER CODE BEGIN Header */ -/** +/** ****************************************************************************** * @file Templates/Src/stm32wbxx_it.c * @author MCD Application Team @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,4 +202,3 @@ void SysTick_Handler(void) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Templates_LL.ioc b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Templates_LL.ioc index d9256550c..9ba503731 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Templates_LL.ioc +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/Templates_LL.ioc @@ -13,8 +13,8 @@ Mcu.PinsNb=1 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55RGVx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -26,6 +26,17 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -91,7 +102,7 @@ RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=16000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/readme.txt b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/readme.txt index a13a5bb7e..ed300cd32 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/readme.txt +++ b/Projects/P-NUCLEO-WB55.Nucleo/Templates_LL/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Templates_LL example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h index 19174e285..cc0beecb2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -257,6 +257,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -266,11 +270,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -278,6 +286,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -606,5 +627,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h index 4ca88d937..34625ccfa 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/main.h index 7d528ca80..2153a572f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h index 8ac183b32..11ba9e13f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h index ed0f50443..5a62284ed 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c index 65f9cac58..6b989f951 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -44,7 +44,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -133,8 +133,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -417,5 +425,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c index 911dcd308..673092767 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -69,6 +70,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ static void Led_Init( void ); @@ -179,22 +182,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} + +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -292,4 +432,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/main.c index 1a9506504..142b1e7df 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -670,5 +670,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c index 4f3093e2a..94ce189f0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -365,4 +364,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c index 767a11175..68b8bdd6e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -351,4 +350,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c index efd4c8554..ff7fcaf3b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -349,5 +348,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c index 2d8ffd563..a22e2b561 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -281,7 +280,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1056,4 +1056,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h index e037940a5..2b242e49d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -83,5 +82,3 @@ void APP_BLE_Key_Button1_Action(void); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h index b51aa7b87..cd8a42274 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,4 +102,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h index df9e12c2f..d688bd867 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/ble_dbg_conf.h @@ -1,23 +1,23 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* USER CODE END Header */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BLE_DBG_CONF_H @@ -197,5 +197,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c index 3240fbf9d..290aea233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.c @@ -6,17 +6,16 @@ * @brief Device Information Service Application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -217,5 +216,3 @@ void DISAPP_Init(void) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h index 196ec9937..3faafd11c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/dis_app.h @@ -6,17 +6,16 @@ * @brief Header for dis_application.c module ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void DISAPP_Init(void); #endif #endif /*__DIS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c index ec6f828e6..7c121e375 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,5 +226,3 @@ static uint32_t HRSAPP_Read_RTC_SSR_SS ( void ) /* USER CODE BEGIN FD */ /* USER CODE END FD */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h index 0246d2811..89b91bab3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/hrs_app.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +64,3 @@ void HRSAPP_Init( void ); #endif #endif /*__HRS_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..5d488c347 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/readme.txt index e9e62048e..019d947cf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_HeartRate/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_HeartRate example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h index 7e66ee35a..8d15b5c11 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h index c880c7b5c..d12ffea2d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -258,26 +257,33 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -286,6 +292,19 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -575,7 +594,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -591,5 +610,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h index 5d85cd90c..b82056fc3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h @@ -1,4 +1,4 @@ - +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file app_entry.h @@ -7,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +40,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h index 7fcd60664..db52de81a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h index 18c088d3e..51ece819e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file hw_flash.h * @brief Header for hw_flash.c module -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __HW_FLASH_H @@ -83,5 +82,3 @@ uint32_t HW_FLASH_OB_GetSNBRSA(void); #endif #endif /*__HW_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h index 41f226faf..cc30a4de0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file lp_timer.h * @brief Header for lp_timer.c module -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __LP_TIMER_H @@ -56,5 +55,3 @@ extern "C" { #endif #endif /*__LP_TIMER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h index 7d6b87d0e..8cebdcea9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -36,5 +35,3 @@ void Error_Handler(void); /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h index 0270583e8..67fee69d0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h index 5bebf1ba6..80c219ed0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void TIM1_CC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c index f912c7ad5..2b78b4b65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -40,7 +39,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -115,8 +114,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -365,5 +372,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c index 4f2ed29d6..7df1bfb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -37,6 +36,8 @@ #include "pal_nvm.h" #include "lp_timer.h" #include "mesh_cfg.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -95,6 +96,8 @@ static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -229,26 +232,163 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - /* Enable debug on CPU2 */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } return; } +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} + + /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ static void Led_Init( void ) { @@ -378,4 +518,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c index 882181c8c..7355cea62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_flash.c @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module - ***************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "common.h" #include "stm32_seq.h" @@ -148,5 +147,3 @@ static void HW_FLASH_PageErase(uint32_t Page) // DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c index cb97bd718..7a42785ae 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c index 404bb2e3b..eafc19123 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/lp_timer.c @@ -1,17 +1,16 @@ /** - *************************************************************************************** + *************************************************************************************** * File Name : lp_timer.c * Description : Low power timer to be used within Mesh Application. - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,4 @@ static void LpTimerCb( void ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c index cbf88434b..a7c98664c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -438,4 +438,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c index 02c02d26a..78a311b55 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -261,5 +260,3 @@ void TIM1_CC_IRQHandler(void) /* USER CODE END TIM1_IRQn 1 */ } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c index 3f6475b15..f820e244c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -339,5 +338,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c index e9b50f44e..5365f0d06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_config.c @@ -1,21 +1,20 @@ /** - ******************************************************************************* + ****************************************************************************** * @file PWM_config.c * @author BLE Mesh Team * @brief Configuration file for PWM. - ******************************************************************************* - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ******************************************************************************* -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c index dc0f184c2..a7691cd61 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.c @@ -1,43 +1,20 @@ /** -******************************************************************************** + ****************************************************************************** * @file PWM_handlers.c * @author BLE Mesh Team -* @version V1.0.0 -* @date 31-July-2018 * @brief Handlers for PWM and other support functions. -******************************************************************************** -* @attention -* -*

                                                                                            © COPYRIGHT(c) 2017 STMicroelectronics

                                                                                            -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h index a27fa757b..2d1346363 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/PWM_handlers.h @@ -2,20 +2,18 @@ ****************************************************************************** * @file PWM/PWM_handlers.c * @author SNM Application Team -* @version V1.0.0 -* @date September-2015 * @brief Handlers for PWM and other support functions. ****************************************************************************** * @attention * - * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS - * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE - * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY - * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING - * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE - * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - *

                                                                                            © COPYRIGHT 2015 STMicroelectronics

                                                                                            ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c index 72c64a839..d520f128a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,7 +271,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -672,4 +672,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h index d87d3e466..629ef1bb7 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/app_ble.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void APP_BLE_Init( void ); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c index 6a94692e4..7440fb163 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.c @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.c * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Config Model APIs callback from ST BLE Mesh Library -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include #include "hal_common.h" @@ -356,4 +353,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t* pPubParameters) /** * @} */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h index ccfbfcc74..ac0fb660c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config.h @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.h * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Header file for the application config file -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_H @@ -51,4 +48,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t*); #endif /* __APPLI_CONFIG_H */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c index 3b7fce7a2..d0584e763 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.c @@ -1,22 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file appli_config_client.c * @author BLE Mesh Team * @brief Application interface for Config CLient Mesh Model - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * - ****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -716,7 +714,7 @@ void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState) /** * @brief This function is Init function for the state machine of the - Configuration Client. The Function shall be called everytime a new + Configuration Client. The Function shall be called every time a new node is provisioned * @param None * @retval None @@ -1456,7 +1454,7 @@ MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be added for Publishing */ /* Do NOTHING, let the next Model be picked */ @@ -1538,7 +1536,7 @@ MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be Subscribed */ /* Do NOTHING, let the next Model be picked */ @@ -1603,7 +1601,7 @@ MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be binded + /* If Model is Foundation Model, then it does not need to be binded with AppKey */ /* Do NOTHING, let the next Model be picked */ @@ -1914,5 +1912,4 @@ MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h index b380cf636..52462b86f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_config_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_CLIENT_H @@ -89,5 +88,4 @@ MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIdx); #endif /* __APPLI_CONFIG_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c index 6e2d2ad18..16add7034 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -466,5 +465,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h index 0d6c708e1..92266787d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,5 +153,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St #endif /* __APPLI_GENERIC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c index 219e5c5b3..74ed4a322 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -341,5 +340,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h index 80ecb070c..f6c569564 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_generic_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_GENERIC_CLIENT_H @@ -36,5 +35,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op #endif /* __APPLI_GENERIC_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c index fefaa383b..e7f8ec9fe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1181,7 +1180,7 @@ void HSL2RGB_Conversion(MOBLEUINT8 elementIndex) mValue = (MOBLEUINT16)((lightnessvalue * 1000) - (cValue/2)); xValue = (MOBLEUINT16)(cValue * (1 - fabs(fmod(hueValue / 60.0, 2.0) - 1))); - /* Conditons applied for the different angle of hue value */ + /* Conditions applied for the different angle of hue value */ if (hueValue > 0 && hueValue < (HUE_UPPER_LIMIT / 6)) { RgbF_Create(cValue + mValue, xValue + mValue, mValue, elementIndex); @@ -1347,5 +1346,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state ,Appli_LightPwmValue_t light_state) /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h index a6da69fce..24ada82ea 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,5 +276,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state, #endif /* __APPLI_LIGHT_H */ /******************************************************************************/ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c index debb9e30a..9c2a6badf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -1202,5 +1201,4 @@ MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, MOB * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h index 77a93eb92..530d0964b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_CLIENT_H @@ -107,5 +106,4 @@ MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, #endif /* __APPLI_LIGHT_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c index 29efc487d..b1d53e1ec 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -450,5 +449,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h index 9b75aa9ff..42c59766e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_light_lc.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_lc.h * @author BLE Mesh Team * @brief Application interface for Light Control Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_LC_H @@ -77,5 +76,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_LIGHT_LC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c index 97acbb5c7..27c7c92bf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1888,4 +1887,3 @@ WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInP /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h index 353e06664..a28aa8984 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_mesh.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,4 @@ MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLE #endif /* __APPLI_MESH_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c index 564d86bf5..ce9af8d33 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -601,7 +600,7 @@ void AppliNvm_Process(void) /** -* @brief Fuction used to set the flag which is responsible for storing the +* @brief Function used to set the flag which is responsible for storing the states in flash. * @param void * @retval void @@ -748,4 +747,3 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h index 75353565a..22946c7a3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_nvm.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** -*/ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_NVM_H @@ -95,5 +94,4 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, #endif /* __APPLI_NVM_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c index d751be1cf..086096403 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -304,7 +303,7 @@ void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pSeriesParam, * Read from application to optimize RAM * @param Sensor offset in sensor init structure * @param descriptor parameters - * @retval Fail if sensor doesn't exist or property ID mismatch occurrs + * @retval Fail if sensor doesn't exist or property ID mismatch occurs * else Success */ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, @@ -354,7 +353,7 @@ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, * Read sensor value and update buffer * data length <= 128 * PreviousTemperatureValue, PresentTemperatureValue to be updated - * everytime sensor value is changed and call to Sensor_UpdateCadence + * every time sensor value is changed and call to Sensor_UpdateCadence * @param Sensor offset in sensor init structure * @param Value parameters * @retval Fail if sensor doesn't exist @@ -579,7 +578,7 @@ MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, } else { - /* Implmented only for sensor at offset 0 */ + /* Implemented only for sensor at offset 0 */ } return fastCadenceStatus; @@ -840,5 +839,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h index 172acf4f7..e45f3d83b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_SENSOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c index 3525a880f..1ce2d49ec 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensors_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -328,5 +327,4 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h index e28aac4df..350bc4cdf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_sensors_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensor_client.h * @author BLE Mesh Team * @brief Application interface for Sensor Mesh Models -****************************************************************************** -* @attention -* - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_SENSOR_CLIENT_H @@ -69,4 +68,3 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, #endif /* __APPLI_SENSOR_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c index dad3f88ac..c1c72ebb2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -555,5 +554,4 @@ void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h index 8515c36e2..cb16bfefe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/appli_vendor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,5 +41,4 @@ MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress); #endif /* __APPLI_VENDOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h index 4cc3ce72b..57713f5e3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,12 +62,10 @@ #define BLE_CFG_CLT_MAX_NBR_CB 5 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_HR_SENSOR_APPEARANCE (832) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h index 35a4d96ab..49a3419cb 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/ble_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,5 +202,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h index 3afc2e373..3ab0f207f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/cube_hal.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ #ifndef _CUBE_HAL_H_ #define _CUBE_HAL_H_ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s index 636eb47c6..782844084 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/data.s @@ -8,33 +8,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. -;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;* -;* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -;* (MoBLE) technology. The present solution is developed and maintained for both -;* Mesh library and Applications solely by STMicroelectronics. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ;*/ @@ -47,4 +26,3 @@ _mobleNvmBase_data FILL 4096, 0x00 END -;/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h index 704a08d80..d6748ef45 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/hal_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,4 @@ void InitDevice(void); void ShouldSleepFunc(void); #endif /* _HAL_H_ */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h index 8cd46ecd6..57710e05b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/mesh_cfg_usr.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -37,7 +36,7 @@ /* * Different provision bearer supported by BLE-Mesh. * Define according to application. -* Atleast one of PB-ADV and PB-GATT should be defined +* At least one of PB-ADV and PB-GATT should be defined */ #define ENABLE_PB_ADV @@ -281,7 +280,7 @@ Comment this macro to disable the publication /* Define the following Macro to check the Power-OnOff Cycles -5 Continous cycles of OnOff with Ontime <2 sec will cause unprovisioning +5 Continuous cycles of OnOff with Ontime <2 sec will cause unprovisioning */ //#define ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE @@ -358,7 +357,7 @@ For STMicroelectronics : it is 0x0030 */ /* Contains a 16-bit vendor-assigned product version ID */ #define PRODUCT_VERSION_ID 0x010A -#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go upto 160*/ +#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go up to 160*/ #define TPT_SEGMENT_COUNT (((MAX_APPLICATION_PACKET_SIZE)/12)+2) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c index 58186edea..668ecbea7 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,7 +129,7 @@ __attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = __attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = { - /*Vendor Commads*/ + /*Vendor Commands*/ Appli_Vendor_LEDControl, Appli_Vendor_DeviceInfo, Appli_Vendor_Test, @@ -479,7 +478,7 @@ void BLEMesh_ModelsCommand(void) pLightLCOccupancyModeParam[0] = Led_Value; pLightLCOnOffParam[0] = Led_Value; - /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functionning */ + /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functioning */ switch (ButtonIndex_Value){ case 0: ButtonIndex_Value=0x1; @@ -1150,4 +1149,3 @@ __weak void Test_Process(void) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h index f00d2d28d..daa30e380 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/models_if.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,4 @@ MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 ele #endif /* __MODELS_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c index 12df6a87f..37960317a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/pal_nvm.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * -****************************************************************************** -*/ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "types.h" @@ -440,4 +439,3 @@ MOBLE_RESULT PalNvmProcess(void) return MOBLE_RESULT_SUCCESS; } -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h index 0b0a971e5..91c8a0ad7 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/sensor_cfg_usr.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file sensor_cfg_usr.h * @author BLE Mesh Team * @brief sensor server initialization parameters -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __SENSOR_USR_CFG_H @@ -262,7 +261,7 @@ typedef struct } /** -* Combined defined of all sensors intialization parameters +* Combined defined of all sensors initialization parameters */ #define SENSOR_SERVER_INIT_PARAMS \ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c index 1816cf137..81ff38b74 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/svcctl_conf.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ const uint8_t* SVCCTL_GetBdAddress( void ) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h index 6df3dc0c7..f9c44a264 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -29,5 +28,3 @@ #endif /*__TL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c index 609ca64cf..85aa6e5da 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/tl_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,4 +43,3 @@ void shci_register_io_bus(tSHciIO* fops) -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c index 43a0e548d..349251ecd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.c @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.c * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief User interface file -****************************************************************************** -* @attention -* -*

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "cube_hal.h" #include "ble_clock.h" @@ -196,7 +174,7 @@ void InitDevice(void) /** -* @brief ShouldSleepFunc sleep mode fuction +* @brief ShouldSleepFunc sleep mode function * @param void * @retval void */ @@ -361,4 +339,3 @@ uint8_t __io_getcharNonBlocking(uint8_t *data) return 0; }/* end serialReadByte() */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h index 773b36116..47889703c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/user_if.h @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.h * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief Header file for User interface file -****************************************************************************** -* @attention -* -*

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef _USER_INTERFACE_H_ @@ -58,5 +36,4 @@ typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t #endif /* _USER_INTERFACE_H_ */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h index 22b6dc41c..5dc48464c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/app/vcp_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,5 +47,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/STM32_WPAN/target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/readme.txt index 2b46ec53f..b3da49ad9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingLPN/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE Mesh Lighting Low Power Node demo example. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -42,7 +42,7 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingLPN/Core/Inc/app_entry.h Parameters configuration file of the application - BLE/BLE_MeshLightingLPN/Core/Inc/hw_conf.h Configuration file of the HW - BLE/BLE_MeshLightingLPN/Core/Inc/hw_flash.h Configuration file of the FLASH driver needed by EE module - - BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h Configuration file of the Hardware Iterface + - BLE/BLE_MeshLightingLPN/Core/Inc/hw_if.h Configuration file of the Hardware Interface - BLE/BLE_MeshLightingLPN/Core/Inc/lp_timer.h Configuration file of the Low power timer to be used within Mesh Application. - BLE/BLE_MeshLightingLPN/Core/Inc/main.h Header for main.c module - BLE/BLE_MeshLightingLPN/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file @@ -142,7 +142,7 @@ one FN must be in the direct radio range of an LPN to establish Friendship. @Configuration Low Power Node -Low Power feature support is defined in mesh_cfg_usr.h by hte predefinition of ENABLE_LOW_POWER_FEATURE. +Low Power feature support is defined in mesh_cfg_usr.h by the predefinition of ENABLE_LOW_POWER_FEATURE. Note: A Low Power feature-enabled node does not support any other feature: all the other features should be undefined. @@ -161,7 +161,7 @@ boards as Low Power nodes. Low Power node setup: Step 1. Configure LPN parameters. - Change only if required ohterwise skip this step (use example parameters defined in mesh_cfg_usr.h) + Change only if required otherwise skip this step (use example parameters defined in mesh_cfg_usr.h) LPN_RSSI_FACTOR_LEVEL 1 LPN_RECIVE_WINDOW_FACTOR_LEVEL 1 LPN_MINIMUM_QUEUE_SIZE_LOG 2 diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h index 7e66ee35a..8d15b5c11 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_common.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_common.h * @author MCD Application Team * @brief Common - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -118,5 +117,3 @@ extern "C" #endif #endif /*__APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h index c14e3a43e..b968c5cec 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -252,26 +251,33 @@ /** * BLE stack Options flags to be configured with: - * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY - * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST - * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO - * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 - * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 - * which are used to set following configuration bits: - * (bit 0): 1: LL only + * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY + * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST + * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO + * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 + * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: + * (bit 0): 1: LL only * 0: LL + host - * (bit 1): 1: no service change desc. + * (bit 1): 1: no service change desc. * 0: with service change desc. - * (bit 2): 1: device name Read-Only + * (bit 2): 1: device name Read-Only * 0: device name R/W - * (bit 7): 1: LE Power Class 1 - * 0: LE Power Classe 2-3 + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported + * (bit 7): 1: LE Power Class 1 + * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS SHCI_C2_BLE_INIT_OPTIONS_LL_HOST +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -280,6 +286,19 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -569,7 +588,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -585,5 +604,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*__APP_CONFIG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h index 13485c16b..6be8307c3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_debug.h @@ -1,22 +1,20 @@ - /** ****************************************************************************** * @file app_debug.h * @author MCD Application Team - * @brief Interface to support debug in the application + * @brief Header for app_debug.c module ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -41,5 +39,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h index 5d85cd90c..b82056fc3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h @@ -1,4 +1,4 @@ - +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file app_entry.h @@ -7,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -40,5 +40,3 @@ extern "C" { #endif #endif /*__APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h index 7fcd60664..db52de81a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h index 18c088d3e..51ece819e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file hw_flash.h * @brief Header for hw_flash.c module -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __HW_FLASH_H @@ -83,5 +82,3 @@ uint32_t HW_FLASH_OB_GetSNBRSA(void); #endif #endif /*__HW_FLASH_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h index 41f226faf..cc30a4de0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h @@ -1,20 +1,19 @@ /** -****************************************************************************** + ****************************************************************************** * @file lp_timer.h * @brief Header for lp_timer.c module -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __LP_TIMER_H @@ -56,5 +55,3 @@ extern "C" { #endif #endif /*__LP_TIMER_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h index 0dfed68a8..5ddcf89b4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -36,5 +35,3 @@ void Error_Handler(void); /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h index 0270583e8..67fee69d0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -346,5 +347,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h index 5bebf1ba6..80c219ed0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -66,5 +65,3 @@ void TIM1_CC_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h index 4dde3509a..66b51180a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c index f912c7ad5..2b78b4b65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_debug.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_debug.c * @author MCD Application Team * @brief Debug capabilities - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2018 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2018(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -40,7 +39,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -115,8 +114,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -365,5 +372,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c index ff9891b2d..a0fa89dc8 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -31,13 +30,13 @@ #include "stm32_lpm.h" #include "app_debug.h" -#include "app_debug.h" - #include "appli_mesh.h" #include "appli_nvm.h" #include "pal_nvm.h" #include "lp_timer.h" #include "mesh_cfg.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -96,6 +95,8 @@ static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); #if (CFG_HW_LPUART1_ENABLED == 1) extern void MX_LPUART1_UART_Init(void); #endif @@ -230,23 +231,159 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) } /** - * The type of the payload for a system user event is tSHCI_UserEvtRxParam - * When the system event is both : - * - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) - * - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) - * The buffer shall not be released - * ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) - * When the status is not filled, the buffer is released by default - */ +* The type of the payload for a system user event is tSHCI_UserEvtRxParam +* When the system event is both : +* - a ready event (subevtcode = SHCI_SUB_EVT_CODE_READY) +* - reported by the FUS (sysevt_ready_rsp == FUS_FW_RUNNING) +* The buffer shall not be released +* ( eg ((tSHCI_UserEvtRxParam*)pPayload)->status shall be set to SHCI_TL_UserEventFlow_Disable ) +* When the status is not filled, the buffer is released by default +*/ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - /* Enable debug on CPU2 */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -378,4 +515,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c index 882181c8c..7355cea62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_flash.c @@ -1,20 +1,19 @@ -/***************************************************************************** +/** + ****************************************************************************** * @file hw_flash.c * @author MCD Application Team - * @brief This file contains the FLASH driver needed by EE module - ***************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ***************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #include "common.h" #include "stm32_seq.h" @@ -148,5 +147,3 @@ static void HW_FLASH_PageErase(uint32_t Page) // DBG_GPIO_Gr2Set(DBG_GPIO_GR2_FLASH_ERASE); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c index cb97bd718..7a42785ae 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c index 404bb2e3b..eafc19123 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/lp_timer.c @@ -1,17 +1,16 @@ /** - *************************************************************************************** + *************************************************************************************** * File Name : lp_timer.c * Description : Low power timer to be used within Mesh Application. - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,5 +129,4 @@ static void LpTimerCb( void ) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c index cbf88434b..a7c98664c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/main.c @@ -1,9 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -438,4 +438,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c index 02c02d26a..78a311b55 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/stm32wbxx_it.c @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -261,5 +260,3 @@ void TIM1_CC_IRQHandler(void) /* USER CODE END TIM1_IRQn 1 */ } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c index 3f6475b15..f820e244c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -339,5 +338,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c index e9b50f44e..5365f0d06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_config.c @@ -1,21 +1,20 @@ /** - ******************************************************************************* + ****************************************************************************** * @file PWM_config.c * @author BLE Mesh Team * @brief Configuration file for PWM. - ******************************************************************************* - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ******************************************************************************* -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c index dc0f184c2..a7691cd61 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.c @@ -1,43 +1,20 @@ /** -******************************************************************************** + ****************************************************************************** * @file PWM_handlers.c * @author BLE Mesh Team -* @version V1.0.0 -* @date 31-July-2018 * @brief Handlers for PWM and other support functions. -******************************************************************************** -* @attention -* -*

                                                                                            © COPYRIGHT(c) 2017 STMicroelectronics

                                                                                            -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h index a27fa757b..2d1346363 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/PWM_handlers.h @@ -2,20 +2,18 @@ ****************************************************************************** * @file PWM/PWM_handlers.c * @author SNM Application Team -* @version V1.0.0 -* @date September-2015 * @brief Handlers for PWM and other support functions. ****************************************************************************** * @attention * - * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS - * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE - * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY - * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING - * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE - * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - *

                                                                                            © COPYRIGHT 2015 STMicroelectronics

                                                                                            ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c index 72c64a839..d520f128a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,7 +271,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -672,4 +672,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h index d87d3e466..629ef1bb7 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/app_ble.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -75,5 +74,3 @@ void APP_BLE_Init( void ); #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c index 6a94692e4..7440fb163 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.c @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.c * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Config Model APIs callback from ST BLE Mesh Library -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include #include "hal_common.h" @@ -356,4 +353,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t* pPubParameters) /** * @} */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h index ccfbfcc74..ac0fb660c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config.h @@ -1,23 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config.h * @author BLE Mesh Team -* @version V1.13.000 -* @date 20-10-2020 * @brief Header file for the application config file -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_H @@ -51,4 +48,3 @@ void Appli_GetPublicationGetParamsCb(model_publicationparams_t*); #endif /* __APPLI_CONFIG_H */ -/******************* (C) COPYRIGHT 2017 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c index 3b7fce7a2..d0584e763 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.c @@ -1,22 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file appli_config_client.c * @author BLE Mesh Team * @brief Application interface for Config CLient Mesh Model - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * - ****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -716,7 +714,7 @@ void Appli_ConfigClientStartNodeConfiguration(MOBLEUINT8 prvState) /** * @brief This function is Init function for the state machine of the - Configuration Client. The Function shall be called everytime a new + Configuration Client. The Function shall be called every time a new node is provisioned * @param None * @retval None @@ -1456,7 +1454,7 @@ MOBLE_RESULT AppliConfigClient_SelfPublicationSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be added for Publishing */ /* Do NOTHING, let the next Model be picked */ @@ -1538,7 +1536,7 @@ MOBLE_RESULT AppliConfigClient_SelfSubscriptionSetDefault (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be + /* If Model is Foundation Model, then it does not need to be Subscribed */ /* Do NOTHING, let the next Model be picked */ @@ -1603,7 +1601,7 @@ MOBLE_RESULT Appli_ConfigClient_SelfDefaultAppKeyBind (void) } else if (MODEL_IS_FOUNDATION_MODEL(modelIdentifier)) { - /* If Model is Foundation Model, then it doesnt need to be binded + /* If Model is Foundation Model, then it does not need to be binded with AppKey */ /* Do NOTHING, let the next Model be picked */ @@ -1914,5 +1912,4 @@ MOBLEUINT8 AppliConfigClient_SendMessageDefault(MOBLEUINT8 elementIdx) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h index b380cf636..52462b86f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_config_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_config_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_CONFIG_CLIENT_H @@ -89,5 +88,4 @@ MOBLEUINT8 GetCountVendorModelToPublish(MOBLEUINT8 elementIdx); #endif /* __APPLI_CONFIG_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c index 7cd69b5fc..2adbeacb1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -466,5 +465,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h index 9ed198bcd..a98425cbc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -154,5 +153,4 @@ MOBLE_RESULT Appli_Generic_GetDefaultTransitionStatus(MOBLEUINT8* pTransition_St #endif /* __APPLI_GENERIC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c index 67fb3a069..22bd7e99a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -341,5 +340,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h index 80ecb070c..f6c569564 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_generic_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_generic_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_GENERIC_CLIENT_H @@ -36,5 +35,4 @@ MOBLE_RESULT Appli_GenericClient_API(MOBLEUINT8 elementIndex, MOBLEUINT16 msg_op #endif /* __APPLI_GENERIC_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c index fefaa383b..e7f8ec9fe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1181,7 +1180,7 @@ void HSL2RGB_Conversion(MOBLEUINT8 elementIndex) mValue = (MOBLEUINT16)((lightnessvalue * 1000) - (cValue/2)); xValue = (MOBLEUINT16)(cValue * (1 - fabs(fmod(hueValue / 60.0, 2.0) - 1))); - /* Conditons applied for the different angle of hue value */ + /* Conditions applied for the different angle of hue value */ if (hueValue > 0 && hueValue < (HUE_UPPER_LIMIT / 6)) { RgbF_Create(cValue + mValue, xValue + mValue, mValue, elementIndex); @@ -1347,5 +1346,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state ,Appli_LightPwmValue_t light_state) /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h index a6da69fce..24ada82ea 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,5 +276,4 @@ void Light_UpdateLedValue(MOBLEUINT8 state, #endif /* __APPLI_LIGHT_H */ /******************************************************************************/ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c index ef4644a11..8d7dda2f7 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -1202,5 +1201,4 @@ MOBLE_RESULT Appli_Light_HslRange_Status(MOBLEUINT8 const *pHslRange_status, MOB * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h index 77a93eb92..530d0964b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_client.h * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_CLIENT_H @@ -107,5 +106,4 @@ MOBLE_RESULT Appli_LightClient_API(MOBLEUINT8 elementIndex, #endif /* __APPLI_LIGHT_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c index 29efc487d..b1d53e1ec 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -450,5 +449,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h index 9b75aa9ff..42c59766e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_light_lc.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_light_lc.h * @author BLE Mesh Team * @brief Application interface for Light Control Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_LIGHT_LC_H @@ -77,5 +76,4 @@ void Appli_Light_LC_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_LIGHT_LC_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c index 97acbb5c7..27c7c92bf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -1888,4 +1887,3 @@ WEAK_FUNCTION (void SerialPrvn_ProvisioningStatusUpdateCb(uint8_t flagPrvningInP /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h index 353e06664..a28aa8984 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_mesh.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -129,5 +128,4 @@ MOBLE_RESULT BLEMesh_ProvisionDevice(neighbor_params_t *unprovDeviceArray, MOBLE #endif /* __APPLI_MESH_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c index 564d86bf5..ce9af8d33 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -601,7 +600,7 @@ void AppliNvm_Process(void) /** -* @brief Fuction used to set the flag which is responsible for storing the +* @brief Function used to set the flag which is responsible for storing the states in flash. * @param void * @retval void @@ -748,4 +747,3 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, /** * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h index 75353565a..22946c7a3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_nvm.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** -*/ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_NVM_H @@ -95,5 +94,4 @@ MOBLE_RESULT AppliNVM_Retrieve_FlashTesting(MOBLEUINT8 *buffer, #endif /* __APPLI_NVM_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c index d751be1cf..086096403 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -304,7 +303,7 @@ void Appli_Sensor_SeriesGet(sensor_SeriesCbParams_t* pSeriesParam, * Read from application to optimize RAM * @param Sensor offset in sensor init structure * @param descriptor parameters - * @retval Fail if sensor doesn't exist or property ID mismatch occurrs + * @retval Fail if sensor doesn't exist or property ID mismatch occurs * else Success */ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, @@ -354,7 +353,7 @@ MOBLE_RESULT Appli_Sensor_ReadDescriptor(MOBLEUINT8 sensorOffset, * Read sensor value and update buffer * data length <= 128 * PreviousTemperatureValue, PresentTemperatureValue to be updated - * everytime sensor value is changed and call to Sensor_UpdateCadence + * every time sensor value is changed and call to Sensor_UpdateCadence * @param Sensor offset in sensor init structure * @param Value parameters * @retval Fail if sensor doesn't exist @@ -579,7 +578,7 @@ MOBLEUINT8 Appli_Sensor_IsFastCadence(MOBLEUINT8 sensorOffset, } else { - /* Implmented only for sensor at offset 0 */ + /* Implemented only for sensor at offset 0 */ } return fastCadenceStatus; @@ -840,5 +839,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h index 172acf4f7..e45f3d83b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -107,5 +106,4 @@ void Appli_Sensor_SerialCmd(char *rcvdStringBuff, uint16_t rcvdStringSize); #endif /* __APPLI_SENSOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c index 3525a880f..1ce2d49ec 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.c @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensors_client.c * @author BLE Mesh Team * @brief Application interface for Generic Mesh Models -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "hal_common.h" @@ -328,5 +327,4 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h index e28aac4df..350bc4cdf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_sensors_client.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file appli_sensor_client.h * @author BLE Mesh Team * @brief Application interface for Sensor Mesh Models -****************************************************************************** -* @attention -* - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + ****************************************************************************** + * @attention * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 -* -****************************************************************************** -*/ + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __APPLI_SENSOR_CLIENT_H @@ -69,4 +68,3 @@ void Appli_Sensor_Series_Status(const MOBLEUINT8 *pSeries, #endif /* __APPLI_SENSOR_CLIENT_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c index dad3f88ac..c1c72ebb2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -555,5 +554,4 @@ void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h index 8515c36e2..cb16bfefe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/appli_vendor.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,5 +41,4 @@ MOBLE_RESULT Appli_Vendor_SetBigDataPacket(MOBLEUINT8 *data, MOBLEUINT32 length, void Appli_Vendor_Publish(MOBLE_ADDRESS srcAddress); #endif /* __APPLI_VENDOR_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h index 4cc3ce72b..57713f5e3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -63,12 +62,10 @@ #define BLE_CFG_CLT_MAX_NBR_CB 5 /****************************************************************************** - * GAP Service - Apprearance + * GAP Service - Appearance ******************************************************************************/ #define BLE_CFG_UNKNOWN_APPEARANCE (0) #define BLE_CFG_HR_SENSOR_APPEARANCE (832) #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*__BLE_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h index 35a4d96ab..49a3419cb 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/ble_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -203,5 +202,3 @@ #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h index 3afc2e373..3ab0f207f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/cube_hal.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ #ifndef _CUBE_HAL_H_ #define _CUBE_HAL_H_ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s index 636eb47c6..782844084 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/data.s @@ -8,33 +8,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. -;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -;* -;* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -;* (MoBLE) technology. The present solution is developed and maintained for both -;* Mesh library and Applications solely by STMicroelectronics. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ;*/ @@ -47,4 +26,3 @@ _mobleNvmBase_data FILL 4096, 0x00 END -;/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h index 704a08d80..d6748ef45 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/hal_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -49,5 +48,4 @@ void InitDevice(void); void ShouldSleepFunc(void); #endif /* _HAL_H_ */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h index 509192886..1a6022a66 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/mesh_cfg_usr.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ /* * Different provision bearer supported by BLE-Mesh. * Define according to application. -* Atleast one of PB-ADV and PB-GATT should be defined +* At least one of PB-ADV and PB-GATT should be defined */ #define ENABLE_PB_ADV @@ -85,7 +84,7 @@ This may result into excessive flash erase operations, this should be avoided to */ #define SAVE_EMBD_PROVISION_DATA 1 -/* Enables the UUID saving per Node - Currenly Not Supported */ +/* Enables the UUID saving per Node - Currently Not Supported */ #define ENABLE_SAVE_UUID_PER_NODE 0 //#define ENABLE_SERIAL_PRVN 1 @@ -327,7 +326,7 @@ Comment this macro to disable the publication /* Define the following Macro to check the Power-OnOff Cycles -5 Continous cycles of OnOff with Ontime <2 sec will cause unprovisioning +5 Continuous cycles of OnOff with Ontime <2 sec will cause unprovisioning */ //#define ENABLE_UNPROVISIONING_BY_POWER_ONOFF_CYCLE @@ -404,7 +403,7 @@ For STMicroelectronics : it is 0x0030 */ /* Contains a 16-bit vendor-assigned product version ID */ #define PRODUCT_VERSION_ID 0x010A -#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go upto 160*/ +#define MAX_APPLICATION_PACKET_SIZE 160 /*Can go up to 160*/ #define TPT_SEGMENT_COUNT (((MAX_APPLICATION_PACKET_SIZE)/12)+2) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c index 58186edea..668ecbea7 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,7 +129,7 @@ __attribute__((aligned(4)))const MOBLE_VENDOR_CB_MAP vendor_cb = __attribute__((aligned(4)))const Appli_Vendor_cb_t VendorAppli_cb = { - /*Vendor Commads*/ + /*Vendor Commands*/ Appli_Vendor_LEDControl, Appli_Vendor_DeviceInfo, Appli_Vendor_Test, @@ -479,7 +478,7 @@ void BLEMesh_ModelsCommand(void) pLightLCOccupancyModeParam[0] = Led_Value; pLightLCOnOffParam[0] = Led_Value; - /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functionning */ + /*This Switch-case allows to quickly set the different Models Messages parameters in order to demonstrate Client APIs functioning */ switch (ButtonIndex_Value){ case 0: ButtonIndex_Value=0x1; @@ -1150,4 +1149,3 @@ __weak void Test_Process(void) * @} */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h index f00d2d28d..daa30e380 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/models_if.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,4 @@ MOBLE_RESULT MeshClient_SetRemotePublication(MOBLEUINT32 modelId, MOBLEUINT8 ele #endif /* __MODELS_H */ -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c index 12df6a87f..37960317a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/pal_nvm.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * -****************************************************************************** -*/ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "types.h" @@ -440,4 +439,3 @@ MOBLE_RESULT PalNvmProcess(void) return MOBLE_RESULT_SUCCESS; } -/******************* (C) COPYRIGHT 2020 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h index 0b0a971e5..91c8a0ad7 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/sensor_cfg_usr.h @@ -1,21 +1,20 @@ /** -****************************************************************************** + ****************************************************************************** * @file sensor_cfg_usr.h * @author BLE Mesh Team * @brief sensor server initialization parameters -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2020 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under Ultimate Liberty license -* SLA0044, the "License"; You may not use this file except in compliance with -* the License. You may obtain a copy of the License at: -* www.st.com/SLA0044 -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __SENSOR_USR_CFG_H @@ -262,7 +261,7 @@ typedef struct } /** -* Combined defined of all sensors intialization parameters +* Combined defined of all sensors initialization parameters */ #define SENSOR_SERVER_INIT_PARAMS \ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c index 1816cf137..81ff38b74 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/svcctl_conf.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -79,4 +78,3 @@ const uint8_t* SVCCTL_GetBdAddress( void ) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h index 6df3dc0c7..f9c44a264 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -29,5 +28,3 @@ #endif /*__TL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h index b468b2863..b2d9401fc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_dbg_conf.h @@ -1,21 +1,22 @@ +/* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * - ****************************************************************************** + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __TL_DBG_CONF_H @@ -42,7 +43,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -122,5 +123,3 @@ /* USER CODE END Tl_Conf */ #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c index 609ca64cf..85aa6e5da 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/tl_if.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -44,4 +43,3 @@ void shci_register_io_bus(tSHciIO* fops) -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c index 43a0e548d..349251ecd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.c @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.c * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief User interface file -****************************************************************************** -* @attention -* -*

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BlueNRG-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "cube_hal.h" #include "ble_clock.h" @@ -196,7 +174,7 @@ void InitDevice(void) /** -* @brief ShouldSleepFunc sleep mode fuction +* @brief ShouldSleepFunc sleep mode function * @param void * @retval void */ @@ -361,4 +339,3 @@ uint8_t __io_getcharNonBlocking(uint8_t *data) return 0; }/* end serialReadByte() */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h index 773b36116..47889703c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/user_if.h @@ -1,43 +1,21 @@ /** -****************************************************************************** + ****************************************************************************** * @file user_if.h * @author BLE Mesh Team -* @version V1.09.000 -* @date 15-Oct-2018 * @brief Header file for User interface file -****************************************************************************** -* @attention -* -*

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            -* -* Redistribution and use in source and binary forms, with or without modification, -* are permitted provided that the following conditions are met: -* 1. Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* 3. Neither the name of STMicroelectronics nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* Initial BLE-Mesh is built over Motorolas Mesh over Bluetooth Low Energy -* (MoBLE) technology. The present solution is developed and maintained for both -* Mesh library and Applications solely by STMicroelectronics. -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) STMicroelectronics +(-2021) STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef _USER_INTERFACE_H_ @@ -58,5 +36,4 @@ typedef void (* IO_RECEIVE_DATA_USER_CALLBACK_TYPE) (uint8_t * rx_data, uint16_t #endif /* _USER_INTERFACE_H_ */ -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h index 22b6dc41c..5dc48464c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/app/vcp_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,5 +47,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/STM32_WPAN/target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt index 5fa79c899..a21ec540f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_MeshLightingPRFNode/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE Mesh Lighting Proxy Relay Friend Node demo example. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -42,7 +42,7 @@ Connectivity, BLE, IPCC, HSEM, RTC, UART, PWR, BLE protocol, BLE mesh, Dual core - BLE/BLE_MeshLightingPRFNode/Core/Inc/app_entry.h Parameters configuration file of the application - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_conf.h Configuration file of the HW - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_flash.h Configuration file of the FLASH driver needed by EE module - - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h Configuration file of the Hardware Iterface + - BLE/BLE_MeshLightingPRFNode/Core/Inc/hw_if.h Configuration file of the Hardware Interface - BLE/BLE_MeshLightingPRFNode/Core/Inc/lp_timer.h Configuration file of the Low power timer to be used within Mesh Application. - BLE/BLE_MeshLightingPRFNode/Core/Inc/main.h Header for main.c module - BLE/BLE_MeshLightingPRFNode/Core/Inc/stm32wbxx_hal_conf.h HAL configuration file @@ -142,7 +142,7 @@ one FN must be in the direct radio range of an LPN to establish Friendship. @Configuration Low Power Node -Low Power feature support is defined in mesh_cfg_usr.h by hte predefinition of ENABLE_LOW_POWER_FEATURE. +Low Power feature support is defined in mesh_cfg_usr.h by the predefinition of ENABLE_LOW_POWER_FEATURE. Note: A Low Power feature-enabled node does not support any other feature: all the other features should be undefined. @@ -161,7 +161,7 @@ boards as Low Power nodes. Low Power Node setup (use the Low Power Node BLE_MeshLightingLPN project): Step 1. Configure LPN parameters. - Change only if required ohterwise skip this step (use example parameters defined in mesh_cfg_usr.h) + Change only if required otherwise skip this step (use example parameters defined in mesh_cfg_usr.h) LPN_RSSI_FACTOR_LEVEL 1 LPN_RECIVE_WINDOW_FACTOR_LEVEL 1 LPN_MINIMUM_QUEUE_SIZE_LOG 2 diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Binary/BLE_TransparentModeVCP_reference.hex b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Binary/BLE_TransparentModeVCP_reference.hex index e63e9bc09..1dbdb8666 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Binary/BLE_TransparentModeVCP_reference.hex +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Binary/BLE_TransparentModeVCP_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:1000000050330020995D0008A95C0008AB5C000833 -:10001000B55D0008B95D0008BD5D00080000000086 -:10002000000000000000000000000000AD5C0008BF -:10003000AF5C000800000000B15C0008B35C000881 -:10004000C15D0008C55D0008C95D0008C95C000805 -:10005000CD5D0008D15D0008D55D0008D95D0008C0 -:10006000DD5D0008E15D0008E55D0008E95D000870 -:10007000ED5D0008F15D0008F55D0008F95D000820 -:10008000FD5D0008015E0008055E0008B95C00081F -:10009000B75C0008095E00080D5E0008115E0008EC -:1000A000155E0008195E00081D5E0008215E00084C -:1000B000255E0008295E00082D5E0008315E0008FC -:1000C000355E0008395E00083D5E0008415E0008AC -:1000D000455E0008495E00084D5E0008515E00085C -:1000E000555E0008595E00085D5E0008615E00080C -:1000F000D15C0008CD5C0008655E0008695E000800 -:100100006D5E0008715E0008755E0008795E00088B -:100110007D5E0008815E0008855E0008895E00083B -:100120008D5E0008915E0008955E0008995E0008EB -:100130009D5E0008A15E0008A55E000881B000F584 +:1000000008100020D97700081D7600081F76000828 +:1000100021760008237600082576000800000000FD +:10002000000000000000000000000000277600082B +:1000300029760008000000002B7600082D760008C5 +:10004000F5770008F9770008FD7700087D7600084D +:100050000178000805780008097800080D78000884 +:100060001178000815780008197800081D78000834 +:1000700021780008257800083B76000829780008D8 +:100080002D780008317800083578000833760008AC +:1000900031760008397800083D780008417800087A +:1000A00045780008497800084D7800085178000824 +:1000B00055780008597800085D78000861780008D4 +:1000C00065780008697800086D7800087178000884 +:1000D00041760008477600087578000879780008AE +:1000E000757600087D78000881780008857800081A +:1000F0004D7600085176000855760008897800088A +:100100008D780008917800089578000899780008A3 +:100110009D780008A1780008A5780008A978000853 +:10012000AD780008B178000859760008B578000865 +:10013000B9780008BD780008C178000881B000F5E2 :10014000E0700268914203D343681A44914202D39B :1001500080680028F5D101B07047DFF8681708689B :1001600090B94FF4805048604FF480324FF0FF3028 @@ -114,7 +114,7 @@ :100700003868884608B9FFF728FDB96801EB08008A :100710002F30491E20EA010188457DD205F5D876A3 :10072000B06828B1326889188A4275D2884273D37A -:1007300000F0AEFF01001CBF0C6811F1010F6BD07F +:1007300000F072FF01001CBF0C6811F1010F6BD0BB :100740003068201805F5D87230605368984238BF79 :1007500018467060A86960BB286908B1814200D260 :100760002961316174610020F06105F12802386867 @@ -139,7 +139,7 @@ :10089000C368283199420BD200F5E0710C68A2427E :1008A00003D34D682C44A24202D389680029F5D1B4 :1008B000C16999423CBF4FF0FF31C16132BC002099 -:1008C00070470000F0220020D81D00206859883CA5 +:1008C0007047000014390020E03100206859883C4E :1008D0002DE9F84F00258946090AC9F1000B08BF28 :1008E000002323D0B1F5803F28BF1F231ED2A1F5DE :1008F0008072120C02F008029140A1F580531B0C8B @@ -351,1185 +351,1613 @@ :1015D0000BD1D6F8C80100E080680028FCD14FF09C :1015E000FF30306201E000F013F8AFF30080BDE897 :1015F000F387316990688A4228BF8842E3D3C56087 -:101600009560A860EA600020A861DEE7D81D002090 -:10161000012000F053B8F0B4024610689568131822 -:10162000506803EB5004C00721D54D441FE0F0BCC7 -:1016300002F10C00704713F8017B05F8017B491E8D -:10164000F9D1A0B1B60813F8011B06F00306032E6A -:1016500008BF13F8016B01EB06214942801C2944A5 -:1016600005D011F8016B05F8016B401EF9D1A342BA -:10167000DDD013F8016B16F0030104BF13F8011B52 -:10168000C91C30090F28DAD113F8010B0F30D6E747 -:101690000749086808B1002070470648C008C00024 -:1016A00008600549C908C900091A0160704700BFF0 -:1016B00048230020573300205037002080B5AFF377 -:1016C0000080024A11001820ABBEFBE72600020092 -:1016D00030B5040085B008BF012043D004F52A7559 -:1016E000687820B900212970204600F023FD0320EE -:1016F0006870206800F0EFFD002128200AE010FB50 -:1017000001F222442832012353701170D181002349 -:1017100000F02AF862689142F1D3002109E010FB41 -:1017200001F2224402F5B47200231170537000F0EC -:101730001BF862689142F2D383B0211D68462022D3 -:1017400001F0F8FA0EBC206800F0CBFD002084F810 -:10175000240001206870E069012804BF204601F0E0 -:1017600046FB002005B030BD491CD37013615361A6 -:101770009361C9B2704710B500F0C7F801D10220DB -:1017800010BD00F003F800F09FFDB7E0012184F8E0 -:10179000A8122068704738B5044600F0ACF8010480 -:1017A00044BF204600F099F900F0A5F840050CD59B -:1017B00000F09DF84FF6FF3000F095F8204600F05D -:1017C000EBFC0021204600F0A5F800F094F840045E -:1017D00005D500F08CF84BF6FF7000F084F800F0AF -:1017E0008AF8800405D500F082F84DF6FF7000F00D -:1017F0007AF804F5387500F07EF8C0041FD521682A -:10180000B1F840204FF6FB700240A1F840204FF69F -:10181000F770B1F840200240A1F840202878012854 -:1018200004D1002129702046C046C046204600F061 -:10183000C4FC00F05CF84EF6FF7000F054F800F0C5 -:101840005AF8000512D5206800F140014FF2FF70F0 -:101850000A8842F008020A808B8803408B8008883F -:1018600040F004000880204600F0A3FC00F043F89C -:10187000000620D5206800F140014FF67F708A886D -:1018800002408A80287898B90A8842F004020A80C7 -:101890000122088840F0080008802A70888A8008A1 -:1018A00000F03C00686001212046C046C04602E0CE -:1018B000204600F07EFC00F01EF8800508D500F000 -:1018C00016F84FF6FF5000F00EF8204600F060FCCE -:1018D00000F011F8C00505D500F009F84FF6FF60DB -:1018E00000F001F831BD0240A1F8442070472168A2 -:1018F000B1F844207047206801F0E0B9206801F099 -:10190000D4F9002084F8A80210BD044694F8A80277 -:101910000128704710B5FFF7F8FF01D1022010BD74 -:10192000012284F8A82284F82410206801F0B7F975 -:10193000E7E738B5054601F0070428204443281995 -:101940000C0647BF00F12804012000F5B474002004 -:1019500001F00701607021702261E370607808B1C6 -:101960002178E181022B04BF0020207195F8A802A4 -:10197000012801D1022032BD012185F8A81221469B -:10198000286800F0B9FC002085F8A80232BD10B527 -:10199000044600F09BF847BF2830012200F5B470E0 -:1019A000002201F00701427000F069F801D1022025 -:1019B00010BD00F003F800F0CBFDA2E7012284F88F -:1019C000A82201462068704738B501F00705282491 -:1019D0006543441904F5B47401F007016261A36121 -:1019E0000022E2616270217021461DE001F00701D2 -:1019F000282251430844D0F88401704738B51C466A -:101A000001F0070528235D434319283301F007013E -:101A10005A619C61012283F824201C620022DA6151 -:101A2000197001225A701946006800F017FE002054 -:101A300032BD10B5044601F007006268824201D24F -:101A4000012010BD28220B0604D550432044283025 -:101A5000012205E012FB01F2A01800F5B47000228B -:101A6000427001F00701012200F008F801D10220C4 -:101A700010BDFFF7A4FF01F0B9F842E782700170D2 -:101A800094F8A812012970471CB5044601F00F0311 -:101A90006068984201D2012016BD00F017F847BFD8 -:101AA0002830012200F5B470002201F007014270D5 -:101AB0000022FFF7E3FF01D1022016BDFFF77EFFF2 -:101AC00001F0ADF8002084F8A80216BD01F007026D -:101AD00028204243A0180A0670472DE9F84F00F568 -:101AE000B475064627E001880AEA010141F4004185 -:101AF000018006F124043068B0F85010227901EB1F -:101B0000C201401800F202400088A169C0F3090038 -:101B100020620844A0610021304600F030FB2178AB -:101B200049B1E06938B92178306841F08001A0F806 -:101B30004C1000212170306800F144010A88130420 -:101B400040F114810A8812F00F0440F68F7748F6AE -:101B50000F7A65D1D206C6D50288130511D58989B9 -:101B600000F015F9EA88C3F30903EB6106F52C715F -:101B700001F0BDF8306800F0FCF8304600F0EFFAF4 -:101B8000D9E71104D7D500F0F4F83068B0F8501058 -:101B900000F0FDF8C3F30903002BEB611CBF69697A -:101BA00000290AD0EA8801F0A2F86869E9690844C6 -:101BB00068610021304600F0D8FA306801880A05D3 -:101BC000B9D4B0F850104118286901F2064148B95B -:101BD000088848F2FF32104008800A8842F4004228 -:101BE0000A8010E03F2805D24208C00748BF521CB7 -:101BF000900207E0420910F01F0F08BF521E90022A -:101C000040F400400880306801884BF68F72114024 -:101C100081F4405141F4004141F0800101808AE7A4 -:101C2000282130F8248011FB04F106EB01095FEA5A -:101C3000084160D530F824100F4047F0800720F8A5 -:101C4000247009F5B477387B58B93068B0F8501073 -:101C50003A7801EBC201411800F091F837D0FA88C8 -:101C600031E0F878022806D142463946304600F085 -:101C700096F883462BE03068397830F8212048F612 -:101C80008F731A4042F4004242F0C00220F8212033 -:101C900030683A78134630F823305904B0F85030A1 -:101CA00003EBC2020AD5811801F202410988C1F38F -:101CB000090BBBF1000F0AD03A8904E0811800F04B -:101CC0005EF804D07A895B46796901F010F8F8690A -:101CD0005844F861786958447861B86910B13A6934 -:101CE000934504D23978304600F03FFA03E030687B -:101CF000394600F0B3FC5FEA086027D5306830F859 -:101D000024200AEA020242F4004209F1280120F8E4 -:101D10002420C878022824D15FEAC85221D4306830 -:101D20000A78B0F8503003EBC203C01800F202404A -:101D300003888869C3F30903834234BFC01A0020B3 -:101D4000886120B91146304600F019FAF3E6486977 -:101D500018444861C8691B18CB61306800F07EFCEC -:101D6000E9E64246304600F077F8E4E60020BDE8B8 -:101D7000F28F01880F4047F080070780704701F21B -:101D800006410988C1F3090BBBF1000F70472A789F -:101D900001EBC201411801F206410B8870472DE9A1 -:101DA000FC410D4600682B78A969B0F850605404D6 -:101DB00048F2C00848F68F7748F2800C4BF68F7EC9 -:101DC00006EBC30419D5061906F202463488C4F39B -:101DD0000904A1422CBF091B0021A96129B930F8CF -:101DE00023100EEA010100F027F8510601D500F09A -:101DF0002AF8F4B123462A8918E0061906F20646A5 -:101E00003488C4F30904A1422CBF091B0021A96135 -:101E100029B930F823100EEA010100F00DF851063F -:101E200001D400F010F824B123466A89696900F0F2 -:101E30005EFF2046BDE8F68181F400514CEA0101C5 -:101E400020F823107047297830F82120174048EAFD -:101E5000070220F8212070472DE9FC410D46044679 -:101E60001646216895F800E0A8697306B1F850306D -:101E70004CF2800748F68F7803EBCE0340F1858063 -:101E8000CB1803F202431B88C3F30903834234BF18 -:101E9000C01A00200028A86125D1687838B9B1F8A7 -:101EA0005000081800EBCE0C00F015F913E00128E3 -:101EB00009D000F030F92046297800F060F970046C -:101EC00040F1ED8082E0B1F85000081800EBCE0C34 -:101ED0000CF2024C0020ACF8000068780028E8D131 -:101EE00000F007F9E7E7720406D531F82E0008EA9A -:101EF0000000074321F82E7095F8240001286ED1C8 -:101F000000F0DFF803D31346C01A286208E010B9C6 -:101F100085F8240004E0002285F8242003462A6284 -:101F2000687810BB2068B0F850208218287802EB3F -:101F3000C00202F2024233B9168848F2FF3006406E -:101F4000168010880DE03F2B05D25808DE0748BFE9 -:101F5000401C800207E0580913F01F0F08BF401E05 -:101F6000800240F4004010800BE0012809D1206875 -:101F7000B0F8502080182A7800EBC20000F202402E -:101F800003802A8920689BB287E0CB1803F20643BE -:101F90001B88C3F3090398422CBFC01A00200028F5 -:101FA000A8612DD1687838B9B1F85000081800EB55 -:101FB000CE0C00F090F81BE0012811D000F0ABF837 -:101FC0002046297800F0DBF8700468D4216828786E -:101FD00031F8202008EA0202174321F820705EE061 -:101FE000B1F85000081800EBCE0C0CF2024C0020A7 -:101FF000ACF8000068780028E0D100F07AF8DFE75C -:10200000720406D431F82E0008EA0000074321F8D4 -:102010002E7095F82400012841D100F052F803D326 -:102020001346C01A286205E010B10346002028625A -:1020300085F824002668687808BBB6F85000321886 -:10204000287802EBC00202F2064233B9178848F240 -:10205000FF300740178010880DE03F2B05D258084D -:10206000DF0748BF401C800207E0580913F01F0F2C -:1020700008BF401E800240F4004010800AE00128A2 -:1020800008D1B6F850002A78301800EBC20000F2F0 -:10209000064003809BB26A89304600F017FE226832 -:1020A000297832F8213048F6BF70034083F03003BE -:1020B00043F4004343F0800322F821300020BDE8C0 -:1020C000F681E86969692A691818E8611944286A7B -:1020D0006961904270470CF2024C48F2FF30BCF844 -:1020E00000300340ACF80030BCF8000040F4004081 -:1020F0007047B1F850000918287801EBC00101F2CF -:10210000064148F2FF300A8802400A80088840F4FD -:102110000040088070476878012809D1B1F8500064 -:102120000818297800EBC10000F206400022028066 -:102130007047000080B56148016841F0806101602E -:102140000022006800F080600090062100981420B2 -:1021500000F07EFEBDE80240142000F097BE00F5BE -:102160002C71D0F8F00200F01FBF0B462822534319 -:10217000C218D0F8F002D2F87C2100F043BF0B4621 -:1021800028225343C218D0F8F002D26B00F06FBF80 -:10219000D0F8F00200F0FABF10B50446D4F8F0020F -:1021A00000F0B1FFD4F8F002BDE81040012100F0CA -:1021B000D9BFD0F8F00200F0D8BFD0F8F00200F09C -:1021C000DCBF10B53E4C3F492160C4F8F002082145 -:1021D00061600021E16002212161A1600021A16113 -:1021E000C0F8C4422046FFF773FA182300220021EA -:1021F00000F012F858230022802100F00DF8C023CF -:102200000022812100F008F84FF488730022012198 -:1022100000F002F8002010BD204600F0CEBD80B5D1 -:10222000D0F8C402FFF7A7FA002002BD10B51C4683 -:102230001346D0F8C4022246FFF77BFB002010BDF6 -:1022400080B5D0F8C402FFF7A2FB002002BD80B524 -:10225000D0F8C402FFF7EDFB002002BD80B5D0F836 -:10226000C402FFF711FC002002BD81B0D0F8C422E7 -:1022700001F07F0328204343D01809064CBF90F893 -:102280002A0090F86A0101B0704780B5D0F8C40206 -:10229000FFF740FB002002BD80B5D0F8C402FFF775 -:1022A000ADFB002002BD80B5D0F8C402FFF78CFB67 -:1022B000002002BDD0F8C402FFF798BB58000058B8 -:1022C000B4180020006800404030002181804BF6A7 -:1022D000807100F0E1BCB0F8402044F27F0100F0D2 -:1022E000F0BC0EB4012120F8401F00210180818044 -:1022F0000182002003B070472DE9F8470B4648F6ED -:102300008F111D780246002032F825600E40D978E2 -:1023100003290CD8DFE801F002080C0546F400762A -:1023200006E046F4C06603E046F4806600E0012063 -:1023300048F28004264322F8256048F68F75197804 -:102340000E4632F826702F403943214322F82610DA -:102350004BF68F76197B93F8009000294CF280079A -:1023600048F6BF7C48F2C00E72D1B3F806A04FF613 -:10237000FE7101EA0A0A59780029B2F85010114496 -:102380001ED001EBC90101F58061A1F800A0197808 -:1023900032F82160760606D532F8216035404EEAE3 -:1023A000050522F821501978DB78012B32F821300D -:1023B0000CEA03030EBF1C4383F020031C43C3E05D -:1023C00001EBC90909F20449A9F800A0B2F85010BC -:1023D00002EB010C19780CEBC10C19690CF2064CDC -:1023E00051B9BCF800E048F2FF3101EA0E01ACF847 -:1023F0000010BCF8001013E03F2908D24FEA510E3C -:10240000C90748BF0EF1010E4FEA8E210AE04FEADC -:10241000511E11F01F0F08BFAEF1010E4FEA8E21C1 -:1024200041F40041ACF80010197832F821C05FEA9D -:102430004C4C06D532F821C005EA0C053D4322F884 -:102440002150197832F821301E4086F440567AE047 -:1024500032F82910294041F4014141F0800122F86D -:102460002910B2F85010B3F808A002EB010919784E -:1024700009EBC10101F580694FF6FE7101EA0A011D -:10248000A9F80010B2F85010B3F80A9002EB010856 -:10249000197808EBC10808F204484FF6FE7101EA0A -:1024A0000901A8F80010597893F80080002932F843 -:1024B000281023D1490405D532F8281029400F43AC -:1024C00022F82870197832F821707F0606D532F884 -:1024D00021703D404EEA050522F82150197832F866 -:1024E00021502E4086F44056264322F82160197868 -:1024F00032F821300CEA03031C4325E0490405D5DA -:1025000032F8281029400F4322F82870197832F841 -:1025100021707F0606D532F821703D404EEA050550 -:1025200022F82150DD781978012D32F821500CEA7B -:10253000050518BF85F02005254322F8215019789C -:1025400032F821301E40344322F82140BDE8F287A2 -:102550002DE9F041024691F800C048780B7B4BF61C -:102560008F7E4CF2800448F2800848F6BF7548F22E -:10257000C00648F68F77ABB9002832F82C0008D097 -:10258000400636D532F82C0007403E4322F82C6036 -:102590002FE0400456D532F82C0007403C4322F887 -:1025A0002C404FE0002832F82C0029D1400405D5FA -:1025B00032F82C003840044322F82C40087832F8D6 -:1025C00020305B0605D532F820303B40334322F8FB -:1025D0002030087832F820301F403E4322F8206037 -:1025E000087832F820300EEA030348EA030322F8A1 -:1025F0002030087832F820100D4048EA050128E024 -:10260000400405D532F82C003840204322F82C0035 -:10261000087832F820305B0605D532F820303B4090 -:102620001E4322F82060087832F820301F403C43D7 -:1026300022F82040087832F820301D4048EA05058D -:1026400022F82050087832F820100EEA010148EAFA -:10265000010122F820100020BDE8F0812DE9FC4E98 -:102660000E4605467278307B012A48F2800748F60C -:102670008F7140F06381D6F810A0B269544694423D -:1026800088BF144628B9F28800F0ACFA00F082FA4C -:102690004BE196F803B06309620896F800C0D6F8DB -:1026A00020E0BBF1020F04F0010048F2801940F075 -:1026B0009E80F24580F0918035F82CA001EA0A0155 -:1026C00049EA010125F82C10AEEB0401316296F8BD -:1026D00000C07178E64635F82EE05FEA4E693DD5D8 -:1026E00099B900F036FA14B900F05EFA09E03F2C0F -:1026F00002D200F00DFA06E014F01F0F08BF5B1EB7 -:10270000980240F40040088001E000F05FFA00F019 -:1027100068FA00F001FA32BF001B04460020306264 -:102720007078002840F0B08000F004FA01F2024115 -:1027300014B900F039FA0DE03F2C05D26008E20729 -:1027400048BF401C800207E0600914F01F0F08BF5B -:10275000401E800240F40040088099E099B900F0E2 -:10276000F0F914B900F020FA09E03F2C02D200F091 -:10277000CFF906E014F01F0F08BF5B1E980240F46B -:102780000040088001E000F016FA328900F02AFAD1 -:1027900000F0C2F932BF001B04460020306270789E -:1027A000002840F0B18000F0C5F901F2064114B9EB -:1027B00000F0FAF90DE03F2C05D26008E20748BFAF -:1027C000401C800207E0600914F01F0F08BF401E84 -:1027D000800240F400400880A1E035F82C1048F653 -:1027E0008F600140394325F82C1074464EE035F8CF -:1027F0002CA001EA0A0149EA010125F82C10AEEBF0 -:102800000401316296F800C07178E64635F82EE092 -:102810005FEA4E693FD599B900F09BF914B900F011 -:10282000C3F909E03F2C02D200F072F906E014F07F -:102830001F0F08BF5B1E980240F40040088001E0B3 -:1028400000F0C4F900F0CDF900F066F932BF001BCA -:1028500004460020002C306267D07078A0B900F0E8 -:1028600088F900F2024005D26108E20748BF491C1E -:10287000890207E0610914F01F0F08BF491E890291 -:1028800041F40041018003E0012801D100F082F908 -:10289000A3B2328945E099B900F053F914B900F0B8 -:1028A00083F909E03F2C02D200F032F906E014F07F -:1028B0001F0F08BF5B1E980240F40040088001E033 -:1028C00000F079F9328900F08DF900F025F932BF76 -:1028D000001B0446002030623CB37078A0B900F0C1 -:1028E00048F900F2064005D26108E20748BF491CDA -:1028F000890207E0610914F01F0F08BF491E890211 -:1029000041F4004101800AE0012808D1B5F85000E7 -:102910003178281800EBC10000F206400480A3B211 -:1029200072897169284600F0D1F9317835F8212093 -:1029300048F6BF70024082F0300219E000282CD126 -:10294000B1693069884232BF091A08460021B16175 -:1029500000F017F990B900F027F940F40040088022 -:10296000317835F821204BF68F70024082F44052C6 -:10297000174325F821700020BDE8F68E3F2805D2C8 -:102980004208C00748BF521C9002E8E7420910F015 -:102990001F0F08BF521E9002DFE7F078022859D1BE -:1029A000C2B900F0DEF802F2024210B900F0BBF842 -:1029B0000DE03F2805D24308C00748BF5B1C9802C2 -:1029C00007E0430910F01F0F08BF5B1E980240F498 -:1029D000004010807078C8B900F0C3F802F20642D7 -:1029E00010B900F0A0F80DE03F2805D24308C00759 -:1029F00048BF5B1C980207E0430910F01F0F08BF97 -:102A00005B1E980240F4004010800BE0012809D1C1 -:102A1000B5F850003278281800EBC20000F20640EA -:102A200032690280F06900289AD0307835F8202089 -:102A300044F2400303EA02049C4218BF1A428FD1B9 -:102A400035F82020114041F4004141F0C00125F843 -:102A5000201085E7012859D1B1693069884232BF19 -:102A6000091A08460021B161440900F00101430838 -:102A70002ABBB5F8502005EB020C32780CEBC20CE7 -:102A80000CF2024C50B9BCF800E048F2FF3202EA06 -:102A90000E02ACF80020BCF800200CE03F2804D265 -:102AA0001A4601B1521C920207E0224610F01F0F95 -:102AB00008BF521E920242F40042ACF80020727825 -:102AC000FAB9B5F8502096F800C0AA1802EBCC026B -:102AD00002F2064248B9118848F2FF3001401180E5 -:102AE000108840F4004010803AE73F2803D201B13B -:102AF0005B1C9802F7E710F01F0F08BF641EA002CE -:102B0000EFE7012AF0D100F03CF828E7012033E795 -:102B100000B1521C900270477069316920447061A5 -:102B2000306A81427047138848F2FF3003401380B7 -:102B300010887047B5F850002918307801EBC001B3 -:102B40007047B5F85010691801EBCC0101F2024151 -:102B50007047B5F85010691801EBCC0101F206413D -:102B60007047B5F850002A18307802EBC00230697F -:102B70007047B5F850003178281800EBC1003F2CA1 -:102B80007047B5F850103278691801EBC20101F2B4 -:102B900006417047B5F850003178281800EBC100A5 -:102BA00000F20240048070470A8848F2FF30024079 -:102BB0000A8008887047012907D1B5F85000281805 -:102BC00000EBCC0000F2024004807047012907D1DD -:102BD000B5F85000281800EBCC0000F20640048045 -:102BE000704772897169A3B228466FE018B50A78F8 -:102BF000497830F82240002948F2800305D048F691 -:102C0000BF710C4084F0100404E04BF68F710C404F -:102C100084F48054234320F82230002012BD30B5C4 -:102C20000A7B002A36D14A780C78002A30F8242012 -:102C300048F2800348F68F7516D0520608D530F852 -:102C40002420154045F4004545F0C00520F82450E7 -:102C5000CA78012A1ED00A7830F8224048F6BF719F -:102C60000C4084F0200412E0520408D530F82420EF -:102C7000154045F4404545F0800520F824500A7879 -:102C800030F822404BF68F710C4084F440542343BB -:102C900020F82230002030BD01800020704711B99B -:102CA0008021A0F84C1000207047B0F8581041F473 -:102CB0000041FFE7A0F8581000207047B0F844002A -:102CC00070470A40A0F840200020704710B58018D7 -:102CD0005B1C00F580605B0807E00A784C7842EAEC -:102CE0000422891C20F8022B5B1EF6D110BD10B502 -:102CF000821802F58062580806E032F8024B0C7028 -:102D0000240A4C70891C401EF7D1D80744BF108894 -:102D1000087010BD62B38B0708D0521E11F8013B3A -:102D200000F8013B00F024808B07F6D1830740F0C8 -:102D3000208000BF103A07D330B4B1E83810103A01 -:102D4000A0E83810F9D230BC530724BFB1E808100E -:102D5000A0E8081044BF51F8043B40F8043BD207F8 -:102D600024BF31F8022B20F8022B44BF0B780370EC -:102D70007047121F17D35B0009D151F8043B20F8AC -:102D8000023B1B0C121F20F8023BF6D20BE051F85D -:102D9000043B00F8013B1B0A20F8023B1B0C121FEE -:102DA00000F8013BF3D238BF121D521E24BF11F8A8 -:102DB000013B00F8013BF8D8704730B528240D06D8 -:102DC00005D501F0070161430844283003E0614361 -:102DD000084400F5B4701AB900210173C38004E0FF -:102DE000038101211B0C01734381002030BD016868 -:102DF00000F538700122826000220270B1F85400A0 -:102E000040F00100A1F85400B1F8540040F0020075 -:102E1000A1F85400002070470901020081B002D4DB -:102E20003C48815405E03C4802F00F02104400F891 -:102E3000041C01B07047394A13684FF6FF010002C5 -:102E40000B4000F4E06018433549084310607047B8 -:102E500038B5324B1C68C4F30223C3F10704052CB8 -:102E600028BF04241D1D072D34BF0023DB1E0125B0 -:102E700005FA04F4641E2140994005FA03F35B1E31 -:102E80001A401143BDE83440C6E70000010007D4F2 -:102E9000012200F01F01234B8A40400943F8202003 -:102EA000704701000BD4012200F01F011E4B8A4025 -:102EB000400943F82020BFF34F8FBFF36F8F704757 -:102EC00010B5401EB0F1807F01D3012010BD174C1A -:102ED00060600F214FF0FF30FFF79EFF0022A260DD -:102EE00007202060002010BD010007D4012200F05F -:102EF0001F010F4B8A40400943F820207047010012 -:102F000007D4012200F01F010A4B8A40400943F810 -:102F10002020704700E400E018ED00E00CED00E038 -:102F20000000FA0500E100E080E100E010E000E0D0 -:102F300000E200E080E200E010B508B9032010BD17 -:102F400000F527730024DC615C621C6301B19961A8 -:102F5000012119700270BDE81040FFF732B91CB5AD -:102F60000022ADF8002009B9032016BD00F52E742B -:102F70002160C96A11B1684688476061002016BDAA -:102F8000FFF74DB980B5D0F8B832032213B11A68F3 -:102F900090470246104602BD80B5D0F8B8220AB16B -:102FA00052689047002002BD38B5044604F2AA25B5 -:102FB000284600F00FFB04F5257001210160818B8C -:102FC0004160817D11F01F0003D002280DD006D38F -:102FD00011E029462046BDE8344000F0EDB829460E -:102FE0002046BDE8344000F064B929462046BDE8DB -:102FF000344000F084B92046BDE8344001F080013F -:10300000FFF725B938B5044610460B0004F52572C4 -:1030100021D11168032910D104F5AE714B680D68F8 -:10302000AB420CD2ED1A4B680D602A469A4201461B -:1030300088BF1A46204600F02BFB002032BD107AD4 -:10304000032804D1516A096909B1204688472046FE -:1030500000F026FBF1E7107A0328EED1526A92695C -:10306000002AEAD0204690470100E6D032BD38B5AC -:10307000044610460A0004F5257538D1296802294E -:103080002ED1E269216A914206D2521AE2610146CA -:10309000204600F0EBFA0DE013D1A069884210D36E -:1030A000696888420DD200220021204600F0DEFA35 -:1030B000002068600023002200212046FFF7F3F87B -:1030C0000EE0287A032804D1696AC96809B120464C -:1030D000884780212046FFF7BAF8204600F0E7FA3B -:1030E000287B012804BF00212973002032BD287AE3 -:1030F0000328FAD16A6A5269002AF6D0204690471E -:103100000100F2D032BD1CB5044604F52570012142 -:1031100001720021016061600161416A09B9032007 -:1031200016BD806A00281CBF4A68002A02D0002110 -:10313000204690474023002200212046FFF776F8E2 -:1031400004F5B070012181804023402101600022FC -:1031500080212046FFF76AF80120A08440202062E9 -:10316000002016BD01740020704700F5277001781B -:103170004170042101700020704700F5277001782C -:10318000042904BF427802700020704780B500F522 -:103190002772D16909B9032002BD1278032A02D12E -:1031A000C96901B18847002002BD0000417800785C -:1031B00040EA012070470000F8B500240546087871 -:1031C00010F0600005F5277608D0202818BF4028A9 -:1031D0002ED1F26993682846984730E0487809284C -:1031E00026D8DFE800F03F592553250905252E296B -:1031F000284600F013F95AE08A88002A04BFC888DC -:10320000002815D14F88802F12D23078032807F07C -:103210007F070DD0B77039462846FFF736F82846A5 -:1032200000F03EFA002F14BF0220012030703EE073 -:10323000284600F0E4F93AE0284600F078F9044620 -:1032400035E0C8880128F3D13278521E012A04D90A -:10325000921EEDD10122291D14E0AC60012205F17E -:1032600008010FE03078401E0228E1D8C888022803 -:10327000DED10121E960B06808B10321E9600222D2 -:1032800005F10C01284600F0E9F910E04888012812 -:103290000DD10121B16007E03078401E0228C7D867 -:1032A0004888012803D1B460284600F0F9F9204687 -:1032B000F2BD70B50E4604463078002510F060006F -:1032C0001CBF2028402815D104F527721178491E0B -:1032D00002290FD8307902280CD2D269936831467E -:1032E000204698470546F08838B9280005D100F0F7 -:1032F00018F902E0314600F018F9284670BD2DE9B2 -:10330000FC410E46002580463078317910F060008F -:1033100008F5277704D020283AD0402864D137E038 -:10332000707800283BD0012815D003285CD138786C -:10333000022816D0032857D1708840B9002918BF39 -:10334000802904D0F08810B94046FEF780FF40463F -:1033500000F0A6F94CE03878022802D003280CD0FF -:1033600042E0002918BF80293ED04046FEF76FFF9B -:1033700080214046FEF76BFF3AE07088C0BB11F039 -:103380007F0F1CBF4046FEF769FF404600F088F9FA -:10339000FA699368314640469847054628E014206C -:1033A00001F07F023B7842434244022B02F5AA74AB -:1033B00002D0032B0FD017E0002918BF802913D1AA -:1033C000080648BF02F11404256002222146404647 -:1033D00000F044F90CE001F00F0310FB03F00B06C2 -:1033E000404408D5808C78B93146404600F007F952 -:1033F0002846BDE8F681B0F864010028F4D0002921 -:1034000018BF802903D1DFE702F11404F7E7404633 -:10341000FEF72BFF00B101202060D6E738B5044647 -:1034200000200D46ADF8000004F52D726888010AF1 -:10343000012908D002291ED0032929D006295AD0F3 -:1034400007295FD067E01268207C136869469847B7 -:10345000EA88002A62D0BDF8001000295BD09142B2 -:1034600088BF1146ADF800100146BDF80020204687 -:1034700000F0F4F831BD207C51680028684604D182 -:10348000896A884702214170E2E7C96A8847F9E7FB -:10349000C0B205283FD8DFE800F0030B121920273F -:1034A00010684268002A36D0207C69469047CFE7F2 -:1034B000106882687AB3207C69469047C8E7106834 -:1034C000C26842B3207C69469047C1E71068026930 -:1034D0000AB3207C69469047BAE710684269D2B1C6 -:1034E000207C69469047B3E7106882699AB1207CD6 -:1034F00069469047ACE7207C68B951684A6B6846DA -:103500009047A5E7207C30B951680A6B6846904720 -:10351000072242709CE700F007F831BD00F001F887 -:1035200031BD204600F0BCB82946204667E0F8B51A -:103530000D460446244F68883870002639780846BE -:10354000022803D3FFF7F0FF0320F2BD94F89C227A -:10355000022A02D0032A0FD02EE0002929D0606071 -:103560002046FFF70FFD060002D0FFF7DDFF29E040 -:10357000FFF7D7FF032019E031B9022084F89C023D -:10358000666000F024F814E06168884211D000F011 -:103590001DF8397861602046FFF7F4FC060008D07A -:1035A000FFF7C2FF616800F011F8022084F89C0266 -:1035B00008E0FFF7B6FF05E0FFF7B6FF397800F047 -:1035C00006F803263046F2BD4C230020C9B220463F -:1035D000FFF7E2BC38B50D460446287820706878BD -:1035E0006070A81CFFF7E2FD60802D1D2846FFF7E4 -:1035F000DDFDA080A81CFFF7D9FDE08031BD10B52E -:1036000004468021FEF723FE2046BDE8104000213D -:10361000FEF71DBE00280B4600D1704730B50021D3 -:10362000044600E0491C14F8015B002DFAD109069C -:10363000C90D891C1180117819700222032159705B -:1036400008E010F8011BD4B2521C1955D4B2002165 -:103650001955521C01780029F3D130BD80B51346AD -:103660000222C0F894228361C36101E080B5134651 -:103670000A460021FEF710FE002002BD80B5134669 -:103680000322C0F8942200F5AC721360536001E08D -:1036900080B513460A460021FEF705FE002002BD54 -:1036A00080B50421C0F8941200230022E1E780B520 -:1036B0000521C0F8941200230022ECE7DFF8F01493 -:1036C0000A6892B200E00246086880B28242FAD1EB -:1036D00070472DE9FC4104461825DFF8D884DFF84F -:1036E000D864684308EB00073078062808D13178A1 -:1036F0007170347078754FF0FF307060002039E0E1 -:1037000000F077F8B9680918B96008F10803B968DA -:1037100032786A439A589142327813D308F11503EC -:1037200015FB02FC13F80C30062B25D008F1080617 -:103730006B43F358994222BF08F115036A439A5C20 -:10374000EED219E01146337869439A420BD008F162 -:10375000140308F1150C5B5C15FB03F50CF8054030 -:103760007A753B7500E07A7508F11402545431788B -:1037700071703470BDE8F6811146694308F1150394 -:103780005B5C062B04D008F1140615FB03F5745599 -:103790007B753A7508F115025454EBE7F8B5DFF87C -:1037A0001834DFF810541E78182402466243B042E1 -:1037B0002A4404D118785870507D18700FE0167D97 -:1037C000507D92F815C005F115076643062807F8E5 -:1037D00006C004D0167D143514FB00F42E550120CC -:1037E00010731878062802BF00294FF0FF31596086 -:1037F000F1BD10B5DFF8C043606810F1010F0FD0C4 -:10380000FFF75CFF6168DFF8B423814261683CBF69 -:103810005388C918081A517848431178C84000E005 -:10382000002080B210BD2DE9F84FDFF89053DFF88B -:1038300090B3D5F80880D8F80000DBF800104A05EE -:1038400000F06AF9DFF87063DFF868A321F48061A3 -:1038500081604FF0180934780AF1080019FB04F16F -:103860004758FFF7C6FF874217D200270121B170E2 -:10387000062C3DD019FB04F40AF108010AF10802F4 -:103880000959814223BF0AF108010959091A002187 -:1038900011510AEB04014C7DEAE7A9884118B942AD -:1038A00002D2AF880021E2E73F1ADFE7022802DAFE -:1038B0002878012800D07F1ED8F80000C1684A0788 -:1038C000FAD500F02FF9DBF80C00000CBFB247EA84 -:1038D0000047CBF80C70FFF7F1FE7060A868006835 -:1038E000816841F480618160AFF30080BDE8F18FB1 -:1038F000B8B20028DAD1FFF7E1FE70600320BDE81E -:10390000F24FFFF7F1BA2DE9F843EFF3108872B6E2 -:10391000AA4DA84BA8680168CA224A62532048628F -:10392000A54A886820F48060886018201678374699 -:1039300047431F44387B022826D13C68D7F81090B3 -:103940009078F0B17A7B012A0AD101213046FFF745 -:1039500025FF88F310887968304600F0F0F804E01D -:1039600088F31088304600F09BF8A8680068CA21E8 -:1039700041622246532141624846314600F02AF90D -:103980000BE0FFF750FF06E0C8684207FCD500F0E7 -:103990007EF88C49086088F31088FF21A8680268C7 -:1039A0005162BDE8F183F8B5844CA160CA22096870 -:1039B0004A6253224A62824A136843F0200313602A -:1039C000136803F00703C3F10403237095682D0CFB -:1039D00005F07F056D1C6570EDB29268C2F30E02B2 -:1039E000521C628092B2521E6A43A2F5A072DA4063 -:1039F0004FF6FF739A422CBFA380A280724A1368CD -:103A000043F400231360714B1D6845F400251D60CD -:103A100048BB6948674E0123837018254FF0FF3378 -:103A2000436000235FFA83FC06F10C0715FB0CFCD6 -:103A30004FF0000E07F80CE05B1CDFB2062FF1DB45 -:103A400006230370886820F48060886000F01FF807 -:103A5000D0600320FFF753FAA1680868826842F437 -:103A60008042826005E0C868410544BF0320FFF73B -:103A70003BFAA1680A68FF2050620022032103205C -:103A8000FFF7E6F9BDE8F2400320FFF7FFB9C86889 -:103A900000F0800060F49060C8604FF40020704730 -:103AA000F8B50746EFF3108472B60320FFF7F9F973 -:103AB000424DAE683068CA2141623A4653214162A4 -:103AC000182043494243895C02291BD10021384612 -:103AD000FFF764FE3848017806290ED1306838496E -:103AE0000A68530500F018F821F480618160C1680C -:103AF0004A07FCD500F016F804E04078884218BF69 -:103B0000FFF791FEA9680A68FF2050620320FFF7C3 -:103B1000BDF984F31088F1BD02D5C1684A07FCD411 -:103B200081687047C16801F0800161F49061C160F3 -:103B30004FF40020234908600320FFF7E0B92DE986 -:103B4000F04180460F46424618201A4942438C18DD -:103B5000207B022804BF4046FFF7A2FFEFF3108549 -:103B600072B60320FFF79DF9144EB0680068CA21B1 -:103B700041625321416202202073A7606760404682 -:103B8000FFF7A7FD0C490A784978914202D0FFF768 -:103B90004AFE02E0A168081AA060FF20B1680A6826 -:103BA00050620320FFF772F985F31088BDE8F081B9 -:103BB00028280040BC2100203C23002008230020AE -:103BC000082800400C0800580008005880080058D9 -:103BD000C821002010470000DFF864130A680309B9 -:103BE00003F47F2300019A4300F47F2000F082B9A0 -:103BF000DFF84C231368010C23EA014343EA004336 -:103C0000136070472DE9F843054600242878DFF853 -:103C100030634106A0464FF0B0472DD5286B70B1F8 -:103C2000B0F5800F06D0B0F5000F18BFB0F5400F0B -:103C300017D01FE0F86840F48030F860EDE0386895 -:103C400020F08060386000F081F98146386800011A -:103C500040F1D08000F07AF9A0EB09000228F5D9F4 -:103C60000324D7E000F072F9A0EB0900022840F22B -:103C7000C980F5E70124A0462868010531D5B06860 -:103C800000F44078286C80452AD000F065F9B8F13E -:103C9000000FB16805D1286C21F440710143B16077 -:103CA0001EE0B06840F48030B06021F44071B0682C -:103CB00020F48030B060286C0143B160B068C00768 -:103CC0000ED500F043F9804641F28939B06880078B -:103CD00006D400F03BF9A0EB08004845F6D30324D6 -:103CE000A0462878C10705D53168A869890840EA47 -:103CF000810131602878810705D53168E86921F4B0 -:103D00004061014331602878C10644BFA86AFFF7CB -:103D10006FFF2878810644BFE86AFFF769FF2878BB -:103D2000410744BF286AFFF757FF2878010744BFBF -:103D3000686AFFF751FF2868C1051BD53168686BB9 -:103D400021F0406101433160686BB0F1006F00F019 -:103D5000BDF8686BB0F1806F75D100F0BDF8044616 -:103D60003868000160D500F0F1F8001B0228F7D98F -:103D70004FF0030867E000F0E9F8001B02285BD968 -:103D8000F6E7316821F04041316020F08050326820 -:103D900022F0406210433060A86BB0F1C05F00F0C9 -:103DA00095F8286841056DD53168E86B21F04051E0 -:103DB00001433160E86BB0F1005F03D1F96841F471 -:103DC0008031F960E86BB0F1805F5BD100F084F87E -:103DD00004463868000146D500F0B8F8001B0228F8 -:103DE000F7D94FF003084DE000F0B0F8001B0228AF -:103DF00041D9F6E700F061F8A86821F4781100F0E5 -:103E000071F88146386800017FF52CAF396968691F -:103E100001433961002C7FF42EAF3168286B21F407 -:103E200040010143316027E700F047F8E86821F0DE -:103E3000606100F057F80446386800019BD5396985 -:103E400068690143396128688105AAD5A86BB0F17A -:103E5000804F1CBFB0F1004F002892D1316821F093 -:103E60004041084397E700F028F8286921F06041B5 -:103E700000F038F8044638680001B5D5396968693A -:103E8000014339612868C10405D5F168686C21F4E3 -:103E900040410143F160286881040BD5796AE86CE0 -:103EA00021F0300101437962796AA86C890840EAFF -:103EB000810179624046BDE8F2833869696820F47F -:103EC000FE4040EA012038613969704703D1F96842 -:103ED00041F08071F9607047396821F08061396084 -:103EE00000F034B801433961386840F080603860D0 -:103EF00000F02CB810430860704710B511490A68EB -:103F000042F080720A600B680F4A23F080730B60E6 -:103F1000046841680C4381680C43C1680C43016923 -:103F200044EA014454601368406923F47C5343EA33 -:103F300000231360116841F06001116010BD0000A2 -:103F40008800005838000058006000400148406870 -:103F5000704700BF501000200248016841F4807192 -:103F6000016070470004005810B590B004A80FF22B -:103F70001C31BD4C3022FEF7DDFE2068BB4C4FF6F5 -:103F8000FC7101EA8001BA484118BA4802906161A7 -:103F900000F5867003900FF22D210FF27920019029 -:103FA0000091684600F0ABF90121022000F085FA8B -:103FB00000202073207204A800F0A8FA0FF2B112BA -:103FC0000021082000F017FBAB4A0021012000F07F -:103FD00012FB0FF261120021102000F00CFBA74A27 -:103FE0000021022000F007FBA54A0021042000F078 -:103FF00002FB0020206104F118000060406004F121 -:10400000200104F5927000F071FB10B010BD80B576 -:10401000964A117B31B1002010730120BDE80240A7 -:1040200000F01CBB014602F11800CFE02DE9F04181 -:104030000F68DFF850828D4E054605E0BC4225D260 -:1040400000F060F825443F1B307A01280DD17268DA -:10405000BA424AD230682946FEF75CFE00F052F8B8 -:1040600000203072706805443F1AEC78391F8C428A -:104070002CBF3C46241D0CE04068C16817E0C068B6 -:1040800014E008F108003060224615E0BDE8F04178 -:1040900038E0297870697172012906D00229EBD0C5 -:1040A0001029ECD02029ECD009E04068016801F12A -:1040B00008023260224630682946FEF72BFEE87877 -:1040C000001D8442BAD201213172E8783168001DA6 -:1040D000001B70600819306005E0FEF71BFE00F061 -:1040E00011F800203072BDE8F081974230683A46FE -:1040F0002946F2D2FEF70EFE7068C01B7060306871 -:104100003844E8E75948417A01290FD0022904D000 -:10411000102905D0202906D070470021042007E08F -:104120000021022004E00021082001E000210120FC -:1041300000F06EBA1CB5102000F07EFA4B4C04F172 -:10414000100104F1180000F09DFB20690FF28D02B0 -:10415000017A022907BFB0F80B10491D817AC91CEA -:1041600002B0BDE8104089B2083000F0E1BA0000AA -:1041700010B5444CB4F809004FF66052811A04D0CF -:10418000491E06D0491E08D00BE0204600F08CFBEB -:1041900011E0204600F0C3FB0DE0204600F0E5FBF7 -:1041A00009E0A0810120A073E072212020720E207E -:1041B00060720420A0722146334800F04DFBBDE838 -:1041C000104007E080B50146DFF8BC0000F044FB7A -:1041D000BDE804400021102000F01ABA1CB5234CA1 -:1041E0006069016920698A68904205D3C9681144F1 -:1041F000884238BF00F00FF904F1180000F023FBEB -:1042000018B90021102000F003FABDE81640102074 -:1042100000F01ABA704770B51446134A134E12686C -:104220001D46012333734FF6FC7303EA8203104AE1 -:10423000D3180A46DE683668A6F80900F17206F15E -:104240000C002146FEF766FD0021002000F0A5F8D5 -:10425000012000F00BFA314605F10800B278BDE804 -:104260007040D21CFEF756BD3C400058A81B0020F1 -:104270000000032090080320254300089B4300080A -:1042800059430008B01F0020C01B002000000000A0 -:10429000000000000000000000000000000000001E -:1042A000440008004005020112279C00F4010000B0 -:1042B000FFFF0000480101000020000000F028BCC2 -:1042C00071487249016001F12002426001F130023F -:1042D000826001F13C02026201F14402426201F19A -:1042E0004C02C26001F15402026101F170024261AC -:1042F00001F1740282618031C16100F027BC38B5E0 -:104300000446634D284600F09BFA5F484068A16868 -:104310000160E168C16085605E49416000F032FC87 -:104320005D4834E080B5584842681368012119722D -:10433000406800F02DFC002002BD38B5564C544DAD -:1043400004E000F04BF8009821688847284600F008 -:104350007AFA0028F5D031BD80B54B494A68D1685A -:104360000220087200F019FC002002BD4A48416892 -:10437000084738B50446494D284600604060424829 -:10438000C068A1680160456000F010FC44482168E5 -:10439000016061684160002032BD80B53A48C26862 -:1043A000136810211972C06800F006FC002002BDDD -:1043B00035483B4AC168C16813680868184738B572 -:1043C000374C364D04E000F009F8009861688847E2 -:1043D000284600F038FA0028F5D031BD6946284655 -:1043E00000F050BA38B504462E4D284600F028FAA1 -:1043F0002D480060406024480069A1688160E16840 -:10440000C1600561216801606168416021694161A5 -:104410006169816131BD80B50146234800F01CFA15 -:10442000BDE802400FF2050000F0D6BB38B5164CCF -:104430001D4D06E0FFF7D2FF00992069006900F0EA -:104440000BFA284600F0FFF90028F3D031BD10B573 -:10445000164C2046006040600B4841690C60BDE886 -:10446000104000F0CDBB1CB5104C06E0694620465C -:1044700000F008FA0098C046C046204600F0E3F974 -:104480000028F3D013BD000000000320B40A03206D -:10449000500B0320A40A03202C230020580B0320D8 -:1044A00034230020400B032024230020480B03204A -:1044B0001248002101604160704710B500F019F802 -:1044C0001C6819B1012904D1204301E024EA00004D -:1044D00018600BE010B500F00CF85C6819B1012908 -:1044E00004D1204301E024EA0000586082F31088E0 -:1044F00010BDEFF3108272B6004B70471C230020F2 -:10450000FFF789FE9DF80E0005B000BDF8B500F17B -:104510000C026B4624214FF66640F1E7F8B500F136 -:104520000C026B460F214FF66840E9E72DE9FC4786 -:104530005B4CDFF87091A5692840A0614FF0FF3A0D -:104540004FF0010830E0491C54F831000642FAD01F -:1045500004EBC106184071681040014208BFC6F85C -:1045600004A07768384000F09FF8606208FA00F015 -:1045700087437760EFF3108172B6626A206908FAA8 -:1045800002F2D24310402061022004EBC00353F832 -:10459000086C1640401E43F8086CF6D181F3108871 -:1045A000606A59F82010884763692069A269184039 -:1045B000104207D0E069216A084203D1002103EAD2 -:1045C0000206C1E7C4F824A0C046C046EFF3108934 -:1045D00072B6216960690140A069014201BFE169C9 -:1045E000206A014200F0A2FB89F31088C046C04651 -:1045F000A561BDE8F38738B51446EFF3108572B6B0 -:1046000000F052F8274941F8204085F3108831BD69 -:1046100010B500F00BF804431C6153F831402043FF -:1046200043F83100FFE782F3108810BDEFF31082EA -:1046300072B61B4B1C697047EFF3108172B6184AB3 -:10464000536923EA000005E0EFF3108172B6144AC3 -:1046500053691843506181F310887047EFF310815C -:1046600072B60F4AD3691843D061F4E7F8B50C4C21 -:10467000656A276A2E4615F1010F0EBF002501213C -:1046800001FA05F5206202E0284600F050FB216A9D -:10469000E0690842F8D088436662E0612762F1BDB4 -:1046A000281000204C22002002460020110C090492 -:1046B00004BF1020120412F07F4F04BF0830120212 -:1046C0000FF2180112F0704F04BF001D1201120FFB -:1046D000C0F11F00895C401AC0B270470403020297 -:1046E00001010101000000000000000010B54F4C66 -:1046F000002220606160A28104F114004C49FEF7A1 -:104700001BFC4C4904F11400FEF729FC04F5397137 -:1047100004F1140000F050FC04F11400FEF730FC2A -:10472000BDE810400FF23D0200212020FFF763BFDB -:10473000F8B50C461546EFF310863C4F0146386835 -:104740002246FEF7E7FABD60FC8172B6387B20B1E5 -:1047500001212020FFF75CFF01E00120787386F340 -:104760001088F1BD10B5314CE289216804F11400C4 -:1047700000F029FC04F1140000F039FC28B1BDE878 -:10478000104001212020FFF743BFA068BDE8104082 -:10479000004738B5254D696805F1140000F01EFC8E -:1047A00005F1140000F039FCEFF3108472B601201B -:1047B0002873687B18B101212020FFF729FF84F3BB -:1047C0001088002032BD0020704710B520281A4AFA -:1047D00002D0212812D01FE008784B788C7840EA6C -:1047E0000320CB7840EA044040EA03601060087977 -:1047F000107148795071887990710DE010680870D7 -:10480000030A4B70030C000EC8708B70107908718E -:104810005079487190798871002010BD80B5FFF7FC -:1048200005FC064800F0F9FB002002BDB411002091 -:104830007C11002078100020AC140020C81100204A -:10484000006040607047EFF3108172B602688242E8 -:104850000CBF0120002012E0EFF3108272B6086056 -:1048600043684B6041604868016019E0EFF31081D4 -:1048700072B642680368136002684368536081F34C -:104880001088704710B5EFF3108472B602680A60A2 -:104890000068FFE7FFF7EAFF84F3108810BD0B60A4 -:1048A00082F310887047000070B5EFF31081027B2F -:1048B000012A02D0022A07D00DE000F028F8137870 -:1048C00000F01FF814700CE000F021F8138800F0DD -:1048D00018F8148005E000F01AF8136800F011F8D9 -:1048E000146081F31088212101720E21417204218C -:1048F00081724FF660518181002181730121C17263 -:1049000070BD264623EA040435402C43704772B636 -:10491000D0F81120D0F80D40D0F81550704781B074 -:10492000017B012902D0022904D008E0D0F80D1043 -:10493000097807E0D0F80D100A88009203E0D0F85B -:104940000D10096800910E21417221220821817207 -:1049500002724FF6615181810121C1720021817380 -:10496000009A40F80F2F01B0704738B50446284828 -:1049700000684FF6FC7505EA800526484519212098 -:1049800020720E2060724220A0724FF66250A08109 -:104990000120E0720020A0731F480168090CA4F8F0 -:1049A0000F100068C0F30B00A4F811001B48017839 -:1049B0001B4801F01F01E174416821754168090A33 -:1049C000C4F815100268C4F819200169C4F81D1054 -:1049D0004169C4F8211004F129018069C4F8250057 -:1049E000286802680A600C222B68191D04F12D004A -:1049F000FEF790F9286800F11001102204F1390047 -:104A0000FEF788F907480168C4F8491031BD000075 -:104A10003C40005800000320002004E00075FF1F08 -:104A20008075FF1FAC5E0008C0680840884201D155 -:104A30000120704700207047C0690840884201D1BA -:104A4000012070470020704710B5704C02212046AD -:104A5000FFF7F2FF38B16068C043810703D5FFF765 -:104A6000AEFC022018E001212046FFF7E5FF38B137 -:104A70006068C043C10703D5FFF75FFC01200BE06E -:104A800008212046FFF7D8FF38B16068C04301070E -:104A900003D5FFF7E8FC0820A06010BD10B55B4C03 -:104AA00000F033F818B96068C043810306D400F001 -:104AB0002CF830B96068C043810302D5BDE81040CE -:104AC00083E0082100F022F870B96068C043010358 -:104AD0000AD560684E4940F400206060086880474D -:104AE0004FF40020A06010BD202100F00FF858B94D -:104AF0006068C043810207D5606840F400106060C0 -:104B0000BDE81040FFF732BC10BD022120468BE704 -:104B1000404881B0016841F480110160006800F4F0 -:104B20008010009000983C48016841F400710160D9 -:104B30003A48026842F40072026040BF20BF384821 -:104B4000016841F40041016001B0704780B535480B -:104B5000016841F480110160006800F48010009049 -:104B600000982A48016841F001010160026842F49E -:104B7000803202602C20FEF789F9BDE802402D202A -:104B8000FEF784B928480168490849000160704768 -:104B900026494FF480300860704723484FF40011D5 -:104BA0004160016821F40011016070471E480168EE -:104BB00021F00201016070471B484FF40031416051 -:104BC000016821F40031016070471748016841F421 -:104BD00000310160FFF7ECBB38B504460B4D0821EE -:104BE0002846FFF721FF30B109480460686820F4C7 -:104BF0000020686031BDA0474FF40021A96031BD9D -:104C00000948016821F0080101607047000C005854 -:104C10004423002050010058D408005820080058B0 -:104C20000C04005850000058040C0058080C0058A0 -:104C300018B53848384C89B0016841F4004101602A -:104C4000FFF736FC35480168C908C90041F0040186 -:104C5000016000F0F5F932490020FEF7A4FE00F0F3 -:104C600006FA01210120FFF735FC002000F035FB9A -:104C7000012000F032FB022000F02FFB012000F0A9 -:104C80005DFB0121002000F063FBFFF719FB2548C5 -:104C9000006040600FF2590200214020FFF7ABFC9A -:104CA00004F23C50029020490FF22D000190009137 -:104CB0006846FFF75EFB04F25470039004F5C96187 -:104CC00040F23C5006900491059403A8FFF78AFB3C -:104CD000FFF7F4FA0AB010BD80B501461148FFF79E -:104CE000BBFDBDE8044000214020FFF791BC00005F -:104CF00080B500F0CBF900210120FFF7EBFB6946FE -:104D00000848FFF7BFFD0098FFF785FBFFF72CF978 -:104D100001BD000008000058300003208004005846 -:104D2000CC220020142300200F40000870474FF0D1 -:104D3000FF30FFF7FBBB0000F8B505464FF40770E6 -:104D4000FCF78EF8040005F52F7602D130600220C2 -:104D5000F2BD346005F14C07287C40B94FF4007374 -:104D600000F032F8012028874FF4007305E040235B -:104D700000F02AF80120288740230222012128463A -:104D8000FDF754FA0120A5F8780108231020788057 -:104D9000032282212846FDF749FA012038807068F5 -:104DA0000168884704F5017100220A614A61287C84 -:104DB0000A6800280CBF4FF40073402301212846E5 -:104DC000FDF771FA0020F2BD022281212846FDF78D -:104DD0002DBA38B504468121FDF732FA04F13805C1 -:104DE0000020288001212046FDF72AFA0020A4F89F -:104DF000780182212046FDF723FA0020A882E8826C -:104E000004F52F74206838B16168486880472068CD -:104E100000F0DFFA00202060002032BDF8B5054622 -:104E200005F5277300201C6A8DF800000E46ADF8CA -:104E3000020000270CB90320F2BD317811F06000A8 -:104E400024D020283ED1F2887078D2B109060DD541 -:104E50005B6AD3F808C02146E047F288082A28BFD9 -:104E6000072221462846FEF7F9FB30E004F50071E1 -:104E70000870F08848702146F2882846FEF7FEFB4D -:104E800025E05B6A9C683146A04720E0707830B12D -:104E900001281CD00A2809D00B2810D012E018785D -:104EA00003280FD102220DF1020104E01878032833 -:104EB00008D1012269462846FEF7D0FB07E01878A2 -:104EC000032804D031462846FEF799FB03273846CD -:104ED000F2BDF8B5044604F52F739E681D680DB940 -:104EE0000320F2BD0F46142010FB07F004EB000C6A -:104EF000DCF8180080B128225743F219926BB0FBFE -:104F0000F2F602FB160038B9CCF818000023002294 -:104F10002046FDF7C1F90BE005F502700022C260E2 -:104F20005A68136923B10A46006805F50471984769 -:104F30000020F2BD70B500F52F752C680CB9032068 -:104F400070BD04F50176FDF7B5F9B06004F50371A5 -:104F50006A683068D3689847002070BD1CB500F5BA -:104F60002F70016809B9032016BD4368002B1EBFCE -:104F700001F500742078FF2804D062789B68984778 -:104F8000FF202070002016BD432101800648704795 -:104F90004321018005487047432101800448704740 -:104FA0000A21018003487047F4100020B01000204F -:104FB000381100206C10002009B903207047C0F898 -:104FC000C01200207047D0F8BC0208B90320704717 -:104FD00000F502700160826000207047D0F8BC02CA -:104FE00008B903207047C0F804120020704710B5BC -:104FF000D0F8BC12012209B9032010BD01F50274DA -:10500000E16841B9E260A168C162A36822688121B8 -:10501000FDF742F90022104610BD80B5D0F8BC1251 -:1050200009B9032002BDD1F80422017C00290CBF7C -:105030004FF4007340230121FDF735F9002002BD34 -:10504000DFF80C00FFE7016841F480610160704700 -:10505000040400584A4900E04A4981B00A68024302 -:105060000A60096808400090009801B0704780B558 -:1050700000F0C1F900F0C1F94348016841F4803102 -:10508000016000F0C9F9BDE801400EE000B587B04D -:1050900068460FF214211C22FDF74CFEFFF7D7F9EA -:1050A0006846FFF73BFA07B000BDF0B585B068462B -:1050B000142100F0C3F900260025002400210FF27E -:1050C000D80000EBC102907988B11368B3F1904F1A -:1050D00008D02E4FBB4208D02D4FBB4204BF908852 -:1050E000044304E09088064301E090880543491C8E -:1050F0002229E4DB0020029001210320039001918A -:10510000B0B288B100900120FFF7A4FF0120FFF7A3 -:10511000A3FF69464FF0904000F094F90022B1B22D -:105120004FF0904000F04BFAA8B280B100900220FE -:10513000FFF790FF0220FFF78FFF144E69463046BD -:1051400000F080F90022A9B2304600F038FAA0B28F -:1051500080B100900420FFF77DFF0420FFF77CFF63 -:105160000B4D6946284600F06DF90022A1B2284691 -:1051700000F025FA05B0F0BD00210648FFF7B6BAE9 -:105180004C0000584C01005890080058000400489A -:1051900000080048B414002000000048010000008E -:1051A000000000480100000000000048010000006D -:1051B000000000480100000000000048010000005D -:1051C000000000480100000000000048010000004D -:1051D000000000480100000000000048010000003D -:1051E000000000480100000000000048010000002D -:1051F000000000480100000000000048010000001D -:10520000000000480100000000000048010000000C -:1052100000000048010000000000004801000000FC -:1052200000000048010000000000004801000000EC -:1052300000000048010000000000004801000000DC -:1052400000000048010000000000004801000000CC -:1052500000000048010000000000004801000000BC -:1052600000000048010000000000004801000000AC -:10527000000000480100000000000048010000009C -:10528000000000480100000000000048010000008C -:10529000000000480100000000000048010000007C -:1052A00000000048010000000000000000000000B5 -:1052B0000000000098510008280003202C00032063 -:1052C000220404003B4981B00A6802430A6009686D -:1052D00008400090009801B0704778B585B004464A -:1052E0006846142100F0AAF80CB9012004E0012C52 -:1052F00018BF022C02D10220FFF7E4FF00F012F8E1 -:1053000000950120019000210220039000F004F894 -:1053100000F00EF806B070BD0291694656F8240000 -:1053200000F090B80FF29C00234E30F814507047F4 -:1053300056F824000022294600F041B90FF28401FA -:105340001D4B31F8101053F82000012200F037B93E -:10535000F0B585B004460D466846142100F06EF89D -:105360000120FFF7AFFF2800144E0FF260070AD1AB -:1053700037F81400009000210191012002900221D1 -:105380000391FFF7CAFF012D12D137F814000090E6 -:1053900001210B480190FFF7BFFF0FF23400045DBD -:1053A00000220F2160B2FDF753FD60B2FDF76EFDE4 -:1053B00005B0F0BD4C0000585C10002068100020C3 -:1053C0000000211010000100020000000004000095 -:1053D0002800FBF7A0BE0000032010B5FDF72BFD51 -:1053E0000F2000F001F90024002814BF012400F070 -:1053F00011F8204610BD064805E00548016841F057 -:10540000020101607047016841F0010101607047CD -:10541000042004E07047000080B5FFF7ADFE0221D4 -:1054200000910023044800F124014FF48052001D34 -:1054300000F0FCF801BD000004000020002200F094 -:1054400009B900002DE9F84F4FF000095F4A604BA1 -:105450004FF00F0805460E4633E05E4FBD4214BFC5 -:10546000072704278F4027434CF82E70C1431C6840 -:1054700001EA040C7468E40348BF40EA0C0CC3F86A -:1054800000C05C6801EA040C7468A40348BF40EAE9 -:105490000C0CC3F804C0146801EA040C7468E4023C -:1054A00048BF40EA0C0CC2F800C0546801EA040C82 -:1054B0007168890248BF40EA0C0CC2F804C009F1C7 -:1054C0000109316831FA09F077D0012404FA09F4AE -:1054D00014EA0100F3D04FEA490C032101FA0CF160 -:1054E0006FEA010E7168012918BF022903D0112942 -:1054F00018BF122911D1A968F7680EEA010107FA4D -:105500000CF73943A960696821EA04047168C1F3A2 -:10551000001101FA09F10C436C60E968B4680EEA05 -:10552000010104FA0CF42143E9604FEA890174682F -:10553000022C18BF122C12D14FEAD90405EB8404B7 -:1055400001F01C07D4F820A008FA07FB2AEA0B0A8E -:10555000D6F810B00BFA07F747EA0A0727622C685B -:105560000EEA0407347904F0030404FA0CF43C4313 -:105570002C607468E400A2D5DFF85CC04FEA990E95 -:105580005CF82E7001F00C0108FA01F427EA04041B -:10559000B5F1904F08BF00270ED0104FBD4208BF95 -:1055A000012709D00E4FBD4208BF022704D00D4F7E -:1055B000BD427FF452AF032754E7BDE8F18F81B0BD -:1055C000002A14BF8161816201B070470008005851 -:1055D00080080058001000480800014000040048FE -:1055E00000080048000C004870B50F4E04463078A3 -:1055F0000025A8B100F08DF832784FF47A71B1FB34 -:10560000F2F1B0FBF1F0FDF75BFC48B9102C07D2CA -:10561000002221464FF0FF30FDF71AFCB46000E095 -:105620000125284670BD00BF5010002010B5029C17 -:10563000016042600021C1600161416181610381BB -:10564000A107047704D5008910B14FF0FF3010BDD9 -:10565000002010BD00B500BF1300964694461039D7 -:1056600028BFA0E80C50FAD85FEA417C28BF0CC0E4 -:1056700048BF40F8042BC90728BF20F8022B48BFB9 -:1056800000F8012B00BD00004FF0B040006800F0B2 -:10569000F000B02888BFB020704738B54FF0B04454 -:1056A000244DA16811F00C0106D1FFF7EDFFC0F306 -:1056B000031055F8200032BD04291F4A05D00829DF -:1056C0001E4804D12168C90222D5104632BDE168C6 -:1056D00001F00301022904D0032904D12168C90281 -:1056E00007D5104605E0FFF7CFFFC0F3031055F8CC -:1056F0002000E168E268E368C1F306214843C2F391 -:105700000211491C5B0FB0FBF1F05B1CB0FBF3F026 -:1057100032BD80B5FFF7C1FF0549FFE7084A0968B8 -:10572000C1F3031152F82110B0FBF1F002BD0000EB -:1057300008000058045C00080024F4000048E80158 -:10574000C45B000818B55B499BB04FF4004008608B -:10575000FFF742FE584CE06B40010ED5E06BC000F5 -:105760000BD4FEF7F9FBFEF7F7FBA06B40F480309B -:10577000A063A06B20F48030A06300F055F807A868 -:105780005021FFF75BFE68461821FFF757FE4B4894 -:105790000168216C41F001012164206C8007FCD577 -:1057A0004FF4807007900021149107A8FEF72AFAA1 -:1057B000206840F0807020604FF00052216801F0B6 -:1057C000807106910021069800914BF67F3003907E -:1057D0002221049100200290202101920591684627 -:1057E000FEF78BFBFEF7B8FBFEF7B6FBA06B40F0B5 -:1057F0000100A063A06B8007FCD50022E06B20F4C1 -:10580000404040F48040E0632D4801680260026936 -:1058100002F05002026100F028F8FFF709FA4FF099 -:10582000FF30FEF783FEFAE7264881B0016841F4B5 -:10583000801101603F21006800F480100090009802 -:10584000214841604161016841F47C1101600269B5 -:1058500042F47C120261016841F03F01016002697B -:1058600042F03F02026101B0704710B5FEF774FBD1 -:10587000FEF772FB1548164C016821F4407141F4A3 -:10588000807101600F21026842F4004202601148F9 -:10589000816047F6FF71C160046000F01DF8CA2006 -:1058A0006062FF2153206062A068C008C000A06051 -:1058B000616210BD10400058580000589414005800 -:1058C0008008005850000058040C00589000005800 -:1058D00000280040CC22002038B5040044D094F8C1 -:1058E000210028B9002184F820102046C046C04677 -:1058F00000F049F8FF2510B100F03FF834E02168CE -:10590000DFF8B0008A6802408A6021688A686368AC -:1059100020690343A06903431A438A602168E06851 -:10592000086120680169A26841EA024101612068BA -:10593000C16821F08001C1602068C16C89088900BC -:10594000C1642168CA6CE369606903431A43CA648D -:1059500020688168880609D400F020F830B12068FA -:105960004562042100F01FF8012032BD2068456225 -:10597000012184F82110002032BD206845620421F5 -:1059800084F821107047022084F82100CA20216881 -:105990004862532022685062204626E020460BE0F1 -:1059A0002068C0F8248084F82110002084F82000AA -:1059B00070470000BFFF8FFF70B5044640F2E93624 -:1059C0002068C16821F0A001C160FEF7BFFA05465A -:1059D0002068C168880606D4FEF7B8FA401BB042BA -:1059E000F6D3032070BD002070BD70B5044620685A -:1059F000C1684A0612D44FF0FF32C26040F2E93665 -:105A0000FEF7A4FA05462068C168480606D4FEF7EA -:105A10009DFA401BB042F6D3032070BD002070BD3C -:105A2000122008800FF200107047042008800FF247 -:105A30000C10704710B500F029F80FF2980004E040 -:105A400010B500F023F80FF2B0002146FDF7E2FD9B -:105A5000204610BD38B51A2008800E494C680868E9 -:105A600089680D4D081809D00822A91C00F01EF8FD -:105A7000042205F11201204600F018F8284632BD34 -:105A800010B500F003F80FF28400DEE70A46034C7D -:105A900070470000107AFF1F98110020BC200020E2 -:105AA00010B5FFF7F3FF0FF27000CEE730B500231B -:105AB00093420DDA040F0A2C2CBF3734303401F82E -:105AC000134001EB4305002400016C705B1CEFE701 -:105AD00030BD000053544D333220566972747561E5 -:105AE0006C20436F6D506F727420696E2046532096 -:105AF0004D6F64650000000053544D6963726F651B -:105B00006C656374726F6E69637300005643502056 -:105B1000436F6E666967000056435020496E746596 -:105B2000726661636500000012010002020200401B -:105B3000830440570002010203010000040309042A -:105B400080B51C48016841F470010160002000F03C -:105B500079F848B180791849184A0A600A6822F42D -:105B60007C5242EA00220A604FF0B040016841F4E2 -:105B70008031016012490A68D208D20042F0010265 -:105B80000A600A6802F00702012AFAD10168890353 -:105B9000FCD581688908890041F002018160816833 -:105BA00001F00C010829FAD1016849084900016097 -:105BB00001BD000088ED00E09C000058FECAFECA4E -:105BC0000040005801000000030000000500000034 -:105BD0000100000001000000060000000A000000B3 -:105BE0002000000002000000040000000800000087 -:105BF00010000000400000008000000000010000D4 -:105C000000020000A0860100400D0300801A06007B -:105C100000350C0040420F0080841E0000093D004A -:105C200000127A000024F40000366E010048E801FA -:105C3000006CDC020000000000000000000000001A -:105C40000000000001460648064AC3798B4218BF8F -:105C5000904218BF0838F8D18B4218BF0020704717 -:105C6000F873FF1F0070FF1F19E050F8042BD307D3 -:105C700044BFA9F101039A18091F0023042942F81F -:105C8000043BF9D25FEA817C134604D54FF0000C47 -:105C9000A2F800C09B1CC90744BF0021197050F82E -:105CA000041B0029E1D170477047FEE77047704739 -:105CB000704700F00FB800E000BF0248FBF76BBD73 -:105CC00000000000B4180020FDF71DBEFEF7E6BE80 -:105CD000FEF7BABE024841680278891841607047F1 -:105CE0005010002010B5074979441831064C7C4407 -:105CF000163404E00A68081D114488470146A14291 -:105D0000F8D110BD2C000000600000004EF6885154 -:105D1000CEF20001086840F470000860BFF34F8FB6 -:105D2000BFF36F8F4FF00070E1EE100A7047000074 -:105D300039FFFFFF9C0E0000B4140020840A00000D -:105D40003000032000000000CFB8FFFF6401000016 -:105D50001802000004000020BFB8FFFF600200002E -:105D600006000000280003200120C046002801D0C2 -:105D7000FFF7B8FFAFF300800020AFF30080FFF71C -:105D8000E1FC00F000F800F001B8000007463846DA -:105D9000FBF794FCFBE700000148804701480047FF -:105DA000415B0008A95D0008AFF30080FFF7AEFF7C -:105DB000FFF7DAFFFFF7FEBFFFF7FEBFFFF7FEBFFB -:105DC000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF07 -:105DD000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF7 -:105DE000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFE7 -:105DF000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFD7 -:105E0000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC6 -:105E1000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB6 -:105E2000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFA6 -:105E3000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF96 -:105E4000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF86 -:105E5000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF76 -:105E6000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF66 -:105E7000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF56 -:105E8000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF46 -:105E9000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF36 -:105EA000FFF7FEBFFFF7FEBF0020704700010000B4 -:105EB000F3FF010001F1FF01F1FF01F1FF01F1FF2B -:105EC00001F1FF01F1FF01F1FF01F1FF01F1FF011C -:105ED000F1FF01F1FF01F1FF01F1FF01F1FF01F11C -:105EE000350152FF01AD3F106D4C104210085001BA -:105EF00048000404110C10020A0600020822402483 -:105F00001003394D0008D30420021D4E00082B1346 -:105F10005D4F10110C43354F106101129110128921 -:105F20000412990412A1041009090243000201009D -:105F3000C03209046D12020B101E05240010010569 -:105F40002401000104240202052406000107058241 -:105F50000308001009040100020A4E10020705019F -:105F6000027B200107058107F22800442240072216 -:105F70008107200100090744F22C04441003215A30 -:105F800000082B0412410412350412550412810436 -:105F900012A104F001FF1A030001F1FF01F1CC018D -:105FA000100393470008C70412CB041C041D4800CB -:0F5FB00008A95E18042EC23A040308005200012B -:0400000508005DA9E9 +:101600009560A860EA600020A861DEE7E031002074 +:10161000012000F017B870470749086808B100209A +:1016200070470648C008C00008600549C908C900DD +:10163000091A0160704700BF6C3900200F100020AC +:101640000814002080B5AFF30080024A1100182072 +:10165000ABBEFBE72600020030B5040085B008BF32 +:10166000012043D004F52A75687820B9002129703B +:10167000204600F04BFD03206870206800F017FE44 +:10168000002128200AE010FB01F222442832012325 +:1016900053701170D181002300F02AF862689142E2 +:1016A000F1D3002109E010FB01F2224402F5B472EB +:1016B00000231170537000F01BF862689142F2D35E +:1016C00083B0211D6846202201F08CFA0EBC2068F0 +:1016D00000F0F3FD002084F8240001206870E06928 +:1016E000012804BF204601F0DAFA002005B030BD21 +:1016F000491CD370136153619361C9B2704710B52F +:1017000000F0B7F801D1022010BD00F003F800F09E +:10171000C7FDA7E0012184F8A8122068704738B5FA +:1017200004462068B0F84400010403D52046BDE813 +:10173000324086E141050ED500F090F84FF6FF30BB +:101740008A8802408A80204600F012FD2046BDE8CB +:101750003440002192E0410404D500F07FF84BF6BC +:10176000FF7077E0810404D500F078F84DF6FF7043 +:1017700070E0C20404F5387120D5226832F8403F89 +:101780004FF6FB70034013804FF6F7701588054045 +:1017900015800878012805D100220A700021204612 +:1017A000C046C046204600F0F4FC2168B1F8442051 +:1017B0004EF6FF700240A1F8442031BD02050FD55E +:1017C00000F04CF84FF2FF700A8842F008020A80DD +:1017D0008B8803408B80088840F00400088020E05C +:1017E000020623D5206800F140024FF67F709388EF +:1017F000034093800878A0B9138843F00403138052 +:101800000123108840F0080010800B70908A800837 +:1018100000F03C00486001212046BDE8344001F062 +:1018200053BA2046BDE8324000F0AFBC81050BD56D +:1018300000F014F84FF6FF508A8802408A80204654 +:10184000BDE8324000F090BCC00506D500F006F8B7 +:101850004FF6FF608A8802408A8031BD206800F11F +:1018600040017047206801F07BF9002084F8A8024D +:1018700010BD044694F8A8020128704710B5FFF780 +:10188000F8FF01D1022010BD012284F8A82284F8BB +:101890002410206801F05EF9E7E738B5054601F04D +:1018A00007042820444328190C0647BF00F12804E8 +:1018B000012000F5B474002001F007016070217070 +:1018C0002261E370607808B12178E181022B04BFC6 +:1018D0000020207195F8A802012801D1022032BD14 +:1018E000012185F8A8122146286800F0F1FC0020AB +:1018F00085F8A80232BD10B5044600F09BF847BF3A +:101900002830012200F5B470002201F00701427076 +:1019100000F069F801D1022010BD00F003F800F0DA +:1019200004FEA2E7012284F8A8220146206870473D +:1019300038B501F0070528246543441904F5B4744B +:1019400001F007016261A3610022E261627021700F +:1019500021461DE001F00701282251430844D0F838 +:101960008401704738B51C4601F0070528235D4304 +:101970004319283301F007015A619C61012283F861 +:1019800024201C620022DA61197001225A70194663 +:10199000006800F050FE002032BD10B5044601F092 +:1019A00007006268824201D2012010BD28220B0686 +:1019B00004D5504320442830012205E012FB01F2F7 +:1019C000A01800F5B4700022427001F00701012256 +:1019D00000F008F801D1022010BDFFF7A4FF01F0CC +:1019E00060F842E78270017094F8A81201297047EC +:1019F0001CB5044601F00F036068984201D2012033 +:101A000016BD00F017F847BF2830012200F5B4706A +:101A1000002201F0070142700022FFF7E3FF01D12D +:101A2000022016BDFFF77EFF01F054F8002084F875 +:101A3000A80216BD01F0070228204243A0180A069A +:101A400070472DE9F84F00F5B475064627E0018888 +:101A50000AEA010141F40041018006F124043068E2 +:101A6000B0F85010227901EBC201401800F2024098 +:101A70000088A169C0F3090020620844A061002128 +:101A8000304600F068FB217849B1E06938B9217827 +:101A9000306841F08001A0F84C10002121703068BE +:101AA00000F144010A88130440F13A810A8812F0D7 +:101AB0000F0440F68F7748F60F7A62D1D206C6D56A +:101AC0000288130511D5898900F044F9EA88C3F327 +:101AD0000903EB6106F52C7101F061F8306800F044 +:101AE0002BF9304600F027FBD9E71104D7D500F0D9 +:101AF00023F93068B0F8501000F02CF9C3F3090353 +:101B0000002BEB611CBF696900290AD0EA8801F04B +:101B100046F86869E969084468610021304600F0C8 +:101B200010FB306801880A05B9D4B0F8501041188C +:101B300028693F2801F2064106D3420910F01F0F21 +:101B400008BF521E900206E040B90A8848F2FF30F2 +:101B500002400A80088840F4004004E04208C007C0 +:101B600048BF521C900208804BF68F723068018883 +:101B7000114081F4405141F4004141F08001018065 +:101B80008DE7282130F8248011FB04F106EB0109D0 +:101B90005FEA084160D530F824100F4047F0800715 +:101BA00020F8247009F5B477387B58B93068B0F85C +:101BB00050103A7801EBC201411800F0C3F837D059 +:101BC000FA8831E0F878022806D142463946304694 +:101BD00000F0D2F883462BE03068397830F82120C5 +:101BE00048F68F731A4042F4004242F0C00220F8D7 +:101BF000212030683A78134630F823305904B0F881 +:101C0000503003EBC2020AD5811801F20241098863 +:101C1000C1F3090BBBF1000F0AD03A8904E0811827 +:101C200000F090F804D07A895B46796900F0B7FF3C +:101C3000F8695844F861786958447861B86910B116 +:101C40003A69934504D23978304600F07AFA03E0D5 +:101C50003068394600F0EFFC5FEA086038D530683C +:101C600030F824200AEA020242F4004209F1280175 +:101C700020F82420C87802282BD0087B00220028D6 +:101C80008A6121D05FEA486209D5487810B900F02E +:101C900069F809E0012817D100F064F812E0326811 +:101CA000487858B900F03FF8038848F2FF321340F3 +:101CB0000380028842F40042028005E0012803D13B +:101CC00000F031F8002303800978304600F043FA31 +:101CD000E5E65FEAC8501ED430680A78B0F85030A4 +:101CE00003EBC203C01800F2024003888869C3F303 +:101CF0000903834234BFC01A0020886108B9114625 +:101D0000E3E7486918444861C8691B18CB6130682B +:101D100000F091FCC3E64246304600F08AF8BEE689 +:101D20000020BDE8F28FB2F8500010180A7800EBDE +:101D3000C20000F20640704701880F4047F080075C +:101D40000780704701F206410988C1F3090BBBF116 +:101D5000000F70472A7801EBC201411801F20641D9 +:101D60000B8870473068B0F8502080180A7800EB74 +:101D7000C20000F2024070472DE9FC410D460068A8 +:101D80002B78A969B0F85060540448F2C00848F6AE +:101D90008F7748F2800C4BF68F7E06EBC30419D583 +:101DA000061906F202463488C4F30904A1422CBF86 +:101DB000091B0021A96129B930F823100EEA01019D +:101DC00000F027F8510601D500F02AF8F4B12346B7 +:101DD0002A8918E0061906F206463488C4F3090475 +:101DE000A1422CBF091B0021A96129B930F8231099 +:101DF0000EEA010100F00DF8510601D400F010F8D0 +:101E000024B123466A89696900F0C9FE2046BDE80D +:101E1000F68181F400514CEA010120F8231070474B +:101E2000297830F82120174048EA070220F82120BD +:101E300070472DE9FC410D4604461646216895F889 +:101E400000E0A8697306B1F850304CF2800748F6FC +:101E50008F7803EBCE0340F18580CB1803F2024369 +:101E60001B88C3F30903834234BFC01A0020002833 +:101E7000A86125D1687838B9B1F85000081800EB8E +:101E8000CE0C00F027F913E0012809D000F030F95A +:101E90002046297800F05FF9700440F1ED8082E07F +:101EA000B1F85000081800EBCE0C0CF2024C0020E8 +:101EB000ACF8000068780028E8D100F0F9F8E7E70E +:101EC000720406D531F82E0008EA0000074321F815 +:101ED0002E7095F8240001286ED100F0DFF803D3AE +:101EE0001346C01A286208E010B985F8240004E0FF +:101EF000002285F8242003462A62687810BB2068F7 +:101F0000B0F850208218287802EBC0023F2B02F272 +:101F1000024206D3580913F01F0F08BF401E80026B +:101F200006E043B9168848F2FF3006401680108854 +:101F300040F4004004E05808DE0748BF401C80021F +:101F400010800BE0012809D12068B0F850208018DB +:101F50002A7800EBC20000F2024003802A89206840 +:101F60009BB287E0CB1803F206431B88C3F3090337 +:101F700098422CBFC01A00200028A8612DD1687893 +:101F800038B9B1F85000081800EBCE0C00F0A2F8F8 +:101F90001BE0012811D000F0ABF82046297800F0B2 +:101FA000DAF8700468D42168287831F8202008EA2B +:101FB0000202174321F820705EE0B1F850000818C3 +:101FC00000EBCE0C0CF2024C0020ACF8000068785C +:101FD0000028E0D100F06CF8DFE7720406D431F895 +:101FE0002E0008EA0000074321F82E7095F824001F +:101FF000012841D100F052F803D31346C01A2862D9 +:1020000005E010B103460020286285F82400266808 +:10201000687808BBB6F850003218287802EBC00286 +:102020003F2B02F2064206D3580913F01F0F08BFD8 +:10203000401E800206E043B9178848F2FF3007408F +:102040001780108840F4004004E05808DF0748BFBC +:10205000401C800210800AE0012808D1B6F8500028 +:102060002A78301800EBC20000F2064003809BB2D1 +:102070006A89304600F082FD2268297832F82130E2 +:1020800048F6BF70034083F0300343F4004343F04D +:10209000800322F821300020BDE8F681E8696969F3 +:1020A0002A691818E8611944286A696190427047E2 +:1020B000B1F850000918287801EBC00101F206417F +:1020C00048F2FF300A8802400A80088840F4004045 +:1020D000088070470CF2024C48F2FF30BCF8003028 +:1020E0000340ACF80030BCF8000040F400407047FA +:1020F0006878012809D1B1F850000818297800EB58 +:10210000C10000F2064000220280704780B561489D +:10211000016841F0806101600022006800F0806089 +:10212000009006210098142000F0ECFDBDE802406C +:10213000142000F005BE00F52C71D0F8F00200F07C +:102140008DBE0B4628225343C218D0F8F002D2F8B5 +:102150007C2100F0B1BE0B4628225343C218D0F8B0 +:10216000F002D26B00F0DDBED0F8F00200F068BFE4 +:1021700010B50446D4F8F00200F01FFFD4F8F002C6 +:10218000BDE81040012100F047BFD0F8F00200F098 +:1021900046BFD0F8F00200F04ABF10B53E4C3F49B0 +:1021A0002160C4F8F002082161600021E160022191 +:1021B0002161A1600021A161C0F8C4422046FFF75F +:1021C0004BFA18230022002100F012F858230022B5 +:1021D000802100F00DF8C0230022812100F008F8D2 +:1021E0004FF488730022012100F002F8002010BD96 +:1021F000204600F03ABD80B5D0F8C402FFF77FFA60 +:10220000002002BD10B51C461346D0F8C402224679 +:10221000FFF743FB002010BD80B5D0F8C402FFF7E4 +:102220006AFB002002BD80B5D0F8C402FFF7B5FB01 +:10223000002002BD80B5D0F8C402FFF7D9FB002012 +:1022400002BD81B0D0F8C42201F07F0328204343AF +:10225000D01809064CBF90F82A0090F86A0101B026 +:10226000704780B5D0F8C402FFF708FB002002BD1C +:1022700080B5D0F8C402FFF775FB002002BD80B521 +:10228000D0F8C402FFF754FB002002BDD0F8C4020E +:10229000FFF760BB58000058BC2C002000680040CD +:1022A0004030002181804BF6807100F050BCB0F8C6 +:1022B000402044F27F0100F05CBC0EB4012120F804 +:1022C000401F0021018081800182002003B07047FF +:1022D0002DE9F8470B4648F68F111D78024600207D +:1022E00032F8254001EA040AD97803290CD8DFE83E +:1022F00001F002080C054AF4007A06E04AF4C06ACC +:1023000003E04AF4806A00E0012048F2800949EACB +:102310000A0122F8251048F68F7519788A4632F896 +:102320002A702F40394349EA010122F82A104BF65E +:102330008F7A197B1C7800294CF2800748F6BF7C05 +:1023400048F2C00E64D1DE884FF6FE710E40597817 +:102350000029B2F85010114401EBC40419D004F55F +:1023600080642680197832F82140640606D532F858 +:10237000214025404EEA050522F821501978DB78E6 +:10238000012B32F821300CEA030301D083F0200343 +:10239000BFE004F204442680B2F8501054181978B3 +:1023A00004EBC10C19693F290CF2064C09D34FEA22 +:1023B000511E11F01F0F08BFAEF1010E4FEA8E2122 +:1023C00009E059B9BCF8004048F2FF312140ACF8AF +:1023D0000010BCF8001041F4004107E04FEA510E34 +:1023E000C90748BF0EF1010E4FEA8E21ACF800106C +:1023F000197832F82140640405D532F8214025408F +:102400003D4322F8215000F08AF883F4405380E0E5 +:10241000D978022909D132F82410294041F4014128 +:1024200041F0800122F8241008E032F8246048F6D8 +:102430008F610E4049EA060622F82460B2F8501077 +:102440001E895418197804EBC10404F580644FF612 +:10245000FE710E402680B2F850105418197804EB23 +:10246000C1085C8908F204484FF6FE710C40A8F8D8 +:102470000040597893F80080002932F8281024D1C0 +:10248000490405D532F8281029400F4322F8287056 +:10249000197832F821707F0606D532F821703D4058 +:1024A0004EEA050522F82150197832F821500AEA3F +:1024B000050484F4405449EA040422F821401978C0 +:1024C00032F821300CEA030323E0490405D532F841 +:1024D000281029400F4322F82870197832F821700B +:1024E0007F0606D532F821703D404EEA050522F8F8 +:1024F0002150DD781978012D32F821500CEA0504BD +:1025000018BF84F0200449EA040422F8214000F0B6 +:1025100006F849EA030322F82130BDE8F28719786A +:1025200032F821300AEA030370472DE9F0410246F0 +:1025300091F800C048780B7B4BF68F7E4CF28004FC +:1025400048F2800848F6BF7548F2C00648F68F7713 +:10255000ABB9002832F82C0008D0400636D532F846 +:102560002C0007403E4322F82C602FE0400456D553 +:1025700032F82C0007403C4322F82C404FE0002862 +:1025800032F82C0029D1400405D532F82C0038400F +:10259000044322F82C40087832F820305B0605D539 +:1025A00032F820303B40334322F82030087832F8AC +:1025B00020301F403E4322F82060087832F8203057 +:1025C0000EEA030348EA030322F82030087832F8C1 +:1025D00020100D4048EA050128E0400405D532F8F6 +:1025E0002C003840204322F82C00087832F82030A4 +:1025F0005B0605D532F820303B401E4322F82060B0 +:10260000087832F820301F403C4322F820400878F8 +:1026100032F820301D4048EA050522F8205008789D +:1026200032F820100EEA010148EA010122F82010D8 +:102630000020BDE8F0812DE9FC420E460546727887 +:10264000307B012A48F2800748F68F7140F0F8800D +:102650003269B36914469C4288BF1C4640B9F2886F +:1026600000F014FA00F016FA00F202400480DEE0F6 +:1026700096F803E03078D6F820C0BEF1020F03468A +:1026800040F0BA80624580F0AB8035F8230001400D +:1026900041F4014141F0800125F82310ACEB040026 +:1026A0003062630832787178964635F82EE05FEA3A +:1026B0004E6904F001004FEA541C47D5B9B900F047 +:1026C000C0F901F2064107D314F01F0F08BFACF1A7 +:1026D000010C4FEA8C2002E024B900F0B9F940F473 +:1026E000004002E000B15B1C9802088006E001296E +:1026F00004D100F0B4F900F206400480728900F0C1 +:10270000C5F900F089F932BF001B04460020306291 +:102710007078C0B900F0A9F901F2024106D360094E +:1027200014F01F0F08BF401E800202E024B900F021 +:102730008FF940F4004004E06008E20748BF401C05 +:10274000800208806DE001286BD152E0B9B900F039 +:1027500078F901F2024107D314F01F0F08BFACF162 +:10276000010C4FEA8C2002E024B900F071F940F42A +:10277000004002E000B15B1C9802088006E00129DD +:1027800004D100F06CF900F202400480328900F0BC +:102790007DF900F041F932BF001B04460020306291 +:1027A0007078C0B900F061F901F2064106D3600902 +:1027B00014F01F0F08BF401E800202E024B900F091 +:1027C00047F940F4004004E06008E20748BF401CBD +:1027D000800208801FE001281DD100F05BF917E09E +:1027E00035F8231048F68F600140394325F823104F +:1027F000644600F04FF911E0ACEB0401316235F8AA +:1028000023104A06B5F85010294401EBC00005D545 +:1028100000F206400480A3B2728904E000F2024094 +:102820000480A3B232897169284600F0A7F9317893 +:1028300035F8212048F6BF70024082F0300220E0D7 +:1028400000282ED1B1693069884232BF091A084682 +:102850000021B16100F0EEF83F2801F2064116D3E5 +:10286000420910F01F0F08BF521E900240F40040B2 +:102870000880317835F821204BF68F70024082F4C1 +:102880004052174325F821700020BDE8F68210B9A8 +:1028900000F0DEF8EAE74208C00748BF521C900289 +:1028A000E6E7F078022857D1BAB900F0E6F802F26C +:1028B000024206D3430910F01F0F08BF5B1E9802A7 +:1028C00002E020B900F0AFF840F4004004E0430813 +:1028D000C00748BF5B1C980210807078C0B900F038 +:1028E000CCF802F2064206D3430910F01F0F08BFCE +:1028F0005B1E980202E020B900F095F840F4004019 +:1029000004E04308C00748BF5B1C980210800BE03E +:10291000012809D1B5F850003278281800EBC20020 +:1029200000F2064032690280F0690028A1D03078B8 +:1029300035F8202044F2400303EA02049C4218BF09 +:102940001A4296D135F82020114041F4004141F05F +:10295000C00125F820108CE701285BD1B1693069EE +:10296000884232BF091A08460021B161440800F0CC +:10297000010143092ABBB5F8502005EB020C32785F +:102980000CEBC20C3F280CF2024C06D31A4610F096 +:102990001F0F08BF521E92020AE060B9BCF800E0A7 +:1029A00048F2FF3202EA0E02ACF80020BCF8002028 +:1029B00042F4004203E0224601B1521C9202ACF8FC +:1029C00000207278FAB9B5F8502096F800C0AA181D +:1029D00002EBCC023F2802F2064208D310F01F0F90 +:1029E00008BF5B1E980240F40040108041E730B9F8 +:1029F000118848F2FF30014011801088F3E701B1DF +:102A0000641CA002F1E7012AF0D100F013F801F2F2 +:102A100006412DE7012038E7706931692044706173 +:102A2000306A81427047138848F2FF3003401380B8 +:102A300010887047B5F850103278691801EBC20160 +:102A40007047B5F85010691801EBC2013F2C704770 +:102A50000A8848F2FF3002400A8008887047B5F8BB +:102A60005000281800EBC2007047B5F85000291834 +:102A7000307801EBC0013F2C7047B5F850002A18A0 +:102A8000307802EBC00230693F2870477169A3B209 +:102A9000284673E0B5F850003178281800EBC100E3 +:102AA000704718B50A78497830F82240002948F272 +:102AB000800305D048F6BF710C4084F0100404E098 +:102AC0004BF68F710C4084F48054234320F822305D +:102AD000002012BD30B50A7B002A36D14A780C7826 +:102AE000002A30F8242048F2800348F68F7516D06B +:102AF000520608D530F82420154045F4004545F02D +:102B0000C00520F82450CA78012A1ED00A7830F86F +:102B1000224048F6BF710C4084F0200412E05204B9 +:102B200008D530F82420154045F4404545F080058F +:102B300020F824500A7830F822404BF68F710C4070 +:102B400084F44054234320F82230002030BD01801B +:102B50000020704711B98021A0F84C100020704768 +:102B6000B0F8581041F40041FFE7A0F858100020D9 +:102B700070470A40A0F840200020704710B5801828 +:102B80005B1C00F580605B0807E00A784C7842EA3D +:102B90000422891C20F8022B5B1EF6D110BD10B553 +:102BA000821802F58062580806E032F8024B0C7079 +:102BB000240A4C70891C401EF7D1D80744BF1088E6 +:102BC000087010BD62B38B0708D0521E11F8013B8C +:102BD00000F8013B00F024808B07F6D1830740F01A +:102BE000208000BF103A07D330B4B1E83810103A53 +:102BF000A0E83810F9D230BC530724BFB1E8081060 +:102C0000A0E8081044BF51F8043B40F8043BD20749 +:102C100024BF31F8022B20F8022B44BF0B7803703D +:102C20007047121F17D35B0009D151F8043B20F8FD +:102C3000023B1B0C121F20F8023BF6D20BE051F8AE +:102C4000043B00F8013B1B0A20F8023B1B0C121F3F +:102C500000F8013BF3D238BF121D521E24BF11F8F9 +:102C6000013B00F8013BF8D8704730B528240D0629 +:102C700005D501F0070161430844283003E06143B2 +:102C8000084400F5B4701AB900210173C38004E050 +:102C9000038101211B0C01734381002030BD0168B9 +:102CA00000F538700122826000220270B1F85400F1 +:102CB00040F00100A1F85400B1F8540040F00200C7 +:102CC000A1F85400002070477047704709010200C6 +:102CD00081B002D43C48815405E03C4802F00F0228 +:102CE000104400F8041C01B07047394A13684FF6CD +:102CF000FF0100020B4000F4E0601843354908432F +:102D00001060704738B5324B1C68C4F30223C3F11E +:102D10000704052C28BF04241D1D072D34BF0023E4 +:102D2000DB1E012505FA04F4641E2140994005FAD2 +:102D300003F35B1E1A401143BDE83440C6E70000B0 +:102D4000010007D4012200F01F01234B8A404009F3 +:102D500043F82020704701000BD4012200F01F012E +:102D60001E4B8A40400943F82020BFF34F8FBFF32A +:102D70006F8F704710B5401EB0F1807F01D30120E6 +:102D800010BD174C60600F214FF0FF30FFF79EFF22 +:102D90000022A26007202060002010BD010007D49F +:102DA000012200F01F010F4B8A40400943F8202008 +:102DB0007047010007D4012200F01F010A4B8A402E +:102DC000400943F82020704700E400E018ED00E0DF +:102DD0000CED00E00000FA0500E100E080E100E019 +:102DE00010E000E000E200E080E200E010B508B989 +:102DF000032010BD00F527730024DC615C621C63B6 +:102E000001B19961012119700270BDE81040FFF70E +:102E1000C4B91CB50022ADF8002009B9032016BDC5 +:102E200000F52E742160C96A11B168468847606157 +:102E3000002016BDFFF7DFB980B5D0F8B832032205 +:102E400013B11A6890470246104602BD80B5D0F80B +:102E5000B8220AB152689047002002BD38B5044636 +:102E600004F2AA25284600F00FFB04F52570012185 +:102E70000160818B4160817D11F01F0003D0022829 +:102E80000DD006D311E029462046BDE8344000F0BD +:102E9000EDB829462046BDE8344000F064B9294623 +:102EA0002046BDE8344000F084B92046BDE83440F7 +:102EB00001F08001FFF7B7B938B5044610460B00A2 +:102EC00004F5257221D11168032910D104F5AE71E2 +:102ED0004B680D68AB420CD2ED1A4B680D602A4668 +:102EE0009A42014688BF1A46204600F02BFB00207C +:102EF00032BD107A032804D1516A096909B120460C +:102F00008847204600F026FBF1E7107A0328EED12F +:102F1000526A9269002AEAD0204690470100E6D022 +:102F200032BD38B5044610460A0004F5257538D17F +:102F3000296802292ED1E269216A914206D2521AE9 +:102F4000E2610146204600F0EBFA0DE013D1A069E2 +:102F5000884210D3696888420DD2002200212046A1 +:102F600000F0DEFA002068600023002200212046E5 +:102F7000FFF785F90EE0287A032804D1696AC96849 +:102F800009B12046884780212046FFF74CF92046AA +:102F900000F0E7FA287B012804BF002129730020F4 +:102FA00032BD287A0328FAD16A6A5269002AF6D01B +:102FB000204690470100F2D032BD1CB5044604F50E +:102FC0002570012101720021016061600161416A87 +:102FD00009B9032016BD806A00281CBF4A68002A70 +:102FE00002D00021204690474023002200212046A5 +:102FF000FFF708F904F5B0700121818040234021DA +:103000000160002280212046FFF7FCF80120A08407 +:1030100040202062002016BD01740020704700F59A +:10302000277001784170042101700020704700F57D +:1030300027700178042904BF42780270002070478D +:1030400080B500F52772D16909B9032002BD127855 +:10305000032A02D1C96901B18847002002BD0000DE +:103060004178007840EA012070470000F8B500245C +:103070000546087810F0600005F5277608D020286E +:1030800018BF40282ED1F26993682846984730E04F +:103090004878092826D8DFE800F03F59255325094C +:1030A00005252E29284600F013F95AE08A88002ABF +:1030B00004BFC888002815D14F88802F12D23078DD +:1030C000032807F07F070DD0B77039462846FFF771 +:1030D000C8F8284600F03EFA002F14BF0220012055 +:1030E00030703EE0284600F0E4F93AE0284600F06F +:1030F00078F9044635E0C8880128F3D13278521EA9 +:10310000012A04D9921EEDD10122291D14E0AC60E0 +:10311000012205F108010FE03078401E0228E1D8B5 +:10312000C8880228DED10121E960B06808B1032116 +:10313000E960022205F10C01284600F0E9F910E0EF +:10314000488801280DD10121B16007E03078401E88 +:103150000228C7D84888012803D1B460284600F067 +:10316000F9F92046F2BD70B50E46044630780025C8 +:1031700010F060001CBF2028402815D104F52772EC +:103180001178491E02290FD8307902280CD2D26951 +:1031900093683146204698470546F08838B928009C +:1031A00005D100F018F902E0314600F018F9284680 +:1031B00070BD2DE9FC410E460025804630783179FE +:1031C00010F0600008F5277704D020283AD0402876 +:1031D00064D137E0707800283BD0012815D003284F +:1031E0005CD13878022816D0032857D1708840B9AE +:1031F000002918BF802904D0F08810B94046FFF795 +:1032000012F8404600F0A6F94CE03878022802D0C7 +:1032100003280CD042E0002918BF80293ED0404648 +:10322000FFF701F880214046FEF7FDFF3AE0708885 +:10323000C0BB11F07F0F1CBF4046FEF7FBFF4046AE +:1032400000F088F9FA699368314640469847054688 +:1032500028E0142001F07F023B7842434244022BD5 +:1032600002F5AA7402D0032B0FD017E0002918BF73 +:10327000802913D1080648BF02F1140425600222F8 +:103280002146404600F044F90CE001F00F0310FB2A +:1032900003F00B06404408D5808C78B9314640468F +:1032A00000F007F92846BDE8F681B0F8640100286F +:1032B000F4D0002918BF802903D1DFE702F11404FC +:1032C000F7E74046FEF7BDFF00B101202060D6E7DA +:1032D00038B5044600200D46ADF8000004F52D7207 +:1032E0006888010A012908D002291ED0032929D0A3 +:1032F00006295AD007295FD067E01268207C13683E +:1033000069469847EA88002A62D0BDF80010002973 +:103310005BD0914288BF1146ADF800100146BDF860 +:103320000020204600F0F4F831BD207C51680028D0 +:10333000684604D1896A884702214170E2E7C96A78 +:103340008847F9E7C0B205283FD8DFE800F0030B53 +:103350001219202710684268002A36D0207C69465E +:103360009047CFE7106882687AB3207C694690471F +:10337000C8E71068C26842B3207C69469047C1E73D +:10338000106802690AB3207C69469047BAE7106862 +:103390004269D2B1207C69469047B3E710688269E0 +:1033A0009AB1207C69469047ACE7207C68B95168A7 +:1033B0004A6B68469047A5E7207C30B951680A6B94 +:1033C00068469047072242709CE700F007F831BD3D +:1033D00000F001F831BD204600F0BCB82946204677 +:1033E00067E0F8B50D460446244F6888387000261B +:1033F00039780846022803D3FFF7F0FF0320F2BD17 +:1034000094F89C22022A02D0032A0FD02EE0002931 +:1034100029D060602046FFF70FFD060002D0FFF7BD +:10342000DDFF29E0FFF7D7FF032019E031B90220C3 +:1034300084F89C02666000F024F814E06168884219 +:1034400011D000F01DF8397861602046FFF7F4FCD8 +:10345000060008D0FFF7C2FF616800F011F80220F3 +:1034600084F89C0208E0FFF7B6FF05E0FFF7B6FF1F +:10347000397800F006F803263046F2BD7039002096 +:10348000C9B22046FFF7E2BC38B50D46044628789D +:10349000207068786070A81CFFF7E2FD60802D1D29 +:1034A0002846FFF7DDFDA080A81CFFF7D9FDE080CE +:1034B00031BD10B504468021FEF7B5FE2046BDE8BB +:1034C00010400021FEF7AFBE00280B4600D1704728 +:1034D00030B50021044600E0491C14F8015B002DC2 +:1034E000FAD10906C90D891C1180117819700222C0 +:1034F0000321597008E010F8011BD4B2521C195571 +:10350000D4B200211955521C01780029F3D130BDE5 +:1035100080B513460222C0F894228361C36101E0A2 +:1035200080B513460A460021FEF7A2FE002002BD28 +:1035300080B513460322C0F8942200F5AC721360E4 +:10354000536001E080B513460A460021FEF797FE5E +:10355000002002BD80B50421C0F89412002300228F +:10356000E1E780B50521C0F8941200230022ECE7C2 +:103570004FF0B040006800F0F000B02888BFB020E5 +:1035800070472DE9F041040054D0207881064FF0B7 +:10359000B04538D5A868E96810F00C0001F00301C7 +:1035A00003D00C2808BF012946D12868800702D51E +:1035B000E06900283ED0FFF7DBFF616A884207D24E +:1035C000084600F0D3FB002834D100F075FA0FE074 +:1035D000286820F0F000014329606968206A21F41E +:1035E0007F4141EA00216960606A00F0BFFB08BBCF +:1035F00000F095FBDFF810180860DFF8100800688D +:1036000000F034FCB0B92078C1070DD5A868E9688E +:1036100000F00C00082801F0030103D00C2808BFBB +:1036200003292DD12868800340F139816068002882 +:1036300040F03581012038E2E06980B1296841F02D +:10364000010100F047FA06462868800700F124814E +:1036500000F02EFC801B0328F6D3032025E2286807 +:1036600040084000286000F023FC0646286800F06F +:103670001FFAC8D000F01CFC801B0328F6D3ECE72F +:103680006068B0F5803F04D1296841F48031296039 +:1036900003E02A6822F480322A60606860B100F09A +:1036A00007FC06462868800300F1F98000F000FC62 +:1036B000801B6528F6D3D0E700F0FAFB06462868A1 +:1036C000400C10F0010000F0EA8000F0F1FB801BDC +:1036D0006528F4D3C1E700F0EBFBC01B0328C0F062 +:1036E0001281BAE7E06878B1296841F4807100F08E +:1036F000F1F906462868400500F1188100F0D8FB72 +:10370000801B0328F6D3A8E7286820F4807028607F +:1037100000F0CEFB06462868800A10F0010000F099 +:10372000DC8000F0C5FB801B0328F4D395E700F094 +:10373000BFFBC01B0328C0F00B818EE740F00100E7 +:1037400000F0CEF907467068800700F11C8100F098 +:10375000AFFBC01B0328F6D37FE7706820F004009E +:1037600000F0BEF907467068C00810F0010000F0D4 +:10377000198100F09DFBC01B0428F4D36DE70528D8 +:10378000306806D140F004003060316841F001013A +:1037900005E0400840003060316821F004013160EC +:1037A000A06841F2893768B100F082FB804630683A +:1037B000800700F10C8100F07BFBA0EB0800B84211 +:1037C000F5D34AE700F074FB8046306800F070F9EA +:1037D00000F0FD8000F06CFBA0EB0800B842F4D3D1 +:1037E0003BE700F065FBC01B0328C0F0FE8034E718 +:1037F000B06840084000B06000F05AFB0746B0686F +:1038000000F056F900F0F58000F052FBC01B0328D1 +:10381000F5D322E700F04CFB801B0328C0F01F818A +:103820001BE700F045FB001B0328C0F0398114E7BB +:10383000286881010CD4296841F080712960E8680A +:1038400040F08050E86000F033FB044628688101B6 +:1038500000F12A8100F02CFB001B0328F6D3FCE6C4 +:103860000C2931D0286820F080702860E968DFF8E2 +:10387000A00589088900E960E9680140E96000F075 +:1038800017FB04462868810140F10E8100F010FB0F +:10389000001B0328F6D3E0E600F00EF9B3E620782B +:1038A00081071AD5A868E96800F00C00042801F027 +:1038B000030104D00C2808BF02297FF413AF286845 +:1038C000400503D5E06800283FF4B4AE696820697C +:1038D00021F0FE4141EA006169602168DFF834654A +:1038E00011F0180F38D0606900283FF436AFC906D0 +:1038F00070687FF523AF800709D4706840F001003D +:1039000000F0EEF80746706880077FF5E4AE706857 +:1039100040F0040000F0E4F80746706800070DD49A +:1039200000F0C6FAC01B0428F7D396E66868216940 +:1039300020F0FE4040EA01606860CEE77068A1694F +:1039400020F4706040EA0120706000F0C6F807467D +:1039500000F0ADF87FF4EBAE2078410737D5DFF803 +:10396000B8743868C10529D400F0A8FA00F0A0FAAC +:1039700080463868C10521D400F09AFAA0EB08000F +:103980000328F6D369E6706820F004007060706860 +:10399000C00810F00100DFD000F08AFAC01B042834 +:1039A000F5D35AE600F099F8074600F080F8D3D036 +:1039B00000F07EFAC01B0328F7D34EE6A06801286A +:1039C0007FF4DDAE306840F001003060E8E6217839 +:1039D00048060ED5A06A00283FF40AAFB16841F04E +:1039E0000101B16000F064FA0746B06880077FF516 +:1039F000F8AEE06A002857D0A968EA68022801F00A +:103A00000C017FF42DAF236B02F00300984202BF3C +:103A100002F07000636B984214D1A36BC2F30620CE +:103A2000984202BF02F47810E36B98420AD1236CEB +:103A300002F06060984202BF02F06042606C824215 +:103A40003FF4F6AE0C293FF4F5AD286841013FF58F +:103A5000F1AD296821F0807100F03CF80646286835 +:103A600081013FF5D7AEE968DFF8B003A26B0140F2 +:103A7000206B0143606B0143E06B41EA022101438B +:103A8000206C0143606C0143E960286840F080705D +:103A90002860E96841F08051E96000F009FA0446C5 +:103AA000286881017FF5BDAE0020BDE8F081706817 +:103AB000400810F0010070472968606A21F0F001A9 +:103AC000014329606868216A20F47F4040EA0120B0 +:103AD00068607047296000F0EBB9706840084000EA +:103AE000706000F0E5B92DE9F8430400884644D041 +:103AF000DFF82C6300F0CBF847D200F0CDF8074692 +:103B000000F0C5F841D000F0D3F9C01B0228F7D966 +:103B10000320BAE000F0CCF9401B022843D9F7E7B4 +:103B200000F0C6F9A0EB090002284CD9F0E700F03C +:103B3000BFF9A0EB0900022854D9E9E700F0B8F971 +:103B4000401B02285DD9E3E700F0B2F9401B0228D0 +:103B500067D9DDE700F0ACF9401B484577D3D7E7DC +:103B6000032802D13968890103E00028396802D1AD +:103B7000890762D401E049055FD4012085E000F0A7 +:103B800097F9C01B022872D9C2E7207881074FF04D +:103B9000B0470BD5B968A06821F0F0010143B960C6 +:103BA00000F086F90546B868C003B3D52078DFF881 +:103BB000545281060AD52968606921F0F001014359 +:103BC000FFF788FF814628688003A9D52078410641 +:103BD0000BD52968A0690909090141EA1011FFF70D +:103BE00079FF81462868C003A1D5207841070BD50D +:103BF000B968E06821F4E0610143B96000F058F968 +:103C00000546B868800399D5207801070CD5B868B7 +:103C1000216920F4605040EAC100B86000F048F922 +:103C20000546B86840038FD52078C10717D560686E +:103C3000022895D1396889039FD5B968890840EA77 +:103C40008100B86041F2893900F032F90546B86860 +:103C5000616800F00C00B0EB810F7FF47BAF30683F +:103C600000F00700804505D200F016F8074600F086 +:103C70000EF884D100F053F8DFF88C11086000F0E2 +:103C800039F9BDE8F24300F0F1B8BDE8F2833068DD +:103C900000F00700404570473168C90848EAC10193 +:103CA000316000F005B938B54FF0B0445E4DA16801 +:103CB00011F00C0106D1FFF75BFCC0F3031055F8BF +:103CC000200032BD0429594A05D00829584804D19A +:103CD0002168C90222D5104632BDE16801F0030116 +:103CE000022904D0032904D12168C90207D510464E +:103CF00005E0FFF73DFCC0F3031055F82000E16834 +:103D0000E268E368C1F306214843C2F30211491C8B +:103D10005B0FB0FBF1F05B1CB0FBF3F032BD80B584 +:103D2000FFF7C1FF3F49FFE7424A0968C1F30311AA +:103D300052F82110B0FBF1F002BD80B5FFF7EFFFA4 +:103D400000F010F8C1F3022106E080B5FFF7E7FFAD +:103D500000F008F8C1F3C22112F8211001F01F0190 +:103D6000C84002BD2F49344A0968704770B52E49D2 +:103D7000B1282EBFCC6AC0F3031051F8204021486F +:103D8000056800F0CDF82B492C4A05F00F0551F8D5 +:103D90002510B4FBF1F10024B1FBF2F1B0F5007F86 +:103DA0000FF2B802204609D10FF2940353F82050C5 +:103DB0008D4214D2401C0328F8D912E00FF2900370 +:103DC00053F820508D420AD2401C0328F8D308E053 +:103DD00000F06EF8801B03280CD3032070BD52F84E +:103DE00020400F4D2868C00844EAC000286000F059 +:103DF0005FF80646296801F00701A142E8D10020DA +:103E000070BD000008010058B8280020902800204C +:103E1000FFFFFEEE90000058000400588C80C11196 +:103E20000040005808000058407500080024F400C5 +:103E30000048E801007500088877000840420F003C +:103E400012000000240000003600000040000000C6 +:103E5000060000000C000000100000000000000040 +:103E600001000000020000000300000070B50F4ECA +:103E7000044630780025A8B1FFF751FF32784FF49F +:103E80007A71B1FBF2F1B0FBF1F0FEF773FF48B9C4 +:103E9000102C07D2002221464FF0FF30FEF732FFF0 +:103EA000B46000E00125284670BD00BF88280020CE +:103EB00001484068704700BF882800200248016818 +:103EC00041F480710160704700040058114810B53A +:103ED000016841F4807101600320FEF706FF0020B5 +:103EE000FFF7C4FF0024002814BF012400F037F8B6 +:103EF000204610BD084880687047084805E007481C +:103F0000016841F0020101607047016841F0010160 +:103F1000016070470040005888280020042004E019 +:103F2000DFF81800006800F4C0607047DFF8100088 +:103F3000FFE7016841F480610160704700040058A8 +:103F4000040400586A4900E06A4981B00A680243E3 +:103F50000A60096808400090009801B0704780B579 +:103F60004FF40020FFF7F0FF002200212E20FEF783 +:103F7000C9FEBDE802402E20FEF7E2BE00685E49A1 +:103F8000884200D0704780B54FF48010FFF7DCFF07 +:103F9000002200212C20FEF7B5FE2C20FEF7D0FEDB +:103FA000002200212D20FEF7ADFEBDE802402D20AD +:103FB000FEF7C6BE38B586B004466846142100F048 +:103FC000B1F820684D4A4E4990422CD108684D4DB9 +:103FD00040F001000860096801F0010105910598B1 +:103FE0000120FFF7AFFF0C2000900221002001917B +:103FF0000290032108200391049069464FF09040FD +:1040000000F094F840482860112000F03EF808B114 +:10401000C046C046A567AC62002200212520FEF7FD +:1040200071FE25202DE0394A90422CD14868384D48 +:1040300040F480404860486800F48040059005984E +:104040000220FFF77FFFC020009002210120019194 +:104050000290032107200391049069462D4800F047 +:1040600065F82D4828600F2000F00FF808B1C04611 +:10407000C046A567AC62002200212420FEF742FE64 +:104080002420FEF75DFE07B030BD68601020A860F8 +:104090000020E8608020286100206861A861E86154 +:1040A0002862284600F026B91CB504461B49206842 +:1040B00088421CD1FFF702FFFFF700FF1848816B11 +:1040C00021F4407141F480718163816B41F40041BE +:1040D0008163026842F480620260006800F48060DC +:1040E000009000982046BDE8164000F083BA13BD4A +:1040F0004C00005850000058000C00580080004050 +:104100005C0000585438002008000240003801408C +:10411000B438002000040048440402400028004055 +:1041200058000058002200F07DBA00002DE9F84F39 +:104130004FF00009674A684B4FF00F0805460E46DE +:1041400033E0664FBD4214BF072704278F40274343 +:104150004CF82E70C1431C6801EA040C7468E40238 +:1041600048BF40EA0C0CC3F800C05C6801EA040CCC +:104170007468A40248BF40EA0C0CC3F804C0146879 +:1041800001EA040C7468E40348BF40EA0C0CC2F86E +:1041900000C0546801EA040C7168890348BF40EA12 +:1041A0000C0CC2F804C009F10109316831FA09F0B8 +:1041B00000F07E80012404FA09F414EA0100F2D030 +:1041C0004FEA490C032101FA0CF16FEA010E716804 +:1041D00001F00307012F1CBF01F00301022911D1D7 +:1041E000A968F7680EEA010107FA0CF73943A960DC +:1041F000696821EA04047168C1F3001101FA09F148 +:104200000C436C604FEA8901347904F00304032CF9 +:104210001FD0EC68B7680EEA040407FA0CF73C43B9 +:10422000EC60347904F00304022C12D14FEAD90770 +:1042300005EB870401F01C07D4F820A008FA07FB5F +:104240002AEA0B0AD6F810B00BFA07F747EA0A0772 +:1042500027622C680EEA0407347904F0030404FA98 +:104260000CF43C432C60746814F4403F9BD0DFF89E +:1042700070C04FEA990E5CF82E7001F00C0108FA3C +:1042800001F427EA0404B5F1904F08BF00270ED0CF +:10429000144FBD4208BF012709D0134FBD4208BFCC +:1042A000022704D0114FBD427FF44BAF03274DE7E7 +:1042B000BDE8F18F81B0002A14BF8161816201B035 +:1042C00070470B4A136803421CBF106000F047BAE6 +:1042D000704700008008005800080058001000488F +:1042E000080001400004004800080048000C004895 +:1042F0000C08005838B5040001D1012032BD2168F6 +:10430000DFF8B002814204F1240500F044F80220F5 +:1043100068700A68A0686FF30E120243E0680243F7 +:104320002069024360690243A0690243E0690243D5 +:10433000206A02430A60204600F011F9A068B0F537 +:10434000804F04BF002161602079696A00F03F005E +:1043500000F014F838B1052805D2204600F019F90C +:1043600000F012F803E0002028636863A8630020CF +:10437000A861012068700020287032BD0860A96A19 +:10438000E86A486060687047296B00200860696BC4 +:10439000A86B486070470AD2DFF81C024218142349 +:1043A000B2FBF3F292002A62DFF8100209E0DFF8B4 +:1043B000100242181423B2FBF3F292002A62DFF8D3 +:1043C0000402E861704781B040B100F124014A78ED +:1043D000022A05D00420886100200870012026E010 +:1043E0000268136823F00E0313604A6A136823F40B +:1043F0008073136000680268520852000260012056 +:1044000091F82020CB6902F01C02904058608A6A23 +:10441000C86A5060086B30B1026822F48072026092 +:104420004A6B886B5060012048700020087001B012 +:10443000704738B500F1240200245178022903D0D6 +:1044400004209061012428E001680B6823F00E032A +:104450000B6001680D686D086D000D60516A0B6896 +:1044600023F480730B60012192F82030D56903F0AA +:104470001C0399406960936AD16A5960116B31B12C +:104480000B6823F480730B60536B916B59600121AF +:1044900051701470516901B18847204632BDF8B59A +:1044A00000F124010423CA6914680268156891F8B0 +:1044B000206006F01C0603FA06F73C4210D06F0796 +:1044C0000ED51468A50603D4156825F004051560FB +:1044D00000F03DF8C968002938D0BDE8F44008472D +:1044E000022303FA06F73C4213D0AF0711D5146834 +:1044F000A50605D4156825F00A05156001224A7045 +:1045000000F025F800220A708968F9B1BDE8F4408E +:104510000847082303FA06F6344217D02B0715D5AF +:10452000136823F00E031360012291F82030CC6948 +:1045300003F01C039A40626001228A614A700022E3 +:104540000A70096911B1BDE8F4400847F1BD91F85E +:104550002020CC6902F01C02934063607047416CDC +:104560000268144B89089A4234BF174B174B03EB70 +:104570008101816402F0FF02083A1421B2FBF1F1DB +:10458000134AC26401F01F01012202FA01F1016520 +:10459000704701790F4A01F03F0102EB8102426549 +:1045A000491E0D4A826501F0030101228A40C2655D +:1045B0007047000008040240F8FFFDBF0000024001 +:1045C000F8FBFDBF00040240000802401C08024046 +:1045D00080080240FC080240400902408A60FF2136 +:1045E00002685162012180F82110002180F820101A +:1045F0000020704790F82010012901D10220704757 +:10460000012280F82020022180F82110CA210268AE +:10461000516253210368596201688A6842F020029E +:10462000FFF7DCBF00B500BF130096469446103973 +:1046300028BFA0E80C50FAD85FEA417C28BF0CC024 +:1046400048BF40F8042BC90728BF20F8022B48BFF9 +:1046500000F8012B00BD000018B53848384C89B06F +:10466000016841F40041016000F07AF835480168C2 +:10467000C908C90041F004010160FFF757FC324945 +:10468000002000F00AFA00F02EFB0121012000F0CA +:1046900079F8002000F073FC012000F070FC02208B +:1046A00000F06DFC012000F09BFC0121002000F0D7 +:1046B000A1FC00F0E3FC2548006040600FF25902C5 +:1046C0000021202000F039FE04F23C5002902049E5 +:1046D0000FF22D0001900091684600F028FD04F2D1 +:1046E0005470039004F5C96140F23C500690049167 +:1046F000059403A800F054FD00F0BEFC0AB010BD04 +:1047000080B50146114800F0A7FEBDE80440002135 +:10471000202000F01FBE000080B500F0F3FA002159 +:10472000012000F02FF86946084800F0ABFE009821 +:1047300000F04FFD00F0B8FE01BD00000800005879 +:104740003000032080040058F4370020383900205E +:104750004F55000870474FF0FF3000F087BD70479D +:104760001248002101604160704710B500F019F84F +:104770001C6819B1012904D1204301E024EA00009A +:1047800018600BE010B500F00CF85C6819B1012955 +:1047900004D1204301E024EA0000586082F310882D +:1047A00010BDEFF3108272B6004B70474039002005 +:1047B000DFF8F0140A6892B200E00246086880B29E +:1047C0008242FAD170472DE9FC4104461825DFF8F2 +:1047D000D884DFF8D864684308EB000730780628EF +:1047E00008D131787170347078754FF0FF30706097 +:1047F000002039E000F077F8B9680918B96008F1CD +:104800000803B96832786A439A589142327813D3D0 +:1048100008F1150315FB02FC13F80C30062B25D00C +:1048200008F108066B43F358994222BF08F11503BB +:104830006A439A5CEED219E01146337869439A4292 +:104840000BD008F1140308F1150C5B5C15FB03F5A4 +:104850000CF805407A753B7500E07A7508F1140292 +:104860005454317871703470BDE8F6811146694353 +:1048700008F115035B5C062B04D008F1140615FB48 +:1048800003F574557B753A7508F115025454EBE73E +:10489000F8B5DFF81834DFF810541E7818240246F3 +:1048A0006243B0422A4404D118785870507D187081 +:1048B0000FE0167D507D92F815C005F1150766438F +:1048C000062807F806C004D0167D143514FB00F442 +:1048D0002E55012010731878062802BF00294FF0CA +:1048E000FF315960F1BD10B5DFF8C043606810F1C9 +:1048F000010F0FD0FFF75CFF6168DFF8B42381423E +:1049000061683CBF5388C918081A51784843117828 +:10491000C84000E0002080B210BD2DE9F84FDFF85C +:104920009053DFF890B3D5F80880D8F80000DBF892 +:1049300000104A0500F06AF9DFF87063DFF868A339 +:1049400021F4806181604FF0180934780AF1080081 +:1049500019FB04F14758FFF7C6FF874217D200271B +:104960000121B170062C3DD019FB04F40AF10801B5 +:104970000AF108020959814223BF0AF108010959C5 +:10498000091A002111510AEB04014C7DEAE7A988BC +:104990004118B94202D2AF880021E2E73F1ADFE7AF +:1049A000022802DA2878012800D07F1ED8F80000FB +:1049B000C1684A07FAD500F02FF9DBF80C00000CAB +:1049C000BFB247EA0047CBF80C70FFF7F1FE70600A +:1049D000A8680068816841F480618160AFF300805D +:1049E000BDE8F18FB8B20028DAD1FFF7E1FE7060C0 +:1049F0000320BDE8F24FFEF7D1B92DE9F843EFF3FC +:104A0000108872B6AA4DA84BA8680168CA224A62EB +:104A100053204862A54A886820F480608860182086 +:104A20001678374647431F44387B022826D13C6816 +:104A3000D7F810909078F0B17A7B012A0AD1012141 +:104A40003046FFF725FF88F310887968304600F07C +:104A5000F0F804E088F31088304600F09BF8A8686E +:104A60000068CA21416222465321416248463146CC +:104A700000F02AF90BE0FFF750FF06E0C868420794 +:104A8000FCD500F07EF88C49086088F31088FF217F +:104A9000A86802685162BDE8F183F8B5844CA16052 +:104AA000CA2209684A6253224A62824A136843F062 +:104AB00020031360136803F00703C3F1040323709A +:104AC00095682D0C05F07F056D1C6570EDB2926840 +:104AD000C2F30E02521C628092B2521E6A43A2F5C9 +:104AE000A072DA404FF6FF739A422CBFA380A280D7 +:104AF000724A136843F400231360714B1D6845F438 +:104B000000251D6048BB6948674E01238370182546 +:104B10004FF0FF33436000235FFA83FC06F10C077C +:104B200015FB0CFC4FF0000E07F80CE05B1CDFB22D +:104B3000062FF1DB06230370886820F4806088600C +:104B400000F01FF8D0600320FEF733F9A168086871 +:104B5000826842F48042826005E0C868410544BF33 +:104B60000320FEF71BF9A1680A68FF2050620022AB +:104B700003210320FEF7C6F8BDE8F2400320FEF74C +:104B8000DFB8C86800F0800060F49060C8604FF43F +:104B900000207047F8B50746EFF3108472B6032083 +:104BA000FEF7D9F8424DAE683068CA2141623A46F4 +:104BB00053214162182043494243895C02291BD199 +:104BC00000213846FFF764FE3848017806290ED1E7 +:104BD000306838490A68530500F018F821F48061FC +:104BE0008160C1684A07FCD500F016F804E04078FF +:104BF000884218BFFFF791FEA9680A68FF2050623B +:104C00000320FEF79DF884F31088F1BD02D5C1683A +:104C10004A07FCD481687047C16801F0800161F4E3 +:104C20009061C1604FF40020234908600320FEF723 +:104C3000C0B82DE9F04180460F46424618201A4977 +:104C400042438C18207B022804BF4046FFF7A2FF96 +:104C5000EFF3108572B60320FEF77DF8144EB068AE +:104C60000068CA2141625321416202202073A7607B +:104C700067604046FFF7A7FD0C490A7849789142E2 +:104C800002D0FFF74AFE02E0A168081AA060FF20E8 +:104C9000B1680A6850620320FEF752F885F3108865 +:104CA000BDE8F08128280040E4360020603900206B +:104CB0002C390020082800400C0800580008005833 +:104CC00080080058F0360020104700004D4900E0F1 +:104CD0004D4981B00A6802430A60096808400090A3 +:104CE000009801B0704780B5FFF707F9FFF707F9A3 +:104CF0004648016841F48031016000F081FDBDE863 +:104D000001400EE000B587B068460FF240211C223A +:104D1000FDF768FF00F079FA684600F091FD07B0F2 +:104D200000BDF0B585B068461421FFF7FBF90026F9 +:104D30000025002400210FF2E40000EBC10290796D +:104D400088B11368B3F1904F08D0314FBB4208D0FF +:104D5000304FBB4204BF9088044304E09088064370 +:104D600001E090880543491C2629E4DB00200290DD +:104D70000121032003900191B0B288B1009001207D +:104D8000FFF7A4FF0120FFF7A3FF69464FF0904013 +:104D9000FFF7CCF90022B1B24FF09040FFF78AFA4A +:104DA000A8B280B100900220FFF790FF0220FFF729 +:104DB0008FFF174E69463046FFF7B8F90022A9B2B7 +:104DC0003046FFF777FAA0B280B100900420FFF7D9 +:104DD0007DFF0420FFF77CFF0E4D69462846FFF754 +:104DE000A5F90022A1B22846FFF764FA05B0F0BD8C +:104DF00080B50021084800F02BFDBDE8014000F01F +:104E0000B1BE00004C0000584C01005890080058FA +:104E10000004004800080048BC28002000000048AA +:104E200001000000000000480100000000000048F0 +:104E300001000000000000480100000000000048E0 +:104E400001000000000000480100000000000048D0 +:104E500001000000000000480100000000000048C0 +:104E600001000000000000480100000000000048B0 +:104E700001000000000000480100000000000048A0 +:104E80000100000000000048010000000000004890 +:104E90000100000000000048010000000000004880 +:104EA0000100000000000048010000000000004870 +:104EB0000100000000000048010000000000004860 +:104EC0000100000000000048010000000000004850 +:104ED0000100000000000048010000000000004840 +:104EE0000100000000000048010000000000004830 +:104EF0000100000000000048010000000000004820 +:104F0000010000000000004801000000000000480F +:104F100001000000000000480100000000000048FF +:104F200001000000000000480100000000000048EF +:104F300001000000000000480100000000000048DF +:104F40000100000000000048010000000000000017 +:104F500000000000000000001C4E00082800032094 +:104F60002C000320260404003C4981B00A68024357 +:104F70000A60096808400090009801B0704778B551 +:104F800085B0044668461421FFF7CCF80CB901201F +:104F900004E0012C18BF022C02D10220FFF7E4FF2D +:104FA00000F012F8009501200190002102200390EA +:104FB00000F004F800F00EF806B070BD02916946EA +:104FC00056F82400FFF7B2B80FF29C00244E30F8D8 +:104FD0001450704756F8240000222946FFF76AB99A +:104FE0000FF284011E4B31F8101053F820000122FB +:104FF000FFF760B9F0B585B004460D466846142148 +:10500000FFF790F80120FFF7AFFF2800154E0FF2D1 +:1050100060070AD137F814000090002101910120A7 +:10502000029002210391FFF7CAFF012D13D137F837 +:105030001400009001214FF404100190FFF7BEFF0F +:105040000FF23000045D00220F2160B2FDF75AFE1E +:1050500060B2FDF775FE05B0F0BD00004C000058D1 +:1050600094280020B4280020100001000200000055 +:10507000000400002800000000F087BE714872495B +:10508000016001F12002426001F13002826001F111 +:105090003C02026201F14402426201F14C02C26030 +:1050A00001F15402026101F17002426101F17402E6 +:1050B00082618031C16100F086BE38B50446634D1F +:1050C000284600F0BDF95F484068A1680160E168CA +:1050D000C16085605E49416000F091FE5D4834E04A +:1050E00080B558484268136801211972406800F081 +:1050F0008CFE002002BD38B5564C544D04E000F043 +:105100004BF8009821688847284600F09CF9002851 +:10511000F5D031BD80B54B494A68D168022008728C +:1051200000F078FE002002BD4A484168084738B5C3 +:105130000446494D2846006040604248C068A16866 +:105140000160456000F06FFE4448216801606168BD +:105150004160002032BD80B53A48C2681368102112 +:105160001972C06800F065FE002002BD35483B4A58 +:10517000C168C16813680868184738B5374C364DA0 +:1051800004E000F009F8009861688847284600F0BC +:105190005AF90028F5D031BD6946284600F072B9A9 +:1051A00038B504462E4D284600F04AF92D480060D7 +:1051B000406024480069A1688160E168C1600561C0 +:1051C00021680160616841602169416161698161B3 +:1051D00031BD80B50146234800F03EF9BDE80240EC +:1051E0000FF2050000F02EBE38B5164C1D4D06E03E +:1051F000FFF7D2FF00992069006900F02DF92846D9 +:1052000000F021F90028F3D031BD10B5164C20462E +:10521000006040600B4841690C60BDE8104000F040 +:1052200025BE1CB5104C06E06946204600F02AF960 +:105230000098C046C046204600F005F90028F3D08B +:1052400013BD000000000320B40A0320500B03200C +:10525000A40A032050390020580B0320583900209D +:10526000400B032048390020480B03202DE9FC4760 +:10527000604CDFF88491A5692840A0614FF0FF3AA7 +:1052800021694FF0010834E0521C54F83200616982 +:1052900019400142F8D0616904EBC2060840716808 +:1052A0001840014208BFC6F804A07768384000F0F3 +:1052B000A5F8606208FA00F087437760EFF3108189 +:1052C00072B6626A206908FA02F2D2431040206185 +:1052D000022004EBC00353F8086C1640401E43F84C +:1052E000086CF6D181F31088606A59F8201088475D +:1052F0002169A36960690140194205D0E069216A0A +:10530000084208BF0022C0D0C4F824A000F0C6FDA7 +:10531000EFF3108972B6216960690140A06901420A +:1053200001BFE169206A0142FFF714FA89F310888E +:10533000C046C046A561BDE8F38738B51446EFF313 +:10534000108572B600F05AF82B4941F8204085F3D9 +:10535000108831BD10B500F00BF804431C6153F800 +:105360003140204343F83100FFE782F3108810BD3D +:10537000EFF3108272B61F4B1C697047EFF3108178 +:1053800072B61C4A536923EA000005E0EFF310816E +:1053900072B6184A53691843506181F310887047F8 +:1053A000EFF3108172B6134AD3691843D061F4E762 +:1053B000F8B5104C666A256A374616F1010F0EBF24 +:1053C0000026012101FA06F6206202E03046FFF7CE +:1053D000C2F9216AE0690842F8D06762EFF31081F0 +:1053E00072B6E269206A8243E26181F31088256225 +:1053F000F1BD00002828002074370020024600205C +:10540000110C090404BF1020120412F07F4F04BFD6 +:10541000083012020FF2180112F0704F04BF001D85 +:105420001201120FC0F11F00895C401AC0B2704710 +:10543000040302020101010100000000000000005D +:10544000006040607047EFF3108172B602688242DC +:105450000CBF0120002012E0EFF3108272B608604A +:1054600043684B6041604868016019E0EFF31081C8 +:1054700072B642680368136002684368536081F340 +:105480001088704710B5EFF3108472B602680A6096 +:105490000068FFE7FFF7EAFF84F3108810BD0B6098 +:1054A00082F310887047000018B591B004A80FF27D +:1054B0001C31BD4C3422FDF795FB2068BB4C4FF6E8 +:1054C000FC7101EA8001BA484118BA480290616152 +:1054D00000F5867003900FF22D210FF279200190D4 +:1054E00000916846FFF7E9FD01210220FFF73DF931 +:1054F00000202073207204A800F09AF90FF2B11274 +:1055000000210820FFF719FFAB4A00210120FFF717 +:1055100014FF0FF2611200211020FFF70EFFA74ABF +:1055200000210220FFF709FFA54A00210420FFF710 +:1055300004FF0020206104F118000060406004F1C5 +:10554000200104F5927000F083F912B010BD80B50F +:10555000964A117B31B1002010730120BDE8024052 +:10556000FFF71EBF014602F11800CFE02DE9F04120 +:105570000F68DFF850828D4E054605E0BC4225D20B +:1055800000F060F825443F1B307A01280DD1726885 +:10559000BA424AD230682946FDF714FB00F052F8AF +:1055A00000203072706805443F1AEC78391F8C4235 +:1055B0002CBF3C46241D0CE04068C16817E0C06861 +:1055C00014E008F108003060224615E0BDE8F04123 +:1055D00038E0297870697172012906D00229EBD070 +:1055E0001029ECD02029ECD009E04068016801F1D5 +:1055F00008023260224630682946FDF7E3FAE8786F +:10560000001D8442BAD201213172E8783168001D50 +:10561000001B70600819306005E0FDF7D3FA00F058 +:1056200011F800203072BDE8F081974230683A46A8 +:105630002946F2D2FDF7C6FA7068C01B7060306868 +:105640003844E8E75948417A01290FD0022904D0AB +:10565000102905D0202906D070470021042007E03A +:105660000021022004E00021082001E000210120A7 +:10567000FFF770BE1CB51020FFF780FE4B4C04F105 +:10568000100104F11800FFF7FDFE20690FF28D02F2 +:10569000017A022907BFB0F80B10491D817AC91C95 +:1056A00002B0BDE8104089B2083000F0F3B8000045 +:1056B00010B5444CB4F809004FF66052811A04D07A +:1056C000491E06D0491E08D00BE0204600F0E8FB3A +:1056D00011E0204600F01FFC0DE0204600F041FCE8 +:1056E00009E0A0810120A073E072212020720E2029 +:1056F00060720420A07221463348FFF7ADFEBDE87A +:10570000104007E080B50146DFF8BC00FFF7A4FEBB +:10571000BDE8044000211020FFF71CBE1CB5234C3F +:105720006069016920698A68904205D3C96811449B +:10573000884238BFFFF74DFD04F11800FFF783FEE4 +:1057400018B900211020FFF705FEBDE81640102013 +:10575000FFF71CBE704770B51446134A134E12680B +:105760001D46012333734FF6FC7303EA8203104A8C +:10577000D3180A46DE683668A6F80900F17206F109 +:105780000C002146FDF71EFA00210020FFF7E3FC84 +:105790000120FFF70DFE314605F10800B278BDE8A3 +:1057A0007040D21CFDF70EBA3C400058B02F0020CC +:1057B0000000032090080320E15000085751000822 +:1057C00015510008B8330020C82F00200000000049 +:1057D00000000000000000000000000000000000C9 +:1057E000440008004005020112279C00F40100005B +:1057F000FFFFFFFF48010100002000000000000043 +:1058000080B5FFF7F5FA022100910023044800F16A +:1058100024014FF48052001D00F002FC01BD000085 +:1058200008140020FFF797FF9DF80E0005B000BD9B +:10583000F8B500F10C026B4625214FF66640F1E702 +:10584000F8B500F10C026B460F214FF66840E9E70E +:1058500010B54F4C002220606160A28104F1140059 +:105860004C49FDF7C3FA4C4904F11400FDF7D1FA95 +:1058700004F5397104F1140000F026FD04F1140060 +:10588000FDF7D8FABDE810400FF23D02002140209C +:10589000FFF753BDF8B50C461546EFF310863C4FA5 +:1058A000014638682246FDF78DF9BD60FC8172B66D +:1058B000387B20B101214020FFF74CFD01E00120A1 +:1058C000787386F31088F1BD10B5314CE2892168F8 +:1058D00004F1140000F0FFFC04F1140000F00FFDCF +:1058E00028B1BDE8104001214020FFF733BDA0687A +:1058F000BDE81040004738B5254D696805F1140032 +:1059000000F0F4FC05F1140000F00FFDEFF310843B +:1059100072B601202873687B18B101214020FFF77F +:1059200019FD84F31088002032BD0020704710B5A7 +:1059300020281A4A02D0212812D01FE008784B787C +:105940008C7840EA0320CB7840EA044040EA0360C8 +:1059500010600879107148795071887990710DE064 +:1059600010680870030A4B70030C000EC8708B702F +:10597000107908715079487190798871002010BDB4 +:1059800080B5FFF7F3FD064800F0CFFC002002BD14 +:105990002C24002050280020F0270020AC280020D4 +:1059A00040240020AF4900E0AF4981B00A680243BB +:1059B0000A60096808400090009801B0704738B547 +:1059C000AA49AB4C4FF400400860FEF77FFA6068CC +:1059D00040010ED56068C0000BD4FEF76FFAFEF7E9 +:1059E0006DFA206840F480302060216821F4803115 +:1059F000216000F016F9002000F0AAFC40B1807987 +:105A00009C49E160E16821F47C5141EA0021E160B8 +:105A100000F055F8984C9948994D606204F12400C3 +:105A200000F0A8FC00F0C5F896480168002202606A +:105A3000026902F0500202610420FFF7B5FF012065 +:105A4000FFF7B2FF0220FFF7AFFF0420FFF7AAFF26 +:105A50000220FFF7A7FF0120FFF7A4FF00220F217C +:105A60000B20FDF74FF90B20FDF76AF900220F21FB +:105A70003A20FDF747F93A20FDF762F9002060600F +:105A800025600F20A06047F6FF70E06000202061D5 +:105A9000A061E0616061204600F0A4FCCA20686259 +:105AA000FF2153206862A868C008C000A86069622E +:105AB000FEF7D2FD4FF0FF30FFF7D8FBFAE710B545 +:105AC000AEB01CA84821FEF72DFB01A81C21FEF753 +:105AD00029FB08A85021FEF725FBFEF7EFF96448E3 +:105AE000016821F01801016007216748026822F46B +:105AF000C06242F4007202604FF48032006800F429 +:105B0000C06000904FF4807400981C9101201E909A +:105B10000021402020901D9227911F941CA8FDF782 +:105B200030FD6F200190022100200291039004902B +:105B3000059006900790012101A8FDF7D4FF43F6D8 +:105B40000300089000214FF4804019900E910F91AE +:105B5000102002211B901A91189408A800F0FCFC58 +:105B60002EB010BD10B5494C494800F015F8206220 +:105B70006062A0626066FFE7204600F091FE0021AF +:105B8000204601F07CFA0021204601F083FA2046ED +:105B9000BDE8104001F056BA20604FF4E13060607B +:105BA0000020A060E06020610C2060610020A06106 +:105BB000704718B59BB007A85021FEF7B3FA01A8AB +:105BC0001821FEF7AFFA3348334C0168206C40F0DF +:105BD00001002064206C8007FCD54FF48070079092 +:105BE0000021149107A800F0B7FC206840F08070F5 +:105BF00020604FF00052216801F080710091002177 +:105C0000009801914BF67F300490222105910020ED +:105C1000039020210292069101A800F018FE1CB00A +:105C200010BD1E4881B0016841F4801101603F2120 +:105C3000006800F4801000900098194841604161AC +:105C4000016841F47C110160026942F47C12026136 +:105C5000016841F03F010160026942F03F020261C8 +:105C600001B07047480000584C00005810400058E0 +:105C700090000058FECAFECAF4370020000C0058FD +:105C8000002800408008005800040058C435002057 +:105C900000800040941400585800005850000058EC +:105CA000040C0058C0680840884201D101207047A8 +:105CB00000207047C0690840884201D10120704728 +:105CC0000020704710B56C4C02212046FFF7F2FF10 +:105CD00038B16068C043810703D5FFF74EFA022050 +:105CE00018E001212046FFF7E5FF38B16068C043A6 +:105CF000C10703D5FFF7FFF901200BE0082120467B +:105D0000FFF7D8FF38B16068C043010703D5FFF73C +:105D100088FA0820A06010BD10B5574C022120461B +:105D2000FFF7C0FF58B96068C043810307D56068BA +:105D300040F400306060BDE81040FFF717BA08215A +:105D40002046FFF7AFFF70B96068C04301030AD572 +:105D500060684A4940F400206060086880474FF45A +:105D60000020A06010BD20212046FFF79BFF58B9FE +:105D70006068C043810207D5606840F4001060602D +:105D8000BDE81040FFF7D0B910BD3D4881B00168B3 +:105D900041F480110160006800F4801000900098C8 +:105DA0003848016841F4007101603748026842F4E4 +:105DB0000072026040BF20BF3448016841F40041D6 +:105DC000016001B0704780B53148016841F480112D +:105DD0000160006800F48010009000982648016877 +:105DE00041F001010160026842F4803202602C201F +:105DF000FCF7A6FFBDE802402D20FCF7A1BF254817 +:105E00000168490849000160704723494FF4803018 +:105E1000086070471F484FF400114160016821F489 +:105E20000011016070471B48016821F00201016008 +:105E3000704718484FF400314160016821F4003187 +:105E40000160704738B504460B4D08212846FFF71E +:105E500029FF30B109480460686820F400206860B8 +:105E600031BDA0474FF40021A96031BD0948016848 +:105E700021F0080101607047000C005868390020CB +:105E800050010058D4080058200800580C0400584D +:105E900050000058040C0058080C005870470000CF +:105EA00070B5EFF31081027B012A02D0022A07D0DD +:105EB0000DE000F028F8137800F01FF814700CE0E3 +:105EC00000F021F8138800F018F8148005E000F0C5 +:105ED0001AF8136800F011F8146081F3108821217A +:105EE00001720E214172042181724FF6605181814D +:105EF000002181730121C17270BD264623EA04048A +:105F000035402C43704772B6D0F81120D0F80D40C0 +:105F1000D0F81550704781B0017B012902D00229C9 +:105F200004D008E0D0F80D10097807E0D0F80D1083 +:105F30000A88009203E0D0F80D10096800910E2144 +:105F4000417221220821817202724FF661518181D2 +:105F50000121C17200218173009A40F80F2F01B016 +:105F6000704738B50446284800684FF6FC7505EAC6 +:105F7000800526484519212020720E20607242209B +:105F8000A0724FF66250A0810120E0720020A07341 +:105F90001F480168090CA4F80F100068C0F30B003B +:105FA000A4F811001B4801781B4801F01F01E1749F +:105FB000416821754168090AC4F815100268C4F8DF +:105FC00019200169C4F81D104169C4F8211004F1B9 +:105FD00029018069C4F82500286802680A600C223B +:105FE0002B68191D04F12D00FCF7ECFD286800F169 +:105FF0001001102204F13900FCF7E4FD07480168A4 +:10600000C4F8491031BD00003C4000580000032096 +:10601000002004E00075FF1F8075FF1FC87800088E +:1060200010B5029C016042600021C16001614161C4 +:1060300081610381A107047704D5008910B14FF075 +:10604000FF3010BD002010BDF8B505464FF40770B5 +:10605000FAF706FF040005F52F7602D13060022022 +:10606000F2BD346005F14C07287C40B94FF4007351 +:1060700000F032F8012028874FF4007305E0402338 +:1060800000F02AF801202887402302220121284617 +:10609000FCF7B8F80120A5F87801082310207880D3 +:1060A000032282212846FCF7ADF801203880706871 +:1060B0000168884704F5017100220A614A61287C61 +:1060C0000A6800280CBF4FF40073402301212846C2 +:1060D000FCF7D5F80020F2BD022281212846FCF70A +:1060E00091B838B504468121FCF796F804F13805DB +:1060F0000020288001212046FCF78EF80020A4F81B +:10610000780182212046FCF787F80020A882E882E7 +:1061100004F52F74206838B16168486880472068AA +:1061200001F00BF800202060002032BDF8B50546D4 +:1061300005F5277300201C6A8DF800000E46ADF8A7 +:10614000020000270CB90320F2BD317811F0600085 +:1061500024D020283ED1F2887078D2B109060DD51E +:106160005B6AD3F808C02146E047F288082A28BFB6 +:10617000072221462846FDF7CBF930E004F50071EF +:106180000870F08848702146F2882846FDF7D0F95B +:1061900025E05B6A9C683146A04720E0707830B10A +:1061A00001281CD00A2809D00B2810D012E018783A +:1061B00003280FD102220DF1020104E01878032810 +:1061C00008D1012269462846FDF7A2F907E01878B0 +:1061D000032804D031462846FDF76BF903273846DB +:1061E000F2BDF8B5044604F52F739E681D680DB91D +:1061F0000320F2BD0F46142010FB07F004EB000C47 +:10620000DCF8180080B128225743F219926BB0FBDA +:10621000F2F602FB160038B9CCF818000023002271 +:106220002046FCF725F80BE005F502700022C2605D +:106230005A68136923B10A46006805F50471984746 +:106240000020F2BD70B500F52F752C680CB9032045 +:1062500070BD04F50176FCF719F8B06004F5037120 +:106260006A683068D3689847002070BD1CB500F597 +:106270002F70016809B9032016BD4368002B1EBFAB +:1062800001F500742078FF2804D062789B68984755 +:10629000FF202070002016BD432101800648704772 +:1062A000432101800548704743210180044870471D +:1062B0000A21018003487047682700202427002016 +:1062C000AC270020A028002009B903207047C0F89F +:1062D000C01200207047D0F8BC0208B903207047F4 +:1062E00000F502700160826000207047D0F8BC02A7 +:1062F00008B903207047C0F804120020704710B599 +:10630000D0F8BC12012209B9032010BD01F50274B6 +:10631000E16841B9E260A168C162A3682268812195 +:10632000FBF7A6FF0022104610BD80B5D0F8BC12C6 +:1063300009B9032002BDD1F80422017C00290CBF59 +:106340004FF4007340230121FBF799FF002002BDA9 +:1063500001460648064AC3798B4218BF904218BFCF +:106360000838F8D18B4218BF00207047F873FF1F20 +:106370000070FF1FF8B504460025ACB104F13406E7 +:10638000307910B92046FDF7F9FD0F4F384600F07F +:1063900021F8386840F001103860204600F007F816 +:1063A00035600120307100E001252846F2BD10B5AE +:1063B0000021064A064B00EB8104491C0629636054 +:1063C000E261F8D310BD0000000C0058CB2C00088F +:1063D00017160008002101604FF03F1141603F2176 +:1063E0008160704738B5040044D094F8210028B982 +:1063F000002184F820102046FDF756FE00F049F8F1 +:10640000FF2510B100F03FF834E02168DFF8B0005C +:106410008A6802408A6021688A6863682069034349 +:10642000A06903431A438A602168E0680861206814 +:106430000169A26841EA024101612068C16821F056 +:106440008001C1602068C16C89088900C16421682D +:10645000CA6CE369606903431A43CA6420688168AF +:10646000880609D400F020F830B120684562042184 +:1064700000F01FF8012032BD20684562012184F838 +:106480002110002032BD20684562042184F82110CB +:106490007047022084F82100CA20216848625320F6 +:1064A00022685062204626E020460BE02068C0F8B3 +:1064B000248084F82110002084F820007047000018 +:1064C000BFFF8FFF70B5044640F2E9362068C1680F +:1064D00021F0A001C160FDF7EBFC05462068C16812 +:1064E000880606D4FDF7E4FC401BB042F6D3032037 +:1064F00070BD002070BD70B504462068C1684A06B2 +:1065000012D44FF0FF32C26040F2E936FDF7D0FC02 +:1065100005462068C168480606D4FDF7C9FC401B43 +:10652000B042F6D3032070BD002070BDDFF86413C5 +:106530000A68030903F47F2300019A4300F47F20D3 +:1065400000F082B9DFF84C231368010C23EA014301 +:1065500043EA0043136070472DE9F84305460024E1 +:106560002878DFF830634106A0464FF0B0472DD5BC +:10657000286B70B1B0F5800F06D0B0F5000F18BFD2 +:10658000B0F5400F17D01FE0F86840F48030F86095 +:10659000EDE0386820F080603860FDF789FC8146C6 +:1065A0003868000140F1D080FDF782FCA0EB0900C3 +:1065B0000228F5D90324D7E0FDF77AFCA0EB090007 +:1065C000022840F2C980F5E70124A04628680105A9 +:1065D00031D5B06800F44078286C80452AD0FDF7AA +:1065E0006DFCB8F1000FB16805D1286C21F4407141 +:1065F0000143B1601EE0B06840F48030B06021F427 +:106600004071B06820F48030B060286C0143B16004 +:10661000B068C0070ED5FDF74BFC804641F28939C2 +:10662000B068800706D4FDF743FCA0EB080048459E +:10663000F6D30324A0462878C10705D53168A86998 +:10664000890840EA810131602878810705D53168E1 +:10665000E86921F44061014331602878C10644BFF4 +:10666000A86AFFF76FFF2878810644BFE86AFFF742 +:1066700069FF2878410744BF286AFFF757FF287849 +:10668000010744BF686AFFF751FF2868C1051BD5A1 +:106690003168686B21F0406101433160686BB0F193 +:1066A000006F00F0BDF8686BB0F1806F75D100F03D +:1066B000BDF804463868000160D5FDF7F9FB001B02 +:1066C0000228F7D94FF0030867E0FDF7F1FB001B44 +:1066D00002285BD9F6E7316821F04041316020F0B3 +:1066E0008050326822F0406210433060A86BB0F1F5 +:1066F000C05F00F095F8286841056DD53168E86BFA +:1067000021F0405101433160E86BB0F1005F03D1EB +:10671000F96841F48031F960E86BB0F1805F5BD1DA +:1067200000F084F804463868000146D5FDF7C0FB48 +:10673000001B0228F7D94FF003084DE0FDF7B8FB26 +:10674000001B022841D9F6E700F061F8A86821F49F +:10675000781100F071F88146386800017FF52CAFA0 +:106760003969686901433961002C7FF42EAF3168C3 +:10677000286B21F440010143316027E700F047F81E +:10678000E86821F0606100F057F8044638680001BD +:106790009BD5396968690143396128688105AAD5A3 +:1067A000A86BB0F1804F1CBFB0F1004F002892D110 +:1067B000316821F04041084397E700F028F8286944 +:1067C00021F0604100F038F8044638680001B5D582 +:1067D00039696869014339612868C10405D5F168E0 +:1067E000686C21F440410143F160286881040BD5B5 +:1067F000796AE86C21F0300101437962796AA86C0A +:10680000890840EA810179624046BDE8F28338692F +:10681000696820F4FE4040EA012038613969704718 +:1068200003D1F96841F08071F9607047396821F04F +:1068300080613960FDF73CBB01433961386840F045 +:1068400080603860FDF734BB10430860704710B5B6 +:1068500011490A6842F080720A600B680F4A23F0FF +:1068600080730B60046841680C4381680C43C16805 +:106870000C43016944EA014454601368406923F4FD +:106880007C5343EA00231360116841F060011160FA +:1068900010BD00008800005838000058006000401B +:1068A00038B5040009D004F18005686808B900F023 +:1068B0001EF800F021F8012801D1012032BDA06AA4 +:1068C00008B100F02AF800F00AF821F02A01FFE7E9 +:1068D000816000F01BF8BDE8324000F0E8BA2068A3 +:1068E000416821F49041416020688168704700212F +:1068F00029702046FDF75EBB24206860206801688F +:10690000490849000160204600F066B92068016826 +:1069100041F00101016020467047204600F064BA52 +:10692000216851E8002F7047206800F1080151E804 +:10693000001F00F1080221F0400142E80010002889 +:106940007047F8B5044640F60F002668F1693268D2 +:10695000B368084004F15C050ED1880602D59006A4 +:1069600002D4D80040F181806969002900F02981B2 +:106970002046BDE8F4400847DFF89006034204BF14 +:10698000DFF88C763A4270D0CF0707D5D70505D50A +:10699000012737622E6B46F001062E638E0708D55D +:1069A000DE0706D5276802263E622E6B46F00406F7 +:1069B0002E634E0708D5DE0706D5276804263E62FB +:1069C0002E6B46F002062E630E070AD5960601D4FA +:1069D000034206D0266808203062286B40F0080089 +:1069E0002863080509D5500107D526684FF40060D3 +:1069F0003062286B40F020002863286B002833D0D9 +:106A0000890607D5900601D4D80003D5696909B174 +:106A100020468847286B21688A68510602D410F006 +:106A2000280F1CD0204600F0C7FA00F0D1F811D58D +:106A3000FFF77AFFFCD1286A60B10FF2DD51816364 +:106A4000286AFDF7F6FC00280ED0286A816BBDE8A5 +:106A5000F44008472046BDE8F24000F070BB2046F5 +:106A600000F06DFB00202863F1BD286901286AD180 +:106A7000CF0668D5D00666D51020306200F0A8F8A1 +:106A80002DD5296A0868406880B20028ECD02A8891 +:106A90009042E9DA6880086801688A061BD4FFF72B +:106AA0003FFF22F4807200F08FF8F8D1206800F0E8 +:106AB00077FAFBD1FFF738FFFCD12020E8620020F5 +:106AC0002861FFF72DFF22F0100200F07DF8F8D1C9 +:106AD000286AFDF778FC29886888091A2DE028883B +:106AE0006988411A688800281CBF88B2002868D0CD +:106AF000226852E8003F23F4907342E800300028F7 +:106B0000F6D1206800F1080200F1080352E8002FD6 +:106B1000DFF8B802024043E800200028F1D120202D +:106B2000E862002028616861226852E8003F23F093 +:106B3000100342E800300028F6D12046BDE8F440BA +:106B400089B200F0FDBAC80209D5580207D54FF442 +:106B5000801030622046BDE8F24000F0EDBA080631 +:106B600009D5100601D4180205D5A96949B32046F4 +:106B7000BDE8F4400847480611D550060FD5FFF789 +:106B8000CFFE22F0400200F01FF8F8D12020A862CA +:106B90000020A8612046BDE8F24000F0D2BA080209 +:106BA00006D5500004D52046BDE8F24000F0CABA30 +:106BB000C80148BF002A04D52046BDE8F24000F0D5 +:106BC000C2BAF1BD22F4F07241E8002000287047FB +:106BD0002068816848067047F8B50446DFF8480425 +:106BE0002168DFF848C40A68DFF844740240A068EE +:106BF00002432069024360690243E06902430A607C +:106C000000254A68E06822F4405202434A60A369C2 +:106C1000DFF8202491421CBF206A03438E68DFF80E +:106C20001804064033438B600FF2A416CB6A606AE7 +:106C30001B0940EA0313CB626145DFF800044FF4FF +:106C4000004339D13F6807F00307032F4DD8DFE831 +:106C500007F0024643494FF0010CE169B1F5004FDE +:106C60004FF6F07740F08080BCF1010F09D0BCF105 +:106C7000020F0AD0BCF1040F71D0BCF1080F71D023 +:106C800099E0FDF762F8002815D0626A616836F86D +:106C90001230B0FBF3F04A0802EB4002B2FBF1F015 +:106CA00080B2A0F11001B942EAD20740C0F342001D +:106CB00007432068C7607FE0914216D13F6817F410 +:106CC000406723D0B7F5806F09D0B7F5006F03D0C8 +:106CD000B7F5406F06D008E04FF0020C07E04FF028 +:106CE000040C04E04FF0080C01E04FF0100C91424E +:106CF000B3D1BCF1000F09D0BCF1020F0AD0BCF136 +:106D0000040F15D0BCF1080F15D054E0FDF715F8AD +:106D1000002851D0616A36F81120B0FBF2F66268A3 +:106D200002EB42018E4246D31103B14205D242E04A +:106D3000FCF7B9FFECE71846ECE75008002110EB30 +:106D4000062051EB1661002300F0FEF9A0F540711A +:106D5000DFF8EC2291422ED22268D0602CE0FCF7C2 +:106D6000A2FF90E7184690E7BCF1010F09D0BCF1F3 +:106D7000020F09D0BCF1040F18D0BCF1080F18D0D5 +:106D800019E0FCF7E2FFB8B1626A36F812306168C8 +:106D9000B0FBF3F000EB5100B0FBF1F080B2A0F1DA +:106DA0001001B94207D22168C86005E0FCF77BFFFB +:106DB000E9E71846E8E7012504F168000121418070 +:106DC000018000218160C1602846F2BDFEFFFFEF17 +:106DD000010002000400060008000A000C00100078 +:106DE000200040008000000190F82810CA0706D556 +:106DF00002685368C16A23F400330B43536090F870 +:106E000028108A0706D502685368016B23F4803383 +:106E10000B43536090F828104A0706D50268536860 +:106E2000416B23F480230B43536090F828100A072A +:106E300006D502685368816B23F400430B4353600B +:106E400090F82810CA0606D502689368C16B23F42F +:106E500080530B43936090F828108A0606D5026889 +:106E60009368016C23F400530B43936090F828104F +:106E70004A0610D502685368416C23F480130B4313 +:106E80005360416CB1F5801F05D15368816C23F4C8 +:106E9000C0030B43536090F828100A0606D501681A +:106EA0004A68C06C22F4002202434A607047F8B579 +:106EB000044604F180050020E8606FF07E47FCF78F +:106EC000F7FF0646206801680A0708D50097334691 +:106ED00000224FF40011204600F017F860B9206836 +:106EE00001684A070AD50097334600224FF4800113 +:106EF000204600F00AF808B10320F2BD20206860A7 +:106F0000A8600020E0662870F2BD2DE9F041069CE3 +:106F100005460E4690461F462868C1693140B14279 +:106F20000CBF01200020404526D114F1010FF3D001 +:106F3000FCF7BEFFC01B844200D33CB900F025F82B +:106F400000F02DF8FCD100F01AF811E02868016873 +:106F50004A07E1D5C1690A05DED54FF40062026235 +:106F600000F013F800F01BF8FCD100F008F8C16045 +:106F700000210170032000E00020BDE8F08105F150 +:106F800080002021416081607047296851E8002F0E +:106F900022F4D07241E800200028F6D1704728681A +:106FA00000F1080151E8001F490800F108024900FA +:106FB00042E8001000287047026852E8003F23F4BE +:106FC000907342E800310029F6D1016801F108020E +:106FD00001F1080352E8002F0E490A4043E800215E +:106FE0000029F2D1C16E012908D1026852E8003FA0 +:106FF00023F0100342E800310029F6D12021C0F827 +:1070000088100021C1660167704700000100001070 +:1070100020010004FEFFFFEF806A00F1560100220C +:107020000A810A8000F08BB8F369FFCF0038014075 +:107030008800005800800040FFF4FF110024F40095 +:1070400000FD0F0010B500F180010A78012A01D17E +:10705000022010BD01230B7024224A6002681368CD +:1070600014686408640014600022426623F0005330 +:1070700000680360202048600020087010BD70B5D3 +:1070800000F01EF801D1022070BD00F01FF822F0C0 +:10709000604209E070B500F013F801D1022070BD24 +:1070A00000F014F822F0606211438160204600F085 +:1070B0001AF820680660202068600020287070BDE3 +:1070C000044604F1800528780128704701222A70BF +:1070D0002420686020680668026852085200026036 +:1070E00020688268704730B5416E11B901210122D4 +:1070F00014E001680FF230048A6889680FF23003E7 +:10710000520E02F00702490F655CA45C595C9A5C60 +:10711000ED00E40095FBF1F194FBF2F26830418060 +:10712000028030BD000000000101010307010000E2 +:1071300008040204080101017047F9F7ECBF704729 +:107140007047704770477047B3BBD9B1B2F5803F05 +:107150007DD2022A1ED98C46B1FBF2F102FB11C38B +:107160001B0443EA1043B3FBF2FC02FB1C3380B266 +:1071700040EA0343B3FBF2F002FB103240EA0C405A +:1071800000237047022A05D98446B0FBF2F002FBC7 +:1071900010C270474AB105D100F0010249085FEA08 +:1071A0003000704700220023704700F0E5B80B0064 +:1071B0000200002100207047904271EB030CF6D3CF +:1071C000B3F5803F2FD2F0B5B3FA83F7B1FA81F46B +:1071D000A7F10F0E3D1B5340CEF1200602FA0EF22E +:1071E000F3415340B5F10F0746D80F3C2C444140C2 +:1071F000C4F12006A040F1414140B1FBF3F603FB8E +:107200001611A2FB0645001BA94102D2761E80186A +:10721000594180EA010221FA0EF362FA0EF20021CE +:107220005A403046F0BD30B4B1FBF3FC03FB1C11F7 +:10723000A2FB0C45001BA94103D2ACF1010C801844 +:10724000594130BC02460B46604600217047B2F1FE +:10725000807F65D3F0B5B2FA82F7B1FA81F4C7F155 +:107260000F063D1B22FA06F307F1110EF2412035FD +:107270005A40B5F10F07B8D94140C4F12006A040EB +:10728000F1414140B1FBF3FC03FB1C11A2FB0C4597 +:10729000001BA94103D2BCF1010C801859410F2FEA +:1072A00012D30F3FC90341EA5041B1FBF3F603FB90 +:1072B0001611A2FB0645D4EBC030A94102D2761EBE +:1072C0008018594146EACC3C07B34140C7F120063B +:1072D000B840F1414140B1FBF3F603FB1611A2FBAC +:1072E0000645001BA94102D2761E8018594180EA4A +:1072F000010221FA0EF3C7F1200462FA0EF20CFA31 +:1073000007F05A402CFA04F13043F0BD80EA010244 +:1073100021FA0EF3002162FA0EF260465A40F0BDE7 +:107320008C46B1FBF2F102FB11C31B0243EA10636E +:10733000B3FBF2FC02FB1C331B024CEA002043EAC5 +:107340001063B3FBF2FC02FB1C331B024CEA00206F +:1073500043EA1063B3FBF2FC02FB1C331B024CEA52 +:10736000002043EA1063B3FBF2FC02FB1C324CEA40 +:1073700000200023704700007047000012200880A2 +:107380000FF200107047042008800FF20C107047B5 +:1073900010B500F029F80FF2980004E010B500F0E5 +:1073A00023F80FF2B0002146FCF78EF8204610BDFE +:1073B00038B51A2008800E494C68086889680D4D58 +:1073C000081809D00822A91C00F01EF8042205F1B3 +:1073D0001201204600F018F8284632BD10B500F022 +:1073E00003F80FF28400DEE70A46034C7047000002 +:1073F000107AFF1F6C280020C434002010B5FFF75E +:10740000F3FF0FF27000CEE730B5002393420DDAA0 +:10741000040F0A2C2CBF3734303401F8134001EB31 +:107420004305002400016C705B1CEFE730BD0000D9 +:1074300053544D3332205669727475616C20436F1A +:107440006D506F727420696E204653204D6F6465D5 +:107450000000000053544D6963726F656C6563747E +:10746000726F6E696373000056435020436F6E66FF +:107470006967000056435020496E74657266616307 +:107480006500000012010002020200408304405720 +:107490000002010203010000040309041349002053 +:1074A00008604FF4E0221248016841F47001016065 +:1074B0004FF0B041086840F0010008608A600D4854 +:1074C0000A6802400C480A60036823F00503036061 +:1074D000426852085200426000220848C8600861B1 +:1074E000086820F4802008608A61704708ED00E099 +:1074F00088ED00E0FBFEF6FA94000058001004222C +:107500000100000003000000050000000100000071 +:1075100001000000060000000A000000200000003A +:10752000020000000400000008000000100000003D +:107530004000000080000000000100000002000088 +:10754000A0860100400D0300801A060000350C00E3 +:1075500040420F0080841E0000093D0000127A00A6 +:107560000024F40000366E010048E801006CDC02E3 +:10757000000000000000000000000000000000000B +:107580002DE9FC4D016800F10805490805EBC10231 +:10759000019200F10802406800F0010A02EBC10804 +:1075A000400808EBC00B00200021019A95422FD023 +:1075B0002A68AE186A68324400920835009A9642EA +:1075C000F3D016F9014B009A964205D12A68AE18FD +:1075D0006A6832440092083516F8017B884210D15F +:1075E000D84508BFFAF714F8D8F80000D8F8041006 +:1075F000BAF1000F18BF48440144884208F1080856 +:10760000EED0002C00F8017B05D5641CE6D1D5E74F +:107610005846BDE8F68D641ED5D5CFE77047FEE726 +:10762000FEE7FEE7FEE770477047704700F028B8B6 +:1076300000E000BF0A48FAF772B80A48FCF72FBF0B +:107640000948FFF77EB90948FFF77BB9FEF73ABB57 +:10765000FEF762BB00F01CB80548FCF720BF000035 +:10766000BC2C00205438002054360020C4350020A3 +:10767000B43800204FF48060FCF723BEFDF7BDB99D +:1076800002484168027889184160704788280020C4 +:107690000449C8680A6882430A60486000F004B878 +:1076A0000000000000150058704719E050F8042B46 +:1076B000D30744BFA9F101039A18091F0023042925 +:1076C00042F8043BF9D25FEA817C134604D54FF0BF +:1076D000000CA2F800C09B1CC90744BF0021197010 +:1076E00050F8041B0029E1D17047000010B507498C +:1076F00079441831064C7C44163404E00A68081DAD +:10770000114488470146A142F8D110BD2C00000069 +:10771000780000004EF68851CEF20001086840F46F +:1077200070000860BFF34F8FBFF36F8F4FF0007092 +:10773000E1EE100A7047000073FFFFFFB810000071 +:10774000BC280020840A0000300003200000000054 +:1077500031FEFFFF02000000020000007001000087 +:1077600002000000280003200800000015FEFFFFB3 +:10777000020000000200000056010000B2010000FB +:1077800008140020B41400000000000000000000F5 +:1077900000000000000000000100000002000000E6 +:1077A00003000000040000000120C046002801D0B2 +:1077B000FFF79CFFAFF300800020AFF30080FEF7DF +:1077C000FEF800F000F800F001B800000746384667 +:1077D000F9F738FFFBE70000014880470148004700 +:1077E0009D740008E9770008AFF30080FFF792FF6F +:1077F000FFF7DAFFFFF7FEBFFFF7FEBFFFF7FEBFA1 +:10780000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAC +:10781000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9C +:10782000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8C +:10783000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7C +:10784000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF6C +:10785000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5C +:10786000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4C +:10787000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3C +:10788000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF2C +:10789000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF1C +:1078A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF0C +:1078B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFFC +:1078C000FFF7FEBF0020704700010000F800000134 +:1078D00081008100810081008100810081008100A0 +:1078E0008100810081008100810081008100810090 +:1078F0008100810081008100810081008100810080 +:10790000810081008100810081008100810081006F +:10791000810081008100810081008100D30045F752 +:107920005800082B5900082F59000881590008C534 +:1079300078000809024300020100C0320904000077 +:1079400001020201000524001001052401000104C8 +:10795000240202052406000107058203080010091D +:10796000040100020AFD00400705010200020007B1 +:107970000581020002000009024300020100C0323A +:107980000904000001020201000524001001052481 +:1079900001000104240202052406000107058203F8 +:1079A00008001009040100020AFD000B070501028E +:1079B0004000000705810240FD0031090743000235 +:1079C0000104C03209040000010202010005240084 +:1079D000100105240100010424020205240600010F +:1079E0000705820308001009040100020AFD000BCC +:1079F000070501024000000705810240FD000B4918 +:107A0000600008E36000082D610008FC000B6D6257 +:107A10000008E361000845620008F4000FA162005D +:107A20000899620008A9620008B1620008EC00F839 +:107A3000FFF4001D7D730008877300089D73000824 +:107A400091730008B1730008DD730008FD7300082E +:107A50001A03E6000001F9000010FA000C480004C7 +:107A60000048000400480A060002FD00014001FC35 +:107A70000001C201FD000008FC00044800093D00AF +:04000005080077E98F :00000001FF diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_conf.h index 8fbf8c1be..444215226 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -214,6 +214,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -223,11 +227,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -235,6 +243,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -567,5 +588,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_conf.h index 05c958851..c5c89c413 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -271,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/main.h index 36d2774f2..b8fb410ec 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_hal_conf.h index 14348875e..746cb11b9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_it.h index ed0f50443..5a62284ed 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/vcp_conf.h index 106c163b2..b5b5af265 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Inc/vcp_conf.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ @@ -51,5 +50,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_debug.c index 65f9cac58..6b989f951 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -44,7 +44,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -133,8 +133,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -417,5 +425,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_entry.c index c3c036eb1..095790a3c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/app_entry.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_entry.c * @author MCD Application Team * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -249,5 +248,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/main.c index 86b903335..e5385b69b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -670,5 +670,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_hal_msp.c index 88868476a..488ddf44d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -354,4 +353,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_it.c index 767a11175..68b8bdd6e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -351,4 +350,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/system_stm32wbxx.c index efd4c8554..ff7fcaf3b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -349,5 +348,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_conf.h index 375fa058d..420310bdb 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,4 +90,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_dbg_conf.h index 845d0f00d..a869a5aad 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/ble_dbg_conf.h @@ -1,23 +1,23 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* USER CODE END Header */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BLE_DBG_CONF_H @@ -197,5 +197,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.c index 27d895bf2..da3512d08 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file tm.c * @author MCD Application Team * @brief Transparent mode - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -451,5 +450,3 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.h index 3d5277c68..5d7fdca77 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/App/tm.h @@ -5,17 +5,16 @@ * @brief Transparent mode interface ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -63,5 +62,3 @@ extern "C" { #endif #endif /*__TM_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..5d488c347 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/readme.txt index 93381a6e4..e01c5683c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_TransparentModeVCP/readme.txt @@ -8,19 +8,19 @@ * @brief add here the very short description of the example (the name ?). ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Example Description -How to communicate with the STM32CubeMonitor-RF Tool using the transparent mode. +How to communicate with the STM32CubeMonitor-RF Tool using the transparent mode through USB Virtual COM Port. @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds) based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from @@ -79,7 +79,7 @@ Wireless Coprocessor binary. In order to make the program work, you must do the following: - Open your preferred toolchain - Rebuild all files and load your image into Target memory - - OR use the BLE_TransparentModeVCPVCP_reference.hex from Binary directory + - OR use the BLE_TransparentModeVCP_reference.hex from Binary directory - to test the BLE Transparent Mode application, use the STM32CubeMonitor RF tool - make the connection between STM32CubeMonitor RF tool and BLE_TransparentModeVCP application - send some ACI commands from STM32CubeMonitor RF tool as HCI_RESET, HCI_LE_RECEIVER_TEST, HCI_LE_TRANSMITTER_TEST, ... diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex index fd809c938..a89dfce94 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Binary/BLE_p2pClient_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:10000000B83300201D9500080594000807940008E7 -:100010003D95000841950008459500080000000046 -:10002000000000000000000000000000099400082B -:100030000B940008000000000D9400080F940008C5 -:10004000499500084D95000851950008299400082D -:1000500055950008599500085D95000861950008C0 -:1000600065950008699500086D9500087195000870 -:1000700075950008799500087D9500088195000820 -:1000800085950008899500088D9500081D94000845 -:100090001B94000891950008959500089995000813 -:1000A0009D950008A1950008A5950008A995000850 -:1000B000AD950008B1950008B5950008B995000800 -:1000C000BD950008C1950008C5950008C9950008B0 -:1000D000CD950008D1950008D5950008D995000860 -:1000E00013940008DD950008E1950008E5950008E7 -:1000F000319400082D940008E9950008ED9500085A -:10010000F1950008F5950008F9950008FD9500089F -:100110000196000805960008099600080D9600084B -:100120001196000815960008199600081D960008FB -:1001300021960008259600082996000881B000F550 +:1000000008100020FDB400088DB200088FB200086F +:1000100091B2000893B2000895B2000800000000F9 +:1000200000000000000000000000000097B200087F +:1000300099B20008000000009BB200089DB20008C1 +:100040001DB5000821B5000825B50008EDB200086F +:1000500029B500082DB5000831B5000835B50008F0 +:1000600039B500083DB5000841B5000845B50008A0 +:1000700049B500084DB50008ABB2000851B50008FD +:1000800055B5000859B500085DB50008A3B20008D1 +:10009000A1B2000861B5000865B5000869B500089F +:1000A0006DB5000871B5000875B5000879B5000890 +:1000B0007DB5000881B5000885B5000889B5000840 +:1000C0008DB5000891B5000895B5000899B50008F0 +:1000D000B1B20008B7B200089DB50008A1B500088C +:1000E000E5B20008A5B50008A9B50008ADB500083F +:1000F000BDB20008C1B20008C5B20008B1B5000821 +:10010000B5B50008B9B50008BDB50008C1B500080F +:10011000C5B50008C9B50008CDB50008D1B50008BF +:10012000D5B50008D9B50008C9B20008DDB500088A +:10013000E1B50008E5B50008E9B5000881B000F5B3 :10014000E0700268914203D343681A44914202D39B :1001500080680028F5D101B07047DFF8681708689B :1001600090B94FF4805048604FF480324FF0FF3028 @@ -114,7 +114,7 @@ :100700003868884608B9FFF728FDB96801EB08008A :100710002F30491E20EA010188457DD205F5D876A3 :10072000B06828B1326889188A4275D2884273D37A -:1007300000F0AEFF01001CBF0C6811F1010F6BD07F +:1007300000F072FF01001CBF0C6811F1010F6BD0BB :100740003068201805F5D87230605368984238BF79 :1007500018467060A86960BB286908B1814200D260 :100760002961316174610020F06105F12802386867 @@ -139,7 +139,7 @@ :10089000C368283199420BD200F5E0710C68A2427E :1008A00003D34D682C44A24202D389680029F5D1B4 :1008B000C16999423CBF4FF0FF31C16132BC002099 -:1008C0007047000010230020D81C00206859883C85 +:1008C0007047000034390020E03000206859883C2F :1008D0002DE9F84F00258946090AC9F1000B08BF28 :1008E000002323D0B1F5803F28BF1F231ED2A1F5DE :1008F0008072120C02F008029140A1F580531B0C8B @@ -351,2080 +351,2603 @@ :1015D0000BD1D6F8C80100E080680028FCD14FF09C :1015E000FF30306201E000F013F8AFF30080BDE897 :1015F000F387316990688A4228BF8842E3D3C56087 -:101600009560A860EA600020A861DEE7D81C002091 -:10161000012000F053B8F0B4024610689568131822 -:10162000506803EB5004C00721D54D441FE0F0BCC7 -:1016300002F10C00704713F8017B05F8017B491E8D -:10164000F9D1A0B1B60813F8011B06F00306032E6A -:1016500008BF13F8016B01EB06214942801C2944A5 -:1016600005D011F8016B05F8016B401EF9D1A342BA -:10167000DDD013F8016B16F0030104BF13F8011B52 -:10168000C91C30090F28DAD113F8010B0F30D6E747 -:101690000749086808B1002070470648C008C00024 -:1016A00008600549C908C900091A0160704700BFF0 -:1016B000A8230020BF330020B837002080B5AFF347 -:1016C0000080024A11001820ABBEFBE72600020092 -:1016D0002DE9F0439FB00FF29C16269CDFF8E48AB8 -:1016E00002918DF83B4000210B914FF0FF370446EB -:1016F00091461D460AE019F8011B0298A0470028F0 -:10170000029000F0A4800B98401C0B9099F8000008 -:1017100050B12528EFD100200021059006910790B7 -:10172000089109900A9103E00B98A7E041F00101AC -:1017300019F8010F2028F9D023280CD02B2804D029 -:101740002D2805D0302809D083E041F00201EFE7D1 -:1017500041F00401ECE741F00801E9E741F0100134 -:10176000E6E700200D900AE00D98404505DA00EB11 -:10177000800302EB4302303A0D9209F1010999F816 -:101780000020A2F130000A28EED399F800002E289C -:1017900018BF0C9726D119F8010F2A2808D12868FC -:1017A000286009F1010950F8042B28600C9219E017 -:1017B0002D280CBF19F8010B002000220C920BE021 -:1017C00040B90C9A424505DA02EB820203EB420370 -:1017D000303B0C9309F1010999F80030A3F1300274 -:1017E0000A2AEDD3ADF83810304699F8001000F011 -:1017F00081FE08B119F8010B8DF83A009DF83A0006 -:10180000682804BF99F80010682903D162208DF878 -:101810003A0008E06C2804BF99F800006C2804D155 -:1018200071218DF83A1009F1010910A804902A4697 -:1018300019F8013B6946204600F060F838B910AA53 -:101840006946204600F08CF900287FF55FAF3846E6 -:1018500014E02A2885D12A682A6052F8040B2A60ED -:1018600000280D9003D540420D9041F0040109F18C -:1018700001098AE7686A6C747A4C00001FB0BDE801 -:10188000F083622820D0682811D06A2803D06C2801 -:1018900027D0712825D10868C01D20F007000860F6 -:1018A000D0E9002308300860194610467047002A26 -:1018B0000A680A60106803D0121D0A6000B217E0BF -:1018C000121D0A6080B217E0002A0A680A601068D8 -:1018D00003D0121D0A6040B20AE0121D0A60C0B2B5 -:1018E0000AE0002A0A680A60106803D0121D0A6024 -:1018F000C1177047121D0A600021704770B51C4661 -:101900000D46B4F125002E69114600F017811C38F0 -:101910006AD0001F022867D9133843D0093863D032 -:10192000801E16D0401E1ED0401E02285CD9001F0B -:1019300019D0401F00F08380401E33D0401E00F0BD -:10194000CD80C01E00F0D880801E2BD0C01E29D0B4 -:10195000FAE06869421C6A610A680A6052F8043B4E -:101960000A603354FAE095F83A000122FFF789FF44 -:10197000C5E900010023994204DA6869411C6961E4 -:101980002D210DE0288F810704D56869411C69610C -:101990002B2105E0C00722D56869411C696120211F -:1019A00031541CE095F83A000022FFF76AFFC5E9C0 -:1019B000000195F83800010711D5D5E90023002072 -:1019C000834208BF82420AD044F02000782806D122 -:1019D000686930213154401C411C696134542146EE -:1019E00068693044E86083E00868C01D20F00700A3 -:1019F0000860D0E9002308300860C5E90023D5E974 -:101A00000001C80F04D06869411C69612D210DE0F7 -:101A1000288F810704D56869411C69612B2105E085 -:101A2000C00704D56869411C696120213154686987 -:101A30003044E8602146284600F0C4F98EE005F104 -:101A40003A02507820B14FF0FF340FF648205EE0A4 -:101A50001078622808D0682824D06A2812D06C2810 -:101A60002ED071280ED02BE00A680A6052F8040BC1 -:101A70000A6020B94FF0FF340FF6302047E0E96AE2 -:101A800001706BE00A680A6052F8040B0A6020B922 -:101A90004FF0FF340FF6142039E0EA6AD317C0E99B -:101AA00000235BE00A680A6052F8040B0A6020B960 -:101AB0004FF0FF340FF6F41029E0E96A01804DE0A1 -:101AC0000A680A6052F8040B0A6020B94FF0FF342C -:101AD0000FF6D8101BE0E96A01603FE00A680A606F -:101AE00052F8040B0A600021C5E90001EE6078217C -:101AF000284600F0BBF831E00868086050F8044B55 -:101B00000860EC603CB94FF0FF340FF6B81000F0FD -:101B1000FDFC201A70BD2E6B002E04D5204600F06F -:101B200017FD044608E032460021204600F02CFD57 -:101B3000002814BF041B3446AC610FE06869411CE7 -:101B400069612521315409E06969481C68612522D1 -:101B50007254210002D0411C69613454002070BDD0 -:101B60002DE9FC410F460646796B7869BC6A091A73 -:101B7000386A091AB869091A786A091AF869091AD3 -:101B800097F838000C1B410790460FD42021002CF9 -:101B90008DF800100ADD254601236A463946304695 -:101BA00000F060FC00285DD16D1EF5D17B694246D6 -:101BB0003946304600F056FC002853D130208DF8CD -:101BC00000003D6A002D09DD01236A463946304692 -:101BD00000F048FC002845D16D1EF5D1BB69FA68BC -:101BE0003946304600F03EFC00283BD130208DF8CD -:101BF00000007D6A002D08DD01236A463946304623 -:101C000000F030FC70BB6D1EF6D1F868B969FB6955 -:101C100042183946304600F025FC18BB30208DF8BC -:101C20000000BD6A002D08DD01236A4639463046B2 -:101C300000F018FCB0B96D1EF6D197F838004107D6 -:101C40000DD52021002C8DF8001008DD01236A46F7 -:101C50003946304600F006FC20B9641EF6D100205B -:101C6000BDE8F6814FF0FF30BDE8F6812DE9FC4775 -:101C700007468A463E69BAF16F0F08BF082405D0AF -:101C80004AF02001782914BF0A2410243C25D7E902 -:101C90000023BAF1640F18BFBAF1690F9046994654 -:101CA00006D100218B4203DAD8F1000869EB49091B -:101CB0000020814508BF80451FD1386BE8B9082C4A -:101CC0004CD197F83800010748D530203B2586F8DD -:101CD0003B0043E000280ED597F8380000F01400D0 -:101CE000102808D17A6B7869121A386A121A511AB8 -:101CF0000029C8BF3962BDE8F3878DF800A04046CF -:101D000049462246E31700F06BFC3032D0B26D1E1C -:101D10003A28019504DB9DF80000A0F151018A18D2 -:101D20007255404649462246E31700F059FC80466A -:101D300089460020814508BF804503D0F8687119A5 -:101D40008842DCD3082C09D197F83800010705D563 -:101D5000715D302902D06D1E30207055C5F13C01F7 -:101D6000B9617019F860386B8142B3DA411A39628F -:101D70004FF6EF70398F01403987BDE8F3872DE9C1 -:101D8000D04306460F4614464FF00008DFF838945B -:101D900012E0E00707D542464B463046394600F090 -:101DA00037FD06460F464046494642464B4600F040 -:101DB0002FFD641080468946002CEAD13046394612 -:101DC000BDE8D0832DE9F34F054641F020048DB0E6 -:101DD000D5E90089612C02AE09D0286B002848BFE4 -:101DE000062003D408BF672C01D101202863D5E960 -:101DF000002358004015401C0ED119030CD00320BD -:101E0000A8619DF8380061381A2802D20FF2D0611B -:101E100011E00FF2D0610EE058004015401C0FD1C8 -:101E200019030DD10320A8619DF8380061381A28E4 -:101E300014D30FF2B861E868032200F0BBFDD3E1D0 -:101E4000194621F00043B3F5801F10460DD200273C -:101E5000BB4208BFBA42019703D111E00FF288617B -:101E6000E9E701AA00F0FAFD0AE0DFF8607307EB8A -:101E70001352DFF85C3301921940DFF858331943ED -:101E8000C5E90001612C0ED1E86830210170811C88 -:101E9000E9609DF8381061290CBF78215821417004 -:101EA0006869801C6861D5E900AB2BF00043002015 -:101EB0002AF00002834204BF8242002300F05A81CC -:101EC000612C40F0A980286B00284CBF2120401CC9 -:101ED00000904046009F7F1C49460022002300F0EE -:101EE000F5FDD94601988DF8082038BF89F00049E2 -:101EF000001F0190002FD0460DF1090040F34981E9 -:101F000040F2FF71DFF8D0B20C91064640464946D8 -:101F10000022002300F0F2FD80F03A814800400DDD -:101F200000F11C0210D0002A0EDD0C98824205DB65 -:101F300009F0004040EA0B01002013E0A4480840EB -:101F400040EA025140460DE029F00043002028F00D -:101F50000002834208BF82420FBF40461C22404617 -:101F600000F0E4FD8046894600F07EFEFF1F002F52 -:101F7000044609DD00F096FE02460B4640464946FF -:101F800000F0A2FE80468946F01D072104E004F01F -:101F90000F0200F8012D2411002C01DD491EF6D599 -:101FA000491E5CBF002200F8012DF9D5ECE00020AD -:101FB000194602AA0A4400E05B1E12F80149491EB4 -:101FC0008442F9D00F2804D10DF10900425C521C63 -:101FD0004254002904D50198001D02AE5B1C0190FB -:101FE000591E12D49DF838007218147804F1300884 -:101FF0005FFA88F4392CC4BFA0F13A04A044491E0A -:1020000002F80189F1D58DF83800286B002840F1DD -:10201000B080591E2963ACE04046494600220023A7 -:1020200000F054FD019938BF89F0004947F29750FC -:1020300041436A4A91FBF2F20192D2F1070204DDB8 -:1020400040464946FFF79BFE0AE0524200206449A1 -:10205000FFF795FE02460B464046494600F0A6FEB5 -:102060008046662C286BDFF87CB106BF019F0A37DB -:1020700006273F18142FC8BF142730208DF80800FA -:1020800089460DF1090000E03046002F34DD064698 -:102090004046494600F0AEFF01460A4606F10803F5 -:1020A00004200A26B2FBF6F606EB860EA2EB4E02E1 -:1020B000303203F8012C0A22B6FBF2F202EB820E58 -:1020C000A6EB4E063036401E03F8026DE9D1083FFC -:1020D000002F03F10806D7DD084600F09FFF0246F7 -:1020E0000B464046494600F0EFFD00225B4600F0FB -:1020F0008FFB80468946CBE70DF10901401A0DF1AF -:10210000090604E00199491E401E0191761C3178B0 -:102110003029F7D0662C02D10199491C03E0652CC7 -:102120000CBF012100212B6BCB189842B8BF431E76 -:10213000002B1ED4834204DAF05C3528A8BF392076 -:1021400000DA30201946721E02EB010800E05B1E27 -:1021500018F80199491E8145F9D0392802D1705CDF -:10216000401C7054002904D50198401C16465B1C85 -:102170000190019800B200901BB29DF838103246D1 -:10218000284600F034F82FE0C61D002F3FF7BEAE02 -:1021900030460DF10901401A009903468842C8BF34 -:1021A0000B46002B0DF109063FF52FAF8342BFF61A -:1021B000FEAE0DF10900C05C07287FF7F8AE0F20D6 -:1021C000F6E60000CBCCCC0C0000244002FCFFFF64 -:1021D000FFFF0F800000E03F0000F07FA0860100BD -:1021E0000000F03F84D797410FB0BDE8F08F2DE994 -:1021F000F84783B006468A461746984600F01CFF0B -:10220000B8F1000F406A356B90F8009003DC4FF096 -:1022100001080FF2DC27BDF930404AF020006628A3 -:1022200008BF641C15D0672840F0848014F1040FA7 -:10223000C0F28680AC4280F2838096F83800641C3D -:10224000010702D4A845B8BF454620B22D1A48BFA1 -:1022500000250FFA84FAF068B169BAF1000F25DCA5 -:102260004A1C30234354002D03DC96F83800010744 -:1022700003D5F06800F80290521C15EB0A0FB8BFA6 -:102280006C4220B2441941424445B8BFA046B261F5 -:1022900071620FFA88F5F561F068B3692A4639462C -:1022A000184400F087FB641BB462C4E022B290457E -:1022B000084417DA4246394600F07CFBB0694044D6 -:1022C000B061AAEB0801002D716203DC96F83810AA -:1022D0000A0705D5F16801F80090F069401CF0612B -:1022E000B562A8E0394600F065FBB069002D5044A6 -:1022F000A8EB040803DC96F838100A0703D5F16848 -:1023000001F80090401CB0610FFA88F08542F06837 -:10231000B369B8BFA8460FFA88F207EB0A01184460 -:1023200000F048FBB0690FFA88F10844B061681A00 -:10233000706280E0BAF1610F14D14FF0700A16E0BC -:10234000A84504DA96F838100A0758BF45466D1EAE -:1023500048BF0025BAF1670F14BF4FF0450A4FF090 -:10236000650A04E0BAF1410F08BF4FF0500AB169A5 -:10237000F368481CB061002D17F8012B5A5403DC98 -:1023800096F838100A071BD5F168431CB36101F8B1 -:102390000090002D14DDA8F101080FFA88F08542A5 -:1023A000F068B8BFA8460FFA88F23946184400F022 -:1023B00001FBB0690FFA88F108446D1AB0617562CB -:1023C000F068B1690844002C80F800A003D42B21E8 -:1023D0004170811C03E02D2141706442811C00206A -:1023E0006A460AE023460A2493FBF4F404EB8405CE -:1023F000A3EB450302F8013B401C24B2002CF1DCA6 -:10240000012806DC4AF02002652A04BF302201F8C8 -:10241000012B48B9302001F8010B07E0401E1DF8E0 -:102420000020303201F8012B0028F7DCF068B26997 -:102430001044091AF16196F8380000F014001028D1 -:102440000DD17169B0694118706A4118F06941187D -:10245000B06A4118706B8142BCBF411A316204B04E -:10246000BDE8F087F8B505460E4617461C46002025 -:1024700074B117F8011BB068A847B06030B1F06ABA -:10248000401CF0620020641EF3D1F2BD4FF0FF301B -:10249000F2BD00007072696E74665F733A20256E3B -:1024A00020646973616C6C6F776564007072696E2B -:1024B00074663A2062616420256E20617267756DD2 -:1024C000656E74007072696E74665F733A20626143 -:1024D0006420257320617267756D656E740000005D -:1024E0006E616E004E414E00696E6600494E4600B8 -:1024F000300000000278C9B28A421AB11CBF10F83D -:10250000012FF9E718BF00207047000080B508B917 -:102510000FF21C0005490B681BB1222200219847CD -:1025200001E0FFF775F8222002BD0000AC23002077 -:10253000636F6E73747261696E742068616E646C2F -:1025400065723A20626164206D657373616765002E -:1025500000F10103810704D010F8011B89B1810744 -:10256000FAD10268B2F10131914311F0803F04BF0A -:1025700050F8042FF6E710F8011B11B110F8011BF9 -:10258000FBE7C01A70470000C9B2830706D0521E8D -:1025900022D310F8013B9942F7D11FE0083A13D338 -:1025A00002F1040241EA012141EA014150F8043BF1 -:1025B000121F21BF4B40A3F1013C2CEA030C1CF07D -:1025C000803FF3D0C9B2001F083210F8013B521E01 -:1025D00028BF91EA030FF8D818BF0120401E7047AA -:1025E000B3BBD9B1B2F5803F7DD2022A1ED98C4649 -:1025F000B1FBF2F102FB11C31B0443EA1043B3FB2E -:10260000F2FC02FB1C3380B240EA0343B3FBF2F05E -:1026100002FB103240EA0C4000237047022A05D921 -:102620008446B0FBF2F002FB10C270474AB105D1FC -:1026300000F0010249085FEA3000704700220023E1 -:10264000704700F0FFBC0B00020000210020704723 -:10265000904271EB030CF6D3B3F5803F2FD2F0B567 -:10266000B3FA83F7B1FA81F4A7F10F0E3D1B534083 -:10267000CEF1200602FA0EF2F3415340B5F10F07F6 -:1026800046D80F3C2C444140C4F12006A040F14103 -:102690004140B1FBF3F603FB1611A2FB0645001BFC -:1026A000A94102D2761E8018594180EA010221FA1E -:1026B0000EF362FA0EF200215A403046F0BD30B4FB -:1026C000B1FBF3FC03FB1C11A2FB0C45001BA94151 -:1026D00003D2ACF1010C8018594130BC02460B46C4 -:1026E000604600217047B2F1807F65D3F0B5B2FA41 -:1026F00082F7B1FA81F4C7F10F063D1B22FA06F307 -:1027000007F1110EF24120355A40B5F10F07B8D943 -:102710004140C4F12006A040F1414140B1FBF3FC2F -:1027200003FB1C11A2FB0C45001BA94103D2BCF109 -:10273000010C801859410F2F12D30F3FC90341EAF2 -:102740005041B1FBF3F603FB1611A2FB0645D4EB97 -:10275000C030A94102D2761E8018594146EACC3CCD -:1027600007B34140C7F12006B840F1414140B1FBF9 -:10277000F3F603FB1611A2FB0645001BA94102D28A -:10278000761E8018594180EA010221FA0EF3C7F142 -:10279000200462FA0EF20CFA07F05A402CFA04F107 -:1027A0003043F0BD80EA010221FA0EF3002162FA03 -:1027B0000EF260465A40F0BD8C46B1FBF2F102FBCE -:1027C00011C31B0243EA1063B3FBF2FC02FB1C3390 -:1027D0001B024CEA002043EA1063B3FBF2FC02FB4D -:1027E0001C331B024CEA002043EA1063B3FBF2FCEB -:1027F00002FB1C331B024CEA002043EA1063B3FBCC -:10280000F2FC02FB1C324CEA00200023704700005F -:10281000B0B581EA030C0CF0004C40F2FF7515EAEC -:1028200011541DBF15EA1357AC42AF4239E0E41909 -:1028300023EA455343F48013C90241F0004141EAC1 -:10284000505EC7021100A7FB020200284FF00000F3 -:10285000EEFB01204FF00001E3FB072118BF42F01F -:102860000102401800214941E3FB0E01A4F58064F8 -:102870000F0302D252004041494154F101046CDD82 -:10288000470872F1004250F1000051EB0451A1F5EC -:1028900080115CBF41EA0C01B0BD4CEA055100203B -:1028A000B0BD05EA1357AC4214BFAF4241E050EA55 -:1028B000410E1CBF52EA430E02E061460020B0BD4B -:1028C00024423C441BD15FEA070EF6D0090302BF45 -:1028D00001460020AEF1140EB1FA81F7AEEB070409 -:1028E00001FA07FE0C37C7F1200100FA07F7C840CC -:1028F0004EEA000E23EA455343F48013A2E733F077 -:102900000043B3FA83F704BFB2FA82FE77440B3F69 -:10291000E41BB7F1200E2FBF02FA0EF3BB40C7F144 -:10292000200E22FA0EFE38BF43EA0E03BA40641CA2 -:1029300082E750EA410E14BF52EA430E6FF00001E5 -:102940004FF4001717EB430F8ABF194617EB410FDF -:10295000B5E74CEA05510020B0BDD4F10104B4F153 -:1029600020070FDAC4F12007520828BF42F0010205 -:1029700010FA07F501FA07F7E1BF2A43E0403843B0 -:10298000E1400FE0352C98DCC7F1200452EA400208 -:1029900020FA07F218BF42F0010231FA07F0A14015 -:1029A0000A43002172F1004250F1000051EB0C018A -:1029B000B0BD000062B38B0708D0521E11F8013B76 -:1029C00000F8013B00F024808B07F6D1830740F02C -:1029D000208000BF103A07D330B4B1E83810103A65 -:1029E000A0E83810F9D230BC530724BFB1E8081072 -:1029F000A0E8081044BF51F8043B40F8043BD2075C -:102A000024BF31F8022B20F8022B44BF0B7803704F -:102A10007047121F17D35B0009D151F8043B20F80F -:102A2000023B1B0C121F20F8023BF6D20BE051F8C0 -:102A3000043B00F8013B1B0A20F8023B1B0C121F51 -:102A400000F8013BF3D238BF121D521E24BF11F80B -:102A5000013B00F8013BF8D87047000010B5144660 -:102A600000F002F8226010BDC1F30A5343B14A00DE -:102A700012F5001F28D2A3F2FE32A1EB02517047DB -:102A800050EA410C20D001F0004C31EA0C01B1FABF -:102A900081F204BFB0FA80F3D2180B3AB2F12003EE -:102AA0002CBF00FA03F1914041EA0C013EBFC2F194 -:102AB000200C20FA0CF319439040524240F2FD33AF -:102AC000D21A01EB03517047002270474FF4001CEB -:102AD0001CEB410F94BF1CEB430F09E041EA030CD0 -:102AE00050EA4C0C52EA0C0C03D2994208BF9042B7 -:102AF000704714BF8B428242704700004FF4001CA5 -:102B00001CEB410F94BF1CEB430F09E041EA030C9F -:102B100050EA4C0C52EA0C0C03D28B4208BF8242A2 -:102B2000704714BF9942904270470000124254D43B -:102B300040F2FF7C1CEA11530FD0634531D09B1843 -:102B400063453CBF01EB0251704701F0004141EA8F -:102B50000C510020AFF30080704750EA410320D0B1 -:102B600001F0004C91EA0C011CD0B1FA81F30B3B4F -:102B70009A420DD9D21A994051EA0C01C3F1200CA6 -:102B800020FA0CFC61449840531C40F2FF7CD7E7CC -:102B9000914041EA0C01C2F1200C20FA0CF31943D8 -:102BA00090407047B0FA80F31533202BE0D3202AF1 -:102BB000EED3203A203B9A4209D9D21A00FA03F107 -:102BC00041EA0C010020531C40F2FF7CB8E700FAF8 -:102BD00002F141EA0C0100207047524240F2FF7CB2 -:102BE0001CEA11530DD06345DBD0B2EB030C3CBFA4 -:102BF000A1EB025170470CF1010221EA035141F4AB -:102C0000801150EA410CCCD001F0004C352A27DC71 -:102C100030B481EA0C01B2F1200309DAC2F12003D9 -:102C2000044601FA03F5D0402843D1409C400CE013 -:102C3000C3F12002450020FA03F418BF44F0010458 -:102C400021FA03F091400C43002174F1004550F14A -:102C5000000051EB0C01244230BC7FF47BAF704785 -:102C60006146002076E70000C1F30A5340F2FE32CD -:102C70009B1A14DDD3F120034FEAE17208DDC9028B -:102C800041EA505141F00040D84080185040704710 -:102C900003F2E13010B1D24382F0004070470020CF -:102CA00070470000C11768B14840401AB0FA80F27E -:102CB0009040D21CC907C2F5846241EA025202EB7D -:102CC000D02140057047000070B44FF0004591EAF4 -:102CD000030F40F1B9816B40841A71EB030603D2F4 -:102CE000001BB141121973414FF4001C1CEB410F42 -:102CF00034BF7CEB430442E00C0DA4EB1356352E9D -:102D00004FDC45EAC323DB0A45EAC121C912B6F10B -:102D100020050DDD63FA05F6EB4086EA0305124255 -:102D200018BF45F00105C01851F100010CD213E0A5 -:102D300062FA06F5F2405540F3415A40B340F34081 -:102D40005A408018594107D349085FEA30005FEACA -:102D5000350528BF45F0010501F58011420875F1E0 -:102D6000004250F1000041EB04514E0016F5001FE7 -:102D700070BC38BF70470020090D090570471CEB77 -:102D8000410F10D252EA43060BD0BCEB410F05D8DD -:102D90000C0DAB43661E342EB6DD02E0AB4380184B -:102DA000594170BC704770BC70470000F0B540F2EC -:102DB000FF7581EA030C0CF0004C15EA11541DBF9D -:102DC00015EA1357AC42AF42E5E0BC41C1F3130131 -:102DD000C3F31303801A994143F4801304D2641E91 -:102DE0004000494180185941C90241EA5051B1FBA4 -:102DF000F3F603FB1611A2FB0675D7EBC020A94121 -:102E000002D2761E80185941C90241EA5051B1FBE5 -:102E1000F3FE03FB1E11A2FB0E75D7EBC020A941E8 -:102E200003D2AEF1010E80185941890241EA905156 -:102E3000760546EA8E2EB1FBF3F603FB1611A2FBD4 -:102E40000675D7EB8020A94102D2761E8018594121 -:102E5000C90241EA50514EEA060EB1FBF3F603FBFC -:102E60001611A2FB0675D7EBC020A94102D2761E2F -:102E700080185941C90241EA5051B1FBF3F703FBF5 -:102E80001711A2FB0735D3EBC020A94167F100075A -:102E90000CBF004247F0010766F3D5274FEA1E3109 -:102EA000B80814F5806412DDBD0775F1004250EBDF -:102EB0000E5051EB045111F5801F5CBF41EA0C012B -:102EC000F0BD4CF07F6141F0E0410020F0BDBD0756 -:102ED0006D0840EA0E5041F48011D4F10104B4F1C0 -:102EE00020060ADAC4F120060200E04001FA06F3E7 -:102EF000E1401843B24015430EE0342C13DCC6F118 -:102F0000200445EA40056D0820FA06F2154321FA2F -:102F100006F0A1400D43002175F1004250F1000080 -:102F200051EB0C01F0BD00205FEA0C01F0BDCFB900 -:102F300092185B41B3FA83F704BFB2FA82F6BF1965 -:102F40000B3FB7F120062FBF02FA06F3BB40C7F1D3 -:102F5000200622FA06F638BF3343BA401CB1E41902 -:102F6000641E33E77F4231F00041B1FA81F404BFBF -:102F7000B0FA80F6A4190B3CB4F120062FBF00FA7A -:102F800006F1A140C4F1200620FA06F638BF31430D -:102F9000A0403C1B1AE7AC421ABF05EA1357AF42E8 -:102FA00012E050EA41061CBF52EA4306BFE750EA6E -:102FB0004107304661461CBF41EA0551F0BD52EA67 -:102FC000430C08BFC143F0BD00204FF4001616EBC0 -:102FD000410F98BF16EB430F08BF16EB410F24BFFC -:102FE000C14305E016EB430F0CBF61464CEA0551A7 -:102FF000F0BD0000400D491840EA81200CD2490D77 -:10300000A1F58061491C40F0004005DBD1F11F01B2 -:1030100054BFC840C017704700207047014648B1F0 -:10302000B0FA80F18840C91CC1F58461090501EB43 -:10303000D0214005704700000148704700000000A3 -:10304000AC15002070470000841A71EB030604D20F -:103050006E40001BB141121973414FF4001C1CEB70 -:10306000410F34BF7CEB430682E00C0DA4EB1356FA -:10307000362E7BDC012E45EAC32341DC43EA525362 -:1030800012BFD20292025B08240545EAC12141EA3F -:103090005051D2EBC020994125D407D1B0FA80F627 -:1030A00010FA06F162D00020203608E0B1FA81F66D -:1030B000B140C6F1200220FA02F21143B0404FEABB -:1030C000F474B4EB465434F001064FEA74040AD8A1 -:1030D000D6F50016760D04F00044F04061FA06F2D1 -:1030E0005040F1404840C00A40EA415021F00041C0 -:1030F00028BF5FEA500550F1000044EBD12135E0D4 -:10310000DB0A45EAC121C90AB6F120050EDD42EA13 -:103110000242120CC5F1200603FA06F6EB4042EA21 -:1031200006056D42984161F100010DE062FA06F575 -:10313000F240554063FA06FC82EA0C02F3405A4022 -:103140006D42904161EB030111F4801F05D1641EB3 -:10315000620502D06D004041494121F480114308CD -:1031600075F1004350F1000041EB045170BC704711 -:103170001CEB410F15D223F0004352EA43060BD05B -:103180004FEA4C0CBCEB410F04D80C0D661E342EDC -:10319000B7DDEBE7801A994150EA410608BF0021EC -:1031A000E4E708BF1CEB430F28BF6FF00001DDE729 -:1031B00030B5040085B008BF012043D004F52A755E -:1031C000687820B900212970204600F023FD0320F3 -:1031D0006870206800F0EFFD002128200AE010FB55 -:1031E00001F222442832012353701170D18100234F -:1031F00000F02AF862689142F1D3002109E010FB47 -:1032000001F2224402F5B47200231170537000F0F1 -:103210001BF862689142F2D383B0211D68462022D8 -:10322000FFF7D8FB0EBC206800F0CBFD002084F82F -:10323000240001206870E069012804BF204601F0E5 -:10324000F3FA002005B030BD491CD37013615361FF -:103250009361C9B2704710B500F0C7F801D10220E0 -:1032600010BD00F003F800F09FFDB7E0012184F8E5 -:10327000A8122068704738B5044600F0ACF8010485 -:1032800044BF204600F099F900F0A5F840050CD5A0 -:1032900000F09DF84FF6FF3000F095F8204600F062 -:1032A000EBFC0021204600F0A5F800F094F8400463 -:1032B00005D500F08CF84BF6FF7000F084F800F0B4 -:1032C0008AF8800405D500F082F84DF6FF7000F012 -:1032D0007AF804F5387500F07EF8C0041FD521682F -:1032E000B1F840204FF6FB700240A1F840204FF6A5 -:1032F000F770B1F840200240A1F84020287801285A -:1033000004D1002129702046C046C046204600F066 -:10331000C4FC00F05CF84EF6FF7000F054F800F0CA -:103320005AF8000512D5206800F140014FF2FF70F5 -:103330000A8842F008020A808B8803408B80088844 -:1033400040F004000880204600F0A3FC00F043F8A1 -:10335000000620D5206800F140014FF67F708A8872 -:1033600002408A80287898B90A8842F004020A80CC -:103370000122088840F0080008802A70888A8008A6 -:1033800000F03C00686001212046C046C04602E0D3 -:10339000204600F07EFC00F01EF8800508D500F005 -:1033A00016F84FF6FF5000F00EF8204600F060FCD3 -:1033B00000F011F8C00505D500F009F84FF6FF60E0 -:1033C00000F001F831BD0240A1F8442070472168A7 -:1033D000B1F844207047206801F0E0B9206801F09E -:1033E000D4F9002084F8A80210BD044694F8A8027D -:1033F0000128704710B5FFF7F8FF01D1022010BD7A -:10340000012284F8A82284F82410206801F0B7F97A -:10341000E7E738B5054601F007042820444328199A -:103420000C0647BF00F12804012000F5B474002009 -:1034300001F00701607021702261E370607808B1CB -:103440002178E181022B04BF0020207195F8A802A9 -:10345000012801D1022032BD012185F8A8122146A0 -:10346000286800F0B9FC002085F8A80232BD10B52C -:10347000044600F09BF847BF2830012200F5B470E5 -:10348000002201F00701427000F069F801D102202A -:1034900010BD00F003F800F0CBFDA2E7012284F894 -:1034A000A82201462068704738B501F00705282496 -:1034B0006543441904F5B47401F007016261A36126 -:1034C0000022E2616270217021461DE001F00701D7 -:1034D000282251430844D0F88401704738B51C466F -:1034E00001F0070528235D434319283301F0070144 -:1034F0005A619C61012283F824201C620022DA6157 -:10350000197001225A701946006800F017FE002059 -:1035100032BD10B5044601F007006268824201D254 -:10352000012010BD28220B0604D55043204428302A -:10353000012205E012FB01F2A01800F5B470002290 -:10354000427001F00701012200F008F801D10220C9 -:1035500010BDFFF7A4FF01F0B9F842E782700170D7 -:1035600094F8A812012970471CB5044601F00F0316 -:103570006068984201D2012016BD00F017F847BFDD -:103580002830012200F5B470002201F007014270DA -:103590000022FFF7E3FF01D1022016BDFFF77EFFF7 -:1035A00001F0ADF8002084F8A80216BD01F0070272 -:1035B00028204243A0180A0670472DE9F84F00F56D -:1035C000B475064627E001880AEA010141F400418A -:1035D000018006F124043068B0F85010227901EB24 -:1035E000C201401800F202400088A169C0F309003E -:1035F00020620844A0610021304600F030FB2178B1 -:1036000049B1E06938B92178306841F08001A0F80B -:103610004C1000212170306800F144010A88130425 -:1036200040F114810A8812F00F0440F68F7748F6B3 -:103630000F7A65D1D206C6D50288130511D58989BE -:1036400000F015F9EA88C3F30903EB6106F52C7164 -:1036500001F0BDF8306800F0FCF8304600F0EFFAF9 -:10366000D9E71104D7D500F0F4F83068B0F850105D -:1036700000F0FDF8C3F30903002BEB611CBF69697F -:1036800000290AD0EA8801F0A2F86869E9690844CB -:1036900068610021304600F0D8FA306801880A05D8 -:1036A000B9D4B0F850104118286901F2064148B960 -:1036B000088848F2FF32104008800A8842F400422D -:1036C0000A8010E03F2805D24208C00748BF521CBC -:1036D000900207E0420910F01F0F08BF521E90022F -:1036E00040F400400880306801884BF68F7211402A -:1036F00081F4405141F4004141F0800101808AE7AA -:10370000282130F8248011FB04F106EB01095FEA5F -:10371000084160D530F824100F4047F0800720F8AA -:10372000247009F5B477387B58B93068B0F8501078 -:103730003A7801EBC201411800F091F837D0FA88CD -:1037400031E0F878022806D142463946304600F08A -:1037500096F883462BE03068397830F8212048F617 -:103760008F731A4042F4004242F0C00220F8212038 -:1037700030683A78134630F823305904B0F85030A6 -:1037800003EBC2020AD5811801F202410988C1F394 -:10379000090BBBF1000F0AD03A8904E0811800F050 -:1037A0005EF804D07A895B46796901F010F8F8690F -:1037B0005844F861786958447861B86910B13A6939 -:1037C000934504D23978304600F03FFA03E0306880 -:1037D000394600F0B3FC5FEA086027D5306830F85E -:1037E00024200AEA020242F4004209F1280120F8EA -:1037F0002420C878022824D15FEAC85221D4306836 -:103800000A78B0F8503003EBC203C01800F202404F -:1038100003888869C3F30903834234BFC01A0020B8 -:10382000886120B91146304600F019FAF3E648697C -:1038300018444861C8691B18CB61306800F07EFCF1 -:10384000E9E64246304600F077F8E4E60020BDE8BD -:10385000F28F01880F4047F080070780704701F220 -:1038600006410988C1F3090BBBF1000F70472A78A4 -:1038700001EBC201411801F206410B8870472DE9A6 -:10388000FC410D4600682B78A969B0F850605404DB -:1038900048F2C00848F68F7748F2800C4BF68F7ECE -:1038A00006EBC30419D5061906F202463488C4F3A0 -:1038B0000904A1422CBF091B0021A96129B930F8D4 -:1038C00023100EEA010100F027F8510601D500F09F -:1038D0002AF8F4B123462A8918E0061906F20646AA -:1038E0003488C4F30904A1422CBF091B0021A9613B -:1038F00029B930F823100EEA010100F00DF8510645 -:1039000001D400F010F824B123466A89696900F0F7 -:103910005EFF2046BDE8F68181F400514CEA0101CA -:1039200020F823107047297830F82120174048EA02 -:10393000070220F8212070472DE9FC410D4604467E -:103940001646216895F800E0A8697306B1F8503072 -:103950004CF2800748F68F7803EBCE0340F1858068 -:10396000CB1803F202431B88C3F30903834234BF1D -:10397000C01A00200028A86125D1687838B9B1F8AC -:103980005000081800EBCE0C00F015F913E00128E8 -:1039900009D000F030F92046297800F060F9700471 -:1039A00040F1ED8082E0B1F85000081800EBCE0C39 -:1039B0000CF2024C0020ACF8000068780028E8D136 -:1039C00000F007F9E7E7720406D531F82E0008EA9F -:1039D0000000074321F82E7095F8240001286ED1CD -:1039E00000F0DFF803D31346C01A286208E010B9CC -:1039F00085F8240004E0002285F8242003462A628A -:103A0000687810BB2068B0F850208218287802EB44 -:103A1000C00202F2024233B9168848F2FF30064073 -:103A2000168010880DE03F2B05D25808DE0748BFEE -:103A3000401C800207E0580913F01F0F08BF401E0A -:103A4000800240F4004010800BE0012809D120687A -:103A5000B0F8502080182A7800EBC20000F2024033 -:103A600003802A8920689BB287E0CB1803F20643C3 -:103A70001B88C3F3090398422CBFC01A00200028FA -:103A8000A8612DD1687838B9B1F85000081800EB5A -:103A9000CE0C00F090F81BE0012811D000F0ABF83C -:103AA0002046297800F0DBF8700468D42168287873 -:103AB00031F8202008EA0202174321F820705EE066 -:103AC000B1F85000081800EBCE0C0CF2024C0020AC -:103AD000ACF8000068780028E0D100F07AF8DFE761 -:103AE000720406D431F82E0008EA0000074321F8DA -:103AF0002E7095F82400012841D100F052F803D32C -:103B00001346C01A286205E010B10346002028625F -:103B100085F824002668687808BBB6F8500032188B -:103B2000287802EBC00202F2064233B9178848F245 -:103B3000FF300740178010880DE03F2B05D2580852 -:103B4000DF0748BF401C800207E0580913F01F0F31 -:103B500008BF401E800240F4004010800AE00128A7 -:103B600008D1B6F850002A78301800EBC20000F2F5 -:103B7000064003809BB26A89304600F017FE226837 -:103B8000297832F8213048F6BF70034083F03003C3 -:103B900043F4004343F0800322F821300020BDE8C5 -:103BA000F681E86969692A691818E8611944286A80 -:103BB0006961904270470CF2024C48F2FF30BCF849 -:103BC00000300340ACF80030BCF8000040F4004086 -:103BD0007047B1F850000918287801EBC00101F2D4 -:103BE000064148F2FF300A8802400A80088840F403 -:103BF0000040088070476878012809D1B1F850006A -:103C00000818297800EBC10000F20640002202806B -:103C10007047000080B56148016841F08061016033 -:103C20000022006800F080600090062100981420B7 -:103C300000F02CFEBDE80240142000F045BE00F567 -:103C40002C71D0F8F00200F0CDBE0B462822534371 -:103C5000C218D0F8F002D2F87C2100F0F1BE0B4679 -:103C600028225343C218D0F8F002D26B00F01DBFD7 -:103C7000D0F8F00200F0A8BF10B50446D4F8F00266 -:103C800000F05FFFD4F8F002BDE81040012100F021 -:103C900087BFD0F8F00200F086BFD0F8F00200F045 -:103CA0008ABF10B53E4C3F492160C4F8F00208219C -:103CB00061600021E16002212161A1600021A16118 -:103CC000C0F8C4422046FFF773FA182300220021EF -:103CD00000F012F858230022802100F00DF8C023D4 -:103CE0000022812100F008F84FF48873002201219E -:103CF00000F002F8002010BD204600F07BBD80B52A -:103D0000D0F8C402FFF7A7FA002002BD10B51C4688 -:103D10001346D0F8C4022246FFF77BFB002010BDFB -:103D200080B5D0F8C402FFF7A2FB002002BD80B529 -:103D3000D0F8C402FFF7EDFB002002BD80B5D0F83B -:103D4000C402FFF711FC002002BD81B0D0F8C422EC -:103D500001F07F0328204343D01809064CBF90F898 -:103D60002A0090F86A0101B0704780B5D0F8C4020B -:103D7000FFF740FB002002BD80B5D0F8C402FFF77A -:103D8000ADFB002002BD80B5D0F8C402FFF78CFB6C -:103D9000002002BDD0F8C402FFF798BB58000058BD -:103DA000E4190020006800404030002181804BF67B -:103DB000807100F0E1BCB0F8402044F27F0100F0D7 -:103DC000F0BC0EB4012120F8401F00210180818049 -:103DD0000182002003B070472DE9F8470B4648F6F2 -:103DE0008F111D780246002032F825600E40D978E8 -:103DF00003290CD8DFE801F002080C0546F4007630 -:103E000006E046F4C06603E046F4806600E0012068 -:103E100048F28004264322F8256048F68F75197809 -:103E20000E4632F826702F403943214322F82610DF -:103E30004BF68F76197B93F8009000294CF280079F -:103E400048F6BF7C48F2C00E72D1B3F806A04FF618 -:103E5000FE7101EA0A0A59780029B2F8501011449B -:103E60001ED001EBC90101F58061A1F800A019780D -:103E700032F82160760606D532F8216035404EEAE8 -:103E8000050522F821501978DB78012B32F8213012 -:103E90000CEA03030EBF1C4383F020031C43C3E062 -:103EA00001EBC90909F20449A9F800A0B2F85010C1 -:103EB00002EB010C19780CEBC10C19690CF2064CE1 -:103EC00051B9BCF800E048F2FF3101EA0E01ACF84C -:103ED0000010BCF8001013E03F2908D24FEA510E41 -:103EE000C90748BF0EF1010E4FEA8E210AE04FEAE2 -:103EF000511E11F01F0F08BFAEF1010E4FEA8E21C7 -:103F000041F40041ACF80010197832F821C05FEAA2 -:103F10004C4C06D532F821C005EA0C053D4322F889 -:103F20002150197832F821301E4086F440567AE04C -:103F300032F82910294041F4014141F0800122F872 -:103F40002910B2F85010B3F808A002EB0109197853 -:103F500009EBC10101F580694FF6FE7101EA0A0122 -:103F6000A9F80010B2F85010B3F80A9002EB01085B -:103F7000197808EBC10808F204484FF6FE7101EA0F -:103F80000901A8F80010597893F80080002932F848 -:103F9000281023D1490405D532F8281029400F43B1 -:103FA00022F82870197832F821707F0606D532F889 -:103FB00021703D404EEA050522F82150197832F86B -:103FC00021502E4086F44056264322F8216019786D -:103FD00032F821300CEA03031C4325E0490405D5DF -:103FE00032F8281029400F4322F82870197832F847 -:103FF00021707F0606D532F821703D404EEA050556 -:1040000022F82150DD781978012D32F821500CEA80 -:10401000050518BF85F02005254322F821501978A1 -:1040200032F821301E40344322F82140BDE8F287A7 -:104030002DE9F041024691F800C048780B7B4BF621 -:104040008F7E4CF2800448F2800848F6BF7548F233 -:10405000C00648F68F77ABB9002832F82C0008D09C -:10406000400636D532F82C0007403E4322F82C603B -:104070002FE0400456D532F82C0007403C4322F88C -:104080002C404FE0002832F82C0029D1400405D5FF -:1040900032F82C003840044322F82C40087832F8DB -:1040A00020305B0605D532F820303B40334322F800 -:1040B0002030087832F820301F403E4322F820603C -:1040C000087832F820300EEA030348EA030322F8A6 -:1040D0002030087832F820100D4048EA050128E029 -:1040E000400405D532F82C003840204322F82C003B -:1040F000087832F820305B0605D532F820303B4096 -:104100001E4322F82060087832F820301F403C43DC -:1041100022F82040087832F820301D4048EA050592 -:1041200022F82050087832F820100EEA010148EAFF -:10413000010122F820100020BDE8F0812DE9FC4E9D -:104140000E4605467278307B012A48F2800748F611 -:104150008F7140F06381D6F810A0B2695446944242 -:1041600088BF144628B9F28800F0ACFA00F082FA51 -:104170004BE196F803B06309620896F800C0D6F8E0 -:1041800020E0BBF1020F04F0010048F2801940F07A -:104190009E80F24580F0918035F82CA001EA0A015A -:1041A00049EA010125F82C10AEEB0401316296F8C2 -:1041B00000C07178E64635F82EE05FEA4E693DD5DD -:1041C00099B900F036FA14B900F05EFA09E03F2C14 -:1041D00002D200F00DFA06E014F01F0F08BF5B1EBC -:1041E000980240F40040088001E000F05FFA00F01F -:1041F00068FA00F001FA32BF001B0446002030626A -:104200007078002840F0B08000F004FA01F202411A -:1042100014B900F039FA0DE03F2C05D26008E2072E -:1042200048BF401C800207E0600914F01F0F08BF60 -:10423000401E800240F40040088099E099B900F0E7 -:10424000F0F914B900F020FA09E03F2C02D200F096 -:10425000CFF906E014F01F0F08BF5B1E980240F470 -:104260000040088001E000F016FA328900F02AFAD6 -:1042700000F0C2F932BF001B0446002030627078A3 -:10428000002840F0B18000F0C5F901F2064114B9F0 -:1042900000F0FAF90DE03F2C05D26008E20748BFB4 -:1042A000401C800207E0600914F01F0F08BF401E89 -:1042B000800240F400400880A1E035F82C1048F658 -:1042C0008F600140394325F82C1074464EE035F8D4 -:1042D0002CA001EA0A0149EA010125F82C10AEEBF5 -:1042E0000401316296F800C07178E64635F82EE098 -:1042F0005FEA4E693FD599B900F09BF914B900F017 -:10430000C3F909E03F2C02D200F072F906E014F084 -:104310001F0F08BF5B1E980240F40040088001E0B8 -:1043200000F0C4F900F0CDF900F066F932BF001BCF -:1043300004460020002C306267D07078A0B900F0ED -:1043400088F900F2024005D26108E20748BF491C23 -:10435000890207E0610914F01F0F08BF491E890296 -:1043600041F40041018003E0012801D100F082F90D -:10437000A3B2328945E099B900F053F914B900F0BD -:1043800083F909E03F2C02D200F032F906E014F084 -:104390001F0F08BF5B1E980240F40040088001E038 -:1043A00000F079F9328900F08DF900F025F932BF7B -:1043B000001B0446002030623CB37078A0B900F0C6 -:1043C00048F900F2064005D26108E20748BF491CDF -:1043D000890207E0610914F01F0F08BF491E890216 -:1043E00041F4004101800AE0012808D1B5F85000ED -:1043F0003178281800EBC10000F206400480A3B217 -:1044000072897169284600F0D1F9317835F8212098 -:1044100048F6BF70024082F0300219E000282CD12B -:10442000B1693069884232BF091A08460021B1617A -:1044300000F017F990B900F027F940F40040088027 -:10444000317835F821204BF68F70024082F44052CB -:10445000174325F821700020BDE8F68E3F2805D2CD -:104460004208C00748BF521C9002E8E7420910F01A -:104470001F0F08BF521E9002DFE7F078022859D1C3 -:10448000C2B900F0DEF802F2024210B900F0BBF847 -:104490000DE03F2805D24308C00748BF5B1C9802C7 -:1044A00007E0430910F01F0F08BF5B1E980240F49D -:1044B000004010807078C8B900F0C3F802F20642DC -:1044C00010B900F0A0F80DE03F2805D24308C0075E -:1044D00048BF5B1C980207E0430910F01F0F08BF9C -:1044E0005B1E980240F4004010800BE0012809D1C7 -:1044F000B5F850003278281800EBC20000F20640F0 -:1045000032690280F06900289AD0307835F820208E -:1045100044F2400303EA02049C4218BF1A428FD1BE -:1045200035F82020114041F4004141F0C00125F848 -:10453000201085E7012859D1B1693069884232BF1E -:10454000091A08460021B161440900F0010143083D -:104550002ABBB5F8502005EB020C32780CEBC20CEC -:104560000CF2024C50B9BCF800E048F2FF3202EA0B -:104570000E02ACF80020BCF800200CE03F2804D26A -:104580001A4601B1521C920207E0224610F01F0F9A -:1045900008BF521E920242F40042ACF8002072782A -:1045A000FAB9B5F8502096F800C0AA1802EBCC0270 -:1045B00002F2064248B9118848F2FF3001401180EA -:1045C000108840F4004010803AE73F2803D201B140 -:1045D0005B1C9802F7E710F01F0F08BF641EA002D3 -:1045E000EFE7012AF0D100F03CF828E7012033E79B -:1045F00000B1521C900270477069316920447061AB -:10460000306A81427047138848F2FF3003401380BC -:1046100010887047B5F850002918307801EBC001B8 -:104620007047B5F85010691801EBCC0101F2024156 -:104630007047B5F85010691801EBCC0101F2064142 -:104640007047B5F850002A18307802EBC002306984 -:104650007047B5F850003178281800EBC1003F2CA6 -:104660007047B5F850103278691801EBC20101F2B9 -:1046700006417047B5F850003178281800EBC100AA -:1046800000F20240048070470A8848F2FF3002407E -:104690000A8008887047012907D1B5F8500028180A -:1046A00000EBCC0000F2024004807047012907D1E2 -:1046B000B5F85000281800EBCC0000F2064004804A -:1046C000704772897169A3B228466FE018B50A78FD -:1046D000497830F82240002948F2800305D048F696 -:1046E000BF710C4084F0100404E04BF68F710C4055 -:1046F00084F48054234320F82230002012BD30B5CA -:104700000A7B002A36D14A780C78002A30F8242017 -:1047100048F2800348F68F7516D0520608D530F857 -:104720002420154045F4004545F0C00520F82450EC -:10473000CA78012A1ED00A7830F8224048F6BF71A4 -:104740000C4084F0200412E0520408D530F82420F4 -:10475000154045F4404545F0800520F824500A787E -:1047600030F822404BF68F710C4084F440542343C0 -:1047700020F82230002030BD01800020704711B9A0 -:104780008021A0F84C1000207047B0F8581041F478 -:104790000041FFE7A0F8581000207047B0F844002F -:1047A00070470A40A0F840200020704710B58018DC -:1047B0005B1C00F580605B0807E00A784C7842EAF1 -:1047C0000422891C20F8022B5B1EF6D110BD10B507 -:1047D000821802F58062580806E032F8024B0C702D -:1047E000240A4C70891C401EF7D1D80744BF10889A -:1047F000087010BD30B528240D0605D501F007015D -:1048000061430844283003E06143084400F5B47074 -:104810001AB900210173C38004E0038101211B0C3C -:1048200001734381002030BD016800F5387001221A -:10483000826000220270B1F8540040F00100A1F83B -:104840005400B1F8540040F00200A1F854000020D8 -:10485000704700000901020081B002D43C48815435 -:1048600005E03C4802F00F02104400F8041C01B0BF -:104870007047394A13684FF6FF0100020B4000F4FD -:10488000E0601843354908431060704738B5324B33 -:104890001C68C4F30223C3F10704052C28BF0424B9 -:1048A0001D1D072D34BF0023DB1E012505FA04F46E -:1048B000641E2140994005FA03F35B1E1A40114320 -:1048C000BDE83440C6E70000010007D4012200F033 -:1048D0001F01234B8A40400943F820207047010004 -:1048E0000BD4012200F01F011E4B8A40400943F8FF -:1048F0002020BFF34F8FBFF36F8F704710B5401E5E -:10490000B0F1807F01D3012010BD174C60600F21F2 -:104910004FF0FF30FFF79EFF0022A26007202060CB -:10492000002010BD010007D4012200F01F010F4B31 -:104930008A40400943F820207047010007D4012233 -:1049400000F01F010A4B8A40400943F820207047BD -:1049500000E400E018ED00E00CED00E00000FA05D6 -:1049600000E100E080E100E010E000E000E200E0B3 -:1049700080E200E010B508B9032010BD00F52773F0 -:104980000024DC615C621C6301B199610121197032 -:104990000270BDE81040FFF784B91CB50022ADF8E5 -:1049A000002009B9032016BD00F52E742160C96AE4 -:1049B00011B1684688476061002016BDFFF79FB9B6 -:1049C00080B5D0F8B832032213B11A689047024676 -:1049D000104602BD80B5D0F8B8220AB1526890479F -:1049E000002002BD38B5044604F2AA25284600F08E -:1049F0000FFB04F5257001210160818B4160817DF1 -:104A000011F01F0003D002280DD006D311E0294673 -:104A10002046BDE8344000F0EDB829462046BDE808 -:104A2000344000F064B929462046BDE8344000F027 -:104A300084B92046BDE8344001F08001FFF777B922 -:104A400038B5044610460B0004F5257221D11168D3 -:104A5000032910D104F5AE714B680D68AB420CD23E -:104A6000ED1A4B680D602A469A42014688BF1A46E5 -:104A7000204600F02BFB002032BD107A032804D121 -:104A8000516A096909B120468847204600F026FB93 -:104A9000F1E7107A0328EED1526A9269002AEAD02F -:104AA000204690470100E6D032BD38B50446104696 -:104AB0000A0004F5257538D1296802292ED1E2694A -:104AC000216A914206D2521AE2610146204600F064 -:104AD000EBFA0DE013D1A069884210D369688842CF -:104AE0000DD200220021204600F0DEFA002068608E -:104AF0000023002200212046FFF745F90EE0287A26 -:104B0000032804D1696AC96809B120468847802111 -:104B10002046FFF70CF9204600F0E7FA287B012831 -:104B200004BF00212973002032BD287A0328FAD15E -:104B30006A6A5269002AF6D0204690470100F2D0F6 -:104B400032BD1CB5044604F5257001210172002117 -:104B5000016061600161416A09B9032016BD806A84 -:104B600000281CBF4A68002A02D000212046904736 -:104B70004023002200212046FFF7C8F804F5B0705A -:104B800001218180402340210160002280212046B4 -:104B9000FFF7BCF80120A08440202062002016BD51 -:104BA00001740020704700F52770017841700421DE -:104BB00001700020704700F527700178042904BFB8 -:104BC000427802700020704780B500F52772D169E5 -:104BD00009B9032002BD1278032A02D1C96901B1C3 -:104BE0008847002002BD00004178007840EA01209B -:104BF00070470000F8B500240546087810F0600002 -:104C000005F5277608D0202818BF40282ED1F26954 -:104C100093682846984730E04878092826D8DFE886 -:104C200000F03F592553250905252E29284600F077 -:104C300013F95AE08A88002A04BFC888002815D1D1 -:104C40004F88802F12D23078032807F07F070DD0CD -:104C5000B77039462846FFF788F8284600F03EFA34 -:104C6000002F14BF0220012030703EE0284600F0E3 -:104C7000E4F93AE0284600F078F9044635E0C888BF -:104C80000128F3D13278521E012A04D9921EEDD1A7 -:104C90000122291D14E0AC60012205F108010FE09A -:104CA0003078401E0228E1D8C8880228DED10121D0 -:104CB000E960B06808B10321E960022205F10C0146 -:104CC000284600F0E9F910E0488801280DD10121BB -:104CD000B16007E03078401E0228C7D84888012814 -:104CE00003D1B460284600F0F9F92046F2BD70B552 -:104CF0000E4604463078002510F060001CBF2028C6 -:104D0000402815D104F527721178491E02290FD8C1 -:104D1000307902280CD2D2699368314620469847F0 -:104D20000546F08838B9280005D100F018F902E0EE -:104D3000314600F018F9284670BD2DE9FC410E46B9 -:104D4000002580463078317910F0600008F527772B -:104D500004D020283AD0402864D137E07078002869 -:104D60003BD0012815D003285CD13878022816D012 -:104D7000032857D1708840B9002918BF802904D072 -:104D8000F08810B94046FEF7D2FF404600F0A6F981 -:104D90004CE03878022802D003280CD042E00029E9 -:104DA00018BF80293ED04046FEF7C1FF8021404613 -:104DB000FEF7BDFF3AE07088C0BB11F07F0F1CBF4B -:104DC0004046FEF7BBFF404600F088F9FA69936859 -:104DD000314640469847054628E0142001F07F02FE -:104DE0003B7842434244022B02F5AA7402D0032BC3 -:104DF0000FD017E0002918BF802913D1080648BF3B -:104E000002F11404256002222146404600F044F9D4 -:104E10000CE001F00F0310FB03F00B06404408D533 -:104E2000808C78B93146404600F007F92846BDE845 -:104E3000F681B0F864010028F4D0002918BF802959 -:104E400003D1DFE702F11404F7E74046FEF77DFFE8 -:104E500000B101202060D6E738B5044600200D4699 -:104E6000ADF8000004F52D726888010A012908D008 -:104E700002291ED0032929D006295AD007295FD03C -:104E800067E01268207C136869469847EA88002A20 -:104E900062D0BDF8001000295BD0914288BF114656 -:104EA000ADF800100146BDF80020204600F0F4F8EF -:104EB00031BD207C51680028684604D1896A884742 -:104EC00002214170E2E7C96A8847F9E7C0B20528C4 -:104ED0003FD8DFE800F0030B121920271068426862 -:104EE000002A36D0207C69469047CFE71068826858 -:104EF0007AB3207C69469047C8E71068C26842B31D -:104F0000207C69469047C1E7106802690AB3207C9B -:104F100069469047BAE710684269D2B1207C694679 -:104F20009047B3E7106882699AB1207C6946904740 -:104F3000ACE7207C68B951684A6B68469047A5E7A2 -:104F4000207C30B951680A6B68469047072242704E -:104F50009CE700F007F831BD00F001F831BD2046B4 -:104F600000F0BCB82946204667E0F8B50D46044677 -:104F7000244F68883870002639780846022803D301 -:104F8000FFF7F0FF0320F2BD94F89C22022A02D022 -:104F9000032A0FD02EE0002929D060602046FFF7B9 -:104FA0000FFD060002D0FFF7DDFF29E0FFF7D7FF76 -:104FB000032019E031B9022084F89C02666000F0F9 -:104FC00024F814E06168884211D000F01DF83978A7 -:104FD00061602046FFF7F4FC060008D0FFF7C2FF2F -:104FE000616800F011F8022084F89C0208E0FFF7E5 -:104FF000B6FF05E0FFF7B6FF397800F006F80326A4 -:105000003046F2BDB0230020C9B22046FFF7E2BC13 -:1050100038B50D4604462878207068786070A81C62 -:10502000FFF7E2FD60802D1D2846FFF7DDFDA08023 -:10503000A81CFFF7D9FDE08031BD10B504468021E2 -:10504000FEF775FE2046BDE810400021FEF76FBE5A -:1050500000280B4600D1704730B50021044600E01F -:10506000491C14F8015B002DFAD10906C90D891CF1 -:1050700011801178197002220321597008E010F88C -:10508000011BD4B2521C1955D4B200211955521C1F -:1050900001780029F3D130BD80B513460222C0F853 -:1050A00094228361C36101E080B513460A46002162 -:1050B000FEF762FE002002BD80B513460322C0F851 -:1050C000942200F5AC721360536001E080B5134682 -:1050D0000A460021FEF757FE002002BD80B50421DC -:1050E000C0F8941200230022E1E780B50521C0F842 -:1050F000941200230022ECE710B58EB002A80FF244 -:105100009061DFF804443022FDF764FC0FF249405F -:105110000190009469460FF2294000F051FB0121F3 -:10512000022000F036FCDFF8E4230021202000F00C -:10513000ACFC02A800F02AFD08B1C046C04600F051 -:105140000DF900F033FD0FF225320021012000F0AF -:105150009CFC0FF25D320021022000F096FCDFF88B -:10516000B043002084F88000202000F0C5FD00F04E -:10517000F7FD0FF2B133002204F18101002001F0AC -:1051800025FB0EB010BD2DE9F043074685B07878B9 -:10519000DFF87C43DFF87C6305284FF0000804F15A -:1051A000800554D03E2863D0FF280DD101203072F5 -:1051B000B7F80300042842D040F20741884204D0E7 -:1051C00040F60201884218D0A6E07879022804BF90 -:1051D000B9790029F8D1002001F00CFC0FF28C30D5 -:1051E00001F054FCA878012806D12978062903D0BB -:1051F0000021022000F056FC8EE0002000F07CFD33 -:10520000F879307301253889F08179893182BA893A -:105210007282FB89B382388A04950090F082357BD4 -:10522000E08A039510260296019601F043FC10B126 -:10523000022001F0D5FB202000F05EFD6CE0012093 -:1052400001F0CEFB68780A2101F040FB64E0B888E9 -:10525000E18A884260D1A4F8168085F800800FF2B8 -:105260003C3001F013FC0120307200F059F853E09B -:10527000F878012802D002281DD04DE0B7F80500CB -:10528000E082062028700FF23C3001F0FFFB86F828 -:10529000088000F045F8E08A01F09BFC30B90FF27D -:1052A0004C3001F0F3FB0FF2783001E00FF2A03048 -:1052B00001F0ECFB30E097F80D90787960BB29E0C5 -:1052C00007EB0800847BC07BFF2821D1072C1FDB64 -:1052D00007EB0800007C01281AD10FF2B43001F06E -:1052E000D5FB07EB0800407C832811D10FF2C030BA -:1052F00001F0CCFB0120A870F8793070387A70701A -:10530000787AB070B87AF070F87A3071387B707152 -:10531000641CA044C845D3DB012005B0BDE8F08380 -:10532000E08A708106F1080000F03BBD7849CA8A26 -:10533000824202D191F8800070470020704780B50A -:1053400000F0BBFE062805D0BDE804400021012086 -:1053500000F0A8BBBDE8014000F035BD18B589B02C -:105360000020ADF81A0001F0F2FC6B4C216811F13D -:10537000010F0DD0694862680170120A090A417074 -:1053800061688170C270110A120C0171427105E0EE -:10539000002001F001FD08B90FF2CC3002460621D1 -:1053A000002000F074FC4EF66E50089007AA2068AA -:1053B000574C079006212E2000F069FC0FF2B03206 -:1053C0001021182000F063FC0FF2B43210210820E5 -:1053D00000F05DFC1821012000F080FC01F0B2FB20 -:1053E0000DF1160006A90190009105AB07220021DE -:1053F000052001F02FFD0FF2DC20BDF81810009001 -:105400000723BDF81400002201F0B3FB0DF11A00D0 -:1054100000900223BDF81610BDF81400002201F020 -:10542000A8FB0020207001F0C9FC01206070012160 -:1054300008202071A1701020607100210120E0700F -:10544000049110213648A0600390082201200191A8 -:105450000092029000230022012101F0C8FCA078F4 -:1054600008B101F02FFD0AB010BD0000284890F8E7 -:105470008010062900D1704780B5002001F0B0FAF5 -:105480004FF4487101230022084601F036FD28B987 -:10549000BDE802400FF2442001F0F8BA0FF26C2090 -:1054A00001F0F4FABDE80240022001F099BA0000D0 -:1054B00018B587B00FF28420154C01F0E7FA94F884 -:1054C000800006281DD01021069105914FF4FA7036 -:1054D000049050210023029128220020039301927E -:1054E00000904FF448710B4B0022084601F02AFD52 -:1054F00008B9042003E0022001F072FA002084F8C9 -:10550000800008B010BD0000A0080320FF5700086D -:1055100040200020F82200208075FF1F6C2300200F -:1055200007B20100012001F065BA0021202000F03F -:10553000B9BA012000F0DCBA012000F0E1BA0000A5 -:1055400010B50446616801F1080000F03FFB00B1AE -:105550000120207010BD000010B1012803D0704759 -:105560003F2000F0B3BA3F2000F0B8BA2D2D2047FD -:1055700041502047454E4552414C20444953434FEA -:10558000564552592050524F4345445552455F436A -:105590004F4D504C455445440A0000000D0A0D2A59 -:1055A0002A20444953434F4E4E454354494F4E20C1 -:1055B0004556454E54205749544820534552564568 -:1055C00052200A000D0A0D2A2A20434F4E4E454311 -:1055D00054494F4E204556454E5420574954482073 -:1055E000534552564552200A000000000D0A0D2A6C -:1055F0002A2047415454205345525649434553208D -:10560000262043484152414354455249535449434B -:105610005320444953434F5645525920200A000015 -:105620002A2047415454203A202053746172742038 -:10563000536561726368696E67205072696D61724B -:1056400079205365727669636573200D0A0D000039 -:10565000424C455F4354524C5F4170705F4E6F74D3 -:10566000696669636174696F6E28292C20416C6CCE -:1056700020736572766963657320646973636F76FE -:10568000657279204661696C6564200D0A0D000021 -:105690002D2D2D205354204D414E554641435455F8 -:1056A000524552204944202D2D2D200A0000000093 -:1056B0002D2D2053455256455220444554454354C0 -:1056C0004544202D2D20564941204D414E2049442E -:1056D0000A00000053544D3332574200200D0A0D8A -:1056E0002A2A2053544152542047454E4552414C9A -:1056F00020444953434F5645525920285343414E65 -:1057000029202A2A20200D0A0D0000002D2D2042DC -:105710004C455F4170705F53746172745F4C696D8A -:10572000697465645F446973635F5265712C2046D8 -:1057300061696C6564200D0A0D0000000D0A0D2AD8 -:105740002A2043524541544520434F4E4E45435431 -:10575000494F4E20544F20534552564552202A2A35 -:1057600020200D0A0D000000AA55443322AA000093 -:10577000123456789ABCDEF0123456789ABCDEF0B9 -:10578000FEDCBA0987654321FEDCBA09876543213F -:105790000000000000000000000000000000000009 -:1057A00000000000440008004005020112279C0090 -:1057B000F4010000FFFF000048010100002000008C -:1057C0007FB50C466D4D61686D4EE86129622846D3 -:1057D00001F030FC246805F1240000604060746032 -:1057E00006F108000060406001203070296829B18E -:1057F0000FF2551000900294684688477FBD1FB590 -:105800005F4C04F1080001F022FC00BB2178F1B1EB -:10581000694604F1080001F043FC5848C16949B1E8 -:105820000098029001228DF8042001A888479DF875 -:10583000040000E001202070207818B1009801F0E9 -:10584000E4FC04E0009904F1080001F009FC04F113 -:10585000080001F0FCFB28B9207818B104F1080019 -:10586000FFF763FE1FBD2DE9F8430646002000F058 -:105870005FF874883088B268DFF80081C4F30904E7 -:1058800044EA8024F068A4B2C1B2204600F03CF89B -:10589000002748F2E8094846FFF74EFE08E068880E -:1058A000A04202D1316928780870687800B10127D8 -:1058B00008F1240001F0CBFBF0B9694608F124009F -:1058C00001F0EEFB009800F10B05407A0F28E6D0BE -:1058D000B5F80110A1420DD10098817AC81E7169F6 -:1058E000C0B28842C8BF0846706102463069E91CF0 -:1058F000FDF760F82878D9E73800CCD0012000F017 -:1059000017F80020BDE8F28310B513461C4A54680E -:10591000A4F80900E1720A46194604F10C00FDF7EB -:1059200049F8164A1369BDE81040002100201847C5 -:105930001249096A82B008B921B101E011B1012010 -:1059400002B0084702B0704710B50146487A0F28E8 -:1059500018BF0E2807D10B4801F08CFBBDE81040A2 -:105960000020FFF7E6BD064C04F1080001F082FBC1 -:1059700004F10800BDE81040FFF7D7BD6422002005 -:1059800040230020882200200C4800210160416053 -:10599000704710B500F00CF85C6819B1012904D10A -:1059A000204301E024EA0000586082F3108810BD13 -:1059B000EFF3108272B6014B704700007423002091 -:1059C0002DE9FC475B4CDFF87091A5692840A06188 -:1059D0004FF0FF3A4FF0010830E0491C54F8310015 -:1059E0000642FAD004EBC10618407168104001422B -:1059F00008BFC6F804A07768384000F09FF86062DE -:105A000008FA00F087437760EFF3108172B6626A9C -:105A1000206908FA02F2D24310402061022004EB10 -:105A2000C00353F8086C1640401E43F8086CF6D1CA -:105A300081F31088606A59F82010884763692069EB -:105A4000A2691840104207D0E069216A084203D1D8 -:105A5000002103EA0206C1E7C4F824A0C046C046FC -:105A6000EFF3108972B6216960690140A0690142B3 -:105A700001BFE169206A014201F07BFC89F31088D3 -:105A8000C046C046A561BDE8F38738B51446EFF3BC -:105A9000108572B600F052F8274941F8204085F38E -:105AA000108831BD10B500F00BF804431C6153F8A9 -:105AB0003140204343F83100FFE782F3108810BDE6 -:105AC000EFF3108272B61B4B1C697047EFF3108125 -:105AD00072B6184A536923EA000005E0EFF310811B -:105AE00072B6144A53691843506181F310887047A5 -:105AF000EFF3108172B60F4AD3691843D061F4E70F -:105B0000F8B50C4C656A276A2E4615F1010F0EBFD9 -:105B10000025012101FA05F5206202E0284601F086 -:105B200029FC216AE0690842F8D088436662E06196 -:105B30002762F1BD28100020C4200020024600206A -:105B4000110C090404BF1020120412F07F4F04BF8F -:105B5000083012020FF2180112F0704F04BF001D3E -:105B60001201120FC0F11F00895C401AC0B27047C9 -:105B70000403020201010101000000000000000016 -:105B800001F061FC9DF80E0005B000BDF8B500F114 -:105B90000C026B4624214FF66640F1E7F8B500F1A0 -:105BA0000C026B460F214FF66840E9E723490020BD -:105BB000087700222248027100F044B820490A798F -:105BC00041F822000879401C0871704770B50446FE -:105BD0006078FF2802BFB4F8031001F47F41B1F5EB -:105BE000406F1FD10025154E317FE8B2884222D286 -:105BF000E9B256F8211020468847002808BF6D1CDE -:105C0000F2D018E0761C2979F0B288420AD2F1B2BB -:105C100055F82110204688470100F3D002D0022811 -:105C200005D006E02046BDE87040FFF7ACBA002082 -:105C300070BD012070BD0026014DE4E7D822002090 -:105C40009423002080B5C046C046C046C046C0462A -:105C5000C046C046C046C046C046C046C046C04614 -:105C6000C046C046C046C046C046C046C046C04604 -:105C7000C046C046C046C046C046C046C046C046F4 -:105C8000C046C046C046BDE8014001F02BBC18B577 -:105C90000C46C7B0114600228DF800208DF81C007C -:105CA0008DF81D4022460DF11E0001F01CFC00F095 -:105CB0003BF83F200C21ADF80400ADF8061007A812 -:105CC000012103900691A41C049400F043F80028DD -:105CD0004CBFFF209DF8000048B010BD00B5C7B014 -:105CE00000F01BF80F2000F02AF800284CBFFF201E -:105CF0009DF8000047B000BD00B5C7B00021ADF869 -:105D00001C0000F016F8182000F019F800284CBF0D -:105D1000FF209DF8000047B000BD00228DF8002054 -:105D20008DF81C008DF81D101822002101A801F02B -:105D3000E0BB8DF80010182201A801F0DABBADF825 -:105D4000060007A9022004903F220120039106903B -:105D5000ADF80420CDF814D0002101A8FFF783BDD1 -:105D600080B50FF2B52200210420FFF78EFE0FF25E -:105D7000752200210820FFF788FED348002101800A -:105D8000C18081700121C1700021017101720FF287 -:105D90004100FFF713FFBDE802400FF2303000F082 -:105DA00075BE0278C84912B1012A03D070474088F5 -:105DB000C88070470020C880087A08B100220A72A3 -:105DC000002000F017BE00210820FFF76BBE000086 -:105DD0002DE9F84F05466878FF2812D1BA4CB5F87E -:105DE0000300618940F60442801A00F08B80801E17 -:105DF0004DD0001F06D0401F00F0B780401E00F0BD -:105E0000DD80EBE0B5F80560207A58B10846FFF771 -:105E10008DFA217A062908BF0028F2D120724FF6A8 -:105E2000FF7060816681E879297A91FBF0F9142886 -:105E30005FFA89F9E5D14FF0100A00270FF2A82880 -:105E40004FF64066F8B24845DBDA05EB0A0B9BF8E3 -:105E500009009BF80A1040EA0120B04211D1618983 -:105E6000404600F013FEABF107000178427841EAAA -:105E70000221A1818178C07841EA0021E1810821D5 -:105E800021720AF106005FFA80FA7F1CDAE7B5F8A2 -:105E90000500814202BF1126E87915283CD1297AF4 -:105EA0000FF2B8290FF27C2B481E28724FF6426A77 -:105EB0004FF64168287A0028A3D0A91905F10A02F3 -:105EC000487A11F8057D925D497840EA022047EA58 -:105ED00001276189404508D050450CD1484600F063 -:105EE000D5FD0A202072A78205E0584600F0CEFDBD -:105EF0000920207227821536287AA0F1150129720F -:105F0000F6B2D7E7B5F80500814201BF95F808B0B1 -:105F10004FF00008E879012860D100270FF28029AE -:105F200042F6021AF8B2B0EB9B0F57DA05EB080005 -:105F300005F10A01C27A467A007B11F8081042EA9C -:105F40000022524546EA012609D16189484600F0FF -:105F50009DFD207A0A2802D1E6820B21217208F1E8 -:105F600004005FFA80F87F1CDCE7B5F80500814289 -:105F700002BFB5F80700A18A88422FD1687A0228AB -:105F800002BFA87A6070012828D1E87AA0704CA4DA -:105F900048B900F02FFD0FF2802000F077FD204679 -:105FA00000F074FD1AE00FF2B02000F06FFD204603 -:105FB00000F06CFD002000F013FD0FE00FF2282030 -:105FC00000F064FD3FA000F061FD6089B5F80510A8 -:105FD000884203D100210420FFF764FD0020BDE8C2 -:105FE000F28F000010B50FF2B020374C00F04EFDDC -:105FF00033A000F04BFD2079401E8041C00F20717E -:10600000207A38B1218A6089E31CBDE81040022261 -:1060100000F04DBE10BD00001CB50120ADF802001F -:106020000021294C207AADF80010002844D0C01F70 -:10603000052841D8DFE800F00308121823340FF2D6 -:10604000982000F023FD13BD0FF2A42000F01EFDE8 -:10605000E289A189608900F0D6FD13BD0FF2B82056 -:1060600000F014FD218A04E00FF2E82000F00EFD9C -:10607000A18A60898A1C92B200F0D6FD13BD0FF28E -:10608000183000F003FDE18A60890DF1020302225D -:1060900000F0E0FD06202072022000F0ABFC13BDF2 -:1060A0000FF21C3000F0F2FCE18A60896B4602229C -:1060B00000F0D0FD0620207213BD0348007A70471F -:1060C000200A0D000A000000282300202D2D20505A -:1060D000325020434C49454E5420494E4954494181 -:1060E0004C495A4544200A002D2D20474154542044 -:1060F0003A205032505F534552564943455F5555FB -:10610000494420464F554E44202D20636F6E6E65E6 -:106110006374696F6E2068616E646C6520307825E9 -:1061200078200A002D2D2047415454203A20575200 -:106130004954455F5555494420464F554E44202DFE -:1061400020636F6E6E656374696F6E2068616E6444 -:106150006C6520307825780A000000002D2D20473E -:10616000415454203A204E4F5449464943415449E2 -:106170004F4E5F434841525F5555494420464F5565 -:106180004E4420202D20636F6E6E656374696F6EC0 -:106190002068616E646C6520307825780A00000004 -:1061A0002D2D2047415454203A20434C49454E540C -:1061B0005F434841525F434F4E4649475F44455312 -:1061C00043524950544F525F555549442D20636FF7 -:1061D0006E6E656374696F6E2068616E646C6520B5 -:1061E000307825780A0000002D2D20474154542096 -:1061F0003A204143495F474154545F50524F435FF7 -:10620000434F4D504C4554455F56534556545F439C -:106210004F4445200A000000202D2D2050325020F0 -:106220004150504C49434154494F4E20434C4945FD -:106230004E54203A204E4F54494649434154494F09 -:106240004E205245434549564544202D204C454457 -:10625000204F4646200A0D00202D2D205032502080 -:106260004150504C49434154494F4E20434C4945BD -:106270004E54203A204E4F54494649434154494FC9 -:106280004E205245434549564544202D204C454417 -:10629000204F4E0A0D0000002D2D2050325020417D -:1062A00050504C49434154494F4E20434C49454E70 -:1062B0005420203A20425554544F4E2050555348B4 -:1062C0004544202D20575249544520544F205345D2 -:1062D00052564552200A20005032505F44495343E1 -:1062E0004F5645525F53455256494345530A0000A5 -:1062F0002A2047415454203A20446973636F7665DD -:106300007220503250204368617261637465726913 -:1063100073746963730A00002A2047415454203A79 -:1063200020446973636F7665722044657363726994 -:1063300070746F72206F66205458202D2057726938 -:10634000746520436861726163746572697469631E -:106350000A0000002A2047415454203A204469731F -:10636000636F7665722044657363726970746F72CF -:10637000206F66205278202D204E6F746966696305 -:106380006174696F6E2043686172616374657269DC -:106390007469630A000000002A2047415454203ADF -:1063A00020456E61626C6520536572766572204E81 -:1063B0006F74696669636174696F6E0A000000003A -:1063C0002A2047415454203A2044697361626C6525 -:1063D00020536572766572204E6F746966696361D9 -:1063E00074696F6E0A000000DFF854150A6892B2F3 -:1063F00000E00246086880B28242FAD170472DE977 -:10640000FC4104461825DFF83C85DFF83C6568430D -:1064100008EB00073078062808D1317871703470A5 -:1064200078754FF0FF307060002039E000F077F8A9 -:10643000B9680918B96008F10803B96832786A4385 -:106440009A589142327813D308F1150315FB02FCD8 -:1064500013F80C30062B25D008F108066B43F358CF -:10646000994222BF08F115036A439A5CEED219E003 -:106470001146337869439A420BD008F1140308F1AE -:10648000150C5B5C15FB03F50CF805407A753B7544 -:1064900000E07A7508F11402545431787170347048 -:1064A000BDE8F6811146694308F115035B5C062BD4 -:1064B00004D008F1140615FB03F574557B753A7585 -:1064C00008F115025454EBE7F8B5DFF87C34DFF837 -:1064D00074541E78182402466243B0422A4404D100 -:1064E00018785870507D18700FE0167D507D92F826 -:1064F00015C005F115076643062807F806C004D045 -:10650000167D143514FB00F42E55012010731878F5 -:10651000062802BF00294FF0FF315960F1BD10B5C8 -:10652000DFF82444606810F1010F0FD0FFF75CFF23 -:106530006168DFF81824814261683CBF5388C9183C -:10654000081A517848431178C84000E0002080B212 -:1065500010BD2DE9F84FDFF8F453DFF8F4B3D5F8A8 -:106560000880D8F80000DBF800104A0500F09BF91D -:10657000DFF8D463DFF8CCA321F4806181604FF0B1 -:10658000180934780AF1080019FB04F14758FFF79D -:10659000C6FF874217D200270121B170062C3DD0DB -:1065A00019FB04F40AF108010AF1080209598142B1 -:1065B00023BF0AF108010959091A002111510AEBF8 -:1065C00004014C7DEAE7A9884118B94202D2AF889C -:1065D0000021E2E73F1ADFE7022802DA28780128E3 -:1065E00000D07F1ED8F80000C1684A07FAD500F035 -:1065F00060F9DBF80C00000CBFB247EA0047CBF8AB -:106600000C70FFF7F1FE7060A8680068816841F4C3 -:1066100080618160AFF30080BDE8F18FB8B20028DF -:10662000DAD1FFF7E1FE70600320BDE8F24FFEF71C -:1066300079B92DE9F843EFF3108872B6C34DC14B19 -:10664000A8680168CA224A6253204862BE4A886824 -:1066500020F48060886018201678374647431F442E -:10666000387B022826D13C68D7F810909078F0B19A -:106670007A7B012A0AD101213046FFF725FF88F3F2 -:1066800010887968304600F021F904E088F310881A -:10669000304600F0CCF8A8680068CA214162224662 -:1066A000532141624846314600F05CF90BE0FFF7A8 -:1066B00050FF06E0C8684207FCD500F07EF8A54907 -:1066C000086088F31088FF21A86802685162BDE85D -:1066D000F183F8B59D4CA160CA2209684A62532231 -:1066E0004A629B4A136843F020031360136803F067 -:1066F0000703C3F10403237095682D0C05F07F0593 -:106700006D1C6570EDB29268C2F30E02521C62807D -:1067100092B2521E6A43A2F5A072DA404FF6FF739E -:106720009A422CBFA380A2808B4A136843F40023B3 -:1067300013608A4B1D6845F400251D6048BB8248E4 -:10674000804E0123837018254FF0FF3343600023F0 -:106750005FFA83FC06F10C0715FB0CFC4FF0000EF2 -:1067600007F80CE05B1CDFB2062FF1DB0623037099 -:10677000886820F48060886000F01FF8D0600320F3 -:10678000FEF7DBF8A1680868826842F48042826004 -:1067900005E0C868410544BF0320FEF7C3F8A168BF -:1067A0000A68FF205062002203210320FEF76EF8E2 -:1067B000BDE8F2400320FEF787B8C86800F080000B -:1067C00060F49060C8604FF400207047F0B5044654 -:1067D0000025EFF3108672B61827DFF868C10CF1B8 -:1067E0000C0007FB05FE10F80E0010B16D1C062D05 -:1067F000F5DB062D0CD06F430CEB07000127077368 -:1068000086F310880461427303600D700020F0BDB0 -:1068100086F310880120F0BD10B5044600F007F89B -:106820001820484A444310190021017310BDF8B5DF -:106830000746EFF3108472B60320FEF750F8434D7D -:10684000AE683068CA2141623A465321416218203D -:1068500043494243895C02291BD100213846FFF796 -:1068600033FE3948017806290ED1306838490A6864 -:10687000530500F018F821F480618160C1684A076F -:10688000FCD500F016F804E04078884218BFFFF706 -:1068900060FEA9680A68FF2050620320FEF714F822 -:1068A00084F31088F1BD02D5C1684A07FCD4816821 -:1068B0007047C16801F0800161F49061C1604FF4DC -:1068C0000020244908600320FEF737B82DE9F04185 -:1068D00080460F46424618201A4942438C18207BB6 -:1068E000022804BF4046FFF7A2FFEFF3108572B6FF -:1068F0000320FDF7F4FF154EB0680068CA2141621D -:106900005321416202202073A76067604046FFF771 -:1069100076FD0D490A784978914202D0FFF719FEB9 -:1069200002E0A168081AA060FF20B1680A685062FE -:106930000320FDF7C9FF85F31088BDE8F081000052 -:1069400028280040B01F00209C2300206023002046 -:10695000082800400C08005800080058800800581B -:10696000BC1F002010470000404981B00A68024364 -:106970000A60096808400090009801B0704778B537 -:1069800085B004466846142100F0BEFD0CB9012014 -:1069900004E0012C18BF022C02D10220FFF7E4FF13 -:1069A00000F012F8009501200190002102200390D0 -:1069B00000F004F800F00EF806B070BD02916946D0 -:1069C00056F8240000F0A4BD0FF2B000284E30F8B5 -:1069D0001450704756F824000022294600F055BE96 -:1069E0000FF29801224B31F8101053F820000122C9 -:1069F00000F04BBE0FF284011D4B31F8101053F81C -:106A00002000002200F041BEF0B585B004460D46DE -:106A10006846142100F078FD0120FFF7A5FF28004B -:106A2000144E0FF260070AD137F8140000900021CD -:106A300001910120029002210391FFF7C0FF012D77 -:106A400012D137F81400009001210B480190FFF794 -:106A5000B5FF0FF23400045D00220F2160B2FDF794 -:106A600015FF60B2FDF730FF05B0F0BD4C000058D7 -:106A70005C100020681000200000211010000100B0 -:106A80000200000000040000280000000EB4C0B5A1 -:106A9000024603A800210190009101AB01210448A6 -:106AA00078440C30FAF714FE06BC5DF810FB00BF0A -:106AB0004B2A00002DE9F841C7B04FF00008ADF8AF -:106AC0001C00DDF838C14F9E509F519D529C8DF89F -:106AD000008007A800F01AF8A0F808C0ADF82660FA -:106AE00087818DF82A508DF82B4000F015F84FF46F -:106AF000C17000F016F8102000F017F800284CBF05 -:106B0000FF209DF8000048B0BDE8F0814180ADF85D -:106B10002020ADF8223070471822002101A800F093 -:106B2000E8BCADF8060007A9704704903F22012099 -:106B300003910690ADF80420CDF814D0002101A8EF -:106B4000FEF791BE00B587B000208DF8000000F080 -:106B50007CF840F20110ADF806003F2201200690BB -:106B600000F0EDF800284CBFFF209DF8000007B0B2 -:106B700000BD30B5C7B01C464A9B00F0C7F80025E1 -:106B80008DF800508DF82140224619460DF1220063 -:106B900000F0A9FC00F059F83F204FF4837100F099 -:106BA000BCF8A41D049400F0CCF800284CBFFF20D2 -:106BB0009DF8000047B030BD0023ADF81C008DF8F3 -:106BC000003007A8418082800021182201A800F02F -:106BD00090BC00B5C7B000F010F8FFF7F6FF0F212A -:106BE00002914FF48970022100F0A1F800284CBFF7 -:106BF000FF209DF8000047B000BD0021ADF81C004B -:106C00008DF80010704700B5C7B0FFF7D5FF0F2112 -:106C1000029140F2151000F089F800284CBFFF20C7 -:106C20009DF8000047B000BD00B5C7B0FFF7C4FF36 -:106C30000F21029140F2171000F078F800284CBFA5 -:106C4000FF209DF8000047B000BD1822002101A8D8 -:106C500000F04FBC18B5C7B000F011F800F045F8CF -:106C6000FFF7F3FF40F2211100F013F800F069F88C -:106C700000284CBFFF209DF8000048B010BD14460E -:106C8000ADF81C00002207A88DF800204180047197 -:106C90007047ADF806103F2007A9ADF80400039136 -:106CA0000F20012102900691641D0494704718B5CD -:106CB000C7B000F010F8FFF7C8FF3F2040F22311E3 -:106CC00000F019F800F03DF800284CBFFF209DF8B7 -:106CD000000048B010BD144600228DF80020ADF829 -:106CE0001C00ADF81E108DF82040224619460DF10B -:106CF000210000F0F8BBADF80400ADF8061007A8BD -:106D0000012103900691641D04947047ADF81C00A6 -:106D1000ADF81E108DF820207047ADF80400ADF8D6 -:106D2000061007A801210390069170470621ADF8CF -:106D30000600049107A801213F2203900691ADF8B7 -:106D40000420CDF814D0002101A8FEF78CBD00B5B9 -:106D500087B000F010F8012003220690ADF804205F -:106D6000ADF8062000F011F800284CBFFF209DF878 -:106D7000000007B000BD00208DF80000182200219F -:106D800001A800F0B6BB03900691CDF814D0002105 -:106D900001A8FEF768BD000001460648064AC3790F -:106DA0008B4218BF904218BF0838F8D18B4218BFE9 -:106DB00000207047F873FF1F0070FF1F00B5C7B0B9 -:106DC00000F00CF8852000F075F800F014F90028A8 -:106DD0004CBFFF209DF8000047B000BD00218DF89A -:106DE0001C008DF80010182201A800F082BB2DE9CC -:106DF000F841C7B04FF0000800F026F80DF123006D -:106E0000DDF844E14E9F4F9E509D529C8DF81F30FF -:106E1000C0F800E08DF800808DF820708DF82160BA -:106E20008DF822508DF8274000F087F88620ADF8C5 -:106E3000060007A90C2000F0DAF800284CBFFF205C -:106E40009DF8000000F0F2B88DF81C0007A8417012 -:106E500082707047F8B5C8B005460E4617461C4606 -:106E600000F023F808A8467087708DF8205000F0D5 -:106E7000D8F88A21ADF80A103F20032100F0C4F8A9 -:106E8000002848BFFF200ED49DF8000058B94F9944 -:106E90004E98BDF801202280BDF803200280BDF885 -:106EA00005000880002049B0F0BD07220021684697 -:106EB00000F01FBBADF8060007A901203F22039197 -:106EC0000490704700B587B000F013F800F035F873 -:106ED000922000F009F800F08EF800284CBFFF2047 -:106EE0009DF8000007B000BDADF806003F2201206C -:106EF000704700208DF80000704718B5C7B000F04B -:106F000011F800F01AF80F2102919720062100F0E5 -:106F100065F800F071F800284CBFFF209DF80000D4 -:106F200048B010BD0024ADF81C008DF8213007A832 -:106F3000418002718DF8004070471822002101A89D -:106F400000F0D7BA2DE9F04F0646C7B000F020F8A0 -:106F500000F012F8FFF7F1FF3F20ADF804009C218C -:106F600000F030F800F04AF800284CBFFF209DF8F0 -:106F7000000047B0BDE8F08F8DF82790B581ADF8DF -:106F80002AB03782ADF82E80B482ADF832A07047B7 -:106F900008461946559CDDF84091519DDDF848B1F1 -:106FA000539FDDF85081DDF858A1ADF81C60002337 -:106FB00007AE8DF80030708032710DF1210006228D -:106FC00000F091BA0F200290ADF80610182004903E -:106FD00007A901200391069070470321ADF8060030 -:106FE000049107A801213F22039006917047049065 -:106FF0003F22012003910690ADF80420CDF814D073 -:10700000002101A8FEF72FBCADF80800059108A8E3 -:10701000072104900791CDF818D0002102A8FEF7AF -:1070200022BC1822002102A800F063BA48B0BDE8D3 -:10703000F08100000249016002490161704700BF10 -:10704000077100082D710008006040607047EFF381 -:10705000108172B6026882420CBF012000201CE041 -:10706000EFF3108272B603680B6048600160086835 -:10707000416023E0EFF3108272B6086043684B6012 -:1070800041604868016019E0EFF3108172B6426810 -:107090000368136002684368536081F31088704787 -:1070A00010B5EFF3108472B602680A600068FFE75B -:1070B000FFF7EAFF84F3108810BD0B6082F310889D -:1070C0007047000000F076BB6C486D49016001F12B -:1070D0002002426001F13002826001F13C02026252 -:1070E00001F14402426201F14C02C26001F154021A -:1070F000026101F17002426101F17402826180312A -:10710000C16100F075BB38B504465E4D2846FFF7F7 -:107110009BFF5A484068A1680160E168C1608560D2 -:107120005949416000F080FB58482AE080B5534837 -:107130004268136801211972406800F07BFB00204F -:1071400002BD38B5514C4F4D04E000F041F80098B5 -:10715000216888472846FFF77AFF0028F5D031BD1F -:107160004A484168084738B50446494D28460060FA -:1071700040604248C068A1680160456000F05FFB64 -:1071800044482168016061684160002032BD80B5DB -:107190003A48C268136810211972C06800F055FBA4 -:1071A000002002BD35483B4AC168C16813680868C1 -:1071B000184738B5374C364D04E000F009F8009810 -:1071C000616888472846FFF742FF0028F5D031BDA7 -:1071D00069462846FFF764BF38B504462E4D284659 -:1071E000FFF732FF2D480060406024480069A16825 -:1071F0008160E168C160056121680160616841608A -:10720000216941616169816131BD80B501462348D1 -:10721000FFF730FFBDE802400FF2050000F025BB8C -:1072200038B5164C1D4D06E0FFF7D2FF00992069D6 -:107230000069FFF71FFF2846FFF709FF0028F3D07A -:1072400031BD10B5164C2046006040600B484169C6 -:107250000C60BDE8104000F01CBB1CB5104C06E0F3 -:1072600069462046FFF71CFF0098C046C0462046EE -:10727000FFF7EDFE0028F3D013BD0000000003204F -:10728000AC090320480A032090080320842300202F -:10729000500A03208C230020380A03207C2300207E -:1072A000400A032010B52748274C88B0016841F4F4 -:1072B00000410160FEF768FB24480168C908C90065 -:1072C00041F00401016000F0FDFA21490020FFF7C0 -:1072D00000FA00F00EFB01210120FEF75AFB00200E -:1072E000FFF74DFB0120FFF74AFB0220FFF747FBAA -:1072F0000120FFF775FB01210020FFF785FBFFF759 -:10730000E3FE144A00214020FEF7BFFB04F23C508C -:107310000FF245010090019169460FF2410000F023 -:107320003DF804F25470029004F5C96140F23C50FB -:1073300005900391049402A8FFF74EFFFFF7C2FEE9 -:1073400008B010BD08000058300003208004005829 -:1073500090220020DF7300087047000080B500F025 -:10736000D7FA00210120FEF714FBBDE80140FDF72C -:10737000C3BE70474FF0FF30FEF722BB0021402014 -:10738000FEF790BB0220FEF7B3BB0220FEF7B8BBAE -:10739000B0F5806F08BFFDF7D2BF70477FB50C46D0 -:1073A0004D4D61684D4EE8612962284600F0CEFBE4 -:1073B0002468746006F1080000604060012000F05D -:1073C00068F801203070296841B10FF2E9000FF22E -:1073D000ED02009001920294684688477FBD1FB578 -:1073E0003E4C04F10800FFF732FE00BB2178F1B1FA -:1073F000694604F10800FFF753FE3748C16949B1F7 -:107400000098029001228DF8042001A888479DF879 -:10741000040000E001202070207818B10098FFF7E8 -:10742000F4FE04E0009904F10800FFF719FE04F1EE -:107430000800FFF70CFE28B9207818B104F1080005 -:10744000FFF79CFF1FBD2DE9F04105460E46904613 -:107450001C46002000F01DF8204F7868A0F8095065 -:10746000C672324641460C30FBF7A4FA1A4A136939 -:1074700000210020984748F2E800FFF786FF79686E -:107480008A78D21C04F10800FBF794FABDE8F041B9 -:1074900001201CB51049124C096A20B901B1884776 -:1074A0000020207013BD0120207011B1BDE81C40E8 -:1074B000084713BD0020FFF765BF000010B5014667 -:1074C000064C04F10800FFF7D5FD04F10800BDE803 -:1074D0001040FFF753BF0000B422002050230020CB -:1074E000B1230020704710B50446FBF763FA20462D -:1074F00010BD10B5044610460A460146204600F06D -:107500002FFB204610BD0000002200F05DBB0000F4 -:107510002DE9F84F4FF00009644A654B4FF00F0812 -:1075200005460E4633E0634FBD4214BF07270427CC -:107530008F4027434CF82E70C1431C6801EA040CAD -:107540007468E40348BF40EA0C0CC3F800C05C68F0 -:1075500001EA040C7468A40348BF40EA0C0CC3F8A9 -:1075600004C0146801EA040C7468E40248BF40EAED -:107570000C0CC2F800C0546801EA040C716889025E -:1075800048BF40EA0C0CC2F804C009F10109316897 -:1075900031FA09F077D0012404FA09F414EA010061 -:1075A000F3D04FEA490C032101FA0CF16FEA010E06 -:1075B0007168012918BF022903D0112918BF1229A7 -:1075C00011D1A968F7680EEA010107FA0CF73943EF -:1075D000A960696821EA04047168C1F3001101FA25 -:1075E00009F10C436C60E968B4680EEA010104FA21 -:1075F0000CF42143E9604FEA89017468022C18BF3A -:10760000122C12D14FEAD90405EB840401F01C07B7 -:10761000D4F820A008FA07FB2AEA0B0AD6F810B023 -:107620000BFA07F747EA0A0727622C680EEA0407F5 -:10763000347904F0030404FA0CF43C432C607468BD -:10764000E400A2D5DFF870C04FEA990E5CF82E7006 -:1076500001F00C0108FA01F427EA0404B5F1904F97 -:1076600008BF00270ED0154FBD4208BF012709D023 -:10767000134FBD4208BF022704D0124FBD427FF412 -:1076800052AF032754E7BDE8F18F81B0002A14BF41 -:107690008161816201B070470B4A136803421CBFCD -:1076A0001060FFF775BE704700000000000800582A -:1076B00080080058001000480800014000040048FD -:1076C00000080048000C00480C080058C06808403A -:1076D000884201D10120704700207047C0690840EE -:1076E000884201D1012070470020704710B56C4CD2 -:1076F00002212046FFF7F2FF38B16068C0438107DE -:1077000003D5FFF756FD022018E001212046FFF7C0 -:10771000E5FF38B16068C043C10703D5FFF711FD2D -:1077200001200BE008212046FFF7D8FF38B1606840 -:10773000C043010703D5FFF790FD0820A06010BDEE -:1077400010B5574C00F033F818B96068C043810396 -:1077500006D400F02CF830B96068C043810302D52C -:10776000BDE810407AE0082100F022F870B96068A6 -:10777000C04301030AD560684A4940F400206060B4 -:10778000086880474FF40020A06010BD202100F061 -:107790000FF858B96068C043810207D5606840F4AB -:1077A00000106060BDE81040FFF7DABC10BD022198 -:1077B00020468BE73C4881B0016841F480110160AC -:1077C000006800F48010009000983848016841F487 -:1077D000007101603648026842F40072026040BFE6 -:1077E00020BF3448016841F40041016001B0704796 -:1077F00080B53148016841F480110160006800F4EF -:107800008010009000982648016841F00101016055 -:10781000026842F4803202602C20FDF755F8BDE882 -:1078200002402D20FDF750B824480168490849005E -:107830000160704722494FF48030086070471F484C -:10784000016821F00201016070471C484FF40031CB -:107850004160016821F400310160704717480168F8 -:1078600041F400310160FFF79DBC38B504460C4D72 -:1078700008212846FFF72AFF30B10A4804606868EB -:1078800020F40020686031BDA0474FF40021A960BA -:1078900031BD0A48016821F008010160704700000D -:1078A000000C0058A423002050010058D4080058B0 -:1078B000200800580C04005850000058040C0058D0 -:1078C000080C0058DFF80C00FFE7016841F4806104 -:1078D00001607047040400584A4900E04A4981B0F9 -:1078E0000A6802430A60096808400090009801B0E5 -:1078F000704780B500F091F900F091F943480168B4 -:1079000041F48031016000F0B4F9BDE801400EE0BF -:1079100000B587B068460FF218211C22FBF75AF811 -:10792000FFF78FFC6846FEF739F907B000BDF0B5E8 -:1079300085B068461421FFF7E7FD002600250024E6 -:1079400000210FF2DC0000EBC102907988B11368CE -:10795000B3F1904F08D02E4FBB4208D02D4FBB4201 -:1079600004BF9088044304E09088064301E09088B7 -:107970000543491C2229E4DB002002900121032059 -:1079800003900191B0B288B100900120FFF7A4FFED -:107990000120FFF7A3FF69464FF09040FFF7B8FDC5 -:1079A0000022B1B24FF09040FFF76FFEA8B280B155 -:1079B00000900220FFF790FF0220FFF78FFF144E88 -:1079C00069463046FFF7A4FD0022A9B23046FFF712 -:1079D0005CFEA0B280B100900420FFF77DFF042080 -:1079E000FFF77CFF0B4D69462846FFF791FD00220B -:1079F000A1B22846FFF749FE05B0F0BD00210648B8 -:107A000000F076B94C0000584C010058900800581E -:107A10000004004800080048E415002000F092B976 -:107A200000000048010000000000004801000000C4 -:107A300000000048010000000000004801000000B4 -:107A400000000048010000000000004801000000A4 -:107A50000000004801000000000000480100000094 -:107A60000000004801000000000000480100000084 -:107A70000000004801000000000000480100000074 -:107A80000000004801000000000000480100000064 -:107A90000000004801000000000000480100000054 -:107AA0000000004801000000000000480100000044 -:107AB0000000004801000000000000480100000034 -:107AC0000000004801000000000000480100000024 -:107AD0000000004801000000000000480100000014 -:107AE0000000004801000000000000480100000004 -:107AF00000000048010000000000004801000000F4 -:107B000000000048010000000000004801000000E3 -:107B100000000048010000000000004801000000D3 -:107B200000000048010000000000004801000000C3 -:107B3000000000000000000000000000207A0008A3 -:107B4000280003202C0003202204040002490160C5 -:107B500002490161704700BF677100088F7100081A -:107B600062F30F2262F31F42401810F0030308D0A3 -:107B7000C91A1FD3DB0748BF00F8012D28BF20F822 -:107B8000022D130030B414461546103928BF20E9E1 -:107B90003C00FAD8490728BF20E90C0048BF40F84C -:107BA000042D890028BF20F8022D48BF00F8012DC0 -:107BB00030BC7047C91818BF00F8012DCB0728BF8B -:107BC00000F8012D7047000000B500BF1300964675 -:107BD0009446103928BFA0E80C50FAD85FEA417CDF -:107BE00028BF0CC048BF40F8042BC90728BF20F8A5 -:107BF000022B48BF00F8012B00BD0000032010B588 -:107C0000FCF737FE0F2000F033F90024002814BFE2 -:107C1000012400F011F8204610BD064805E0054893 -:107C2000016841F0020101607047016841F0010103 -:107C300001607047042004E07047000038B5EFF39E -:107C4000108472B6284D6946281D00F04CFA69462A -:107C5000281D00F0A5FA38B184F31088BDF8001093 -:107C6000224AFFF7DBFE31BD0120287084F3108823 -:107C700031BD80B5FFF7C2FE0221009100231A48F2 -:107C800000F124014FF48052001D00F013F901BDF2 -:107C900000BFF8B514460026EFF3108510F1010F70 -:107CA0001ED001281CBF02284FF0FF3618D1BCB1EE -:107CB000264672B60C4F012392B2381D00F00EF921 -:107CC00000281CBF3978002908D000223A7085F3BB -:107CD0001088A1B2054AFFF7A1FE01E085F31088E4 -:107CE0003046F2BD00000000040000203D7C00088A -:107CF00010B55A4C002220606160A28104F114008A -:107D00005749FCF737FE574904F11400FCF745FECC -:107D100004F5397104F1140000F0CCFB04F11400F7 -:107D2000FCF74CFE0FF28103002204F11001002049 -:107D3000FEF74CFDBDE810400FF23D02002180200F -:107D4000FDF7A3BEF8B50C461546EFF31086434F7A -:107D5000014638682246FAF72DFEBD60FC8172B6F6 -:107D6000387B20B101218020FDF79CFE01E001203D -:107D7000787386F31088F1BD10B5384CE28921681C -:107D800004F1140000F09DFB04F1140000F0ADFBC1 -:107D900028B1BDE8104001218020FDF783BEA06816 -:107DA000BDE810400047000038B5EFF3108472B60C -:107DB0002A4D01202873687B18B101218020FDF72E -:107DC00071FE84F31088287CBDE83240FEF724BDA4 -:107DD00010B5224C616804F1140000F07DFB04F141 -:107DE000140000F098FB207C4AF21701FEF76EFDAC -:107DF000002010BD0020704710B520281A4A02D07C -:107E0000212812D01FE008784B788C7840EA0320B4 -:107E1000CB7840EA044040EA0360106008791071B2 -:107E200048795071887990710DE010680870030AE4 -:107E30004B70030C000EC8708B701079087150796C -:107E4000487190798871002010BD80B5C046C04649 -:107E5000064800F060FB002002BD0000B4110020C5 -:107E60007C11002078100020AC140020C8110020E4 -:107E700070B50F4E044630780025A8B100F0A3FB82 -:107E800032784FF47A71B1FBF2F1B0FBF1F0FCF70C -:107E900035FD48B9102C07D2002221464FF0FF30A3 -:107EA000FCF7F4FCB46000E00125284670BD00BF7B -:107EB0005010002010B5029C016042600021C1609A -:107EC0000161416181610381A107047704D50089C3 -:107ED00010B14FF0FF3010BD002010BD2DE9F04F64 -:107EE000064685B030890C460027BB4600287169DC -:107EF000DC460CBF4FF00208D84681B168B9306942 -:107F00007768451CBD4228BFED1B3768385C7D5D36 -:107F100000EB0527BF1CBFB203E0074600E000B13D -:107F200002463069F568A84223BF7568281AC01B4D -:107F30000020154608EB050903FB09FE864532BF04 -:107F40000020B0FBF9FA09FB1A00C0B2804509DA3B -:107F500096F81C905FEAC97A48BF84465FEA897048 -:107F600048BFC446100000F0B4807068714461449A -:107F70008842C0F0AE8008EB020080B20390D94680 -:107F8000100AADF802000294ADF80020049359E005 -:107F9000800740D53089002840F09B803268D01897 -:107FA000A34600F8024C200A32681A4402F8010C79 -:107FB000224630681844FAF7FDFC70692018706199 -:107FC000B069019C401CB061200A31680C703168B6 -:107FD00048701CE08CB3307FC207D9D5308940B9D6 -:107FE00031681944FF2001F8020C3168194401F886 -:107FF000010C4FF0000B7069241874612C46308915 -:10800000002340B931680C70210A306841700223A6 -:108010007069801C706108EB04070021BFB23161F8 -:108020005CB1DA44029800EB0A0130682246184439 -:10803000FAF7C0FC70692418746109F10109B0698C -:10804000401CB061049A70683169914545D2791835 -:1080500081422CBF081A0846306103463089A0B916 -:108060003068BDF80010C1545B1C706831688342F1 -:1080700028BF1B1ABDF80200C8545B1C70688342FD -:1080800028BF1B1A7069801C706105FB09FA7468AF -:10809000BDF80000E41A844288BF0446029800EB51 -:1080A0000A01281BAC42019003D093D2307F0028F4 -:1080B00090D137682246F818FAF77CFC70692018CE -:1080C0007061A346019C039F0023A9E730684044E8 -:1080D00000E0002005B0BDE8F08F88448045F5D36E -:1080E000A8EB0008F2E778B5028900230B80002A8C -:1080F00044690CBF02250025002C4FD0028952B9DB -:10810000C2684668531CB34228BF9B1B0668B25C1A -:10811000F35C02EB03220A80027F02F00302012AD1 -:1081200025D10B884FF6FF72934204BF0289002AC3 -:1081300009D0C36802699A4219D20289BAB1466865 -:10814000F31A934213D24368C268E41A1419002246 -:10815000C260446102894AB902681478012B94BF55 -:10816000C3F101030123D25C04EB02220A80C4683C -:10817000426806682B19934228BF9B1A33440E8825 -:108180004169891B491B416105D034192D1995425C -:1081900028BFAD1AC5608169491E8161184672BD4C -:1081A000F8B5028900230B80002A42690CBF022423 -:1081B0000024002A3BD0C56802892B464AB946688C -:1081C0006A1CB24228BF921B0668775DB25C07EB5F -:1081D00002220A80067F06F00306012E20D10F88B6 -:1081E0004FF6FF72974204BF0289002A07D1426806 -:1081F0000023012A94BFC2F1010201220AE00269B0 -:10820000AA420DD202895AB14668751B954207D21F -:10821000002304E005682E78AA5C06EB02220A809F -:1082200041680068E4188C4228BF641A0319184694 -:10823000F2BD0000F8B505464FF40770F8F710FEE0 -:10824000040005F52F7602D130600220F2BD3460C3 -:1082500005F14C07287C40B94FF4007300F032F868 -:10826000012028874FF4007305E0402300F02AF82E -:10827000012028874023022201212846FBF746FDE2 -:108280000120A5F87801082310207880032282219C -:108290002846FBF73BFD012038807068016888475D -:1082A00004F5017100220A614A61287C0A680028ED -:1082B0000CBF4FF40073402301212846FBF763FDF8 -:1082C0000020F2BD022281212846FBF71FBD38B5F0 -:1082D00004468121FBF724FD04F1380500202880A5 -:1082E00001212046FBF71CFD0020A4F87801822123 -:1082F0002046FBF715FD0020A882E88204F52F74C4 -:10830000206838B1616848688047206800F074F9D7 -:1083100000202060002032BDF8B5054605F5277322 -:1083200000201C6A8DF800000E46ADF80200002700 -:108330000CB90320F2BD317811F0600024D0202860 -:108340003ED1F2887078D2B109060DD55B6AD3F8B8 -:1083500008C02146E047F288082A28BF07222146A4 -:108360002846FCF799FE30E004F500710870F088AB -:1083700048702146F2882846FCF79EFE25E05B6A9D -:108380009C683146A04720E0707830B101281CD0AD -:108390000A2809D00B2810D012E0187803280FD132 -:1083A00002220DF1020104E01878032808D101220D -:1083B00069462846FCF770FE07E01878032804D0C9 -:1083C00031462846FCF739FE03273846F2BDF8B59A -:1083D000044604F52F739E681D680DB90320F2BD95 -:1083E0000F46142010FB07F004EB000CDCF818001B -:1083F00080B128225743F219926BB0FBF2F602FBD0 -:10840000160038B9CCF81800002300222046FBF7EC -:10841000B3FC0BE005F502700022C2605A681369D4 -:1084200023B10A46006805F5047198470020F2BDA3 -:1084300070B500F52F752C680CB9032070BD04F5DC -:108440000176FBF7A7FCB06004F503716A68306839 -:10845000D3689847002070BD1CB500F52F700168E7 -:1084600009B9032016BD4368002B1EBF01F5007437 -:108470002078FF2804D062789B689847FF202070FE -:10848000002016BD4321018006487047432101802A -:108490000548704743210180044870470A21018044 -:1084A00003487047F4100020B0100020381100205D -:1084B0006C10002009B903207047C0F8C0120020DA -:1084C0007047D0F8BC0208B90320704700F502706D -:1084D0000160826000207047D0F8BC0208B9032018 -:1084E0007047C0F804120020704710B5D0F8BC12D5 -:1084F000012209B9032010BD01F50274E16841B9F8 -:10850000E260A168C162A36822688121FBF734FCA4 -:108510000022104610BD80B5D0F8BC1209B9032066 -:1085200002BDD1F80422017C00290CBF4FF4007376 -:1085300040230121FBF727FC002002BD4FF0B04093 -:10854000006800F0F000B02888BFB020704738B550 -:108550004FF0B044244DA16811F00C0106D1FFF793 -:10856000EDFFC0F3031055F8200032BD04291F4A67 -:1085700005D008291E4804D12168C90222D5104619 -:1085800032BDE16801F00301022904D0032904D1BE -:108590002168C90207D5104605E0FFF7CFFFC0F3F9 -:1085A000031055F82000E168E268E368C1F3062192 -:1085B0004843C2F30211491C5B0FB0FBF1F05B1C96 -:1085C000B0FBF3F032BD80B5FFF7C1FF0549FFE70F -:1085D000084A0968C1F3031152F82110B0FBF1F009 -:1085E00002BD0000080000584C8E00080024F40072 -:1085F0000048E8010C8E0008F8F78DBDDFF8641321 -:108600000A68030903F47F2300019A4300F47F20E2 -:1086100000F082B9DFF84C231368010C23EA014310 -:1086200043EA0043136070472DE9F84305460024F0 -:108630002878DFF830634106A0464FF0B0472DD5CB -:10864000286B70B1B0F5800F06D0B0F5000F18BFE1 -:10865000B0F5400F17D01FE0F86840F48030F860A4 -:10866000EDE0386820F08060386000F081F98146E4 -:108670003868000140F1D08000F07AF9A0EB0900E1 -:108680000228F5D90324D7E000F072F9A0EB090025 -:10869000022840F2C980F5E70124A04628680105B8 -:1086A00031D5B06800F44078286C80452AD000F0BD -:1086B00065F9B8F1000FB16805D1286C21F440715B -:1086C0000143B1601EE0B06840F48030B06021F436 -:1086D0004071B06820F48030B060286C0143B16014 -:1086E000B068C0070ED500F043F9804641F28939E1 -:1086F000B068800706D400F03BF9A0EB08004845BD -:10870000F6D30324A0462878C10705D53168A869A7 -:10871000890840EA810131602878810705D53168F0 -:10872000E86921F44061014331602878C10644BF03 -:10873000A86AFFF76FFF2878810644BFE86AFFF751 -:1087400069FF2878410744BF286AFFF757FF287858 -:10875000010744BF686AFFF751FF2868C1051BD5B0 -:108760003168686B21F0406101433160686BB0F1A2 -:10877000006F00F0BDF8686BB0F1806F75D100F04C -:10878000BDF804463868000160D500F0F1F8001B20 -:108790000228F7D94FF0030867E000F0E9F8001B62 -:1087A00002285BD9F6E7316821F04041316020F0C2 -:1087B0008050326822F0406210433060A86BB0F104 -:1087C000C05F00F095F8286841056DD53168E86B09 -:1087D00021F0405101433160E86BB0F1005F03D1FB -:1087E000F96841F48031F960E86BB0F1805F5BD1EA -:1087F00000F084F804463868000146D500F0B8F867 -:10880000001B0228F7D94FF003084DE000F0B0F844 -:10881000001B022841D9F6E700F061F8A86821F4AE -:10882000781100F071F88146386800017FF52CAFAF -:108830003969686901433961002C7FF42EAF3168D2 -:10884000286B21F440010143316027E700F047F82D -:10885000E86821F0606100F057F8044638680001CC -:108860009BD5396968690143396128688105AAD5B2 -:10887000A86BB0F1804F1CBFB0F1004F002892D11F -:10888000316821F04041084397E700F028F8286953 -:1088900021F0604100F038F8044638680001B5D591 -:1088A00039696869014339612868C10405D5F168EF -:1088B000686C21F440410143F160286881040BD5C4 -:1088C000796AE86C21F0300101437962796AA86C19 -:1088D000890840EA810179624046BDE8F28338693F -:1088E000696820F4FE4040EA012038613969704728 -:1088F00003D1F96841F08071F9607047396821F05F -:108900008061396000F034B801433961386840F063 -:108910008060386000F02CB810430860704710B5D4 -:1089200011490A6842F080720A600B680F4A23F00E -:1089300080730B60046841680C4381680C43C16814 -:108940000C43016944EA014454601368406923F40C -:108950007C5343EA00231360116841F06001116009 -:1089600010BD00008800005838000058006000402A -:1089700001484068704700BF50100020024801685D -:1089800041F48071016070470004005818B55B49DC -:108990009BB04FF400400860FFF730F9584CE06B93 -:1089A00040010ED5E06BC0000BD4FFF7E7FFFFF7E7 -:1089B000E5FFA06B40F48030A063A06B20F4803012 -:1089C000A06300F055F807A85021FEF79DFD68460A -:1089D0001821FEF799FD4B480168216C41F0010117 -:1089E0002164206C8007FCD54FF480700790002133 -:1089F000149107A8FFF718FE206840F080702060EF -:108A00004FF00052216801F0807106910021069814 -:108A100000914BF67F3003902221049100200290B8 -:108A20002021019205916846FFF779FFFFF7A6FF25 -:108A3000FFF7A4FFA06B40F00100A063A06B8007CC -:108A4000FCD50022E06B20F4404040F48040E0631D -:108A50002D4801680260026902F05002026100F0D4 -:108A600028F8FEF71FFC4FF0FF30FCF7A9FFFAE7EC -:108A7000264881B0016841F4801101603F210068FF -:108A800000F4801000900098214841604161016825 -:108A900041F47C110160026942F47C1202610168B8 -:108AA00041F03F010160026942F03F02026101B002 -:108AB000704710B5FFF762FFFFF760FF1548164CCF -:108AC000016821F4407141F4807101600F21026856 -:108AD00042F4004202601148816047F6FF71C160B4 -:108AE000046000F01DF8CA206062FF21532060621C -:108AF000A068C008C000A060616210BD10400058AE -:108B0000580000589414005880080058500000582D -:108B1000040C0058900000580028004090220020CB -:108B200038B5040044D094F8210028B9002184F815 -:108B300020102046C046C04600F049F8FF2510B17D -:108B400000F03FF834E02168DFF8B0008A680240A6 -:108B50008A6021688A68636820690343A0690343C7 -:108B60001A438A602168E068086120680169A26888 -:108B700041EA024101612068C16821F08001C160C1 -:108B80002068C16C89088900C1642168CA6CE369E6 -:108B9000606903431A43CA6420688168880609D45F -:108BA00000F020F830B120684562042100F01FF881 -:108BB000012032BD20684562012184F82110002087 -:108BC00032BD20684562042184F8211070470220DC -:108BD00084F82100CA20216848625320226850622C -:108BE000204626E020460BE02068C0F8248084F868 -:108BF0002110002084F8200070470000BFFF8FFF85 -:108C000070B5044640F2E9362068C16821F0A00141 -:108C1000C160FFF7ADFE05462068C168880606D42E -:108C2000FFF7A6FE401BB042F6D3032070BD002024 -:108C300070BD70B504462068C1684A0612D44FF072 -:108C4000FF32C26040F2E936FFF792FE0546206827 -:108C5000C168480606D4FFF78BFE401BB042F6D32E -:108C6000032070BD002070BD122008800FF200109C -:108C70007047042008800FF20C10704710B500F008 -:108C800029F80FF2980004E010B500F023F80FF275 -:108C9000B0002146FCF7DCF9204610BD38B51A209B -:108CA00008800E494C68086889680D4D081809D07D -:108CB0000822A91C00F01EF8042205F1120120462A -:108CC00000F018F8284632BD10B500F003F80FF296 -:108CD0008400DEE70A46034C70470000107AFF1F4D -:108CE00098110020B01E002010B5FFF7F3FF0FF21F -:108CF0007000CEE730B5002393420DDA040F0A2C42 -:108D00002CBF3734303401F8134001EB4305002405 -:108D100000016C705B1CEFE730BD000053544D3315 -:108D200032205669727475616C20436F6D506F729A -:108D30007420696E204653204D6F6465000000006A -:108D400053544D6963726F656C656374726F6E69BD -:108D50006373000056435020436F6E6669670000DE -:108D600056435020496E7465726661636500000069 -:108D70001201000202020040830440570002010277 -:108D8000030100000403090480B51C48016841F494 -:108D9000700101600020FDF7FFFF48B1807918499C -:108DA000184A0A600A6822F47C5242EA00220A60E9 -:108DB0004FF0B040016841F48031016012490A6807 -:108DC000D208D20042F001020A600A6802F00702EB -:108DD000012AFAD101688903FCD5816889088900D4 -:108DE00041F002018160816801F00C010829FAD18B -:108DF000016849084900016001BD000088ED00E0FC -:108E00009C000058FECAFECA004000580100000045 -:108E10000300000005000000010000000100000048 -:108E2000060000000A000000200000000200000010 -:108E300004000000080000001000000040000000D6 -:108E4000800000000001000000020000A086010078 -:108E5000400D0300801A060000350C0040420F0050 -:108E600080841E0000093D0000127A000024F400F6 -:108E700000366E010048E801006CDC0200000000D2 -:108E80000000000000000000000000002DE9F0419B -:108E900007468846387810F0030F16461D4633D033 -:108EA000384600F099F878BBB8F1000F1CBFD8E93C -:108EB00000018619012D2ED13888C10415D5396AD3 -:108EC00007F14402384600F0A3F83A6B044602B9B1 -:108ED0003A69F968384600F09BF8361B341A7A690B -:108EE000F968384600F094F8261A1EB94DB916F103 -:108EF000010F09D097F903002A46314600F08EF899 -:108F0000064616F1010F09D12320AFF300804FF080 -:108F1000FF30BDE8F081022DE8D1EBE7388810F48E -:108F2000405F0ED07868F86038617861B861786821 -:108F3000F86107F14400386207F1300078620020E0 -:108F40003863B8F1000F05D0D8E9020107F1340207 -:108F5000C2E9000139884CF6FF60014039800020E9 -:108F6000BDE8F08170B50546AFF300802888810424 -:108F700015D56E680024EA6895F9030031469142E0 -:108F800012D2521AFEF784FE10F1010F1CBF002806 -:108F90003618F0D10FE04DF6FF70014029802846C9 -:108FA000AFF30080002070BD00220021FEF770FEAC -:108FB00010F1010F00D101246868E860A861E86140 -:108FC000002C2988E7D041F4007129802846AFF3AE -:108FD00000804FF0FF3070BDF8B5A0B9AFF300804E -:108FE00000250A4E08244FF0FF37306820B1FFF704 -:108FF000B9FF002848BF3D46361D641EF5D1AFF3CA -:1090000000802846F2BDBDE8F240ABE78C15002099 -:10901000914234BF511A0021084670473EB5040002 -:109020000D00012A02D100F063F807E0022A07D1FF -:1090300000940020019069460C20ABBE2D1801E081 -:10904000002A0CD10094019569460A20ABBE002885 -:1090500005D100222100280000F027F801E00020BF -:10906000C04303B030BD000010B4314A00211346A4 -:109070001C6884421EBF491C9C6884421EBF491C58 -:109080001C69844209D09C69491C844205D0491C52 -:1090900020331029ECD310BC7047002342F8313044 -:1090A00002EBC1014B6010BC704778B4204C002328 -:1090B00025462E688E421EBF5B1CAE688E421EBFC8 -:1090C0005B1C2E698E4209D0AE695B1C8E4205D0B6 -:1090D0005B1C2035102BECD372BC7047054604EBAB -:1090E000C303012A04BF59684D195D6072BC704703 -:1090F00010B40F4A002113461C6884421EBF491C4D -:109100009C6884421EBF491C1C6984420AD09C6929 -:10911000491C844206D0491C20331029ECD310BCD2 -:109120000020704702EBC100406810BC704700008F -:109130004421002010B50446E068A169884251D35B -:10914000218849F202030B40022B08D008044CBFCF -:109150004FF400704FF48440014321803BE001F460 -:10916000C042B2F5C04F06D1A168884203D3204661 -:10917000FFF732FF78BB208810F4406F02BF6068B1 -:1091800004F14401884217D14FF40070F7F768FEEC -:10919000606030B904F144006060E060401CA06091 -:1091A0000AE0218841F040012180E060606100F523 -:1091B00000726068A260E06160682061A068A061E0 -:1091C000207841070AD502220021204600F00CF841 -:1091D00010F1010F02D14FF0FF3010BD208840F494 -:1091E000C0402080002010BD70B504460D461646D4 -:1091F000AFF3008033462A4600212046FFF746FEA3 -:1092000005462046AFF30080284670BD38B50400FF -:109210000ED0207810F0030F03D094F9030000283B -:1092200009D5AFF30080204600F030F8AFF300809E -:109230004FF0FF3032BD2046FFF7CEFE0546AFF3BC -:1092400000802078410644BF6068FFF7D5F9002010 -:10925000606094F90300022804D900F055F808B1C1 -:109260004FF0FF35E06B48B100F05AF808B14FF00D -:10927000FF35E06BFFF7C0F90020E063204600F007 -:1092800005F8AFF30080284632BD000001780A06D9 -:1092900026D51C4A13680021834203D1002342F8DB -:1092A00021301BE05368012183421EBF02219368D5 -:1092B0008342F3D0D368032183421EBF0421136984 -:1092C0008342EBD05369052183421EBF0621936977 -:1092D00083421EBF0721D3698342DFD0FFF78CB9D9 -:1092E000002101804FF0FF31C17000F14401416065 -:1092F000C160016141618161C161016200F13001C0 -:10930000416270478C1500201CB50200009269462E -:109310000220ABBE04001000FFF7A6FE200016BD21 -:10932000E0B50090F9F714F9019069460E20ABBE44 -:1093300003B000BD38B50C46C5B22046AFF300807F -:10934000E068A169884204D32046FFF7F3FE0028B5 -:109350000FD4E068401CE06000F8015D2088010542 -:1093600003D440050BD50A2D09D12046FFF734FE62 -:1093700028B12046AFF300804FF0FF3032BD2046C9 -:10938000AFF30080284632BD19E050F8042BD30714 -:1093900044BFA9F101039A18091F0023042942F8C8 -:1093A000043BF9D25FEA817C134604D54FF0000CF0 -:1093B000A2F800C09B1CC90744BF0021197050F8D7 -:1093C000041B0029E1D1704738B50D4D08242868E9 -:1093D00000281CBF017811F0030F05D090F903108D -:1093E000002958BFFFF712FF2D1D641EEFD1BDE805 -:1093F0003840002200214FF0FF30FEF749BC00BF8B -:109400008C1500207047FEE770477047704700F0EA -:1094100011B84FF48060FEF73FB900E000BF01488B -:10942000F9F729BFE4190020FDF703B9FEF788B961 -:10943000FEF75CB9024841680278891841607047BC -:109440005010002010B5074979441831064C7C446F -:10945000163404E00A68081D114488470146A142F9 -:10946000F8D110BD2C000000600000004EF68851BD -:10947000CEF20001086840F470000860BFF34F8F1F -:10948000BFF36F8F4FF00070E1EE100A70470000DD -:10949000F9FEFFFFD00D0000E41500207008000069 -:1094A00030000320000000006F81FFFF84010000F6 -:1094B000EC020000040000205F81FFFFEA020000D0 -:1094C00006000000280003200120C046002801D02B -:1094D000FFF7B8FFAFF300800020AFF30080FFF785 -:1094E00055FA00F000F800F001B800000746FFF759 -:1094F0006BFF3846F8F7E2F8FBE738B504460D464F -:10950000284600F005F8A84218BF0024204632BDC6 -:109510000149FFF70FBF00BFFC140020014880473E -:1095200001480047898D00082D950008AFF30080A1 -:10953000FFF79CFFFFF7C8FF00002E00FFF7FEBFFC -:10954000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4F -:10955000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3F -:10956000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF2F -:10957000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF1F -:10958000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF0F -:10959000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFFF -:1095A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFEF -:1095B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFDF -:1095C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFCF -:1095D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFBF -:1095E000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAF -:1095F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9F -:10960000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF8E -:10961000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF7E -:10962000FFF7FEBFFFF7FEBFFFF7FEBF002070474A -:10963000F3FF010001F1FF01F1FF01F1FF01F1FF73 -:1096400001F1FF01F1FF01F1FF01F1FF01F1FF0164 -:10965000F1FF01F1FF01F1FF01F1FF01F1FF01F164 -:10966000350152FF01AD3F106D4C10421008500102 -:1096700048000404110C10020A06000208224024CB -:10968000100335820008CF042002198300082B1331 -:10969000598410110C433184106101128D10128510 -:1096A00004129504129D04100909024300020100EE -:1096B000C03209046D12020B101E052400100105B2 -:1096C000240100010424020205240600010705828A -:1096D0000308001009040100020A4E1002070501E8 -:1096E000027B200107058107F2280044224007225F -:1096F0008107200100090744F22C04441003698CFF -:1097000000087304128904127D04129D0412C90416 -:1097100012E904F001FF1A030001F1FF01F1CC018D -:109720001003D17D0008F50412F9041C044B7E00DF -:10973000082D9618042EC23A041E08610310050075 -:1097400000F8140020F90452F804430000146108E2 -:1097500052E40CF10B011007020401011422002055 -:10976000640452140421346108F0041240150020EE -:109770002C15484003080202C4214021082104217D -:10978000346108128844F212744812B4B412FC0412 -:10979000F206442CF0020738950008046D8C05F29F -:0997A000003A140300005200011C -:040000050800952D2D +:101600009560A860EA600020A861DEE7E030002075 +:10161000012000F017B870470749086808B100209A +:1016200070470648C008C00008600549C908C900DD +:10163000091A0160704700BFD03900200F10002048 +:101640000814002080B5AFF30080024A1100182072 +:10165000ABBEFBE7260002002DE9F0439FB00FF27E +:101660009C16269CDFF8E48A02918DF83B4000210D +:101670000B914FF0FF37044691461D460AE019F8DA +:10168000011B0298A0470028029000F0A4800B984C +:10169000401C0B9099F8000050B12528EFD1002094 +:1016A0000021059006910790089109900A9103E0A6 +:1016B0000B98A7E041F0010119F8010F2028F9D09B +:1016C00023280CD02B2804D02D2805D0302809D071 +:1016D00083E041F00201EFE741F00401ECE741F063 +:1016E0000801E9E741F01001E6E700200D900AE06B +:1016F0000D98404505DA00EB800302EB4302303AD7 +:101700000D9209F1010999F80020A2F130000A2890 +:10171000EED399F800002E2818BF0C9726D119F89F +:10172000010F2A2808D12868286009F1010950F81A +:10173000042B28600C9219E02D280CBF19F8010B1E +:10174000002000220C920BE040B90C9A424505DAC9 +:1017500002EB820203EB4203303B0C9309F10109D7 +:1017600099F80030A3F130020A2AEDD3ADF8381011 +:10177000304699F8001000F081FE08B119F8010B0D +:101780008DF83A009DF83A00682804BF99F80010D7 +:10179000682903D162208DF83A0008E06C2804BF64 +:1017A00099F800006C2804D171218DF83A1009F1E4 +:1017B000010910A804902A4619F8013B6946204601 +:1017C00000F060F838B910AA6946204600F08CF99C +:1017D00000287FF55FAF384614E02A2885D12A68B3 +:1017E0002A6052F8040B2A6000280D9003D540426D +:1017F0000D9041F0040109F101098AE7686A6C74EF +:101800007A4C00001FB0BDE8F083622820D0682821 +:1018100011D06A2803D06C2827D0712825D10868F8 +:10182000C01D20F007000860D0E9002308300860E0 +:10183000194610467047002A0A680A60106803D0EB +:10184000121D0A6000B217E0121D0A6080B217E094 +:10185000002A0A680A60106803D0121D0A6040B2AC +:101860000AE0121D0A60C0B20AE0002A0A680A6093 +:10187000106803D0121D0A60C1177047121D0A605C +:101880000021704770B51C460D46B4F125002E6945 +:10189000114600F017811C386AD0001F022867D952 +:1018A000133843D0093863D0801E16D0401E1ED096 +:1018B000401E02285CD9001F19D0401F00F0838011 +:1018C000401E33D0401E00F0CD80C01E00F0D880F6 +:1018D000801E2BD0C01E29D0FAE06869421C6A61C4 +:1018E0000A680A6052F8043B0A603354FAE095F83B +:1018F0003A000122FFF789FFC5E900010023994260 +:1019000004DA6869411C69612D210DE0288F810787 +:1019100004D56869411C69612B2105E0C00722D507 +:101920006869411C6961202131541CE095F83A0036 +:101930000022FFF76AFFC5E9000195F838000107AA +:1019400011D5D5E900230020834208BF82420AD086 +:1019500044F02000782806D1686930213154401CB9 +:10196000411C69613454214668693044E86083E071 +:101970000868C01D20F007000860D0E90023083087 +:101980000860C5E90023D5E90001C80F04D06869E3 +:10199000411C69612D210DE0288F810704D56869FC +:1019A000411C69612B2105E0C00704D56869411C11 +:1019B00069612021315468693044E8602146284635 +:1019C00000F0C4F98EE005F13A02507820B14FF0F2 +:1019D000FF340FF648205EE01078622808D06828AF +:1019E00024D06A2812D06C282ED071280ED02BE07B +:1019F0000A680A6052F8040B0A6020B94FF0FF34FD +:101A00000FF6302047E0E96A01706BE00A680A606F +:101A100052F8040B0A6020B94FF0FF340FF614207F +:101A200039E0EA6AD317C0E900235BE00A680A607C +:101A300052F8040B0A6020B94FF0FF340FF6F4108F +:101A400029E0E96A01804DE00A680A6052F8040B57 +:101A50000A6020B94FF0FF340FF6D8101BE0E96A96 +:101A600001603FE00A680A6052F8040B0A60002136 +:101A7000C5E90001EE607821284600F0BBF831E0AE +:101A80000868086050F8044B0860EC603CB94FF0FF +:101A9000FF340FF6B81000F0FDFC201A70BD2E6B5D +:101AA000002E04D5204600F017FD044608E032461B +:101AB0000021204600F02CFD002814BF041B3446F2 +:101AC000AC610FE06869411C69612521315409E06E +:101AD0006969481C686125227254210002D0411CAA +:101AE00069613454002070BD2DE9FC410F46064663 +:101AF000796B7869BC6A091A386A091AB869091ACF +:101B0000786A091AF869091A97F838000C1B410716 +:101B100090460FD42021002C8DF800100ADD2546B8 +:101B200001236A463946304600F060FC00285DD14A +:101B30006D1EF5D17B6942463946304600F056FCB1 +:101B4000002853D130208DF800003D6A002D09DDBA +:101B500001236A463946304600F048FC002845D14A +:101B60006D1EF5D1BB69FA683946304600F03EFC7F +:101B700000283BD130208DF800007D6A002D08DD63 +:101B800001236A463946304600F030FC70BB6D1EBA +:101B9000F6D1F868B969FB6942183946304600F059 +:101BA00025FC18BB30208DF80000BD6A002D08DD33 +:101BB00001236A463946304600F018FCB0B96D1E64 +:101BC000F6D197F8380041070DD52021002C8DF86B +:101BD000001008DD01236A463946304600F006FC55 +:101BE00020B9641EF6D10020BDE8F6814FF0FF3029 +:101BF000BDE8F6812DE9FC4707468A463E69BAF101 +:101C00006F0F08BF082405D04AF02001782914BFBF +:101C10000A2410243C25D7E90023BAF1640F18BF29 +:101C2000BAF1690F9046994606D100218B4203DA3A +:101C3000D8F1000869EB49090020814508BF8045BB +:101C40001FD1386BE8B9082C4CD197F83800010740 +:101C500048D530203B2586F83B0043E000280ED5D0 +:101C600097F8380000F01400102808D17A6B7869D2 +:101C7000121A386A121A511A0029C8BF3962BDE80F +:101C8000F3878DF800A0404649462246E31700F04E +:101C90006BFC3032D0B26D1E3A28019504DB9DF802 +:101CA0000000A0F151018A1872554046494622466B +:101CB000E31700F059FC804689460020814508BFA3 +:101CC000804503D0F86871198842DCD3082C09D10B +:101CD00097F83800010705D5715D302902D06D1ED7 +:101CE00030207055C5F13C01B9617019F860386B4E +:101CF0008142B3DA411A39624FF6EF70398F0140F1 +:101D00003987BDE8F3872DE9D04306460F461446D0 +:101D10004FF00008DFF8389412E0E00707D542469C +:101D20004B463046394600F037FD06460F464046E2 +:101D3000494642464B4600F02FFD641080468946D6 +:101D4000002CEAD130463946BDE8D0832DE9F34F67 +:101D5000054641F020048DB0D5E90089612C02AE22 +:101D600009D0286B002848BF062003D408BF672C81 +:101D700001D101202863D5E9002358004015401CFB +:101D80000ED119030CD00320A8619DF838006138EA +:101D90001A2802D20FF2D06111E00FF2D0610EE0EA +:101DA00058004015401C0FD119030DD10320A86124 +:101DB0009DF8380061381A2814D30FF2B861E8682A +:101DC000032200F0BBFDD3E1194621F00043B3F537 +:101DD000801F10460DD20027BB4208BFBA420197B0 +:101DE00003D111E00FF28861E9E701AA00F0FAFDE2 +:101DF0000AE0DFF8607307EB1352DFF85C330192FF +:101E00001940DFF858331943C5E90001612C0ED1A0 +:101E1000E86830210170811CE9609DF83810612963 +:101E20000CBF7821582141706869801C6861D5E930 +:101E300000AB2BF0004300202AF00002834204BFD5 +:101E40008242002300F05A81612C40F0A980286B67 +:101E500000284CBF2120401C00904046009F7F1C62 +:101E600049460022002300F0F5FDD94601988DF87F +:101E7000082038BF89F00049001F0190002FD0468C +:101E80000DF1090040F3498140F2FF71DFF8D0B253 +:101E90000C910646404649460022002300F0F2FD20 +:101EA00080F03A814800400D00F11C0210D0002A59 +:101EB0000EDD0C98824205DB09F0004040EA0B0180 +:101EC000002013E0A448084040EA025140460DE0DB +:101ED00029F00043002028F00002834208BF82421C +:101EE0000FBF40461C22404600F0E4FD8046894674 +:101EF00000F07EFEFF1F002F044609DD00F096FE75 +:101F000002460B464046494600F0A2FE80468946FE +:101F1000F01D072104E004F00F0200F8012D241148 +:101F2000002C01DD491EF6D5491E5CBF002200F8D9 +:101F3000012DF9D5ECE00020194602AA0A4400E080 +:101F40005B1E12F80149491E8442F9D00F2804D1C2 +:101F50000DF10900425C521C4254002904D501983D +:101F6000001D02AE5B1C0190591E12D49DF8380072 +:101F70007218147804F130085FFA88F4392CC4BF61 +:101F8000A0F13A04A044491E02F80189F1D58DF868 +:101F90003800286B002840F1B080591E2963ACE05E +:101FA000404649460022002300F054FD019938BF05 +:101FB00089F0004947F2975041436A4A91FBF2F297 +:101FC0000192D2F1070204DD40464946FFF79BFE2D +:101FD0000AE0524200206449FFF795FE02460B4694 +:101FE0004046494600F0A6FE8046662C286BDFF886 +:101FF0007CB106BF019F0A3706273F18142FC8BFC0 +:10200000142730208DF8080089460DF1090000E002 +:102010003046002F34DD06464046494600F0AEFF0C +:1020200001460A4606F1080304200A26B2FBF6F62A +:1020300006EB860EA2EB4E02303203F8012C0A2288 +:10204000B6FBF2F202EB820EA6EB4E063036401ED5 +:1020500003F8026DE9D1083F002F03F10806D7DD30 +:10206000084600F09FFF02460B464046494600F0F6 +:10207000EFFD00225B4600F08FFB80468946CBE7F0 +:102080000DF10901401A0DF1090604E00199491EFC +:10209000401E0191761C31783029F7D0662C02D190 +:1020A0000199491C03E0652C0CBF012100212B6B19 +:1020B000CB189842B8BF431E002B1ED4834204DACB +:1020C000F05C3528A8BF392000DA30201946721E8E +:1020D00002EB010800E05B1E18F80199491E8145DA +:1020E000F9D0392802D1705C401C7054002904D505 +:1020F0000198401C16465B1C0190019800B20090AC +:102100001BB29DF838103246284600F034F82FE014 +:10211000C61D002F3FF7BEAE30460DF10901401A33 +:10212000009903468842C8BF0B46002B0DF10906F3 +:102130003FF52FAF8342BFF6FEAE0DF10900C05C44 +:1021400007287FF7F8AE0F20F6E60000CBCCCC0CCA +:102150000000244002FCFFFFFFFF0F800000E03F73 +:102160000000F07FA08601000000F03F84D7974177 +:102170000FB0BDE8F08F2DE9F84783B006468A46D8 +:102180001746984600F01CFFB8F1000F406A356B07 +:1021900090F8009003DC4FF001080FF2DC27BDF946 +:1021A00030404AF02000662808BF641C15D067281C +:1021B00040F0848014F1040FC0F28680AC4280F2BB +:1021C000838096F83800641C010702D4A845B8BF84 +:1021D000454620B22D1A48BF00250FFA84FAF06850 +:1021E000B169BAF1000F25DC4A1C30234354002D9D +:1021F00003DC96F83800010703D5F06800F8029078 +:10220000521C15EB0A0FB8BF6C4220B24419414270 +:102210004445B8BFA046B26171620FFA88F5F56116 +:10222000F068B3692A463946184400F087FB641BFE +:10223000B462C4E022B29045084417DA42463946F7 +:1022400000F07CFBB0694044B061AAEB0801002DAE +:10225000716203DC96F838100A0705D5F16801F8B9 +:102260000090F069401CF061B562A8E0394600F0CA +:1022700065FBB069002D5044A8EB040803DC96F818 +:1022800038100A0703D5F16801F80090401CB061CE +:102290000FFA88F08542F068B369B8BFA8460FFA14 +:1022A00088F207EB0A01184400F048FBB0690FFA06 +:1022B00088F10844B061681A706280E0BAF1610F79 +:1022C00014D14FF0700A16E0A84504DA96F83810D9 +:1022D0000A0758BF45466D1E48BF0025BAF1670F73 +:1022E00014BF4FF0450A4FF0650A04E0BAF1410F00 +:1022F00008BF4FF0500AB169F368481CB061002D67 +:1023000017F8012B5A5403DC96F838100A071BD52E +:10231000F168431CB36101F80090002D14DDA8F1B1 +:1023200001080FFA88F08542F068B8BFA8460FFA96 +:1023300088F23946184400F001FBB0690FFA88F1C1 +:1023400008446D1AB0617562F068B1690844002CE8 +:1023500080F800A003D42B214170811C03E02D21C3 +:1023600041706442811C00206A460AE023460A2428 +:1023700093FBF4F404EB8405A3EB450302F8013B63 +:10238000401C24B2002CF1DC012806DC4AF02002BB +:10239000652A04BF302201F8012B48B9302001F82A +:1023A000010B07E0401E1DF80020303201F8012B20 +:1023B0000028F7DCF068B2691044091AF16196F858 +:1023C000380000F0140010280DD17169B06941186F +:1023D000706A4118F0694118B06A4118706B814207 +:1023E000BCBF411A316204B0BDE8F087F8B50546BC +:1023F0000E4617461C46002074B117F8011BB06842 +:10240000A847B06030B1F06A401CF0620020641E42 +:10241000F3D1F2BD4FF0FF30F2BD00007072696E73 +:1024200074665F733A20256E20646973616C6C6F0B +:10243000776564007072696E74663A206261642028 +:10244000256E20617267756D656E74007072696EBD +:1024500074665F733A20626164202573206172673D +:10246000756D656E740000006E616E004E414E0029 +:10247000696E6600494E4600300070470278C9B266 +:102480008A421AB11CBF10F8012FF9E718BF0020CB +:102490007047000080B508B90FF21C0005490B68B1 +:1024A0001BB122220021984701E0FFF7B1F822205A +:1024B00002BD0000D4390020636F6E7374726169CD +:1024C0006E742068616E646C65723A20626164208B +:1024D0006D6573736167650000F10103810704D0C6 +:1024E00010F8011B89B18107FAD10268B2F10131FC +:1024F000914311F0803F04BF50F8042FF6E710F825 +:10250000011B11B110F8011BFBE7C01A7047000056 +:10251000C9B2830706D0521E22D310F8013B99425C +:10252000F7D11FE0083A13D302F1040241EA012176 +:1025300041EA014150F8043B121F21BF4B40A3F177 +:10254000013C2CEA030C1CF0803FF3D0C9B2001F01 +:10255000083210F8013B521E28BF91EA030FF8D849 +:1025600018BF0120401E7047B3BBD9B1B2F5803F00 +:102570007DD2022A1ED98C46B1FBF2F102FB11C3B7 +:102580001B0443EA1043B3FBF2FC02FB1C3380B292 +:1025900040EA0343B3FBF2F002FB103240EA0C4086 +:1025A00000237047022A05D98446B0FBF2F002FBF3 +:1025B00010C270474AB105D100F0010249085FEA34 +:1025C0003000704700220023704700F0FFBC0B0072 +:1025D0000200002100207047904271EB030CF6D3FB +:1025E000B3F5803F2FD2F0B5B3FA83F7B1FA81F497 +:1025F000A7F10F0E3D1B5340CEF1200602FA0EF25A +:10260000F3415340B5F10F0746D80F3C2C444140ED +:10261000C4F12006A040F1414140B1FBF3F603FBB9 +:102620001611A2FB0645001BA94102D2761E801896 +:10263000594180EA010221FA0EF362FA0EF20021FA +:102640005A403046F0BD30B4B1FBF3FC03FB1C1123 +:10265000A2FB0C45001BA94103D2ACF1010C801870 +:10266000594130BC02460B46604600217047B2F12A +:10267000807F65D3F0B5B2FA82F7B1FA81F4C7F181 +:102680000F063D1B22FA06F307F1110EF241203529 +:102690005A40B5F10F07B8D94140C4F12006A04017 +:1026A000F1414140B1FBF3FC03FB1C11A2FB0C45C3 +:1026B000001BA94103D2BCF1010C801859410F2F16 +:1026C00012D30F3FC90341EA5041B1FBF3F603FBBC +:1026D0001611A2FB0645D4EBC030A94102D2761EEA +:1026E0008018594146EACC3C07B34140C7F1200667 +:1026F000B840F1414140B1FBF3F603FB1611A2FBD8 +:102700000645001BA94102D2761E8018594180EA75 +:10271000010221FA0EF3C7F1200462FA0EF20CFA5C +:1027200007F05A402CFA04F13043F0BD80EA010270 +:1027300021FA0EF3002162FA0EF260465A40F0BD13 +:102740008C46B1FBF2F102FB11C31B0243EA10639A +:10275000B3FBF2FC02FB1C331B024CEA002043EAF1 +:102760001063B3FBF2FC02FB1C331B024CEA00209B +:1027700043EA1063B3FBF2FC02FB1C331B024CEA7E +:10278000002043EA1063B3FBF2FC02FB1C324CEA6C +:102790000020002370470000B0B581EA030C0CF064 +:1027A000004C40F2FF7515EA11541DBF15EA13578E +:1027B000AC42AF4239E0E41923EA455343F48013B5 +:1027C000C90241F0004141EA505EC7021100A7FB77 +:1027D000020200284FF00000EEFB01204FF0000144 +:1027E000E3FB072118BF42F00102401800214941D4 +:1027F000E3FB0E01A4F580640F0302D252004041B6 +:10280000494154F101046CDD470872F1004250F176 +:10281000000051EB0451A1F580115CBF41EA0C01AD +:10282000B0BD4CEA05510020B0BD05EA1357AC42DB +:1028300014BFAF4241E050EA410E1CBF52EA430EC2 +:1028400002E061460020B0BD24423C441BD15FEA57 +:10285000070EF6D0090302BF01460020AEF1140EA8 +:10286000B1FA81F7AEEB070401FA07FE0C37C7F1A6 +:10287000200100FA07F7C8404EEA000E23EA45534C +:1028800043F48013A2E733F00043B3FA83F704BFA5 +:10289000B2FA82FE77440B3FE41BB7F1200E2FBF44 +:1028A00002FA0EF3BB40C7F1200E22FA0EFE38BF2B +:1028B00043EA0E03BA40641C82E750EA410E14BF9B +:1028C00052EA430E6FF000014FF4001717EB430F6D +:1028D0008ABF194617EB410FB5E74CEA05510020B6 +:1028E000B0BDD4F10104B4F120070FDAC4F1200720 +:1028F000520828BF42F0010210FA07F501FA07F763 +:10290000E1BF2A43E0403843E1400FE0352C98DC3A +:10291000C7F1200452EA400220FA07F218BF42F041 +:10292000010231FA07F0A1400A43002172F100428E +:1029300050F1000051EB0C01B0BD000062B38B07F9 +:1029400008D0521E11F8013B00F8013B00F0248032 +:102950008B07F6D1830740F0208000BF103A07D3E1 +:1029600030B4B1E83810103AA0E83810F9D230BCD1 +:10297000530724BFB1E80810A0E8081044BF51F87D +:10298000043B40F8043BD20724BF31F8022B20F867 +:10299000022B44BF0B7803707047121F17D35B00E4 +:1029A00009D151F8043B20F8023B1B0C121F20F800 +:1029B000023BF6D20BE051F8043B00F8013B1B0A46 +:1029C00020F8023B1B0C121F00F8013BF3D238BF6A +:1029D000121D521E24BF11F8013B00F8013BF8D82C +:1029E0007047000010B5144600F002F8226010BDD8 +:1029F000C1F30A5343B14A0012F5001F28D2A3F2D3 +:102A0000FE32A1EB0251704750EA410C20D001F098 +:102A1000004C31EA0C01B1FA81F204BFB0FA80F344 +:102A2000D2180B3AB2F120032CBF00FA03F1914007 +:102A300041EA0C013EBFC2F1200C20FA0CF319430D +:102A40009040524240F2FD33D21A01EB03517047DD +:102A5000002270474FF4001C1CEB410F94BF1CEB8D +:102A6000430F09E041EA030C50EA4C0C52EA0C0C0B +:102A700003D2994208BF9042704714BF8B428242F2 +:102A8000704700004FF4001C1CEB410F94BF1CEB7F +:102A9000430F09E041EA030C50EA4C0C52EA0C0CDB +:102AA00003D28B4208BF8242704714BF99429042C2 +:102AB00070470000124254D440F2FF7C1CEA1153CC +:102AC0000FD0634531D09B1863453CBF01EB0251E9 +:102AD000704701F0004141EA0C510020AFF3008043 +:102AE000704750EA410320D001F0004C91EA0C01FC +:102AF0001CD0B1FA81F30B3B9A420DD9D21A9940FE +:102B000051EA0C01C3F1200C20FA0CFC61449840FE +:102B1000531C40F2FF7CD7E7914041EA0C01C2F11F +:102B2000200C20FA0CF3194390407047B0FA80F360 +:102B30001533202BE0D3202AEED3203A203B9A42B3 +:102B400009D9D21A00FA03F141EA0C010020531C02 +:102B500040F2FF7CB8E700FA02F141EA0C010020E4 +:102B60007047524240F2FF7C1CEA11530DD063457E +:102B7000DBD0B2EB030C3CBFA1EB025170470CF170 +:102B8000010221EA035141F4801150EA410CCCD0FA +:102B900001F0004C352A27DC30B481EA0C01B2F197 +:102BA000200309DAC2F12003044601FA03F5D040FC +:102BB0002843D1409C400CE0C3F12002450020FA9C +:102BC00003F418BF44F0010421FA03F091400C43D0 +:102BD000002174F1004550F1000051EB0C0124423A +:102BE00030BC7FF47BAF70476146002076E7000081 +:102BF000C1F30A5340F2FE329B1A14DDD3F12003D5 +:102C00004FEAE17208DDC90241EA505141F000404B +:102C1000D84080185040704703F2E13010B1D243E1 +:102C200082F000407047002070470000C11768B173 +:102C30004840401AB0FA80F29040D21CC907C2F551 +:102C4000846241EA025202EBD02140057047000045 +:102C500070B44FF0004591EA030F40F1B9816B4029 +:102C6000841A71EB030603D2001BB14112197341A0 +:102C70004FF4001C1CEB410F34BF7CEB430442E0DB +:102C80000C0DA4EB1356352E4FDC45EAC323DB0AAB +:102C900045EAC121C912B6F120050DDD63FA05F63A +:102CA000EB4086EA0305124218BF45F00105C01843 +:102CB00051F100010CD213E062FA06F5F2405540E2 +:102CC000F3415A40B340F3405A408018594107D36A +:102CD00049085FEA30005FEA350528BF45F0010585 +:102CE00001F58011420875F1004250F1000041EBFE +:102CF00004514E0016F5001F70BC38BF704700200D +:102D0000090D090570471CEB410F10D252EA43062A +:102D10000BD0BCEB410F05D80C0DAB43661E342E17 +:102D2000B6DD02E0AB438018594170BC704770BCFF +:102D300070470000F0B540F2FF7581EA030C0CF01B +:102D4000004C15EA11541DBF15EA1357AC42AF42AF +:102D5000E5E0BC41C1F31301C3F31303801A9941A9 +:102D600043F4801304D2641E400049418018594145 +:102D7000C90241EA5051B1FBF3F603FB1611A2FB65 +:102D80000675D7EBC020A94102D2761E80185941A2 +:102D9000C90241EA5051B1FBF3FE03FB1E11A2FB35 +:102DA0000E75D7EBC020A94103D2AEF1010E8018F9 +:102DB0005941890241EA9051760546EA8E2EB1FBCF +:102DC000F3F603FB1611A2FB0675D7EB8020A94191 +:102DD00002D2761E80185941C90241EA50514EEA8A +:102DE000060EB1FBF3F603FB1611A2FB0675D7EB3B +:102DF000C020A94102D2761E80185941C90241EA79 +:102E00005051B1FBF3F703FB1711A2FB0735D3EBCE +:102E1000C020A94167F100070CBF004247F001073D +:102E200066F3D5274FEA1E31B80814F5806412DD29 +:102E3000BD0775F1004250EB0E5051EB045111F5F6 +:102E4000801F5CBF41EA0C01F0BD4CF07F6141F096 +:102E5000E0410020F0BDBD076D0840EA0E5041F48E +:102E60008011D4F10104B4F120060ADAC4F120067D +:102E70000200E04001FA06F3E1401843B240154376 +:102E80000EE0342C13DCC6F1200445EA40056D0841 +:102E900020FA06F2154321FA06F0A1400D43002165 +:102EA00075F1004250F1000051EB0C01F0BD002023 +:102EB0005FEA0C01F0BDCFB992185B41B3FA83F71A +:102EC00004BFB2FA82F6BF190B3FB7F120062FBF3D +:102ED00002FA06F3BB40C7F1200622FA06F638BF15 +:102EE0003343BA401CB1E419641E33E77F4231F02A +:102EF0000041B1FA81F404BFB0FA80F6A4190B3C8A +:102F0000B4F120062FBF00FA06F1A140C4F120065B +:102F100020FA06F638BF3143A0403C1B1AE7AC420A +:102F20001ABF05EA1357AF4212E050EA41061CBF30 +:102F300052EA4306BFE750EA4107304661461CBFEC +:102F400041EA0551F0BD52EA430C08BFC143F0BD50 +:102F500000204FF4001616EB410F98BF16EB430FFD +:102F600008BF16EB410F24BFC14305E016EB430F2A +:102F70000CBF61464CEA0551F0BD0000400D4918F8 +:102F800040EA81200CD2490DA1F58061491C40F036 +:102F9000004005DBD1F11F0154BFC840C017704786 +:102FA00000207047014648B1B0FA80F18840C91C42 +:102FB000C1F58461090501EBD0214005704700008F +:102FC0000148704700000000002900207047000001 +:102FD000841A71EB030604D26E40001BB141121932 +:102FE00073414FF4001C1CEB410F34BF7CEB4306D4 +:102FF00082E00C0DA4EB1356362E7BDC012E45EA45 +:10300000C32341DC43EA525312BFD20292025B084F +:10301000240545EAC12141EA5051D2EBC020994133 +:1030200025D407D1B0FA80F610FA06F162D000205C +:10303000203608E0B1FA81F6B140C6F1200220FA4C +:1030400002F21143B0404FEAF474B4EB465434F04A +:1030500001064FEA74040AD8D6F50016760D04F07E +:103060000044F04061FA06F25040F1404840C00A86 +:1030700040EA415021F0004128BF5FEA500550F17D +:10308000000044EBD12135E0DB0A45EAC121C90A41 +:10309000B6F120050EDD42EA0242120CC5F120060F +:1030A00003FA06F6EB4042EA06056D42984161F1EB +:1030B00000010DE062FA06F5F240554063FA06FCA5 +:1030C00082EA0C02F3405A406D42904161EB0301E9 +:1030D00011F4801F05D1641E620502D06D004041CD +:1030E000494121F48011430875F1004350F100007B +:1030F00041EB045170BC70471CEB410F15D223F01B +:10310000004352EA43060BD04FEA4C0CBCEB410F94 +:1031100004D80C0D661E342EB7DDEBE7801A9941FA +:1031200050EA410608BF0021E4E708BF1CEB430F4B +:1031300028BF6FF00001DDE730B5040085B008BF9F +:10314000012043D004F52A75687820B90021297040 +:10315000204600F04BFD03206870206800F017FE49 +:10316000002128200AE010FB01F22244283201232A +:1031700053701170D181002300F02AF862689142E7 +:10318000F1D3002109E010FB01F2224402F5B472F0 +:1031900000231170537000F01BF862689142F2D363 +:1031A00083B0211D68462022FFF7D8FB0EBC2068A3 +:1031B00000F0F3FD002084F8240001206870E0692D +:1031C000012804BF204601F087FA002005B030BD79 +:1031D000491CD370136153619361C9B2704710B534 +:1031E00000F0B7F801D1022010BD00F003F800F0A4 +:1031F000C7FDA7E0012184F8A8122068704738B500 +:1032000004462068B0F84400010403D52046BDE818 +:10321000324086E141050ED500F090F84FF6FF30C0 +:103220008A8802408A80204600F012FD2046BDE8D0 +:103230003440002192E0410404D500F07FF84BF6C1 +:10324000FF7077E0810404D500F078F84DF6FF7048 +:1032500070E0C20404F5387120D5226832F8403F8E +:103260004FF6FB70034013804FF6F770158805404A +:1032700015800878012805D100220A700021204617 +:10328000C046C046204600F0F4FC2168B1F8442056 +:103290004EF6FF700240A1F8442031BD02050FD563 +:1032A00000F04CF84FF2FF700A8842F008020A80E2 +:1032B0008B8803408B80088840F00400088020E061 +:1032C000020623D5206800F140024FF67F709388F4 +:1032D000034093800878A0B9138843F00403138057 +:1032E0000123108840F0080010800B70908A80083D +:1032F00000F03C00486001212046BDE8344001F068 +:1033000000BA2046BDE8324000F0AFBC81050BD5C5 +:1033100000F014F84FF6FF508A8802408A80204659 +:10332000BDE8324000F090BCC00506D500F006F8BC +:103330004FF6FF608A8802408A8031BD206800F124 +:1033400040017047206801F07BF9002084F8A80252 +:1033500010BD044694F8A8020128704710B5FFF785 +:10336000F8FF01D1022010BD012284F8A82284F8C0 +:103370002410206801F05EF9E7E738B5054601F052 +:1033800007042820444328190C0647BF00F12804ED +:10339000012000F5B474002001F007016070217075 +:1033A0002261E370607808B12178E181022B04BFCB +:1033B0000020207195F8A802012801D1022032BD19 +:1033C000012185F8A8122146286800F0F1FC0020B0 +:1033D00085F8A80232BD10B5044600F09BF847BF3F +:1033E0002830012200F5B470002201F0070142707C +:1033F00000F069F801D1022010BD00F003F800F0E0 +:1034000004FEA2E7012284F8A82201462068704742 +:1034100038B501F0070528246543441904F5B47450 +:1034200001F007016261A3610022E2616270217014 +:1034300021461DE001F00701282251430844D0F83D +:103440008401704738B51C4601F0070528235D4309 +:103450004319283301F007015A619C61012283F866 +:1034600024201C620022DA61197001225A70194668 +:10347000006800F050FE002032BD10B5044601F097 +:1034800007006268824201D2012010BD28220B068B +:1034900004D5504320442830012205E012FB01F2FC +:1034A000A01800F5B4700022427001F0070101225B +:1034B00000F008F801D1022010BDFFF7A4FF01F0D1 +:1034C00060F842E78270017094F8A81201297047F1 +:1034D0001CB5044601F00F036068984201D2012038 +:1034E00016BD00F017F847BF2830012200F5B47070 +:1034F000002201F0070142700022FFF7E3FF01D133 +:10350000022016BDFFF77EFF01F054F8002084F87A +:10351000A80216BD01F0070228204243A0180A069F +:1035200070472DE9F84F00F5B475064627E001888D +:103530000AEA010141F40041018006F124043068E7 +:10354000B0F85010227901EBC201401800F202409D +:103550000088A169C0F3090020620844A06100212D +:10356000304600F068FB217849B1E06938B921782C +:10357000306841F08001A0F84C10002121703068C3 +:1035800000F144010A88130440F13A810A8812F0DC +:103590000F0440F68F7748F60F7A62D1D206C6D56F +:1035A0000288130511D5898900F044F9EA88C3F32C +:1035B0000903EB6106F52C7101F061F8306800F049 +:1035C0002BF9304600F027FBD9E71104D7D500F0DE +:1035D00023F93068B0F8501000F02CF9C3F3090358 +:1035E000002BEB611CBF696900290AD0EA8801F051 +:1035F00046F86869E969084468610021304600F0CE +:1036000010FB306801880A05B9D4B0F85010411891 +:1036100028693F2801F2064106D3420910F01F0F26 +:1036200008BF521E900206E040B90A8848F2FF30F7 +:1036300002400A80088840F4004004E04208C007C5 +:1036400048BF521C900208804BF68F723068018888 +:10365000114081F4405141F4004141F0800101806A +:103660008DE7282130F8248011FB04F106EB0109D5 +:103670005FEA084160D530F824100F4047F080071A +:1036800020F8247009F5B477387B58B93068B0F861 +:1036900050103A7801EBC201411800F0C3F837D05E +:1036A000FA8831E0F878022806D142463946304699 +:1036B00000F0D2F883462BE03068397830F82120CA +:1036C00048F68F731A4042F4004242F0C00220F8DC +:1036D000212030683A78134630F823305904B0F886 +:1036E000503003EBC2020AD5811801F20241098869 +:1036F000C1F3090BBBF1000F0AD03A8904E081182D +:1037000000F090F804D07A895B46796900F0B7FF41 +:10371000F8695844F861786958447861B86910B11B +:103720003A69934504D23978304600F07AFA03E0DA +:103730003068394600F0EFFC5FEA086038D5306841 +:1037400030F824200AEA020242F4004209F128017A +:1037500020F82420C87802282BD0087B00220028DB +:103760008A6121D05FEA486209D5487810B900F033 +:1037700069F809E0012817D100F064F812E0326816 +:10378000487858B900F03FF8038848F2FF321340F8 +:103790000380028842F40042028005E0012803D140 +:1037A00000F031F8002303800978304600F043FA36 +:1037B000E5E65FEAC8501ED430680A78B0F85030A9 +:1037C00003EBC203C01800F2024003888869C3F308 +:1037D0000903834234BFC01A0020886108B911462A +:1037E000E3E7486918444861C8691B18CB61306831 +:1037F00000F091FCC3E64246304600F08AF8BEE68F +:103800000020BDE8F28FB2F8500010180A7800EBE3 +:10381000C20000F20640704701880F4047F0800761 +:103820000780704701F206410988C1F3090BBBF11B +:10383000000F70472A7801EBC201411801F20641DE +:103840000B8870473068B0F8502080180A7800EB79 +:10385000C20000F2024070472DE9FC410D460068AD +:103860002B78A969B0F85060540448F2C00848F6B3 +:103870008F7748F2800C4BF68F7E06EBC30419D588 +:10388000061906F202463488C4F30904A1422CBF8B +:10389000091B0021A96129B930F823100EEA0101A2 +:1038A00000F027F8510601D500F02AF8F4B12346BC +:1038B0002A8918E0061906F206463488C4F309047A +:1038C000A1422CBF091B0021A96129B930F823109E +:1038D0000EEA010100F00DF8510601D400F010F8D5 +:1038E00024B123466A89696900F0C9FE2046BDE813 +:1038F000F68181F400514CEA010120F82310704751 +:10390000297830F82120174048EA070220F82120C2 +:1039100070472DE9FC410D4604461646216895F88E +:1039200000E0A8697306B1F850304CF2800748F601 +:103930008F7803EBCE0340F18580CB1803F202436E +:103940001B88C3F30903834234BFC01A0020002838 +:10395000A86125D1687838B9B1F85000081800EB93 +:10396000CE0C00F027F913E0012809D000F030F95F +:103970002046297800F05FF9700440F1ED8082E084 +:10398000B1F85000081800EBCE0C0CF2024C0020ED +:10399000ACF8000068780028E8D100F0F9F8E7E713 +:1039A000720406D531F82E0008EA0000074321F81A +:1039B0002E7095F8240001286ED100F0DFF803D3B3 +:1039C0001346C01A286208E010B985F8240004E004 +:1039D000002285F8242003462A62687810BB2068FC +:1039E000B0F850208218287802EBC0023F2B02F278 +:1039F000024206D3580913F01F0F08BF401E800271 +:103A000006E043B9168848F2FF3006401680108859 +:103A100040F4004004E05808DE0748BF401C800224 +:103A200010800BE0012809D12068B0F850208018E0 +:103A30002A7800EBC20000F2024003802A89206845 +:103A40009BB287E0CB1803F206431B88C3F309033C +:103A500098422CBFC01A00200028A8612DD1687898 +:103A600038B9B1F85000081800EBCE0C00F0A2F8FD +:103A70001BE0012811D000F0ABF82046297800F0B7 +:103A8000DAF8700468D42168287831F8202008EA30 +:103A90000202174321F820705EE0B1F850000818C8 +:103AA00000EBCE0C0CF2024C0020ACF80000687861 +:103AB0000028E0D100F06CF8DFE7720406D431F89A +:103AC0002E0008EA0000074321F82E7095F8240024 +:103AD000012841D100F052F803D31346C01A2862DE +:103AE00005E010B103460020286285F8240026680E +:103AF000687808BBB6F850003218287802EBC0028C +:103B00003F2B02F2064206D3580913F01F0F08BFDD +:103B1000401E800206E043B9178848F2FF30074094 +:103B20001780108840F4004004E05808DF0748BFC1 +:103B3000401C800210800AE0012808D1B6F850002D +:103B40002A78301800EBC20000F2064003809BB2D6 +:103B50006A89304600F082FD2268297832F82130E7 +:103B600048F6BF70034083F0300343F4004343F052 +:103B7000800322F821300020BDE8F681E8696969F8 +:103B80002A691818E8611944286A696190427047E7 +:103B9000B1F850000918287801EBC00101F2064184 +:103BA00048F2FF300A8802400A80088840F400404A +:103BB000088070470CF2024C48F2FF30BCF800302D +:103BC0000340ACF80030BCF8000040F400407047FF +:103BD0006878012809D1B1F850000818297800EB5D +:103BE000C10000F2064000220280704780B56148A3 +:103BF000016841F0806101600022006800F080608F +:103C0000009006210098142000F098FDBDE80240C5 +:103C1000142000F0B1BD00F52C71D0F8F00200F0D6 +:103C200039BE0B4628225343C218D0F8F002D2F80E +:103C30007C2100F05DBE0B4628225343C218D0F809 +:103C4000F002D26B00F089BED0F8F00200F014BF91 +:103C500010B50446D4F8F00200F0CBFED4F8F00220 +:103C6000BDE81040012100F0F3BED0F8F00200F0F2 +:103C7000F2BED0F8F00200F0F6BE10B53E4C3F495F +:103C80002160C4F8F002082161600021E160022196 +:103C90002161A1600021A161C0F8C4422046FFF764 +:103CA0004BFA18230022002100F012F858230022BA +:103CB000802100F00DF8C0230022812100F008F8D7 +:103CC0004FF488730022012100F002F8002010BD9B +:103CD000204600F0E7BC80B5D0F8C402FFF77FFAB9 +:103CE000002002BD10B51C461346D0F8C40222467F +:103CF000FFF743FB002010BD80B5D0F8C402FFF7EA +:103D00006AFB002002BD80B5D0F8C402FFF7B5FB06 +:103D1000002002BD80B5D0F8C402FFF7D9FB002017 +:103D200002BD81B0D0F8C42201F07F0328204343B4 +:103D3000D01809064CBF90F82A0090F86A0101B02B +:103D4000704780B5D0F8C402FFF708FB002002BD21 +:103D500080B5D0F8C402FFF775FB002002BD80B526 +:103D6000D0F8C402FFF754FB002002BDD0F8C40213 +:103D7000FFF760BB58000058EC2D002000680040A1 +:103D80004030002181804BF6807100F050BCB0F8CB +:103D9000402044F27F0100F05CBC0EB4012120F809 +:103DA000401F0021018081800182002003B0704704 +:103DB0002DE9F8470B4648F68F111D780246002082 +:103DC00032F8254001EA040AD97803290CD8DFE843 +:103DD00001F002080C054AF4007A06E04AF4C06AD1 +:103DE00003E04AF4806A00E0012048F2800949EAD1 +:103DF0000A0122F8251048F68F7519788A4632F89C +:103E00002A702F40394349EA010122F82A104BF663 +:103E10008F7A197B1C7800294CF2800748F6BF7C0A +:103E200048F2C00E64D1DE884FF6FE710E4059781C +:103E30000029B2F85010114401EBC40419D004F564 +:103E400080642680197832F82140640606D532F85D +:103E5000214025404EEA050522F821501978DB78EB +:103E6000012B32F821300CEA030301D083F0200348 +:103E7000BFE004F204442680B2F8501054181978B8 +:103E800004EBC10C19693F290CF2064C09D34FEA27 +:103E9000511E11F01F0F08BFAEF1010E4FEA8E2127 +:103EA00009E059B9BCF8004048F2FF312140ACF8B4 +:103EB0000010BCF8001041F4004107E04FEA510E39 +:103EC000C90748BF0EF1010E4FEA8E21ACF8001071 +:103ED000197832F82140640405D532F82140254094 +:103EE0003D4322F8215000F08AF883F4405380E0EB +:103EF000D978022909D132F82410294041F401412E +:103F000041F0800122F8241008E032F8246048F6DD +:103F10008F610E4049EA060622F82460B2F850107C +:103F20001E895418197804EBC10404F580644FF617 +:103F3000FE710E402680B2F850105418197804EB28 +:103F4000C1085C8908F204484FF6FE710C40A8F8DD +:103F50000040597893F80080002932F8281024D1C5 +:103F6000490405D532F8281029400F4322F828705B +:103F7000197832F821707F0606D532F821703D405D +:103F80004EEA050522F82150197832F821500AEA44 +:103F9000050484F4405449EA040422F821401978C5 +:103FA00032F821300CEA030323E0490405D532F846 +:103FB000281029400F4322F82870197832F8217010 +:103FC0007F0606D532F821703D404EEA050522F8FD +:103FD0002150DD781978012D32F821500CEA0504C2 +:103FE00018BF84F0200449EA040422F8214000F0BC +:103FF00006F849EA030322F82130BDE8F287197870 +:1040000032F821300AEA030370472DE9F0410246F5 +:1040100091F800C048780B7B4BF68F7E4CF2800401 +:1040200048F2800848F6BF7548F2C00648F68F7718 +:10403000ABB9002832F82C0008D0400636D532F84B +:104040002C0007403E4322F82C602FE0400456D558 +:1040500032F82C0007403C4322F82C404FE0002867 +:1040600032F82C0029D1400405D532F82C00384014 +:10407000044322F82C40087832F820305B0605D53E +:1040800032F820303B40334322F82030087832F8B1 +:1040900020301F403E4322F82060087832F820305C +:1040A0000EEA030348EA030322F82030087832F8C6 +:1040B00020100D4048EA050128E0400405D532F8FB +:1040C0002C003840204322F82C00087832F82030A9 +:1040D0005B0605D532F820303B401E4322F82060B5 +:1040E000087832F820301F403C4322F820400878FE +:1040F00032F820301D4048EA050522F820500878A3 +:1041000032F820100EEA010148EA010122F82010DD +:104110000020BDE8F0812DE9FC420E46054672788C +:10412000307B012A48F2800748F68F7140F0F88012 +:104130003269B36914469C4288BF1C4640B9F28874 +:1041400000F014FA00F016FA00F202400480DEE0FB +:1041500096F803E03078D6F820C0BEF1020F03468F +:1041600040F0BA80624580F0AB8035F82300014012 +:1041700041F4014141F0800125F82310ACEB04002B +:104180003062630832787178964635F82EE05FEA3F +:104190004E6904F001004FEA541C47D5B9B900F04C +:1041A000C0F901F2064107D314F01F0F08BFACF1AC +:1041B000010C4FEA8C2002E024B900F0B9F940F478 +:1041C000004002E000B15B1C9802088006E0012973 +:1041D00004D100F0B4F900F206400480728900F0C6 +:1041E000C5F900F089F932BF001B04460020306297 +:1041F0007078C0B900F0A9F901F2024106D3600954 +:1042000014F01F0F08BF401E800202E024B900F026 +:104210008FF940F4004004E06008E20748BF401C0A +:10422000800208806DE001286BD152E0B9B900F03E +:1042300078F901F2024107D314F01F0F08BFACF167 +:10424000010C4FEA8C2002E024B900F071F940F42F +:10425000004002E000B15B1C9802088006E00129E2 +:1042600004D100F06CF900F202400480328900F0C1 +:104270007DF900F041F932BF001B04460020306296 +:104280007078C0B900F061F901F2064106D3600907 +:1042900014F01F0F08BF401E800202E024B900F096 +:1042A00047F940F4004004E06008E20748BF401CC2 +:1042B000800208801FE001281DD100F05BF917E0A3 +:1042C00035F8231048F68F600140394325F8231054 +:1042D000644600F04FF911E0ACEB0401316235F8AF +:1042E00023104A06B5F85010294401EBC00005D54B +:1042F00000F206400480A3B2728904E000F202409A +:104300000480A3B232897169284600F0A7F9317898 +:1043100035F8212048F6BF70024082F0300220E0DC +:1043200000282ED1B1693069884232BF091A084687 +:104330000021B16100F0EEF83F2801F2064116D3EA +:10434000420910F01F0F08BF521E900240F40040B7 +:104350000880317835F821204BF68F70024082F4C6 +:104360004052174325F821700020BDE8F68210B9AD +:1043700000F0DEF8EAE74208C00748BF521C90028E +:10438000E6E7F078022857D1BAB900F0E6F802F271 +:10439000024206D3430910F01F0F08BF5B1E9802AC +:1043A00002E020B900F0AFF840F4004004E0430818 +:1043B000C00748BF5B1C980210807078C0B900F03D +:1043C000CCF802F2064206D3430910F01F0F08BFD3 +:1043D0005B1E980202E020B900F095F840F400401E +:1043E00004E04308C00748BF5B1C980210800BE044 +:1043F000012809D1B5F850003278281800EBC20026 +:1044000000F2064032690280F0690028A1D03078BD +:1044100035F8202044F2400303EA02049C4218BF0E +:104420001A4296D135F82020114041F4004141F064 +:10443000C00125F820108CE701285BD1B1693069F3 +:10444000884232BF091A08460021B161440800F0D1 +:10445000010143092ABBB5F8502005EB020C327864 +:104460000CEBC20C3F280CF2024C06D31A4610F09B +:104470001F0F08BF521E92020AE060B9BCF800E0AC +:1044800048F2FF3202EA0E02ACF80020BCF800202D +:1044900042F4004203E0224601B1521C9202ACF801 +:1044A00000207278FAB9B5F8502096F800C0AA1822 +:1044B00002EBCC023F2802F2064208D310F01F0F95 +:1044C00008BF5B1E980240F40040108041E730B9FD +:1044D000118848F2FF30014011801088F3E701B1E4 +:1044E000641CA002F1E7012AF0D100F013F801F2F8 +:1044F00006412DE7012038E7706931692044706179 +:10450000306A81427047138848F2FF3003401380BD +:1045100010887047B5F850103278691801EBC20165 +:104520007047B5F85010691801EBC2013F2C704775 +:104530000A8848F2FF3002400A8008887047B5F8C0 +:104540005000281800EBC2007047B5F85000291839 +:10455000307801EBC0013F2C7047B5F850002A18A5 +:10456000307802EBC00230693F2870477169A3B20E +:10457000284673E0B5F850003178281800EBC100E8 +:10458000704718B50A78497830F82240002948F277 +:10459000800305D048F6BF710C4084F0100404E09D +:1045A0004BF68F710C4084F48054234320F8223062 +:1045B000002012BD30B50A7B002A36D14A780C782B +:1045C000002A30F8242048F2800348F68F7516D070 +:1045D000520608D530F82420154045F4004545F032 +:1045E000C00520F82450CA78012A1ED00A7830F875 +:1045F000224048F6BF710C4084F0200412E05204BF +:1046000008D530F82420154045F4404545F0800594 +:1046100020F824500A7830F822404BF68F710C4075 +:1046200084F44054234320F82230002030BD018020 +:104630000020704711B98021A0F84C10002070476D +:10464000B0F8581041F40041FFE7A0F858100020DE +:1046500070470A40A0F840200020704710B580182D +:104660005B1C00F580605B0807E00A784C7842EA42 +:104670000422891C20F8022B5B1EF6D110BD10B558 +:10468000821802F58062580806E032F8024B0C707E +:10469000240A4C70891C401EF7D1D80744BF1088EB +:1046A000087010BD30B528240D0605D501F00701AE +:1046B00061430844283003E06143084400F5B470C6 +:1046C0001AB900210173C38004E0038101211B0C8E +:1046D00001734381002030BD016800F5387001226C +:1046E000826000220270B1F8540040F00100A1F88D +:1046F0005400B1F8540040F00200A1F8540000202A +:10470000704770470901020081B002D43C488154CF +:1047100005E03C4802F00F02104400F8041C01B010 +:104720007047394A13684FF6FF0100020B4000F44E +:10473000E0601843354908431060704738B5324B84 +:104740001C68C4F30223C3F10704052C28BF04240A +:104750001D1D072D34BF0023DB1E012505FA04F4BF +:10476000641E2140994005FA03F35B1E1A40114371 +:10477000BDE83440C6E70000010007D4012200F084 +:104780001F01234B8A40400943F820207047010055 +:104790000BD4012200F01F011E4B8A40400943F850 +:1047A0002020BFF34F8FBFF36F8F704710B5401EAF +:1047B000B0F1807F01D3012010BD174C60600F2144 +:1047C0004FF0FF30FFF79EFF0022A260072020601D +:1047D000002010BD010007D4012200F01F010F4B83 +:1047E0008A40400943F820207047010007D4012285 +:1047F00000F01F010A4B8A40400943F8202070470F +:1048000000E400E018ED00E00CED00E00000FA0527 +:1048100000E100E080E100E010E000E000E200E004 +:1048200080E200E010B508B9032010BD00F5277341 +:104830000024DC615C621C6301B199610121197083 +:104840000270BDE81040FFF718BA1CB50022ADF8A1 +:10485000002009B9032016BD00F52E742160C96A35 +:1048600011B1684688476061002016BDFFF733BA72 +:1048700080B5D0F8B832032213B11A6890470246C7 +:10488000104602BD80B5D0F8B8220AB152689047F0 +:10489000002002BD38B5044604F2AA25284600F0DF +:1048A0000FFB04F5257001210160818B4160817D42 +:1048B00011F01F0003D002280DD006D311E02946C5 +:1048C0002046BDE8344000F0EDB829462046BDE85A +:1048D000344000F064B929462046BDE8344000F079 +:1048E00084B92046BDE8344001F08001FFF70BBADF +:1048F00038B5044610460B0004F5257221D1116825 +:10490000032910D104F5AE714B680D68AB420CD28F +:10491000ED1A4B680D602A469A42014688BF1A4636 +:10492000204600F02BFB002032BD107A032804D172 +:10493000516A096909B120468847204600F026FBE4 +:10494000F1E7107A0328EED1526A9269002AEAD080 +:10495000204690470100E6D032BD38B504461046E7 +:104960000A0004F5257538D1296802292ED1E2699B +:10497000216A914206D2521AE2610146204600F0B5 +:10498000EBFA0DE013D1A069884210D36968884220 +:104990000DD200220021204600F0DEFA00206860DF +:1049A0000023002200212046FFF7D9F90EE0287AE3 +:1049B000032804D1696AC96809B120468847802163 +:1049C0002046FFF7A0F9204600F0E7FA287B0128EF +:1049D00004BF00212973002032BD287A0328FAD1B0 +:1049E0006A6A5269002AF6D0204690470100F2D048 +:1049F00032BD1CB5044604F5257001210172002169 +:104A0000016061600161416A09B9032016BD806AD5 +:104A100000281CBF4A68002A02D000212046904787 +:104A20004023002200212046FFF75CF904F5B07016 +:104A30000121818040234021016000228021204605 +:104A4000FFF750F90120A08440202062002016BD0D +:104A500001740020704700F527700178417004212F +:104A600001700020704700F527700178042904BF09 +:104A7000427802700020704780B500F52772D16936 +:104A800009B9032002BD1278032A02D1C96901B114 +:104A90008847002002BD00004178007840EA0120EC +:104AA00070470000F8B500240546087810F0600053 +:104AB00005F5277608D0202818BF40282ED1F269A6 +:104AC00093682846984730E04878092826D8DFE8D8 +:104AD00000F03F592553250905252E29284600F0C9 +:104AE00013F95AE08A88002A04BFC888002815D123 +:104AF0004F88802F12D23078032807F07F070DD01F +:104B0000B77039462846FFF71CF9284600F03EFAF0 +:104B1000002F14BF0220012030703EE0284600F034 +:104B2000E4F93AE0284600F078F9044635E0C88810 +:104B30000128F3D13278521E012A04D9921EEDD1F8 +:104B40000122291D14E0AC60012205F108010FE0EB +:104B50003078401E0228E1D8C8880228DED1012121 +:104B6000E960B06808B10321E960022205F10C0197 +:104B7000284600F0E9F910E0488801280DD101210C +:104B8000B16007E03078401E0228C7D84888012865 +:104B900003D1B460284600F0F9F92046F2BD70B5A3 +:104BA0000E4604463078002510F060001CBF202817 +:104BB000402815D104F527721178491E02290FD813 +:104BC000307902280CD2D269936831462046984742 +:104BD0000546F08838B9280005D100F018F902E040 +:104BE000314600F018F9284670BD2DE9FC410E460B +:104BF000002580463078317910F0600008F527777D +:104C000004D020283AD0402864D137E070780028BA +:104C10003BD0012815D003285CD13878022816D063 +:104C2000032857D1708840B9002918BF802904D0C3 +:104C3000F08810B94046FFF766F8404600F0A6F944 +:104C40004CE03878022802D003280CD042E000293A +:104C500018BF80293ED04046FFF755F880214046D6 +:104C6000FFF751F83AE07088C0BB11F07F0F1CBF0E +:104C70004046FFF74FF8404600F088F9FA6993681C +:104C8000314640469847054628E0142001F07F024F +:104C90003B7842434244022B02F5AA7402D0032B14 +:104CA0000FD017E0002918BF802913D1080648BF8C +:104CB00002F11404256002222146404600F044F926 +:104CC0000CE001F00F0310FB03F00B06404408D585 +:104CD000808C78B93146404600F007F92846BDE897 +:104CE000F681B0F864010028F4D0002918BF8029AB +:104CF00003D1DFE702F11404F7E74046FFF711F8AC +:104D000000B101202060D6E738B5044600200D46EA +:104D1000ADF8000004F52D726888010A012908D059 +:104D200002291ED0032929D006295AD007295FD08D +:104D300067E01268207C136869469847EA88002A71 +:104D400062D0BDF8001000295BD0914288BF1146A7 +:104D5000ADF800100146BDF80020204600F0F4F840 +:104D600031BD207C51680028684604D1896A884793 +:104D700002214170E2E7C96A8847F9E7C0B2052815 +:104D80003FD8DFE800F0030B1219202710684268B3 +:104D9000002A36D0207C69469047CFE710688268A9 +:104DA0007AB3207C69469047C8E71068C26842B36E +:104DB000207C69469047C1E7106802690AB3207CED +:104DC00069469047BAE710684269D2B1207C6946CB +:104DD0009047B3E7106882699AB1207C6946904792 +:104DE000ACE7207C68B951684A6B68469047A5E7F4 +:104DF000207C30B951680A6B6846904707224270A0 +:104E00009CE700F007F831BD00F001F831BD204605 +:104E100000F0BCB82946204667E0F8B50D460446C8 +:104E2000244F68883870002639780846022803D352 +:104E3000FFF7F0FF0320F2BD94F89C22022A02D073 +:104E4000032A0FD02EE0002929D060602046FFF70A +:104E50000FFD060002D0FFF7DDFF29E0FFF7D7FFC7 +:104E6000032019E031B9022084F89C02666000F04A +:104E700024F814E06168884211D000F01DF83978F8 +:104E800061602046FFF7F4FC060008D0FFF7C2FF80 +:104E9000616800F011F8022084F89C0208E0FFF736 +:104EA000B6FF05E0FFF7B6FF397800F006F80326F5 +:104EB0003046F2BDD8390020C9B22046FFF7E2BC27 +:104EC00038B50D4604462878207068786070A81CB4 +:104ED000FFF7E2FD60802D1D2846FFF7DDFDA08075 +:104EE000A81CFFF7D9FDE08031BD10B50446802134 +:104EF000FEF709FF2046BDE810400021FEF703BF82 +:104F000000280B4600D1704730B50021044600E070 +:104F1000491C14F8015B002DFAD10906C90D891C42 +:104F200011801178197002220321597008E010F8DD +:104F3000011BD4B2521C1955D4B200211955521C70 +:104F400001780029F3D130BD80B513460222C0F8A4 +:104F500094228361C36101E080B513460A460021B3 +:104F6000FEF7F6FE002002BD80B513460322C0F80E +:104F7000942200F5AC721360536001E080B51346D3 +:104F80000A460021FEF7EBFE002002BD80B5042199 +:104F9000C0F8941200230022E1E780B50521C0F893 +:104FA000941200230022ECE738B5040009D004F184 +:104FB0008005686808B900F01EF800F021F80128A3 +:104FC00001D1012032BDA06A08B100F02AF800F03A +:104FD0000AF821F02A01FFE7816000F01BF8BDE824 +:104FE000324000F03EBB2068416821F490414160AE +:104FF00020688168704700212970204600F0AEBC0F +:105000002420686020680168490849000160204642 +:1050100000F0BCB92068016841F001010160204640 +:105020007047204600F0BABA70B5044604F1800516 +:105030001346686820283DD169B318002BD0287822 +:10504000012837D001222A7004F1540621653380EB +:1050500073800020E86021206860706AE8B1DFF8A2 +:105060002013C162DFF81C03716A0863716ADFF8FC +:10507000180348630020716A88632068216D00F17D +:105080002802706A00F09BFD38B11020E860002013 +:10509000287020206860012070BD216840200862CF +:1050A0000020287000F008F841F0800100F061FB5A +:1050B000F8D170BD022070BD206800F1080151E8F0 +:1050C000001F00F108027047216851E8002F704767 +:1050D000206800F1080151E8001F00F1080221F0EA +:1050E000400142E8001000287047F8B5044640F639 +:1050F0000F002668F1693268B368084004F15C0566 +:105100000ED1880602D5900602D4D80040F18180E5 +:105110006969002900F029812046BDE8F44008476C +:10512000DFF8E006034204BFDFF8DC763A4270D0D5 +:10513000CF0707D5D70505D5012737622E6B46F077 +:1051400001062E638E0708D5DE0706D527680226DE +:105150003E622E6B46F004062E634E0708D5DE072E +:1051600006D5276804263E622E6B46F002062E63A3 +:105170000E070AD5960601D4034206D026680820F9 +:105180003062286B40F008002863080509D55001FB +:1051900007D526684FF400603062286B40F020008D +:1051A0002863286B002833D0890607D5900601D4E0 +:1051B000D80003D5696909B120468847286B216862 +:1051C0008A68510602D410F0280F1CD0204600F047 +:1051D000EFFA00F0D1F811D5FFF77AFFFCD1286A79 +:1051E00060B10FF2B1618163286A00F061FD0028AF +:1051F0000ED0286A816BBDE8F44008472046BDE820 +:10520000F24000F047BE204600F044FE0020286334 +:10521000F1BD286901286AD1CF0668D5D00666D5C8 +:105220001020306200F0A8F82DD5296A086840687F +:1052300080B20028ECD02A889042E9DA68800868B9 +:1052400001688A061BD4FFF73FFF22F4807200F04A +:105250008FF8F8D1206800F07DFAFBD1FFF738FF16 +:10526000FCD12020E86200202861FFF72DFF22F00A +:10527000100200F07DF8F8D1286A00F0E3FC2988DC +:105280006888091A2DE028886988411A68880028EA +:105290001CBF88B2002868D0226852E8003F23F47F +:1052A000907342E800300028F6D1206800F108022F +:1052B00000F1080352E8002FDFF8C402024043E87F +:1052C00000200028F1D12020E862002028616861D8 +:1052D000226852E8003F23F0100342E80030002823 +:1052E000F6D12046BDE8F44089B200F0D4BDC80232 +:1052F00009D5580207D54FF4801030622046BDE82A +:10530000F24000F043BE080609D5100601D4180289 +:1053100005D5A96949B32046BDE8F44008474806C9 +:1053200011D550060FD5FFF7CFFE22F0400200F056 +:105330001FF8F8D12020A8620020A8612046BDE80F +:10534000F24000F03DBE080206D5500004D52046CC +:10535000BDE8F24000F046BEC80148BF002A04D5AF +:105360002046BDE8F24000F03EBEF1BD22F4F072EE +:1053700041E800200028704720688168480670478F +:10538000115800084358000849580008F8B5044669 +:10539000DFF838052168DFF838C50A68DFF83475AA +:1053A0000240A06802432069024360690243E06949 +:1053B00002430A6000254A68E06822F44052024332 +:1053C0004A60A369DFF8102591421CBF206A03439D +:1053D0008E68DFF80805064033438B600FF2A41691 +:1053E000CB6A606A1B0940EA0313CB626145DFF8B0 +:1053F000F0044FF4004339D13F6807F00307032F4F +:105400004DD8DFE807F0024643494FF0010CE1694F +:10541000B1F5004F4FF6F07740F08080BCF1010FFE +:1054200009D0BCF1020F0AD0BCF1040F71D0BCF15D +:10543000080F71D099E001F0C4F9002815D0626A14 +:10544000616836F81230B0FBF3F04A0802EB400214 +:10545000B2FBF1F080B2A0F11001B942EAD20740EC +:10546000C0F3420007432068C7607FE0914216D135 +:105470003F6817F4406723D0B7F5806F09D0B7F5C0 +:10548000006F03D0B7F5406F06D008E04FF0020C74 +:1054900007E04FF0040C04E04FF0080C01E04FF07F +:1054A000100C9142B3D1BCF1000F09D0BCF1020F36 +:1054B0000AD0BCF1040F15D0BCF1080F15D054E090 +:1054C00001F077F9002851D0616A36F81120B0FB5D +:1054D000F2F6626802EB42018E4246D31103B142FA +:1054E00005D242E001F01BF9ECE71846ECE7500862 +:1054F000002110EB062051EB16610023FDF734F874 +:10550000A0F54071DFF8DC2391422ED22268D060F2 +:105510002CE001F004F990E7184690E7BCF1010F88 +:1055200009D0BCF1020F09D0BCF1040F18D0BCF1B6 +:10553000080F18D019E001F044F9B8B1626A36F8E2 +:1055400012306168B0FBF3F000EB5100B0FBF1F0FA +:1055500080B2A0F11001B94207D22168C86005E00D +:1055600001F0DDF8E9E71846E8E7012504F16800F5 +:1055700001214180018000218160C1602846F2BD87 +:10558000FEFFFFEF010002000400060008000A0011 +:105590000C001000200040008000000190F828104E +:1055A000CA0706D502685368C16A23F400330B4367 +:1055B000536090F828108A0706D502685368016B7B +:1055C00023F480330B43536090F828104A0706D524 +:1055D00002685368416B23F480230B43536090F8B7 +:1055E00028100A0706D502685368816B23F400432C +:1055F0000B43536090F82810CA0606D502689368DA +:10560000C16B23F480530B43936090F828108A06F3 +:1056100006D502689368016C23F400530B43936032 +:1056200090F828104A0610D502685368416C23F49C +:1056300080130B435360416CB1F5801F05D1536853 +:10564000816C23F4C0030B43536090F828100A06C2 +:1056500006D501684A68C06C22F4002202434A6001 +:105660007047F8B5044604F180050020E8606FF04B +:105670007E4701F037F90646206801680A0708D519 +:105680000097334600224FF40011204600F017F82F +:1056900060B9206801684A070AD50097334600229E +:1056A0004FF48001204600F00AF808B10320F2BD53 +:1056B00020206860A8600020E0662870F2BD2DE917 +:1056C000F041069C05460E4690461F462868C16973 +:1056D0003140B1420CBF01200020404526D114F1D9 +:1056E000010FF3D001F0FEF8C01B844200D33CB997 +:1056F00000F025F800F02DF8FCD100F01AF811E0C8 +:10570000286801684A07E1D5C1690A05DED54FF46A +:105710000062026200F013F800F01BF8FCD100F008 +:1057200008F8C16000210170032000E00020BDE8FE +:10573000F08105F180002021416081607047296877 +:1057400051E8002F22F4D07241E800200028F6D161 +:105750007047286800F1080151E8001F490800F16E +:105760000802490042E8001000287047DFF878017D +:10577000014042E80010002870470000026852E82B +:10578000003F23F0C00342E800310029F6D1016850 +:1057900001F1080252E8002F01F1080322F400028F +:1057A00043E800210029F2D12021C0F8841070477D +:1057B000026852E8003F23F4907342E80031002968 +:1057C000F6D1016801F1080201F1080352E8002F47 +:1057D0000E490A4043E800210029F2D1C16E012997 +:1057E00008D1026852E8003F23F0100342E800317C +:1057F0000029F6D12021C0F888100021C166016778 +:10580000704700000100001020010004FEFFFFEFC0 +:105810000146886A09680A68930610D40021A0F836 +:105820005610016801F1080252E8002F01F1080347 +:1058300022F0800243E800210029F2D13BE000F091 +:10584000BFBB806A01F054B8F8B5846A04F18405DE +:1058500004F1560728686E6821688A68110606D523 +:10586000212804D1002038802046FFF787FFFFF76A +:1058700083FD06D5222E04D1002038812046FFF773 +:1058800097FFA86840F01000A8602046BDE8F240ED +:1058900000F000BB806A00F1560100220A810A80F4 +:1058A00000F0F8BA026852E8003F23F0800342E8B3 +:1058B00000310029F6D1026852E8003F43F040036E +:1058C00042E800310029F6D170470000F369FFCFAC +:1058D000003801408800005800800040FFF4FF11AC +:1058E0000024F40000FD0F00FEFF7FEF724900E08E +:1058F000724981B00A6802430A6009680840009052 +:10590000009801B0704780B54FF40020FFF7F0FF1A +:10591000002200212E20FEF711FFBDE802402E20BC +:10592000FEF72ABF00686649884200D0704780B5FC +:105930004FF48010FFF7DCFF002200212C20FEF73F +:10594000FDFE2C20FEF718FF002200212D20FEF77F +:10595000F5FEBDE802402D20FEF70EBF38B58AB037 +:1059600004466846142100F0C5FF2068554A564990 +:1059700090423CD10868554D40F00100086009682C +:1059800001F00101059105980120FFF7AFFF0C2000 +:105990000090022100200191029003210820039130 +:1059A000049069464FF0904000F0A8FF48482860F6 +:1059B000112000F04EF808B101F036FA4FF088508F +:1059C0000690002101200791ADF82010099006A94A +:1059D000284601F02BFA08B101F026FAA567AC625F +:1059E000002200212520FEF7A9FE25202DE0394ABE +:1059F00090422CD14868384D40F480404860486857 +:105A000000F48040059005980220FFF76FFFC0204A +:105A100000900221012001910290032107200391AF +:105A2000049069462D4800F069FF2D4828600F203A +:105A300000F00FF808B101F0F7F9A567AC62002299 +:105A400000212420FEF77AFE2420FEF795FE0BB0FD +:105A500030BD68601020A8600020E86080202861C8 +:105A600000206861A861E8612862284600F03EB81D +:105A70001CB504461B49206888421CD101F0FCF982 +:105A800001F0FAF91848816B21F4407141F48071FA +:105A90008163816B41F400418163026842F480625A +:105AA0000260006800F48060009000982046BDE825 +:105AB000164001F0F5B913BD4C00005850000058D5 +:105AC000000C0058008000405C000058EC360020BC +:105AD00044000240003801404C37002000040048D8 +:105AE00044040240002800405800005838B5040023 +:105AF00001D1012032BD2168DFF87003814204F139 +:105B0000240500F044F8022068700A68A0686FF36A +:105B10000E120243E06802432069024360690243B7 +:105B2000A0690243E0690243206A02430A602046FA +:105B300000F070F9A068B0F5804F04BF00216160EB +:105B40002079696A00F03F0000F014F838B10528A8 +:105B500005D2204600F078F900F012F803E00020AA +:105B600028636863A8630020A86101206870002092 +:105B7000287032BD0860A96AE86A486060687047AA +:105B8000296B00200860696BA86B486070470AD2D7 +:105B9000DFF8DC0242181423B2FBF3F292002A620F +:105BA000DFF8D00209E0DFF8D00242181423B2FB7C +:105BB000F3F292002A62DFF8C402E8617047F8B598 +:105BC000044604F1240600253078012801D1022082 +:105BD000F2BD01273770707801282FD10227777026 +:105BE000B561206807687F087F000760204600F0E5 +:105BF000F5F82168F06820B10A6842F00E020A60E8 +:105C000008E0086820F0040008602068016841F09E +:105C10000A010160706A0168CA0303D5026842F490 +:105C200080720260306B18B1016841F480710160CC +:105C30002068026842F00102026001E0357002252E +:105C40002846F2BD81B040B100F124014A78022A11 +:105C500005D00420886100200870012026E0026839 +:105C6000136823F00E0313604A6A136823F48073E9 +:105C7000136000680268520852000260012091F827 +:105C80002020CB6902F01C02904058608A6AC86AE2 +:105C90005060086B30B1026822F4807202604A6B77 +:105CA000886B5060012048700020087001B0704778 +:105CB00038B500F1240200245178022903D00420D1 +:105CC0009061012428E001680B6823F00E030B604B +:105CD00001680D686D086D000D60516A0B6823F452 +:105CE00080730B60012192F82030D56903F01C030A +:105CF00099406960936AD16A5960116B31B10B6840 +:105D000023F480730B60536B916B596001215170C8 +:105D10001470516901B18847204632BDF8B500F1D1 +:105D200024010423CA6914680268156891F8206088 +:105D300006F01C0603FA06F73C4210D06F070ED59A +:105D40001468A50603D4156825F00405156000F055 +:105D50003DF8C968002938D0BDE8F440084702235F +:105D600003FA06F73C4213D0AF0711D51468A50615 +:105D700005D4156825F00A05156001224A7000F067 +:105D800025F800220A708968F9B1BDE8F440084797 +:105D9000082303FA06F6344217D02B0715D51368EB +:105DA00023F00E031360012291F82030CC6903F038 +:105DB0001C039A40626001228A614A7000220A70C4 +:105DC000096911B1BDE8F4400847F1BD91F8202000 +:105DD000CC6902F01C0293406360704778B5C56CD3 +:105DE000046D6C60446D14B1846DC56D65600125F2 +:105DF00090F84440066C04F01C04A54075600468EB +:105E000063608068102802D1A260E16071BDA1606A +:105E1000E26071BD416C0268144B89089A4234BF3C +:105E2000174B184B03EB8101816402F0FF02083A23 +:105E30001421B2FBF1F1144AC26401F01F010122E6 +:105E400002FA01F1016570470179104A01F03F0142 +:105E500002EB81024265491E0D4A826501F0030191 +:105E600001228A40C2657047000000000804024019 +:105E7000F8FFFDBF00000240F8FBFDBF0004024038 +:105E8000000802401C08024080080240FC08024052 +:105E9000400902407047704710B500F180010A7850 +:105EA000012A01D1022010BD01230B7024224A6077 +:105EB0000268136814686408640014600022426673 +:105EC00023F0005300680360202048600020087021 +:105ED00010BD70B500F01EF801D1022070BD00F0B9 +:105EE0001FF822F0604209E070B500F013F801D10C +:105EF000022070BD00F014F822F06062114381604E +:105F0000204600F01AF82068066020206860002013 +:105F1000287070BD044604F1800528780128704778 +:105F200001222A70242068602068066802685208EE +:105F30005200026020688268704730B5416E11B926 +:105F40000121012214E001680FF230048A68896897 +:105F50000FF23003520E02F00702490F655CA45C99 +:105F6000595C9A5CED00E40095FBF1F194FBF2F2D0 +:105F700068304180028030BD000000000101010353 +:105F80000701000008040204080101017047000035 +:105F900010B50024022811D1114803600E480F4BA0 +:105FA0000360FFF741F8012805D007D3032804D088 +:105FB00038BF022402E0012400E00324204610BD83 +:105FC00000680649884204D105490868002818BFBE +:105FD0000047704700000000B833002000800040F8 +:105FE000CC390020704770474FF0B040006800F097 +:105FF000F000B02888BFB02070472DE9F0410400C0 +:1060000054D0207881064FF0B04538D5A868E968AB +:1060100010F00C0001F0030103D00C2808BF012987 +:1060200046D12868800702D5E06900283ED0FFF7F6 +:10603000DBFF616A884207D2084600F0D3FB0028E4 +:1060400034D100F075FA0FE0286820F0F000014329 +:1060500029606968206A21F47F4141EA0021696072 +:10606000606A00F0BFFB08BB00F095FBDFF810187A +:106070000860DFF81008006800F02AFFB0B9207847 +:10608000C1070DD5A868E96800F00C00082801F0E8 +:10609000030103D00C2808BF03292DD128688003F1 +:1060A00040F139816068002840F03581012038E2F4 +:1060B000E06980B1296841F0010100F047FA064625 +:1060C0002868800700F1248100F00CFC801B032865 +:1060D000F6D3032025E2286840084000286000F03D +:1060E00001FC0646286800F01FFAC8D000F0FAFB51 +:1060F000801B0328F6D3ECE76068B0F5803F04D13D +:10610000296841F48031296003E02A6822F4803252 +:106110002A60606860B100F0E5FB064628688003ED +:1061200000F1F98000F0DEFB801B6528F6D3D0E794 +:1061300000F0D8FB06462868400C10F0010000F083 +:10614000EA8000F0CFFB801B6528F4D3C1E700F0A4 +:10615000C9FBC01B0328C0F01281BAE7E06878B120 +:10616000296841F4807100F0F1F90646286840057D +:1061700000F1188100F0B6FB801B0328F6D3A8E7D6 +:10618000286820F48070286000F0ACFB0646286880 +:10619000800A10F0010000F0DC8000F0A3FB801BFF +:1061A0000328F4D395E700F09DFBC01B0328C0F043 +:1061B0000B818EE740F0010000F0CEF907467068D1 +:1061C000800700F11C8100F08DFBC01B0328F6D373 +:1061D0007FE7706820F0040000F0BEF907467068A1 +:1061E000C00810F0010000F0198100F07BFBC01B1B +:1061F0000428F4D36DE70528306806D140F0040088 +:106200003060316841F0010105E040084000306035 +:10621000316821F004013160A06841F2893768B12A +:1062200000F060FB80463068800700F10C8100F0D0 +:1062300059FBA0EB0800B842F5D34AE700F052FB47 +:106240008046306800F070F900F0FD8000F04AFBF5 +:10625000A0EB0800B842F4D33BE700F043FBC01BBF +:106260000328C0F0FE8034E7B06840084000B0600A +:1062700000F038FB0746B06800F056F900F0F580F2 +:1062800000F030FBC01B0328F5D322E700F02AFB07 +:10629000801B0328C0F01F811BE700F023FB001BBD +:1062A0000328C0F0398114E7286881010CD42968DB +:1062B00041F080712960E86840F08050E86000F0AB +:1062C00011FB04462868810100F12A8100F00AFBD5 +:1062D000001B0328F6D3FCE60C2931D0286820F0F7 +:1062E00080702860E968DFF8A00589088900E96006 +:1062F000E9680140E96000F0F5FA04462868810188 +:1063000040F10E8100F0EEFA001B0328F6D3E0E620 +:1063100000F00EF9B3E6207881071AD5A868E9687D +:1063200000F00C00042801F0030104D00C2808BF81 +:1063300002297FF413AF2868400503D5E0680028E0 +:106340003FF4B4AE6968206921F0FE4141EA006182 +:1063500069602168DFF8346511F0180F38D0606982 +:1063600000283FF436AFC90670687FF523AF800779 +:1063700009D4706840F0010000F0EEF8074670683C +:1063800080077FF5E4AE706840F0040000F0E4F8A8 +:106390000746706800070DD400F0A4FAC01B04285B +:1063A000F7D396E66868216920F0FE4040EA016074 +:1063B0006860CEE77068A16920F4706040EA01204F +:1063C000706000F0C6F8074600F0ADF87FF4EBAE61 +:1063D0002078410737D5DFF8B8743868C10529D46B +:1063E00000F04AFD00F07EFA80463868C10521D4ED +:1063F00000F078FAA0EB08000328F6D369E670688D +:1064000020F0040070607068C00810F00100DFD058 +:1064100000F068FAC01B0428F5D35AE600F099F89A +:10642000074600F080F8D3D000F05CFAC01B0328C8 +:10643000F7D34EE6A06801287FF4DDAE306840F067 +:1064400001003060E8E6217848060ED5A06A0028F1 +:106450003FF40AAFB16841F00101B16000F042FAC7 +:106460000746B06880077FF5F8AEE06A002857D08D +:10647000A968EA68022801F00C017FF42DAF236BB4 +:1064800002F00300984202BF02F07000636B984272 +:1064900014D1A36BC2F30620984202BF02F4781015 +:1064A000E36B98420AD1236C02F06060984202BF0D +:1064B00002F06042606C82423FF4F6AE0C293FF479 +:1064C000F5AD286841013FF5F1AD296821F08071F3 +:1064D00000F03CF80646286881013FF5D7AEE96830 +:1064E000DFF8B003A26B0140206B0143606B0143F6 +:1064F000E06B41EA02210143206C0143606C0143DF +:10650000E960286840F080702860E96841F08051B7 +:10651000E96000F0E7F90446286881017FF5BDAE27 +:106520000020BDE8F0817068400810F0010070475D +:106530002968606A21F0F001014329606868216AD6 +:1065400020F47F4040EA012068607047296000F035 +:10655000C9B9706840084000706000F0C3B92DE907 +:10656000F8430400884644D0DFF82C6300F0CBF8F1 +:1065700047D200F0CDF8074600F0C5F841D000F052 +:10658000B1F9C01B0228F7D90320BAE000F0AAF93C +:10659000401B022843D9F7E700F0A4F9A0EB09005B +:1065A00002284CD9F0E700F09DF9A0EB0900022881 +:1065B00054D9E9E700F096F9401B02285DD9E3E7DA +:1065C00000F090F9401B022867D9DDE700F08AF956 +:1065D000401B484577D3D7E7032802D139688901A2 +:1065E00003E00028396802D1890762D401E0490537 +:1065F0005FD4012085E000F075F9C01B022872D934 +:10660000C2E7207881074FF0B0470BD5B968A06882 +:1066100021F0F0010143B96000F064F90546B86863 +:10662000C003B3D52078DFF8545281060AD5296813 +:10663000606921F0F0010143FFF788FF8146286877 +:106640008003A9D5207841060BD52968A0690909DE +:10665000090141EA1011FFF779FF81462868C0035C +:10666000A1D5207841070BD5B968E06821F4E06135 +:106670000143B96000F036F90546B868800399D542 +:10668000207801070CD5B868216920F4605040EAF1 +:10669000C100B86000F026F90546B86840038FD500 +:1066A0002078C10717D56068022895D13968890319 +:1066B0009FD5B968890840EA8100B86041F28939FC +:1066C00000F010F90546B868616800F00C00B0EB06 +:1066D000810F7FF47BAF306800F00700804505D262 +:1066E00000F016F8074600F00EF884D100F053F8D9 +:1066F000DFF88C11086000F021FCBDE8F24300F0E7 +:10670000E7BBBDE8F283306800F007004045704702 +:106710003168C90848EAC101316000F0E3B838B512 +:106720004FF0B0445E4DA16811F00C0106D1FFF7A7 +:106730005BFCC0F3031055F8200032BD0429594A10 +:1067400005D00829584804D12168C90222D510462D +:1067500032BDE16801F00301022904D0032904D10C +:106760002168C90207D5104605E0FFF73DFCC0F3DC +:10677000031055F82000E168E268E368C1F30621E0 +:106780004843C2F30211491C5B0FB0FBF1F05B1CE4 +:10679000B0FBF3F032BD80B5FFF7C1FF3F49FFE723 +:1067A000424A0968C1F3031152F82110B0FBF1F01D +:1067B00002BD80B5FFF7EFFF00F010F8C1F3022132 +:1067C00006E080B5FFF7E7FF00F008F8C1F3C2214B +:1067D00012F8211001F01F01C84002BD2F49344AB0 +:1067E0000968704770B52E49B1282EBFCC6AC0F336 +:1067F000031051F820402148056800F0B5FB2B49F3 +:106800002C4A05F00F0551F82510B4FBF1F10024D6 +:10681000B1FBF2F1B0F5007F0FF2B802204609D1CA +:106820000FF2940353F820508D4214D2401C0328D9 +:10683000F8D912E00FF2900353F820508D420AD29B +:10684000401C0328F8D308E000F04CF8801B032814 +:106850000CD3032070BD52F820400F4D2868C008AB +:1068600044EAC000286000F03DF80646296801F0BF +:106870000701A142E8D1002070BD000008010058C6 +:10688000E8290020C0290020FFFFFEEE90000058FC +:10689000000400588C80C1110040005808000058C6 +:1068A00008AD00080024F4000048E801C8AC000866 +:1068B00088B4000840420F001200000024000000CD +:1068C0003600000040000000060000000C00000040 +:1068D00010000000000000000100000002000000A5 +:1068E0000300000001484068704700BFB82900203D +:1068F00070470000002200F049BB00002DE9F84F6E +:106900004FF00009674A684B4FF00F0805460E46E6 +:1069100033E0664FBD4214BF072704278F4027434B +:106920004CF82E70C1431C6801EA040C7468E40240 +:1069300048BF40EA0C0CC3F800C05C6801EA040CD4 +:106940007468A40248BF40EA0C0CC3F804C0146881 +:1069500001EA040C7468E40348BF40EA0C0CC2F876 +:1069600000C0546801EA040C7168890348BF40EA1A +:106970000C0CC2F804C009F10109316831FA09F0C0 +:1069800000F07E80012404FA09F414EA0100F2D038 +:106990004FEA490C032101FA0CF16FEA010E71680C +:1069A00001F00307012F1CBF01F00301022911D1DF +:1069B000A968F7680EEA010107FA0CF73943A960E4 +:1069C000696821EA04047168C1F3001101FA09F150 +:1069D0000C436C604FEA8901347904F00304032C02 +:1069E0001FD0EC68B7680EEA040407FA0CF73C43C2 +:1069F000EC60347904F00304022C12D14FEAD90779 +:106A000005EB870401F01C07D4F820A008FA07FB67 +:106A10002AEA0B0AD6F810B00BFA07F747EA0A077A +:106A200027622C680EEA0407347904F0030404FAA0 +:106A30000CF43C432C60746814F4403F9BD0DFF8A6 +:106A400070C04FEA990E5CF82E7001F00C0108FA44 +:106A500001F427EA0404B5F1904F08BF00270ED0D7 +:106A6000144FBD4208BF012709D0134FBD4208BFD4 +:106A7000022704D0114FBD427FF44BAF03274DE7EF +:106A8000BDE8F18F81B0002A14BF8161816201B03D +:106A900070470B4A136803421CBF106000F09EBB96 +:106AA0007047000080080058000800580010004897 +:106AB000080001400004004800080048000C00489D +:106AC0000C080058DFF81C1301E0DFF81C1381B03C +:106AD0000A6802430A60096808400090009801B003 +:106AE000704710B5DFF80413DFF804434FF400409B +:106AF000086000F00FFA606840010ED56068C000C1 +:106B00000BD400F0B9F900F0B7F9206840F48030F8 +:106B10002060216821F48031216000F041F90020DB +:106B200000F0B8FC40B18079B249E160E16821F43D +:106B30007C5141EA0021E16000F019F800F073F89F +:106B400000F0F6F8AC48016800220260026902F029 +:106B50005002026100F0E1F800F0C3F800F0A1F883 +:106B600000F02EFA4FF0FF3000F0A6FCFAE710B567 +:106B7000AEB01CA84821FFF7BDFE01A81C21FFF7FD +:106B8000B9FE08A85021FFF7B5FE00F075F9984846 +:106B9000016821F01801016007219848026822F479 +:106BA000C06242F4007202604FF48032006800F468 +:106BB000C06000904FF4807400981C9101201E90DA +:106BC0000021402020901D9227911F941CA8FFF7C0 +:106BD00014FA08B100F028F96F200190022100207A +:106BE000029103900490059006900790012101A85E +:106BF000FFF7B5FC08B100F017F943F60300089061 +:106C000000214FF4804019900E910F911020022125 +:106C10001B901A91189408A800F04EFD08B100F0DE +:106C200003F92EB010BD80B575487649016000F0BB +:106C3000E7FE10B1BDE80140F6E001BD10B5724CB1 +:106C4000724800F01EF820626062A0626066204612 +:106C5000FEF7AAF908B100F0E7F800212046FFF797 +:106C600038F908B100F0E0F800212046FFF73CF9C0 +:106C700008B100F0D9F82046FFF70EF900B10DE099 +:106C800010BD20604FF4E13060600020A060E06043 +:106C900020610C2060610020A0617047BDE81040B9 +:106CA000C2E0002110B55A485A4C416004600F21DF +:106CB000816047F6FF71C160002101618161C1619E +:106CC000416100F0D5FE08B100F0AEF8CA20606264 +:106CD000FF2153206062A068C008C000A06061620C +:106CE00010BD80B50420FFF7EDFE0220FFF7EAFE9D +:106CF0000120FFF7E7FE00220F210E20FDF71EFD09 +:106D00000E20FDF739FD00220F213A20FDF716FD78 +:106D1000BDE802403A20FDF72FBD80B50420FFF703 +:106D2000D4FE0120FFF7D1FEBDE802400220CCE6F0 +:106D300018B59BB007A85021FFF7DCFD01A818216A +:106D4000FFF7D8FD3448354C0168206C40F0010055 +:106D50002064206C8007FCD54FF4807007900021E0 +:106D6000149107A800F0A8FC206840F08070206013 +:106D70004FF00052216801F08071009100210098CD +:106D800001914BF67F300490222105910020039061 +:106D900020210292069101A800F009FE1CB010BD4E +:106DA0001F4881B0016841F4801101603F210068F3 +:106DB00000F48010009000981A4841604161016819 +:106DC00041F47C110160026942F47C1202610168A5 +:106DD00041F03F010160026942F03F02026101B0EF +:106DE00070470000480000584C0000581040005800 +:106DF00090000058FECAFECA8008005800040058DF +:106E00004C380020000C0058B833002000800040AF +:106E1000B43800200028004094140058580000584E +:106E200050000058040C005872B6FEE718B500F187 +:106E30002402507801281BD11378012B01D10220A4 +:106E400012BD536A10701C680A4804400868044365 +:106E5000C868401E44EAC04448680443087A497A36 +:106E600044EA004444EA41241C600020107012BD32 +:106E7000012012BDFFFD00E00248016841F480716D +:106E800001607047000400588A60FF210268516267 +:106E9000012180F82110002180F820100020704787 +:106EA00090F82010012901D102207047012280F8BA +:106EB0002020022180F82110CA210268516253214A +:106EC0000368596201688A6842F02002FFF7DCBF5C +:106ED00070B50F4E044630780025A8B1FFF75BFC73 +:106EE00032784FF47A71B1FBF2F1B0FBF1F0FDF7BB +:106EF0005DFC48B9102C07D2002221464FF0FF302C +:106F0000FDF71CFCB46000E00125284670BD00BF01 +:106F1000B8290020114810B5016841F48071016062 +:106F20000320FDF7FEFB0020FFF7D2FF002400281E +:106F300014BF0124FEF7E7FC204610BD0848806816 +:106F40007047084805E00748016841F00201016008 +:106F50007047016841F0010101607047004000582E +:106F6000B8290020042004E0DFF81800006800F4CD +:106F7000C0607047DFF81000FFE7016841F48061EE +:106F800001607047000400580404005800B500BFB9 +:106F9000130096469446103928BFA0E80C50FAD842 +:106FA0005FEA417C28BF0CC048BF40F8042BC907EA +:106FB00028BF20F8022B48BF00F8012B00BD0000BD +:106FC00010B57148714C88B0016841F4004101600E +:106FD00000F0F2FD6E480168C908C90041F00401E3 +:106FE0000160FFF7C7FF6B49002000F076FF01F05A +:106FF000CCF80121012000F0E4FD00F0D1F80121DE +:10700000002001F061FA01F0A3FA634A0021402058 +:1070100000F0B9FA04F23C500FF2310100900191F6 +:1070200069460FF22D0001F081FB04F254700290CA +:1070300004F5C96140F23C5005900391049402A804 +:1070400001F00EFB01F082FA08B010BD704700009D +:1070500038B5044688B0616801F10B05684601F057 +:1070600026FC9DF802309DF801209DF800100FF2DB +:10707000781001F05BFC9DF804100FF2901001F005 +:1070800055FC9DF80C309DF80B209DF80A100FF26E +:10709000981001F04BFC28884FF41241401A0CD094 +:1070A000401E3ED0401E4CD0801E57D0401E5AD0AD +:1070B000401E5BD0401E60D063E004A81021FFF7A3 +:1070C00019FC60680D300078F8B90FF2882001F0E3 +:1070D0002DFC01F069F80D208DF810007F212F485C +:1070E0008DF8121004680FF29C20240C214601F048 +:1070F0001DFCADF81C4004A801F0D2FB01F02AFCF5 +:107100000021012000F05DFD3BE0012806D10FF2D7 +:10711000942001F00BFC0020207032E00FF2B02030 +:107120002DE0606800F10D040FF2D020217801F00D +:10713000FDFB2078002814BF0FF224300FF2E82066 +:107140001DE00FF2FC0001F0F1FBD5F80620D5F8A8 +:1071500002100FF2181001F0E9FB12E0D5F802104E +:107160000FF24C1006E00FF27C1008E0D5F8021088 +:107170000FF28C1001F0DAFB03E00FF2BC1001F00B +:10718000D5FB09B030BD00000800005830000320D6 +:1071900080040058B43800206F870008002004E005 +:1071A00080B5002001F04BF9012001F048F90220E0 +:1071B00001F045F9BDE80240012001F071B97047C6 +:1071C0004FF0FF3000F078B90021402000F0E8B91E +:1071D000022000F00BBA022000F010BAB0F5806F68 +:1071E00008BF01F0DABC7047576972656C6573734C +:1071F000204669726D776172652076657273696F7A +:107200006E2025642E25642E25640A005769726558 +:107210006C657373204669726D7761726520627563 +:10722000696C642025640A004655532076657273A4 +:10723000696F6E2025642E25642E25640A0A0000DD +:107240002D2D20424C45204E564D2052414D204878 +:107250004153204245454E20555044415445442019 +:10726000425920434D4F2B200A0000005348434908 +:107270005F5355425F4556545F424C455F4E564DF5 +:107280005F52414D5F555044415445203A2053745C +:1072900061727441646472657373203D20256C785B +:1072A000202C2053697A65203D20256C640A00005B +:1072B000534843495F5355425F4556545F4E564DC0 +:1072C0005F53544152545F5752495445203A204E1F +:1072D000756D6265724F66576F726473203D20252D +:1072E0006C640A00534843495F5355425F45565406 +:1072F0005F4E564D5F454E445F57524954450A0014 +:10730000534843495F5355425F4556545F4E564D6F +:107310005F53544152545F4552415345203A204EE9 +:10732000756D6265724F66536563746F7273203D4D +:1073300020256C640A000000534843495F535542BE +:107340005F4556545F4E564D5F454E445F45524132 +:1073500053450A00534843495F5355425F455654CD +:107360005F434F44455F5245414459202D205749C2 +:1073700052454C4553535F46575F52554E4E494E0A +:1073800047200A004442474D43555F4765745265A4 +:10739000766973696F6E49443D20256C78200A0A2E +:1073A00000000000534843495F5355425F4556541F +:1073B0005F434F44455F5245414459202D20465577 +:1073C000535F46575F52554E4E494E47200A0000C4 +:1073D000534843495F5355425F4556545F434F44BA +:1073E000455F5245414459209620554E45585045D9 +:1073F000435445442043415345200A0053484349E0 +:107400005F5355425F4556545F4552524F525F4E4F +:107410004F544946205749544820524541534F4EF6 +:10742000202578200A000000534843495F53554205 +:107430005F4556545F4552524F525F4E4F54494636 +:10744000205749544820524541534F4E20962045DD +:1074500052525F424C455F494E4954200A00000099 +:10746000534843495F5355425F4556545F45525216 +:107470004F525F4E4F544946205749544820524579 +:1074800041534F4E209620424C45204552524F5278 +:10749000200A000001460648064AC3798B4218BFFD +:1074A000904218BF0838F8D18B4218BF00207047AF +:1074B000F873FF1F0070FF1F2DE9FC47604CDFF8D9 +:1074C0008491A5692840A0614FF0FF3A21694FF0EF +:1074D000010834E0521C54F832006169194001423D +:1074E000F8D0616904EBC206084071681840014297 +:1074F00008BFC6F804A07768384000F0A5F86062BD +:1075000008FA00F087437760EFF3108172B6626A81 +:10751000206908FA02F2D24310402061022004EBF5 +:10752000C00353F8086C1640401E43F8086CF6D1AF +:1075300081F31088606A59F8201088472169A3698F +:1075400060690140194205D0E069216A084208BF1C +:107550000022C0D0C4F824A001F05EFDEFF3108932 +:1075600072B6216960690140A069014201BFE16909 +:10757000206A0142FFF723FE89F31088C046C04607 +:10758000A561BDE8F38738B51446EFF3108572B6F0 +:1075900000F05AF82B4941F8204085F3108831BD9E +:1075A00010B500F00BF804431C6153F83140204340 +:1075B00043F83100FFE782F3108810BDEFF310822B +:1075C00072B61F4B1C697047EFF3108172B61C4AEC +:1075D000536923EA000005E0EFF3108172B6184A00 +:1075E00053691843506181F310887047EFF310819D +:1075F00072B6134AD3691843D061F4E7F8B5104C5A +:10760000666A256A374616F1010F0EBF0026012172 +:1076100001FA06F6206202E03046FFF7D1FD216A4A +:10762000E0690842F8D06762EFF3108172B6E26950 +:10763000206A8243E26181F310882562F1BD000077 +:1076400038290020EC35002002460020110C0904E6 +:1076500004BF1020120412F07F4F04BF0830120242 +:107660000FF2180112F0704F04BF001D1201120F2B +:10767000C0F11F00895C401AC0B2704704030202C7 +:10768000010101010000000000000000DFF86413A8 +:107690000A68030903F47F2300019A4300F47F2062 +:1076A00000F082B9DFF84C231368010C23EA014390 +:1076B00043EA0043136070472DE9F8430546002470 +:1076C0002878DFF830634106A0464FF0B0472DD54B +:1076D000286B70B1B0F5800F06D0B0F5000F18BF61 +:1076E000B0F5400F17D01FE0F86840F48030F86024 +:1076F000EDE0386820F080603860FFF7F3F88146ED +:107700003868000140F1D080FFF7ECF8A0EB0900E9 +:107710000228F5D90324D7E0FFF7E4F8A0EB09002D +:10772000022840F2C980F5E70124A0462868010537 +:1077300031D5B06800F44078286C80452AD0FFF736 +:107740009BFBB8F1000FB16805D1286C21F44071A2 +:107750000143B1601EE0B06840F48030B06021F4B5 +:107760004071B06820F48030B060286C0143B16093 +:10777000B068C0070ED5FFF7B5F8804641F28939E9 +:10778000B068800706D4FFF7ADF8A0EB08004845C5 +:10779000F6D30324A0462878C10705D53168A86927 +:1077A000890840EA810131602878810705D5316870 +:1077B000E86921F44061014331602878C10644BF83 +:1077C000A86AFFF76FFF2878810644BFE86AFFF7D1 +:1077D00069FF2878410744BF286AFFF757FF2878D8 +:1077E000010744BF686AFFF751FF2868C1051BD530 +:1077F0003168686B21F0406101433160686BB0F122 +:10780000006F00F0BDF8686BB0F1806F75D100F0CB +:10781000BDF804463868000160D5FFF763F8001B27 +:107820000228F7D94FF0030867E0FFF75BF8001B69 +:1078300002285BD9F6E7316821F04041316020F041 +:107840008050326822F0406210433060A86BB0F183 +:10785000C05F00F095F8286841056DD53168E86B88 +:1078600021F0405101433160E86BB0F1005F03D17A +:10787000F96841F48031F960E86BB0F1805F5BD169 +:1078800000F084F804463868000146D5FFF72AF86E +:10789000001B0228F7D94FF003084DE0FFF722F84C +:1078A000001B022841D9F6E700F061F8A86821F42E +:1078B000781100F071F88146386800017FF52CAF2F +:1078C0003969686901433961002C7FF42EAF316852 +:1078D000286B21F440010143316027E700F047F8AD +:1078E000E86821F0606100F057F80446386800014C +:1078F0009BD5396968690143396128688105AAD532 +:10790000A86BB0F1804F1CBFB0F1004F002892D19E +:10791000316821F04041084397E700F028F82869D2 +:1079200021F0604100F038F8044638680001B5D510 +:1079300039696869014339612868C10405D5F1686E +:10794000686C21F440410143F160286881040BD543 +:10795000796AE86C21F0300101437962796AA86C98 +:10796000890840EA810179624046BDE8F2833869BE +:10797000696820F4FE4040EA0120386139697047A7 +:1079800003D1F96841F08071F9607047396821F0DE +:1079900080613960FEF7A6BF01433961386840F065 +:1079A00080603860FEF79EBF10430860704710B5D6 +:1079B00011490A6842F080720A600B680F4A23F08E +:1079C00080730B60046841680C4381680C43C16894 +:1079D0000C43016944EA014454601368406923F48C +:1079E0007C5343EA00231360116841F06001116089 +:1079F00010BD0000880000583800005800600040AA +:107A0000F8B504460025ACB104F13406307910B95C +:107A10002046FDF787FF0F4F384600F021F8386801 +:107A200040F001103860204600F007F83560012072 +:107A3000307100E001252846F2BD10B50021064A4C +:107A4000064B00EB8104491C06296360E261F8D310 +:107A500010BD0000000C00587B2400081716000819 +:107A6000002101604FF03F1141603F21816070476C +:107A700038B5040044D094F8210028B9002184F8D6 +:107A800020102046FDF7F4FF00F049F8FF2510B163 +:107A900000F03FF834E02168DFF8B0008A68024067 +:107AA0008A6021688A68636820690343A069034388 +:107AB0001A438A602168E068086120680169A26849 +:107AC00041EA024101612068C16821F08001C16082 +:107AD0002068C16C89088900C1642168CA6CE369A7 +:107AE000606903431A43CA6420688168880609D420 +:107AF00000F020F830B120684562042100F01FF842 +:107B0000012032BD20684562012184F82110002047 +:107B100032BD20684562042184F82110704702209C +:107B200084F82100CA2021684862532022685062EC +:107B3000204626E020460BE02068C0F8248084F828 +:107B40002110002084F8200070470000BFFF8FFF45 +:107B500070B5044640F2E9362068C16821F0A00102 +:107B6000C160FEF7BFFE05462068C168880606D4DE +:107B7000FEF7B8FE401BB042F6D3032070BD0020D4 +:107B800070BD70B504462068C1684A0612D44FF033 +:107B9000FF32C26040F2E936FEF7A4FE05462068D7 +:107BA000C168480606D4FEF79DFE401BB042F6D3DE +:107BB000032070BD002070BD0C48002101604160B1 +:107BC000704710B500F00CF85C6819B1012904D1B8 +:107BD000204301E024EA0000586082F3108810BDC1 +:107BE000EFF3108272B6014B704700009839002005 +:107BF000DFF854150A6892B200E00246086880B2C5 +:107C00008242FAD170472DE9FC4104461825DFF87D +:107C10003C85DFF83C65684308EB000730780628B0 +:107C200008D131787170347078754FF0FF30706022 +:107C3000002039E000F077F8B9680918B96008F158 +:107C40000803B96832786A439A589142327813D35C +:107C500008F1150315FB02FC13F80C30062B25D098 +:107C600008F108066B43F358994222BF08F1150347 +:107C70006A439A5CEED219E01146337869439A421E +:107C80000BD008F1140308F1150C5B5C15FB03F530 +:107C90000CF805407A753B7500E07A7508F114021E +:107CA0005454317871703470BDE8F68111466943DF +:107CB00008F115035B5C062B04D008F1140615FBD4 +:107CC00003F574557B753A7508F115025454EBE7CA +:107CD000F8B5DFF87C34DFF874541E7818240246B7 +:107CE0006243B0422A4404D118785870507D18700D +:107CF0000FE0167D507D92F815C005F1150766431B +:107D0000062807F806C004D0167D143514FB00F4CD +:107D10002E55012010731878062802BF00294FF055 +:107D2000FF315960F1BD10B5DFF82444606810F1EF +:107D3000010F0FD0FFF75CFF6168DFF81824814264 +:107D400061683CBF5388C918081A517848431178B4 +:107D5000C84000E0002080B210BD2DE9F84FDFF8E8 +:107D6000F453DFF8F4B3D5F80880D8F80000DBF856 +:107D700000104A0500F09BF9DFF8D463DFF8CCA3CC +:107D800021F4806181604FF0180934780AF108000D +:107D900019FB04F14758FFF7C6FF874217D20027A7 +:107DA0000121B170062C3DD019FB04F40AF1080141 +:107DB0000AF108020959814223BF0AF10801095951 +:107DC000091A002111510AEB04014C7DEAE7A98848 +:107DD0004118B94202D2AF880021E2E73F1ADFE73B +:107DE000022802DA2878012800D07F1ED8F8000087 +:107DF000C1684A07FAD500F060F9DBF80C00000C06 +:107E0000BFB247EA0047CBF80C70FFF7F1FE706095 +:107E1000A8680068816841F480618160AFF30080E8 +:107E2000BDE8F18FB8B20028DAD1FFF7E1FE70604B +:107E30000320BDE8F24FFCF7CDBC2DE9F843EFF38A +:107E4000108872B6C34DC14BA8680168CA224A6245 +:107E500053204862BE4A886820F4806088601820F9 +:107E60001678374647431F44387B022826D13C68A2 +:107E7000D7F810909078F0B17A7B012A0AD10121CD +:107E80003046FFF725FF88F310887968304600F008 +:107E900021F904E088F31088304600F0CCF8A86897 +:107EA0000068CA2141622246532141624846314658 +:107EB00000F05CF90BE0FFF750FF06E0C8684207EE +:107EC000FCD500F07EF8A549086088F31088FF21F2 +:107ED000A86802685162BDE8F183F8B59D4CA160C5 +:107EE000CA2209684A6253224A629B4A136843F0D5 +:107EF00020031360136803F00703C3F10403237026 +:107F000095682D0C05F07F056D1C6570EDB29268CB +:107F1000C2F30E02521C628092B2521E6A43A2F554 +:107F2000A072DA404FF6FF739A422CBFA380A28062 +:107F30008B4A136843F4002313608A4B1D6845F491 +:107F400000251D6048BB8248804E012383701825A0 +:107F50004FF0FF33436000235FFA83FC06F10C0708 +:107F600015FB0CFC4FF0000E07F80CE05B1CDFB2B9 +:107F7000062FF1DB06230370886820F48060886098 +:107F800000F01FF8D0600320FCF72FFCA168086800 +:107F9000826842F48042826005E0C868410544BFBF +:107FA0000320FCF717FCA1680A68FF20506200223A +:107FB00003210320FCF7C2FBBDE8F2400320FCF7DD +:107FC000DBBBC86800F0800060F49060C8604FF4CC +:107FD00000207047F0B504460025EFF3108672B616 +:107FE0001827DFF868C10CF10C0007FB05FE10F83C +:107FF0000E0010B16D1C062DF5DB062D0CD06F4365 +:108000000CEB07000127077386F3108804614273A5 +:1080100003600D700020F0BD86F310880120F0BDD4 +:1080200010B5044600F007F81820484A44431019D8 +:108030000021017310BDF8B50746EFF3108472B646 +:108040000320FCF7A4FB434DAE683068CA214162AF +:108050003A4653214162182043494243895C022930 +:108060001BD100213846FFF733FE39480178062935 +:108070000ED1306838490A68530500F018F821F429 +:1080800080618160C1684A07FCD500F016F804E001 +:108090004078884218BFFFF760FEA9680A68FF2091 +:1080A00050620320FCF768FB84F31088F1BD02D511 +:1080B000C1684A07FCD481687047C16801F080013B +:1080C00061F49061C1604FF40020244908600320EE +:1080D000FCF78BBB2DE9F04180460F464246182045 +:1080E0001A4942438C18207B022804BF4046FFF700 +:1080F000A2FFEFF3108572B60320FCF748FB154E84 +:10810000B0680068CA214162532141620220207395 +:10811000A76067604046FFF776FD0D490A78497809 +:10812000914202D0FFF719FE02E0A168081AA06090 +:10813000FF20B1680A6850620320FCF71DFB85F33D +:108140001088BDE8F081000028280040D8340020C5 +:10815000C039002084390020082800400C0800584D +:108160000008005880080058E43400201047000040 +:108170004D4900E04D4981B00A6802430A60096830 +:1081800008400090009801B0704780B5FEF7D9FE16 +:10819000FEF7D9FE4648016841F48031016000F0E5 +:1081A00058FFBDE801400EE000B587B068460FF209 +:1081B0005C211C22FAF7D2FB00F087FA684600F037 +:1081C00067FB07B000BDF0B585B068461421FEF727 +:1081D00091FB00260025002400210FF2001000EB87 +:1081E000C102907988B11368B3F1904F08D0314F34 +:1081F000BB4208D0304FBB4204BF9088044304E028 +:108200009088064301E090880543491C2629E4DB59 +:10821000002002900121032003900191B0B288B1A7 +:1082200000900120FFF7A4FF0120FFF7A3FF69469C +:108230004FF09040FEF762FB0022B1B24FF0904049 +:10824000FEF720FCA8B280B100900220FFF790FF5B +:108250000220FFF78FFF174E69463046FEF74EFBB0 +:108260000022A9B23046FEF70DFCA0B280B100900A +:108270000420FFF77DFF0420FFF77CFF0E4D6946C9 +:108280002846FEF73BFB0022A1B22846FEF7FAFB88 +:1082900005B0F0BD80B50021084800F019FFBDE829 +:1082A0000140FEF7CBBC00004C0000584C010058C8 +:1082B000900800580004004800080048EC290020FD +:1082C00070B504460D46164600F02CFF33462A468C +:1082D0002146BDE870400220FDF75ABE000000486C +:1082E00001000000000000480100000000000048FC +:1082F00001000000000000480100000000000048EC +:1083000001000000000000480100000000000048DB +:1083100001000000000000480100000000000048CB +:1083200001000000000000480100000000000048BB +:1083300001000000000000480100000000000048AB +:10834000010000000000004801000000000000489B +:10835000010000000000004801000000000000488B +:10836000010000000000004801000000000000487B +:10837000010000000000004801000000000000486B +:10838000010000000000004801000000000000485B +:10839000010000000000004801000000000000484B +:1083A000010000000000004801000000000000483B +:1083B000010000000000004801000000000000482B +:1083C000010000000000004801000000000000481B +:1083D000010000000000004801000000000000480B +:1083E00001000000000000480100000000000048FB +:1083F00001000000000000480100000000000048EB +:108400000100000000000048010000000000000022 +:108410000000000000000000DC82000828000320AB +:108420002C00032026040400414981B00A6802435D +:108430000A60096808400090009801B0704778B55C +:1084400085B0044668461421FEF754FA0CB90120A1 +:1084500004E0012C18BF022C02D10220FFF7E4FF38 +:1084600000F012F8009501200190002102200390F5 +:1084700000F004F800F00EF806B070BD02916946F5 +:1084800056F82400FEF73ABA0FF2B000294E30F841 +:108490001450704756F8240000222946FEF7F2BA1D +:1084A0000FF29801234B31F8101053F820000122ED +:1084B000FEF7E8BA0FF284011E4B31F8101053F8A2 +:1084C00020000022FEF7DEBAF0B585B004460D4666 +:1084D00068461421FEF70EFA0120FFF7A5FF2800D9 +:1084E000154E0FF260070AD137F8140000900021F2 +:1084F00001910120029002210391FFF7C0FF012D9D +:1085000013D137F81400009001214FF404100190AA +:10851000FFF7B4FF0FF23000045D00220F2160B2BC +:10852000FCF70CF960B2FCF727F905B0F0BD0000CC +:108530004C000058C4290020E4290020100001004C +:1085400002000000000400002800000000F0F3BE5C +:108550006C486D49016001F12002426001F1300276 +:10856000826001F13C02026201F14402426201F1C7 +:108570004C02C26001F15402026101F170024261D9 +:1085800001F1740282618031C16100F0F2BE38B540 +:1085900004465E4D284600F04FFF5A484068A168E7 +:1085A0000160E168C16085605949416000F0FDFEED +:1085B00058482AE080B5534842681368012119726F +:1085C000406800F0F8FE002002BD38B5514C4F4D18 +:1085D00004E000F041F8009821688847284600F040 +:1085E0002EFF0028F5D031BD4A484168084738B50C +:1085F0000446494D2846006040604248C068A16872 +:108600000160456000F0DCFE44482168016061685B +:108610004160002032BD80B53A48C268136810211D +:108620001972C06800F0D2FE002002BD35483B4AF6 +:10863000C168C16813680868184738B5374C364DAB +:1086400004E000F009F8009861688847284600F0C7 +:10865000F6FE0028F5D031BD6946284600F018BF67 +:1086600038B504462E4D284600F0E6FE2D48006041 +:10867000406024480069A1688160E168C1600561CB +:1086800021680160616841602169416161698161BE +:1086900031BD80B50146234800F0E4FEBDE802404C +:1086A0000FF2050000F09BBE38B5164C1D4D06E0DC +:1086B000FFF7D2FF00992069006900F0D3FE284639 +:1086C00000F0BDFE0028F3D031BD10B5164C204699 +:1086D000006040600B4841690C60BDE8104000F04C +:1086E00092BE1CB5104C06E06946204600F0D0FE54 +:1086F0000098C046C046204600F0A1FE0028F3D0F6 +:1087000013BD000000000320AC090320480A032029 +:1087100090080320A8390020500A0320B039002017 +:10872000380A0320A0390020400A03207FB50C46F8 +:108730004D4D61684D4EE8612962284600F0BAFE51 +:108740002468746006F1080000604060012000F0B9 +:1087500068F801203070296841B10FF2E9000FF28A +:10876000ED02009001920294684688477FBD1FB5D4 +:108770003E4C04F1080000F062FE00BB2178F1B12C +:10878000694604F1080000F083FE3748C16949B129 +:108790000098029001228DF8042001A888479DF8D6 +:1087A000040000E001202070207818B10098FFF745 +:1087B00070FF04E0009904F1080000F049FE04F1A4 +:1087C000080000F03CFE28B9207818B104F1080038 +:1087D000FEF7FAFC1FBD2DE9F04105460E46904616 +:1087E0001C46002000F01DF8204F7868A0F80950C2 +:1087F000C672324641460C30FAF7A0F81A4A13699D +:1088000000210020984748F2E800FEF7E4FC796870 +:108810008A78D21C04F10800FAF790F8BDE8F0411C +:1088200001201CB51049124C096A20B901B18847D2 +:108830000020207013BD0120207011B1BDE81C4044 +:10884000084713BD0020FEF7C3BC000010B5014669 +:10885000064C04F1080000F005FE04F10800BDE834 +:108860001040FEF7B1BC0000D83800207439002059 +:10887000D9390020FFF7AFFF9DF80E0005B000BD0D +:10888000F8B500F10C026B4625214FF66640F1E782 +:10889000F8B500F10C026B460F214FF66840E9E78E +:1088A000F8B502466B460E214FF67540E2E770B50B +:1088B0001B491C4B0A681C49C2F30D0201EB8201E3 +:1088C0000C6822689A4205D16569A169E269E3688A +:1088D000246904E025696169A2696368A4682E0EB1 +:1088E000067001722E0C467042722E0A8670C47396 +:1088F000C5F3031605F00F050571C6700D0E457121 +:108900000D0C85710D0A190E8172C571190CC17299 +:108910001B0A210E41730373210C8173002070BD6B +:108920003C400058B95646A9000003200EB4C0B51B +:10893000024603A800210190009101AB01210448E7 +:1089400078440C30F8F788FE06BC5DF810FB00BFD9 +:108950008B2B000018B58FB002A80FF28861DFF8EA +:10896000FC433422F9F7FAFF0FF2414001900094E2 +:1089700069460FF2214000F0A7FD01210220FFF718 +:1089800020F9DFF8DC2300212020FEF7FCFD02A8FF +:10899000FFF776FF08B1FEF747FA00F00DF900F097 +:1089A00077FE0FF2253200210120FEF7ECFD0FF2D9 +:1089B000553200210220FEF7E6FDDFF8A843002033 +:1089C00084F88000202000F00BFF00F03BFF0FF246 +:1089D000A933002204F181010020FFF7FBFA10B057 +:1089E00010BD2DE9F043074685B07878DFF8744371 +:1089F000DFF8746305284FF0000804F1800554D0B7 +:108A00003E2863D0FF280DD101203072B7F8030053 +:108A1000042842D040F20741884204D040F60201C7 +:108A2000884218D0A6E07879022804BFB9790029D5 +:108A3000F8D10020FFF73EFD0FF28430FFF776FFFC +:108A4000A878012806D12978062903D00021022020 +:108A5000FEF7A6FD8EE0002000F0C2FEF87930732C +:108A600001253889F08179893182BA897282FB893E +:108A7000B382388A04950090F082357BE08A0395B2 +:108A800010260296019601F021FA10B10220FFF79C +:108A900007FD202000F0A4FE6CE00120FFF700FDA0 +:108AA00068780A21FFF716FB64E0B888E18A8842FB +:108AB00060D1A4F8168085F800800FF23430FFF7FB +:108AC00035FF0120307200F059F853E0F8780128A2 +:108AD00002D002281DD04DE0B7F80500E082062044 +:108AE00028700FF23430FFF721FF86F8088000F07D +:108AF00045F8E08A01F079FA30B90FF24430FFF717 +:108B000015FF0FF2703001E00FF29830FFF70EFF03 +:108B100030E097F80D90787960BB29E007EB08000A +:108B2000847BC07BFF2821D1072C1FDB07EB0800CB +:108B3000007C01281AD10FF2AC30FFF7F7FE07EBEB +:108B40000800407C832811D10FF2B830FFF7EEFE09 +:108B50000120A870F8793070387A7070787AB07027 +:108B6000B87AF070F87A3071387B7071641CA04468 +:108B7000C845D3DB012005B0BDE8F083E08A7081F1 +:108B800006F1080000F07FBE7649CA8A824202D10F +:108B900091F8800070470020704780B500F093FF87 +:108BA000062805D0BDE8044000210120FEF7F8BCEE +:108BB000BDE8014000F079BE18B589B00020ADF8DD +:108BC0001A0001F0D0FA694C216811F1010F0DD0A3 +:108BD000674862680170120A090A41706168817011 +:108BE000C270110A120C0171427105E00020FEF7FB +:108BF00051FC08B90FF2C43002460621002000F0F3 +:108C0000BAFD4EF66E50089007AA2068554C0790A2 +:108C100006212E2000F0AFFD0FF2A83210211820FF +:108C200000F0A9FD0FF2AC321021082000F0A3FDE6 +:108C30001821012000F0C6FD01F090F90DF1160099 +:108C400006A90190009105AB07220021042001F044 +:108C5000FAFA0FF2D420BDF8181000900523BDF8E1 +:108C60001400002201F091F90DF11A000090022386 +:108C7000BDF81610BDF81400002201F086F900209E +:108C8000207001F094FA0120607001210820207109 +:108C9000A1701020607100210120E070049110216A +:108CA0003448A060039008220120019100920290B4 +:108CB00000230022012101F093FAA07808B101F00D +:108CC000F2FA0AB010BD0000264890F8801006297C +:108CD00000D1704780B50020FFF7E2FB4FF44871E8 +:108CE00001230022084601F0F5FA10B90FF24020E6 +:108CF00004E00220FFF7D4FB0FF26420BDE802403D +:108D0000FFF714BE18B587B00FF28420154CFFF79B +:108D10000DFE94F8800006281DD0102106910591C3 +:108D20004FF4FA7004905021002302912822002071 +:108D30000393019200904FF448710B4B00220846B8 +:108D400001F0F5FA08B9042003E00220FFF7A8FBC0 +:108D5000002084F8800008B010BD0000A0080320A7 +:108D600007950008683500201C3900208075FF1F1A +:108D70009039002007B201000120FFF79BBB0021C2 +:108D80002020FEF70DBC0120FEF730BC0120FEF7CD +:108D900035BC000010B50446616801F1080000F020 +:108DA00087FC00B10120207010BD000010B1012827 +:108DB00003D070473F20FEF707BC3F20FEF70CBCF6 +:108DC0002D2D204741502047454E4552414C2044CF +:108DD0004953434F564552592050524F43454455ED +:108DE00052455F434F4D504C455445440A000000E6 +:108DF0000D0A0D2A2A20444953434F4E4E454354F1 +:108E0000494F4E204556454E54205749544820530B +:108E10004552564552200A000D0A0D2A2A20434F7A +:108E20004E4E454354494F4E204556454E542057CB +:108E300049544820534552564552200A000000002C +:108E40000D0A0D2A2A2047415454205345525649B1 +:108E500043455320262043484152414354455249FB +:108E6000535449435320444953434F564552592084 +:108E7000200A00002A2047415454203A20205374ED +:108E800061727420536561726368696E6720507205 +:108E9000696D617279205365727669636573200D1F +:108EA0000A0D0000424C455F4354524C5F417070C4 +:108EB0005F4E6F74696669636174696F6E28292CEF +:108EC00020416C6C207365727669636573206469F8 +:108ED00073636F76657279204661696C6564200DF5 +:108EE0000A0D00002D2D2D205354204D414E554686 +:108EF00041435455524552204944202D2D2D200ADE +:108F0000000000002D2D2053455256455220444567 +:108F1000544543544544202D2D20564941204D4170 +:108F20004E2049440A0000005032505F43000000C8 +:108F3000200D0A0D2A2A2053544152542047454EF1 +:108F40004552414C20444953434F564552592028DD +:108F50005343414E29202A2A20200D0A0D000000EB +:108F60002D2D20424C455F4170705F5374617274C7 +:108F70005F4C696D697465645F446973635F5265D2 +:108F8000712C204661696C6564200D0A0D0000009B +:108F90000D0A0D2A2A2043524541544520434F4E85 +:108FA0004E454354494F4E20544F20534552564549 +:108FB00052202A2A20200D0A0D0000006C7AD8AC1D +:108FC00057720000123456789ABCDEF0123456788C +:108FD0009ABCDEF0FEDCBA0987654321FEDCBA09E3 +:108FE0008765432100000000000000000000000031 +:108FF00000000000000000004400080040050201DD +:1090000012279C00F4010000FFFFFFFF4801010050 +:1090100000200000000000007047000038B5EFF3AA +:10902000108472B6284D6946281D01F00CFB694674 +:10903000281D01F066FB38B184F31088BDF80010DC +:10904000224AFFF73DF931BD0120287084F31088D2 +:1090500031BD80B5FFF71EF90221009100231A48A7 +:1090600000F124014FF48052001D01F0D3F901BD3D +:1090700000BFF8B514460026EFF3108510F1010F7C +:109080001ED001281CBF02284FF0FF3618D1BCB1FA +:10909000264672B60C4F012392B2381D01F0CEF96C +:1090A00000281CBF3978002908D000223A7085F3C7 +:1090B0001088A1B2054AFFF703F901E085F3108893 +:1090C0003046F2BD00000000081400201D9000088A +:1090D00010B55A4C002220606160A28104F1140096 +:1090E0005749FBF79FFB574904F11400FBF7ADFB11 +:1090F00004F5397104F1140001F08EFC04F1140040 +:10910000FBF7B4FB0FF28103002204F110010020F1 +:10911000FEF760FFBDE810400FF23D020021802005 +:10912000FEF731BAF8B50C461546EFF31086434FFB +:10913000014638682246F9F701FCBD60FC8172B631 +:10914000387B20B101218020FEF72AFA01E00120BE +:10915000787386F31088F1BD10B5384CE289216828 +:1091600004F1140001F05FFC04F1140001F06FFC45 +:1091700028B1BDE8104001218020FEF711BAA06897 +:10918000BDE810400047000038B5EFF3108472B618 +:109190002A4D01202873687B18B101218020FEF739 +:1091A000FFF984F31088287CBDE83240FEF738BF11 +:1091B00010B5224C616804F1140001F03FFC04F189 +:1091C000140001F05AFC207C4AF21701FEF782FFDE +:1091D000002010BD0020704710B520281A4A02D088 +:1091E000212812D01FE008784B788C7840EA0320C1 +:1091F000CB7840EA044040EA0360106008791071BF +:1092000048795071887990710DE010680870030AF0 +:109210004B70030C000EC8708B7010790871507978 +:10922000487190798871002010BD80B5C046C04655 +:10923000064801F022FC002002BD00002C24002082 +:1092400080290020C8280020DC290020402400209C +:10925000C0680840884201D1012070470020704753 +:10926000C0690840884201D1012070470020704742 +:1092700010B5684C02212046FFF7F2FF38B1606854 +:10928000C043810703D5FFF7D8F9022018E0012178 +:109290002046FFF7E5FF38B16068C043C10703D53A +:1092A000FFF793F901200BE008212046FFF7D8FFD4 +:1092B00038B16068C043010703D5FFF712FA0820F0 +:1092C000A06010BD10B5534C02212046FFF7C0FF2F +:1092D00058B96068C043810307D5606840F4003026 +:1092E0006060BDE81040FFF7A1B908212046FFF7F4 +:1092F000AFFF70B96068C04301030AD56068464992 +:1093000040F400206060086880474FF40020A060AF +:1093100010BD20212046FFF79BFF58B96068C0436D +:10932000810207D5606840F400106060BDE810401D +:10933000FFF75AB910BD394881B0016841F4801176 +:109340000160006800F480100090009834480168C3 +:1093500041F4007101603348026842F40072026017 +:1093600040BF20BF3048016841F40041016001B0B6 +:10937000704780B52D48016841F480110160006894 +:1093800000F48010009000982248016841F001012B +:109390000160026842F4803202602C20FBF7ECF995 +:1093A000BDE802402D20FBF7E7B9214801684908D4 +:1093B0004900016070471F494FF4803008607047D2 +:1093C0001B48016821F002010160704718484FF402 +:1093D00000314160016821F400310160704738B507 +:1093E00004460C4D08212846FFF732FF30B10A48E9 +:1093F0000460686820F40020686031BDA0474FF425 +:109400000021A96031BD0A48016821F0080101600E +:1094100070470000000C0058C83900205001005867 +:10942000D4080058200800580C0400585000005878 +:10943000040C0058080C0058006040607047EFF3BF +:10944000108172B6026882420CBF012000201CE02D +:10945000EFF3108272B603680B6048600160086821 +:10946000416023E0EFF3108272B6086043684B60FE +:1094700041604868016019E0EFF3108172B64268FC +:109480000368136002684368536081F31088704773 +:1094900010B5EFF3108472B602680A600068FFE747 +:1094A000FFF7EAFF84F3108810BD0B6082F3108889 +:1094B000704700000249016002490161704700BF26 +:1094C000EF850008178600087FB50C466D4D616872 +:1094D0006D4EE8612962284601F0E2FA246805F140 +:1094E000240000604060746006F108000060406085 +:1094F00001203070296829B10FF2551000900294B4 +:10950000684688477FBD1FB55F4C04F10800FFF730 +:1095100096FF00BB2178F1B1694604F10800FFF71E +:10952000B7FF5848C16949B10098029001228DF8EF +:10953000042001A888479DF8040000E00120207065 +:10954000207818B10098FFF7A4F804E0009904F11E +:109550000800FFF77DFF04F10800FFF770FF28B94E +:10956000207818B104F10800FFF709FC1FBD2DE9B0 +:10957000F8430646002000F05FF874883088B2682F +:10958000DFF80081C4F3090444EA8024F068A4B23F +:10959000C1B2204600F03CF8002748F2E8094846EE +:1095A000FFF7F4FB08E06888A04202D1316928780F +:1095B0000870687800B1012708F12400FFF73FFF29 +:1095C000F0B9694608F12400FFF762FF009800F146 +:1095D0000B05407A0F28E6D0B5F80110A1420DD155 +:1095E0000098817AC81E7169C0B28842C8BF084617 +:1095F000706102463069E91CF9F7A0F92878D9E7CB +:109600003800CCD0012000F017F80020BDE8F2832C +:1096100010B513461C4A5468A4F80900E1720A46C2 +:10962000194604F10C00F9F789F9164A1369BDE8E7 +:1096300010400021002018471249096A82B008B979 +:1096400021B101E011B1012002B0084702B070471A +:1096500010B50146487A0F2818BF0E2807D10B48CD +:10966000FFF700FFBDE810400020FFF78CBB064C61 +:1096700004F10800FFF7F6FE04F10800BDE8104011 +:10968000FFF77DBB8838002064390020AC3800200B +:1096900023490020087700222248027100F044B8D4 +:1096A00020490A7941F822000879401C0871704766 +:1096B00070B504466078FF2802BFB4F8031001F4C7 +:1096C0007F41B1F5406F1FD10025154E317FE8B2C3 +:1096D000884222D2E9B256F8211020468847002855 +:1096E00008BF6D1CF2D018E0761C2979F0B28842D0 +:1096F0000AD2F1B255F82110204688470100F3D074 +:1097000002D0022805D006E02046BDE87040FFF7F1 +:1097100068B9002070BD012070BD0026014DE4E74E +:10972000FC380020B839002080B5C046C046C0468D +:10973000C046C046C046C046C046C046C046C046F9 +:10974000C046C046C046C046C046C046C046C046E9 +:10975000C046C046C046C046C046C046C046C046D9 +:10976000C046C046C046C046C046C046C046BDE82A +:10977000014001F09FB918B50C46C7B01146002250 +:109780008DF800208DF81C008DF81D4022460DF14B +:109790001E0001F090F900F03FF83F200C21ADF8D9 +:1097A0000400ADF8061007A8012103900691A41C3F +:1097B000049400F041F800284CBFFF209DF8000001 +:1097C00048B010BD00B5C7B000F01FF80F2000F082 +:1097D00028F800284CBFFF209DF8000047B000BDCE +:1097E00000B5C7B00021ADF81C008DF8001018229C +:1097F00001A801F066F9182000F013F800284CBF0A +:10980000FF209DF8000047B000BD00228DF8002029 +:109810008DF81C008DF81D101822002101A801F000 +:1098200050B9ADF8060007A9022004903F2201209C +:1098300003910690ADF80420CDF814D0002101A8C2 +:10984000FFF795BE80B50FF2B92200210420FDF785 +:109850009AFE0FF2792200210820FDF794FED348EA +:1098600000210180C18081700121C170002101713E +:1098700001720FF24100FFF713FFBDE802400FF243 +:109880003030FFF753B80278C84912B1012A03D02B +:1098900070474088C88070470020C880087A08B1A7 +:1098A00000220A720020FEF705BE00210820FDF705 +:1098B00077BE00002DE9F84F05466878FF2812D1E1 +:1098C000BA4CB5F80300618940F60442801A00F0F2 +:1098D0008B80801E4DD0001F06D0401F00F0B78047 +:1098E000401E00F0DD80EBE0B5F80560207A58B14D +:1098F0000846FFF749F9217A062908BF0028F2D166 +:1099000020724FF6FF7060816681E879297A91FBB9 +:10991000F0F914285FFA89F9E5D14FF0100A002711 +:109920000FF2A8284FF64066F8B24845DBDA05EB9F +:109930000A0B9BF809009BF80A1040EA0120B0428C +:1099400011D161894046FEF7F1FFABF107000178C4 +:10995000427841EA0221A1818178C07841EA002160 +:10996000E181082121720AF106005FFA80FA7F1C6A +:10997000DAE7B5F80500814202BF1126E87915281B +:109980003CD1297A0FF2B8290FF27C2B481E28729D +:109990004FF6426A4FF64168287A0028A3D0A919E9 +:1099A00005F10A02487A11F8057D925D497840EA8E +:1099B000022047EA01276189404508D050450CD173 +:1099C0004846FEF7B3FF0A202072A78205E05846FA +:1099D000FEF7ACFF0920207227821536287AA0F105 +:1099E00015012972F6B2D7E7B5F80500814201BF2B +:1099F00095F808B04FF00008E879012860D10027F9 +:109A00000FF2802942F6021AF8B2B0EB9B0F57DA38 +:109A100005EB080005F10A01C27A467A007B11F8CD +:109A2000081042EA0022524546EA012609D161891E +:109A30004846FEF77BFF207A0A2802D1E6820B21F6 +:109A4000217208F104005FFA80F87F1CDCE7B5F8AA +:109A50000500814202BFB5F80700A18A88422FD1D4 +:109A6000687A022802BFA87A6070012828D1E87AB3 +:109A7000A0704CA448B9FEF71DFD0FF28020FEF740 +:109A800055FF2046FEF752FF1AE00FF2B020FEF716 +:109A90004DFF2046FEF74AFF0020FEF701FD0FE0D4 +:109AA0000FF22820FEF742FF3FA0FEF73FFF60893C +:109AB000B5F80510884203D100210420FDF770FDA0 +:109AC0000020BDE8F28F3948007A704710B50FF2D8 +:109AD000AC20364CFEF72AFF32A0FEF727FF207994 +:109AE000401E8041C00F2071207A38B1218A6089E0 +:109AF000E31CBDE81040022200F0E5BA10BD0000F2 +:109B00001CB50120ADF802000021284C207AADF8E8 +:109B10000010002844D0C01F052841D8DFE800F01D +:109B20000308121823340FF29420FEF7FFFE13BD32 +:109B30000FF2A020FEF7FAFEE289A189608900F009 +:109B40006EFA13BD0FF2B420FEF7F0FE218A04E096 +:109B50000FF2E420FEF7EAFEA18A60898A1C92B225 +:109B600000F06EFA13BD0FF21430FEF7DFFEE18A4B +:109B700060890DF10203022200F078FA06202072BB +:109B80000220FEF797FC13BD0FF21830FEF7CEFE51 +:109B9000E18A60896B46022200F068FA0620207292 +:109BA00013BD0000200A0D000A0000004C390020FF +:109BB0002D2D2050325020434C49454E5420494EC3 +:109BC000495449414C495A4544200A002D2D20470B +:109BD000415454203A205032505F53455256494325 +:109BE000455F5555494420464F554E44202D20632E +:109BF0006F6E6E656374696F6E2068616E646C650C +:109C00002030782578200A002D2D204741545420FB +:109C10003A2057524954455F5555494420464F55BF +:109C20004E44202D20636F6E6E656374696F6E20E5 +:109C300068616E646C6520307825780A0000000049 +:109C40002D2D2047415454203A204E4F5449464927 +:109C5000434154494F4E5F434841525F5555494433 +:109C600020464F554E4420202D20636F6E6E656355 +:109C700074696F6E2068616E646C65203078257839 +:109C80000A0000002D2D2047415454203A20434C17 +:109C900049454E545F434841525F434F4E46494702 +:109CA0005F44455343524950544F525F55554944C0 +:109CB0002D20636F6E6E656374696F6E2068616ED0 +:109CC000646C6520307825780A0000002D2D20472F +:109CD000415454203A204143495F474154545F5016 +:109CE000524F435F434F4D504C4554455F5653458B +:109CF00056545F434F4445200A000000202D2D207C +:109D0000503250204150504C49434154494F4E200D +:109D1000434C49454E54203A204E4F5449464943FE +:109D20004154494F4E205245434549564544202D04 +:109D3000204C4544204F4646200A0D00202D2D2062 +:109D4000503250204150504C49434154494F4E20CD +:109D5000434C49454E54203A204E4F5449464943BE +:109D60004154494F4E205245434549564544202DC4 +:109D7000204C4544204F4E0A0D0000002D2D205050 +:109D80003250204150504C49434154494F4E20439A +:109D90004C49454E5420203A20425554544F4E20B1 +:109DA000505553484544202D20575249544520547E +:109DB0004F20534552564552200A20005032505FE2 +:109DC000444953434F5645525F53455256494345C4 +:109DD000530A00002A2047415454203A2044697312 +:109DE000636F766572205032502043686172616300 +:109DF0007465726973746963730A00002A204741AD +:109E00005454203A20446973636F76657220446528 +:109E10007363726970746F72206F66205458202DBE +:109E2000205772697465204368617261637465725A +:109E3000697469630A0000002A2047415454203A9B +:109E400020446973636F7665722044657363726939 +:109E500070746F72206F66205278202D204E6F74C0 +:109E6000696669636174696F6E20436861726163DA +:109E7000746572697469630A000000002A20474112 +:109E80005454203A20456E61626C652053657276A9 +:109E90006572204E6F74696669636174696F6E0ADA +:109EA000000000002A2047415454203A204469739E +:109EB00061626C6520536572766572204E6F7469BD +:109EC0006669636174696F6E0A0000002DE9F841EC +:109ED000C7B04FF00008ADF81C00DDF838C14F9E48 +:109EE000509F519D529C8DF8008007A800F01AF8F1 +:109EF000A0F808C0ADF8266087818DF82A508DF84B +:109F00002B4000F015F84FF4C17000F016F8102047 +:109F100000F017F800284CBFFF209DF8000048B063 +:109F2000BDE8F0814180ADF82020ADF822307047C7 +:109F30001822002101A800F0C4BDADF8060007A951 +:109F4000704704903F22012003910690ADF8042051 +:109F5000CDF814D0002101A8FFF709BB00B587B0E8 +:109F600000208DF8000000F07CF840F20110ADF800 +:109F700006003F220120069000F0EDF800284CBFBB +:109F8000FF209DF8000007B000BD30B5C7B01C46EB +:109F90004A9B00F0C7F800258DF800508DF821404D +:109FA000224619460DF1220000F085FD00F059F817 +:109FB0003F204FF4837100F0BCF8A41D049400F01E +:109FC000CCF800284CBFFF209DF8000047B030BD02 +:109FD0000023ADF81C008DF8003007A84180828076 +:109FE0000021182201A800F06CBD00B5C7B000F038 +:109FF00010F8FFF7F6FF0F2102914FF4897002214C +:10A0000000F0A1F800284CBFFF209DF8000047B0E9 +:10A0100000BD0021ADF81C008DF80010704700B5A0 +:10A02000C7B0FFF7D5FF0F21029140F2151000F0E5 +:10A0300089F800284CBFFF209DF8000047B000BD04 +:10A0400000B5C7B0FFF7C4FF0F21029140F217100F +:10A0500000F078F800284CBFFF209DF8000047B0C2 +:10A0600000BD1822002101A800F02BBD18B5C7B013 +:10A0700000F011F800F045F8FFF7F3FF40F221116E +:10A0800000F013F800F069F800284CBFFF209DF89D +:10A09000000048B010BD1446ADF81C00002207A80F +:10A0A0008DF80020418004717047ADF806103F2004 +:10A0B00007A9ADF8040003910F2001210290069139 +:10A0C000641D0494704718B5C7B000F010F8FFF78E +:10A0D000C8FF3F2040F2231100F019F800F03DF8CE +:10A0E00000284CBFFF209DF8000048B010BD14466A +:10A0F00000228DF80020ADF81C00ADF81E108DF880 +:10A100002040224619460DF1210000F0D4BCADF8E4 +:10A110000400ADF8061007A8012103900691641D04 +:10A1200004947047ADF81C00ADF81E108DF8202087 +:10A130007047ADF80400ADF8061007A801210390A0 +:10A14000069170470621ADF80600049107A8012189 +:10A150003F2203900691ADF80420CDF814D00021E1 +:10A1600001A8FFF704BA00B587B000F010F801208D +:10A1700003220690ADF80420ADF8062000F011F897 +:10A1800000284CBFFF209DF8000007B000BD002054 +:10A190008DF800001822002101A800F092BC039065 +:10A1A0000691CDF814D0002101A8FFF7E0B900B561 +:10A1B000C7B000F00CF8852000F0FCF800F0AEF815 +:10A1C00000284CBFFF209DF8000047B000BD0021D3 +:10A1D0008DF81C008DF80010182201A800F071BC49 +:10A1E0002DE9F841C7B04FF0000800F026F80DF156 +:10A1F0002300DDF844E14E9F4F9E509D529C8DF808 +:10A200001F30C0F800E08DF800808DF820708DF8C8 +:10A2100021608DF822508DF8274000F0EFF886205D +:10A22000ADF8060007A90C2000F074F800284CBF18 +:10A23000FF209DF8000000F0E6B88DF81C0007A88C +:10A24000417082707047F8B5C8B005460E46174693 +:10A250001C4600F023F808A8467087708DF820503F +:10A2600000F0C7F88A21ADF80A103F20032100F062 +:10A27000B3F8002848BFFF200ED49DF8000058B95D +:10A280004F994E98BDF801202280BDF8032002802E +:10A29000BDF805000880002049B0F0BD072200216C +:10A2A000684600F00EBC00B587B000F0AFF800F0D3 +:10A2B000A5F8922000F009F800F030F800284CBF13 +:10A2C000FF209DF8000007B000BDADF806003F225A +:10A2D0000120704718B5C7B000F011F800F08EF8F3 +:10A2E0000F2102919720062100F06DF800F017F879 +:10A2F00000284CBFFF209DF8000048B010BD00248E +:10A30000ADF81C008DF8213007A8418002718DF84E +:10A310000040704704903F22012003910690ADF861 +:10A320000420CDF814D0002101A8FFF720B92DE9B1 +:10A33000F04F0646C7B008461946559CDDF84091D7 +:10A34000519DDDF848B1539FDDF85081DDF858A1EB +:10A35000ADF81C60002307AE8DF8003070803271BC +:10A360000DF12100062200F0A6FB8DF82790B581A3 +:10A37000ADF82AB03782ADF82E80B482ADF832A0A5 +:10A3800000F03CF83F20ADF804009C210F20029023 +:10A39000ADF806101820049007A90120039106903B +:10A3A000FFF7BFFF00284CBFFF209DF8000047B01B +:10A3B000BDE8F08FADF8060007A901203F22039108 +:10A3C000049070470321ADF80600049107A801210D +:10A3D0003F22039006917047ADF80800059108A848 +:10A3E000072104900791CDF818D0002102A8FFF7AB +:10A3F000BEB81822002102A800F063BB1822002179 +:10A4000001A800F05EBB48B0BDE8F08100208DF8E7 +:10A410000000704710B5029C016042600021C160DD +:10A420000161416181610381A107047704D500893D +:10A4300010B14FF0FF3010BD002010BD2DE9F04FDE +:10A44000064685B030890C460027BB460028716956 +:10A45000DC460CBF4FF00208D84681B168B93069BC +:10A460007768451CBD4228BFED1B3768385C7D5DB1 +:10A4700000EB0527BF1CBFB203E0074600E000B1B8 +:10A4800002463069F568A84223BF7568281AC01BC8 +:10A490000020154608EB050903FB09FE864532BF7F +:10A4A0000020B0FBF9FA09FB1A00C0B2804509DAB6 +:10A4B00096F81C905FEAC97A48BF84465FEA8970C3 +:10A4C00048BFC446100000F0B48070687144614415 +:10A4D0008842C0F0AE8008EB020080B20390D946FB +:10A4E000100AADF802000294ADF80020049359E080 +:10A4F000800740D53089002840F09B803268D01812 +:10A50000A34600F8024C200A32681A4402F8010CF3 +:10A51000224630681844F8F711FA70692018706103 +:10A52000B069019C401CB061200A31680C70316830 +:10A5300048701CE08CB3307FC207D9D5308940B950 +:10A5400031681944FF2001F8020C3168194401F800 +:10A55000010C4FF0000B7069241874612C4630898F +:10A56000002340B931680C70210A30684170022321 +:10A570007069801C706108EB04070021BFB2316173 +:10A580005CB1DA44029800EB0A01306822461844B4 +:10A59000F8F7D4F970692418746109F10109B069F8 +:10A5A000401CB061049A70683169914545D27918B0 +:10A5B00081422CBF081A0846306103463089A0B991 +:10A5C0003068BDF80010C1545B1C7068316883426C +:10A5D00028BF1B1ABDF80200C8545B1C7068834278 +:10A5E00028BF1B1A7069801C706105FB09FA74682A +:10A5F000BDF80000E41A844288BF0446029800EBCC +:10A600000A01281BAC42019003D093D2307F00286E +:10A6100090D137682246F818F8F790F97069201839 +:10A620007061A346019C039F0023A9E73068404462 +:10A6300000E0002005B0BDE8F08F88448045F5D3E8 +:10A64000A8EB0008F2E7F8B5024600231089546928 +:10A6500000280CBF022500250026002C4DD060B933 +:10A66000D36857685E1CBE4228BFF61B1768FB5CA8 +:10A67000BE5D03EB0626B6B200E00646137F03F08C +:10A680000303012B23D14FF6FF77BE4208BF0028FA +:10A6900008D0D36817699F4219D2C0B15768FB1A16 +:10A6A000834214D25668D368A41B1C19002354613A +:10A6B000D36058B910680378012E94BFC6F1010623 +:10A6C0000126805D03EB0026B6B200E00646D7689F +:10A6D00054681368E819A04228BF001B034450695E +:10A6E000801B401B506105D0F719ED19A54228BF0A +:10A6F0002D1BD5609069401E906101B10E801846F7 +:10A70000F2BDF8B5024600241089536900280CBF39 +:10A71000022500250026002B3AD0D468234658B9DC +:10A720005768661CBE4228BFF61B176817F804C09E +:10A73000BE5D0CEB062600E00646177F07F0030718 +:10A74000012F1ED1B7B24FF6FF7C674508BF002826 +:10A7500007D150680023012894BFC0F101000120F7 +:10A760000AE01769A7420CD258B157683C1B8442D3 +:10A7700007D20023064604E014682678205C06EB26 +:10A7800000265068ED18854228BF2D1A106844191C +:10A7900001B10E802046F2BDF8B505464FF40770B2 +:10A7A000F6F75EFB040005F52F7602D1306002203B +:10A7B000F2BD346005F14C07287C40B94FF40073BA +:10A7C00000F032F8012028874FF4007305E04023A1 +:10A7D00000F02AF801202887402302220121284680 +:10A7E000F9F780FA0120A5F8780108231020788075 +:10A7F000032282212846F9F775FA01203880706813 +:10A800000168884704F5017100220A614A61287CC9 +:10A810000A6800280CBF4FF400734023012128462A +:10A82000F9F79DFA0020F2BD022281212846F9F7AE +:10A8300059BA38B504468121F9F75EFA04F13805B2 +:10A840000020288001212046F9F756FA0020A4F8BC +:10A85000780182212046F9F74FFA0020A882E88289 +:10A8600004F52F74206838B1616848688047206813 +:10A8700000F031F900202060002032BDF8B5054617 +:10A8800005F5277300201C6A8DF800000E46ADF810 +:10A89000020000270CB90320F2BD317811F06000EE +:10A8A00024D020283ED1F2887078D2B109060DD587 +:10A8B0005B6AD3F808C02146E047F288082A28BF1F +:10A8C000072221462846FAF73FFB30E004F50071E5 +:10A8D0000870F08848702146F2882846FAF744FB51 +:10A8E00025E05B6A9C683146A04720E0707830B173 +:10A8F00001281CD00A2809D00B2810D012E01878A3 +:10A9000003280FD102220DF1020104E01878032878 +:10A9100008D1012269462846FAF716FB07E01878A5 +:10A92000032804D031462846FAF7DFFA03273846D1 +:10A93000F2BDF8B5044604F52F739E681D680DB985 +:10A940000320F2BD0F46142010FB07F004EB000CAF +:10A95000DCF8180080B128225743F219926BB0FB43 +:10A96000F2F602FB160038B9CCF8180000230022DA +:10A970002046F9F7EDF90BE005F502700022C26000 +:10A980005A68136923B10A46006805F504719847AF +:10A990000020F2BD70B500F52F752C680CB90320AE +:10A9A00070BD04F50176F9F7E1F9B06004F50371C3 +:10A9B0006A683068D3689847002070BD1CB500F500 +:10A9C0002F70016809B9032016BD4368002B1EBF14 +:10A9D00001F500742078FF2804D062789B689847BE +:10A9E000FF202070002016BD4321018006487047DB +:10A9F0004321018005487047432101800448704786 +:10AA00000A2101800348704740280020FC270020CD +:10AA100084280020D029002009B903207047C0F8FD +:10AA2000C01200207047D0F8BC0208B9032070475C +:10AA300000F502700160826000207047D0F8BC020F +:10AA400008B903207047C0F804120020704710B501 +:10AA5000D0F8BC12012209B9032010BD01F502741F +:10AA6000E16841B9E260A168C162A36822688121FE +:10AA7000F9F76EF90022104610BD80B5D0F8BC126F +:10AA800009B9032002BDD1F80422017C00290CBFC2 +:10AA90004FF4007340230121F9F761F9002002BD52 +:10AAA0000249016002490161704700BF8F850008BB +:10AAB000B5850008704710B50446F7F73FFF2046FC +:10AAC00010BD10B5044610460A460146204600F067 +:10AAD00005F8204610BDF6F71EBB000062F30F22FA +:10AAE00062F31F42401810F0030308D0C91A1FD3A5 +:10AAF000DB0748BF00F8012D28BF20F8022D130006 +:10AB000030B414461546103928BF20E93C00FAD865 +:10AB1000490728BF20E90C0048BF40F8042D8900F0 +:10AB200028BF20F8022D48BF00F8012D30BC704727 +:10AB3000C91818BF00F8012DCB0728BF00F8012D58 +:10AB400070470000122008800FF2001070470420A8 +:10AB500008800FF20C10704710B500F029F80FF2C2 +:10AB6000980004E010B500F023F80FF2B000214681 +:10AB7000FAF7C6F9204610BD38B51A2008800E49EC +:10AB80004C68086889680D4D081809D00822A91C6E +:10AB900000F01EF8042205F11201204600F018F81A +:10ABA000284632BD10B500F003F80FF28400DEE74E +:10ABB0000A46034C70470000107AFF1F9C290020B2 +:10ABC000B832002010B5FFF7F3FF0FF27000CEE7A8 +:10ABD00030B5002393420DDA040F0A2C2CBF373412 +:10ABE000303401F8134001EB4305002400016C7080 +:10ABF0005B1CEFE730BD000053544D3332205669E3 +:10AC0000727475616C20436F6D506F727420696E41 +:10AC1000204653204D6F64650000000053544D6979 +:10AC200063726F656C656374726F6E696373000045 +:10AC300056435020436F6E666967000056435020AC +:10AC4000496E74657266616365000000120100025E +:10AC50000202004083044057000201020301000089 +:10AC6000040309041349002008604FF4E02212484D +:10AC7000016841F4700101604FF0B041086840F094 +:10AC8000010008608A600D480A6802400C480A60AA +:10AC9000036823F0050303604268520852004260D3 +:10ACA00000220848C8600861086820F48020086015 +:10ACB0008A61704708ED00E088ED00E0FBFEF6FADF +:10ACC000940000580010042201000000030000005E +:10ACD0000500000001000000010000000600000067 +:10ACE0000A00000020000000020000000400000034 +:10ACF000080000001000000040000000800000007C +:10AD00000001000000020000A0860100400D0300C9 +:10AD1000801A060000350C0040420F0080841E009F +:10AD200000093D0000127A000024F40000366E0194 +:10AD30000048E801006CDC02000000000000000098 +:10AD400000000000000000002DE9F04107468846A1 +:10AD5000387810F0030F16461D4633D0384600F001 +:10AD600099F878BBB8F1000F1CBFD8E9000186192B +:10AD7000012D2ED13888C10415D5396A07F1440256 +:10AD8000384600F0A3F83A6B044602B93A69F9680C +:10AD9000384600F09BF8361B341A7A69F968384651 +:10ADA00000F094F8261A1EB94DB916F1010F09D01A +:10ADB00097F903002A46314600F08EF8064616F150 +:10ADC000010F09D12320AFF300804FF0FF30BDE821 +:10ADD000F081022DE8D1EBE7388810F4405F0ED007 +:10ADE0007868F86038617861B8617868F86107F16F +:10ADF0004400386207F13000786200203863B8F10F +:10AE0000000F05D0D8E9020107F13402C2E90001C0 +:10AE100039884CF6FF60014039800020BDE8F081A0 +:10AE200070B50546AFF300802888810415D56E689B +:10AE30000024EA6895F903003146914212D2521A71 +:10AE4000FEF716F910F1010F1CBF00283618F0D1DB +:10AE50000FE04DF6FF70014029802846AFF30080D7 +:10AE6000002070BD00220021FEF702F910F1010F51 +:10AE700000D101246868E860A861E861002C298895 +:10AE8000E7D041F4007129802846AFF300804FF0ED +:10AE9000FF3070BDF8B5A0B9AFF3008000250A4EB1 +:10AEA00008244FF0FF37306820B1FFF7B9FF0028C2 +:10AEB00048BF3D46361D641EF5D1AFF300802846DD +:10AEC000F2BDBDE8F240ABE760290020914234BFFB +:10AED000511A0021084670473EB504000D00012AB2 +:10AEE00002D100F063F807E0022A07D100940020A5 +:10AEF000019069460C20ABBE2D1801E0002A0CD150 +:10AF00000094019569460A20ABBE002805D10022B5 +:10AF10002100280000F027F801E00020C04303B022 +:10AF200030BD000010B4314A002113461C68844231 +:10AF30001EBF491C9C6884421EBF491C1C69844278 +:10AF400009D09C69491C844205D0491C2033102932 +:10AF5000ECD310BC7047002342F8313002EBC10142 +:10AF60004B6010BC704778B4204C002325462E68F7 +:10AF70008E421EBF5B1CAE688E421EBF5B1C2E69DC +:10AF80008E4209D0AE695B1C8E4205D05B1C203519 +:10AF9000102BECD372BC7047054604EBC303012AA7 +:10AFA00004BF59684D195D6072BC704710B40F4AF8 +:10AFB000002113461C6884421EBF491C9C688442C1 +:10AFC0001EBF491C1C6984420AD09C69491C8442EA +:10AFD00006D0491C20331029ECD310BC0020704748 +:10AFE00002EBC100406810BC704700006C360020C6 +:10AFF00010B50446E068A169884251D3218849F21E +:10B0000002030B40022B08D008044CBF4FF4007021 +:10B010004FF48440014321803BE001F4C042B2F58B +:10B02000C04F06D1A168884203D32046FFF732FF04 +:10B0300078BB208810F4406F02BF606804F14401BF +:10B04000884217D14FF40070F5F70AFF606030B9FD +:10B0500004F144006060E060401CA0600AE02188C8 +:10B0600041F040012180E060606100F5007260689D +:10B07000A260E06160682061A068A061207841075B +:10B080000AD502220021204600F00CF810F1010F31 +:10B0900002D14FF0FF3010BD208840F4C040208026 +:10B0A000002010BD70B504460D461646AFF3008073 +:10B0B00033462A4600212046FFF746FE0546204635 +:10B0C000AFF30080284670BD2DE9FC4D016800F10A +:10B0D0000805490805EBC102019200F10802406829 +:10B0E00000F0010A02EBC108400808EBC00B002089 +:10B0F0000021019A95422FD02A68AE186A6832441E +:10B1000000920835009A9642F3D016F9014B009A46 +:10B11000964205D12A68AE186A6832440092083512 +:10B1200016F8017B884210D1D84508BFF6F770FAAF +:10B13000D8F80000D8F80410BAF1000F18BF48443E +:10B140000144884208F10808EED0002C00F8017B89 +:10B1500005D5641CE6D1D5E75846BDE8F68D641EDA +:10B16000D5D5CFE738B504000ED0207810F0030F06 +:10B1700003D094F90300002809D5AFF300802046DE +:10B1800000F030F8AFF300804FF0FF3032BD2046C2 +:10B19000FFF780FE0546AFF300802078410644BFEC +:10B1A0006068FFF798FC0020606094F903000228B3 +:10B1B00004D900F055F808B14FF0FF35E06B48B105 +:10B1C00000F05AF808B14FF0FF35E06BFFF783FC51 +:10B1D0000020E063204600F005F8AFF30080284629 +:10B1E00032BD000001780A0626D51C4A13680021EA +:10B1F000834203D1002342F821301BE05368012130 +:10B2000083421EBF022193688342F3D0D368032197 +:10B2100083421EBF042113698342EBD05369052189 +:10B2200083421EBF0621936983421EBF0721D36953 +:10B230008342DFD0FFF74FBC002101804FF0FF3188 +:10B24000C17000F144014160C160016141618161EF +:10B25000C161016200F13001416270476029002044 +:10B260001CB50200009269460220ABBE040010002B +:10B27000FFF758FE200016BDE0B50090F7F72CF957 +:10B28000019069460E20ABBE03B000BD7047FEE7DB +:10B29000FEE7FEE7FEE770477047704700F028B80A +:10B2A00000E000BF0A48F7F7AABF0A48FAF736BD20 +:10B2B0000948F9F71ABF0948F9F717BFFDF7D8BFD2 +:10B2C000FEF700B800F01CB80548FAF727BD0000EB +:10B2D000EC2D0020EC36002048340020B83300204C +:10B2E0004C3700204FF48060FBF7D3BBFCF7A5BDC3 +:10B2F000024841680278891841607047B8290020E7 +:10B300000449C8680A6882430A60486000F004B8CB +:10B310000000000000150058704738B50C46C5B253 +:10B320002046AFF30080E068A169884204D320463C +:10B33000FFF75EFE00280FD4E068401CE06000F8D4 +:10B34000015D2088010503D440050BD50A2D09D1E4 +:10B350002046FFF79FFD28B12046AFF300804FF055 +:10B36000FF3032BD2046AFF30080284632BD19E0E1 +:10B3700050F8042BD30744BFA9F101039A18091F01 +:10B380000023042942F8043BF9D25FEA817C13468A +:10B3900004D54FF0000CA2F800C09B1CC90744BFA5 +:10B3A0000021197050F8041B0029E1D170470000FA +:10B3B00038B50D4D0824286800281CBF017811F00D +:10B3C000030F05D090F90310002958BFFFF7CAFEFC +:10B3D0002D1D641EEFD1BDE83840002200214FF042 +:10B3E000FF30FDF745BE00BF6029002010B50749BA +:10B3F00079441831064C7C44163404E00A68081D70 +:10B40000114488470146A142F8D110BD2C0000002C +:10B41000780000004EF68851CEF20001086840F432 +:10B4200070000860BFF34F8FBFF36F8F4FF0007055 +:10B43000E1EE100A7047000037FFFFFFF00F000039 +:10B44000EC290020700800003000032000000000FC +:10B4500079FCFFFF020000000200000094010000E0 +:10B460000200000028000320080000005DFCFFFF30 +:10B4700002000000020000007A01000069020000E2 +:10B4800008140020E4150000000000000000000087 +:10B4900000000000000000000100000002000000A9 +:10B4A00003000000040000000120C046002801D075 +:10B4B000FFF79CFFAFF300800020AFF30080FBF7A5 +:10B4C00010FB00F000F800F001B800000746FFF79D +:10B4D0006FFF3846F6F7B6F8FBE738B504460D4679 +:10B4E000284600F005F8A84218BF0024204632BDC7 +:10B4F0000149FFF712BF00BF6C27002001488047B9 +:10B500000148004765AC00080DB50008AFF30080A6 +:10B51000FFF780FFFFF7C8FF00002E00FFF7FEBF18 +:10B52000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4F +:10B53000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3F +:10B54000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF2F +:10B55000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF1F +:10B56000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF0F +:10B57000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFFF +:10B58000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFEF +:10B59000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFDF +:10B5A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFCF +:10B5B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFBF +:10B5C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAF +:10B5D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF9F +:10B5E000FFF7FEBFFFF7FEBFFFF7FEBF002070476B +:10B5F000F80000018100810081008100810081004C +:10B600008100810081008100810081008100810032 +:10B610008100810081008100810081008100810022 +:10B620008100810081008100810081008100810012 +:10B630008100810081008100810081008100810002 +:10B64000D30027B1910008D5910008D99100082BAB +:10B65000920008EDB5000801040000682700206989 +:10B660002700206827002068270020FC00036827A7 +:10B670000020FC00076827002054270020E000136A +:10B6800002040101FC3700204C380020FC37002068 +:10B69000FC370020FC0003FC370020FC0007B0272B +:10B6A00000209C270020E0001302080202AC3700B3 +:10B6B00020FC370020AC370020AC370020FC000312 +:10B6C000AC370020FC0007F8270020E4270020E02A +:10B6D000003109024300020100C0320904000001E8 +:10B6E00002020100052400100105240100010424C8 +:10B6F0000202052406000107058203080010090460 +:10B700000100020AFD0040070501020002000705D2 +:10B7100081020002000009024300020100C0320958 +:10B7200004000001020201000524001001052401AB +:10B730000001042402020524060001070582030813 +:10B74000001009040100020AFD000B070501024078 +:10B7500000000705810240FD003109074300020196 +:10B7600004C0320904000001020201000524001097 +:10B77000010524010001042402020524060001073A +:10B7800005820308001009040100020AFD000B07EE +:10B790000501024000000705810240FD000B99A74A +:10B7A000000833A800087DA80008FC000BBDA90014 +:10B7B0000833A9000895A90008F4002BF1A9000896 +:10B7C000E9A90008F9A9000801AA000818B50008AD +:10B7D00018B5000818B5000818B5000818B5000815 +:10B7E00018B5000818B50008F8FF0B1AB5000818BE +:10B7F000B5000818B50008FAFFEA00F8FFF4000BDE +:10B80000242700206C270020B4270020EC001D45D1 +:10B81000AB00084FAB000865AB000859AB000879D6 +:10B82000AB0008A5AB0008C5AB00081A03E6000092 +:10B8300001F9000010FA000C480004004800040060 +:10B84000480A060002FD00014001FC0001C201FDA2 +:0BB85000000008FC00044800093D0057 +:040000050800B50D2D :00000001FF diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h index 50f745e32..e8a26430c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -250,6 +250,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -259,11 +263,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -271,6 +279,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -603,5 +624,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h index c95d8bea9..286cf657d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h index dbeb8cd93..2a5ac9220 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -211,5 +211,3 @@ #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h index 8d481bc18..8394a102b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/main.h index 04ce3872e..536f37570 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h index 14348875e..746cb11b9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h index a2c0b1e4f..84b3315f8 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -76,5 +75,3 @@ void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c index 65f9cac58..6b989f951 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -44,7 +44,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -133,8 +133,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -417,5 +425,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c index 6c6f8cee3..0ec43e28f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -68,6 +70,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ @@ -187,15 +191,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } return; } +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ void APPE_Led_Init( void ) { @@ -289,4 +429,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/main.c index ad8048d71..f21d291ee 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @verbatim @@ -33,6 +32,7 @@ detailed procedure to change the Wireless Coprocessor binary. @endverbatim + ****************************************************************************** */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -667,5 +667,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c index 9cfeed587..82273e9f4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -364,5 +363,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c index 767a11175..68b8bdd6e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -351,4 +350,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c index efd4c8554..ff7fcaf3b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -349,5 +348,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c index 4e8a83ce5..33404dccc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -274,7 +273,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1020,5 +1020,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h index 6b4e0da4d..b9d2ab968 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -89,5 +88,3 @@ extern "C" { #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h index 182245ed4..33efb1779 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,4 +63,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h index aac642b01..ff54850bd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/ble_dbg_conf.h @@ -1,23 +1,23 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* USER CODE END Header */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BLE_DBG_CONF_H @@ -215,5 +215,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c index 664a3bd11..34497f908 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -120,7 +119,7 @@ typedef struct{ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonStatus; @@ -700,7 +699,7 @@ void Update_Service() aP2PClientContext[index].P2PServiceEndHandle); break; - case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No decriptor */ + case APP_BLE_DISCOVER_WRITE_DESC: /* Not Used - No descriptor */ APP_DBG_MSG("* GATT : Discover Descriptor of TX - Write Characteritic\n"); aci_gatt_disc_all_char_desc(aP2PClientContext[index].connHandle, aP2PClientContext[index].P2PWriteToServerCharHdle, @@ -743,5 +742,3 @@ void Update_Service() return; } /* USER CODE END LF */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h index bbb0aaa39..37f8eb064 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/p2p_client_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.h * @author MCD Application Team * @brief Header for p2p_server_app.c module - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -79,5 +78,3 @@ void P2PC_APP_SW1_Button_Action(void); #endif #endif /*__P2P_APPLICATION_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..5d488c347 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/readme.txt index 441677f22..17bcd704b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pClient/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pClient application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h index bb4cca1f4..895e9983d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -262,6 +262,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -271,11 +275,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -283,6 +291,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -622,5 +643,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h index 77ead2384..1db7656d6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -65,5 +64,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h index 6303f58f6..dab9e3d3f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file hw_conf.h - * @author MCD Application Team - * @brief Configuration of hardware interface + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -272,5 +271,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h index 36d2774f2..b8fb410ec 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h index 8ac183b32..11ba9e13f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h index ed0f50443..5a62284ed 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c index 65f9cac58..6b989f951 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -44,7 +44,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -133,8 +133,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -417,5 +425,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c index 99e63e589..fb3d02bc0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -69,6 +70,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ static void Led_Init( void ); @@ -189,12 +192,149 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } return; } @@ -291,4 +431,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c index 30cec46cb..6bc788731 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c index 15e13bd46..9058386d9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -670,5 +670,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c index 4f3093e2a..94ce189f0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -365,4 +364,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c index d20eee004..7c30da6cd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -354,4 +353,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c index efd4c8554..ff7fcaf3b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -349,5 +348,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c index e86fc51a0..3116aa4f3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -418,7 +417,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1920,4 +1920,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h index 5110383cf..e3526b7f8 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -109,5 +108,3 @@ typedef struct #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h index ff9001303..9eefd989d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,4 +63,3 @@ #define BLE_CFG_GAP_APPEARANCE (BLE_CFG_UNKNOWN_APPEARANCE) #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h index 845d0f00d..a869a5aad 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/ble_dbg_conf.h @@ -1,23 +1,23 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* USER CODE END Header */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BLE_DBG_CONF_H @@ -197,5 +197,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c index 4c36471c1..e4deb9158 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_routeur_app.c * @author MCD Application Team * @brief P2P Routeur Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -93,15 +92,15 @@ typedef struct{ typedef struct { /** - * used to chek if Client (Smart Phone) can receive push button information + * used to check if Client (Smart Phone) can receive push button information */ uint8_t Notification_Button_Status; /** - * used to chek if Client (Smart Phone) can receive end device connection information + * used to check if Client (Smart Phone) can receive end device connection information */ uint8_t Notification_EndDevice_Status; /** - * provide end device Managment information + * provide end device Management information */ EDS_STM_Status_t EndDeviceStatus; /** @@ -480,7 +479,7 @@ static void Client_Update_Service( void ) switch(aP2PClientContext[index].state) { /* USER CODE BEGIN aP2PClientContext */ - case APP_BLE_DISCOVER_LED_CHAR_DESC: /* Not Used - No decriptor */ + case APP_BLE_DISCOVER_LED_CHAR_DESC: /* Not Used - No descriptor */ APP_DBG_MSG("* GATT : Discover Descriptor of Led Characteritic\n"); aci_gatt_disc_all_char_desc(aP2PClientContext[index].connHandle, aP2PClientContext[index].P2PLedCharHdle, @@ -917,4 +916,3 @@ static SVCCTL_EvtAckStatus_t Client_Event_Handler(void *Event) /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ /* USER CODE END FD_LOCAL_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h index 0d8ec9afc..7c21788f9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/p2p_routeur_app.h @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_routeur_app.h * @author MCD Application Team * @brief Header for p2p routeur application module - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void P2PR_APP_End_Device_Mgt_Connection_Update( P2PR_APP_Device_Status_t *p_devi #endif #endif /*__P2P_ROUTEUR_APP_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/readme.txt index 56704b2a8..e5cd50d59 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pRouteur/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE P2P Router application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex index 1a054726c..d233cec0b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Binary/BLE_p2pServer_reference.hex @@ -1,24 +1,24 @@ :020000040800F2 -:1000000090330020F9920008E1910008E391000884 -:10001000199300081D9300082193000800000000B8 -:10002000000000000000000000000000E591000852 -:10003000E791000800000000E9910008EB9100083A -:1000400025930008299300082D93000805920008C5 -:100050003193000835930008399300083D93000858 -:100060004193000845930008499300084D93000808 -:100070005193000855930008599300085D930008B8 -:10008000619300086593000869930008F9910008DE -:10009000F79100086D9300087193000875930008AC -:1000A000799300087D9300088193000885930008E8 -:1000B000899300088D930008919300089593000898 -:1000C000999300089D930008A1930008A593000848 -:1000D000A9930008AD930008B1930008B5930008F8 -:1000E000EF910008B9930008BD930008C193000880 -:1000F0000D92000809920008C5930008C9930008F2 -:10010000CD930008D1930008D5930008D993000837 -:10011000DD930008E1930008E5930008E9930008E7 -:10012000ED930008F1930008F5930008F993000897 -:10013000FD930008019400080594000881B000F5C3 +:1000000008100020E5B8000875B6000877B60008AB +:1000100079B600087BB600087DB600080000000035 +:100020000000000000000000000000007FB6000893 +:1000300081B600080000000083B6000885B60008FD +:1000400005B9000809B900080DB90008D5B60008BF +:1000500011B9000815B9000819B900081DB9000840 +:1000600021B9000825B9000829B900082DB90008F0 +:1000700031B9000835B9000893B6000839B900084D +:100080003DB9000841B9000845B900088BB6000821 +:1000900089B6000849B900084DB9000851B90008EF +:1000A00055B9000859B900085DB9000861B90008E0 +:1000B00065B9000869B900086DB9000871B9000890 +:1000C00075B9000879B900087DB9000881B9000840 +:1000D00099B600089FB6000885B9000889B90008DC +:1000E000CDB600088DB9000891B9000895B900088F +:1000F000A5B60008A9B60008ADB6000899B9000871 +:100100009DB90008A1B90008A5B90008A9B900085F +:10011000ADB90008B1B90008B5B90008B9B900080F +:10012000BDB90008C1B90008B1B60008C5B90008DA +:10013000C9B90008CDB90008D1B9000881B000F5EF :10014000E0700268914203D343681A44914202D39B :1001500080680028F5D101B07047DFF8681708689B :1001600090B94FF4805048604FF480324FF0FF3028 @@ -114,7 +114,7 @@ :100700003868884608B9FFF728FDB96801EB08008A :100710002F30491E20EA010188457DD205F5D876A3 :10072000B06828B1326889188A4275D2884273D37A -:1007300000F0AEFF01001CBF0C6811F1010F6BD07F +:1007300000F072FF01001CBF0C6811F1010F6BD0BB :100740003068201805F5D87230605368984238BF79 :1007500018467060A86960BB286908B1814200D260 :100760002961316174610020F06105F12802386867 @@ -139,7 +139,7 @@ :10089000C368283199420BD200F5E0710C68A2427E :1008A00003D34D682C44A24202D389680029F5D1B4 :1008B000C16999423CBF4FF0FF31C16132BC002099 -:1008C00070470000F0220020F01C00206859883C8E +:1008C0007047000024390020083100206859883C16 :1008D0002DE9F84F00258946090AC9F1000B08BF28 :1008E000002323D0B1F5803F28BF1F231ED2A1F5DE :1008F0008072120C02F008029140A1F580531B0C8B @@ -351,2046 +351,2666 @@ :1015D0000BD1D6F8C80100E080680028FCD14FF09C :1015E000FF30306201E000F013F8AFF30080BDE897 :1015F000F387316990688A4228BF8842E3D3C56087 -:101600009560A860EA600020A861DEE7F01C002079 -:10161000012000F053B8F0B4024610689568131822 -:10162000506803EB5004C00721D54D441FE0F0BCC7 -:1016300002F10C00704713F8017B05F8017B491E8D -:10164000F9D1A0B1B60813F8011B06F00306032E6A -:1016500008BF13F8016B01EB06214942801C2944A5 -:1016600005D011F8016B05F8016B401EF9D1A342BA -:10167000DDD013F8016B16F0030104BF13F8011B52 -:10168000C91C30090F28DAD113F8010B0F30D6E747 -:101690000749086808B1002070470648C008C00024 -:1016A00008600549C908C900091A0160704700BFF0 -:1016B00080230020973300209037002080B5AFF3BF -:1016C0000080024A11001820ABBEFBE72600020092 -:1016D0002DE9F0439FB00FF29C16269CDFF8E48AB8 -:1016E00002918DF83B4000210B914FF0FF370446EB -:1016F00091461D460AE019F8011B0298A0470028F0 -:10170000029000F0A4800B98401C0B9099F8000008 -:1017100050B12528EFD100200021059006910790B7 -:10172000089109900A9103E00B98A7E041F00101AC -:1017300019F8010F2028F9D023280CD02B2804D029 -:101740002D2805D0302809D083E041F00201EFE7D1 -:1017500041F00401ECE741F00801E9E741F0100134 -:10176000E6E700200D900AE00D98404505DA00EB11 -:10177000800302EB4302303A0D9209F1010999F816 -:101780000020A2F130000A28EED399F800002E289C -:1017900018BF0C9726D119F8010F2A2808D12868FC -:1017A000286009F1010950F8042B28600C9219E017 -:1017B0002D280CBF19F8010B002000220C920BE021 -:1017C00040B90C9A424505DA02EB820203EB420370 -:1017D000303B0C9309F1010999F80030A3F1300274 -:1017E0000A2AEDD3ADF83810304699F8001000F011 -:1017F00081FE08B119F8010B8DF83A009DF83A0006 -:10180000682804BF99F80010682903D162208DF878 -:101810003A0008E06C2804BF99F800006C2804D155 -:1018200071218DF83A1009F1010910A804902A4697 -:1018300019F8013B6946204600F060F838B910AA53 -:101840006946204600F08CF900287FF55FAF3846E6 -:1018500014E02A2885D12A682A6052F8040B2A60ED -:1018600000280D9003D540420D9041F0040109F18C -:1018700001098AE7686A6C747A4C00001FB0BDE801 -:10188000F083622820D0682811D06A2803D06C2801 -:1018900027D0712825D10868C01D20F007000860F6 -:1018A000D0E9002308300860194610467047002A26 -:1018B0000A680A60106803D0121D0A6000B217E0BF -:1018C000121D0A6080B217E0002A0A680A601068D8 -:1018D00003D0121D0A6040B20AE0121D0A60C0B2B5 -:1018E0000AE0002A0A680A60106803D0121D0A6024 -:1018F000C1177047121D0A600021704770B51C4661 -:101900000D46B4F125002E69114600F017811C38F0 -:101910006AD0001F022867D9133843D0093863D032 -:10192000801E16D0401E1ED0401E02285CD9001F0B -:1019300019D0401F00F08380401E33D0401E00F0BD -:10194000CD80C01E00F0D880801E2BD0C01E29D0B4 -:10195000FAE06869421C6A610A680A6052F8043B4E -:101960000A603354FAE095F83A000122FFF789FF44 -:10197000C5E900010023994204DA6869411C6961E4 -:101980002D210DE0288F810704D56869411C69610C -:101990002B2105E0C00722D56869411C696120211F -:1019A00031541CE095F83A000022FFF76AFFC5E9C0 -:1019B000000195F83800010711D5D5E90023002072 -:1019C000834208BF82420AD044F02000782806D122 -:1019D000686930213154401C411C696134542146EE -:1019E00068693044E86083E00868C01D20F00700A3 -:1019F0000860D0E9002308300860C5E90023D5E974 -:101A00000001C80F04D06869411C69612D210DE0F7 -:101A1000288F810704D56869411C69612B2105E085 -:101A2000C00704D56869411C696120213154686987 -:101A30003044E8602146284600F0C4F98EE005F104 -:101A40003A02507820B14FF0FF340FF648205EE0A4 -:101A50001078622808D0682824D06A2812D06C2810 -:101A60002ED071280ED02BE00A680A6052F8040BC1 -:101A70000A6020B94FF0FF340FF6302047E0E96AE2 -:101A800001706BE00A680A6052F8040B0A6020B922 -:101A90004FF0FF340FF6142039E0EA6AD317C0E99B -:101AA00000235BE00A680A6052F8040B0A6020B960 -:101AB0004FF0FF340FF6F41029E0E96A01804DE0A1 -:101AC0000A680A6052F8040B0A6020B94FF0FF342C -:101AD0000FF6D8101BE0E96A01603FE00A680A606F -:101AE00052F8040B0A600021C5E90001EE6078217C -:101AF000284600F0BBF831E00868086050F8044B55 -:101B00000860EC603CB94FF0FF340FF6B81000F0FD -:101B1000FDFC201A70BD2E6B002E04D5204600F06F -:101B200017FD044608E032460021204600F02CFD57 -:101B3000002814BF041B3446AC610FE06869411CE7 -:101B400069612521315409E06969481C68612522D1 -:101B50007254210002D0411C69613454002070BDD0 -:101B60002DE9FC410F460646796B7869BC6A091A73 -:101B7000386A091AB869091A786A091AF869091AD3 -:101B800097F838000C1B410790460FD42021002CF9 -:101B90008DF800100ADD254601236A463946304695 -:101BA00000F060FC00285DD16D1EF5D17B694246D6 -:101BB0003946304600F056FC002853D130208DF8CD -:101BC00000003D6A002D09DD01236A463946304692 -:101BD00000F048FC002845D16D1EF5D1BB69FA68BC -:101BE0003946304600F03EFC00283BD130208DF8CD -:101BF00000007D6A002D08DD01236A463946304623 -:101C000000F030FC70BB6D1EF6D1F868B969FB6955 -:101C100042183946304600F025FC18BB30208DF8BC -:101C20000000BD6A002D08DD01236A4639463046B2 -:101C300000F018FCB0B96D1EF6D197F838004107D6 -:101C40000DD52021002C8DF8001008DD01236A46F7 -:101C50003946304600F006FC20B9641EF6D100205B -:101C6000BDE8F6814FF0FF30BDE8F6812DE9FC4775 -:101C700007468A463E69BAF16F0F08BF082405D0AF -:101C80004AF02001782914BF0A2410243C25D7E902 -:101C90000023BAF1640F18BFBAF1690F9046994654 -:101CA00006D100218B4203DAD8F1000869EB49091B -:101CB0000020814508BF80451FD1386BE8B9082C4A -:101CC0004CD197F83800010748D530203B2586F8DD -:101CD0003B0043E000280ED597F8380000F01400D0 -:101CE000102808D17A6B7869121A386A121A511AB8 -:101CF0000029C8BF3962BDE8F3878DF800A04046CF -:101D000049462246E31700F06BFC3032D0B26D1E1C -:101D10003A28019504DB9DF80000A0F151018A18D2 -:101D20007255404649462246E31700F059FC80466A -:101D300089460020814508BF804503D0F8687119A5 -:101D40008842DCD3082C09D197F83800010705D563 -:101D5000715D302902D06D1E30207055C5F13C01F7 -:101D6000B9617019F860386B8142B3DA411A39628F -:101D70004FF6EF70398F01403987BDE8F3872DE9C1 -:101D8000D04306460F4614464FF00008DFF838945B -:101D900012E0E00707D542464B463046394600F090 -:101DA00037FD06460F464046494642464B4600F040 -:101DB0002FFD641080468946002CEAD13046394612 -:101DC000BDE8D0832DE9F34F054641F020048DB0E6 -:101DD000D5E90089612C02AE09D0286B002848BFE4 -:101DE000062003D408BF672C01D101202863D5E960 -:101DF000002358004015401C0ED119030CD00320BD -:101E0000A8619DF8380061381A2802D20FF2D0611B -:101E100011E00FF2D0610EE058004015401C0FD1C8 -:101E200019030DD10320A8619DF8380061381A28E4 -:101E300014D30FF2B861E868032200F0BBFDD3E1D0 -:101E4000194621F00043B3F5801F10460DD200273C -:101E5000BB4208BFBA42019703D111E00FF288617B -:101E6000E9E701AA00F0FAFD0AE0DFF8607307EB8A -:101E70001352DFF85C3301921940DFF858331943ED -:101E8000C5E90001612C0ED1E86830210170811C88 -:101E9000E9609DF8381061290CBF78215821417004 -:101EA0006869801C6861D5E900AB2BF00043002015 -:101EB0002AF00002834204BF8242002300F05A81CC -:101EC000612C40F0A980286B00284CBF2120401CC9 -:101ED00000904046009F7F1C49460022002300F0EE -:101EE000F5FDD94601988DF8082038BF89F00049E2 -:101EF000001F0190002FD0460DF1090040F34981E9 -:101F000040F2FF71DFF8D0B20C91064640464946D8 -:101F10000022002300F0F2FD80F03A814800400DDD -:101F200000F11C0210D0002A0EDD0C98824205DB65 -:101F300009F0004040EA0B01002013E0A4480840EB -:101F400040EA025140460DE029F00043002028F00D -:101F50000002834208BF82420FBF40461C22404617 -:101F600000F0E4FD8046894600F07EFEFF1F002F52 -:101F7000044609DD00F096FE02460B4640464946FF -:101F800000F0A2FE80468946F01D072104E004F01F -:101F90000F0200F8012D2411002C01DD491EF6D599 -:101FA000491E5CBF002200F8012DF9D5ECE00020AD -:101FB000194602AA0A4400E05B1E12F80149491EB4 -:101FC0008442F9D00F2804D10DF10900425C521C63 -:101FD0004254002904D50198001D02AE5B1C0190FB -:101FE000591E12D49DF838007218147804F1300884 -:101FF0005FFA88F4392CC4BFA0F13A04A044491E0A -:1020000002F80189F1D58DF83800286B002840F1DD -:10201000B080591E2963ACE04046494600220023A7 -:1020200000F054FD019938BF89F0004947F29750FC -:1020300041436A4A91FBF2F20192D2F1070204DDB8 -:1020400040464946FFF79BFE0AE0524200206449A1 -:10205000FFF795FE02460B464046494600F0A6FEB5 -:102060008046662C286BDFF87CB106BF019F0A37DB -:1020700006273F18142FC8BF142730208DF80800FA -:1020800089460DF1090000E03046002F34DD064698 -:102090004046494600F0AEFF01460A4606F10803F5 -:1020A00004200A26B2FBF6F606EB860EA2EB4E02E1 -:1020B000303203F8012C0A22B6FBF2F202EB820E58 -:1020C000A6EB4E063036401E03F8026DE9D1083FFC -:1020D000002F03F10806D7DD084600F09FFF0246F7 -:1020E0000B464046494600F0EFFD00225B4600F0FB -:1020F0008FFB80468946CBE70DF10901401A0DF1AF -:10210000090604E00199491E401E0191761C3178B0 -:102110003029F7D0662C02D10199491C03E0652CC7 -:102120000CBF012100212B6BCB189842B8BF431E76 -:10213000002B1ED4834204DAF05C3528A8BF392076 -:1021400000DA30201946721E02EB010800E05B1E27 -:1021500018F80199491E8145F9D0392802D1705CDF -:10216000401C7054002904D50198401C16465B1C85 -:102170000190019800B200901BB29DF838103246D1 -:10218000284600F034F82FE0C61D002F3FF7BEAE02 -:1021900030460DF10901401A009903468842C8BF34 -:1021A0000B46002B0DF109063FF52FAF8342BFF61A -:1021B000FEAE0DF10900C05C07287FF7F8AE0F20D6 -:1021C000F6E60000CBCCCC0C0000244002FCFFFF64 -:1021D000FFFF0F800000E03F0000F07FA0860100BD -:1021E0000000F03F84D797410FB0BDE8F08F2DE994 -:1021F000F84783B006468A461746984600F01CFF0B -:10220000B8F1000F406A356B90F8009003DC4FF096 -:1022100001080FF2DC27BDF930404AF020006628A3 -:1022200008BF641C15D0672840F0848014F1040FA7 -:10223000C0F28680AC4280F2838096F83800641C3D -:10224000010702D4A845B8BF454620B22D1A48BFA1 -:1022500000250FFA84FAF068B169BAF1000F25DCA5 -:102260004A1C30234354002D03DC96F83800010744 -:1022700003D5F06800F80290521C15EB0A0FB8BFA6 -:102280006C4220B2441941424445B8BFA046B261F5 -:1022900071620FFA88F5F561F068B3692A4639462C -:1022A000184400F087FB641BB462C4E022B290457E -:1022B000084417DA4246394600F07CFBB0694044D6 -:1022C000B061AAEB0801002D716203DC96F83810AA -:1022D0000A0705D5F16801F80090F069401CF0612B -:1022E000B562A8E0394600F065FBB069002D5044A6 -:1022F000A8EB040803DC96F838100A0703D5F16848 -:1023000001F80090401CB0610FFA88F08542F06837 -:10231000B369B8BFA8460FFA88F207EB0A01184460 -:1023200000F048FBB0690FFA88F10844B061681A00 -:10233000706280E0BAF1610F14D14FF0700A16E0BC -:10234000A84504DA96F838100A0758BF45466D1EAE -:1023500048BF0025BAF1670F14BF4FF0450A4FF090 -:10236000650A04E0BAF1410F08BF4FF0500AB169A5 -:10237000F368481CB061002D17F8012B5A5403DC98 -:1023800096F838100A071BD5F168431CB36101F8B1 -:102390000090002D14DDA8F101080FFA88F08542A5 -:1023A000F068B8BFA8460FFA88F23946184400F022 -:1023B00001FBB0690FFA88F108446D1AB0617562CB -:1023C000F068B1690844002C80F800A003D42B21E8 -:1023D0004170811C03E02D2141706442811C00206A -:1023E0006A460AE023460A2493FBF4F404EB8405CE -:1023F000A3EB450302F8013B401C24B2002CF1DCA6 -:10240000012806DC4AF02002652A04BF302201F8C8 -:10241000012B48B9302001F8010B07E0401E1DF8E0 -:102420000020303201F8012B0028F7DCF068B26997 -:102430001044091AF16196F8380000F014001028D1 -:102440000DD17169B0694118706A4118F06941187D -:10245000B06A4118706B8142BCBF411A316204B04E -:10246000BDE8F087F8B505460E4617461C46002025 -:1024700074B117F8011BB068A847B06030B1F06ABA -:10248000401CF0620020641EF3D1F2BD4FF0FF301B -:10249000F2BD00007072696E74665F733A20256E3B -:1024A00020646973616C6C6F776564007072696E2B -:1024B00074663A2062616420256E20617267756DD2 -:1024C000656E74007072696E74665F733A20626143 -:1024D0006420257320617267756D656E740000005D -:1024E0006E616E004E414E00696E6600494E4600B8 -:1024F000300000000278C9B28A421AB11CBF10F83D -:10250000012FF9E718BF00207047000080B508B917 -:102510000FF21C0005490B681BB1222200219847CD -:1025200001E0FFF775F8222002BD0000842300209F -:10253000636F6E73747261696E742068616E646C2F -:1025400065723A20626164206D657373616765002E -:1025500000F10103810704D010F8011B89B1810744 -:10256000FAD10268B2F10131914311F0803F04BF0A -:1025700050F8042FF6E710F8011B11B110F8011BF9 -:10258000FBE7C01A70470000C9B2830706D0521E8D -:1025900022D310F8013B9942F7D11FE0083A13D338 -:1025A00002F1040241EA012141EA014150F8043BF1 -:1025B000121F21BF4B40A3F1013C2CEA030C1CF07D -:1025C000803FF3D0C9B2001F083210F8013B521E01 -:1025D00028BF91EA030FF8D818BF0120401E7047AA -:1025E000B3BBD9B1B2F5803F7DD2022A1ED98C4649 -:1025F000B1FBF2F102FB11C31B0443EA1043B3FB2E -:10260000F2FC02FB1C3380B240EA0343B3FBF2F05E -:1026100002FB103240EA0C4000237047022A05D921 -:102620008446B0FBF2F002FB10C270474AB105D1FC -:1026300000F0010249085FEA3000704700220023E1 -:10264000704700F0FFBC0B00020000210020704723 -:10265000904271EB030CF6D3B3F5803F2FD2F0B567 -:10266000B3FA83F7B1FA81F4A7F10F0E3D1B534083 -:10267000CEF1200602FA0EF2F3415340B5F10F07F6 -:1026800046D80F3C2C444140C4F12006A040F14103 -:102690004140B1FBF3F603FB1611A2FB0645001BFC -:1026A000A94102D2761E8018594180EA010221FA1E -:1026B0000EF362FA0EF200215A403046F0BD30B4FB -:1026C000B1FBF3FC03FB1C11A2FB0C45001BA94151 -:1026D00003D2ACF1010C8018594130BC02460B46C4 -:1026E000604600217047B2F1807F65D3F0B5B2FA41 -:1026F00082F7B1FA81F4C7F10F063D1B22FA06F307 -:1027000007F1110EF24120355A40B5F10F07B8D943 -:102710004140C4F12006A040F1414140B1FBF3FC2F -:1027200003FB1C11A2FB0C45001BA94103D2BCF109 -:10273000010C801859410F2F12D30F3FC90341EAF2 -:102740005041B1FBF3F603FB1611A2FB0645D4EB97 -:10275000C030A94102D2761E8018594146EACC3CCD -:1027600007B34140C7F12006B840F1414140B1FBF9 -:10277000F3F603FB1611A2FB0645001BA94102D28A -:10278000761E8018594180EA010221FA0EF3C7F142 -:10279000200462FA0EF20CFA07F05A402CFA04F107 -:1027A0003043F0BD80EA010221FA0EF3002162FA03 -:1027B0000EF260465A40F0BD8C46B1FBF2F102FBCE -:1027C00011C31B0243EA1063B3FBF2FC02FB1C3390 -:1027D0001B024CEA002043EA1063B3FBF2FC02FB4D -:1027E0001C331B024CEA002043EA1063B3FBF2FCEB -:1027F00002FB1C331B024CEA002043EA1063B3FBCC -:10280000F2FC02FB1C324CEA00200023704700005F -:10281000B0B581EA030C0CF0004C40F2FF7515EAEC -:1028200011541DBF15EA1357AC42AF4239E0E41909 -:1028300023EA455343F48013C90241F0004141EAC1 -:10284000505EC7021100A7FB020200284FF00000F3 -:10285000EEFB01204FF00001E3FB072118BF42F01F -:102860000102401800214941E3FB0E01A4F58064F8 -:102870000F0302D252004041494154F101046CDD82 -:10288000470872F1004250F1000051EB0451A1F5EC -:1028900080115CBF41EA0C01B0BD4CEA055100203B -:1028A000B0BD05EA1357AC4214BFAF4241E050EA55 -:1028B000410E1CBF52EA430E02E061460020B0BD4B -:1028C00024423C441BD15FEA070EF6D0090302BF45 -:1028D00001460020AEF1140EB1FA81F7AEEB070409 -:1028E00001FA07FE0C37C7F1200100FA07F7C840CC -:1028F0004EEA000E23EA455343F48013A2E733F077 -:102900000043B3FA83F704BFB2FA82FE77440B3F69 -:10291000E41BB7F1200E2FBF02FA0EF3BB40C7F144 -:10292000200E22FA0EFE38BF43EA0E03BA40641CA2 -:1029300082E750EA410E14BF52EA430E6FF00001E5 -:102940004FF4001717EB430F8ABF194617EB410FDF -:10295000B5E74CEA05510020B0BDD4F10104B4F153 -:1029600020070FDAC4F12007520828BF42F0010205 -:1029700010FA07F501FA07F7E1BF2A43E0403843B0 -:10298000E1400FE0352C98DCC7F1200452EA400208 -:1029900020FA07F218BF42F0010231FA07F0A14015 -:1029A0000A43002172F1004250F1000051EB0C018A -:1029B000B0BD000062B38B0708D0521E11F8013B76 -:1029C00000F8013B00F024808B07F6D1830740F02C -:1029D000208000BF103A07D330B4B1E83810103A65 -:1029E000A0E83810F9D230BC530724BFB1E8081072 -:1029F000A0E8081044BF51F8043B40F8043BD2075C -:102A000024BF31F8022B20F8022B44BF0B7803704F -:102A10007047121F17D35B0009D151F8043B20F80F -:102A2000023B1B0C121F20F8023BF6D20BE051F8C0 -:102A3000043B00F8013B1B0A20F8023B1B0C121F51 -:102A400000F8013BF3D238BF121D521E24BF11F80B -:102A5000013B00F8013BF8D87047000010B5144660 -:102A600000F002F8226010BDC1F30A5343B14A00DE -:102A700012F5001F28D2A3F2FE32A1EB02517047DB -:102A800050EA410C20D001F0004C31EA0C01B1FABF -:102A900081F204BFB0FA80F3D2180B3AB2F12003EE -:102AA0002CBF00FA03F1914041EA0C013EBFC2F194 -:102AB000200C20FA0CF319439040524240F2FD33AF -:102AC000D21A01EB03517047002270474FF4001CEB -:102AD0001CEB410F94BF1CEB430F09E041EA030CD0 -:102AE00050EA4C0C52EA0C0C03D2994208BF9042B7 -:102AF000704714BF8B428242704700004FF4001CA5 -:102B00001CEB410F94BF1CEB430F09E041EA030C9F -:102B100050EA4C0C52EA0C0C03D28B4208BF8242A2 -:102B2000704714BF9942904270470000124254D43B -:102B300040F2FF7C1CEA11530FD0634531D09B1843 -:102B400063453CBF01EB0251704701F0004141EA8F -:102B50000C510020AFF30080704750EA410320D0B1 -:102B600001F0004C91EA0C011CD0B1FA81F30B3B4F -:102B70009A420DD9D21A994051EA0C01C3F1200CA6 -:102B800020FA0CFC61449840531C40F2FF7CD7E7CC -:102B9000914041EA0C01C2F1200C20FA0CF31943D8 -:102BA00090407047B0FA80F31533202BE0D3202AF1 -:102BB000EED3203A203B9A4209D9D21A00FA03F107 -:102BC00041EA0C010020531C40F2FF7CB8E700FAF8 -:102BD00002F141EA0C0100207047524240F2FF7CB2 -:102BE0001CEA11530DD06345DBD0B2EB030C3CBFA4 -:102BF000A1EB025170470CF1010221EA035141F4AB -:102C0000801150EA410CCCD001F0004C352A27DC71 -:102C100030B481EA0C01B2F1200309DAC2F12003D9 -:102C2000044601FA03F5D0402843D1409C400CE013 -:102C3000C3F12002450020FA03F418BF44F0010458 -:102C400021FA03F091400C43002174F1004550F14A -:102C5000000051EB0C01244230BC7FF47BAF704785 -:102C60006146002076E70000C1F30A5340F2FE32CD -:102C70009B1A14DDD3F120034FEAE17208DDC9028B -:102C800041EA505141F00040D84080185040704710 -:102C900003F2E13010B1D24382F0004070470020CF -:102CA00070470000C11768B14840401AB0FA80F27E -:102CB0009040D21CC907C2F5846241EA025202EB7D -:102CC000D02140057047000070B44FF0004591EAF4 -:102CD000030F40F1B9816B40841A71EB030603D2F4 -:102CE000001BB141121973414FF4001C1CEB410F42 -:102CF00034BF7CEB430442E00C0DA4EB1356352E9D -:102D00004FDC45EAC323DB0A45EAC121C912B6F10B -:102D100020050DDD63FA05F6EB4086EA0305124255 -:102D200018BF45F00105C01851F100010CD213E0A5 -:102D300062FA06F5F2405540F3415A40B340F34081 -:102D40005A408018594107D349085FEA30005FEACA -:102D5000350528BF45F0010501F58011420875F1E0 -:102D6000004250F1000041EB04514E0016F5001FE7 -:102D700070BC38BF70470020090D090570471CEB77 -:102D8000410F10D252EA43060BD0BCEB410F05D8DD -:102D90000C0DAB43661E342EB6DD02E0AB4380184B -:102DA000594170BC704770BC70470000F0B540F2EC -:102DB000FF7581EA030C0CF0004C15EA11541DBF9D -:102DC00015EA1357AC42AF42E5E0BC41C1F3130131 -:102DD000C3F31303801A994143F4801304D2641E91 -:102DE0004000494180185941C90241EA5051B1FBA4 -:102DF000F3F603FB1611A2FB0675D7EBC020A94121 -:102E000002D2761E80185941C90241EA5051B1FBE5 -:102E1000F3FE03FB1E11A2FB0E75D7EBC020A941E8 -:102E200003D2AEF1010E80185941890241EA905156 -:102E3000760546EA8E2EB1FBF3F603FB1611A2FBD4 -:102E40000675D7EB8020A94102D2761E8018594121 -:102E5000C90241EA50514EEA060EB1FBF3F603FBFC -:102E60001611A2FB0675D7EBC020A94102D2761E2F -:102E700080185941C90241EA5051B1FBF3F703FBF5 -:102E80001711A2FB0735D3EBC020A94167F100075A -:102E90000CBF004247F0010766F3D5274FEA1E3109 -:102EA000B80814F5806412DDBD0775F1004250EBDF -:102EB0000E5051EB045111F5801F5CBF41EA0C012B -:102EC000F0BD4CF07F6141F0E0410020F0BDBD0756 -:102ED0006D0840EA0E5041F48011D4F10104B4F1C0 -:102EE00020060ADAC4F120060200E04001FA06F3E7 -:102EF000E1401843B24015430EE0342C13DCC6F118 -:102F0000200445EA40056D0820FA06F2154321FA2F -:102F100006F0A1400D43002175F1004250F1000080 -:102F200051EB0C01F0BD00205FEA0C01F0BDCFB900 -:102F300092185B41B3FA83F704BFB2FA82F6BF1965 -:102F40000B3FB7F120062FBF02FA06F3BB40C7F1D3 -:102F5000200622FA06F638BF3343BA401CB1E41902 -:102F6000641E33E77F4231F00041B1FA81F404BFBF -:102F7000B0FA80F6A4190B3CB4F120062FBF00FA7A -:102F800006F1A140C4F1200620FA06F638BF31430D -:102F9000A0403C1B1AE7AC421ABF05EA1357AF42E8 -:102FA00012E050EA41061CBF52EA4306BFE750EA6E -:102FB0004107304661461CBF41EA0551F0BD52EA67 -:102FC000430C08BFC143F0BD00204FF4001616EBC0 -:102FD000410F98BF16EB430F08BF16EB410F24BFFC -:102FE000C14305E016EB430F0CBF61464CEA0551A7 -:102FF000F0BD0000400D491840EA81200CD2490D77 -:10300000A1F58061491C40F0004005DBD1F11F01B2 -:1030100054BFC840C017704700207047014648B1F0 -:10302000B0FA80F18840C91CC1F58461090501EB43 -:10303000D0214005704700000148704700000000A3 -:10304000C415002070470000841A71EB030604D2F7 -:103050006E40001BB141121973414FF4001C1CEB70 -:10306000410F34BF7CEB430682E00C0DA4EB1356FA -:10307000362E7BDC012E45EAC32341DC43EA525362 -:1030800012BFD20292025B08240545EAC12141EA3F -:103090005051D2EBC020994125D407D1B0FA80F627 -:1030A00010FA06F162D00020203608E0B1FA81F66D -:1030B000B140C6F1200220FA02F21143B0404FEABB -:1030C000F474B4EB465434F001064FEA74040AD8A1 -:1030D000D6F50016760D04F00044F04061FA06F2D1 -:1030E0005040F1404840C00A40EA415021F00041C0 -:1030F00028BF5FEA500550F1000044EBD12135E0D4 -:10310000DB0A45EAC121C90AB6F120050EDD42EA13 -:103110000242120CC5F1200603FA06F6EB4042EA21 -:1031200006056D42984161F100010DE062FA06F575 -:10313000F240554063FA06FC82EA0C02F3405A4022 -:103140006D42904161EB030111F4801F05D1641EB3 -:10315000620502D06D004041494121F480114308CD -:1031600075F1004350F1000041EB045170BC704711 -:103170001CEB410F15D223F0004352EA43060BD05B -:103180004FEA4C0CBCEB410F04D80C0D661E342EDC -:10319000B7DDEBE7801A994150EA410608BF0021EC -:1031A000E4E708BF1CEB430F28BF6FF00001DDE729 -:1031B00030B5040085B008BF012043D004F52A755E -:1031C000687820B900212970204600F023FD0320F3 -:1031D0006870206800F0EFFD002128200AE010FB55 -:1031E00001F222442832012353701170D18100234F -:1031F00000F02AF862689142F1D3002109E010FB47 -:1032000001F2224402F5B47200231170537000F0F1 -:103210001BF862689142F2D383B0211D68462022D8 -:10322000FFF7D8FB0EBC206800F0CBFD002084F82F -:10323000240001206870E069012804BF204601F0E5 -:10324000F3FA002005B030BD491CD37013615361FF -:103250009361C9B2704710B500F0C7F801D10220E0 -:1032600010BD00F003F800F09FFDB7E0012184F8E5 -:10327000A8122068704738B5044600F0ACF8010485 -:1032800044BF204600F099F900F0A5F840050CD5A0 -:1032900000F09DF84FF6FF3000F095F8204600F062 -:1032A000EBFC0021204600F0A5F800F094F8400463 -:1032B00005D500F08CF84BF6FF7000F084F800F0B4 -:1032C0008AF8800405D500F082F84DF6FF7000F012 -:1032D0007AF804F5387500F07EF8C0041FD521682F -:1032E000B1F840204FF6FB700240A1F840204FF6A5 -:1032F000F770B1F840200240A1F84020287801285A -:1033000004D1002129702046C046C046204600F066 -:10331000C4FC00F05CF84EF6FF7000F054F800F0CA -:103320005AF8000512D5206800F140014FF2FF70F5 -:103330000A8842F008020A808B8803408B80088844 -:1033400040F004000880204600F0A3FC00F043F8A1 -:10335000000620D5206800F140014FF67F708A8872 -:1033600002408A80287898B90A8842F004020A80CC -:103370000122088840F0080008802A70888A8008A6 -:1033800000F03C00686001212046C046C04602E0D3 -:10339000204600F07EFC00F01EF8800508D500F005 -:1033A00016F84FF6FF5000F00EF8204600F060FCD3 -:1033B00000F011F8C00505D500F009F84FF6FF60E0 -:1033C00000F001F831BD0240A1F8442070472168A7 -:1033D000B1F844207047206801F0E0B9206801F09E -:1033E000D4F9002084F8A80210BD044694F8A8027D -:1033F0000128704710B5FFF7F8FF01D1022010BD7A -:10340000012284F8A82284F82410206801F0B7F97A -:10341000E7E738B5054601F007042820444328199A -:103420000C0647BF00F12804012000F5B474002009 -:1034300001F00701607021702261E370607808B1CB -:103440002178E181022B04BF0020207195F8A802A9 -:10345000012801D1022032BD012185F8A8122146A0 -:10346000286800F0B9FC002085F8A80232BD10B52C -:10347000044600F09BF847BF2830012200F5B470E5 -:10348000002201F00701427000F069F801D102202A -:1034900010BD00F003F800F0CBFDA2E7012284F894 -:1034A000A82201462068704738B501F00705282496 -:1034B0006543441904F5B47401F007016261A36126 -:1034C0000022E2616270217021461DE001F00701D7 -:1034D000282251430844D0F88401704738B51C466F -:1034E00001F0070528235D434319283301F0070144 -:1034F0005A619C61012283F824201C620022DA6157 -:10350000197001225A701946006800F017FE002059 -:1035100032BD10B5044601F007006268824201D254 -:10352000012010BD28220B0604D55043204428302A -:10353000012205E012FB01F2A01800F5B470002290 -:10354000427001F00701012200F008F801D10220C9 -:1035500010BDFFF7A4FF01F0B9F842E782700170D7 -:1035600094F8A812012970471CB5044601F00F0316 -:103570006068984201D2012016BD00F017F847BFDD -:103580002830012200F5B470002201F007014270DA -:103590000022FFF7E3FF01D1022016BDFFF77EFFF7 -:1035A00001F0ADF8002084F8A80216BD01F0070272 -:1035B00028204243A0180A0670472DE9F84F00F56D -:1035C000B475064627E001880AEA010141F400418A -:1035D000018006F124043068B0F85010227901EB24 -:1035E000C201401800F202400088A169C0F309003E -:1035F00020620844A0610021304600F030FB2178B1 -:1036000049B1E06938B92178306841F08001A0F80B -:103610004C1000212170306800F144010A88130425 -:1036200040F114810A8812F00F0440F68F7748F6B3 -:103630000F7A65D1D206C6D50288130511D58989BE -:1036400000F015F9EA88C3F30903EB6106F52C7164 -:1036500001F0BDF8306800F0FCF8304600F0EFFAF9 -:10366000D9E71104D7D500F0F4F83068B0F850105D -:1036700000F0FDF8C3F30903002BEB611CBF69697F -:1036800000290AD0EA8801F0A2F86869E9690844CB -:1036900068610021304600F0D8FA306801880A05D8 -:1036A000B9D4B0F850104118286901F2064148B960 -:1036B000088848F2FF32104008800A8842F400422D -:1036C0000A8010E03F2805D24208C00748BF521CBC -:1036D000900207E0420910F01F0F08BF521E90022F -:1036E00040F400400880306801884BF68F7211402A -:1036F00081F4405141F4004141F0800101808AE7AA -:10370000282130F8248011FB04F106EB01095FEA5F -:10371000084160D530F824100F4047F0800720F8AA -:10372000247009F5B477387B58B93068B0F8501078 -:103730003A7801EBC201411800F091F837D0FA88CD -:1037400031E0F878022806D142463946304600F08A -:1037500096F883462BE03068397830F8212048F617 -:103760008F731A4042F4004242F0C00220F8212038 -:1037700030683A78134630F823305904B0F85030A6 -:1037800003EBC2020AD5811801F202410988C1F394 -:10379000090BBBF1000F0AD03A8904E0811800F050 -:1037A0005EF804D07A895B46796901F010F8F8690F -:1037B0005844F861786958447861B86910B13A6939 -:1037C000934504D23978304600F03FFA03E0306880 -:1037D000394600F0B3FC5FEA086027D5306830F85E -:1037E00024200AEA020242F4004209F1280120F8EA -:1037F0002420C878022824D15FEAC85221D4306836 -:103800000A78B0F8503003EBC203C01800F202404F -:1038100003888869C3F30903834234BFC01A0020B8 -:10382000886120B91146304600F019FAF3E648697C -:1038300018444861C8691B18CB61306800F07EFCF1 -:10384000E9E64246304600F077F8E4E60020BDE8BD -:10385000F28F01880F4047F080070780704701F220 -:1038600006410988C1F3090BBBF1000F70472A78A4 -:1038700001EBC201411801F206410B8870472DE9A6 -:10388000FC410D4600682B78A969B0F850605404DB -:1038900048F2C00848F68F7748F2800C4BF68F7ECE -:1038A00006EBC30419D5061906F202463488C4F3A0 -:1038B0000904A1422CBF091B0021A96129B930F8D4 -:1038C00023100EEA010100F027F8510601D500F09F -:1038D0002AF8F4B123462A8918E0061906F20646AA -:1038E0003488C4F30904A1422CBF091B0021A9613B -:1038F00029B930F823100EEA010100F00DF8510645 -:1039000001D400F010F824B123466A89696900F0F7 -:103910005EFF2046BDE8F68181F400514CEA0101CA -:1039200020F823107047297830F82120174048EA02 -:10393000070220F8212070472DE9FC410D4604467E -:103940001646216895F800E0A8697306B1F8503072 -:103950004CF2800748F68F7803EBCE0340F1858068 -:10396000CB1803F202431B88C3F30903834234BF1D -:10397000C01A00200028A86125D1687838B9B1F8AC -:103980005000081800EBCE0C00F015F913E00128E8 -:1039900009D000F030F92046297800F060F9700471 -:1039A00040F1ED8082E0B1F85000081800EBCE0C39 -:1039B0000CF2024C0020ACF8000068780028E8D136 -:1039C00000F007F9E7E7720406D531F82E0008EA9F -:1039D0000000074321F82E7095F8240001286ED1CD -:1039E00000F0DFF803D31346C01A286208E010B9CC -:1039F00085F8240004E0002285F8242003462A628A -:103A0000687810BB2068B0F850208218287802EB44 -:103A1000C00202F2024233B9168848F2FF30064073 -:103A2000168010880DE03F2B05D25808DE0748BFEE -:103A3000401C800207E0580913F01F0F08BF401E0A -:103A4000800240F4004010800BE0012809D120687A -:103A5000B0F8502080182A7800EBC20000F2024033 -:103A600003802A8920689BB287E0CB1803F20643C3 -:103A70001B88C3F3090398422CBFC01A00200028FA -:103A8000A8612DD1687838B9B1F85000081800EB5A -:103A9000CE0C00F090F81BE0012811D000F0ABF83C -:103AA0002046297800F0DBF8700468D42168287873 -:103AB00031F8202008EA0202174321F820705EE066 -:103AC000B1F85000081800EBCE0C0CF2024C0020AC -:103AD000ACF8000068780028E0D100F07AF8DFE761 -:103AE000720406D431F82E0008EA0000074321F8DA -:103AF0002E7095F82400012841D100F052F803D32C -:103B00001346C01A286205E010B10346002028625F -:103B100085F824002668687808BBB6F8500032188B -:103B2000287802EBC00202F2064233B9178848F245 -:103B3000FF300740178010880DE03F2B05D2580852 -:103B4000DF0748BF401C800207E0580913F01F0F31 -:103B500008BF401E800240F4004010800AE00128A7 -:103B600008D1B6F850002A78301800EBC20000F2F5 -:103B7000064003809BB26A89304600F017FE226837 -:103B8000297832F8213048F6BF70034083F03003C3 -:103B900043F4004343F0800322F821300020BDE8C5 -:103BA000F681E86969692A691818E8611944286A80 -:103BB0006961904270470CF2024C48F2FF30BCF849 -:103BC00000300340ACF80030BCF8000040F4004086 -:103BD0007047B1F850000918287801EBC00101F2D4 -:103BE000064148F2FF300A8802400A80088840F403 -:103BF0000040088070476878012809D1B1F850006A -:103C00000818297800EBC10000F20640002202806B -:103C10007047000080B56148016841F08061016033 -:103C20000022006800F080600090062100981420B7 -:103C300000F02CFEBDE80240142000F045BE00F567 -:103C40002C71D0F8F00200F0CDBE0B462822534371 -:103C5000C218D0F8F002D2F87C2100F0F1BE0B4679 -:103C600028225343C218D0F8F002D26B00F01DBFD7 -:103C7000D0F8F00200F0A8BF10B50446D4F8F00266 -:103C800000F05FFFD4F8F002BDE81040012100F021 -:103C900087BFD0F8F00200F086BFD0F8F00200F045 -:103CA0008ABF10B53E4C3F492160C4F8F00208219C -:103CB00061600021E16002212161A1600021A16118 -:103CC000C0F8C4422046FFF773FA182300220021EF -:103CD00000F012F858230022802100F00DF8C023D4 -:103CE0000022812100F008F84FF48873002201219E -:103CF00000F002F8002010BD204600F07BBD80B52A -:103D0000D0F8C402FFF7A7FA002002BD10B51C4688 -:103D10001346D0F8C4022246FFF77BFB002010BDFB -:103D200080B5D0F8C402FFF7A2FB002002BD80B529 -:103D3000D0F8C402FFF7EDFB002002BD80B5D0F83B -:103D4000C402FFF711FC002002BD81B0D0F8C422EC -:103D500001F07F0328204343D01809064CBF90F898 -:103D60002A0090F86A0101B0704780B5D0F8C4020B -:103D7000FFF740FB002002BD80B5D0F8C402FFF77A -:103D8000ADFB002002BD80B5D0F8C402FFF78CFB6C -:103D9000002002BDD0F8C402FFF798BB58000058BD -:103DA000FC190020006800404030002181804BF663 -:103DB000807100F0E1BCB0F8402044F27F0100F0D7 -:103DC000F0BC0EB4012120F8401F00210180818049 -:103DD0000182002003B070472DE9F8470B4648F6F2 -:103DE0008F111D780246002032F825600E40D978E8 -:103DF00003290CD8DFE801F002080C0546F4007630 -:103E000006E046F4C06603E046F4806600E0012068 -:103E100048F28004264322F8256048F68F75197809 -:103E20000E4632F826702F403943214322F82610DF -:103E30004BF68F76197B93F8009000294CF280079F -:103E400048F6BF7C48F2C00E72D1B3F806A04FF618 -:103E5000FE7101EA0A0A59780029B2F8501011449B -:103E60001ED001EBC90101F58061A1F800A019780D -:103E700032F82160760606D532F8216035404EEAE8 -:103E8000050522F821501978DB78012B32F8213012 -:103E90000CEA03030EBF1C4383F020031C43C3E062 -:103EA00001EBC90909F20449A9F800A0B2F85010C1 -:103EB00002EB010C19780CEBC10C19690CF2064CE1 -:103EC00051B9BCF800E048F2FF3101EA0E01ACF84C -:103ED0000010BCF8001013E03F2908D24FEA510E41 -:103EE000C90748BF0EF1010E4FEA8E210AE04FEAE2 -:103EF000511E11F01F0F08BFAEF1010E4FEA8E21C7 -:103F000041F40041ACF80010197832F821C05FEAA2 -:103F10004C4C06D532F821C005EA0C053D4322F889 -:103F20002150197832F821301E4086F440567AE04C -:103F300032F82910294041F4014141F0800122F872 -:103F40002910B2F85010B3F808A002EB0109197853 -:103F500009EBC10101F580694FF6FE7101EA0A0122 -:103F6000A9F80010B2F85010B3F80A9002EB01085B -:103F7000197808EBC10808F204484FF6FE7101EA0F -:103F80000901A8F80010597893F80080002932F848 -:103F9000281023D1490405D532F8281029400F43B1 -:103FA00022F82870197832F821707F0606D532F889 -:103FB00021703D404EEA050522F82150197832F86B -:103FC00021502E4086F44056264322F8216019786D -:103FD00032F821300CEA03031C4325E0490405D5DF -:103FE00032F8281029400F4322F82870197832F847 -:103FF00021707F0606D532F821703D404EEA050556 -:1040000022F82150DD781978012D32F821500CEA80 -:10401000050518BF85F02005254322F821501978A1 -:1040200032F821301E40344322F82140BDE8F287A7 -:104030002DE9F041024691F800C048780B7B4BF621 -:104040008F7E4CF2800448F2800848F6BF7548F233 -:10405000C00648F68F77ABB9002832F82C0008D09C -:10406000400636D532F82C0007403E4322F82C603B -:104070002FE0400456D532F82C0007403C4322F88C -:104080002C404FE0002832F82C0029D1400405D5FF -:1040900032F82C003840044322F82C40087832F8DB -:1040A00020305B0605D532F820303B40334322F800 -:1040B0002030087832F820301F403E4322F820603C -:1040C000087832F820300EEA030348EA030322F8A6 -:1040D0002030087832F820100D4048EA050128E029 -:1040E000400405D532F82C003840204322F82C003B -:1040F000087832F820305B0605D532F820303B4096 -:104100001E4322F82060087832F820301F403C43DC -:1041100022F82040087832F820301D4048EA050592 -:1041200022F82050087832F820100EEA010148EAFF -:10413000010122F820100020BDE8F0812DE9FC4E9D -:104140000E4605467278307B012A48F2800748F611 -:104150008F7140F06381D6F810A0B2695446944242 -:1041600088BF144628B9F28800F0ACFA00F082FA51 -:104170004BE196F803B06309620896F800C0D6F8E0 -:1041800020E0BBF1020F04F0010048F2801940F07A -:104190009E80F24580F0918035F82CA001EA0A015A -:1041A00049EA010125F82C10AEEB0401316296F8C2 -:1041B00000C07178E64635F82EE05FEA4E693DD5DD -:1041C00099B900F036FA14B900F05EFA09E03F2C14 -:1041D00002D200F00DFA06E014F01F0F08BF5B1EBC -:1041E000980240F40040088001E000F05FFA00F01F -:1041F00068FA00F001FA32BF001B0446002030626A -:104200007078002840F0B08000F004FA01F202411A -:1042100014B900F039FA0DE03F2C05D26008E2072E -:1042200048BF401C800207E0600914F01F0F08BF60 -:10423000401E800240F40040088099E099B900F0E7 -:10424000F0F914B900F020FA09E03F2C02D200F096 -:10425000CFF906E014F01F0F08BF5B1E980240F470 -:104260000040088001E000F016FA328900F02AFAD6 -:1042700000F0C2F932BF001B0446002030627078A3 -:10428000002840F0B18000F0C5F901F2064114B9F0 -:1042900000F0FAF90DE03F2C05D26008E20748BFB4 -:1042A000401C800207E0600914F01F0F08BF401E89 -:1042B000800240F400400880A1E035F82C1048F658 -:1042C0008F600140394325F82C1074464EE035F8D4 -:1042D0002CA001EA0A0149EA010125F82C10AEEBF5 -:1042E0000401316296F800C07178E64635F82EE098 -:1042F0005FEA4E693FD599B900F09BF914B900F017 -:10430000C3F909E03F2C02D200F072F906E014F084 -:104310001F0F08BF5B1E980240F40040088001E0B8 -:1043200000F0C4F900F0CDF900F066F932BF001BCF -:1043300004460020002C306267D07078A0B900F0ED -:1043400088F900F2024005D26108E20748BF491C23 -:10435000890207E0610914F01F0F08BF491E890296 -:1043600041F40041018003E0012801D100F082F90D -:10437000A3B2328945E099B900F053F914B900F0BD -:1043800083F909E03F2C02D200F032F906E014F084 -:104390001F0F08BF5B1E980240F40040088001E038 -:1043A00000F079F9328900F08DF900F025F932BF7B -:1043B000001B0446002030623CB37078A0B900F0C6 -:1043C00048F900F2064005D26108E20748BF491CDF -:1043D000890207E0610914F01F0F08BF491E890216 -:1043E00041F4004101800AE0012808D1B5F85000ED -:1043F0003178281800EBC10000F206400480A3B217 -:1044000072897169284600F0D1F9317835F8212098 -:1044100048F6BF70024082F0300219E000282CD12B -:10442000B1693069884232BF091A08460021B1617A -:1044300000F017F990B900F027F940F40040088027 -:10444000317835F821204BF68F70024082F44052CB -:10445000174325F821700020BDE8F68E3F2805D2CD -:104460004208C00748BF521C9002E8E7420910F01A -:104470001F0F08BF521E9002DFE7F078022859D1C3 -:10448000C2B900F0DEF802F2024210B900F0BBF847 -:104490000DE03F2805D24308C00748BF5B1C9802C7 -:1044A00007E0430910F01F0F08BF5B1E980240F49D -:1044B000004010807078C8B900F0C3F802F20642DC -:1044C00010B900F0A0F80DE03F2805D24308C0075E -:1044D00048BF5B1C980207E0430910F01F0F08BF9C -:1044E0005B1E980240F4004010800BE0012809D1C7 -:1044F000B5F850003278281800EBC20000F20640F0 -:1045000032690280F06900289AD0307835F820208E -:1045100044F2400303EA02049C4218BF1A428FD1BE -:1045200035F82020114041F4004141F0C00125F848 -:10453000201085E7012859D1B1693069884232BF1E -:10454000091A08460021B161440900F0010143083D -:104550002ABBB5F8502005EB020C32780CEBC20CEC -:104560000CF2024C50B9BCF800E048F2FF3202EA0B -:104570000E02ACF80020BCF800200CE03F2804D26A -:104580001A4601B1521C920207E0224610F01F0F9A -:1045900008BF521E920242F40042ACF8002072782A -:1045A000FAB9B5F8502096F800C0AA1802EBCC0270 -:1045B00002F2064248B9118848F2FF3001401180EA -:1045C000108840F4004010803AE73F2803D201B140 -:1045D0005B1C9802F7E710F01F0F08BF641EA002D3 -:1045E000EFE7012AF0D100F03CF828E7012033E79B -:1045F00000B1521C900270477069316920447061AB -:10460000306A81427047138848F2FF3003401380BC -:1046100010887047B5F850002918307801EBC001B8 -:104620007047B5F85010691801EBCC0101F2024156 -:104630007047B5F85010691801EBCC0101F2064142 -:104640007047B5F850002A18307802EBC002306984 -:104650007047B5F850003178281800EBC1003F2CA6 -:104660007047B5F850103278691801EBC20101F2B9 -:1046700006417047B5F850003178281800EBC100AA -:1046800000F20240048070470A8848F2FF3002407E -:104690000A8008887047012907D1B5F8500028180A -:1046A00000EBCC0000F2024004807047012907D1E2 -:1046B000B5F85000281800EBCC0000F2064004804A -:1046C000704772897169A3B228466FE018B50A78FD -:1046D000497830F82240002948F2800305D048F696 -:1046E000BF710C4084F0100404E04BF68F710C4055 -:1046F00084F48054234320F82230002012BD30B5CA -:104700000A7B002A36D14A780C78002A30F8242017 -:1047100048F2800348F68F7516D0520608D530F857 -:104720002420154045F4004545F0C00520F82450EC -:10473000CA78012A1ED00A7830F8224048F6BF71A4 -:104740000C4084F0200412E0520408D530F82420F4 -:10475000154045F4404545F0800520F824500A787E -:1047600030F822404BF68F710C4084F440542343C0 -:1047700020F82230002030BD01800020704711B9A0 -:104780008021A0F84C1000207047B0F8581041F478 -:104790000041FFE7A0F8581000207047B0F844002F -:1047A00070470A40A0F840200020704710B58018DC -:1047B0005B1C00F580605B0807E00A784C7842EAF1 -:1047C0000422891C20F8022B5B1EF6D110BD10B507 -:1047D000821802F58062580806E032F8024B0C702D -:1047E000240A4C70891C401EF7D1D80744BF10889A -:1047F000087010BD30B528240D0605D501F007015D -:1048000061430844283003E06143084400F5B47074 -:104810001AB900210173C38004E0038101211B0C3C -:1048200001734381002030BD016800F5387001221A -:10483000826000220270B1F8540040F00100A1F83B -:104840005400B1F8540040F00200A1F854000020D8 -:10485000704700000901020081B002D43C48815435 -:1048600005E03C4802F00F02104400F8041C01B0BF -:104870007047394A13684FF6FF0100020B4000F4FD -:10488000E0601843354908431060704738B5324B33 -:104890001C68C4F30223C3F10704052C28BF0424B9 -:1048A0001D1D072D34BF0023DB1E012505FA04F46E -:1048B000641E2140994005FA03F35B1E1A40114320 -:1048C000BDE83440C6E70000010007D4012200F033 -:1048D0001F01234B8A40400943F820207047010004 -:1048E0000BD4012200F01F011E4B8A40400943F8FF -:1048F0002020BFF34F8FBFF36F8F704710B5401E5E -:10490000B0F1807F01D3012010BD174C60600F21F2 -:104910004FF0FF30FFF79EFF0022A26007202060CB -:10492000002010BD010007D4012200F01F010F4B31 -:104930008A40400943F820207047010007D4012233 -:1049400000F01F010A4B8A40400943F820207047BD -:1049500000E400E018ED00E00CED00E00000FA05D6 -:1049600000E100E080E100E010E000E000E200E0B3 -:1049700080E200E010B508B9032010BD00F52773F0 -:104980000024DC615C621C6301B199610121197032 -:104990000270BDE81040FFF784B91CB50022ADF8E5 -:1049A000002009B9032016BD00F52E742160C96AE4 -:1049B00011B1684688476061002016BDFFF79FB9B6 -:1049C00080B5D0F8B832032213B11A689047024676 -:1049D000104602BD80B5D0F8B8220AB1526890479F -:1049E000002002BD38B5044604F2AA25284600F08E -:1049F0000FFB04F5257001210160818B4160817DF1 -:104A000011F01F0003D002280DD006D311E0294673 -:104A10002046BDE8344000F0EDB829462046BDE808 -:104A2000344000F064B929462046BDE8344000F027 -:104A300084B92046BDE8344001F08001FFF777B922 -:104A400038B5044610460B0004F5257221D11168D3 -:104A5000032910D104F5AE714B680D68AB420CD23E -:104A6000ED1A4B680D602A469A42014688BF1A46E5 -:104A7000204600F02BFB002032BD107A032804D121 -:104A8000516A096909B120468847204600F026FB93 -:104A9000F1E7107A0328EED1526A9269002AEAD02F -:104AA000204690470100E6D032BD38B50446104696 -:104AB0000A0004F5257538D1296802292ED1E2694A -:104AC000216A914206D2521AE2610146204600F064 -:104AD000EBFA0DE013D1A069884210D369688842CF -:104AE0000DD200220021204600F0DEFA002068608E -:104AF0000023002200212046FFF745F90EE0287A26 -:104B0000032804D1696AC96809B120468847802111 -:104B10002046FFF70CF9204600F0E7FA287B012831 -:104B200004BF00212973002032BD287A0328FAD15E -:104B30006A6A5269002AF6D0204690470100F2D0F6 -:104B400032BD1CB5044604F5257001210172002117 -:104B5000016061600161416A09B9032016BD806A84 -:104B600000281CBF4A68002A02D000212046904736 -:104B70004023002200212046FFF7C8F804F5B0705A -:104B800001218180402340210160002280212046B4 -:104B9000FFF7BCF80120A08440202062002016BD51 -:104BA00001740020704700F52770017841700421DE -:104BB00001700020704700F527700178042904BFB8 -:104BC000427802700020704780B500F52772D169E5 -:104BD00009B9032002BD1278032A02D1C96901B1C3 -:104BE0008847002002BD00004178007840EA01209B -:104BF00070470000F8B500240546087810F0600002 -:104C000005F5277608D0202818BF40282ED1F26954 -:104C100093682846984730E04878092826D8DFE886 -:104C200000F03F592553250905252E29284600F077 -:104C300013F95AE08A88002A04BFC888002815D1D1 -:104C40004F88802F12D23078032807F07F070DD0CD -:104C5000B77039462846FFF788F8284600F03EFA34 -:104C6000002F14BF0220012030703EE0284600F0E3 -:104C7000E4F93AE0284600F078F9044635E0C888BF -:104C80000128F3D13278521E012A04D9921EEDD1A7 -:104C90000122291D14E0AC60012205F108010FE09A -:104CA0003078401E0228E1D8C8880228DED10121D0 -:104CB000E960B06808B10321E960022205F10C0146 -:104CC000284600F0E9F910E0488801280DD10121BB -:104CD000B16007E03078401E0228C7D84888012814 -:104CE00003D1B460284600F0F9F92046F2BD70B552 -:104CF0000E4604463078002510F060001CBF2028C6 -:104D0000402815D104F527721178491E02290FD8C1 -:104D1000307902280CD2D2699368314620469847F0 -:104D20000546F08838B9280005D100F018F902E0EE -:104D3000314600F018F9284670BD2DE9FC410E46B9 -:104D4000002580463078317910F0600008F527772B -:104D500004D020283AD0402864D137E07078002869 -:104D60003BD0012815D003285CD13878022816D012 -:104D7000032857D1708840B9002918BF802904D072 -:104D8000F08810B94046FEF7D2FF404600F0A6F981 -:104D90004CE03878022802D003280CD042E00029E9 -:104DA00018BF80293ED04046FEF7C1FF8021404613 -:104DB000FEF7BDFF3AE07088C0BB11F07F0F1CBF4B -:104DC0004046FEF7BBFF404600F088F9FA69936859 -:104DD000314640469847054628E0142001F07F02FE -:104DE0003B7842434244022B02F5AA7402D0032BC3 -:104DF0000FD017E0002918BF802913D1080648BF3B -:104E000002F11404256002222146404600F044F9D4 -:104E10000CE001F00F0310FB03F00B06404408D533 -:104E2000808C78B93146404600F007F92846BDE845 -:104E3000F681B0F864010028F4D0002918BF802959 -:104E400003D1DFE702F11404F7E74046FEF77DFFE8 -:104E500000B101202060D6E738B5044600200D4699 -:104E6000ADF8000004F52D726888010A012908D008 -:104E700002291ED0032929D006295AD007295FD03C -:104E800067E01268207C136869469847EA88002A20 -:104E900062D0BDF8001000295BD0914288BF114656 -:104EA000ADF800100146BDF80020204600F0F4F8EF -:104EB00031BD207C51680028684604D1896A884742 -:104EC00002214170E2E7C96A8847F9E7C0B20528C4 -:104ED0003FD8DFE800F0030B121920271068426862 -:104EE000002A36D0207C69469047CFE71068826858 -:104EF0007AB3207C69469047C8E71068C26842B31D -:104F0000207C69469047C1E7106802690AB3207C9B -:104F100069469047BAE710684269D2B1207C694679 -:104F20009047B3E7106882699AB1207C6946904740 -:104F3000ACE7207C68B951684A6B68469047A5E7A2 -:104F4000207C30B951680A6B68469047072242704E -:104F50009CE700F007F831BD00F001F831BD2046B4 -:104F600000F0BCB82946204667E0F8B50D46044677 -:104F7000244F68883870002639780846022803D301 -:104F8000FFF7F0FF0320F2BD94F89C22022A02D022 -:104F9000032A0FD02EE0002929D060602046FFF7B9 -:104FA0000FFD060002D0FFF7DDFF29E0FFF7D7FF76 -:104FB000032019E031B9022084F89C02666000F0F9 -:104FC00024F814E06168884211D000F01DF83978A7 -:104FD00061602046FFF7F4FC060008D0FFF7C2FF2F -:104FE000616800F011F8022084F89C0208E0FFF7E5 -:104FF000B6FF05E0FFF7B6FF397800F006F80326A4 -:105000003046F2BD3D230020C9B22046FFF7E2BC86 -:1050100038B50D4604462878207068786070A81C62 -:10502000FFF7E2FD60802D1D2846FFF7DDFDA08023 -:10503000A81CFFF7D9FDE08031BD10B504468021E2 -:10504000FEF775FE2046BDE810400021FEF76FBE5A -:1050500000280B4600D1704730B50021044600E01F -:10506000491C14F8015B002DFAD10906C90D891CF1 -:1050700011801178197002220321597008E010F88C -:10508000011BD4B2521C1955D4B200211955521C1F -:1050900001780029F3D130BD80B513460222C0F853 -:1050A00094228361C36101E080B513460A46002162 -:1050B000FEF762FE002002BD80B513460322C0F851 -:1050C000942200F5AC721360536001E080B5134682 -:1050D0000A460021FEF757FE002002BD80B50421DC -:1050E000C0F8941200230022E1E780B50521C0F842 -:1050F000941200230022ECE710B58EB002A80FF244 -:105100007061DFF894433022FDF764FC0FF2E93060 -:105110000190009469460FF2C93000F041FB012173 -:10512000022000F026FCDFF874230021042000F0A8 -:105130009CFC02A800F01AFD08B1C046C04600F071 -:1051400089F800F023FDD64C0FF21132002084F8CC -:10515000800000214FF6FF70E082012000F085FC06 -:10516000062000F0A7FD00F03AFE0FF251330022B6 -:1051700004F18101002001F02FF90FF249330022E0 -:1051800004F18201002001F027F900202083802112 -:10519000C4480180A0214180012000F0F6F80EB043 -:1051A00010BDF8B50746BE4C7878BF4D052804F110 -:1051B000800604D03E2814D0FF2833D046E0B888BB -:1051C000E18A884206D10020E08230700FF23C3044 -:1051D00001F0D0F9012000F0D8F801202870E08A11 -:1051E0001BE0F878012804D003282FD10FF24430B7 -:1051F00022E0707801F021F9B7F805100FF2603065 -:1052000001F0B8F9307804280CBF06200520307072 -:105210000021B7F80500E08229706880284600F078 -:10522000D8FD13E0B7F80300042808D040F2074186 -:1052300088420BD10FF26C3001F09CF906E001209E -:1052400001F0E8F9B0780A2101F046F90120F2BD39 -:1052500000F0DFBD78B589B00020ADF81A0001F08C -:105260002EFA924D924E286810F1010F0ED0696807 -:105270003074090A000A707406F110046868B0748A -:10528000F174080A090C3075717506E0002001F010 -:1052900067FA040008BF0FF2A84422460621002046 -:1052A00000F0D3FC6079307207AA20797072062171 -:1052B000E078B072A078F072607830732078784C23 -:1052C00070734EF66E500890286807902E2000F0FC -:1052D000BCFC0FF274421021182000F0B6FC0FF253 -:1052E00078421021082000F0B0FC1821012000F0C5 -:1052F000D3FC01F047FA0DF1160006A901900091C8 -:1053000005AB07220021012001F0E7FB0FF2C020CE -:10531000BDF8181000900723BDF81400002201F01A -:10532000F1FA0DF11A0000900223BDF81610BDF835 -:105330001400002201F0E6FA02220221002001F00E -:10534000DEF90020207001F07CFB0120607001215B -:1053500008202071A1701020607100210120E070F0 -:10536000049110215348A06003900822012001916C -:105370000092029000230022012101F07BFBA07823 -:1053800008B101F0FDFB0AB070BD2DE9F8410446FB -:10539000012C87B003D143480588478803E04FF4C8 -:1053A000C8654FF47A67DFF8F88008F180067078F6 -:1053B00001F043F831780FF2202001F0DBF8022CE5 -:1053C00011D13078012818BF02280CD101F0DEFA83 -:1053D000010004D10FF21C2001F0CCF803E00FF221 -:1053E000382001F0C7F8347000200690059008F1CD -:1053F00019010491082298F818000FF26C310390FB -:1054000002910192002300933A462946002001F0C0 -:10541000CFFA27490E2001F090FB010013D1012C97 -:105420000AD10FF21C2001F0A5F87078224908B0CB -:10543000BDE8F04101F050B808B0BDE8F0410FF20E -:10544000282001F097B808B0012CBDE8F0410CBF4E -:105450000FF240200FF26C2001F08CB810B5012043 -:1054600001F0E2F80E4C94F88000052812D001F00B -:105470008DFA002184F8801030B90FF27C2001F001 -:1054800079F80FF27C2001E00FF29020BDE8104087 -:1054900001F070B810BD0000A0080320DF5700081D -:1054A0005820002088230020782300208075FF1FCB -:1054B0000400002007B2010046E0010000210120A5 -:1054C00000F0E0BA012001F0AFB80021042000F0A4 -:1054D000D9BA012000F0FCBA012000F001BB0000A5 -:1054E00010B50446616801F1080000F05DFB00B1F1 -:1054F0000120207010BD000010B1012803D07047BA -:10550000072000F0D3BA072000F0D8BA0D0A0D2A00 -:105510002A20444953434F4E4E454354494F4E2051 -:105520004556454E54205749544820434C49454E12 -:1055300054200A000D0A0D2A2A20434F4E4E45439F -:1055400054494F4E20555044415445204556454EF0 -:1055500054205749544820434C49454E54200A0092 -:105560004843495F4C455F434F4E4E454354494F76 -:105570004E5F434F4D504C4554455F535542455641 -:10558000545F434F444520666F7220636F6E6E65B3 -:105590006374696F6E2068616E646C652030782575 -:1055A000780A00000D0A0D2A2A204143495F47412D -:1055B000505F50524F435F434F4D504C4554455FF1 -:1055C00056534556545F434F4445200A000000009F -:1055D00053544D3332574200466972737420696EDA -:1055E00064657820696E2025642073746174652079 -:1055F0000A0000005375636365737366756C6C799C -:105600002053746F707065642041647665727469AC -:1056100073696E67200A000053746F7020416476CE -:105620006572746973696E67204661696C65642090 -:105630002C20726573756C743A202564200A000072 -:105640005375636365737366756C6C79205374610D -:105650007274204661737420416476657274697354 -:10566000696E67200A000000537563636573736693 -:10567000756C6C79205374617274204C6F77205074 -:105680006F776572204164766572746973696E67BD -:10569000200A0000537461727420466173742041C3 -:1056A00064766572746973696E67204661696C65BA -:1056B00064202C20726573756C743A202564200A6E -:1056C000000000005374617274204C6F7720506F9B -:1056D000776572204164766572746973696E6720BC -:1056E0004661696C6564202C20726573756C743A30 -:1056F000202564200A00000020200D0A0D00000073 -:105700002A2A2053544F502041445645525449535D -:10571000494E47202A2A20200D0A0D002A2A20530C -:10572000544F50204144564552544953494E472006 -:105730002A2A20204661696C6564200D0A0D00004C -:105740006C7AD8AC57720000123456789ABCDEF0EE -:10575000123456789ABCDEF0FEDCBA098765432124 -:10576000FEDCBA0987654321095032505352563145 -:105770000000000000000000000000000000000029 -:1057800000000000440008004005020112279C00B0 -:10579000F4010000FFFF00004801010000200000AC -:1057A0007FB50C466D4D61686D4EE86129622846F3 -:1057B00001F03EFA246805F1240000604060746046 -:1057C00006F108000060406001203070296829B1AE -:1057D0000FF2551000900294684688477FBD1FB5B0 -:1057E0005F4C04F1080001F030FA00BB2178F1B100 -:1057F000694604F1080001F051FA5848C16949B1FD -:105800000098029001228DF8042001A888479DF895 -:10581000040000E001202070207818B1009801F009 -:10582000F2FA04E0009904F1080001F017FA04F11B -:10583000080001F00AFA28B9207818B104F108002C -:10584000FFF743FE1FBD2DE9F8430646002000F098 -:105850005FF874883088B268DFF80081C4F3090407 -:1058600044EA8024F068A4B2C1B2204600F03CF8BB -:10587000002748F2E8094846FFF72EFE08E068884E -:10588000A04202D1316928780870687800B10127F8 -:1058900008F1240001F0D9F9F0B9694608F12400B3 -:1058A00001F0FCF9009800F10B05407A0F28E6D0D2 -:1058B000B5F80110A1420DD10098817AC81E716916 -:1058C000C0B28842C8BF0846706102463069E91C10 -:1058D000FDF770F82878D9E73800CCD0012000F027 -:1058E00017F80020BDE8F28310B513461C4A54682F -:1058F000A4F80900E1720A46194604F10C00FDF70C -:1059000059F8164A1369BDE81040002100201847D5 -:105910001249096A82B008B921B101E011B1012030 -:1059200002B0084702B0704710B50146487A0F2808 -:1059300018BF0E2807D10B4801F09AF9BDE81040B6 -:105940000020FFF7C6BD064C04F1080001F090F9F5 -:1059500004F10800BDE81040FFF7B7BD7C2200202D -:1059600008230020A02200200C4800210160416093 -:10597000704710B500F00CF85C6819B1012904D12A -:10598000204301E024EA0000586082F3108810BD33 -:10599000EFF3108272B6014B7047000040230020E5 -:1059A0002DE9FC475B4CDFF87091A5692840A061A8 -:1059B0004FF0FF3A4FF0010830E0491C54F8310035 -:1059C0000642FAD004EBC10618407168104001424B -:1059D00008BFC6F804A07768384000F09FF86062FE -:1059E00008FA00F087437760EFF3108172B6626ABD -:1059F000206908FA02F2D24310402061022004EB31 -:105A0000C00353F8086C1640401E43F8086CF6D1EA -:105A100081F31088606A59F820108847636920690B -:105A2000A2691840104207D0E069216A084203D1F8 -:105A3000002103EA0206C1E7C4F824A0C046C0461C -:105A4000EFF3108972B6216960690140A0690142D3 -:105A500001BFE169206A014201F089FA89F31088E7 -:105A6000C046C046A561BDE8F38738B51446EFF3DC -:105A7000108572B600F052F8274941F8204085F3AE -:105A8000108831BD10B500F00BF804431C6153F8C9 -:105A90003140204343F83100FFE782F3108810BD06 -:105AA000EFF3108272B61B4B1C697047EFF3108145 -:105AB00072B6184A536923EA000005E0EFF310813B -:105AC00072B6144A53691843506181F310887047C5 -:105AD000EFF3108172B60F4AD3691843D061F4E72F -:105AE000F8B50C4C656A276A2E4615F1010F0EBFFA -:105AF0000025012101FA05F5206202E0284601F0A7 -:105B000037FA216AE0690842F8D088436662E061AA -:105B10002762F1BD40100020DC200020024600205A -:105B2000110C090404BF1020120412F07F4F04BFAF -:105B3000083012020FF2180112F0704F04BF001D5E -:105B40001201120FC0F11F00895C401AC0B27047E9 -:105B50000403020201010101000000000000000036 -:105B600001F06FFA9DF80E0005B000BDF8B500F128 -:105B70000C026B4624214FF66640F1E7F8B500F1C0 -:105B80000C026B460F214FF66840E9E71B480021E5 -:105B90000171017200F034B818490A7941F8220005 -:105BA0000879401C0871704770B504466078FF287A -:105BB00002BFB4F8031001F47F41B1F5406F12D178 -:105BC00000260E4D00E0761C2979F0B288420AD2F8 -:105BD000F1B255F82110204688470100F3D002D0D9 -:105BE000022805D006E02046BDE87040FFF7D9BA8C -:105BF000002070BD012070BD000000003423002093 -:105C000080B5C046C046C046C046C046C046C04635 -:105C1000C046C046C046C046C046C046C046C04654 -:105C2000C046C046C046C046C046C046C046C04644 -:105C3000C04601F08BFAC046C046C046C046C046CA -:105C4000C046BDE8014001F03BBB18B50C46C7B0EB -:105C5000114600228DF800208DF81C008DF81D40A3 -:105C600022460DF11E0001F02CFB00F03BF83F2016 -:105C70000C21ADF80400ADF8061007A8012103902F -:105C80000691A41C049400F043F800284CBFFF20A8 -:105C90009DF8000048B010BD00B5C7B000F01BF87B -:105CA0000F2000F02AF800284CBFFF209DF80000CC -:105CB00047B000BD00B5C7B00021ADF81C0000F032 -:105CC00016F8182000F019F800284CBFFF209DF8A6 -:105CD000000047B000BD00228DF800208DF81C00A8 -:105CE0008DF81D101822002101A801F0F0BA8DF8DE -:105CF0000010182201A801F0EABAADF8060007A9C1 -:105D0000022004903F22012003910690ADF8042068 -:105D1000CDF814D0002101A8FFF795BD70B5064657 -:105D20004E4C30784CA520B1012807D0032810D064 -:105D300070BD012020700FF2281003E000212170B7 -:105D40000FF2501000F016FC2846BDE8704000F03D -:105D500011BC71680878C8B94978012909D100F0E7 -:105D600059FC0FF2641000F005FC00F02FF8012040 -:105D7000A0707168487848B900F056FC0FF27010B6 -:105D800000F0F8FB00F022F80020A07070680178A5 -:105D900001291AD1407801280AD1002000F03AFCEC -:105DA0000FF2741000F0E6FB00F010F80120A07074 -:105DB0007168487848B900F037FC0FF2841000F0A1 -:105DC000D9FB00F003F80020A07070BD284600F059 -:105DD000D1BB0078012808BF00F00DB8704780B52E -:105DE0000FF2390200210220FFF73FFE1B4900227B -:105DF0000A70BDE8014080B5002000F015FC17488E -:105E000001214170002181700121C17000210171C7 -:105E100001BD00210220FFF735BE000010B50F4C78 -:105E20002079401E8041C00F2071207868B10FF2A8 -:105E3000381000F09FFB08A000F09CFBE11CBDE8BF -:105E400010404FF6426001F011BABDE810400FF269 -:105E5000581000F08FBB0000200A0D0060230020C6 -:105E60002D2D20503250204150504C49434154492F -:105E70004F4E20534552564552203A204E4F5449DA -:105E80004649434154494F4E20454E41424C4544BA -:105E90000A0000002D2D20503250204150504C4916 -:105EA000434154494F4E20534552564552203A20C3 -:105EB0004E4F54494649434154494F4E204449535B -:105EC00041424C45440A00002D2D205032502041C3 -:105ED00050504C49434154494F4E2053455256452A -:105EE0005220203A204C454431204F4E0A000000F9 -:105EF0002D2D20503250204150504C49434154499F -:105F00004F4E2053455256455220203A204C45448E -:105F100031204F46460A00002D2D2050325020419E -:105F200050504C49434154494F4E205345525645D9 -:105F3000522031203A204C454431204F4E0A000077 -:105F40002D2D20503250204150504C49434154494E -:105F50004F4E205345525645522031203A204C4551 -:105F60004431204F46460A002D2D2050325020410A -:105F700050504C49434154494F4E20534552564589 -:105F80005220203A20494E464F524D20434C49451D -:105F90004E5420425554544F4E20312050555348B2 -:105FA0004544200A200000002D2D20503250204171 -:105FB00050504C49434154494F4E20534552564549 -:105FC00052203A2043414E275420494E464F524DCD -:105FD00020434C49454E54202D20204E4F544946D5 -:105FE00049434154494F4E2044495341424C454452 -:105FF0000A200000DFF854150A6892B200E0024659 -:10600000086880B28242FAD170472DE9FC4104460B -:106010001825DFF83C85DFF83C65684308EB00078E -:106020003078062808D131787170347078754FF067 -:10603000FF307060002039E000F077F8B968091887 -:10604000B96008F10803B96832786A439A589142F6 -:10605000327813D308F1150315FB02FC13F80C304A -:10606000062B25D008F108066B43F358994222BF4E -:1060700008F115036A439A5CEED219E011463378B1 -:1060800069439A420BD008F1140308F1150C5B5CCC -:1060900015FB03F50CF805407A753B7500E07A7541 -:1060A00008F114025454317871703470BDE8F681EF -:1060B0001146694308F115035B5C062B04D008F117 -:1060C000140615FB03F574557B753A7508F1150236 -:1060D0005454EBE7F8B5DFF87C34DFF874541E78DD -:1060E000182402466243B0422A4404D118785870FA -:1060F000507D18700FE0167D507D92F815C005F1A7 -:1061000015076643062807F806C004D0167D143527 -:1061100014FB00F42E55012010731878062802BFD6 -:1061200000294FF0FF315960F1BD10B5DFF824446C -:10613000606810F1010F0FD0FFF75CFF6168DFF8B6 -:106140001824814261683CBF5388C918081A5178E5 -:1061500048431178C84000E0002080B210BD2DE90E -:10616000F84FDFF8F453DFF8F4B3D5F80880D8F827 -:106170000000DBF800104A0500F09BF9DFF8D4635B -:10618000DFF8CCA321F4806181604FF018093478E6 -:106190000AF1080019FB04F14758FFF7C6FF8742D0 -:1061A00017D200270121B170062C3DD019FB04F451 -:1061B0000AF108010AF108020959814223BF0AF1D4 -:1061C00008010959091A002111510AEB04014C7DFB -:1061D000EAE7A9884118B94202D2AF880021E2E774 -:1061E0003F1ADFE7022802DA2878012800D07F1E54 -:1061F000D8F80000C1684A07FAD500F060F9DBF86A -:106200000C00000CBFB247EA0047CBF80C70FFF758 -:10621000F1FE7060A8680068816841F48061816067 -:10622000AFF30080BDE8F18FB8B20028DAD1FFF7F4 -:10623000E1FE70600320BDE8F24FFEF773BB2DE96D -:10624000F843EFF3108872B6C34DC14BA8680168DC -:10625000CA224A6253204862BE4A886820F480609D -:10626000886018201678374647431F44387B022839 -:1062700026D13C68D7F810909078F0B17A7B012A4B -:106280000AD101213046FFF725FF88F3108879688D -:10629000304600F021F904E088F31088304600F021 -:1062A000CCF8A8680068CA214162224653214162A5 -:1062B0004846314600F05CF90BE0FFF750FF06E07E -:1062C000C8684207FCD500F07EF8A549086088F34D -:1062D0001088FF21A86802685162BDE8F183F8B513 -:1062E0009D4CA160CA2209684A6253224A629B4AB5 -:1062F000136843F020031360136803F00703C3F12E -:106300000403237095682D0C05F07F056D1C6570E6 -:10631000EDB29268C2F30E02521C628092B2521E1B -:106320006A43A2F5A072DA404FF6FF739A422CBF7F -:10633000A380A2808B4A136843F4002313608A4B26 -:106340001D6845F400251D6048BB8248804E01232E -:10635000837018254FF0FF33436000235FFA83FCFE -:1063600006F10C0715FB0CFC4FF0000E07F80CE0D3 -:106370005B1CDFB2062FF1DB06230370886820F474 -:106380008060886000F01FF8D0600320FEF7D5FA27 -:10639000A1680868826842F48042826005E0C868AB -:1063A000410544BF0320FEF7BDFAA1680A68FF203B -:1063B0005062002203210320FEF768FABDE8F24094 -:1063C0000320FEF781BAC86800F0800060F4906096 -:1063D000C8604FF400207047F0B504460025EFF385 -:1063E000108672B61827DFF868C10CF10C0007FBA5 -:1063F00005FE10F80E0010B16D1C062DF5DB062D04 -:106400000CD06F430CEB07000127077386F310884D -:106410000461427303600D700020F0BD86F31088A4 -:106420000120F0BD10B5044600F007F81820484AD6 -:10643000444310190021017310BDF8B50746EFF36E -:10644000108472B60320FEF74AFA434DAE683068F6 -:10645000CA2141623A4653214162182043494243CE -:10646000895C02291BD100213846FFF733FE3948E9 -:10647000017806290ED1306838490A68530500F0C2 -:1064800018F821F480618160C1684A07FCD500F0EA -:1064900016F804E04078884218BFFFF760FEA9684C -:1064A0000A68FF2050620320FEF70EFA84F310887A -:1064B000F1BD02D5C1684A07FCD481687047C16844 -:1064C00001F0800161F49061C1604FF40020244923 -:1064D00008600320FEF731BA2DE9F04180460F46EF -:1064E000424618201A4942438C18207B022804BFD8 -:1064F0004046FFF7A2FFEFF3108572B60320FEF7C8 -:10650000EEF9154EB0680068CA214162532141621C -:1065100002202073A76067604046FFF776FD0D49B3 -:106520000A784978914202D0FFF719FE02E0A1688B -:10653000081AA060FF20B1680A6850620320FEF7C5 -:10654000C3F985F31088BDE8F081000028280040D9 -:10655000C81F0020702300202823002008280040A6 -:106560000C0800580008005880080058D41F00206C -:10657000104700000EB4C0B5024603A800210190E8 -:10658000009101AB0121044878440C30FBF7A0F8DE -:1065900006BC5DF810FB00BF3F2D0000404981B0F4 -:1065A0000A6802430A60096808400090009801B038 -:1065B000704778B585B004466846142100F092FE15 -:1065C0000CB9012004E0012C18BF022C02D10220DA -:1065D000FFF7E4FF00F012F8009501200190002180 -:1065E0000220039000F004F800F00EF806B070BD31 -:1065F0000291694656F8240000F078BE0FF2B00010 -:10660000284E30F81450704756F8240000222946CE -:1066100000F029BF0FF29801224B31F8101053F807 -:106620002000012200F01FBF0FF284011D4B31F842 -:10663000101053F82000002200F015BFF0B585B00F -:1066400004460D466846142100F04CFE0120FFF779 -:10665000A5FF2800144E0FF260070AD137F8140086 -:106660000090002101910120029002210391FFF787 -:10667000C0FF012D12D137F81400009001210B4802 -:106680000190FFF7B5FF0FF23400045D00220F21E7 -:1066900060B2FEF7FBF860B2FEF716F905B0F0BD88 -:1066A0004C000058741000208010002000002110C1 -:1066B000100001000200000000040000280000B5E6 -:1066C00087B000F010F8012003220690ADF80420F6 -:1066D000ADF8062000F03DF800284CBFFF209DF8E3 -:1066E000000007B000BD00208DF800001822002136 -:1066F00001A800F0ECBD182201A800F0E8BD00B52B -:10670000C7B000F00EF8FFF7F6FF312000F013F8E5 -:1067100000F01FF800284CBFFF209DF8000047B094 -:1067200000BD00238DF81C008DF8003007A84170D3 -:10673000827000217047ADF8060007A9032004907D -:106740000822012003910690ADF8042070470390C1 -:106750000691CDF814D0002101A8FFF774B800000D -:1067600001460648064AC3798B4218BF904218BFBB -:106770000838F8D18B4218BF00207047F873FF1F0C -:106780000070FF1F00B587B000208DF8000000F0FA -:10679000E0F840F20110ADF806003F22012006901B -:1067A00000F0ECF800284CBFFF209DF8000007B077 -:1067B00000BD2DE9F84107460128C7B088461546B7 -:1067C0001E4608BF022003D002280CBF1020002064 -:1067D0000DF11D010C1800F036F8012F8DF81C701A -:1067E00002D0022F18D019E002273A4641460DF197 -:1067F0001D0000F066FD2570667000F0AAF83F20CD -:106800004FF4817100F016F8FF1C049700F0B8F8FF -:10681000002805D5FF2009E01027E6E7472005E01E -:106820009DF8000010B94E9800F067F8FFE748B0F7 -:10683000BDE8F081ADF80400ADF8061007A803210B -:1068400003900691704703220021684600F03FBD87 -:106850002DE9F64F0C460546012CC7B09B4608BFF4 -:10686000022003D0022C0CBF102000200DF11F01CC -:106870000E18FFF7E8FF012CADF81C508DF81E40F4 -:1068800002D0022C2CD02DE00227569C559DDDF81D -:106890005091DDF84CA1DDF8488148993A4600F066 -:1068A00054F8A6F800B086F8028086F803A086F8AF -:1068B00004907571B47100F04CF83F20ADF80400FD -:1068C0004FF4827107A8ADF80610039003210A3730 -:1068D0000497069100F054F8002805D5FF2009E040 -:1068E0001027D2E7472005E09DF8000010B957981F -:1068F00000F003F849B0BDE8F08FBDF80110018049 -:106900000020704730B5C7B01C464A9B00F026F8FF -:1069100000258DF800508DF82140224619460DF1D2 -:10692000220000F0CEFC00F014F83F204FF48371F9 -:1069300000F01BF8A41D049400F022F800284CBFBE -:10694000FF209DF8000047B030BD0DF11F0000F0A2 -:10695000B8BC1822002101A800F0B9BCADF81C0099 -:10696000ADF81E108DF820207047ADF80400ADF88A -:10697000061007A80121039006917047ADF8042086 -:10698000CDF814D0002101A8FEF75DBF00B587B097 -:1069900000F00DF900F00FF9812000F003F900F08C -:1069A00013F900284CBFFF209DF8000007B000BD80 -:1069B0002DE9F84DC7B09446DDF840E1519A559D58 -:1069C000569EDDF84CA1ADF81D108DF81C004FF05F -:1069D000000BADF81FC08DF821308DF822E000F0DB -:1069E00024F800F017F824F8095F668000F0E3F857 -:1069F0003F20832100F003F9574406910D37049797 -:106A000000F0E5F800284CBFFF209DF8000048B0DA -:106A1000BDE8F08D88F800A007AC5499E4195246FF -:106A200008F10100544400F04CBC8DF823201746B7 -:106A300052998DF800B00DF1240809A8B84400F06F -:106A400040BC00B5C7B000F00CF8852000F090F80D -:106A500000F0BAF800284CBFFF209DF8000047B0B6 -:106A600000BD00218DF81C008DF80010182201A82F -:106A700000F02DBC2DE9F841C7B04FF0000800F040 -:106A800026F80DF12300DDF844E14E9F4F9E509D06 -:106A9000529C8DF81F30C0F800E08DF800808DF812 -:106AA00020708DF821608DF822508DF8274000F07D -:106AB00082F88620ADF8060007A90C2000F080F8C7 -:106AC00000284CBFFF209DF8000000F0A4B88DF80E -:106AD0001C0007A8417082707047F8B5C8B0054621 -:106AE0000E4617461C4600F023F808A8467087702B -:106AF0008DF8205000F07EF88A21ADF80A103F2072 -:106B0000032100F06AF8002848BFFF200ED49DF84A -:106B1000000058B94F994E98BDF801202280BDF869 -:106B200003200280BDF805000880002049B0F0BDB8 -:106B300007220021684600F0CABB18B5C7B004465A -:106B400000F035F88DF81C40224600F060F800F0A7 -:106B500032F83F208E2100F061F8641C049400F0AC -:106B600036F800284CBFFF209DF8000048B010BD4B -:106B7000ADF8060007A901203F2203910490704759 -:106B800000B587B000F013F800F015F8922000F07F -:106B900009F800F019F800284CBFFF209DF800000C -:106BA00007B000BDADF806003F220120704700206D -:106BB0008DF8000070471822002101A800F087BB63 -:106BC00004903F22012003910690ADF80420CDF8F7 -:106BD00014D0002101A8FEF736BEADF808000591DB -:106BE00008A8072104900791CDF818D0002102A829 -:106BF000FEF729BE1822002102A800F068BBADF8FC -:106C00000400ADF8061007A80121039070470DF1AC -:106C10001D0000F056BB48B0BDE8F081ADF804009F -:106C2000ADF8061007A801210390069170470000F7 -:106C30000249016002490161704700BF036D00080D -:106C4000296D0008006040607047EFF3108172B654 -:106C5000026882420CBF012000201CE0EFF310828A -:106C600072B603680B60486001600868416023E009 -:106C7000EFF3108272B6086043684B604160486869 -:106C8000016019E0EFF3108172B642680368136087 -:106C900002684368536081F31088704710B5EFF3C2 -:106CA000108472B602680A600068FFE7FFF7EAFF27 -:106CB00084F3108810BD0B6082F3108870470000C9 -:106CC00000F066BC6C486D49016001F12002426031 -:106CD00001F13002826001F13C02026201F14402E2 -:106CE000426201F14C02C26001F15402026101F101 -:106CF0007002426101F1740282618031C16100F071 -:106D000065BC38B504465E4D2846FFF79BFF5A48E0 -:106D10004068A1680160E168C160856059494160CF -:106D200000F070FC58482AE080B553484268136868 -:106D300001211972406800F06BFC002002BD38B5DB -:106D4000514C4F4D04E000F041F80098216888470D -:106D50002846FFF77AFF0028F5D031BD4A48416840 -:106D6000084738B50446494D28460060406042480F -:106D7000C068A1680160456000F04FFC444821688C -:106D8000016061684160002032BD80B53A48C26848 -:106D9000136810211972C06800F045FC002002BD84 -:106DA00035483B4AC168C16813680868184738B558 -:106DB000374C364D04E000F009F8009861688847C8 -:106DC0002846FFF742FF0028F5D031BD6946284626 -:106DD000FFF764BF38B504462E4D2846FFF732FF53 -:106DE0002D480060406024480069A1688160E16826 -:106DF000C16005612168016061684160216941618C -:106E00006169816131BD80B501462348FFF730FFDC -:106E1000BDE802400FF2050000F015BC38B5164C75 -:106E20001D4D06E0FFF7D2FF009920690069FFF7CA -:106E30001FFF2846FFF709FF0028F3D031BD10B52A -:106E4000164C2046006040600B4841690C60BDE86C -:106E5000104000F00CBC1CB5104C06E06946204602 -:106E6000FFF71CFF0098C046C0462046FFF7EDFE26 -:106E70000028F3D013BD000000000320AC0903205C -:106E8000480A03209008032050230020500A0320C2 -:106E900058230020380A032048230020400A0320FA -:106EA00010B52748274C88B0016841F400410160C3 -:106EB000FEF75AFD24480168C908C90041F00401E1 -:106EC000016000F0EDFB21490020FFF708FA00F017 -:106ED000FEFB01210120FEF74CFD0020FFF769FBBE -:106EE0000120FFF766FB0220FFF763FB0120FFF79D -:106EF00091FB01210020FFF7A1FBFFF7E3FE144AFD -:106F000000210820FEF7B1FD04F23C500FF24501CC -:106F10000090019169460FF2410000F03DF804F243 -:106F20005470029004F5C96140F23C500590039101 -:106F3000049402A8FFF74EFFFFF7C2FE08B010BD91 -:106F4000080000583000032080040058A8220020C8 -:106F5000DB6F00087047000080B500F0C7FB002120 -:106F60000120FEF706FDBDE80140FEF7C5B87047F9 -:106F70004FF0FF30FEF714BD00210820FEF782BD60 -:106F80000220FEF7A5BD0220FEF7AABDB0F5806F76 -:106F900008BFFEF75DB970477FB50C464D4D61687F -:106FA0004D4EE8612962284600F0BEFC24687460FA -:106FB00006F1080000604060012000F068F8012040 -:106FC0003070296841B10FF2E9000FF2ED02009034 -:106FD00001920294684688477FBD1FB53E4C04F17C -:106FE0000800FFF732FE00BB2178F1B1694604F1D9 -:106FF0000800FFF753FE3748C16949B10098029075 -:1070000001228DF8042001A888479DF8040000E0C3 -:1070100001202070207818B10098FFF7F4FE04E0FA -:10702000009904F10800FFF719FE04F10800FFF7CA -:107030000CFE28B9207818B104F10800FFF79CFF76 -:107040001FBD2DE9F04105460E4690461C46002026 -:1070500000F01DF8204F7868A0F80950C67232463B -:1070600041460C30FBF7A6FC1A4A136900210020A8 -:10707000984748F2E800FFF786FF79688A78D21CC3 -:1070800004F10800FBF796FCBDE8F04101201CB5B7 -:107090001049124C096A20B901B1884700202070BC -:1070A00013BD0120207011B1BDE81C40084713BD7D -:1070B0000020FFF765BF000010B50146064C04F143 -:1070C0000800FFF7D5FD04F10800BDE81040FFF708 -:1070D00053BF0000CC220020182300203E230020B4 -:1070E00038B5054684B068780024FF2802BFB5F89B -:1070F000031040F60140814225D165498A88B5F8E0 -:107100000700921C904209D1687B0124C10752BF3D -:107110008DF8004000218DF8001011E04988491CCD -:10712000884210D10FF27010FFF724FA03208DF877 -:10713000000005F10D00B5F80B108DF80810019056 -:107140006846FEF7EBFD204605B030BD10B58AB0AD -:1071500050484F4CFEF720FD8F218DF81810E52088 -:10716000B3218DF819008DF81A10D5202E218DF835 -:107170001B008DF81C107F204A218DF81D008DF812 -:107180001E1098202A218DF81F008DF8201048200D -:107190007A218DF821008DF82210CC2040218DF825 -:1071A00023008DF82410FE2000218DF82500ADF875 -:1071B000261000940823012206A90220FFF7F9FAFD -:1071C00000F032F8412000F023F8A01C00F010F885 -:1071D000062100F015F800F027F8422000F018F81A -:1071E000201D00F005F8102100F00AF80AB010BDCB -:1071F000059001210491029100200A22019070471C -:10720000039200910223208806AA0221FFF720BBE7 -:107210008E218DF824008DF823100020FE21ADF87A -:1072200026008DF82510704719208DF81800ED21E3 -:1072300082208DF81A008DF81910ED20AE218DF8FE -:107240001C008DF81B104C2021218DF81E008DF89C -:107250001D1041209D218DF820008DF81F10222047 -:1072600045218DF822008DF82110704780B542220B -:107270004FF64263984208D1054800910223818865 -:1072800000880022FFF73EFB0246104602BD0000C8 -:1072900068230020E17000082D2D20474154542020 -:1072A0003A204C454420434F4E464947555241549D -:1072B000494F4E2052454345495645440A00000077 -:1072C000704710B50446FBF775FB204610BD10B59E -:1072D000044610460A460146204600F02FFB204691 -:1072E00010BD0000002200F05DBB00002DE9F84F4A -:1072F0004FF00009644A654B4FF00F0805460E46F3 -:1073000033E0634FBD4214BF072704278F40274354 -:107310004CF82E70C1431C6801EA040C7468E40345 -:1073200048BF40EA0C0CC3F800C05C6801EA040CDA -:107330007468A40348BF40EA0C0CC3F804C0146886 -:1073400001EA040C7468E40248BF40EA0C0CC2F87D -:1073500000C0546801EA040C7168890248BF40EA21 -:107360000C0CC2F804C009F10109316831FA09F0C6 -:1073700077D0012404FA09F414EA0100F3D04FEAAB -:10738000490C032101FA0CF16FEA010E7168012921 -:1073900018BF022903D0112918BF122911D1A968D9 -:1073A000F7680EEA010107FA0CF73943A96069682A -:1073B00021EA04047168C1F3001101FA09F10C43D8 -:1073C0006C60E968B4680EEA010104FA0CF4214328 -:1073D000E9604FEA89017468022C18BF122C12D19F -:1073E0004FEAD90405EB840401F01C07D4F820A06F -:1073F00008FA07FB2AEA0B0AD6F810B00BFA07F7CF -:1074000047EA0A0727622C680EEA0407347904F079 -:10741000030404FA0CF43C432C607468E400A2D525 -:10742000DFF870C04FEA990E5CF82E7001F00C0185 -:1074300008FA01F427EA0404B5F1904F08BF0027C9 -:107440000ED0154FBD4208BF012709D0134FBD42D2 -:1074500008BF022704D0124FBD427FF452AF03276A -:1074600054E7BDE8F18F81B0002A14BF81618162C9 -:1074700001B070470B4A136803421CBF1060FFF74E -:1074800085BD7047000000000008005880080058C3 -:1074900000100048080001400004004800080048AF -:1074A000000C00480C080058C0680840884201D110 -:1074B0000120704700207047C0690840884201D110 -:1074C000012070470020704710B56C4C0221204607 -:1074D000FFF7F2FF38B16068C043810703D5FFF7BB -:1074E00066FC022018E001212046FFF7E5FF38B1D5 -:1074F0006068C043C10703D5FFF721FC01200BE002 -:1075000008212046FFF7D8FF38B16068C043010763 -:1075100003D5FFF7A0FC0820A06010BD10B5574CA4 -:1075200000F033F818B96068C043810306D400F056 -:107530002CF830B96068C043810302D5BDE8104023 -:107540007AE0082100F022F870B96068C0430103B6 -:107550000AD560684A4940F40020606008688047A6 -:107560004FF40020A06010BD202100F00FF858B9A2 -:107570006068C043810207D5606840F40010606015 -:10758000BDE81040FFF7EABB10BD022120468BE7A3 -:107590003C4881B0016841F480110160006800F44A -:1075A0008010009000983848016841F40071016033 -:1075B0003648026842F40072026040BF20BF34487F -:1075C000016841F40041016001B0704780B5314865 -:1075D000016841F480110160006800F4801000909F -:1075E00000982648016841F001010160026842F4F8 -:1075F000803202602C20FDF767F9BDE802402D20A3 -:10760000FDF762B9244801684908490001607047E4 -:1076100022494FF48030086070471F48016821F00C -:107620000201016070471C484FF40031416001685D -:1076300021F40031016070471748016841F40031BE -:107640000160FFF7ADBB38B504460C4D0821284654 -:10765000FFF72AFF30B10A480460686820F4002070 -:10766000686031BDA0474FF40021A96031BD0A48D0 -:10767000016821F00801016070470000000C00580B -:107680007C23002050010058D408005820080058DE -:107690000C04005850000058040C0058080C005806 -:1076A000DFF80C00FFE7016841F48061016070477A -:1076B000040400584A4900E04A4981B00A6802437C -:1076C0000A60096808400090009801B0704780B5D2 -:1076D00000F091F900F091F94348016841F48031DC -:1076E000016000F0B4F9BDE801400EE000B587B0DC -:1076F00068460FF218211C22FBF76CF9FFF79FFB7D -:107700006846FEF73BFA07B000BDF0B585B06846A5 -:107710001421FFF7E7FD00260025002400210FF2C9 -:10772000DC0000EBC102907988B11368B3F1904F8F -:1077300008D02E4FBB4208D02D4FBB4204BF9088CB -:10774000044304E09088064301E090880543491C07 -:107750002229E4DB00200290012103200390019103 -:10776000B0B288B100900120FFF7A4FF0120FFF71D -:10777000A3FF69464FF09040FFF7B8FD0022B1B279 -:107780004FF09040FFF76FFEA8B280B1009002204A -:10779000FFF790FF0220FFF78FFF144E6946304637 -:1077A000FFF7A4FD0022A9B23046FFF75CFEA0B2AD -:1077B00080B100900420FFF77DFF0420FFF77CFFDD -:1077C0000B4D69462846FFF791FD0022A1B22846DD -:1077D000FFF749FE05B0F0BD0021064800F076B97C -:1077E0004C0000584C010058900800580004004814 -:1077F00000080048FC15002000F092B90000004885 -:1078000001000000000000480100000000000048E6 -:1078100001000000000000480100000000000048D6 -:1078200001000000000000480100000000000048C6 -:1078300001000000000000480100000000000048B6 -:1078400001000000000000480100000000000048A6 -:107850000100000000000048010000000000004896 -:107860000100000000000048010000000000004886 -:107870000100000000000048010000000000004876 -:107880000100000000000048010000000000004866 -:107890000100000000000048010000000000004856 -:1078A0000100000000000048010000000000004846 -:1078B0000100000000000048010000000000004836 -:1078C0000100000000000048010000000000004826 -:1078D0000100000000000048010000000000004816 -:1078E0000100000000000048010000000000004806 -:1078F00001000000000000480100000000000048F6 -:10790000010000000000004801000000000000002D -:107910000000000000000000FC77000828000320A1 -:107920002C00032022040400024901600249016185 -:10793000704700BF636D00088B6D000862F30F2273 -:1079400062F31F42401810F0030308D0C91A1FD376 -:10795000DB0748BF00F8012D28BF20F8022D1300D7 -:1079600030B414461546103928BF20E93C00FAD837 -:10797000490728BF20E90C0048BF40F8042D8900C2 -:1079800028BF20F8022D48BF00F8012D30BC7047F9 -:10799000C91818BF00F8012DCB0728BF00F8012D2A -:1079A0007047000000B500BF13009646944610399A -:1079B00028BFA0E80C50FAD85FEA417C28BF0CC071 -:1079C00048BF40F8042BC90728BF20F8022B48BF46 -:1079D00000F8012B00BD0000032010B5FCF749FFA3 -:1079E0000F2000F033F90024002814BF012400F018 -:1079F00011F8204610BD064805E00548016841F031 -:107A0000020101607047016841F0010101607047A7 -:107A1000042004E07047000038B5EFF3108472B61C -:107A2000284D6946281D00F04CFA6946281D00F0D3 -:107A3000A5FA38B184F31088BDF80010224AFFF788 -:107A4000DBFE31BD0120287084F3108831BD80B584 -:107A5000FFF7C2FE0221009100231A4800F1240121 -:107A60004FF48052001D00F013F901BD00BFF8B5BE -:107A700014460026EFF3108510F1010F1ED00128E7 -:107A80001CBF02284FF0FF3618D1BCB1264672B693 -:107A90000C4F012392B2381D00F00EF900281CBFD4 -:107AA0003978002908D000223A7085F31088A1B2F5 -:107AB000054AFFF7A1FE01E085F310883046F2BDCC -:107AC000000000001C000020197A000810B55A4C74 -:107AD000002220606160A28104F114005749FCF784 -:107AE00049FF574904F11400FCF757FF04F53971B9 -:107AF00004F1140000F0CCFB04F11400FCF75EFF6D -:107B00000FF28103002204F110010020FEF764FC53 -:107B1000BDE810400FF23D0200211020FDF7A5BF87 -:107B2000F8B50C461546EFF31086434F014638680A -:107B30002246FAF73FFFBD60FC8172B6387B20B168 -:107B400001211020FDF79EFF01E00120787386F3EC -:107B50001088F1BD10B5384CE289216804F1140099 -:107B600000F09DFB04F1140000F0ADFB28B1BDE86E -:107B7000104001211020FDF785BFA068BDE810402E -:107B80000047000038B5EFF3108472B62A4D01208B -:107B90002873687B18B101211020FDF773FF84F36F -:107BA0001088287CBDE83240FEF73CBC10B5224C62 -:107BB000616804F1140000F07DFB04F1140000F092 -:107BC00098FB207C4AF21701FEF786FC002010BDCE -:107BD0000020704710B520281A4A02D0212812D060 -:107BE0001FE008784B788C7840EA0320CB7840EA95 -:107BF000044040EA036010600879107148795071C0 -:107C0000887990710DE010680870030A4B70030CBE -:107C1000000EC8708B701079087150794871907996 -:107C20008871002010BD80B5C046C046064800F0EF -:107C300060FB002002BD0000CC1100209411002048 -:107C400090100020C4140020E011002070B50F4EE9 -:107C5000044630780025A8B100F0A3FB32784FF439 -:107C60007A71B1FBF2F1B0FBF1F0FCF747FE48B9D5 -:107C7000102C07D2002221464FF0FF30FCF706FE01 -:107C8000B46000E00125284670BD00BF68100020E8 -:107C900010B5029C016042600021C1600161416138 -:107CA00081610381A107047704D5008910B14FF0E9 -:107CB000FF3010BD002010BD2DE9F04F064685B005 -:107CC00030890C460027BB4600287169DC460CBF92 -:107CD0004FF00208D84681B168B930697768451C11 -:107CE000BD4228BFED1B3768385C7D5D00EB052782 -:107CF000BF1CBFB203E0074600E000B10246306996 -:107D0000F568A84223BF7568281AC01B00201546D5 -:107D100008EB050903FB09FE864532BF0020B0FBD6 -:107D2000F9FA09FB1A00C0B2804509DA96F81C90EE -:107D30005FEAC97A48BF84465FEA897048BFC44693 -:107D4000100000F0B4807068714461448842C0F053 -:107D5000AE8008EB020080B20390D946100AADF85D -:107D600002000294ADF80020049359E0800740D54A -:107D70003089002840F09B803268D018A34600F874 -:107D8000024C200A32681A4402F8010C224630687C -:107D90001844FAF70FFE706920187061B069019CF1 -:107DA000401CB061200A31680C70316848701CE0DA -:107DB0008CB3307FC207D9D5308940B931681944B6 -:107DC000FF2001F8020C3168194401F8010C4FF052 -:107DD000000B7069241874612C463089002340B967 -:107DE00031680C70210A3068417002237069801C70 -:107DF000706108EB04070021BFB231615CB1DA4465 -:107E0000029800EB0A01306822461844FAF7D2FDC6 -:107E100070692418746109F10109B069401CB061EE -:107E2000049A70683169914545D2791881422CBF16 -:107E3000081A0846306103463089A0B93068BDF899 -:107E40000010C1545B1C70683168834228BF1B1A44 -:107E5000BDF80200C8545B1C7068834228BF1B1A1F -:107E60007069801C706105FB09FA7468BDF8000038 -:107E7000E41A844288BF0446029800EB0A01281BDA -:107E8000AC42019003D093D2307F002890D1376864 -:107E90002246F818FAF78EFD706920187061A34623 -:107EA000019C039F0023A9E73068404400E00020C4 -:107EB00005B0BDE8F08F88448045F5D3A8EB0008F5 -:107EC000F2E778B5028900230B80002A44690CBFD1 -:107ED00002250025002C4FD0028952B9C26846689D -:107EE000531CB34228BF9B1B0668B25CF35C02EBD9 -:107EF00003220A80027F02F00302012A25D10B88A7 -:107F00004FF6FF72934204BF0289002A09D0C3686A -:107F100002699A4219D20289BAB14668F31A9342A9 -:107F200013D24368C268E41A14190022C260446183 -:107F300002894AB902681478012B94BFC3F1010386 -:107F40000123D25C04EB02220A80C46842680668FE -:107F50002B19934228BF9B1A33440E884169891B11 -:107F6000491B416105D034192D19954228BFAD1A1E -:107F7000C5608169491E8161184672BDF8B50289E4 -:107F800000230B80002A42690CBF02240024002A2F -:107F90003BD0C56802892B464AB946686A1CB24282 -:107FA00028BF921B0668775DB25C07EB02220A804D -:107FB000067F06F00306012E20D10F884FF6FF72D0 -:107FC000974204BF0289002A07D142680023012A90 -:107FD00094BFC2F1010201220AE00269AA420DD255 -:107FE00002895AB14668751B954207D2002304E006 -:107FF00005682E78AA5C06EB02220A8041680068B8 -:10800000E4188C4228BF641A03191846F2BD000018 -:10801000F8B505464FF40770F8F722FF040005F5A0 -:108020002F7602D130600220F2BD346005F14C079A -:10803000287C40B94FF4007300F032F80120288703 -:108040004FF4007305E0402300F02AF80120288750 -:108050004023022201212846FBF758FE0120A5F803 -:108060007801082310207880032282212846FBF71C -:108070004DFE0120388070680168884704F5017161 -:1080800000220A614A61287C0A6800280CBF4FF46C -:108090000073402301212846FBF775FE0020F2BD46 -:1080A000022281212846FBF731BE38B504468121E2 -:1080B000FBF736FE04F13805002028800121204618 -:1080C000FBF72EFE0020A4F8780182212046FBF762 -:1080D00027FE0020A882E88204F52F74206838B1BA -:1080E000616848688047206800F074F900202060CB -:1080F000002032BDF8B5054605F5277300201C6A3F -:108100008DF800000E46ADF8020000270CB90320E0 -:10811000F2BD317811F0600024D020283ED1F288E1 -:108120007078D2B109060DD55B6AD3F808C0214634 -:10813000E047F288082A28BF072221462846FCF794 -:10814000ABFF30E004F500710870F08848702146FC -:10815000F2882846FCF7B0FF25E05B6A9C68314650 -:10816000A04720E0707830B101281CD00A2809D03F -:108170000B2810D012E0187803280FD102220DF13D -:10818000020104E01878032808D101226946284634 -:10819000FCF782FF07E01878032804D03146284610 -:1081A000FCF74BFF03273846F2BDF8B5044604F54B -:1081B0002F739E681D680DB90320F2BD0F46142071 -:1081C00010FB07F004EB000CDCF8180080B128224B -:1081D0005743F219926BB0FBF2F602FB160038B966 -:1081E000CCF81800002300222046FBF7C5FD0BE069 -:1081F00005F502700022C2605A68136923B10A466D -:10820000006805F5047198470020F2BD70B500F5CF -:108210002F752C680CB9032070BD04F50176FBF7AF -:10822000B9FDB06004F503716A683068D368984797 -:10823000002070BD1CB500F52F70016809B903203E -:1082400016BD4368002B1EBF01F500742078FF287F -:1082500004D062789B689847FF202070002016BDEC -:10826000432101800648704743210180054870473B -:1082700043210180044870470A2101800348704768 -:108280000C110020C8100020501100208410002084 -:1082900009B903207047C0F8C01200207047D0F819 -:1082A000BC0208B90320704700F5027001608260CB -:1082B00000207047D0F8BC0208B903207047C0F80E -:1082C00004120020704710B5D0F8BC12012209B981 -:1082D000032010BD01F50274E16841B9E260A168B4 -:1082E000C162A36822688121FBF746FD0022104687 -:1082F00010BD80B5D0F8BC1209B9032002BDD1F879 -:108300000422017C00290CBF4FF40073402301219B -:10831000FBF739FD002002BD4FF0B040006800F0CF -:10832000F000B02888BFB020704738B54FF0B04497 -:10833000244DA16811F00C0106D1FFF7EDFFC0F349 -:10834000031055F8200032BD04291F4A05D0082922 -:108350001E4804D12168C90222D5104632BDE16809 -:1083600001F00301022904D0032904D12168C902C4 -:1083700007D5104605E0FFF7CFFFC0F3031055F80F -:108380002000E168E268E368C1F306214843C2F3D4 -:108390000211491C5B0FB0FBF1F05B1CB0FBF3F06A -:1083A00032BD80B5FFF7C1FF0549FFE7084A0968FC -:1083B000C1F3031152F82110B0FBF1F002BD00002F -:1083C00008000058288C00080024F4000048E80148 -:1083D000E88B0008F8F79FBEDFF864130A6803090A -:1083E00003F47F2300019A4300F47F2000F082B958 -:1083F000DFF84C231368010C23EA014343EA0043EE -:10840000136070472DE9F843054600242878DFF80B -:1084100030634106A0464FF0B0472DD5286B70B1B0 -:10842000B0F5800F06D0B0F5000F18BFB0F5400FC3 -:1084300017D01FE0F86840F48030F860EDE038684D -:1084400020F08060386000F081F9814638680001D2 -:1084500040F1D08000F07AF9A0EB09000228F5D9AC -:108460000324D7E000F072F9A0EB0900022840F2E3 -:10847000C980F5E70124A0462868010531D5B06818 -:1084800000F44078286C80452AD000F065F9B8F1F6 -:10849000000FB16805D1286C21F440710143B1602F -:1084A0001EE0B06840F48030B06021F44071B068E4 -:1084B00020F48030B060286C0143B160B068C00720 -:1084C0000ED500F043F9804641F28939B068800743 -:1084D00006D400F03BF9A0EB08004845F6D303248E -:1084E000A0462878C10705D53168A869890840EAFF -:1084F000810131602878810705D53168E86921F468 -:108500004061014331602878C10644BFA86AFFF783 -:108510006FFF2878810644BFE86AFFF769FF287873 -:10852000410744BF286AFFF757FF2878010744BF77 -:10853000686AFFF751FF2868C1051BD53168686B71 -:1085400021F0406101433160686BB0F1006F00F0D1 -:10855000BDF8686BB0F1806F75D100F0BDF80446CE -:108560003868000160D500F0F1F8001B0228F7D947 -:108570004FF0030867E000F0E9F8001B02285BD920 -:10858000F6E7316821F04041316020F080503268D8 -:1085900022F0406210433060A86BB0F1C05F00F081 -:1085A00095F8286841056DD53168E86B21F0405198 -:1085B00001433160E86BB0F1005F03D1F96841F429 -:1085C0008031F960E86BB0F1805F5BD100F084F836 -:1085D00004463868000146D500F0B8F8001B0228B0 -:1085E000F7D94FF003084DE000F0B0F8001B022867 -:1085F00041D9F6E700F061F8A86821F4781100F09D -:1086000071F88146386800017FF52CAF39696869D7 -:1086100001433961002C7FF42EAF3168286B21F4BF -:1086200040010143316027E700F047F8E86821F096 -:10863000606100F057F80446386800019BD539693D -:1086400068690143396128688105AAD5A86BB0F132 -:10865000804F1CBFB0F1004F002892D1316821F04B -:108660004041084397E700F028F8286921F060416D -:1086700000F038F8044638680001B5D539696869F2 -:10868000014339612868C10405D5F168686C21F49B -:1086900040410143F160286881040BD5796AE86C98 -:1086A00021F0300101437962796AA86C890840EAB7 -:1086B000810179624046BDE8F2833869696820F437 -:1086C000FE4040EA012038613969704703D1F968FA -:1086D00041F08071F9607047396821F0806139603C -:1086E00000F034B801433961386840F08060386088 -:1086F00000F02CB810430860704710B511490A68A3 -:1087000042F080720A600B680F4A23F080730B609E -:10871000046841680C4381680C43C1680C430169DB -:1087200044EA014454601368406923F47C5343EAEB -:1087300000231360116841F06001116010BD00005A -:108740008800005838000058006000400148406828 -:10875000704700BF681000200248016841F4807132 -:10876000016070470004005818B55B499BB04FF496 -:1087700000400860FFF730F9584CE06B40010ED51F -:10878000E06BC0000BD4FFF7E7FFFFF7E5FFA06B3E -:1087900040F48030A063A06B20F48030A06300F030 -:1087A00055F807A85021FEF79DFD68461821FEF7F1 -:1087B00099FD4B480168216C41F001012164206C56 -:1087C0008007FCD54FF4807007900021149107A812 -:1087D000FFF718FE206840F0807020604FF00052D4 -:1087E000216801F0807106910021069800914BF6F6 -:1087F0007F300390222104910020029020210192D9 -:1088000005916846FFF779FFFFF7A6FFFFF7A4FF82 -:10881000A06B40F00100A063A06B8007FCD5002294 -:10882000E06B20F4404040F48040E0632D48016854 -:108830000260026902F05002026100F028F8FEF7BF -:108840002FFB4FF0FF30FDF7ABF8FAE7264881B079 -:10885000016841F4801101603F21006800F480103C -:1088600000900098214841604161016841F47C1109 -:108870000160026942F47C120261016841F03F012B -:108880000160026942F03F02026101B0704710B519 -:10889000FFF762FFFFF760FF1548164C016821F4EF -:1088A000407141F4807101600F21026842F400427E -:1088B00002601148816047F6FF71C160046000F0FA -:1088C0001DF8CA206062FF2153206062A068C008C2 -:1088D000C000A060616210BD1040005858000058F0 -:1088E000941400588008005850000058040C005898 -:1088F0009000005800280040A822002038B504004D -:1089000044D094F8210028B9002184F82010204692 -:10891000C046C04600F049F8FF2510B100F03FF80E -:1089200034E02168DFF8B0008A6802408A6021687C -:108930008A68636820690343A06903431A438A6015 -:108940002168E068086120680169A26841EA024183 -:1089500001612068C16821F08001C1602068C16C9C -:1089600089088900C1642168CA6CE36960690343AE -:108970001A43CA6420688168880609D400F020F888 -:1089800030B120684562042100F01FF8012032BD9B -:1089900020684562012184F82110002032BD206842 -:1089A0004562042184F821107047022084F82100D8 -:1089B000CA2021684862532022685062204626E07F -:1089C00020460BE02068C0F8248084F821100020A5 -:1089D00084F8200070470000BFFF8FFF70B5044689 -:1089E00040F2E9362068C16821F0A001C160FFF7BC -:1089F000ADFE05462068C168880606D4FFF7A6FECE -:108A0000401BB042F6D3032070BD002070BD70B58E -:108A100004462068C1684A0612D44FF0FF32C26093 -:108A200040F2E936FFF792FE05462068C168480625 -:108A300006D4FFF78BFE401BB042F6D3032070BD77 -:108A4000002070BD122008800FF200107047042033 -:108A500008800FF20C10704710B500F029F80FF2E3 -:108A6000980004E010B500F023F80FF2B0002146A2 -:108A7000FCF7EEFA204610BD38B51A2008800E49E2 -:108A80004C68086889680D4D081809D00822A91C8F -:108A900000F01EF8042205F11201204600F018F83B -:108AA000284632BD10B500F003F80FF28400DEE76F -:108AB0000A46034C70470000107AFF1FB0110020D7 -:108AC000C81E002010B5FFF7F3FF0FF27000CEE7CD -:108AD00030B5002393420DDA040F0A2C2CBF373433 -:108AE000303401F8134001EB4305002400016C70A1 -:108AF0005B1CEFE730BD000053544D333220566904 -:108B0000727475616C20436F6D506F727420696E62 -:108B1000204653204D6F64650000000053544D699A -:108B200063726F656C656374726F6E696373000066 -:108B300056435020436F6E666967000056435020CD -:108B4000496E74657266616365000000120100027F -:108B500002020040830440570002010203010000AA -:108B60000403090480B51C48016841F470010160E8 -:108B70000020FDF7F5FD48B180791849184A0A60D0 -:108B80000A6822F47C5242EA00220A604FF0B040A8 -:108B9000016841F48031016012490A68D208D200AC -:108BA00042F001020A600A6802F00702012AFAD1C3 -:108BB00001688903FCD581688908890041F00201B8 -:108BC0008160816801F00C010829FAD10168490827 -:108BD0004900016001BD000088ED00E09C000058E4 -:108BE000FECAFECA00400058010000000300000059 -:108BF0000500000001000000010000000600000068 -:108C00000A00000020000000020000000400000034 -:108C1000080000001000000040000000800000007C -:108C20000001000000020000A0860100400D0300CA -:108C3000801A060000350C0040420F0080841E00A0 -:108C400000093D0000127A000024F40000366E0195 -:108C50000048E801006CDC02000000000000000099 -:108C600000000000000000002DE9F04107468846A2 -:108C7000387810F0030F16461D4633D0384600F002 -:108C800099F878BBB8F1000F1CBFD8E9000186192C -:108C9000012D2ED13888C10415D5396A07F1440257 -:108CA000384600F0A3F83A6B044602B93A69F9680D -:108CB000384600F09BF8361B341A7A69F968384652 -:108CC00000F094F8261A1EB94DB916F1010F09D01B -:108CD00097F903002A46314600F08EF8064616F151 -:108CE000010F09D12320AFF300804FF0FF30BDE822 -:108CF000F081022DE8D1EBE7388810F4405F0ED008 -:108D00007868F86038617861B8617868F86107F16F -:108D10004400386207F13000786200203863B8F10F -:108D2000000F05D0D8E9020107F13402C2E90001C1 -:108D300039884CF6FF60014039800020BDE8F081A1 -:108D400070B50546AFF300802888810415D56E689C -:108D50000024EA6895F903003146914212D2521A72 -:108D6000FEF784FE10F1010F1CBF00283618F0D169 -:108D70000FE04DF6FF70014029802846AFF30080D8 -:108D8000002070BD00220021FEF770FE10F1010FDF -:108D900000D101246868E860A861E861002C298896 -:108DA000E7D041F4007129802846AFF300804FF0EE -:108DB000FF3070BDF8B5A0B9AFF3008000250A4EB2 -:108DC00008244FF0FF37306820B1FFF7B9FF0028C3 -:108DD00048BF3D46361D641EF5D1AFF300802846DE -:108DE000F2BDBDE8F240ABE7A4150020914234BFCC -:108DF000511A0021084670473EB504000D00012AB3 -:108E000002D100F063F807E0022A07D100940020A5 -:108E1000019069460C20ABBE2D1801E0002A0CD150 -:108E20000094019569460A20ABBE002805D10022B6 -:108E30002100280000F027F801E00020C04303B023 -:108E400030BD000010B4314A002113461C68844232 -:108E50001EBF491C9C6884421EBF491C1C69844279 -:108E600009D09C69491C844205D0491C2033102933 -:108E7000ECD310BC7047002342F8313002EBC10143 -:108E80004B6010BC704778B4204C002325462E68F8 -:108E90008E421EBF5B1CAE688E421EBF5B1C2E69DD -:108EA0008E4209D0AE695B1C8E4205D05B1C20351A -:108EB000102BECD372BC7047054604EBC303012AA8 -:108EC00004BF59684D195D6072BC704710B40F4AF9 -:108ED000002113461C6884421EBF491C9C688442C2 -:108EE0001EBF491C1C6984420AD09C69491C8442EB -:108EF00006D0491C20331029ECD310BC0020704749 -:108F000002EBC100406810BC704700005C210020EB -:108F100010B50446E068A169884251D3218849F21E -:108F200002030B40022B08D008044CBF4FF4007022 -:108F30004FF48440014321803BE001F4C042B2F58C -:108F4000C04F06D1A168884203D32046FFF732FF05 -:108F500078BB208810F4406F02BF606804F14401C0 -:108F6000884217D14FF40070F7F77AFF606030B98C -:108F700004F144006060E060401CA0600AE02188C9 -:108F800041F040012180E060606100F5007260689E -:108F9000A260E06160682061A068A061207841075C -:108FA0000AD502220021204600F00CF810F1010F32 -:108FB00002D14FF0FF3010BD208840F4C040208027 -:108FC000002010BD70B504460D461646AFF3008074 -:108FD00033462A4600212046FFF746FE0546204636 -:108FE000AFF30080284670BD38B504000ED020785D -:108FF00010F0030F03D094F90300002809D5AFF354 -:109000000080204600F030F8AFF300804FF0FF30D2 -:1090100032BD2046FFF7CEFE0546AFF30080207834 -:10902000410644BF6068FFF7D5F90020606094F9FD -:109030000300022804D900F055F808B14FF0FF35BD -:10904000E06B48B100F05AF808B14FF0FF35E06B23 -:10905000FFF7C0F90020E063204600F005F8AFF309 -:109060000080284632BD000001780A0626D51C4A39 -:1090700013680021834203D1002342F821301BE012 -:109080005368012183421EBF022193688342F3D0BB -:10909000D368032183421EBF042113698342EBD0AE -:1090A0005369052183421EBF0621936983421EBF77 -:1090B0000721D3698342DFD0FFF78CB900210180FB -:1090C0004FF0FF31C17000F144014160C1600161A6 -:1090D00041618161C161016200F13001416270470B -:1090E000A41500201CB50200009269460220ABBE08 -:1090F00004001000FFF7A6FE200016BDE0B50090AA -:10910000F9F726FA019069460E20ABBE03B000BD08 -:1091100038B50C46C5B22046AFF30080E068A169BF -:10912000884204D32046FFF7F3FE00280FD4E068FE -:10913000401CE06000F8015D2088010503D4400573 -:109140000BD50A2D09D12046FFF734FE28B1204661 -:10915000AFF300804FF0FF3032BD2046AFF3008008 -:10916000284632BD19E050F8042BD30744BFA9F1BB -:1091700001039A18091F0023042942F8043BF9D27D -:109180005FEA817C134604D54FF0000CA2F800C0C2 -:109190009B1CC90744BF0021197050F8041B00290B -:1091A000E1D1704738B50D4D0824286800281CBF50 -:1091B000017811F0030F05D090F90310002958BF72 -:1091C000FFF712FF2D1D641EEFD1BDE838400022CD -:1091D00000214FF0FF30FEF749BC00BFA41500206E -:1091E0007047FEE770477047704700F011B84FF4C2 -:1091F0008060FEF73FB900E000BF0148FAF73BB8D6 -:10920000FC190020FDF71BB8FEF788B9FEF75CB922 -:109210000248416802788918416070476810002050 -:1092200010B5074979441831064C7C44163404E0E3 -:109230000A68081D114488470146A142F8D110BDB3 -:109240002C000000600000004EF68851CEF20001B4 -:10925000086840F470000860BFF34F8FBFF36F8F52 -:109260004FF00070E1EE100A70470000F9FEFFFFBA -:10927000900D0000FC150020700800003000032055 -:10928000000000009383FFFF84010000FA02000049 -:10929000040000208383FFFFF102000006000000AD -:1092A000280003200120C046002801D0FFF7B8FFA6 -:1092B000AFF300800020AFF30080FFF755FA00F015 -:1092C00000F800F001B800000746FFF76BFF3846D2 -:1092D000F8F7F4F9FBE738B504460D46284600F0E8 -:1092E00005F8A84218BF0024204632BD0149FFF707 -:1092F0000FBF00BF141500200148804701480047F8 -:10930000658B000809930008AFF30080FFF79CFF0E -:10931000FFF7C8FF00002E00FFF7FEBFFFF7FEBFFC -:10932000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF71 -:10933000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF61 -:10934000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF51 -:10935000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF41 -:10936000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF31 -:10937000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF21 -:10938000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF11 -:10939000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF01 -:1093A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFF1 -:1093B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFE1 -:1093C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFD1 -:1093D000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFC1 -:1093E000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFB1 -:1093F000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFA1 -:10940000FFF7FEBFFFF7FEBF00207047F003020D1D -:10941000FF01830001F3FF010001F1FF01F1FF01F2 -:10942000F1FF01F1FF01F1FF01F1FF01F1FF01F196 -:10943000FF01F1FF01F1FF01F1FF01F1FF01F1FF78 -:1094400001F1FF01F1350152FF01AD3F106D4C10EC -:10945000421008500148000404110C10020A0600D2 -:109460000208224024100311800008AB0412F50406 -:10947000212B13358210A0058100080D82000850B1 -:1094800012691012610412710412790410090902A0 -:109490004300020100C03209046D12020B101E05C8 -:1094A0002400100105240100010424020205240601 -:1094B00000010705820308001009040100020A4E9A -:1094C0001002070501027B200107058107F2280031 -:1094D00044224007228107200100090744F22C049E -:1094E000441003458A00084F0412650412590412FF -:1094F000790412A50412C504F001FF1A030001F15A -:10950000FF01F1CC011003AD7B0008D10412D5049A -:109510001F277CF8031E9418042EC23A041E08610B -:10952000031D6004100215002011045210044300B2 -:109530000014610843FC140CF10B01100702040134 -:10954000012C2200207C04522C0421346108125882 -:1095500048F3124415484003080202DC2140210868 -:1095600021042134610812A044F2128C4812CCB4B8 -:10957000121428F2065C2CF0020714930008046D04 -:0C9580008C05F2001614030000520001DC -:040000050800930953 +:101600009560A860EA600020A861DEE7083100204C +:10161000012000F017B870470749086808B100209A +:1016200070470648C008C00008600549C908C900DD +:10163000091A0160704700BFB43900200F10002064 +:101640000814002080B5AFF30080024A1100182072 +:10165000ABBEFBE7260002002DE9F0439FB00FF27E +:101660009C16269CDFF8E48A02918DF83B4000210D +:101670000B914FF0FF37044691461D460AE019F8DA +:10168000011B0298A0470028029000F0A4800B984C +:10169000401C0B9099F8000050B12528EFD1002094 +:1016A0000021059006910790089109900A9103E0A6 +:1016B0000B98A7E041F0010119F8010F2028F9D09B +:1016C00023280CD02B2804D02D2805D0302809D071 +:1016D00083E041F00201EFE741F00401ECE741F063 +:1016E0000801E9E741F01001E6E700200D900AE06B +:1016F0000D98404505DA00EB800302EB4302303AD7 +:101700000D9209F1010999F80020A2F130000A2890 +:10171000EED399F800002E2818BF0C9726D119F89F +:10172000010F2A2808D12868286009F1010950F81A +:10173000042B28600C9219E02D280CBF19F8010B1E +:10174000002000220C920BE040B90C9A424505DAC9 +:1017500002EB820203EB4203303B0C9309F10109D7 +:1017600099F80030A3F130020A2AEDD3ADF8381011 +:10177000304699F8001000F081FE08B119F8010B0D +:101780008DF83A009DF83A00682804BF99F80010D7 +:10179000682903D162208DF83A0008E06C2804BF64 +:1017A00099F800006C2804D171218DF83A1009F1E4 +:1017B000010910A804902A4619F8013B6946204601 +:1017C00000F060F838B910AA6946204600F08CF99C +:1017D00000287FF55FAF384614E02A2885D12A68B3 +:1017E0002A6052F8040B2A6000280D9003D540426D +:1017F0000D9041F0040109F101098AE7686A6C74EF +:101800007A4C00001FB0BDE8F083622820D0682821 +:1018100011D06A2803D06C2827D0712825D10868F8 +:10182000C01D20F007000860D0E9002308300860E0 +:10183000194610467047002A0A680A60106803D0EB +:10184000121D0A6000B217E0121D0A6080B217E094 +:10185000002A0A680A60106803D0121D0A6040B2AC +:101860000AE0121D0A60C0B20AE0002A0A680A6093 +:10187000106803D0121D0A60C1177047121D0A605C +:101880000021704770B51C460D46B4F125002E6945 +:10189000114600F017811C386AD0001F022867D952 +:1018A000133843D0093863D0801E16D0401E1ED096 +:1018B000401E02285CD9001F19D0401F00F0838011 +:1018C000401E33D0401E00F0CD80C01E00F0D880F6 +:1018D000801E2BD0C01E29D0FAE06869421C6A61C4 +:1018E0000A680A6052F8043B0A603354FAE095F83B +:1018F0003A000122FFF789FFC5E900010023994260 +:1019000004DA6869411C69612D210DE0288F810787 +:1019100004D56869411C69612B2105E0C00722D507 +:101920006869411C6961202131541CE095F83A0036 +:101930000022FFF76AFFC5E9000195F838000107AA +:1019400011D5D5E900230020834208BF82420AD086 +:1019500044F02000782806D1686930213154401CB9 +:10196000411C69613454214668693044E86083E071 +:101970000868C01D20F007000860D0E90023083087 +:101980000860C5E90023D5E90001C80F04D06869E3 +:10199000411C69612D210DE0288F810704D56869FC +:1019A000411C69612B2105E0C00704D56869411C11 +:1019B00069612021315468693044E8602146284635 +:1019C00000F0C4F98EE005F13A02507820B14FF0F2 +:1019D000FF340FF648205EE01078622808D06828AF +:1019E00024D06A2812D06C282ED071280ED02BE07B +:1019F0000A680A6052F8040B0A6020B94FF0FF34FD +:101A00000FF6302047E0E96A01706BE00A680A606F +:101A100052F8040B0A6020B94FF0FF340FF614207F +:101A200039E0EA6AD317C0E900235BE00A680A607C +:101A300052F8040B0A6020B94FF0FF340FF6F4108F +:101A400029E0E96A01804DE00A680A6052F8040B57 +:101A50000A6020B94FF0FF340FF6D8101BE0E96A96 +:101A600001603FE00A680A6052F8040B0A60002136 +:101A7000C5E90001EE607821284600F0BBF831E0AE +:101A80000868086050F8044B0860EC603CB94FF0FF +:101A9000FF340FF6B81000F0FDFC201A70BD2E6B5D +:101AA000002E04D5204600F017FD044608E032461B +:101AB0000021204600F02CFD002814BF041B3446F2 +:101AC000AC610FE06869411C69612521315409E06E +:101AD0006969481C686125227254210002D0411CAA +:101AE00069613454002070BD2DE9FC410F46064663 +:101AF000796B7869BC6A091A386A091AB869091ACF +:101B0000786A091AF869091A97F838000C1B410716 +:101B100090460FD42021002C8DF800100ADD2546B8 +:101B200001236A463946304600F060FC00285DD14A +:101B30006D1EF5D17B6942463946304600F056FCB1 +:101B4000002853D130208DF800003D6A002D09DDBA +:101B500001236A463946304600F048FC002845D14A +:101B60006D1EF5D1BB69FA683946304600F03EFC7F +:101B700000283BD130208DF800007D6A002D08DD63 +:101B800001236A463946304600F030FC70BB6D1EBA +:101B9000F6D1F868B969FB6942183946304600F059 +:101BA00025FC18BB30208DF80000BD6A002D08DD33 +:101BB00001236A463946304600F018FCB0B96D1E64 +:101BC000F6D197F8380041070DD52021002C8DF86B +:101BD000001008DD01236A463946304600F006FC55 +:101BE00020B9641EF6D10020BDE8F6814FF0FF3029 +:101BF000BDE8F6812DE9FC4707468A463E69BAF101 +:101C00006F0F08BF082405D04AF02001782914BFBF +:101C10000A2410243C25D7E90023BAF1640F18BF29 +:101C2000BAF1690F9046994606D100218B4203DA3A +:101C3000D8F1000869EB49090020814508BF8045BB +:101C40001FD1386BE8B9082C4CD197F83800010740 +:101C500048D530203B2586F83B0043E000280ED5D0 +:101C600097F8380000F01400102808D17A6B7869D2 +:101C7000121A386A121A511A0029C8BF3962BDE80F +:101C8000F3878DF800A0404649462246E31700F04E +:101C90006BFC3032D0B26D1E3A28019504DB9DF802 +:101CA0000000A0F151018A1872554046494622466B +:101CB000E31700F059FC804689460020814508BFA3 +:101CC000804503D0F86871198842DCD3082C09D10B +:101CD00097F83800010705D5715D302902D06D1ED7 +:101CE00030207055C5F13C01B9617019F860386B4E +:101CF0008142B3DA411A39624FF6EF70398F0140F1 +:101D00003987BDE8F3872DE9D04306460F461446D0 +:101D10004FF00008DFF8389412E0E00707D542469C +:101D20004B463046394600F037FD06460F464046E2 +:101D3000494642464B4600F02FFD641080468946D6 +:101D4000002CEAD130463946BDE8D0832DE9F34F67 +:101D5000054641F020048DB0D5E90089612C02AE22 +:101D600009D0286B002848BF062003D408BF672C81 +:101D700001D101202863D5E9002358004015401CFB +:101D80000ED119030CD00320A8619DF838006138EA +:101D90001A2802D20FF2D06111E00FF2D0610EE0EA +:101DA00058004015401C0FD119030DD10320A86124 +:101DB0009DF8380061381A2814D30FF2B861E8682A +:101DC000032200F0BBFDD3E1194621F00043B3F537 +:101DD000801F10460DD20027BB4208BFBA420197B0 +:101DE00003D111E00FF28861E9E701AA00F0FAFDE2 +:101DF0000AE0DFF8607307EB1352DFF85C330192FF +:101E00001940DFF858331943C5E90001612C0ED1A0 +:101E1000E86830210170811CE9609DF83810612963 +:101E20000CBF7821582141706869801C6861D5E930 +:101E300000AB2BF0004300202AF00002834204BFD5 +:101E40008242002300F05A81612C40F0A980286B67 +:101E500000284CBF2120401C00904046009F7F1C62 +:101E600049460022002300F0F5FDD94601988DF87F +:101E7000082038BF89F00049001F0190002FD0468C +:101E80000DF1090040F3498140F2FF71DFF8D0B253 +:101E90000C910646404649460022002300F0F2FD20 +:101EA00080F03A814800400D00F11C0210D0002A59 +:101EB0000EDD0C98824205DB09F0004040EA0B0180 +:101EC000002013E0A448084040EA025140460DE0DB +:101ED00029F00043002028F00002834208BF82421C +:101EE0000FBF40461C22404600F0E4FD8046894674 +:101EF00000F07EFEFF1F002F044609DD00F096FE75 +:101F000002460B464046494600F0A2FE80468946FE +:101F1000F01D072104E004F00F0200F8012D241148 +:101F2000002C01DD491EF6D5491E5CBF002200F8D9 +:101F3000012DF9D5ECE00020194602AA0A4400E080 +:101F40005B1E12F80149491E8442F9D00F2804D1C2 +:101F50000DF10900425C521C4254002904D501983D +:101F6000001D02AE5B1C0190591E12D49DF8380072 +:101F70007218147804F130085FFA88F4392CC4BF61 +:101F8000A0F13A04A044491E02F80189F1D58DF868 +:101F90003800286B002840F1B080591E2963ACE05E +:101FA000404649460022002300F054FD019938BF05 +:101FB00089F0004947F2975041436A4A91FBF2F297 +:101FC0000192D2F1070204DD40464946FFF79BFE2D +:101FD0000AE0524200206449FFF795FE02460B4694 +:101FE0004046494600F0A6FE8046662C286BDFF886 +:101FF0007CB106BF019F0A3706273F18142FC8BFC0 +:10200000142730208DF8080089460DF1090000E002 +:102010003046002F34DD06464046494600F0AEFF0C +:1020200001460A4606F1080304200A26B2FBF6F62A +:1020300006EB860EA2EB4E02303203F8012C0A2288 +:10204000B6FBF2F202EB820EA6EB4E063036401ED5 +:1020500003F8026DE9D1083F002F03F10806D7DD30 +:10206000084600F09FFF02460B464046494600F0F6 +:10207000EFFD00225B4600F08FFB80468946CBE7F0 +:102080000DF10901401A0DF1090604E00199491EFC +:10209000401E0191761C31783029F7D0662C02D190 +:1020A0000199491C03E0652C0CBF012100212B6B19 +:1020B000CB189842B8BF431E002B1ED4834204DACB +:1020C000F05C3528A8BF392000DA30201946721E8E +:1020D00002EB010800E05B1E18F80199491E8145DA +:1020E000F9D0392802D1705C401C7054002904D505 +:1020F0000198401C16465B1C0190019800B20090AC +:102100001BB29DF838103246284600F034F82FE014 +:10211000C61D002F3FF7BEAE30460DF10901401A33 +:10212000009903468842C8BF0B46002B0DF10906F3 +:102130003FF52FAF8342BFF6FEAE0DF10900C05C44 +:1021400007287FF7F8AE0F20F6E60000CBCCCC0CCA +:102150000000244002FCFFFFFFFF0F800000E03F73 +:102160000000F07FA08601000000F03F84D7974177 +:102170000FB0BDE8F08F2DE9F84783B006468A46D8 +:102180001746984600F01CFFB8F1000F406A356B07 +:1021900090F8009003DC4FF001080FF2DC27BDF946 +:1021A00030404AF02000662808BF641C15D067281C +:1021B00040F0848014F1040FC0F28680AC4280F2BB +:1021C000838096F83800641C010702D4A845B8BF84 +:1021D000454620B22D1A48BF00250FFA84FAF06850 +:1021E000B169BAF1000F25DC4A1C30234354002D9D +:1021F00003DC96F83800010703D5F06800F8029078 +:10220000521C15EB0A0FB8BF6C4220B24419414270 +:102210004445B8BFA046B26171620FFA88F5F56116 +:10222000F068B3692A463946184400F087FB641BFE +:10223000B462C4E022B29045084417DA42463946F7 +:1022400000F07CFBB0694044B061AAEB0801002DAE +:10225000716203DC96F838100A0705D5F16801F8B9 +:102260000090F069401CF061B562A8E0394600F0CA +:1022700065FBB069002D5044A8EB040803DC96F818 +:1022800038100A0703D5F16801F80090401CB061CE +:102290000FFA88F08542F068B369B8BFA8460FFA14 +:1022A00088F207EB0A01184400F048FBB0690FFA06 +:1022B00088F10844B061681A706280E0BAF1610F79 +:1022C00014D14FF0700A16E0A84504DA96F83810D9 +:1022D0000A0758BF45466D1E48BF0025BAF1670F73 +:1022E00014BF4FF0450A4FF0650A04E0BAF1410F00 +:1022F00008BF4FF0500AB169F368481CB061002D67 +:1023000017F8012B5A5403DC96F838100A071BD52E +:10231000F168431CB36101F80090002D14DDA8F1B1 +:1023200001080FFA88F08542F068B8BFA8460FFA96 +:1023300088F23946184400F001FBB0690FFA88F1C1 +:1023400008446D1AB0617562F068B1690844002CE8 +:1023500080F800A003D42B214170811C03E02D21C3 +:1023600041706442811C00206A460AE023460A2428 +:1023700093FBF4F404EB8405A3EB450302F8013B63 +:10238000401C24B2002CF1DC012806DC4AF02002BB +:10239000652A04BF302201F8012B48B9302001F82A +:1023A000010B07E0401E1DF80020303201F8012B20 +:1023B0000028F7DCF068B2691044091AF16196F858 +:1023C000380000F0140010280DD17169B06941186F +:1023D000706A4118F0694118B06A4118706B814207 +:1023E000BCBF411A316204B0BDE8F087F8B50546BC +:1023F0000E4617461C46002074B117F8011BB06842 +:10240000A847B06030B1F06A401CF0620020641E42 +:10241000F3D1F2BD4FF0FF30F2BD00007072696E73 +:1024200074665F733A20256E20646973616C6C6F0B +:10243000776564007072696E74663A206261642028 +:10244000256E20617267756D656E74007072696EBD +:1024500074665F733A20626164202573206172673D +:10246000756D656E740000006E616E004E414E0029 +:10247000696E6600494E4600300070470278C9B266 +:102480008A421AB11CBF10F8012FF9E718BF0020CB +:102490007047000080B508B90FF21C0005490B68B1 +:1024A0001BB122220021984701E0FFF7B1F822205A +:1024B00002BD0000B8390020636F6E7374726169E9 +:1024C0006E742068616E646C65723A20626164208B +:1024D0006D6573736167650000F10103810704D0C6 +:1024E00010F8011B89B18107FAD10268B2F10131FC +:1024F000914311F0803F04BF50F8042FF6E710F825 +:10250000011B11B110F8011BFBE7C01A7047000056 +:10251000C9B2830706D0521E22D310F8013B99425C +:10252000F7D11FE0083A13D302F1040241EA012176 +:1025300041EA014150F8043B121F21BF4B40A3F177 +:10254000013C2CEA030C1CF0803FF3D0C9B2001F01 +:10255000083210F8013B521E28BF91EA030FF8D849 +:1025600018BF0120401E7047B3BBD9B1B2F5803F00 +:102570007DD2022A1ED98C46B1FBF2F102FB11C3B7 +:102580001B0443EA1043B3FBF2FC02FB1C3380B292 +:1025900040EA0343B3FBF2F002FB103240EA0C4086 +:1025A00000237047022A05D98446B0FBF2F002FBF3 +:1025B00010C270474AB105D100F0010249085FEA34 +:1025C0003000704700220023704700F0FFBC0B0072 +:1025D0000200002100207047904271EB030CF6D3FB +:1025E000B3F5803F2FD2F0B5B3FA83F7B1FA81F497 +:1025F000A7F10F0E3D1B5340CEF1200602FA0EF25A +:10260000F3415340B5F10F0746D80F3C2C444140ED +:10261000C4F12006A040F1414140B1FBF3F603FBB9 +:102620001611A2FB0645001BA94102D2761E801896 +:10263000594180EA010221FA0EF362FA0EF20021FA +:102640005A403046F0BD30B4B1FBF3FC03FB1C1123 +:10265000A2FB0C45001BA94103D2ACF1010C801870 +:10266000594130BC02460B46604600217047B2F12A +:10267000807F65D3F0B5B2FA82F7B1FA81F4C7F181 +:102680000F063D1B22FA06F307F1110EF241203529 +:102690005A40B5F10F07B8D94140C4F12006A04017 +:1026A000F1414140B1FBF3FC03FB1C11A2FB0C45C3 +:1026B000001BA94103D2BCF1010C801859410F2F16 +:1026C00012D30F3FC90341EA5041B1FBF3F603FBBC +:1026D0001611A2FB0645D4EBC030A94102D2761EEA +:1026E0008018594146EACC3C07B34140C7F1200667 +:1026F000B840F1414140B1FBF3F603FB1611A2FBD8 +:102700000645001BA94102D2761E8018594180EA75 +:10271000010221FA0EF3C7F1200462FA0EF20CFA5C +:1027200007F05A402CFA04F13043F0BD80EA010270 +:1027300021FA0EF3002162FA0EF260465A40F0BD13 +:102740008C46B1FBF2F102FB11C31B0243EA10639A +:10275000B3FBF2FC02FB1C331B024CEA002043EAF1 +:102760001063B3FBF2FC02FB1C331B024CEA00209B +:1027700043EA1063B3FBF2FC02FB1C331B024CEA7E +:10278000002043EA1063B3FBF2FC02FB1C324CEA6C +:102790000020002370470000B0B581EA030C0CF064 +:1027A000004C40F2FF7515EA11541DBF15EA13578E +:1027B000AC42AF4239E0E41923EA455343F48013B5 +:1027C000C90241F0004141EA505EC7021100A7FB77 +:1027D000020200284FF00000EEFB01204FF0000144 +:1027E000E3FB072118BF42F00102401800214941D4 +:1027F000E3FB0E01A4F580640F0302D252004041B6 +:10280000494154F101046CDD470872F1004250F176 +:10281000000051EB0451A1F580115CBF41EA0C01AD +:10282000B0BD4CEA05510020B0BD05EA1357AC42DB +:1028300014BFAF4241E050EA410E1CBF52EA430EC2 +:1028400002E061460020B0BD24423C441BD15FEA57 +:10285000070EF6D0090302BF01460020AEF1140EA8 +:10286000B1FA81F7AEEB070401FA07FE0C37C7F1A6 +:10287000200100FA07F7C8404EEA000E23EA45534C +:1028800043F48013A2E733F00043B3FA83F704BFA5 +:10289000B2FA82FE77440B3FE41BB7F1200E2FBF44 +:1028A00002FA0EF3BB40C7F1200E22FA0EFE38BF2B +:1028B00043EA0E03BA40641C82E750EA410E14BF9B +:1028C00052EA430E6FF000014FF4001717EB430F6D +:1028D0008ABF194617EB410FB5E74CEA05510020B6 +:1028E000B0BDD4F10104B4F120070FDAC4F1200720 +:1028F000520828BF42F0010210FA07F501FA07F763 +:10290000E1BF2A43E0403843E1400FE0352C98DC3A +:10291000C7F1200452EA400220FA07F218BF42F041 +:10292000010231FA07F0A1400A43002172F100428E +:1029300050F1000051EB0C01B0BD000062B38B07F9 +:1029400008D0521E11F8013B00F8013B00F0248032 +:102950008B07F6D1830740F0208000BF103A07D3E1 +:1029600030B4B1E83810103AA0E83810F9D230BCD1 +:10297000530724BFB1E80810A0E8081044BF51F87D +:10298000043B40F8043BD20724BF31F8022B20F867 +:10299000022B44BF0B7803707047121F17D35B00E4 +:1029A00009D151F8043B20F8023B1B0C121F20F800 +:1029B000023BF6D20BE051F8043B00F8013B1B0A46 +:1029C00020F8023B1B0C121F00F8013BF3D238BF6A +:1029D000121D521E24BF11F8013B00F8013BF8D82C +:1029E0007047000010B5144600F002F8226010BDD8 +:1029F000C1F30A5343B14A0012F5001F28D2A3F2D3 +:102A0000FE32A1EB0251704750EA410C20D001F098 +:102A1000004C31EA0C01B1FA81F204BFB0FA80F344 +:102A2000D2180B3AB2F120032CBF00FA03F1914007 +:102A300041EA0C013EBFC2F1200C20FA0CF319430D +:102A40009040524240F2FD33D21A01EB03517047DD +:102A5000002270474FF4001C1CEB410F94BF1CEB8D +:102A6000430F09E041EA030C50EA4C0C52EA0C0C0B +:102A700003D2994208BF9042704714BF8B428242F2 +:102A8000704700004FF4001C1CEB410F94BF1CEB7F +:102A9000430F09E041EA030C50EA4C0C52EA0C0CDB +:102AA00003D28B4208BF8242704714BF99429042C2 +:102AB00070470000124254D440F2FF7C1CEA1153CC +:102AC0000FD0634531D09B1863453CBF01EB0251E9 +:102AD000704701F0004141EA0C510020AFF3008043 +:102AE000704750EA410320D001F0004C91EA0C01FC +:102AF0001CD0B1FA81F30B3B9A420DD9D21A9940FE +:102B000051EA0C01C3F1200C20FA0CFC61449840FE +:102B1000531C40F2FF7CD7E7914041EA0C01C2F11F +:102B2000200C20FA0CF3194390407047B0FA80F360 +:102B30001533202BE0D3202AEED3203A203B9A42B3 +:102B400009D9D21A00FA03F141EA0C010020531C02 +:102B500040F2FF7CB8E700FA02F141EA0C010020E4 +:102B60007047524240F2FF7C1CEA11530DD063457E +:102B7000DBD0B2EB030C3CBFA1EB025170470CF170 +:102B8000010221EA035141F4801150EA410CCCD0FA +:102B900001F0004C352A27DC30B481EA0C01B2F197 +:102BA000200309DAC2F12003044601FA03F5D040FC +:102BB0002843D1409C400CE0C3F12002450020FA9C +:102BC00003F418BF44F0010421FA03F091400C43D0 +:102BD000002174F1004550F1000051EB0C0124423A +:102BE00030BC7FF47BAF70476146002076E7000081 +:102BF000C1F30A5340F2FE329B1A14DDD3F12003D5 +:102C00004FEAE17208DDC90241EA505141F000404B +:102C1000D84080185040704703F2E13010B1D243E1 +:102C200082F000407047002070470000C11768B173 +:102C30004840401AB0FA80F29040D21CC907C2F551 +:102C4000846241EA025202EBD02140057047000045 +:102C500070B44FF0004591EA030F40F1B9816B4029 +:102C6000841A71EB030603D2001BB14112197341A0 +:102C70004FF4001C1CEB410F34BF7CEB430442E0DB +:102C80000C0DA4EB1356352E4FDC45EAC323DB0AAB +:102C900045EAC121C912B6F120050DDD63FA05F63A +:102CA000EB4086EA0305124218BF45F00105C01843 +:102CB00051F100010CD213E062FA06F5F2405540E2 +:102CC000F3415A40B340F3405A408018594107D36A +:102CD00049085FEA30005FEA350528BF45F0010585 +:102CE00001F58011420875F1004250F1000041EBFE +:102CF00004514E0016F5001F70BC38BF704700200D +:102D0000090D090570471CEB410F10D252EA43062A +:102D10000BD0BCEB410F05D80C0DAB43661E342E17 +:102D2000B6DD02E0AB438018594170BC704770BCFF +:102D300070470000F0B540F2FF7581EA030C0CF01B +:102D4000004C15EA11541DBF15EA1357AC42AF42AF +:102D5000E5E0BC41C1F31301C3F31303801A9941A9 +:102D600043F4801304D2641E400049418018594145 +:102D7000C90241EA5051B1FBF3F603FB1611A2FB65 +:102D80000675D7EBC020A94102D2761E80185941A2 +:102D9000C90241EA5051B1FBF3FE03FB1E11A2FB35 +:102DA0000E75D7EBC020A94103D2AEF1010E8018F9 +:102DB0005941890241EA9051760546EA8E2EB1FBCF +:102DC000F3F603FB1611A2FB0675D7EB8020A94191 +:102DD00002D2761E80185941C90241EA50514EEA8A +:102DE000060EB1FBF3F603FB1611A2FB0675D7EB3B +:102DF000C020A94102D2761E80185941C90241EA79 +:102E00005051B1FBF3F703FB1711A2FB0735D3EBCE +:102E1000C020A94167F100070CBF004247F001073D +:102E200066F3D5274FEA1E31B80814F5806412DD29 +:102E3000BD0775F1004250EB0E5051EB045111F5F6 +:102E4000801F5CBF41EA0C01F0BD4CF07F6141F096 +:102E5000E0410020F0BDBD076D0840EA0E5041F48E +:102E60008011D4F10104B4F120060ADAC4F120067D +:102E70000200E04001FA06F3E1401843B240154376 +:102E80000EE0342C13DCC6F1200445EA40056D0841 +:102E900020FA06F2154321FA06F0A1400D43002165 +:102EA00075F1004250F1000051EB0C01F0BD002023 +:102EB0005FEA0C01F0BDCFB992185B41B3FA83F71A +:102EC00004BFB2FA82F6BF190B3FB7F120062FBF3D +:102ED00002FA06F3BB40C7F1200622FA06F638BF15 +:102EE0003343BA401CB1E419641E33E77F4231F02A +:102EF0000041B1FA81F404BFB0FA80F6A4190B3C8A +:102F0000B4F120062FBF00FA06F1A140C4F120065B +:102F100020FA06F638BF3143A0403C1B1AE7AC420A +:102F20001ABF05EA1357AF4212E050EA41061CBF30 +:102F300052EA4306BFE750EA4107304661461CBFEC +:102F400041EA0551F0BD52EA430C08BFC143F0BD50 +:102F500000204FF4001616EB410F98BF16EB430FFD +:102F600008BF16EB410F24BFC14305E016EB430F2A +:102F70000CBF61464CEA0551F0BD0000400D4918F8 +:102F800040EA81200CD2490DA1F58061491C40F036 +:102F9000004005DBD1F11F0154BFC840C017704786 +:102FA00000207047014648B1B0FA80F18840C91C42 +:102FB000C1F58461090501EBD0214005704700008F +:102FC0000148704700000000002900207047000001 +:102FD000841A71EB030604D26E40001BB141121932 +:102FE00073414FF4001C1CEB410F34BF7CEB4306D4 +:102FF00082E00C0DA4EB1356362E7BDC012E45EA45 +:10300000C32341DC43EA525312BFD20292025B084F +:10301000240545EAC12141EA5051D2EBC020994133 +:1030200025D407D1B0FA80F610FA06F162D000205C +:10303000203608E0B1FA81F6B140C6F1200220FA4C +:1030400002F21143B0404FEAF474B4EB465434F04A +:1030500001064FEA74040AD8D6F50016760D04F07E +:103060000044F04061FA06F25040F1404840C00A86 +:1030700040EA415021F0004128BF5FEA500550F17D +:10308000000044EBD12135E0DB0A45EAC121C90A41 +:10309000B6F120050EDD42EA0242120CC5F120060F +:1030A00003FA06F6EB4042EA06056D42984161F1EB +:1030B00000010DE062FA06F5F240554063FA06FCA5 +:1030C00082EA0C02F3405A406D42904161EB0301E9 +:1030D00011F4801F05D1641E620502D06D004041CD +:1030E000494121F48011430875F1004350F100007B +:1030F00041EB045170BC70471CEB410F15D223F01B +:10310000004352EA43060BD04FEA4C0CBCEB410F94 +:1031100004D80C0D661E342EB7DDEBE7801A9941FA +:1031200050EA410608BF0021E4E708BF1CEB430F4B +:1031300028BF6FF00001DDE718B58FB002A80FF6C9 +:103140008431DFF834453422FFF708FC0FF2795060 +:103150000190009469460FF2595000F0CDFD012115 +:10316000022000F0B2FEDFF814250021082000F054 +:103170002AFF02A800F0B0FF08B1C046C04600F028 +:1031800019F900F0FFFFDFF8F8440FF23142002098 +:1031900084F8800000214FF6FF70E082012000F0EB +:1031A00012FF0FF265420021042000F00CFF062000 +:1031B00001F07EF8DFF8CC0400210170012141709C +:1031C00001F009F90FF23143002204F181010020DE +:1031D00001F0FEFB0FF22943002204F182010020DE +:1031E00001F0F6FB002020838021DFF89C040180A1 +:1031F000A0214180012000F078F910B010BDF8B591 +:103200000746DFF87C447878DFF87854052804F125 +:10321000800604D03E2814D0FF285AD0C6E0B888D3 +:10322000E18A884206D10020E08230700FF2AC4083 +:1032300001F09CFC012000F058F901202871E08A7F +:1032400042E0F87801282BD0032802D00C2803D0C4 +:10325000ACE00FF2B0409FE00FF2D44001F086FCEA +:10326000387900280CBF0FF2E4400FF2085001F04B +:103270007DFCE08A6A460DF1010101F0B5FC60B900 +:103280000FF2185001F072FC9DF800209DF801101B +:103290000FF21C5001F06AFC88E00FF230507BE026 +:1032A000707801F0C6FBB7F805100FF23C5001F042 +:1032B0005DFC307804280CBF06200520307000210A +:1032C000B7F80500E0822971E880281D01F07DF83B +:1032D0006CE0B7F80300001F61D04FF47F71401A13 +:1032E00018D0401E49D0401E17D0401E1CD0401E92 +:1032F0001DD0401E1ED0801E4CD0401E24D0401E2B +:1033000028D0401E23D040F2F631401A04BF0120DD +:1033100068704BE00FF214503EE00FF2405001F0A5 +:1033200025FC0FF2605037E00FF2785034E00FF2D6 +:10333000A45031E00FF2D05001F018FCE08A01F007 +:10334000BCFD0FF2EC5027E00FF2006024E00FF21A +:103350002C6021E0D7F807100FF2506001F006FC56 +:10336000D7F807100FF25C6001F000FCE08A012141 +:1033700001F0F5FD0FF260600EE0F9790FF2986050 +:1033800001F0F4FBF879002814BF0FF200700FF27F +:10339000E86001E00FF2087001F0E8FB06E00120B0 +:1033A00001F044FEB0780A2101F092FB0120F2BD49 +:1033B00001F02BB878B589B00020ADF81A0001F003 +:1033C000E9FBB24DB24E286810F1010F0ED06968CA +:1033D0003074090A000A707406F110046868B07449 +:1033E000F174080A090C3075717506E0002001F0CF +:1033F00073FE040008BF0FF69C042246062100203D +:1034000000F021FF6079307207AA207970720621DE +:10341000E078B072A078F072607830732078984CC1 +:1034200070734EF66E500890286807902E2000F0BA +:103430000AFF0FF668021021182000F004FF0FF6B3 +:103440006C021021082000F0FEFE1821012000F07F +:1034500021FF01F053FE0DF1160006A90190009125 +:1034600005AB07220021012001F0C8FC0FF25C60CF +:10347000BDF8181000900723BDF81400002201F0D9 +:10348000FDFE0DF11A0000900223BDF81610BDF8E4 +:103490001400002201F0F2FE02220221002001F0BD +:1034A000D6FB0020207001F05DFC0120607001213E +:1034B00008202071A1701020607100210120E070AF +:1034C000049110217348A06003900822012001910B +:1034D0000092029000230022012101F05CFCA07800 +:1034E00008B101F0D3FC0AB070BD2DE9F8410446E3 +:1034F000012C87B003D164480588478803E04FF466 +:10350000C8654FF47A67DFF8788108F18006707833 +:1035100001F08FFA31780FF2BC5001F027FB022C3A +:1035200011D13078012818BF02280CD101F0BFFB5F +:10353000010004D10FF2B85001F018FB03E00FF2C4 +:10354000D45001F013FB347000200690059008F170 +:1035500019010491082298F818000FF26071039085 +:1035600002910192002300933A462946002001F07F +:10357000B0FB47490E2001F071FC010013D1012C72 +:103580000AD10FF2B85001F0F1FA7078424908B050 +:10359000BDE8F04101F09CBA08B0BDE8F0410FF27F +:1035A000C45001F0E3BA08B0012CBDE8F0410CBFF3 +:1035B0000FF2DC500FF2086001F0D8BA10B501200C +:1035C00001F03EFD2E4C94F88000052812D001F049 +:1035D0006EFB002184F8801030B90FF2186001F002 +:1035E000C5FA0FF2186001E00FF22C60BDE8104040 +:1035F00001F0BCBA10BD00000021012000F0F0BCB9 +:10360000012001F01DBD00001CB51D4C94F8800088 +:10361000012818BF00282DD01A484178012929D146 +:10362000002201784270491C01EBD1725210A1EBCB +:1036300042010170F7EE040A017800EB81004FF4BB +:10364000FA7190ED020AE08A0091C0EE200AFDEEC8 +:10365000E00A10EE902A92B20023114601F052FEC9 +:10366000BDE8164000280CBF0FF2D0500FF2FC50FE +:1036700001F07CBA13BD0000A0080320373D00080C +:1036800090350020D0290020BC3900208075FF1F14 +:10369000B829002007B2010046E0010000210820FF +:1036A00000F09EBC012000F0C1BC012000F0C6BCAF +:1036B00010B50446616801F1080000F071FD00B129 +:1036C0000120207010BD000010B1012803D0704708 +:1036D0000F2000F099BC0F2000F09EBC0D0A0D2AAF +:1036E0002A20444953434F4E4E454354494F4E20A0 +:1036F0004556454E54205749544820434C49454E61 +:1037000054200A000D0A0D2A2A20434F4E4E4543ED +:1037100054494F4E20555044415445204556454E3E +:1037200054205749544820434C49454E54200A00E0 +:103730004556545F5550444154455F5048595F4386 +:103740004F4D504C455445200A0000004556545FEB +:103750005550444154455F5048595F434F4D504C7C +:103760004554452C20737461747573206F6B200A67 +:10377000000000004556545F5550444154455F5089 +:1037800048595F434F4D504C4554452C207374614C +:10379000747573206E6F6B200A00000052656164BF +:1037A0005F5048592073756363657373200A000086 +:1037B00050485920506172616D202054583D202599 +:1037C000642C2052583D202564200A005265616413 +:1037D00020636F6E66206E6F74207375636365651A +:1037E0007373200A000000004843495F4C455F4363 +:1037F0004F4E4E454354494F4E5F434F4D504C45FD +:1038000054455F5355424556545F434F44452066E7 +:103810006F7220636F6E6E656374696F6E2068618E +:103820006E646C6520307825780A00000D0A0D2A38 +:103830002A204143495F4741505F4C494D49544517 +:10384000445F444953434F56455241424C455F56AD +:10385000534556545F434F4445200A000D0A0D2A34 +:103860002A204143495F4741505F504153535F4BCA +:1038700045595F5245515F56534556545F434F4437 +:1038800045200A000D0A0D2A2A206163695F6761DD +:10389000705F706173735F6B65795F7265737020C1 +:1038A0000A0000000D0A0D2A2A204143495F4741C2 +:1038B000505F415554484F52495A4154494F4E5F09 +:1038C0005245515F56534556545F434F4445200A75 +:1038D000000000000D0A0D2A2A204143495F47419C +:1038E000505F534C4156455F5345435552495459D7 +:1038F0005F494E495449415445445F5653455654D7 +:103900005F434F4445200A000D0A0D2A2A204143F7 +:10391000495F4741505F424F4E445F4C4F53545FA5 +:1039200056534556545F434F4445200A000000005B +:103930000D0A0D2A2A2053656E6420616C6C6F7726 +:10394000207265626F6E64200A0000000D0A0D2A65 +:103950002A204143495F4741505F414444525F4EF2 +:103960004F545F5245534F4C5645445F565345564E +:10397000545F434F4445200A000000000D0A0D2A01 +:103980002A204143495F4741505F4B4559505245BA +:1039900053535F4E4F54494649434154494F4E5F3C +:1039A00056534556545F434F44450A006E756D6546 +:1039B0007269635F76616C7565203D20256C640AD1 +:1039C000000000004865785F76616C7565203D20D9 +:1039D000256C780A000000000D0A0D2A2A20616378 +:1039E000695F6761705F6E756D657269635F636F54 +:1039F0006D70617269736F6E5F76616C75655F6320 +:103A00006F6E6669726D5F7965736E6F2D2D3E59AD +:103A10004553200A00000000424C455F4354524C7D +:103A20005F4170705F4E6F74696669636174696F3E +:103A30006E3A204143495F4741505F5041495249E6 +:103A40004E475F434F4D504C4554455F5653455686 +:103A5000545F434F44452C2070616972696E675F03 +:103A6000636F6D706C6574652D3E5374617475730E +:103A7000203D2025640A00000D0A0D2A2A205061ED +:103A80006972696E67204F4B200A00000D0A0D2AEB +:103A90002A2050616972696E67204B4F200A00002E +:103AA0000D0A0D2A2A204143495F4741505F505279 +:103AB0004F435F434F4D504C4554455F5653455619 +:103AC000545F434F4445200A0000000050325053D9 +:103AD00052563100466972737420696E64657820AD +:103AE000696E202564207374617465200A000000EB +:103AF0005375636365737366756C6C792053746F6B +:103B000070706564204164766572746973696E676C +:103B1000200A000053746F702041647665727469E6 +:103B200073696E67204661696C6564202C2072653C +:103B300073756C743A202564200A00005375636322 +:103B400065737366756C6C7920537461727420466A +:103B5000617374204164766572746973696E67205D +:103B60000A0000005375636365737366756C6C7946 +:103B7000205374617274204C6F7720506F77657298 +:103B8000204164766572746973696E67200A00006B +:103B90005374617274204661737420416476657257 +:103BA000746973696E67204661696C6564202C20B6 +:103BB000726573756C743A202564200A0000000059 +:103BC0005374617274204C6F7720506F7765722048 +:103BD0004164766572746973696E67204661696CC9 +:103BE0006564202C20726573756C743A20256420FE +:103BF0000A00000020200D0A0D0000002A2A205390 +:103C0000544F50204144564552544953494E472041 +:103C10002A2A20200D0A0D002A2A2053544F502012 +:103C20004144564552544953494E47202A2A2020A0 +:103C30004661696C6564200D0A0D0000424C455FC9 +:103C40005356435F4C324341505F436F6E6E5F5536 +:103C5000706461746528292C2053756363657373E0 +:103C600066756C6C79200D0A0D000000424C455FB2 +:103C70005356435F4C324341505F436F6E6E5F5506 +:103C8000706461746528292C204661696C65642024 +:103C90000D0A0D006C7AD8AC5772000012345678B9 +:103CA0009ABCDEF0123456789ABCDEF0FEDCBA091B +:103CB00087654321FEDCBA098765432109503250EC +:103CC00053525631000000000000000000000000C8 +:103CD0000000000000000000440008004005020150 +:103CE00012279C00F4010000FFFFFFFF48010100C4 +:103CF00000200000000000007FB50C466D4D61689B +:103D00006D4EE8612962284601F030FB246805F118 +:103D1000240000604060746006F1080000604060AC +:103D200001203070296829B10FF2551000900294DB +:103D3000684688477FBD1FB55F4C04F1080001F05D +:103D400022FB00BB2178F1B1694604F1080001F0C3 +:103D500043FB5848C16949B10098029001228DF88F +:103D6000042001A888479DF8040000E0012020708D +:103D7000207818B1009801F0E4FB04E0009904F108 +:103D8000080001F009FB04F1080001F0FCFA28B971 +:103D9000207818B104F10800FFF780FC1FBD2DE961 +:103DA000F8430646002000F05FF874883088B26857 +:103DB000DFF80081C4F3090444EA8024F068A4B267 +:103DC000C1B2204600F03CF8002748F2E809484616 +:103DD000FFF76BFC08E06888A04202D131692878BF +:103DE0000870687800B1012708F1240001F0CBFACF +:103DF000F0B9694608F1240001F0EEFA009800F1EC +:103E00000B05407A0F28E6D0B5F80110A1420DD17C +:103E10000098817AC81E7169C0B28842C8BF08463E +:103E2000706102463069E91CFEF788FD2878D9E701 +:103E30003800CCD0012000F017F80020BDE8F28354 +:103E400010B513461C4A5468A4F80900E1720A46EA +:103E5000194604F10C00FEF771FD164A1369BDE81E +:103E600010400021002018471249096A82B008B9A1 +:103E700021B101E011B1012002B0084702B0704742 +:103E800010B50146487A0F2818BF0E2807D10B48F5 +:103E900001F08CFABDE810400020FFF703BC064C8F +:103EA00004F1080001F082FA04F10800BDE81040B6 +:103EB000FFF7F4BBD43800203C390020F83800204C +:103EC0000C48002101604160704710B500F00CF80B +:103ED0005C6819B1012904D1204301E024EA000003 +:103EE000586082F3108810BDEFF3108272B6014B58 +:103EF00070470000743900202DE9FC47604CDFF862 +:103F00008491A5692840A0614FF0FF3A21694FF0E4 +:103F1000010834E0521C54F8320061691940014232 +:103F2000F8D0616904EBC20608407168184001428C +:103F300008BFC6F804A07768384000F0A5F86062B2 +:103F400008FA00F087437760EFF3108172B6626A77 +:103F5000206908FA02F2D24310402061022004EBEB +:103F6000C00353F8086C1640401E43F8086CF6D1A5 +:103F700081F31088606A59F8201088472169A36985 +:103F800060690140194205D0E069216A084208BF12 +:103F90000022C0D0C4F824A001F020FBEFF3108968 +:103FA00072B6216960690140A069014201BFE169FF +:103FB000206A014201F013FC89F31088C046C04614 +:103FC000A561BDE8F38738B51446EFF3108572B6E6 +:103FD00000F05AF82B4941F8204085F3108831BD94 +:103FE00010B500F00BF804431C6153F83140204336 +:103FF00043F83100FFE782F3108810BDEFF3108221 +:1040000072B61F4B1C697047EFF3108172B61C4AE1 +:10401000536923EA000005E0EFF3108172B6184AF5 +:1040200053691843506181F310887047EFF3108192 +:1040300072B6134AD3691843D061F4E7F8B5104C4F +:10404000666A256A374616F1010F0EBF0026012168 +:1040500001FA06F6206202E0304601F0C1FB216A57 +:10406000E0690842F8D06762EFF3108172B6E26946 +:10407000206A8243E26181F310882562F1BD00006D +:10408000382900201436002002460020110C0904B3 +:1040900004BF1020120412F07F4F04BF0830120238 +:1040A0000FF2180112F0704F04BF001D1201120F21 +:1040B000C0F11F00895C401AC0B2704704030202BD +:1040C00001010101000000000000000001F047FDB7 +:1040D0009DF80E0005B000BDF8B500F10C026B466E +:1040E00025214FF66640F1E7F8B500F10C026B466A +:1040F0000F214FF66840E9E7F8B502466B460E21FE +:104100004FF67540E2E770B51B491C4B0A681C4925 +:10411000C2F30D0201EB82010C6822689A4205D1BC +:104120006569A169E269E368246904E02569616958 +:10413000A2696368A4682E0E067001722E0C467088 +:1041400042722E0A8670C473C5F3031605F00F057C +:104150000571C6700D0E45710D0C85710D0A190E95 +:104160008172C571190CC1721B0A210E4173037350 +:10417000210C8173002070BD3C400058B95646A9FF +:10418000000003201B4800210171017200F034B8C7 +:1041900018490A7941F822000879401C08717047D3 +:1041A00070B504466078FF2802BFB4F8031001F42C +:1041B0007F41B1F5406F12D100260E4D00E0761C14 +:1041C0002979F0B288420AD2F1B255F8211020467E +:1041D00088470100F3D002D0022805D006E020462F +:1041E000BDE87040FFF70BB8002070BD012070BD26 +:1041F000000000006839002080B5C046C046C046B7 +:10420000C046C046C046C046C046C046C046C0467E +:10421000C046C046C046C046C046C046C046C0466E +:10422000C046C046C046C046C04601F01DFDC0465F +:10423000C046C046C046C046C046C046C046BDE8AF +:10424000014001F0CBBD18B50C46C7B011460022A5 +:104250008DF800208DF81C008DF81D4022460DF1D0 +:104260001E0001F0BCFD00F03FF83F200C21ADF82E +:104270000400ADF8061007A8012103900691A41CC4 +:10428000049400F041F800284CBFFF209DF8000086 +:1042900048B010BD00B5C7B000F01FF80F2000F007 +:1042A00028F800284CBFFF209DF8000047B000BD53 +:1042B00000B5C7B00021ADF81C008DF80010182221 +:1042C00001A801F092FD182000F013F800284CBF5F +:1042D000FF209DF8000047B000BD00228DF80020AF +:1042E0008DF81C008DF81D101822002101A801F086 +:1042F0007CBDADF8060007A9022004903F220120F2 +:1043000003910690ADF80420CDF814D0002101A847 +:10431000FFF745BD70B506464E4C30784CA520B130 +:10432000012807D0032810D070BD012020700FF2A3 +:10433000281003E0002121700FF2501000F016FC4D +:104340002846BDE8704000F011BC71680878C8B913 +:104350004978012909D100F069FE0FF2641000F0DC +:1043600005FC00F02FF80120A0707168487848B96A +:1043700000F066FE0FF2701000F0F8FB00F022F87B +:104380000020A0707068017801291AD140780128B6 +:104390000AD1002000F04AFE0FF2741000F0E6FB94 +:1043A00000F010F80120A0707168487848B900F05A +:1043B00047FE0FF2841000F0D9FB00F003F8002054 +:1043C000A07070BD284600F0D1BB0078012808BF5E +:1043D00000F00DB8704780B50FF2390200210220BD +:1043E000FFF7F1FD1B4900220A70BDE8014080B5CE +:1043F000002000F025FE1748012141700021817046 +:104400000121C1700021017101BD00210220FFF7CF +:10441000E7BD000010B50F4C2079401E8041C00F51 +:104420002071207868B10FF2381000F09FFB08A0CF +:1044300000F09CFBE11CBDE810404FF6426001F02B +:10444000A3BCBDE810400FF2581000F08FBB000075 +:10445000200A0D00943900202D2D2050325020418B +:1044600050504C49434154494F4E205345525645B4 +:1044700052203A204E4F54494649434154494F4EE9 +:1044800020454E41424C45440A0000002D2D20504D +:104490003250204150504C49434154494F4E2053D3 +:1044A0004552564552203A204E4F544946494341C1 +:1044B00054494F4E2044495341424C45440A000060 +:1044C0002D2D20503250204150504C4943415449E9 +:1044D0004F4E2053455256455220203A204C4544D9 +:1044E00031204F4E0A0000002D2D20503250204127 +:1044F00050504C49434154494F4E20534552564524 +:104500005220203A204C454431204F46460A0000B4 +:104510002D2D20503250204150504C494341544998 +:104520004F4E205345525645522031203A204C459B +:104530004431204F4E0A00002D2D20503250204192 +:1045400050504C49434154494F4E205345525645D3 +:10455000522031203A204C454431204F46460A0033 +:104560002D2D20503250204150504C494341544948 +:104570004F4E2053455256455220203A20494E4630 +:104580004F524D20434C49454E5420425554544FB0 +:104590004E203120505553484544200A2000000049 +:1045A0002D2D20503250204150504C494341544908 +:1045B0004F4E20534552564552203A2043414E27F4 +:1045C0005420494E464F524D20434C49454E5420AD +:1045D0002D20204E4F54494649434154494F4E20C7 +:1045E00044495341424C45440A200000DFF8541529 +:1045F0000A6892B200E00246086880B28242FAD1AC +:1046000070472DE9FC4104461825DFF83C85DFF8AA +:104610003C65684308EB00073078062808D13178FC +:104620007170347078754FF0FF307060002039E0A1 +:1046300000F077F8B9680918B96008F10803B9689B +:1046400032786A439A589142327813D308F11503AD +:1046500015FB02FC13F80C30062B25D008F10806D8 +:104660006B43F358994222BF08F115036A439A5CE1 +:10467000EED219E01146337869439A420BD008F123 +:10468000140308F1150C5B5C15FB03F50CF80540F1 +:104690007A753B7500E07A7508F11402545431784C +:1046A00071703470BDE8F6811146694308F1150355 +:1046B0005B5C062B04D008F1140615FB03F574555A +:1046C0007B753A7508F115025454EBE7F8B5DFF83D +:1046D0007C34DFF874541E78182402466243B042DA +:1046E0002A4404D118785870507D18700FE0167D58 +:1046F000507D92F815C005F115076643062807F8A6 +:1047000006C004D0167D143514FB00F42E5501208C +:1047100010731878062802BF00294FF0FF31596046 +:10472000F1BD10B5DFF82444606810F1010F0FD01F +:10473000FFF75CFF6168DFF81824814261683CBFC5 +:104740005388C918081A517848431178C84000E0C6 +:10475000002080B210BD2DE9F84FDFF8F453DFF8E8 +:10476000F4B3D5F80880D8F80000DBF800104A054B +:1047700000F09BF9DFF8D463DFF8CCA321F480616B +:1047800081604FF0180934780AF1080019FB04F130 +:104790004758FFF7C6FF874217D200270121B170A3 +:1047A000062C3DD019FB04F40AF108010AF10802B5 +:1047B0000959814223BF0AF108010959091A002148 +:1047C00011510AEB04014C7DEAE7A9884118B9426E +:1047D00002D2AF880021E2E73F1ADFE7022802DABF +:1047E0002878012800D07F1ED8F80000C1684A0749 +:1047F000FAD500F060F9DBF80C00000CBFB247EA14 +:104800000047CBF80C70FFF7F1FE7060A8680068F5 +:10481000816841F480618160AFF30080BDE8F18F71 +:10482000B8B20028DAD1FFF7E1FE70600320BDE8DE +:10483000F24F01F04DBB2DE9F843EFF3108872B64B +:10484000C34DC14BA8680168CA224A62532048621E +:10485000BE4A886820F48060886018201678374641 +:1048600047431F44387B022826D13C68D7F8109074 +:104870009078F0B17A7B012A0AD101213046FFF706 +:1048800025FF88F310887968304600F021F904E0AC +:1048900088F31088304600F0CCF8A8680068CA2178 +:1048A00041622246532141624846314600F05CF99C +:1048B0000BE0FFF750FF06E0C8684207FCD500F0A8 +:1048C0007EF8A549086088F31088FF21A86802686F +:1048D0005162BDE8F183F8B59D4CA160CA22096818 +:1048E0004A6253224A629B4A136843F020031360D2 +:1048F000136803F00703C3F10403237095682D0CBC +:1049000005F07F056D1C6570EDB29268C2F30E0272 +:10491000521C628092B2521E6A43A2F5A072DA4023 +:104920004FF6FF739A422CBFA380A2808B4A136874 +:1049300043F4002313608A4B1D6845F400251D6075 +:1049400048BB8248804E0123837018254FF0FF3307 +:10495000436000235FFA83FC06F10C0715FB0CFC97 +:104960004FF0000E07F80CE05B1CDFB2062FF1DB06 +:1049700006230370886820F48060886000F01FF8C8 +:10498000D060032001F0AFFAA1680868826842F4A1 +:104990008042826005E0C868410544BF032001F001 +:1049A00097FAA1680A68FF205062002203210320C1 +:1049B00001F042FABDE8F240032001F05BBAC8689A +:1049C00000F0800060F49060C8604FF400207047F1 +:1049D000F0B504460025EFF3108672B61827DFF80D +:1049E00068C10CF10C0007FB05FE10F80E0010B1B9 +:1049F0006D1C062DF5DB062D0CD06F430CEB07006C +:104A00000127077386F310880461427303600D70F9 +:104A10000020F0BD86F310880120F0BD10B50446DB +:104A200000F007F81820484A444310190021017388 +:104A300010BDF8B50746EFF3108472B6032001F0FD +:104A400024FA434DAE683068CA2141623A46532188 +:104A50004162182043494243895C02291BD100214D +:104A60003846FFF733FE3948017806290ED1306801 +:104A700038490A68530500F018F821F48061816014 +:104A8000C1684A07FCD500F016F804E04078884277 +:104A900018BFFFF760FEA9680A68FF205062032074 +:104AA00001F0E8F984F31088F1BD02D5C1684A0726 +:104AB000FCD481687047C16801F0800161F49061A5 +:104AC000C1604FF4002024490860032001F00BBAB4 +:104AD0002DE9F04180460F46424618201A494243CC +:104AE0008C18207B022804BF4046FFF7A2FFEFF39B +:104AF000108572B6032001F0C8F9154EB068006841 +:104B0000CA2141625321416202202073A76067607D +:104B10004046FFF776FD0D490A784978914202D068 +:104B2000FFF719FE02E0A168081AA060FF20B16833 +:104B30000A685062032001F09DF985F31088BDE8F2 +:104B4000F08100002828004000350020A439002012 +:104B50005C390020082800400C0800580008005864 +:104B6000800800580C350020104700000EB4C0B576 +:104B7000024603A800210190009101AB01210448E5 +:104B800078440C30FCF768FD06BC5DF810FB00BFF4 +:104B9000336D000000B587B000F014F80120032247 +:104BA0000690ADF80420ADF8062000F07AF8002851 +:104BB0004CBFFF209DF8000007B000BD182201A8DF +:104BC00001F013B900208DF800001822002101A87F +:104BD00001F00BB909220021684601F006B918223C +:104BE000002102A801F001B970B5C8B006460C4614 +:104BF00015460522FFF7EFFFADF82060FFF7EFFF46 +:104C0000302100F014F80521049000F019F8002874 +:104C100048BFFF2009D49DF8000030B99DF803007B +:104C200020709DF804002870002048B070BDADF8D9 +:104C30000A1008200221ADF80800059108A8704765 +:104C40000791CDF818D0002102A8FFF7A8B800B549 +:104C5000C7B000F00EF8FFF7B1FF312000F013F8F5 +:104C600000F01FF800284CBFFF209DF8000047B05F +:104C700000BD00238DF81C008DF8003007A841709E +:104C8000827000217047ADF8060007A90320049048 +:104C90000822012003910690ADF80420704703908C +:104CA0000691CDF814D0002101A8FFF778B800B51F +:104CB00087B000F065F900F04DF9812000F0F8F8B8 +:104CC00000F016F900284CBFFF209DF8000007B047 +:104CD00000BD2DE9F84DC7B09446DDF840E1519A8A +:104CE000559D569EDDF84CA1ADF81D108DF81C00A9 +:104CF0004FF0000BADF81FC08DF821308DF822E089 +:104D000000F024F800F017F824F8095F668000F03E +:104D100021F93F20832100F00EF9574406910D3709 +:104D2000049700F0E8F800284CBFFF209DF8000031 +:104D300048B0BDE8F08D88F800A007AC5499E4199C +:104D4000524608F10100544401F049B88DF823207F +:104D5000174652998DF800B00DF1240809A8B844FF +:104D600001F03DB800B5C7B000F00CF8852000F0A8 +:104D7000C8F800F0BDF800284CBFFF209DF80000E7 +:104D800047B000BD00218DF81C008DF800101822DE +:104D900001A801F02AB82DE9F841C7B04FF000088A +:104DA00000F026F80DF12300DDF844E14E9F4F9E00 +:104DB000509D529C8DF81F30C0F800E08DF80080A7 +:104DC0008DF820708DF821608DF822508DF82740E5 +:104DD00000F0C0F88620ADF8060007A90C2000F00E +:104DE00083F800284CBFFF209DF8000000F0C5B8F4 +:104DF0008DF81C0007A8417082707047F8B5C8B0E4 +:104E000005460E4617461C4600F023F808A84670D3 +:104E100087708DF8205000F089F88A21ADF80A10CB +:104E20003F20032100F075F8002848BFFF200ED472 +:104E30009DF8000058B94F994E98BDF80120228086 +:104E4000BDF803200280BDF805000880002049B0AD +:104E5000F0BD07220021684600F0C7BF18B5C7B0F3 +:104E600000F09DF800F076F83F208E2100F08CF8DD +:104E700000F041F800284CBFFF209DF8000048B02A +:104E800010BDADF8060007A90220704700B587B035 +:104E900000F076F800F05EF8922000F009F800F0DB +:104EA00027F800284CBFFF209DF8000007B000BD88 +:104EB000ADF806003F220120704700B5C7B00021C1 +:104EC000ADF81C00FFF761FF9520FFF7DAFF00F057 +:104ED0000BF800284CBFFF209DF8000047B000BD34 +:104EE000ADF8060007A9032004903F22012003919A +:104EF0000690ADF80420CDF814D0002101A8FEF7EB +:104F00004EBFADF8060007A901203F22039104908F +:104F10007047ADF80800059108A807210490079193 +:104F2000CDF818D0002102A8FEF739BF18220021C1 +:104F300002A800F05ABFADF80400ADF8061007A8AB +:104F400001210390704700228DF80020ADF81C006D +:104F50008DF81E101822002101A800F046BF00B5F0 +:104F6000C7B0FFF7F0FFA520FFF7BAFF00284CBF3E +:104F7000FF209DF8000047B000BD48B0BDE8F081BB +:104F800000208DF800007047ADF80400ADF8061061 +:104F900007A8012103900691641C049470470446FD +:104FA00000208DF800008DF81C4022460DF11D00F8 +:104FB00000F015BF414981B00A6802430A600968E0 +:104FC00008400090009801B0704778B585B004465D +:104FD0006846142100F0A4FF0CB9012004E0012C64 +:104FE00018BF022C02D10220FFF7E4FF00F012F8F4 +:104FF00000950120019000210220039000F004F8A8 +:1050000000F00EF806B070BD0291694656F8240013 +:1050100000F08ABF0FF2B000294E30F814507047EC +:1050200056F824000022294601F042B80FF29801F8 +:10503000234B31F8101053F82000012201F038B84A +:105040000FF284011E4B31F8101053F8200000229B +:1050500001F02EB8F0B585B004460D46684614211F +:1050600000F05EFF0120FFF7A5FF2800154E0FF2AC +:1050700060070AD137F81400009000210191012047 +:10508000029002210391FFF7C0FF012D13D137F8E1 +:105090001400009001214FF404100190FFF7B4FFB9 +:1050A0000FF23000045D00220F2160B200F0C4FE58 +:1050B00060B200F0DFFE05B0F0BD00004C0000580B +:1050C000EC2900200C2A0020100001000200000042 +:1050D000000400002800000001460648064AC37983 +:1050E0008B4218BF904218BF0838F8D18B4218BFC6 +:1050F00000207047F873FF1F0070FF1F00B587B0D6 +:1051000000208DF8000000F0E0F840F20110ADF84A +:1051100006003F220120069000F0ECF800284CBF6A +:10512000FF209DF8000007B000BD2DE9F8410746BB +:105130000128C7B0884615461E4608BF022003D086 +:1051400002280CBF102000200DF11D010C1800F0EA +:1051500036F8012F8DF81C7002D0022F18D019E0FC +:1051600002273A4641460DF11D0000F038FE257039 +:10517000667000F0AAF83F204FF4817100F016F835 +:10518000FF1C049700F0B8F8002805D5FF2009E0BF +:105190001027E6E7972005E09DF8000010B94E982B +:1051A00000F067F8FFE748B0BDE8F081ADF8040013 +:1051B000ADF8061007A8032103900691704703225B +:1051C0000021684600F011BE2DE9F64F0C46054659 +:1051D000012CC7B09B4608BF022003D0022C0CBF95 +:1051E000102000200DF11F010E18FFF7E8FF012C21 +:1051F000ADF81C508DF81E4002D0022C2CD02DE0B2 +:105200000227569C559DDDF85091DDF84CA1DDF844 +:10521000488148993A4600F054F8A6F800B086F85C +:10522000028086F803A086F804907571B47100F0CE +:105230004CF83F20ADF804004FF4827107A8ADF898 +:105240000610039003210A370497069100F054F8E2 +:10525000002805D5FF2009E01027D2E7972005E0B8 +:105260009DF8000010B9579800F003F849B0BDE868 +:10527000F08FBDF8011001800020704730B5C7B035 +:105280001C464A9B00F026F800258DF800508DF84A +:105290002140224619460DF1220000F0A0FD00F049 +:1052A00014F83F204FF4837100F01BF8A41D049400 +:1052B00000F022F800284CBFFF209DF8000047B006 +:1052C00030BD0DF11F0000F08ABD1822002101A899 +:1052D00000F08BBDADF81C00ADF81E108DF820203D +:1052E0007047ADF80400ADF8061007A8012103903F +:1052F00006917047ADF80420CDF814D0002101A824 +:10530000FEF74DBD30B5C7B00025ADF81C0007A8AD +:105310004A9C41808280ADF8223004818DF8005093 +:1053200000F01EF80F21029140F281100A21ADF821 +:105330000600049107A801213F220390069100F086 +:1053400007F800284CBFFF209DF8000047B030BD93 +:10535000ADF80420CDF814D0002101A8FEF71FBD40 +:105360001822002101A800F040BD000002490160A0 +:1053700002490161704700BF3F54000865540008AE +:10538000006040607047EFF3108172B6026882429D +:105390000CBF012000201CE0EFF3108272B60368FE +:1053A0000B60486001600868416023E0EFF3108201 +:1053B00072B6086043684B6041604868016019E05C +:1053C000EFF3108172B642680368136002684368A5 +:1053D000536081F31088704710B5EFF3108472B6F4 +:1053E00002680A600068FFE7FFF7EAFF84F31088AD +:1053F00010BD0B6082F310887047000000F0EBBE18 +:105400006C486D49016001F12002426001F13002F7 +:10541000826001F13C02026201F14402426201F148 +:105420004C02C26001F15402026101F1700242615A +:1054300001F1740282618031C16100F0EABE38B5C9 +:1054400004465E4D2846FFF79BFF5A484068A16816 +:105450000160E168C16085605949416000F0F5FE76 +:1054600058482AE080B553484268136801211972F0 +:10547000406800F0F0FE002002BD38B5514C4F4DA1 +:1054800004E000F041F80098216888472846FFF7BB +:105490007AFF0028F5D031BD4A484168084738B541 +:1054A0000446494D2846006040604248C068A168F3 +:1054B0000160456000F0D4FE4448216801606168E5 +:1054C0004160002032BD80B53A48C268136810219F +:1054D0001972C06800F0CAFE002002BD35483B4A80 +:1054E000C168C16813680868184738B5374C364D2D +:1054F00004E000F009F80098616888472846FFF743 +:1055000042FF0028F5D031BD69462846FFF764BF49 +:1055100038B504462E4D2846FFF732FF2D4800606F +:10552000406024480069A1688160E168C16005614C +:10553000216801606168416021694161616981613F +:1055400031BD80B501462348FFF730FFBDE802407A +:105550000FF2050000F093BE38B5164C1D4D06E065 +:10556000FFF7D2FF009920690069FFF71FFF284667 +:10557000FFF709FF0028F3D031BD10B5164C2046C7 +:10558000006040600B4841690C60BDE8104000F0CD +:105590008ABE1CB5104C06E069462046FFF71CFF8A +:1055A0000098C046C0462046FFF7EDFE0028F3D025 +:1055B00013BD000000000320AC090320480A0320AB +:1055C0009008032084390020500A03208C390020E1 +:1055D000380A03207C390020400A0320704700006D +:1055E00010B57148714C88B0016841F40041016008 +:1055F000FEF766FC6E480168C908C90041F0040165 +:10560000016000F06FFE6B490020FFF764F900F0C5 +:1056100082FE01210120FEF758FC00F0D1F80121A3 +:105620000020FFF717FDFFF7EBFE634A0021102073 +:10563000FEF7C9FC04F23C500FF2310100900191D9 +:1056400069460FF22D0000F035FA04F25470029012 +:1056500004F5C96140F23C5005900391049402A8FE +:10566000FFF756FFFFF7CAFE08B010BD70470000F5 +:1056700038B5044688B0616801F10B056846FEF74D +:1056800042FD9DF802309DF801209DF800100FF2B8 +:105690007810FFF76BFA9DF804100FF29010FFF7E7 +:1056A00065FA9DF80C309DF80B209DF80A100FF25A +:1056B0009810FFF75BFA28884FF41241401A0CD07B +:1056C000401E3ED0401E4CD0801E57D0401E5AD0A7 +:1056D000401E5BD0401E60D063E004A8102100F0A3 +:1056E0001FFC60680D300078F8B90FF28820FFF7D2 +:1056F0003DFA00F01FFE0D208DF810007F212F488D +:105700008DF8121004680FF29C20240C2146FFF73C +:105710002DFAADF81C4004A8FEF7EEFCFDF70CFDD9 +:1057200000210120FEF7D1FB3BE0012806D10FF25A +:105730009420FFF71BFA0020207032E00FF2B02017 +:105740002DE0606800F10D040FF2D0202178FFF702 +:105750000DFA2078002814BF0FF224300FF2E82051 +:105760001DE00FF2FC00FFF701FAD5F80620D5F88E +:1057700002100FF21810FFF7F9F912E0D5F8021035 +:105780000FF24C1006E00FF27C1008E0D5F8021082 +:105790000FF28C10FFF7EAF903E00FF2BC10FFF7ED +:1057A000E5F909B030BD00000800005830000320C2 +:1057B0008004005814370020F75A0008002004E045 +:1057C00080B50020FFF701FC0120FFF7FEFB02205F +:1057D000FFF7FBFBBDE802400120FFF727BC704745 +:1057E0004FF0FF30FEF788BB00211020FEF7F8BB1A +:1057F0000220FEF71BBC0220FEF720BCB0F5806F34 +:1058000008BFFDF7D5BD7047576972656C65737346 +:10581000204669726D776172652076657273696F73 +:105820006E2025642E25642E25640A005769726552 +:105830006C657373204669726D776172652062755D +:10584000696C642025640A0046555320766572739E +:10585000696F6E2025642E25642E25640A0A0000D7 +:105860002D2D20424C45204E564D2052414D204872 +:105870004153204245454E20555044415445442013 +:10588000425920434D4F2B200A0000005348434902 +:105890005F5355425F4556545F424C455F4E564DEF +:1058A0005F52414D5F555044415445203A20537456 +:1058B00061727441646472657373203D20256C7855 +:1058C000202C2053697A65203D20256C640A000055 +:1058D000534843495F5355425F4556545F4E564DBA +:1058E0005F53544152545F5752495445203A204E19 +:1058F000756D6265724F66576F726473203D202527 +:105900006C640A00534843495F5355425F455654FF +:105910005F4E564D5F454E445F57524954450A000D +:10592000534843495F5355425F4556545F4E564D69 +:105930005F53544152545F4552415345203A204EE3 +:10594000756D6265724F66536563746F7273203D47 +:1059500020256C640A000000534843495F535542B8 +:105960005F4556545F4E564D5F454E445F4552412C +:1059700053450A00534843495F5355425F455654C7 +:105980005F434F44455F5245414459202D205749BC +:1059900052454C4553535F46575F52554E4E494E04 +:1059A00047200A004442474D43555F47657452659E +:1059B000766973696F6E49443D20256C78200A0A28 +:1059C00000000000534843495F5355425F45565419 +:1059D0005F434F44455F5245414459202D20465571 +:1059E000535F46575F52554E4E494E47200A0000BE +:1059F000534843495F5355425F4556545F434F44B4 +:105A0000455F5245414459209620554E45585045D2 +:105A1000435445442043415345200A0053484349D9 +:105A20005F5355425F4556545F4552524F525F4E49 +:105A30004F544946205749544820524541534F4EF0 +:105A4000202578200A000000534843495F535542FF +:105A50005F4556545F4552524F525F4E4F54494630 +:105A6000205749544820524541534F4E20962045D7 +:105A700052525F424C455F494E4954200A00000093 +:105A8000534843495F5355425F4556545F45525210 +:105A90004F525F4E4F544946205749544820524573 +:105AA00041534F4E209620424C45204552524F5272 +:105AB000200A00007FB50C464D4D61684D4EE861EF +:105AC0002962284600F076FD2468746006F108001B +:105AD00000604060012000F068F801203070296803 +:105AE00041B10FF2E9000FF2ED0200900192029431 +:105AF000684688477FBD1FB53E4C04F10800FFF79C +:105B000042FC00BB2178F1B1694604F10800FFF7BF +:105B100063FC3748C16949B10098029001228DF8B1 +:105B2000042001A888479DF8040000E001202070AF +:105B3000207818B10098FFF704FD04E0009904F103 +:105B40000800FFF729FC04F10800FFF71CFC28B946 +:105B5000207818B104F10800FFF746FE1FBD2DE9BB +:105B6000F04105460E4690461C46002000F01DF808 +:105B7000204F7868A0F80950C672324641460C3072 +:105B8000FCF7DCFE1A4A136900210020984748F20E +:105B9000E800FFF730FE79688A78D21C04F108002B +:105BA000FCF7CCFEBDE8F04101201CB51049124CB9 +:105BB000096A20B901B188470020207013BD012077 +:105BC000207011B1BDE81C40084713BD0020FFF74D +:105BD0000FBE000010B50146064C04F10800FFF7A7 +:105BE000E5FB04F10800BDE81040FFF7FDBD000033 +:105BF000003900204C3900207239002038B50546A4 +:105C000084B068780024FF2802BFB5F8031040F67E +:105C10000140814225D165498A88B5F80700921C68 +:105C2000904209D1687B0124C10752BF8DF8004022 +:105C300000218DF8001011E04988491C884210D1DC +:105C40000FF27010FEF792FF03208DF8000005F1AF +:105C50000D00B5F80B108DF8081001906846FEF79E +:105C600059FB204605B030BD10B58AB050484F4CA6 +:105C7000FEF78EFA8F218DF81810E520B3218DF8EC +:105C800019008DF81A10D5202E218DF81B008DF8E3 +:105C90001C107F204A218DF81D008DF81E109820C1 +:105CA0002A218DF81F008DF8201048207A218DF8C8 +:105CB00021008DF82210CC2040218DF823008DF892 +:105CC0002410FE2000218DF82500ADF82610009448 +:105CD0000823012206A90220FFF727FA00F032F874 +:105CE000412000F023F8A01C00F010F8062100F07D +:105CF00015F800F027F8422000F018F8201D00F0F9 +:105D000005F8102100F00AF80AB010BD0590012135 +:105D10000491029100200A220190704703920091A1 +:105D20000223208806AA0221FFF74EBA8E218DF8A1 +:105D300024008DF823100020FE21ADF826008DF8F8 +:105D40002510704719208DF81800ED2182208DF85C +:105D50001A008DF81910ED20AE218DF81C008DF879 +:105D60001B104C2021218DF81E008DF81D104120A4 +:105D70009D218DF820008DF81F10222045218DF8DF +:105D800022008DF82110704780B592224FF64263B1 +:105D9000984208D10548009102238188008800229A +:105DA000FFF76CFA0246104602BD00009C39002045 +:105DB000FD5B00082D2D2047415454203A204C45CE +:105DC0004420434F4E46494755524154494F4E2077 +:105DD00052454345495645440A000000704710B5F6 +:105DE0000446FCF7ABFD204610BD10B50446104636 +:105DF0000A460146204600F0E7FB204610BD0000A1 +:105E00000901020081B002D43C48815405E03C48BD +:105E100002F00F02104400F8041C01B07047394A28 +:105E200013684FF6FF0100020B4000F4E0601843D6 +:105E3000354908431060704738B5324B1C68C4F3CD +:105E40000223C3F10704052C28BF04241D1D072DC0 +:105E500034BF0023DB1E012505FA04F4641E214033 +:105E6000994005FA03F35B1E1A401143BDE8344024 +:105E7000C6E70000010007D4012200F01F01234BF8 +:105E80008A40400943F82020704701000BD40122CA +:105E900000F01F011E4B8A40400943F82020BFF349 +:105EA0004F8FBFF36F8F704710B5401EB0F1807FEA +:105EB00001D3012010BD174C60600F214FF0FF305F +:105EC000FFF79EFF0022A26007202060002010BD87 +:105ED000010007D4012200F01F010F4B8A40400946 +:105EE00043F820207047010007D4012200F01F0171 +:105EF0000A4B8A40400943F82020704700E400E044 +:105F000018ED00E00CED00E00000FA0500E100E013 +:105F100080E100E010E000E000E200E080E200E06C +:105F2000002200F085BB00002DE9F84F4FF000097A +:105F3000674A684B4FF00F0805460E4633E0664F40 +:105F4000BD4214BF072704278F4027434CF82E700B +:105F5000C1431C6801EA040C7468E40248BF40EACB +:105F60000C0CC3F800C05C6801EA040C7468A4025D +:105F700048BF40EA0C0CC3F804C0146801EA040CE2 +:105F80007468E40348BF40EA0C0CC2F800C05468CF +:105F900001EA040C7168890348BF40EA0C0CC2F89E +:105FA00004C009F10109316831FA09F000F07E807E +:105FB000012404FA09F414EA0100F2D04FEA490C72 +:105FC000032101FA0CF16FEA010E716801F0030779 +:105FD000012F1CBF01F00301022911D1A968F76844 +:105FE0000EEA010107FA0CF73943A960696821EA52 +:105FF00004047168C1F3001101FA09F10C436C60EB +:106000004FEA8901347904F00304032C1FD0EC68B3 +:10601000B7680EEA040407FA0CF73C43EC603479E5 +:1060200004F00304022C12D14FEAD90705EB8704D0 +:1060300001F01C07D4F820A008FA07FB2AEA0B0A93 +:10604000D6F810B00BFA07F747EA0A0727622C6860 +:106050000EEA0407347904F0030404FA0CF43C4318 +:106060002C60746814F4403F9BD0DFF870C04FEA96 +:10607000990E5CF82E7001F00C0108FA01F427EA81 +:106080000404B5F1904F08BF00270ED0144FBD4255 +:1060900008BF012709D0134FBD4208BF022704D013 +:1060A000114FBD427FF44BAF03274DE7BDE8F18FA1 +:1060B00081B0002A14BF8161816201B070470B4A30 +:1060C000136803421CBF1060FFF798BB70470000C5 +:1060D00080080058000800580010004808000140DF +:1060E0000004004800080048000C00480C08005854 +:1060F000C0680840884201D10120704700207047E5 +:10610000C0690840884201D10120704700207047D3 +:1061100010B5684C02212046FFF7F2FF38B16068E5 +:10612000C043810703D5FFF7E0F9022018E0012101 +:106130002046FFF7E5FF38B16068C043C10703D5CB +:10614000FFF79BF901200BE008212046FFF7D8FF5D +:1061500038B16068C043010703D5FFF71AFA082079 +:10616000A06010BD10B5534C02212046FFF7C0FFC0 +:1061700058B96068C043810307D5606840F40030B7 +:106180006060BDE81040FFF7A9B908212046FFF77D +:10619000AFFF70B96068C04301030AD56068464923 +:1061A00040F400206060086880474FF40020A06041 +:1061B00010BD20212046FFF79BFF58B96068C043FF +:1061C000810207D5606840F400106060BDE81040AF +:1061D000FFF762B910BD394881B0016841F4801100 +:1061E0000160006800F48010009000983448016855 +:1061F00041F4007101603348026842F400720260A9 +:1062000040BF20BF3048016841F40041016001B047 +:10621000704780B52D48016841F480110160006825 +:1062200000F48010009000982248016841F00101BC +:106230000160026842F4803202602C20FFF71AFEEF +:10624000BDE802402D20FFF715BE2148016849082E +:106250004900016070471F494FF480300860704763 +:106260001B48016821F002010160704718484FF493 +:1062700000314160016821F400310160704738B598 +:1062800004460C4D08212846FFF732FF30B10A487A +:106290000460686820F40020686031BDA0474FF4B6 +:1062A0000021A96031BD0A48016821F008010160A0 +:1062B00070470000000C0058AC3900205001005815 +:1062C000D4080058200800580C040058500000580A +:1062D000040C0058080C0058DFF81800006800F49F +:1062E000C0607047DFF81000FFE7016841F480618B +:1062F0000160704700040058040400584D4900E054 +:106300004D4981B00A6802430A600968084000905C +:10631000009801B0704780B500F0BBF900F0BBF900 +:106320004648016841F48031016000F0E0F9BDE8C1 +:1063300001400EE000B587B068460FF25C211C22D8 +:10634000FCF70CFBFFF719F96846FDF7CDFE07B027 +:1063500000BDF0B585B068461421FFF7E1FD0026C9 +:106360000025002400210FF2001000EBC1029079FB +:1063700088B11368B3F1904F08D0314FBB4208D0B9 +:10638000304FBB4204BF9088044304E0908806432A +:1063900001E090880543491C2629E4DB0020029097 +:1063A0000121032003900191B0B288B10090012037 +:1063B000FFF7A4FF0120FFF7A3FF69464FF09040CD +:1063C000FFF7B2FD0022B1B24FF09040FFF770FE30 +:1063D000A8B280B100900220FFF790FF0220FFF7E3 +:1063E0008FFF174E69463046FFF79EFD0022A9B287 +:1063F0003046FFF75DFEA0B280B100900420FFF7A9 +:106400007DFF0420FFF77CFF0E4D69462846FFF70D +:106410008BFD0022A1B22846FFF74AFE05B0F0BD71 +:1064200080B50021084800F0A1F9BDE8014000F066 +:106430003DBB00004C0000584C010058900800582B +:106440000004004800080048142A002070B50446E3 +:106450000D46164600F0B4F933462A462146BDE8FB +:106460007040022000F0C2BB0000004801000000A4 +:10647000000000480100000000000048010000008A +:10648000000000480100000000000048010000007A +:10649000000000480100000000000048010000006A +:1064A000000000480100000000000048010000005A +:1064B000000000480100000000000048010000004A +:1064C000000000480100000000000048010000003A +:1064D000000000480100000000000048010000002A +:1064E000000000480100000000000048010000001A +:1064F000000000480100000000000048010000000A +:1065000000000048010000000000004801000000F9 +:1065100000000048010000000000004801000000E9 +:1065200000000048010000000000004801000000D9 +:1065300000000048010000000000004801000000C9 +:1065400000000048010000000000004801000000B9 +:1065500000000048010000000000004801000000A9 +:106560000000004801000000000000480100000099 +:106570000000004801000000000000480100000089 +:106580000000004801000000000000480100000079 +:1065900000000048010000000000000000000000B2 +:1065A0000000000068640008280003202C0003207D +:1065B000260404000249016002490161704700BFDE +:1065C0009F540008C754000862F30F2262F31F4271 +:1065D000401810F0030308D0C91A1FD3DB0748BFC7 +:1065E00000F8012D28BF20F8022D130030B4144606 +:1065F0001546103928BF20E93C00FAD8490728BFC2 +:1066000020E90C0048BF40F8042D890028BF20F87D +:10661000022D48BF00F8012D30BC7047C91818BFC3 +:1066200000F8012DCB0728BF00F8012D70470000AE +:1066300000B500BF130096469446103928BFA0E865 +:106640000C50FAD85FEA417C28BF0CC048BF40F824 +:10665000042BC90728BF20F8022B48BF00F8012BE4 +:1066600000BD0000114810B5016841F4807101605F +:106670000320FFF7D4FB002000F0E2FA00240028FA +:1066800014BF012400F00BFB204610BD08488068B1 +:106690007047084805E00748016841F002010160C1 +:1066A0007047016841F001010160704700400058E7 +:1066B000E0290020042004E038B5EFF3108472B61E +:1066C000284D6946281D00F0F6FC6946281D00F09B +:1066D00050FD38B184F31088BDF80010224AFFF74E +:1066E000B5FE31BD0120287084F3108831BD80B51E +:1066F000FFF796FE0221009100231A4800F12401C1 +:106700004FF48052001D00F0BDFB01BD00BFF8B585 +:1067100014460026EFF3108510F1010F1ED001285A +:106720001CBF02284FF0FF3618D1BCB1264672B606 +:106730000C4F012392B2381D00F0B8FB00281CBF9B +:106740003978002908D000223A7085F31088A1B268 +:10675000054AFFF77BFE01E085F310883046F2BD65 +:106760000000000008140020B966000810B55A4C5B +:10677000002220606160A28104F11400574900F0FA +:1067800043FD574904F1140000F051FD04F539713F +:1067900004F1140000F0B2FF04F1140000F058FD01 +:1067A0000FF28103002204F110010020FEF710F91E +:1067B000BDE810400FF23D0200212020FDF703BC90 +:1067C000F8B50C461546EFF31086434F014638687E +:1067D0002246FCF7B3F8BD60FC8172B6387B20B16D +:1067E00001212020FDF7FCFB01E00120787386F3F6 +:1067F0001088F1BD10B5384CE289216804F114000D +:1068000000F083FF04F1140000F093FF28B1BDE80D +:10681000104001212020FDF7E3BBA068BDE8104037 +:106820000047000038B5EFF3108472B62A4D0120FE +:106830002873687B18B101212020FDF7D1FB84F378 +:106840001088287CBDE83240FEF7E8B810B5224C2D +:10685000616804F1140000F063FF04F1140000F01B +:106860007EFF207C4AF21701FEF732F9002010BDAE +:106870000020704710B520281A4A02D0212812D0D3 +:106880001FE008784B788C7840EA0320CB7840EA08 +:10689000044040EA03601060087910714879507133 +:1068A000887990710DE010680870030A4B70030C32 +:1068B000000EC8708B70107908715079487190790A +:1068C0008871002010BD80B5C046C046064800F063 +:1068D00046FF002002BD00002C240020802900205B +:1068E000C8280020042A002040240020AF4900E0EE +:1068F000AF4981B00A6802430A6009680840009005 +:10690000009801B0704738B5AA49AB4C4FF400402D +:106910000860FFF7A7FE606840010ED56068C00000 +:106920000BD400F02FFF00F02DFF206840F48030E2 +:106930002060216821F48031216000F016F90020E8 +:10694000FEF7CAFB40B180799C49E160E16821F41F +:106950007C5141EA0021E16000F055F8984C9948DB +:10696000994D606204F1240000F014FF00F0C5F8B6 +:106970009648016800220260026902F0500202613A +:106980000420FFF7B5FF0120FFF7B2FF0220FFF759 +:10699000AFFF0420FFF7AAFF0120FFF7A7FF0220A7 +:1069A000FFF7A4FF00220F210E20FFF745FA0E206B +:1069B000FFF760FA00220F213A20FFF73DFA3A2054 +:1069C000FFF758FA0020606025600F20A06047F6AE +:1069D000FF70E06000202061A061E06160612046FE +:1069E00000F010FFCA206862FF2153206862A86887 +:1069F000C008C000A8606962FEF7F2FD4FF0FF30EA +:106A0000FDF77AFAFAE710B5AEB01CA84821FFF7F7 +:106A100087FA01A81C21FFF783FA08A85021FFF785 +:106A20007FFA00F0AFFE6448016821F018010160B0 +:106A300007216748026822F4C06242F400720260D3 +:106A40004FF48032006800F4C06000904FF480740E +:106A500000981C9101201E900021402020901D9242 +:106A600027911F941CA800F07AFF6F20019002214B +:106A70000020029103900490059006900790012158 +:106A800001A801F01EFA43F60300089000214FF41C +:106A9000804019900E910F91102002211B901A91A5 +:106AA000189408A801F0E6FB2EB010BD10B5494CB3 +:106AB000494800F015F820626062A0626066FFE756 +:106AC000204601F07BFD0021204602F036FA00212D +:106AD000204602F03DFA2046BDE8104002F010BA10 +:106AE00020604FF4E13060600020A060E060206131 +:106AF0000C2060610020A061704718B59BB007A80A +:106B00005021FFF70DFA01A81821FFF709FA3348C1 +:106B1000334C0168206C40F001002064206C800739 +:106B2000FCD54FF4807007900021149107A801F064 +:106B3000A1FB206840F0807020604FF00052216877 +:106B400001F0807100910021009801914BF67F3097 +:106B500004902221059100200390202102920691A9 +:106B600001A801F002FD1CB010BD1E4881B00168F3 +:106B700041F4801101603F21006800F48010009012 +:106B80000098194841604161016841F47C1101603D +:106B9000026942F47C120261016841F03F01016028 +:106BA000026942F03F02026101B07047480000589C +:106BB0004C0000581040005890000058FECAFECA11 +:106BC00014370020000C00580028004080080058AE +:106BD00000040058E0330020008000409414005866 +:106BE0005800005850000058040C005810B50024FC +:106BF000022811D1114803600E480F4B036001F0C9 +:106C00001DFD012805D007D3032804D038BF022476 +:106C100002E0012400E00324204610BD006806497C +:106C2000884204D105490868002818BF004770470A +:106C300000000000E033002000800040B039002058 +:106C400070B50F4E044630780025A8B101F055FA12 +:106C500032784FF47A71B1FBF2F1B0FBF1F0FFF74B +:106C600023F948B9102C07D2002221464FF0FF30FB +:106C7000FFF7E2F8B46000E00125284670BD00BFD0 +:106C8000E0290020724900E0724981B00A6802439D +:106C90000A60096808400090009801B0704780B50C +:106CA0004FF40020FFF7F0FF002200212E20FFF715 +:106CB000C3F8BDE802402E20FFF7DCB80068664943 +:106CC000884200D0704780B54FF48010FFF7DCFF9A +:106CD000002200212C20FFF7AFF82C20FFF7CAF884 +:106CE000002200212D20FFF7A7F8BDE802402D204B +:106CF000FFF7C0B838B58AB0044668461421FFF7DC +:106D00000FF92068554A564990423CD10868554DC4 +:106D100040F001000860096801F001010591059843 +:106D20000120FFF7AFFF0C2000900221002001910D +:106D30000290032108200391049069464FF090408F +:106D4000FFF7F2F848482860112000F04EF808B12B +:106D5000C046C0464FF088500690002101200791A0 +:106D6000ADF82010099006A9284602F045F908B1AF +:106D7000C046C046A567AC62002200212520FFF76F +:106D80005BF825202DE0394A90422CD14868384DD7 +:106D900040F480404860486800F4804005900598C1 +:106DA0000220FFF76FFFC020009002210120019117 +:106DB0000290032107200391049069462D48FFF7B4 +:106DC000B3F82D4828600F2000F00FF808B1C04636 +:106DD000C046A567AC62002200212420FFF72CF8F2 +:106DE0002420FFF747F80BB030BD68601020A86082 +:106DF0000020E8608020286100206861A861E861C7 +:106E00002862284602F01EB91CB504461B492068BA +:106E100088421CD100F0B6FC00F0B4FC1848816B2D +:106E200021F4407141F480718163816B41F4004130 +:106E30008163026842F480620260006800F480604E +:106E4000009000982046BDE8164002F0DBBA13BD62 +:106E50004C00005850000058000C005800800040C2 +:106E60005C000058743700204400024000380140A4 +:106E7000D4370020000400484404024000280040A9 +:106E80005800005810B5029C016042600021C160AA +:106E90000161416181610381A107047704D5008903 +:106EA00010B14FF0FF3010BD002010BD2DE9F04FA4 +:106EB000064685B030890C460027BB46002871691C +:106EC000DC460CBF4FF00208D84681B168B9306982 +:106ED0007768451CBD4228BFED1B3768385C7D5D77 +:106EE00000EB0527BF1CBFB203E0074600E000B17E +:106EF00002463069F568A84223BF7568281AC01B8E +:106F00000020154608EB050903FB09FE864532BF44 +:106F10000020B0FBF9FA09FB1A00C0B2804509DA7B +:106F200096F81C905FEAC97A48BF84465FEA897088 +:106F300048BFC446100000F0B480706871446144DA +:106F40008842C0F0AE8008EB020080B20390D946C0 +:106F5000100AADF802000294ADF80020049359E045 +:106F6000800740D53089002840F09B803268D018D7 +:106F7000A34600F8024C200A32681A4402F8010CB9 +:106F8000224630681844FBF7D9FC706920187061FC +:106F9000B069019C401CB061200A31680C703168F6 +:106FA00048701CE08CB3307FC207D9D5308940B916 +:106FB00031681944FF2001F8020C3168194401F8C6 +:106FC000010C4FF0000B7069241874612C46308955 +:106FD000002340B931680C70210A306841700223E7 +:106FE0007069801C706108EB04070021BFB2316139 +:106FF0005CB1DA44029800EB0A013068224618447A +:10700000FBF79CFC70692418746109F10109B069EF +:10701000401CB061049A70683169914545D2791875 +:1070200081422CBF081A0846306103463089A0B956 +:107030003068BDF80010C1545B1C70683168834231 +:1070400028BF1B1ABDF80200C8545B1C706883423D +:1070500028BF1B1A7069801C706105FB09FA7468EF +:10706000BDF80000E41A844288BF0446029800EB91 +:107070000A01281BAC42019003D093D2307F002834 +:1070800090D137682246F818FBF758FC7069201831 +:107090007061A346019C039F0023A9E73068404428 +:1070A00000E0002005B0BDE8F08F88448045F5D3AE +:1070B000A8EB0008F2E7F8B50246002310895469EE +:1070C00000280CBF022500250026002C4DD060B9F9 +:1070D000D36857685E1CBE4228BFF61B1768FB5C6E +:1070E000BE5D03EB0626B6B200E00646137F03F052 +:1070F0000303012B23D14FF6FF77BE4208BF0028C0 +:1071000008D0D36817699F4219D2C0B15768FB1ADB +:10711000834214D25668D368A41B1C1900235461FF +:10712000D36058B910680378012E94BFC6F10106E8 +:107130000126805D03EB0026B6B200E00646D76864 +:1071400054681368E819A04228BF001B0344506923 +:10715000801B401B506105D0F719ED19A54228BFCF +:107160002D1BD5609069401E906101B10E801846BC +:10717000F2BDF8B5024600241089536900280CBFFF +:10718000022500250026002B3AD0D468234658B9A2 +:107190005768661CBE4228BFF61B176817F804C064 +:1071A000BE5D0CEB062600E00646177F07F00307DE +:1071B000012F1ED1B7B24FF6FF7C674508BF0028EC +:1071C00007D150680023012894BFC0F101000120BD +:1071D0000AE01769A7420CD258B157683C1B844299 +:1071E00007D20023064604E014682678205C06EBEC +:1071F00000265068ED18854228BF2D1A10684419E2 +:1072000001B10E802046F2BD10B508B9032010BDB3 +:1072100000F527730024DC615C621C6301B1996195 +:10722000012119700270BDE8104002F04AB91CB586 +:107230000022ADF8002009B9032016BD00F52E7418 +:107240002160C96A11B1684688476061002016BD97 +:1072500002F065B980B5D0F8B832032213B11A68CC +:1072600090470246104602BD80B5D0F8B8220AB158 +:1072700052689047002002BD38B5044604F2AA25A2 +:10728000284602F0B5FB04F5257001210160818BD1 +:107290004160817D11F01F0003D002280DD006D37C +:1072A00011E029462046BDE8344002F093B9294652 +:1072B0002046BDE8344002F00ABA29462046BDE81F +:1072C000344002F02ABA2046BDE8344001F0800183 +:1072D00002F03DB938B5044610460B0004F525729E +:1072E00021D11168032910D104F5AE714B680D68E6 +:1072F000AB420CD2ED1A4B680D602A469A42014609 +:1073000088BF1A46204602F0D1FB002032BD107A19 +:10731000032804D1516A096909B1204688472046EB +:1073200002F0CCFBF1E7107A0328EED1526A9269A1 +:10733000002AEAD0204690470100E6D032BD38B599 +:10734000044610460A0004F5257538D1296802293B +:107350002ED1E269216A914206D2521AE2610146B7 +:10736000204602F091FB0DE013D1A069884210D3B2 +:10737000696888420DD200220021204602F084FB79 +:1073800000206860002300220021204602F00BF953 +:107390000EE0287A032804D1696AC96809B1204639 +:1073A00088478021204602F0D2F8204602F08DFB6B +:1073B000287B012804BF00212973002032BD287AD0 +:1073C0000328FAD16A6A5269002AF6D0204690470B +:1073D0000100F2D032BD1CB5044604F52570012130 +:1073E00001720021016061600161416A09B90320F5 +:1073F00016BD806A00281CBF4A68002A02D00021FE +:1074000020469047402300220021204602F08EF8BB +:1074100004F5B070012181804023402101600022E9 +:107420008021204602F082F80120A08440202062C2 +:10743000002016BD01740020704700F52770017808 +:107440004170042101700020704700F52770017819 +:10745000042904BF427802700020704780B500F50F +:107460002772D16909B9032002BD1278032A02D11B +:10747000C96901B18847002002BD0000F8B5054682 +:107480004FF40770F9F7ECFC040005F52F7602D1F4 +:1074900030600220F2BD346005F14C07287C40B911 +:1074A0004FF4007300F032F8012028874FF4007386 +:1074B00005E0402300F02AF801202887402302221B +:1074C0000121284602F032F80120A5F878010823AE +:1074D0001020788003228221284602F027F801201C +:1074E000388070680168884704F5017100220A61DC +:1074F0004A61287C0A6800280CBF4FF400734023BF +:107500000121284602F04FF80020F2BD022281211D +:10751000284602F00BB838B50446812102F010F875 +:1075200004F13805002028800121204602F008F8E7 +:107530000020A4F878018221204602F001F8002002 +:10754000A882E88204F52F74206838B16168486821 +:107550008047206802F0C0FA00202060002032BD81 +:10756000F8B5054605F5277300201C6A8DF8000064 +:107570000E46ADF8020000270CB90320F2BD3178A9 +:1075800011F0600024D020283ED1F2887078D2B16A +:1075900009060DD55B6AD3F808C02146E047F2889A +:1075A000082A28BF07222146284602F065FA30E063 +:1075B00004F500710870F08848702146F28828466A +:1075C00002F06AFA25E05B6A9C683146A04720E039 +:1075D000707830B101281CD00A2809D00B2810D0AF +:1075E00012E0187803280FD102220DF1020104E005 +:1075F0001878032808D101226946284602F03CFA8F +:1076000007E01878032804D03146284602F005FA2E +:1076100003273846F2BDF8B5044604F52F739E687B +:107620001D680DB90320F2BD0F46142010FB07F0B2 +:1076300004EB000CDCF8180080B128225743F21943 +:10764000926BB0FBF2F602FB160038B9CCF81800CA +:1076500000230022204601F09FFF0BE005F5027099 +:107660000022C2605A68136923B10A46006805F512 +:10767000047198470020F2BD70B500F52F752C6895 +:107680000CB9032070BD04F5017601F093FFB060E2 +:1076900004F503716A683068D3689847002070BDAC +:1076A0001CB500F52F70016809B9032016BD4368A9 +:1076B000002B1EBF01F500742078FF2804D06278EB +:1076C0009B689847FF202070002016BD4321018051 +:1076D00006487047432101800548704743210180D7 +:1076E000044870470A210180034870474028002061 +:1076F000FC27002084280020F829002009B9032055 +:107700007047C0F8C01200207047D0F8BC0208B91A +:107710000320704700F5027001608260002070470E +:10772000D0F8BC0208B903207047C0F8041200204A +:10773000704710B5D0F8BC12012209B9032010BD62 +:1077400001F50274E16841B9E260A168C162A36811 +:107750002268812101F020FF0022104610BD80B573 +:10776000D0F8BC1209B9032002BDD1F80422017C73 +:1077700000290CBF4FF400734023012101F013FFD7 +:10778000002002BD0248016841F480710160704729 +:1077900000040058F8B504460025ACB104F13406E5 +:1077A000307910B92046FFF789FA0F4F384600F0BC +:1077B00021F8386840F001103860204600F007F8E2 +:1077C00035600120307100E001252846F2BD10B57A +:1077D0000021064A064B00EB8104491C0629636020 +:1077E000E261F8D310BD0000000C00587B240008B3 +:1077F00017160008002101604FF03F1141603F2142 +:107800008160704738B5040044D094F8210028B94D +:10781000002184F820102046FFF7F6FA00F049F81E +:10782000FF2510B100F03FF834E02168DFF8B00028 +:107830008A6802408A6021688A6863682069034315 +:10784000A06903431A438A602168E06808612068E0 +:107850000169A26841EA024101612068C16821F022 +:107860008001C1602068C16C89088900C1642168F9 +:10787000CA6CE369606903431A43CA64206881687B +:10788000880609D400F020F830B120684562042150 +:1078900000F01FF8012032BD20684562012184F804 +:1078A0002110002032BD20684562042184F8211097 +:1078B0007047022084F82100CA20216848625320C2 +:1078C00022685062204626E020460BE02068C0F87F +:1078D000248084F82110002084F8200070470000E4 +:1078E000BFFF8FFF70B5044640F2E9362068C168DB +:1078F00021F0A001C16002F0F1F805462068C168DE +:10790000880606D402F0EAF8401BB042F6D3032002 +:1079100070BD002070BD70B504462068C1684A067D +:1079200012D44FF0FF32C26040F2E93602F0D6F8CE +:1079300005462068C168480606D402F0CFF8401B0F +:10794000B042F6D3032070BD002070BD4FF0B040B0 +:10795000006800F0F000B02888BFB02070472DE923 +:10796000F041040054D0207881064FF0B04538D55E +:10797000A868E96810F00C0001F0030103D00C289E +:1079800008BF012946D12868800702D5E069002890 +:107990003ED0FFF7DBFF616A884207D2084600F05D +:1079A000D3FB002834D100F075FA0FE0286820F0EE +:1079B000F000014329606968206A21F47F4141EAAF +:1079C00000216960606A00F0BFFB08BB00F095FB16 +:1079D000DFF810180860DFF810080068FFF730F9CA +:1079E000B0B92078C1070DD5A868E96800F00C008F +:1079F000082801F0030103D00C2808BF03292DD16A +:107A00002868800340F139816068002840F03581A2 +:107A1000012038E2E06980B1296841F0010100F0FD +:107A200047FA06462868800700F1248102F056F8DC +:107A3000801B0328F6D3032025E228684008400075 +:107A4000286002F04BF80646286800F01FFAC8D0FC +:107A500002F044F8801B0328F6D3ECE76068B0F529 +:107A6000803F04D1296841F48031296003E02A680D +:107A700022F480322A60606860B102F02FF8064676 +:107A80002868800300F1F98002F028F8801B65283F +:107A9000F6D3D0E702F022F806462868400C10F032 +:107AA000010000F0EA8002F019F8801B6528F4D389 +:107AB000C1E702F013F8C01B0328C0F01281BAE737 +:107AC000E06878B1296841F4807100F0F1F9064668 +:107AD0002868400500F1188102F000F8801B032897 +:107AE000F6D3A8E7286820F48070286001F0F6FF3C +:107AF00006462868800A10F0010000F0DC8001F0E2 +:107B0000EDFF801B0328F4D395E701F0E7FFC01BCE +:107B10000328C0F00B818EE740F0010000F0CEF9A1 +:107B200007467068800700F11C8101F0D7FFC01B79 +:107B30000328F6D37FE7706820F0040000F0BEF958 +:107B400007467068C00810F0010000F0198101F0CC +:107B5000C5FFC01B0428F4D36DE70528306806D1A3 +:107B600040F004003060316841F0010105E0400858 +:107B700040003060316821F004013160A06841F2BA +:107B8000893768B101F0AAFF80463068800700F1AC +:107B90000C8101F0A3FFA0EB0800B842F5D34AE73F +:107BA00001F09CFF8046306800F070F900F0FD8025 +:107BB00001F094FFA0EB0800B842F4D33BE701F0DA +:107BC0008DFFC01B0328C0F0FE8034E7B06840087A +:107BD0004000B06001F082FF0746B06800F056F93F +:107BE00000F0F58001F07AFFC01B0328F5D322E7EF +:107BF00001F074FF801B0328C0F01F811BE701F018 +:107C00006DFF001B0328C0F0398114E7286881014B +:107C10000CD4296841F080712960E86840F08050F8 +:107C2000E86001F05BFF04462868810100F12A81C9 +:107C300001F054FF001B0328F6D3FCE60C2931D0D9 +:107C4000286820F080702860E968DFF8A0058908BE +:107C50008900E960E9680140E96001F03FFF0446FE +:107C60002868810140F10E8101F038FF001B0328D4 +:107C7000F6D3E0E600F00EF9B3E6207881071AD5D6 +:107C8000A868E96800F00C00042801F0030104D0A2 +:107C90000C2808BF02297FF413AF2868400503D5DC +:107CA000E06800283FF4B4AE6968206921F0FE4125 +:107CB00041EA006169602168DFF8346511F0180F4E +:107CC00038D0606900283FF436AFC90670687FF588 +:107CD00023AF800709D4706840F0010000F0EEF88F +:107CE0000746706880077FF5E4AE706840F00400D6 +:107CF00000F0E4F80746706800070DD401F0EEFECE +:107D0000C01B0428F7D396E66868216920F0FE407E +:107D100040EA01606860CEE77068A16920F4706095 +:107D200040EA0120706000F0C6F8074600F0ADF8A8 +:107D30007FF4EBAE2078410737D5DFF8B8743868A8 +:107D4000C10529D4FFF71EFD01F0C8FE8046386842 +:107D5000C10521D401F0C2FEA0EB08000328F6D330 +:107D600069E6706820F0040070607068C00810F068 +:107D70000100DFD001F0B2FEC01B0428F5D35AE6A3 +:107D800000F099F8074600F080F8D3D001F0A6FE85 +:107D9000C01B0328F7D34EE6A06801287FF4DDAEB0 +:107DA000306840F001003060E8E6217848060ED5E2 +:107DB000A06A00283FF40AAFB16841F00101B16048 +:107DC00001F08CFE0746B06880077FF5F8AEE06AE8 +:107DD000002857D0A968EA68022801F00C017FF456 +:107DE0002DAF236B02F00300984202BF02F0700037 +:107DF000636B984214D1A36BC2F30620984202BF72 +:107E000002F47810E36B98420AD1236C02F06060B0 +:107E1000984202BF02F06042606C82423FF4F6AECC +:107E20000C293FF4F5AD286841013FF5F1AD296813 +:107E300021F0807100F03CF80646286881013FF58A +:107E4000D7AEE968DFF8B003A26B0140206B0143B5 +:107E5000606B0143E06B41EA02210143206C014366 +:107E6000606C0143E960286840F080702860E96830 +:107E700041F08051E96001F031FE0446286881013B +:107E80007FF5BDAE0020BDE8F0817068400810F0BD +:107E9000010070472968606A21F0F0010143296000 +:107EA0006868216A20F47F4040EA012068607047DA +:107EB000296001F013BE706840084000706001F056 +:107EC0000DBE2DE9F8430400884644D0DFF82C634A +:107ED00000F0CBF847D200F0CDF8074600F0C5F827 +:107EE00041D001F0FBFDC01B0228F7D90320BAE006 +:107EF00001F0F4FD401B022843D9F7E701F0EEFD45 +:107F0000A0EB090002284CD9F0E701F0E7FDA0EB57 +:107F10000900022854D9E9E701F0E0FD401B0228DE +:107F20005DD9E3E701F0DAFD401B022867D9DDE700 +:107F300001F0D4FD401B484577D3D7E7032802D191 +:107F40003968890103E00028396802D1890762D4C1 +:107F500001E049055FD4012085E001F0BFFDC01BB1 +:107F6000022872D9C2E7207881074FF0B0470BD5BD +:107F7000B968A06821F0F0010143B96001F0AEFDDD +:107F80000546B868C003B3D52078DFF8545281069F +:107F90000AD52968606921F0F0010143FFF788FFE5 +:107FA000814628688003A9D5207841060BD5296829 +:107FB000A0690909090141EA1011FFF779FF81461B +:107FC0002868C003A1D5207841070BD5B968E068BF +:107FD00021F4E0610143B96001F080FD0546B86815 +:107FE000800399D5207801070CD5B868216920F461 +:107FF000605040EAC100B86001F070FD0546B86805 +:1080000040038FD52078C10717D56068022895D125 +:10801000396889039FD5B968890840EA8100B8604A +:1080200041F2893901F05AFD0546B868616800F0EF +:108030000C00B0EB810F7FF47BAF306800F00700DD +:10804000804505D200F016F8074600F00EF884D1FE +:1080500000F053F8DFF88C110860FEF717FBBDE85D +:10806000F243FEF7EDBDBDE8F283306800F0070093 +:10807000404570473168C90848EAC101316001F0E4 +:108080002DBD38B54FF0B0445E4DA16811F00C0124 +:1080900006D1FFF75BFCC0F3031055F8200032BD9A +:1080A0000429594A05D00829584804D12168C90231 +:1080B00022D5104632BDE16801F00301022904D047 +:1080C000032904D12168C90207D5104605E0FFF74E +:1080D0003DFCC0F3031055F82000E168E268E36856 +:1080E000C1F306214843C2F30211491C5B0FB0FBE8 +:1080F000F1F05B1CB0FBF3F032BD80B5FFF7C1FFC0 +:108100003F49FFE7424A0968C1F3031152F82110C1 +:10811000B0FBF1F002BD80B5FFF7EFFF00F010F803 +:10812000C1F3022106E080B5FFF7E7FF00F008F891 +:10813000C1F3C22112F8211001F01F01C84002BD95 +:108140002F49344A0968704770B52E49B1282EBFAF +:10815000CC6AC0F3031051F8204021480568FEF7AF +:10816000BBF82B492C4A05F00F0551F82510B4FB3C +:10817000F1F10024B1FBF2F1B0F5007F0FF2B8028B +:10818000204609D10FF2940353F820508D4214D2A7 +:10819000401C0328F8D912E00FF2900353F8205046 +:1081A0008D420AD2401C0328F8D308E001F096FC67 +:1081B000801B03280CD3032070BD52F820400F4DC4 +:1081C0002868C00844EAC000286001F087FC064621 +:1081D000296801F00701A142E8D1002070BD00002C +:1081E00008010058102A0020E8290020FFFFFEEEB9 +:1081F00090000058000400588C80C11100400058C5 +:1082000008000058F0B000080024F4000048E8011D +:10821000B0B0000870B8000840420F001200000023 +:1082200024000000360000004000000006000000AE +:108230000C00000010000000000000000100000021 +:108240000200000003000000DFF864130A6803095D +:1082500003F47F2300019A4300F47F2000F082B9E9 +:10826000DFF84C231368010C23EA014343EA00437F +:10827000136070472DE9F843054600242878DFF89D +:1082800030634106A0464FF0B0472DD5286B70B142 +:10829000B0F5800F06D0B0F5000F18BFB0F5400F55 +:1082A00017D01FE0F86840F48030F860EDE03868DF +:1082B00020F08060386001F011FC814638680001D0 +:1082C00040F1D08001F00AFCA0EB09000228F5D9AA +:1082D0000324D7E001F002FCA0EB0900022840F2E1 +:1082E000C980F5E70124A0462868010531D5B068AA +:1082F00000F44078286C80452AD0FFF743FAB8F1A3 +:10830000000FB16805D1286C21F440710143B160C0 +:108310001EE0B06840F48030B06021F44071B06875 +:1083200020F48030B060286C0143B160B068C007B1 +:108330000ED501F0D3FB804641F28939B068800741 +:1083400006D401F0CBFBA0EB08004845F6D303248C +:10835000A0462878C10705D53168A869890840EA90 +:10836000810131602878810705D53168E86921F4F9 +:108370004061014331602878C10644BFA86AFFF715 +:108380006FFF2878810644BFE86AFFF769FF287805 +:10839000410744BF286AFFF757FF2878010744BF09 +:1083A000686AFFF751FF2868C1051BD53168686B03 +:1083B00021F0406101433160686BB0F1006F00F063 +:1083C000BDF8686BB0F1806F75D100F0BDF8044660 +:1083D0003868000160D501F081FB001B0228F7D945 +:1083E0004FF0030867E001F079FB001B02285BD91E +:1083F000F6E7316821F04041316020F0805032686A +:1084000022F0406210433060A86BB0F1C05F00F012 +:1084100095F8286841056DD53168E86B21F0405129 +:1084200001433160E86BB0F1005F03D1F96841F4BA +:108430008031F960E86BB0F1805F5BD100F084F8C7 +:1084400004463868000146D501F048FB001B0228AD +:10845000F7D94FF003084DE001F040FB001B022864 +:1084600041D9F6E700F061F8A86821F4781100F02E +:1084700071F88146386800017FF52CAF3969686969 +:1084800001433961002C7FF42EAF3168286B21F451 +:1084900040010143316027E700F047F8E86821F028 +:1084A000606100F057F80446386800019BD53969CF +:1084B00068690143396128688105AAD5A86BB0F1C4 +:1084C000804F1CBFB0F1004F002892D1316821F0DD +:1084D0004041084397E700F028F8286921F06041FF +:1084E00000F038F8044638680001B5D53969686984 +:1084F000014339612868C10405D5F168686C21F42D +:1085000040410143F160286881040BD5796AE86C29 +:1085100021F0300101437962796AA86C890840EA48 +:10852000810179624046BDE8F2833869696820F4C8 +:10853000FE4040EA012038613969704703D1F9688B +:1085400041F08071F9607047396821F080613960CD +:1085500001F0C4BA01433961386840F08060386086 +:1085600001F0BCBA10430860704710B511490A68A1 +:1085700042F080720A600B680F4A23F080730B6030 +:10858000046841680C4381680C43C1680C4301696D +:1085900044EA014454601368406923F47C5343EA7D +:1085A00000231360116841F06001116010BD0000EC +:1085B00088000058380000580060004038B50400BA +:1085C00009D004F18005686808B900F01EF800F0D1 +:1085D00021F8012801D1012032BDA06A08B100F0C4 +:1085E0002AF800F00AF821F02A01FFE7816000F084 +:1085F0001BF8BDE8324000F03EBB2068416821F422 +:1086000090414160206881687047002129702046B0 +:10861000FEF770BB242068602068016849084900A3 +:108620000160204600F0BCB92068016841F00101FA +:10863000016020467047204600F0BABA70B5044683 +:1086400004F180051346686820283DD169B31800FD +:108650002BD02878012837D001222A7004F1540643 +:108660002165338073800020E86021206860706A93 +:10867000E8B1DFF82013C162DFF81C03716A0863F8 +:10868000716ADFF8180348630020716A8863206804 +:10869000216D00F12802706A00F03DFD38B1102014 +:1086A000E8600020287020206860012070BD2168EB +:1086B000402008620020287000F008F841F0800196 +:1086C00000F061FBF8D170BD022070BD206800F1A0 +:1086D000080151E8001F00F108027047216851E8C5 +:1086E000002F7047206800F1080151E8001F00F1D9 +:1086F000080221F0400142E8001000287047F8B558 +:10870000044640F60F002668F1693268B3680840F5 +:1087100004F15C050ED1880602D5900602D4D8007B +:1087200040F181806969002900F029812046BDE877 +:10873000F4400847DFF8E006034204BFDFF8DC76C8 +:108740003A4270D0CF0707D5D70505D50127376244 +:108750002E6B46F001062E638E0708D5DE0706D580 +:10876000276802263E622E6B46F004062E634E07F3 +:1087700008D5DE0706D5276804263E622E6B46F034 +:1087800002062E630E070AD5960601D4034206D0D0 +:10879000266808203062286B40F00800286308052E +:1087A00009D5500107D526684FF400603062286B68 +:1087B00040F020002863286B002833D0890607D5B5 +:1087C000900601D4D80003D5696909B120468847CD +:1087D000286B21688A68510602D410F0280F1CD03B +:1087E000204600F0EFFA00F0D1F811D5FFF77AFF3C +:1087F000FCD1286A60B10FF2B1618163286A00F090 +:1088000003FD00280ED0286A816BBDE8F4400847BC +:108810002046BDE8F24001F067B9204601F064F956 +:1088200000202863F1BD286901286AD1CF0668D5E8 +:10883000D00666D51020306200F0A8F82DD5296A40 +:108840000868406880B20028ECD02A889042E9DAB3 +:108850006880086801688A061BD4FFF73FFF22F48E +:10886000807200F08FF8F8D1206800F07DFAFBD11B +:10887000FFF738FFFCD12020E86200202861FFF7D5 +:108880002DFF22F0100200F07DF8F8D1286A00F0E8 +:1088900085FC29886888091A2DE028886988411A8A +:1088A000688800281CBF88B2002868D0226852E877 +:1088B000003F23F4907342E800300028F6D120688E +:1088C00000F1080200F1080352E8002FDFF8C402AB +:1088D000024043E800200028F1D12020E862002077 +:1088E00028616861226852E8003F23F0100342E8E3 +:1088F00000300028F6D12046BDE8F44089B201F0EE +:10890000F4B8C80209D5580207D54FF48010306278 +:108910002046BDE8F24000F06DBB080609D5100600 +:1089200001D4180205D5A96949B32046BDE8F44031 +:108930000847480611D550060FD5FFF7CFFE22F0A5 +:10894000400200F01FF8F8D12020A8620020A861A2 +:108950002046BDE8F240FEF761B9080206D5500096 +:1089600004D52046BDE8F24001F0C0B8C80148BFB8 +:10897000002A04D52046BDE8F24001F0B8B8F1BDA8 +:1089800022F4F07241E800200028704720688168D6 +:1089900048067047258E0008578E00085D8E000837 +:1089A000F8B50446DFF838052168DFF838C50A68ED +:1089B000DFF834750240A068024320690243606911 +:1089C0000243E06902430A6000254A68E06822F435 +:1089D000405202434A60A369DFF8102591421CBF50 +:1089E000206A03438E68DFF80805064033438B6036 +:1089F0000FF2A416CB6A606A1B0940EA0313CB622C +:108A00006145DFF8F0044FF4004339D13F6807F0C7 +:108A10000307032F4DD8DFE807F0024643494FF024 +:108A2000010CE169B1F5004F4FF6F07740F080801E +:108A3000BCF1010F09D0BCF1020F0AD0BCF1040F48 +:108A400071D0BCF1080F71D099E0FFF76CFB0028E2 +:108A500015D0626A616836F81230B0FBF3F04A084C +:108A600002EB4002B2FBF1F080B2A0F11001B9427A +:108A7000EAD20740C0F3420007432068C7607FE0A6 +:108A8000914216D13F6817F4406723D0B7F5806F45 +:108A900009D0B7F5006F03D0B7F5406F06D008E0F6 +:108AA0004FF0020C07E04FF0040C04E04FF0080C0C +:108AB00001E04FF0100C9142B3D1BCF1000F09D08E +:108AC000BCF1020F0AD0BCF1040F15D0BCF1080FA5 +:108AD00015D054E0FFF71FFB002851D0616A36F82B +:108AE0001120B0FBF2F6626802EB42018E4246D3DF +:108AF0001103B14205D242E0FFF7C3FAECE7184692 +:108B0000ECE75008002110EB062051EB1661002322 +:108B1000F9F72AFDA0F54071DFF8DC2391422ED24F +:108B20002268D0602CE0FFF7ACFA90E7184690E797 +:108B3000BCF1010F09D0BCF1020F09D0BCF1040F48 +:108B400018D0BCF1080F18D019E0FFF7ECFAB8B153 +:108B5000626A36F812306168B0FBF3F000EB510046 +:108B6000B0FBF1F080B2A0F11001B94207D2216848 +:108B7000C86005E0FFF785FAE9E71846E8E7012550 +:108B800004F1680001214180018000218160C16001 +:108B90002846F2BDFEFFFFEF0100020004000600C0 +:108BA00008000A000C0010002000400080000001B6 +:108BB00090F82810CA0706D502685368C16A23F4E2 +:108BC00000330B43536090F828108A0706D50268DB +:108BD0005368016B23F480330B43536090F82810E3 +:108BE0004A0706D502685368416B23F480230B4380 +:108BF000536090F828100A0706D502685368816B05 +:108C000023F400430B43536090F82810CA0606D59E +:108C100002689368C16B23F480530B43936090F810 +:108C200028108A0606D502689368016C23F4005365 +:108C30000B43936090F828104A0610D502685368D9 +:108C4000416C23F480130B435360416CB1F5801FDA +:108C500005D15368816C23F4C0030B43536090F833 +:108C600028100A0606D501684A68C06C22F4002262 +:108C700002434A607047F8B5044604F180050020BD +:108C8000E8606FF07E4700F029FF06462068016823 +:108C90000A0708D50097334600224FF400112046FA +:108CA00000F017F860B9206801684A070AD50097F4 +:108CB000334600224FF48001204600F00AF808B144 +:108CC0000320F2BD20206860A8600020E0662870C4 +:108CD000F2BD2DE9F041069C05460E4690461F4622 +:108CE0002868C1693140B1420CBF012000204045D5 +:108CF00026D114F1010FF3D000F0F0FEC01B844226 +:108D000000D33CB900F025F800F02DF8FCD100F0BC +:108D10001AF811E0286801684A07E1D5C1690A0517 +:108D2000DED54FF40062026200F013F800F01BF889 +:108D3000FCD100F008F8C16000210170032000E0C0 +:108D40000020BDE8F08105F18000202141608160B4 +:108D50007047296851E8002F22F4D07241E80020C2 +:108D60000028F6D17047286800F1080151E8001F7B +:108D7000490800F10802490042E800100028704745 +:108D8000DFF87801014042E8001000287047000039 +:108D9000026852E8003F23F0C00342E80031002996 +:108DA000F6D1016801F1080252E8002F01F1080331 +:108DB00022F4000243E800210029F2D12021C0F86A +:108DC00084107047026852E8003F23F4907342E831 +:108DD00000310029F6D1016801F1080201F1080310 +:108DE00052E8002F0E490A4043E800210029F2D141 +:108DF000C16E012908D1026852E8003F23F0100338 +:108E000042E800310029F6D12021C0F88810002165 +:108E1000C1660167704700000100001020010004D6 +:108E2000FEFFFFEF0146886A09680A68930610D4BE +:108E30000021A0F85610016801F1080252E8002F45 +:108E400001F1080322F0800243E800210029F2D159 +:108E50003BE0FDF7E3BE806A00F04ABEF8B5846AE5 +:108E600004F1840504F1560728686E6821688A6851 +:108E7000110606D5212804D1002038802046FFF7AE +:108E800087FFFFF783FD06D5222E04D1002038810D +:108E90002046FFF797FFA86840F01000A860204622 +:108EA000BDE8F24000F020BE806A00F156010022C9 +:108EB0000A810A8000F018BE026852E8003F23F0E1 +:108EC000800342E800310029F6D1026852E8003FF1 +:108ED00043F0400342E800310029F6D1704700001A +:108EE000F369FFCF0038014088000058008000403F +:108EF000FFF4FF110024F40000FD0F00FEFF7FEFE0 +:108F000010B500F180010A78012A01D1022010BDBC +:108F100001230B7024224A600268136814686408F5 +:108F2000640014600022426623F00053006803606E +:108F3000202048600020087010BD70B500F01EF8B9 +:108F400001D1022070BD00F01FF822F0604209E05C +:108F500070B500F013F801D1022070BD00F014F8D4 +:108F600022F0606211438160204600F01AF8206808 +:108F70000660202068600020287070BD044604F15F +:108F8000800528780128704701222A702420686013 +:108F900020680668026852085200026020688268F1 +:108FA000704730B5416E11B90121012214E001680A +:108FB0000FF230048A6889680FF23003520E02F013 +:108FC0000702490F655CA45C595C9A5CED00E40003 +:108FD00095FBF1F194FBF2F268304180028030BDE4 +:108FE0000000000001010103070100000804020461 +:108FF000080101017047000018B500F12402507803 +:1090000001281BD11378012B01D1022012BD536A14 +:1090100010701C680A48044008680443C868401E71 +:1090200044EAC04448680443087A497A44EA004460 +:1090300044EA41241C600020107012BD012012BDC2 +:10904000FFFD00E038B5040001D1012032BD2168E8 +:10905000DFF87003814204F1240500F044F8022097 +:1090600068700A68A0686FF30E120243E06802435A +:109070002069024360690243A0690243E069024338 +:10908000206A02430A60204600F070F9A068B0F53B +:10909000804F04BF002161602079696A00F03F00C1 +:1090A00000F014F838B1052805D2204600F078F910 +:1090B00000F012F803E0002028636863A863002032 +:1090C000A861012068700020287032BD0860A96A7C +:1090D000E86A486060687047296B00200860696B27 +:1090E000A86B486070470AD2DFF8DC0242181423EC +:1090F000B2FBF3F292002A62DFF8D00209E0DFF857 +:10910000D00242181423B2FBF3F292002A62DFF875 +:10911000C402E8617047F8B5044604F1240600254E +:109120003078012801D10220F2BD01273770707814 +:1091300001282FD102277770B561206807687F0862 +:109140007F000760204600F0F5F82168F06820B144 +:109150000A6842F00E020A6008E0086820F0040085 +:1091600008602068016841F00A010160706A0168C6 +:10917000CA0303D5026842F480720260306B18B1F2 +:10918000016841F4807101602068026842F00102C8 +:10919000026001E0357002252846F2BD81B040B181 +:1091A00000F124014A78022A05D0042088610020B9 +:1091B0000870012026E00268136823F00E03136094 +:1091C0004A6A136823F480731360006802685208C7 +:1091D00052000260012091F82020CB6902F01C02AD +:1091E000904058608A6AC86A5060086B30B1026863 +:1091F00022F4807202604A6B886B506001204870D4 +:109200000020087001B0704738B500F12402002436 +:109210005178022903D004209061012428E00168DC +:109220000B6823F00E030B6001680D686D086D007C +:109230000D60516A0B6823F480730B60012192F872 +:109240002030D56903F01C0399406960936AD16AA4 +:109250005960116B31B10B6823F480730B60536B51 +:10926000916B5960012151701470516901B18847A7 +:10927000204632BDF8B500F124010423CA69146800 +:109280000268156891F8206006F01C0603FA06F7DC +:109290003C4210D06F070ED51468A50603D415689C +:1092A00025F00405156000F03DF8C968002938D0A4 +:1092B000BDE8F4400847022303FA06F73C4213D006 +:1092C000AF0711D51468A50605D4156825F00A0561 +:1092D000156001224A7000F025F800220A708968A2 +:1092E000F9B1BDE8F4400847082303FA06F6344212 +:1092F00017D02B0715D5136823F00E031360012236 +:1093000091F82030CC6903F01C039A40626001227E +:109310008A614A7000220A70096911B1BDE8F440FF +:109320000847F1BD91F82020CC6902F01C0293405F +:109330006360704778B5C56C046D6C60446D14B1A2 +:10934000846DC56D6560012590F84440066C04F09D +:109350001C04A5407560046863608068102802D111 +:10936000A260E16071BDA160E26071BD416C026804 +:10937000144B89089A4234BF174B184B03EB8101F9 +:10938000816402F0FF02083A1421B2FBF1F1144AA1 +:10939000C26401F01F01012202FA01F10165704768 +:1093A0000179104A01F03F0102EB81024265491E3A +:1093B0000D4A826501F0030101228A40C2657047AF +:1093C0000000000008040240F8FFFDBF000002405A +:1093D000F8FBFDBF00040240000802401C080240E8 +:1093E00080080240FC080240400902408A60FF21D8 +:1093F00002685162012180F82110002180F82010BC +:109400000020704790F82010012901D102207047F8 +:10941000012280F82020022180F82110CA21026850 +:10942000516253210368596201688A6842F0200240 +:10943000FFF7DCBF80B56148016841F080610160E1 +:109440000022006800F0806000900621009814203F +:10945000FCF7F2FCBDE802401420FCF70BBD00F560 +:109460002C71D0F8F002FDF707BF0B4628225343BA +:10947000C218D0F8F002D2F87C21FDF72BBF0B46C2 +:1094800028225343C218D0F8F002D26BFDF757BF21 +:10949000D0F8F002FDF7E2BF10B50446D4F8F002B0 +:1094A000FDF799FFD4F8F002BDE810400121FDF767 +:1094B000C1BFD0F8F002FDF7C0BFD0F8F002FDF751 +:1094C000C4BF10B53E4C3F492160C4F8F0020821EA +:1094D00061600021E16002212161A1600021A161A0 +:1094E000C0F8C442204600F004FB182300220021EB +:1094F00000F012F858230022802100F00DF8C0235C +:109500000022812100F008F84FF488730022012125 +:1095100000F002F8002010BD204601F044B880B5EC +:10952000D0F8C40200F038FB002002BD10B51C4684 +:109530001346D0F8C402224600F0FCFB002010BD08 +:1095400080B5D0F8C40200F023FC002002BD80B535 +:10955000D0F8C40200F06EFC002002BD80B5D0F847 +:10956000C40200F092FC002002BD81B0D0F8C422F9 +:1095700001F07F0328204343D01809064CBF90F820 +:109580002A0090F86A0101B0704780B5D0F8C40293 +:1095900000F0C1FB002002BD80B5D0F8C40200F08D +:1095A0002EFC002002BD80B5D0F8C40200F00DFCF6 +:1095B000002002BDD0F8C40200F019BC58000058C9 +:1095C000142E0020006800404178007840EA012015 +:1095D00070470000F8B500240546087810F06000D8 +:1095E00005F5277608D0202818BF40282ED1F2692B +:1095F00093682846984730E04878092826D8DFE85D +:1096000000F03F592553250905252E29284600F04D +:1096100013F95AE08A88002A04BFC888002815D1A7 +:109620004F88802F12D23078032807F07F070DD0A3 +:10963000B77039462846FFF7A8FF284600F03EFAE3 +:10964000002F14BF0220012030703EE0284600F0B9 +:10965000E4F93AE0284600F078F9044635E0C88895 +:109660000128F3D13278521E012A04D9921EEDD17D +:109670000122291D14E0AC60012205F108010FE070 +:109680003078401E0228E1D8C8880228DED10121A6 +:10969000E960B06808B10321E960022205F10C011C +:1096A000284600F0E9F910E0488801280DD1012191 +:1096B000B16007E03078401E0228C7D848880128EA +:1096C00003D1B460284600F0F9F92046F2BD70B528 +:1096D0000E4604463078002510F060001CBF20289C +:1096E000402815D104F527721178491E02290FD898 +:1096F000307902280CD2D2699368314620469847C7 +:109700000546F08838B9280005D100F018F902E0C4 +:10971000314600F018F9284670BD2DE9FC410E468F +:10972000002580463078317910F0600008F5277701 +:1097300004D020283AD0402864D137E0707800283F +:109740003BD0012815D003285CD13878022816D0E8 +:10975000032857D1708840B9002918BF802904D048 +:10976000F08810B94046FFF7F2FE404600F0A6F937 +:109770004CE03878022802D003280CD042E00029BF +:1097800018BF80293ED04046FFF7E1FE80214046C9 +:10979000FFF7DDFE3AE07088C0BB11F07F0F1CBF01 +:1097A0004046FFF7DBFE404600F088F9FA6993680F +:1097B000314640469847054628E0142001F07F02D4 +:1097C0003B7842434244022B02F5AA7402D0032B99 +:1097D0000FD017E0002918BF802913D1080648BF11 +:1097E00002F11404256002222146404600F044F9AB +:1097F0000CE001F00F0310FB03F00B06404408D50A +:10980000808C78B93146404600F007F92846BDE81B +:10981000F681B0F864010028F4D0002918BF80292F +:1098200003D1DFE702F11404F7E74046FFF79DFE9E +:1098300000B101202060D6E738B5044600200D466F +:10984000ADF8000004F52D726888010A012908D0DE +:1098500002291ED0032929D006295AD007295FD012 +:1098600067E01268207C136869469847EA88002AF6 +:1098700062D0BDF8001000295BD0914288BF11462C +:10988000ADF800100146BDF80020204600F0F4F8C5 +:1098900031BD207C51680028684604D1896A884718 +:1098A00002214170E2E7C96A8847F9E7C0B205289A +:1098B0003FD8DFE800F0030B121920271068426838 +:1098C000002A36D0207C69469047CFE7106882682E +:1098D0007AB3207C69469047C8E71068C26842B3F3 +:1098E000207C69469047C1E7106802690AB3207C72 +:1098F00069469047BAE710684269D2B1207C694650 +:109900009047B3E7106882699AB1207C6946904716 +:10991000ACE7207C68B951684A6B68469047A5E778 +:10992000207C30B951680A6B684690470722427024 +:109930009CE700F007F831BD00F001F831BD20468A +:1099400000F0BCB82946204667E0F8B50D4604464D +:10995000244F68883870002639780846022803D3D7 +:10996000FFF7F0FF0320F2BD94F89C22022A02D0F8 +:10997000032A0FD02EE0002929D060602046FDF791 +:1099800069FC060002D0FFF7DDFF29E0FFF7D7FFF3 +:10999000032019E031B9022084F89C02666000F0CF +:1099A00024F814E06168884211D000F01DF839787D +:1099B00061602046FDF74EFC060008D0FFF7C2FFAD +:1099C000616800F011F8022084F89C0208E0FFF7BB +:1099D000B6FF05E0FFF7B6FF397800F006F803267A +:1099E0003046F2BD71390020C9B22046FDF73CBCBB +:1099F00038B50D4604462878207068786070A81C39 +:109A0000FFF7E2FD60802D1D2846FFF7DDFDA080F9 +:109A1000A81CFFF7D9FDE08031BD10B504468021B8 +:109A2000FFF795FD2046BDE810400021FFF78FBDF0 +:109A300000280B4600D1704730B50021044600E0F5 +:109A4000491C14F8015B002DFAD10906C90D891CC7 +:109A500011801178197002220321597008E010F862 +:109A6000011BD4B2521C1955D4B200211955521CF5 +:109A700001780029F3D130BD80B513460222C0F829 +:109A800094228361C36101E080B513460A46002138 +:109A9000FFF782FD002002BD80B513460322C0F807 +:109AA000942200F5AC721360536001E080B5134658 +:109AB0000A460021FFF777FD002002BD80B5042192 +:109AC000C0F8941200230022E1E780B50521C0F818 +:109AD000941200230022ECE7F7F71DBB0148406811 +:109AE000704700BFE02900207047704770477047FB +:109AF000704730B5040085B008BF012043D004F59D +:109B00002A75687820B9002129702046FFF792FC59 +:109B100003206870206800F07EFD002128200AE004 +:109B200010FB01F222442832012353701170D181BD +:109B3000002300F02AF862689142F1D3002109E085 +:109B400010FB01F2224402F5B4720023117053702D +:109B500000F01BF862689142F2D383B0211D684681 +:109B60002022F8F7FBFE0EBC206800F05AFD002012 +:109B700084F8240001206870E069012804BF2046B1 +:109B800000F02BFD002005B030BD491CD3701361DF +:109B900053619361C9B2704710B500F0B7F801D1B5 +:109BA000022010BD00F003F800F02EFDA7E0012117 +:109BB00084F8A8122068704738B504462068B0F8C9 +:109BC0004400010403D52046BDE8324086E141054A +:109BD0000ED500F090F84FF6FF308A8802408A8058 +:109BE0002046FFF759FC2046BDE83440002192E0B2 +:109BF000410404D500F07FF84BF6FF7077E0810454 +:109C000004D500F078F84DF6FF7070E0C20404F55A +:109C1000387120D5226832F8403F4FF6FB70034080 +:109C200013804FF6F77015880540158008780128D5 +:109C300005D100220A7000212046C046C0462046B9 +:109C4000FFF73BFC2168B1F844204EF6FF7002405C +:109C5000A1F8442031BD02050FD500F04CF84FF2B9 +:109C6000FF700A8842F008020A808B8803408B80CC +:109C7000088840F00400088020E0020623D5206810 +:109C800000F140024FF67F7093880340938008787C +:109C9000A0B9138843F0040313800123108840F017 +:109CA000080010800B70908A800800F03C0048602B +:109CB00001212046BDE8344000F0A4BC2046BDE8A8 +:109CC0003240FFF7F6BB81050BD500F014F84FF6D4 +:109CD000FF508A8802408A802046BDE83240FFF764 +:109CE000D7BBC00506D500F006F84FF6FF608A889E +:109CF00002408A8031BD206800F140017047206831 +:109D000001F0E2F8002084F8A80210BD044694F89F +:109D1000A8020128704710B5FFF7F8FF01D1022013 +:109D200010BD012284F8A82284F82410206801F0D4 +:109D3000C5F8E7E738B5054601F007042820444395 +:109D400028190C0647BF00F12804012000F5B4745F +:109D5000002001F00701607021702261E3706078DB +:109D600008B12178E181022B04BF0020207195F811 +:109D7000A802012801D1022032BD012185F8A812D4 +:109D80002146286800F058FC002085F8A80232BD62 +:109D900010B5044600F09BF847BF2830012200F5BB +:109DA000B470002201F00701427000F069F801D19F +:109DB000022010BD00F003F800F06BFDA2E70122C5 +:109DC00084F8A82201462068704738B501F00705DD +:109DD00028246543441904F5B47401F00701626155 +:109DE000A3610022E2616270217021461DE001F052 +:109DF0000701282251430844D0F88401704738B540 +:109E00001C4601F0070528235D434319283301F060 +:109E100007015A619C61012283F824201C62002200 +:109E2000DA61197001225A701946006800F0B7FD16 +:109E3000002032BD10B5044601F00700626882427E +:109E400001D2012010BD28220B0604D55043204426 +:109E50002830012205E012FB01F2A01800F5B470D1 +:109E60000022427001F00701012200F008F801D140 +:109E7000022010BDFFF7A4FF00F0C7FF42E7827089 +:109E8000017094F8A812012970471CB5044601F02E +:109E90000F036068984201D2012016BD00F017F848 +:109EA00047BF2830012200F5B470002201F00701FD +:109EB00042700022FFF7E3FF01D1022016BDFFF739 +:109EC0007EFF00F0BBFF002084F8A80216BD01F061 +:109ED000070228204243A0180A0670472DE9F84FD0 +:109EE00000F5B475064627E001880AEA010141F44D +:109EF0000041018006F124043068B0F85010227946 +:109F000001EBC201401800F202400088A169C0F3D1 +:109F1000090020620844A06100213046FFF7AFFA33 +:109F2000217849B1E06938B92178306841F0800181 +:109F3000A0F84C1000212170306800F144010A881B +:109F4000130440F13A810A8812F00F0440F68F772B +:109F500048F60F7A62D1D206C6D50288130511D50C +:109F6000898900F044F9EA88C3F30903EB6106F537 +:109F70002C7100F0C8FF306800F02BF93046FFF775 +:109F80006EFAD9E71104D7D500F023F93068B0F89C +:109F9000501000F02CF9C3F30903002BEB611CBF38 +:109FA000696900290AD0EA8800F0ADFF6869E969AB +:109FB0000844686100213046FFF757FA306801888D +:109FC0000A05B9D4B0F85010411828693F2801F2A9 +:109FD000064106D3420910F01F0F08BF521E90021F +:109FE00006E040B90A8848F2FF3002400A8008883B +:109FF00040F4004004E04208C00748BF521C9002F1 +:10A0000008804BF68F7230680188114081F440510E +:10A0100041F4004141F0800101808DE7282130F8B2 +:10A02000248011FB04F106EB01095FEA084160D5C9 +:10A0300030F824100F4047F0800720F8247009F50D +:10A04000B477387B58B93068B0F850103A7801EBE3 +:10A05000C201411800F0C3F837D0FA8831E0F8782F +:10A06000022806D142463946304600F0D2F88346EF +:10A070002BE03068397830F8212048F68F731A4089 +:10A0800042F4004242F0C00220F8212030683A78C1 +:10A09000134630F823305904B0F8503003EBC202B5 +:10A0A0000AD5811801F202410988C1F3090BBBF1FD +:10A0B000000F0AD03A8904E0811800F090F804D02B +:10A0C0007A895B46796900F01EFFF8695844F861A7 +:10A0D000786958447861B86910B13A69934504D2F7 +:10A0E00039783046FFF7C1F903E03068394600F0AF +:10A0F00056FC5FEA086038D5306830F824200AEA58 +:10A10000020242F4004209F1280120F82420C87814 +:10A1100002282BD0087B002200288A6121D05FEA28 +:10A12000486209D5487810B900F069F809E00128BB +:10A1300017D100F064F812E03268487858B900F09E +:10A140003FF8038848F2FF3213400380028842F44C +:10A150000042028005E0012803D100F031F800231D +:10A16000038009783046FFF78AF9E5E65FEAC850D0 +:10A170001ED430680A78B0F8503003EBC203C01820 +:10A1800000F2024003888869C3F30903834234BFA5 +:10A19000C01A0020886108B91146E3E748691844ED +:10A1A0004861C8691B18CB61306800F0F8FBC3E652 +:10A1B0004246304600F08AF8BEE60020BDE8F28F45 +:10A1C000B2F8500010180A7800EBC20000F2064006 +:10A1D000704701880F4047F080070780704701F201 +:10A1E00006410988C1F3090BBBF1000F70472A78BB +:10A1F00001EBC201411801F206410B88704730683B +:10A20000B0F8502080180A7800EBC20000F202403B +:10A2100070472DE9FC410D4600682B78A969B0F81C +:10A220005060540448F2C00848F68F7748F2800C1A +:10A230004BF68F7E06EBC30419D5061906F20246CB +:10A240003488C4F30904A1422CBF091B0021A96171 +:10A2500029B930F823100EEA010100F027F8510661 +:10A2600001D500F02AF8F4B123462A8918E006192E +:10A2700006F206463488C4F30904A1422CBF091B28 +:10A280000021A96129B930F823100EEA010100F07C +:10A290000DF8510601D400F010F824B123466A8964 +:10A2A000696900F030FE2046BDE8F68181F4005176 +:10A2B0004CEA010120F823107047297830F821205A +:10A2C000174048EA070220F8212070472DE9FC4199 +:10A2D0000D4604461646216895F800E0A869730605 +:10A2E000B1F850304CF2800748F68F7803EBCE037C +:10A2F00040F18580CB1803F202431B88C3F30903A6 +:10A30000834234BFC01A00200028A86125D1687894 +:10A3100038B9B1F85000081800EBCE0C00F027F95E +:10A3200013E0012809D000F030F920462978FFF722 +:10A33000A6F8700440F1ED8082E0B1F850000818F2 +:10A3400000EBCE0C0CF2024C0020ACF80000687858 +:10A350000028E8D100F0F9F8E7E7720406D531F8F3 +:10A360002E0008EA0000074321F82E7095F824001B +:10A3700001286ED100F0DFF803D31346C01A28621B +:10A3800008E010B985F8240004E0002285F82420B4 +:10A3900003462A62687810BB2068B0F85020821803 +:10A3A000287802EBC0023F2B02F2024206D3580982 +:10A3B00013F01F0F08BF401E800206E043B9168845 +:10A3C00048F2FF3006401680108840F4004004E058 +:10A3D0005808DE0748BF401C800210800BE00128AF +:10A3E00009D12068B0F8502080182A7800EBC2000C +:10A3F00000F2024003802A8920689BB287E0CB18D4 +:10A4000003F206431B88C3F3090398422CBFC01A0A +:10A4100000200028A8612DD1687838B9B1F8500023 +:10A42000081800EBCE0C00F0A2F81BE0012811D0B8 +:10A4300000F0ABF820462978FFF721F8700468D4C3 +:10A440002168287831F8202008EA0202174321F811 +:10A4500020705EE0B1F85000081800EBCE0C0CF252 +:10A46000024C0020ACF8000068780028E0D100F031 +:10A470006CF8DFE7720406D431F82E0008EA000019 +:10A48000074321F82E7095F82400012841D100F0EF +:10A4900052F803D31346C01A286205E010B10346F0 +:10A4A0000020286285F824002668687808BBB6F882 +:10A4B00050003218287802EBC0023F2B02F206420D +:10A4C00006D3580913F01F0F08BF401E800206E094 +:10A4D00043B9178848F2FF3007401780108840F4CE +:10A4E000004004E05808DF0748BF401C800210808D +:10A4F0000AE0012808D1B6F850002A78301800EB9D +:10A50000C20000F2064003809BB26A89304600F028 +:10A51000E9FC2268297832F8213048F6BF70034000 +:10A5200083F0300343F4004343F0800322F82130EA +:10A530000020BDE8F681E86969692A691818E861B0 +:10A540001944286A696190427047B1F850000918AF +:10A55000287801EBC00101F2064148F2FF300A8879 +:10A5600002400A80088840F40040088070470CF2DE +:10A57000024C48F2FF30BCF800300340ACF8003029 +:10A58000BCF8000040F4004070476878012809D109 +:10A59000B1F850000818297800EBC10000F206401D +:10A5A00000220280704730B528240D0605D501F041 +:10A5B000070161430844283003E06143084400F583 +:10A5C000B4701AB900210173C38004E00381012132 +:10A5D0001B0C01734381002030BD016800F5387009 +:10A5E0000122826000220270B1F8540040F00100A4 +:10A5F000A1F85400B1F8540040F00200A1F8540052 +:10A6000000207047704700004030002181804BF6E9 +:10A61000807100F050BCB0F8402044F27F0100F09F +:10A620005CBC0EB4012120F8401F00210180818014 +:10A630000182002003B070472DE9F8470B4648F629 +:10A640008F111D780246002032F8254001EA040AE5 +:10A65000D97803290CD8DFE801F002080C054AF488 +:10A66000007A06E04AF4C06A03E04AF4806A00E037 +:10A67000012048F2800949EA0A0122F8251048F62B +:10A680008F7519788A4632F82A702F40394349EA83 +:10A69000010122F82A104BF68F7A197B1C780029C9 +:10A6A0004CF2800748F6BF7C48F2C00E64D1DE88C9 +:10A6B0004FF6FE710E4059780029B2F8501011443F +:10A6C00001EBC40419D004F580642680197832F8AF +:10A6D0002140640606D532F8214025404EEA0505A2 +:10A6E00022F821501978DB78012B32F821300CEA5E +:10A6F000030301D083F02003BFE004F2044426806A +:10A70000B2F850105418197804EBC10C19693F299C +:10A710000CF2064C09D34FEA511E11F01F0F08BF6F +:10A72000AEF1010E4FEA8E2109E059B9BCF80040A4 +:10A7300048F2FF312140ACF80010BCF8001041F4A1 +:10A74000004107E04FEA510EC90748BF0EF1010E64 +:10A750004FEA8E21ACF80010197832F821406404D9 +:10A7600005D532F8214025403D4322F8215000F024 +:10A770008AF883F4405380E0D978022909D132F86D +:10A780002410294041F4014141F0800122F82410B5 +:10A7900008E032F8246048F68F610E4049EA060668 +:10A7A00022F82460B2F850101E895418197804EB6E +:10A7B000C10404F580644FF6FE710E402680B2F8A5 +:10A7C00050105418197804EBC1085C8908F2044849 +:10A7D0004FF6FE710C40A8F80040597893F80080BD +:10A7E000002932F8281024D1490405D532F8281060 +:10A7F00029400F4322F82870197832F821707F061B +:10A8000006D532F821703D404EEA050522F8215068 +:10A81000197832F821500AEA050484F4405449EAD0 +:10A82000040422F82140197832F821300CEA03039D +:10A8300023E0490405D532F8281029400F4322F8B7 +:10A840002870197832F821707F0606D532F8217009 +:10A850003D404EEA050522F82150DD781978012D9A +:10A8600032F821500CEA050418BF84F0200449EAAC +:10A87000040422F8214000F006F849EA030322F814 +:10A880002130BDE8F287197832F821300AEA030353 +:10A8900070472DE9F041024691F800C048780B7BE3 +:10A8A0004BF68F7E4CF2800448F2800848F6BF7564 +:10A8B00048F2C00648F68F77ABB9002832F82C0072 +:10A8C00008D0400636D532F82C0007403E4322F827 +:10A8D0002C602FE0400456D532F82C0007403C4352 +:10A8E00022F82C404FE0002832F82C0029D14004F7 +:10A8F00005D532F82C003840044322F82C40087863 +:10A9000032F820305B0605D532F820303B40334327 +:10A9100022F82030087832F820301F403E4322F8D9 +:10A920002060087832F820300EEA030348EA030377 +:10A9300022F82030087832F820100D4048EA05014E +:10A9400028E0400405D532F82C003840204322F896 +:10A950002C00087832F820305B0605D532F820301C +:10A960003B401E4322F82060087832F820301F4018 +:10A970003C4322F82040087832F820301D4048EA55 +:10A98000050522F82050087832F820100EEA01015F +:10A9900048EA010122F820100020BDE8F0812DE9ED +:10A9A000FC420E4605467278307B012A48F2800749 +:10A9B00048F68F7140F0F8803269B36914469C42C2 +:10A9C00088BF1C4640B9F28800F014FA00F016FA6D +:10A9D00000F202400480DEE096F803E03078D6F81A +:10A9E00020C0BEF1020F034640F0BA80624580F0FD +:10A9F000AB8035F82300014041F4014141F0800172 +:10AA000025F82310ACEB04003062630832787178CB +:10AA1000964635F82EE05FEA4E6904F001004FEAF1 +:10AA2000541C47D5B9B900F0C0F901F2064107D36B +:10AA300014F01F0F08BFACF1010C4FEA8C2002E0AC +:10AA400024B900F0B9F940F4004002E000B15B1C09 +:10AA50009802088006E0012904D100F0B4F900F260 +:10AA600006400480728900F0C5F900F089F932BF10 +:10AA7000001B0446002030627078C0B900F0A9F9CC +:10AA800001F2024106D3600914F01F0F08BF401EF7 +:10AA9000800202E024B900F08FF940F4004004E0A5 +:10AAA0006008E20748BF401C800208806DE0012872 +:10AAB0006BD152E0B9B900F078F901F2024107D345 +:10AAC00014F01F0F08BFACF1010C4FEA8C2002E01C +:10AAD00024B900F071F940F4004002E000B15B1CC1 +:10AAE0009802088006E0012904D100F06CF900F218 +:10AAF00002400480328900F07DF900F041F932BF54 +:10AB0000001B0446002030627078C0B900F061F983 +:10AB100001F2064106D3600914F01F0F08BF401E62 +:10AB2000800202E024B900F047F940F4004004E05C +:10AB30006008E20748BF401C800208801FE001282F +:10AB40001DD100F05BF917E035F8231048F68F604F +:10AB50000140394325F82310644600F04FF911E015 +:10AB6000ACEB0401316235F823104A06B5F85010F9 +:10AB7000294401EBC00005D500F206400480A3B2D1 +:10AB8000728904E000F202400480A3B23289716944 +:10AB9000284600F0A7F9317835F8212048F6BF7033 +:10ABA000024082F0300220E000282ED1B1693069E5 +:10ABB000884232BF091A08460021B16100F0EEF860 +:10ABC0003F2801F2064116D3420910F01F0F08BFBB +:10ABD000521E900240F400400880317835F8212060 +:10ABE0004BF68F70024082F44052174325F82170D3 +:10ABF0000020BDE8F68210B900F0DEF8EAE742086E +:10AC0000C00748BF521C9002E6E7F078022857D1EF +:10AC1000BAB900F0E6F802F2024206D3430910F096 +:10AC20001F0F08BF5B1E980202E020B900F0AFF8CA +:10AC300040F4004004E04308C00748BF5B1C980292 +:10AC400010807078C0B900F0CCF802F2064206D34A +:10AC5000430910F01F0F08BF5B1E980202E020B9E5 +:10AC600000F095F840F4004004E04308C00748BFF6 +:10AC70005B1C980210800BE0012809D1B5F8500048 +:10AC80003278281800EBC20000F2064032690280D8 +:10AC9000F0690028A1D0307835F8202044F2400334 +:10ACA00003EA02049C4218BF1A4296D135F82020CC +:10ACB000114041F4004141F0C00125F820108CE71B +:10ACC00001285BD1B1693069884232BF091A084650 +:10ACD0000021B161440800F0010143092ABBB5F825 +:10ACE000502005EB020C32780CEBC20C3F280CF222 +:10ACF000024C06D31A4610F01F0F08BF521E9202D4 +:10AD00000AE060B9BCF800E048F2FF3202EA0E0245 +:10AD1000ACF80020BCF8002042F4004203E02246D8 +:10AD200001B1521C9202ACF800207278FAB9B5F861 +:10AD3000502096F800C0AA1802EBCC023F2802F27D +:10AD4000064208D310F01F0F08BF5B1E980240F4A4 +:10AD50000040108041E730B9118848F2FF300140CF +:10AD600011801088F3E701B1641CA002F1E7012A09 +:10AD7000F0D100F013F801F206412DE7012038E789 +:10AD80007069316920447061306A8142704713886C +:10AD900048F2FF300340138010887047B5F8501018 +:10ADA0003278691801EBC2017047B5F85010691884 +:10ADB00001EBC2013F2C70470A8848F2FF30024085 +:10ADC0000A8008887047B5F85000281800EBC200C8 +:10ADD0007047B5F850002918307801EBC0013F2CBE +:10ADE0007047B5F850002A18307802EBC00230697D +:10ADF0003F2870477169A3B2284673E0B5F8500048 +:10AE00003178281800EBC100704718B50A784978E6 +:10AE100030F82240002948F2800305D048F6BF717F +:10AE20000C4084F0100404E04BF68F710C4084F465 +:10AE30008054234320F82230002012BD30B50A7B15 +:10AE4000002A36D14A780C78002A30F8242048F2BB +:10AE5000800348F68F7516D0520608D530F82420A6 +:10AE6000154045F4004545F0C00520F82450CA7847 +:10AE7000012A1ED00A7830F8224048F6BF710C40F3 +:10AE800084F0200412E0520408D530F82420154044 +:10AE900045F4404545F0800520F824500A7830F804 +:10AEA00022404BF68F710C4084F44054234320F829 +:10AEB0002230002030BD01800020704711B9802170 +:10AEC000A0F84C1000207047B0F8581041F4004131 +:10AED000FFE7A0F85810002070470A40A0F8402073 +:10AEE0000020704710B580185B1C00F580605B087F +:10AEF00007E00A784C7842EA0422891C20F8022BE9 +:10AF00005B1EF6D110BD10B5821802F5806258089C +:10AF100006E032F8024B0C70240A4C70891C401E6B +:10AF2000F7D1D80744BF1088087010BD12200880E0 +:10AF30000FF200107047042008800FF20C107047C9 +:10AF400010B500F029F80FF2980004E010B500F0F9 +:10AF500023F80FF2B0002146FEF76AFD204610BD2F +:10AF600038B51A2008800E494C68086889680D4D6C +:10AF7000081809D00822A91C00F01EF8042205F1C7 +:10AF80001201204600F018F8284632BD10B500F036 +:10AF900003F80FF28400DEE70A46034C7047000016 +:10AFA000107AFF1F9C290020E032002010B5FFF727 +:10AFB000F3FF0FF27000CEE730B5002393420DDAB5 +:10AFC000040F0A2C2CBF3734303401F8134001EB46 +:10AFD0004305002400016C705B1CEFE730BD0000EE +:10AFE00053544D3332205669727475616C20436F2F +:10AFF0006D506F727420696E204653204D6F6465EA +:10B000000000000053544D6963726F656C65637492 +:10B01000726F6E696373000056435020436F6E6613 +:10B020006967000056435020496E7465726661631B +:10B030006500000012010002020200408304405734 +:10B040000002010203010000040309041349002067 +:10B0500008604FF4E0221248016841F47001016079 +:10B060004FF0B041086840F0010008608A600D4868 +:10B070000A6802400C480A60036823F00503036075 +:10B08000426852085200426000220848C8600861C5 +:10B09000086820F4802008608A61704708ED00E0AD +:10B0A00088ED00E0FBFEF6FA940000580010042240 +:10B0B0000100000003000000050000000100000086 +:10B0C00001000000060000000A000000200000004F +:10B0D0000200000004000000080000001000000052 +:10B0E000400000008000000000010000000200009D +:10B0F000A0860100400D0300801A060000350C00F8 +:10B1000040420F0080841E0000093D0000127A00BA +:10B110000024F40000366E010048E801006CDC02F7 +:10B12000000000000000000000000000000000001F +:10B130002DE9F04107468846387810F0030F16468F +:10B140001D4633D0384600F099F878BBB8F1000FAF +:10B150001CBFD8E900018619012D2ED13888C10401 +:10B1600015D5396A07F14402384600F0A3F83A6B66 +:10B17000044602B93A69F968384600F09BF8361B74 +:10B18000341A7A69F968384600F094F8261A1EB91C +:10B190004DB916F1010F09D097F903002A4631463F +:10B1A00000F08EF8064616F1010F09D12320AFF307 +:10B1B00000804FF0FF30BDE8F081022DE8D1EBE7D1 +:10B1C000388810F4405F0ED07868F8603861786194 +:10B1D000B8617868F86107F14400386207F130001F +:10B1E000786200203863B8F1000F05D0D8E9020179 +:10B1F00007F13402C2E9000139884CF6FF600140D2 +:10B2000039800020BDE8F08170B50546AFF30080BD +:10B210002888810415D56E680024EA6895F9030032 +:10B220003146914212D2521AFBF770FA10F1010F17 +:10B230001CBF00283618F0D10FE04DF6FF7001401A +:10B2400029802846AFF30080002070BD0022002135 +:10B25000FBF75CFA10F1010F00D101246868E86087 +:10B26000A861E861002C2988E7D041F400712980A9 +:10B270002846AFF300804FF0FF3070BDF8B5A0B99D +:10B28000AFF3008000250A4E08244FF0FF373068E6 +:10B2900020B1FFF7B9FF002848BF3D46361D641EA8 +:10B2A000F5D1AFF300802846F2BDBDE8F240ABE730 +:10B2B00060290020914234BF511A0021084670478E +:10B2C0003EB504000D00012A02D100F063F807E04A +:10B2D000022A07D100940020019069460C20ABBEE1 +:10B2E0002D1801E0002A0CD10094019569460A202E +:10B2F000ABBE002805D100222100280000F027F86D +:10B3000001E00020C04303B030BD000010B4314A5A +:10B31000002113461C6884421EBF491C9C6884425D +:10B320001EBF491C1C69844209D09C69491C844287 +:10B3300005D0491C20331029ECD310BC70470023E2 +:10B3400042F8313002EBC1014B6010BC704778B459 +:10B35000204C002325462E688E421EBF5B1CAE6823 +:10B360008E421EBF5B1C2E698E4209D0AE695B1CEB +:10B370008E4205D05B1C2035102BECD372BC70477D +:10B38000054604EBC303012A04BF59684D195D60EB +:10B3900072BC704710B40F4A002113461C688442E7 +:10B3A0001EBF491C9C6884421EBF491C1C69844204 +:10B3B0000AD09C69491C844206D0491C20331029BC +:10B3C000ECD310BC0020704702EBC100406810BCF9 +:10B3D000704700009436002010B50446E068A1696B +:10B3E000884251D3218849F202030B40022B08D036 +:10B3F00008044CBF4FF400704FF484400143218097 +:10B400003BE001F4C042B2F5C04F06D1A1688842CA +:10B4100003D32046FFF732FF78BB208810F4406F3B +:10B4200002BF606804F14401884217D14FF40070F4 +:10B43000F5F716FD606030B904F144006060E0602B +:10B44000401CA0600AE0218841F040012180E060BA +:10B45000606100F500726068A260E0616068206170 +:10B46000A068A061207841070AD502220021204669 +:10B4700000F00CF810F1010F02D14FF0FF3010BDB9 +:10B48000208840F4C0402080002010BD70B50446E4 +:10B490000D461646AFF3008033462A46002120466B +:10B4A000FFF746FE05462046AFF30080284670BDF4 +:10B4B0002DE9FC4D016800F10805490805EBC102C2 +:10B4C000019200F10802406800F0010A02EBC10895 +:10B4D000400808EBC00B00200021019A95422FD0B4 +:10B4E0002A68AE186A68324400920835009A96427B +:10B4F000F3D016F9014B009A964205D12A68AE188E +:10B500006A6832440092083516F8017B884210D1EF +:10B51000D84508BFF6F77CF8D8F80000D8F8041032 +:10B52000BAF1000F18BF48440144884208F10808E6 +:10B53000EED0002C00F8017B05D5641CE6D1D5E7E0 +:10B540005846BDE8F68D641ED5D5CFE738B5040062 +:10B550000ED0207810F0030F03D094F903000028D8 +:10B5600009D5AFF30080204600F030F8AFF300803B +:10B570004FF0FF3032BD2046FFF780FE0546AFF3A7 +:10B5800000802078410644BF6068FEF7A5FA0020DD +:10B59000606094F90300022804D900F055F808B15E +:10B5A0004FF0FF35E06B48B100F05AF808B14FF0AA +:10B5B000FF35E06BFEF790FA0020E063204600F0D4 +:10B5C00005F8AFF30080284632BD000001780A0676 +:10B5D00026D51C4A13680021834203D1002342F878 +:10B5E00021301BE05368012183421EBF0221936872 +:10B5F0008342F3D0D368032183421EBF0421136921 +:10B600008342EBD05369052183421EBF0621936913 +:10B6100083421EBF0721D3698342DFD0FEF75CBAA5 +:10B62000002101804FF0FF31C17000F14401416001 +:10B63000C160016141618161C161016200F130015C +:10B6400041627047602900201CB5020000926946E3 +:10B650000220ABBE04001000FFF758FE200016BD0C +:10B66000E0B50090F6F738FF019069460E20ABBEBA +:10B6700003B000BD7047FEE7FEE7FEE7FEE7704758 +:10B680007047704700F028B800E000BF0A48FEF796 +:10B6900093BA0A48FDF7EEBD0948FDF730B80948EE +:10B6A000FDF72DB8FAF734BDFAF75CBD00F01CB811 +:10B6B0000548FDF7DFBD0000142E00207437002080 +:10B6C00070340020E0330020D43700204FF4806035 +:10B6D000FAF7F5BCF9F7AFB8024841680278891863 +:10B6E00041607047E02900200449C8680A68824325 +:10B6F0000A60486000F004B800000000001500581F +:10B70000704738B50C46C5B22046AFF30080E068FC +:10B71000A169884204D32046FFF75EFE00280FD4BB +:10B72000E068401CE06000F8015D2088010503D45A +:10B7300040050BD50A2D09D12046FFF79FFD28B102 +:10B740002046AFF300804FF0FF3032BD2046AFF30C +:10B750000080284632BD19E050F8042BD30744BFBF +:10B76000A9F101039A18091F0023042942F8043B98 +:10B77000F9D25FEA817C134604D54FF0000CA2F8A1 +:10B7800000C09B1CC90744BF0021197050F8041B5E +:10B790000029E1D17047000038B50D4D0824286814 +:10B7A00000281CBF017811F0030F05D090F9031099 +:10B7B000002958BFFFF7CAFE2D1D641EEFD1BDE85A +:10B7C0003840002200214FF0FF30FAF79FBF00BF42 +:10B7D0006029002010B5074979441831064C7C4493 +:10B7E000163404E00A68081D114488470146A14246 +:10B7F000F8D110BD2C000000780000004EF68851F2 +:10B80000CEF20001086840F470000860BFF34F8F6B +:10B81000BFF36F8F4FF00070E1EE100A7047000029 +:10B8200037FFFFFFAC0F0000142A00207008000053 +:10B83000300003200000000079FCFFFF0200000040 +:10B840000200000094010000020000002800032014 +:10B85000080000005DFCFFFF020000000200000085 +:10B860007A01000076020000081400200C16000087 +:10B8700000000000000000000000000000000000C8 +:10B8800001000000020000000300000004000000AE +:10B890000120C046002801D0FFF79CFFAFF30080D5 +:10B8A0000020AFF30080FBF72EF800F000F800F066 +:10B8B00001B800000746FFF76FFF3846F5F7C2FEF4 +:10B8C000FBE738B504460D46284600F005F8A842C7 +:10B8D00018BF0024204632BD0149FFF712BF00BF48 +:10B8E0006C27002001488047014800474DB0000800 +:10B8F000F5B80008AFF30080FFF780FFFFF7C8FF3F +:10B9000000002E00FFF7FEBFFFF7FEBFFFF7FEBFF0 +:10B91000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF5B +:10B92000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF4B +:10B93000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF3B +:10B94000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF2B +:10B95000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF1B +:10B96000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBF0B +:10B97000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFFB +:10B98000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFEB +:10B99000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFDB +:10B9A000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFCB +:10B9B000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFBB +:10B9C000FFF7FEBFFFF7FEBFFFF7FEBFFFF7FEBFAB +:10B9D000FFF7FEBF00207047F800000181008100E2 +:10B9E000810081008100810081008100810081004F +:10B9F000810081008100810081008100810081003F +:10BA0000810081008100810081008100810081002E +:10BA1000810081008100810081008100810081001E +:10BA20008100810081008100D300274D68000871EA +:10BA300068000875680008C7680008D5B9000801E3 +:10BA4000040000682700206927002068270020687C +:10BA5000270020FC000368270020FC00076827005F +:10BA60002054270020E00013020401018438002044 +:10BA7000D43800208438002084380020FC0003845F +:10BA8000380020FC0007B02700209C270020E000A1 +:10BA900013020802023438002084380020343800B1 +:10BAA0002034380020FC000334380020FC0007F864 +:10BAB000270020E4270020E00031090243000201B2 +:10BAC00000C0320904000001020201000524001038 +:10BAD00001052401000104240202052406000107D7 +:10BAE00005820308001009040100020AFD00400756 +:10BAF00005010200020007058102000200000902A0 +:10BB00004300020100C032090400000102020100EA +:10BB1000052400100105240100010424020205246B +:10BB20000600010705820308001009040100020A4B +:10BB3000FD000B070501024000000705810240FDE2 +:10BB4000003109074300020104C03209040000016A +:10BB50000202010005240010010524010001042453 +:10BB600002020524060001070582030800100904EB +:10BB70000100020AFD000B07050102400000070555 +:10BB8000810240FD000B7D74000817750008617587 +:10BB90000008FC000BA176000817760008797600F3 +:10BBA00008F4002BD5760008CD760008DD76000875 +:10BBB000E576000800B9000800B9000800B90008DF +:10BBC00000B9000800B9000800B9000800B9000871 +:10BBD000F8FF0B02B9000800B9000800B90008FA24 +:10BBE000FFEA00F8FFF4000B242700206C27002058 +:10BBF000B4270020EC001D2DAF000837AF00084D22 +:10BC0000AF000841AF000861AF00088DAF0008AD7C +:10BC1000AF00081A03E600030DFF0183E2000648A7 +:10BC20004200007A4401F9000010FA000C480004B8 +:10BC30000048000400480A060002FD00014001FC23 +:10BC40000001C201FD000008FC00044800093D009D +:040000050800B8F542 :00000001FF diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h index cf8a5baa6..8637c02bf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h index 778670a7a..46f29b99e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -285,6 +285,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -294,11 +298,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -306,6 +314,19 @@ #define CFG_BLE_MAX_TX_POWER (0) + +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER +* which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -633,5 +654,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h index 4224edbe0..047785098 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h index 8251e0f6d..ff85f2bac 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * @brief Interface to the application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -66,5 +65,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h index ac1e606db..2f49319d9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -270,5 +270,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h index 8d481bc18..8394a102b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/main.h index 7d528ca80..2153a572f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -71,5 +70,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h index d8e67947f..45c31caa5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h index 553c73c7b..2d2d2bf5f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h index ed0f50443..5a62284ed 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -77,5 +76,3 @@ void PUSH_BUTTON_SW1_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h index 92a5d07a3..c34a6ca79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/utilities_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/vcp_conf.h index 7280c33b9..67ce3231a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -49,5 +48,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c index a3fa1e7eb..dfefbd108 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -44,7 +44,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -133,8 +133,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -417,5 +425,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c index 28627aae8..22a87caef 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/app_entry.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_entry.c - * @author MCD Application Team - * @brief Entry point of the Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -30,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "shci.h" +#include "dbg_trace.h" /* Private includes -----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -69,6 +70,8 @@ static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); /* USER CODE BEGIN PFP */ @@ -188,15 +191,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); +/** +* @brief Notify when ready system event from the M0 firmware +*/ +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + + } else { + + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY UNEXPECTED CASE \n"); + } return; } +/** +* @brief Notify a system error coming from the M0 firmware +*/ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON ERR_BLE_INIT \n"); + } else { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON BLE ERROR \n"); + } + return; +} /* USER CODE BEGIN FD_LOCAL_FUNCTIONS */ void APPE_Led_Init( void ) { @@ -290,4 +429,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) return; } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c index 721099329..e00eaabf4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/main.c index 1a9506504..142b1e7df 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/main.c @@ -1,10 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file main.c * @author MCD Application Team * @brief BLE application with BLE core * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -24,18 +35,7 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -670,5 +670,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c index 4f3093e2a..94ce189f0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -365,4 +364,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c index 767a11175..68b8bdd6e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -351,4 +350,3 @@ void RTC_WKUP_IRQHandler(void) } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c index efd4c8554..ff7fcaf3b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -349,5 +348,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf index 2d3b26636..f13848f65 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/EWARM/stm32wb55xx_flash_cm4.icf @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/MDK-ARM/stm32wb55xx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c index 40fd435b7..29ffed178 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * @file app_ble.c - * @author MCD Application Team - * @brief BLE Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @file app_ble.c + * @author MCD Application Team + * @brief BLE Application + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -401,7 +400,8 @@ void APP_BLE_Init( void ) 0, CFG_BLE_MAX_COC_INITIATOR_NBR, CFG_BLE_MIN_TX_POWER, - CFG_BLE_MAX_TX_POWER} + CFG_BLE_MAX_TX_POWER, + CFG_BLE_RX_MODEL_CONFIG} }; /** @@ -1238,4 +1238,3 @@ void SVCCTL_ResumeUserEventFlow( void ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h index 54841bbd7..6ad5933e4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.h @@ -6,17 +6,16 @@ * @brief Header for ble application ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -89,5 +88,3 @@ extern "C" { #endif #endif /*APP_BLE_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h index 7d63f62fb..db4fb50f6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_conf.h - * Description : Configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_conf.h + * @author MCD Application Team + * @brief Configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -69,4 +68,3 @@ #define BLE_CFG_OTA_REBOOT_CHAR 0/**< REBOOT OTA MODE CHARACTERISTIC */ #endif /*BLE_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h index fff4943a3..78a50ae09 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/ble_dbg_conf.h @@ -1,23 +1,23 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/ble_dbg_conf.h - * Description : Debug configuration file for BLE Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file ble_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for BLE Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ /* USER CODE END Header */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __BLE_DBG_CONF_H @@ -215,5 +215,3 @@ #endif #endif /*__BLE_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c index fd07d3d63..463866485 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.c @@ -1,22 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * @file p2p_server_app.c * @author MCD Application Team * @brief peer to peer Server Application - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -46,7 +45,7 @@ typedef struct { - uint8_t Notification_Status; /* used to chek if P2P Server is enabled to Notify */ + uint8_t Notification_Status; /* used to check if P2P Server is enabled to Notify */ P2P_LedCharValue_t LedControl; P2P_ButtonCharValue_t ButtonControl; uint16_t ConnectionHandle; @@ -385,5 +384,3 @@ void P2PS_Send_Notification(void) } /* USER CODE END FD_LOCAL_FUNCTIONS*/ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h index fd915159d..8fd85526c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/p2p_server_app.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/p2p_server_app.h - * Description : Header for p2p_server_app.c module - ****************************************************************************** + ****************************************************************************** + * File Name : App/p2p_server_app.h + * Description : Header for p2p_server_app.c module + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -78,4 +77,3 @@ typedef struct #endif /*__P2P_SERVER_APP_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..bf72864fc 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/tl_dbg_conf.h - * Description : Debug configuration file for stm32wpan transport layer interface. - * + ****************************************************************************** + * @file tl_dbg_conf.h + * @author MCD Application Team + * @brief Debug configuration file for stm32wpan transport layer interface. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -132,5 +131,3 @@ extern "C" { #endif #endif /*__TL_DBG_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c index 23c9dbeeb..5d488c347 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/STM32_WPAN/Target/hw_ipcc.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Target/hw_ipcc.c - * Description : Hardware IPCC source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_ipcc.c + * @author MCD Application Team + * @brief Hardware IPCC source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -164,10 +163,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/readme.txt index 1cf49c2ab..a682150c6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/BLE/BLE_p2pServer/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BLE_p2pServer application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h index cf8a5baa6..7197b3388 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_common.h @@ -4,16 +4,15 @@ * File Name : app_common.h * Description : App Common application configuration file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -116,4 +115,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h index f47da8040..a60550815 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_conf.h @@ -3,16 +3,16 @@ ****************************************************************************** * File Name : app_conf.h * Description : Application configuration file for STM32WPAN Middleware. - ****************************************************************************** + * + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -370,4 +370,3 @@ typedef enum #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h index 48c467aaa..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h index 6cefe665f..4ca3bbb1b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -255,4 +254,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h index 81e303b99..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h index 04421f057..56638ded0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h index e3a61b9d9..0ed8c561a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h index b169e75d8..1b5b75719 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -86,5 +85,3 @@ void USB_FS_WKUP_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h index 948bfb5c5..6a811f7ab 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h index 92a5d07a3..8aacfd97f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c index 8251a3a91..f619f4e77 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -448,4 +447,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c index c0af6a14a..3d44a3caf 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -892,4 +891,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c index 6ae6ff9f9..166acccd5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/hw_uart.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -317,4 +316,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c index a997812a2..86c5d7a8f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/main.c @@ -4,6 +4,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -23,19 +34,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -650,5 +650,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c index 4a1674c66..3d838a044 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -364,4 +363,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c index 58fa982a0..82a2e86c2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -432,4 +431,3 @@ void USB_FS_WKUP_IRQHandler(void) } #endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c index 0416f0c7a..aacc61283 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf index 97193b314..d37cb319e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20000004; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000004; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x200327FF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c index 15912beab..b5473e3f1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/app_thread.c - * Description : Thread Application. - ****************************************************************************** + * File Name : App/app_thread.c + * Description : Thread Application. + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -317,7 +316,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -715,7 +714,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -743,4 +742,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h index b5a20ccc3..b60877648 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -102,4 +101,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c index c9e07fdb9..a5c0bd43f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -670,4 +666,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/readme.txt index a40df621a..9b161ff71 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Cli_Cmd/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread Cli command application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -128,7 +128,7 @@ Wireless Coprocessor binary. In order to make the program work, you must do the following: - Plug your STM32WB55xx_Usb_Dongle board to your PC - - Rebuild all files and load your image OR use the Thread_Cli_Cmd_reference.hex from Binary directory + - Rebuild all files and load your image - Run the example and use the HyperTerminal to interact with the Board via the Cli commands Note: when LED1, LED2 and LED3 are toggling it is indicating an error has occurred on application. diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h index 486199914..d3c7bd91f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -117,5 +116,3 @@ extern "C" { #endif #endif /* APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h index f7394d2c6..839d38220 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -93,7 +92,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -352,7 +351,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -374,5 +373,3 @@ typedef enum #endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h index 0fbf65bda..163b23b0a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, synchro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -41,5 +40,3 @@ void APPE_Init( void ); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h index a140b3084..1f99d05dd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -246,5 +245,3 @@ #endif /* HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h index c838d3bc5..b94f224c1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/main.h @@ -1,19 +1,20 @@ - /* @file main.h +/** + ****************************************************************************** + * @file main.h * @author MCD Application Team * @brief This file contains all the functions prototypes for the main.c * file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -51,5 +52,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ #endif /* MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h index ec0f85423..bc93f3f16 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -347,5 +348,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h index 70f25218d..1dd7fa026 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void USB_FS_WKUP_IRQHandler(void); #endif #endif /* STM32WB_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h index 9f95c06e6..373a97306 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c index 480c72fb1..9aa7c82a0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -422,4 +421,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c index 501af6260..6461833c5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -336,4 +336,3 @@ void HAL_Delay(uint32_t Delay) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c index 2c41f893c..d3045abe5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm32wbxx_it.c @@ -1,23 +1,22 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32xx_it.c * @author MCD Application Team * @brief Main Interrupt Service Routines. * This file provides template for all exceptions handler and * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -187,5 +186,3 @@ void USB_FS_WKUP_IRQHandler(void) HAL_PCD_IRQHandler(&hpcd); } #endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf index 97193b314..d37cb319e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20000004; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000004; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x200327FF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c index be914cbc4..c0436a26c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -472,7 +471,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -573,9 +572,9 @@ static void APP_THREAD_SendNextBuffer(void) } else { - /* Buffer transfer has been successfully transfered */ + /* Buffer transfer has been successfully transferred */ BSP_LED_On(LED1); - APP_DBG("********* BUFFER HAS BEEN TRANFERED *********"); + APP_DBG("********* BUFFER HAS BEEN TRANSFERRED *********"); } } @@ -1310,7 +1309,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1338,4 +1337,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h index 99f5eceac..077ceb7a1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -137,4 +136,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h index ef2e4b2ae..0144924d0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/data_transfer.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file data_transfer.h * @author MCD Application Team - * @brief data to be transfered - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @brief data to be transferred + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ #ifndef DATA_TRANSFER_H_ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/readme.txt index 17e590456..5cd4e7900 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_DataTransfer/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread_Coap_DataTransfer application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @@ -52,7 +52,7 @@ After the reset of the 2 boards, one board will be in Leader mode (Green LED2 ON the other one will be in Child mode (Red LED3 ON) Once the child mode is established for one of the devices, it starts the provisioning procedure in multicast mode in order to probe the IP address of the leader device. Then this is used to start the File transfer procedure -in unicast mode, which success is marked by the lightening of the blue LED. +in unicast mode, which success is marked by the lightning of the blue LED. ___________________________ ___________________________ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h index 486199914..d3c7bd91f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -117,5 +116,3 @@ extern "C" { #endif #endif /* APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h index 286bd8d9e..2ac846ee4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -93,7 +92,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -353,7 +352,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -375,5 +374,3 @@ typedef enum #endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h index 0fbf65bda..163b23b0a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, synchro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -41,5 +40,3 @@ void APPE_Init( void ); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h index a140b3084..1f99d05dd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -246,5 +245,3 @@ #endif /* HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h index c838d3bc5..b94f224c1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/main.h @@ -1,19 +1,20 @@ - /* @file main.h +/** + ****************************************************************************** + * @file main.h * @author MCD Application Team * @brief This file contains all the functions prototypes for the main.c * file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -51,5 +52,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ #endif /* MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h index ec0f85423..bc93f3f16 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -347,5 +348,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h index e0052a9d7..05b26973f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -75,5 +74,3 @@ void EXTI15_10_IRQHandler(void); #endif #endif /* STM32WB_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h index 9f95c06e6..373a97306 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c index ebc5bb173..57cb4eac4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -442,4 +441,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c index 501af6260..6461833c5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -336,4 +336,3 @@ void HAL_Delay(uint32_t Delay) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c index 108e44a49..7cd715568 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm32wbxx_it.c @@ -1,23 +1,22 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32xx_it.c * @author MCD Application Team * @brief Main Interrupt Service Routines. * This file provides template for all exceptions handler and * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -276,4 +275,3 @@ void EXTI15_10_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf index 97193b314..d37cb319e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20000004; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000004; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x200327FF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 7d296972a..080b32857 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c index 14aafd4ab..cb3c25d30 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -418,7 +417,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1093,7 +1092,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1121,4 +1120,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h index 7f95a252b..2c515c2bb 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -127,4 +126,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/readme.txt index cc4591b8b..f7e22a255 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_Coap_Generic/readme.txt @@ -8,12 +8,12 @@ * @brief Description of Coap Generic Application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h index 486199914..d3c7bd91f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -117,5 +116,3 @@ extern "C" { #endif #endif /* APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h index b0097b0a7..31c5f7762 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -93,7 +92,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -345,7 +344,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -366,5 +365,3 @@ typedef enum #endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h index 0fbf65bda..163b23b0a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, synchro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -41,5 +40,3 @@ void APPE_Init( void ); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h index a140b3084..1f99d05dd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -246,5 +245,3 @@ #endif /* HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h index c838d3bc5..b94f224c1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/main.h @@ -1,19 +1,20 @@ - /* @file main.h +/** + ****************************************************************************** + * @file main.h * @author MCD Application Team * @brief This file contains all the functions prototypes for the main.c * file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -51,5 +52,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ #endif /* MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h index ec0f85423..bc93f3f16 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -347,5 +348,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h index 45d957a9c..eb71eae6b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -74,5 +73,3 @@ void EXTI15_10_IRQHandler(void); #endif #endif /* STM32WB_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h index 9f95c06e6..373a97306 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c index 13d8d9b18..b57764be9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -443,4 +442,3 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c index 501af6260..6461833c5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -336,4 +336,3 @@ void HAL_Delay(uint32_t Delay) } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c index 41cb85dc7..f9da7f0cb 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm32wbxx_it.c @@ -1,23 +1,22 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32xx_it.c * @author MCD Application Team * @brief Main Interrupt Service Routines. * This file provides template for all exceptions handler and * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -197,5 +196,3 @@ void EXTI15_10_IRQHandler(void) { HAL_GPIO_EXTI_IRQHandler(BUTTON_SW1_PIN); } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf index 97193b314..d37cb319e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20000004; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000004; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x200327FF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 81ab2840c..ad25237fb 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c index 7e570196c..461725e4a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -421,7 +420,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -974,7 +973,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1002,4 +1001,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h index b5e5a0fb3..3dabf8e6d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -123,4 +122,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt index 76a85565f..af4135df6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_FTD_Coap_Multicast/readme.txt @@ -9,12 +9,12 @@ * application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h index 486199914..d3c7bd91f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_common.h @@ -5,17 +5,16 @@ * @brief Common ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -117,5 +116,3 @@ extern "C" { #endif #endif /* APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h index 86caf1ec6..6ce4f02e4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file app_conf.h * @author MCD Application Team * @brief Application configuration file - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -102,7 +101,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -353,7 +352,7 @@ typedef enum ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { @@ -375,5 +374,3 @@ typedef enum #endif /* APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h index 0fbf65bda..163b23b0a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/app_entry.h @@ -6,17 +6,16 @@ * overall system infrastructure (scheduler, synchro with the M0, etc..) ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ @@ -41,5 +40,3 @@ void APPE_Init( void ); #endif #endif /* APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h index a140b3084..1f99d05dd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_conf.h * @author MCD Application Team * @brief Configuration of hardware interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -246,5 +245,3 @@ #endif /* HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h index 271a222a9..5dfe0e735 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h index c838d3bc5..b94f224c1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/main.h @@ -1,19 +1,20 @@ - /* @file main.h +/** + ****************************************************************************** + * @file main.h * @author MCD Application Team * @brief This file contains all the functions prototypes for the main.c * file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** */ @@ -51,5 +52,3 @@ extern RTC_HandleTypeDef hrtc; /**< RTC handler declaration */ #endif /* MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h index ec0f85423..bc93f3f16 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -5,17 +6,17 @@ * @brief HAL configuration file. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -347,5 +348,3 @@ #endif #endif /* STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h index 70f25218d..1dd7fa026 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm32wbxx_it.h @@ -5,17 +5,16 @@ * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -73,5 +72,3 @@ void USB_FS_WKUP_IRQHandler(void); #endif #endif /* STM32WB_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h index 9f95c06e6..373a97306 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h index 4dde3509a..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h index 22607b351..3aacf9b9a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c index 5a58d7f39..632894897 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/app_entry.c @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -430,4 +429,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c index c842ba55e..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c index 775aa241d..8b1a7ff53 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/hw_uart.c @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file hw_uart.c * @author MCD Application Team * @brief hardware access - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -467,5 +466,3 @@ return; } - - /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c index c122553e6..b4c0dc695 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ @@ -335,4 +335,3 @@ void HAL_Delay(uint32_t Delay) } } -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c index 2c41f893c..d3045abe5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm32wbxx_it.c @@ -1,23 +1,22 @@ /** - ****************************************************************************** + ****************************************************************************** * @file stm32xx_it.c * @author MCD Application Team * @brief Main Interrupt Service Routines. * This file provides template for all exceptions handler and * peripherals interrupt service routine. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ @@ -187,5 +186,3 @@ void USB_FS_WKUP_IRQHandler(void) HAL_PCD_IRQHandler(&hpcd); } #endif /* (CFG_USB_INTERFACE_ENABLE != 0) */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c index 40997ccd7..36ad5be14 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c index f24d74b56..ab4230ad0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/Core/Src/system_stm32wbxx.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file system_stm32wbxx.c * @author MCD Application Team * @brief CMSIS Cortex Device Peripheral Access Layer System Source File @@ -57,19 +57,18 @@ * SDIO and RNG clock | *----------------------------------------------------------------------------- *============================================================================= - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /** @addtogroup CMSIS * @{ @@ -154,10 +153,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -339,5 +340,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s index 79b0e7edd..df835872d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/startup_stm32wb55xx_cm4.s @@ -14,28 +14,14 @@ ;* After Reset the Cortex-M4 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. ;******************************************************************************** +;* @attention ;* -;* Redistribution and use in source and binary forms, with or without modification, -;* are permitted provided that the following conditions are met: -;* 1. Redistributions of source code must retain the above copyright notice, -;* this list of conditions and the following disclaimer. -;* 2. Redistributions in binary form must reproduce the above copyright notice, -;* this list of conditions and the following disclaimer in the documentation -;* and/or other materials provided with the distribution. -;* 3. Neither the name of STMicroelectronics nor the names of its contributors -;* may be used to endorse or promote products derived from this software -;* without specific prior written permission. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -;* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -;* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -;* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -;* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -;* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -;* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -;* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;******************************************************************************* ; @@ -96,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -525,4 +511,3 @@ DMAMUX1_OVR_IRQHandler B DMAMUX1_OVR_IRQHandler END -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf index 97193b314..d37cb319e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/EWARM/stm32wb55xx_flash_cm4.icf @@ -14,11 +14,11 @@ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; /*-Memory Regions- read write */ -define symbol __ICFEDIT_region_RAM1_start__ = 0x20000004; -define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000004; +define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_start__ = 0x20030000; -define symbol __ICFEDIT_region_RAM2aRet_SHARED_end__ = 0x200327FF; +define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; +define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x200327FF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; @@ -27,8 +27,8 @@ define symbol __ICFEDIT_size_heap__ = 0x400; define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM1_region = mem:[from __ICFEDIT_region_RAM1_start__ to __ICFEDIT_region_RAM1_end__]; -define region RAM2aRet_SHARED_region = mem:[from __ICFEDIT_region_RAM2aRet_SHARED_start__ to __ICFEDIT_region_RAM2aRet_SHARED_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; -place in ROM_region { readonly }; -place in RAM1_region { readwrite,block CSTACK, block HEAP }; -place in RAM2aRet_SHARED_region { first section MAPPING_TABLE}; -place in RAM2aRet_SHARED_region { section MB_MEM1}; -place in RAM2aRet_SHARED_region { section MB_MEM2}; +place in ROM_region { readonly }; +place in RAM_region { readwrite,block CSTACK, block HEAP }; +place in RAM_SHARED_region { section MB_MEM1}; +place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s index 9a2771e25..90bedbb4d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/Application/User/Core/src/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index 2939d27d4..001a31233 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c index 5fa4ae876..39ae70a84 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.c @@ -4,18 +4,17 @@ * File Name : App/app_thread.c * Description : Thread Application. ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -430,7 +429,7 @@ static void APP_THREAD_TraceError(const char * pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Thread - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -1085,7 +1084,7 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) uint32_t char_remaining = 0; static uint32_t len_total = 0; - /* Copy the characteres in the temporary buffer */ + /* Copy the characters in the temporary buffer */ for (i = 0; i < *Len; i++) { TmpString[len_total++] = Buf[i]; @@ -1113,4 +1112,3 @@ void VCP_DataReceived(uint8_t* Buf , uint32_t *Len) /* USER CODE BEGIN FD_WRAP_FUNCTIONS */ /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h index b25276d5b..a89fc78f8 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/app_thread.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : App/app_thread.h + ****************************************************************************** + * File Name : App/app_thread.h * Description : Header for Thread Application. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_THREAD_H @@ -125,4 +124,3 @@ void APP_THREAD_TL_THREAD_INIT(void); #endif /* APP_THREAD_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h index 7bfe8fac6..b2b3b4354 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/App/tl_dbg_conf.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * File Name : App/tl_dbg_conf.h + * File Name : tl_dbg_conf.h * Description : Debug configuration file for stm32wpan transport layer interface. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -48,7 +47,7 @@ extern "C" { #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -133,4 +132,3 @@ extern "C" { #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt index c03d1e362..93bd962b3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Thread/Thread_SED_Coap_Multicast/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the Thread Coap Multicast application ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt index 8d7f0c61a..33ec23e48 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Binary/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USB DFU application binary file. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h index 7991bc850..4b1076c7a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -72,5 +71,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h index fc39592af..c56c4cff2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h index 0d6644db7..b9803cc17 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI15_10_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/main.c index 5eda16a21..357dab7f2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,6 +133,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -147,7 +149,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -168,11 +170,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ /** Enable MSI Auto calibration */ HAL_RCCEx_EnableMSIPLLMode(); @@ -243,4 +240,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c index 82d84f2cd..8e3c27cba 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_hal_msp.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +79,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c index 083d9b687..676133b6b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -221,4 +220,4 @@ void EXTI15_10_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_KEY_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc index 90bf74a15..95183fa77 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/DFU_Standalone.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55CGUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -40,6 +40,17 @@ PA12.GPIOParameters=GPIO_Speed PA12.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA12.Mode=Device PA12.Signal=USB_DP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -101,14 +112,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf index da280d0ae..14cb5946a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x1000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s index 874f408c5..83743c348 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 94caa84ab..6daf416b0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c index bdf094275..beaa7a685 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -130,4 +129,3 @@ void MX_USB_Device_Init(void) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h index 6127af195..818427984 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usb_device.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,4 +101,3 @@ void MX_USB_Device_Init(void); #endif /* __USB_DEVICE__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c index 90f8015f7..15b4fb769 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -395,4 +394,3 @@ static void IntToUnicode(uint32_t value, uint8_t * pbuf, uint8_t len) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h index f006bf50a..2de0da10d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_desc.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,4 +141,3 @@ extern USBD_DescriptorsTypeDef DFU_Desc; #endif /* __USBD_DESC__C__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c index 7d88abd5d..130546ee2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -334,5 +333,3 @@ static uint32_t GetPage(uint32_t Addr) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h index 188a63d07..ef74ed949 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/App/usbd_dfu_flash.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -126,4 +125,3 @@ extern USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops; #endif /* __USBD_DFU_FLASH_H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c index e7c4b2505..a60575253 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,11 +66,11 @@ extern void SystemClock_Config(void); *******************************************************************************/ /* MSP Init */ -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { GPIO_InitTypeDef GPIO_InitStruct = {0}; if(pcdHandle->Instance==USB) @@ -104,11 +103,11 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) } } -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { if(pcdHandle->Instance==USB) { @@ -742,4 +741,3 @@ USBD_StatusTypeDef USBD_Get_USB_Status(HAL_StatusTypeDef hal_status) } return usb_status; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h index 2d5202dea..275fb37e6 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/USB_Device/Target/usbd_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -181,4 +180,3 @@ void USBD_static_free(void *p); #endif /* __USBD_CONF__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/readme.txt index 4b3b1ba75..cbb3f60c5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/DFU_Standalone/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USB DFU application. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/main.h index c17c24d2d..0d5fc8630 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,5 +67,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h index fc39592af..c56c4cff2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h index c606655da..5d1fd0678 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Inc/stm32wbxx_it.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void EXTI15_10_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/main.c index 3bf9a1fb9..f6e465271 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/main.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,6 +114,9 @@ void SystemClock_Config(void) RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ @@ -128,7 +130,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLN = 32; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; - RCC_OscInitStruct.PLL.PLLQ = 4; + RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); @@ -149,11 +151,6 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks - */ - /* USER CODE BEGIN Smps */ - - /* USER CODE END Smps */ /** Enable MSI Auto calibration */ HAL_RCCEx_EnableMSIPLLMode(); @@ -229,4 +226,3 @@ void assert_failed(uint8_t *file, uint32_t line) } #endif /* USE_FULL_ASSERT */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c index 0ed084ebd..ebcc6960f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_hal_msp.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -80,4 +79,3 @@ void HAL_MspInit(void) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c index cb5aa1c02..dc2d84250 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/stm32wbxx_it.c @@ -9,13 +9,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -227,4 +226,4 @@ void EXTI15_10_IRQHandler(void) HAL_GPIO_EXTI_IRQHandler(BUTTON_KEY1_PIN); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ + diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf index da280d0ae..14cb5946a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/EWARM/stm32wb55xx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x1000; +define symbol __ICFEDIT_size_heap__ = 0x1000; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc index cc7f38c99..c27ba954f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/HID_Standalone.ioc @@ -18,8 +18,8 @@ Mcu.PinsNb=4 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32WB55CGUx -MxCube.Version=6.2.0 -MxDb.Version=DB.6.0.20 +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true @@ -40,6 +40,17 @@ PA12.GPIOParameters=GPIO_Speed PA12.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH PA12.Mode=Device PA12.Signal=USB_DP +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 PinOutPanel.RotationAngle=0 ProjectManager.AskForMigrate=true ProjectManager.BackupPrevious=false @@ -101,14 +112,14 @@ RCC.MSI_VALUE=4000000 RCC.PLLN=32 RCC.PLLP=RCC_PLLP_DIV5 RCC.PLLPoutputFreq_Value=25600000 -RCC.PLLQ=4 +RCC.PLLQ=RCC_PLLQ_DIV4 RCC.PLLQoutputFreq_Value=32000000 RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSAI1PoutputFreq_Value=16000000 RCC.PLLSAI1QoutputFreq_Value=16000000 RCC.PLLSAI1RoutputFreq_Value=16000000 RCC.PWRFreq_Value=64000000 -RCC.RFWKPFreq_Value=244.140625 +RCC.RFWKPFreq_Value=7812.5 RCC.RNGFreq_Value=32000 RCC.SAI1Freq_Value=16000000 RCC.SMPS1Freq_Value=8000000 diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s index 874f408c5..83743c348 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index 94caa84ab..6daf416b0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c index c04dddcb2..e0d024b2b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -206,4 +205,3 @@ void MX_USB_Device_Init(void) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h index 57fb199fe..bfb4ea6b9 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usb_device.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -102,4 +101,3 @@ void MX_USB_Device_Init(void); #endif /* __USB_DEVICE__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c index 4e5304622..5473567c3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -393,4 +392,3 @@ static void IntToUnicode(uint32_t value, uint8_t * pbuf, uint8_t len) * @} */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h index bb1f857b9..4a9202123 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/App/usbd_desc.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -142,4 +141,3 @@ extern USBD_DescriptorsTypeDef HID_Desc; #endif /* __USBD_DESC__C__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c index 21f42c6a1..208370a60 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,11 +67,11 @@ extern void SystemClock_Config(void); *******************************************************************************/ /* MSP Init */ -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { GPIO_InitTypeDef GPIO_InitStruct = {0}; if(pcdHandle->Instance==USB) @@ -105,11 +104,11 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* pcdHandle) } } -#if (USE_HAL_PCD_REGISTER_CALLBACK == 1U) +#if (USE_HAL_PCD_REGISTER_CALLBACKS == 1U) static void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) #else void HAL_PCD_MspDeInit(PCD_HandleTypeDef* pcdHandle) -#endif /* USE_HAL_PCD_REGISTER_CALLBACK */ +#endif /* USE_HAL_PCD_REGISTER_CALLBACKS */ { if(pcdHandle->Instance==USB) { @@ -766,4 +765,3 @@ USBD_StatusTypeDef USBD_Get_USB_Status(HAL_StatusTypeDef hal_status) } return usb_status; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h index 468592084..46982eb11 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/USB_Device/Target/usbd_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -175,4 +174,3 @@ void USBD_static_free(void *p); #endif /* __USBD_CONF__H__ */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/readme.txt index 0ff31f18c..c7177fdc4 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/USB_Device/HID_Standalone/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the USB HID application. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h index 0ea10c5f2..db2aabacb 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -334,7 +333,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -349,4 +348,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index cee08b189..1e8ee456d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h index 72becb5d2..986f6e5d1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,5 +90,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/vcp_conf.h index 064cd6f1a..5e4968f1a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c index d57afbd99..67097dbda 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -493,4 +492,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c index 24b3a8ebf..4244768e3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -423,4 +422,3 @@ IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c index aeba6430e..2b3f9c6c3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -122,7 +121,7 @@ static void APP_ZIGBEE_MeterId_Server_Init(void){ APP_DBG("[METER ID] Writing Company Name attribute."); status = ZbZclAttrStringWriteShort(zigbee_app_info.meterid_server_1, ZCL_METER_ID_ATTR_COMPANY_NAME, (const uint8_t*)&ZCL_company_mame_string); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[METER ID] Error writting local attribute."); + APP_DBG("[METER ID] Error writing local attribute."); assert(0); } @@ -130,7 +129,7 @@ static void APP_ZIGBEE_MeterId_Server_Init(void){ APP_DBG("[METER ID] Writing Meter Type ID attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.meterid_server_1, ZCL_METER_ID_ATTR_METER_TYPE_ID, METER_TYPE_ID); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[METER ID] Error writting local attribute."); + APP_DBG("[METER ID] Error writing local attribute."); assert(0); } @@ -383,7 +382,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -471,7 +470,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -606,4 +605,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt index 35e7b9bbe..9c6febeb0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_MeterId_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Meter Identification cluster as a server on a centralized Zigbee network. +How to use the Meter Identification cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Meter Identification cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h index 9d94a1679..4129abef3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -333,7 +332,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -348,4 +347,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h index cee08b189..1e8ee456d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h index 72becb5d2..986f6e5d1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,5 +90,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/vcp_conf.h index 064cd6f1a..5e4968f1a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c index 3a59699e4..34588f606 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -494,4 +493,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c index 24b3a8ebf..4244768e3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -423,4 +422,3 @@ IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c index 16d72918f..a0b698c3e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -337,7 +336,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -440,7 +439,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -575,4 +574,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt index eae363fb4..1c774ff71 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Client_Router/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a client on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Client with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h index 7bccccc2f..bf5a78621 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -332,7 +331,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -347,4 +346,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h index cee08b189..1e8ee456d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h index 72becb5d2..986f6e5d1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,5 +90,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/vcp_conf.h index 064cd6f1a..5e4968f1a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c index d57afbd99..67097dbda 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -493,4 +492,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c index 24b3a8ebf..4244768e3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -423,4 +422,3 @@ IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c index 6809315f6..cd8a58950 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -402,7 +401,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -490,7 +489,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -625,4 +624,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt index 55fef28d8..a9c7d5be2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_OnOff_Server_Coord/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use OnOff cluster as a server on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the OnOff cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h index 15efa6e2e..0d1b50801 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_common.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,4 +114,3 @@ extern "C"{ #endif /*APP_COMMON_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h index db42dba52..1f97a201b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -103,7 +102,7 @@ * The higher is the value, the better is the power consumption and the accuracy of the timerserver * The lower is the value, the finest is the granularity * - * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to ouput + * CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output * clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding * the wakeup timer. A lower clock speed would impact the accuracy of the timer server. * @@ -341,7 +340,7 @@ typedef enum { ******************************************************************************/ /** * Supported requester to the MCU Low Power Manager - can be increased up to 32 - * It lits a bit mapping of all user of the Low Power Manager + * It lists a bit mapping of all user of the Low Power Manager */ typedef enum { CFG_LPM_APP, @@ -356,4 +355,3 @@ typedef enum { #endif /*APP_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h index da5fabb6e..ae746ae3e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/app_entry.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*APP_ENTRY_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h index d5f531b16..05aaaf731 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_conf.h @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_conf.h * Description : Hardware configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -244,4 +243,3 @@ #endif /*HW_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h index f42bd938f..7f24c2913 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -147,7 +146,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessfull or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -246,5 +245,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h index b6670fcf6..138e647cd 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -67,5 +66,3 @@ void Error_Handler(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h index d8e67947f..49bc3661f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** + ****************************************************************************** * @file stm32_lpm_if.h * @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* -*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                            -* -* This software component is licensed by ST under BSD 3-Clause license, -* the "License"; You may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +76,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h index cee08b189..1e8ee456d 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h index 72becb5d2..986f6e5d1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm32wbxx_it.h @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.h * @brief This file contains the headers of the interrupt handlers. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -91,5 +90,3 @@ void IPCC_C1_RX_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h index 3c4b2c537..758369e64 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/stm_logging.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h index 1da072f2d..fcab34b06 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/utilities_conf.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,4 +64,3 @@ extern "C" { #endif /*UTILITIES_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/vcp_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/vcp_conf.h index 064cd6f1a..5e4968f1a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/vcp_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Inc/vcp_conf.h @@ -1,21 +1,20 @@ /** - ****************************************************************************** + ****************************************************************************** * @file vcp_conf.h * @author MCD Application Team * @brief Configuration of the vcp interface - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -50,5 +49,3 @@ extern "C" #endif #endif /*__VCP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c index 0990cea10..bd9cd1f4c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/app_entry.c @@ -5,16 +5,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -494,4 +493,3 @@ static void UartCmdExecute(void) } } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c index e0e4fcb5d..f1444495a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_timerserver.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : hw_timerserver.c * Description : Hardware timerserver source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -890,4 +889,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c index ce910235c..1744bc74c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/hw_uart.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -315,4 +314,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c index 2fee4ced9..f16c2cc32 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/main.c @@ -3,6 +3,17 @@ * @file : main.c * @brief : Main program body * + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** @verbatim ============================================================================== ##### IMPORTANT NOTE ##### @@ -22,19 +33,8 @@ @endverbatim ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "main.h" @@ -524,5 +524,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c index fba978d88..fd5ffa733 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32_lpm_if.c @@ -1,18 +1,17 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** + *************************************************************************************** * File Name : stm32_lpm_if.c * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + *************************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +276,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +346,4 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c index bce4b8fb6..5963c1e19 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -331,4 +330,3 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c index 24b3a8ebf..4244768e3 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm32wbxx_it.c @@ -3,16 +3,15 @@ ****************************************************************************** * @file stm32wbxx_it.c * @brief Interrupt Service Routines. - ******************************************************************************* + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -423,4 +422,3 @@ IPCC_C1_RX_IRQHandler(void) return; } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c index 4cb535105..95968024f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/stm_logging.c @@ -1,6 +1,6 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** + ****************************************************************************** * File Name : stm_logging.c * Description : This file contains all the defines and functions used * for logging on Application examples. @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c index cb2a3e777..5b380f01a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf index b50e32be9..6407af433 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/EWARM/stm32wb55xx_flash_cm4.icf @@ -39,9 +39,9 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s index a8863c804..b0c83982a 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c index 23180b659..dda5abe79 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Core/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Generated by STM32CubeIDE * @brief STM32CubeIDE System Memory calls file @@ -7,19 +7,18 @@ * For more information about which C functions * need which of these lowlevel functions * please consult the newlib libc manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include @@ -60,7 +59,7 @@ void *_sbrk(ptrdiff_t incr) const uint8_t *max_heap = (uint8_t *)stack_limit; uint8_t *prev_heap_end; - /* Initalize heap end at first call */ + /* Initialize heap end at first call */ if (NULL == __sbrk_heap_end) { __sbrk_heap_end = &_end; diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s index 2f6d91285..78680e0ea 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/Application/User/Startup/startup_stm32wb55rgvx.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -93,7 +92,7 @@ LoopFillZerobss: Reset_Handler: ldr r0, =_estack mov sp, r0 /* set stack pointer */ -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld index cdb1e6174..54e2a2c9f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32CubeIDE/STM32WB55RGVX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c index 05e723dd1..227a54919 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.c @@ -1,20 +1,19 @@ /** - ****************************************************************************** - * File Name : App/app_zigbee.c - * Description : Zigbee Application. - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 - * - ****************************************************************************** - */ + ****************************************************************************** + * File Name : App/app_zigbee.c + * Description : Zigbee Application. + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes ------------------------------------------------------------------*/ #include "app_common.h" @@ -134,7 +133,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Total Profile Number attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_TOTAL_PROFILENUM, TOTAL_PROFILENUM); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -142,7 +141,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Multiple Scheduling attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_MULTIPLE_SCHED, MULTIPLE_SCHEDULING); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -150,7 +149,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Energy Formating attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_ENERGY_FORMAT, ENERGY_FORMATING); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -158,7 +157,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Energy Remote attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_ENERGY_REMOTE, ENERGY_REMOTE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -166,7 +165,7 @@ static void APP_ZIGBEE_PowerProfile_Server_Init(void){ APP_DBG("[POWER PROFILE] Writing Schedule Mode attribute."); status = ZbZclAttrIntegerWrite(zigbee_app_info.powerprofile_server_1, ZCL_POWER_PROF_SVR_ATTR_SCHEDULE_MODE, SCHEDULE_MODE); if(status != ZCL_STATUS_SUCCESS){ - APP_DBG("[POWER PROFILE] Error writting local attribute."); + APP_DBG("[POWER PROFILE] Error writing local attribute."); assert(0); } @@ -688,7 +687,7 @@ static void APP_ZIGBEE_TraceError(const char *pMess, uint32_t ErrCode) /** * @brief Check if the Coprocessor Wireless Firmware loaded supports Zigbee - * and display associated informations + * and display associated information * @param None * @retval None */ @@ -789,7 +788,7 @@ void ZIGBEE_CmdTransfer(void) } /* ZIGBEE_CmdTransfer */ /** - * @brief This function is called when the M0+ acknoledge the fact that it has received a Cmd + * @brief This function is called when the M0+ acknowledge the fact that it has received a Cmd * * * @param Otbuffer : a pointer to TL_EvtPacket_t @@ -924,4 +923,3 @@ void APP_ZIGBEE_ProcessRequestM0ToM4(void) } } -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h index 11fc8c399..1ea310bc2 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/app_zigbee.h @@ -6,16 +6,15 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef APP_ZIGBEE_H #define APP_ZIGBEE_H @@ -59,4 +58,3 @@ void Pre_ZigbeeCmdProcessing(void); #endif /* APP_ZIGBEE_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h index b468b2863..d54b76ff0 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/App/tl_dbg_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,7 +41,7 @@ #define TL_HCI_EVT_DBG_EN 0 /* Reports BLE Asynchronous Events received from CPU2 */ #define TL_HCI_EVT_DBG_RAW_EN 0 /* Reports raw data BLE Asynchronous Events received from CPU2 */ -#define TL_MM_DBG_EN 0 /* Reports the informations of the buffer released to CPU2 */ +#define TL_MM_DBG_EN 0 /* Reports the information of the buffer released to CPU2 */ /** * Macro definition @@ -123,4 +122,3 @@ #endif /*__TL_DBG_CONF_H */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c index e7049681d..6aceffd62 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/STM32_WPAN/Target/hw_ipcc.c @@ -1,18 +1,17 @@ /** - ****************************************************************************** + ****************************************************************************** * File Name : Target/hw_ipcc.c * Description : Hardware IPCC source file for STM32WPAN Middleware. * - ****************************************************************************** + ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -162,10 +161,7 @@ void HW_IPCC_Tx_Handler( void ) HW_IPCC_ZIGBEE_CmdEvtHandler(); } #endif /* ZIGBEE_WB */ - else if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL )) - { - HW_IPCC_SYS_CmdEvtHandler(); - } + else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL )) { HW_IPCC_MM_FreeBufHandler(); @@ -672,4 +668,3 @@ static void HW_IPCC_TRACES_EvtHandler( void ) __weak void HW_IPCC_TRACES_EvtNot( void ){}; -/******************* (C) COPYRIGHT 2019 STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt index 8aac8b3c9..5454ffbac 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Applications/Zigbee/Zigbee_PowerProfile_Server_Router/readme.txt @@ -9,19 +9,19 @@ * using a centralized network. ****************************************************************************** * - * Copyright (c) 2020 STMicroelectronics. All rights reserved. + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim @par Application Description -How to use Power Profile cluster as a server on a centralized Zigbee network. +How to use the Power Profile cluster on a device acting as a Server with Router role within a Centralized Zigbee network. The purpose of this application is to show how to create a Zigbee centralized network, and how to communicate from one node to another one using the Power Profile cluster. Once the Zigbee mesh diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/EWARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/EWARM/startup_stm32wb55xx_cm4.s index f3b216985..911641737 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/EWARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/EWARM/startup_stm32wb55xx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                            © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                            +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/main.h b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/main.h index f0c6f41ca..ba4002e2e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/main.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/main.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -31,5 +30,3 @@ /* Exported functions ------------------------------------------------------- */ #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_hal_conf.h b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_hal_conf.h index f32f08581..cbb44259b 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_hal_conf.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -333,5 +334,3 @@ #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_it.h b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_it.h index 8628872af..db23b559e 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_it.h +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Inc/stm32wbxx_it.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -47,5 +46,3 @@ void EXTI15_10_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/MDK-ARM/startup_stm32wb55xx_cm4.s b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/MDK-ARM/startup_stm32wb55xx_cm4.s index 61fc19a49..90dcb223f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/MDK-ARM/startup_stm32wb55xx_cm4.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/MDK-ARM/startup_stm32wb55xx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/Startup/startup_stm32wb55cgux.s b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/Startup/startup_stm32wb55cgux.s index 295a7bb21..380473efe 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/Startup/startup_stm32wb55cgux.s +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/Startup/startup_stm32wb55cgux.s @@ -14,13 +14,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -101,7 +100,7 @@ Reset_Handler: INIT_BSS _sbss, _ebss INIT_BSS _sMB_MEM2, _eMB_MEM2 -/* Call the clock system intitialization function.*/ +/* Call the clock system initialization function.*/ bl SystemInit /* Call static constructors */ bl __libc_init_array @@ -442,4 +441,3 @@ g_pfnVectors: .weak DMAMUX1_OVR_IRQHandler .thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/syscalls.c b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/syscalls.c index 4ec95844d..0a2679a25 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/syscalls.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/syscalls.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file syscalls.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/sysmem.c b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/sysmem.c index 4665417ed..e5f94e4e1 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/sysmem.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/Example/User/sysmem.c @@ -1,5 +1,5 @@ /** - ****************************************************************************** + ****************************************************************************** * @file sysmem.c * @author Auto-generated by STM32CubeIDE * @brief STM32CubeIDE Minimal System Memory calls file @@ -7,19 +7,18 @@ * For more information about which c-functions * need which of these lowlevel functions * please consult the Newlib libc-manual - ****************************************************************************** - * @attention - * - *

                                                                                            © Copyright (c) 2020 STMicroelectronics. - * All rights reserved.

                                                                                            - * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause - * - ****************************************************************************** - */ + ****************************************************************************** + * @attention + * + * Copyright (c) 2020-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* Includes */ #include diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld index b88fae36f..cc4c23e00 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/STM32CubeIDE/STM32WB55CGUX_FLASH.ld @@ -15,30 +15,14 @@ ** of any kind. ** ***************************************************************************** +** @attention ** -**

                                                                                            © COPYRIGHT(c) 2019 STMicroelectronics

                                                                                            +** Copyright (c) 2019 STMicroelectronics. +** All rights reserved. ** -** Redistribution and use in source and binary forms, with or without modification, -** are permitted provided that the following conditions are met: -** 1. Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** 2. Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** 3. Neither the name of STMicroelectronics nor the names of its contributors -** may be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** This software is licensed under terms that can be found in the LICENSE file +** in the root directory of this software component. +** If no LICENSE file comes with this software, it is provided AS-IS. ** ***************************************************************************** */ @@ -145,7 +129,7 @@ SECTIONS . = ALIGN(4); .bss : { - /* This is used by the startup in order to initialize the .bss secion */ + /* This is used by the startup in order to initialize the .bss section */ _sbss = .; /* define a global symbol at bss start */ __bss_start__ = _sbss; *(.bss) diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/main.c b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/main.c index 496ac5932..fd25b9525 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/main.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -134,5 +133,3 @@ void assert_failed(uint8_t *file, uint32_t line) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/stm32wbxx_it.c b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/stm32wbxx_it.c index 463041e1b..97830cbd5 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/stm32wbxx_it.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/stm32wbxx_it.c @@ -1,4 +1,4 @@ -/** +/** ****************************************************************************** * @file BSP/BSP/Src/stm32wbxx_it.c * @author MCD Application Team @@ -8,13 +8,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -163,5 +162,3 @@ void EXTI15_10_IRQHandler(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/system_stm32wbxx.c b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/system_stm32wbxx.c index efd4c8554..bac9a055f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/system_stm32wbxx.c +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                            © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                            + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Apache License, Version 2.0, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/Apache-2.0 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -161,10 +160,12 @@ const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \ 4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */ +#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) const uint32_t SmpsPrescalerTable[4UL][6UL]={{1UL,3UL,2UL,2UL,1UL,2UL}, \ {2UL,6UL,4UL,3UL,2UL,4UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}, \ {4UL,12UL,8UL,6UL,4UL,8UL}}; +#endif /** * @} @@ -349,5 +350,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/readme.txt b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/readme.txt index 2d2f355a8..a9689b59f 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/readme.txt +++ b/Projects/P-NUCLEO-WB55.USBDongle/Examples/BSP/readme.txt @@ -8,12 +8,12 @@ * @brief Description of the BSP example. ****************************************************************************** * - * Copyright (c) 2019 STMicroelectronics. All rights reserved. + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** @endverbatim diff --git a/Projects/P-NUCLEO-WB55.USBDongle/Release_Notes.html b/Projects/P-NUCLEO-WB55.USBDongle/Release_Notes.html index 5334231b1..59664dd7c 100644 --- a/Projects/P-NUCLEO-WB55.USBDongle/Release_Notes.html +++ b/Projects/P-NUCLEO-WB55.USBDongle/Release_Notes.html @@ -42,12 +42,24 @@

                                                                                            Update History

                                                                                            - +

                                                                                            Main Changes

                                                                                            Maintenance

                                                                                            • Update of FW projects following changes in latest version of HAL/LL and Middlewares
                                                                                              • +
                                                                                            +


                                                                                            +

                                                                                            +
                                                                                            +
                                                                                            +
                                                                                            + +
                                                                                            +

                                                                                            Main Changes

                                                                                            +

                                                                                            Maintenance

                                                                                            +
                                                                                              +
                                                                                            • Update of FW projects following changes in latest version of HAL/LL and Middlewares
                                                                                            • Update linker files templates for all IDE (.icf/.sct/.ld)
                                                                                              • RAM start address has been updated from 0x20000000/0x20000004 to 0x20000008 to be aligned on a 8 byte boundary, and be compatible with ARM Compiler 6 (Keil MDK-ARM)
                                                                                                • @@ -60,8 +72,8 @@
                                                                                                -

                                                                                                Main Changes

                                                                                                -

                                                                                                Maintenance

                                                                                                +

                                                                                                Main Changes

                                                                                                +

                                                                                                Maintenance

                                                                                                • Update BLE applications:
                                                                                                    @@ -79,8 +91,8 @@
                                                                                                    -

                                                                                                    Main Changes

                                                                                                    -

                                                                                                    Maintenance

                                                                                                    +

                                                                                                    Main Changes

                                                                                                    +

                                                                                                    Maintenance

                                                                                                    • Ensure the option “required prototype” is enabled in all IAR projects.
                                                                                                    • Ensure compatibility with STM32CubeMX 6.2.0
                                                                                                      • @@ -90,8 +102,8 @@
                                                                                                      -

                                                                                                      Main Changes

                                                                                                      -

                                                                                                      Maintenance

                                                                                                      +

                                                                                                      Main Changes

                                                                                                      +

                                                                                                      Maintenance

                                                                                                      • Ensure compatibility with STM32CubeMX 6.1.0
                                                                                                      @@ -100,14 +112,14 @@
                                                                                                      -

                                                                                                      Main Changes

                                                                                                      +

                                                                                                      Main Changes

                                                                                                      Update BLE and Thread example

                                                                                                      -

                                                                                                      Main Changes

                                                                                                      +

                                                                                                      Main Changes

                                                                                                      Replace SW4STM32 by STM32CubeIDE projects files for all examples and application

                                                                                                      • Compatibility with STM32CubeMX 6.0.0
                                                                                                        • @@ -117,7 +129,7 @@
                                                                                                        -

                                                                                                        Main Changes

                                                                                                        +

                                                                                                        Main Changes

                                                                                                        Add BLE Mesh split of BLE_MeshLightingDemo project in:

                                                                                                        • BLE_MeshLightingLPN (Low Power Node),
                                                                                                          • @@ -128,8 +140,8 @@
                                                                                                          -

                                                                                                          Main Changes

                                                                                                          -

                                                                                                          Maintenance

                                                                                                          +

                                                                                                          Main Changes

                                                                                                          +

                                                                                                          Maintenance

                                                                                                          • Zigbee:
                                                                                                              @@ -146,8 +158,8 @@
                                                                                                              -

                                                                                                              Main Changes

                                                                                                              -

                                                                                                              Maintenance

                                                                                                              +

                                                                                                              Main Changes

                                                                                                              +

                                                                                                              Maintenance

                                                                                                              • Zigbee:
                                                                                                                  @@ -163,8 +175,8 @@
                                                                                                                  -

                                                                                                                  Main Changes

                                                                                                                  -

                                                                                                                  Maintenance

                                                                                                                  +

                                                                                                                  Main Changes

                                                                                                                  +

                                                                                                                  Maintenance

                                                                                                                  • Ensure compatibility with STM32CubeMX V5.4.
                                                                                                                  • Correct Ticket 65791 - .bin generated by SW4STM32 is too big
                                                                                                                    • @@ -174,15 +186,15 @@
                                                                                                                    -

                                                                                                                    Main Changes

                                                                                                                    -

                                                                                                                    Maintenance

                                                                                                                    +

                                                                                                                    Main Changes

                                                                                                                    +

                                                                                                                    Maintenance

                                                                                                                    Adapt applications to new utility directory tree.

                                                                                                                    -

                                                                                                                    Main Changes

                                                                                                                    +

                                                                                                                    Main Changes

                                                                                                                    Remove binaries, Addition of new examples

                                                                                                                    Change directory name to reflect board RPN: P-NUCLEO-WB55

                                                                                                                    Add USB Device applications:

                                                                                                                    @@ -195,7 +207,7 @@
                                                                                                                    -

                                                                                                                    Main Changes

                                                                                                                    +

                                                                                                                    Main Changes

                                                                                                                    First release

                                                                                                                    First official release.

                                                                                                                    diff --git a/Projects/STM32CubeProjectsList.html b/Projects/STM32CubeProjectsList.html index ad8cd9089..62c28df38 100644 --- a/Projects/STM32CubeProjectsList.html +++ b/Projects/STM32CubeProjectsList.html @@ -18,7 +18,7 @@

                                                                                                                    STM32CubeWB Firmware Examples for STM32WBxx Series

                                                                                                                    -

                                                                                                                    Copyright 2021 STMicroelectronics

                                                                                                                    +

                                                                                                                    Copyright 2019 STMicroelectronics

                                                                                                                    @@ -118,14 +118,14 @@ This projects provides a reference template through the LL API that can be used CubeMx - CubeMx - - + CubeMx - Total number of templates_ll: 2 + Total number of templates_ll: 3 1 0 1 - 0 + 1

                                                                                                                    Examples

                                                                                                                    @@ -2562,11 +2562,21 @@ the STM32WBxx UART HAL and LL API, the LL API being used for performance improve 6 -

                                                                                                                    Applications

                                                                                                                    -

                                                                                                                    BLE

                                                                                                                    +

                                                                                                                    Applications

                                                                                                                    +

                                                                                                                    BLE

                                                                                                                    +

                                                                                                                    BLE_AT_Server

                                                                                                                    + +How to demonstrate Point-to-Point communication using BLE component (as GATT server). + + - + - + New + - + +

                                                                                                                    BLE_Beacon

                                                                                                                    -How to advertize 3 types of beacon ( tlm, uuid, url ). +How to advertise 3 types of beacon ( tlm, uuid, url ). - - @@ -2628,7 +2638,7 @@ How to use the Health Thermometer profile as specified by the BLE SIG. How to use the Heart Rate profile as specified by the BLE SIG. - X + CubeMx X CubeMx CubeMx @@ -2692,7 +2702,7 @@ How to use the Human Interface Device profile as specified by the BLE SIG. - X X - - + New

                                                                                                                    BLE_MeshLightingPRFNode

                                                                                                                    @@ -2701,20 +2711,31 @@ How to use the Human Interface Device profile as specified by the BLE SIG. - X X - - + New

                                                                                                                    BLE_MeshLightingProvisioner

                                                                                                                    - This is the implementation of the BLE Mesh Lighting profile as specified by the BLE SIG. + This is the implementation of the BLE Mesh Lighting Embedded Provisioner as specified by the BLE SIG, +a Node with the capacity of creating MESH network from unprovisionned Nodes, like Proxy-Relay-Friend Nodes or +Low Power Nodes. - - X - + +

                                                                                                                    BLE_Mesh_Model_Sensor

                                                                                                                    + This is the implementation of a BLE Mesh Sensor Model (Client and Server) as specified by the BLE SIG. + + New + - + - + - +

                                                                                                                    BLE_Mesh_ThermometerSensor

                                                                                                                    - This is the implementation of a BLE Mesh Vendor profile as specified by the BLE SIG. + This is the implementation of a BLE Mesh Vendor model as specified by the BLE SIG. X - @@ -2754,7 +2775,7 @@ How to communicate with simple BLE peripheral with minimum activated features.

                                                                                                                    BLE_Peripheral_Lite_EventCallbacks

                                                                                                                    -How to communicate with simple BLE peripheral with minimum activated features. +How to communicate with simple BLE peripheral with minimum activated features with implemented BLE API event callbacks functions. - - @@ -2784,9 +2805,9 @@ How to demonstrate the capability to erase/write the flash while a Point-to-Poin

                                                                                                                    BLE_Sensor

                                                                                                                    -This example is to demonstrate capabilities of STM32WB5MM Discovery Kit with the use of board sensors. +This example is to demonstrate capabilities of STM32WB5MM Discovery Kit with the use of board sensors. - X + CubeMx - - - @@ -2796,7 +2817,7 @@ This example is to demonstrate capabilities of STM32WB5MM Discovery Kit with the How to communicate with the STM32CubeMonitor-RF Tool using the transparent mode. - X + CubeMx - CubeMx CubeMx @@ -2804,7 +2825,7 @@ How to communicate with the STM32CubeMonitor-RF Tool using the transparent mode.

                                                                                                                    BLE_TransparentModeVCP

                                                                                                                    -How to communicate with the STM32CubeMonitor-RF Tool using the transparent mode. +How to communicate with the STM32CubeMonitor-RF Tool using the transparent mode through USB Virtual COM Port. - X @@ -2835,7 +2856,7 @@ How to demonstrate Point-to-Point communication using BLE component (as GATT cli How to demonstrate Point-to-Point communication using BLE component (as GATT server). - X + CubeMx X CubeMx CubeMx @@ -2851,7 +2872,7 @@ How to demonstrate Point-to-Point communication using BLE component (peripherica X -

                                                                                                                    BLE_LLD

                                                                                                                    +

                                                                                                                    BLE_LLD

                                                                                                                    BLE_LLD_Chat

                                                                                                                    How to create a "Chat" talk between 2 boards using terminals. @@ -2861,6 +2882,16 @@ How to create a "Chat" talk between 2 boards using terminals. X X + +

                                                                                                                    BLE_LLD_Datarate

                                                                                                                    + +How to send BLE LLD packets in high data rate. + + - + - + New + - +

                                                                                                                    BLE_LLD_Lowpower

                                                                                                                    @@ -2937,7 +2968,7 @@ How to use BLE application and Thread application in static concurrent mode. - -

                                                                                                                    BLE_Zigbee

                                                                                                                    +

                                                                                                                    BLE_Zigbee

                                                                                                                    BLE_Zigbee_Dyn

                                                                                                                    How to use BLE application and Zigbee application (acting as router) in dynamic concurrent mode. @@ -2951,16 +2982,6 @@ How to use BLE application and Zigbee application (acting as router) in dynamic

                                                                                                                    BLE_Zigbee_Dyn_SED

                                                                                                                    How to use BLE application and Zigbee application (acting as sleep end device) in dynamic concurrent mode. - - - - - - X - - - - -

                                                                                                                    BLE_Zigbee_Static

                                                                                                                    - -How to use BLE application and Zigbee application in static concurrent mode. - - @@ -3124,7 +3145,7 @@ How to create a "PHY_802.15.4 command line interface" application on STM32WB55xx - -

                                                                                                                    Thread

                                                                                                                    +

                                                                                                                    Thread

                                                                                                                    Thread_Cli_Cmd

                                                                                                                    How to control the Thread stack via Cli commands. @@ -3157,7 +3178,7 @@ How to build Thread application based on Coap messages.

                                                                                                                    Thread_Coap_Generic_Ota

                                                                                                                    -How to build Thread application based on Coap messages. +How to build Thread application based on Coap messages (OTA mode). - - @@ -3207,7 +3228,7 @@ How to exchange multicast Coap messages.

                                                                                                                    Thread_Ota

                                                                                                                    -How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread. +How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread (Client side). - - @@ -3217,7 +3238,7 @@ How to update Over The Air (OTA) FW application and Copro Wireless binary using

                                                                                                                    Thread_Ota_Server

                                                                                                                    -How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread. +How to update Over The Air (OTA) FW application and Copro Wireless binary using Thread (Server side). - - @@ -3227,7 +3248,6 @@ How to update Over The Air (OTA) FW application and Copro Wireless binary using

                                                                                                                    Thread_RCP

                                                                                                                    - This application is used to demonstrate the OpenThread Border router feature using an STM32WB device. - @@ -3235,6 +3255,16 @@ This application is used to demonstrate the OpenThread Border router feature usi X - + +

                                                                                                                    Thread_RCP_Cli_Cmd

                                                                                                                    + +How to control the Thread stack via Cli commands and trigger an automatic commissioning joiner sequence from a press button. + + - + - + New + - +

                                                                                                                    Thread_SED_Coap_FreeRTOS

                                                                                                                    @@ -3322,7 +3352,7 @@ Use of the USB device application based on the Human Interface (HID).

                                                                                                                    Zigbee

                                                                                                                    Zigbee_APS_Coord

                                                                                                                    -How to use the APS layer in an application with a centralized Zigbee network. +How to use the APS layer in an application acting as a Zigbee Coordinator within a centralized network. - - @@ -3332,7 +3362,7 @@ How to use the APS layer in an application with a centralized Zigbee network.

                                                                                                                    Zigbee_APS_Router

                                                                                                                    -How to use the APS layer in an application with a centralized Zigbee network. +How to use the APS layer in an application acting as a Router within a centralized Zigbee network. - - @@ -3342,7 +3372,7 @@ How to use the APS layer in an application with a centralized Zigbee network.

                                                                                                                    Zigbee_Commissioning_Client_Coord

                                                                                                                    -How to use Commissioning cluster as a client on a centralized Zigbee network. +How to use the Commissioning cluster on a device acting as a Client with Coordinator role within a Centralized Zigbee network. - - @@ -3352,7 +3382,7 @@ How to use Commissioning cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_Commissioning_Server_Router

                                                                                                                    -How to use Commissioning cluster as a client on a centralized Zigbee network. +How to use the Commissioning cluster on a device acting as a Server with Router role within a Centralized Zigbee network. - - @@ -3362,7 +3392,7 @@ How to use Commissioning cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_DevTemp_Client_Router

                                                                                                                    -How to use DevTemp cluster on a Centralized Zigbee network with device acting as router. +How to use the Device Temperature cluster on a device acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3372,7 +3402,7 @@ How to use DevTemp cluster on a Centralized Zigbee network with device acting as

                                                                                                                    Zigbee_DevTemp_Server_Coord

                                                                                                                    -How to use DevTemp cluster on a Centralized Zigbee network with device acting as server. +How to use the Device Temperature cluster on a device acting as a Server with Coordinator role on a Centralized Zigbee network. - - @@ -3382,7 +3412,7 @@ How to use DevTemp cluster on a Centralized Zigbee network with device acting as

                                                                                                                    Zigbee_Diagnostic_Client_Router

                                                                                                                    -How to use Diagnostic cluster as a client on a centralized Zigbee network. +How to use the Diagnostic cluster on a device acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3392,7 +3422,7 @@ How to use Diagnostic cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_Diagnostic_Server_Coord

                                                                                                                    -How to use Diagnostic cluster as a server on a centralized Zigbee network. +How to use the Diagnostic cluster as a device acting as a Server with Coordinator role within a Centralized Zigbee network. - - @@ -3402,7 +3432,7 @@ How to use Diagnostic cluster as a server on a centralized Zigbee network.

                                                                                                                    Zigbee_DoorLock_Client_Router

                                                                                                                    -How to use Door Lock cluster as a client on a centralized Zigbee network. +How to use the Door Lock cluster on a device acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3412,7 +3442,7 @@ How to use Door Lock cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_DoorLock_Server_Coord

                                                                                                                    -How to use Door Lock cluster as a client on a centralized Zigbee network. +ow to use the Door Lock cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. - - @@ -3422,7 +3452,7 @@ How to use Door Lock cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_Find_Bind_Coord

                                                                                                                    -How to use Finding and Binding on a centralized Zigbee network. +How to use the Finding and Binding feature on a device acting as a Server with Coordinator role within a Centralized Zigbee network. - - @@ -3432,7 +3462,7 @@ How to use Finding and Binding on a centralized Zigbee network.

                                                                                                                    Zigbee_Find_Bind_IAS_Router2

                                                                                                                    -How to use Finding and Binding on a centralized Zigbee network. +How to use the Finding and Binding feature on a device using IAS cluster, acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3442,7 +3472,7 @@ How to use Finding and Binding on a centralized Zigbee network.

                                                                                                                    Zigbee_Find_Bind_OnOff_Router1

                                                                                                                    -How to use Finding and Binding on a centralized Zigbee network. +How to use the Finding and Binding feature on a device using OnOff cluster, acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3452,7 +3482,7 @@ How to use Finding and Binding on a centralized Zigbee network.

                                                                                                                    Zigbee_IAS_WD_Client_Router

                                                                                                                    -How to use IAS WD cluster as a client on a centralized Zigbee network. +How to use the IAS WD (Intruder Alarm System Warning Device) cluster on a device acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3462,7 +3492,7 @@ How to use IAS WD cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_IAS_WD_Server_Coord

                                                                                                                    -How to use IAS WD cluster as a server on a centralized Zigbee network. +How to use the IAS WD (Intruder Alarm System Warning Device) cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. - - @@ -3472,7 +3502,7 @@ How to use IAS WD cluster as a server on a centralized Zigbee network.

                                                                                                                    Zigbee_MeterId_Client_Router

                                                                                                                    -How to use Meter Identification cluster as a client on a centralized Zigbee network. +How to use the Meter Identification cluster on a device acting as a client with Router role within a Centralized Zigbee network. - - @@ -3482,7 +3512,7 @@ How to use Meter Identification cluster as a client on a centralized Zigbee netw

                                                                                                                    Zigbee_MeterId_Server_Coord

                                                                                                                    -How to use Meter Identification cluster as a server on a centralized Zigbee network. +How to use the Meter Identification cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. - X @@ -3492,7 +3522,7 @@ How to use Meter Identification cluster as a server on a centralized Zigbee netw

                                                                                                                    Zigbee_OTA_Client_Router

                                                                                                                    -How to use OTA cluster as a client on a centralized Zigbee network. +How to use the OTA cluster on a device acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3502,7 +3532,7 @@ How to use OTA cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_OTA_Server_Coord

                                                                                                                    -How to use OTA cluster as a server on a centralized Zigbee network. +How to use the OTA cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. - - @@ -3512,7 +3542,7 @@ How to use OTA cluster as a server on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Client_Distrib

                                                                                                                    -How to use OnOff cluster as a client on a distributed Zigbee network. +How to use the OnOff cluster on a device acting as a Client within a distributed Zigbee network. - - @@ -3522,7 +3552,7 @@ How to use OnOff cluster as a client on a distributed Zigbee network.

                                                                                                                    Zigbee_OnOff_Client_Router

                                                                                                                    -How to use OnOff cluster as a client on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Client with Router role within a Centralized Zigbee network. X X @@ -3532,7 +3562,7 @@ How to use OnOff cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Client_Router_FreeRTOS

                                                                                                                    -How to use OnOff cluster as a client on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Client with Router role within a Centralized Zigbee network using FreeRTOS. - - @@ -3542,7 +3572,7 @@ How to use OnOff cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Client_Router_Ota

                                                                                                                    -How to use OnOff cluster as a client on a centralized Zigbee network. +How to use an updated OnOff cluster Zigbee application previously downloaded via OTA. - - @@ -3551,8 +3581,8 @@ How to use OnOff cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Client_SED

                                                                                                                    - -How to use OnOff cluster as a client on a centralized Zigbee network. + +How to use the OnOff cluster on a Sleepy End Device acting as a Client within a Centralized Zigbee network. - - @@ -3562,7 +3592,7 @@ How to use OnOff cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Coord_NVM

                                                                                                                    -How to use OnOff cluster with persistent data on a centralized Zigbee network. +How to use the OnOff cluster with persistent data activated on a device acting as Coordinator within a Centralized Zigbee network. - - @@ -3572,7 +3602,7 @@ How to use OnOff cluster with persistent data on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Router_NVM

                                                                                                                    -How to use OnOff cluster with persistent data on a centralized Zigbee network. +How to use the OnOff cluster with persistent data activated on a device acting as Router within a Centralized Zigbee network. - - @@ -3582,7 +3612,7 @@ How to use OnOff cluster with persistent data on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Server_Coord

                                                                                                                    -How to use OnOff cluster as a server on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. X X @@ -3592,7 +3622,7 @@ How to use OnOff cluster as a server on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Server_Coord_FreeRTOS

                                                                                                                    -How to use OnOff cluster as a server on a centralized Zigbee network. +How to use the OnOff cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network using FreeRTOS. - - @@ -3602,7 +3632,7 @@ How to use OnOff cluster as a server on a centralized Zigbee network.

                                                                                                                    Zigbee_OnOff_Server_Distrib

                                                                                                                    -How to use OnOff cluster as a server on a distributed Zigbee network. +How to use the OnOff cluster on a device acting as a Server within a distributed Zigbee network. - - @@ -3612,7 +3642,7 @@ How to use OnOff cluster as a server on a distributed Zigbee network.

                                                                                                                    Zigbee_PollControl_Client_Coord

                                                                                                                    -How to use Poll Control cluster as a client on a centralized Zigbee network. +How to use the Poll Control cluster on a device acting as a client with Coordinator role within a Centralized Zigbee network. - - @@ -3622,7 +3652,7 @@ How to use Poll Control cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_PollControl_Server_SED

                                                                                                                    -How to use Poll Control cluster as a server on a centralized Zigbee network. +How to use the Poll Control cluster on a Sleepy End Device (SED) acting as a Server within a Centralized Zigbee network. - - @@ -3632,7 +3662,7 @@ How to use Poll Control cluster as a server on a centralized Zigbee network.

                                                                                                                    Zigbee_PowerProfile_Client_Coord

                                                                                                                    -How to use Power Profile cluster as a client on a centralized Zigbee network. +How to use the Power Profile cluster on a device acting as a Client with Coordinator role within a Centralized Zigbee network. - - @@ -3642,7 +3672,7 @@ How to use Power Profile cluster as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_PowerProfile_Server_Router

                                                                                                                    -How to use Power Profile cluster as a server on a centralized Zigbee network. +How to use the Power Profile cluster on a device acting as a Server with Router role within a Centralized Zigbee network. - X @@ -3652,7 +3682,7 @@ How to use Power Profile cluster as a server on a centralized Zigbee network.

                                                                                                                    Zigbee_PressMeas_Client_Router

                                                                                                                    -How to use Pressure Measurement cluster on a Centralized Zigbee network with device acting as router. +How to use the Pressure Measurement cluster on a device acting as a client with Router role within a Centralized Zigbee network. - - @@ -3662,7 +3692,7 @@ How to use Pressure Measurement cluster on a Centralized Zigbee network with dev

                                                                                                                    Zigbee_PressMeas_Server_Coord

                                                                                                                    -How to use Pressure Measurement cluster on a Centralized Zigbee network with device acting as server. +How to use the Pressure Measurement cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. - - @@ -3672,7 +3702,7 @@ How to use Pressure Measurement cluster on a Centralized Zigbee network with dev

                                                                                                                    Zigbee_SE_Msg_Client_Coord

                                                                                                                    -How to use SE Messaging cluster on a Centralized Zigbee network with device acting as coordinator (Client). +How to use the Smart Energy Messaging cluster on a device acting as a client with Coordinator role within a Centralized Zigbee network. - - @@ -3682,7 +3712,7 @@ How to use SE Messaging cluster on a Centralized Zigbee network with device acti

                                                                                                                    Zigbee_SE_Msg_Server_Router

                                                                                                                    -How to use SE Messaging cluster on a Centralized Zigbee network with device acting as router (Server). +How to use the Smart Energy Messaging cluster on a device acting as a Server with Router role within a Centralized Zigbee network. - - @@ -3692,7 +3722,7 @@ How to use SE Messaging cluster on a Centralized Zigbee network with device acti

                                                                                                                    Zigbee_TempMeas_Client_Router

                                                                                                                    -How to use TempMeas as a client on a centralized Zigbee network. +How to use the Device Temperature cluster on a device acting as a Client with Router role within a Centralized Zigbee network. X - @@ -3702,7 +3732,7 @@ How to use TempMeas as a client on a centralized Zigbee network.

                                                                                                                    Zigbee_TempMeas_Server_Coord

                                                                                                                    -How to use Temperature Measurement cluster as a server on a centralized Zigbee network. +How to use the Device Temperature cluster on a device acting as a Server with Coordinator role on a Centralized Zigbee network. X - @@ -3712,12 +3742,7 @@ How to use Temperature Measurement cluster as a server on a centralized Zigbee n

                                                                                                                    Zigbee_custom_ls_Client_Router

                                                                                                                    -How to use Custom long string cluster on a Centralized Zigbee network with device -acting as coordinator (Server) - -The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate -from one node to another one using the custom long string cluster. Once the Zigbee mesh network is created, the -user can send requests to the different boards through the push buttons in order to make the LED toggling. +How to use the Custom long string cluster on a device acting as a Client with Router role within a Centralized Zigbee network. - - @@ -3727,12 +3752,7 @@ user can send requests to the different boards through the push buttons in order

                                                                                                                    Zigbee_custom_ls_Server_Coord

                                                                                                                    -How to use Custom long string cluster on a Centralized Zigbee network with device -acting as coordinator (Server) - -The purpose of this application is to show how to create a centralized Zigbee network, and how to communicate -from one node to another one using the custom long string cluster. Once the Zigbee mesh network is created, the -user can send requests to the different boards through the push buttons in order to make the LED toggling. +How to use the Custom long string cluster on a device acting as a Server with Coordinator role within a Centralized Zigbee network. - - @@ -3740,18 +3760,18 @@ user can send requests to the different boards through the push buttons in order - - Total number of applications: 151 - 13 + Total number of applications: 156 + 14 18 - 108 - 12 + 110 + 14 - Total number of projects: 443 - 23 + Total number of projects: 449 + 24 19 - 314 - 87 + 316 + 90 diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/.extSettings b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/.extSettings index 8bafa9b25..45631b545 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/.extSettings +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/.extSettings @@ -1,8 +1,7 @@ [ProjectFiles] HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WB5MM-DK;..\..\..\..\..\..\Drivers\BSP\Components\ssd1315;..\..\..\..\..\..\Drivers\BSP\Components\Common;..\..\..\..\..\..\Utilities\Fonts;..\..\..\..\..\..\Utilities\LCD; [Others] -Define=STM32WL55MM_DK -HALModule=IPCC; +Define=USE_STM32WB5M_DK [Groups] Drivers/BSP/STM32WB5MM-DK=../../../../../../Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk.c;../../../../../../Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_bus.c;../../../../../../Drivers/BSP/STM32WB5MM-DK/stm32wb5mm_dk_lcd.c;../../../../../../Drivers/BSP/Components/ssd1315/ssd1315.c;../../../../../../Drivers/BSP/Components/ssd1315/ssd1315_reg.c; Doc=../readme.txt; diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc new file mode 100644 index 000000000..84f143439 --- /dev/null +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/BLE_HeartRate.ioc @@ -0,0 +1,520 @@ +#MicroXplorer Configuration settings - do not modify +Dma.Request0=USART1_TX +Dma.RequestsNb=1 +Dma.USART1_TX.0.Direction=DMA_MEMORY_TO_PERIPH +Dma.USART1_TX.0.EventEnable=DISABLE +Dma.USART1_TX.0.Instance=DMA2_Channel4 +Dma.USART1_TX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE +Dma.USART1_TX.0.MemInc=DMA_MINC_ENABLE +Dma.USART1_TX.0.Mode=DMA_NORMAL +Dma.USART1_TX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE +Dma.USART1_TX.0.PeriphInc=DMA_PINC_DISABLE +Dma.USART1_TX.0.Polarity=HAL_DMAMUX_REQ_GEN_RISING +Dma.USART1_TX.0.Priority=DMA_PRIORITY_LOW +Dma.USART1_TX.0.RequestNumber=1 +Dma.USART1_TX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,SignalID,Polarity,RequestNumber,SyncSignalID,SyncPolarity,SyncEnable,EventEnable,SyncRequestNumber +Dma.USART1_TX.0.SignalID=NONE +Dma.USART1_TX.0.SyncEnable=DISABLE +Dma.USART1_TX.0.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT +Dma.USART1_TX.0.SyncRequestNumber=1 +Dma.USART1_TX.0.SyncSignalID=NONE +File.Version=6 +GPIO.groupedBy=Group By Peripherals +I2C3.IPParameters=Timing +I2C3.Timing=0x00707CBB +KeepUserPlacement=false +Mcu.Family=STM32WB +Mcu.IP0=DMA +Mcu.IP1=HSEM +Mcu.IP10=STM32_WPAN +Mcu.IP11=SYS +Mcu.IP12=TIM17 +Mcu.IP13=TINY_LPM +Mcu.IP14=USART1 +Mcu.IP2=I2C3 +Mcu.IP3=IPCC +Mcu.IP4=NVIC +Mcu.IP5=RCC +Mcu.IP6=RF +Mcu.IP7=RTC +Mcu.IP8=SEQUENCER +Mcu.IP9=SPI1 +Mcu.IPNb=15 +Mcu.Name=STM32WB5MMGHx +Mcu.Package=LGA86 +Mcu.Pin0=PA2 +Mcu.Pin1=PA1 +Mcu.Pin10=PB5 +Mcu.Pin11=PB4 +Mcu.Pin12=PB3 +Mcu.Pin13=PC10 +Mcu.Pin14=PC11 +Mcu.Pin15=PC12 +Mcu.Pin16=PA13 +Mcu.Pin17=PA14 +Mcu.Pin18=PA15 +Mcu.Pin19=PA10 +Mcu.Pin2=PA0 +Mcu.Pin20=PA12 +Mcu.Pin21=PA11 +Mcu.Pin22=PD0 +Mcu.Pin23=PD1 +Mcu.Pin24=PB13 +Mcu.Pin25=PC6 +Mcu.Pin26=PB14 +Mcu.Pin27=PB15 +Mcu.Pin28=PB6 +Mcu.Pin29=PC13 +Mcu.Pin3=PC3 +Mcu.Pin30=PB12 +Mcu.Pin31=PE4 +Mcu.Pin32=PC5 +Mcu.Pin33=PB11 +Mcu.Pin34=PB10 +Mcu.Pin35=PB2 +Mcu.Pin36=PC4 +Mcu.Pin37=PA8 +Mcu.Pin38=PA9 +Mcu.Pin39=PA7 +Mcu.Pin4=PC2 +Mcu.Pin40=PA6 +Mcu.Pin41=PA5 +Mcu.Pin42=PA4 +Mcu.Pin43=PA3 +Mcu.Pin44=PH0 +Mcu.Pin45=PH1 +Mcu.Pin46=PD14 +Mcu.Pin47=PE1 +Mcu.Pin48=PD13 +Mcu.Pin49=PD12 +Mcu.Pin5=PC1 +Mcu.Pin50=PD2 +Mcu.Pin51=PC9 +Mcu.Pin52=PD3 +Mcu.Pin53=PC7 +Mcu.Pin54=PE3 +Mcu.Pin55=PD4 +Mcu.Pin56=PD9 +Mcu.Pin57=PD8 +Mcu.Pin58=PD15 +Mcu.Pin59=PD10 +Mcu.Pin6=PB9 +Mcu.Pin60=PE2 +Mcu.Pin61=PE0 +Mcu.Pin62=PD5 +Mcu.Pin63=PD6 +Mcu.Pin64=PD11 +Mcu.Pin65=PC8 +Mcu.Pin66=VP_HSEM_VS_HSEM +Mcu.Pin67=VP_IPCC_VS_IPCC +Mcu.Pin68=VP_RCC_V_OSC_IN +Mcu.Pin69=VP_RCC_V_OSC32_IN +Mcu.Pin7=PC0 +Mcu.Pin70=VP_RF_VS_RF +Mcu.Pin71=VP_RTC_VS_RTC_Activate +Mcu.Pin72=VP_SEQUENCER_VS_SEQUENCER +Mcu.Pin73=VP_STM32_WPAN_VS_BLE_HOST +Mcu.Pin74=VP_SYS_VS_Systick +Mcu.Pin75=VP_TIM17_VS_ClockSourceINT +Mcu.Pin76=VP_TINY_LPM_VS_TINY_LPM +Mcu.Pin8=PB8 +Mcu.Pin9=PB7 +Mcu.PinsNb=77 +Mcu.ThirdPartyNb=0 +Mcu.UserConstants= +Mcu.UserName=STM32WB5MMGHx +MxCube.Version=6.4.0 +MxDb.Version=DB.6.0.40 +NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.DMA2_Channel4_IRQn=true\:15\:0\:true\:false\:true\:false\:true +NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.ForceEnableDMAVector=true +NVIC.HSEM_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 +NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true +NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PA0.Locked=true +PA0.Signal=ADCx_IN5 +PA1.Locked=true +PA1.Mode=Full_Duplex_Master +PA1.Signal=SPI1_SCK +PA10.Locked=true +PA10.Signal=I2C1_SDA +PA11.GPIOParameters=GPIO_Label +PA11.GPIO_Label=USB_N +PA11.Locked=true +PA11.Signal=USB_DM +PA12.GPIOParameters=GPIO_Label +PA12.GPIO_Label=USB_P +PA12.Locked=true +PA12.Signal=USB_DP +PA13.GPIOParameters=GPIO_Label +PA13.GPIO_Label=T_SWDIO +PA13.Locked=true +PA13.Signal=SYS_JTMS-SWDIO +PA14.GPIOParameters=GPIO_Label +PA14.GPIO_Label=T_SWCLK +PA14.Locked=true +PA14.Signal=SYS_JTCK-SWCLK +PA15.Locked=true +PA15.Signal=S_TIM2_CH1 +PA2.Locked=true +PA2.Signal=ADCx_IN7 +PA3.GPIOParameters=GPIO_Label +PA3.GPIO_Label=QSPI_BK_SCK +PA3.Locked=true +PA3.Signal=QUADSPI_CLK +PA4.Locked=true +PA4.Signal=SPI1_NSS +PA5.Locked=true +PA5.Signal=ADCx_IN10 +PA6.Locked=true +PA6.Signal=LPUART1_CTS +PA7.Locked=true +PA7.Mode=Full_Duplex_Master +PA7.Signal=SPI1_MOSI +PA8.GPIOParameters=GPIO_Label +PA8.GPIO_Label=SAI1_CK2 +PA8.Locked=true +PA8.Signal=SAI1_CK2 +PA9.GPIOParameters=GPIO_Label +PA9.GPIO_Label=SAI1_D2 +PA9.Locked=true +PA9.Signal=SAI1_D2 +PB10.Locked=true +PB10.Signal=S_TIM2_CH3 +PB11.GPIOParameters=GPIO_Label +PB11.GPIO_Label=I2C3_SDA +PB11.Locked=true +PB11.Mode=I2C +PB11.Signal=I2C3_SDA +PB12.Locked=true +PB12.Signal=LPUART1_RTS +PB13.GPIOParameters=GPIO_Label +PB13.GPIO_Label=I2C3_SCL +PB13.Locked=true +PB13.Mode=I2C +PB13.Signal=I2C3_SCL +PB14.Locked=true +PB14.Signal=SPI2_MISO +PB15.Locked=true +PB15.Signal=SPI2_MOSI +PB2.Locked=true +PB2.Signal=GPIO_Input +PB3.GPIOParameters=GPIO_Label +PB3.GPIO_Label=T_SWO +PB3.Locked=true +PB3.Signal=SYS_JTDO-SWO +PB4.Locked=true +PB4.Mode=Full_Duplex_Master +PB4.Signal=SPI1_MISO +PB5.GPIOParameters=GPIO_Label +PB5.GPIO_Label=LPUART1_TX_MCU +PB5.Locked=true +PB5.Signal=LPUART1_TX +PB6.GPIOParameters=GPIO_Speed,GPIO_PuPd,GPIO_Label +PB6.GPIO_Label=VCP_TX +PB6.GPIO_PuPd=GPIO_PULLUP +PB6.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH +PB6.Locked=true +PB6.Mode=Asynchronous +PB6.Signal=USART1_TX +PB7.GPIOParameters=GPIO_ModeDefaultPP,GPIO_Speed,GPIO_PuPd,GPIO_Label +PB7.GPIO_Label=VCP_RX +PB7.GPIO_ModeDefaultPP=GPIO_MODE_AF_PP +PB7.GPIO_PuPd=GPIO_PULLUP +PB7.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH +PB7.Locked=true +PB7.Mode=Asynchronous +PB7.Signal=USART1_RX +PB8.Locked=true +PB8.Signal=I2C1_SCL +PB9.GPIOParameters=GPIO_Label +PB9.GPIO_Label=QSPI_BK_IO0 +PB9.Locked=true +PB9.Signal=QUADSPI_BK1_IO0 +PC0.GPIOParameters=GPIO_Label +PC0.GPIO_Label=LPUART1_RX_MCU +PC0.Locked=true +PC0.Signal=LPUART1_RX +PC1.Locked=true +PC1.Signal=ADCx_IN2 +PC10.Locked=true +PC10.Signal=GPIO_Input +PC11.Locked=true +PC11.Signal=GPIO_Input +PC12.GPIOParameters=GPIO_Label +PC12.GPIO_Label=User-B1 +PC12.Locked=true +PC12.Signal=SYS_WKUP3 +PC13.GPIOParameters=GPIO_Label +PC13.GPIO_Label=User-B2 +PC13.Locked=true +PC13.Signal=SYS_WKUP2 +PC2.Locked=true +PC2.Signal=GPIO_Input +PC3.Locked=true +PC3.Signal=ADCx_IN4 +PC4.Locked=true +PC4.Signal=ADCx_IN13 +PC5.Locked=true +PC5.Signal=ADCx_IN14 +PC6.GPIOParameters=GPIO_Label +PC6.GPIO_Label=TSC_G4_IO1 +PC6.Locked=true +PC6.Signal=TSC_G4_IO1 +PC7.GPIOParameters=GPIO_Label +PC7.GPIO_Label=TSC_G4_IO2 +PC7.Locked=true +PC7.Signal=TSC_G4_IO2 +PC8.GPIOParameters=GPIO_Label +PC8.GPIO_Label=RST_DISP +PC8.Locked=true +PC8.Signal=GPIO_Output +PC9.GPIOParameters=GPIO_Label +PC9.GPIO_Label=D/C_DISP +PC9.Locked=true +PC9.Signal=GPIO_Output +PCC.Ble.ConnectionInterval=1000.0 +PCC.Ble.DataLength=6 +PCC.Ble.IsUsed=false +PCC.Ble.Mode=NOT_SELECTED +PCC.Ble.PowerLevel=Min +PCC.Zigbee.IsUsed=false +PCC.Zigbee.Mode=Sleepy End Device +PCC.Zigbee.Payload=15 +PCC.Zigbee.PoolPeriodicity=480.0 +PCC.Zigbee.PowerLevel=Min +PCC.Zigbee.RequestPeriodicity=1500.0 +PD0.Locked=true +PD0.Signal=SPI2_NSS +PD1.Locked=true +PD1.Signal=SPI2_SCK +PD10.GPIOParameters=GPIO_Label +PD10.GPIO_Label=TSC_G6_IO1 +PD10.Locked=true +PD10.Signal=TSC_G6_IO1 +PD11.GPIOParameters=GPIO_Label +PD11.GPIO_Label=TSC_G6_IO2 +PD11.Locked=true +PD11.Signal=TSC_G6_IO2 +PD12.Locked=true +PD12.Signal=GPIO_Input +PD13.Locked=true +PD13.Signal=GPIO_Input +PD14.Locked=true +PD14.Signal=S_TIM1_CH1 +PD15.Locked=true +PD15.Signal=S_TIM1_CH2 +PD2.GPIOParameters=GPIO_Label +PD2.GPIO_Label=INT1 +PD2.Locked=true +PD2.Signal=GPXTI2 +PD3.GPIOParameters=GPIO_Label +PD3.GPIO_Label=QSPI_BK_NCS +PD3.Locked=true +PD3.Signal=QUADSPI_BK1_NCS +PD4.Locked=true +PD4.Signal=GPIO_Input +PD5.GPIOParameters=GPIO_Label +PD5.GPIO_Label=QSPI_BK_IO1 +PD5.Locked=true +PD5.Signal=QUADSPI_BK1_IO1 +PD6.GPIOParameters=GPIO_Label +PD6.GPIO_Label=QSPI_BK_IO2 +PD6.Locked=true +PD6.Signal=QUADSPI_BK1_IO2 +PD8.Locked=true +PD8.Signal=GPIO_Output +PD9.GPIOParameters=GPIO_Label +PD9.GPIO_Label=INT2 +PD9.Locked=true +PD9.Signal=GPXTI9 +PE0.Locked=true +PE0.Signal=S_TIM16_CH1 +PE1.GPIOParameters=GPIO_Label +PE1.GPIO_Label=DRDY +PE1.Locked=true +PE1.Signal=GPIO_Input +PE2.GPIOParameters=GPIO_Label +PE2.GPIO_Label=GPIO_SELECT1 +PE2.Locked=true +PE2.Signal=GPIO_Output +PE3.Locked=true +PE3.Signal=GPXTI3 +PE4.Locked=true +PE4.Signal=GPIO_Input +PH0.GPIOParameters=GPIO_Label +PH0.GPIO_Label=CS_DISP +PH0.Locked=true +PH0.Signal=GPIO_Output +PH1.GPIOParameters=GPIO_Label +PH1.GPIO_Label=GPIO_SELECT2 +PH1.Locked=true +PH1.Signal=GPIO_Output +PinOutPanel.CurrentBGAView=Top +PinOutPanel.RotationAngle=0 +ProjectManager.AskForMigrate=true +ProjectManager.BackupPrevious=false +ProjectManager.CompilerOptimize=6 +ProjectManager.ComputerToolchain=false +ProjectManager.CoupleFile=false +ProjectManager.DeletePrevious=true +ProjectManager.DeviceId=STM32WB5MMGHx +ProjectManager.FreePins=false +ProjectManager.HalAssertFull=false +ProjectManager.HeapSize=0x400 +ProjectManager.KeepUserCode=true +ProjectManager.LastFirmware=false +ProjectManager.LibraryCopy=2 +ProjectManager.MainLocation=Core/Src +ProjectManager.NoMain=false +ProjectManager.PreviousToolchain= +ProjectManager.ProjectBuild=false +ProjectManager.ProjectFileName=BLE_HeartRate.ioc +ProjectManager.ProjectName=BLE_HeartRate +ProjectManager.RegisterCallBack= +ProjectManager.StackSize=0x1000 +ProjectManager.TargetToolchain=EWARM V8 +ProjectManager.ToolChainLocation= +ProjectManager.UnderRoot=false +ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_RF_Init-RF-false-HAL-true,5-MX_RTC_Init-RTC-false-HAL-true,false-6-MX_TIM17_Init-TIM17-false-HAL-true,7-MX_USART1_UART_Init-USART1-false-HAL-false,8-APPE_Init-STM32_WPAN-false-HAL-false,false-9-MX_I2C3_Init-I2C3-false-HAL-true,false-10-MX_SPI1_Init-SPI1-false-HAL-true,11-MX_IPCC_Init-IPCC-false-HAL-true,0-MX_HSEM_Init-HSEM-false-HAL-true +RCC.AHBFreq_Value=32000000 +RCC.APB1Freq_Value=32000000 +RCC.APB1TimFreq_Value=32000000 +RCC.APB2Freq_Value=32000000 +RCC.APB2TimFreq_Value=32000000 +RCC.APB3Freq_Value=16000000 +RCC.Cortex2Freq_Value=32000000 +RCC.CortexFreq_Value=32000000 +RCC.FCLK2Freq_Value=32000000 +RCC.FCLKCortexFreq_Value=32000000 +RCC.FamilyName=M +RCC.HCLK2Freq_Value=32000000 +RCC.HCLK3Freq_Value=32000000 +RCC.HCLKFreq_Value=32000000 +RCC.HCLKRFFreq_Value=16000000 +RCC.HSE_VALUE=32000000 +RCC.HSI48_VALUE=48000000 +RCC.HSI_VALUE=16000000 +RCC.I2C1Freq_Value=32000000 +RCC.I2C3Freq_Value=32000000 +RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HCLKRFFreq_Value,HSE_VALUE,HSI48_VALUE,HSI_VALUE,I2C1Freq_Value,I2C3Freq_Value,LCDFreq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSI_VALUE,MCO1PinFreq_Value,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PLLSAI1PoutputFreq_Value,PLLSAI1QoutputFreq_Value,PLLSAI1RoutputFreq_Value,PWRFreq_Value,RFWKPClockSelection,RFWKPFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SAI1Freq_Value,SMPS1Freq_Value,SMPSCLockSelectionVirtual,SMPSFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,USART1Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VCOSAI1OutputFreq_Value +RCC.LCDFreq_Value=32768 +RCC.LPTIM1Freq_Value=32000000 +RCC.LPTIM2Freq_Value=32000000 +RCC.LPUART1Freq_Value=32000000 +RCC.LSCOPinFreq_Value=32000 +RCC.LSI_VALUE=32000 +RCC.MCO1PinFreq_Value=32000000 +RCC.PLLPoutputFreq_Value=16000000 +RCC.PLLQoutputFreq_Value=16000000 +RCC.PLLRCLKFreq_Value=16000000 +RCC.PLLSAI1PoutputFreq_Value=16000000 +RCC.PLLSAI1QoutputFreq_Value=16000000 +RCC.PLLSAI1RoutputFreq_Value=16000000 +RCC.PWRFreq_Value=32000000 +RCC.RFWKPClockSelection=RCC_RFWKPCLKSOURCE_LSE +RCC.RFWKPFreq_Value=32768 +RCC.RNGFreq_Value=32000 +RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE +RCC.RTCFreq_Value=32768 +RCC.SAI1Freq_Value=16000000 +RCC.SMPS1Freq_Value=16000000 +RCC.SMPSCLockSelectionVirtual=RCC_SMPSCLKSOURCE_HSE +RCC.SMPSFreq_Value=8000000 +RCC.SYSCLKFreq_VALUE=32000000 +RCC.SYSCLKSource=RCC_SYSCLKSOURCE_HSE +RCC.USART1Freq_Value=32000000 +RCC.VCOInputFreq_Value=4000000 +RCC.VCOOutputFreq_Value=32000000 +RCC.VCOSAI1OutputFreq_Value=32000000 +SH.ADCx_IN10.0=ADC1_IN10 +SH.ADCx_IN10.ConfNb=1 +SH.ADCx_IN13.0=ADC1_IN13 +SH.ADCx_IN13.ConfNb=1 +SH.ADCx_IN14.0=ADC1_IN14 +SH.ADCx_IN14.ConfNb=1 +SH.ADCx_IN2.0=ADC1_IN2 +SH.ADCx_IN2.ConfNb=1 +SH.ADCx_IN4.0=ADC1_IN4 +SH.ADCx_IN4.ConfNb=1 +SH.ADCx_IN5.0=ADC1_IN5 +SH.ADCx_IN5.ConfNb=1 +SH.ADCx_IN7.0=ADC1_IN7 +SH.ADCx_IN7.ConfNb=1 +SH.GPXTI2.0=GPIO_EXTI2 +SH.GPXTI2.ConfNb=1 +SH.GPXTI3.0=GPIO_EXTI3 +SH.GPXTI3.ConfNb=1 +SH.GPXTI9.0=GPIO_EXTI9 +SH.GPXTI9.ConfNb=1 +SH.S_TIM16_CH1.0=TIM16_CH1 +SH.S_TIM16_CH1.ConfNb=1 +SH.S_TIM1_CH1.0=TIM1_CH1 +SH.S_TIM1_CH1.ConfNb=1 +SH.S_TIM1_CH2.0=TIM1_CH2 +SH.S_TIM1_CH2.ConfNb=1 +SH.S_TIM2_CH1.0=TIM2_CH1 +SH.S_TIM2_CH1.ConfNb=1 +SH.S_TIM2_CH3.0=TIM2_CH3 +SH.S_TIM2_CH3.ConfNb=1 +SPI1.CalculateBaudRate=16.0 MBits/s +SPI1.Direction=SPI_DIRECTION_2LINES +SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate +SPI1.Mode=SPI_MODE_MASTER +SPI1.VirtualType=VM_MASTER +STM32_WPAN.BLE_CFG_SVC_MAX_NBR_CB=7 +STM32_WPAN.BLE_DBG_DIS_EN=1 +STM32_WPAN.BLE_DBG_HRS_EN=1 +STM32_WPAN.BLE_DBG_SVCCTL_EN=1 +STM32_WPAN.BT_SIG_HEART_RATE_SENSOR=Enabled +STM32_WPAN.CFG_ADV_BD_ADDRESS=0x7257acd87a6c +STM32_WPAN.CFG_BONDING_MODE=1 +STM32_WPAN.CFG_DEBUGGER_SUPPORTED=1 +STM32_WPAN.CFG_DEBUG_APP_TRACE=1 +STM32_WPAN.CFG_DEBUG_BLE_TRACE=1 +STM32_WPAN.CFG_DEBUG_TRACE_LIGHT=1 +STM32_WPAN.CFG_DEBUG_TRACE_UART=hw_uart1 +STM32_WPAN.CFG_HW_USART1_ENABLED=1 +STM32_WPAN.CFG_LPM_SUPPORTED=0 +STM32_WPAN.CFG_USE_SMPS=0 +STM32_WPAN.CUSTOM_P2P_SERVER=Disabled +STM32_WPAN.IPParameters=CUSTOM_P2P_SERVER,BT_SIG_HEART_RATE_SENSOR,BLE_CFG_SVC_MAX_NBR_CB,CFG_HW_USART1_ENABLED,CFG_DEBUGGER_SUPPORTED,CFG_DEBUG_TRACE_UART,CFG_LPM_SUPPORTED,CFG_ADV_BD_ADDRESS,CFG_BONDING_MODE,BLE_DBG_DIS_EN,BLE_DBG_HRS_EN,BLE_DBG_SVCCTL_EN,CFG_DEBUG_TRACE_LIGHT,CFG_DEBUG_BLE_TRACE,CFG_DEBUG_APP_TRACE,CFG_USE_SMPS,LOCAL_NAME,LOCAL_NAME_FORMATTED +STM32_WPAN.LOCAL_NAME=HRSTM +STM32_WPAN.LOCAL_NAME_FORMATTED=,'H','R','S','T','M' +USART1.IPParameters=VirtualMode-Asynchronous,OverSampling +USART1.OverSampling=UART_OVERSAMPLING_8 +USART1.VirtualMode-Asynchronous=VM_ASYNC +VP_HSEM_VS_HSEM.Mode=HSEM_Activate +VP_HSEM_VS_HSEM.Signal=HSEM_VS_HSEM +VP_IPCC_VS_IPCC.Mode=IPCC_Activate +VP_IPCC_VS_IPCC.Signal=IPCC_VS_IPCC +VP_RCC_V_OSC32_IN.Mode=LSE-External-Clock-Source +VP_RCC_V_OSC32_IN.Signal=RCC_V_OSC32_IN +VP_RCC_V_OSC_IN.Mode=HSE-External-Clock-Source +VP_RCC_V_OSC_IN.Signal=RCC_V_OSC_IN +VP_RF_VS_RF.Mode=RF_Activate +VP_RF_VS_RF.Signal=RF_VS_RF +VP_RTC_VS_RTC_Activate.Mode=RTC_Enabled +VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate +VP_SEQUENCER_VS_SEQUENCER.Mode=SEQUENCER_Enabled +VP_SEQUENCER_VS_SEQUENCER.Signal=SEQUENCER_VS_SEQUENCER +VP_STM32_WPAN_VS_BLE_HOST.Mode=STM32_WPAN_Enabled +VP_STM32_WPAN_VS_BLE_HOST.Signal=STM32_WPAN_VS_BLE_HOST +VP_SYS_VS_Systick.Mode=SysTick +VP_SYS_VS_Systick.Signal=SYS_VS_Systick +VP_TIM17_VS_ClockSourceINT.Mode=Enable_Timer +VP_TIM17_VS_ClockSourceINT.Signal=TIM17_VS_ClockSourceINT +VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled +VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM +board=STM32WB5MM-DK +boardIOC=true +ProjectManager.Example=BLE_HeartRate +ProjectManager.ExampleSource=CubeFw diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h index 3981eb9da..62e8ad603 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_common.h @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_common.h - * Description : App Common application configuration file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file app_common.h + * @author MCD Application Team + * @brief App Common application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -115,5 +114,3 @@ extern "C"{ #endif #endif /*APP_COMMON_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h index a59aeb43c..4987ac13c 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_conf.h - * Description : Application configuration file for STM32WPAN Middleware. + ****************************************************************************** + * @file app_conf.h + * @author MCD Application Team + * @brief Application configuration file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -42,8 +42,7 @@ * Define Advertising parameters */ #define CFG_ADV_BD_ADDRESS (0x7257acd87a6c) -#define CFG_BLE_ADDRESS_TYPE RANDOM_ADDR /**< Bluetooth address types defined in ble_legacy.h */ -/*#define CFG_STATIC_RANDOM_ADDRESS (0xf257acd87a6c)*/ /**< Static Random Address fixed for lifetime of the device */ +#define CFG_BLE_ADDRESS_TYPE PUBLIC_ADDR /**< Bluetooth address types defined in ble_legacy.h */ #define CFG_FAST_CONN_ADV_INTERVAL_MIN (0x80) /**< 80ms */ #define CFG_FAST_CONN_ADV_INTERVAL_MAX (0xA0) /**< 100ms */ @@ -261,6 +260,10 @@ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW + * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV + * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 + * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1 * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3 * which are used to set following configuration bits: @@ -270,11 +273,15 @@ * 0: with service change desc. * (bit 2): 1: device name Read-Only * 0: device name R/W + * (bit 3): 1: extended advertizing supported [NOT SUPPORTED] + * 0: extended advertizing not supported [NOT SUPPORTED] + * (bit 4): 1: CS Algo #2 supported + * 0: CS Algo #2 not supported * (bit 7): 1: LE Power Class 1 * 0: LE Power Class 2-3 * other bits: reserved (shall be set to 0) */ -#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) +#define CFG_BLE_OPTIONS (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3) #define CFG_BLE_MAX_COC_INITIATOR_NBR (32) @@ -282,6 +289,18 @@ #define CFG_BLE_MAX_TX_POWER (0) +/** + * BLE Rx model configuration flags to be configured with: + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER + * which are used to set following configuration bits: + * (bit 0): 1: agc_rssi model improved vs RF blockers + * 0: Legacy agc_rssi model + * other bits: reserved (shall be set to 0) + */ + +#define CFG_BLE_RX_MODEL_CONFIG SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY + /****************************************************************************** * Transport Layer ******************************************************************************/ @@ -429,8 +448,9 @@ #endif -/** tick timer value in us */ +/** tick timer values */ #define CFG_TS_TICK_VAL DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE ) +#define CFG_TS_TICK_VAL_PS DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE ) typedef enum { @@ -545,9 +565,9 @@ typedef enum CFG_TASK_ADV_UPDATE_ID, CFG_TASK_MEAS_REQ_ID, CFG_TASK_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */ CFG_TASK_SW_BUTTON_PUSHED_ID, -/* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITH_HCICMD, /**< Shall be LAST in the list */ } CFG_Task_Id_With_HCI_Cmd_t; @@ -556,11 +576,12 @@ typedef enum { CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1, /**< Shall be FIRST in the list */ CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID, -/* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */ -/* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ + /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */ CFG_LAST_TASK_ID_WITHO_NO_HCICMD /**< Shall be LAST in the list */ } CFG_Task_Id_With_NO_HCI_Cmd_t; + #define CFG_TASK_NBR CFG_LAST_TASK_ID_WITHO_NO_HCICMD /** @@ -593,9 +614,9 @@ typedef enum { CFG_LPM_APP, CFG_LPM_APP_BLE, - /* USER CODE BEGIN CFG_LPM_Id_t */ + /* USER CODE BEGIN CFG_LPM_Id_t */ - /* USER CODE END CFG_LPM_Id_t */ + /* USER CODE END CFG_LPM_Id_t */ } CFG_LPM_Id_t; /****************************************************************************** @@ -606,5 +627,3 @@ typedef enum #define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR #endif /*APP_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h index 9354bf8a9..9237f301f 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_debug.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.h - * Description : Header for app_debug.c module - ****************************************************************************** + ****************************************************************************** + * @file app_debug.h + * @author MCD Application Team + * @brief Header for app_debug.c module + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -65,5 +65,3 @@ extern "C" { #endif #endif /*__APP_DEBUG_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h index f559a7d8e..752734d7e 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/app_entry.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.h - * Description : App entry configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file app_entry.h + * @author MCD Application Team + * @brief Interface to the application + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -60,6 +60,9 @@ extern "C" { void MX_APPE_Config( void ); void MX_APPE_Init( void ); void MX_APPE_Process( void ); + void Init_Exti( void ); + void Init_Smps( void ); + /* USER CODE BEGIN EF */ void LED_Deinit(void); void LED_On(aPwmLedGsData_TypeDef aPwmLedGsData); @@ -71,5 +74,3 @@ extern "C" { #endif #endif /*APP_ENTRY_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h index 9ea733a63..cc426a452 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_conf.h @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_conf.h - * Description : Hardware configuration file for STM32WPAN Middleware. - ****************************************************************************** + ****************************************************************************** + * @file hw_conf.h + * @author MCD Application Team + * @brief Configuration of hardware interface + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -210,5 +210,3 @@ #define CFG_HW_USART1_DMA_TX_IRQHandler DMA2_Channel4_IRQHandler #endif /*HW_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h index 92a787b69..403bf1ed7 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/hw_if.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -150,7 +149,7 @@ extern "C" { * @param pTimerId: Timer Id returned to the user to request operation (start, stop, delete) * @param TimerMode: Mode of the virtual timer (Single shot or repeated) * @param pTimerCallBack: Callback when the virtual timer expires - * @retval HW_TS_ReturnStatus_t: Return whether the creation is sucessful or not + * @retval HW_TS_ReturnStatus_t: Return whether the creation is successful or not */ HW_TS_ReturnStatus_t HW_TS_Create(uint32_t TimerProcessID, uint8_t *pTimerId, HW_TS_Mode_t TimerMode, HW_TS_pTimerCb_t pTimerCallBack); @@ -249,5 +248,3 @@ extern "C" { #endif #endif /*HW_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/main.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/main.h index e2a9f44c2..ab3c3a4b0 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/main.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/main.h @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -143,5 +142,3 @@ void MX_USART1_UART_Init(void); #endif #endif /* __MAIN_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h index e1aecd591..45c31caa5 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32_lpm_if.h @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** -****************************************************************************** -* @file stm32_lpm_if.h -* @brief Header for stm32_lpm_if.c module (device specific LP management) -****************************************************************************** -* @attention -* - *

                                                                                                                    © Copyright (c) 2019 STMicroelectronics. -* All rights reserved.

                                                                                                                    -* - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause -* -****************************************************************************** -*/ + ****************************************************************************** + * @file stm32_lpm_if.h + * @author MCD Application Team + * @brief Header for stm32_lpm_if.c module (device specific LP management) + ****************************************************************************** + * @attention + * + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -77,5 +77,3 @@ void PWR_ExitSleepMode( void ); #endif #endif /*__STM32_LPM_IF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wb5mm_dk_conf.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wb5mm_dk_conf.h index 12589916a..9aefd8c2d 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wb5mm_dk_conf.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wb5mm_dk_conf.h @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -92,5 +91,3 @@ extern "C" { #endif #endif /* STM32WB5MM_DK_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h index 291c8a9e9..0de7f34ea 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_hal_conf.h @@ -1,3 +1,4 @@ +/* USER CODE BEGIN Header */ /** ****************************************************************************** * @file stm32wbxx_hal_conf.h @@ -6,16 +7,16 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2019 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ +/* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __STM32WBxx_HAL_CONF_H @@ -46,7 +47,7 @@ /*#define HAL_LPTIM_MODULE_ENABLED */ /*#define HAL_PCD_MODULE_ENABLED */ /*#define HAL_PKA_MODULE_ENABLED */ -#define HAL_QSPI_MODULE_ENABLED +/*#define HAL_QSPI_MODULE_ENABLED */ /*#define HAL_RNG_MODULE_ENABLED */ #define HAL_RTC_MODULE_ENABLED /*#define HAL_SAI_MODULE_ENABLED */ @@ -349,5 +350,3 @@ #endif #endif /* __STM32WBxx_HAL_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h index 473bef7e2..5ba8bf25d 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/stm32wbxx_it.h @@ -6,15 +6,14 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -73,5 +72,3 @@ void PUSH_BUTTON_SW_EXTI_IRQHandler(void); #endif #endif /* __STM32WBxx_IT_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h index 4edfbbacf..c34a6ca79 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Inc/utilities_conf.h @@ -1,21 +1,20 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : utilities_conf.h - * Description : Configuration file for STM32 Utilities. - * - ****************************************************************************** + ****************************************************************************** + * @file utilities_conf.h + * @author MCD Application Team + * @brief Configuration file for STM32 Utilities. + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ***************************************************************************** + ****************************************************************************** */ /* USER CODE END Header */ @@ -64,5 +63,3 @@ extern "C" { #endif #endif /*UTILITIES_CONF_H */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c index 7b2d278a5..ebdc12e32 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_debug.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_debug.c - * Description : Debug capabilities source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_debug.c + * @author MCD Application Team + * @brief Debug capabilities source file for STM32WPAN Middleware + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -43,7 +43,7 @@ typedef PACKED_STRUCT /* Private defines -----------------------------------------------------------*/ /* USER CODE BEGIN PD */ #define GPIO_NBR_OF_RF_SIGNALS 9 -#define GPIO_CFG_NBR_OF_FEATURES 34 +#define GPIO_CFG_NBR_OF_FEATURES 38 #define NBR_OF_TRACES_CONFIG_PARAMETERS 4 #define NBR_OF_GENERAL_CONFIG_PARAMETERS 4 @@ -128,8 +128,16 @@ static const APPD_GpioConfig_t aGpioConfigList[GPIO_CFG_NBR_OF_FEATURES] = /* From v1.4.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* NVMA_START - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_EOP - Set on Entry / Reset on Exit */ +/* From v1.5.0 */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_WRITE - Set on Entry / Reset on Exit */ { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* FLASH_ERASE - Set on Entry / Reset on Exit */ +/* From v1.6.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_RESCHEDULE_EVENT - Set on Entry / Reset on Exit */ +/* From v1.8.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_CMD_RX - Set on Entry / Reset on Exit */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* IPCC_BLE_LLD_ACK_TX - Set on Entry / Reset on Exit */ +/* From v1.9.0 */ + { GPIOA, LL_GPIO_PIN_0, 0, 0}, /* BLE_ASYNCH_EVENT_NACKED - Set on Entry / Reset on Exit */ }; /** @@ -408,5 +416,3 @@ void DbgOutputTraces( uint8_t *p_data, uint16_t size, void (*cb)(void) ) return; } #endif - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c index 98fb79035..95cfcced7 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/app_entry.c @@ -1,21 +1,21 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : app_entry.c - * Description : Entry application source file for STM32WPAN Middleware - ****************************************************************************** + ****************************************************************************** + * @file app_entry.c + * @author MCD Application Team + * @brief Entry point of the Application + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * - ****************************************************************************** - */ + ****************************************************************************** + */ /* USER CODE END Header */ /* Includes ------------------------------------------------------------------*/ @@ -29,6 +29,8 @@ #include "shci_tl.h" #include "stm32_lpm.h" #include "app_debug.h" +#include "dbg_trace.h" +#include "shci.h" #include "otp.h" /* Private includes -----------------------------------------------------------*/ @@ -66,16 +68,18 @@ PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t BleSpareEvtBuffer[sizeof(TL_ /* Private functions prototypes-----------------------------------------------*/ static void Config_HSE(void); static void Reset_Device( void ); +#if ( CFG_HW_RESET_BY_FW == 1 ) static void Reset_IPCC( void ); static void Reset_BackupDomain( void ); +#endif /* CFG_HW_RESET_BY_FW */ static void System_Init( void ); static void SystemPower_Config( void ); static void appe_Tl_Init( void ); static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ); static void APPE_SysUserEvtRx( void * pPayload ); -static void Init_Exti( void ); +static void APPE_SysEvtReadyProcessing( void * pPayload ); +static void APPE_SysEvtError( void * pPayload); static void Init_Rtc( void ); -static void Init_Smps( void ); /* USER CODE BEGIN PFP */ static void Button_Init( void ); @@ -154,6 +158,33 @@ void MX_APPE_Init( void ) /* USER CODE END APPE_Init_2 */ return; } + +void Init_Smps( void ) +{ +#if (CFG_USE_SMPS != 0) + /** + * Configure and enable SMPS + * + * The SMPS configuration is not yet supported by CubeMx + * when SMPS output voltage is set to 1.4V, the RF output power is limited to 3.7dBm + * the SMPS output voltage shall be increased for higher RF output power + */ + LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA); + LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40); + LL_PWR_SMPS_Enable(); +#endif + + return; +} + +void Init_Exti( void ) +{ + /* Enable IPCC(36), HSEM(38) wakeup interrupts on CPU1 */ + LL_EXTI_EnableIT_32_63( LL_EXTI_LINE_36 & LL_EXTI_LINE_38 ); + + return; +} + /* USER CODE BEGIN FD */ void LED_Deinit(void) @@ -199,11 +230,12 @@ static void Reset_Device( void ) Reset_BackupDomain(); Reset_IPCC(); -#endif +#endif /* CFG_HW_RESET_BY_FW */ return; } +#if ( CFG_HW_RESET_BY_FW == 1 ) static void Reset_BackupDomain( void ) { if ((LL_RCC_IsActiveFlag_PINRST() != FALSE) && (LL_RCC_IsActiveFlag_SFTRST() == FALSE)) @@ -259,6 +291,7 @@ static void Reset_IPCC( void ) return; } +#endif /* CFG_HW_RESET_BY_FW */ static void Config_HSE(void) { @@ -287,33 +320,6 @@ static void System_Init( void ) return; } -static void Init_Smps( void ) -{ -#if (CFG_USE_SMPS != 0) - /** - * Configure and enable SMPS - * - * The SMPS configuration is not yet supported by CubeMx - * when SMPS output voltage is set to 1.4V, the RF output power is limited to 3.7dBm - * the SMPS output voltage shall be increased for higher RF output power - */ - LL_PWR_SMPS_SetStartupCurrent(LL_PWR_SMPS_STARTUP_CURRENT_80MA); - LL_PWR_SMPS_SetOutputVoltageLevel(LL_PWR_SMPS_OUTPUT_VOLTAGE_1V40); - LL_PWR_SMPS_Enable(); -#endif - - return; -} - -static void Init_Exti( void ) -{ - /**< Disable all wakeup interrupt on CPU1 except IPCC(36), HSEM(38) */ - LL_EXTI_DisableIT_0_31(~0); - LL_EXTI_DisableIT_32_63( (~0) & (~(LL_EXTI_LINE_36 | LL_EXTI_LINE_38)) ); - - return; -} - static void Init_Rtc( void ) { /* Disable RTC registers write protection */ @@ -326,6 +332,7 @@ static void Init_Rtc( void ) return; } + /** * @brief Configure the system for power optimization * @@ -398,12 +405,151 @@ static void APPE_SysStatusNot( SHCI_TL_CmdStatus_t status ) */ static void APPE_SysUserEvtRx( void * pPayload ) { - UNUSED(pPayload); - /* Traces channel initialization */ - APPD_EnableCPU2( ); + TL_AsynchEvt_t *p_sys_event; + WirelessFwInfo_t WirelessInfo; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + + /* Read the firmware version of both the wireless firmware and the FUS */ + SHCI_GetWirelessFwInfo( &WirelessInfo ); + APP_DBG_MSG("Wireless Firmware version %d.%d.%d\n", WirelessInfo.VersionMajor, WirelessInfo.VersionMinor, WirelessInfo.VersionSub); + APP_DBG_MSG("Wireless Firmware build %d\n", WirelessInfo.VersionReleaseType); + APP_DBG_MSG("FUS version %d.%d.%d\n\n", WirelessInfo.FusVersionMajor, WirelessInfo.FusVersionMinor, WirelessInfo.FusVersionSub); + + switch(p_sys_event->subevtcode) + { + case SHCI_SUB_EVT_CODE_READY: + APPE_SysEvtReadyProcessing(pPayload); + break; + + case SHCI_SUB_EVT_ERROR_NOTIF: + APPE_SysEvtError(pPayload); + break; + + case SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE: + APP_DBG_MSG("-- BLE NVM RAM HAS BEEN UPDATED BY CMO+ \n"); + APP_DBG_MSG("SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE : StartAddress = %lx , Size = %ld\n", + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->StartAddress, + ((SHCI_C2_BleNvmRamUpdate_Evt_t*)p_sys_event->payload)->Size); + break; + + case SHCI_SUB_EVT_NVM_START_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_WRITE : NumberOfWords = %ld\n", + ((SHCI_C2_NvmStartWrite_Evt_t*)p_sys_event->payload)->NumberOfWords); + break; + + case SHCI_SUB_EVT_NVM_END_WRITE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_WRITE\n"); + break; + + case SHCI_SUB_EVT_NVM_START_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_START_ERASE : NumberOfSectors = %ld\n", + ((SHCI_C2_NvmStartErase_Evt_t*)p_sys_event->payload)->NumberOfSectors); + break; + + case SHCI_SUB_EVT_NVM_END_ERASE: + APP_DBG_MSG("SHCI_SUB_EVT_NVM_END_ERASE\n"); + break; + + default: + break; + } + + return; +} + +/** + * @brief Notify a system error coming from the M0 firmware + * @param ErrorCode : errorCode detected by the M0 firmware + * + * @retval None + */ +static void APPE_SysEvtError( void * pPayload) +{ + TL_AsynchEvt_t *p_sys_event; + SCHI_SystemErrCode_t *p_sys_error_code; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_error_code = (SCHI_SystemErrCode_t*) p_sys_event->payload; + + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON %x \n",(*p_sys_error_code)); + + if ((*p_sys_error_code) == ERR_BLE_INIT) + { + /* Error during BLE stack initialization */ + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - ERR_BLE_INIT \n"); + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_ERROR_NOTIF WITH REASON - BLE ERROR \n"); + } + return; +} + +static void APPE_SysEvtReadyProcessing( void * pPayload ) +{ + TL_AsynchEvt_t *p_sys_event; + SHCI_C2_Ready_Evt_t *p_sys_ready_event; + + SHCI_C2_CONFIG_Cmd_Param_t config_param = {0}; + uint32_t RevisionID=0; + + p_sys_event = (TL_AsynchEvt_t*)(((tSHCI_UserEvtRxParam*)pPayload)->pckt->evtserial.evt.payload); + p_sys_ready_event = (SHCI_C2_Ready_Evt_t*) p_sys_event->payload; + + if(p_sys_ready_event->sysevt_ready_rsp == WIRELESS_FW_RUNNING) + { + /** + * The wireless firmware is running on the CPU2 + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - WIRELESS_FW_RUNNING \n"); + + /* Traces channel initialization */ + APPD_EnableCPU2( ); + + /* Enable all events Notification */ + config_param.PayloadCmdSize = SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE; + config_param.EvtMask1 = SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE + + SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE; + + /* Read revision identifier */ + /** + * @brief Return the device revision identifier + * @note This field indicates the revision of the device. + * @rmtoll DBGMCU_IDCODE REV_ID LL_DBGMCU_GetRevisionID + * @retval Values between Min_Data=0x00 and Max_Data=0xFFFF + */ + RevisionID = LL_DBGMCU_GetRevisionID(); + + APP_DBG_MSG("DBGMCU_GetRevisionID= %lx \n\n", RevisionID); + + config_param.RevisionID = RevisionID; + (void)SHCI_C2_Config(&config_param); + + APP_BLE_Init( ); + UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); + } + else if (p_sys_ready_event->sysevt_ready_rsp == FUS_FW_RUNNING) + { + /** + * The FUS firmware is running on the CPU2 + * In the scope of this application, there should be no case when we get here + */ + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - FUS_FW_RUNNING \n"); + + /* The packet shall not be released as this is not supported by the FUS */ + ((tSHCI_UserEvtRxParam*)pPayload)->status = SHCI_TL_UserEventFlow_Disable; + } + else + { + APP_DBG_MSG("SHCI_SUB_EVT_CODE_READY - UNEXPECTED CASE \n"); + } - APP_BLE_Init( ); - UTIL_LPM_SetOffMode(1U << CFG_LPM_APP, UTIL_LPM_ENABLE); return; } @@ -487,6 +633,8 @@ void UTIL_SEQ_Idle( void ) void UTIL_SEQ_EvtIdle( UTIL_SEQ_bm_t task_id_bm, UTIL_SEQ_bm_t evt_waited_bm ) { UTIL_SEQ_Run( UTIL_SEQ_DEFAULT ); + + return; } void shci_notify_asynch_evt(void* pdata) @@ -528,4 +676,3 @@ void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) } /* USER CODE END FD_WRAP_FUNCTIONS */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c index c0af6a14a..23a5bcdc6 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_timerserver.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : hw_timerserver.c - * Description : Hardware timerserver source file for STM32WPAN Middleware. - * - ****************************************************************************** + ****************************************************************************** + * @file hw_timerserver.c + * @author MCD Application Team + * @brief Hardware timerserver source file for STM32WPAN Middleware. + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -891,5 +890,3 @@ __weak void HW_TS_RTC_Int_AppNot(uint32_t TimerProcessID, uint8_t TimerID, HW_TS return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c index 6ae6ff9f9..43c681c1c 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/hw_uart.c @@ -1,19 +1,18 @@ /* USER CODE BEGIN Header */ /** - ****************************************************************************** - * File Name : Src/hw_uart.c - * Description : HW UART source file for STM32WPAN Middleware. - * + ****************************************************************************** + * @file hw_uart.c + * @author MCD Application Team + * @brief HW UART source file for STM32WPAN Middleware. ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under Ultimate Liberty license - * SLA0044, the "License"; You may not use this file except in compliance with - * the License. You may obtain a copy of the License at: - * www.st.com/SLA0044 + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -316,5 +315,3 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) return; } - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/main.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/main.c index d375dbd25..7aaac1d55 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/main.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/main.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -58,6 +57,7 @@ DMA_HandleTypeDef hdma_usart1_tx; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); +void PeriphCommonClock_Config(void); static void MX_GPIO_Init(void); static void MX_DMA_Init(void); static void MX_RF_Init(void); @@ -100,6 +100,9 @@ int main(void) /* Configure the system clock */ SystemClock_Config(); +/* Configure the peripherals common clocks */ + PeriphCommonClock_Config(); + /* IPCC initialisation */ MX_IPCC_Init(); @@ -142,7 +145,6 @@ void SystemClock_Config(void) { RCC_OscInitTypeDef RCC_OscInitStruct = {0}; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; /** Configure LSE Drive Capability */ @@ -181,17 +183,23 @@ void SystemClock_Config(void) { Error_Handler(); } - /** Initializes the peripherals clocks +} + +/** + * @brief Peripherals Common Clock Configuration + * @retval None + */ +void PeriphCommonClock_Config(void) +{ + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; + + /** Initializes the peripherals clock */ - PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP - |RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_USART1 - |RCC_PERIPHCLK_I2C3; - PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; - PeriphClkInitStruct.I2c3ClockSelection = RCC_I2C3CLKSOURCE_PCLK1; - PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SMPS|RCC_PERIPHCLK_RFWAKEUP; PeriphClkInitStruct.RFWakeUpClockSelection = RCC_RFWKPCLKSOURCE_LSE; PeriphClkInitStruct.SmpsClockSelection = RCC_SMPSCLKSOURCE_HSE; PeriphClkInitStruct.SmpsDivSelection = RCC_SMPSCLKDIV_RANGE0; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) { Error_Handler(); @@ -414,6 +422,14 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Pull = GPIO_NOPULL; HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); + /*Configure GPIO pin : QSPI_BK_IO0_Pin */ + GPIO_InitStruct.Pin = QSPI_BK_IO0_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF10_QUADSPI; + HAL_GPIO_Init(QSPI_BK_IO0_GPIO_Port, &GPIO_InitStruct); + /*Configure GPIO pin : LPUART1_RX_MCU_Pin */ GPIO_InitStruct.Pin = LPUART1_RX_MCU_Pin; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; @@ -422,6 +438,14 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Alternate = GPIO_AF8_LPUART1; HAL_GPIO_Init(LPUART1_RX_MCU_GPIO_Port, &GPIO_InitStruct); + /*Configure GPIO pin : PB8 */ + GPIO_InitStruct.Pin = GPIO_PIN_8; + GPIO_InitStruct.Mode = GPIO_MODE_AF_OD; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF4_I2C1; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + /*Configure GPIO pins : LPUART1_TX_MCU_Pin PB12 */ GPIO_InitStruct.Pin = LPUART1_TX_MCU_Pin|GPIO_PIN_12; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; @@ -438,6 +462,14 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Alternate = GPIO_AF1_TIM2; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + /*Configure GPIO pin : PA10 */ + GPIO_InitStruct.Pin = GPIO_PIN_10; + GPIO_InitStruct.Mode = GPIO_MODE_AF_OD; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF4_I2C1; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + /*Configure GPIO pins : USB_P_Pin USB_N_Pin */ GPIO_InitStruct.Pin = USB_P_Pin|USB_N_Pin; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; @@ -506,6 +538,14 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Alternate = GPIO_AF8_LPUART1; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + /*Configure GPIO pin : QSPI_BK_SCK_Pin */ + GPIO_InitStruct.Pin = QSPI_BK_SCK_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF10_QUADSPI; + HAL_GPIO_Init(QSPI_BK_SCK_GPIO_Port, &GPIO_InitStruct); + /*Configure GPIO pins : CS_DISP_Pin GPIO_SELECT2_Pin */ GPIO_InitStruct.Pin = CS_DISP_Pin|GPIO_SELECT2_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; @@ -540,6 +580,14 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); + /*Configure GPIO pins : QSPI_BK_NCS_Pin QSPI_BK_IO1_Pin QSPI_BK_IO2_Pin */ + GPIO_InitStruct.Pin = QSPI_BK_NCS_Pin|QSPI_BK_IO1_Pin|QSPI_BK_IO2_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF10_QUADSPI; + HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + /*Configure GPIO pin : PE3 */ GPIO_InitStruct.Pin = GPIO_PIN_3; GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING; @@ -663,5 +711,3 @@ void assert_failed(uint8_t *file, uint32_t line) /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c index fba978d88..8018ad626 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32_lpm_if.c @@ -1,18 +1,18 @@ /* USER CODE BEGIN Header */ /** - *************************************************************************************** - * File Name : stm32_lpm_if.c - * Description : Low layer function to enter/exit low power modes (stop, sleep). - *************************************************************************************** + ****************************************************************************** + * @file stm32_lpm_if.c + * @author MCD Application Team + * @brief Low layer function to enter/exit low power modes (stop, sleep). + ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -277,19 +277,11 @@ static void EnterLowPower( void ) /* Release ENTRY_STOP_MODE semaphore */ LL_HSEM_ReleaseLock( HSEM, CFG_HW_ENTRY_STOP_MODE_SEMID, 0 ); - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } } else { - /** - * The switch on HSI before entering Stop Mode is required on Cut2.0 - * It is useless from Cut2.1 - */ Switch_On_HSI( ); } @@ -355,5 +347,3 @@ static void Switch_On_HSI( void ) /* USER CODE END Private_Functions */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c index fd4d1ba8e..d9d67ab08 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_hal_msp.c @@ -7,13 +7,12 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -68,6 +67,8 @@ void HAL_MspInit(void) /* USER CODE END MspInit 0 */ + __HAL_RCC_HSEM_CLK_ENABLE(); + /* System interrupt init*/ /* Peripheral interrupt init */ @@ -132,6 +133,7 @@ void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* hipcc) */ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) { + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(hrtc->Instance==RTC) { /* USER CODE BEGIN RTC_MspInit 0 */ @@ -145,6 +147,15 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc) __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE); /**< Select LSI as RTC Input */ /* USER CODE END RTC_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC; + PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_RTC_ENABLE(); __HAL_RCC_RTCAPB_CLK_ENABLE(); @@ -187,11 +198,21 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* hrtc) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ /* USER CODE END USART1_MspInit 0 */ + /** Initializes the peripherals clock + */ + PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART1; + PeriphClkInitStruct.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) + { + Error_Handler(); + } + /* Peripheral clock enable */ __HAL_RCC_USART1_CLK_ENABLE(); @@ -274,5 +295,3 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /* USER CODE END 1 */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c index b808829e1..5ff5db0fc 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/stm32wbxx_it.c @@ -6,13 +6,12 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2021 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -302,4 +301,3 @@ void TIM1_TRG_COM_TIM17_IRQHandler(void) BSP_PWM_LED_IRQHandler(); } /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c index 706ee9182..f53552c59 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/Core/Src/system_stm32wbxx.c @@ -60,13 +60,12 @@ ****************************************************************************** * @attention * - *

                                                                                                                    © Copyright (c) 2019 STMicroelectronics. - * All rights reserved.

                                                                                                                    + * Copyright (c) 2019-2021 STMicroelectronics. + * All rights reserved. * - * This software component is licensed by ST under BSD 3-Clause license, - * the "License"; You may not use this file except in compliance with the - * License. You may obtain a copy of the License at: - * opensource.org/licenses/BSD-3-Clause + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. * ****************************************************************************** */ @@ -355,5 +354,3 @@ void SystemCoreClockUpdate(void) /** * @} */ - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp index 75665691a..534d73c0e 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/BLE_HeartRate.ewp @@ -1,1296 +1,1294 @@ - 3 - - BLE_HeartRate - - ARM - + 3 + + BLE_HeartRate + + ARM + + 1 + + General + 3 + + 30 + 1 1 - - General - 3 - - 30 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ICCARM - 2 - - 34 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AARM - 2 - - 10 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OBJCOPY - 0 - - 1 - 1 - 1 - - - - - - - - - CUSTOM - 3 - - - - 0 - - - - BICOMP - 0 - - - - BUILDACTION - 1 - - - - - - - ILINK - 0 - - 20 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IARCHIVE - 0 - - 0 - 1 - 1 - - - - - - - BILINK - 0 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 34 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 10 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + 0 + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 20 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + + + Application - Application - - EWARM - - $PROJ_DIR$\startup_stm32wb5mxx_cm4.s - - - - User - - Core - - $PROJ_DIR$\..\Core\Src\app_debug.c - - - $PROJ_DIR$\..\Core\Src\app_entry.c - - - $PROJ_DIR$\..\Core\Src\hw_timerserver.c - - - $PROJ_DIR$\..\Core\Src\hw_uart.c - - - $PROJ_DIR$\..\Core\Src\main.c - - - $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c - - - $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c - - - - STM32_WPAN - - App - - $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c - - - $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c - - - $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c - - - - Target - - $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c - - - - + EWARM + + $PROJ_DIR$\startup_stm32wb5mxx_cm4.s + - Doc + User + + Core - $PROJ_DIR$\..\readme.txt + $PROJ_DIR$\..\Core\Src\main.c - - - Drivers - - BSP - - STM32WB5MM-DK - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\Components\ssd1315\ssd1315.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\Components\ssd1315\ssd1315_reg.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WB5MM-DK\stm32wb5mm_dk.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WB5MM-DK\stm32wb5mm_dk_bus.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WB5MM-DK\stm32wb5mm_dk_lcd.c - - - - - CMSIS - - $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c - - + + $PROJ_DIR$\..\Core\Src\app_entry.c + + + $PROJ_DIR$\..\Core\Src\app_debug.c + + + $PROJ_DIR$\..\Core\Src\hw_timerserver.c + + + $PROJ_DIR$\..\Core\Src\hw_uart.c + + + $PROJ_DIR$\..\Core\Src\stm32_lpm_if.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_it.c + + + $PROJ_DIR$\..\Core\Src\stm32wbxx_hal_msp.c + + + + STM32_WPAN - STM32WBxx_HAL_Driver - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_i2c.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_i2c_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_qspi.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_spi.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_spi_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c - - - $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c - + App + + $PROJ_DIR$\..\STM32_WPAN\App\app_ble.c + + + $PROJ_DIR$\..\STM32_WPAN\App\dis_app.c + + + $PROJ_DIR$\..\STM32_WPAN\App\hrs_app.c + - - - Middlewares - STM32_WPAN - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c - - - $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c - + Target + + $PROJ_DIR$\..\STM32_WPAN\Target\hw_ipcc.c + + + + + Doc + + $PROJ_DIR$\..\readme.txt + + + + Drivers - Utilities + BSP + + STM32WB5MM-DK - $PROJ_DIR$\..\..\..\..\..\..\Utilities\LCD\stm32_lcd.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WB5MM-DK\stm32wb5mm_dk.c - $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WB5MM-DK\stm32wb5mm_dk_bus.c - $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WB5MM-DK\stm32wb5mm_dk_lcd.c + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\Components\ssd1315\ssd1315.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\Components\ssd1315\ssd1315_reg.c + + + + + CMSIS + + $PROJ_DIR$\..\Core\Src\system_stm32wbxx.c + + + + STM32WBxx_HAL_Driver + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_hsem.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rcc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_flash_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_gpio.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_dma_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_pwr_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_cortex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_exti.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c.c + + + $PROJ_DIR$/../../../../../../Drivers/STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_i2c_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_ipcc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_rtc_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_spi.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_spi_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_tim_ex.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart.c + + + $PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WBxx_HAL_Driver\Src\stm32wbxx_hal_uart_ex.c + + + + + Middlewares + + STM32_WPAN + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\tl_mbox.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\shci\shci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\dbg_trace.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\otp.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_list.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\utilities\stm_queue.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\template\osal.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_gatt_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hal_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_hci_le.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\core\auto\ble_l2cap_aci.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\hrs.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\dis.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\hci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\interface\patterns\ble_thread\tl\shci_tl_if.c + + + $PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_WPAN\ble\svc\Src\svc_ctl.c + + + + Utilities + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\LCD\stm32_lcd.c + + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c + + + $PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c + + + diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb5mxx_cm4.s b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb5mxx_cm4.s index 6d2a51d5a..690ee250e 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb5mxx_cm4.s +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/startup_stm32wb5mxx_cm4.s @@ -16,13 +16,12 @@ ;****************************************************************************** ;* @attention ;* -;*

                                                                                                                    © Copyright (c) 2019 STMicroelectronics. -;* All rights reserved.

                                                                                                                    +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under BSD 3-Clause license, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/BSD-3-Clause +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** ; @@ -83,7 +82,7 @@ __vector_table DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -514,4 +513,3 @@ DMAMUX1_OVR_IRQHandler END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_flash_cm4.icf b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_flash_cm4.icf index 6a7a123fc..f13848f65 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_flash_cm4.icf +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_flash_cm4.icf @@ -11,7 +11,7 @@ define symbol __ICFEDIT_region_RAM_start__ = 0x20000008; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; /*-Sizes-*/ define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x400; /**** End of ICF editor section. ###ICF###*/ define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000; @@ -21,6 +21,7 @@ define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define region RAM_SHARED_region = mem:[from __ICFEDIT_region_RAM_SHARED_start__ to __ICFEDIT_region_RAM_SHARED_end__]; +define region Total_RAM_region = RAM_region | RAM_SHARED_region ; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; @@ -32,9 +33,10 @@ do not initialize { section .noinit, section MB_MEM1 }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; +place at address mem:__ICFEDIT_region_RAM_SHARED_start__ { section MAPPING_TABLE }; place in ROM_region { readonly }; -place in RAM_region { readwrite,block CSTACK, block HEAP }; -place in RAM_SHARED_region { first section MAPPING_TABLE}; +place in RAM_region { block CSTACK, block HEAP }; place in RAM_SHARED_region { section MB_MEM1}; place in RAM_SHARED_region { section MB_MEM2}; +place in Total_RAM_region { readwrite }; diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_sram_cm4.icf b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_sram_cm4.icf deleted file mode 100644 index 36cf3e51a..000000000 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/EWARM/stm32wb5mxx_sram_cm4.icf +++ /dev/null @@ -1,39 +0,0 @@ -/*###ICF### Section handled by ICF editor, don't touch! ****/ -/*-Editor annotation file-*/ -/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ -/*-Specials-*/ -define symbol __ICFEDIT_intvec_start__ = 0x20000000; -/*-Memory Regions-*/ -/***** RAM dedicated to M4 *****/ -define symbol __ICFEDIT_region_ROM_start__ = 0x20000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x20017FFF; - -define symbol __ICFEDIT_region_RAM_start__ = 0x20018000 ; -define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF ; - -/***** RAM2a *****/ -define symbol __ICFEDIT_region_RAM_SHARED_start__ = 0x20030000 ; -define symbol __ICFEDIT_region_RAM_SHARED_end__ = 0x20037FFF ; - -/*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x1000; -define symbol __ICFEDIT_size_heap__ = 0x400; -/**** End of ICF editor section. ###ICF###*/ - - -define memory mem with size = 4G; -define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; -define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; - - -define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; -define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { }; - -initialize by copy { readwrite }; -do not initialize { section .noinit }; - -place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; - -place in ROM_region { readonly }; -place in RAM_region { readwrite, - block CSTACK, block HEAP }; diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/BLE_HeartRate.uvprojx b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/BLE_HeartRate.uvprojx index a03959922..dcfa2532c 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/BLE_HeartRate.uvprojx +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/BLE_HeartRate.uvprojx @@ -337,7 +337,7 @@ 0 --diag_suppress 1296 - USE_HAL_DRIVER,STM32WB5Mxx,STM32WL55MM_DK + USE_HAL_DRIVER,STM32WB5Mxx,USE_STM32WB5M_DK ../Core/Inc;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WBxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WBxx/Include;../../../../../../Drivers/CMSIS/Include;../STM32_WPAN/App;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/ST/STM32_WPAN;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/tl;../../../../../../Middlewares/ST/STM32_WPAN/interface/patterns/ble_thread/shci;../../../../../../Middlewares/ST/STM32_WPAN/utilities;../../../../../../Middlewares/ST/STM32_WPAN/ble/core;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/auto;../../../../../../Middlewares/ST/STM32_WPAN/ble/core/template;../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Inc;../../../../../../Middlewares/ST/STM32_WPAN/ble/svc/Src;../../../../../../Utilities/sequencer;../../../../../../Middlewares/ST/STM32_WPAN/ble;../../../../../../Drivers/BSP/STM32WB5MM-DK;../../../../../../Drivers/BSP/Components/ssd1315;../../../../../../Drivers/BSP/Components/Common;../../../../../../Utilities/Fonts;../../../../../../Utilities/LCD diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb5mxx_cm4.s b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb5mxx_cm4.s index f04432d7b..6a51d2123 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb5mxx_cm4.s +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/startup_stm32wb5mxx_cm4.s @@ -14,12 +14,12 @@ ;****************************************************************************** ;* @attention ;* -;* Copyright (c) 2019 STMicroelectronics. All rights reserved. +;* Copyright (c) 2019 STMicroelectronics. +;* All rights reserved. ;* -;* This software component is licensed by ST under Apache License, Version 2.0, -;* the "License"; You may not use this file except in compliance with the -;* License. You may obtain a copy of the License at: -;* opensource.org/licenses/Apache-2.0 +;* This software is licensed under terms that can be found in the LICENSE file +;* in the root directory of this software component. +;* If no LICENSE file comes with this software, it is provided AS-IS. ;* ;****************************************************************************** @@ -84,7 +84,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD EXTI0_IRQHandler ; EXTI Line 0 Interrupt DCD EXTI1_IRQHandler ; EXTI Line 1 Interrupt DCD EXTI2_IRQHandler ; EXTI Line 2 Interrupt - DCD EXTI3_IRQHandler ; EXTI Line 3 Interrup + DCD EXTI3_IRQHandler ; EXTI Line 3 Interrupt DCD EXTI4_IRQHandler ; EXTI Line 4 Interrupt DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1 Interrupt DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2 Interrupt @@ -365,4 +365,3 @@ __user_initial_stackheap END -;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***** diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb5mxx_flash_cm4.sct b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb5mxx_flash_cm4.sct index 9d4d446ba..938d9f592 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb5mxx_flash_cm4.sct +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/MDK-ARM/stm32wb5mxx_flash_cm4.sct @@ -11,11 +11,16 @@ LR_IROM1 0x08000000 0x00080000 { ; load region size_region RW_IRAM1 0x20000008 0x2FFF8 { ; RW data .ANY (+RW +ZI) } - RW_RAM_SHARED 0x20030000 0x2800 { ; RW data - *(MAPPING_TABLE) - *(MB_MEM1) - *(MB_MEM2) - } + + RW_RAM_SHARED1 0x20030000 0x28 { ; RW data + *(MAPPING_TABLE) + } + RW_RAM_SHARED2 0x20030028 0x27D8 { ; RW data + *(MB_MEM1) + *(MB_MEM2) + .ANY (+RW +ZI) + } + } diff --git a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/STM32CubeIDE/.cproject b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/STM32CubeIDE/.cproject index 6c51c0732..70cd9bf82 100644 --- a/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/STM32CubeIDE/.cproject +++ b/Projects/STM32WB5MM-DK/Applications/BLE/BLE_HeartRate/STM32CubeIDE/.cproject @@ -47,7 +47,7 @@

                                                                                                                  How to flash the Wireless Coprocessor Binary via SWD/JTAG by ST-LINK (STM32CubeProgrammer GUI)

                                                                                                                    @@ -213,17 +221,17 @@

                                                                                                                • STEP 5: Download latest FUS for only FUSv0.5.3 upgrade

                                                                                                                    -
                                                                                                                  • in Firmware Upgrade Services: (File Path: [stm32wb3x_FUS_fw_for_fus_0_5_3.bin], Start Adress: [Install@])
                                                                                                                    • +
                                                                                                                  • in Firmware Upgrade Services: (File Path: [stm32wb3x_FUS_fw_for_fus_0_5_3.bin], Start Address: [Install@])
                                                                                                                  • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.
                                                                                                                  • -

                                                                                                                • STEP 6: Download latest FUS

                                                                                                                  +

                                                                                                                • STEP 6: Download latest FUS or Safeboot

                                                                                                                    -
                                                                                                                  • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Adress: [Install@])
                                                                                                                    • +
                                                                                                                  • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Address: [Install@])
                                                                                                                  • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                                • STEP 7: Download new wireless stack (after “FW Delete” if requested)

                                                                                                                    -
                                                                                                                  • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Adress: [Install@])
                                                                                                                    • +
                                                                                                                  • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Address: [Install@])
                                                                                                                  • then select “Firmware Upgrade” (with “Verify download” and “Start stack after upgrade”) Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary. (optional: activate “Anti-Rollback” on downloaded binary) If you need to perform FUS related manipulations, you always need to START the FUS in case the FUS is not running.

                                                                                                                • STEP 8: Revert to default configuration: in Option Bytes menu for User Configuration set: nSWboot0=1 (checked) nboot1=1 nboot0=1

                                                                                                                  • @@ -263,17 +271,17 @@

                                                                                                              • STEP 5: Download latest FUS for only FUSv0.5.3 upgrade

                                                                                                                  -
                                                                                                                • in Firmware Upgrade Service: (File Path: [stm32wb3x_FUS_fw_for_fus_0_5_3.bin], Start Adress: [Install@])
                                                                                                                  • +
                                                                                                                • in Firmware Upgrade Service: (File Path: [stm32wb3x_FUS_fw_for_fus_0_5_3.bin], Start Address: [Install@])
                                                                                                                • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.
                                                                                                                • -

                                                                                                              • STEP 6: Download latest FUS

                                                                                                                +

                                                                                                              • STEP 6: Download latest FUS or Safeboot

                                                                                                                  -
                                                                                                                • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Adress: [Install@])
                                                                                                                  • +
                                                                                                                • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Address: [Install@])
                                                                                                                • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                              • STEP 7: Download new wireless stack (after “FW Delete” if requested)

                                                                                                                  -
                                                                                                                • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Adress: [Install@])
                                                                                                                  • +
                                                                                                                • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Address: [Install@])
                                                                                                                • then select “Firmware Upgrade” (with “Verify download” and “Start stack after upgrade”) Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                              • STEP 8: Revert STEP 2 procedure to put back device in normal mode.

                                                                                                                • @@ -313,7 +321,7 @@
                                                                                                              • STM32_Programmer_CLI.exe -c port=swd mode=UR -fwupgrade stm32wb3x_FUS_fw_for_fus_0_5_3.bin [Install@] firstinstall=0

                                                                                                              Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                              -

                                                                                                            • STEP 6: Download latest FUS

                                                                                                              +

                                                                                                            • STEP 6: Download latest FUS or Safeboot

                                                                                                              • STM32_Programmer_CLI.exe -c port=swd mode=UR -fwupgrade [FUS_Binary] [Install@] firstinstall=0
                                                                                                              @@ -364,7 +372,7 @@
                                                                                                            • STM32_Programmer_CLI.exe -c port=usb1 -fwupgrade stm32wb3x_FUS_fw_for_fus_0_5_3.bin [Install@] firstinstall=0

                                                                                                            Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                            • -

                                                                                                          • STEP 6: Download latest FUS

                                                                                                            +

                                                                                                          • STEP 6: Download latest FUS or Safeboot

                                                                                                            • STM32_Programmer_CLI.exe -c port=usb1 -fwupgrade [FUS_Binary] [Install@] firstinstall=0 Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.
                                                                                                            • @@ -386,13 +394,222 @@

                                                                                                            Update History

                                                                                                            - +

                                                                                                            Main Changes

                                                                                                            Associated changes in Wireless Coprocessor Binary:

                                                                                                            • BLE:
                                                                                                                +
                                                                                                              • BLE Multi link connection
                                                                                                                • +
                                                                                                              • The command “ACI_GAP_START_NAME_DISCOVERY_PROC” is deprecated
                                                                                                                • +
                                                                                                              • Configurable RX AGC settings
                                                                                                                • +
                                                                                                              • ID 97519 : When SRAM2 parity check is enabled, the NMI is triggered as soon as BLE is started
                                                                                                                • +
                                                                                                              • ID 108789 : ACI_GAP_START_NAME_DISCOVERY_PROC command is deprecated
                                                                                                                • +
                                                                                                              • ID 109676 : New HCI error status overlap with ACI error status
                                                                                                                +
                                                                                                                • +
                                                                                                              • ID 111208 : Support Dory Cut2.1 in parallel to Cut2.2 with new SHCI_C2_CONFIG parameter.
                                                                                                                • +
                                                                                                              • ID 111218 : STM32WB: potential issue with NVM RAM data not properly bounded
                                                                                                                +
                                                                                                                • +
                                                                                                              • ID 111277 : SHCI event parsing function improved in WPAN examples  
                                                                                                                +
                                                                                                                • +
                                                                                                              • ID 111509 : HCI/CCO/BI-40-C [LE Set Data Length, Invalid Parameters]
                                                                                                                • +
                                                                                                              • ID 111513 : HCI/CCO/BI-43-C [LE Read Channel Map – Reject Invalid Handle]
                                                                                                                • +
                                                                                                              • ID 111516 : LL/CON/ADV/BI-02 - LL/CON/INI/BI-03 FAIL no duplicate connection allowed
                                                                                                                • +
                                                                                                              • ID 111522 : LL/CON/PER/BI-18 - LL_PHY_UPDATE_IND from remote with coded_phy
                                                                                                                • +
                                                                                                              • ID 111749 : LL/DDI/ADV/BI_07 Connection request invalid Hop increment
                                                                                                                • +
                                                                                                              • ID 111756 : LL/CON/CEN/BI_11 FAIL should not respond twice to LL_VERSION_IND
                                                                                                                • +
                                                                                                              • ID 112402 : Implement SMP bypass controlled vis config data command
                                                                                                                • +
                                                                                                              • ID 112560 : STM32WB-BLE: potential issue in SMP process handling RX data
                                                                                                                • +
                                                                                                              • ID 113007 : add new parameter “rx_model_config” used for RSSI/AGC-LUT selection in SHCI_C2_Ble_Init() interface
                                                                                                                • +
                                                                                                              • ID 113942 : SMP PTS test SM_CEN_JW_BV-05 no more passing due to blacklist device
                                                                                                                • +
                                                                                                              • ID 114233 : Low power issue correction after stopping Advertising
                                                                                                                • +
                                                                                                              • ID 115162 : OTA procedure not completed properly
                                                                                                                • +
                                                                                                              • +
                                                                                                            • 802.15.4 general updates (Zigbee, Thread, MAC, PHY) +
                                                                                                                +
                                                                                                              • CCA (Clear Channel Assessment) Threshold has been increased
                                                                                                                • +
                                                                                                              • +
                                                                                                            • Thread: +
                                                                                                                +
                                                                                                              • Fix wrapper issue with UDP receivers
                                                                                                                • +
                                                                                                              • RCP: improved commissioning process robustness
                                                                                                                • +
                                                                                                              • +
                                                                                                            • Zigbee: +
                                                                                                                +
                                                                                                              • The handling of the internal 802_15_4 timer has been improved in order to solve several issues relative to the wraparound of this timer.
                                                                                                                • +
                                                                                                              • +
                                                                                                            • Mac 802.15.4: +
                                                                                                                +
                                                                                                              • ID 108754: On restart from persistence, device short address is not set to stored value
                                                                                                                • +
                                                                                                              • ID 111291: Fcf’s PANID compression bit wrongly filled in Beacon Request command
                                                                                                                • +
                                                                                                              • ID 111294: CSMA-CA - MaxBe low level threshold wrongly set
                                                                                                                • +
                                                                                                              • +
                                                                                                            • Phy 802.15.4: +
                                                                                                                +
                                                                                                              • New command SetGpioTX added. Control a debug GPIO raised during TX transmission (more detail in help command).
                                                                                                                • +
                                                                                                              • +
                                                                                                            • Safeboot: +
                                                                                                                +
                                                                                                              • Adding new binary: stm32wb3x_Safeboot_fw.bin +
                                                                                                                  +
                                                                                                                • This binary is intended to be installed in order to update the safeboot part.
                                                                                                                  • +
                                                                                                                • This binary is intended only for FUS versions V1.1.0 and higher.
                                                                                                                  • +
                                                                                                                • Safeboot upgrade is optional.
                                                                                                                  • +
                                                                                                                • +
                                                                                                              • +
                                                                                                            +

                                                                                                            Firmware Upgrade Services Binary Table: Provides Install address for the targeted binary to be used in flash procedure “STEP 5/6” via USB or via SWD/JTAG.

                                                                                                            + + + + + + + + + + + + + + + + + + + + + + + +
                                                                                                            Wireless Coprocessor BinarySTM32WB3x(512K)STM32WB3x(256K)Version
                                                                                                            stm32wb3x_FUS_fw_for_fus_0_5_3.bin0x0807A0000x0803A000V1.2.0
                                                                                                            stm32wb3x_FUS_fw.bin0x0807A0000x0803A000V1.2.0
                                                                                                            +

                                                                                                            Wireless Coprocessor Binary Table: Provides Install address for the targeted binary to be used in flash procedure “STEP 7” via USB or via SWD/JTAG.

                                                                                                            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                                                                            Wireless Coprocessor BinarySTM32WB3x(512K)STM32WB3x(256K)Version
                                                                                                            stm32wb3x_BLE_HCILayer_fw.bin0x080680000x08028000V1.13.0
                                                                                                            stm32wb3x_BLE_HCI_AdvScan_fw.bin0x080770000x08037000V1.13.0
                                                                                                            stm32wb3x_BLE_LLD_fw.bin0x080780000x08038000V1.12.0
                                                                                                            stm32wb3x_BLE_Mac_802_15_4_fw.bin0x080400000x00V1.13.0
                                                                                                            stm32wb3x_BLE_Stack_basic_fw.bin0x0805D0000x0801D000V1.13.0
                                                                                                            stm32wb3x_BLE_Stack_full_fw.bin0x080530000x08013000V1.13.0
                                                                                                            stm32wb3x_BLE_Stack_light_fw.bin0x080630000x08023000V1.13.0
                                                                                                            stm32wb3x_Mac_802_15_4_fw.bin0x0806F0000x0802F000V1.13.0
                                                                                                            stm32wb3x_Phy_802_15_4_fw.bin0x0806A0000x0802A000V1.13.0
                                                                                                            stm32wb3x_Thread_FTD_fw.bin0x080230000x00V1.13.0
                                                                                                            stm32wb3x_Thread_MTD_fw.bin0x080360000x00V1.13.0
                                                                                                            stm32wb3x_Thread_RCP_fw.bin0x080660000x08026000V1.13.0
                                                                                                            stm32wb3x_Zigbee_FFD_fw.bin0x080300000x00V1.13.0
                                                                                                            stm32wb3x_Zigbee_RFD_fw.bin0x0803F0000x00V1.13.0
                                                                                                            +

                                                                                                            Firmware Safeboot Binary Table: Provides Install address for the targeted binary to be used in flash procedure “STEP 5/6” via USB or via SWD/JTAG.

                                                                                                            + + + + + + + + + + + + + + + + + +
                                                                                                            Wireless Coprocessor BinarySTM32WB3x(512K)STM32WB3x(256K)Version
                                                                                                            stm32wb3x_Safeboot_fw.bin0x0807E0000x0803E000V2.0.0
                                                                                                            +
                                                                                                            +
                                                                                                            +
                                                                                                            + +
                                                                                                            +

                                                                                                            Main Changes

                                                                                                            +

                                                                                                            Associated changes in Wireless Coprocessor Binary:

                                                                                                            +
                                                                                                              +
                                                                                                            • BLE: +
                                                                                                              • ID 110164 : Update BLE stack to avoid BLE link loss in case of Flash Erase while BLE RF is in process
                                                                                                            @@ -523,7 +740,7 @@
                                                                                                            -

                                                                                                            Main Changes

                                                                                                            +

                                                                                                            Main Changes

                                                                                                            Associated changes in Wireless Coprocessor Binary:

                                                                                                            • Thread: @@ -535,7 +752,7 @@
                                                                                                              • zb_destroy_process improvement correcting some potential memory issues.
                                                                                                              • Memory allocation improvement 
                                                                                                                • -
                                                                                                              • Code cleanup (MISRA rules compliancy)
                                                                                                                • +
                                                                                                              • Code cleanup (MISRA rules compliance)
                                                                                                              • Power consumption improvement when using fragmentation for a sleepy end device (transfer of payload > 50 bytes)
                                                                                                              • ID 105050 : Correct issue avoiding the Application to run at 64Mhz
                                                                                                              • @@ -689,7 +906,7 @@
                                                                                                              -

                                                                                                              Main Changes

                                                                                                              +

                                                                                                              Main Changes

                                                                                                              Associated changes in Wireless Coprocessor Binary:

                                                                                                              • Install address for STM32WB3x(256K) provided

                                                                                                                • @@ -699,7 +916,7 @@
                                                                                                              • ID 99680 : 2nd link secure fail if master database is clear during 1st link connection
                                                                                                              • ID 101346 : ACI_GAP_BOND_LOST_Event timeout does not work if ALLOW rebond not sent
                                                                                                              • ID 101921 : PTS issue ticket done CASE0070853: destination channel ID value above 1000 should be allowed and test passed
                                                                                                                • -
                                                                                                              • ID 94289 ,ID 102395 ,ID 100425 : BLE_Ota application improvments (SBSFU ready, Flash driver use, SEM7 flash activity control)
                                                                                                                • +
                                                                                                              • ID 94289 ,ID 102395 ,ID 100425 : BLE_Ota application improvements (SBSFU ready, Flash driver use, SEM7 flash activity control)
                                                                                                            • Thread:
                                                                                                                @@ -851,7 +1068,7 @@
                                                                                                                -

                                                                                                                Main Changes

                                                                                                                +

                                                                                                                Main Changes

                                                                                                                Associated changes in Wireless Coprocessor Binary:

                                                                                                                • Support of new binary: @@ -1008,7 +1225,7 @@
                                                                                                                  -

                                                                                                                  Main Changes

                                                                                                                  +

                                                                                                                  Main Changes

                                                                                                                  Associated changes in Wireless Coprocessor Binary:

                                                                                                                  • BLE: @@ -1106,7 +1323,7 @@
                                                                                                                    -

                                                                                                                    Main Changes

                                                                                                                    +

                                                                                                                    Main Changes

                                                                                                                    Associated changes in Wireless Coprocessor Binary:

                                                                                                                    • Introducing following new binary:
                                                                                                                      • @@ -1121,12 +1338,12 @@
                                                                                                                    • ID 89456 : ERR_BLE_INIT event is enum listed, kept but not really supported as not reported
                                                                                                                    • ID 90095 : Device Privacy Mode is now mandatory for BLE 5.0 and implemented to handle command HCI_LE_SET_PRIVACY_MODE command
                                                                                                                    • ID 90607 : Beacon Only certification needs LE Test commands and LE Read Buffer Size command as:
                                                                                                                      HCI_LE_RECEIVER_TEST, HCI_LE_TEST_END,HCI_LE_TRANSMITTER_TEST and LE_READ_BUFFER_SIZE integrated commands
                                                                                                                      • -
                                                                                                                    • ID 90891 : DEEPSLEEP mode on CPU2 not applied after aci_hal_stack_reset or hci_reset command is executed.
                                                                                                                      A fix is to enable back the Stop Mode when the hci_reset() command is executed, included in all regenrated M0 firmware binaries
                                                                                                                      • +
                                                                                                                    • ID 90891 : DEEPSLEEP mode on CPU2 not applied after aci_hal_stack_reset or hci_reset command is executed.
                                                                                                                      A fix is to enable back the Stop Mode when the hci_reset() command is executed, included in all regenerated M0 firmware binaries
                                                                                                                    • ID 91134 : SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE not implemented on the stack side.
                                                                                                                      A fix has been implemented on CPU2 to receive expected events on CPU1
                                                                                                                    • ID 91157 : FLASH_SR_EOP flag remains set after the bonding info stored in NVM.
                                                                                                                      A fix has been implemented to clear EOP flag after flash processing on CPU2
                                                                                                                    • ID 91309 : A bug identified in the Link Layer which not de-allocate the memory it has allocated for ACL packets
                                                                                                                      to be sent to the upper layer memory used for previous ACL packets.
                                                                                                                      A fix implemented to de-allocate packet not yet sent to upper layers at the disconnection time
                                                                                                                      • -
                                                                                                                    • ID 91351 : CPU2 gets stuck when EOP and EOPIE both set in CPU1 FLASH interface prior CPU2 booting.
                                                                                                                      A fix in NVM arbitrer implemented as enable SYSCFG only when EOPIE is enabled
                                                                                                                      • +
                                                                                                                    • ID 91351 : CPU2 gets stuck when EOP and EOPIE both set in CPU1 FLASH interface prior CPU2 booting.
                                                                                                                      A fix in NVM arbiter implemented as enable SYSCFG only when EOPIE is enabled
                                                                                                                    • ID 92458 : Replace the EOP polling by CFGBSY polling in CPU2 M0 firmware to get confirmation flash operation is completed
                                                                                                                      to avoid unexpected interrupt on CPU1 side when its EOPIE bit is set
                                                                                                                    • ID 91576 : The feature flag LE Power Class 1 shall be set when the ExtPa is used
                                                                                                                    • @@ -1220,7 +1437,7 @@
                                                                                                                    -

                                                                                                                    Main Changes

                                                                                                                    +

                                                                                                                    Main Changes

                                                                                                                    Associated changes in Wireless Coprocessor Binary:

                                                                                                                    • BLE: @@ -1328,7 +1545,7 @@
                                                                                                                      -

                                                                                                                      Main Changes

                                                                                                                      +

                                                                                                                      Main Changes

                                                                                                                      Associated changes in Wireless Coprocessor Binary:

                                                                                                                      • MAC: @@ -1417,7 +1634,7 @@
                                                                                                                        -

                                                                                                                        Main Changes

                                                                                                                        +

                                                                                                                        Main Changes

                                                                                                                        Associated changes in Wireless Coprocessor Binary:

                                                                                                                        • Initial version of Wireless Coprocessor Binary compatible with STM32WB3x.
                                                                                                                          • diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCILayer_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCILayer_fw.bin index bb990d597..19569dc11 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCILayer_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCILayer_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCI_AdvScan_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCI_AdvScan_fw.bin index df8e965e8..f8eab2a70 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCI_AdvScan_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_HCI_AdvScan_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_basic_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_basic_fw.bin index 0bca2277d..71a9ae74a 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_basic_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_basic_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_full_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_full_fw.bin index 445b1fc0e..6ca79933f 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_full_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_full_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_light_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_light_fw.bin index f350dd08f..c1a3cb66b 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_light_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_BLE_Stack_light_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Mac_802_15_4_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Mac_802_15_4_fw.bin index 7de766122..7690eab89 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Mac_802_15_4_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Mac_802_15_4_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Phy_802_15_4_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Phy_802_15_4_fw.bin index fb4530766..109c57a10 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Phy_802_15_4_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Phy_802_15_4_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Safeboot_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Safeboot_fw.bin new file mode 100644 index 000000000..190ab9090 Binary files /dev/null and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Safeboot_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_FTD_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_FTD_fw.bin index bf079bafa..385881a32 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_FTD_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_FTD_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_MTD_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_MTD_fw.bin index 8b2b36da1..92077bc78 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_MTD_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_MTD_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_RCP_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_RCP_fw.bin index daff2bfbb..0c406c1c9 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_RCP_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Thread_RCP_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_FFD_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_FFD_fw.bin index 25d00bce9..641a342af 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_FFD_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_FFD_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_RFD_fw.bin b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_RFD_fw.bin index 136bdd2d8..cb3163216 100644 Binary files a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_RFD_fw.bin and b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB3x/stm32wb3x_Zigbee_RFD_fw.bin differ diff --git a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/Release_Notes.html b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/Release_Notes.html index 4b4e4abed..415102698 100644 --- a/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/Release_Notes.html +++ b/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/Release_Notes.html @@ -176,17 +176,6 @@
                                                                                                                        • Static Concurrent Mode BLE MAC 802.15.4.
                                                                                                                        • Supports Full BLE Stack 5.2 certified and MAC 802.15.4 API based on latest official IEEE Std 802.15.4-2011
                                                                                                                        • -
                                                                                                                      • stm32wb5x_BLE_Zigbee_FFD_static_fw.bin -
                                                                                                                          -
                                                                                                                        • Static Concurrent Mode BLE Zigbee FFD
                                                                                                                          • -
                                                                                                                        • Supports Full BLE Stack 5.2 certified and Zigbee FFD(Full Function Device) Compliant Platform certified
                                                                                                                          • -
                                                                                                                        • -
                                                                                                                      • stm32wb5x_BLE_Zigbee_RFD_static_fw.bin -
                                                                                                                          -
                                                                                                                        • Static Concurrent Mode BLE Zigbee RFD
                                                                                                                          • -
                                                                                                                        • Supports Full BLE Stack 5.2 certified and Zigbee RFD(Reduced Function Device) Compliant Platform certified
                                                                                                                          • -
                                                                                                                        • Optimized for Power consumption.
                                                                                                                          • -
                                                                                                                      • stm32wb5x_BLE_Zigbee_FFD_dynamic_fw.bin
                                                                                                                        • Dynamic Concurrent Mode BLE Zigbee FFD.
                                                                                                                          • @@ -214,6 +203,14 @@
                                                                                                                        • This binary is the utility to flash the Wireless Coprocessor Binaries.
                                                                                                                        • Latest version of the FUS
                                                                                                                        • +
                                                                                                                      • stm32wb5x_Safeboot_fw.bin +
                                                                                                                          +
                                                                                                                        • Safeboot is an independent part of the FUS that manages specifically one case: option bytes corruption.
                                                                                                                          • +
                                                                                                                        • When option bytes are corrupted, the STM32WB hardware forces the boot to safeboot whatever the running firmware.
                                                                                                                          • +
                                                                                                                        • The safeboot performs a factory reset (on FUS versions V1.1.0 and higher) which means the wireless stack is removed if any and the Cortex®-M4 code is erased and boot is reset to FUS (virgin part state).
                                                                                                                          • +
                                                                                                                        • This operation is also not reversible. In order to activate the Safeboot, the user must activate Cortex®-M0+ by writing the value 0x00008000 at the address 0x5800040C using the SWD interface.
                                                                                                                          • +
                                                                                                                        • If a FUS version lower than V1.1.0 is running, then, no recovery is possible at this point.
                                                                                                                          • +

                                                                                                                      How to flash the Wireless Coprocessor Binary via SWD/JTAG by ST-LINK (STM32CubeProgrammer GUI)

                                                                                                                        @@ -254,17 +251,17 @@

                                                                                                                    • STEP 5: Download latest FUS for only FUSv0.5.3 upgrade

                                                                                                                        -
                                                                                                                      • in Firmware Upgrade Services: (File Path: [stm32wb5x_FUS_fw_for_fus_0_5_3.bin], Start Adress: [Install@])
                                                                                                                        • +
                                                                                                                      • in Firmware Upgrade Services: (File Path: [stm32wb5x_FUS_fw_for_fus_0_5_3.bin], Start Address: [Install@])
                                                                                                                      • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.
                                                                                                                      • -

                                                                                                                    • STEP 6: Download latest FUS

                                                                                                                      +

                                                                                                                    • STEP 6: Download latest FUS or Safeboot

                                                                                                                        -
                                                                                                                      • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Adress: [Install@])
                                                                                                                        • +
                                                                                                                      • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Address: [Install@])
                                                                                                                      • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                                    • STEP 7: Download new wireless stack (after “FW Delete” if requested)

                                                                                                                        -
                                                                                                                      • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Adress: [Install@])
                                                                                                                        • +
                                                                                                                      • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Address: [Install@])
                                                                                                                      • then select “Firmware Upgrade” (with “Verify download” and “Start stack after upgrade”) Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary. (optional: activate “Anti-Rollback” on downloaded binary) If you need to perform FUS related manipulations, you always need to START the FUS in case the FUS is not running.

                                                                                                                    • STEP 8: Revert to default configuration: in Option Bytes menu for User Configuration set: nSWboot0=1 (checked) nboot1=1 nboot0=1

                                                                                                                      • @@ -313,17 +310,17 @@

                                                                                                                  • STEP 5: Download latest FUS for only FUSv0.5.3 upgrade

                                                                                                                      -
                                                                                                                    • in Firmware Upgrade Service: (File Path: [stm32wb5x_FUS_fw_for_fus_0_5_3.bin], Start Adress: [Install@])
                                                                                                                      • +
                                                                                                                    • in Firmware Upgrade Service: (File Path: [stm32wb5x_FUS_fw_for_fus_0_5_3.bin], Start Address: [Install@])
                                                                                                                    • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.
                                                                                                                    • -

                                                                                                                  • STEP 6: Download latest FUS

                                                                                                                    +

                                                                                                                  • STEP 6: Download latest FUS or Safeboot

                                                                                                                      -
                                                                                                                    • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Adress: [Install@])
                                                                                                                      • +
                                                                                                                    • in Firmware Upgrade Service: (File Path: [FUS_Binary], Start Address: [Install@])
                                                                                                                    • then select “Firmware Upgrade” Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                                  • STEP 7: Download new wireless stack (after “FW Delete” if requested)

                                                                                                                      -
                                                                                                                    • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Adress: [Install@])
                                                                                                                      • +
                                                                                                                    • in Firmware Upgrade Service: (File Path: [Wireless_Coprocessor_Binary], Start Address: [Install@])
                                                                                                                    • then select “Firmware Upgrade” (with “Verify download” and “Start stack after upgrade”) Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                                  • STEP 8: Revert STEP 2 procedure to put back device in normal mode.

                                                                                                                    • @@ -372,7 +369,7 @@
                                                                                                                  • STM32_Programmer_CLI.exe -c port=swd mode=UR -fwupgrade stm32wb5x_FUS_fw_for_fus_0_5_3.bin [Install@] firstinstall=0

                                                                                                                  Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                                  • -

                                                                                                                • STEP 6: Download latest FUS

                                                                                                                  +

                                                                                                                • STEP 6: Download latest FUS or Safeboot

                                                                                                                  • STM32_Programmer_CLI.exe -c port=swd mode=UR -fwupgrade [FUS_Binary] [Install@] firstinstall=0
                                                                                                                  @@ -433,7 +430,7 @@
                                                                                                                • STM32_Programmer_CLI.exe -c port=usb1 -fwupgrade stm32wb5x_FUS_fw_for_fus_0_5_3.bin [Install@] firstinstall=0

                                                                                                                Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.

                                                                                                                -

                                                                                                              • STEP 6: Download latest FUS

                                                                                                                +

                                                                                                              • STEP 6: Download latest FUS or Safeboot

                                                                                                                • STM32_Programmer_CLI.exe -c port=usb1 -fwupgrade [FUS_Binary] [Install@] firstinstall=0 Please check Firmware Upgrade Services Binary Table for Install@ parameter depending of the binary.
                                                                                                                • @@ -455,13 +452,318 @@

                                                                                                                Update History

                                                                                                                - +

                                                                                                                Main Changes

                                                                                                                Associated changes in Wireless Coprocessor Binary:

                                                                                                                • BLE:
                                                                                                                    +
                                                                                                                  • BLE Multi link connection
                                                                                                                    • +
                                                                                                                  • The command “ACI_GAP_START_NAME_DISCOVERY_PROC” is deprecated
                                                                                                                    • +
                                                                                                                  • Configurable RX AGC settings
                                                                                                                    • +
                                                                                                                  • ID 97519 : When SRAM2 parity check is enabled, the NMI is triggered as soon as BLE is started
                                                                                                                    • +
                                                                                                                  • ID 108789 : ACI_GAP_START_NAME_DISCOVERY_PROC command is deprecated
                                                                                                                    • +
                                                                                                                  • ID 109676 : New HCI error status overlap with ACI error status
                                                                                                                    +
                                                                                                                    • +
                                                                                                                  • ID 111208 : Support Dory Cut2.1 in parallel to Cut2.2 with new SHCI_C2_CONFIG parameter.
                                                                                                                    • +
                                                                                                                  • ID 111218 : STM32WB: potential issue with NVM RAM data not properly bounded
                                                                                                                    +
                                                                                                                    • +
                                                                                                                  • ID 111277 : SHCI event parsing function improved in WPAN examples  
                                                                                                                    +
                                                                                                                    • +
                                                                                                                  • ID 111509 : HCI/CCO/BI-40-C [LE Set Data Length, Invalid Parameters]
                                                                                                                    • +
                                                                                                                  • ID 111513 : HCI/CCO/BI-43-C [LE Read Channel Map – Reject Invalid Handle]
                                                                                                                    • +
                                                                                                                  • ID 111516 : LL/CON/ADV/BI-02 - LL/CON/INI/BI-03 FAIL no duplicate connection allowed
                                                                                                                    • +
                                                                                                                  • ID 111522 : LL/CON/PER/BI-18 - LL_PHY_UPDATE_IND from remote with coded_phy
                                                                                                                    • +
                                                                                                                  • ID 111749 : LL/DDI/ADV/BI_07 Connection request invalid Hop increment
                                                                                                                    • +
                                                                                                                  • ID 111756 : LL/CON/CEN/BI_11 FAIL should not respond twice to LL_VERSION_IND
                                                                                                                    • +
                                                                                                                  • ID 112402 : Implement SMP bypass controlled vis config data command
                                                                                                                    • +
                                                                                                                  • ID 112560 : STM32WB-BLE: potential issue in SMP process handling RX data
                                                                                                                    • +
                                                                                                                  • ID 113007 : add new parameter “rx_model_config” used for RSSI/AGC-LUT selection in SHCI_C2_Ble_Init() interface
                                                                                                                    • +
                                                                                                                  • ID 113942 : SMP PTS test SM_CEN_JW_BV-05 no more passing due to blacklist device
                                                                                                                    • +
                                                                                                                  • ID 114233 : Low power issue correction after stopping Advertising
                                                                                                                    • +
                                                                                                                  • ID 115162 : OTA procedure not completed properly
                                                                                                                    • +
                                                                                                                  • +
                                                                                                                • 802.15.4 general updates (Zigbee, Thread, MAC, PHY) +
                                                                                                                    +
                                                                                                                  • CCA (Clear Channel Assessment) Threshold has been increased
                                                                                                                    • +
                                                                                                                  • +
                                                                                                                • Thread: +
                                                                                                                    +
                                                                                                                  • Fix wrapper issue with UDP receivers
                                                                                                                    • +
                                                                                                                  • RCP: improved commissioning process robustness
                                                                                                                    • +
                                                                                                                  • +
                                                                                                                • Zigbee: +
                                                                                                                    +
                                                                                                                  • The handling of the internal 802_15_4 timer has been improved in order to solve several issues relative to the wraparound of this timer.
                                                                                                                    • +
                                                                                                                  • +
                                                                                                                • Mac 802.15.4: +
                                                                                                                    +
                                                                                                                  • ID 108754: On restart from persistence, device short address is not set to stored value
                                                                                                                    • +
                                                                                                                  • ID 111291: Fcf’s PANID compression bit wrongly filled in Beacon Request command
                                                                                                                    • +
                                                                                                                  • ID 111294: CSMA-CA - MaxBe low level threshold wrongly set
                                                                                                                    • +
                                                                                                                  • +
                                                                                                                • Phy 802.15.4: +
                                                                                                                    +
                                                                                                                  • New command SetGpioTX added. Control a debug GPIO raised during TX transmission (more detail in help command).
                                                                                                                    • +
                                                                                                                  • +
                                                                                                                • Safeboot: +
                                                                                                                    +
                                                                                                                  • Adding new binary: stm32wb5x_Safeboot_fw.bin +
                                                                                                                      +
                                                                                                                    • This binary is intended to be installed in order to update the safeboot part.
                                                                                                                      • +
                                                                                                                    • This binary is intended only for FUS versions V1.1.0 and higher.
                                                                                                                      • +
                                                                                                                    • Safeboot upgrade is optional.
                                                                                                                      • +
                                                                                                                    • +
                                                                                                                  • +
                                                                                                                +

                                                                                                                Firmware Upgrade Services Binary Table: Provides Install address for the targeted binary to be used in flash procedure “STEP 5/6” via USB or via SWD/JTAG.

                                                                                                                + ++++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                                                                                Wireless Coprocessor BinarySTM32WB5xxG(1M)STM32WB5xxY(640k)STM32WB5xxE(512K)STM32WB5xxC(256K)Version
                                                                                                                stm32wb5x_FUS_fw_for_fus_0_5_3.bin0x080EC0000x0809A0000x0807A0000x0803A000V1.2.0
                                                                                                                stm32wb5x_FUS_fw.bin0x080EC0000x0809A0000x0807A0000x0803A000V1.2.0
                                                                                                                +

                                                                                                                Wireless Coprocessor Binary Table: Provides Install address for the targeted binary to be used in flash procedure “STEP 7” via USB or via SWD/JTAG.

                                                                                                                + ++++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                                                                                Wireless Coprocessor BinarySTM32WB5xxG(1M)STM32WB5xxY(640k)STM32WB5xxE(512K)STM32WB5xxC(256K)Version
                                                                                                                stm32wb5x_BLE_HCILayer_fw.bin0x080DC0000x080880000x080680000x08028000V1.13.0
                                                                                                                stm32wb5x_BLE_HCI_AdvScan_fw.bin0x080EB0000x080970000x080770000x08037000V1.13.0
                                                                                                                stm32wb5x_BLE_LLD_fw.bin0x080ED0000x080990000x080790000x08039000V1.12.0
                                                                                                                stm32wb5x_BLE_Mac_802_15_4_fw.bin0x080B10000x0805D0000x0803D0000x00V1.13.0
                                                                                                                stm32wb5x_BLE_Stack_basic_fw.bin0x080D10000x0807D0000x0805D0000x0801D000V1.13.0
                                                                                                                stm32wb5x_BLE_Stack_full_fw.bin0x080C70000x080730000x080530000x08013000V1.13.0
                                                                                                                stm32wb5x_BLE_Stack_light_fw.bin0x080D70000x080830000x080630000x08023000V1.13.0
                                                                                                                stm32wb5x_BLE_Thread_dynamic_fw.bin0x0806D0000x080190000x000x00V1.13.0
                                                                                                                stm32wb5x_BLE_Thread_static_fw.bin0x0806F0000x0801B0000x000x00V1.13.0
                                                                                                                stm32wb5x_BLE_Zigbee_FFD_dynamic_fw.bin0x080710000x0801D0000x000x00V1.13.0
                                                                                                                stm32wb5x_BLE_Zigbee_RFD_dynamic_fw.bin0x080800000x0802C0000x0800C0000x00V1.13.0
                                                                                                                stm32wb5x_Mac_802_15_4_fw.bin0x080E30000x0808F0000x0806F0000x0802F000V1.13.0
                                                                                                                stm32wb5x_Phy_802_15_4_fw.bin0x080DE0000x0808A0000x0806A0000x0802A000V1.13.0
                                                                                                                stm32wb5x_Thread_FTD_fw.bin0x080970000x080430000x080230000x00V1.13.0
                                                                                                                stm32wb5x_Thread_MTD_fw.bin0x080AA0000x080560000x080360000x00V1.13.0
                                                                                                                stm32wb5x_Thread_RCP_fw.bin0x080DA0000x080860000x080660000x08026000V1.13.0
                                                                                                                stm32wb5x_Zigbee_FFD_fw.bin0x080A40000x080500000x080300000x00V1.13.0
                                                                                                                stm32wb5x_Zigbee_RFD_fw.bin0x080B30000x0805F0000x0803F0000x00V1.13.0
                                                                                                                +

                                                                                                                Firmware Safeboot Binary Table: Provides Install address for the targeted binary to be used in flash procedure “STEP 5/6” via USB or via SWD/JTAG.

                                                                                                                + ++++++++ + + + + + + + + + + + + + + + + + + + + +
                                                                                                                Wireless Coprocessor BinarySTM32WB5xxG(1M)STM32WB5xxY(640k)STM32WB5xxE(512K)STM32WB5xxC(256K)Version
                                                                                                                stm32wb5x_Safeboot_fw.bin0x080F00000x0809F0000x0807F0000x0803F000V2.0.0
                                                                                                                +
                                                                                                                +
                                                                                                                +
                                                                                                                + +
                                                                                                                +

                                                                                                                Main Changes

                                                                                                                +

                                                                                                                Associated changes in Wireless Coprocessor Binary:

                                                                                                                +
                                                                                                                  +
                                                                                                                • BLE: +
                                                                                                                  • ID 110164 : Update BLE stack to avoid BLE link loss in case of Flash Erase while BLE RF is in process
                                                                                                                @@ -692,7 +994,7 @@
                                                                                                                -

                                                                                                                Main Changes

                                                                                                                +

                                                                                                                Main Changes

                                                                                                                • Thread:
                                                                                                                    @@ -703,7 +1005,7 @@
                                                                                                                    • zb_destroy_process improvement correcting some potential memory issues.
                                                                                                                    • Memory allocation improvement 
                                                                                                                      • -
                                                                                                                    • Code cleanup (MISRA rules compliancy)
                                                                                                                      • +
                                                                                                                    • Code cleanup (MISRA rules compliance)
                                                                                                                    • Power consumption improvement when using fragmentation for a sleepy end device (transfer of payload > 50 bytes)
                                                                                                                    • ID 105050 : Correct issue avoiding the Application to run at 64Mhz
                                                                                                                    @@ -957,7 +1259,7 @@
                                                                                                                    -

                                                                                                                    Main Changes

                                                                                                                    +

                                                                                                                    Main Changes

                                                                                                                    • BLE:
                                                                                                                        @@ -965,7 +1267,7 @@
                                                                                                                      • ID 99680 : 2nd link secure fail if master database is clear during 1st link connection
                                                                                                                      • ID 101346 : ACI_GAP_BOND_LOST_Event timeout does not work if ALLOW rebond not sent
                                                                                                                      • ID 101921 : PTS issue ticket done CASE0070853: destination channel ID value above 1000 should be allowed and test passed
                                                                                                                        • -
                                                                                                                      • ID 94289 ,ID 102395 ,ID 100425 : BLE_Ota application improvments (SBSFU ready, Flash driver use, SEM7 flash activity control)
                                                                                                                        • +
                                                                                                                      • ID 94289 ,ID 102395 ,ID 100425 : BLE_Ota application improvements (SBSFU ready, Flash driver use, SEM7 flash activity control)
                                                                                                                    • Thread:
                                                                                                                        @@ -1221,7 +1523,7 @@
                                                                                                                        -

                                                                                                                        Main Changes

                                                                                                                        +

                                                                                                                        Main Changes

                                                                                                                        Associated changes in Wireless Coprocessor Binary:

                                                                                                                        • Support of new binary: @@ -1502,7 +1804,7 @@
                                                                                                                          -

                                                                                                                          Main Changes

                                                                                                                          +

                                                                                                                          Main Changes

                                                                                                                          Associated changes in Wireless Coprocessor Binary:

                                                                                                                          • BLE: @@ -1745,7 +2047,7 @@
                                                                                                                            -

                                                                                                                            Main Changes

                                                                                                                            +

                                                                                                                            Main Changes

                                                                                                                            Associated changes in Wireless Coprocessor Binary:

                                                                                                                            • Introducing following new binaries: @@ -1778,12 +2080,12 @@
                                                                                                                            • ID 89456 : ERR_BLE_INIT event is enum listed, kept but not really supported as not reported
                                                                                                                            • ID 90095 : Device Privacy Mode is now mandatory for BLE 5.0 and implemented to handle command HCI_LE_SET_PRIVACY_MODE command
                                                                                                                            • ID 90607 : Beacon Only certification needs LE Test commands and LE Read Buffer Size command as:
                                                                                                                              HCI_LE_RECEIVER_TEST, HCI_LE_TEST_END,HCI_LE_TRANSMITTER_TEST and LE_READ_BUFFER_SIZE integrated commands
                                                                                                                              • -
                                                                                                                            • ID 90891 : DEEPSLEEP mode on CPU2 not applied after aci_hal_stack_reset or hci_reset command is executed.
                                                                                                                              A fix is to enable back the Stop Mode when the hci_reset() command is executed, included in all regenrated M0 firmware binaries
                                                                                                                              • +
                                                                                                                            • ID 90891 : DEEPSLEEP mode on CPU2 not applied after aci_hal_stack_reset or hci_reset command is executed.
                                                                                                                              A fix is to enable back the Stop Mode when the hci_reset() command is executed, included in all regenerated M0 firmware binaries
                                                                                                                            • ID 91134 : SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE not implemented on the stack side.
                                                                                                                              A fix has been implemented on CPU2 to receive expected events on CPU1
                                                                                                                            • ID 91157 : FLASH_SR_EOP flag remains set after the bonding info stored in NVM.
                                                                                                                              A fix has been implemented to clear EOP flag after flash processing on CPU2
                                                                                                                            • ID 91309 : A bug identified in the Link Layer which not de-allocate the memory it has allocated for ACL packets
                                                                                                                              to be sent to the upper layer memory used for previous ACL packets.
                                                                                                                              A fix implemented to de-allocate packet not yet sent to upper layers at the disconnection time
                                                                                                                              • -
                                                                                                                            • ID 91351 : CPU2 gets stuck when EOP and EOPIE both set in CPU1 FLASH interface prior CPU2 booting.
                                                                                                                              A fix in NVM arbitrer implemented as enable SYSCFG only when EOPIE is enabled
                                                                                                                              • +
                                                                                                                            • ID 91351 : CPU2 gets stuck when EOP and EOPIE both set in CPU1 FLASH interface prior CPU2 booting.
                                                                                                                              A fix in NVM arbiter implemented as enable SYSCFG only when EOPIE is enabled
                                                                                                                            • ID 92458 : Replace the EOP polling by CFGBSY polling in CPU2 M0 firmware to get confirmation flash operation is completed
                                                                                                                              to avoid unexpected interrupt on CPU1 side when its EOPIE bit is set
                                                                                                                            • ID 91576 : The feature flag LE Power Class 1 shall be set when the ExtPa is used
                                                                                                                            • @@ -2034,7 +2336,7 @@
                                                                                                                            -

                                                                                                                            Main Changes

                                                                                                                            +

                                                                                                                            Main Changes

                                                                                                                            Associated changes in Wireless Coprocessor Binary:

                                                                                                                            • BLE: @@ -2230,7 +2532,7 @@
                                                                                                                              -

                                                                                                                              Main Changes

                                                                                                                              +

                                                                                                                              Main Changes

                                                                                                                              Associated changes in Wireless Coprocessor Binary:

                                                                                                                              • MAC: @@ -2426,7 +2728,7 @@
                                                                                                                                -

                                                                                                                                Main Changes

                                                                                                                                +

                                                                                                                                Main Changes

                                                                                                                                Associated changes in Wireless Coprocessor Binary:

                                                                                                                                • FUS: @@ -2618,7 +2920,7 @@ then #define CFG_BLE_NUM_LINK in app_conf.h shall be updated accordingly.
                                                                                                                                  • -

                                                                                                                                  Main Changes

                                                                                                                                  +

                                                                                                                                  Main Changes

                                                                                                                                  Associated changes in Wireless Coprocessor Binary:

                                                                                                                                  • ZIGBEE : @@ -2763,7 +3065,7 @@ then #define CFG_BLE_NUM_LINK in app_conf.h shall be updated accordingly.
                                                                                                                                    • -

                                                                                                                                    Main Changes

                                                                                                                                    +

                                                                                                                                    Main Changes

                                                                                                                                    Associated changes in Wireless Coprocessor Binary:

                                                                                                                                    • ZIGBEE : @@ -2903,7 +3205,7 @@ then #define CFG_BLE_NUM_LINK in app_conf.h shall be updated accordingly.
                                                                                                                                      • -

                                                                                                                                      Main Changes

                                                                                                                                      +

                                                                                                                                      Main Changes

                                                                                                                                      Associated changes in Wireless Coprocessor Binary:

                                                                                                                                      -

                                                                                                                                      Contents

                                                                                                                                      -

                                                                                                                                      Projects

                                                                                                                                      +

                                                                                                                                      Contents

                                                                                                                                      +

                                                                                                                                      Projects

                                                                                                                                      The STM32CubeWB Firmware package comes with a rich set of examples running on STMicroelectronics boards, organized by board and provided with preconfigured projects for the main supported toolchains.

                                                                                                                                      The exhaustive list of projects and their short description is provided in this table (STM32CubeProjectsList.html).

                                                                                                                                      Please note that the path of the example projects have been change to P-NUCLEO-WB55.Nucleo and P-NUCLEO-WB55.USBDongle.

                                                                                                                                      -

                                                                                                                                      Components

                                                                                                                                      +

                                                                                                                                      Components

                                                                                                                                      Firmware Upgrade Services Binary

                                                                                                                                      @@ -5970,7 +6617,7 @@ - +
                                                                                                                                      stm32wb5x_FUS_fw.bin V1.0.2 SLA0044 (binary release)release noterelease notes
                                                                                                                                      @@ -5989,43 +6636,43 @@ stm32wb5x_BLE_Stack_fw.bin V1.1.1 SLA0044 (binary release) -release note +release notes stm32wb5x_BLE_HCILayer_fw.bin V1.1.1 SLA0044 (binary release) -release note +release notes stm32wb5x_Thread_FTD_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_Thread_MTD_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_BLE_Thread_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_Mac_802_15_4_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_rfmonitor_phy802_15_4_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes @@ -6178,7 +6825,7 @@


                                                                                                                                      -

                                                                                                                                      Known Limitations

                                                                                                                                      +

                                                                                                                                      Known Limitations

                                                                                                                                      • With the ability to change the Coprocessor Wireless Binaries Over The Air (OTA), it is possible to switch from one binary to another. Only, the following case is not possible due to available memory size:
                                                                                                                                          @@ -6196,18 +6843,18 @@
                                                                                                                                        • SW4STM32 project is compiled without optimisation. (With optimised size compilation, the virtual com port required for the application is not functionnal)
                                                                                                                                      -

                                                                                                                                      Development Toolchains and Compilers

                                                                                                                                      +

                                                                                                                                      Development Toolchains and Compilers

                                                                                                                                      • IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2 + ST-Link
                                                                                                                                      • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25 + ST-Link
                                                                                                                                      • System Workbench for STM32 (SW4STM32) toolchain V2.7 + ST-Link
                                                                                                                                      -

                                                                                                                                      Supported Devices and boards

                                                                                                                                      +

                                                                                                                                      Supported Devices and boards

                                                                                                                                      • STM32WB55xx devices
                                                                                                                                      • P-NUCLEO-WB55 kit composed of P-NUCLEO-WB55.Nucleo and P-NUCLEO-WB55.USBDongle
                                                                                                                                      -

                                                                                                                                      Dependencies

                                                                                                                                      +

                                                                                                                                      Dependencies

                                                                                                                                      This software release is compatible with:

                                                                                                                                      • STM32WB_Copro_Wireless_Binaries available under Projects/STM32WB_Copro_Wireless_Binaries
                                                                                                                                        • @@ -6223,13 +6870,13 @@
                                                                                                                                      • Projects/P-NUCLEO-WB55.USBDongle/Applications/xxx/Binary/.hex

                                                                                                                                      Each of them require a different coprocessor binary in order to behave correctly. This is documented inside each readme.txt of those applications.

                                                                                                                                      -

                                                                                                                                      You can refer to the release note of the binaries for a detailed explanation on how to use and how to flash them.

                                                                                                                                      +

                                                                                                                                      You can refer to the release notes of the binaries for a detailed explanation on how to use and how to flash them.

                                                                                                                                      -

                                                                                                                                      Main Changes

                                                                                                                                      +

                                                                                                                                      Main Changes

                                                                                                                                      New features introduction and maintenance release

                                                                                                                                      This release introduces the following feature:

                                                                                                                                        @@ -6280,7 +6927,7 @@
                                                                                                                                      • The Coprocessor Wireless Binaries provided inside STM32Cube_FW_WB_V1.0.0 are not compatible with the FUS V1.0.1 provided inside STM32Cube_FW_WB_V1.1.0.
                                                                                                                                      • The Coprocessor Wireless Binaries provided inside STM32Cube_FW_WB_V1.1.0 are not compatible with the previous FUS (V0.5.3) loaded on P-NUCLEO-WB55 Kit.
                                                                                                                                      -

                                                                                                                                      To use Coprocessor Wireless Binaries provided inside STM32Cube_FW_WB_V1.1.0, you must first load FUS V1.0.1. (Warning, you cannot revert the FUS to previous version). This action enables the STM32WBxx to accept all the Coprocessor Wireless Binaries provided inside STM32Cube_FW_WB_V1.1.0. The complete operation is described inside the release note of the binaries.

                                                                                                                                      +

                                                                                                                                      To use Coprocessor Wireless Binaries provided inside STM32Cube_FW_WB_V1.1.0, you must first load FUS V1.0.1. (Warning, you cannot revert the FUS to previous version). This action enables the STM32WBxx to accept all the Coprocessor Wireless Binaries provided inside STM32Cube_FW_WB_V1.1.0. The complete operation is described inside the release notes of the binaries.

                                                                                                                                      A particular attention to the below section “Dependencies” must be taken when using BLE, Thread or Mac 802-15-4 applications as a specific binary must be loaded inside device memory for each application.

                                                                                                                                      They can be found under the following directories:

                                                                                                                                        @@ -6291,8 +6938,8 @@
                                                                                                                                      • Projects\P-NUCLEO-WB55.USBDongle\Applications\BLE
                                                                                                                                      • Projects\P-NUCLEO-WB55.USBDongle\Applications\Thread
                                                                                                                                      -

                                                                                                                                      Contents

                                                                                                                                      -

                                                                                                                                      Projects

                                                                                                                                      +

                                                                                                                                      Contents

                                                                                                                                      +

                                                                                                                                      Projects

                                                                                                                                      The STM32CubeWB Firmware package comes with a rich set of examples running on STMicroelectronics boards, organized by board and provided with preconfigured projects for the main supported toolchains.

                                                                                                                                      The exhaustive list of projects and their short description is provided in this table (STM32CubeProjectsList.html).

                                                                                                                                      Please note that the path of the example projects have been change to P-NUCLEO-WB55.Nucleo and P-NUCLEO-WB55.USBDongle.

                                                                                                                                      -

                                                                                                                                      Components

                                                                                                                                      +

                                                                                                                                      Components

                                                                                                                                      Firmware Upgrade Services Binary

                                                                                                                                      @@ -6316,7 +6963,7 @@ - +
                                                                                                                                      stm32wb5x_FUS_fw.bin V1.0.1 SLA0044 (binary release)release noterelease notes
                                                                                                                                      @@ -6335,43 +6982,43 @@ stm32wb5x_BLE_Stack_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_BLE_HCILayer_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_Thread_FTD_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_Thread_MTD_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_BLE_Thread_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_Mac_802_15_4_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes stm32wb5x_rfmonitor_phy802_15_4_fw.bin V1.1.0 SLA0044 (binary release) -release note +release notes @@ -6524,7 +7171,7 @@


                                                                                                                                      -

                                                                                                                                      Known Limitations

                                                                                                                                      +

                                                                                                                                      Known Limitations

                                                                                                                                      • With the ability to change the Coprocessor Wireless Binaries Over The Air (OTA), it is possible to switch from one binary to another. Only, the following case is not possible due to available memory size:
                                                                                                                                          @@ -6542,18 +7189,18 @@
                                                                                                                                        • SW4STM32 project is compiled without optimisation. (With optimised size compilation, the virtual com port required for the application is not functionnal)
                                                                                                                                      -

                                                                                                                                      Development Toolchains and Compilers

                                                                                                                                      +

                                                                                                                                      Development Toolchains and Compilers

                                                                                                                                      • IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2 + ST-Link
                                                                                                                                      • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25 + ST-Link
                                                                                                                                      • System Workbench for STM32 (SW4STM32) toolchain V2.7 + ST-Link
                                                                                                                                      -

                                                                                                                                      Supported Devices and boards

                                                                                                                                      +

                                                                                                                                      Supported Devices and boards

                                                                                                                                      • STM32WB55xx devices
                                                                                                                                      • P-NUCLEO-WB55 kit composed of P-NUCLEO-WB55.Nucleo and P-NUCLEO-WB55.USBDongle
                                                                                                                                      -

                                                                                                                                      Dependencies

                                                                                                                                      +

                                                                                                                                      Dependencies

                                                                                                                                      This software release is compatible with:

                                                                                                                                      • STM32WB_Copro_Wireless_Binaries available under Projects/STM32WB_Copro_Wireless_Binaries
                                                                                                                                        • @@ -6569,13 +7216,13 @@
                                                                                                                                      • Projects/P-NUCLEO-WB55.USBDongle/Applications/xxx/Binary/.hex

                                                                                                                                      Each of them require a different coprocessor binary in order to behave correctly. This is documented inside each readme.txt of those applications.

                                                                                                                                      -

                                                                                                                                      You can refer to the release note of the binaries for a detailed explanation on how to use and how to flash them.

                                                                                                                                      +

                                                                                                                                      You can refer to the release notes of the binaries for a detailed explanation on how to use and how to flash them.

                                                                                                                                      -

                                                                                                                                      Main Changes

                                                                                                                                      +

                                                                                                                                      Main Changes

                                                                                                                                      First release

                                                                                                                                      First release of STM32CubeWB (STM32Cube for STM32WB Series) supporting STM32WB55xx devices.

                                                                                                                                      In the STM32CubeWB MCU Package, most of the examples and applications projects are generated with the STM32CubeMX tool to initialize the system, peripherals and middleware stacks.

                                                                                                                                      @@ -6591,15 +7238,15 @@
                                                                                                                                    • Projects\P-NUCLEO-WB55.USBDongle\Applications\BLE
                                                                                                                                    • Projects\P-NUCLEO-WB55.USBDongle\Applications\Thread
                                                                                                                                    -

                                                                                                                                    Contents

                                                                                                                                    -

                                                                                                                                    Projects

                                                                                                                                    +

                                                                                                                                    Contents

                                                                                                                                    +

                                                                                                                                    Projects

                                                                                                                                    The STM32CubeWB Firmware package comes with a rich set of examples running on STMicroelectronics boards, organized by board and provided with preconfigured projects for the main supported toolchains.

                                                                                                                                    The exhaustive list of projects and their short description is provided in this table (STM32CubeProjectsList.html).

                                                                                                                                    -

                                                                                                                                    Components

                                                                                                                                    +

                                                                                                                                    Components

                                                                                                                                    Coprocessor Wireless Binaries

                                                                                                                                    @@ -6614,37 +7261,37 @@ - + - + - + - + - + - + @@ -6792,7 +7439,7 @@
                                                                                                                                    stm32wb5x_BLE_HCILayer_fw.bin V1.0.0release noterelease notes SLA0044 (binary release)
                                                                                                                                    stm32wb5x_BLE_Stack_fw.bin V1.0.0release noterelease notes SLA0044 (binary release)
                                                                                                                                    stm32wb5x_BLE_Thread_fw.bin V1.0.0release noterelease notes SLA0044 (binary release)
                                                                                                                                    stm32wb5x_Mac_802_15_4_fw.bin V1.0.0release noterelease notes SLA0044 (binary release)
                                                                                                                                    stm32wb5x_Thread_FTD_fw.bin V1.0.0release noterelease notes SLA0044 (binary release)
                                                                                                                                    stm32wb5x_Thread_MTD_fw.bin V1.0.0release noterelease notes SLA0044 (binary release)


                                                                                                                                    -

                                                                                                                                    Known Limitations

                                                                                                                                    +

                                                                                                                                    Known Limitations

                                                                                                                                    • BLE\BLE_p2pClient is provided with EWARM and MDK-ARM IDE. A connection issue with BLE_p2pServer is encounter with SW4STM32.
                                                                                                                                    • BLE\BLE_p2pRouter is provided with EWARM and MDK-ARM IDE. A connection issue with BLE_p2pServer is encounter with SW4STM32.
                                                                                                                                      • @@ -6822,18 +7469,18 @@
                                                                                                                                -

                                                                                                                                Development Toolchains and Compilers

                                                                                                                                +

                                                                                                                                Development Toolchains and Compilers

                                                                                                                                • IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2 + ST-Link
                                                                                                                                • RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25 + ST-Link
                                                                                                                                • System Workbench for STM32 (SW4STM32) toolchain V2.7 + ST-Link
                                                                                                                                -

                                                                                                                                Supported Devices and boards

                                                                                                                                +

                                                                                                                                Supported Devices and boards

                                                                                                                                • STM32WB55xx devices
                                                                                                                                • P-NUCLEO-WB55 kit composed of P-NUCLEO-WB55.Nucleo and P-NUCLEO-WB55.USBDongle
                                                                                                                                -

                                                                                                                                Dependencies

                                                                                                                                +

                                                                                                                                Dependencies

                                                                                                                                This software release is compatible with:

                                                                                                                                • STM32WB_Copro_Wireless_Binaries available under Projects/STM32WB_Copro_Wireless_Binaries
                                                                                                                                  • @@ -6849,7 +7496,7 @@
                                                                                                                                • Projects/P-NUCLEO-WB55.USBDongle/Applications/xxx/Binary/.hex

                                                                                                                                Each of them require a different coprocessor binary in order to behave correctly. This is documented inside each readme.txt of those applications.

                                                                                                                                -

                                                                                                                                You can refer to the release note of the binaries for a detailed explanation on how to use and how to flash them.

                                                                                                                                +

                                                                                                                                You can refer to the release notes of the binaries for a detailed explanation on how to use and how to flash them.

                                                                                                                              diff --git a/package.xml b/package.xml index 17ca94429..71412c4e8 100644 --- a/package.xml +++ b/package.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file -- cgit v1.2.3